Merge remote-tracking branch 'frappe/develop' into develop

commit: 5ccaf6f9d7c0b4b551cd36be401f936ec4d943cf [log] [tgz]
author: Giovanni Lion <giovanni.lion@gmail.com> Wed Dec 09 15:25:47 2015 +0800
committer: Giovanni Lion <giovanni.lion@gmail.com> Wed Dec 09 15:25:47 2015 +0800
tree: abf34f8631ffaada034bb065db31feafc74cfc67
parent: 87b5fcb3b50cf2b372244f78ca8df4b8b4650031 [diff]
parent: 29fe53f63c8fae263243abfd3c5138c6a943bd98 [diff]
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 293d373..5d7abf5 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.7'
+__version__ = '6.12.6'

diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index ca26ffb..66e7108 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "account_name", 
    "oldfieldtype": "Data", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Group", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -109,6 +113,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -132,7 +137,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Root Type",  
+   "label": "Root Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nAsset\nLiability\nIncome\nExpense\nEquity", 
    "permlevel": 0, 
@@ -154,7 +160,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Report Type",  
+   "label": "Report Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nBalance Sheet\nProfit and Loss", 
    "permlevel": 0, 
@@ -178,6 +185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -200,6 +208,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -222,6 +231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_account", 
    "oldfieldtype": "Link", 
@@ -246,7 +256,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Account Type",  
+   "label": "Account Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account_type", 
    "oldfieldtype": "Select", 
@@ -272,6 +283,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tax_rate", 
    "oldfieldtype": "Currency", 
@@ -295,7 +307,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Frozen",  
+   "label": "Frozen", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "freeze_account", 
    "oldfieldtype": "Select", 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -341,7 +355,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Balance must be",  
+   "label": "Balance must be", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nDebit\nCredit", 
    "permlevel": 0, 
@@ -364,6 +379,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lft", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -385,6 +401,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rgt", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -406,6 +423,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Old Parent", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -426,7 +444,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:37.436071", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.535663", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 

diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 8544b17..5c6aecd 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py

@@ -65,12 +65,19 @@
 				if self.root_type != db_value.root_type:
 					frappe.db.sql("update `tabAccount` set root_type=%s where lft > %s and rgt < %s",
 						(self.root_type, self.lft, self.rgt))
+						
+		if self.root_type and not self.report_type:
+			self.report_type = "Balance Sheet" \
+				if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"
 
 	def validate_root_details(self):
 		# does not exists parent
 		if frappe.db.exists("Account", self.name):
 			if not frappe.db.get_value("Account", self.name, "parent_account"):
 				throw(_("Root cannot be edited."), RootNotEditable)
+				
+		if not self.parent_account and not self.is_group:
+			frappe.throw(_("Root Account must be a group"))
 
 	def validate_frozen_accounts_modifier(self):
 		old_value = frappe.db.get_value("Account", self.name, "freeze_account")
@@ -127,11 +134,11 @@
 			and docstatus != 2""", self.name)
 
 	def validate_mandatory(self):
-		if not self.report_type:
-			throw(_("Report Type is mandatory"))
-
 		if not self.root_type:
 			throw(_("Root Type is mandatory"))
+			
+		if not self.report_type:
+			throw(_("Report Type is mandatory"))
 
 	def validate_warehouse_account(self):
 		if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):

diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index cd9d9d0..3de8241 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

@@ -2,10 +2,29 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Bank Reconciliation", {
+	setup: function(frm) {
+		frm.get_docfield("journal_entries").allow_bulk_edit = 1;
+		frm.add_fetch("bank_account", "account_currency", "account_currency");
+	},
+
+	onload: function(frm) {
+		frm.set_query("bank_account", function() {
+			return {
+				"filters": {
+					"account_type": "Bank",
+					"is_group": 0
+				}
+			};
+		});
+
+		frm.set_value("from_date", frappe.datetime.month_start());
+		frm.set_value("to_date", frappe.datetime.month_end());
+	},
+
 	refresh: function(frm) {
 		frm.disable_save();
 	},
-	
+
 	update_clearance_date: function(frm) {
 		return frappe.call({
 			method: "update_details",
@@ -22,19 +41,3 @@
 		});
 	}
 });
-
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	cur_frm.add_fetch("bank_account", "company", "company");
-
-	cur_frm.set_query("bank_account", function() {
-		return {
-			"filters": {
-				"account_type": "Bank",
-				"is_group": 0
-			}
-		};
-	});
-
-	cur_frm.set_value("from_date", frappe.datetime.month_start());
-	cur_frm.set_value("to_date", frappe.datetime.month_end());
-}
\ No newline at end of file

diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index df18ab9..59a3cfc 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -19,10 +19,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Bank Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -34,17 +36,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "company", 
+   "fieldname": "account_currency", 
    "fieldtype": "Link", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Company", 
+   "in_list_view": 0, 
+   "label": "Account Currency", 
+   "length": 0, 
    "no_copy": 0, 
-   "options": "Company", 
+   "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,9 +67,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -84,9 +90,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -105,9 +113,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Include Reconciled Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -126,10 +136,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Relevant Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -148,10 +160,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Journal Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Bank Reconciliation Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -170,10 +184,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Clearance Date", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -192,10 +208,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount", 
+   "length": 0, 
    "no_copy": 0, 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -213,7 +231,9 @@
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
- "modified": "2015-02-05 05:11:34.776660", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-30 12:44:45.105451", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 
@@ -241,5 +261,6 @@
   }
  ], 
  "read_only": 1, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "version": 0
 }
\ No newline at end of file

diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index f1c8820..3c280bd 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -15,12 +15,11 @@
 
 		condition = ""
 		if not self.include_reconciled_entries:
-			condition = "and ifnull(clearance_date, '') in ('', '0000-00-00')"
+			condition = "and (clearance_date is null or clearance_date='0000-00-00')"
 
 
-		dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit,
-				t2.credit, t1.posting_date, t2.against_account, t1.clearance_date,
-				t2.reference_type, t2.reference_name
+		dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit_in_account_currency,
+				t2.credit_in_account_currency, t1.posting_date, t2.against_account, t1.clearance_date
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
@@ -39,11 +38,11 @@
 			nl.voucher_id = d.name
 			nl.cheque_number = d.cheque_no
 			nl.cheque_date = d.cheque_date
-			nl.debit = d.debit
-			nl.credit = d.credit
+			nl.debit = d.debit_in_account_currency
+			nl.credit = d.credit_in_account_currency
 			nl.against_account = d.against_account
 			nl.clearance_date = d.clearance_date
-			self.total_amount += flt(d.debit) - flt(d.credit)
+			self.total_amount += flt(d.debit_in_account_currency) - flt(d.credit_in_account_currency)
 
 	def update_details(self):
 		vouchers = []

diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
index 7afb33f..5d74c3f 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -18,35 +18,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Voucher ID", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_id", 
    "oldfieldtype": "Link", 
    "options": "Journal Entry", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "clearance_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Clearance Date", 
-   "no_copy": 0, 
-   "oldfieldname": "clearance_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,34 +44,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Against Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "against_account", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "cheque_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Cheque Number", 
-   "no_copy": 0, 
-   "oldfieldname": "cheque_number", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -111,12 +69,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Debit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,12 +95,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Credit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit", 
    "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
+   "options": "account_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -152,47 +114,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "reference_type", 
-   "fieldtype": "Link", 
+   "fieldname": "column_break_5", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Reference Type", 
+   "length": 0, 
    "no_copy": 0, 
-   "options": "DocType", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
-   "read_only": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Reference Name", 
-   "no_copy": 0, 
-   "options": "reference_type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "unique": 0, 
+   "width": "50%"
   }, 
   {
    "allow_on_submit": 0, 
@@ -205,11 +145,38 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "cheque_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Cheque Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "cheque_number", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -226,19 +193,69 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "label": "Cheque Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cheque_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "clearance_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Clearance Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "clearance_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "data_10", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -249,12 +266,15 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:39.149782", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-04 11:01:24.286320", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
  "owner": "Administrator", 
  "permissions": [], 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "version": 0
 }
\ No newline at end of file

diff --git a/erpnext/accounts/doctype/budget_detail/budget_detail.json b/erpnext/accounts/doctype/budget_detail/budget_detail.json
index 4d9b489..99d3919 100644
--- a/erpnext/accounts/doctype/budget_detail/budget_detail.json
+++ b/erpnext/accounts/doctype/budget_detail/budget_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Budget Allocated", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "budget_allocated", 
    "oldfieldtype": "Currency", 
@@ -67,6 +69,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -89,7 +92,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:40.727468", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.050558", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget Detail", 

diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index fe5a2cd..83b2ddc 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json

@@ -18,6 +18,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -40,7 +41,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "C-FORM-", 
    "permlevel": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "C-Form No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Received Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -105,6 +109,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
@@ -126,6 +131,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -149,6 +155,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -171,6 +178,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year", 
    "permlevel": 0, 
@@ -192,7 +200,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Quarter",  
+   "label": "Quarter", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nI\nII\nIII\nIV", 
    "permlevel": 0, 
@@ -215,6 +224,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -237,6 +247,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "State", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -257,6 +268,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -278,6 +290,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Invoices", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "C-Form Invoice Detail", 
    "permlevel": 0, 
@@ -300,6 +313,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Invoiced Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -322,6 +336,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "C-Form", 
    "permlevel": 0, 
@@ -344,7 +359,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2015-10-02 07:38:40.926061", 
+ "modified": "2015-11-16 06:29:43.143528", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 

diff --git a/erpnext/accounts/doctype/c_form/test_c_form.py b/erpnext/accounts/doctype/c_form/test_c_form.py
new file mode 100644
index 0000000..c4c95db
--- /dev/null
+++ b/erpnext/accounts/doctype/c_form/test_c_form.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('C-Form')
+
+class TestCForm(unittest.TestCase):
+	pass

diff --git a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
index 2292caa..351ce99 100644
--- a/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
+++ b/erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -114,6 +118,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -136,7 +141,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:41.105885", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.221484", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form Invoice Detail", 

diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 93ffac9..e69a9c2 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Cost Center Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "cost_center_name", 
    "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_cost_center", 
    "oldfieldtype": "Link", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company_name", 
    "oldfieldtype": "Link", 
@@ -112,6 +116,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Group", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Budget", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Distribution Id", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "distribution_id", 
    "oldfieldtype": "Link", 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Budgets", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "budget_details", 
    "oldfieldtype": "Table", 
@@ -229,6 +238,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lft", 
    "oldfieldtype": "Int", 
@@ -252,6 +262,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rgt", 
    "oldfieldtype": "Int", 
@@ -275,6 +286,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
    "oldfieldtype": "Data", 
@@ -298,7 +310,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:42.617993", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.870712", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 

diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index a8ad0f2..fcbd72c 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -22,6 +22,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "year", 
    "oldfieldtype": "Data", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year Start Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "year_start_date", 
    "oldfieldtype": "Date", 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Companies", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year Company", 
    "permlevel": 0, 
@@ -133,7 +138,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:50.942038", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.289982", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year", 

diff --git a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
index 6892b16..2957d0b 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -39,7 +40,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:51.045350", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.344839", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year Company", 

diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 5f07df9..b7b698c 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Transaction Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -65,6 +67,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account", 
    "oldfieldtype": "Link", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "DocType", 
    "permlevel": 0, 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_type", 
    "permlevel": 0, 
@@ -133,6 +138,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
@@ -182,6 +189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit", 
    "oldfieldtype": "Currency", 
@@ -207,6 +215,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -230,6 +239,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit Amount in Account Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -253,6 +263,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Amount in Account Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -276,6 +287,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "against", 
    "oldfieldtype": "Text", 
@@ -299,6 +311,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Voucher Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "against_voucher_type", 
    "oldfieldtype": "Data", 
@@ -323,6 +336,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Voucher", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "against_voucher", 
    "oldfieldtype": "Data", 
@@ -347,6 +361,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_type", 
    "oldfieldtype": "Select", 
@@ -371,6 +386,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_no", 
    "oldfieldtype": "Data", 
@@ -395,6 +411,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Text", 
@@ -418,6 +435,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Is Opening", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_opening", 
    "oldfieldtype": "Select", 
@@ -442,6 +460,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_advance", 
    "oldfieldtype": "Select", 
@@ -466,6 +485,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -490,6 +510,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -513,7 +534,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-20 12:10:59.771050", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.382225", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "GL Entry", 

diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index f0f0fa4..1f6ff35 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -120,7 +120,7 @@
 	if not adv_adj and account:
 		balance_must_be = frappe.db.get_value("Account", account, "balance_must_be")
 		if balance_must_be:
-			balance = frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
+			balance = frappe.db.sql("""select sum(debit) - sum(credit)
 				from `tabGL Entry` where account = %s""", account)[0][0]
 
 			if (balance_must_be=="Debit" and flt(balance) < 0) or \
@@ -142,14 +142,14 @@
 
 def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False):
 	if party_type and party:
-		party_condition = " and ifnull(party_type, '')='{0}' and ifnull(party, '')='{1}'"\
+		party_condition = " and party_type='{0}' and party='{1}'"\
 			.format(frappe.db.escape(party_type), frappe.db.escape(party))
 	else:
 		party_condition = ""
 
 	# get final outstanding amt
 	bal = flt(frappe.db.sql("""
-		select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where against_voucher_type=%s and against_voucher=%s
 		and account = %s {0}""".format(party_condition),
@@ -159,9 +159,9 @@
 		bal = -bal
 	elif against_voucher_type == "Journal Entry":
 		against_voucher_amount = flt(frappe.db.sql("""
-			select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 			from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
-			and account = %s and ifnull(against_voucher, '') = '' {0}"""
+			and account = %s and (against_voucher is null or against_voucher='') {0}"""
 			.format(party_condition), (against_voucher, account))[0][0])
 
 		if not against_voucher_amount:

diff --git a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
index 146d084..6cc9bc8 100644
--- a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -9,17 +9,17 @@
 	def test_round_off_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
 		frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
-		
-		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC", 
+
+		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 100, "_Test Cost Center - _TC", submit=False)
-			
+
 		jv.get("accounts")[0].debit = 100.01
 		jv.flags.ignore_validate = True
 		jv.submit()
-		
+
 		round_off_entry = frappe.db.sql("""select name from `tabGL Entry`
-			where voucher_type='Journal Entry' and voucher_no = %s 
+			where voucher_type='Journal Entry' and voucher_no = %s
 			and account='_Test Write Off - _TC' and cost_center='_Test Cost Center - _TC'
-			and ifnull(debit, 0) = 0 and ifnull(credit, 0) = '.01'""", jv.name)
-			
-		self.assertTrue(round_off_entry)
\ No newline at end of file
+			and debit = 0 and credit = '.01'""", jv.name)
+
+		self.assertTrue(round_off_entry)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index b1c355b..479eaaf 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -368,10 +368,6 @@
 
 	credit: function(frm, dt, dn) {
 		cur_frm.cscript.update_totals(frm.doc);
-	},
-
-	exchange_rate: function(frm, cdt, cdn) {
-		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 	}
 })
 
@@ -418,7 +414,7 @@
 
 		if(row.account_currency == company_currency || !frm.doc.multi_currency) {
 			frappe.model.set_value(cdt, cdn, "exchange_rate", 1);
-		} else if (!row.exchange_rate || row.account_type == "Bank") {
+		} else if (!row.exchange_rate || row.exchange_rate == 1 || row.account_type == "Bank") {
 			frappe.call({
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
 				args: {

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index abfbaa4..6890b50 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json

@@ -19,10 +19,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -42,10 +44,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -64,13 +68,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Entry Type",  
+   "label": "Entry Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_type", 
    "oldfieldtype": "Select", 
    "options": "Journal Entry\nBank Entry\nCash Entry\nCredit Card Entry\nDebit Note\nCredit Note\nContra Entry\nExcise Entry\nWrite Off Entry\nOpening Entry", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -88,13 +94,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "JV-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -112,10 +120,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,11 +145,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -158,11 +170,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-table", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -181,12 +195,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting Entries", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "entries", 
    "oldfieldtype": "Table", 
    "options": "Journal Entry Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -204,9 +220,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -226,11 +244,13 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Reference Number", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "cheque_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -249,11 +269,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "cheque_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -272,11 +294,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "User Remark", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "user_remark", 
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -294,9 +318,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -315,12 +341,14 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Total Debit", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_debit", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -339,12 +367,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Total Credit", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_credit", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -364,12 +394,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference (Dr - Cr)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "difference", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -389,10 +421,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Make Difference Entry", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -411,10 +445,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Multi Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -433,10 +469,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount", 
+   "length": 0, 
    "no_copy": 1, 
-   "options": "Company:company:default_currency", 
+   "options": "", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -455,9 +493,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount in Words", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -476,10 +516,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-pushpin", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -498,11 +540,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Clearance Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "clearance_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -522,11 +566,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remark", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remark", 
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -544,9 +590,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -565,11 +613,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bill No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -588,11 +638,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bill Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -611,11 +663,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Due Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "due_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -635,10 +689,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -658,11 +714,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Write Off Based On",  
+   "label": "Write Off Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Accounts Receivable\nAccounts Payable", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -682,10 +740,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Outstanding Invoices", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "get_outstanding_invoices", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -703,10 +763,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -726,10 +788,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -748,10 +812,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -770,9 +836,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pay To / Recd From", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -790,10 +858,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -812,10 +882,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -834,12 +906,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -858,11 +932,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -881,12 +957,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -905,12 +983,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -928,10 +1008,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -952,13 +1034,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Is Opening",  
+   "label": "Is Opening", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_opening", 
    "oldfieldtype": "Select", 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -978,11 +1062,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Entry", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Stock Entry", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1001,12 +1087,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Link", 
    "options": "Journal Entry", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1024,7 +1112,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:54.074343", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-30 16:11:45.556341", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
@@ -1096,5 +1186,6 @@
  "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
\ No newline at end of file

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index c5035ad..ec22483 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.utils import cstr, flt, fmt_money, formatdate
 from frappe import msgprint, _, scrub
 from erpnext.controllers.accounts_controller import AccountsController
@@ -28,7 +28,7 @@
 		self.validate_entries_for_advance()
 		self.validate_multi_currency()
 		self.set_amounts_in_company_currency()
-		self.validate_debit_and_credit()
+		self.validate_total_debit_and_credit()
 		self.validate_against_jv()
 		self.validate_reference_doc()
 		self.set_against_account()
@@ -121,7 +121,7 @@
 
 				against_entries = frappe.db.sql("""select * from `tabJournal Entry Account`
 					where account = %s and docstatus = 1 and parent = %s
-					and ifnull(reference_type, '') in ("", "Sales Order", "Purchase Order")
+					and (reference_type is null or reference_type in ("", "Sales Order", "Purchase Order"))
 					""", (d.account, d.reference_name), as_dict=True)
 
 				if not against_entries:
@@ -252,7 +252,13 @@
 			if flt(d.debit > 0): d.against_account = ", ".join(list(set(accounts_credited)))
 			if flt(d.credit > 0): d.against_account = ", ".join(list(set(accounts_debited)))
 
-	def validate_debit_and_credit(self):
+	def validate_total_debit_and_credit(self):
+		self.set_total_debit_credit()
+		if self.difference:
+			frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
+				.format(self.difference))
+
+	def set_total_debit_credit(self):
 		self.total_debit, self.total_credit, self.difference = 0, 0, 0
 		for d in self.get("accounts"):
 			if d.debit and d.credit:
@@ -264,10 +270,6 @@
 		self.difference = flt(self.total_debit, self.precision("total_debit")) - \
 			flt(self.total_credit, self.precision("total_credit"))
 
-		if self.difference:
-			frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
-				.format(self.difference))
-
 	def validate_multi_currency(self):
 		alternate_currency = []
 		for d in self.get("accounts"):
@@ -283,7 +285,7 @@
 				frappe.throw(_("Please check Multi Currency option to allow accounts with other currency"))
 
 		self.set_exchange_rate()
-	
+
 	def set_amounts_in_company_currency(self):
 		for d in self.get("accounts"):
 			d.debit = flt(flt(d.debit_in_account_currency)*flt(d.exchange_rate), d.precision("debit"))
@@ -293,7 +295,7 @@
 		for d in self.get("accounts"):
 			if d.account_currency == self.company_currency:
 				d.exchange_rate = 1
-			elif not d.exchange_rate or d.account_type=="Bank" or \
+			elif not d.exchange_rate or d.exchange_rate == 1 or \
 				(d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name):
 					d.exchange_rate = get_exchange_rate(d.account, d.account_currency, self.company,
 						d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
@@ -337,20 +339,24 @@
 			self.remark = ("\n").join(r) #User Remarks is not mandatory
 
 	def set_print_format_fields(self):
+		total_amount = 0.0
+		bank_account_currency = None
 		for d in self.get('accounts'):
 			if d.party_type and d.party:
 				if not self.pay_to_recd_from:
 					self.pay_to_recd_from = frappe.db.get_value(d.party_type, d.party,
 						"customer_name" if d.party_type=="Customer" else "supplier_name")
 
-					self.set_total_amount(d.debit or d.credit)
 			elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
-				self.set_total_amount(d.debit or d.credit)
+				total_amount += (d.debit_in_account_currency or d.credit_in_account_currency)
+				bank_account_currency = d.account_currency
 
-	def set_total_amount(self, amt):
+		self.set_total_amount(total_amount, bank_account_currency)
+
+	def set_total_amount(self, amt, currency):
 		self.total_amount = amt
 		from frappe.utils import money_in_words
-		self.total_amount_in_words = money_in_words(amt, self.company_currency)
+		self.total_amount_in_words = money_in_words(amt, currency)
 
 	def make_gl_entries(self, cancel=0, adv_adj=0):
 		from erpnext.accounts.general_ledger import make_gl_entries
@@ -404,7 +410,7 @@
 					blank_row.debit_in_account_currency = abs(diff)
 					blank_row.debit = abs(diff)
 
-			self.validate_debit_and_credit()
+			self.validate_total_debit_and_credit()
 
 	def get_outstanding_invoices(self):
 		self.set('accounts', [])
@@ -432,7 +438,7 @@
 		elif self.write_off_based_on == 'Accounts Payable':
 			jd2.credit = total
 
-		self.validate_debit_and_credit()
+		self.validate_total_debit_and_credit()
 
 
 	def get_values(self):
@@ -520,14 +526,14 @@
 			"account_currency": account_details.account_currency,
 			"account_type": account_details.account_type
 		}
-		
+
 @frappe.whitelist()
 def get_payment_entry_against_order(dt, dn):
 	ref_doc = frappe.get_doc(dt, dn)
-	
+
 	if flt(ref_doc.per_billed, 2) > 0:
 		frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
-		
+
 	if dt == "Sales Order":
 		party_type = "Customer"
 		amount_field_party = "credit_in_account_currency"
@@ -536,15 +542,15 @@
 		party_type = "Supplier"
 		amount_field_party = "debit_in_account_currency"
 		amount_field_bank = "credit_in_account_currency"
-		
+
 	party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
 	party_account_currency = get_account_currency(party_account)
-	
+
 	if party_account_currency == ref_doc.company_currency:
 		amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
 	else:
 		amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
-		
+
 	return get_payment_entry(ref_doc, {
 		"party_type": party_type,
 		"party_account": party_account,
@@ -555,35 +561,40 @@
 		"remarks": 'Advance Payment received against {0} {1}'.format(dt, dn),
 		"is_advance": "Yes"
 	})
-	
+
 @frappe.whitelist()
 def get_payment_entry_against_invoice(dt, dn):
 	ref_doc = frappe.get_doc(dt, dn)
 	if dt == "Sales Invoice":
 		party_type = "Customer"
 		party_account = ref_doc.debit_to
-		amount_field_party = "credit_in_account_currency"
-		amount_field_bank = "debit_in_account_currency"
 	else:
 		party_type = "Supplier"
 		party_account = ref_doc.credit_to
+
+
+	if (dt=="Sales Invoice" and ref_doc.outstanding_amount > 0) \
+		or (dt=="Purchase Invoice" and ref_doc.outstanding_amount < 0):
+			amount_field_party = "credit_in_account_currency"
+			amount_field_bank = "debit_in_account_currency"
+	else:
 		amount_field_party = "debit_in_account_currency"
 		amount_field_bank = "credit_in_account_currency"
-		
+
 	return get_payment_entry(ref_doc, {
 		"party_type": party_type,
 		"party_account": party_account,
 		"party_account_currency": ref_doc.party_account_currency,
 		"amount_field_party": amount_field_party,
 		"amount_field_bank": amount_field_bank,
-		"amount": ref_doc.outstanding_amount,
+		"amount": abs(ref_doc.outstanding_amount),
 		"remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks),
 		"is_advance": "No"
 	})
-	
+
 def get_payment_entry(ref_doc, args):
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
-	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), 
+	exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
 		ref_doc.company, ref_doc.doctype, ref_doc.name)
 
 	jv = frappe.new_doc("Journal Entry")
@@ -592,7 +603,7 @@
 		"company": ref_doc.company,
 		"remark": args.get("remarks")
 	})
-	
+
 	party_row = jv.append("accounts", {
 		"account": args.get("party_account"),
 		"party_type": args.get("party_type"),
@@ -601,7 +612,7 @@
 		"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
 		"account_currency": args.get("party_account_currency") or \
 			get_account_currency(args.get("party_account")),
-		"account_balance": get_balance_on(args.get("party_account")),
+		"balance": get_balance_on(args.get("party_account")),
 		"party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
 		"exchange_rate": exchange_rate,
 		args.get("amount_field_party"): args.get("amount"),
@@ -614,11 +625,11 @@
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry")
 	if bank_account:
 		bank_row.update(bank_account)
-		bank_row.exchange_rate = get_exchange_rate(bank_account["account"], 
+		bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
 			bank_account["account_currency"], ref_doc.company)
-			
+
 	bank_row.cost_center = cost_center
-	
+
 	if bank_row.account_currency == args.get("party_account_currency"):
 		bank_row.set(args.get("amount_field_bank"), args.get("amount"))
 	else:
@@ -630,7 +641,8 @@
 			jv.multi_currency = 1
 
 	jv.set_amounts_in_company_currency()
-	
+	jv.set_total_debit_credit()
+
 	return jv.as_dict()
 
 @frappe.whitelist()
@@ -646,24 +658,27 @@
 	return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
 		from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
 		where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
-		and ifnull(jv_detail.reference_type, '') = ''
-		and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield),
+		and (jv_detail.reference_type is null or jv_detail.reference_type = '')
+		and jv.docstatus = 1 and jv.`{0}` like %s order by jv.name desc limit %s, %s""".format(frappe.db.escape(searchfield)),
 		(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
 
 @frappe.whitelist()
 def get_outstanding(args):
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
-	args = eval(args)
+
+	if isinstance(args, basestring):
+		args = json.loads(args)
+
 	company_currency = get_company_currency(args.get("company"))
 
 	if args.get("doctype") == "Journal Entry":
 		condition = " and party=%(party)s" if args.get("party") else ""
 
 		against_jv_amount = frappe.db.sql("""
-			select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 			from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0}
-			and ifnull(reference_type, '')=''""".format(condition), args)
+			and (reference_type is null or reference_type = '')""".format(condition), args)
 
 		against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0
 		amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
@@ -728,6 +743,11 @@
 		"exchange_rate": get_exchange_rate(account, account_details.account_currency,
 			company, debit=debit, credit=credit, exchange_rate=exchange_rate)
 	}
+
+	# un-set party if not party type
+	if not party_type:
+		grid_values["party"] = ""
+
 	return grid_values
 
 @frappe.whitelist()
@@ -737,6 +757,9 @@
 	account_details = frappe.db.get_value("Account", account,
 		["account_type", "root_type", "account_currency", "company"], as_dict=1)
 
+	if not account_details:
+		frappe.throw(_("Please select correct account"))
+
 	if not company:
 		company = account_details.company
 

diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index f2c1575..9277da5 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -10,7 +10,7 @@
  "fields": [
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "account", 
    "fieldtype": "Link", 
@@ -19,12 +19,14 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account", 
    "oldfieldtype": "Link", 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "250px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -45,10 +47,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Type", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -67,12 +71,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Balance", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "balance", 
    "oldfieldtype": "Data", 
    "options": "account_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -93,12 +99,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -118,9 +126,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -139,10 +149,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "DocType", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -161,10 +173,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Party", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -183,11 +197,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Balance", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "account_currency", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -208,10 +224,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -230,11 +248,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -252,10 +272,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -274,10 +296,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "6", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -296,9 +320,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -308,7 +334,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "debit_in_account_currency", 
    "fieldtype": "Currency", 
@@ -316,12 +342,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Debit in Account Currency", 
+   "label": "Debit", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "account_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 1, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -331,7 +359,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "debit", 
    "fieldtype": "Currency", 
@@ -340,6 +368,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Debit in Company Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "debit", 
    "oldfieldtype": "Currency", 
@@ -347,6 +376,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -364,9 +394,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -376,7 +408,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "credit_in_account_currency", 
    "fieldtype": "Currency", 
@@ -384,12 +416,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Credit in Account Currency", 
+   "label": "Credit", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "account_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 1, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -399,7 +433,7 @@
   }, 
   {
    "allow_on_submit": 0, 
-   "bold": 0, 
+   "bold": 1, 
    "collapsible": 0, 
    "fieldname": "credit", 
    "fieldtype": "Currency", 
@@ -408,6 +442,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit in Company Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "credit", 
    "oldfieldtype": "Currency", 
@@ -415,6 +450,7 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -433,9 +469,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -454,11 +492,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -477,11 +517,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "reference_type", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -499,9 +541,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -520,12 +564,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "is_advance", 
    "oldfieldtype": "Select", 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -544,11 +590,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "against_account", 
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -565,7 +613,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-20 12:10:22.203395", 
+ "max_attachments": 0, 
+ "modified": "2015-12-02 04:14:37.571883", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 

diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 2b3bfc9..6befedc 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mode of Payment", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "mode_of_payment", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Mode of Payment Account", 
    "permlevel": 0, 
@@ -65,7 +67,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:57.318104", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.335559", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 

diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
index e827e48..36d54b6 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py

@@ -5,6 +5,24 @@
 import frappe
 
 from frappe.model.document import Document
+from frappe import _
 
 class ModeofPayment(Document):
-	pass
+	def validate(self):
+		self.validate_accounts()
+		self.validate_repeating_companies()
+	
+	def validate_repeating_companies(self):
+		"""Error when Same Company is entered multiple times in accounts"""
+		accounts_list = []
+		for entry in self.accounts:
+			accounts_list.append(entry.company)
+
+		if len(accounts_list)!= len(set(accounts_list)):
+			frappe.throw(_("Same Company is entered more than once"))
+
+	def validate_accounts(self):
+		for entry in self.accounts:
+			"""Error when Company of Ledger account doesn't match with Company Selected"""
+			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
+				frappe.throw(_("Account does not match with Company"))

diff --git a/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json b/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
index 9bb7f36..9cd1e7c 100644
--- a/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
+++ b/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -63,7 +65,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:57.388194", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.367895", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment Account", 

diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 080864a..d7d6710 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Distribution Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "distribution_id", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Monthly Distribution Percentages", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "budget_distribution_details", 
    "oldfieldtype": "Table", 
@@ -91,7 +94,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:57.594541", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.431735", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution", 

diff --git a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
index ba534ed..11f7eb8 100644
--- a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
+++ b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Month", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "month", 
    "oldfieldtype": "Data", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Percentage Allocation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "percentage_allocation", 
    "oldfieldtype": "Currency", 
@@ -63,7 +65,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:57.670950", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.468982", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Monthly Distribution Percentage", 

diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
index f32f5cd..4527531 100644
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -82,7 +85,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:59.582533", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.450360", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Party Account", 

diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 13b8f02..8354556 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py

@@ -6,6 +6,7 @@
 from frappe.utils import flt
 from frappe import msgprint, _
 from frappe.model.document import Document
+from erpnext.accounts.utils import get_outstanding_invoices
 
 class PaymentReconciliation(Document):
 	def get_unreconciled_entries(self):
@@ -17,7 +18,7 @@
 		dr_or_cr = "credit_in_account_currency" if self.party_type == "Customer" \
 			else "debit_in_account_currency"
 
-		cond = self.check_condition(dr_or_cr)
+		cond = self.check_condition()
 
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
@@ -32,7 +33,7 @@
 				t1.name = t2.parent and t1.docstatus = 1 and t2.docstatus = 1
 				and t2.party_type = %(party_type)s and t2.party = %(party)s
 				and t2.account = %(account)s and {dr_or_cr} > 0
-				and ifnull(t2.reference_type, '') in ('', 'Sales Order', 'Purchase Order')
+				and (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
 				{cond}
 				and (CASE
 					WHEN t1.voucher_type in ('Debit Note', 'Credit Note')
@@ -65,65 +66,11 @@
 
 	def get_invoice_entries(self):
 		#Fetch JVs, Sales and Purchase Invoices for 'invoices' to reconcile against
-		non_reconciled_invoices = []
-		dr_or_cr = "debit_in_account_currency" if self.party_type == "Customer" else "credit_in_account_currency"
-		cond = self.check_condition(dr_or_cr)
 
-		invoice_list = frappe.db.sql("""
-			select
-				voucher_no, voucher_type, posting_date,
-				ifnull(sum({dr_or_cr}), 0) as invoice_amount
-			from
-				`tabGL Entry`
-			where
-				party_type = %(party_type)s and party = %(party)s
-				and account = %(account)s and {dr_or_cr} > 0 {cond}
-				and (CASE
-					WHEN voucher_type = 'Journal Entry'
-					THEN ifnull(against_voucher, '') = ''
-					ELSE 1=1
-				END)
-			group by voucher_type, voucher_no
-		""".format(**{
-			"cond": cond,
-			"dr_or_cr": dr_or_cr
-		}), {
-			"party_type": self.party_type,
-			"party": self.party,
-			"account": self.receivable_payable_account,
-		}, as_dict=True)
+		condition = self.check_condition()
 
-		for d in invoice_list:
-			payment_amount = frappe.db.sql("""
-				select
-					ifnull(sum(ifnull({0}, 0)), 0)
-				from
-					`tabGL Entry`
-				where
-					party_type = %(party_type)s and party = %(party)s
-					and account = %(account)s and {0} > 0
-					and against_voucher_type = %(against_voucher_type)s
-					and ifnull(against_voucher, '') = %(against_voucher)s
-			""".format("credit_in_account_currency" if self.party_type == "Customer" 
-				else "debit_in_account_currency"), {
-					"party_type": self.party_type,
-					"party": self.party,
-					"account": self.receivable_payable_account,
-					"against_voucher_type": d.voucher_type,
-					"against_voucher": d.voucher_no
-				}
-			)
-
-			payment_amount = payment_amount[0][0] if payment_amount else 0
-
-			if d.invoice_amount - payment_amount > 0.005:
-				non_reconciled_invoices.append({
-					'voucher_no': d.voucher_no,
-					'voucher_type': d.voucher_type,
-					'posting_date': d.posting_date,
-					'invoice_amount': flt(d.invoice_amount),
-					'outstanding_amount': flt(d.invoice_amount - payment_amount, 2)
-				})
+		non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party,
+			self.receivable_payable_account, condition=condition)
 
 		self.add_invoice_entries(non_reconciled_invoices)
 
@@ -210,13 +157,18 @@
 		if not invoices_to_reconcile:
 			frappe.throw(_("Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row"))
 
-	def check_condition(self, dr_or_cr):
-		cond = self.from_date and " and posting_date >= '" + self.from_date + "'" or ""
-		cond += self.to_date and " and posting_date <= '" + self.to_date + "'" or ""
+	def check_condition(self):
+		cond = " and posting_date >= {0}".format(frappe.db.escape(self.from_date)) if self.from_date else ""
+		cond += " and posting_date <= {0}".format(frappe.db.escape(self.to_date)) if self.to_date else ""
+
+		if self.party_type == "Customer":
+			dr_or_cr = "debit_in_account_currency"
+		else:
+			dr_or_cr = "credit_in_account_currency"
 
 		if self.minimum_amount:
-			cond += " and {0} >= %s".format(dr_or_cr) % self.minimum_amount
+			cond += " and `{0}` >= {1}".format(dr_or_cr, flt(self.minimum_amount))
 		if self.maximum_amount:
-			cond += " and {0} <= %s".format(dr_or_cr) % self.maximum_amount
+			cond += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_amount))
 
 		return cond

diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
index f017349..5659f1f 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice\nPurchase Invoice\nJournal Entry", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Number", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -105,6 +109,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -126,6 +131,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Outstanding Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -144,7 +150,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-16 06:14:07.460813", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.516537", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Invoice", 

diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index 801dd9b..f9b6039 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Journal Entry", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Journal Entry", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,6 +64,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -83,6 +86,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Advance", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -104,6 +108,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Voucher Detail Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -125,6 +130,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -146,6 +152,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Invoice Number", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -168,6 +175,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -190,6 +198,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -211,6 +220,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remark", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -229,7 +239,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:59.835936", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.563989", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Payment", 

diff --git a/erpnext/accounts/doctype/payment_tool/payment_tool.py b/erpnext/accounts/doctype/payment_tool/payment_tool.py
index 6cf2b6d..19527d3 100644
--- a/erpnext/accounts/doctype/payment_tool/payment_tool.py
+++ b/erpnext/accounts/doctype/payment_tool/payment_tool.py

@@ -8,6 +8,7 @@
 from frappe.model.document import Document
 import json
 from erpnext.accounts.utils import get_account_currency
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate
 
 class PaymentTool(Document):
 	def make_journal_entry(self):
@@ -19,7 +20,15 @@
 		jv.company = self.company
 		jv.cheque_no = self.reference_no
 		jv.cheque_date = self.reference_date
-
+		
+		party_account_currency, party_account_type = frappe.db.get_value("Account", self.party_account, 
+			["account_currency", "account_type"])
+		
+		bank_account_currency, bank_account_type = None, None
+		if self.payment_account:
+			bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account, 
+				["account_currency", "account_type"])
+		
 		if not self.total_payment_amount:
 			frappe.throw(_("Please enter Payment Amount in atleast one row"))
 
@@ -27,27 +36,56 @@
 			if not frappe.db.get_value(v.against_voucher_type, {"name": v.against_voucher_no}):
 				frappe.throw(_("Row {0}: {1} is not a valid {2}").format(v.idx, v.against_voucher_no,
 					v.against_voucher_type))
-
+			
 			if v.payment_amount:
+				exchange_rate = get_exchange_rate(self.party_account, party_account_currency,
+					self.company, v.against_voucher_type, v.against_voucher_no)
+				
 				d1 = jv.append("accounts")
 				d1.account = self.party_account
 				d1.party_type = self.party_type
 				d1.party = self.party
+				d1.account_currency = party_account_currency
+				d1.account_type = party_account_type
 				d1.balance = get_balance_on(self.party_account)
+				d1.party_balance = get_balance_on(party=self.party, party_type=self.party_type)
+				d1.exchange_rate = exchange_rate
 				d1.set("debit_in_account_currency" if self.received_or_paid=="Paid" \
 					else "credit_in_account_currency", flt(v.payment_amount))
-				d1.set("reference_type", v.against_voucher_type)
-				d1.set("reference_name", v.against_voucher_no)
-				d1.set('is_advance', 'Yes' if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No')
-				total_payment_amount = flt(total_payment_amount) + \
-					flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
+				d1.reference_type = v.against_voucher_type
+				d1.reference_name = v.against_voucher_no
+				d1.is_advance = 'Yes' \
+					if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No'
+					
+				amount = flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
+				if bank_account_currency == party_account_currency:
+					total_payment_amount += amount
+				else:
+					total_payment_amount += amount*exchange_rate
 
 		d2 = jv.append("accounts")
-		d2.account = self.payment_account
-		d2.set('debit_in_account_currency' if total_payment_amount < 0 \
-			else 'credit_in_account_currency', abs(total_payment_amount))
 		if self.payment_account:
-			d2.balance = get_balance_on(self.payment_account)
+			bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account, 
+				["account_currency", "account_type"])
+				
+			d2.account = self.payment_account
+			d2.account_currency = bank_account_currency
+			d2.account_type = bank_account_type
+			d2.exchange_rate = get_exchange_rate(self.payment_account, self.company)
+			d2.account_balance = get_balance_on(self.payment_account)
+		
+		amount_field_bank = 'debit_in_account_currency' if total_payment_amount < 0 \
+			else 'credit_in_account_currency'
+		
+		d2.set(amount_field_bank, abs(total_payment_amount))
+		
+		company_currency = frappe.db.get_value("Company", self.company, "default_currency")
+		if party_account_currency != company_currency or \
+			(bank_account_currency and bank_account_currency != company_currency):
+				jv.multi_currency = 1
+			
+		jv.set_amounts_in_company_currency()
+		jv.set_total_debit_credit()
 
 		return jv.as_dict()
 
@@ -63,20 +101,18 @@
 	party_account_currency = get_account_currency(args.get("party_account"))
 	company_currency = frappe.db.get_value("Company", args.get("company"), "default_currency")
 
-	if args.get("party_type") == "Customer" and args.get("received_or_paid") == "Received":
-		amount_query = "ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0)"
-	elif args.get("party_type") == "Supplier" and args.get("received_or_paid") == "Paid":
-		amount_query = "ifnull(credit_in_account_currency, 0) - ifnull(debit_in_account_currency, 0)"
-	else:
+	if ((args.get("party_type") == "Customer" and args.get("received_or_paid") == "Paid")
+		or (args.get("party_type") == "Supplier" and args.get("received_or_paid") == "Received")):
+
 		frappe.throw(_("Please enter the Against Vouchers manually"))
 
 	# Get all outstanding sales /purchase invoices
-	outstanding_invoices = get_outstanding_invoices(amount_query, args.get("party_account"),
-		args.get("party_type"), args.get("party"))
+	outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"), args.get("party_account"))
 
 	# Get all SO / PO which are not fully billed or aginst which full advance not paid
 	orders_to_be_billed = get_orders_to_be_billed(args.get("party_type"), args.get("party"),
 		party_account_currency, company_currency)
+
 	return outstanding_invoices + orders_to_be_billed
 
 def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
@@ -87,8 +123,8 @@
 	orders = frappe.db.sql("""
 		select
 			name as voucher_no,
-			ifnull({ref_field}, 0) as invoice_amount,
-			(ifnull({ref_field}, 0) - ifnull(advance_paid, 0)) as outstanding_amount,
+			{ref_field} as invoice_amount,
+			({ref_field} - advance_paid) as outstanding_amount,
 			transaction_date as posting_date
 		from
 			`tab{voucher_type}`
@@ -96,8 +132,8 @@
 			{party_type} = %s
 			and docstatus = 1
 			and ifnull(status, "") != "Stopped"
-			and ifnull({ref_field}, 0) > ifnull(advance_paid, 0)
-			and abs(100 - ifnull(per_billed, 0)) > 0.01
+			and {ref_field} > advance_paid
+			and abs(100 - per_billed) > 0.01
 		""".format(**{
 			"ref_field": ref_field,
 			"voucher_type": voucher_type,
@@ -118,7 +154,7 @@
 	ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
 
 	if against_voucher_type in ["Sales Order", "Purchase Order"]:
-		select_cond = "{0} as total_amount, ifnull({0}, 0) - ifnull(advance_paid, 0) as outstanding_amount"\
+		select_cond = "{0} as total_amount, {0} - advance_paid as outstanding_amount"\
 			.format(ref_field)
 	elif against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
 		select_cond = "{0} as total_amount, outstanding_amount".format(ref_field)
@@ -127,6 +163,6 @@
 		select_cond = "{0} as total_amount".format(ref_field)
 
 	details = frappe.db.sql("""select {0} from `tab{1}` where name = %s"""
-		.format(select_cond, against_voucher_type), against_voucher_no, as_dict=1)
+		.format(select_cond, frappe.db.escape(against_voucher_type)), against_voucher_no, as_dict=1)
 
 	return details[0] if details else {}

diff --git a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json b/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
index 8fba291..765aa93 100644
--- a/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
+++ b/erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Against Voucher Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "DocType", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Against Voucher No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "against_voucher_type", 
    "permlevel": 0, 
@@ -64,6 +66,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -86,6 +89,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_account_currency", 
    "permlevel": 0, 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Outstanding Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_account_currency", 
    "permlevel": 0, 
@@ -130,6 +135,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Payment Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "party_account_currency", 
    "permlevel": 0, 
@@ -149,7 +155,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:59.950506", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.626386", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Tool Detail", 

diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index 51d8117..364b78c 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js

@@ -10,12 +10,12 @@
 
 // ***************** Get Account Head *****************
 cur_frm.fields_dict['closing_account_head'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{
-			"company": doc.company,
-			"root_type": "Liability",
-			"freeze_account": "No",
-			"is_group": 0
-		}
+	return {
+		filters: [
+			['Account', 'company', '=', doc.company],
+			['Account', 'is_group', '=', '0'],
+			['Account', 'freeze_account', '=', 'No'],
+			['Account', 'root_type', 'in', 'Liability, Equity']
+		]
 	}
 }

diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index 2295956..04a9f94 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json

@@ -18,6 +18,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Transaction Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Closing Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Select", 
@@ -158,6 +164,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Closing Account Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "closing_account_head", 
    "oldfieldtype": "Link", 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Small Text", 
@@ -227,7 +236,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-21 12:40:58.278256", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.671436", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Period Closing Voucher", 

diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index aba43a6..d22f4d3 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -22,21 +22,21 @@
 
 	def validate_account_head(self):
 		closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type")
-		
-		if closing_account_type != "Liability":
-			frappe.throw(_("Closing Account {0} must be of type 'Liability'")
+
+		if closing_account_type not in ["Liability", "Equity"]:
+			frappe.throw(_("Closing Account {0} must be of type Liability / Equity")
 				.format(self.closing_account_head))
 
 		account_currency = get_account_currency(self.closing_account_head)
-		company_currency = frappe.db.get_value("Company", self.company, "default_currency")		
+		company_currency = frappe.db.get_value("Company", self.company, "default_currency")
 		if account_currency != company_currency:
 			frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency))
 
 	def validate_posting_date(self):
 		from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
-		
+
 		validate_fiscal_year(self.posting_date, self.fiscal_year, label=_("Posting Date"), doc=self)
-		
+
 		self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year)[1]
 
 		pce = frappe.db.sql("""select name from `tabPeriod Closing Voucher`
@@ -50,7 +50,7 @@
 		gl_entries = []
 		net_pl_balance = 0
 		pl_accounts = self.get_pl_balances()
-		
+
 		for acc in pl_accounts:
 			if flt(acc.balance_in_company_currency):
 				gl_entries.append(self.get_gl_dict({
@@ -67,7 +67,7 @@
 				}))
 
 				net_pl_balance += flt(acc.balance_in_company_currency)
-		
+
 		if net_pl_balance:
 			gl_entries.append(self.get_gl_dict({
 				"account": self.closing_account_head,
@@ -76,20 +76,20 @@
 				"credit_in_account_currency": abs(net_pl_balance) if net_pl_balance < 0 else 0,
 				"credit": abs(net_pl_balance) if net_pl_balance < 0 else 0
 			}))
-		
+
 		from erpnext.accounts.general_ledger import make_gl_entries
 		make_gl_entries(gl_entries)
 
 	def get_pl_balances(self):
 		"""Get balance for pl accounts"""
 		return frappe.db.sql("""
-			select 
-				t1.account, t2.account_currency,  				sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) 
-					as balance_in_account_currency,
-				sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance_in_company_currency
+			select
+				t1.account, t2.account_currency,
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as balance_in_account_currency,
+				sum(t1.debit) - sum(t1.credit) as balance_in_company_currency
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss'
+			where t1.account = t2.name and t2.report_type = 'Profit and Loss'
 			and t2.docstatus < 2 and t2.company = %s
 			and t1.posting_date between %s and %s
 			group by t1.account
-		""", (self.company, self.get("year_start_date"), self.posting_date), as_dict=1)
\ No newline at end of file
+		""", (self.company, self.get("year_start_date"), self.posting_date), as_dict=1)

diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
index db4dad4..1fdf002 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py

@@ -12,60 +12,60 @@
 class TestPeriodClosingVoucher(unittest.TestCase):
 	def test_closing_entry(self):
 		year_start_date = get_fiscal_year(today())[1]
-		
-		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400, 
+
+		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400,
 			"_Test Cost Center - _TC", submit=True)
-		
-		make_journal_entry("_Test Account Cost for Goods Sold - _TC", 
+
+		make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 600, "_Test Cost Center - _TC", submit=True)
-			
+
 		random_expense_account = frappe.db.sql("""
-			select t1.account, 
-				sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance,
-				sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) \
+			select t1.account,
+				sum(t1.debit) - sum(t1.credit) as balance,
+				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) \
 					as balance_in_account_currency
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.root_type, '') = 'Expense'
+			where t1.account = t2.name and t2.root_type = 'Expense'
 				and t2.docstatus < 2 and t2.company = '_Test Company'
 				and t1.posting_date between %s and %s
 			group by t1.account
-			having sum(ifnull(t1.debit,0)) > sum(ifnull(t1.credit,0))
+			having sum(t1.debit) > sum(t1.credit)
 			limit 1""", (year_start_date, today()), as_dict=True)
-			
-		profit_or_loss = frappe.db.sql("""select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance
+
+		profit_or_loss = frappe.db.sql("""select sum(t1.debit) - sum(t1.credit) as balance
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss'
+			where t1.account = t2.name and t2.report_type = 'Profit and Loss'
 			and t2.docstatus < 2 and t2.company = '_Test Company'
 			and t1.posting_date between %s and %s""", (year_start_date, today()))
-			
+
 		profit_or_loss = flt(profit_or_loss[0][0]) if profit_or_loss else 0
-		
+
 		pcv = self.make_period_closing_voucher()
-		
+
 		# Check value for closing account
-		gle_amount_for_closing_account = frappe.db.sql("""select ifnull(debit, 0) - ifnull(credit, 0)
+		gle_amount_for_closing_account = frappe.db.sql("""select debit - credit
 			from `tabGL Entry` where voucher_type='Period Closing Voucher' and voucher_no=%s
 			and account = '_Test Account Reserves and Surplus - _TC'""", pcv.name)
-			
+
 		gle_amount_for_closing_account = flt(gle_amount_for_closing_account[0][0]) \
 			if gle_amount_for_closing_account else 0
 
 		self.assertEqual(gle_amount_for_closing_account, profit_or_loss)
-		
+
 		if random_expense_account:
 			# Check posted value for teh above random_expense_account
 			gle_for_random_expense_account = frappe.db.sql("""
-				select ifnull(debit, 0) - ifnull(credit, 0) as amount,
-					ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0) 
+				select debit - credit as amount,
+					debit_in_account_currency - credit_in_account_currency
 						as amount_in_account_currency
-				from `tabGL Entry` 
-				where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""", 
+				from `tabGL Entry`
+				where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""",
 				(pcv.name, random_expense_account[0].account), as_dict=True)
-			
+
 			self.assertEqual(gle_for_random_expense_account[0].amount, -1*random_expense_account[0].balance)
-			self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency, 
+			self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency,
 				-1*random_expense_account[0].balance_in_account_currency)
-		
+
 	def make_period_closing_voucher(self):
 		pcv = frappe.get_doc({
 			"doctype": "Period Closing Voucher",
@@ -77,7 +77,7 @@
 		})
 		pcv.insert()
 		pcv.submit()
-		
+
 		return pcv
 
 

diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 02533ee..6d395af 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Applicable for User", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "user", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -93,6 +96,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Stock", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -113,6 +117,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_account", 
    "oldfieldtype": "Link", 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -183,6 +190,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
@@ -207,6 +215,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mode of Payment", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Mode of Payment", 
    "permlevel": 0, 
@@ -229,6 +238,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -251,6 +261,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Format", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Format", 
    "permlevel": 0, 
@@ -274,6 +285,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
@@ -298,6 +310,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Select", 
@@ -322,6 +335,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
@@ -345,6 +359,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -368,6 +383,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "territory", 
    "oldfieldtype": "Link", 
@@ -392,6 +408,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -415,6 +432,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -437,6 +455,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -460,6 +479,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -483,6 +503,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge", 
    "oldfieldtype": "Link", 
@@ -506,6 +527,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -528,6 +550,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cash/Bank Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cash_bank_account", 
    "oldfieldtype": "Link", 
@@ -552,6 +575,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Income Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "income_account", 
    "oldfieldtype": "Link", 
@@ -577,6 +601,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -599,6 +624,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
@@ -622,7 +648,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:00.196535", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.741253", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index c0b7bb4..a9c7ce7 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,7 +65,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Apply On",  
+   "label": "Apply On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nItem Code\nItem Group\nBrand", 
    "permlevel": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item", 
    "permlevel": 0, 
@@ -110,6 +114,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Brand", 
    "permlevel": 0, 
@@ -133,6 +138,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Group", 
    "permlevel": 0, 
@@ -154,6 +160,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -176,7 +183,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Priority",  
+   "label": "Priority", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", 
    "permlevel": 0, 
@@ -199,6 +207,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disable", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -219,6 +228,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -241,6 +251,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Selling", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -262,6 +273,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Buying", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -282,6 +294,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -304,7 +317,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Applicable For",  
+   "label": "Applicable For", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", 
    "permlevel": 0, 
@@ -328,6 +342,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
@@ -351,6 +366,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -374,6 +390,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -397,6 +414,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Partner", 
    "permlevel": 0, 
@@ -420,6 +438,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Campaign", 
    "permlevel": 0, 
@@ -443,6 +462,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -466,6 +486,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier Type", 
    "permlevel": 0, 
@@ -487,6 +508,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -509,6 +531,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Min Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -529,6 +552,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -551,6 +575,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Max Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -571,6 +596,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -594,6 +620,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid From", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -615,6 +642,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid Upto", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -635,6 +663,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -656,6 +685,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -678,6 +708,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -699,7 +730,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Price or Discount",  
+   "label": "Price or Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nPrice\nDiscount Percentage", 
    "permlevel": 0, 
@@ -721,6 +753,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -743,6 +776,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -765,6 +799,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -787,6 +822,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "For Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
@@ -809,6 +845,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -831,6 +868,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule Help", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -851,7 +889,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:00.632196", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.958974", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index bcdf9fc..d835e76 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -59,7 +59,7 @@
 					self.set(f, None)
 
 	def validate_price_or_discount(self):
-		for field in ["Price", "Discount Percentage"]:
+		for field in ["Price"]:
 			if flt(self.get(frappe.scrub(field))) < 0:
 				throw(_("{0} can not be negative").format(field))
 
@@ -179,7 +179,7 @@
 			if parent_groups:
 				if allow_blank: parent_groups.append('')
 				condition = " ifnull("+field+", '') in ('" + \
-					"', '".join([d.replace("'", "\\'").replace('"', '\\"').replace("%", "%%") for d in parent_groups])+"')"
+					"', '".join([frappe.db.escape(d) for d in parent_groups])+"')"
 		return condition
 
 
@@ -206,8 +206,8 @@
 
 	return frappe.db.sql("""select * from `tabPricing Rule`
 		where (item_code=%(item_code)s {item_group_condition} or brand=%(brand)s)
-			and docstatus < 2 and ifnull(disable, 0) = 0
-			and ifnull({transaction_type}, 0) = 1 {conditions}
+			and docstatus < 2 and disable = 0
+			and {transaction_type} = 1 {conditions}
 		order by priority desc, name desc""".format(
 			item_group_condition=item_group_condition,
 			transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index db49a4d..6eb29fa 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -24,7 +24,7 @@
 
 		if(!doc.is_return) {
 			if(doc.docstatus==1) {
-				if(doc.outstanding_amount > 0) {
+				if(doc.outstanding_amount != 0) {
 					this.frm.add_custom_button(__('Payment'), this.make_bank_entry).addClass("btn-primary");
 				}
 				cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note);

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 5e01151..3ed1939 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

@@ -20,10 +20,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,13 +43,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "PINV-\nPINV-RET-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -66,12 +70,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier", 
    "oldfieldtype": "Link", 
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -91,11 +97,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier_name", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -114,9 +122,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,9 +145,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -156,9 +168,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -177,9 +191,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -197,10 +213,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -221,11 +239,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -245,11 +265,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Invoice No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -268,11 +290,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Invoice Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -291,12 +315,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Link", 
    "options": "Purchase Invoice", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -315,12 +341,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -339,10 +367,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Return", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -362,11 +392,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Return Against Purchase Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase Invoice", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -385,10 +417,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -407,12 +441,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -432,12 +468,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -455,9 +493,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -476,10 +516,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -498,10 +540,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -520,10 +564,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -542,9 +588,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -563,11 +611,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -586,12 +636,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "entries", 
    "oldfieldtype": "Table", 
    "options": "Purchase Invoice Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,9 +661,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -630,11 +684,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -654,12 +710,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -677,9 +735,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -698,11 +758,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -721,12 +783,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -745,11 +809,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -768,12 +834,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_other_charges", 
    "oldfieldtype": "Link", 
    "options": "Purchase Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -792,12 +860,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_tax_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -816,10 +886,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -838,11 +910,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -861,12 +935,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -885,12 +961,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -909,12 +987,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_tax", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -932,10 +1012,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -954,12 +1036,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -978,12 +1062,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1002,11 +1088,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1026,10 +1114,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1048,12 +1138,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1071,10 +1163,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1093,11 +1187,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1116,11 +1212,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1138,10 +1236,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1160,12 +1260,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1185,11 +1287,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1207,10 +1311,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1230,12 +1336,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1254,11 +1362,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1277,12 +1387,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Advance", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_advance", 
    "oldfieldtype": "Currency", 
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1301,12 +1413,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Outstanding Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "outstanding_amount", 
    "oldfieldtype": "Currency", 
    "options": "party_account_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1327,10 +1441,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1349,10 +1465,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1371,11 +1489,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1393,10 +1513,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1416,10 +1538,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1439,10 +1563,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Cost Center", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1462,11 +1588,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advance Payments", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1485,11 +1613,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Advances Paid", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "get_advances", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1508,12 +1638,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advances", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "advance_allocation_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Invoice Advance", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1533,10 +1665,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1555,10 +1689,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1577,9 +1713,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions1", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1599,10 +1737,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1621,10 +1761,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1642,9 +1784,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1664,10 +1808,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1686,10 +1832,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1708,11 +1856,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1731,12 +1881,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1755,11 +1907,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1779,12 +1933,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Credit To", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit_to", 
    "oldfieldtype": "Link", 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1803,11 +1959,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Account Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1827,13 +1985,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Is Opening",  
+   "label": "Is Opening", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_opening", 
    "oldfieldtype": "Select", 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1852,11 +2012,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Due Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "due_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1875,11 +2037,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Expense Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "against_expense_account", 
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1897,9 +2061,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1918,12 +2084,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mode of Payment", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "mode_of_payment", 
    "oldfieldtype": "Select", 
    "options": "Mode of Payment", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1942,12 +2110,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1966,11 +2136,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1991,10 +2163,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-time", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2015,9 +2189,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Recurring", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2037,11 +2213,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Recurring Type",  
+   "label": "Recurring Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2062,9 +2240,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2085,9 +2265,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2108,9 +2290,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Repeat on Day of Month", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2131,9 +2315,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2151,9 +2337,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2175,9 +2363,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2198,9 +2388,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Id", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2221,9 +2413,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notification Email Address", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2243,11 +2437,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Print Format", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Format", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2265,7 +2461,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-12 16:23:32.141069", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-01 00:49:02.736868", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 91b01d5..d916b61 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -106,7 +106,7 @@
 	def check_for_stopped_or_closed_status(self):
 		check_list = []
 		pc_obj = frappe.get_doc('Purchase Common')
-		
+
 		for d in self.get('items'):
 			if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt:
 				check_list.append(d.purchase_order)
@@ -150,10 +150,14 @@
 		against_accounts = []
 		stock_items = self.get_stock_items()
 		for item in self.get("items"):
+			# in case of auto inventory accounting, 
+			# against expense account is always "Stock Received But Not Billed"
+			# for a stock item and if not epening entry and not drop-ship entry
+			
 			if auto_accounting_for_stock and item.item_code in stock_items \
-					and self.is_opening == 'No':
-				# in case of auto inventory accounting, against expense account is always
-				# Stock Received But Not Billed for a stock item
+				and self.is_opening == 'No' and (not item.po_detail or 
+					not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")):
+				
 				item.expense_account = stock_not_billed_account
 				item.cost_center = None
 
@@ -176,9 +180,10 @@
 					 throw(_("Purchse Order number required for Item {0}").format(d.item_code))
 
 	def pr_required(self):
+		stock_items = self.get_stock_items()
 		if frappe.db.get_value("Buying Settings", None, "pr_required") == 'Yes':
 			 for d in self.get('items'):
-				 if not d.purchase_receipt:
+				 if not d.purchase_receipt and d.item_code in stock_items:
 					 throw(_("Purchase Receipt number required for Item {0}").format(d.item_code))
 
 	def validate_write_off_account(self):
@@ -395,7 +400,7 @@
 
 	def on_cancel(self):
 		self.check_for_stopped_or_closed_status()
-		
+
 		if not self.is_return:
 			from erpnext.accounts.utils import remove_against_link_from_jv
 			remove_against_link_from_jv(self.doctype, self.name)
@@ -438,10 +443,10 @@
 					or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary"))
 				and tabAccount.is_group=0
 				and tabAccount.docstatus!=2
-				and tabAccount.company = '%(company)s'
-				and tabAccount.%(key)s LIKE '%(txt)s'
-				%(mcond)s""" % {'company': filters['company'], 'key': searchfield,
-			'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype)})
+				and tabAccount.company = %(company)s
+				and tabAccount.{key} LIKE %(txt)s
+				{mcond}""".format( key=frappe.db.escape(searchfield), mcond=get_match_cond(doctype) ),
+				{ 'company': filters['company'], 'txt': "%%%s%%" % frappe.db.escape(txt) })
 
 @frappe.whitelist()
 def make_debit_note(source_name, target_doc=None):

diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 10e20af..d2de964 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -221,7 +221,7 @@
 		test_recurring_document(self, test_records)
 
 	def test_total_purchase_cost_for_project(self):
-		existing_purchase_cost = frappe.db.sql("""select sum(ifnull(base_net_amount, 0))
+		existing_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
 			from `tabPurchase Invoice Item` where project_name = '_Test Project' and docstatus=1""")
 		existing_purchase_cost = existing_purchase_cost and existing_purchase_cost[0][0] or 0
 

diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 024948d..34156f5 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Journal Entry", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "journal_voucher", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Journal Entry Detail No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "jv_detail_no", 
    "oldfieldtype": "Date", 
@@ -69,6 +71,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Small Text", 
@@ -93,6 +96,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -114,6 +118,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Advance Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "advance_amount", 
    "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "allocated_amount", 
    "oldfieldtype": "Currency", 
@@ -164,7 +170,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:03.538046", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:53.288895", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Advance", 

diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 9b8fee4..b856d89 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -86,6 +89,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -133,6 +138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -155,6 +161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -178,6 +185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -199,6 +207,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -221,6 +230,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -242,6 +252,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -264,6 +275,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -284,6 +296,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -305,6 +318,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -328,6 +342,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -348,6 +363,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -369,6 +385,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -390,6 +407,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -411,6 +429,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate ", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_rate", 
    "oldfieldtype": "Currency", 
@@ -435,6 +454,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_amount", 
    "oldfieldtype": "Currency", 
@@ -458,6 +478,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -479,6 +500,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -503,6 +525,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -527,6 +550,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -548,6 +572,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -570,6 +595,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -593,6 +619,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -615,6 +642,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -637,6 +665,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -660,6 +689,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -683,6 +713,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -704,6 +735,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expense_head", 
    "oldfieldtype": "Link", 
@@ -729,6 +761,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -750,6 +783,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
@@ -773,6 +807,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
@@ -799,6 +834,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -820,6 +856,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Data", 
@@ -844,6 +881,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -869,6 +907,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -892,6 +931,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -916,6 +956,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Order", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_order", 
    "oldfieldtype": "Link", 
@@ -939,6 +980,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -960,6 +1002,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Order Item", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "po_detail", 
    "oldfieldtype": "Data", 
@@ -983,6 +1026,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Receipt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_receipt", 
    "oldfieldtype": "Link", 
@@ -1007,6 +1051,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1028,6 +1073,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "PR Detail", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "pr_detail", 
    "oldfieldtype": "Data", 
@@ -1051,6 +1097,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1073,6 +1120,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Materials Supplied Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1093,7 +1141,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:52.304768", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:53.343792", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 

diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 0d52f40..2ce1ef7 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json

@@ -19,7 +19,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Consider Tax or Charge for",  
+   "label": "Consider Tax or Charge for", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "category", 
    "oldfieldtype": "Select", 
@@ -44,7 +45,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Add or Deduct",  
+   "label": "Add or Deduct", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "add_deduct_tax", 
    "oldfieldtype": "Select", 
@@ -68,7 +70,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge_type", 
    "oldfieldtype": "Select", 
@@ -94,6 +97,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference Row #", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "row_id", 
    "oldfieldtype": "Data", 
@@ -118,6 +122,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is this Tax included in Basic Rate?", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -139,6 +144,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -160,6 +166,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account_head", 
    "oldfieldtype": "Link", 
@@ -185,6 +192,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
@@ -209,6 +217,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -233,6 +242,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -255,6 +265,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -277,6 +288,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -299,6 +311,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tax_amount", 
    "oldfieldtype": "Currency", 
@@ -323,6 +336,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -346,6 +360,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total", 
    "oldfieldtype": "Currency", 
@@ -369,6 +384,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -391,6 +407,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -414,6 +431,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -437,6 +455,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -460,6 +479,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Wise Tax Detail ", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_wise_tax_detail", 
    "oldfieldtype": "Small Text", 
@@ -483,6 +503,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Parenttype", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parenttype", 
    "oldfieldtype": "Data", 
@@ -504,7 +525,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:06.372275", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.644704", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges", 

diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 6378a50..84e903c 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json

@@ -21,6 +21,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "title", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -109,6 +113,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -131,6 +136,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -153,6 +159,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_tax_details", 
    "oldfieldtype": "Table", 
@@ -176,7 +183,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:06.563868", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.729312", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Taxes and Charges Template", 

diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index e81eec9..18faae7 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py

@@ -48,8 +48,9 @@
 		ON
 			(item_det.item_code=i.name or item_det.item_code=i.variant_of)
 		where
-			ifnull(i.has_variants, 0) = 0 and
+			i.has_variants = 0 and
 			{condition}
 		order by
 			{order_by}
-			i.name""".format(condition=condition, order_by=order_by), args, as_dict=1)
+			i.name
+		limit 24""".format(condition=condition, order_by=order_by), args, as_dict=1)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index a6a47d5..6705979 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -115,6 +119,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -138,6 +143,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -222,6 +231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is POS", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_pos", 
    "oldfieldtype": "Check", 
@@ -246,6 +256,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Return", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -267,6 +278,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -290,6 +302,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -313,6 +326,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Payment Due Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "due_date", 
    "oldfieldtype": "Date", 
@@ -336,6 +350,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -360,6 +375,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Link", 
@@ -385,6 +401,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Return Against Sales Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -408,6 +425,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Shipping Address Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -431,6 +449,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -453,6 +472,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -475,6 +495,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
@@ -500,6 +521,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
@@ -523,6 +545,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -545,6 +568,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -569,6 +593,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -592,6 +617,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
@@ -614,6 +640,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
@@ -635,6 +662,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -658,6 +686,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Stock", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "update_stock", 
    "oldfieldtype": "Check", 
@@ -681,6 +710,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "entries", 
    "oldfieldtype": "Table", 
@@ -705,6 +735,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packing List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-suitcase", 
    "permlevel": 0, 
@@ -727,6 +758,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packed Items", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Packed Item", 
    "permlevel": 0, 
@@ -749,6 +781,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Product Bundle Help", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -769,6 +802,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -790,6 +824,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -813,6 +848,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
@@ -836,6 +872,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -857,6 +894,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -880,6 +918,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -902,6 +941,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -925,6 +965,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge", 
    "oldfieldtype": "Link", 
@@ -948,6 +989,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -969,6 +1011,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "Shipping Rule", 
@@ -991,6 +1034,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1012,6 +1056,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges", 
    "oldfieldtype": "Table", 
@@ -1036,6 +1081,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
@@ -1057,6 +1103,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1078,6 +1125,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_total", 
    "oldfieldtype": "Currency", 
@@ -1101,6 +1149,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1123,6 +1172,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1146,6 +1196,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1169,6 +1220,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1191,6 +1243,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1212,6 +1265,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1234,6 +1288,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1257,6 +1312,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -1280,6 +1336,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
@@ -1304,6 +1361,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
@@ -1329,6 +1387,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
@@ -1351,6 +1410,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1374,6 +1434,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_export", 
    "oldfieldtype": "Currency", 
@@ -1398,6 +1459,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total_export", 
    "oldfieldtype": "Currency", 
@@ -1422,6 +1484,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
@@ -1445,6 +1508,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Advance", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_advance", 
    "oldfieldtype": "Currency", 
@@ -1469,6 +1533,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Outstanding Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "outstanding_amount", 
    "oldfieldtype": "Currency", 
@@ -1494,6 +1559,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advance Payments", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -1517,6 +1583,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Advances Received", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "get_advances", 
@@ -1540,6 +1607,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advances", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "advance_adjustment_details", 
    "oldfieldtype": "Table", 
@@ -1566,6 +1634,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payments", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-money", 
    "permlevel": 0, 
@@ -1588,6 +1657,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mode of Payment", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "mode_of_payment", 
    "oldfieldtype": "Select", 
@@ -1613,6 +1683,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cash/Bank Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cash_bank_account", 
    "oldfieldtype": "Link", 
@@ -1637,6 +1708,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1660,6 +1732,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Paid Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "paid_amount", 
    "oldfieldtype": "Currency", 
@@ -1684,6 +1757,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Paid Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1709,6 +1783,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1732,6 +1807,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1754,6 +1830,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1778,6 +1855,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Outstanding Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1799,6 +1877,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1822,6 +1901,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -1845,6 +1925,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Write Off Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -1868,6 +1949,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "", 
@@ -1891,6 +1973,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
@@ -1915,6 +1998,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
@@ -1938,6 +2022,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1960,6 +2045,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
@@ -1983,6 +2069,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -2005,6 +2092,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
@@ -2030,6 +2118,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -2052,6 +2141,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -2077,6 +2167,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -2100,6 +2191,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -2121,6 +2213,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2143,6 +2236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -2165,6 +2259,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -2188,6 +2283,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
@@ -2212,6 +2308,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -2236,6 +2333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -2260,6 +2358,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Debit To", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "debit_to", 
    "oldfieldtype": "Link", 
@@ -2284,6 +2383,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Party Account Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -2309,6 +2409,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Is Opening Entry", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_opening", 
    "oldfieldtype": "Select", 
@@ -2333,6 +2434,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "C-Form Applicable", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "No\nYes", 
    "permlevel": 0, 
@@ -2355,6 +2457,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "C-Form No", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "C-Form", 
    "permlevel": 0, 
@@ -2376,6 +2479,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -2398,6 +2502,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_time", 
    "oldfieldtype": "Time", 
@@ -2421,6 +2526,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -2445,6 +2551,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Text", 
@@ -2469,6 +2576,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-group", 
@@ -2492,6 +2600,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_partner", 
    "oldfieldtype": "Link", 
@@ -2515,6 +2624,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -2538,6 +2648,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "commission_rate", 
    "oldfieldtype": "Currency", 
@@ -2561,6 +2672,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_commission", 
    "oldfieldtype": "Currency", 
@@ -2586,6 +2698,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2607,6 +2720,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team1", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_team", 
    "oldfieldtype": "Table", 
@@ -2633,6 +2747,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-time", 
    "permlevel": 0, 
@@ -2654,6 +2769,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2678,6 +2794,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Recurring", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2701,6 +2818,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
@@ -2725,6 +2843,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2748,6 +2867,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2771,6 +2891,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Repeat on Day of Month", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2794,6 +2915,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2814,6 +2936,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2838,6 +2961,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2861,6 +2985,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Id", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2884,6 +3009,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notification Email Address", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2906,6 +3032,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Print Format", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Format", 
    "permlevel": 0, 
@@ -2929,6 +3056,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Income Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "against_income_account", 
    "oldfieldtype": "Small Text", 
@@ -2951,7 +3079,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-26 12:12:40.616546", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.906783", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 6abf1ba..7ad50d5 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -64,6 +64,7 @@
 			self.validate_pos()
 
 		if cint(self.update_stock):
+			self.validate_dropship_item()
 			self.validate_item_code()
 			self.validate_warehouse()
 			self.update_current_stock()
@@ -155,7 +156,7 @@
 				'second_join_field': 'so_detail',
 				'overflow_type': 'delivery',
 				'extra_cond': """ and exists(select name from `tabSales Invoice`
-					where name=`tabSales Invoice Item`.parent and ifnull(update_stock, 0) = 1)"""
+					where name=`tabSales Invoice Item`.parent and update_stock = 1)"""
 			},
 			{
 				'source_dt': 'Sales Invoice Item',
@@ -359,8 +360,8 @@
 		"""check for does customer belong to same project as entered.."""
 		if self.project_name and self.customer:
 			res = frappe.db.sql("""select name from `tabProject`
-				where name = %s and (customer = %s or
-					ifnull(customer,'')='')""", (self.project_name, self.customer))
+				where name = %s and (customer = %s or customer is null or customer = '')""",
+				(self.project_name, self.customer))
 			if not res:
 				throw(_("Customer {0} does not belong to project {1}").format(self.customer,self.project_name))
 
@@ -379,6 +380,8 @@
 				msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)
 
 	def validate_warehouse(self):
+		super(SalesInvoice, self).validate_warehouse()
+		
 		for d in self.get('items'):
 			if not d.warehouse:
 				frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
@@ -407,6 +410,12 @@
 		if self.c_form_applicable == 'Yes' and self.c_form_no:
 			msgprint(_("Please remove this Invoice {0} from C-Form {1}")
 				.format(self.name, self.c_form_no), raise_exception = 1)
+	
+	def validate_dropship_item(self):
+		for item in self.items:
+			if item.sales_order:
+				if frappe.db.get_value("Sales Order Item", item.so_detail, "delivered_by_supplier"):
+					frappe.throw(_("Could not update stock, invoice contains drop shipping item."))
 
 	def update_current_stock(self):
 		for d in self.get('items'):
@@ -434,7 +443,7 @@
 
 		if not warehouse:
 			global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
-				where ifnull(user,'') = '' and company = %s""", self.company)
+				where (user is null or user = '') and company = %s""", self.company)
 
 			if global_pos_profile:
 				warehouse = global_pos_profile[0][1]

diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index 442dadd..b1fae8e 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Journal Entry", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "journal_voucher", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Small Text", 
@@ -69,6 +71,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Journal Entry Detail No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "jv_detail_no", 
    "oldfieldtype": "Data", 
@@ -93,6 +96,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -114,6 +118,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Advance amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "advance_amount", 
    "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allocated amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "allocated_amount", 
    "oldfieldtype": "Currency", 
@@ -164,7 +170,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:09.979547", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.263776", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Advance", 

diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 0dcf9f5..51e2ebc 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -40,6 +41,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -63,6 +65,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -107,6 +111,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -128,6 +133,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Edit Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -150,6 +156,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -174,6 +181,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -196,6 +204,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -219,6 +228,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -241,6 +251,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -262,6 +273,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -285,6 +297,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ref_rate", 
    "oldfieldtype": "Currency", 
@@ -310,6 +323,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "adj_rate", 
    "oldfieldtype": "Float", 
@@ -332,6 +346,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -353,6 +368,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -375,6 +391,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "base_ref_rate", 
    "oldfieldtype": "Currency", 
@@ -398,6 +415,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -419,6 +437,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_rate", 
    "oldfieldtype": "Currency", 
@@ -443,6 +462,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_amount", 
    "oldfieldtype": "Currency", 
@@ -466,6 +486,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -487,6 +508,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "basic_rate", 
    "oldfieldtype": "Currency", 
@@ -511,6 +533,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -535,6 +558,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -556,6 +580,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -578,6 +603,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -601,6 +627,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -623,6 +650,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -645,6 +673,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -668,6 +697,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -692,6 +722,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Drop Ship", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -714,6 +745,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivered By Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -736,6 +768,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -757,6 +790,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Income Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "income_account", 
    "oldfieldtype": "Link", 
@@ -783,6 +817,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Expense Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -805,6 +840,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -827,6 +863,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
@@ -854,6 +891,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -875,6 +913,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -899,6 +938,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -922,6 +962,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Small Text", 
@@ -945,6 +986,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Batch", 
    "permlevel": 0, 
@@ -968,6 +1010,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -992,6 +1035,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Brand Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Data", 
@@ -1015,6 +1059,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -1037,6 +1082,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1058,6 +1104,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Batch Qty at Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -1082,6 +1129,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Qty at Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -1105,6 +1153,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "References", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1127,6 +1176,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Time Log Batch", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Time Log Batch", 
    "permlevel": 0, 
@@ -1149,6 +1199,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "sales_order", 
    "oldfieldtype": "Link", 
@@ -1173,6 +1224,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Order Item", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "so_detail", 
    "oldfieldtype": "Data", 
@@ -1195,6 +1247,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1217,6 +1270,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Note", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "delivery_note", 
    "oldfieldtype": "Link", 
@@ -1241,6 +1295,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Note Item", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "dn_detail", 
    "oldfieldtype": "Data", 
@@ -1264,6 +1319,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivered Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "delivered_qty", 
    "oldfieldtype": "Currency", 
@@ -1286,6 +1342,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1308,6 +1365,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1327,7 +1385,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-11-02 15:14:02.306067", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.335017", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 

diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
index cb67a70..fe7f615 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json

@@ -18,7 +18,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge_type", 
    "oldfieldtype": "Select", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference Row #", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "row_id", 
    "oldfieldtype": "Data", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Account Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "account_head", 
    "oldfieldtype": "Link", 
@@ -92,6 +95,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center_other_charges", 
    "oldfieldtype": "Link", 
@@ -115,6 +119,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -137,6 +142,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -163,6 +169,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is this Tax included in Basic Rate?", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -185,6 +192,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -207,6 +215,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -229,6 +238,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -251,6 +261,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -274,6 +285,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -297,6 +309,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax Amount After Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -319,6 +332,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -341,6 +355,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tax_amount", 
    "oldfieldtype": "Currency", 
@@ -365,6 +380,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total", 
    "oldfieldtype": "Currency", 
@@ -390,6 +406,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax Amount After Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -412,6 +429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Wise Tax Detail", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_wise_tax_detail", 
    "oldfieldtype": "Small Text", 
@@ -435,6 +453,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Parenttype", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parenttype", 
    "oldfieldtype": "Data", 
@@ -456,7 +475,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:11.977789", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.263576", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges", 

diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index ddaca27..04cc330 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json

@@ -21,6 +21,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "title", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -86,6 +89,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -107,6 +111,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -130,6 +135,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -152,6 +158,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges", 
    "oldfieldtype": "Table", 
@@ -175,7 +182,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:12.157257", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.346680", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Taxes and Charges Template", 

diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
index 886400e..a61ad11 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py

@@ -16,7 +16,7 @@
 
 	if doc.is_default == 1:
 		frappe.db.sql("""update `tab{0}` set is_default = 0
-			where ifnull(is_default,0) = 1 and name != %s and company = %s""".format(doc.doctype),
+			where is_default = 1 and name != %s and company = %s""".format(doc.doctype),
 			(doc.name, doc.company))
 
 	for tax in doc.get("taxes"):

diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index e692322..7816dd5 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Shipping Rule Label", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -64,7 +66,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Calculate Based On",  
+   "label": "Calculate Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Net Total\nNet Weight", 
    "permlevel": 0, 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Shipping Rule Condition", 
    "permlevel": 0, 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid for Countries", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -153,6 +159,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Worldwide Shipping", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -176,6 +183,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid for Countries", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Shipping Rule Country", 
    "permlevel": 0, 
@@ -199,6 +207,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -220,6 +229,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -241,6 +251,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -262,6 +273,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -284,6 +296,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -305,7 +318,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:12.778062", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.633071", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule", 

diff --git a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
index ae22bef..f653b10 100644
--- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Value", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -40,6 +41,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Value", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -61,6 +63,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Shipping Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -81,7 +84,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:12.974539", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.700694", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule Condition", 

diff --git a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
index f89408d..3d0c36c 100644
--- a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
+++ b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -39,7 +40,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:13.035775", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.731755", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Shipping Rule Country", 

diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.js b/erpnext/accounts/doctype/tax_rule/tax_rule.js
index 4b059dc..4c35370 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.js
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.js

@@ -4,19 +4,26 @@
 cur_frm.add_fetch("customer", "customer_group", "customer_group" );
 cur_frm.add_fetch("supplier", "supplier_type", "supplier_type" );
 
-cur_frm.toggle_reqd("sales_tax_template", cur_frm.doc.tax_type=="Sales");
-cur_frm.toggle_reqd("purchase_tax_template", cur_frm.doc.tax_type=="Purchase");
-
+frappe.ui.form.on("Tax Rule", "tax_type", function(frm) {
+	frm.toggle_reqd("sales_tax_template", frm.doc.tax_type=="Sales");
+	frm.toggle_reqd("purchase_tax_template", frm.doc.tax_type=="Purchase");
+})
 
 frappe.ui.form.on("Tax Rule", "onload", function(frm) {
-	if(frm.doc.__islocal){
+	if(frm.doc.__islocal) {
 		frm.set_value("use_for_shopping_cart", 1);
 	}
 })
 
+frappe.ui.form.on("Tax Rule", "refresh", function(frm) {
+	frappe.ui.form.trigger("Tax Rule", "tax_type");
+})
+
 frappe.ui.form.on("Tax Rule", "use_for_shopping_cart", function(frm) {
-	if(!frm.doc.use_for_shopping_cart && (frappe.get_list("Tax Rule", {"use_for_shopping_cart":1}).length == 0)){
-		frappe.model.get_value("Shopping Cart Settings", "Shopping Cart Settings", "enabled", function(docfield) {
+	if(!frm.doc.use_for_shopping_cart && 
+			(frappe.get_list("Tax Rule", {"use_for_shopping_cart":1}).length == 0)) {
+		frappe.model.get_value("Shopping Cart Settings", "Shopping Cart Settings", 
+				"enabled", function(docfield) {
 			if(docfield.enabled){
 				frm.set_value("use_for_shopping_cart", 1);
 				frappe.throw(__("Shopping Cart is enabled"));

diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index 7340278..38e6805 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json

@@ -20,7 +20,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Tax Type",  
+   "label": "Tax Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales\nPurchase", 
    "permlevel": 0, 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Use for Shopping Cart", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Tax Template", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Taxes and Charges Template", 
    "permlevel": 0, 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Tax Template", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase Taxes and Charges Template", 
    "permlevel": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Filters", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
@@ -182,6 +189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing City", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing State", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -249,6 +259,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -271,6 +282,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -294,6 +306,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -318,6 +331,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier Type", 
    "permlevel": 0, 
@@ -341,6 +355,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping City", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -363,6 +378,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping State", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -385,6 +401,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -408,6 +425,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Validity", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -430,6 +448,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -451,6 +470,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -473,6 +493,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -494,6 +515,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -517,6 +539,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Priority", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -538,6 +561,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -560,6 +584,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -580,7 +605,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:16.298546", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.201327", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 

diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index ed2a049..49a7bd0 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py

@@ -27,25 +27,25 @@
 		gl_map = merge_similar_entries(gl_map)
 
 	for entry in gl_map:
-		# toggle debit, credit if negative entry		
+		# toggle debit, credit if negative entry
 		if flt(entry.debit) < 0:
 			entry.credit = flt(entry.credit) - flt(entry.debit)
 			entry.debit = 0.0
-			
+
 		if flt(entry.debit_in_account_currency) < 0:
 			entry.credit_in_account_currency = \
 				flt(entry.credit_in_account_currency) - flt(entry.debit_in_account_currency)
 			entry.debit_in_account_currency = 0.0
-		
+
 		if flt(entry.credit) < 0:
 			entry.debit = flt(entry.debit) - flt(entry.credit)
 			entry.credit = 0.0
-			
+
 		if flt(entry.credit_in_account_currency) < 0:
 			entry.debit_in_account_currency = \
 				flt(entry.debit_in_account_currency) - flt(entry.credit_in_account_currency)
 			entry.credit_in_account_currency = 0.0
-			
+
 	return gl_map
 
 def merge_similar_entries(gl_map):
@@ -81,7 +81,7 @@
 def save_entries(gl_map, adv_adj, update_outstanding):
 	validate_account_for_auto_accounting_for_stock(gl_map)
 	round_off_debit_credit(gl_map)
-	
+
 	for entry in gl_map:
 		make_entry(entry, adv_adj, update_outstanding)
 		# check against budget
@@ -99,7 +99,7 @@
 	if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \
 		and gl_map[0].voucher_type=="Journal Entry":
 			aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
-				where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")]
+				where account_type = 'Warehouse' and (warehouse != '' and warehouse is not null)""")]
 
 			for entry in gl_map:
 				if entry.account in aii_accounts:
@@ -109,36 +109,36 @@
 def round_off_debit_credit(gl_map):
 	precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
 		currency=frappe.db.get_value("Company", gl_map[0].company, "default_currency", cache=True))
-	
+
 	debit_credit_diff = 0.0
 	for entry in gl_map:
 		entry.debit = flt(entry.debit, precision)
 		entry.credit = flt(entry.credit, precision)
 		debit_credit_diff += entry.debit - entry.credit
-	
+
 	debit_credit_diff = flt(debit_credit_diff, precision)
 	if abs(debit_credit_diff) >= (5.0 / (10**precision)):
 		frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
 			.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
-		
+
 	elif abs(debit_credit_diff) >= (1.0 / (10**precision)):
 		make_round_off_gle(gl_map, debit_credit_diff)
-		
+
 def make_round_off_gle(gl_map, debit_credit_diff):
-	round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company, 
+	round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company,
 		["round_off_account", "round_off_cost_center"]) or [None, None]
 	if not round_off_account:
 		frappe.throw(_("Please mention Round Off Account in Company"))
-		
+
 	if not round_off_cost_center:
 		frappe.throw(_("Please mention Round Off Cost Center in Company"))
-		
-	
+
+
 	round_off_gle = frappe._dict()
-	for k in ["voucher_type", "voucher_no", "company", 
+	for k in ["voucher_type", "voucher_no", "company",
 		"posting_date", "remarks", "fiscal_year", "is_opening"]:
 			round_off_gle[k] = gl_map[0][k]
-	
+
 	round_off_gle.update({
 		"account": round_off_account,
 		"debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
@@ -149,7 +149,7 @@
 		"against_voucher_type": None,
 		"against_voucher": None
 	})
-	
+
 	gl_map.append(round_off_gle)
 
 

diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index b172ae0..403c1ce 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js

@@ -117,7 +117,7 @@
 					}
 				},
 				{
-					condition: function(node) { return !node.root && node.expandable; },
+					condition: function(node) { return node.expandable; },
 					label: __("Add Child"),
 					click: function() {
 						me.make_new()
@@ -166,7 +166,10 @@
 				var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr";
 				if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) {
 					$('<span class="balance-area pull-right text-muted small">'
-						+ format_currency(Math.abs(node.data.balance), node.data.account_currency)
+						+ (node.data.balance_in_account_currency ? 
+							(format_currency(Math.abs(node.data.balance_in_account_currency), 
+								node.data.account_currency) + " / ") : "")
+						+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
 						+ " " + dr_or_cr
 						+ '</span>').insertBefore(node.$ul);
 				}
@@ -208,6 +211,9 @@
 					description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
 				{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
 					description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
+				{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
+					options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+				},
 				{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
 					options: ['', 'Bank', 'Cash', 'Warehouse', 'Tax', 'Chargeable'].join('\n'),
 					description: __("Optional. This setting will be used to filter in various transactions.") },
@@ -237,6 +243,9 @@
 			$(fd.tax_rate.wrapper).toggle(fd.account_type.get_value()==='Tax');
 			$(fd.warehouse.wrapper).toggle(fd.account_type.get_value()==='Warehouse');
 		})
+		
+		// root type if root
+		$(fd.root_type.wrapper).toggle(node.root);
 
 		// create
 		d.set_primary_action(__("Create New"), function() {
@@ -252,6 +261,14 @@
 			var node = me.tree.get_selected_node();
 			v.parent_account = node.label;
 			v.company = me.company;
+			
+			if(node.root) {
+				v.is_root = true;
+				v.parent_account = null;
+			} else {
+				v.is_root = false;
+				v.root_type = null;
+			}
 
 			return frappe.call({
 				args: v,

diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.py b/erpnext/accounts/page/accounts_browser/accounts_browser.py
index 80101ce..891a05d 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.py
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.py

@@ -25,9 +25,9 @@
 		acc = frappe.db.sql(""" select
 			name as value, is_group as expandable %s
 			from `tab%s`
-			where ifnull(parent_%s,'') = ''
+			where ifnull(`parent_%s`,'') = ''
 			and `company` = %s	and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
 				company, as_dict=1)
 
 		if args["parent"]=="Accounts":
@@ -38,13 +38,18 @@
 		acc = frappe.db.sql("""select
 			name as value, is_group as expandable %s
 	 		from `tab%s`
-			where ifnull(parent_%s,'') = %s
+			where ifnull(`parent_%s`,'') = %s
 			and docstatus<2
-			order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'),
+			order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
 				args['parent'], as_dict=1)
 
 	if ctype == 'Account':
+		company_currency = frappe.db.get_value("Company", company, "default_currency")
 		for each in acc:
-			each["balance"] = flt(get_balance_on(each.get("value")))
+			each["company_currency"] = company_currency
+			each["balance"] = flt(get_balance_on(each.get("value"), in_account_currency=False))
+			
+			if each.account_currency != company_currency:
+				each["balance_in_account_currency"] = flt(get_balance_on(each.get("value")))
 
 	return acc

diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 2f0c0e5..d1e2cdc 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py

@@ -35,7 +35,7 @@
 	party = out[party_type.lower()]
 
 	if not ignore_permissions and not frappe.has_permission(party_type, "read", party):
-		frappe.throw(_("Not permitted"), frappe.PermissionError)
+		frappe.throw(_("Not permitted for {0}").format(party), frappe.PermissionError)
 
 	party = frappe.get_doc(party_type, party)
 

diff --git a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html
new file mode 100644
index 0000000..a4f8fa6
--- /dev/null
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html

@@ -0,0 +1,30 @@
+{%- from "templates/print_formats/standard_macros.html" import add_header -%}
+<div class="page-break">
+    {%- if not doc.get("print_heading") and not doc.get("select_print_heading")
+        and doc.set("select_print_heading", _("Payment Receipt Note")) -%}{%- endif -%}
+    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}
+
+    {%- for label, value in (
+        (_("Received On"), frappe.utils.formatdate(doc.voucher_date)),
+        (_("Received From"), doc.pay_to_recd_from),
+        (_("Amount"), "<strong>" + doc.get_formatted("total_amount") + "</strong><br>" + (doc.total_amount_in_words or "") + "<br>"),
+        (_("Remarks"), doc.remark)
+    ) -%}
+    <div class="row">
+        <div class="col-xs-3"><label class="text-right">{{ label }}</label></div>
+        <div class="col-xs-9">{{ value }}</div>
+    </div>
+
+    {%- endfor -%}
+
+    <hr>
+    <br>
+    <p class="strong">
+        {{ _("For") }} {{ doc.company }},<br>
+        <br>
+        <br>
+        <br>
+        {{ _("Authorized Signatory") }}
+    </p>
+</div>
+

diff --git a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
index 5445f66..f1de448 100755
--- a/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json
+++ b/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.json

@@ -1,15 +1,17 @@
 {
- "creation": "2012-05-01 12:46:31",
- "doc_type": "Journal Entry",
- "docstatus": 0,
- "doctype": "Print Format",
- "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Payment Receipt Note\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n    {%- for label, value in (\n        (_(\"Received On\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Received From\"), doc.pay_to_recd_from),\n        (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"Remarks\"), doc.remark)\n    ) -%}\n    <div class=\"row\">\n        <div class=\"col-xs-3\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-9\">{{ value }}</div>\n    </div>\n\n    {%- endfor -%}\n\n    <hr>\n    <br>\n    <p class=\"strong\">\n        {{ _(\"For\") }} {{ doc.company }},<br>\n        <br>\n        <br>\n        <br>\n        {{ _(\"Authorized Signatory\") }}\n    </p>\n</div>\n\n",
- "idx": 1,
- "modified": "2015-01-16 11:03:22.893209",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Payment Receipt Voucher",
- "owner": "Administrator",
- "print_format_type": "Server",
+ "creation": "2012-05-01 12:46:31", 
+ "custom_format": 0, 
+ "disabled": 0, 
+ "doc_type": "Journal Entry", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "html": "", 
+ "idx": 1, 
+ "modified": "2015-11-25 07:06:00.668141", 
+ "modified_by": "Administrator", 
+ "name": "Payment Receipt Voucher", 
+ "owner": "Administrator", 
+ "print_format_builder": 0, 
+ "print_format_type": "Server", 
  "standard": "Yes"
-}
+}
\ No newline at end of file

diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index e4ae2a4..3168514 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py

@@ -216,7 +216,7 @@
 			self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
 				voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0}
 				from `tabGL Entry`
-				where docstatus < 2 and party_type=%s and ifnull(party, '') != '' {1}
+				where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
 				order by posting_date, party"""
 				.format(select_fields, conditions), values, as_dict=True)
 

diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
index d749383..ee77085 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html

@@ -2,7 +2,7 @@
 	{%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __("Bank Reconciliation Statement") %}</h2>
-<h4 class="text-center">{%= filters.account && (filters.account + ", ")  || "" %} {%= filters.company %}</h4>
+<h4 class="text-center">{%= filters.account %}</h4>
 <hr>
 <table class="table table-bordered">
 	<thead>
@@ -16,31 +16,31 @@
 	</thead>
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
-			{% if (data[i][__("Posting Date")]) { %}
+			{% if (data[i]["posting_date"]) { %}
 			<tr>
-				<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
-					{% if (data[i][__("Reference")]) { %}
-						<br>{%= __("Reference") %}: {%= data[i][__("Reference")] %}
-						{% if (data[i][__("Ref Date")]) { %}
-							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i][__("Ref Date")]) %}
+				<td>{%= dateutil.str_to_user(data[i]["posting_date"]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td>{%= __("Against") %}: {%= data[i]["against_account"] %}
+					{% if (data[i]["reference"]) { %}
+						<br>{%= __("Reference") %}: {%= data[i]["reference"] %}
+						{% if (data[i]["ref_date"]) { %}
+							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i]["ref_date"]) %}
 						{% } %}
 					{% } %}
-					{% if (data[i][__("Clearance Date")]) { %}
-						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i][__("Clearance Date")]) %}
+					{% if (data[i]["clearance_date"]) { %}
+						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i]["clearance_date"]) %}
 					{% } %}
 				</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } else { %}
 			<tr>
 				<td></td>
 				<td></td>
-				<td>{%= data[i][__("Journal Entry")] %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
+				<td>{%= data[i]["journal_entry"] %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["debit"]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i]["credit"]) %}</td>
 			</tr>
 			{% } %}
 		{% } %}

diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 7016c46..6ff1eea 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py

@@ -12,19 +12,21 @@
 	columns = get_columns()
 
 	if not filters.get("account"): return columns, []
+	
+	account_currency = frappe.db.get_value("Account", filters.account, "account_currency")
 
 	data = get_entries(filters)
-
+	
 	from erpnext.accounts.utils import get_balance_on
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
 
 	total_debit, total_credit = 0,0
 	for d in data:
-		total_debit += flt(d[2])
-		total_credit += flt(d[3])
+		total_debit += flt(d.debit)
+		total_credit += flt(d.credit)
 
 	amounts_not_reflected_in_system = frappe.db.sql("""
-		select sum(ifnull(jvd.debit_in_account_currency, 0) - ifnull(jvd.credit_in_account_currency, 0))
+		select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)
 		from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1 and jvd.account=%s
 		and jv.posting_date > %s and jv.clearance_date <= %s and ifnull(jv.is_opening, 'No') = 'No'
@@ -37,39 +39,112 @@
 		+ amounts_not_reflected_in_system
 
 	data += [
-		get_balance_row(_("System Balance"), balance_as_per_system),
-		[""]*len(columns),
-		["", '"' + _("Amounts not reflected in bank") + '"', total_debit, total_credit, "", "", "", "", ""],
-		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system),
-		[""]*len(columns),
-		get_balance_row(_("Expected balance as per bank"), bank_bal)
+		get_balance_row(_("System Balance"), balance_as_per_system, account_currency),
+		{},
+		{
+			"journal_entry": '"' + _("Amounts not reflected in bank") + '"',
+			"debit": total_debit,
+			"credit": total_credit,
+			"account_currency": account_currency
+		},
+		get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system, 
+			account_currency),
+		{},
+		get_balance_row(_("Expected balance as per bank"), bank_bal, account_currency)
 	]
 
 	return columns, data
 
 def get_columns():
-	return [_("Posting Date") + ":Date:100", _("Journal Entry") + ":Link/Journal Entry:220",
-		_("Debit") + ":Currency:120", _("Credit") + ":Currency:120",
-		_("Against Account") + ":Link/Account:200", _("Reference") + "::100", 
-		_("Ref Date") + ":Date:110", _("Clearance Date") + ":Date:110", _("Currency") + ":Link/Currency:70"
+	return [
+		{
+			"fieldname": "posting_date",
+			"label": _("Posting Date"),
+			"fieldtype": "Date",
+			"width": 100
+		},
+		{
+			"fieldname": "journal_entry",
+			"label": _("Journal Entry"),
+			"fieldtype": "Link",
+			"options": "Journal Entry",
+			"width": 220
+		},
+		{
+			"fieldname": "debit",
+			"label": _("Debit"),
+			"fieldtype": "Currency",
+			"options": "account_currency",
+			"width": 120
+		},
+		{
+			"fieldname": "credit",
+			"label": _("Credit"),
+			"fieldtype": "Currency",
+			"options": "account_currency",
+			"width": 120
+		},
+		{
+			"fieldname": "against_account",
+			"label": _("Against Account"),
+			"fieldtype": "Link",
+			"options": "Account",
+			"width": 200
+		},
+		{
+			"fieldname": "reference",
+			"label": _("Reference"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "ref_date",
+			"label": _("Ref Date"),
+			"fieldtype": "Date",
+			"width": 110
+		},
+		{
+			"fieldname": "clearance_date",
+			"label": _("Clearance Date"),
+			"fieldtype": "Date",
+			"width": 110
+		},		
+		{
+			"fieldname": "account_currency",
+			"label": _("Currency"),
+			"fieldtype": "Link",
+			"options": "Currency",
+			"width": 100
+		}
 	]
 
 def get_entries(filters):
 	entries = frappe.db.sql("""select
-			jv.posting_date, jv.name, jvd.debit_in_account_currency, jvd.credit_in_account_currency,
-			jvd.against_account, jv.cheque_no, jv.cheque_date, jv.clearance_date, jvd.account_currency
+			jv.posting_date, jv.name as journal_entry, jvd.debit_in_account_currency as debit, 
+			jvd.credit_in_account_currency as credit, jvd.against_account, 
+			jv.cheque_no as reference, jv.cheque_date as ref_date, jv.clearance_date, jvd.account_currency
 		from
 			`tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		where jvd.parent = jv.name and jv.docstatus=1
 			and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
 			and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
 			and ifnull(jv.is_opening, 'No') = 'No'
-		order by jv.name DESC""", filters, as_list=1)
+		order by jv.name DESC""", filters, as_dict=1)
 
 	return entries
 
-def get_balance_row(label, amount):
+def get_balance_row(label, amount, account_currency):
 	if amount > 0:
-		return ["", '"' + label + '"', amount, 0, "", "", "", "", ""]
+		return {
+			"journal_entry": '"' + label + '"',
+			"debit": amount,
+			"credit": 0,
+			"account_currency": account_currency
+		}
 	else:
-		return ["", '"' + label + '"', 0, abs(amount), "", "", "", "", ""]
+		return {
+			"journal_entry": '"' + label + '"',
+			"debit": 0,
+			"credit": abs(amount),
+			"account_currency": account_currency
+		}
\ No newline at end of file

diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index be2e968..5cdf553 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py

@@ -80,8 +80,13 @@
 		return None
 
 	accounts, accounts_by_name = filter_accounts(accounts)
-	gl_entries_by_account = get_gl_entries(company, period_list[0]["from_date"], period_list[-1]["to_date"],
-		accounts[0].lft, accounts[0].rgt, ignore_closing_entries=ignore_closing_entries)
+
+	gl_entries_by_account = {}
+	for root in frappe.db.sql("""select lft, rgt from tabAccount
+			where root_type=%s and ifnull(parent_account, '') = ''""", root_type, as_dict=1):
+		set_gl_entries_by_account(company, period_list[0]["from_date"],
+			period_list[-1]["to_date"],root.lft, root.rgt, gl_entries_by_account,
+			ignore_closing_entries=ignore_closing_entries)
 
 	calculate_values(accounts_by_name, gl_entries_by_account, period_list)
 	accumulate_values_into_parents(accounts, accounts_by_name, period_list)
@@ -101,7 +106,6 @@
 				if entry.posting_date <= period.to_date:
 					d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
 
-
 def accumulate_values_into_parents(accounts, accounts_by_name, period_list):
 	"""accumulate children's values in parent accounts"""
 	for d in reversed(accounts):
@@ -143,15 +147,20 @@
 	return out
 
 def add_total_row(out, balance_must_be, period_list):
-	row = {
+	total_row = {
 		"account_name": "'" + _("Total ({0})").format(balance_must_be) + "'",
 		"account": None
 	}
-	for period in period_list:
-		row[period.key] = out[0].get(period.key, 0.0)
-		out[0][period.key] = ""
 
-	out.append(row)
+	for row in out:
+		if not row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+			row[period.key] = ""
+
+	out.append(total_row)
 
 	# blank row after Total
 	out.append({})
@@ -200,7 +209,8 @@
 
 	roots.sort(compare_roots)
 
-def get_gl_entries(company, from_date, to_date, root_lft, root_rgt, ignore_closing_entries=False):
+def set_gl_entries_by_account(company, from_date, to_date, root_lft, root_rgt, gl_entries_by_account,
+		ignore_closing_entries=False):
 	"""Returns a dict like { "account": [gl entries], ... }"""
 	additional_conditions = []
 
@@ -226,7 +236,6 @@
 		},
 		as_dict=True)
 
-	gl_entries_by_account = {}
 	for entry in gl_entries:
 		gl_entries_by_account.setdefault(entry.account, []).append(entry)
 

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 7bad361..e11fb0e 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py

@@ -102,15 +102,15 @@
 	return result
 
 def get_gl_entries(filters):
-	select_fields = """, sum(ifnull(debit_in_account_currency, 0)) as debit_in_account_currency,
-		sum(ifnull(credit_in_account_currency, 0)) as credit_in_account_currency""" \
+	select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
+		sum(credit_in_account_currency) as credit_in_account_currency""" \
 		if filters.get("show_in_account_currency") else ""
 
 	group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
 		if filters.get("group_by_voucher") else "group by name"
 
 	gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
-			sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit,
+			sum(debit) as debit, sum(credit) as credit,
 			voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields}
 		from `tabGL Entry`
 		where company=%(company)s {conditions}

diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 4afce91..8d9684c 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py

@@ -98,16 +98,17 @@
 
 			row.base_amount = flt(row.base_net_amount)
 
+			product_bundles = []
 			if row.update_stock:
 				product_bundles = self.product_bundles.get(row.parenttype, {}).get(row.parent, frappe._dict())
 			elif row.dn_detail:
 				product_bundles = self.product_bundles.get("Delivery Note", {})\
 					.get(row.delivery_note, frappe._dict())
 				row.item_row = row.dn_detail
-			
+
 			# get buying amount
 			if row.item_code in product_bundles:
-				row.buying_amount = self.get_buying_amount_from_product_bundle(row, 
+				row.buying_amount = self.get_buying_amount_from_product_bundle(row,
 					product_bundles[row.item_code])
 			else:
 				row.buying_amount = self.get_buying_amount(row, row.item_code)
@@ -184,7 +185,7 @@
 				parenttype, parent = row.parenttype, row.parent
 				if row.dn_detail:
 					parenttype, parent = "Delivery Note", row.delivery_note
-				
+
 				for i, sle in enumerate(my_sle):
 					# find the stock valution rate from stock ledger entry
 					if sle.voucher_type == parenttype and parent == sle.voucher_no and \
@@ -207,7 +208,7 @@
 			else:
 				self.average_buying_rate[item_code] = flt(frappe.db.sql("""select avg(valuation_rate)
 					from `tabStock Ledger Entry`
-					where item_code = %s and ifnull(qty_after_transaction,0) > 0""", item_code)[0][0])
+					where item_code = %s and qty_after_transaction > 0""", item_code)[0][0])
 
 		return self.average_buying_rate[item_code]
 

diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index bcb128b..122b239 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -88,7 +88,7 @@
 
 	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount
 		from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
-		and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
+		and docstatus = 1 and (account_head is not null and account_head != '') and category in ('Total', 'Valuation and Total')
 		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys()))
 
 	for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:

diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index 61b4227..b8afa9f 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -86,7 +86,7 @@
 	tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail,
 		charge_type, base_tax_amount_after_discount_amount
 		from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
-		and docstatus = 1 and ifnull(account_head, '') != ''
+		and docstatus = 1 and (account_head is not null and account_head != '')
 		and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)),
 		tuple(invoice_wise_items.keys()))
 

diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index 6f80029..cad1f19 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py

@@ -29,7 +29,7 @@
 		purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
 		project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
 
-		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, 
+		row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name,
 			supplier_details.get(inv.supplier),
 			inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks,
 			", ".join(purchase_order), ", ".join(purchase_receipt)]
@@ -54,7 +54,7 @@
 
 		# total tax, grand total, outstanding amount & rounded total
 		row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount]
-		data.append(row)		
+		data.append(row)
 
 	return columns, data
 
@@ -71,13 +71,15 @@
 
 	if invoice_list:
 		expense_accounts = frappe.db.sql_list("""select distinct expense_account
-			from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_account, '') != ''
+			from `tabPurchase Invoice Item` where docstatus = 1
+			and (expense_account is not null and expense_account != '')
 			and parent in (%s) order by expense_account""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
 
 		tax_accounts = 	frappe.db.sql_list("""select distinct account_head
 			from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
-			and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total')
+			and docstatus = 1 and (account_head is not null and account_head != '')
+			and category in ('Total', 'Valuation and Total')
 			and parent in (%s) order by account_head""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
 
@@ -143,7 +145,7 @@
 	return invoice_expense_map, invoice_tax_map
 
 def get_invoice_po_pr_map(invoice_list):
-	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail, 
+	pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail,
 		project_name from `tabPurchase Invoice Item` where parent in (%s)
 		and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" %
 		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)

diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index ffb274c..d202cf3 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py

@@ -79,7 +79,7 @@
 
 		tax_accounts = 	frappe.db.sql_list("""select distinct account_head
 			from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
-			and docstatus = 1 and ifnull(base_tax_amount_after_discount_amount, 0) != 0
+			and docstatus = 1 and base_tax_amount_after_discount_amount != 0
 			and parent in (%s) order by account_head""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
 

diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 11af273..13e8743 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py

@@ -5,7 +5,7 @@
 import frappe
 from frappe import _
 from frappe.utils import cint, flt, getdate, formatdate, cstr
-from erpnext.accounts.report.financial_statements import filter_accounts, get_gl_entries
+from erpnext.accounts.report.financial_statements import filter_accounts, set_gl_entries_by_account
 
 value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")
 
@@ -45,7 +45,7 @@
 		filters.to_date = filters.year_end_date
 
 def get_data(filters):
-	accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt 
+	accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt
 		from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
 
 	if not accounts:
@@ -56,8 +56,10 @@
 	min_lft, max_rgt = frappe.db.sql("""select min(lft), max(rgt) from `tabAccount`
 		where company=%s""", (filters.company,))[0]
 
-	gl_entries_by_account = get_gl_entries(filters.company, filters.from_date, filters.to_date, min_lft, max_rgt,
-		ignore_closing_entries=not flt(filters.with_period_closing_entry))
+	gl_entries_by_account = {}
+
+	set_gl_entries_by_account(filters.company, filters.from_date,
+		filters.to_date, min_lft, max_rgt, gl_entries_by_account, ignore_closing_entries=not flt(filters.with_period_closing_entry))
 
 	opening_balances = get_opening_balances(filters)
 
@@ -67,27 +69,27 @@
 	data = prepare_data(accounts, filters, total_row)
 
 	return data
-	
+
 def get_opening_balances(filters):
 	balance_sheet_opening = get_rootwise_opening_balances(filters, "Balance Sheet")
 	pl_opening = get_rootwise_opening_balances(filters, "Profit and Loss")
-	
+
 	balance_sheet_opening.update(pl_opening)
 	return balance_sheet_opening
-	
-	
+
+
 def get_rootwise_opening_balances(filters, report_type):
 	additional_conditions = " and posting_date >= %(year_start_date)s" \
 		if report_type == "Profit and Loss" else ""
-		
+
 	if not flt(filters.with_period_closing_entry):
 		additional_conditions += " and ifnull(voucher_type, '')!='Period Closing Voucher'"
-		
+
 	gle = frappe.db.sql("""
-		select 
-			account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+		select
+			account, sum(debit) as opening_debit, sum(credit) as opening_credit
 		from `tabGL Entry`
-		where 
+		where
 			company=%(company)s
 			{additional_conditions}
 			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
@@ -100,11 +102,11 @@
 			"year_start_date": filters.year_start_date
 		},
 		as_dict=True)
-		
+
 	opening = frappe._dict()
 	for d in gle:
 		opening.setdefault(d.account, d)
-		
+
 	return opening
 
 def calculate_values(accounts, gl_entries_by_account, opening_balances, filters):
@@ -139,7 +141,7 @@
 
 		total_row["debit"] += d["debit"]
 		total_row["credit"] += d["credit"]
-		
+
 
 	return total_row
 

diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index 2a47ce8..ceabaab 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py

@@ -76,7 +76,7 @@
 	
 def get_opening_balances(filters):
 	gle = frappe.db.sql("""
-		select party, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit 
+		select party, sum(debit) as opening_debit, sum(credit) as opening_credit 
 		from `tabGL Entry`
 		where company=%(company)s 
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
@@ -96,7 +96,7 @@
 	
 def get_balances_within_period(filters):
 	gle = frappe.db.sql("""
-		select party, sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit 
+		select party, sum(debit) as debit, sum(credit) as credit 
 		from `tabGL Entry`
 		where company=%(company)s 
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 88b1ed4..25ae482 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py

@@ -21,7 +21,7 @@
 
 def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
 	# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
-	cond = " ifnull(disabled, 0) = 0"
+	cond = " disabled = 0"
 	if fiscal_year:
 		cond += " and fy.name = %(fiscal_year)s"
 	else:
@@ -65,7 +65,7 @@
 
 	cond = []
 	if date:
-		cond.append("posting_date <= '%s'" % date)
+		cond.append("posting_date <= '%s'" % frappe.db.escape(cstr(date)))
 	else:
 		# get balance of all entries that exist
 		date = nowdate()
@@ -105,17 +105,17 @@
 			if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"):
 				in_account_currency = False
 		else:
-			cond.append("""gle.account = "%s" """ % (account.replace('"', '\\"'), ))
+			cond.append("""gle.account = "%s" """ % (frappe.db.escape(account), ))
 
 	if party_type and party:
 		cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
-			(party_type.replace('"', '\\"'), party.replace('"', '\\"')))
+			(frappe.db.escape(party_type), frappe.db.escape(party)))
 
 	if account or (party_type and party):
 		if in_account_currency:
-			select_field = "sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))"
+			select_field = "sum(debit_in_account_currency) - sum(credit_in_account_currency)"
 		else:
-			select_field = "sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))"
+			select_field = "sum(debit) - sum(credit)"
 		bal = frappe.db.sql("""
 			SELECT {0}
 			FROM `tabGL Entry` gle
@@ -134,6 +134,8 @@
 	ac.update(args)
 	ac.old_parent = ""
 	ac.freeze_account = "No"
+	if ac.get("is_root"):
+		ac.flags.ignore_mandatory = True
 	ac.insert()
 
 	return ac.name
@@ -181,7 +183,7 @@
 		select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2
 		where t1.name = t2.parent and t2.account = %(account)s
 		and t2.party_type = %(party_type)s and t2.party = %(party)s
-		and ifnull(t2.reference_type, '') in ("", "Sales Order", "Purchase Order")
+		and (t2.reference_type is null or t2.reference_type in ("", "Sales Order", "Purchase Order"))
 		and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
 		and t1.docstatus=1 """.format(dr_or_cr = args.get("dr_or_cr")), args)
 
@@ -211,7 +213,7 @@
 
 	if d['allocated_amt'] < d['unadjusted_amt']:
 		jvd = frappe.db.sql("""
-			select cost_center, balance, against_account, is_advance, 
+			select cost_center, balance, against_account, is_advance,
 				account_type, exchange_rate, account_currency
 			from `tabJournal Entry Account` where name = %s
 		""", d['voucher_detail_no'], as_dict=True)
@@ -282,7 +284,7 @@
 		sum(debit) - sum(credit) as diff
 		from `tabGL Entry`
 		group by voucher_type, voucher_no
-		having sum(ifnull(debit, 0)) != sum(ifnull(credit, 0))""", as_dict=1)
+		having sum(debit) != sum(credit)""", as_dict=1)
 
 	for d in vouchers:
 		if abs(d.diff) > 0:
@@ -301,7 +303,7 @@
 	difference = {}
 
 	account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount
-		where account_type = 'Warehouse' and ifnull(warehouse, '') != ''
+		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')
 		and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list))
 
 	for account, warehouse in account_warehouse.items():
@@ -372,7 +374,7 @@
 		if args.get("month_end_date") else ""
 
 	return flt(frappe.db.sql("""
-		select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
+		select sum(debit) - sum(credit)
 		from `tabGL Entry`
 		where account='%(account)s' and cost_center='%(cost_center)s'
 		and fiscal_year='%(fiscal_year)s' and company='%(company)s' %(condition)s
@@ -392,14 +394,14 @@
 		from `tabStock Ledger Entry` where company=%s""", company)
 
 	pr_valuation_amount = frappe.db.sql("""
-		select sum(ifnull(pr_item.valuation_rate, 0) * ifnull(pr_item.qty, 0) * ifnull(pr_item.conversion_factor, 0))
+		select sum(pr_item.valuation_rate * pr_item.qty * pr_item.conversion_factor)
 		from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
 	    where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
 		and pr.posting_date <= %s and pr_item.item_code in (%s)""" %
 	    ('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
 
 	pi_valuation_amount = frappe.db.sql("""
-		select sum(ifnull(pi_item.valuation_rate, 0) * ifnull(pi_item.qty, 0) * ifnull(pi_item.conversion_factor, 0))
+		select sum(pi_item.valuation_rate * pi_item.qty * pi_item.conversion_factor)
 		from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi
 	    where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
 		and pi.posting_date <= %s and pi_item.item_code in (%s)""" %
@@ -415,47 +417,63 @@
 	# Amount should be credited
 	return flt(stock_rbnb) + flt(sys_bal)
 
-def get_outstanding_invoices(amount_query, account, party_type, party):
-	all_outstanding_vouchers = []
-	outstanding_voucher_list = frappe.db.sql("""
-		select
-			voucher_no, voucher_type, posting_date,
-			ifnull(sum({amount_query}), 0) as invoice_amount
+def get_outstanding_invoices(party_type, party, account, condition=None):
+	outstanding_invoices = []
+	precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
+
+	if party_type=="Customer":
+		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
+		payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
+	else:
+		dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
+		payment_dr_or_cr = "payment_gl_entry.debit_in_account_currency - payment_gl_entry.credit_in_account_currency"
+
+	invoice_list = frappe.db.sql("""select
+			voucher_no,	voucher_type, posting_date,
+			ifnull(sum({dr_or_cr}), 0) as invoice_amount,
+			(
+				select
+					ifnull(sum({payment_dr_or_cr}), 0)
+				from `tabGL Entry` payment_gl_entry
+				where
+					payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type
+					and payment_gl_entry.against_voucher = invoice_gl_entry.voucher_no
+					and payment_gl_entry.party_type = invoice_gl_entry.party_type
+					and payment_gl_entry.party = invoice_gl_entry.party
+					and payment_gl_entry.account = invoice_gl_entry.account
+					and {payment_dr_or_cr} > 0
+			) as payment_amount
 		from
-			`tabGL Entry`
+			`tabGL Entry` invoice_gl_entry
 		where
-			account = %s and party_type=%s and party=%s and {amount_query} > 0
-			and (CASE
-					WHEN voucher_type = 'Journal Entry'
-					THEN ifnull(against_voucher, '') = ''
-					ELSE 1=1
-				END)
+			party_type = %(party_type)s
+			and party = %(party)s
+			and account = %(account)s
+			and {dr_or_cr} > 0
+			{condition}
+			and ((voucher_type = 'Journal Entry'
+					and (against_voucher = ''
+						or against_voucher is null))
+				or (voucher_type != 'Journal Entry'))
 		group by voucher_type, voucher_no
-		""".format(amount_query = amount_query), (account, party_type, party), as_dict = True)
+		having (invoice_amount - payment_amount) > 0.005""".format(
+			dr_or_cr = dr_or_cr,
+			payment_dr_or_cr = payment_dr_or_cr,
+			condition = condition or ""
+		), {
+			"party_type": party_type,
+			"party": party,
+			"account": account,
+		}, as_dict=True)
 
-	for d in outstanding_voucher_list:
-		payment_amount = frappe.db.sql("""
-			select ifnull(sum({amount_query}), 0)
-			from
-				`tabGL Entry`
-			where
-				account = %s and party_type=%s and party=%s and {amount_query} < 0
-				and against_voucher_type = %s and ifnull(against_voucher, '') = %s
-			""".format(**{
-			"amount_query": amount_query
-			}), (account, party_type, party, d.voucher_type, d.voucher_no))
+	for d in invoice_list:
+		outstanding_invoices.append({
+			'voucher_no': d.voucher_no,
+			'voucher_type': d.voucher_type,
+			'posting_date': d.posting_date,
+			'invoice_amount': flt(d.invoice_amount),
+			'payment_amount': flt(d.payment_amount),
+			'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision)
+		})
 
-		payment_amount = -1*payment_amount[0][0] if payment_amount else 0
-		precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
-
-		if d.invoice_amount > payment_amount:
-
-			all_outstanding_vouchers.append({
-				'voucher_no': d.voucher_no,
-				'voucher_type': d.voucher_type,
-				'posting_date': d.posting_date,
-				'invoice_amount': flt(d.invoice_amount, precision),
-				'outstanding_amount': flt(d.invoice_amount - payment_amount, precision)
-			})
-
-	return all_outstanding_vouchers
+	return outstanding_invoices

diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index f372cd8..2fb3bc7 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js

@@ -58,6 +58,11 @@
 	refresh: function(doc) {
 		this.frm.toggle_display("supplier_name",
 			(this.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
+
+		if(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request") {
+			this.set_from_product_bundle();
+		}
+
 		this._super();
 	},
 
@@ -157,6 +162,13 @@
 	},
 	add_deduct_tax: function(doc, cdt, cdn) {
 		this.calculate_taxes_and_totals();
+	},
+
+	set_from_product_bundle: function() {
+		var me = this;
+		this.frm.add_custom_button(__("From Product Bundle"), function() {
+			erpnext.buying.get_items_from_product_bundle(me.frm);
+		});
 	}
 });
 
@@ -180,3 +192,78 @@
 		}
 	});
 }
+
+erpnext.buying.get_items_from_product_bundle = function(frm) {
+	var dialog = new frappe.ui.Dialog({
+		title: __("Get Items from Product Bundle"),
+		fields: [
+			{
+				"fieldtype": "Link",
+				"label": __("Product Bundle"),
+				"fieldname": "product_bundle",
+				"options":"Product Bundle",
+				"reqd": 1
+			},
+			{
+				"fieldtype": "Currency",
+				"label": __("Quantity"),
+				"fieldname": "quantity",
+				"reqd": 1,
+				"default": 1
+			},
+			{
+				"fieldtype": "Button",
+				"label": __("Get Items"),
+				"fieldname": "get_items",
+				"cssClass": "btn-primary"
+			}
+		]
+	});
+
+	dialog.fields_dict.get_items.$input.click(function() {
+		args = dialog.get_values();
+		if(!args) return;
+		dialog.hide();
+		return frappe.call({
+			type: "GET",
+			method: "erpnext.stock.doctype.packed_item.packed_item.get_items_from_product_bundle",
+			args: {
+				args: {
+					item_code: args.product_bundle,
+					quantity: args.quantity,
+					parenttype: frm.doc.doctype,
+					parent: frm.doc.name,
+					supplier: frm.doc.supplier,
+					currency: frm.doc.currency,
+					conversion_rate: frm.doc.conversion_rate,
+					price_list: frm.doc.buying_price_list,
+					price_list_currency: frm.doc.price_list_currency,
+					plc_conversion_rate: frm.doc.plc_conversion_rate,
+					company: frm.doc.company,
+					is_subcontracted: frm.doc.is_subcontracted,
+					transaction_date: frm.doc.transaction_date || frm.doc.posting_date,
+					ignore_pricing_rule: frm.doc.ignore_pricing_rule
+				}
+			},
+			freeze: true,
+			callback: function(r) {
+				if(!r.exc && r.message) {
+					for ( var i=0; i< r.message.length; i++ ) {
+						var d = frm.add_child("items");
+						var item = r.message[i];
+						for ( var key in  item) {
+							if ( !is_null(item[key]) ) {
+								d[key] = item[key];
+							}
+						}
+						if(frappe.meta.get_docfield(d.doctype, "price_list_rate", d.name)) {
+							frm.script_manager.trigger("price_list_rate", d.doctype, d.name);
+						}
+					}
+					frm.refresh_field("items");
+				}
+			}
+		})
+	});
+	dialog.show();
+}

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 2a76f8a..c0fc95c 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -18,24 +18,49 @@
 		var me = this;
 		this._super();
 		// this.frm.dashboard.reset();
+		var allow_receipt = false;
+		var is_drop_ship = false;
 
-		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-
-			if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
-				cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
+		for (var i in cur_frm.doc.items) {
+			var item = cur_frm.doc.items[i];
+			if(item.delivered_by_supplier !== 1) {
+				allow_receipt = true;
 			}
 
-			cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
+			else {
+				is_drop_ship = true
+			}
 
-			if(doc.delivered_by_supplier && doc.status!="Delivered"){
-				cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier);
+			if(is_drop_ship && allow_receipt) {
+				break;
+			}
+		}
+
+		cur_frm.set_df_property("drop_ship", "hidden", !is_drop_ship);
+
+		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
+			if (this.frm.has_perm("submit")) {
+				if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
+					cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
+				}
+
+				cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
 			}
 
 			if(flt(doc.per_billed)==0) {
 				cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
 			}
 
-			if(flt(doc.per_received, 2) < 100) {
+			if(is_drop_ship && doc.status!="Delivered"){
+				cur_frm.add_custom_button(__('Mark as Delivered'),
+					 this.delivered_by_supplier).addClass("btn-primary");
+			}
+		} else if(doc.docstatus===0) {
+			cur_frm.cscript.add_from_mappers();
+		}
+
+		if(doc.docstatus == 1 && !in_list(["Stopped", "Closed"], doc.status)) {
+			if(flt(doc.per_received, 2) < 100 && allow_receipt) {
 				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");
 
 				if(doc.is_subcontracted==="Yes") {
@@ -45,15 +70,14 @@
 			}
 
 			if(flt(doc.per_billed, 2) < 100)
-				cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice);
-
-
-		} else if(doc.docstatus===0) {
-			cur_frm.cscript.add_from_mappers();
+				cur_frm.add_custom_button(__('Invoice'),
+					this.make_purchase_invoice).addClass("btn-primary");
 		}
 
 		if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
-			cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);
+			if (this.frm.has_perm("submit")) {
+				cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order).addClass("btn-primary");
+			}
 		}
 	},
 
@@ -165,15 +189,19 @@
 			}
 		});
 	},
+
 	stop_purchase_order: function(){
 		cur_frm.cscript.update_status('Stop', 'Stopped')
 	},
+
 	unstop_purchase_order: function(){
 		cur_frm.cscript.update_status('Re-open', 'Submitted')
 	},
+
 	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
 	},
+
 	delivered_by_supplier: function(){
 		cur_frm.cscript.update_status('Deliver', 'Delivered')
 	}
@@ -225,14 +253,6 @@
 	}
 }
 
-cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){
-	return $c_obj(doc, 'get_last_purchase_rate', '', function(r, rt) {
-		refresh_field("items");
-		var doc = locals[cdt][cdn];
-		cur_frm.cscript.calc_amount( doc, 2);
-	});
-}
-
 cur_frm.pformat.indent_no = function(doc, cdt, cdn){
 	//function to make row of table
 

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 0b03319..85e14f3 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json

@@ -20,10 +20,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -43,10 +45,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -65,12 +69,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "PO-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -90,12 +96,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier", 
    "oldfieldtype": "Link", 
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -115,10 +123,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supply Raw Materials", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -137,9 +147,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -159,9 +171,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -180,9 +194,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -201,9 +217,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -222,9 +240,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -242,10 +262,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -266,11 +288,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -289,12 +313,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
    "options": "Purchase Order", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -314,12 +340,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -330,8 +358,8 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "delivered_by_supplier", 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
    "fieldname": "drop_ship", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -339,10 +367,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Drop Ship", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -354,7 +384,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -362,11 +392,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -378,7 +410,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
    "fieldname": "customer_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -386,32 +418,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "delivered_by_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "To be delivered to customer", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -429,10 +441,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -444,7 +458,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
    "fieldname": "customer_address", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -452,11 +466,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -468,7 +484,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "depends_on": "delivered_by_supplier", 
+   "depends_on": "", 
    "fieldname": "customer_contact_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -476,11 +492,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -499,10 +517,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address Display", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -521,10 +541,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -543,10 +565,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -565,10 +589,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -587,10 +613,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,12 +637,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -634,12 +664,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -657,9 +689,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -678,10 +712,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -700,10 +736,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -722,10 +760,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -744,9 +784,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -765,11 +807,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -788,34 +832,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Order Item", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "get_last_purchase_rate", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Get Last Purchase Rate", 
-   "no_copy": 0, 
-   "oldfieldtype": "Button", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -833,9 +857,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -854,11 +880,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -877,12 +905,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -900,9 +930,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -921,11 +953,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -944,12 +978,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -968,11 +1004,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -992,12 +1030,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_other_charges", 
    "oldfieldtype": "Link", 
    "options": "Purchase Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1016,12 +1056,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_tax_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1040,10 +1082,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1062,11 +1106,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1085,12 +1131,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1109,12 +1157,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1133,12 +1183,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_tax", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1156,10 +1208,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1178,12 +1232,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1202,12 +1258,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1226,11 +1284,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1250,10 +1310,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1273,11 +1335,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1295,10 +1359,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1317,11 +1383,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1340,11 +1408,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1362,10 +1432,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1384,12 +1456,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1409,11 +1483,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1432,12 +1508,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1456,9 +1534,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advance Paid", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1476,10 +1556,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1498,12 +1580,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1522,11 +1606,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1546,11 +1632,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1569,12 +1657,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1593,11 +1683,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1617,10 +1709,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1639,10 +1733,12 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1660,9 +1756,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1681,10 +1779,12 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1703,10 +1803,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1726,12 +1828,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
    "options": "\nDraft\nTo Receive and Bill\nTo Bill\nTo Receive\nCompleted\nStopped\nCancelled\nClosed\nDelivered", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1750,12 +1854,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1774,11 +1880,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ref SQ", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "ref_sq", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1796,10 +1904,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1820,11 +1930,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "% Received", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_received", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1845,11 +1957,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "% Billed", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_billed", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1868,10 +1982,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1892,12 +2008,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1916,12 +2034,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1942,11 +2062,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Materials Supplied", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-truck", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1965,12 +2087,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplied Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_raw_material_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Order Item Supplied", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1990,10 +2114,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-time", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2012,9 +2138,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2035,9 +2163,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Recurring", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2057,10 +2187,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2081,9 +2213,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2104,9 +2238,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2127,9 +2263,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Repeat on Day of Month", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2150,9 +2288,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2171,9 +2311,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2194,9 +2336,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2216,9 +2360,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Id", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2239,9 +2385,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notification Email Address", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2261,11 +2409,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Print Format", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Format", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2283,7 +2433,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-11-04 04:44:22.025827", 
+ "max_attachments": 0, 
+ "modified": "2015-12-01 00:48:11.749313", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 01ebcb9..b10b72f 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -8,7 +8,6 @@
 from frappe import msgprint, _, throw
 from frappe.model.mapper import get_mapped_doc
 from erpnext.controllers.buying_controller import BuyingController
-from erpnext.stock.doctype.item.item import get_last_purchase_details
 from erpnext.stock.stock_balance import update_bin_qty, get_ordered_qty
 from frappe.desk.notifications import clear_doctype_notifications
 
@@ -48,6 +47,7 @@
 		self.validate_for_subcontracting()
 		self.validate_minimum_order_qty()
 		self.create_raw_materials_supplied("supplied_items")
+		self.set_received_qty_for_drop_ship_items()
 
 	def validate_with_previous_doc(self):
 		super(PurchaseOrder, self).validate_with_previous_doc({
@@ -84,29 +84,6 @@
 				d.schedule_date = frappe.db.get_value("Material Request Item",
 						d.prevdoc_detail_docname, "schedule_date")
 
-	def get_last_purchase_rate(self):
-		"""get last purchase rates for all items"""
-		conversion_rate = flt(self.get('conversion_rate')) or 1.0
-
-		for d in self.get("items"):
-			if d.item_code:
-				last_purchase_details = get_last_purchase_details(d.item_code, self.name)
-
-				if last_purchase_details:
-					d.base_price_list_rate = last_purchase_details['base_price_list_rate'] * (flt(d.conversion_factor) or 1.0)
-					d.discount_percentage = last_purchase_details['discount_percentage']
-					d.base_rate = last_purchase_details['base_rate'] * (flt(d.conversion_factor) or 1.0)
-					d.price_list_rate = d.base_price_list_rate / conversion_rate
-					d.rate = d.base_rate / conversion_rate
-				else:
-					# if no last purchase found, reset all values to 0
-					d.base_price_list_rate = d.base_rate = d.price_list_rate = d.rate = d.discount_percentage = 0
-
-					item_last_purchase_rate = frappe.db.get_value("Item", d.item_code, "last_purchase_rate")
-					if item_last_purchase_rate:
-						d.base_price_list_rate = d.base_rate = d.price_list_rate \
-							= d.rate = item_last_purchase_rate
-
 	# Check for Stopped status
 	def check_for_stopped_or_closed_status(self, pc_obj):
 		check_list =[]
@@ -134,9 +111,11 @@
 		"""update requested qty (before ordered_qty is updated)"""
 		item_wh_list = []
 		for d in self.get("items"):
-			if (not po_item_rows or d.name in po_item_rows) and [d.item_code, d.warehouse] not in item_wh_list \
-					and frappe.db.get_value("Item", d.item_code, "is_stock_item") and d.warehouse:
-				item_wh_list.append([d.item_code, d.warehouse])
+			if (not po_item_rows or d.name in po_item_rows) \
+				and [d.item_code, d.warehouse] not in item_wh_list \
+				and frappe.db.get_value("Item", d.item_code, "is_stock_item") \
+				and d.warehouse and not d.delivered_by_supplier:
+					item_wh_list.append([d.item_code, d.warehouse])
 
 		for item_code, warehouse in item_wh_list:
 			update_bin_qty(item_code, warehouse, {
@@ -161,7 +140,7 @@
 		clear_doctype_notifications(self)
 
 	def on_submit(self):
-		if self.delivered_by_supplier == 1:
+		if self.has_drop_ship_item():
 			self.update_status_updater()
 
 		super(PurchaseOrder, self).on_submit()
@@ -178,8 +157,9 @@
 		purchase_controller.update_last_purchase_rate(self, is_submit = 1)
 
 	def on_cancel(self):
-		if self.delivered_by_supplier == 1:
+		if self.has_drop_ship_item():
 			self.update_status_updater()
+			self.update_delivered_qty_in_sales_order()
 
 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_stopped_or_closed_status(pc_obj)
@@ -231,16 +211,30 @@
 		"""Update delivered qty in Sales Order for drop ship"""
 		sales_orders_to_update = []
 		for item in self.items:
-			if item.prevdoc_doctype == "Sales Order":
+			if item.prevdoc_doctype == "Sales Order" and item.delivered_by_supplier == 1:
 				if item.prevdoc_docname not in sales_orders_to_update:
 					sales_orders_to_update.append(item.prevdoc_docname)
 
 		for so_name in sales_orders_to_update:
 			so = frappe.get_doc("Sales Order", so_name)
-			so.update_delivery_status(self.name)
+			so.update_delivery_status()
 			so.set_status(update=True)
 			so.notify_update()
 
+	def has_drop_ship_item(self):
+		is_drop_ship = False
+
+		for item in self.items:
+			if item.delivered_by_supplier == 1:
+				is_drop_ship = True
+
+		return is_drop_ship
+
+	def set_received_qty_for_drop_ship_items(self):
+		for item in self.items:
+			if item.delivered_by_supplier == 1:
+				item.received_qty = item.qty
+
 @frappe.whitelist()
 def stop_or_unstop_purchase_orders(names, status):
 	if not frappe.has_permission("Purchase Order", "write"):
@@ -259,7 +253,6 @@
 
 	frappe.local.message_log = []
 
-
 def set_missing_values(source, target):
 	target.ignore_pricing_rule = 1
 	target.run_method("set_missing_values")
@@ -289,7 +282,7 @@
 				"parenttype": "prevdoc_doctype",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.received_qty < doc.qty
+			"condition": lambda doc: abs(doc.received_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",
@@ -325,7 +318,7 @@
 				"parent": "purchase_order",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.base_amount==0 or doc.billed_amt < doc.amount
+			"condition": lambda doc: (doc.base_amount==0 or abs(doc.billed_amt) < abs(doc.amount))
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",

diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index af08473..16e09b1 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

@@ -1,1214 +1,1290 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "creation": "2013-05-24 19:29:06",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "creation": "2013-05-24 19:29:06", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Item Code",
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "supplier_part_no",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier Part Number",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "supplier_part_no", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Part Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Item Name",
-   "no_copy": 0,
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "fieldname": "schedule_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Reqd By Date",
-   "no_copy": 0,
-   "oldfieldname": "schedule_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "schedule_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Reqd By Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "schedule_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Description",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Description",
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "300px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Image",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Image View",
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Quantity and Rate",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Quantity",
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "60px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "60px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "60px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Stock UOM",
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Data",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "UOM",
-   "no_copy": 0,
-   "oldfieldname": "uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "100px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "UOM Conversion Factor",
-   "no_copy": 0,
-   "oldfieldname": "conversion_factor",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "conversion_factor", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "sec_break1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Price List Rate",
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Price List Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "price_list_rate",
-   "fieldname": "discount_percentage",
-   "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Discount on Price List Rate (%)",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Price List Rate (Company Currency)",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "sec_break2",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "sec_break2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Rate ",
-   "no_copy": 0,
-   "oldfieldname": "import_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Rate ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "import_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Amount",
-   "no_copy": 0,
-   "oldfieldname": "import_amount",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "import_amount", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Rate (Company Currency)",
-   "no_copy": 0,
-   "oldfieldname": "purchase_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "purchase_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Amount (Company Currency)",
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "pricing_rule",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Pricing Rule",
-   "no_copy": 0,
-   "options": "Pricing Rule",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "pricing_rule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Pricing Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Pricing Rule", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "section_break_29",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_29", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Rate",
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Amount",
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_32",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Rate (Company Currency)",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Amount (Company Currency)",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "warehouse_and_reference",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Warehouse and Reference",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "warehouse_and_reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse and Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Warehouse",
-   "no_copy": 0,
-   "oldfieldname": "warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "project_name",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Project Name",
-   "no_copy": 0,
-   "options": "Project",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "project_name", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Project Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "prevdoc_doctype",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Reference Document Type",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_doctype",
-   "oldfieldtype": "Data",
-   "options": "DocType",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_doctype", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference Document Type", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_doctype", 
+   "oldfieldtype": "Data", 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "prevdoc_docname",
-   "fieldtype": "Dynamic Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Reference Name",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_docname",
-   "oldfieldtype": "Link",
-   "options": "prevdoc_doctype",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "120px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_docname", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Reference Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_docname", 
+   "oldfieldtype": "Link", 
+   "options": "prevdoc_doctype", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "120px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "120px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "prevdoc_detail_docname",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Material Request Detail No",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_detail_docname",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_detail_docname", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Material Request Detail No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_detail_docname", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "supplier_quotation",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier Quotation",
-   "no_copy": 1,
-   "options": "Supplier Quotation",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "supplier_quotation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Quotation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Supplier Quotation", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "supplier_quotation_item",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier Quotation Item",
-   "no_copy": 1,
-   "options": "Supplier Quotation Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "supplier_quotation_item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Quotation Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Supplier Quotation Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "To be delivered to customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Item Group",
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "brand",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Brand",
-   "no_copy": 0,
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_group", 
+   "oldfieldtype": "Link", 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "bom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "BOM",
-   "no_copy": 1,
-   "options": "BOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "brand", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Brand", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Link", 
+   "options": "Brand", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "stock_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Qty as per Stock UOM",
-   "no_copy": 1,
-   "oldfieldname": "stock_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "bom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "BOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "stock_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "received_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Received Qty",
-   "no_copy": 1,
-   "oldfieldname": "received_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "received_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Received Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "received_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "returned_qty",
-   "fieldname": "returned_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Returned Qty",
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "returned_qty", 
+   "fieldname": "returned_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Returned Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "billed_amt",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Billed Amt",
-   "no_copy": 1,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "billed_amt", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billed Amt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
-   "fieldname": "item_tax_rate",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Item Tax Rate",
-   "no_copy": 0,
-   "oldfieldname": "item_tax_rate",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges", 
+   "fieldname": "item_tax_rate", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Tax Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_tax_rate", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "page_break",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Page Break",
-   "no_copy": 1,
-   "oldfieldname": "page_break",
-   "oldfieldtype": "Check",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "page_break", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Page Break", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "page_break", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "modified": "2015-10-19 03:04:51.773012",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Purchase Order Item",
- "owner": "Administrator",
- "permissions": [],
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2015-11-19 02:53:19.301428", 
+ "modified_by": "Administrator", 
+ "module": "Buying", 
+ "name": "Purchase Order Item", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file

diff --git a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
index 488f382..bad9e0e 100644
--- a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "main_item_code", 
    "oldfieldtype": "Data", 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Raw Material Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rm_item_code", 
    "oldfieldtype": "Data", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplied Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "required_qty", 
    "oldfieldtype": "Currency", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM Detail No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_detail_no", 
    "oldfieldtype": "Data", 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reference_name", 
    "oldfieldtype": "Data", 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
@@ -204,6 +212,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Uom", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -226,7 +235,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:05.021801", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.025077", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item Supplied", 

diff --git a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
index 8911e51..070909d 100644
--- a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "main_item_code", 
    "oldfieldtype": "Data", 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Raw Material Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rm_item_code", 
    "oldfieldtype": "Data", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Data", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Batch", 
    "permlevel": 0, 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -131,6 +136,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -152,6 +158,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Required Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "required_qty", 
    "oldfieldtype": "Currency", 
@@ -175,6 +182,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Consumed Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "consumed_qty", 
    "oldfieldtype": "Currency", 
@@ -198,6 +206,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Uom", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -222,6 +231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -246,6 +256,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -270,6 +281,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
@@ -293,6 +305,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Stock", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "current_stock", 
    "oldfieldtype": "Currency", 
@@ -316,6 +329,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reference Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reference_name", 
    "oldfieldtype": "Data", 
@@ -339,6 +353,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM Detail No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_detail_no", 
    "oldfieldtype": "Data", 
@@ -360,7 +375,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:06.224300", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.573531", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Receipt Item Supplied", 

diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/buying/doctype/quality_inspection/quality_inspection.json
index 193866e..ba5396c 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/buying/doctype/quality_inspection/quality_inspection.json

@@ -18,7 +18,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "QI-", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Report Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "report_date", 
    "oldfieldtype": "Date", 
@@ -64,6 +66,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -85,7 +88,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Inspection Type",  
+   "label": "Inspection Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "inspection_type", 
    "oldfieldtype": "Select", 
@@ -110,6 +114,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Receipt No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_receipt_no", 
    "oldfieldtype": "Link", 
@@ -134,6 +139,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Note No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "delivery_note_no", 
    "oldfieldtype": "Link", 
@@ -157,6 +163,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -179,6 +186,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_serial_no", 
    "oldfieldtype": "Link", 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "batch_no", 
    "oldfieldtype": "Link", 
@@ -251,6 +261,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sample Size", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sample_size", 
    "oldfieldtype": "Currency", 
@@ -273,6 +284,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -296,6 +308,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -318,6 +331,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -341,6 +355,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -364,6 +379,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Inspected By", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "inspected_by", 
    "oldfieldtype": "Data", 
@@ -388,6 +404,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Verified By", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "verified_by", 
    "oldfieldtype": "Data", 
@@ -410,6 +427,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -432,6 +450,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Text", 
@@ -455,6 +474,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -479,6 +499,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "Simple", 
@@ -502,6 +523,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Specification Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "get_item_specification_details", 
    "permlevel": 0, 
@@ -524,6 +546,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Readings", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qa_specification_details", 
    "oldfieldtype": "Table", 
@@ -547,7 +570,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:06.674821", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.786379", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quality Inspection", 

diff --git a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
index 2650268..046d79d 100644
--- a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "specification", 
    "oldfieldtype": "Data", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Acceptance Criteria", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "value", 
    "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 1", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_1", 
    "oldfieldtype": "Data", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 2", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_2", 
    "oldfieldtype": "Data", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 3", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_3", 
    "oldfieldtype": "Data", 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reading 4", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_4", 
    "oldfieldtype": "Data", 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 5", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_5", 
    "oldfieldtype": "Data", 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 6", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_6", 
    "oldfieldtype": "Data", 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 7", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_7", 
    "oldfieldtype": "Data", 
@@ -226,6 +235,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 8", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_8", 
    "oldfieldtype": "Data", 
@@ -249,6 +259,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 9", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_9", 
    "oldfieldtype": "Data", 
@@ -272,6 +283,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reading 10", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reading_10", 
    "oldfieldtype": "Data", 
@@ -295,7 +307,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -318,7 +331,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:06.876419", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.873250", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quality Inspection Reading", 

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 36c8be2..498154b 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json

@@ -21,11 +21,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -43,13 +45,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "SUPP-", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -68,11 +72,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "supplier_name", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -90,9 +96,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -112,12 +120,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier_type", 
    "oldfieldtype": "Link", 
    "options": "Supplier Type", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -136,10 +146,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Frozen", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -157,10 +169,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -179,10 +193,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -201,53 +217,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "default_taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Taxes and Charges", 
-   "no_copy": 0, 
-   "options": "Purchase Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -266,9 +241,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -288,11 +265,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address and Contacts", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "options": "icon-map-marker", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -311,9 +290,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -331,9 +312,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -353,9 +336,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -375,9 +360,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Payable Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -398,10 +385,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Party Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -421,9 +410,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -443,11 +434,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "website", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -467,11 +460,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier_details", 
    "oldfieldtype": "Code", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -490,10 +485,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Communications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Communication", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -511,7 +508,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:14.767820", 
+ "max_attachments": 0, 
+ "modified": "2015-12-08 12:52:56.827461", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 

diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 6ae0a2e..f010626 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py

@@ -93,7 +93,7 @@
 			{"supplier": supplier, "docstatus": ["!=", 2] }, "count(*)")
 
 	billing_this_year = frappe.db.sql("""
-		select sum(ifnull(credit_in_account_currency, 0)) - sum(ifnull(debit_in_account_currency, 0))
+		select sum(credit_in_account_currency) - sum(debit_in_account_currency)
 		from `tabGL Entry`
 		where voucher_type='Purchase Invoice' and party_type = 'Supplier'
 			and party=%s and fiscal_year = %s""",

diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 5f95e91..a904be8 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -20,10 +20,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -43,10 +45,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -64,13 +68,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "SQTN-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -90,12 +96,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier", 
    "oldfieldtype": "Link", 
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -114,9 +122,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -135,9 +145,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -156,9 +168,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -177,9 +191,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -198,9 +214,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -218,10 +236,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -242,11 +262,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -265,12 +287,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
    "options": "Supplier Quotation", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -290,12 +314,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -314,10 +340,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -336,12 +364,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -361,12 +391,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -384,9 +416,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -407,10 +441,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -430,10 +466,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -453,10 +491,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -475,9 +515,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -496,11 +538,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -519,12 +563,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_details", 
    "oldfieldtype": "Table", 
    "options": "Supplier Quotation Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -542,9 +588,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -563,11 +611,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -586,12 +636,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -609,9 +661,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -630,11 +684,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -653,12 +709,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -677,11 +735,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -701,12 +761,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_other_charges", 
    "oldfieldtype": "Link", 
    "options": "Purchase Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -725,12 +787,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_tax_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -749,10 +813,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -771,11 +837,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -794,12 +862,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -818,12 +888,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -842,12 +914,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_tax", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -865,10 +939,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -887,12 +963,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -911,12 +989,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -935,11 +1015,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -959,10 +1041,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -981,12 +1065,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1004,10 +1090,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1026,11 +1114,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1049,11 +1139,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1071,10 +1163,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1093,12 +1187,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1118,11 +1214,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1141,12 +1239,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1164,10 +1264,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1186,12 +1288,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1210,11 +1314,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1234,11 +1340,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1257,12 +1365,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1281,11 +1391,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1305,10 +1417,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1327,10 +1441,12 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1349,10 +1465,12 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1371,10 +1489,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1393,12 +1513,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1417,12 +1539,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1441,11 +1565,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1463,13 +1589,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
    "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1488,11 +1616,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Is Subcontracted",  
+   "label": "Is Subcontracted", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nYes\nNo", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1510,9 +1640,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1531,12 +1663,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -1554,7 +1688,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:15.027459", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-01 00:48:50.969833", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 

diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index ce1aaa3..7ee47c4 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Part Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -64,6 +66,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -86,6 +89,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -131,6 +136,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -155,6 +161,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -176,6 +183,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -198,6 +206,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -221,6 +230,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -242,6 +252,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -267,6 +278,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -290,6 +302,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -310,6 +323,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -331,6 +345,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -357,6 +372,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -378,6 +394,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -399,6 +416,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate ", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_rate", 
    "oldfieldtype": "Currency", 
@@ -423,6 +441,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_amount", 
    "oldfieldtype": "Currency", 
@@ -446,6 +465,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -467,6 +487,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_rate", 
    "oldfieldtype": "Currency", 
@@ -493,6 +514,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -517,6 +539,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -538,6 +561,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -560,6 +584,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -582,6 +607,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -604,6 +630,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -626,6 +653,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -649,6 +677,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -672,6 +701,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse and Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -693,6 +723,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -717,6 +748,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
@@ -739,6 +771,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Prevdoc DocType", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -762,6 +795,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Material Request No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Link", 
@@ -787,6 +821,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -808,6 +843,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Material Request Detail No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
@@ -831,6 +867,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -856,6 +893,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -881,6 +919,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -904,6 +943,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -925,7 +965,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:51.597343", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.833849", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 

diff --git a/erpnext/buying/print_format/drop_shipping/drop_shipping.json b/erpnext/buying/print_format/drop_shipping/drop_shipping.json
deleted file mode 100644
index 0af9a24..0000000
--- a/erpnext/buying/print_format/drop_shipping/drop_shipping.json
+++ /dev/null

@@ -1,17 +0,0 @@
-{
- "creation": "2015-10-20 16:46:39.382799", 
- "custom_format": 0, 
- "disabled": 0, 
- "doc_type": "Purchase Order", 
- "docstatus": 0, 
- "doctype": "Print Format", 
- "font": "Default", 
- "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"<h1 style=\\\"text-align: center;\\\">Purchase Order</h1><div style=\\\"text-align: center;\\\">{{doc.name}}</div><div style=\\\"text-align: center;\\\"><hr></div>\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"title\"}, {\"print_hide\": 0, \"fieldname\": \"supplier\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_name\"}, {\"print_hide\": 0, \"fieldname\": \"address_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"contact_mobile\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"transaction_date\"}, {\"print_hide\": 0, \"fieldname\": \"customer\"}, {\"print_hide\": 0, \"fieldname\": \"customer_name\"}, {\"print_hide\": 0, \"fieldname\": \"customer_address_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_display\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_mobile\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"item_code\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"image\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"qty\", \"print_width\": \"60px\"}, {\"print_hide\": 0, \"fieldname\": \"uom\", \"print_width\": \"100px\"}, {\"print_hide\": 0, \"fieldname\": \"discount_percentage\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"pricing_rule\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"supplier_quotation_item\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"items\"}, {\"print_hide\": 0, \"fieldname\": \"get_last_purchase_rate\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"total\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"category\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"add_deduct_tax\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"charge_type\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"row_id\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"included_in_print_rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"account_head\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"cost_center\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"description\", \"print_width\": \"300px\"}, {\"print_hide\": 0, \"fieldname\": \"rate\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"tax_amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"total\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"taxes\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"grand_total\"}, {\"print_hide\": 0, \"fieldname\": \"in_words\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"terms\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"customer_contact_person\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"recurring_print_format\"}]", 
- "modified": "2015-10-20 17:21:45.810640", 
- "modified_by": "saurabh@erpnext.com", 
- "name": "Drop Shipping", 
- "owner": "Administrator", 
- "print_format_builder": 1, 
- "print_format_type": "Server", 
- "standard": "No"
-}
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/buying/print_format/drop_shipping_format/__init__.py
similarity index 100%
rename from erpnext/buying/print_format/drop_shipping/__init__.py
rename to erpnext/buying/print_format/drop_shipping_format/__init__.py


diff --git a/erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json b/erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json
new file mode 100644
index 0000000..cd2e826
--- /dev/null
+++ b/erpnext/buying/print_format/drop_shipping_format/drop_shipping_format.json

@@ -0,0 +1,18 @@
+{
+ "creation": "2015-12-04 13:11:16.992997", 
+ "custom_format": 1, 
+ "disabled": 0, 
+ "doc_type": "Purchase Order", 
+ "docstatus": 0, 
+ "doctype": "Print Format", 
+ "font": "Default", 
+ "html": "<div class=\"page-break\">\n    <div class=\"print-heading\">\n\t\t<h2>Purchase Order<br>\n\t        <small>{{doc.name}}</small>\n        </h2>\n    </div>\n    <div class=\"row section-break\">\n        <div class=\"col-xs-6 column-break\">\n                <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Supplier Name</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t{{doc.supplier_name}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n\t\t\t\t{% if doc.address_display %}\n\t                <div class=\"row\">\n\t\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t\t<label>Address</label>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t\t{{doc.address_display}}\n\t\t\t\t\t\t</div>\n\t\t\t\t\t</div>\n\t\t\t\t{%- endif -%}\n\t\t\t\t{% if doc.contact_display %}\n\t                <div class=\"row\">\n\t\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t\t<label>Contact</label>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t\t{{doc.contact_display}}\n\t\t\t\t\t\t</div>\n\t\t\t\t\t</div>\n\t\t\t\t{%- endif -%}\n\t\t\t\t{% if doc.contact_mobile %}\n\t                <div class=\"row\">\n\t\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t\t<label>Mobile No</label>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t\t{{doc.contact_mobile}}\n\t\t\t\t\t\t</div>\n\t\t\t\t\t</div>\n\t\t\t\t{%- endif -%}\n        </div>\n        \n        <div class=\"col-xs-6 column-break\">\n            <div class=\"row\">\n\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t<label>Date</label>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t{{doc.transaction_date}}\n\t\t\t\t</div>\n\t\t\t</div>\n            <div class=\"row\">\n\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t<label>Customer Name</label>\n\t\t\t\t</div>\n\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t{{doc.customer_name}}\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t\t{% if doc.customer_address_display %}\n\t            <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Customer Address</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t{{doc.customer_address_display}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n\t\t\t{%- endif -%}\n\t\t\t{% if doc.customer_contact_display %}\n\t            <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Customer Contact</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t{{doc.customer_contact_display}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n\t\t\t{%- endif -%}\n\t\t\t{% if doc.customer_contact_mobile %}\n\t            <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Customer Mobile No</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7  value\">\n\t\t\t\t\t\t{{doc.customer_contact_mobile}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n\t\t\t{%- endif -%}\n        </div>\n    </div>\n\t<table class=\"table table-bordered\">\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<th>Sr</th>\n\t\t\t\t<th>Item Name</th>\n\t\t\t\t<th>Description</th>\n\t\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t\t<th class=\"text-right\">Amount</th>\n\t\t\t</tr>\n\t\t\t{%- for row in doc.items -%}\n\t\t\t<tr>\n\t\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t\t{{ row.item_name }}\n\t\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t\t{%- endif %}\n\t\t\t\t</td>\n\t\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t\t</tr>\n\t\t\t{%- endfor -%}\n\t\t</tbody>\n\t</table>\n    <div class=\"row section-break\">\n        <div class=\"col-xs-6 column-break\">\n        </div>\n        <div class=\"col-xs-6 column-break\">\n                <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Total</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7 text-right value\">\n\t\t\t\t\t\t{{doc.total}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n                <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>Grand Total</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7 text-right value\">\n\t\t\t\t\t\t{{doc.grand_total}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n                <div class=\"row\">\n\t\t\t\t\t<div class=\"col-xs-5 text-right\">\n\t\t\t\t\t\t<label>In Words</label>\n\t\t\t\t\t</div>\n\t\t\t\t\t<div class=\"col-xs-7 text-right value\">\n\t\t\t\t\t\t{{doc.in_words}}\n\t\t\t\t\t</div>\n\t\t\t\t</div>\n        </div>\n    </div>\n</div>", 
+ "idx": 0, 
+ "modified": "2015-12-04 13:47:55.157482", 
+ "modified_by": "Administrator", 
+ "name": "Drop Shipping Format", 
+ "owner": "Administrator", 
+ "print_format_builder": 0, 
+ "print_format_type": "Server", 
+ "standard": "Yes"
+}
\ No newline at end of file

diff --git a/erpnext/change_log/v6/v6_11_0.md b/erpnext/change_log/v6/v6_11_0.md
new file mode 100644
index 0000000..3cf459c
--- /dev/null
+++ b/erpnext/change_log/v6/v6_11_0.md

@@ -0,0 +1 @@
+- Get Items from Product Bundle in Purchase Documents

diff --git a/erpnext/change_log/v6/v6_11_1.md b/erpnext/change_log/v6/v6_11_1.md
new file mode 100644
index 0000000..7b10dcf
--- /dev/null
+++ b/erpnext/change_log/v6/v6_11_1.md

@@ -0,0 +1 @@
+- Update Clearance date via Upload and Download like Stock Reconciliation. Sponsored by [AG Techologies, Singapore](http://agtech.com.sg)

diff --git a/erpnext/change_log/v6/v6_2_0.md b/erpnext/change_log/v6/v6_2_0.md
index 8078830..004e90c 100644
--- a/erpnext/change_log/v6/v6_2_0.md
+++ b/erpnext/change_log/v6/v6_2_0.md

@@ -1 +1 @@
-- **[Multi-currency Accounting](https://manual.erpnext.com/contents/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency
+- **[Multi-currency Accounting](https://frappe.github.io/erpnext/user/guides/accounts/multi-currency-accounting)**: You can now have an Account in a different currency than your Company's currency

diff --git a/erpnext/change_log/v6/v6_8_0.md b/erpnext/change_log/v6/v6_8_0.md
new file mode 100644
index 0000000..d45b784
--- /dev/null
+++ b/erpnext/change_log/v6/v6_8_0.md

@@ -0,0 +1,2 @@
+- Removed Stock UOM Replace Utility    
+  Replacing UOM and Conversion Factor in existing transactions broke the integrity of data. The cleaner solution is to create new Items for a different Stock UOM, and keep existing transactions as they are.

diff --git a/erpnext/change_log/v6/v6_9_1.md b/erpnext/change_log/v6/v6_9_1.md
new file mode 100644
index 0000000..82e2d4f
--- /dev/null
+++ b/erpnext/change_log/v6/v6_9_1.md

@@ -0,0 +1,4 @@
+- Invoice Outstanding calculation fixed related to advance
+- Show Close button only for users with Submit rights and for Delivery Note and Purchase Receipt, only if it is returned
+- Don't show Receive for a Purchase Order having non-stock items
+- Leave Allocation, Application and Balance report cleanup and fixes
\ No newline at end of file

diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py
new file mode 100644
index 0000000..9c9c4c7
--- /dev/null
+++ b/erpnext/config/docs.py

@@ -0,0 +1,27 @@
+source_link = "https://github.com/frappe/erpnext"
+docs_base_url = "https://frappe.github.io/erpnext"
+headline = "ERPNext Documentation"
+sub_heading = "Detailed explanation for all ERPNext features and developer API"
+long_description = """ERPNext is a fully featured ERP system designed for Small and Medium Sized
+business. ERPNext covers a wide range of features including Accounting, CRM,
+Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
+Payroll, Website, E-Commerce and much more.
+
+ERPNext is based on the Frappe Framework is highly customizable and extendable.
+You can create Custom Form, Fields, Scripts and can also create your own Apps
+to extend ERPNext functionality.
+
+ERPNext is Open Source under the GNU General Public Licence v3 and has been
+listed as one of the Best Open Source Softwares in the world by my online
+blogs."""
+
+docs_version = "6.x.x"
+splash_light_background = True
+
+def get_context(context):
+	context.app.splash_light_background = True
+	context.top_bar_items = [
+		{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
+		{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
+		{"label": "Developer Docs", "url": context.docs_base_url + "/current", "right": 1}
+	]

diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index a4a7202..9b47e58 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py

@@ -77,11 +77,6 @@
 					"type": "doctype",
 					"name": "Landed Cost Voucher",
 					"description": _("Update additional costs to calculate landed cost of items"),
-				},
-				{
-					"type": "doctype",
-					"name": "Stock UOM Replace Utility",
-					"description": _("Change UOM for an Item."),
 				}
 			]
 		},

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 5b06f1c..861ec8e 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py

@@ -133,6 +133,14 @@
 	def set_missing_item_details(self):
 		"""set missing item values"""
 		from erpnext.stock.get_item_details import get_item_details
+		
+		if self.doctype == "Purchase Invoice":
+			auto_accounting_for_stock = cint(frappe.defaults.get_global_default("auto_accounting_for_stock"))
+
+			if auto_accounting_for_stock:
+				stock_not_billed_account = self.get_company_default("stock_received_but_not_billed")
+				
+			stock_items = self.get_stock_items()
 
 		if hasattr(self, "items"):
 			parent_dict = {}
@@ -152,13 +160,14 @@
 					ret = get_item_details(args)
 
 					for fieldname, value in ret.items():
-						if item.meta.get_field(fieldname) and \
-							(item.get(fieldname) is None or fieldname in force_item_fields) \
-								and value is not None:
+						if item.meta.get_field(fieldname) and value is not None:
+							if (item.get(fieldname) is None or fieldname in force_item_fields):
 								item.set(fieldname, value)
 
-						if fieldname == "cost_center" and item.meta.get_field("cost_center") \
-							and not item.get("cost_center") and value is not None:
+							elif fieldname == "cost_center" and not item.get("cost_center"):
+								item.set(fieldname, value)
+
+							elif fieldname == "conversion_factor" and not item.get("conversion_factor"):
 								item.set(fieldname, value)
 
 					if ret.get("pricing_rule"):
@@ -169,6 +178,15 @@
 						if item.price_list_rate:
 							item.rate = flt(item.price_list_rate *
 								(1.0 - (flt(item.discount_percentage) / 100.0)), item.precision("rate"))
+								
+					if self.doctype == "Purchase Invoice":
+						if auto_accounting_for_stock and item.item_code in stock_items \
+							and self.is_opening == 'No' \
+							and (not item.po_detail or not frappe.db.get_value("Purchase Order Item", 
+								item.po_detail, "delivered_by_supplier")):
+				
+								item.expense_account = stock_not_billed_account
+								item.cost_center = None
 
 	def set_taxes(self):
 		if not self.meta.get_field("taxes"):
@@ -257,7 +275,7 @@
 		self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))
 
 		frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
-			and ifnull(allocated_amount, 0) = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
+			and allocated_amount = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
 
 	def get_advances(self, account_head, party_type, party, child_doctype, parentfield, dr_or_cr, against_order_field):
 		"""Returns list of advances against Account, Party, Reference"""
@@ -375,7 +393,7 @@
 
 		advance_paid = frappe.db.sql("""
 			select
-				sum(ifnull({dr_or_cr}, 0))
+				sum({dr_or_cr})
 			from
 				`tabJournal Entry Account`
 			where

diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 5ccf29d..c9b660d 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py

@@ -52,15 +52,6 @@
 					self.supplier = supplier
 					break
 
-	def validate_warehouse(self):
-		from erpnext.stock.utils import validate_warehouse_company
-
-		warehouses = list(set([d.warehouse for d in
-			self.get("items") if getattr(d, "warehouse", None)]))
-
-		for w in warehouses:
-			validate_warehouse_company(w, self.company)
-
 	def validate_stock_or_nonstock_items(self):
 		if self.meta.get_field("taxes") and not self.get_stock_items():
 			tax_for_valuation = [d.account_head for d in self.get("taxes")
@@ -234,7 +225,7 @@
 
 	def get_items_from_bom(self, item_code, bom):
 		bom_items = frappe.db.sql("""select t2.item_code,
-			ifnull(t2.qty, 0) / ifnull(t1.quantity, 1) as qty_consumed_per_unit,
+			t2.qty / ifnull(t1.quantity, 1) as qty_consumed_per_unit,
 			t2.rate, t2.stock_uom, t2.name, t2.description
 			from `tabBOM` t1, `tabBOM Item` t2, tabItem t3
 			where t2.parent = t1.name and t1.item = %s

diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 0af0b81..3c262f1 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py

@@ -165,7 +165,7 @@
 			concat(substr(tabItem.description, 1, 40), "..."), description) as decription
 		from tabItem
 		where tabItem.docstatus < 2
-			and ifnull(tabItem.has_variants, 0)=0
+			and tabItem.has_variants=0
 			and tabItem.disabled=0
 			and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
 			and (tabItem.`{key}` LIKE %(txt)s

diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index 41fd8b2..d34002b 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py

@@ -37,7 +37,7 @@
 	condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else ""
 
 	recurring_documents = frappe.db.sql("""select name, recurring_id
-		from `tab{0}` where ifnull(is_recurring, 0)=1
+		from `tab{0}` where is_recurring=1
 		and docstatus=1 and next_date=%s
 		and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date)
 
@@ -85,12 +85,9 @@
 
 	# get last day of the month to maintain period if the from date is first day of its own month
 	# and to date is the last day of its own month
-	if (cstr(get_first_day(ref_wrapper.from_date)) == \
-			cstr(ref_wrapper.from_date)) and \
-		(cstr(get_last_day(ref_wrapper.to_date)) == \
-			cstr(ref_wrapper.to_date)):
-		to_date = get_last_day(get_next_date(ref_wrapper.to_date,
-			mcount))
+	if (cstr(get_first_day(ref_wrapper.from_date)) == cstr(ref_wrapper.from_date)) and \
+		(cstr(get_last_day(ref_wrapper.to_date)) == cstr(ref_wrapper.to_date)):
+			to_date = get_last_day(get_next_date(ref_wrapper.to_date, mcount))
 	else:
 		to_date = get_next_date(ref_wrapper.to_date, mcount)
 

diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index f4895ca..c6c7111 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py

@@ -110,7 +110,7 @@
 			`tab{0} Item` child, `tab{1}` par
 		where
 			child.parent = par.name and par.docstatus = 1
-			and ifnull(par.is_return, 0) = 1 and par.return_against = %s and child.qty < 0
+			and par.is_return = 1 and par.return_against = %s and child.qty < 0
 		group by item_code
 	""".format(doc.doctype, doc.doctype), doc.return_against))
 

diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 1ed8b8a..895f146 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py

@@ -202,7 +202,7 @@
 			
 		delivered_via_si = frappe.db.sql("""select sum(si_item.qty) 
 			from `tabSales Invoice Item` si_item, `tabSales Invoice` si
-			where si_item.parent = si.name and ifnull(si.update_stock, 0) = 1
+			where si_item.parent = si.name and si.update_stock = 1
 			and si_item.so_detail = %s and si.docstatus = 1 
 			and si_item.sales_order = %s
 			and si.name != %s""", (so_detail, so, current_docname))

diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index f221fc2..73e9d7f 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py

@@ -76,10 +76,10 @@
 		self.update_qty()
 		self.validate_qty()
 
-	def set_status(self, update=False, status=None):
+	def set_status(self, update=False, status=None, update_modified=True):
 		if self.is_new():
 			return
-
+				
 		if self.doctype in status_map:
 			_status = self.status
 
@@ -102,9 +102,10 @@
 
 			if self.status != _status and self.status not in ("Submitted", "Cancelled"):
 				self.add_comment("Label", _(self.status))
-
+			
 			if update:
-				frappe.db.set_value(self.doctype, self.name, "status", self.status)
+				frappe.db.set_value(self.doctype, self.name, "status", self.status, 
+					update_modified=update_modified)
 
 	def validate_qty(self):
 		"""Validates qty at row level"""
@@ -177,6 +178,7 @@
 			else:
 				args['cond'] = ' and parent!="%s"' % self.name.replace('"', '\"')
 
+			args['set_modified'] = ''
 			if change_modified:
 				args['set_modified'] = ', modified = now(), modified_by = "{0}"'\
 					.format(frappe.db.escape(frappe.session.user))
@@ -210,7 +212,7 @@
 				if not args.get("extra_cond"): args["extra_cond"] = ""
 
 				frappe.db.sql("""update `tab%(target_dt)s`
-					set %(target_field)s = (select sum(%(source_field)s)
+					set %(target_field)s = (select ifnull(sum(%(source_field)s), 0)
 						from `tab%(source_dt)s` where `%(join_field)s`="%(detail_id)s"
 						and (docstatus=1 %(cond)s) %(extra_cond)s) %(second_source_condition)s
 					where name='%(detail_id)s'""" % args)
@@ -228,16 +230,18 @@
 			# update percent complete in the parent table
 			if args.get('target_parent_field'):
 				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s >
-						ifnull(%(target_field)s, 0), %(target_field)s,
-						%(target_ref_field)s))/sum(%(target_ref_field)s)*100
-						from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s
+					set %(target_parent_field)s = round(
+						ifnull((select
+							ifnull(sum(if(%(target_ref_field)s > %(target_field)s, %(target_field)s, %(target_ref_field)s)), 0)
+							/ sum(%(target_ref_field)s) * 100
+						from `tab%(target_dt)s` where parent="%(name)s"), 0), 2)
+						%(set_modified)s
 					where name='%(name)s'""" % args)
 
 			# update field
 			if args.get('status_field'):
 				frappe.db.sql("""update `tab%(target_parent_dt)s`
-					set %(status_field)s = if(ifnull(%(target_parent_field)s,0)<0.001,
+					set %(status_field)s = if(%(target_parent_field)s<0.001,
 						'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
 						'Fully %(keyword)s', 'Partly %(keyword)s'))
 					where name='%(name)s'""" % args)
@@ -264,10 +268,10 @@
 
 	def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname):
 		for ref_dn in zero_amount_refdoc:
-			ref_doc_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0)) from `tab%s Item`
+			ref_doc_qty = flt(frappe.db.sql("""select ifnull(sum(qty), 0) from `tab%s Item`
 				where parent=%s""" % (ref_dt, '%s'), (ref_dn))[0][0])
 
-			billed_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0))
+			billed_qty = flt(frappe.db.sql("""select ifnull(sum(qty), 0)
 				from `tab%s Item` where %s=%s and docstatus=1""" %
 				(self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0])
 

diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 2a9fa17..6e860c5 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py

@@ -221,7 +221,7 @@
 	def get_incoming_rate_for_sales_return(self, item_code, warehouse, against_document):
 		incoming_rate = 0.0
 		if against_document and item_code:
-			incoming_rate = frappe.db.sql("""select abs(ifnull(stock_value_difference, 0) / actual_qty)
+			incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
 				from `tabStock Ledger Entry`
 				where voucher_type = %s and voucher_no = %s
 					and item_code = %s and warehouse=%s limit 1""",
@@ -303,6 +303,15 @@
 						}))
 
 		self.make_sl_entries(sl_entries)
+		
+	def validate_warehouse(self):
+		from erpnext.stock.utils import validate_warehouse_company
+
+		warehouses = list(set([d.warehouse for d in
+			self.get("items") if getattr(d, "warehouse", None)]))
+
+		for w in warehouses:
+			validate_warehouse_company(w, self.company)
 
 def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
 		warehouse_account=None):
@@ -376,6 +385,6 @@
 	warehouse_account = frappe._dict()
 
 	for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount
-		where account_type = 'Warehouse' and ifnull(warehouse, '') != ''""", as_dict=1):
+		where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')""", as_dict=1):
 			warehouse_account.setdefault(d.warehouse, d)
 	return warehouse_account

diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 27ec618..b348da6 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py

@@ -398,17 +398,18 @@
 			return
 		
 		self.doc.round_floats_in(self.doc, ["grand_total", "total_advance", "write_off_amount"])
-		total_amount_to_pay = flt(self.doc.grand_total  - self.doc.total_advance - self.doc.write_off_amount,
-			self.doc.precision("grand_total"))
+		if self.doc.party_account_currency == self.doc.currency:
+			total_amount_to_pay = flt(self.doc.grand_total  - self.doc.total_advance 
+				- flt(self.doc.write_off_amount), self.doc.precision("grand_total"))
+		else:
+			total_amount_to_pay = flt(self.doc.base_grand_total  - self.doc.total_advance 
+				- flt(self.doc.base_write_off_amount), self.doc.precision("grand_total"))
 			
 		if self.doc.doctype == "Sales Invoice":
 			self.doc.round_floats_in(self.doc, ["paid_amount"])
-			outstanding_amount = flt(total_amount_to_pay - self.doc.paid_amount, self.doc.precision("outstanding_amount"))
+			paid_amount = self.doc.paid_amount \
+				if self.doc.party_account_currency == self.doc.currency else self.doc.base_paid_amount
+			self.doc.outstanding_amount = flt(total_amount_to_pay - flt(paid_amount), 
+				self.doc.precision("outstanding_amount"))
 		elif self.doc.doctype == "Purchase Invoice":
-			outstanding_amount = flt(total_amount_to_pay, self.doc.precision("outstanding_amount"))
-		
-		if self.doc.party_account_currency == self.doc.currency:
-			self.doc.outstanding_amount = outstanding_amount
-		else:
-			self.doc.outstanding_amount = flt(outstanding_amount * self.doc.conversion_rate, 
-				self.doc.precision("outstanding_amount"))
\ No newline at end of file
+			self.doc.outstanding_amount = flt(total_amount_to_pay, self.doc.precision("outstanding_amount"))
\ No newline at end of file

diff --git a/erpnext/controllers/tests/test_recurring_document.py b/erpnext/controllers/tests/test_recurring_document.py
index 3d005ff..ef8d5fb 100644
--- a/erpnext/controllers/tests/test_recurring_document.py
+++ b/erpnext/controllers/tests/test_recurring_document.py

@@ -5,11 +5,10 @@
 import frappe
 import frappe.permissions
 from erpnext.controllers.recurring_document import date_field_map
-from frappe.utils import getdate
+from frappe.utils import get_first_day, get_last_day, add_to_date, nowdate, getdate, add_days
+from erpnext.accounts.utils import get_fiscal_year
 
 def test_recurring_document(obj, test_records):
-	from frappe.utils import get_first_day, get_last_day, add_to_date, nowdate, getdate, add_days
-	from erpnext.accounts.utils import get_fiscal_year
 	frappe.db.set_value("Print Settings", "Print Settings", "send_print_as_pdf", 1)
 	today = nowdate()
 	base_doc = frappe.copy_doc(test_records[0])
@@ -38,14 +37,15 @@
 	_test_recurring_document(obj, doc1, date_field, True)
 
 	# monthly without a first and last day period
-	doc2 = frappe.copy_doc(base_doc)
-	doc2.update({
-		"from_date": today,
-		"to_date": add_to_date(today, days=30)
-	})
-	doc2.insert()
-	doc2.submit()
-	_test_recurring_document(obj, doc2, date_field, False)
+	if getdate(today).day != 1:
+		doc2 = frappe.copy_doc(base_doc)
+		doc2.update({
+			"from_date": today,
+			"to_date": add_to_date(today, days=30)
+		})
+		doc2.insert()
+		doc2.submit()
+		_test_recurring_document(obj, doc2, date_field, False)
 
 	# quarterly
 	doc3 = frappe.copy_doc(base_doc)

diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index c925383..ae6e9e4 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py

@@ -13,7 +13,7 @@
 		"global_number_format": frappe.db.get_default("number_format") or "#,###.##",
 		"currency": frappe.db.get_default("currency"),
 		"currency_symbols": json.dumps(dict(frappe.db.sql("""select name, symbol
-			from tabCurrency where ifnull(enabled,0)=1"""))),
+			from tabCurrency where enabled=1"""))),
 		"row_template": "templates/includes/transaction_row.html",
 		"get_list": get_transaction_list
 	}

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index b81375c..1d3aa17 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json

@@ -1,944 +1,978 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "creation": "2013-04-10 11:45:37", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "creation": "2013-04-10 11:45:37",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "lead_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "no_copy": 0, 
-   "options": "icon-user", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "lead_details",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "",
+   "length": 0,
+   "no_copy": 0,
+   "options": "icon-user",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Series",  
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "LEAD-", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Series",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "LEAD-",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "lead_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Person Name", 
-   "no_copy": 0, 
-   "oldfieldname": "lead_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "lead_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Person Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "lead_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "company_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Organization Name", 
-   "no_copy": 0, 
-   "oldfieldname": "company_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "company_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Organization Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "company_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Email Id", 
-   "no_copy": 0, 
-   "oldfieldname": "email_id", 
-   "oldfieldtype": "Data", 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "email_id",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Email Id",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "email_id",
+   "oldfieldtype": "Data",
+   "options": "Email",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "col_break123", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "col_break123",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Lead", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Status",  
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "Lead\nOpen\nReplied\nOpportunity\nInterested\nConverted\nDo Not Contact", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "Lead",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Status",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "Lead\nOpen\nReplied\nOpportunity\nInterested\nConverted\nDo Not Contact",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "source", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Source",  
-   "no_copy": 1, 
-   "oldfieldname": "source", 
-   "oldfieldtype": "Select", 
-   "options": "\nAdvertisement\nBlog Post\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "source",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Source",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "source",
+   "oldfieldtype": "Select",
+   "options": "\nAdvertisement\nBlog Post\nCampaign\nCall\nCustomer\nExhibition\nSupplier\nWebsite\nEmail",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.source == 'Customer'", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "From Customer", 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.source == 'Customer'",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "From Customer",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "Customer",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.source == 'Campaign'", 
-   "description": "", 
-   "fieldname": "campaign_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Campaign Name", 
-   "no_copy": 0, 
-   "oldfieldname": "campaign_name", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.source == 'Campaign'",
+   "description": "",
+   "fieldname": "campaign_name",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Campaign Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "campaign_name",
+   "oldfieldtype": "Link",
+   "options": "Campaign",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_12", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "section_break_12",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "__user", 
-   "fieldname": "lead_owner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Lead Owner", 
-   "no_copy": 0, 
-   "oldfieldname": "lead_owner", 
-   "oldfieldtype": "Link", 
-   "options": "User", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "__user",
+   "fieldname": "lead_owner",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Lead Owner",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "lead_owner",
+   "oldfieldtype": "Link",
+   "options": "User",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_by", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Next Contact By", 
-   "no_copy": 0, 
-   "oldfieldname": "contact_by", 
-   "oldfieldtype": "Link", 
-   "options": "User", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "contact_by",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Next Contact By",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "contact_by",
+   "oldfieldtype": "Link",
+   "options": "User",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Add to calendar on this date", 
-   "fieldname": "contact_date", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Next Contact Date", 
-   "no_copy": 1, 
-   "oldfieldname": "contact_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Add to calendar on this date",
+   "fieldname": "contact_date",
+   "fieldtype": "Datetime",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Next Contact Date",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "contact_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "100px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "contact_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address & Contact", 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "options": "icon-map-marker", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "fieldname": "contact_info",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address & Contact",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "options": "icon-map-marker",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.__islocal", 
-   "fieldname": "address_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address Desc", 
-   "no_copy": 0, 
-   "options": "<em>Addresses will appear only when you save the lead</em>", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.__islocal",
+   "fieldname": "address_desc",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address Desc",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address HTML", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "phone", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Phone", 
-   "no_copy": 0, 
-   "oldfieldname": "contact_no", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "phone",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Phone",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "contact_no",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "mobile_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Mobile No.", 
-   "no_copy": 0, 
-   "oldfieldname": "mobile_no", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "mobile_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Mobile No.",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "mobile_no",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "fax", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Fax", 
-   "no_copy": 0, 
-   "oldfieldname": "fax", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "fax",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Fax",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fax",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "website", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website", 
-   "no_copy": 0, 
-   "oldfieldname": "website", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Website",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "website",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Territory", 
-   "no_copy": 0, 
-   "oldfieldname": "territory", 
-   "oldfieldtype": "Link", 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Territory",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "territory",
+   "oldfieldtype": "Link",
+   "options": "Territory",
+   "permlevel": 0,
+   "print_hide": 1,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "fieldname": "more_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "More Information", 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "icon-file-text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "More Information",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "icon-file-text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Lead Type",  
-   "no_copy": 0, 
-   "oldfieldname": "type", 
-   "oldfieldtype": "Select", 
-   "options": "\nClient\nChannel Partner\nConsultant", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Lead Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "type",
+   "oldfieldtype": "Select",
+   "options": "\nClient\nChannel Partner\nConsultant",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "market_segment", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Market Segment",  
-   "no_copy": 0, 
-   "oldfieldname": "market_segment", 
-   "oldfieldtype": "Select", 
-   "options": "\nLower Income\nMiddle Income\nUpper Income", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "market_segment",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Market Segment",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "market_segment",
+   "oldfieldtype": "Select",
+   "options": "\nLower Income\nMiddle Income\nUpper Income",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "industry", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Industry", 
-   "no_copy": 0, 
-   "oldfieldname": "industry", 
-   "oldfieldtype": "Link", 
-   "options": "Industry Type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "industry",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Industry",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "industry",
+   "oldfieldtype": "Link",
+   "options": "Industry Type",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "request_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Request Type",  
-   "no_copy": 0, 
-   "oldfieldname": "request_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nProduct Enquiry\nRequest for Information\nSuggestions\nOther", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "request_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Request Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "request_type",
+   "oldfieldtype": "Select",
+   "options": "\nProduct Enquiry\nRequest for Information\nSuggestions\nOther",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Fiscal Year", 
-   "no_copy": 0, 
-   "oldfieldname": "fiscal_year", 
-   "oldfieldtype": "Select", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Fiscal Year",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "fiscal_year",
+   "oldfieldtype": "Select",
+   "options": "Fiscal Year",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Company", 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "unsubscribed", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Unsubscribed", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "unsubscribed",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Unsubscribed",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "blog_subscriber", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Blog Subscriber", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "blog_subscriber",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Blog Subscriber",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-user", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "modified": "2015-10-02 07:38:55.014441", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Lead", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-user",
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2015-11-16 06:29:49.250337",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Lead",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 0,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 1,
+   "print": 0,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
   }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "lead_name,lead_owner,status", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "lead_name,lead_owner,status",
+ "sort_field": "modified",
+ "sort_order": "DESC",
  "title_field": "lead_name"
-}
\ No newline at end of file
+}

diff --git a/erpnext/crm/doctype/newsletter/newsletter.json b/erpnext/crm/doctype/newsletter/newsletter.json
index 923c6d9..348b12b 100644
--- a/erpnext/crm/doctype/newsletter/newsletter.json
+++ b/erpnext/crm/doctype/newsletter/newsletter.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Newsletter List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Newsletter List", 
    "permlevel": 0, 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Subject", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sender", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Sent?", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -151,6 +157,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -173,6 +180,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Test Email Id", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -194,6 +202,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Test", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "test_send", 
    "permlevel": 0, 
@@ -215,7 +224,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:57.733269", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.506090", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Newsletter", 

diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.json b/erpnext/crm/doctype/newsletter_list/newsletter_list.json
index 7e3a382..597116f 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.json
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Subscribers", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -62,7 +64,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:57.839265", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.643141", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Newsletter List", 

diff --git a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json
index c22d042..08208b8 100644
--- a/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json
+++ b/erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Newsletter List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Newsletter List", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Unsubscribed", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -84,7 +87,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:57.901238", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.675306", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Newsletter List Subscriber", 

diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 6b94b2c..a0afbb8 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -42,7 +43,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -66,7 +68,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Opportunity From",  
+   "label": "Opportunity From", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "enquiry_from", 
    "oldfieldtype": "Select", 
@@ -92,6 +95,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -117,6 +121,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Lead", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lead", 
    "oldfieldtype": "Link", 
@@ -142,6 +147,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer / Lead Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -162,6 +168,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -185,6 +192,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -207,7 +215,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Opportunity Type",  
+   "label": "Opportunity Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "enquiry_type", 
    "oldfieldtype": "Select", 
@@ -232,7 +241,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -258,6 +268,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lost Reason", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -279,6 +290,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "With Items", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -302,6 +314,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -326,6 +339,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "enquiry_details", 
    "oldfieldtype": "Table", 
@@ -352,6 +366,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Info", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -375,6 +390,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer / Lead Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -397,6 +413,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "address", 
    "oldfieldtype": "Small Text", 
@@ -422,6 +439,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -446,6 +464,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_group", 
    "oldfieldtype": "Link", 
@@ -469,6 +488,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -491,6 +511,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -514,6 +535,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -536,6 +558,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -558,6 +581,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -580,6 +604,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -602,7 +627,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Source",  
+   "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -628,6 +654,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
@@ -651,6 +678,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -674,6 +702,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -699,6 +728,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opportunity Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -723,6 +753,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -748,6 +779,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -771,6 +803,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Next Contact By", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contact_by", 
    "oldfieldtype": "Link", 
@@ -797,6 +830,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Contact Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contact_date", 
    "oldfieldtype": "Date", 
@@ -819,6 +853,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -842,6 +877,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Discuss", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "to_discuss", 
    "oldfieldtype": "Small Text", 
@@ -865,6 +901,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -889,7 +926,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:58.453338", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.931180", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 

diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 61b883d..1715c55 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,6 +64,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -86,6 +89,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -110,6 +114,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -133,6 +138,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -155,6 +161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -179,6 +186,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -202,6 +210,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -226,6 +235,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -248,6 +258,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -271,6 +282,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -294,6 +306,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "basic_rate", 
    "oldfieldtype": "Currency", 
@@ -316,7 +329,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:51.988510", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.062309", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity Item", 

diff --git a/erpnext/docs/assets/img/accounts/account-settings.png b/erpnext/docs/assets/img/accounts/account-settings.png
new file mode 100644
index 0000000..943aa3d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/account-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/accounts-receivable.png b/erpnext/docs/assets/img/accounts/accounts-receivable.png
new file mode 100644
index 0000000..b03f254
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/accounts-receivable.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/advance-payment-1.png b/erpnext/docs/assets/img/accounts/advance-payment-1.png
new file mode 100644
index 0000000..17a8b30
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/advance-payment-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/advance-payment-2.png b/erpnext/docs/assets/img/accounts/advance-payment-2.png
new file mode 100644
index 0000000..373220d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/advance-payment-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/advance-payment-3.png b/erpnext/docs/assets/img/accounts/advance-payment-3.png
new file mode 100644
index 0000000..d35329e
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/advance-payment-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/bank-reconciliation.png b/erpnext/docs/assets/img/accounts/bank-reconciliation.png
new file mode 100644
index 0000000..86872d9
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/bank-reconciliation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/chart-of-accounts-1.png b/erpnext/docs/assets/img/accounts/chart-of-accounts-1.png
new file mode 100644
index 0000000..50ef62d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-accounts-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/chart-of-accounts-2.png b/erpnext/docs/assets/img/accounts/chart-of-accounts-2.png
new file mode 100644
index 0000000..490d248
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-accounts-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/chart-of-accounts-3.png b/erpnext/docs/assets/img/accounts/chart-of-accounts-3.png
new file mode 100644
index 0000000..10fe4a4
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-accounts-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/credit-limit-1.png b/erpnext/docs/assets/img/accounts/credit-limit-1.png
new file mode 100644
index 0000000..60d8e1f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/credit-limit-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/credit-limit-2.png b/erpnext/docs/assets/img/accounts/credit-limit-2.png
new file mode 100644
index 0000000..916daa7
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/credit-limit-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/financial-analytics-bl.png b/erpnext/docs/assets/img/accounts/financial-analytics-bl.png
new file mode 100644
index 0000000..1b01c3d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/financial-analytics-bl.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/financial-analytics-pl.png b/erpnext/docs/assets/img/accounts/financial-analytics-pl.png
new file mode 100644
index 0000000..ad754c1
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/financial-analytics-pl.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/fiscal-year.png b/erpnext/docs/assets/img/accounts/fiscal-year.png
new file mode 100644
index 0000000..2dbf0a2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/fiscal-year.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/general-ledger.png b/erpnext/docs/assets/img/accounts/general-ledger.png
new file mode 100644
index 0000000..b787119
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/general-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/journal-entry.png b/erpnext/docs/assets/img/accounts/journal-entry.png
new file mode 100644
index 0000000..d4a4e21
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/journal-entry.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/make-payment.png b/erpnext/docs/assets/img/accounts/make-payment.png
new file mode 100644
index 0000000..917432e
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/make-payment.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/account.png b/erpnext/docs/assets/img/accounts/multi-currency/account.png
new file mode 100644
index 0000000..7973e8d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/account.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/accounts-receivable.png b/erpnext/docs/assets/img/accounts/multi-currency/accounts-receivable.png
new file mode 100644
index 0000000..74f3e5c
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/accounts-receivable.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/bank-transfer.png b/erpnext/docs/assets/img/accounts/multi-currency/bank-transfer.png
new file mode 100644
index 0000000..6af0848
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/bank-transfer.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/chart-of-accounts.png b/erpnext/docs/assets/img/accounts/multi-currency/chart-of-accounts.png
new file mode 100644
index 0000000..f4a62b5
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/chart-of-accounts.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/customer.png b/erpnext/docs/assets/img/accounts/multi-currency/customer.png
new file mode 100644
index 0000000..35408c9
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/customer.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/general-ledger.png b/erpnext/docs/assets/img/accounts/multi-currency/general-ledger.png
new file mode 100644
index 0000000..de5e4d0
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/general-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-multi-currency.png b/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-multi-currency.png
new file mode 100644
index 0000000..17f3a71
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-multi-currency.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-row.png b/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-row.png
new file mode 100644
index 0000000..a27287d
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/journal-entry-row.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/payment-entry.png b/erpnext/docs/assets/img/accounts/multi-currency/payment-entry.png
new file mode 100644
index 0000000..3bfe102
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/payment-entry.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/multi-currency/sales-invoice.png b/erpnext/docs/assets/img/accounts/multi-currency/sales-invoice.png
new file mode 100644
index 0000000..7b576ab
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/multi-currency/sales-invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/new-bank-entry.png b/erpnext/docs/assets/img/accounts/new-bank-entry.png
new file mode 100644
index 0000000..803797b
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/new-bank-entry.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/opening-account-1.png b/erpnext/docs/assets/img/accounts/opening-account-1.png
new file mode 100644
index 0000000..2e19363
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/opening-account-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/payment-reconcile-tool.png b/erpnext/docs/assets/img/accounts/payment-reconcile-tool.png
new file mode 100644
index 0000000..c507f19
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/payment-reconcile-tool.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/payment-tool-1.png b/erpnext/docs/assets/img/accounts/payment-tool-1.png
new file mode 100644
index 0000000..9e6d625
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/payment-tool-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/payment-tool-2.png b/erpnext/docs/assets/img/accounts/payment-tool-2.png
new file mode 100644
index 0000000..535e0a2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/payment-tool-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/payment-tool-3.png b/erpnext/docs/assets/img/accounts/payment-tool-3.png
new file mode 100644
index 0000000..19ac8fa
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/payment-tool-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/period-closing-voucher.png b/erpnext/docs/assets/img/accounts/period-closing-voucher.png
new file mode 100644
index 0000000..2e9078f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/period-closing-voucher.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/purchase-invoice.png b/erpnext/docs/assets/img/accounts/purchase-invoice.png
new file mode 100644
index 0000000..0235520
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/purchase-invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/sales-invoice.png b/erpnext/docs/assets/img/accounts/sales-invoice.png
new file mode 100644
index 0000000..421e398
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/sales-invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/sales-register.png b/erpnext/docs/assets/img/accounts/sales-register.png
new file mode 100644
index 0000000..5dc7f1a
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/sales-register.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/tax-rule-1.png b/erpnext/docs/assets/img/accounts/tax-rule-1.png
new file mode 100644
index 0000000..7d3c22c
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/tax-rule-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/tax-rule-2.png b/erpnext/docs/assets/img/accounts/tax-rule-2.png
new file mode 100644
index 0000000..a0dae13
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/tax-rule-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/tax-rule.png b/erpnext/docs/assets/img/accounts/tax-rule.png
new file mode 100644
index 0000000..a82741f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/tax-rule.png
Binary files differ

diff --git a/erpnext/docs/assets/img/accounts/trial-balance.png b/erpnext/docs/assets/img/accounts/trial-balance.png
new file mode 100644
index 0000000..d96d439
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/trial-balance.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_223.png b/erpnext/docs/assets/img/articles/$SGrab_223.png
new file mode 100644
index 0000000..5091620
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_223.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_238.png b/erpnext/docs/assets/img/articles/$SGrab_238.png
new file mode 100644
index 0000000..5f59d4f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_238.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_241.png b/erpnext/docs/assets/img/articles/$SGrab_241.png
new file mode 100644
index 0000000..ad74fc4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_241.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_242.png b/erpnext/docs/assets/img/articles/$SGrab_242.png
new file mode 100644
index 0000000..751fbb1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_242.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_253.png b/erpnext/docs/assets/img/articles/$SGrab_253.png
new file mode 100644
index 0000000..6964925
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_253.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_254.png b/erpnext/docs/assets/img/articles/$SGrab_254.png
new file mode 100644
index 0000000..7b2ea78
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_254.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_256.png b/erpnext/docs/assets/img/articles/$SGrab_256.png
new file mode 100644
index 0000000..1fabda3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_256.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_258.png b/erpnext/docs/assets/img/articles/$SGrab_258.png
new file mode 100644
index 0000000..c5d59f8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_258.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_260.png b/erpnext/docs/assets/img/articles/$SGrab_260.png
new file mode 100644
index 0000000..4ba692b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_260.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_261.png b/erpnext/docs/assets/img/articles/$SGrab_261.png
new file mode 100644
index 0000000..a8a9fa4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_261.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_306.png b/erpnext/docs/assets/img/articles/$SGrab_306.png
new file mode 100644
index 0000000..ebbb007
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_306.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_307.png b/erpnext/docs/assets/img/articles/$SGrab_307.png
new file mode 100644
index 0000000..f3d1ee1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_307.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_316.png b/erpnext/docs/assets/img/articles/$SGrab_316.png
new file mode 100644
index 0000000..79eea96
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_316.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_317.png b/erpnext/docs/assets/img/articles/$SGrab_317.png
new file mode 100644
index 0000000..b80e98c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_317.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_318.png b/erpnext/docs/assets/img/articles/$SGrab_318.png
new file mode 100644
index 0000000..6aa68be
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_318.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_323.png b/erpnext/docs/assets/img/articles/$SGrab_323.png
new file mode 100644
index 0000000..e97f343
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_323.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_327.png b/erpnext/docs/assets/img/articles/$SGrab_327.png
new file mode 100644
index 0000000..8e63c70
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_327.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_328.png b/erpnext/docs/assets/img/articles/$SGrab_328.png
new file mode 100644
index 0000000..88882c1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_328.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_329.png b/erpnext/docs/assets/img/articles/$SGrab_329.png
new file mode 100644
index 0000000..fa3711b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_329.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_330.png b/erpnext/docs/assets/img/articles/$SGrab_330.png
new file mode 100644
index 0000000..f1fe4f2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_330.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_331.png b/erpnext/docs/assets/img/articles/$SGrab_331.png
new file mode 100644
index 0000000..3c4d10d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_331.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_349.png b/erpnext/docs/assets/img/articles/$SGrab_349.png
new file mode 100644
index 0000000..dec8468
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_349.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_350.png b/erpnext/docs/assets/img/articles/$SGrab_350.png
new file mode 100644
index 0000000..aa5793a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_350.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_352.png b/erpnext/docs/assets/img/articles/$SGrab_352.png
new file mode 100644
index 0000000..0c34c11
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_352.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_353.png b/erpnext/docs/assets/img/articles/$SGrab_353.png
new file mode 100644
index 0000000..159d2e2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_353.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_383.png b/erpnext/docs/assets/img/articles/$SGrab_383.png
new file mode 100644
index 0000000..720ecdf
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_383.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_384.png b/erpnext/docs/assets/img/articles/$SGrab_384.png
new file mode 100644
index 0000000..d67bcb2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_384.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_385.png b/erpnext/docs/assets/img/articles/$SGrab_385.png
new file mode 100644
index 0000000..c2cad13
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_385.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_386.png b/erpnext/docs/assets/img/articles/$SGrab_386.png
new file mode 100644
index 0000000..e530064
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_386.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_387.png b/erpnext/docs/assets/img/articles/$SGrab_387.png
new file mode 100644
index 0000000..c7ec59b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_387.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_389.png b/erpnext/docs/assets/img/articles/$SGrab_389.png
new file mode 100644
index 0000000..ee1b8cb
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_389.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_390.png b/erpnext/docs/assets/img/articles/$SGrab_390.png
new file mode 100644
index 0000000..b936c07
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_390.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_391.png b/erpnext/docs/assets/img/articles/$SGrab_391.png
new file mode 100644
index 0000000..79595ae
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_391.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_392.png b/erpnext/docs/assets/img/articles/$SGrab_392.png
new file mode 100644
index 0000000..677e7c9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_392.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_393.png b/erpnext/docs/assets/img/articles/$SGrab_393.png
new file mode 100644
index 0000000..9ba5acf
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_393.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_394.png b/erpnext/docs/assets/img/articles/$SGrab_394.png
new file mode 100644
index 0000000..222a5dc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_394.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_406.png b/erpnext/docs/assets/img/articles/$SGrab_406.png
new file mode 100644
index 0000000..022eeb8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_406.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_407.png b/erpnext/docs/assets/img/articles/$SGrab_407.png
new file mode 100644
index 0000000..bc75a10
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_407.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_408.png b/erpnext/docs/assets/img/articles/$SGrab_408.png
new file mode 100644
index 0000000..bcd3d83
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_408.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_418.png b/erpnext/docs/assets/img/articles/$SGrab_418.png
new file mode 100644
index 0000000..f778921
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_418.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_419.png b/erpnext/docs/assets/img/articles/$SGrab_419.png
new file mode 100644
index 0000000..c396ba7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_419.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_420.png b/erpnext/docs/assets/img/articles/$SGrab_420.png
new file mode 100644
index 0000000..9b3522e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_420.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_422.png b/erpnext/docs/assets/img/articles/$SGrab_422.png
new file mode 100644
index 0000000..e1eabe9
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_422.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_428.png b/erpnext/docs/assets/img/articles/$SGrab_428.png
new file mode 100644
index 0000000..4ef2c60
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_428.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_429.png b/erpnext/docs/assets/img/articles/$SGrab_429.png
new file mode 100644
index 0000000..80039fa
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_429.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_431.png b/erpnext/docs/assets/img/articles/$SGrab_431.png
new file mode 100644
index 0000000..ae79a3e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_431.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_432.png b/erpnext/docs/assets/img/articles/$SGrab_432.png
new file mode 100644
index 0000000..cc49d85
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_432.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_439.png b/erpnext/docs/assets/img/articles/$SGrab_439.png
new file mode 100644
index 0000000..2afa5fd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_439.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/$SGrab_440.png b/erpnext/docs/assets/img/articles/$SGrab_440.png
new file mode 100644
index 0000000..6f62d34
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/$SGrab_440.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Order Copy.png b/erpnext/docs/assets/img/articles/Order Copy.png
new file mode 100644
index 0000000..5f7ede8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Order Copy.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_250.png b/erpnext/docs/assets/img/articles/SGrab_250.png
new file mode 100644
index 0000000..d0a24e0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_250.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_282.png b/erpnext/docs/assets/img/articles/SGrab_282.png
new file mode 100644
index 0000000..3fb138a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_282.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_283.png b/erpnext/docs/assets/img/articles/SGrab_283.png
new file mode 100644
index 0000000..d726339
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_283.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_342.png b/erpnext/docs/assets/img/articles/SGrab_342.png
new file mode 100644
index 0000000..c56f211
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_342.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_343.png b/erpnext/docs/assets/img/articles/SGrab_343.png
new file mode 100644
index 0000000..6dd89db
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_343.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/SGrab_344.png b/erpnext/docs/assets/img/articles/SGrab_344.png
new file mode 100644
index 0000000..ce78397
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/SGrab_344.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png
new file mode 100644
index 0000000..804192a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png
new file mode 100644
index 0000000..0b7045b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png
new file mode 100644
index 0000000..59a2351
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png
new file mode 100644
index 0000000..ea5bd6a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png
new file mode 100644
index 0000000..e20b65f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png
new file mode 100644
index 0000000..bdbf34c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png
new file mode 100644
index 0000000..151a0ca
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png
new file mode 100644
index 0000000..c491c0a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png
new file mode 100644
index 0000000..63701a3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png
new file mode 100644
index 0000000..d016ec0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png
new file mode 100644
index 0000000..f446efc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png
new file mode 100644
index 0000000..404a1cd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png
new file mode 100644
index 0000000..8467e6d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png
new file mode 100644
index 0000000..ae9f7fc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png
new file mode 100644
index 0000000..cc16776
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png
new file mode 100644
index 0000000..186732c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png
new file mode 100644
index 0000000..1095cb5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png
new file mode 100644
index 0000000..44fa23f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png
new file mode 100644
index 0000000..ac32083
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png
new file mode 100644
index 0000000..bcb05a3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png
new file mode 100644
index 0000000..d4efcf4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png
new file mode 100644
index 0000000..8b4f089
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png
new file mode 100644
index 0000000..dc52a73
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png
new file mode 100644
index 0000000..dab2750
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png
new file mode 100644
index 0000000..3e14711
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png
new file mode 100644
index 0000000..0dd14f6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png
new file mode 100644
index 0000000..b848b23
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png
new file mode 100644
index 0000000..46c2047
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png
new file mode 100644
index 0000000..f4f2cd2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png
new file mode 100644
index 0000000..8aa9371
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png
new file mode 100644
index 0000000..f7d3cd8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png
new file mode 100644
index 0000000..13de7b7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png
new file mode 100644
index 0000000..631555f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png
new file mode 100644
index 0000000..955c580
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png
new file mode 100644
index 0000000..73bf284
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png
new file mode 100644
index 0000000..a0554c8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png
new file mode 100644
index 0000000..4e73f8e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png b/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png
new file mode 100644
index 0000000..43f9ceb
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_001f1e2ff.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0027e4d09.png b/erpnext/docs/assets/img/articles/Selection_0027e4d09.png
new file mode 100644
index 0000000..488906d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0027e4d09.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0028c9f9a.png b/erpnext/docs/assets/img/articles/Selection_0028c9f9a.png
new file mode 100644
index 0000000..baf3ba0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0028c9f9a.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_003bf981b.png b/erpnext/docs/assets/img/articles/Selection_003bf981b.png
new file mode 100644
index 0000000..1595e1f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_003bf981b.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_005d73bc7.png b/erpnext/docs/assets/img/articles/Selection_005d73bc7.png
new file mode 100644
index 0000000..13b6861
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_005d73bc7.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_00616c670.png b/erpnext/docs/assets/img/articles/Selection_00616c670.png
new file mode 100644
index 0000000..a9b5d45
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_00616c670.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_007f81dc2.png b/erpnext/docs/assets/img/articles/Selection_007f81dc2.png
new file mode 100644
index 0000000..774bac3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_007f81dc2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0085ca13e.png b/erpnext/docs/assets/img/articles/Selection_0085ca13e.png
new file mode 100644
index 0000000..922c13d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0085ca13e.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_010496ae2.png b/erpnext/docs/assets/img/articles/Selection_010496ae2.png
new file mode 100644
index 0000000..f2e2326
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_010496ae2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_01087d575.png b/erpnext/docs/assets/img/articles/Selection_01087d575.png
new file mode 100644
index 0000000..52c6e2d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_01087d575.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_011.png b/erpnext/docs/assets/img/articles/Selection_011.png
new file mode 100644
index 0000000..8bf4cfa
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_011.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0124080f1.png b/erpnext/docs/assets/img/articles/Selection_0124080f1.png
new file mode 100644
index 0000000..cca65ac
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0124080f1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_01244aec7.png b/erpnext/docs/assets/img/articles/Selection_01244aec7.png
new file mode 100644
index 0000000..3a1c50c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_01244aec7.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_013.png b/erpnext/docs/assets/img/articles/Selection_013.png
new file mode 100644
index 0000000..0a76617
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_013.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_014.png b/erpnext/docs/assets/img/articles/Selection_014.png
new file mode 100644
index 0000000..f830942
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_014.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0149d98bf.png b/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
new file mode 100644
index 0000000..2a2d8fb
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_014dd1559.png b/erpnext/docs/assets/img/articles/Selection_014dd1559.png
new file mode 100644
index 0000000..1e4d65c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_014dd1559.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_0173436a8.png b/erpnext/docs/assets/img/articles/Selection_0173436a8.png
new file mode 100644
index 0000000..249a450
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_0173436a8.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_018ef32b6.png b/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
new file mode 100644
index 0000000..7513648
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_019811b13.png b/erpnext/docs/assets/img/articles/Selection_019811b13.png
new file mode 100644
index 0000000..dc669b8
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_019811b13.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_019bf0547.png b/erpnext/docs/assets/img/articles/Selection_019bf0547.png
new file mode 100644
index 0000000..00ffb87
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_019bf0547.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_020f01c1e.png b/erpnext/docs/assets/img/articles/Selection_020f01c1e.png
new file mode 100644
index 0000000..68ccaab
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_020f01c1e.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_021.png b/erpnext/docs/assets/img/articles/Selection_021.png
new file mode 100644
index 0000000..f4a61cf
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_021.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_02178f9d6.png b/erpnext/docs/assets/img/articles/Selection_02178f9d6.png
new file mode 100644
index 0000000..49b9c8c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_02178f9d6.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_021ac61a5.png b/erpnext/docs/assets/img/articles/Selection_021ac61a5.png
new file mode 100644
index 0000000..49ad7e3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_021ac61a5.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_022.png b/erpnext/docs/assets/img/articles/Selection_022.png
new file mode 100644
index 0000000..79eefa7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_022.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_022b7c6d5.png b/erpnext/docs/assets/img/articles/Selection_022b7c6d5.png
new file mode 100644
index 0000000..7c3ca5e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_022b7c6d5.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_026.png b/erpnext/docs/assets/img/articles/Selection_026.png
new file mode 100644
index 0000000..6617068
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_026.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_028.png b/erpnext/docs/assets/img/articles/Selection_028.png
new file mode 100644
index 0000000..cbe0d09
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_028.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_029.png b/erpnext/docs/assets/img/articles/Selection_029.png
new file mode 100644
index 0000000..adee68d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_029.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_030.png b/erpnext/docs/assets/img/articles/Selection_030.png
new file mode 100644
index 0000000..ce37124
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_030.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_043.png b/erpnext/docs/assets/img/articles/Selection_043.png
new file mode 100644
index 0000000..55c7c91
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_043.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_044.png b/erpnext/docs/assets/img/articles/Selection_044.png
new file mode 100644
index 0000000..cbbbd97
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_044.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_046.png b/erpnext/docs/assets/img/articles/Selection_046.png
new file mode 100644
index 0000000..ec00c01
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_046.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_049.png b/erpnext/docs/assets/img/articles/Selection_049.png
new file mode 100644
index 0000000..2cf490e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_049.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_050.png b/erpnext/docs/assets/img/articles/Selection_050.png
new file mode 100644
index 0000000..f3c1b01
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_050.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_052.png b/erpnext/docs/assets/img/articles/Selection_052.png
new file mode 100644
index 0000000..33b758d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_052.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_052f7b160.png b/erpnext/docs/assets/img/articles/Selection_052f7b160.png
new file mode 100644
index 0000000..0ed575e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_052f7b160.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_053.png b/erpnext/docs/assets/img/articles/Selection_053.png
new file mode 100644
index 0000000..d9e509e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_053.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_054.png b/erpnext/docs/assets/img/articles/Selection_054.png
new file mode 100644
index 0000000..a17b1ea
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_054.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_061.png b/erpnext/docs/assets/img/articles/Selection_061.png
new file mode 100644
index 0000000..176d8c5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_061.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_062.png b/erpnext/docs/assets/img/articles/Selection_062.png
new file mode 100644
index 0000000..a230c93
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_062.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_064.png b/erpnext/docs/assets/img/articles/Selection_064.png
new file mode 100644
index 0000000..95a0032
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_064.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_066.png b/erpnext/docs/assets/img/articles/Selection_066.png
new file mode 100644
index 0000000..5a48927
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_066.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_069.png b/erpnext/docs/assets/img/articles/Selection_069.png
new file mode 100644
index 0000000..0e19f82
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_069.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_071.png b/erpnext/docs/assets/img/articles/Selection_071.png
new file mode 100644
index 0000000..86b7cff
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_071.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_072.png b/erpnext/docs/assets/img/articles/Selection_072.png
new file mode 100644
index 0000000..e8dd519
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_072.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_078.png b/erpnext/docs/assets/img/articles/Selection_078.png
new file mode 100644
index 0000000..174cc47
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_078.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_080.png b/erpnext/docs/assets/img/articles/Selection_080.png
new file mode 100644
index 0000000..a1acd6c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_080.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_084.png b/erpnext/docs/assets/img/articles/Selection_084.png
new file mode 100644
index 0000000..a346a74
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_084.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_085.png b/erpnext/docs/assets/img/articles/Selection_085.png
new file mode 100644
index 0000000..d8a5151
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_085.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_433.png b/erpnext/docs/assets/img/articles/Selection_433.png
new file mode 100644
index 0000000..531645c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_433.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_434.png b/erpnext/docs/assets/img/articles/Selection_434.png
new file mode 100644
index 0000000..d1f6a76
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_434.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_435.png b/erpnext/docs/assets/img/articles/Selection_435.png
new file mode 100644
index 0000000..5153871
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_435.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_436.png b/erpnext/docs/assets/img/articles/Selection_436.png
new file mode 100644
index 0000000..097eb3f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_436.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_437.png b/erpnext/docs/assets/img/articles/Selection_437.png
new file mode 100644
index 0000000..1faa12f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_437.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_439.png b/erpnext/docs/assets/img/articles/Selection_439.png
new file mode 100644
index 0000000..5cf5243
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_439.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_440.png b/erpnext/docs/assets/img/articles/Selection_440.png
new file mode 100644
index 0000000..63fb04c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_440.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_442.png b/erpnext/docs/assets/img/articles/Selection_442.png
new file mode 100644
index 0000000..55d0735
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_442.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_443.png b/erpnext/docs/assets/img/articles/Selection_443.png
new file mode 100644
index 0000000..6d045f2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_443.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_445.png b/erpnext/docs/assets/img/articles/Selection_445.png
new file mode 100644
index 0000000..bab8185
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_445.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_446.png b/erpnext/docs/assets/img/articles/Selection_446.png
new file mode 100644
index 0000000..ecd0edd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_446.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_447.png b/erpnext/docs/assets/img/articles/Selection_447.png
new file mode 100644
index 0000000..683c289
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_447.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_576.png b/erpnext/docs/assets/img/articles/Selection_576.png
new file mode 100644
index 0000000..5bc4f70
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_576.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_577.png b/erpnext/docs/assets/img/articles/Selection_577.png
new file mode 100644
index 0000000..abf08a1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_577.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Selection_578.png b/erpnext/docs/assets/img/articles/Selection_578.png
new file mode 100644
index 0000000..db33446
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Selection_578.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Sselection_013.png b/erpnext/docs/assets/img/articles/Sselection_013.png
new file mode 100644
index 0000000..046de3c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Sselection_013.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png b/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png
new file mode 100644
index 0000000..2fc511c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Supplier Item Code in Purchase Order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/Supplier Item Code.png b/erpnext/docs/assets/img/articles/Supplier Item Code.png
new file mode 100644
index 0000000..cea3f14
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/Supplier Item Code.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/allowance_percentage.png b/erpnext/docs/assets/img/articles/allowance_percentage.png
new file mode 100644
index 0000000..519a837
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allowance_percentage.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/allowance_percentage_item.png b/erpnext/docs/assets/img/articles/allowance_percentage_item.png
new file mode 100644
index 0000000..3d30fdc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/allowance_percentage_item.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/delete-company.png b/erpnext/docs/assets/img/articles/delete-company.png
new file mode 100644
index 0000000..17c3bb4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-company.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/delivery-note-barcode.png b/erpnext/docs/assets/img/articles/delivery-note-barcode.png
new file mode 100644
index 0000000..25814c6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delivery-note-barcode.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/feature-setup-barcode.png b/erpnext/docs/assets/img/articles/feature-setup-barcode.png
new file mode 100644
index 0000000..667e3a1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/feature-setup-barcode.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/item-barcode.png b/erpnext/docs/assets/img/articles/item-barcode.png
new file mode 100644
index 0000000..6fd0f72
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-barcode.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinfield.png b/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinfield.png
new file mode 100644
index 0000000..278d7fc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinfield.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png b/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png
new file mode 100644
index 0000000..3feb746
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_allowonsubmit_checkinform.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_custom_name.png b/erpnext/docs/assets/img/articles/kb_custom_name.png
new file mode 100644
index 0000000..4914201
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_custom_name.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_po_forsupp.png b/erpnext/docs/assets/img/articles/kb_po_forsupp.png
new file mode 100644
index 0000000..4c336af
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_po_forsupp.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_po_itemtable.png b/erpnext/docs/assets/img/articles/kb_po_itemtable.png
new file mode 100644
index 0000000..ec7b406
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_po_itemtable.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/kb_po_popup.png b/erpnext/docs/assets/img/articles/kb_po_popup.png
new file mode 100644
index 0000000..f642fdd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/kb_po_popup.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/precision-fieldwise.png b/erpnext/docs/assets/img/articles/precision-fieldwise.png
new file mode 100644
index 0000000..45ad6c0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/precision-fieldwise.png
Binary files differ

diff --git a/erpnext/docs/assets/img/articles/precision-global.png b/erpnext/docs/assets/img/articles/precision-global.png
new file mode 100644
index 0000000..6a5cbc0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/precision-global.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/buying-settings.png b/erpnext/docs/assets/img/buying/buying-settings.png
new file mode 100644
index 0000000..946776e
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/buying-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/material-request.png b/erpnext/docs/assets/img/buying/material-request.png
new file mode 100644
index 0000000..34005b2
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/material-request.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/purchase-order-uom.png b/erpnext/docs/assets/img/buying/purchase-order-uom.png
new file mode 100644
index 0000000..f5c062d
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/purchase-order-uom.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/purchase-order.png b/erpnext/docs/assets/img/buying/purchase-order.png
new file mode 100644
index 0000000..846164d
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/purchase-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/supplier-master.png b/erpnext/docs/assets/img/buying/supplier-master.png
new file mode 100644
index 0000000..7c6a950
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-master.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/supplier-quotation.png b/erpnext/docs/assets/img/buying/supplier-quotation.png
new file mode 100644
index 0000000..a07b4cb
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-quotation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/buying/supplier-type.png b/erpnext/docs/assets/img/buying/supplier-type.png
new file mode 100644
index 0000000..a9641c3
--- /dev/null
+++ b/erpnext/docs/assets/img/buying/supplier-type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/campaign-new-lead.png b/erpnext/docs/assets/img/crm/campaign-new-lead.png
new file mode 100644
index 0000000..e73bcd6
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/campaign-new-lead.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/campaign-view-leads.png b/erpnext/docs/assets/img/crm/campaign-view-leads.png
new file mode 100644
index 0000000..3288787
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/campaign-view-leads.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/campaign.png b/erpnext/docs/assets/img/crm/campaign.png
new file mode 100644
index 0000000..475c1c4
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/campaign.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/contact-from-cust.png b/erpnext/docs/assets/img/crm/contact-from-cust.png
new file mode 100644
index 0000000..09a9c7f
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/contact-from-cust.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/contact.png b/erpnext/docs/assets/img/crm/contact.png
new file mode 100644
index 0000000..3c63ccf
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/contact.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/customer-group-tree.png b/erpnext/docs/assets/img/crm/customer-group-tree.png
new file mode 100644
index 0000000..11bb9a9
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/customer-group-tree.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/customer.png b/erpnext/docs/assets/img/crm/customer.png
new file mode 100644
index 0000000..d4357a7
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/customer.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/lead-to-opportunity.png b/erpnext/docs/assets/img/crm/lead-to-opportunity.png
new file mode 100644
index 0000000..5c82dac
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/lead-to-opportunity.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/lead.png b/erpnext/docs/assets/img/crm/lead.png
new file mode 100644
index 0000000..2b82464
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/lead.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/newsletter-new.png b/erpnext/docs/assets/img/crm/newsletter-new.png
new file mode 100644
index 0000000..da8f6a3
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/newsletter-new.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/newsletter-test.png b/erpnext/docs/assets/img/crm/newsletter-test.png
new file mode 100644
index 0000000..0ceb8ed
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/newsletter-test.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/opportunity.png b/erpnext/docs/assets/img/crm/opportunity.png
new file mode 100644
index 0000000..fb3747a
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/opportunity.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/sales-person-tree.png b/erpnext/docs/assets/img/crm/sales-person-tree.png
new file mode 100644
index 0000000..0cd79a6
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/sales-person-tree.png
Binary files differ

diff --git a/erpnext/docs/assets/img/crm/territory-tree.png b/erpnext/docs/assets/img/crm/territory-tree.png
new file mode 100644
index 0000000..b027394
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/territory-tree.png
Binary files differ

diff --git a/erpnext/docs/assets/img/customize/customize-title.gif b/erpnext/docs/assets/img/customize/customize-title.gif
new file mode 100644
index 0000000..7881a10
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/customize-title.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/customize/editable-title.gif b/erpnext/docs/assets/img/customize/editable-title.gif
new file mode 100644
index 0000000..4eda213
--- /dev/null
+++ b/erpnext/docs/assets/img/customize/editable-title.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/home.png b/erpnext/docs/assets/img/home.png
new file mode 100644
index 0000000..2b9102e
--- /dev/null
+++ b/erpnext/docs/assets/img/home.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/appraisal-employee.png b/erpnext/docs/assets/img/human-resources/appraisal-employee.png
new file mode 100644
index 0000000..5c8f5dd
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/appraisal-employee.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/appraisal.png b/erpnext/docs/assets/img/human-resources/appraisal.png
new file mode 100644
index 0000000..b3f769c
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/appraisal.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/attendence-upload.png b/erpnext/docs/assets/img/human-resources/attendence-upload.png
new file mode 100644
index 0000000..d3394c2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/attendence-upload.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/attendence.png b/erpnext/docs/assets/img/human-resources/attendence.png
new file mode 100644
index 0000000..880c9a4
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/attendence.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/branch.png b/erpnext/docs/assets/img/human-resources/branch.png
new file mode 100644
index 0000000..0c5846b
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/branch.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/deduction-type.png b/erpnext/docs/assets/img/human-resources/deduction-type.png
new file mode 100644
index 0000000..86aba4c
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/deduction-type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/department.png b/erpnext/docs/assets/img/human-resources/department.png
new file mode 100644
index 0000000..78cdcc9
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/department.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/designation.png b/erpnext/docs/assets/img/human-resources/designation.png
new file mode 100644
index 0000000..f625cc8
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/designation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/earning-type.png b/erpnext/docs/assets/img/human-resources/earning-type.png
new file mode 100644
index 0000000..ca5f484
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/earning-type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/email-account.png b/erpnext/docs/assets/img/human-resources/email-account.png
new file mode 100644
index 0000000..089891e
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/email-account.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employee-birthday-report.png b/erpnext/docs/assets/img/human-resources/employee-birthday-report.png
new file mode 100644
index 0000000..c6ca377
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-birthday-report.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employee-information-report.png b/erpnext/docs/assets/img/human-resources/employee-information-report.png
new file mode 100644
index 0000000..dc276f3
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-information-report.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employee-leave-approver.png b/erpnext/docs/assets/img/human-resources/employee-leave-approver.png
new file mode 100644
index 0000000..2ae98d7
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-leave-approver.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employee-leave-balance-report.png b/erpnext/docs/assets/img/human-resources/employee-leave-balance-report.png
new file mode 100644
index 0000000..5af5ae7
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-leave-balance-report.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employee.png b/erpnext/docs/assets/img/human-resources/employee.png
new file mode 100644
index 0000000..ec2e70e
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/employment-type.png b/erpnext/docs/assets/img/human-resources/employment-type.png
new file mode 100644
index 0000000..eb44807
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employment-type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/expense_claim.png b/erpnext/docs/assets/img/human-resources/expense_claim.png
new file mode 100644
index 0000000..ddca100
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/expense_claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/holiday-list.png b/erpnext/docs/assets/img/human-resources/holiday-list.png
new file mode 100644
index 0000000..94dbee8
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/holiday-list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/hr-settings.png b/erpnext/docs/assets/img/human-resources/hr-settings.png
new file mode 100644
index 0000000..fe2e735
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/hr-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/job-applicant.png b/erpnext/docs/assets/img/human-resources/job-applicant.png
new file mode 100644
index 0000000..17a372b
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/job-applicant.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/job-opening.png b/erpnext/docs/assets/img/human-resources/job-opening.png
new file mode 100644
index 0000000..148193a
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/job-opening.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/leave-allocation.png b/erpnext/docs/assets/img/human-resources/leave-allocation.png
new file mode 100644
index 0000000..4a154e9
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-allocation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/leave-application.png b/erpnext/docs/assets/img/human-resources/leave-application.png
new file mode 100644
index 0000000..761e76b
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-application.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/leave-type.png b/erpnext/docs/assets/img/human-resources/leave-type.png
new file mode 100644
index 0000000..4f04291
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/leave-type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/monthly-attendance-sheet-report.png b/erpnext/docs/assets/img/human-resources/monthly-attendance-sheet-report.png
new file mode 100644
index 0000000..db5191d
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/monthly-attendance-sheet-report.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/monthly-salary-register-report.png b/erpnext/docs/assets/img/human-resources/monthly-salary-register-report.png
new file mode 100644
index 0000000..7d2b032
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/monthly-salary-register-report.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/offer-letter-print.png b/erpnext/docs/assets/img/human-resources/offer-letter-print.png
new file mode 100644
index 0000000..5d63750
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/offer-letter-print.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/offer-letter.png b/erpnext/docs/assets/img/human-resources/offer-letter.png
new file mode 100644
index 0000000..e3d5671
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/offer-letter.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/process-payroll.png b/erpnext/docs/assets/img/human-resources/process-payroll.png
new file mode 100644
index 0000000..ebbd9ae
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/process-payroll.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/salary-slip.png b/erpnext/docs/assets/img/human-resources/salary-slip.png
new file mode 100644
index 0000000..d3f77cd
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/salary-slip.png
Binary files differ

diff --git a/erpnext/docs/assets/img/human-resources/salary-structure.png b/erpnext/docs/assets/img/human-resources/salary-structure.png
new file mode 100644
index 0000000..af850ee
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/salary-structure.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-FG-update-qty.png b/erpnext/docs/assets/img/manufacturing/PO-FG-update-qty.png
new file mode 100644
index 0000000..1ee59ec
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-FG-update-qty.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
new file mode 100644
index 0000000..b07a7cf
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-SE-for-material-transfer.png b/erpnext/docs/assets/img/manufacturing/PO-SE-for-material-transfer.png
new file mode 100644
index 0000000..74e1f64
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-SE-for-material-transfer.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
new file mode 100644
index 0000000..e8dea02
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
new file mode 100644
index 0000000..5c20ff8
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
new file mode 100644
index 0000000..dbdc303
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations-make-tl.png b/erpnext/docs/assets/img/manufacturing/PO-operations-make-tl.png
new file mode 100644
index 0000000..1bc2720
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations-make-tl.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations.png b/erpnext/docs/assets/img/manufacturing/PO-operations.png
new file mode 100644
index 0000000..6916891
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-reassigning-operations.png b/erpnext/docs/assets/img/manufacturing/PO-reassigning-operations.png
new file mode 100644
index 0000000..0970a54
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-reassigning-operations.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/PO-stop.png b/erpnext/docs/assets/img/manufacturing/PO-stop.png
new file mode 100644
index 0000000..c486a68
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-stop.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom-costing.png b/erpnext/docs/assets/img/manufacturing/bom-costing.png
new file mode 100644
index 0000000..6cb6a3f
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom-costing.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom-exploded.png b/erpnext/docs/assets/img/manufacturing/bom-exploded.png
new file mode 100644
index 0000000..c71e6d9
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom-exploded.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom-operations.png b/erpnext/docs/assets/img/manufacturing/bom-operations.png
new file mode 100644
index 0000000..04e8a12
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom-operations.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom-replace-tool.png b/erpnext/docs/assets/img/manufacturing/bom-replace-tool.png
new file mode 100644
index 0000000..51ac993
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom-replace-tool.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom-update-cost.png b/erpnext/docs/assets/img/manufacturing/bom-update-cost.png
new file mode 100644
index 0000000..6d467d0
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom-update-cost.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/bom.png b/erpnext/docs/assets/img/manufacturing/bom.png
new file mode 100644
index 0000000..0adf255
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/bom.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png
new file mode 100644
index 0000000..18b28dd
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing.png b/erpnext/docs/assets/img/manufacturing/manufacturing.png
new file mode 100644
index 0000000..75d7d3c
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/operation.png b/erpnext/docs/assets/img/manufacturing/operation.png
new file mode 100644
index 0000000..4cd045c
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/operation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/ppt-create-material-request.png b/erpnext/docs/assets/img/manufacturing/ppt-create-material-request.png
new file mode 100644
index 0000000..35fba3a
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/ppt-create-material-request.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/ppt-create-production-order.png b/erpnext/docs/assets/img/manufacturing/ppt-create-production-order.png
new file mode 100644
index 0000000..26185ac
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/ppt-create-production-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/ppt-get-item.png b/erpnext/docs/assets/img/manufacturing/ppt-get-item.png
new file mode 100644
index 0000000..e89efea
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/ppt-get-item.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/ppt-get-sales-orders.png b/erpnext/docs/assets/img/manufacturing/ppt-get-sales-orders.png
new file mode 100644
index 0000000..379e007
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/ppt-get-sales-orders.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/ppt.png b/erpnext/docs/assets/img/manufacturing/ppt.png
new file mode 100644
index 0000000..f5018b7
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/ppt.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/production-order.png b/erpnext/docs/assets/img/manufacturing/production-order.png
new file mode 100644
index 0000000..d1e7966
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/production-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/manufacturing/workstation.png b/erpnext/docs/assets/img/manufacturing/workstation.png
new file mode 100644
index 0000000..df6486b
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/workstation.png
Binary files differ

diff --git a/erpnext/docs/assets/img/pos-setting/pos-setting.png b/erpnext/docs/assets/img/pos-setting/pos-setting.png
new file mode 100644
index 0000000..6061199
--- /dev/null
+++ b/erpnext/docs/assets/img/pos-setting/pos-setting.png
Binary files differ

diff --git a/erpnext/docs/assets/img/price-list/price-list.png b/erpnext/docs/assets/img/price-list/price-list.png
new file mode 100644
index 0000000..93a0183
--- /dev/null
+++ b/erpnext/docs/assets/img/price-list/price-list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/activity_cost.png b/erpnext/docs/assets/img/project/activity_cost.png
new file mode 100644
index 0000000..d7468a0
--- /dev/null
+++ b/erpnext/docs/assets/img/project/activity_cost.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/activity_type.png b/erpnext/docs/assets/img/project/activity_type.png
new file mode 100644
index 0000000..e10cce1
--- /dev/null
+++ b/erpnext/docs/assets/img/project/activity_type.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project.png b/erpnext/docs/assets/img/project/project.png
new file mode 100644
index 0000000..c6bcd92
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_cost_center.png b/erpnext/docs/assets/img/project/project_cost_center.png
new file mode 100644
index 0000000..09bd557
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_cost_center.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_costing.png b/erpnext/docs/assets/img/project/project_costing.png
new file mode 100644
index 0000000..997e613
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_costing.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_expense_claim_link.png b/erpnext/docs/assets/img/project/project_expense_claim_link.png
new file mode 100644
index 0000000..077cea1
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_expense_claim_link.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_gantt_chart.png b/erpnext/docs/assets/img/project/project_gantt_chart.png
new file mode 100644
index 0000000..3eba443
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_gantt_chart.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_sales_order.png b/erpnext/docs/assets/img/project/project_sales_order.png
new file mode 100644
index 0000000..ff4030d
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_sales_order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_task.png b/erpnext/docs/assets/img/project/project_task.png
new file mode 100644
index 0000000..88f1e68
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_task.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_task_grid.png b/erpnext/docs/assets/img/project/project_task_grid.png
new file mode 100644
index 0000000..935fba6
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_task_grid.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_task_list.png b/erpnext/docs/assets/img/project/project_task_list.png
new file mode 100644
index 0000000..2a59caf
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_task_list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_time_log_link.png b/erpnext/docs/assets/img/project/project_time_log_link.png
new file mode 100644
index 0000000..08ac36c
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_time_log_link.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_time_log_list.png b/erpnext/docs/assets/img/project/project_time_log_list.png
new file mode 100644
index 0000000..3b3724b
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_time_log_list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_total_expense_claim.png b/erpnext/docs/assets/img/project/project_total_expense_claim.png
new file mode 100644
index 0000000..cbd3c01
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_total_expense_claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_view_expense_claim.png b/erpnext/docs/assets/img/project/project_view_expense_claim.png
new file mode 100644
index 0000000..32056ca
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_view_expense_claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_view_gantt_chart.png b/erpnext/docs/assets/img/project/project_view_gantt_chart.png
new file mode 100644
index 0000000..7039a45
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_view_gantt_chart.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_view_task.png b/erpnext/docs/assets/img/project/project_view_task.png
new file mode 100644
index 0000000..dfdff8b
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_view_task.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/project_view_time_log.png b/erpnext/docs/assets/img/project/project_view_time_log.png
new file mode 100644
index 0000000..dbf184e
--- /dev/null
+++ b/erpnext/docs/assets/img/project/project_view_time_log.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task.png b/erpnext/docs/assets/img/project/task.png
new file mode 100644
index 0000000..6fe239d
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_depends_on.png b/erpnext/docs/assets/img/project/task_depends_on.png
new file mode 100644
index 0000000..2bbc393
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_depends_on.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_expense_claim_link.png b/erpnext/docs/assets/img/project/task_expense_claim_link.png
new file mode 100644
index 0000000..8583a74
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_expense_claim_link.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_status.png b/erpnext/docs/assets/img/project/task_status.png
new file mode 100644
index 0000000..c3424cb
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_status.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_time_log_link.png b/erpnext/docs/assets/img/project/task_time_log_link.png
new file mode 100644
index 0000000..d713b98
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_time_log_link.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_time_log_list.png b/erpnext/docs/assets/img/project/task_time_log_list.png
new file mode 100644
index 0000000..97218c1
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_time_log_list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_total_expense_claim.png b/erpnext/docs/assets/img/project/task_total_expense_claim.png
new file mode 100644
index 0000000..29fa6f9
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_total_expense_claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_view_expense_claim.png b/erpnext/docs/assets/img/project/task_view_expense_claim.png
new file mode 100644
index 0000000..efcb87f
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_view_expense_claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/task_view_time_log.png b/erpnext/docs/assets/img/project/task_view_time_log.png
new file mode 100644
index 0000000..4104842
--- /dev/null
+++ b/erpnext/docs/assets/img/project/task_view_time_log.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log.png b/erpnext/docs/assets/img/project/time_log.png
new file mode 100644
index 0000000..4d92a6c
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_batch.gif b/erpnext/docs/assets/img/project/time_log_batch.gif
new file mode 100644
index 0000000..35ff14d
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_batch.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_batch_make_invoice.png b/erpnext/docs/assets/img/project/time_log_batch_make_invoice.png
new file mode 100644
index 0000000..2ac4475
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_batch_make_invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_batch_sales_invoice.png b/erpnext/docs/assets/img/project/time_log_batch_sales_invoice.png
new file mode 100644
index 0000000..4fef5f2
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_batch_sales_invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_calendar_day.gif b/erpnext/docs/assets/img/project/time_log_calendar_day.gif
new file mode 100644
index 0000000..11deb23
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_calendar_day.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_calendar_week.gif b/erpnext/docs/assets/img/project/time_log_calendar_week.gif
new file mode 100644
index 0000000..8d81083
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_calendar_week.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_costing.png b/erpnext/docs/assets/img/project/time_log_costing.png
new file mode 100644
index 0000000..dda98f8
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_costing.png
Binary files differ

diff --git a/erpnext/docs/assets/img/project/time_log_view_calendar.png b/erpnext/docs/assets/img/project/time_log_view_calendar.png
new file mode 100644
index 0000000..0118dfb
--- /dev/null
+++ b/erpnext/docs/assets/img/project/time_log_view_calendar.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/close-sales-order.png b/erpnext/docs/assets/img/selling/close-sales-order.png
new file mode 100644
index 0000000..be8c40f
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/close-sales-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/drop-ship-print-format.png b/erpnext/docs/assets/img/selling/drop-ship-print-format.png
new file mode 100644
index 0000000..2e34da9
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/drop-ship-print-format.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/drop-ship-purchase-order.png b/erpnext/docs/assets/img/selling/drop-ship-purchase-order.png
new file mode 100644
index 0000000..5703cdd
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/drop-ship-purchase-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/drop-ship-sales-order.png b/erpnext/docs/assets/img/selling/drop-ship-sales-order.png
new file mode 100644
index 0000000..6e17f67
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/drop-ship-sales-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/make-SO-from-quote.png b/erpnext/docs/assets/img/selling/make-SO-from-quote.png
new file mode 100644
index 0000000..c3c6b38
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/make-SO-from-quote.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/make-quotation.gif b/erpnext/docs/assets/img/selling/make-quotation.gif
new file mode 100644
index 0000000..c707a70
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/make-quotation.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/make-quote-from-opp.png b/erpnext/docs/assets/img/selling/make-quote-from-opp.png
new file mode 100644
index 0000000..3acfa9a
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/make-quote-from-opp.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/make-so.gif b/erpnext/docs/assets/img/selling/make-so.gif
new file mode 100644
index 0000000..5edd19b
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/make-so.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/product-bundle.gif b/erpnext/docs/assets/img/selling/product-bundle.gif
new file mode 100644
index 0000000..a488e5d
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/product-bundle.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/product-bundle.png b/erpnext/docs/assets/img/selling/product-bundle.png
new file mode 100644
index 0000000..0264518
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/product-bundle.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/recurring-sales-order.png b/erpnext/docs/assets/img/selling/recurring-sales-order.png
new file mode 100644
index 0000000..c509333
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/recurring-sales-order.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/sales-partner-website.png b/erpnext/docs/assets/img/selling/sales-partner-website.png
new file mode 100644
index 0000000..3d84b10
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-partner-website.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/sales-partner.png b/erpnext/docs/assets/img/selling/sales-partner.png
new file mode 100644
index 0000000..2c14edc
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/sales-partner.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/selling-settings.png b/erpnext/docs/assets/img/selling/selling-settings.png
new file mode 100644
index 0000000..345735b
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/selling-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/setup-drop-ship-on-item-master.png b/erpnext/docs/assets/img/selling/setup-drop-ship-on-item-master.png
new file mode 100644
index 0000000..0e0d0e5
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/setup-drop-ship-on-item-master.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/setup-drop-ship-on-sales-order-item.png b/erpnext/docs/assets/img/selling/setup-drop-ship-on-sales-order-item.png
new file mode 100644
index 0000000..1c49ebd
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/setup-drop-ship-on-sales-order-item.png
Binary files differ

diff --git a/erpnext/docs/assets/img/selling/shipping-rule.png b/erpnext/docs/assets/img/selling/shipping-rule.png
new file mode 100644
index 0000000..7cd9b46
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/shipping-rule.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-10.png b/erpnext/docs/assets/img/setup-wizard/step-10.png
new file mode 100644
index 0000000..4687999
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-10.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-2.png b/erpnext/docs/assets/img/setup-wizard/step-2.png
new file mode 100644
index 0000000..7330004
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-3.png b/erpnext/docs/assets/img/setup-wizard/step-3.png
new file mode 100644
index 0000000..7aac64a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-4.png b/erpnext/docs/assets/img/setup-wizard/step-4.png
new file mode 100644
index 0000000..cee29fc
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-4.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-5.png b/erpnext/docs/assets/img/setup-wizard/step-5.png
new file mode 100644
index 0000000..a770f3e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-5.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-6.png b/erpnext/docs/assets/img/setup-wizard/step-6.png
new file mode 100644
index 0000000..db2bf38
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-6.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-7.png b/erpnext/docs/assets/img/setup-wizard/step-7.png
new file mode 100644
index 0000000..02c6da6
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-7.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-8.png b/erpnext/docs/assets/img/setup-wizard/step-8.png
new file mode 100644
index 0000000..18f8d88
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-8.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup-wizard/step-9.png b/erpnext/docs/assets/img/setup-wizard/step-9.png
new file mode 100644
index 0000000..dced6e0
--- /dev/null
+++ b/erpnext/docs/assets/img/setup-wizard/step-9.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/auth-rule.png b/erpnext/docs/assets/img/setup/auth-rule.png
new file mode 100644
index 0000000..f6999cd
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/auth-rule.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/barcode-1.png b/erpnext/docs/assets/img/setup/barcode-1.png
new file mode 100644
index 0000000..c200a13
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/barcode-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/barcode-2.png b/erpnext/docs/assets/img/setup/barcode-2.png
new file mode 100644
index 0000000..6ea4529
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/barcode-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/Doctype-all-fields.png b/erpnext/docs/assets/img/setup/customize/Doctype-all-fields.png
new file mode 100644
index 0000000..3a08267
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/Doctype-all-fields.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/Doctype-book-added.png b/erpnext/docs/assets/img/setup/customize/Doctype-book-added.png
new file mode 100644
index 0000000..1b5f643
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/Doctype-book-added.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/Doctype-list-view.png b/erpnext/docs/assets/img/setup/customize/Doctype-list-view.png
new file mode 100644
index 0000000..5edb604
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/Doctype-list-view.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/Doctype-permissions.png b/erpnext/docs/assets/img/setup/customize/Doctype-permissions.png
new file mode 100644
index 0000000..9f9bfcc
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/Doctype-permissions.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/Doctype-save.png b/erpnext/docs/assets/img/setup/customize/Doctype-save.png
new file mode 100644
index 0000000..5d11650
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/Doctype-save.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/doctype-basics.png b/erpnext/docs/assets/img/setup/customize/doctype-basics.png
new file mode 100644
index 0000000..2fbede1
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/doctype-basics.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/customize/doctype-field-naming.png b/erpnext/docs/assets/img/setup/customize/doctype-field-naming.png
new file mode 100644
index 0000000..7f91637
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/customize/doctype-field-naming.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-1.png b/erpnext/docs/assets/img/setup/data-import/data-import-1.png
new file mode 100644
index 0000000..96d7bb4
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-2.png b/erpnext/docs/assets/img/setup/data-import/data-import-2.png
new file mode 100644
index 0000000..90d0449
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-3.png b/erpnext/docs/assets/img/setup/data-import/data-import-3.png
new file mode 100644
index 0000000..971fff5
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/data/rename.png b/erpnext/docs/assets/img/setup/data/rename.png
new file mode 100644
index 0000000..0a922e1
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data/rename.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-account-incoming.png b/erpnext/docs/assets/img/setup/email/email-account-incoming.png
new file mode 100644
index 0000000..8ef4f28
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-account-incoming.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-account-list.png b/erpnext/docs/assets/img/setup/email/email-account-list.png
new file mode 100644
index 0000000..10ba12c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-account-list.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-account-sending.png b/erpnext/docs/assets/img/setup/email/email-account-sending.png
new file mode 100644
index 0000000..81bb73d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-account-sending.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-account-unreplied.png b/erpnext/docs/assets/img/setup/email/email-account-unreplied.png
new file mode 100644
index 0000000..bb105ad
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-account-unreplied.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-alert-1.png b/erpnext/docs/assets/img/setup/email/email-alert-1.png
new file mode 100644
index 0000000..4af172d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-alert-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-alert-2.png b/erpnext/docs/assets/img/setup/email/email-alert-2.png
new file mode 100644
index 0000000..3856f89
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-alert-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/email-digest.png b/erpnext/docs/assets/img/setup/email/email-digest.png
new file mode 100644
index 0000000..4197ed8
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-digest.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/email/send-email.gif b/erpnext/docs/assets/img/setup/email/send-email.gif
new file mode 100644
index 0000000..cdd3079
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/send-email.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/address-format.png b/erpnext/docs/assets/img/setup/print/address-format.png
new file mode 100644
index 0000000..f63108a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/address-format.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/letter-head-1.png b/erpnext/docs/assets/img/setup/print/letter-head-1.png
new file mode 100644
index 0000000..8be8ce2
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/letter-head-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/letter-head.png b/erpnext/docs/assets/img/setup/print/letter-head.png
new file mode 100644
index 0000000..d316aae
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/letter-head.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-format-builder-1.gif b/erpnext/docs/assets/img/setup/print/print-format-builder-1.gif
new file mode 100644
index 0000000..a788470
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-format-builder-1.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-format-builder-2.gif b/erpnext/docs/assets/img/setup/print/print-format-builder-2.gif
new file mode 100644
index 0000000..cb78725
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-format-builder-2.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-format-builder-3.gif b/erpnext/docs/assets/img/setup/print/print-format-builder-3.gif
new file mode 100644
index 0000000..8502b1a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-format-builder-3.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-format-builder-4.gif b/erpnext/docs/assets/img/setup/print/print-format-builder-4.gif
new file mode 100644
index 0000000..b1b241c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-format-builder-4.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-heading-1.png b/erpnext/docs/assets/img/setup/print/print-heading-1.png
new file mode 100644
index 0000000..292ad52
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-heading-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-heading.png b/erpnext/docs/assets/img/setup/print/print-heading.png
new file mode 100644
index 0000000..a2a4010
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-heading.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/print-settings.png b/erpnext/docs/assets/img/setup/print/print-settings.png
new file mode 100644
index 0000000..9c43dce
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/print-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/terms-1.png b/erpnext/docs/assets/img/setup/print/terms-1.png
new file mode 100644
index 0000000..235e2af
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/terms-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/terms-2.png b/erpnext/docs/assets/img/setup/print/terms-2.png
new file mode 100644
index 0000000..7b715be
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/terms-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/print/terms-3.png b/erpnext/docs/assets/img/setup/print/terms-3.png
new file mode 100644
index 0000000..51c1017
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/print/terms-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/settings/global-defaults.png b/erpnext/docs/assets/img/setup/settings/global-defaults.png
new file mode 100644
index 0000000..1db693e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/settings/global-defaults.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/settings/naming-series.gif b/erpnext/docs/assets/img/setup/settings/naming-series.gif
new file mode 100644
index 0000000..211f93b
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/settings/naming-series.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/settings/show-hide-modules.png b/erpnext/docs/assets/img/setup/settings/show-hide-modules.png
new file mode 100644
index 0000000..3b86680
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/settings/show-hide-modules.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/settings/system-settings.png b/erpnext/docs/assets/img/setup/settings/system-settings.png
new file mode 100644
index 0000000..7bab5de
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/settings/system-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/stock-recon-1.png b/erpnext/docs/assets/img/setup/stock-recon-1.png
new file mode 100644
index 0000000..7990531
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/stock-recon-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/stock-recon-2.png b/erpnext/docs/assets/img/setup/stock-recon-2.png
new file mode 100644
index 0000000..42ea3e6
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/stock-recon-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/users/share.gif b/erpnext/docs/assets/img/setup/users/share.gif
new file mode 100644
index 0000000..f32aeea
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/share.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/users/user-1.png b/erpnext/docs/assets/img/setup/users/user-1.png
new file mode 100644
index 0000000..5529109
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/users/user-2.png b/erpnext/docs/assets/img/setup/users/user-2.png
new file mode 100644
index 0000000..b2c4969
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/users/user-3.png b/erpnext/docs/assets/img/setup/users/user-3.png
new file mode 100644
index 0000000..0e2af91
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-3.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/users/user-4.png b/erpnext/docs/assets/img/setup/users/user-4.png
new file mode 100644
index 0000000..807a05c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-4.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/workflow-1.png b/erpnext/docs/assets/img/setup/workflow-1.png
new file mode 100644
index 0000000..632e1fb
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/setup/workflow-2.png b/erpnext/docs/assets/img/setup/workflow-2.png
new file mode 100644
index 0000000..2041860
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-2.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/additional-costs-general-ledger.png b/erpnext/docs/assets/img/stock/additional-costs-general-ledger.png
new file mode 100644
index 0000000..edad86f
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/additional-costs-general-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/additional-costs-table.png b/erpnext/docs/assets/img/stock/additional-costs-table.png
new file mode 100644
index 0000000..ae53973
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/additional-costs-table.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/batch.png b/erpnext/docs/assets/img/stock/batch.png
new file mode 100644
index 0000000..406acbd
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/batch.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/delivery-note.png b/erpnext/docs/assets/img/stock/delivery-note.png
new file mode 100644
index 0000000..9356495
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/delivery-note.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/installation-note.png b/erpnext/docs/assets/img/stock/installation-note.png
new file mode 100644
index 0000000..fe6100e
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/installation-note.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-attribute-non-numeric.png b/erpnext/docs/assets/img/stock/item-attribute-non-numeric.png
new file mode 100644
index 0000000..bf986fb
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-attribute-non-numeric.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-attribute-numeric.png b/erpnext/docs/assets/img/stock/item-attribute-numeric.png
new file mode 100644
index 0000000..b06dbd1
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-attribute-numeric.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-attribute.png b/erpnext/docs/assets/img/stock/item-attribute.png
new file mode 100644
index 0000000..8e8b3c1
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-attribute.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-attributes.png b/erpnext/docs/assets/img/stock/item-attributes.png
new file mode 100644
index 0000000..a78b76e
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-attributes.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-group-del.gif b/erpnext/docs/assets/img/stock/item-group-del.gif
new file mode 100644
index 0000000..94513e8
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-group-del.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-group-new.gif b/erpnext/docs/assets/img/stock/item-group-new.gif
new file mode 100644
index 0000000..6a042b1
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-group-new.gif
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-group-tree.png b/erpnext/docs/assets/img/stock/item-group-tree.png
new file mode 100644
index 0000000..23a6d45
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-group-tree.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/item-has-variants.png b/erpnext/docs/assets/img/stock/item-has-variants.png
new file mode 100644
index 0000000..903a63c
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/item-has-variants.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/landed-cost.png b/erpnext/docs/assets/img/stock/landed-cost.png
new file mode 100644
index 0000000..acaebb1
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/landed-cost.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/make-variant-1.png b/erpnext/docs/assets/img/stock/make-variant-1.png
new file mode 100644
index 0000000..5b9f2d5
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/make-variant-1.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/make-variant.png b/erpnext/docs/assets/img/stock/make-variant.png
new file mode 100644
index 0000000..787e842
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/make-variant.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/packing-slip.png b/erpnext/docs/assets/img/stock/packing-slip.png
new file mode 100644
index 0000000..df2fa5f
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/packing-slip.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/purchase-receipt.png b/erpnext/docs/assets/img/stock/purchase-receipt.png
new file mode 100644
index 0000000..496a3b5
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/purchase-receipt.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/purchase-return-against-purchase-receipt.png b/erpnext/docs/assets/img/stock/purchase-return-against-purchase-receipt.png
new file mode 100644
index 0000000..e75d0e7
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/purchase-return-against-purchase-receipt.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/purchase-return-general-ledger.png b/erpnext/docs/assets/img/stock/purchase-return-general-ledger.png
new file mode 100644
index 0000000..2444209
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/purchase-return-general-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/purchase-return-original-purchase-receipt.png b/erpnext/docs/assets/img/stock/purchase-return-original-purchase-receipt.png
new file mode 100644
index 0000000..7519007
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/purchase-return-original-purchase-receipt.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/purchase-return-stock-ledger.png b/erpnext/docs/assets/img/stock/purchase-return-stock-ledger.png
new file mode 100644
index 0000000..24020be
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/purchase-return-stock-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/quality-inspection.png b/erpnext/docs/assets/img/stock/quality-inspection.png
new file mode 100644
index 0000000..3707155
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/quality-inspection.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/sales-return-against-delivery-note.png b/erpnext/docs/assets/img/stock/sales-return-against-delivery-note.png
new file mode 100644
index 0000000..dcca634
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sales-return-against-delivery-note.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/sales-return-against-sales-invoice.png b/erpnext/docs/assets/img/stock/sales-return-against-sales-invoice.png
new file mode 100644
index 0000000..96ec8b4
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sales-return-against-sales-invoice.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/sales-return-general-ledger.png b/erpnext/docs/assets/img/stock/sales-return-general-ledger.png
new file mode 100644
index 0000000..127ad37
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sales-return-general-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/sales-return-original-delivery-note.png b/erpnext/docs/assets/img/stock/sales-return-original-delivery-note.png
new file mode 100644
index 0000000..82755cb
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sales-return-original-delivery-note.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/sales-return-stock-ledger.png b/erpnext/docs/assets/img/stock/sales-return-stock-ledger.png
new file mode 100644
index 0000000..d9ed144
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/sales-return-stock-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/serial-no.png b/erpnext/docs/assets/img/stock/serial-no.png
new file mode 100644
index 0000000..3738433
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/serial-no.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/stock-entry-item-valuation-rate.png b/erpnext/docs/assets/img/stock/stock-entry-item-valuation-rate.png
new file mode 100644
index 0000000..58c36dd
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/stock-entry-item-valuation-rate.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/stock-entry.png b/erpnext/docs/assets/img/stock/stock-entry.png
new file mode 100644
index 0000000..30941b9
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/stock-entry.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/stock-settings.png b/erpnext/docs/assets/img/stock/stock-settings.png
new file mode 100644
index 0000000..0065a92
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/stock-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/stock/warehouse.png b/erpnext/docs/assets/img/stock/warehouse.png
new file mode 100644
index 0000000..6b968d3
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/warehouse.png
Binary files differ

diff --git a/erpnext/docs/assets/img/support/issue.png b/erpnext/docs/assets/img/support/issue.png
new file mode 100644
index 0000000..b28579b
--- /dev/null
+++ b/erpnext/docs/assets/img/support/issue.png
Binary files differ

diff --git a/erpnext/docs/assets/img/support/maintenance-schedule.png b/erpnext/docs/assets/img/support/maintenance-schedule.png
new file mode 100644
index 0000000..8af0cbe
--- /dev/null
+++ b/erpnext/docs/assets/img/support/maintenance-schedule.png
Binary files differ

diff --git a/erpnext/docs/assets/img/support/maintenance-visit.png b/erpnext/docs/assets/img/support/maintenance-visit.png
new file mode 100644
index 0000000..6212860
--- /dev/null
+++ b/erpnext/docs/assets/img/support/maintenance-visit.png
Binary files differ

diff --git a/erpnext/docs/assets/img/support/warranty-claim.png b/erpnext/docs/assets/img/support/warranty-claim.png
new file mode 100644
index 0000000..39cfb5f
--- /dev/null
+++ b/erpnext/docs/assets/img/support/warranty-claim.png
Binary files differ

diff --git a/erpnext/docs/assets/img/taxes/inclusive-tax.png b/erpnext/docs/assets/img/taxes/inclusive-tax.png
new file mode 100644
index 0000000..9bd76e1
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes/inclusive-tax.png
Binary files differ

diff --git a/erpnext/docs/assets/img/taxes/item-tax.png b/erpnext/docs/assets/img/taxes/item-tax.png
new file mode 100644
index 0000000..6b70ef5
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes/item-tax.png
Binary files differ

diff --git a/erpnext/docs/assets/img/taxes/sales-tax-master.png b/erpnext/docs/assets/img/taxes/sales-tax-master.png
new file mode 100644
index 0000000..f832454
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes/sales-tax-master.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-role.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-role.png
new file mode 100644
index 0000000..4fb5a8f
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-employee-role.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png
new file mode 100644
index 0000000..2a260c1
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png
new file mode 100644
index 0000000..eab8d57
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png
new file mode 100644
index 0000000..032707a
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application.png
new file mode 100644
index 0000000..cd4e38f
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-application.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png
new file mode 100644
index 0000000..b7b6770
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png
new file mode 100644
index 0000000..e23f122
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permission-user-limited-by-company.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png
new file mode 100644
index 0000000..0aececd
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-role-all.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png
new file mode 100644
index 0000000..6d78e5d
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png
new file mode 100644
index 0000000..e091a61
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-company.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png
new file mode 100644
index 0000000..5f55e37
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png
new file mode 100644
index 0000000..23564fa
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png
Binary files differ

diff --git a/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png b/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png
new file mode 100644
index 0000000..dd9ed49
--- /dev/null
+++ b/erpnext/docs/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png
Binary files differ

diff --git a/erpnext/docs/assets/img/videos/conf-2014.jpg b/erpnext/docs/assets/img/videos/conf-2014.jpg
new file mode 100644
index 0000000..50e2ae9
--- /dev/null
+++ b/erpnext/docs/assets/img/videos/conf-2014.jpg
Binary files differ

diff --git a/erpnext/docs/assets/img/videos/learn.jpg b/erpnext/docs/assets/img/videos/learn.jpg
new file mode 100644
index 0000000..45e48e2
--- /dev/null
+++ b/erpnext/docs/assets/img/videos/learn.jpg
Binary files differ

diff --git a/erpnext/docs/assets/img/website/banner.png b/erpnext/docs/assets/img/website/banner.png
new file mode 100644
index 0000000..600cdd0
--- /dev/null
+++ b/erpnext/docs/assets/img/website/banner.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/blog-post.png b/erpnext/docs/assets/img/website/blog-post.png
new file mode 100644
index 0000000..69d0d48
--- /dev/null
+++ b/erpnext/docs/assets/img/website/blog-post.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/blog-sample.png b/erpnext/docs/assets/img/website/blog-sample.png
new file mode 100644
index 0000000..1fff0bb
--- /dev/null
+++ b/erpnext/docs/assets/img/website/blog-sample.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/blogger.png b/erpnext/docs/assets/img/website/blogger.png
new file mode 100644
index 0000000..cb1d08f
--- /dev/null
+++ b/erpnext/docs/assets/img/website/blogger.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/integrations.png b/erpnext/docs/assets/img/website/integrations.png
new file mode 100644
index 0000000..992ddd2
--- /dev/null
+++ b/erpnext/docs/assets/img/website/integrations.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/top-bar.png b/erpnext/docs/assets/img/website/top-bar.png
new file mode 100644
index 0000000..8200167
--- /dev/null
+++ b/erpnext/docs/assets/img/website/top-bar.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/web-form-view.png b/erpnext/docs/assets/img/website/web-form-view.png
new file mode 100644
index 0000000..935e4e8
--- /dev/null
+++ b/erpnext/docs/assets/img/website/web-form-view.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/web-form.png b/erpnext/docs/assets/img/website/web-form.png
new file mode 100644
index 0000000..69178fa
--- /dev/null
+++ b/erpnext/docs/assets/img/website/web-form.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/web-page.png b/erpnext/docs/assets/img/website/web-page.png
new file mode 100644
index 0000000..e8343a9
--- /dev/null
+++ b/erpnext/docs/assets/img/website/web-page.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/website-settings.png b/erpnext/docs/assets/img/website/website-settings.png
new file mode 100644
index 0000000..7ec9d33
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/img/website/website-theme.png b/erpnext/docs/assets/img/website/website-theme.png
new file mode 100644
index 0000000..fa85791
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-theme.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-1.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-1.png
new file mode 100644
index 0000000..462c3f1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png
new file mode 100644
index 0000000..eea5d73
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png
new file mode 100644
index 0000000..a29c0e5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png
new file mode 100644
index 0000000..9143371
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png
new file mode 100644
index 0000000..a250fd0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png
new file mode 100644
index 0000000..5ce57e8
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png
new file mode 100644
index 0000000..f194360
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png
new file mode 100644
index 0000000..c6e336f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-3.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png
new file mode 100644
index 0000000..9370e86
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png
new file mode 100644
index 0000000..cbe25e7
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png
new file mode 100644
index 0000000..3050931
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png
new file mode 100644
index 0000000..dbe669e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png
new file mode 100644
index 0000000..bfa9516
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png
new file mode 100644
index 0000000..4f3fa7e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assets-1.png b/erpnext/docs/assets/old_images/erpnext/assets-1.png
new file mode 100644
index 0000000..19b3328
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assets-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assets-2.png b/erpnext/docs/assets/old_images/erpnext/assets-2.png
new file mode 100644
index 0000000..f0b0262
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assets-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assets-3.png b/erpnext/docs/assets/old_images/erpnext/assets-3.png
new file mode 100644
index 0000000..fd0a9a5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assets-3.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assets-4.png b/erpnext/docs/assets/old_images/erpnext/assets-4.png
new file mode 100644
index 0000000..4727484
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assets-4.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assets-5.png b/erpnext/docs/assets/old_images/erpnext/assets-5.png
new file mode 100644
index 0000000..8beaa57
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assets-5.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assign-remove.png b/erpnext/docs/assets/old_images/erpnext/assign-remove.png
new file mode 100644
index 0000000..2973ec0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assign-remove.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assign-todo.png b/erpnext/docs/assets/old_images/erpnext/assign-todo.png
new file mode 100644
index 0000000..c63b943
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assign-todo.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assign-user.png b/erpnext/docs/assets/old_images/erpnext/assign-user.png
new file mode 100644
index 0000000..4a34fe8
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assign-user.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assigned-to-icon.png b/erpnext/docs/assets/old_images/erpnext/assigned-to-icon.png
new file mode 100644
index 0000000..9604a02
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assigned-to-icon.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/assigned-to.png b/erpnext/docs/assets/old_images/erpnext/assigned-to.png
new file mode 100644
index 0000000..01a3875
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/assigned-to.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/auto-notification.png b/erpnext/docs/assets/old_images/erpnext/auto-notification.png
new file mode 100644
index 0000000..1331a72
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/auto-notification.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/backup-manager.png b/erpnext/docs/assets/old_images/erpnext/backup-manager.png
new file mode 100644
index 0000000..3483a1f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/backup-manager.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png b/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png
new file mode 100644
index 0000000..2fec1e6
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-1.png b/erpnext/docs/assets/old_images/erpnext/budgeting-1.png
new file mode 100644
index 0000000..29038a0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png b/erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png
new file mode 100644
index 0000000..7cd431e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting-2-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-3.png b/erpnext/docs/assets/old_images/erpnext/budgeting-3.png
new file mode 100644
index 0000000..29037c7
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting-3.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png b/erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png
new file mode 100644
index 0000000..6348f1e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting-4-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png b/erpnext/docs/assets/old_images/erpnext/budgeting-4.png
new file mode 100644
index 0000000..17683e3
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting-4.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting.png b/erpnext/docs/assets/old_images/erpnext/budgeting.png
new file mode 100644
index 0000000..809d6d1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/budgeting.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png b/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
new file mode 100644
index 0000000..4d7a6cb
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png b/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
new file mode 100644
index 0000000..ff04fb4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png b/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
new file mode 100644
index 0000000..0174f52
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png b/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
new file mode 100644
index 0000000..c86c5f5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png b/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
new file mode 100644
index 0000000..f5b21f1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png b/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
new file mode 100644
index 0000000..174f154
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png b/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
new file mode 100644
index 0000000..ff14072
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png b/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
new file mode 100644
index 0000000..6791d32
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png b/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
new file mode 100644
index 0000000..6eacdf1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-label.png b/erpnext/docs/assets/old_images/erpnext/custom-field-label.png
new file mode 100644
index 0000000..948b705
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-label.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-link.png b/erpnext/docs/assets/old_images/erpnext/custom-field-link.png
new file mode 100644
index 0000000..d2ee056
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-link.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-option.png b/erpnext/docs/assets/old_images/erpnext/custom-field-option.png
new file mode 100644
index 0000000..712cf27
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-option.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-properties.png b/erpnext/docs/assets/old_images/erpnext/custom-field-properties.png
new file mode 100644
index 0000000..0c0554d
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-properties.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-type.png b/erpnext/docs/assets/old_images/erpnext/custom-field-type.png
new file mode 100644
index 0000000..f642b1c
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-field-type.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/custom-script.png b/erpnext/docs/assets/old_images/erpnext/custom-script.png
new file mode 100644
index 0000000..f8612b0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/custom-script.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
new file mode 100644
index 0000000..459d503
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-orders-1.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-orders-1.png
new file mode 100644
index 0000000..5cb95bd
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customer-portal-orders-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
new file mode 100644
index 0000000..f7ff81b
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
new file mode 100644
index 0000000..7693877
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
new file mode 100644
index 0000000..771de78
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png b/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
new file mode 100644
index 0000000..d3e1143
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-document.png b/erpnext/docs/assets/old_images/erpnext/customize-form-document.png
new file mode 100644
index 0000000..e6773d5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize-form-document.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-list-view.png b/erpnext/docs/assets/old_images/erpnext/customize-form-list-view.png
new file mode 100644
index 0000000..fd42fd5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize-form-list-view.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-mandatory.png b/erpnext/docs/assets/old_images/erpnext/customize-form-mandatory.png
new file mode 100644
index 0000000..1da1811
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize-form-mandatory.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-update.png b/erpnext/docs/assets/old_images/erpnext/customize-form-update.png
new file mode 100644
index 0000000..64431a5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize-form-update.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize/print-format.png b/erpnext/docs/assets/old_images/erpnext/customize/print-format.png
new file mode 100644
index 0000000..a1e0ede
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize/print-format.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/customize/print-settings.png b/erpnext/docs/assets/old_images/erpnext/customize/print-settings.png
new file mode 100644
index 0000000..635afc3
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/customize/print-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png b/erpnext/docs/assets/old_images/erpnext/dropbox-access.png
new file mode 100644
index 0000000..7aa6cec
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/dropbox-access.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/email-digest.png b/erpnext/docs/assets/old_images/erpnext/email-digest.png
new file mode 100644
index 0000000..ac26e94
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/email-digest.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/email-settings1.png b/erpnext/docs/assets/old_images/erpnext/email-settings1.png
new file mode 100644
index 0000000..8052a38
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/email-settings1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/email-settings2.png b/erpnext/docs/assets/old_images/erpnext/email-settings2.png
new file mode 100644
index 0000000..3f84c71
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/email-settings2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/faq-manufacturer-part-no.png b/erpnext/docs/assets/old_images/erpnext/faq-manufacturer-part-no.png
new file mode 100644
index 0000000..e43667b
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/faq-manufacturer-part-no.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/faq-reorder-level.png b/erpnext/docs/assets/old_images/erpnext/faq-reorder-level.png
new file mode 100644
index 0000000..8e3e8c5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/faq-reorder-level.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/faq-reorder-qty.png b/erpnext/docs/assets/old_images/erpnext/faq-reorder-qty.png
new file mode 100644
index 0000000..7b1e312
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/faq-reorder-qty.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/faq-warranty.png b/erpnext/docs/assets/old_images/erpnext/faq-warranty.png
new file mode 100644
index 0000000..93903a1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/faq-warranty.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/fifo.png b/erpnext/docs/assets/old_images/erpnext/fifo.png
new file mode 100644
index 0000000..6b62aec
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/fifo.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/forms.png b/erpnext/docs/assets/old_images/erpnext/forms.png
new file mode 100644
index 0000000..0c4af1a
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/forms.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/hide-features.png b/erpnext/docs/assets/old_images/erpnext/hide-features.png
new file mode 100644
index 0000000..3f86470
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/hide-features.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/hide-module.png b/erpnext/docs/assets/old_images/erpnext/hide-module.png
new file mode 100644
index 0000000..f3f26a4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/hide-module.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/holiday-list-1.png b/erpnext/docs/assets/old_images/erpnext/holiday-list-1.png
new file mode 100644
index 0000000..579c6dd
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/holiday-list-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/holiday-list-2.png b/erpnext/docs/assets/old_images/erpnext/holiday-list-2.png
new file mode 100644
index 0000000..5717971
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/holiday-list-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/image-temp-opening.png b/erpnext/docs/assets/old_images/erpnext/image-temp-opening.png
new file mode 100644
index 0000000..52d0d5a
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/image-temp-opening.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/implementation-image.png b/erpnext/docs/assets/old_images/erpnext/implementation-image.png
new file mode 100644
index 0000000..4edcf31
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/implementation-image.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/import-3.png b/erpnext/docs/assets/old_images/erpnext/import-3.png
new file mode 100644
index 0000000..9387dd5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/import-3.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/import-4.png b/erpnext/docs/assets/old_images/erpnext/import-4.png
new file mode 100644
index 0000000..fce1f51
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/import-4.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-manufacturing-website.png b/erpnext/docs/assets/old_images/erpnext/item-manufacturing-website.png
new file mode 100644
index 0000000..65d78b9
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-manufacturing-website.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-price-item.png b/erpnext/docs/assets/old_images/erpnext/item-price-item.png
new file mode 100644
index 0000000..90acbf1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-price-item.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-price-list.png b/erpnext/docs/assets/old_images/erpnext/item-price-list.png
new file mode 100644
index 0000000..60591f0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-price-list.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-price-rate.png b/erpnext/docs/assets/old_images/erpnext/item-price-rate.png
new file mode 100644
index 0000000..05dbef0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-price-rate.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-purchase.png b/erpnext/docs/assets/old_images/erpnext/item-purchase.png
new file mode 100644
index 0000000..04940b9
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-purchase.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-sales.png b/erpnext/docs/assets/old_images/erpnext/item-sales.png
new file mode 100644
index 0000000..4579249
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-sales.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
new file mode 100644
index 0000000..a2dfe7f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
new file mode 100644
index 0000000..473a3ff
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage.png b/erpnext/docs/assets/old_images/erpnext/item-webimage.png
new file mode 100644
index 0000000..af46e3c
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-webimage.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-wise-tax-calc.png b/erpnext/docs/assets/old_images/erpnext/item-wise-tax-calc.png
new file mode 100644
index 0000000..cd3a08f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-wise-tax-calc.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-wise-tax-master.png b/erpnext/docs/assets/old_images/erpnext/item-wise-tax-master.png
new file mode 100644
index 0000000..95983c5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-wise-tax-master.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/item-wise-tax.png b/erpnext/docs/assets/old_images/erpnext/item-wise-tax.png
new file mode 100644
index 0000000..374fab6
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/item-wise-tax.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
new file mode 100644
index 0000000..9c3a400
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
new file mode 100644
index 0000000..dcb8641
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
new file mode 100644
index 0000000..1b4039c
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg b/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg
new file mode 100644
index 0000000..6846fa5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/material-request-workflow.jpg
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/message-list.png b/erpnext/docs/assets/old_images/erpnext/message-list.png
new file mode 100644
index 0000000..e5034a5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/message-list.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/message-to.png b/erpnext/docs/assets/old_images/erpnext/message-to.png
new file mode 100644
index 0000000..ecd75b4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/message-to.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/note-permission.png b/erpnext/docs/assets/old_images/erpnext/note-permission.png
new file mode 100644
index 0000000..a3cbc25
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/note-permission.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/note.png b/erpnext/docs/assets/old_images/erpnext/note.png
new file mode 100644
index 0000000..58bc180
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/note.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png b/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png
new file mode 100644
index 0000000..42fbe57
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/opening-entry-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/opening-entry-2.png b/erpnext/docs/assets/old_images/erpnext/opening-entry-2.png
new file mode 100644
index 0000000..57e0fb3
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/opening-entry-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/overview.png b/erpnext/docs/assets/old_images/erpnext/overview.png
new file mode 100644
index 0000000..b62b09e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/overview.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png b/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
new file mode 100644
index 0000000..0993cb5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-menu.png b/erpnext/docs/assets/old_images/erpnext/portal-menu.png
new file mode 100644
index 0000000..0f9ea82
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-menu.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png b/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png
new file mode 100644
index 0000000..6130ded
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-new-ticket.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png b/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
new file mode 100644
index 0000000..e92e8dc
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png
new file mode 100644
index 0000000..175eca7
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-ticket-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png
new file mode 100644
index 0000000..fd5875c
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-ticket-list-empty.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png b/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png
new file mode 100644
index 0000000..f03f673
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/portal-ticket-reply.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/pos-add-item.png b/erpnext/docs/assets/old_images/erpnext/pos-add-item.png
new file mode 100644
index 0000000..96e64d4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/pos-add-item.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png b/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
new file mode 100644
index 0000000..c4ef00f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png b/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
new file mode 100644
index 0000000..46ffc2b
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png b/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png
new file mode 100644
index 0000000..b7d0a90
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/projected-quantity-stock-report.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg b/erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg
new file mode 100644
index 0000000..0ff3ed0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/purchase-order-f.jpg
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png b/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png
new file mode 100644
index 0000000..508bf4e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/purchase-taxes.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png b/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png
new file mode 100644
index 0000000..bb51d60
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-analytics-customer.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg b/erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg
new file mode 100644
index 0000000..084b651
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-order-f.jpg
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png
new file mode 100644
index 0000000..944a7da
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-partner-listing.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png b/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png
new file mode 100644
index 0000000..631ca31
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-partner-published.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png
new file mode 100644
index 0000000..de1c6b8
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-person-item-group-report.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png
new file mode 100644
index 0000000..d10da04
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-person-target-distribution.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png b/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png
new file mode 100644
index 0000000..e1a2eb5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-person-target-item-group.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png
new file mode 100644
index 0000000..51f470b
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-manager.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png
new file mode 100644
index 0000000..154a73d
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sales-person-territory-report.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png
new file mode 100644
index 0000000..80ce1e1
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png
new file mode 100644
index 0000000..ffa0d07
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/setting-up-permissions-level-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png
new file mode 100644
index 0000000..2611ce4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/shopping-cart-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png
new file mode 100644
index 0000000..868c170
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/shopping-cart-2.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png
new file mode 100644
index 0000000..d9ab164
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png
new file mode 100644
index 0000000..6fd5f000
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/shopping-cart-display-amount.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg b/erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg
new file mode 100644
index 0000000..4b1e8f3
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sms-setting2.jpg
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/sms-settings1.png b/erpnext/docs/assets/old_images/erpnext/sms-settings1.png
new file mode 100644
index 0000000..64678d0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/sms-settings1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png
new file mode 100644
index 0000000..50c027e
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/stock-reco-data.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png
new file mode 100644
index 0000000..811689f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/stock-reco-ledger.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png b/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png
new file mode 100644
index 0000000..1c6d7d0
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/stock-reco-upload.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/subcontract.png b/erpnext/docs/assets/old_images/erpnext/subcontract.png
new file mode 100644
index 0000000..a199314
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/subcontract.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg b/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg
new file mode 100644
index 0000000..03c50de
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/supplier-quotation-f.jpg
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/tags-in-list.png b/erpnext/docs/assets/old_images/erpnext/tags-in-list.png
new file mode 100644
index 0000000..257ab5f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/tags-in-list.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/target-distribution.png b/erpnext/docs/assets/old_images/erpnext/target-distribution.png
new file mode 100644
index 0000000..7e451cd
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/target-distribution.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/third-party-backups.png b/erpnext/docs/assets/old_images/erpnext/third-party-backups.png
new file mode 100644
index 0000000..3bd10c8
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/third-party-backups.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/todo-close.png b/erpnext/docs/assets/old_images/erpnext/todo-close.png
new file mode 100644
index 0000000..5ef0b2a
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/todo-close.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/todo-list.png b/erpnext/docs/assets/old_images/erpnext/todo-list.png
new file mode 100644
index 0000000..fc65ced
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/todo-list.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/trial-balance-1.png b/erpnext/docs/assets/old_images/erpnext/trial-balance-1.png
new file mode 100644
index 0000000..a4322e9
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/trial-balance-1.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png b/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png
new file mode 100644
index 0000000..e0b2373
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png b/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png
new file mode 100644
index 0000000..8a7e9c6
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/user-permissions-quotation-list.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png b/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
new file mode 100644
index 0000000..7981e4f
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-labels.png b/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
new file mode 100644
index 0000000..3182ab7
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png
new file mode 100644
index 0000000..e0878a3
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/workflow-employee-la.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png
new file mode 100644
index 0000000..80f3ecc
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/workflow-hr-user-la.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png b/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png
new file mode 100644
index 0000000..26ff3e6
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/workflow-leave-approver-la.png
Binary files differ

diff --git a/erpnext/docs/assets/old_images/erpnext/workflow-leave-fl.jpg b/erpnext/docs/assets/old_images/erpnext/workflow-leave-fl.jpg
new file mode 100644
index 0000000..3430974
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/workflow-leave-fl.jpg
Binary files differ

diff --git a/erpnext/docs/contents.html b/erpnext/docs/contents.html
new file mode 100644
index 0000000..59d0b44
--- /dev/null
+++ b/erpnext/docs/contents.html

@@ -0,0 +1,10 @@
+<!-- title: Table of Contents -->
+
+<h1>Table of Contents</h1>
+<br>
+
+{% include "templates/includes/full_index.html" %}
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- no-breadcrumbs -->

diff --git a/erpnext/docs/contents.md b/erpnext/docs/contents.md
new file mode 100644
index 0000000..59d0b44
--- /dev/null
+++ b/erpnext/docs/contents.md

@@ -0,0 +1,10 @@
+<!-- title: Table of Contents -->
+
+<h1>Table of Contents</h1>
+<br>
+
+{% include "templates/includes/full_index.html" %}
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- no-breadcrumbs -->

diff --git a/erpnext/docs/contents.py b/erpnext/docs/contents.py
new file mode 100644
index 0000000..131d410
--- /dev/null
+++ b/erpnext/docs/contents.py

@@ -0,0 +1,9 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.website.utils import get_full_index
+
+def get_context(context):
+	context.full_index = get_full_index(extn = True)

diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html b/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html
new file mode 100644
index 0000000..ee2613a
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/erpnext.accounts.general_ledger.html

@@ -0,0 +1,193 @@
+<!-- title: erpnext.accounts.general_ledger --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/general_ledger.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockAccountInvalidTransaction</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.check_if_in_list" href="#erpnext.accounts.general_ledger.check_if_in_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>check_if_in_list</b>
+        <i class="text-muted">(gle, gl_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.delete_gl_entries" href="#erpnext.accounts.general_ledger.delete_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>delete_gl_entries</b>
+        <i class="text-muted">(gl_entries=None, voucher_type=None, voucher_no=None, adv_adj=False, update_outstanding=Yes)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.make_entry" href="#erpnext.accounts.general_ledger.make_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>make_entry</b>
+        <i class="text-muted">(args, adv_adj, update_outstanding)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.make_gl_entries" href="#erpnext.accounts.general_ledger.make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>make_gl_entries</b>
+        <i class="text-muted">(gl_map, cancel=False, adv_adj=False, merge_entries=True, update_outstanding=Yes)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.make_round_off_gle" href="#erpnext.accounts.general_ledger.make_round_off_gle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>make_round_off_gle</b>
+        <i class="text-muted">(gl_map, debit_credit_diff)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.merge_similar_entries" href="#erpnext.accounts.general_ledger.merge_similar_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>merge_similar_entries</b>
+        <i class="text-muted">(gl_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.process_gl_map" href="#erpnext.accounts.general_ledger.process_gl_map" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>process_gl_map</b>
+        <i class="text-muted">(gl_map, merge_entries=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.round_off_debit_credit" href="#erpnext.accounts.general_ledger.round_off_debit_credit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>round_off_debit_credit</b>
+        <i class="text-muted">(gl_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.save_entries" href="#erpnext.accounts.general_ledger.save_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>save_entries</b>
+        <i class="text-muted">(gl_map, adv_adj, update_outstanding)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.general_ledger.validate_account_for_auto_accounting_for_stock" href="#erpnext.accounts.general_ledger.validate_account_for_auto_accounting_for_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.general_ledger.<b>validate_account_for_auto_accounting_for_stock</b>
+        <i class="text-muted">(gl_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.html b/erpnext/docs/current/api/accounts/erpnext.accounts.html
new file mode 100644
index 0000000..eb477e3
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/erpnext.accounts.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.party.html b/erpnext/docs/current/api/accounts/erpnext.accounts.party.html
new file mode 100644
index 0000000..e5c8d31
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/erpnext.accounts.party.html

@@ -0,0 +1,332 @@
+<!-- title: erpnext.accounts.party --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/party.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>DuplicatePartyAccountError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party._get_party_details" href="#erpnext.accounts.party._get_party_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>_get_party_details</b>
+        <i class="text-muted">(party=None, account=None, party_type=Customer, company=None, posting_date=None, price_list=None, currency=None, doctype=None, ignore_permissions=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_company_currency" href="#erpnext.accounts.party.get_company_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_company_currency</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_credit_days" href="#erpnext.accounts.party.get_credit_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_credit_days</b>
+        <i class="text-muted">(party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_default_price_list" href="#erpnext.accounts.party.get_default_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_default_price_list</b>
+        <i class="text-muted">(party)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Return default price list for party (Document object)</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.party.get_due_date</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_due_date" href="#erpnext.accounts.party.get_due_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_due_date</b>
+        <i class="text-muted">(posting_date, party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set Due Date = Posting Date + Credit Days</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.party.get_party_account</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_party_account" href="#erpnext.accounts.party.get_party_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_party_account</b>
+        <i class="text-muted">(party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns the account for the given <code>party</code>.
+Will first search in party (Customer / Supplier) record, if not found,
+will search in group (Customer Group / Supplier Type),
+finally will return default.</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_party_account_currency" href="#erpnext.accounts.party.get_party_account_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_party_account_currency</b>
+        <i class="text-muted">(party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.party.get_party_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_party_details" href="#erpnext.accounts.party.get_party_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_party_details</b>
+        <i class="text-muted">(party=None, account=None, party_type=Customer, company=None, posting_date=None, price_list=None, currency=None, doctype=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.get_party_gle_currency" href="#erpnext.accounts.party.get_party_gle_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>get_party_gle_currency</b>
+        <i class="text-muted">(party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_account_and_due_date" href="#erpnext.accounts.party.set_account_and_due_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_account_and_due_date</b>
+        <i class="text-muted">(party, account, party_type, company, posting_date, doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_address_details" href="#erpnext.accounts.party.set_address_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_address_details</b>
+        <i class="text-muted">(out, party, party_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_contact_details" href="#erpnext.accounts.party.set_contact_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_contact_details</b>
+        <i class="text-muted">(out, party, party_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_other_values" href="#erpnext.accounts.party.set_other_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_other_values</b>
+        <i class="text-muted">(out, party, party_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_price_list" href="#erpnext.accounts.party.set_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_price_list</b>
+        <i class="text-muted">(out, party, party_type, given_price_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.party.set_taxes</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.set_taxes" href="#erpnext.accounts.party.set_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>set_taxes</b>
+        <i class="text-muted">(party, party_type, posting_date, company, customer_group=None, supplier_type=None, billing_address=None, shipping_address=None, use_for_shopping_cart=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.validate_due_date" href="#erpnext.accounts.party.validate_due_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>validate_due_date</b>
+        <i class="text-muted">(posting_date, due_date, party_type, party, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.validate_party_accounts" href="#erpnext.accounts.party.validate_party_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>validate_party_accounts</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.party.validate_party_gle_currency" href="#erpnext.accounts.party.validate_party_gle_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.party.<b>validate_party_gle_currency</b>
+        <i class="text-muted">(party_type, party, company, party_account_currency=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate party account currency with existing GL Entry's currency</p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.utils.html b/erpnext/docs/current/api/accounts/erpnext.accounts.utils.html
new file mode 100644
index 0000000..e280a9b
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/erpnext.accounts.utils.html

@@ -0,0 +1,380 @@
+<!-- title: erpnext.accounts.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BudgetError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>FiscalYearError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.utils.add_ac</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.add_ac" href="#erpnext.accounts.utils.add_ac" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>add_ac</b>
+        <i class="text-muted">(args=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.utils.add_cc</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.add_cc" href="#erpnext.accounts.utils.add_cc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>add_cc</b>
+        <i class="text-muted">(args=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.check_if_jv_modified" href="#erpnext.accounts.utils.check_if_jv_modified" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>check_if_jv_modified</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check if there is already a voucher reference
+check if amount is same
+check if jv is submitted</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.fix_total_debit_credit" href="#erpnext.accounts.utils.fix_total_debit_credit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>fix_total_debit_credit</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_actual_expense" href="#erpnext.accounts.utils.get_actual_expense" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_actual_expense</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_allocated_budget" href="#erpnext.accounts.utils.get_allocated_budget" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_allocated_budget</b>
+        <i class="text-muted">(distribution_id, posting_date, fiscal_year, yearly_budget)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.utils.get_balance_on</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_balance_on" href="#erpnext.accounts.utils.get_balance_on" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_balance_on</b>
+        <i class="text-muted">(account=None, date=None, party_type=None, party=None, in_account_currency=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.utils.get_company_default</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_company_default" href="#erpnext.accounts.utils.get_company_default" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_company_default</b>
+        <i class="text-muted">(company, fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_currency_precision" href="#erpnext.accounts.utils.get_currency_precision" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_currency_precision</b>
+        <i class="text-muted">(currency=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.utils.get_fiscal_year</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_fiscal_year" href="#erpnext.accounts.utils.get_fiscal_year" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_fiscal_year</b>
+        <i class="text-muted">(date=None, fiscal_year=None, label=Date, verbose=1, company=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_fiscal_years" href="#erpnext.accounts.utils.get_fiscal_years" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_fiscal_years</b>
+        <i class="text-muted">(transaction_date=None, fiscal_year=None, label=Date, verbose=1, company=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_outstanding_invoices" href="#erpnext.accounts.utils.get_outstanding_invoices" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_outstanding_invoices</b>
+        <i class="text-muted">(party_type, party, account, condition=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_stock_and_account_difference" href="#erpnext.accounts.utils.get_stock_and_account_difference" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_stock_and_account_difference</b>
+        <i class="text-muted">(account_list=None, posting_date=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.get_stock_rbnb_difference" href="#erpnext.accounts.utils.get_stock_rbnb_difference" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>get_stock_rbnb_difference</b>
+        <i class="text-muted">(posting_date, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.reconcile_against_document" href="#erpnext.accounts.utils.reconcile_against_document" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>reconcile_against_document</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Cancel JV, Update aginst document, split if required and resubmit jv</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.remove_against_link_from_jv" href="#erpnext.accounts.utils.remove_against_link_from_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>remove_against_link_from_jv</b>
+        <i class="text-muted">(ref_type, ref_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.update_against_doc" href="#erpnext.accounts.utils.update_against_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>update_against_doc</b>
+        <i class="text-muted">(d, jv_obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Updates against document, if partial amount splits into rows</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.validate_allocated_amount" href="#erpnext.accounts.utils.validate_allocated_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>validate_allocated_amount</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.validate_expense_against_budget" href="#erpnext.accounts.utils.validate_expense_against_budget" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>validate_expense_against_budget</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.utils.validate_fiscal_year" href="#erpnext.accounts.utils.validate_fiscal_year" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.utils.<b>validate_fiscal_year</b>
+        <i class="text-muted">(date, fiscal_year, label=Date, doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/index.html b/erpnext/docs/current/api/accounts/index.html
new file mode 100644
index 0000000..9c93356
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/index.html

@@ -0,0 +1,19 @@
+<!-- title: accounts -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/accounts"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/index.txt b/erpnext/docs/current/api/accounts/index.txt
new file mode 100644
index 0000000..33f157c
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/index.txt

@@ -0,0 +1,4 @@
+erpnext.accounts.general_ledger
+erpnext.accounts
+erpnext.accounts.party
+erpnext.accounts.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/erpnext.accounts.print_format.cheque_printing_format.html b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/erpnext.accounts.print_format.cheque_printing_format.html
new file mode 100644
index 0000000..a67ad8f
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/erpnext.accounts.print_format.cheque_printing_format.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts.print_format.cheque_printing_format --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/print_format/cheque_printing_format.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.html b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.html
new file mode 100644
index 0000000..48d9afd
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.html

@@ -0,0 +1,19 @@
+<!-- title: cheque_printing_format -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/cheque_printing_format"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.txt b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.txt
new file mode 100644
index 0000000..4298944
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/cheque_printing_format/index.txt

@@ -0,0 +1 @@
+erpnext.accounts.print_format.cheque_printing_format
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/credit_note/erpnext.accounts.print_format.credit_note.html b/erpnext/docs/current/api/accounts/print_format/credit_note/erpnext.accounts.print_format.credit_note.html
new file mode 100644
index 0000000..f2fa7b5
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/credit_note/erpnext.accounts.print_format.credit_note.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts.print_format.credit_note --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/print_format/credit_note.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/credit_note/index.html b/erpnext/docs/current/api/accounts/print_format/credit_note/index.html
new file mode 100644
index 0000000..fea00d4
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/credit_note/index.html

@@ -0,0 +1,19 @@
+<!-- title: credit_note -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/credit_note"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/credit_note/index.txt b/erpnext/docs/current/api/accounts/print_format/credit_note/index.txt
new file mode 100644
index 0000000..f98781e
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/credit_note/index.txt

@@ -0,0 +1 @@
+erpnext.accounts.print_format.credit_note
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/erpnext.accounts.print_format.html b/erpnext/docs/current/api/accounts/print_format/erpnext.accounts.print_format.html
new file mode 100644
index 0000000..6201a82
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/erpnext.accounts.print_format.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts.print_format --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/print_format.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/index.html b/erpnext/docs/current/api/accounts/print_format/index.html
new file mode 100644
index 0000000..d8c6158
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/index.html

@@ -0,0 +1,19 @@
+<!-- title: print_format -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/print_format"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/index.txt b/erpnext/docs/current/api/accounts/print_format/index.txt
new file mode 100644
index 0000000..959c953
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/index.txt

@@ -0,0 +1 @@
+erpnext.accounts.print_format
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/erpnext.accounts.print_format.payment_receipt_voucher.html b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/erpnext.accounts.print_format.payment_receipt_voucher.html
new file mode 100644
index 0000000..36a19b4
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/erpnext.accounts.print_format.payment_receipt_voucher.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts.print_format.payment_receipt_voucher --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/print_format/payment_receipt_voucher.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.html b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.html
new file mode 100644
index 0000000..f51bbbc
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.html

@@ -0,0 +1,19 @@
+<!-- title: payment_receipt_voucher -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/payment_receipt_voucher"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.txt b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.txt
new file mode 100644
index 0000000..e90d4d9
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/payment_receipt_voucher/index.txt

@@ -0,0 +1 @@
+erpnext.accounts.print_format.payment_receipt_voucher
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/pos_invoice/erpnext.accounts.print_format.pos_invoice.html b/erpnext/docs/current/api/accounts/print_format/pos_invoice/erpnext.accounts.print_format.pos_invoice.html
new file mode 100644
index 0000000..8a1faf6
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/pos_invoice/erpnext.accounts.print_format.pos_invoice.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.accounts.print_format.pos_invoice --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/accounts/print_format/pos_invoice.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.html b/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.html
new file mode 100644
index 0000000..a8b2dd5
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.html

@@ -0,0 +1,19 @@
+<!-- title: pos_invoice -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/pos_invoice"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.txt b/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.txt
new file mode 100644
index 0000000..533ff20
--- /dev/null
+++ b/erpnext/docs/current/api/accounts/print_format/pos_invoice/index.txt

@@ -0,0 +1 @@
+erpnext.accounts.print_format.pos_invoice
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/erpnext.buying.html b/erpnext/docs/current/api/buying/erpnext.buying.html
new file mode 100644
index 0000000..67f986d
--- /dev/null
+++ b/erpnext/docs/current/api/buying/erpnext.buying.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.buying --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/index.html b/erpnext/docs/current/api/buying/index.html
new file mode 100644
index 0000000..1843089
--- /dev/null
+++ b/erpnext/docs/current/api/buying/index.html

@@ -0,0 +1,19 @@
+<!-- title: buying -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/buying"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/index.txt b/erpnext/docs/current/api/buying/index.txt
new file mode 100644
index 0000000..7897fe2
--- /dev/null
+++ b/erpnext/docs/current/api/buying/index.txt

@@ -0,0 +1 @@
+erpnext.buying
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html
new file mode 100644
index 0000000..9c2648b
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/erpnext.buying.print_format.drop_shipping_format.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.buying.print_format.drop_shipping_format --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format/drop_shipping_format.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html
new file mode 100644
index 0000000..ef09e77
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.html

@@ -0,0 +1,19 @@
+<!-- title: drop_shipping_format -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/drop_shipping_format"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt
new file mode 100644
index 0000000..590a2c9
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/drop_shipping_format/index.txt

@@ -0,0 +1 @@
+erpnext.buying.print_format.drop_shipping_format
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/erpnext.buying.print_format.html b/erpnext/docs/current/api/buying/print_format/erpnext.buying.print_format.html
new file mode 100644
index 0000000..c6a45de
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/erpnext.buying.print_format.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.buying.print_format --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/buying/print_format.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/index.html b/erpnext/docs/current/api/buying/print_format/index.html
new file mode 100644
index 0000000..d8c6158
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/index.html

@@ -0,0 +1,19 @@
+<!-- title: print_format -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/print_format"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/buying/print_format/index.txt b/erpnext/docs/current/api/buying/print_format/index.txt
new file mode 100644
index 0000000..161fb0c
--- /dev/null
+++ b/erpnext/docs/current/api/buying/print_format/index.txt

@@ -0,0 +1 @@
+erpnext.buying.print_format
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.accounts.html b/erpnext/docs/current/api/config/erpnext.config.accounts.html
new file mode 100644
index 0000000..aac5da8
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.accounts.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.accounts --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/accounts.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.accounts.get_data" href="#erpnext.config.accounts.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.accounts.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.buying.html b/erpnext/docs/current/api/config/erpnext.config.buying.html
new file mode 100644
index 0000000..6b4ea7c
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.buying.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.buying --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/buying.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.buying.get_data" href="#erpnext.config.buying.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.buying.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.crm.html b/erpnext/docs/current/api/config/erpnext.config.crm.html
new file mode 100644
index 0000000..3d8cff2
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.crm.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.crm --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/crm.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.crm.get_data" href="#erpnext.config.crm.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.crm.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.desktop.html b/erpnext/docs/current/api/config/erpnext.config.desktop.html
new file mode 100644
index 0000000..487cd32
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.desktop.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.desktop --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/desktop.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.desktop.get_data" href="#erpnext.config.desktop.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.desktop.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.docs.html b/erpnext/docs/current/api/config/erpnext.config.docs.html
new file mode 100644
index 0000000..6df0858
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.docs.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.docs --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/docs.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.docs.get_context" href="#erpnext.config.docs.get_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.docs.<b>get_context</b>
+        <i class="text-muted">(context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.hr.html b/erpnext/docs/current/api/config/erpnext.config.hr.html
new file mode 100644
index 0000000..ff59b6e
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.hr.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.hr --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/hr.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.hr.get_data" href="#erpnext.config.hr.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.hr.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.html b/erpnext/docs/current/api/config/erpnext.config.html
new file mode 100644
index 0000000..53a163a
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.config --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.learn.html b/erpnext/docs/current/api/config/erpnext.config.learn.html
new file mode 100644
index 0000000..0765780
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.learn.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.learn --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/learn.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.learn.get_data" href="#erpnext.config.learn.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.learn.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.manufacturing.html b/erpnext/docs/current/api/config/erpnext.config.manufacturing.html
new file mode 100644
index 0000000..8ae5b5d
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.manufacturing.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.manufacturing --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/manufacturing.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.manufacturing.get_data" href="#erpnext.config.manufacturing.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.manufacturing.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.projects.html b/erpnext/docs/current/api/config/erpnext.config.projects.html
new file mode 100644
index 0000000..c0f8060
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.projects.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.projects --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/projects.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.projects.get_data" href="#erpnext.config.projects.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.projects.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.selling.html b/erpnext/docs/current/api/config/erpnext.config.selling.html
new file mode 100644
index 0000000..2d17ea7
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.selling.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.selling --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/selling.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.selling.get_data" href="#erpnext.config.selling.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.selling.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.setup.html b/erpnext/docs/current/api/config/erpnext.config.setup.html
new file mode 100644
index 0000000..15348d1
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.setup.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.setup --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/setup.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.setup.get_data" href="#erpnext.config.setup.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.setup.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.stock.html b/erpnext/docs/current/api/config/erpnext.config.stock.html
new file mode 100644
index 0000000..3f8ec32
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.stock.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.stock --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/stock.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.stock.get_data" href="#erpnext.config.stock.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.stock.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.support.html b/erpnext/docs/current/api/config/erpnext.config.support.html
new file mode 100644
index 0000000..27a23b9
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.support.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.support --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/support.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.support.get_data" href="#erpnext.config.support.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.support.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/erpnext.config.website.html b/erpnext/docs/current/api/config/erpnext.config.website.html
new file mode 100644
index 0000000..b5a85c9
--- /dev/null
+++ b/erpnext/docs/current/api/config/erpnext.config.website.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.config.website --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/config/website.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.config.website.get_data" href="#erpnext.config.website.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.config.website.<b>get_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/index.html b/erpnext/docs/current/api/config/index.html
new file mode 100644
index 0000000..989aaf3
--- /dev/null
+++ b/erpnext/docs/current/api/config/index.html

@@ -0,0 +1,19 @@
+<!-- title: config -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/config"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/config/index.txt b/erpnext/docs/current/api/config/index.txt
new file mode 100644
index 0000000..7d4ebc5
--- /dev/null
+++ b/erpnext/docs/current/api/config/index.txt

@@ -0,0 +1,15 @@
+erpnext.config.accounts
+erpnext.config.buying
+erpnext.config.crm
+erpnext.config.desktop
+erpnext.config.docs
+erpnext.config.hr
+erpnext.config
+erpnext.config.learn
+erpnext.config.manufacturing
+erpnext.config.projects
+erpnext.config.selling
+erpnext.config.setup
+erpnext.config.stock
+erpnext.config.support
+erpnext.config.website
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html
new file mode 100644
index 0000000..78705e3
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html

@@ -0,0 +1,527 @@
+<!-- title: erpnext.controllers.accounts_controller --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/accounts_controller.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AccountsController</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="append_taxes_from_master" href="#append_taxes_from_master" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>append_taxes_from_master</b>
+        <i class="text-muted">(self, tax_master_doctype=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_recurring" href="#before_recurring" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_recurring</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_taxes_and_totals" href="#calculate_taxes_and_totals" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_taxes_and_totals</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="clear_unallocated_advances" href="#clear_unallocated_advances" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>clear_unallocated_advances</b>
+        <i class="text-muted">(self, childtype, parentfield)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_advances" href="#get_advances" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_advances</b>
+        <i class="text-muted">(self, account_head, party_type, party, child_doctype, parentfield, dr_or_cr, against_order_field)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns list of advances against Account, Party, Reference</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_company_default" href="#get_company_default" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_company_default</b>
+        <i class="text-muted">(self, fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_dict" href="#get_gl_dict" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_dict</b>
+        <i class="text-muted">(self, args, account_currency=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>this method populates the common properties of a gl entry record</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_party" href="#get_party" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_party</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_stock_items" href="#get_stock_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_stock_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update_after_submit" href="#on_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_balance_in_account_currency" href="#set_balance_in_account_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_balance_in_account_currency</b>
+        <i class="text-muted">(self, gl_dict, account_currency=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_item_details" href="#set_missing_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_item_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>set missing item values</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_values" href="#set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_values</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_other_charges" href="#set_other_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_other_charges</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_price_list_currency" href="#set_price_list_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_price_list_currency</b>
+        <i class="text-muted">(self, buying_or_selling)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_taxes" href="#set_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_taxes</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_advance_paid" href="#set_total_advance_paid" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_advance_paid</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_account_currency" href="#validate_account_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_account_currency</b>
+        <i class="text-muted">(self, account, account_currency=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_advance_jv" href="#validate_advance_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_advance_jv</b>
+        <i class="text-muted">(self, reference_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_currency" href="#validate_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_date_with_fiscal_year" href="#validate_date_with_fiscal_year" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_date_with_fiscal_year</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_due_date" href="#validate_due_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_due_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_enabled_taxes_and_charges" href="#validate_enabled_taxes_and_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_enabled_taxes_and_charges</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_multiple_billing" href="#validate_multiple_billing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_multiple_billing</b>
+        <i class="text-muted">(self, ref_dt, item_ref_dn, based_on, parentfield)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_party" href="#validate_party" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_party</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.accounts_controller.get_default_taxes_and_charges</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.get_default_taxes_and_charges" href="#erpnext.controllers.accounts_controller.get_default_taxes_and_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>get_default_taxes_and_charges</b>
+        <i class="text-muted">(master_doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.accounts_controller.get_tax_rate</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.get_tax_rate" href="#erpnext.controllers.accounts_controller.get_tax_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>get_tax_rate</b>
+        <i class="text-muted">(account_head)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.accounts_controller.get_taxes_and_charges</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.get_taxes_and_charges" href="#erpnext.controllers.accounts_controller.get_taxes_and_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>get_taxes_and_charges</b>
+        <i class="text-muted">(master_doctype, master_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.validate_conversion_rate" href="#erpnext.controllers.accounts_controller.validate_conversion_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>validate_conversion_rate</b>
+        <i class="text-muted">(currency, conversion_rate, conversion_rate_label, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p>common validation for currency and price list currency</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.validate_inclusive_tax" href="#erpnext.controllers.accounts_controller.validate_inclusive_tax" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>validate_inclusive_tax</b>
+        <i class="text-muted">(tax, doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.accounts_controller.validate_taxes_and_charges" href="#erpnext.controllers.accounts_controller.validate_taxes_and_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.accounts_controller.<b>validate_taxes_and_charges</b>
+        <i class="text-muted">(tax)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.buying_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.buying_controller.html
new file mode 100644
index 0000000..83fd326
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.buying_controller.html

@@ -0,0 +1,246 @@
+<!-- title: erpnext.controllers.buying_controller --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/buying_controller.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BuyingController</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.stock_controller.StockController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__setup__" href="#__setup__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__setup__</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="cleanup_raw_materials_supplied" href="#cleanup_raw_materials_supplied" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>cleanup_raw_materials_supplied</b>
+        <i class="text-muted">(self, parent_items, raw_material_table)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Remove all those child items which are no longer present in main item table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_raw_materials_supplied" href="#create_raw_materials_supplied" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_raw_materials_supplied</b>
+        <i class="text-muted">(self, raw_material_table)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items_from_bom" href="#get_items_from_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items_from_bom</b>
+        <i class="text-muted">(self, item_code, bom)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="is_item_table_empty" href="#is_item_table_empty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>is_item_table_empty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_values" href="#set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_values</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_qty_as_per_stock_uom" href="#set_qty_as_per_stock_uom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_qty_as_per_stock_uom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_supplier_from_item_default" href="#set_supplier_from_item_default" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_supplier_from_item_default</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_in_words" href="#set_total_in_words" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_in_words</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_raw_materials_supplied" href="#update_raw_materials_supplied" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_raw_materials_supplied</b>
+        <i class="text-muted">(self, item, raw_material_table)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_valuation_rate" href="#update_valuation_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_valuation_rate</b>
+        <i class="text-muted">(self, parentfield)</i>
+    </p>
+	<div class="docs-attr-desc"><p>item<em>tax</em>amount is the total tax amount applied on that item
+stored for valuation</p>
+
+<p>TODO: rename item<em>tax</em>amount to valuation<em>tax</em>amount</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_for_subcontracting" href="#validate_for_subcontracting" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_for_subcontracting</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_stock_or_nonstock_items" href="#validate_stock_or_nonstock_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_stock_or_nonstock_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.html b/erpnext/docs/current/api/controllers/erpnext.controllers.html
new file mode 100644
index 0000000..ed209a2
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.controllers --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html
new file mode 100644
index 0000000..3720e82
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.item_variant.html

@@ -0,0 +1,170 @@
+<!-- title: erpnext.controllers.item_variant --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/item_variant.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidItemAttributeValueError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemTemplateCannotHaveStock</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemVariantExistsError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.copy_attributes_to_variant" href="#erpnext.controllers.item_variant.copy_attributes_to_variant" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>copy_attributes_to_variant</b>
+        <i class="text-muted">(item, variant)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.item_variant.create_variant</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.create_variant" href="#erpnext.controllers.item_variant.create_variant" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>create_variant</b>
+        <i class="text-muted">(item, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.find_variant" href="#erpnext.controllers.item_variant.find_variant" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>find_variant</b>
+        <i class="text-muted">(item, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.item_variant.get_variant</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.get_variant" href="#erpnext.controllers.item_variant.get_variant" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>get_variant</b>
+        <i class="text-muted">(item, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validates Attributes and their Values, then looks for an exactly matching Item Variant</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>item</code></strong> -  Template Item</li>
+<li><strong><code>args</code></strong> -  A dictionary with "Attribute" as key and "Attribute Value" as value</li>
+</ul>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.make_variant_item_code" href="#erpnext.controllers.item_variant.make_variant_item_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>make_variant_item_code</b>
+        <i class="text-muted">(template, variant)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Uses template's item code and abbreviations to make variant's item code</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.item_variant.validate_item_variant_attributes" href="#erpnext.controllers.item_variant.validate_item_variant_attributes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.item_variant.<b>validate_item_variant_attributes</b>
+        <i class="text-muted">(item, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.print_settings.html b/erpnext/docs/current/api/controllers/erpnext.controllers.print_settings.html
new file mode 100644
index 0000000..75c4469
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.print_settings.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.controllers.print_settings --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/print_settings.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.print_settings.print_settings_for_item_table" href="#erpnext.controllers.print_settings.print_settings_for_item_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.print_settings.<b>print_settings_for_item_table</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.queries.html b/erpnext/docs/current/api/controllers/erpnext.controllers.queries.html
new file mode 100644
index 0000000..c7dac79
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.queries.html

@@ -0,0 +1,228 @@
+<!-- title: erpnext.controllers.queries --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/queries.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.bom" href="#erpnext.controllers.queries.bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>bom</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.customer_query" href="#erpnext.controllers.queries.customer_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>customer_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.employee_query" href="#erpnext.controllers.queries.employee_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>employee_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_account_list" href="#erpnext.controllers.queries.get_account_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_account_list</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_batch_no" href="#erpnext.controllers.queries.get_batch_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_batch_no</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_delivery_notes_to_be_billed" href="#erpnext.controllers.queries.get_delivery_notes_to_be_billed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_delivery_notes_to_be_billed</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_filters_cond" href="#erpnext.controllers.queries.get_filters_cond" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_filters_cond</b>
+        <i class="text-muted">(doctype, filters, conditions)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.queries.get_income_account</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_income_account" href="#erpnext.controllers.queries.get_income_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_income_account</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.get_project_name" href="#erpnext.controllers.queries.get_project_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>get_project_name</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.item_query" href="#erpnext.controllers.queries.item_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>item_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.lead_query" href="#erpnext.controllers.queries.lead_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>lead_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.supplier_query" href="#erpnext.controllers.queries.supplier_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>supplier_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.queries.tax_account_query" href="#erpnext.controllers.queries.tax_account_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.queries.<b>tax_account_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html b/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html
new file mode 100644
index 0000000..b6ac163
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html

@@ -0,0 +1,195 @@
+<!-- title: erpnext.controllers.recurring_document --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/recurring_document.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.assign_task_to_owner" href="#erpnext.controllers.recurring_document.assign_task_to_owner" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>assign_task_to_owner</b>
+        <i class="text-muted">(doc, doctype, msg, users)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.convert_to_recurring" href="#erpnext.controllers.recurring_document.convert_to_recurring" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>convert_to_recurring</b>
+        <i class="text-muted">(doc, posting_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.create_recurring_documents" href="#erpnext.controllers.recurring_document.create_recurring_documents" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>create_recurring_documents</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.get_next_date" href="#erpnext.controllers.recurring_document.get_next_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>get_next_date</b>
+        <i class="text-muted">(dt, mcount, day=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.make_new_document" href="#erpnext.controllers.recurring_document.make_new_document" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>make_new_document</b>
+        <i class="text-muted">(ref_wrapper, date_field, posting_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.manage_recurring_documents" href="#erpnext.controllers.recurring_document.manage_recurring_documents" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>manage_recurring_documents</b>
+        <i class="text-muted">(doctype, next_date=None, commit=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create recurring documents on specific date by copying the original one
+and notify the concerned people</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.notify_errors" href="#erpnext.controllers.recurring_document.notify_errors" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>notify_errors</b>
+        <i class="text-muted">(doc, doctype, party, owner)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.send_notification" href="#erpnext.controllers.recurring_document.send_notification" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>send_notification</b>
+        <i class="text-muted">(new_rv)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Notify concerned persons about recurring document generation</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.set_next_date" href="#erpnext.controllers.recurring_document.set_next_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>set_next_date</b>
+        <i class="text-muted">(doc, posting_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set next date on which recurring document will be created</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.validate_notification_email_id" href="#erpnext.controllers.recurring_document.validate_notification_email_id" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>validate_notification_email_id</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.recurring_document.validate_recurring_document" href="#erpnext.controllers.recurring_document.validate_recurring_document" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.recurring_document.<b>validate_recurring_document</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html b/erpnext/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html
new file mode 100644
index 0000000..03a72e8
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.sales_and_purchase_return.html

@@ -0,0 +1,113 @@
+<!-- title: erpnext.controllers.sales_and_purchase_return --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/sales_and_purchase_return.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockOverReturnError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.sales_and_purchase_return.get_already_returned_items" href="#erpnext.controllers.sales_and_purchase_return.get_already_returned_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.sales_and_purchase_return.<b>get_already_returned_items</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.sales_and_purchase_return.make_return_doc" href="#erpnext.controllers.sales_and_purchase_return.make_return_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.sales_and_purchase_return.<b>make_return_doc</b>
+        <i class="text-muted">(doctype, source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.sales_and_purchase_return.validate_return" href="#erpnext.controllers.sales_and_purchase_return.validate_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.sales_and_purchase_return.<b>validate_return</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.sales_and_purchase_return.validate_return_against" href="#erpnext.controllers.sales_and_purchase_return.validate_return_against" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.sales_and_purchase_return.<b>validate_return_against</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.sales_and_purchase_return.validate_returned_items" href="#erpnext.controllers.sales_and_purchase_return.validate_returned_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.sales_and_purchase_return.<b>validate_returned_items</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.selling_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.selling_controller.html
new file mode 100644
index 0000000..3f83a7b
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.selling_controller.html

@@ -0,0 +1,315 @@
+<!-- title: erpnext.controllers.selling_controller --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/selling_controller.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SellingController</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.stock_controller.StockController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__setup__" href="#__setup__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__setup__</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="apply_shipping_rule" href="#apply_shipping_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>apply_shipping_rule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_commission" href="#calculate_commission" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_commission</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_contribution" href="#calculate_contribution" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_contribution</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_stop_or_close_sales_order" href="#check_stop_or_close_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_stop_or_close_sales_order</b>
+        <i class="text-muted">(self, ref_fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_already_delivered_qty" href="#get_already_delivered_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_already_delivered_qty</b>
+        <i class="text-muted">(self, current_docname, so, so_detail)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_item_list" href="#get_item_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_item_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_so_qty_and_warehouse" href="#get_so_qty_and_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_so_qty_and_warehouse</b>
+        <i class="text-muted">(self, so_detail)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_product_bundle" href="#has_product_bundle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_product_bundle</b>
+        <i class="text-muted">(self, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="remove_shipping_charge" href="#remove_shipping_charge" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>remove_shipping_charge</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_lead_customer_details" href="#set_missing_lead_customer_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_lead_customer_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_values" href="#set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_values</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_price_list_and_item_details" href="#set_price_list_and_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_price_list_and_item_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_in_words" href="#set_total_in_words" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_in_words</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_max_discount" href="#validate_max_discount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_max_discount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_order_type" href="#validate_order_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_order_type</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.selling_controller.check_active_sales_items" href="#erpnext.controllers.selling_controller.check_active_sales_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.selling_controller.<b>check_active_sales_items</b>
+        <i class="text-muted">(obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
new file mode 100644
index 0000000..05fd9ce
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html

@@ -0,0 +1,200 @@
+<!-- title: erpnext.controllers.status_updater --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/status_updater.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StatusUpdater</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p>Updates the status of the calling records
+Delivery Note: Update Delivered Qty, Update Percent and Validate over delivery
+Sales Invoice: Update Billed Amt, Update Percent and Validate over billing
+Installation Note: Update Installed Qty, Update Percent Qty and Validate over installation</p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_update_children" href="#_update_children" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_update_children</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update quantities or amount in child table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_update_percent_field" href="#_update_percent_field" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_update_percent_field</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update percent field in parent transaction</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_overflow_with_tolerance" href="#check_overflow_with_tolerance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_overflow_with_tolerance</b>
+        <i class="text-muted">(self, item, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Checks if there is overflow condering a relaxation tolerance</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_status" href="#set_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_status</b>
+        <i class="text-muted">(self, update=False, status=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_billing_status" href="#update_billing_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status</b>
+        <i class="text-muted">(self, zero_amount_refdoc, ref_dt, ref_fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_billing_status_for_zero_amount_refdoc" href="#update_billing_status_for_zero_amount_refdoc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_billing_status_for_zero_amount_refdoc</b>
+        <i class="text-muted">(self, ref_dt)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_prevdoc_status" href="#update_prevdoc_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_prevdoc_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_qty" href="#update_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_qty</b>
+        <i class="text-muted">(self, change_modified=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Updates qty or amount at row level</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>change_modified</code></strong> -  If true, updates <code>modified</code> and <code>modified_by</code> for target parent doc</li>
+</ul>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_qty" href="#validate_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validates qty at row level</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.status_updater.get_tolerance_for" href="#erpnext.controllers.status_updater.get_tolerance_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.status_updater.<b>get_tolerance_for</b>
+        <i class="text-muted">(item_code, item_tolerance={}, global_tolerance=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns the tolerance for the item, if not set, returns global tolerance</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.status_updater.validate_status" href="#erpnext.controllers.status_updater.validate_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.status_updater.<b>validate_status</b>
+        <i class="text-muted">(status, options)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
new file mode 100644
index 0000000..fd3dc8c
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html

@@ -0,0 +1,323 @@
+<!-- title: erpnext.controllers.stock_controller --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/stock_controller.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockController</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.accounts_controller.AccountsController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_expense_account" href="#check_expense_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_expense_account</b>
+        <i class="text-muted">(self, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_entries" href="#get_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_entries</b>
+        <i class="text-muted">(self, warehouse_account=None, default_expense_account=None, default_cost_center=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_incoming_rate_for_sales_return" href="#get_incoming_rate_for_sales_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_incoming_rate_for_sales_return</b>
+        <i class="text-muted">(self, item_code, warehouse, against_document)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items_and_warehouses" href="#get_items_and_warehouses" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items_and_warehouses</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_serialized_items" href="#get_serialized_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_serialized_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_sl_entries" href="#get_sl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_sl_entries</b>
+        <i class="text-muted">(self, d, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_stock_ledger_details" href="#get_stock_ledger_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_stock_ledger_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_voucher_details" href="#get_voucher_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_voucher_details</b>
+        <i class="text-muted">(self, default_expense_account, default_cost_center, sle_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_adjustment_entry" href="#make_adjustment_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_adjustment_entry</b>
+        <i class="text-muted">(self, expected_gle, voucher_obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries" href="#make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries</b>
+        <i class="text-muted">(self, repost_future_gle=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries_on_cancel" href="#make_gl_entries_on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries_on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_sl_entries" href="#make_sl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_sl_entries</b>
+        <i class="text-muted">(self, sl_entries, is_amended=None, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_reserved_qty" href="#update_reserved_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_reserved_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_stock_ledger" href="#update_stock_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_stock_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.stock_controller.compare_existing_and_expected_gle" href="#erpnext.controllers.stock_controller.compare_existing_and_expected_gle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.stock_controller.<b>compare_existing_and_expected_gle</b>
+        <i class="text-muted">(existing_gle, expected_gle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.stock_controller.get_future_stock_vouchers" href="#erpnext.controllers.stock_controller.get_future_stock_vouchers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.stock_controller.<b>get_future_stock_vouchers</b>
+        <i class="text-muted">(posting_date, posting_time, for_warehouses=None, for_items=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.stock_controller.get_voucherwise_gl_entries" href="#erpnext.controllers.stock_controller.get_voucherwise_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.stock_controller.<b>get_voucherwise_gl_entries</b>
+        <i class="text-muted">(future_stock_vouchers, posting_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.stock_controller.get_warehouse_account" href="#erpnext.controllers.stock_controller.get_warehouse_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.stock_controller.<b>get_warehouse_account</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.stock_controller.update_gl_entries_after" href="#erpnext.controllers.stock_controller.update_gl_entries_after" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.stock_controller.<b>update_gl_entries_after</b>
+        <i class="text-muted">(posting_date, posting_time, for_warehouses=None, for_items=None, warehouse_account=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html
new file mode 100644
index 0000000..f0c8a32
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.taxes_and_totals.html

@@ -0,0 +1,370 @@
+<!-- title: erpnext.controllers.taxes_and_totals --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/taxes_and_totals.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>calculate_taxes_and_totals</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from __builtin__.object</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_calculate" href="#_calculate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_calculate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_cleanup" href="#_cleanup" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_cleanup</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_get_tax_rate" href="#_get_tax_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_get_tax_rate</b>
+        <i class="text-muted">(self, tax, item_tax_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_load_item_tax_rate" href="#_load_item_tax_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_load_item_tax_rate</b>
+        <i class="text-muted">(self, item_tax_rate)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_set_in_company_currency" href="#_set_in_company_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_set_in_company_currency</b>
+        <i class="text-muted">(self, doc, fields)</i>
+    </p>
+	<div class="docs-attr-desc"><p>set values in base currency</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="adjust_discount_amount_loss" href="#adjust_discount_amount_loss" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>adjust_discount_amount_loss</b>
+        <i class="text-muted">(self, tax)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="apply_discount_amount" href="#apply_discount_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>apply_discount_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate" href="#calculate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_item_values" href="#calculate_item_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_item_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_net_total" href="#calculate_net_total" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_net_total</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_outstanding_amount" href="#calculate_outstanding_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_outstanding_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_taxes" href="#calculate_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_taxes</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_total_advance" href="#calculate_total_advance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_total_advance</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_totals" href="#calculate_totals" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_totals</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="determine_exclusive_rate" href="#determine_exclusive_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>determine_exclusive_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_current_tax_amount" href="#get_current_tax_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_current_tax_amount</b>
+        <i class="text-muted">(self, item, tax, item_tax_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_current_tax_fraction" href="#get_current_tax_fraction" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_current_tax_fraction</b>
+        <i class="text-muted">(self, tax, item_tax_map)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get tax fraction for calculating tax exclusive amount
+from tax inclusive amount</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_total_for_discount_amount" href="#get_total_for_discount_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_total_for_discount_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="initialize_taxes" href="#initialize_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>initialize_taxes</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="manipulate_grand_total_for_inclusive_tax" href="#manipulate_grand_total_for_inclusive_tax" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>manipulate_grand_total_for_inclusive_tax</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="round_off_totals" href="#round_off_totals" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>round_off_totals</b>
+        <i class="text-muted">(self, tax)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_item_wise_tax" href="#set_item_wise_tax" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_item_wise_tax</b>
+        <i class="text-muted">(self, item, tax, tax_rate, current_tax_amount)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_conversion_rate" href="#validate_conversion_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_conversion_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.trends.html b/erpnext/docs/current/api/controllers/erpnext.controllers.trends.html
new file mode 100644
index 0000000..4b72a39
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.trends.html

@@ -0,0 +1,196 @@
+<!-- title: erpnext.controllers.trends --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/trends.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.based_wise_columns_query" href="#erpnext.controllers.trends.based_wise_columns_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>based_wise_columns_query</b>
+        <i class="text-muted">(based_on, trans)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_columns" href="#erpnext.controllers.trends.get_columns" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_columns</b>
+        <i class="text-muted">(filters, trans)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_data" href="#erpnext.controllers.trends.get_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_data</b>
+        <i class="text-muted">(filters, conditions)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_mon" href="#erpnext.controllers.trends.get_mon" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_mon</b>
+        <i class="text-muted">(dt)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.controllers.trends.get_period_date_ranges</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_period_date_ranges" href="#erpnext.controllers.trends.get_period_date_ranges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_period_date_ranges</b>
+        <i class="text-muted">(period, fiscal_year=None, year_start_date=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_period_month_ranges" href="#erpnext.controllers.trends.get_period_month_ranges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_period_month_ranges</b>
+        <i class="text-muted">(period, fiscal_year)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_period_wise_columns" href="#erpnext.controllers.trends.get_period_wise_columns" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_period_wise_columns</b>
+        <i class="text-muted">(bet_dates, period, pwc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.get_period_wise_query" href="#erpnext.controllers.trends.get_period_wise_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>get_period_wise_query</b>
+        <i class="text-muted">(bet_dates, trans_date, query_details)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.group_wise_column" href="#erpnext.controllers.trends.group_wise_column" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>group_wise_column</b>
+        <i class="text-muted">(group_by)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.period_wise_columns_query" href="#erpnext.controllers.trends.period_wise_columns_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>period_wise_columns_query</b>
+        <i class="text-muted">(filters, trans)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.trends.validate_filters" href="#erpnext.controllers.trends.validate_filters" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.trends.<b>validate_filters</b>
+        <i class="text-muted">(filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.website_list_for_contact.html b/erpnext/docs/current/api/controllers/erpnext.controllers.website_list_for_contact.html
new file mode 100644
index 0000000..9c226b2
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.website_list_for_contact.html

@@ -0,0 +1,98 @@
+<!-- title: erpnext.controllers.website_list_for_contact --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/controllers/website_list_for_contact.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.website_list_for_contact.get_customers_suppliers" href="#erpnext.controllers.website_list_for_contact.get_customers_suppliers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.website_list_for_contact.<b>get_customers_suppliers</b>
+        <i class="text-muted">(doctype, user)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.website_list_for_contact.get_list_context" href="#erpnext.controllers.website_list_for_contact.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.website_list_for_contact.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.website_list_for_contact.get_transaction_list" href="#erpnext.controllers.website_list_for_contact.get_transaction_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.website_list_for_contact.<b>get_transaction_list</b>
+        <i class="text-muted">(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.website_list_for_contact.has_website_permission" href="#erpnext.controllers.website_list_for_contact.has_website_permission" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.website_list_for_contact.<b>has_website_permission</b>
+        <i class="text-muted">(doc, ptype, user, verbose=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.controllers.website_list_for_contact.post_process" href="#erpnext.controllers.website_list_for_contact.post_process" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.controllers.website_list_for_contact.<b>post_process</b>
+        <i class="text-muted">(doctype, data)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/index.html b/erpnext/docs/current/api/controllers/index.html
new file mode 100644
index 0000000..d8da3db
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/index.html

@@ -0,0 +1,19 @@
+<!-- title: controllers -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/controllers"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/controllers/index.txt b/erpnext/docs/current/api/controllers/index.txt
new file mode 100644
index 0000000..3965811
--- /dev/null
+++ b/erpnext/docs/current/api/controllers/index.txt

@@ -0,0 +1,14 @@
+erpnext.controllers.accounts_controller
+erpnext.controllers.buying_controller
+erpnext.controllers
+erpnext.controllers.item_variant
+erpnext.controllers.print_settings
+erpnext.controllers.queries
+erpnext.controllers.recurring_document
+erpnext.controllers.sales_and_purchase_return
+erpnext.controllers.selling_controller
+erpnext.controllers.status_updater
+erpnext.controllers.stock_controller
+erpnext.controllers.taxes_and_totals
+erpnext.controllers.trends
+erpnext.controllers.website_list_for_contact
\ No newline at end of file

diff --git a/erpnext/docs/current/api/crm/erpnext.crm.html b/erpnext/docs/current/api/crm/erpnext.crm.html
new file mode 100644
index 0000000..ff9d2d2
--- /dev/null
+++ b/erpnext/docs/current/api/crm/erpnext.crm.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.crm --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/crm.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/crm/index.html b/erpnext/docs/current/api/crm/index.html
new file mode 100644
index 0000000..ecb502b
--- /dev/null
+++ b/erpnext/docs/current/api/crm/index.html

@@ -0,0 +1,19 @@
+<!-- title: crm -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/crm"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/crm/index.txt b/erpnext/docs/current/api/crm/index.txt
new file mode 100644
index 0000000..5c97286
--- /dev/null
+++ b/erpnext/docs/current/api/crm/index.txt

@@ -0,0 +1 @@
+erpnext.crm
\ No newline at end of file

diff --git a/erpnext/docs/current/api/erpnext.__init__.html b/erpnext/docs/current/api/erpnext.__init__.html
new file mode 100644
index 0000000..7020440
--- /dev/null
+++ b/erpnext/docs/current/api/erpnext.__init__.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.__init__ --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/__init__.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/erpnext.__version__.html b/erpnext/docs/current/api/erpnext.__version__.html
new file mode 100644
index 0000000..7499b1e
--- /dev/null
+++ b/erpnext/docs/current/api/erpnext.__version__.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.__version__ --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/__version__.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/erpnext.exceptions.html b/erpnext/docs/current/api/erpnext.exceptions.html
new file mode 100644
index 0000000..7c91646
--- /dev/null
+++ b/erpnext/docs/current/api/erpnext.exceptions.html

@@ -0,0 +1,63 @@
+<!-- title: erpnext.exceptions --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/exceptions.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CustomerFrozen</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidAccountCurrency</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidCurrency</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/erpnext.hooks.html b/erpnext/docs/current/api/erpnext.hooks.html
new file mode 100644
index 0000000..d96bfe6
--- /dev/null
+++ b/erpnext/docs/current/api/erpnext.hooks.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.hooks --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hooks.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/erpnext.tasks.html b/erpnext/docs/current/api/erpnext.tasks.html
new file mode 100644
index 0000000..9bd0ec2
--- /dev/null
+++ b/erpnext/docs/current/api/erpnext.tasks.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.tasks --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/tasks.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/erpnext.hr.html b/erpnext/docs/current/api/hr/erpnext.hr.html
new file mode 100644
index 0000000..0dc3184
--- /dev/null
+++ b/erpnext/docs/current/api/hr/erpnext.hr.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.hr --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hr.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/erpnext.hr.utils.html b/erpnext/docs/current/api/hr/erpnext.hr.utils.html
new file mode 100644
index 0000000..52607d4
--- /dev/null
+++ b/erpnext/docs/current/api/hr/erpnext.hr.utils.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.hr.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hr/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.utils.set_employee_name" href="#erpnext.hr.utils.set_employee_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.utils.<b>set_employee_name</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/index.html b/erpnext/docs/current/api/hr/index.html
new file mode 100644
index 0000000..9f0b88d
--- /dev/null
+++ b/erpnext/docs/current/api/hr/index.html

@@ -0,0 +1,19 @@
+<!-- title: hr -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/hr"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/index.txt b/erpnext/docs/current/api/hr/index.txt
new file mode 100644
index 0000000..c515b53
--- /dev/null
+++ b/erpnext/docs/current/api/hr/index.txt

@@ -0,0 +1,2 @@
+erpnext.hr
+erpnext.hr.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/erpnext.hr.print_format.html b/erpnext/docs/current/api/hr/print_format/erpnext.hr.print_format.html
new file mode 100644
index 0000000..2620e48
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/erpnext.hr.print_format.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.hr.print_format --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hr/print_format.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/index.html b/erpnext/docs/current/api/hr/print_format/index.html
new file mode 100644
index 0000000..d8c6158
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/index.html

@@ -0,0 +1,19 @@
+<!-- title: print_format -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/print_format"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/index.txt b/erpnext/docs/current/api/hr/print_format/index.txt
new file mode 100644
index 0000000..1c63c43
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/index.txt

@@ -0,0 +1 @@
+erpnext.hr.print_format
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/offer_letter/erpnext.hr.print_format.offer_letter.html b/erpnext/docs/current/api/hr/print_format/offer_letter/erpnext.hr.print_format.offer_letter.html
new file mode 100644
index 0000000..67a3a78
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/offer_letter/erpnext.hr.print_format.offer_letter.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.hr.print_format.offer_letter --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hr/print_format/offer_letter.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/offer_letter/index.html b/erpnext/docs/current/api/hr/print_format/offer_letter/index.html
new file mode 100644
index 0000000..e2c18cd
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/offer_letter/index.html

@@ -0,0 +1,19 @@
+<!-- title: offer_letter -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/offer_letter"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hr/print_format/offer_letter/index.txt b/erpnext/docs/current/api/hr/print_format/offer_letter/index.txt
new file mode 100644
index 0000000..eb22082
--- /dev/null
+++ b/erpnext/docs/current/api/hr/print_format/offer_letter/index.txt

@@ -0,0 +1 @@
+erpnext.hr.print_format.offer_letter
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hub_node/erpnext.hub_node.html b/erpnext/docs/current/api/hub_node/erpnext.hub_node.html
new file mode 100644
index 0000000..b22b015
--- /dev/null
+++ b/erpnext/docs/current/api/hub_node/erpnext.hub_node.html

@@ -0,0 +1,36 @@
+<!-- title: erpnext.hub_node --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/hub_node.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hub_node.get_items</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hub_node.get_items" href="#erpnext.hub_node.get_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hub_node.<b>get_items</b>
+        <i class="text-muted">(text, start, limit)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hub_node/index.html b/erpnext/docs/current/api/hub_node/index.html
new file mode 100644
index 0000000..60b42a5
--- /dev/null
+++ b/erpnext/docs/current/api/hub_node/index.html

@@ -0,0 +1,19 @@
+<!-- title: hub_node -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/hub_node"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/hub_node/index.txt b/erpnext/docs/current/api/hub_node/index.txt
new file mode 100644
index 0000000..597a807
--- /dev/null
+++ b/erpnext/docs/current/api/hub_node/index.txt

@@ -0,0 +1 @@
+erpnext.hub_node
\ No newline at end of file

diff --git a/erpnext/docs/current/api/index.html b/erpnext/docs/current/api/index.html
new file mode 100644
index 0000000..3c4ca08
--- /dev/null
+++ b/erpnext/docs/current/api/index.html

@@ -0,0 +1,20 @@
+<!-- title: ERPNext API -->
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Contents</h3>
+
+<!-- autodoc -->
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/current/api/index.txt b/erpnext/docs/current/api/index.txt
new file mode 100644
index 0000000..f7f8f5e
--- /dev/null
+++ b/erpnext/docs/current/api/index.txt

@@ -0,0 +1,5 @@
+erpnext.__init__
+erpnext.__version__
+erpnext.exceptions
+erpnext.hooks
+erpnext.tasks
\ No newline at end of file

diff --git a/erpnext/docs/current/api/manufacturing/erpnext.manufacturing.html b/erpnext/docs/current/api/manufacturing/erpnext.manufacturing.html
new file mode 100644
index 0000000..09ff0f7
--- /dev/null
+++ b/erpnext/docs/current/api/manufacturing/erpnext.manufacturing.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.manufacturing --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/manufacturing.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/manufacturing/index.html b/erpnext/docs/current/api/manufacturing/index.html
new file mode 100644
index 0000000..5d5021d
--- /dev/null
+++ b/erpnext/docs/current/api/manufacturing/index.html

@@ -0,0 +1,19 @@
+<!-- title: manufacturing -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/manufacturing"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/manufacturing/index.txt b/erpnext/docs/current/api/manufacturing/index.txt
new file mode 100644
index 0000000..de5c2bf
--- /dev/null
+++ b/erpnext/docs/current/api/manufacturing/index.txt

@@ -0,0 +1 @@
+erpnext.manufacturing
\ No newline at end of file

diff --git a/erpnext/docs/current/api/projects/erpnext.projects.html b/erpnext/docs/current/api/projects/erpnext.projects.html
new file mode 100644
index 0000000..7e2d1c6
--- /dev/null
+++ b/erpnext/docs/current/api/projects/erpnext.projects.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.projects --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/projects.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/projects/erpnext.projects.utils.html b/erpnext/docs/current/api/projects/erpnext.projects.utils.html
new file mode 100644
index 0000000..c98d887
--- /dev/null
+++ b/erpnext/docs/current/api/projects/erpnext.projects.utils.html

@@ -0,0 +1,54 @@
+<!-- title: erpnext.projects.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/projects/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.utils.get_time_log_list</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.utils.get_time_log_list" href="#erpnext.projects.utils.get_time_log_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.utils.<b>get_time_log_list</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.utils.query_task</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.utils.query_task" href="#erpnext.projects.utils.query_task" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.utils.<b>query_task</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/projects/index.html b/erpnext/docs/current/api/projects/index.html
new file mode 100644
index 0000000..63248bf
--- /dev/null
+++ b/erpnext/docs/current/api/projects/index.html

@@ -0,0 +1,19 @@
+<!-- title: projects -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/projects"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/projects/index.txt b/erpnext/docs/current/api/projects/index.txt
new file mode 100644
index 0000000..f6cc0eb
--- /dev/null
+++ b/erpnext/docs/current/api/projects/index.txt

@@ -0,0 +1,2 @@
+erpnext.projects
+erpnext.projects.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/selling/erpnext.selling.html b/erpnext/docs/current/api/selling/erpnext.selling.html
new file mode 100644
index 0000000..6d34150
--- /dev/null
+++ b/erpnext/docs/current/api/selling/erpnext.selling.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.selling --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/selling.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/selling/index.html b/erpnext/docs/current/api/selling/index.html
new file mode 100644
index 0000000..987b42d
--- /dev/null
+++ b/erpnext/docs/current/api/selling/index.html

@@ -0,0 +1,19 @@
+<!-- title: selling -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/selling"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/selling/index.txt b/erpnext/docs/current/api/selling/index.txt
new file mode 100644
index 0000000..e570c86
--- /dev/null
+++ b/erpnext/docs/current/api/selling/index.txt

@@ -0,0 +1 @@
+erpnext.selling
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/erpnext.setup.html b/erpnext/docs/current/api/setup/erpnext.setup.html
new file mode 100644
index 0000000..7356ec9
--- /dev/null
+++ b/erpnext/docs/current/api/setup/erpnext.setup.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.setup --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/erpnext.setup.install.html b/erpnext/docs/current/api/setup/erpnext.setup.install.html
new file mode 100644
index 0000000..a1c18af
--- /dev/null
+++ b/erpnext/docs/current/api/setup/erpnext.setup.install.html

@@ -0,0 +1,82 @@
+<!-- title: erpnext.setup.install --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/install.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.install.add_web_forms" href="#erpnext.setup.install.add_web_forms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.install.<b>add_web_forms</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Import web forms for Issues and Addresses</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.install.after_install" href="#erpnext.setup.install.after_install" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.install.<b>after_install</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.install.feature_setup" href="#erpnext.setup.install.feature_setup" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.install.<b>feature_setup</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>save global defaults and features setup</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.install.set_single_defaults" href="#erpnext.setup.install.set_single_defaults" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.install.<b>set_single_defaults</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/erpnext.setup.utils.html b/erpnext/docs/current/api/setup/erpnext.setup.utils.html
new file mode 100644
index 0000000..413f743
--- /dev/null
+++ b/erpnext/docs/current/api/setup/erpnext.setup.utils.html

@@ -0,0 +1,100 @@
+<!-- title: erpnext.setup.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.utils.before_tests" href="#erpnext.setup.utils.before_tests" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.utils.<b>before_tests</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.utils.get_ancestors_of" href="#erpnext.setup.utils.get_ancestors_of" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.utils.<b>get_ancestors_of</b>
+        <i class="text-muted">(doctype, name)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get ancestor elements of a DocType with a tree structure</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.utils.get_company_currency" href="#erpnext.setup.utils.get_company_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.utils.<b>get_company_currency</b>
+        <i class="text-muted">(company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.setup.utils.get_exchange_rate</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.utils.get_exchange_rate" href="#erpnext.setup.utils.get_exchange_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.utils.<b>get_exchange_rate</b>
+        <i class="text-muted">(from_currency, to_currency)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.utils.get_root_of" href="#erpnext.setup.utils.get_root_of" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.utils.<b>get_root_of</b>
+        <i class="text-muted">(doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get root element of a DocType with a tree structure</p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/index.html b/erpnext/docs/current/api/setup/index.html
new file mode 100644
index 0000000..8cd811c
--- /dev/null
+++ b/erpnext/docs/current/api/setup/index.html

@@ -0,0 +1,19 @@
+<!-- title: setup -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/setup"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/index.txt b/erpnext/docs/current/api/setup/index.txt
new file mode 100644
index 0000000..63162d8
--- /dev/null
+++ b/erpnext/docs/current/api/setup/index.txt

@@ -0,0 +1,3 @@
+erpnext.setup
+erpnext.setup.install
+erpnext.setup.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html
new file mode 100644
index 0000000..4a78ed1
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.default_website.html

@@ -0,0 +1,105 @@
+<!-- title: erpnext.setup.setup_wizard.default_website --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/default_website.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.default_website.test" href="#erpnext.setup.setup_wizard.default_website.test" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.default_website.<b>test</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>website_maker</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from __builtin__.object</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, company, tagline, user)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_blog" href="#make_blog" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_blog</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_web_page" href="#make_web_page" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_web_page</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_website_settings" href="#make_website_settings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_website_settings</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html
new file mode 100644
index 0000000..0021f57
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.setup.setup_wizard --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.industry_type.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.industry_type.html
new file mode 100644
index 0000000..054eccd
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.industry_type.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.setup.setup_wizard.industry_type --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/industry_type.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.industry_type.get_industry_types" href="#erpnext.setup.setup_wizard.industry_type.get_industry_types" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.industry_type.<b>get_industry_types</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html
new file mode 100644
index 0000000..02fb0da
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.install_fixtures.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.setup.setup_wizard.install_fixtures --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/install_fixtures.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.install_fixtures.install" href="#erpnext.setup.setup_wizard.install_fixtures.install" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.install_fixtures.<b>install</b>
+        <i class="text-muted">(country=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.sample_data.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.sample_data.html
new file mode 100644
index 0000000..c6dc574
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.sample_data.html

@@ -0,0 +1,115 @@
+<!-- title: erpnext.setup.setup_wizard.sample_data --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/sample_data.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_issue" href="#erpnext.setup.setup_wizard.sample_data.make_issue" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_issue</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_material_request" href="#erpnext.setup.setup_wizard.sample_data.make_material_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_material_request</b>
+        <i class="text-muted">(buying_items)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_opportunity" href="#erpnext.setup.setup_wizard.sample_data.make_opportunity" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_opportunity</b>
+        <i class="text-muted">(selling_items, customer)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_projects" href="#erpnext.setup.setup_wizard.sample_data.make_projects" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_projects</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_quote" href="#erpnext.setup.setup_wizard.sample_data.make_quote" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_quote</b>
+        <i class="text-muted">(selling_items, customer)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.sample_data.make_sample_data" href="#erpnext.setup.setup_wizard.sample_data.make_sample_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.sample_data.<b>make_sample_data</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create a few opportunities, quotes, material requests, issues, todos, projects
+to help the user get started</p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html
new file mode 100644
index 0000000..83a4a23
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.setup_wizard.html

@@ -0,0 +1,370 @@
+<!-- title: erpnext.setup.setup_wizard.setup_wizard --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/setup_wizard.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.add_all_roles_to" href="#erpnext.setup.setup_wizard.setup_wizard.add_all_roles_to" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>add_all_roles_to</b>
+        <i class="text-muted">(name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_contact" href="#erpnext.setup.setup_wizard.setup_wizard.create_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_contact</b>
+        <i class="text-muted">(contact, party_type, party)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create contact based on given contact name</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_customers" href="#erpnext.setup.setup_wizard.setup_wizard.create_customers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_customers</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_email_digest" href="#erpnext.setup.setup_wizard.setup_wizard.create_email_digest" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_email_digest</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_feed_and_todo" href="#erpnext.setup.setup_wizard.setup_wizard.create_feed_and_todo" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_feed_and_todo</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>update Activity feed and create todo for creation of item, customer, vendor</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_fiscal_year_and_company" href="#erpnext.setup.setup_wizard.setup_wizard.create_fiscal_year_and_company" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_fiscal_year_and_company</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_items" href="#erpnext.setup.setup_wizard.setup_wizard.create_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_items</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_letter_head" href="#erpnext.setup.setup_wizard.setup_wizard.create_letter_head" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_letter_head</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_logo" href="#erpnext.setup.setup_wizard.setup_wizard.create_logo" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_logo</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_price_lists" href="#erpnext.setup.setup_wizard.setup_wizard.create_price_lists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_price_lists</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_suppliers" href="#erpnext.setup.setup_wizard.setup_wizard.create_suppliers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_suppliers</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_taxes" href="#erpnext.setup.setup_wizard.setup_wizard.create_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_taxes</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_territories" href="#erpnext.setup.setup_wizard.setup_wizard.create_territories" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_territories</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>create two default territories, one for home country and one named Rest of the World</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.create_users" href="#erpnext.setup.setup_wizard.setup_wizard.create_users" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>create_users</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.get_fy_details" href="#erpnext.setup.setup_wizard.setup_wizard.get_fy_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>get_fy_details</b>
+        <i class="text-muted">(fy_start_date, fy_end_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.login_as_first_user" href="#erpnext.setup.setup_wizard.setup_wizard.login_as_first_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>login_as_first_user</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.make_item_price" href="#erpnext.setup.setup_wizard.setup_wizard.make_item_price" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>make_item_price</b>
+        <i class="text-muted">(item, price_list_name, item_price)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.make_sales_and_purchase_tax_templates" href="#erpnext.setup.setup_wizard.setup_wizard.make_sales_and_purchase_tax_templates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>make_sales_and_purchase_tax_templates</b>
+        <i class="text-muted">(account)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.make_tax_head" href="#erpnext.setup.setup_wizard.setup_wizard.make_tax_head" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>make_tax_head</b>
+        <i class="text-muted">(args, i, tax_group, tax_rate)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.set_defaults" href="#erpnext.setup.setup_wizard.setup_wizard.set_defaults" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>set_defaults</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.setup_complete" href="#erpnext.setup.setup_wizard.setup_wizard.setup_complete" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>setup_complete</b>
+        <i class="text-muted">(args=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.setup_wizard.setup_wizard.update_user_name" href="#erpnext.setup.setup_wizard.setup_wizard.update_user_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.setup_wizard.setup_wizard.<b>update_user_name</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_data.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_data.html
new file mode 100644
index 0000000..372fc7d
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_data.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.setup.setup_wizard.test_setup_data --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/test_setup_data.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html
new file mode 100644
index 0000000..8500521
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/erpnext.setup.setup_wizard.test_setup_wizard.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.setup.setup_wizard.test_setup_wizard --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/setup/setup_wizard/test_setup_wizard.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/index.html b/erpnext/docs/current/api/setup/setup_wizard/index.html
new file mode 100644
index 0000000..66740a2
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/index.html

@@ -0,0 +1,19 @@
+<!-- title: setup_wizard -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/setup_wizard"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/setup/setup_wizard/index.txt b/erpnext/docs/current/api/setup/setup_wizard/index.txt
new file mode 100644
index 0000000..6e21162
--- /dev/null
+++ b/erpnext/docs/current/api/setup/setup_wizard/index.txt

@@ -0,0 +1,8 @@
+erpnext.setup.setup_wizard.default_website
+erpnext.setup.setup_wizard
+erpnext.setup.setup_wizard.industry_type
+erpnext.setup.setup_wizard.install_fixtures
+erpnext.setup.setup_wizard.sample_data
+erpnext.setup.setup_wizard.setup_wizard
+erpnext.setup.setup_wizard.test_setup_data
+erpnext.setup.setup_wizard.test_setup_wizard
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html
new file mode 100644
index 0000000..cc9dcd6
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.cart.html

@@ -0,0 +1,363 @@
+<!-- title: erpnext.shopping_cart.cart --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/shopping_cart/cart.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>WebsitePriceListMissingError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart._apply_shipping_rule" href="#erpnext.shopping_cart.cart._apply_shipping_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>_apply_shipping_rule</b>
+        <i class="text-muted">(party=None, quotation=None, cart_settings=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart._get_cart_quotation" href="#erpnext.shopping_cart.cart._get_cart_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>_get_cart_quotation</b>
+        <i class="text-muted">(party=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart._set_price_list" href="#erpnext.shopping_cart.cart._set_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>_set_price_list</b>
+        <i class="text-muted">(quotation, cart_settings)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set price list based on customer or shopping cart default</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.apply_cart_settings" href="#erpnext.shopping_cart.cart.apply_cart_settings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>apply_cart_settings</b>
+        <i class="text-muted">(party=None, quotation=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.cart.apply_shipping_rule</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.apply_shipping_rule" href="#erpnext.shopping_cart.cart.apply_shipping_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>apply_shipping_rule</b>
+        <i class="text-muted">(shipping_rule)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.decorate_quotation_doc" href="#erpnext.shopping_cart.cart.decorate_quotation_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>decorate_quotation_doc</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_address_docs" href="#erpnext.shopping_cart.cart.get_address_docs" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_address_docs</b>
+        <i class="text-muted">(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_address_territory" href="#erpnext.shopping_cart.cart.get_address_territory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_address_territory</b>
+        <i class="text-muted">(address_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Tries to match city, state and country of address to existing territory</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_applicable_shipping_rules" href="#erpnext.shopping_cart.cart.get_applicable_shipping_rules" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_applicable_shipping_rules</b>
+        <i class="text-muted">(party=None, quotation=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.cart.get_cart_quotation</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_cart_quotation" href="#erpnext.shopping_cart.cart.get_cart_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_cart_quotation</b>
+        <i class="text-muted">(doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_customer" href="#erpnext.shopping_cart.cart.get_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_customer</b>
+        <i class="text-muted">(user=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.get_shipping_rules" href="#erpnext.shopping_cart.cart.get_shipping_rules" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>get_shipping_rules</b>
+        <i class="text-muted">(quotation=None, cart_settings=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.guess_territory" href="#erpnext.shopping_cart.cart.guess_territory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>guess_territory</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.cart.place_order</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.place_order" href="#erpnext.shopping_cart.cart.place_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>place_order</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.set_cart_count" href="#erpnext.shopping_cart.cart.set_cart_count" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>set_cart_count</b>
+        <i class="text-muted">(quotation=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.set_price_list_and_rate" href="#erpnext.shopping_cart.cart.set_price_list_and_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>set_price_list_and_rate</b>
+        <i class="text-muted">(quotation, cart_settings)</i>
+    </p>
+	<div class="docs-attr-desc"><p>set price list based on billing territory</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.set_taxes" href="#erpnext.shopping_cart.cart.set_taxes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>set_taxes</b>
+        <i class="text-muted">(quotation, cart_settings)</i>
+    </p>
+	<div class="docs-attr-desc"><p>set taxes based on billing territory</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.cart.update_cart</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.update_cart" href="#erpnext.shopping_cart.cart.update_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>update_cart</b>
+        <i class="text-muted">(item_code, qty, with_items=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.cart.update_cart_address</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.update_cart_address" href="#erpnext.shopping_cart.cart.update_cart_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>update_cart_address</b>
+        <i class="text-muted">(address_fieldname, address_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.cart.update_party" href="#erpnext.shopping_cart.cart.update_party" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.cart.<b>update_party</b>
+        <i class="text-muted">(fullname, company_name=None, mobile_no=None, phone=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.html
new file mode 100644
index 0000000..ad50db4
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.shopping_cart --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/shopping_cart.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.product.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.product.html
new file mode 100644
index 0000000..7f8e297
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.product.html

@@ -0,0 +1,68 @@
+<!-- title: erpnext.shopping_cart.product --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/shopping_cart/product.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.product.get_price" href="#erpnext.shopping_cart.product.get_price" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.product.<b>get_price</b>
+        <i class="text-muted">(item_code, template_item_code, price_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.shopping_cart.product.get_product_info</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.product.get_product_info" href="#erpnext.shopping_cart.product.get_product_info" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.product.<b>get_product_info</b>
+        <i class="text-muted">(item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get product price / stock info</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.product.get_qty_in_stock" href="#erpnext.shopping_cart.product.get_qty_in_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.product.<b>get_qty_in_stock</b>
+        <i class="text-muted">(item_code, template_item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html
new file mode 100644
index 0000000..aad5c36
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.test_shopping_cart.html

@@ -0,0 +1,244 @@
+<!-- title: erpnext.shopping_cart.test_shopping_cart --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/shopping_cart/test_shopping_cart.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TestShoppingCart</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from unittest.case.TestCase</i></h4>
+    
+    <div class="docs-attr-desc"><p>Note:
+Shopping Cart == Quotation</p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_quotation" href="#create_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_quotation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="disable_shopping_cart" href="#disable_shopping_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>disable_shopping_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="enable_shopping_cart" href="#enable_shopping_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>enable_shopping_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="login_as_customer" href="#login_as_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>login_as_customer</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="login_as_new_user" href="#login_as_new_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>login_as_new_user</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="remove_all_items_from_cart" href="#remove_all_items_from_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>remove_all_items_from_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="remove_test_quotation" href="#remove_test_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>remove_test_quotation</b>
+        <i class="text-muted">(self, quotation)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="setUp" href="#setUp" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>setUp</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="tearDown" href="#tearDown" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>tearDown</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_add_to_cart" href="#test_add_to_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_add_to_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_get_cart_customer" href="#test_get_cart_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_get_cart_customer</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_get_cart_new_user" href="#test_get_cart_new_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_get_cart_new_user</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_remove_from_cart" href="#test_remove_from_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_remove_from_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_tax_rule" href="#test_tax_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_tax_rule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_update_cart" href="#test_update_cart" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_update_cart</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html
new file mode 100644
index 0000000..cd8cbc1
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/erpnext.shopping_cart.utils.html

@@ -0,0 +1,98 @@
+<!-- title: erpnext.shopping_cart.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/shopping_cart/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.utils.clear_cart_count" href="#erpnext.shopping_cart.utils.clear_cart_count" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.utils.<b>clear_cart_count</b>
+        <i class="text-muted">(login_manager)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.utils.set_cart_count" href="#erpnext.shopping_cart.utils.set_cart_count" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.utils.<b>set_cart_count</b>
+        <i class="text-muted">(login_manager)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.utils.show_cart_count" href="#erpnext.shopping_cart.utils.show_cart_count" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.utils.<b>show_cart_count</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.utils.update_my_account_context" href="#erpnext.shopping_cart.utils.update_my_account_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.utils.<b>update_my_account_context</b>
+        <i class="text-muted">(context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.utils.update_website_context" href="#erpnext.shopping_cart.utils.update_website_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.utils.<b>update_website_context</b>
+        <i class="text-muted">(context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/index.html b/erpnext/docs/current/api/shopping_cart/index.html
new file mode 100644
index 0000000..3903d46
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/index.html

@@ -0,0 +1,19 @@
+<!-- title: shopping_cart -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/shopping_cart"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/shopping_cart/index.txt b/erpnext/docs/current/api/shopping_cart/index.txt
new file mode 100644
index 0000000..c95a01d
--- /dev/null
+++ b/erpnext/docs/current/api/shopping_cart/index.txt

@@ -0,0 +1,5 @@
+erpnext.shopping_cart.cart
+erpnext.shopping_cart
+erpnext.shopping_cart.product
+erpnext.shopping_cart.test_shopping_cart
+erpnext.shopping_cart.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/erpnext.startup.boot.html b/erpnext/docs/current/api/startup/erpnext.startup.boot.html
new file mode 100644
index 0000000..5dc50c7
--- /dev/null
+++ b/erpnext/docs/current/api/startup/erpnext.startup.boot.html

@@ -0,0 +1,82 @@
+<!-- title: erpnext.startup.boot --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/startup/boot.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.startup.boot.boot_session" href="#erpnext.startup.boot.boot_session" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.startup.boot.<b>boot_session</b>
+        <i class="text-muted">(bootinfo)</i>
+    </p>
+	<div class="docs-attr-desc"><p>boot session - send website info if guest</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.startup.boot.get_letter_heads" href="#erpnext.startup.boot.get_letter_heads" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.startup.boot.<b>get_letter_heads</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.startup.boot.load_country_and_currency" href="#erpnext.startup.boot.load_country_and_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.startup.boot.<b>load_country_and_currency</b>
+        <i class="text-muted">(bootinfo)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.startup.boot.update_page_info" href="#erpnext.startup.boot.update_page_info" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.startup.boot.<b>update_page_info</b>
+        <i class="text-muted">(bootinfo)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/erpnext.startup.html b/erpnext/docs/current/api/startup/erpnext.startup.html
new file mode 100644
index 0000000..6866385
--- /dev/null
+++ b/erpnext/docs/current/api/startup/erpnext.startup.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.startup --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/startup.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/erpnext.startup.notifications.html b/erpnext/docs/current/api/startup/erpnext.startup.notifications.html
new file mode 100644
index 0000000..e16eb74
--- /dev/null
+++ b/erpnext/docs/current/api/startup/erpnext.startup.notifications.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.startup.notifications --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/startup/notifications.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.startup.notifications.get_notification_config" href="#erpnext.startup.notifications.get_notification_config" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.startup.notifications.<b>get_notification_config</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/erpnext.startup.report_data_map.html b/erpnext/docs/current/api/startup/erpnext.startup.report_data_map.html
new file mode 100644
index 0000000..fcf1e8f
--- /dev/null
+++ b/erpnext/docs/current/api/startup/erpnext.startup.report_data_map.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.startup.report_data_map --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/startup/report_data_map.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/index.html b/erpnext/docs/current/api/startup/index.html
new file mode 100644
index 0000000..1cc0b94
--- /dev/null
+++ b/erpnext/docs/current/api/startup/index.html

@@ -0,0 +1,19 @@
+<!-- title: startup -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/startup"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/startup/index.txt b/erpnext/docs/current/api/startup/index.txt
new file mode 100644
index 0000000..40766bc
--- /dev/null
+++ b/erpnext/docs/current/api/startup/index.txt

@@ -0,0 +1,4 @@
+erpnext.startup.boot
+erpnext.startup
+erpnext.startup.notifications
+erpnext.startup.report_data_map
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html
new file mode 100644
index 0000000..8724808
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.get_item_details.html

@@ -0,0 +1,500 @@
+<!-- title: erpnext.stock.get_item_details --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock/get_item_details.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.apply_price_list</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.apply_price_list" href="#erpnext.stock.get_item_details.apply_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>apply_price_list</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>args = {
+    "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
+    "conversion</em>rate": 1.0,
+    "selling<em>price</em>list": None,
+    "price<em>list</em>currency": None,
+    "plc<em>conversion</em>rate": 1.0,
+    "parenttype": "",
+    "parent": "",
+    "supplier": None,
+    "transaction<em>date": None,
+    "conversion</em>rate": 1.0,
+    "buying<em>price</em>list": None,
+    "transaction<em>type": "selling",
+    "ignore</em>pricing_rule": 0/1
+}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.apply_price_list_on_item" href="#erpnext.stock.get_item_details.apply_price_list_on_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>apply_price_list_on_item</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_actual_batch_qty" href="#erpnext.stock.get_item_details.get_actual_batch_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_actual_batch_qty</b>
+        <i class="text-muted">(batch_no, warehouse, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_available_qty</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_available_qty" href="#erpnext.stock.get_item_details.get_available_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_available_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_basic_details" href="#erpnext.stock.get_item_details.get_basic_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_basic_details</b>
+        <i class="text-muted">(args, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_batch_qty</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_batch_qty" href="#erpnext.stock.get_item_details.get_batch_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_batch_qty</b>
+        <i class="text-muted">(batch_no, warehouse, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_conversion_factor</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_conversion_factor" href="#erpnext.stock.get_item_details.get_conversion_factor" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_conversion_factor</b>
+        <i class="text-muted">(item_code, uom)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_default_bom</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_default_bom" href="#erpnext.stock.get_item_details.get_default_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_default_bom</b>
+        <i class="text-muted">(item_code=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_default_cost_center" href="#erpnext.stock.get_item_details.get_default_cost_center" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_default_cost_center</b>
+        <i class="text-muted">(args, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_default_expense_account" href="#erpnext.stock.get_item_details.get_default_expense_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_default_expense_account</b>
+        <i class="text-muted">(args, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_default_income_account" href="#erpnext.stock.get_item_details.get_default_income_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_default_income_account</b>
+        <i class="text-muted">(args, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_item_code</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_item_code" href="#erpnext.stock.get_item_details.get_item_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_item_code</b>
+        <i class="text-muted">(barcode=None, serial_no=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_item_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_item_details" href="#erpnext.stock.get_item_details.get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_item_details</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>args = {
+    "item<em>code": "",
+    "warehouse": None,
+    "customer": "",
+    "conversion</em>rate": 1.0,
+    "selling<em>price</em>list": None,
+    "price<em>list</em>currency": None,
+    "plc<em>conversion</em>rate": 1.0,
+    "parenttype": "",
+    "parent": "",
+    "supplier": None,
+    "transaction<em>date": None,
+    "conversion</em>rate": 1.0,
+    "buying<em>price</em>list": None,
+    "is<em>subcontracted": "Yes" / "No",
+    "transaction</em>type": "selling",
+    "ignore<em>pricing</em>rule": 0/1
+    "project_name": ""
+}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_party_item_code" href="#erpnext.stock.get_item_details.get_party_item_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_party_item_code</b>
+        <i class="text-muted">(args, item_doc, out)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_pos_profile</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_pos_profile" href="#erpnext.stock.get_item_details.get_pos_profile" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_pos_profile</b>
+        <i class="text-muted">(company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_pos_profile_item_details" href="#erpnext.stock.get_item_details.get_pos_profile_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_pos_profile_item_details</b>
+        <i class="text-muted">(company, args, pos_profile=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_price_list_currency" href="#erpnext.stock.get_item_details.get_price_list_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_price_list_currency</b>
+        <i class="text-muted">(price_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_price_list_currency_and_exchange_rate" href="#erpnext.stock.get_item_details.get_price_list_currency_and_exchange_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_price_list_currency_and_exchange_rate</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_price_list_rate" href="#erpnext.stock.get_item_details.get_price_list_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_price_list_rate</b>
+        <i class="text-muted">(args, item_doc, out)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_price_list_rate_for" href="#erpnext.stock.get_item_details.get_price_list_rate_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_price_list_rate_for</b>
+        <i class="text-muted">(args, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.get_item_details.get_projected_qty</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_projected_qty" href="#erpnext.stock.get_item_details.get_projected_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_projected_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.get_serial_nos_by_fifo" href="#erpnext.stock.get_item_details.get_serial_nos_by_fifo" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>get_serial_nos_by_fifo</b>
+        <i class="text-muted">(args, item_doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.insert_item_price" href="#erpnext.stock.get_item_details.insert_item_price" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>insert_item_price</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Insert Item Price if Price List and Price List Rate are specified and currency is the same</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.process_args" href="#erpnext.stock.get_item_details.process_args" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>process_args</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.validate_conversion_rate" href="#erpnext.stock.get_item_details.validate_conversion_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>validate_conversion_rate</b>
+        <i class="text-muted">(args, meta)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.validate_item_details" href="#erpnext.stock.get_item_details.validate_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>validate_item_details</b>
+        <i class="text-muted">(args, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.get_item_details.validate_price_list" href="#erpnext.stock.get_item_details.validate_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.get_item_details.<b>validate_price_list</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.html b/erpnext/docs/current/api/stock/erpnext.stock.html
new file mode 100644
index 0000000..42937be
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.stock --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.reorder_item.html b/erpnext/docs/current/api/stock/erpnext.stock.reorder_item.html
new file mode 100644
index 0000000..aee77b0
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.reorder_item.html

@@ -0,0 +1,115 @@
+<!-- title: erpnext.stock.reorder_item --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock/reorder_item.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item._reorder_item" href="#erpnext.stock.reorder_item._reorder_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>_reorder_item</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item.create_material_request" href="#erpnext.stock.reorder_item.create_material_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>create_material_request</b>
+        <i class="text-muted">(material_requests)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>Create indent on reaching reorder level
+</code></pre>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item.get_item_warehouse_projected_qty" href="#erpnext.stock.reorder_item.get_item_warehouse_projected_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>get_item_warehouse_projected_qty</b>
+        <i class="text-muted">(items_to_consider)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item.notify_errors" href="#erpnext.stock.reorder_item.notify_errors" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>notify_errors</b>
+        <i class="text-muted">(exceptions_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item.reorder_item" href="#erpnext.stock.reorder_item.reorder_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>reorder_item</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Reorder item if stock reaches reorder level</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.reorder_item.send_email_notification" href="#erpnext.stock.reorder_item.send_email_notification" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.reorder_item.<b>send_email_notification</b>
+        <i class="text-muted">(mr_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Notify user about auto creation of indent</p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.stock_balance.html b/erpnext/docs/current/api/stock/erpnext.stock.stock_balance.html
new file mode 100644
index 0000000..ced3d56
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.stock_balance.html

@@ -0,0 +1,210 @@
+<!-- title: erpnext.stock.stock_balance --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock/stock_balance.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.get_balance_qty_from_sle" href="#erpnext.stock.stock_balance.get_balance_qty_from_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>get_balance_qty_from_sle</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.get_indented_qty" href="#erpnext.stock.stock_balance.get_indented_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>get_indented_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.get_ordered_qty" href="#erpnext.stock.stock_balance.get_ordered_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>get_ordered_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.get_planned_qty" href="#erpnext.stock.stock_balance.get_planned_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>get_planned_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.get_reserved_qty" href="#erpnext.stock.stock_balance.get_reserved_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>get_reserved_qty</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.repost" href="#erpnext.stock.stock_balance.repost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>repost</b>
+        <i class="text-muted">(only_actual=False, allow_negative_stock=False, allow_zero_rate=False, only_bin=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Repost everything!</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.repost_actual_qty" href="#erpnext.stock.stock_balance.repost_actual_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>repost_actual_qty</b>
+        <i class="text-muted">(item_code, warehouse, allow_zero_rate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.repost_all_stock_vouchers" href="#erpnext.stock.stock_balance.repost_all_stock_vouchers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>repost_all_stock_vouchers</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.repost_stock" href="#erpnext.stock.stock_balance.repost_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>repost_stock</b>
+        <i class="text-muted">(item_code, warehouse, allow_zero_rate=False, only_actual=False, only_bin=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.reset_serial_no_status_and_warehouse" href="#erpnext.stock.stock_balance.reset_serial_no_status_and_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>reset_serial_no_status_and_warehouse</b>
+        <i class="text-muted">(serial_nos=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.set_stock_balance_as_per_serial_no" href="#erpnext.stock.stock_balance.set_stock_balance_as_per_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>set_stock_balance_as_per_serial_no</b>
+        <i class="text-muted">(item_code=None, posting_date=None, posting_time=None, fiscal_year=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_balance.update_bin_qty" href="#erpnext.stock.stock_balance.update_bin_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_balance.<b>update_bin_qty</b>
+        <i class="text-muted">(item_code, warehouse, qty_dict=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.stock_ledger.html b/erpnext/docs/current/api/stock/erpnext.stock.stock_ledger.html
new file mode 100644
index 0000000..f577b5e
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.stock_ledger.html

@@ -0,0 +1,339 @@
+<!-- title: erpnext.stock.stock_ledger --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock/stock_ledger.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NegativeStockError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.delete_cancelled_entry" href="#erpnext.stock.stock_ledger.delete_cancelled_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>delete_cancelled_entry</b>
+        <i class="text-muted">(voucher_type, voucher_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.get_previous_sle" href="#erpnext.stock.stock_ledger.get_previous_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>get_previous_sle</b>
+        <i class="text-muted">(args, for_update=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get the last sle on or before the current time-bucket,
+to get actual qty before transaction, this function
+is called from various transaction like stock entry, reco etc</p>
+
+<p>args = {
+    "item<em>code": "ABC",
+    "warehouse": "XYZ",
+    "posting</em>date": "2012-12-12",
+    "posting_time": "12:00",
+    "sle": "name of reference Stock Ledger Entry"
+}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.get_stock_ledger_entries" href="#erpnext.stock.stock_ledger.get_stock_ledger_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>get_stock_ledger_entries</b>
+        <i class="text-muted">(previous_sle, operator=None, order=desc, limit=None, for_update=False, debug=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get stock ledger entries filtered by specific posting datetime conditions</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.get_valuation_rate" href="#erpnext.stock.stock_ledger.get_valuation_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>get_valuation_rate</b>
+        <i class="text-muted">(item_code, warehouse, allow_zero_rate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.make_entry" href="#erpnext.stock.stock_ledger.make_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>make_entry</b>
+        <i class="text-muted">(args, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.make_sl_entries" href="#erpnext.stock.stock_ledger.make_sl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>make_sl_entries</b>
+        <i class="text-muted">(sl_entries, is_amended=None, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.stock_ledger.set_as_cancel" href="#erpnext.stock.stock_ledger.set_as_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.stock_ledger.<b>set_as_cancel</b>
+        <i class="text-muted">(voucher_type, voucher_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>update_entries_after</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from __builtin__.object</i></h4>
+    
+    <div class="docs-attr-desc"><p>update valution rate and qty after transaction
+from the current time-bucket onwards</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><p><strong><code>args</code></strong> -  args as dict</p>
+
+<p>args = {
+    "item<em>code": "ABC",
+    "warehouse": "XYZ",
+    "posting</em>date": "2012-12-12",
+    "posting_time": "12:00"
+}</p></li>
+</ul>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, args, allow_zero_rate=False, allow_negative_stock=None, via_landed_cost_voucher=False, verbose=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="build" href="#build" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>build</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_fifo_values" href="#get_fifo_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_fifo_values</b>
+        <i class="text-muted">(self, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_moving_average_values" href="#get_moving_average_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_moving_average_values</b>
+        <i class="text-muted">(self, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_serialized_values" href="#get_serialized_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_serialized_values</b>
+        <i class="text-muted">(self, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_sle_after_datetime" href="#get_sle_after_datetime" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_sle_after_datetime</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get Stock Ledger Entries after a particular datetime, for reposting</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_sle_before_datetime" href="#get_sle_before_datetime" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_sle_before_datetime</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get previous stock ledger entry before current time-bucket</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="process_sle" href="#process_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>process_sle</b>
+        <i class="text-muted">(self, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="raise_exceptions" href="#raise_exceptions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>raise_exceptions</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_bin" href="#update_bin" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_bin</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_negative_stock" href="#validate_negative_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_negative_stock</b>
+        <i class="text-muted">(self, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p>validate negative stock for entries current datetime onwards
+will not consider cancelled entries</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/erpnext.stock.utils.html b/erpnext/docs/current/api/stock/erpnext.stock.utils.html
new file mode 100644
index 0000000..1fb0155
--- /dev/null
+++ b/erpnext/docs/current/api/stock/erpnext.stock.utils.html

@@ -0,0 +1,213 @@
+<!-- title: erpnext.stock.utils --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/stock/utils.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidWarehouseCompany</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_avg_purchase_rate" href="#erpnext.stock.utils.get_avg_purchase_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_avg_purchase_rate</b>
+        <i class="text-muted">(serial_nos)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get average value of serial numbers</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_bin" href="#erpnext.stock.utils.get_bin" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_bin</b>
+        <i class="text-muted">(item_code, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_fifo_rate" href="#erpnext.stock.utils.get_fifo_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_fifo_rate</b>
+        <i class="text-muted">(previous_stock_queue, qty)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get FIFO (average) Rate from Queue</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.utils.get_incoming_rate</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_incoming_rate" href="#erpnext.stock.utils.get_incoming_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_incoming_rate</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get Incoming Rate based on valuation method</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_latest_stock_balance" href="#erpnext.stock.utils.get_latest_stock_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_latest_stock_balance</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_stock_balance" href="#erpnext.stock.utils.get_stock_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_stock_balance</b>
+        <i class="text-muted">(item_code, warehouse, posting_date=None, posting_time=None, with_valuation_rate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns stock balance quantity at given warehouse on given posting date or current date.</p>
+
+<p>If <code>with_valuation_rate</code> is True, will return tuple (qty, rate)</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_stock_value_on" href="#erpnext.stock.utils.get_stock_value_on" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_stock_value_on</b>
+        <i class="text-muted">(warehouse=None, posting_date=None, item_code=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_valid_serial_nos" href="#erpnext.stock.utils.get_valid_serial_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_valid_serial_nos</b>
+        <i class="text-muted">(sr_nos, qty=0, item_code=)</i>
+    </p>
+	<div class="docs-attr-desc"><p>split serial nos, validate and return list of valid serial nos</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.get_valuation_method" href="#erpnext.stock.utils.get_valuation_method" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>get_valuation_method</b>
+        <i class="text-muted">(item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get valuation method from item or default</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.update_bin" href="#erpnext.stock.utils.update_bin" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>update_bin</b>
+        <i class="text-muted">(args, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.utils.validate_warehouse_company" href="#erpnext.stock.utils.validate_warehouse_company" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.utils.<b>validate_warehouse_company</b>
+        <i class="text-muted">(warehouse, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/index.html b/erpnext/docs/current/api/stock/index.html
new file mode 100644
index 0000000..fe17254
--- /dev/null
+++ b/erpnext/docs/current/api/stock/index.html

@@ -0,0 +1,19 @@
+<!-- title: stock -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/stock"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/stock/index.txt b/erpnext/docs/current/api/stock/index.txt
new file mode 100644
index 0000000..27cb148
--- /dev/null
+++ b/erpnext/docs/current/api/stock/index.txt

@@ -0,0 +1,6 @@
+erpnext.stock.get_item_details
+erpnext.stock
+erpnext.stock.reorder_item
+erpnext.stock.stock_balance
+erpnext.stock.stock_ledger
+erpnext.stock.utils
\ No newline at end of file

diff --git a/erpnext/docs/current/api/support/erpnext.support.html b/erpnext/docs/current/api/support/erpnext.support.html
new file mode 100644
index 0000000..d10ce6b
--- /dev/null
+++ b/erpnext/docs/current/api/support/erpnext.support.html

@@ -0,0 +1,18 @@
+<!-- title: erpnext.support --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/support.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/support/index.html b/erpnext/docs/current/api/support/index.html
new file mode 100644
index 0000000..bcbe1c8
--- /dev/null
+++ b/erpnext/docs/current/api/support/index.html

@@ -0,0 +1,19 @@
+<!-- title: support -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/support"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/support/index.txt b/erpnext/docs/current/api/support/index.txt
new file mode 100644
index 0000000..42739d1
--- /dev/null
+++ b/erpnext/docs/current/api/support/index.txt

@@ -0,0 +1 @@
+erpnext.support
\ No newline at end of file

diff --git a/erpnext/docs/current/api/utilities/erpnext.utilities.address_and_contact.html b/erpnext/docs/current/api/utilities/erpnext.utilities.address_and_contact.html
new file mode 100644
index 0000000..89c9c17
--- /dev/null
+++ b/erpnext/docs/current/api/utilities/erpnext.utilities.address_and_contact.html

@@ -0,0 +1,114 @@
+<!-- title: erpnext.utilities.address_and_contact --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/utilities/address_and_contact.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.get_permission_query_conditions" href="#erpnext.utilities.address_and_contact.get_permission_query_conditions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>get_permission_query_conditions</b>
+        <i class="text-muted">(doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.get_permission_query_conditions_for_address" href="#erpnext.utilities.address_and_contact.get_permission_query_conditions_for_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>get_permission_query_conditions_for_address</b>
+        <i class="text-muted">(user)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.get_permission_query_conditions_for_contact" href="#erpnext.utilities.address_and_contact.get_permission_query_conditions_for_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>get_permission_query_conditions_for_contact</b>
+        <i class="text-muted">(user)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.get_permitted_and_not_permitted_links" href="#erpnext.utilities.address_and_contact.get_permitted_and_not_permitted_links" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>get_permitted_and_not_permitted_links</b>
+        <i class="text-muted">(doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.has_permission" href="#erpnext.utilities.address_and_contact.has_permission" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>has_permission</b>
+        <i class="text-muted">(doc, ptype, user)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.address_and_contact.load_address_and_contact" href="#erpnext.utilities.address_and_contact.load_address_and_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.address_and_contact.<b>load_address_and_contact</b>
+        <i class="text-muted">(doc, key)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Loads address list and contact list in <code>__onload</code></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/utilities/erpnext.utilities.html b/erpnext/docs/current/api/utilities/erpnext.utilities.html
new file mode 100644
index 0000000..f2a4dc8
--- /dev/null
+++ b/erpnext/docs/current/api/utilities/erpnext.utilities.html

@@ -0,0 +1,34 @@
+<!-- title: erpnext.utilities --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/utilities.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.update_doctypes" href="#erpnext.utilities.update_doctypes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.<b>update_doctypes</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/utilities/erpnext.utilities.transaction_base.html b/erpnext/docs/current/api/utilities/erpnext.utilities.transaction_base.html
new file mode 100644
index 0000000..216cec5
--- /dev/null
+++ b/erpnext/docs/current/api/utilities/erpnext.utilities.transaction_base.html

@@ -0,0 +1,206 @@
+<!-- title: erpnext.utilities.transaction_base --><div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/blob/develop/erpnext/utilities/transaction_base.py"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TransactionBase</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.status_updater.StatusUpdater</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_add_calendar_event" href="#_add_calendar_event" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_add_calendar_event</b>
+        <i class="text-muted">(self, opts)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_calendar_event" href="#add_calendar_event" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_calendar_event</b>
+        <i class="text-muted">(self, opts, force=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="compare_values" href="#compare_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>compare_values</b>
+        <i class="text-muted">(self, ref_doc, fields, doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_events" href="#delete_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_events</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="load_notification_message" href="#load_notification_message" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>load_notification_message</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_posting_time" href="#validate_posting_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_posting_time</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_rate_with_reference_doc" href="#validate_rate_with_reference_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_rate_with_reference_doc</b>
+        <i class="text-muted">(self, ref_details)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_uom_is_integer" href="#validate_uom_is_integer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_uom_is_integer</b>
+        <i class="text-muted">(self, uom_field, qty_fields)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self, ref)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>UOMMustBeIntegerError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.transaction_base.delete_events" href="#erpnext.utilities.transaction_base.delete_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.transaction_base.<b>delete_events</b>
+        <i class="text-muted">(ref_type, ref_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.transaction_base.validate_uom_is_integer" href="#erpnext.utilities.transaction_base.validate_uom_is_integer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.transaction_base.<b>validate_uom_is_integer</b>
+        <i class="text-muted">(doc, uom_field, qty_fields, child_dt=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/utilities/index.html b/erpnext/docs/current/api/utilities/index.html
new file mode 100644
index 0000000..12c76f3
--- /dev/null
+++ b/erpnext/docs/current/api/utilities/index.html

@@ -0,0 +1,19 @@
+<!-- title: utilities -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/utilities"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>Package Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/current/api/utilities/index.txt b/erpnext/docs/current/api/utilities/index.txt
new file mode 100644
index 0000000..86ae38f
--- /dev/null
+++ b/erpnext/docs/current/api/utilities/index.txt

@@ -0,0 +1,3 @@
+erpnext.utilities.address_and_contact
+erpnext.utilities
+erpnext.utilities.transaction_base
\ No newline at end of file

diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
new file mode 100644
index 0000000..338ec01
--- /dev/null
+++ b/erpnext/docs/current/index.html

@@ -0,0 +1,55 @@
+<!-- title: ERPNext: Developer Docs -->
+<!-- no-breadcrumbs -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<table class="table table-bordered">
+	<tr>
+		<td style="width: 20%">
+			App Name
+		</td>
+		<td>
+			<code>erpnext</code>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Publisher
+		</td>
+		<td>
+			<code>Frappe Technologies Pvt. Ltd.</code>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			Version
+		</td>
+		<td>
+			<code>6.12.3</code>
+		</td>
+	</tr>
+</table>
+
+<h3>Contents</h3>
+<ul>
+	<li>
+		<a href="models">Models (DocTypes)</a>
+	</li>
+	<li>
+		<a href="api">Server-side API</a>
+	</li>
+</ul>
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html
new file mode 100644
index 0000000..d9c83b0
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/account.html

@@ -0,0 +1,989 @@
+<!-- title: Account -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/account"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAccount</code></p>
+
+
+Heads (or groups) against which Accounting Entries are made and balances are maintained.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>properties</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>account_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Account Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>is_group</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Group
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>root_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Root Type
+                
+            </td>
+            <td>
+                <pre>
+Asset
+Liability
+Income
+Expense
+Equity</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>report_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Report Type
+                
+            </td>
+            <td>
+                <pre>
+Balance Sheet
+Profit and Loss</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>account_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>parent_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>account_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Account Type
+                <p class="text-muted small">
+                    Setting Account Type helps in selecting this Account in transactions.</p>
+            </td>
+            <td>
+                <pre>
+Bank
+Cash
+Tax
+Chargeable
+Warehouse
+Receivable
+Payable
+Equity
+Fixed Asset
+Cost of Goods Sold
+Expense Account
+Round Off
+Income Account
+Stock Received But Not Billed
+Expenses Included In Valuation
+Stock Adjustment
+Stock
+Temporary</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>tax_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Rate
+                <p class="text-muted small">
+                    Rate at which this tax is applied</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>freeze_account</code></td>
+            <td >
+                Select</td>
+            <td >
+                Frozen
+                <p class="text-muted small">
+                    If the account is frozen, entries are allowed to restricted users.</p>
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>balance_must_be</code></td>
+            <td >
+                Select</td>
+            <td >
+                Balance must be
+                
+            </td>
+            <td>
+                <pre>
+Debit
+Credit</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                Lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                Rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Old Parent
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.account.account</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Account</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, old, new, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, old, new, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_gle_exists" href="#check_gle_exists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_gle_exists</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_child_exists" href="#check_if_child_exists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_child_exists</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="convert_group_to_ledger" href="#convert_group_to_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>convert_group_to_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="convert_ledger_to_group" href="#convert_ledger_to_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>convert_ledger_to_group</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_root_and_report_type" href="#set_root_and_report_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_root_and_report_type</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_nsm_model" href="#update_nsm_model" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_nsm_model</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update lft, rgt indices for nested set model</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_account_currency" href="#validate_account_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_account_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_balance_must_be_debit_or_credit" href="#validate_balance_must_be_debit_or_credit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_balance_must_be_debit_or_credit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_frozen_accounts_modifier" href="#validate_frozen_accounts_modifier" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_frozen_accounts_modifier</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_parent" href="#validate_parent" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_parent</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Fetch Parent Details and validate parent account</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_root_details" href="#validate_root_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_root_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_trash" href="#validate_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>checks gl entries and if child exists</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse_account" href="#validate_warehouse_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>RootNotEditable</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.account.account.get_account_currency" href="#erpnext.accounts.doctype.account.account.get_account_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.account.account.<b>get_account_currency</b>
+        <i class="text-muted">(account)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Helper function to get account currency</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.account.account.get_parent_account" href="#erpnext.accounts.doctype.account.account.get_parent_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.account.account.<b>get_parent_account</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/bank_reconciliation">Bank Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/budget_detail">Budget Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim_detail">Expense Claim Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim_type">Expense Claim Type</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/gl_entry">GL Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_tax">Item Tax</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry_account">Journal Entry Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment_account">Mode of Payment Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_tool">Payment Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/period_closing_voucher">Period Closing Voucher</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/accounts_settings.html b/erpnext/docs/current/models/accounts/accounts_settings.html
new file mode 100644
index 0000000..42b8c88
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/accounts_settings.html

@@ -0,0 +1,169 @@
+<!-- title: Accounts Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/accounts_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Settings for Accounts
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>auto_accounting_for_stock</code></td>
+            <td >
+                Check</td>
+            <td >
+                Make Accounting Entry For Every Stock Movement
+                <p class="text-muted small">
+                    If enabled, the system will post accounting entries for inventory automatically.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>acc_frozen_upto</code></td>
+            <td >
+                Date</td>
+            <td >
+                Accounts Frozen Upto
+                <p class="text-muted small">
+                    Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>frozen_accounts_modifier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Role Allowed to Set Frozen Accounts & Edit Frozen Entries
+                <p class="text-muted small">
+                    Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/role">Role</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>credit_controller</code></td>
+            <td >
+                Link</td>
+            <td >
+                Credit Controller
+                <p class="text-muted small">
+                    Role that is allowed to submit transactions that exceed credit limits set.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/role">Role</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>check_supplier_invoice_uniqueness</code></td>
+            <td >
+                Check</td>
+            <td >
+                Check Supplier Invoice Number Uniqueness
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.accounts_settings.accounts_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AccountsSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/bank_reconciliation.html b/erpnext/docs/current/models/accounts/bank_reconciliation.html
new file mode 100644
index 0000000..d8146f9
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/bank_reconciliation.html

@@ -0,0 +1,239 @@
+<!-- title: Bank Reconciliation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/bank_reconciliation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>bank_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Bank Account
+                <p class="text-muted small">
+                    Select account head of the bank where cheque was deposited.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>include_reconciled_entries</code></td>
+            <td >
+                Check</td>
+            <td >
+                Include Reconciled Entries
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>get_relevant_entries</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Relevant Entries
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>journal_entries</code></td>
+            <td >
+                Table</td>
+            <td >
+                Journal Entries
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/bank_reconciliation_detail">Bank Reconciliation Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>update_clearance_date</code></td>
+            <td >
+                Button</td>
+            <td >
+                Update Clearance Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>total_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Amount
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.bank_reconciliation.bank_reconciliation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BankReconciliation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_details" href="#get_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_details" href="#update_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html b/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html
new file mode 100644
index 0000000..e5cf539
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/bank_reconciliation_detail.html

@@ -0,0 +1,184 @@
+<!-- title: Bank Reconciliation Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/bank_reconciliation_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabBank Reconciliation Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>voucher_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                Voucher ID
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>against_account</code></td>
+            <td >
+                Data</td>
+            <td >
+                Against Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>debit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Debit
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>credit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>cheque_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Cheque Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>cheque_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Cheque Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>clearance_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Clearance Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/bank_reconciliation">Bank Reconciliation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/budget_detail.html b/erpnext/docs/current/models/accounts/budget_detail.html
new file mode 100644
index 0000000..cc66173
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/budget_detail.html

@@ -0,0 +1,119 @@
+<!-- title: Budget Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/budget_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabBudget Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>budget_allocated</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Budget Allocated
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/c_form.html b/erpnext/docs/current/models/accounts/c_form.html
new file mode 100644
index 0000000..1fc0566
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/c_form.html

@@ -0,0 +1,436 @@
+<!-- title: C-Form -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/c_form"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabC-Form</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>C-FORM-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>c_form_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                C-Form No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>received_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Received Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>quarter</code></td>
+            <td >
+                Select</td>
+            <td >
+                Quarter
+                
+            </td>
+            <td>
+                <pre>
+I
+II
+III
+IV</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>total_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>state</code></td>
+            <td >
+                Data</td>
+            <td >
+                State
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>invoices</code></td>
+            <td >
+                Table</td>
+            <td >
+                Invoices
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form_invoice_detail">C-Form Invoice Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>total_invoiced_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Invoiced Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.c_form.c_form</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CForm</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_cancel" href="#before_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_invoice_details" href="#get_invoice_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_invoice_details</b>
+        <i class="text-muted">(self, invoice_no)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>Pull details from invoices for referrence
+</code></pre>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>Update C-Form No on invoices
+</code></pre>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_cform_in_sales_invoices" href="#set_cform_in_sales_invoices" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_cform_in_sales_invoices</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_invoiced_amount" href="#set_total_invoiced_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_invoiced_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate invoice that c-form is applicable
+and no other c-form is received for that</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/c_form_invoice_detail.html b/erpnext/docs/current/models/accounts/c_form_invoice_detail.html
new file mode 100644
index 0000000..e951576
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/c_form_invoice_detail.html

@@ -0,0 +1,145 @@
+<!-- title: C-Form Invoice Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/c_form_invoice_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabC-Form Invoice Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>invoice_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Invoice No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>invoice_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Invoice Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/cost_center.html b/erpnext/docs/current/models/accounts/cost_center.html
new file mode 100644
index 0000000..fa31f48
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/cost_center.html

@@ -0,0 +1,583 @@
+<!-- title: Cost Center -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/cost_center"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCost Center</code></p>
+
+
+Track separate Income and Expense for product verticals or divisions.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>sb0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>cost_center_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Cost Center Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>parent_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>is_group</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Group
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>sb1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Budget
+                <p class="text-muted small">
+                    Define Budget for this Cost Center. To set budget action, see "Company List"</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>distribution_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                Distribution Id
+                <p class="text-muted small">
+                    Select Monthly Distribution, if you want to track based on seasonality.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>budgets</code></td>
+            <td >
+                Table</td>
+            <td >
+                Budgets
+                <p class="text-muted small">
+                    Add rows to set annual budgets on Accounts.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/budget_detail">Budget Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                old_parent
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.cost_center.cost_center</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CostCenter</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.utils.nestedset.NestedSet</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_gle_exists" href="#check_gle_exists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_gle_exists</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_child_exists" href="#check_if_child_exists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_child_exists</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="convert_group_to_ledger" href="#convert_group_to_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>convert_group_to_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="convert_ledger_to_group" href="#convert_ledger_to_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>convert_ledger_to_group</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_accounts" href="#validate_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_accounts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/gl_entry">GL Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry_account">Journal Entry Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/fiscal_year.html b/erpnext/docs/current/models/accounts/fiscal_year.html
new file mode 100644
index 0000000..e315a29
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/fiscal_year.html

@@ -0,0 +1,512 @@
+<!-- title: Fiscal Year -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/fiscal_year"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabFiscal Year</code></p>
+
+
+**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>year</code></td>
+            <td >
+                Data</td>
+            <td >
+                Year Name
+                <p class="text-muted small">
+                    For e.g. 2012, 2012-13</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>year_start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Year Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>year_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Year End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>companies</code></td>
+            <td >
+                Table</td>
+            <td >
+                Companies
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year_company">Fiscal Year Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.fiscal_year.fiscal_year</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>FiscalYear</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_as_default" href="#set_as_default" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_as_default</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates" href="#validate_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year" href="#erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.fiscal_year.fiscal_year.<b>auto_create_fiscal_year</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.fiscal_year.fiscal_year.check_duplicate_fiscal_year</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.fiscal_year.fiscal_year.check_duplicate_fiscal_year" href="#erpnext.accounts.doctype.fiscal_year.fiscal_year.check_duplicate_fiscal_year" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.fiscal_year.fiscal_year.<b>check_duplicate_fiscal_year</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/budget_detail">Budget Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/gl_entry">GL Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/global_defaults">Global Defaults</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday_list">Holiday List</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list">Leave Block List</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/period_closing_voucher">Period Closing Voucher</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/process_payroll">Process Payroll</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/target_detail">Target Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/fiscal_year_company.html b/erpnext/docs/current/models/accounts/fiscal_year_company.html
new file mode 100644
index 0000000..8e55ddf
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/fiscal_year_company.html

@@ -0,0 +1,84 @@
+<!-- title: Fiscal Year Company -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/fiscal_year_company"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabFiscal Year Company</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/gl_entry.html b/erpnext/docs/current/models/accounts/gl_entry.html
new file mode 100644
index 0000000..b6f13ce
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/gl_entry.html

@@ -0,0 +1,640 @@
+<!-- title: GL Entry -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/gl_entry"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabGL Entry</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Transaction Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>party_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Party Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>party</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Party
+                
+            </td>
+            <td>
+                <pre>party_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>debit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Debit Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>credit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>account_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>debit_in_account_currency</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Debit Amount in Account Currency
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>credit_in_account_currency</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit Amount in Account Currency
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>against</code></td>
+            <td >
+                Text</td>
+            <td >
+                Against
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>against_voucher_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Against Voucher Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>against_voucher</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Against Voucher
+                
+            </td>
+            <td>
+                <pre>against_voucher_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>voucher_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Voucher Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>voucher_no</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Voucher No
+                
+            </td>
+            <td>
+                <pre>voucher_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>is_opening</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Opening
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>is_advance</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Advance
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.gl_entry.gl_entry</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>GLEntry</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_mandatory" href="#check_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_pl_account" href="#check_pl_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_pl_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update_with_args" href="#on_update_with_args" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update_with_args</b>
+        <i class="text-muted">(self, adv_adj, update_outstanding=Yes)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="pl_must_have_cost_center" href="#pl_must_have_cost_center" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>pl_must_have_cost_center</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_account_details" href="#validate_account_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_account_details</b>
+        <i class="text-muted">(self, adv_adj)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Account must be ledger, active and not freezed</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_cost_center" href="#validate_cost_center" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_cost_center</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_currency" href="#validate_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_party" href="#validate_party" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_party</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_posting_date" href="#validate_posting_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_posting_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.gl_entry.gl_entry.check_freezing_date" href="#erpnext.accounts.doctype.gl_entry.gl_entry.check_freezing_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.gl_entry.gl_entry.<b>check_freezing_date</b>
+        <i class="text-muted">(posting_date, adv_adj=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Nobody can do GL Entries where posting date is before freezing date
+except authorized person</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.gl_entry.gl_entry.update_against_account" href="#erpnext.accounts.doctype.gl_entry.gl_entry.update_against_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.gl_entry.gl_entry.<b>update_against_account</b>
+        <i class="text-muted">(voucher_type, voucher_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.gl_entry.gl_entry.update_outstanding_amt" href="#erpnext.accounts.doctype.gl_entry.gl_entry.update_outstanding_amt" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.gl_entry.gl_entry.<b>update_outstanding_amt</b>
+        <i class="text-muted">(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.gl_entry.gl_entry.validate_balance_type" href="#erpnext.accounts.doctype.gl_entry.gl_entry.validate_balance_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.gl_entry.gl_entry.<b>validate_balance_type</b>
+        <i class="text-muted">(account, adv_adj=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.gl_entry.gl_entry.validate_frozen_account" href="#erpnext.accounts.doctype.gl_entry.gl_entry.validate_frozen_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.gl_entry.gl_entry.<b>validate_frozen_account</b>
+        <i class="text-muted">(account, adv_adj=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/index.html b/erpnext/docs/current/models/accounts/index.html
new file mode 100644
index 0000000..d22419c
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module accounts -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for accounts</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/accounts/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/accounts/index.txt


diff --git a/erpnext/docs/current/models/accounts/journal_entry.html b/erpnext/docs/current/models/accounts/journal_entry.html
new file mode 100644
index 0000000..239b9cf
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/journal_entry.html

@@ -0,0 +1,1416 @@
+<!-- title: Journal Entry -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/journal_entry"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabJournal Entry</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>entry_type_and_date</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-flag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>voucher_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Entry Type
+                
+            </td>
+            <td>
+                <pre>Journal Entry
+Bank Entry
+Cash Entry
+Credit Card Entry
+Debit Note
+Credit Note
+Contra Entry
+Excise Entry
+Write Off Entry
+Opening Entry</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>JV-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>2_add_edit_gl_entries</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-table</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounting Entries
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry_account">Journal Entry Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break99</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>cheque_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reference Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>cheque_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Reference Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>user_remark</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                User Remark
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break99</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>total_debit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Debit
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>total_credit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Credit
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>difference</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Difference (Dr - Cr)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>get_balance</code></td>
+            <td >
+                Button</td>
+            <td >
+                Make Difference Entry
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>multi_currency</code></td>
+            <td >
+                Check</td>
+            <td >
+                Multi Currency
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>total_amount</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Total Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>total_amount_in_words</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Total Amount in Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td>
+                <pre>icon-pushpin</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>clearance_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Clearance Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>remark</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remark
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>column_break98</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>bill_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Bill No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>bill_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Bill Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>due_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Due Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>write_off</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Write Off
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>write_off_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Write Off Based On
+                
+            </td>
+            <td>
+                <pre>Accounts Receivable
+Accounts Payable</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>get_outstanding_invoices</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Outstanding Invoices
+                
+            </td>
+            <td>
+                <pre>get_outstanding_invoices</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break_30</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>write_off_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Write Off Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>pay_to_recd_from</code></td>
+            <td >
+                Data</td>
+            <td >
+                Pay To / Recd From
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>column_break_35</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>addtional_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>is_opening</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Opening
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>stock_entry</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock Entry
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.journal_entry.journal_entry</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>JournalEntry</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.accounts_controller.AccountsController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_credit_limit" href="#check_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_credit_limit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_remarks" href="#create_remarks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_remarks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_balance" href="#get_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_balance</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_outstanding_invoices" href="#get_outstanding_invoices" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_outstanding_invoices</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_title" href="#get_title" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_title</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_values" href="#get_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries" href="#make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries</b>
+        <i class="text-muted">(self, cancel=0, adv_adj=0)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_account_and_party_balance" href="#set_account_and_party_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_account_and_party_balance</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_against_account" href="#set_against_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_against_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_amounts_in_company_currency" href="#set_amounts_in_company_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_amounts_in_company_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_exchange_rate" href="#set_exchange_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_exchange_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_print_format_fields" href="#set_print_format_fields" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_print_format_fields</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_amount" href="#set_total_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_amount</b>
+        <i class="text-muted">(self, amt, currency)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_debit_credit" href="#set_total_debit_credit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_debit_credit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_advance_paid" href="#update_advance_paid" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_advance_paid</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_expense_claim" href="#update_expense_claim" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_expense_claim</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_against_jv" href="#validate_against_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_against_jv</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_cheque_info" href="#validate_cheque_info" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_cheque_info</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_credit_debit_note" href="#validate_credit_debit_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_credit_debit_note</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_empty_accounts_table" href="#validate_empty_accounts_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_empty_accounts_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_entries_for_advance" href="#validate_entries_for_advance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_entries_for_advance</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_expense_claim" href="#validate_expense_claim" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_expense_claim</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_invoices" href="#validate_invoices" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_invoices</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate totals and docstatus for invoices</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_multi_currency" href="#validate_multi_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_multi_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_orders" href="#validate_orders" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_orders</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate totals, stopped and docstatus for orders</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_party" href="#validate_party" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_party</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_reference_doc" href="#validate_reference_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_reference_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validates reference document</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_total_debit_and_credit" href="#validate_total_debit_and_credit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_total_debit_and_credit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_account_balance_and_party_type</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_account_balance_and_party_type" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_account_balance_and_party_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_account_balance_and_party_type</b>
+        <i class="text-muted">(account, date, company, debit=None, credit=None, exchange_rate=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns dict of account balance and party type to be set in Journal Entry on selection of account.</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_against_jv</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_average_exchange_rate</b>
+        <i class="text-muted">(account)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_default_bank_cash_account</b>
+        <i class="text-muted">(company, voucher_type, mode_of_payment=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_exchange_rate</b>
+        <i class="text-muted">(account, account_currency=None, company=None, reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_opening_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_opening_accounts</b>
+        <i class="text-muted">(company)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get all balance sheet accounts for opening entry</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_outstanding</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_outstanding" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_outstanding" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_outstanding</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_balance</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_balance" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_party_account_and_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_party_account_and_balance</b>
+        <i class="text-muted">(company, party_type, party)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry</b>
+        <i class="text-muted">(ref_doc, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_invoice</b>
+        <i class="text-muted">(dt, dn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" href="#erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.journal_entry.journal_entry.<b>get_payment_entry_against_order</b>
+        <i class="text-muted">(dt, dn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/bank_reconciliation_detail">Bank Reconciliation Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation_payment">Payment Reconciliation Payment</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_advance">Purchase Invoice Advance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_advance">Sales Invoice Advance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/journal_entry_account.html b/erpnext/docs/current/models/accounts/journal_entry_account.html
new file mode 100644
index 0000000..5f4153e
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/journal_entry_account.html

@@ -0,0 +1,415 @@
+<!-- title: Journal Entry Account -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/journal_entry_account"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabJournal Entry Account</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>account_type</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Account Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>balance</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Account Balance
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                <p class="text-muted small">
+                    If Income or Expense</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>party_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Party Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>party</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Party
+                
+            </td>
+            <td>
+                <pre>party_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>party_balance</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Party Balance
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>currency_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>account_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>exchange_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>debit_in_account_currency</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Debit
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>debit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Debit in Company Currency
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>credit_in_account_currency</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit
+                
+            </td>
+            <td>
+                <pre>account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>credit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit in Company Currency
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>reference_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Reference Type
+                
+            </td>
+            <td>
+                <pre>
+Sales Invoice
+Purchase Invoice
+Journal Entry
+Sales Order
+Purchase Order
+Expense Claim</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>reference_name</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Reference Name
+                
+            </td>
+            <td>
+                <pre>reference_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>is_advance</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Advance
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>against_account</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Against Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/mode_of_payment.html b/erpnext/docs/current/models/accounts/mode_of_payment.html
new file mode 100644
index 0000000..5b7ddc9
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/mode_of_payment.html

@@ -0,0 +1,191 @@
+<!-- title: Mode of Payment -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/mode_of_payment"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabMode of Payment</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>mode_of_payment</code></td>
+            <td >
+                Data</td>
+            <td >
+                Mode of Payment
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounts
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment_account">Mode of Payment Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.mode_of_payment.mode_of_payment</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ModeofPayment</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_accounts" href="#validate_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_accounts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_repeating_companies" href="#validate_repeating_companies" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_repeating_companies</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Error when Same Company is entered multiple times in accounts</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_tool">Payment Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/mode_of_payment_account.html b/erpnext/docs/current/models/accounts/mode_of_payment_account.html
new file mode 100644
index 0000000..d9d7c94
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/mode_of_payment_account.html

@@ -0,0 +1,106 @@
+<!-- title: Mode of Payment Account -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/mode_of_payment_account"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMode of Payment Account</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>default_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Account
+                <p class="text-muted small">
+                    Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment">Mode of Payment</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/monthly_distribution.html b/erpnext/docs/current/models/accounts/monthly_distribution.html
new file mode 100644
index 0000000..fc86fc6
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/monthly_distribution.html

@@ -0,0 +1,201 @@
+<!-- title: Monthly Distribution -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/monthly_distribution"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabMonthly Distribution</code></p>
+
+
+**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>distribution_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Distribution Name
+                <p class="text-muted small">
+                    Name of the Monthly Distribution</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>percentages</code></td>
+            <td >
+                Table</td>
+            <td >
+                Monthly Distribution Percentages
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution_percentage">Monthly Distribution Percentage</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.monthly_distribution.monthly_distribution</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>MonthlyDistribution</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_months" href="#get_months" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_months</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/monthly_distribution_percentage.html b/erpnext/docs/current/models/accounts/monthly_distribution_percentage.html
new file mode 100644
index 0000000..3c29b82
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/monthly_distribution_percentage.html

@@ -0,0 +1,87 @@
+<!-- title: Monthly Distribution Percentage -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/monthly_distribution_percentage"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMonthly Distribution Percentage</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>month</code></td>
+            <td >
+                Data</td>
+            <td >
+                Month
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>percentage_allocation</code></td>
+            <td >
+                Float</td>
+            <td >
+                Percentage Allocation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/party_account.html b/erpnext/docs/current/models/accounts/party_account.html
new file mode 100644
index 0000000..95b2c42
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/party_account.html

@@ -0,0 +1,138 @@
+<!-- title: Party Account -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/party_account"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabParty Account</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/supplier_type">Supplier Type</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation.html b/erpnext/docs/current/models/accounts/payment_reconciliation.html
new file mode 100644
index 0000000..97f201f
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_reconciliation.html

@@ -0,0 +1,447 @@
+<!-- title: Payment Reconciliation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_reconciliation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>party_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Party Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>party</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Party
+                
+            </td>
+            <td>
+                <pre>party_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>receivable_payable_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Receivable / Payable Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>bank_cash_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Bank / Cash Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>minimum_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Minimum Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>maximum_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Maximum Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>get_unreconciled_entries</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Unreconciled Entries
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Unreconciled Payment Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>payments</code></td>
+            <td >
+                Table</td>
+            <td >
+                Payments
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation_payment">Payment Reconciliation Payment</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>reconcile</code></td>
+            <td >
+                Button</td>
+            <td >
+                Reconcile
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>sec_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Invoice/Journal Entry Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>invoices</code></td>
+            <td >
+                Table</td>
+            <td >
+                Invoices
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation_invoice">Payment Reconciliation Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.payment_reconciliation.payment_reconciliation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PaymentReconciliation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_invoice_entries" href="#add_invoice_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_invoice_entries</b>
+        <i class="text-muted">(self, non_reconciled_invoices)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_payment_entries" href="#add_payment_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_payment_entries</b>
+        <i class="text-muted">(self, jv_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_condition" href="#check_condition" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_condition</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_mandatory_to_fetch" href="#check_mandatory_to_fetch" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_mandatory_to_fetch</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_invoice_entries" href="#get_invoice_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_invoice_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_jv_entries" href="#get_jv_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_jv_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_unreconciled_entries" href="#get_unreconciled_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_unreconciled_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="reconcile" href="#reconcile" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>reconcile</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_invoice" href="#validate_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_invoice</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation_invoice.html b/erpnext/docs/current/models/accounts/payment_reconciliation_invoice.html
new file mode 100644
index 0000000..df5e143
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_reconciliation_invoice.html

@@ -0,0 +1,139 @@
+<!-- title: Payment Reconciliation Invoice -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_reconciliation_invoice"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPayment Reconciliation Invoice</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>invoice_type</code></td>
+            <td >
+                Data</td>
+            <td >
+                Invoice Type
+                
+            </td>
+            <td>
+                <pre>Sales Invoice
+Purchase Invoice
+Journal Entry</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>invoice_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Invoice Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>invoice_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Invoice Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>outstanding_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Outstanding Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/payment_reconciliation_payment.html b/erpnext/docs/current/models/accounts/payment_reconciliation_payment.html
new file mode 100644
index 0000000..13ae995
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_reconciliation_payment.html

@@ -0,0 +1,192 @@
+<!-- title: Payment Reconciliation Payment -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_reconciliation_payment"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPayment Reconciliation Payment</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>journal_entry</code></td>
+            <td >
+                Link</td>
+            <td >
+                Journal Entry
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>is_advance</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Is Advance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>voucher_detail_number</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Voucher Detail Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>invoice_number</code></td>
+            <td >
+                Select</td>
+            <td >
+                Invoice Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>allocated_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Allocated amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>remark</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remark
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/payment_tool.html b/erpnext/docs/current/models/accounts/payment_tool.html
new file mode 100644
index 0000000..2a509b8
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_tool.html

@@ -0,0 +1,473 @@
+<!-- title: Payment Tool -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_tool"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Find Invoices to Match
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>party_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Party Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>received_or_paid</code></td>
+            <td >
+                Select</td>
+            <td >
+                Received Or Paid
+                
+            </td>
+            <td>
+                <pre>Received
+Paid</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>party</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Party
+                
+            </td>
+            <td>
+                <pre>party_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>party_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Party Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>party_account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Party Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>set_payment_amount</code></td>
+            <td >
+                Check</td>
+            <td >
+                Set Payment Amount = Outstanding Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>get_outstanding_vouchers</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Outstanding Vouchers
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>sec_break3</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Set Matching Amounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>vouchers</code></td>
+            <td >
+                Table</td>
+            <td >
+                Against Vouchers
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_tool_detail">Payment Tool Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>section_break_19</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Make Payment Entry
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>payment_mode</code></td>
+            <td >
+                Link</td>
+            <td >
+                Payment Mode
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment">Mode of Payment</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>payment_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Payment Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>total_payment_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Payment Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>data_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>reference_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Reference Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>reference_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reference No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>make_journal_entry</code></td>
+            <td >
+                Button</td>
+            <td >
+                Make Journal Entry
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>section_break_21</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>make_jv_help</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.payment_tool.payment_tool</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PaymentTool</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_journal_entry" href="#make_journal_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_journal_entry</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_tool.payment_tool.get_against_voucher_amount</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_tool.payment_tool.get_against_voucher_amount" href="#erpnext.accounts.doctype.payment_tool.payment_tool.get_against_voucher_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_tool.payment_tool.<b>get_against_voucher_amount</b>
+        <i class="text-muted">(against_voucher_type, against_voucher_no, party_account, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_tool.payment_tool.get_orders_to_be_billed" href="#erpnext.accounts.doctype.payment_tool.payment_tool.get_orders_to_be_billed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_tool.payment_tool.<b>get_orders_to_be_billed</b>
+        <i class="text-muted">(party_type, party, party_account_currency, company_currency)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.payment_tool.payment_tool.get_outstanding_vouchers</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.payment_tool.payment_tool.get_outstanding_vouchers" href="#erpnext.accounts.doctype.payment_tool.payment_tool.get_outstanding_vouchers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.payment_tool.payment_tool.<b>get_outstanding_vouchers</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/payment_tool_detail.html b/erpnext/docs/current/models/accounts/payment_tool_detail.html
new file mode 100644
index 0000000..7c77c1c
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/payment_tool_detail.html

@@ -0,0 +1,152 @@
+<!-- title: Payment Tool Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/payment_tool_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPayment Tool Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>against_voucher_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Against Voucher Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>against_voucher_no</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Against Voucher No
+                
+            </td>
+            <td>
+                <pre>against_voucher_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>total_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>outstanding_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Outstanding Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>payment_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Payment Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_tool">Payment Tool</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/period_closing_voucher.html b/erpnext/docs/current/models/accounts/period_closing_voucher.html
new file mode 100644
index 0000000..981e8c8
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/period_closing_voucher.html

@@ -0,0 +1,332 @@
+<!-- title: Period Closing Voucher -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/period_closing_voucher"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPeriod Closing Voucher</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Transaction Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Closing Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/period_closing_voucher">Period Closing Voucher</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>closing_account_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Closing Account Head
+                <p class="text-muted small">
+                    The account head under Liability, in which Profit/Loss will be booked</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.period_closing_voucher.period_closing_voucher</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PeriodClosingVoucher</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.accounts_controller.AccountsController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_pl_balances" href="#get_pl_balances" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_pl_balances</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get balance for pl accounts</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries" href="#make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_account_head" href="#validate_account_head" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_account_head</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_posting_date" href="#validate_posting_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_posting_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/period_closing_voucher">Period Closing Voucher</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/pos_profile.html b/erpnext/docs/current/models/accounts/pos_profile.html
new file mode 100644
index 0000000..acdb17f
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/pos_profile.html

@@ -0,0 +1,662 @@
+<!-- title: POS Profile -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/pos_profile"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPOS Profile</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>user</code></td>
+            <td >
+                Link</td>
+            <td >
+                Applicable for User
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>[Select]</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>update_stock</code></td>
+            <td >
+                Check</td>
+            <td >
+                Update Stock
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>mode_of_payment</code></td>
+            <td >
+                Link</td>
+            <td >
+                Mode of Payment
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment">Mode of Payment</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_16</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>print_format</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Format
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/print_format">Print Format</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break_19</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>write_off_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td class="danger" title="Mandatory"><code>write_off_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>column_break_23</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>cash_bank_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cash/Bank Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>income_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Income Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expense Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.pos_profile.pos_profile</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>POSProfile</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_duplicate" href="#check_for_duplicate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_duplicate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_defaults" href="#set_defaults" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_defaults</b>
+        <i class="text-muted">(self, include_current_pos=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_all_link_fields" href="#validate_all_link_fields" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_all_link_fields</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.pos_profile.pos_profile.get_series</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pos_profile.pos_profile.get_series" href="#erpnext.accounts.doctype.pos_profile.pos_profile.get_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pos_profile.pos_profile.<b>get_series</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/pricing_rule.html b/erpnext/docs/current/models/accounts/pricing_rule.html
new file mode 100644
index 0000000..a5eadd2
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/pricing_rule.html

@@ -0,0 +1,986 @@
+<!-- title: Pricing Rule -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/pricing_rule"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPricing Rule</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>applicability_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>apply_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply On
+                
+            </td>
+            <td>
+                <pre>
+Item Code
+Item Group
+Brand</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td >
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break_7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>priority</code></td>
+            <td >
+                Select</td>
+            <td >
+                Priority
+                <p class="text-muted small">
+                    Higher the number, higher the priority</p>
+            </td>
+            <td>
+                <pre>
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>disable</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disable
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>selling</code></td>
+            <td >
+                Check</td>
+            <td >
+                Selling
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>buying</code></td>
+            <td >
+                Check</td>
+            <td >
+                Buying
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>applicable_for</code></td>
+            <td >
+                Select</td>
+            <td >
+                Applicable For
+                
+            </td>
+            <td>
+                <pre>
+Customer
+Customer Group
+Territory
+Sales Partner
+Campaign
+Supplier
+Supplier Type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>supplier_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/supplier_type">Supplier Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>section_break_19</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>min_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Min Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>column_break_21</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>max_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Max Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>26</td>
+            <td ><code>section_break_23</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>valid_from</code></td>
+            <td >
+                Date</td>
+            <td >
+                Valid From
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>valid_upto</code></td>
+            <td >
+                Date</td>
+            <td >
+                Valid Upto
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>price_discount_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td class="danger" title="Mandatory"><code>price_or_discount</code></td>
+            <td >
+                Select</td>
+            <td >
+                Price or Discount
+                
+            </td>
+            <td>
+                <pre>
+Price
+Discount Percentage</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>price</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>for_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                For Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>37</td>
+            <td ><code>help_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>pricing_rule_help</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Pricing Rule Help
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.pricing_rule.pricing_rule</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>MultiplePricingRuleConflict</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PricingRule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="cleanup_fields_value" href="#cleanup_fields_value" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>cleanup_fields_value</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_applicable_for_selling_or_buying" href="#validate_applicable_for_selling_or_buying" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_applicable_for_selling_or_buying</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_max_discount" href="#validate_max_discount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_max_discount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_min_max_qty" href="#validate_min_max_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_min_max_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_price_or_discount" href="#validate_price_or_discount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_price_or_discount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_internal_priority" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_internal_priority" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>apply_internal_priority</b>
+        <i class="text-muted">(pricing_rules, field_set, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>apply_pricing_rule</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>args = {
+    "item<em>list": [{"doctype": "", "name": "", "item</em>code": "", "brand": "", "item<em>group": ""}, ...],
+    "customer": "something",
+    "customer</em>group": "something",
+    "territory": "something",
+    "supplier": "something",
+    "supplier<em>type": "something",
+    "currency": "something",
+    "conversion</em>rate": "something",
+    "price<em>list": "something",
+    "plc</em>conversion<em>rate": "something",
+    "company": "something",
+    "transaction</em>date": "something",
+    "campaign": "something",
+    "sales<em>partner": "something",
+    "ignore</em>pricing_rule": "something"
+}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.filter_pricing_rules" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.filter_pricing_rules" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>filter_pricing_rules</b>
+        <i class="text-muted">(args, pricing_rules)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.get_pricing_rule_for_item" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.get_pricing_rule_for_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>get_pricing_rule_for_item</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.get_pricing_rules" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.get_pricing_rules" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>get_pricing_rules</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.pricing_rule.pricing_rule.if_all_rules_same" href="#erpnext.accounts.doctype.pricing_rule.pricing_rule.if_all_rules_same" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.pricing_rule.pricing_rule.<b>if_all_rules_same</b>
+        <i class="text-muted">(pricing_rules, fields)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html
new file mode 100644
index 0000000..912bed9
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html

@@ -0,0 +1,1896 @@
+<!-- title: Purchase Invoice -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/purchase_invoice"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Invoice</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>PINV-
+PINV-RET-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>bill_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Invoice No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>bill_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Supplier Invoice Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>is_return</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Return
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>return_against</code></td>
+            <td >
+                Link</td>
+            <td >
+                Return Against Purchase Invoice
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>get_items_from_product_bundle</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Product Bundle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>section_break_26</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break_28</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>base_taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>base_taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>column_break_40</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>46</td>
+            <td ><code>section_break_44</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
+            <td ><code>section_break_49</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>column_break8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>total_advance</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Advance
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>outstanding_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Outstanding Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>59</td>
+            <td ><code>write_off</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Write Off
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>write_off_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Write Off Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>base_write_off_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Write Off Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>column_break_61</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>write_off_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>write_off_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>65</td>
+            <td ><code>advances_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Advance Payments
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>get_advances_paid</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Advances Paid
+                
+            </td>
+            <td>
+                <pre>get_advances</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>advances</code></td>
+            <td >
+                Table</td>
+            <td >
+                Advances
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_advance">Purchase Invoice Advance</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>68</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions1
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>71</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>supplier_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>col_break23</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>75</td>
+            <td ><code>printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>78</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td class="danger" title="Mandatory"><code>credit_to</code></td>
+            <td >
+                Link</td>
+            <td >
+                Credit To
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>party_account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Party Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>is_opening</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Opening
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>due_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Due Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>against_expense_account</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Against Expense Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>column_break_63</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>85</td>
+            <td ><code>mode_of_payment</code></td>
+            <td >
+                Link</td>
+            <td >
+                Mode of Payment
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment">Mode of Payment</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td ><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>88</td>
+            <td ><code>recurring_invoice</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Recurring Invoice
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>is_recurring</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Recurring
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>90</td>
+            <td ><code>recurring_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Recurring Type
+                <p class="text-muted small">
+                    Select the period when the invoice will be generated automatically</p>
+            </td>
+            <td>
+                <pre>Monthly
+Quarterly
+Half-yearly
+Yearly</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>91</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                <p class="text-muted small">
+                    Start date of current invoice's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>92</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                <p class="text-muted small">
+                    End date of current invoice's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>93</td>
+            <td ><code>repeat_on_day_of_month</code></td>
+            <td >
+                Int</td>
+            <td >
+                Repeat on Day of Month
+                <p class="text-muted small">
+                    The day of the month on which auto invoice will be generated e.g. 05, 28 etc</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>94</td>
+            <td ><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                <p class="text-muted small">
+                    The date on which recurring invoice will be stop</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>95</td>
+            <td ><code>column_break_82</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>96</td>
+            <td ><code>next_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Next Date
+                <p class="text-muted small">
+                    The date on which next invoice will be generated. It is generated on submit.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>97</td>
+            <td ><code>recurring_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Recurring Id
+                <p class="text-muted small">
+                    The unique id for tracking all recurring invoices. It is generated on submit.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>98</td>
+            <td ><code>notification_email_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Notification Email Address
+                <p class="text-muted small">
+                    Enter email id separated by commas, invoice will be mailed automatically on particular date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>99</td>
+            <td ><code>recurring_print_format</code></td>
+            <td >
+                Link</td>
+            <td >
+                Recurring Print Format
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/print_format">Print Format</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.purchase_invoice.purchase_invoice</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PurchaseInvoice</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_active_purchase_items" href="#check_active_purchase_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_active_purchase_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_conversion_rate" href="#check_conversion_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_conversion_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_stopped_or_closed_status" href="#check_for_stopped_or_closed_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_stopped_or_closed_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_prev_docstatus" href="#check_prev_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_prev_docstatus</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_remarks" href="#create_remarks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_remarks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_advances" href="#get_advances" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_advances</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries" href="#make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="po_required" href="#po_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>po_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="pr_required" href="#pr_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>pr_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_against_expense_account" href="#set_against_expense_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_against_expense_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_values" href="#set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_values</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_against_document_in_jv" href="#update_against_document_in_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_against_document_in_jv</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Links invoice and advance voucher:
+    1. cancel advance voucher
+    2. split into multiple rows if partially adjusted, assign against voucher
+    3. submit advance voucher</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_project" href="#update_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_project</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_credit_to_acc" href="#validate_credit_to_acc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_credit_to_acc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_supplier_invoice" href="#validate_supplier_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_supplier_invoice</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_write_off_account" href="#validate_write_off_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_write_off_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account" href="#erpnext.accounts.doctype.purchase_invoice.purchase_invoice.get_expense_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.purchase_invoice.purchase_invoice.<b>get_expense_account</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note" href="#erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.purchase_invoice.purchase_invoice.<b>make_debit_note</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/purchase_invoice_advance.html b/erpnext/docs/current/models/accounts/purchase_invoice_advance.html
new file mode 100644
index 0000000..89c249b
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/purchase_invoice_advance.html

@@ -0,0 +1,148 @@
+<!-- title: Purchase Invoice Advance -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/purchase_invoice_advance"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Invoice Advance</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>journal_entry</code></td>
+            <td >
+                Link</td>
+            <td >
+                Journal Entry
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>jv_detail_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Journal Entry Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>advance_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Advance Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>allocated_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Allocated Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/purchase_invoice_item.html b/erpnext/docs/current/models/accounts/purchase_invoice_item.html
new file mode 100644
index 0000000..04fdda6
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/purchase_invoice_item.html

@@ -0,0 +1,750 @@
+<!-- title: Purchase Invoice Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/purchase_invoice_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Invoice Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>description_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td >
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>sec_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate 
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td class="danger" title="Mandatory"><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_22</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_25</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>accounting</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounting
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expense Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>36</td>
+            <td ><code>reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>brand</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Brand
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                <p class="text-muted small">
+                    Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>item_tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>purchase_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>col_break6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>po_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Order Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>purchase_receipt</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Receipt
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>pr_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                PR Detail
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Valuation Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>rm_supp_cost</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Raw Materials Supplied Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/purchase_taxes_and_charges.html b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges.html
new file mode 100644
index 0000000..bb8a16c
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges.html

@@ -0,0 +1,387 @@
+<!-- title: Purchase Taxes and Charges -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/purchase_taxes_and_charges"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Taxes and Charges</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>category</code></td>
+            <td >
+                Select</td>
+            <td >
+                Consider Tax or Charge for
+                
+            </td>
+            <td>
+                <pre>Valuation and Total
+Valuation
+Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>add_deduct_tax</code></td>
+            <td >
+                Select</td>
+            <td >
+                Add or Deduct
+                
+            </td>
+            <td>
+                <pre>Add
+Deduct</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>charge_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                <pre>
+Actual
+On Net Total
+On Previous Row Amount
+On Previous Row Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>row_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reference Row #
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>included_in_print_rate</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is this Tax included in Basic Rate?
+                <p class="text-muted small">
+                    If checked, the tax amount will be considered as already included in the Print Rate / Print Amount</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>account_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_10</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>section_break_9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>tax_amount_after_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Tax Amount After Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>base_tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>base_tax_amount_after_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Tax Amount After Discount Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>item_wise_tax_detail</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Wise Tax Detail 
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>parenttype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Parenttype
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html
new file mode 100644
index 0000000..3ab1d49
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/purchase_taxes_and_charges_template.html

@@ -0,0 +1,270 @@
+<!-- title: Purchase Taxes and Charges Template -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/purchase_taxes_and_charges_template"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Taxes and Charges Template</code></p>
+
+
+Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like "Shipping", "Insurance", "Handling" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Default
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.purchase_taxes_and_charges_template.purchase_taxes_and_charges_template</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PurchaseTaxesandChargesTemplate</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html
new file mode 100644
index 0000000..76924c3
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html

@@ -0,0 +1,2742 @@
+<!-- title: Sales Invoice -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/sales_invoice"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSales Invoice</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>SINV-
+SINV-RET-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>is_pos</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is POS
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>is_return</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Return
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>due_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Payment Due Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>return_against</code></td>
+            <td >
+                Link</td>
+            <td >
+                Return Against Sales Invoice
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>shipping_address_name</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>shipping_address</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                <p class="text-muted small">
+                    Rate at which Customer Currency is converted to customer's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td class="danger" title="Mandatory"><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td class="danger" title="Mandatory"><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                <p class="text-muted small">
+                    Rate at which Price list currency is converted to customer's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>update_stock</code></td>
+            <td >
+                Check</td>
+            <td >
+                Update Stock
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td class="danger" title="Mandatory"><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>packing_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Packing List
+                
+            </td>
+            <td>
+                <pre>icon-suitcase</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>packed_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Packed Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>product_bundle_help</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Product Bundle Help
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>section_break_30</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td class="danger" title="Mandatory"><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>column_break_32</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>40</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>column_break_38</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>shipping_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>44</td>
+            <td ><code>section_break_40</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>47</td>
+            <td ><code>section_break_43</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>column_break_47</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
+            <td ><code>section_break_49</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>56</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td class="danger" title="Mandatory"><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                <p class="text-muted small">
+                    In Words will be visible once you save the Sales Invoice.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>column_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td class="danger" title="Mandatory"><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>total_advance</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Advance
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>65</td>
+            <td ><code>outstanding_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Outstanding Amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>66</td>
+            <td ><code>advances_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Advance Payments
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>get_advances_received</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Advances Received
+                
+            </td>
+            <td>
+                <pre>get_advances</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td ><code>advances</code></td>
+            <td >
+                Table</td>
+            <td >
+                Advances
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_advance">Sales Invoice Advance</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>69</td>
+            <td ><code>payments_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Payments
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>mode_of_payment</code></td>
+            <td >
+                Link</td>
+            <td >
+                Mode of Payment
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment">Mode of Payment</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>71</td>
+            <td ><code>cash_bank_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cash/Bank Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>paid_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Paid Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>base_paid_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Paid Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>75</td>
+            <td ><code>column_break4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Write Off
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>write_off_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Write Off Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td ><code>base_write_off_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Write Off Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td ><code>write_off_outstanding_amount_automatically</code></td>
+            <td >
+                Check</td>
+            <td >
+                Write Off Outstanding Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>column_break_74</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>write_off_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>write_off_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Write Off Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>82</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>85</td>
+            <td ><code>edit_printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>column_break_84</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>89</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>90</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>91</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>92</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>93</td>
+            <td ><code>col_break23</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>94</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>95</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>96</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>97</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Existing Customer
+Reference
+Advertisement
+Cold Calling
+Exhibition
+Supplier Reference
+Mass Mailing
+Customer's Vendor
+Campaign</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>98</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounting Details
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>99</td>
+            <td class="danger" title="Mandatory"><code>debit_to</code></td>
+            <td >
+                Link</td>
+            <td >
+                Debit To
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>100</td>
+            <td ><code>party_account_currency</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Party Account Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>101</td>
+            <td ><code>is_opening</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Opening Entry
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>102</td>
+            <td ><code>c_form_applicable</code></td>
+            <td >
+                Select</td>
+            <td >
+                C-Form Applicable
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>103</td>
+            <td ><code>c_form_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                C-Form No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>104</td>
+            <td ><code>column_break8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>105</td>
+            <td ><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>106</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>107</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>108</td>
+            <td ><code>sales_team_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Commission
+                
+            </td>
+            <td>
+                <pre>icon-group</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>109</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>110</td>
+            <td ><code>column_break10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>111</td>
+            <td ><code>commission_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Commission Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>112</td>
+            <td ><code>total_commission</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Commission
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>113</td>
+            <td ><code>section_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Team
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>114</td>
+            <td ><code>sales_team</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Team1
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_team">Sales Team</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>115</td>
+            <td ><code>recurring_invoice</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Recurring
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>116</td>
+            <td ><code>column_break11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>117</td>
+            <td ><code>is_recurring</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Recurring
+                <p class="text-muted small">
+                    Check if recurring invoice, uncheck to stop recurring or put proper End Date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>118</td>
+            <td ><code>recurring_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Recurring Type
+                <p class="text-muted small">
+                    Select the period when the invoice will be generated automatically</p>
+            </td>
+            <td>
+                <pre>
+Monthly
+Quarterly
+Half-yearly
+Yearly</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>119</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                <p class="text-muted small">
+                    Start date of current invoice's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>120</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                <p class="text-muted small">
+                    End date of current invoice's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>121</td>
+            <td ><code>repeat_on_day_of_month</code></td>
+            <td >
+                Int</td>
+            <td >
+                Repeat on Day of Month
+                <p class="text-muted small">
+                    The day of the month on which auto invoice will be generated e.g. 05, 28 etc </p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>122</td>
+            <td ><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                <p class="text-muted small">
+                    The date on which recurring invoice will be stop</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>123</td>
+            <td ><code>column_break12</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>124</td>
+            <td ><code>next_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Next Date
+                <p class="text-muted small">
+                    The date on which next invoice will be generated. It is generated on submit.
+</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>125</td>
+            <td ><code>recurring_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Recurring Id
+                <p class="text-muted small">
+                    The unique id for tracking all recurring invoices. It is generated on submit.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>126</td>
+            <td ><code>notification_email_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Notification Email Address
+                <p class="text-muted small">
+                    Enter email id separated by commas, invoice will be mailed automatically on particular date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>127</td>
+            <td ><code>recurring_print_format</code></td>
+            <td >
+                Link</td>
+            <td >
+                Recurring Print Format
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/print_format">Print Format</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>128</td>
+            <td ><code>against_income_account</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Against Income Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.sales_invoice.sales_invoice</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalesInvoice</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.selling_controller.SellingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_remarks" href="#add_remarks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_remarks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_cancel" href="#before_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_credit_limit" href="#check_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_credit_limit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_prev_docstatus" href="#check_prev_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_prev_docstatus</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_advances" href="#get_advances" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_advances</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_company_abbr" href="#get_company_abbr" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_company_abbr</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_entries" href="#get_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_entries</b>
+        <i class="text-muted">(self, warehouse_account=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_warehouse" href="#get_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_customer_gl_entry" href="#make_customer_gl_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_customer_gl_entry</b>
+        <i class="text-muted">(self, gl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_gl_entries" href="#make_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_gl_entries</b>
+        <i class="text-muted">(self, repost_future_gle=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_item_gl_entries" href="#make_item_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_item_gl_entries</b>
+        <i class="text-muted">(self, gl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_pos_gl_entries" href="#make_pos_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_pos_gl_entries</b>
+        <i class="text-muted">(self, gl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_tax_gl_entries" href="#make_tax_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_tax_gl_entries</b>
+        <i class="text-muted">(self, gl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_write_off_gl_entry" href="#make_write_off_gl_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_write_off_gl_entry</b>
+        <i class="text-muted">(self, gl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_against_income_account" href="#set_against_income_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_against_income_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set against account for debit to account</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_indicator" href="#set_indicator" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_indicator</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set indicator for portal</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_missing_values" href="#set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_missing_values</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_pos_fields" href="#set_pos_fields" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_pos_fields</b>
+        <i class="text-muted">(self, for_validate=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set retail related fields from POS Profiles</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="so_dn_required" href="#so_dn_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>so_dn_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check in manage account if sales order / delivery note required or not.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_against_document_in_jv" href="#update_against_document_in_jv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_against_document_in_jv</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Links invoice and advance voucher:
+    1. cancel advance voucher
+    2. split into multiple rows if partially adjusted, assign against voucher
+    3. submit advance voucher</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_current_stock" href="#update_current_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_current_stock</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_packing_list" href="#update_packing_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_packing_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status_updater_args" href="#update_status_updater_args" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status_updater_args</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_time_log_batch" href="#update_time_log_batch" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_time_log_batch</b>
+        <i class="text-muted">(self, sales_invoice)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_c_form" href="#validate_c_form" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_c_form</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Blank C-form no if C-form applicable marked as 'No'</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_c_form_on_cancel" href="#validate_c_form_on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_c_form_on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Display message if C-Form no exists on cancellation of Sales Invoice</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_debit_to_acc" href="#validate_debit_to_acc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_debit_to_acc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_delivery_note" href="#validate_delivery_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_delivery_note</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dropship_item" href="#validate_dropship_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dropship_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_fixed_asset_account" href="#validate_fixed_asset_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_fixed_asset_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate Fixed Asset and whether Income Account Entered Exists</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item_code" href="#validate_item_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item_code</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_pos" href="#validate_pos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_pos</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_proj_cust" href="#validate_proj_cust" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_proj_cust</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check for does customer belong to same project as entered..</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_time_logs_are_submitted" href="#validate_time_logs_are_submitted" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_time_logs_are_submitted</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_write_off_account" href="#validate_write_off_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_write_off_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account" href="#erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.sales_invoice.sales_invoice.<b>get_bank_cash_account</b>
+        <i class="text-muted">(mode_of_payment, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.sales_invoice.sales_invoice.get_list_context" href="#erpnext.accounts.doctype.sales_invoice.sales_invoice.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.sales_invoice.sales_invoice.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note" href="#erpnext.accounts.doctype.sales_invoice.sales_invoice.make_delivery_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.sales_invoice.sales_invoice.<b>make_delivery_note</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return" href="#erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.sales_invoice.sales_invoice.<b>make_sales_return</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form_invoice_detail">C-Form Invoice Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/sales_invoice_advance.html b/erpnext/docs/current/models/accounts/sales_invoice_advance.html
new file mode 100644
index 0000000..5caa97d
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/sales_invoice_advance.html

@@ -0,0 +1,148 @@
+<!-- title: Sales Invoice Advance -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/sales_invoice_advance"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSales Invoice Advance</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>journal_entry</code></td>
+            <td >
+                Link</td>
+            <td >
+                Journal Entry
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>jv_detail_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Journal Entry Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>advance_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Advance amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>allocated_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Allocated amount
+                
+            </td>
+            <td>
+                <pre>party_account_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/sales_invoice_item.html b/erpnext/docs/current/models/accounts/sales_invoice_item.html
new file mode 100644
index 0000000..362da12
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/sales_invoice_item.html

@@ -0,0 +1,898 @@
+<!-- title: Sales Invoice Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/sales_invoice_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSales Invoice Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>barcode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Barcode
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>customer_item_code</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer's Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Edit Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td class="danger" title="Mandatory"><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_21</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_24</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>drop_ship</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Drop Ship
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>delivered_by_supplier</code></td>
+            <td >
+                Check</td>
+            <td >
+                Delivered By Supplier
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>accounting</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounting Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td class="danger" title="Mandatory"><code>income_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Income Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expense Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td class="danger" title="Mandatory"><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Stock Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>target_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>brand</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Brand Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>actual_batch_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Available Batch Qty at Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Available Qty at Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>49</td>
+            <td ><code>edit_references</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                References
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>time_log_batch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Time Log Batch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>so_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Sales Order Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>column_break_50</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>delivery_note</code></td>
+            <td >
+                Link</td>
+            <td >
+                Delivery Note
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>dn_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Delivery Note Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>delivered_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Delivered Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>57</td>
+            <td ><code>section_break_54</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/sales_taxes_and_charges.html b/erpnext/docs/current/models/accounts/sales_taxes_and_charges.html
new file mode 100644
index 0000000..ce1fb3b
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/sales_taxes_and_charges.html

@@ -0,0 +1,356 @@
+<!-- title: Sales Taxes and Charges -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/sales_taxes_and_charges"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSales Taxes and Charges</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>charge_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                <pre>
+Actual
+On Net Total
+On Previous Row Amount
+On Previous Row Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>row_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reference Row #
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>account_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Account Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>col_break_1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>included_in_print_rate</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is this Tax included in Basic Rate?
+                <p class="text-muted small">
+                    If checked, the tax amount will be considered as already included in the Print Rate / Print Amount</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_8</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>tax_amount_after_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Tax Amount After Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break_13</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>base_tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>base_tax_amount_after_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Tax Amount After Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>item_wise_tax_detail</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Wise Tax Detail
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>parenttype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Parenttype
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html b/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html
new file mode 100644
index 0000000..21e82f2
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/sales_taxes_and_charges_template.html

@@ -0,0 +1,295 @@
+<!-- title: Sales Taxes and Charges Template -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/sales_taxes_and_charges_template"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSales Taxes and Charges Template</code></p>
+
+
+Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like "Shipping", "Insurance", "Handling" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Default
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Taxes and Charges
+                <p class="text-muted small">
+                    * Will be calculated in the transaction.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.sales_taxes_and_charges_template.sales_taxes_and_charges_template</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalesTaxesandChargesTemplate</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.sales_taxes_and_charges_template.sales_taxes_and_charges_template.valdiate_taxes_and_charges_template" href="#erpnext.accounts.doctype.sales_taxes_and_charges_template.sales_taxes_and_charges_template.valdiate_taxes_and_charges_template" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.sales_taxes_and_charges_template.sales_taxes_and_charges_template.<b>valdiate_taxes_and_charges_template</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/shipping_rule.html b/erpnext/docs/current/models/accounts/shipping_rule.html
new file mode 100644
index 0000000..0b06eb2
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/shipping_rule.html

@@ -0,0 +1,422 @@
+<!-- title: Shipping Rule -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/shipping_rule"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabShipping Rule</code></p>
+
+
+Specify conditions to calculate shipping amount
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>label</code></td>
+            <td >
+                Data</td>
+            <td >
+                Shipping Rule Label
+                <p class="text-muted small">
+                    example: Next Day Shipping</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>calculate_based_on</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Calculate Based On
+                
+            </td>
+            <td>
+                <pre>Net Total
+Net Weight</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>rule_conditions_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Shipping Rule Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>conditions</code></td>
+            <td >
+                Table</td>
+            <td >
+                Shipping Rule Conditions
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule_condition">Shipping Rule Condition</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Valid for Countries
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>worldwide_shipping</code></td>
+            <td >
+                Check</td>
+            <td >
+                Worldwide Shipping
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>countries</code></td>
+            <td >
+                Table</td>
+            <td >
+                Valid for Countries
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule_country">Shipping Rule Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break_10</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_12</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.shipping_rule.shipping_rule</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>FromGreaterThanToError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ManyBlankToValuesError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverlappingConditionError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ShippingRule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="sort_shipping_rule_conditions" href="#sort_shipping_rule_conditions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>sort_shipping_rule_conditions</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Sort Shipping Rule Conditions based on increasing From Value</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_from_to_values" href="#validate_from_to_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_from_to_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_overlapping_shipping_rule_conditions" href="#validate_overlapping_shipping_rule_conditions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_overlapping_shipping_rule_conditions</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/shipping_rule_condition.html b/erpnext/docs/current/models/accounts/shipping_rule_condition.html
new file mode 100644
index 0000000..a9ac078
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/shipping_rule_condition.html

@@ -0,0 +1,101 @@
+<!-- title: Shipping Rule Condition -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/shipping_rule_condition"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabShipping Rule Condition</code></p>
+
+
+A condition for a Shipping Rule
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>from_value</code></td>
+            <td >
+                Float</td>
+            <td >
+                From Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>to_value</code></td>
+            <td >
+                Float</td>
+            <td >
+                To Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>shipping_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Shipping Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/shipping_rule_country.html b/erpnext/docs/current/models/accounts/shipping_rule_country.html
new file mode 100644
index 0000000..c30420b
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/shipping_rule_country.html

@@ -0,0 +1,84 @@
+<!-- title: Shipping Rule Country -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/shipping_rule_country"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabShipping Rule Country</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/accounts/tax_rule.html b/erpnext/docs/current/models/accounts/tax_rule.html
new file mode 100644
index 0000000..be8e8f6
--- /dev/null
+++ b/erpnext/docs/current/models/accounts/tax_rule.html

@@ -0,0 +1,608 @@
+<!-- title: Tax Rule -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/accounts/doctype/tax_rule"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTax Rule</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>tax_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Tax Type
+                
+            </td>
+            <td>
+                <pre>Sales
+Purchase</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>use_for_shopping_cart</code></td>
+            <td >
+                Check</td>
+            <td >
+                Use for Shopping Cart
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>sales_tax_template</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Tax Template
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>purchase_tax_template</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Tax Template
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>filters</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Filters
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>billing_city</code></td>
+            <td >
+                Data</td>
+            <td >
+                Billing City
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>billing_state</code></td>
+            <td >
+                Data</td>
+            <td >
+                Billing State
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>billing_country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Billing Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>supplier_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/supplier_type">Supplier Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>shipping_city</code></td>
+            <td >
+                Data</td>
+            <td >
+                Shipping City
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>shipping_state</code></td>
+            <td >
+                Data</td>
+            <td >
+                Shipping State
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>shipping_country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Validity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break_7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>priority</code></td>
+            <td >
+                Int</td>
+            <td >
+                Priority
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>column_break_20</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.accounts.doctype.tax_rule.tax_rule</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ConflictingTaxRule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>IncorrectCustomerGroup</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>IncorrectSupplierType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TaxRule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__setup__" href="#__setup__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__setup__</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_date" href="#validate_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_filters" href="#validate_filters" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_filters</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_tax_template" href="#validate_tax_template" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_tax_template</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details" href="#erpnext.accounts.doctype.tax_rule.tax_rule.get_party_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.tax_rule.tax_rule.<b>get_party_details</b>
+        <i class="text-muted">(party, party_type, args=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.accounts.doctype.tax_rule.tax_rule.get_tax_template" href="#erpnext.accounts.doctype.tax_rule.tax_rule.get_tax_template" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.accounts.doctype.tax_rule.tax_rule.<b>get_tax_template</b>
+        <i class="text-muted">(posting_date, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get matching tax rule</p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/buying_settings.html b/erpnext/docs/current/models/buying/buying_settings.html
new file mode 100644
index 0000000..c064ba8
--- /dev/null
+++ b/erpnext/docs/current/models/buying/buying_settings.html

@@ -0,0 +1,210 @@
+<!-- title: Buying Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/buying_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Settings for Buying Module
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>supp_master_name</code></td>
+            <td >
+                Select</td>
+            <td >
+                Supplier Naming By
+                
+            </td>
+            <td>
+                <pre>Supplier Name
+Naming Series</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>supplier_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Supplier Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/supplier_type">Supplier Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Buying Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>po_required</code></td>
+            <td >
+                Select</td>
+            <td >
+                Purchase Order Required
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>pr_required</code></td>
+            <td >
+                Select</td>
+            <td >
+                Purchase Receipt Required
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>maintain_same_rate</code></td>
+            <td >
+                Check</td>
+            <td >
+                Maintain same rate throughout purchase cycle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>allow_multiple_items</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Item to be added multiple times in a transaction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.buying_settings.buying_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BuyingSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/index.html b/erpnext/docs/current/models/buying/index.html
new file mode 100644
index 0000000..75f0e00
--- /dev/null
+++ b/erpnext/docs/current/models/buying/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module buying -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for buying</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/buying/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/buying/index.txt


diff --git a/erpnext/docs/current/models/buying/purchase_common.html b/erpnext/docs/current/models/buying/purchase_common.html
new file mode 100644
index 0000000..df0bbcc
--- /dev/null
+++ b/erpnext/docs/current/models/buying/purchase_common.html

@@ -0,0 +1,129 @@
+<!-- title: Purchase Common -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/purchase_common"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.purchase_common.purchase_common</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PurchaseCommon</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_docstatus" href="#check_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_docstatus</b>
+        <i class="text-muted">(self, check, doctype, docname, detail_doctype=)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_stopped_or_closed_status" href="#check_for_stopped_or_closed_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_stopped_or_closed_status</b>
+        <i class="text-muted">(self, doctype, docname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_last_purchase_rate" href="#update_last_purchase_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_last_purchase_rate</b>
+        <i class="text-muted">(self, obj, is_submit)</i>
+    </p>
+	<div class="docs-attr-desc"><p>updates last<em>purchase</em>rate in item table for each item</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_for_items" href="#validate_for_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_for_items</b>
+        <i class="text-muted">(self, obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
new file mode 100644
index 0000000..87a0773
--- /dev/null
+++ b/erpnext/docs/current/models/buying/purchase_order.html

@@ -0,0 +1,1922 @@
+<!-- title: Purchase Order -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/purchase_order"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Order</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>supplier_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>PO-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>is_subcontracted</code></td>
+            <td >
+                Select</td>
+            <td >
+                Supply Raw Materials
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>drop_ship</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Drop Ship
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break_19</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>customer_contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Contact
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>customer_address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Customer Address Display
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>customer_contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Customer Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>customer_contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Customer Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>customer_contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Customer Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>cb_price_list</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>get_last_purchase_rate</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Last Purchase Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>get_items_from_product_bundle</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Product Bundle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>37</td>
+            <td ><code>sb_last_purchase</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>column_break_26</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>43</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>47</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>base_taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>base_taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>column_break_39</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>55</td>
+            <td ><code>discount_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>column_break_45</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>60</td>
+            <td ><code>totals_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                <p class="text-muted small">
+                    In Words will be visible once you save the Purchase Order.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>advance_paid</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Advance Paid
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>65</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>68</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>71</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>supplier_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>cb_contact</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>75</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+To Receive and Bill
+To Bill
+To Receive
+Completed
+Stopped
+Cancelled
+Closed
+Delivered</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td ><code>ref_sq</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Ref SQ
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>column_break_74</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>per_received</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Received
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>per_billed</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Billed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>82</td>
+            <td ><code>column_break5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>85</td>
+            <td ><code>raw_material_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Raw Materials Supplied
+                
+            </td>
+            <td>
+                <pre>icon-truck</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td ><code>supplied_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Supplied Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item_supplied">Purchase Order Item Supplied</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>87</td>
+            <td ><code>recurring_order</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Recurring
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>column_break</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>is_recurring</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Recurring
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>90</td>
+            <td ><code>recurring_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Recurring Type
+                
+            </td>
+            <td>
+                <pre>Monthly
+Quarterly
+Half-yearly
+Yearly</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>91</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                <p class="text-muted small">
+                    Start date of current order's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>92</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                <p class="text-muted small">
+                    End date of current order's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>93</td>
+            <td ><code>repeat_on_day_of_month</code></td>
+            <td >
+                Int</td>
+            <td >
+                Repeat on Day of Month
+                <p class="text-muted small">
+                    The day of the month on which auto order will be generated e.g. 05, 28 etc</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>94</td>
+            <td ><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                <p class="text-muted small">
+                    The date on which recurring order will be stop</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>95</td>
+            <td ><code>column_break83</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>96</td>
+            <td ><code>next_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Next Date
+                <p class="text-muted small">
+                    The date on which next invoice will be generated. It is generated on submit.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>97</td>
+            <td ><code>recurring_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Recurring Id
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>98</td>
+            <td ><code>notification_email_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Notification Email Address
+                <p class="text-muted small">
+                    Enter email id separated by commas, order will be mailed automatically on particular date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>99</td>
+            <td ><code>recurring_print_format</code></td>
+            <td >
+                Link</td>
+            <td >
+                Recurring Print Format
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/print_format">Print Format</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.purchase_order.purchase_order</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PurchaseOrder</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_recurring" href="#before_recurring" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_recurring</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_stopped_or_closed_status" href="#check_for_stopped_or_closed_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_stopped_or_closed_status</b>
+        <i class="text-muted">(self, pc_obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_modified_date" href="#check_modified_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_modified_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_schedule_dates" href="#get_schedule_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_schedule_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_drop_ship_item" href="#has_drop_ship_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_drop_ship_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_received_qty_for_drop_ship_items" href="#set_received_qty_for_drop_ship_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_received_qty_for_drop_ship_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_delivered_qty_in_sales_order" href="#update_delivered_qty_in_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_delivered_qty_in_sales_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update delivered qty in Sales Order for drop ship</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_ordered_qty" href="#update_ordered_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_ordered_qty</b>
+        <i class="text-muted">(self, po_item_rows=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update requested qty (before ordered_qty is updated)</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_requested_qty" href="#update_requested_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_requested_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status_updater" href="#update_status_updater" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status_updater</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_minimum_order_qty" href="#validate_minimum_order_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_minimum_order_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice" href="#erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>make_purchase_invoice</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt" href="#erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>make_purchase_receipt</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_stock_entry</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.make_stock_entry" href="#erpnext.buying.doctype.purchase_order.purchase_order.make_stock_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>make_stock_entry</b>
+        <i class="text-muted">(purchase_order, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.set_missing_values" href="#erpnext.buying.doctype.purchase_order.purchase_order.set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>set_missing_values</b>
+        <i class="text-muted">(source, target)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders" href="#erpnext.buying.doctype.purchase_order.purchase_order.stop_or_unstop_purchase_orders" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>stop_or_unstop_purchase_orders</b>
+        <i class="text-muted">(names, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.purchase_order.purchase_order.update_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.purchase_order.purchase_order.update_status" href="#erpnext.buying.doctype.purchase_order.purchase_order.update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.purchase_order.purchase_order.<b>update_status</b>
+        <i class="text-muted">(status, name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/purchase_order_item.html b/erpnext/docs/current/models/buying/purchase_order_item.html
new file mode 100644
index 0000000..aceb9de
--- /dev/null
+++ b/erpnext/docs/current/models/buying/purchase_order_item.html

@@ -0,0 +1,835 @@
+<!-- title: Purchase Order Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/purchase_order_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Order Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>supplier_part_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Supplier Part Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>schedule_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Reqd By Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td >
+                UOM Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>sec_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate 
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td class="danger" title="Mandatory"><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>29</td>
+            <td ><code>section_break_29</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>column_break_32</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>35</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse and Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Reference Document Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Reference Name
+                
+            </td>
+            <td>
+                <pre>prevdoc_doctype</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Material Request Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>supplier_quotation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Quotation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>supplier_quotation_item</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Supplier Quotation Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>delivered_by_supplier</code></td>
+            <td >
+                Check</td>
+            <td >
+                To be delivered to customer
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>stock_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty as per Stock UOM
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>received_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Received Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>returned_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Returned Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>billed_amt</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billed Amt
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                <p class="text-muted small">
+                    Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/purchase_order_item_supplied.html b/erpnext/docs/current/models/buying/purchase_order_item_supplied.html
new file mode 100644
index 0000000..7b39f24
--- /dev/null
+++ b/erpnext/docs/current/models/buying/purchase_order_item_supplied.html

@@ -0,0 +1,184 @@
+<!-- title: Purchase Order Item Supplied -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/purchase_order_item_supplied"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Order Item Supplied</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>main_item_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>rm_item_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Raw Material Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>required_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Supplied Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>bom_detail_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                BOM Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>reference_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reference Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock Uom
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/purchase_receipt_item_supplied.html b/erpnext/docs/current/models/buying/purchase_receipt_item_supplied.html
new file mode 100644
index 0000000..aebb744
--- /dev/null
+++ b/erpnext/docs/current/models/buying/purchase_receipt_item_supplied.html

@@ -0,0 +1,265 @@
+<!-- title: Purchase Receipt Item Supplied -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/purchase_receipt_item_supplied"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Receipt Item Supplied</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>main_item_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>rm_item_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Raw Material Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>required_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Required Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>consumed_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Consumed Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock Uom
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>current_stock</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Current Stock
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>reference_name</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Reference Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>bom_detail_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                BOM Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/quality_inspection.html b/erpnext/docs/current/models/buying/quality_inspection.html
new file mode 100644
index 0000000..e27eed7
--- /dev/null
+++ b/erpnext/docs/current/models/buying/quality_inspection.html

@@ -0,0 +1,515 @@
+<!-- title: Quality Inspection -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/quality_inspection"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabQuality Inspection</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>QI-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>report_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Report Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>inspection_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Inspection Type
+                
+            </td>
+            <td>
+                <pre>
+Incoming
+Outgoing
+In Process</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>purchase_receipt_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Receipt No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>delivery_note_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Delivery Note No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>item_serial_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Serial No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>sample_size</code></td>
+            <td >
+                Float</td>
+            <td >
+                Sample Size
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>section_break_14</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>inspected_by</code></td>
+            <td >
+                Link</td>
+            <td >
+                Inspected By
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>verified_by</code></td>
+            <td >
+                Data</td>
+            <td >
+                Verified By
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break_17</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>specification_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>get_specification_details</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Specification Details
+                
+            </td>
+            <td>
+                <pre>get_item_specification_details</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>readings</code></td>
+            <td >
+                Table</td>
+            <td >
+                Readings
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection_reading">Quality Inspection Reading</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.quality_inspection.quality_inspection</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>QualityInspection</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_item_specification_details" href="#get_item_specification_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_item_specification_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.quality_inspection.quality_inspection.item_query" href="#erpnext.buying.doctype.quality_inspection.quality_inspection.item_query" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.quality_inspection.quality_inspection.<b>item_query</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/quality_inspection_reading.html b/erpnext/docs/current/models/buying/quality_inspection_reading.html
new file mode 100644
index 0000000..7745ab1
--- /dev/null
+++ b/erpnext/docs/current/models/buying/quality_inspection_reading.html

@@ -0,0 +1,222 @@
+<!-- title: Quality Inspection Reading -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/quality_inspection_reading"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabQuality Inspection Reading</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>specification</code></td>
+            <td >
+                Data</td>
+            <td >
+                Parameter
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Acceptance Criteria
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>reading_1</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 1
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>reading_2</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 2
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>reading_3</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 3
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>reading_4</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 4
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>reading_5</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 5
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>reading_6</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 6
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>reading_7</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 7
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>reading_8</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 8
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>reading_9</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 9
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>reading_10</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reading 10
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Accepted
+Rejected</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/supplier.html b/erpnext/docs/current/models/buying/supplier.html
new file mode 100644
index 0000000..5bf98b3
--- /dev/null
+++ b/erpnext/docs/current/models/buying/supplier.html

@@ -0,0 +1,741 @@
+<!-- title: Supplier -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/supplier"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSupplier</code></p>
+
+
+Supplier of Goods or Services.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>basic_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>SUPP-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>supplier_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/supplier_type">Supplier Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>is_frozen</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Frozen
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>default_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Billing Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>default_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>default_taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>credit_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Credit Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>address_contacts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Address and Contacts
+                
+            </td>
+            <td>
+                <pre>icon-map-marker</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>address_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>contact_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Contact HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>default_payable_accounts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Default Payable Accounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounts
+                <p class="text-muted small">
+                    Mention if non-standard receivable account</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>column_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Supplier Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>supplier_details</code></td>
+            <td >
+                Text</td>
+            <td >
+                Supplier Details
+                <p class="text-muted small">
+                    Statutory info and other general information about your Supplier</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>communications</code></td>
+            <td >
+                Table</td>
+            <td class="text-muted" title="Hidden">
+                Communications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.supplier.supplier</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Supplier</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_supplier_address" href="#delete_supplier_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_supplier_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_supplier_contact" href="#delete_supplier_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_supplier_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_contacts" href="#get_contacts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_contacts</b>
+        <i class="text-muted">(self, nm)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Load address and contacts in <code>__onload</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_address" href="#update_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_contact" href="#update_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_supplier_address" href="#update_supplier_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_supplier_address</b>
+        <i class="text-muted">(self, newdn, set_field)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.supplier.supplier.get_dashboard_info</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.supplier.supplier.get_dashboard_info" href="#erpnext.buying.doctype.supplier.supplier.get_dashboard_info" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.supplier.supplier.<b>get_dashboard_info</b>
+        <i class="text-muted">(supplier)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_supplier">Item Supplier</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_purchase_receipt">Landed Cost Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sms_center">SMS Center</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/supplier_quotation.html b/erpnext/docs/current/models/buying/supplier_quotation.html
new file mode 100644
index 0000000..1bb1c2f
--- /dev/null
+++ b/erpnext/docs/current/models/buying/supplier_quotation.html

@@ -0,0 +1,1213 @@
+<!-- title: Supplier Quotation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/supplier_quotation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSupplier Quotation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>supplier_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>SQTN-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>14</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>cb_price_list</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>get_items_from_product_bundle</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Product Bundle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_22</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_24</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>35</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>base_taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>base_taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>column_break_37</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>43</td>
+            <td ><code>section_break_41</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>column_break_43</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>48</td>
+            <td ><code>section_break_46</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>55</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>58</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>supplier_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>61</td>
+            <td ><code>printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>64</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>65</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Stopped
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>is_subcontracted</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Subcontracted
+                
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>column_break_57</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.buying.doctype.supplier_quotation.supplier_quotation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SupplierQuotation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_common" href="#validate_common" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_common</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order" href="#erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.buying.doctype.supplier_quotation.supplier_quotation.<b>make_purchase_order</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/buying/supplier_quotation_item.html b/erpnext/docs/current/models/buying/supplier_quotation_item.html
new file mode 100644
index 0000000..2863e07
--- /dev/null
+++ b/erpnext/docs/current/models/buying/supplier_quotation_item.html

@@ -0,0 +1,637 @@
+<!-- title: Supplier Quotation Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/buying/doctype/supplier_quotation_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSupplier Quotation Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>supplier_part_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Supplier Part Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate 
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td class="danger" title="Mandatory"><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>section_break_24</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break_27</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse and Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Prevdoc DocType
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Link</td>
+            <td >
+                Material Request No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Material Request Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td >
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                <p class="text-muted small">
+                    Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/index.html b/erpnext/docs/current/models/crm/index.html
new file mode 100644
index 0000000..978f40d
--- /dev/null
+++ b/erpnext/docs/current/models/crm/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module crm -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for crm</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/crm/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/crm/index.txt


diff --git a/erpnext/docs/current/models/crm/lead.html b/erpnext/docs/current/models/crm/lead.html
new file mode 100644
index 0000000..3d95401
--- /dev/null
+++ b/erpnext/docs/current/models/crm/lead.html

@@ -0,0 +1,865 @@
+<!-- title: Lead -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/lead"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLead</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>lead_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>LEAD-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>lead_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Person Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>company_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Organization Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email Id
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>col_break123</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Lead
+Open
+Replied
+Opportunity
+Interested
+Converted
+Do Not Contact</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Advertisement
+Blog Post
+Campaign
+Call
+Customer
+Exhibition
+Supplier
+Website
+Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>campaign_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>section_break_12</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>lead_owner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Lead Owner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>contact_by</code></td>
+            <td >
+                Link</td>
+            <td >
+                Next Contact By
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>contact_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Next Contact Date
+                <p class="text-muted small">
+                    Add to calendar on this date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Address & Contact
+                
+            </td>
+            <td>
+                <pre>icon-map-marker</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>address_desc</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address Desc
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>address_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>phone</code></td>
+            <td >
+                Data</td>
+            <td >
+                Phone
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>mobile_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Mobile No.
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>fax</code></td>
+            <td >
+                Data</td>
+            <td >
+                Fax
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Lead Type
+                
+            </td>
+            <td>
+                <pre>
+Client
+Channel Partner
+Consultant</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>market_segment</code></td>
+            <td >
+                Select</td>
+            <td >
+                Market Segment
+                
+            </td>
+            <td>
+                <pre>
+Lower Income
+Middle Income
+Upper Income</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>industry</code></td>
+            <td >
+                Link</td>
+            <td >
+                Industry
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/industry_type">Industry Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>request_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Request Type
+                
+            </td>
+            <td>
+                <pre>
+Product Enquiry
+Request for Information
+Suggestions
+Other</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>unsubscribed</code></td>
+            <td >
+                Check</td>
+            <td >
+                Unsubscribed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>blog_subscriber</code></td>
+            <td >
+                Check</td>
+            <td >
+                Blog Subscriber
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.crm.doctype.lead.lead</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Lead</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.selling_controller.SellingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_calendar_event" href="#add_calendar_event" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_calendar_event</b>
+        <i class="text-muted">(self, opts=None, force=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_email_id_is_unique" href="#check_email_id_is_unique" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_email_id_is_unique</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_customer" href="#has_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_customer</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_opportunity" href="#has_opportunity" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_opportunity</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.lead.lead._make_customer" href="#erpnext.crm.doctype.lead.lead._make_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.lead.lead.<b>_make_customer</b>
+        <i class="text-muted">(source_name, target_doc=None, ignore_permissions=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.lead.lead.get_lead_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.lead.lead.get_lead_details" href="#erpnext.crm.doctype.lead.lead.get_lead_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.lead.lead.<b>get_lead_details</b>
+        <i class="text-muted">(lead)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.lead.lead.make_customer</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.lead.lead.make_customer" href="#erpnext.crm.doctype.lead.lead.make_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.lead.lead.<b>make_customer</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.lead.lead.make_opportunity</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.lead.lead.make_opportunity" href="#erpnext.crm.doctype.lead.lead.make_opportunity" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.lead.lead.<b>make_opportunity</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.lead.lead.make_quotation</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.lead.lead.make_quotation" href="#erpnext.crm.doctype.lead.lead.make_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.lead.lead.<b>make_quotation</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/issue">Issue</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/newsletter.html b/erpnext/docs/current/models/crm/newsletter.html
new file mode 100644
index 0000000..42ff48c
--- /dev/null
+++ b/erpnext/docs/current/models/crm/newsletter.html

@@ -0,0 +1,383 @@
+<!-- title: Newsletter -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/newsletter"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabNewsletter</code></p>
+
+
+Create and Send Newsletters
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>newsletter_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Newsletter List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/newsletter_list">Newsletter List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>subject</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Subject
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>send_from</code></td>
+            <td >
+                Data</td>
+            <td >
+                Sender
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>email_sent</code></td>
+            <td >
+                Check</td>
+            <td >
+                Email Sent?
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>newsletter_content</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>message</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>test_the_newsletter</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>test_email_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Test Email Id
+                <p class="text-muted small">
+                    A Lead with this email id should exist</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>test_send</code></td>
+            <td >
+                Button</td>
+            <td >
+                Test
+                
+            </td>
+            <td>
+                <pre>test_send</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.crm.doctype.newsletter.newsletter</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Newsletter</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_recipients" href="#get_recipients" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_recipients</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get recipients from Newsletter List</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_bulk" href="#send_bulk" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_bulk</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_emails" href="#send_emails" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_emails</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>send emails to leads and customers</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="test_send" href="#test_send" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>test_send</b>
+        <i class="text-muted">(self, doctype=Lead)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_send" href="#validate_send" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_send</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter.newsletter.confirm_subscription</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.confirm_subscription" href="#erpnext.crm.doctype.newsletter.newsletter.confirm_subscription" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>confirm_subscription</b>
+        <i class="text-muted">(email)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.create_lead" href="#erpnext.crm.doctype.newsletter.newsletter.create_lead" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>create_lead</b>
+        <i class="text-muted">(email_id)</i>
+    </p>
+	<div class="docs-attr-desc"><p>create a lead if it does not exist</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter.newsletter.get_lead_options</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.get_lead_options" href="#erpnext.crm.doctype.newsletter.newsletter.get_lead_options" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>get_lead_options</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.return_unsubscribed_page" href="#erpnext.crm.doctype.newsletter.newsletter.return_unsubscribed_page" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>return_unsubscribed_page</b>
+        <i class="text-muted">(email)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter.newsletter.subscribe</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.subscribe" href="#erpnext.crm.doctype.newsletter.newsletter.subscribe" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>subscribe</b>
+        <i class="text-muted">(email)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter.newsletter.unsubscribe</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter.newsletter.unsubscribe" href="#erpnext.crm.doctype.newsletter.newsletter.unsubscribe" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter.newsletter.<b>unsubscribe</b>
+        <i class="text-muted">(email, name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/newsletter_list.html b/erpnext/docs/current/models/crm/newsletter_list.html
new file mode 100644
index 0000000..8d68c50
--- /dev/null
+++ b/erpnext/docs/current/models/crm/newsletter_list.html

@@ -0,0 +1,228 @@
+<!-- title: Newsletter List -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/newsletter_list"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabNewsletter List</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>total_subscribers</code></td>
+            <td >
+                Int</td>
+            <td >
+                Total Subscribers
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.crm.doctype.newsletter_list.newsletter_list</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NewsletterList</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_total_subscribers" href="#get_total_subscribers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_total_subscribers</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="import_from" href="#import_from" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>import_from</b>
+        <i class="text-muted">(self, doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Extract email ids from given doctype and add them to the current list</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_total_subscribers" href="#update_total_subscribers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_total_subscribers</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter_list.newsletter_list.add_subscribers</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter_list.newsletter_list.add_subscribers" href="#erpnext.crm.doctype.newsletter_list.newsletter_list.add_subscribers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter_list.newsletter_list.<b>add_subscribers</b>
+        <i class="text-muted">(name, email_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.newsletter_list.newsletter_list.import_from</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter_list.newsletter_list.import_from" href="#erpnext.crm.doctype.newsletter_list.newsletter_list.import_from" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter_list.newsletter_list.<b>import_from</b>
+        <i class="text-muted">(name, doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/newsletter">Newsletter</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/newsletter_list_subscriber">Newsletter List Subscriber</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/newsletter_list_subscriber.html b/erpnext/docs/current/models/crm/newsletter_list_subscriber.html
new file mode 100644
index 0000000..6840da5
--- /dev/null
+++ b/erpnext/docs/current/models/crm/newsletter_list_subscriber.html

@@ -0,0 +1,136 @@
+<!-- title: Newsletter List Subscriber -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/newsletter_list_subscriber"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabNewsletter List Subscriber</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>newsletter_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Newsletter List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/newsletter_list">Newsletter List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>unsubscribed</code></td>
+            <td >
+                Check</td>
+            <td >
+                Unsubscribed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.crm.doctype.newsletter_list_subscriber.newsletter_list_subscriber</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NewsletterListSubscriber</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.newsletter_list_subscriber.newsletter_list_subscriber.after_doctype_insert" href="#erpnext.crm.doctype.newsletter_list_subscriber.newsletter_list_subscriber.after_doctype_insert" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.newsletter_list_subscriber.newsletter_list_subscriber.<b>after_doctype_insert</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/opportunity.html b/erpnext/docs/current/models/crm/opportunity.html
new file mode 100644
index 0000000..8de74d2
--- /dev/null
+++ b/erpnext/docs/current/models/crm/opportunity.html

@@ -0,0 +1,915 @@
+<!-- title: Opportunity -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/opportunity"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabOpportunity</code></p>
+
+
+Potential Sales Deal
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>from_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>OPTY-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>enquiry_from</code></td>
+            <td >
+                Select</td>
+            <td >
+                Opportunity From
+                
+            </td>
+            <td>
+                <pre>
+Lead
+Customer</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>lead</code></td>
+            <td >
+                Link</td>
+            <td >
+                Lead
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer / Lead Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>enquiry_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Opportunity Type
+                
+            </td>
+            <td>
+                <pre>Sales
+Maintenance</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Quotation
+Lost
+Replied
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>order_lost_reason</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Lost Reason
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>with_items</code></td>
+            <td >
+                Check</td>
+            <td >
+                With Items
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity_item">Opportunity Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Info
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer / Lead Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Contact Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Existing Customer
+Reference
+Advertisement
+Cold Calling
+Exhibition
+Supplier Reference
+Mass Mailing
+Customer's Vendor
+Campaign
+Walk In</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                <p class="text-muted small">
+                    Enter name of campaign if source of enquiry is campaign</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Opportunity Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>32</td>
+            <td ><code>next_contact</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Next Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>contact_by</code></td>
+            <td >
+                Link</td>
+            <td >
+                Next Contact By
+                <p class="text-muted small">
+                    Your sales person who will contact the customer in future</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>contact_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Next Contact Date
+                <p class="text-muted small">
+                    Your sales person will get a reminder on this date to contact the customer</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>to_discuss</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                To Discuss
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.crm.doctype.opportunity.opportunity</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Opportunity</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_calendar_event" href="#add_calendar_event" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_calendar_event</b>
+        <i class="text-muted">(self, opts=None, force=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_insert" href="#after_insert" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_insert</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="declare_enquiry_lost" href="#declare_enquiry_lost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>declare_enquiry_lost</b>
+        <i class="text-muted">(self, arg)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_cust_address" href="#get_cust_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_cust_address</b>
+        <i class="text-muted">(self, name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_ordered_quotation" href="#has_ordered_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_ordered_quotation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_quotation" href="#has_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_quotation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_new_lead_if_required" href="#make_new_lead_if_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_new_lead_if_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set lead against new opportunity</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_cust_name" href="#validate_cust_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_cust_name</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item_details" href="#validate_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_lead_cust" href="#validate_lead_cust" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_lead_cust</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.opportunity.opportunity.get_item_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.opportunity.opportunity.get_item_details" href="#erpnext.crm.doctype.opportunity.opportunity.get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.opportunity.opportunity.<b>get_item_details</b>
+        <i class="text-muted">(item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.opportunity.opportunity.make_quotation</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.opportunity.opportunity.make_quotation" href="#erpnext.crm.doctype.opportunity.opportunity.make_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.opportunity.opportunity.<b>make_quotation</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.crm.doctype.opportunity.opportunity.set_multiple_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.crm.doctype.opportunity.opportunity.set_multiple_status" href="#erpnext.crm.doctype.opportunity.opportunity.set_multiple_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.crm.doctype.opportunity.opportunity.<b>set_multiple_status</b>
+        <i class="text-muted">(names, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/crm/opportunity_item.html b/erpnext/docs/current/models/crm/opportunity_item.html
new file mode 100644
index 0000000..3c8158c
--- /dev/null
+++ b/erpnext/docs/current/models/crm/opportunity_item.html

@@ -0,0 +1,259 @@
+<!-- title: Opportunity Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/crm/doctype/opportunity_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabOpportunity Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>basic_rate</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Basic Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/appraisal.html b/erpnext/docs/current/models/hr/appraisal.html
new file mode 100644
index 0000000..56dc3fc
--- /dev/null
+++ b/erpnext/docs/current/models/hr/appraisal.html

@@ -0,0 +1,500 @@
+<!-- title: Appraisal -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/appraisal"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAppraisal</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>employee_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>kra_template</code></td>
+            <td >
+                Link</td>
+            <td >
+                Appraisal Template
+                <p class="text-muted small">
+                    Select template from which you want to get the Goals</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal_template">Appraisal Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                For Employee
+                <p class="text-muted small">
+                    Select the Employee for whom you are creating the Appraisal.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                For Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Completed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Goals
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>goals</code></td>
+            <td >
+                Table</td>
+            <td >
+                Goals
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal_goal">Appraisal Goal</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>calculate_total_score</code></td>
+            <td >
+                Button</td>
+            <td >
+                Calculate Total Score
+                
+            </td>
+            <td>
+                <pre>calculate_total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>total_score</code></td>
+            <td >
+                Float</td>
+            <td >
+                Total Score (Out of 5)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Text</td>
+            <td >
+                Remarks
+                <p class="text-muted small">
+                    Any other remarks, noteworthy effort that should go in the records.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>other_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>column_break_17</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.appraisal.appraisal</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Appraisal</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_total" href="#calculate_total" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_total</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_employee_name" href="#get_employee_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_employee_name</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates" href="#validate_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_existing_appraisal" href="#validate_existing_appraisal" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_existing_appraisal</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template" href="#erpnext.hr.doctype.appraisal.appraisal.fetch_appraisal_template" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.appraisal.appraisal.<b>fetch_appraisal_template</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/appraisal_goal.html b/erpnext/docs/current/models/hr/appraisal_goal.html
new file mode 100644
index 0000000..3c37098
--- /dev/null
+++ b/erpnext/docs/current/models/hr/appraisal_goal.html

@@ -0,0 +1,148 @@
+<!-- title: Appraisal Goal -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/appraisal_goal"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabAppraisal Goal</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>kra</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Goal
+                <p class="text-muted small">
+                    Key Responsibility Area</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>per_weightage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Weightage (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>score</code></td>
+            <td >
+                Float</td>
+            <td >
+                Score (0-5)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>score_earned</code></td>
+            <td >
+                Float</td>
+            <td >
+                Score Earned
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/appraisal_template.html b/erpnext/docs/current/models/hr/appraisal_template.html
new file mode 100644
index 0000000..6044768
--- /dev/null
+++ b/erpnext/docs/current/models/hr/appraisal_template.html

@@ -0,0 +1,162 @@
+<!-- title: Appraisal Template -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/appraisal_template"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAppraisal Template</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>kra_title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Appraisal Template Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>goals</code></td>
+            <td >
+                Table</td>
+            <td >
+                Goals
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal_template_goal">Appraisal Template Goal</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.appraisal_template.appraisal_template</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AppraisalTemplate</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_total_points" href="#check_total_points" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_total_points</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/appraisal_template_goal.html b/erpnext/docs/current/models/hr/appraisal_template_goal.html
new file mode 100644
index 0000000..d032548
--- /dev/null
+++ b/erpnext/docs/current/models/hr/appraisal_template_goal.html

@@ -0,0 +1,88 @@
+<!-- title: Appraisal Template Goal -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/appraisal_template_goal"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabAppraisal Template Goal</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>kra</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                KRA
+                <p class="text-muted small">
+                    Key Performance Area</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>per_weightage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Weightage (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal_template">Appraisal Template</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/attendance.html b/erpnext/docs/current/models/hr/attendance.html
new file mode 100644
index 0000000..de340f7
--- /dev/null
+++ b/erpnext/docs/current/models/hr/attendance.html

@@ -0,0 +1,359 @@
+<!-- title: Attendance -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/attendance"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAttendance</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>attendance_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>ATT-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Present
+Absent
+Half Day</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>leave_type</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Leave Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_type">Leave Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>att_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Attendance Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.attendance.attendance</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Attendance</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_leave_record" href="#check_leave_record" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_leave_record</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_att_date" href="#validate_att_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_att_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_duplicate_record" href="#validate_duplicate_record" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_duplicate_record</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_employee" href="#validate_employee" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_employee</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/branch.html b/erpnext/docs/current/models/hr/branch.html
new file mode 100644
index 0000000..4f41382
--- /dev/null
+++ b/erpnext/docs/current/models/hr/branch.html

@@ -0,0 +1,155 @@
+<!-- title: Branch -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/branch"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabBranch</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>branch</code></td>
+            <td >
+                Data</td>
+            <td >
+                Branch
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.branch.branch</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Branch</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_internal_work_history">Employee Internal Work History</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_control_panel">Leave Control Panel</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/process_payroll">Process Payroll</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sms_center">SMS Center</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/deduction_type.html b/erpnext/docs/current/models/hr/deduction_type.html
new file mode 100644
index 0000000..ad56e74
--- /dev/null
+++ b/erpnext/docs/current/models/hr/deduction_type.html

@@ -0,0 +1,122 @@
+<!-- title: Deduction Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/deduction_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabDeduction Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>deduction_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.deduction_type.deduction_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>DeductionType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip_deduction">Salary Slip Deduction</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure_deduction">Salary Structure Deduction</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/department.html b/erpnext/docs/current/models/hr/department.html
new file mode 100644
index 0000000..c92d9b2
--- /dev/null
+++ b/erpnext/docs/current/models/hr/department.html

@@ -0,0 +1,177 @@
+<!-- title: Department -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/department"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabDepartment</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>department_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Department
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>leave_block_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Block List
+                <p class="text-muted small">
+                    Days for which Holidays are blocked for this department.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list">Leave Block List</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.department.department</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Department</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_internal_work_history">Employee Internal Work History</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_control_panel">Leave Control Panel</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/process_payroll">Process Payroll</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sms_center">SMS Center</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/designation.html b/erpnext/docs/current/models/hr/designation.html
new file mode 100644
index 0000000..f392ee3
--- /dev/null
+++ b/erpnext/docs/current/models/hr/designation.html

@@ -0,0 +1,164 @@
+<!-- title: Designation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/designation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabDesignation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>designation_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Designation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.designation.designation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Designation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/authorization_rule">Authorization Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_internal_work_history">Employee Internal Work History</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_control_panel">Leave Control Panel</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/process_payroll">Process Payroll</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/earning_type.html b/erpnext/docs/current/models/hr/earning_type.html
new file mode 100644
index 0000000..3ab4ea9
--- /dev/null
+++ b/erpnext/docs/current/models/hr/earning_type.html

@@ -0,0 +1,122 @@
+<!-- title: Earning Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/earning_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabEarning Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>earning_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.earning_type.earning_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EarningType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip_earning">Salary Slip Earning</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure_earning">Salary Structure Earning</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employee.html b/erpnext/docs/current/models/hr/employee.html
new file mode 100644
index 0000000..5bfab8e
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employee.html

@@ -0,0 +1,1684 @@
+<!-- title: Employee -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employee"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabEmployee</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>basic_information</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>employee</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Employee
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>EMP/</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>salutation</code></td>
+            <td >
+                Select</td>
+            <td >
+                Salutation
+                
+            </td>
+            <td>
+                <pre>
+Mr
+Ms</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Full Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td >
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>user_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                User ID
+                <p class="text-muted small">
+                    System User (login) ID. If set, it will become default for all HR forms.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>employee_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>date_of_joining</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date of Joining
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>date_of_birth</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date of Birth
+                <p class="text-muted small">
+                    You can enter any date manually</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>gender</code></td>
+            <td >
+                Select</td>
+            <td >
+                Gender
+                
+            </td>
+            <td>
+                <pre>
+Male
+Female</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>employment_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Employment Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>col_break_21</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Active
+Left</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>employment_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employment Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employment_type">Employment Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>holiday_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Holiday List
+                <p class="text-muted small">
+                    Applicable Holiday List</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday_list">Holiday List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>col_break_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>scheduled_confirmation_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Offer Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>final_confirmation_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Confirmation Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>contract_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Contract End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>date_of_retirement</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date Of Retirement
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>26</td>
+            <td ><code>job_profile</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Job Profile
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>company_email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Company Email
+                <p class="text-muted small">
+                    Provide email id registered in company</p>
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>notice_number_of_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Notice (days)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>salary_information</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Salary Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>salary_mode</code></td>
+            <td >
+                Select</td>
+            <td >
+                Salary Mode
+                
+            </td>
+            <td>
+                <pre>
+Bank
+Cash
+Cheque</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>bank_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Bank Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>bank_ac_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Bank A/C No.
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>37</td>
+            <td ><code>organization_profile</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Organization Profile
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>reports_to</code></td>
+            <td >
+                Link</td>
+            <td >
+                Reports to
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>leave_approvers</code></td>
+            <td >
+                Table</td>
+            <td >
+                Leave Approvers
+                <p class="text-muted small">
+                    The first Leave Approver in the list will be set as the default Leave Approver</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_leave_approver">Employee Leave Approver</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>40</td>
+            <td ><code>contact_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>cell_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Cell Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>personal_email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Personal Email
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>unsubscribed</code></td>
+            <td >
+                Check</td>
+            <td >
+                Unsubscribed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>emergency_contact_details</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Emergency Contact Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>person_to_be_contacted</code></td>
+            <td >
+                Data</td>
+            <td >
+                Emergency Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>relation</code></td>
+            <td >
+                Data</td>
+            <td >
+                Relation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>emergency_phone_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Emergency Phone
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>permanent_accommodation_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Permanent Address Is
+                
+            </td>
+            <td>
+                <pre>
+Rented
+Owned</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>permanent_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Permanent Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>current_accommodation_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Current Address Is
+                
+            </td>
+            <td>
+                <pre>
+Rented
+Owned</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>current_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Current Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>54</td>
+            <td ><code>sb53</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>bio</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Bio
+                <p class="text-muted small">
+                    Short biography for website and other publications.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>56</td>
+            <td ><code>personal_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Personal Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>column_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>passport_number</code></td>
+            <td >
+                Data</td>
+            <td >
+                Passport Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>date_of_issue</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date of Issue
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>valid_upto</code></td>
+            <td >
+                Date</td>
+            <td >
+                Valid Upto
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>place_of_issue</code></td>
+            <td >
+                Data</td>
+            <td >
+                Place of Issue
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>column_break6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>marital_status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Marital Status
+                
+            </td>
+            <td>
+                <pre>
+Single
+Married
+Divorced
+Widowed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>blood_group</code></td>
+            <td >
+                Select</td>
+            <td >
+                Blood Group
+                
+            </td>
+            <td>
+                <pre>
+A+
+A-
+B+
+B-
+AB+
+AB-
+O+
+O-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>65</td>
+            <td ><code>family_background</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Family Background
+                <p class="text-muted small">
+                    Here you can maintain family details like name and occupation of parent, spouse and children</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>health_details</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Health Details
+                <p class="text-muted small">
+                    Here you can maintain height, weight, allergies, medical concerns etc</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>67</td>
+            <td ><code>educational_qualification</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Educational Qualification
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td ><code>education</code></td>
+            <td >
+                Table</td>
+            <td >
+                Education
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_education">Employee Education</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>69</td>
+            <td ><code>previous_work_experience</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Previous Work Experience
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>external_work_history</code></td>
+            <td >
+                Table</td>
+            <td >
+                External Work History
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_external_work_history">Employee External Work History</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>71</td>
+            <td ><code>history_in_company</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                History In Company
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>internal_work_history</code></td>
+            <td >
+                Table</td>
+            <td >
+                Internal Work History
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee_internal_work_history">Employee Internal Work History</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>73</td>
+            <td ><code>exit</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Exit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>column_break7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>75</td>
+            <td ><code>resignation_letter_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Resignation Letter Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>relieving_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Relieving Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td ><code>reason_for_leaving</code></td>
+            <td >
+                Data</td>
+            <td >
+                Reason for Leaving
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td ><code>leave_encashed</code></td>
+            <td >
+                Select</td>
+            <td >
+                Leave Encashed?
+                
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>encashment_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Encashment Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>exit_interview_details</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Exit Interview Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>held_on</code></td>
+            <td >
+                Date</td>
+            <td >
+                Held On
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>reason_for_resignation</code></td>
+            <td >
+                Select</td>
+            <td >
+                Reason for Resignation
+                
+            </td>
+            <td>
+                <pre>
+Better Prospects
+Health Concerns</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>new_workplace</code></td>
+            <td >
+                Data</td>
+            <td >
+                New Workplace
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>feedback</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Feedback
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.employee.employee</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Employee</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_user" href="#update_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_user</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_user_permissions" href="#update_user_permissions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_user_permissions</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_date" href="#validate_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_duplicate_user_id" href="#validate_duplicate_user_id" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_duplicate_user_id</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_email" href="#validate_email" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_email</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_employee_leave_approver" href="#validate_employee_leave_approver" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_employee_leave_approver</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_for_enabled_user_id" href="#validate_for_enabled_user_id" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_for_enabled_user_id</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_reports_to" href="#validate_reports_to" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_reports_to</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_status" href="#validate_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EmployeeUserDisabledError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.get_employees_who_are_born_today" href="#erpnext.hr.doctype.employee.employee.get_employees_who_are_born_today" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>get_employees_who_are_born_today</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get Employee properties whose birthday is today.</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.employee.employee.get_retirement_date</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.get_retirement_date" href="#erpnext.hr.doctype.employee.employee.get_retirement_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>get_retirement_date</b>
+        <i class="text-muted">(date_of_birth=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.employee.employee.make_salary_structure</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.make_salary_structure" href="#erpnext.hr.doctype.employee.employee.make_salary_structure" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>make_salary_structure</b>
+        <i class="text-muted">(source_name, target=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.send_birthday_reminders" href="#erpnext.hr.doctype.employee.employee.send_birthday_reminders" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>send_birthday_reminders</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>Send Employee birthday reminders if no 'Stop Birthday Reminders' is not set.</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.update_user_permissions" href="#erpnext.hr.doctype.employee.employee.update_user_permissions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>update_user_permissions</b>
+        <i class="text-muted">(doc, method)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.employee.employee.validate_employee_role" href="#erpnext.hr.doctype.employee.employee.validate_employee_role" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.employee.employee.<b>validate_employee_role</b>
+        <i class="text-muted">(doc, method)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/activity_cost">Activity Cost</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/authorization_rule">Authorization Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_allocation">Leave Allocation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_application">Leave Application</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employee_education.html b/erpnext/docs/current/models/hr/employee_education.html
new file mode 100644
index 0000000..ecfbd97
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employee_education.html

@@ -0,0 +1,139 @@
+<!-- title: Employee Education -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employee_education"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabEmployee Education</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>school_univ</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                School/University
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>qualification</code></td>
+            <td >
+                Data</td>
+            <td >
+                Qualification
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>level</code></td>
+            <td >
+                Select</td>
+            <td >
+                Level
+                
+            </td>
+            <td>
+                <pre>Graduate
+Post Graduate
+Under Graduate</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>year_of_passing</code></td>
+            <td >
+                Int</td>
+            <td >
+                Year of Passing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>class_per</code></td>
+            <td >
+                Data</td>
+            <td >
+                Class / Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>maj_opt_subj</code></td>
+            <td >
+                Text</td>
+            <td >
+                Major/Optional Subjects
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employee_external_work_history.html b/erpnext/docs/current/models/hr/employee_external_work_history.html
new file mode 100644
index 0000000..d28b572
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employee_external_work_history.html

@@ -0,0 +1,137 @@
+<!-- title: Employee External Work History -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employee_external_work_history"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabEmployee External Work History</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>company_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Company
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>designation</code></td>
+            <td >
+                Data</td>
+            <td >
+                Designation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>salary</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Salary
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>contact</code></td>
+            <td >
+                Data</td>
+            <td >
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>total_experience</code></td>
+            <td >
+                Data</td>
+            <td >
+                Total Experience
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employee_internal_work_history.html b/erpnext/docs/current/models/hr/employee_internal_work_history.html
new file mode 100644
index 0000000..56e916e
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employee_internal_work_history.html

@@ -0,0 +1,150 @@
+<!-- title: Employee Internal Work History -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employee_internal_work_history"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabEmployee Internal Work History</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employee_leave_approver.html b/erpnext/docs/current/models/hr/employee_leave_approver.html
new file mode 100644
index 0000000..67bbd56
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employee_leave_approver.html

@@ -0,0 +1,84 @@
+<!-- title: Employee Leave Approver -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employee_leave_approver"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabEmployee Leave Approver</code></p>
+
+
+Users who can approve a specific employee's leave applications
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>leave_approver</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Approver
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/employment_type.html b/erpnext/docs/current/models/hr/employment_type.html
new file mode 100644
index 0000000..335f10f
--- /dev/null
+++ b/erpnext/docs/current/models/hr/employment_type.html

@@ -0,0 +1,110 @@
+<!-- title: Employment Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/employment_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabEmployment Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>employee_type_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employment Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.employment_type.employment_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EmploymentType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_control_panel">Leave Control Panel</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/expense_claim.html b/erpnext/docs/current/models/hr/expense_claim.html
new file mode 100644
index 0000000..5c30269
--- /dev/null
+++ b/erpnext/docs/current/models/hr/expense_claim.html

@@ -0,0 +1,599 @@
+<!-- title: Expense Claim -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/expense_claim"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabExpense Claim</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>EXP</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>approval_status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Approval Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Approved
+Rejected</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>exp_approver</code></td>
+            <td >
+                Link</td>
+            <td >
+                Approver
+                <p class="text-muted small">
+                    A user with "Expense Approver" role</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>total_claimed_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Claimed Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>total_sanctioned_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Sanctioned Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>expense_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>expenses</code></td>
+            <td >
+                Table</td>
+            <td >
+                Expenses
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim_detail">Expense Claim Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>sb1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>cb1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>total_amount_reimbursed</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Amount Reimbursed
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>remark</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remark
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>project</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>task</code></td>
+            <td >
+                Link</td>
+            <td >
+                Task
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Employees Email Id
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.expense_claim.expense_claim</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ExpenseClaim</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_total_amount" href="#calculate_total_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_total_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_task" href="#update_task" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_task</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_task_and_project" href="#update_task_and_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_task_and_project</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_expense_approver" href="#validate_expense_approver" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_expense_approver</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_sanctioned_amount" href="#validate_sanctioned_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_sanctioned_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidExpenseApproverError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver" href="#erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.expense_claim.expense_claim.<b>get_expense_approver</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/expense_claim_detail.html b/erpnext/docs/current/models/hr/expense_claim_detail.html
new file mode 100644
index 0000000..5fd3c9e
--- /dev/null
+++ b/erpnext/docs/current/models/hr/expense_claim_detail.html

@@ -0,0 +1,205 @@
+<!-- title: Expense Claim Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/expense_claim_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabExpense Claim Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>expense_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expense Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>expense_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expense Claim Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim_type">Expense Claim Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>default_account</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Default Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>claim_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Claim Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>sanctioned_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Sanctioned Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/expense_claim_type.html b/erpnext/docs/current/models/hr/expense_claim_type.html
new file mode 100644
index 0000000..c86949a
--- /dev/null
+++ b/erpnext/docs/current/models/hr/expense_claim_type.html

@@ -0,0 +1,134 @@
+<!-- title: Expense Claim Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/expense_claim_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabExpense Claim Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>expense_type</code></td>
+            <td >
+                Data</td>
+            <td >
+                Expense Claim Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>default_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.expense_claim_type.expense_claim_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ExpenseClaimType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim_detail">Expense Claim Detail</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/holiday.html b/erpnext/docs/current/models/hr/holiday.html
new file mode 100644
index 0000000..7986a89
--- /dev/null
+++ b/erpnext/docs/current/models/hr/holiday.html

@@ -0,0 +1,87 @@
+<!-- title: Holiday -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/holiday"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabHoliday</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>holiday_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday_list">Holiday List</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/holiday_list.html b/erpnext/docs/current/models/hr/holiday_list.html
new file mode 100644
index 0000000..d4aa8a9
--- /dev/null
+++ b/erpnext/docs/current/models/hr/holiday_list.html

@@ -0,0 +1,354 @@
+<!-- title: Holiday List -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/holiday_list"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabHoliday List</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>holiday_list_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Holiday List Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Default
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>weekly_off</code></td>
+            <td >
+                Select</td>
+            <td >
+                Weekly Off
+                
+            </td>
+            <td>
+                <pre>
+Sunday
+Monday
+Tuesday
+Wednesday
+Thursday
+Friday
+Saturday</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>get_weekly_off_dates</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Weekly Off Dates
+                
+            </td>
+            <td>
+                <pre>get_weekly_off_dates</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>holidays</code></td>
+            <td >
+                Table</td>
+            <td >
+                Holidays
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday">Holiday</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>clear_table</code></td>
+            <td >
+                Button</td>
+            <td >
+                Clear Table
+                
+            </td>
+            <td>
+                <pre>clear_table</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.holiday_list.holiday_list</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>HolidayList</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="clear_table" href="#clear_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>clear_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_weekly_off_date_list" href="#get_weekly_off_date_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_weekly_off_date_list</b>
+        <i class="text-muted">(self, year_start_date, year_end_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_weekly_off_dates" href="#get_weekly_off_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_weekly_off_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_default_holiday_list" href="#update_default_holiday_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_default_holiday_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_days" href="#validate_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_days</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_values" href="#validate_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.holiday_list.holiday_list.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.holiday_list.holiday_list.get_events" href="#erpnext.hr.doctype.holiday_list.holiday_list.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.holiday_list.holiday_list.<b>get_events</b>
+        <i class="text-muted">(start, end, filters=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.holiday_list.holiday_list.get_fy_start_end_dates" href="#erpnext.hr.doctype.holiday_list.holiday_list.get_fy_start_end_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.holiday_list.holiday_list.<b>get_fy_start_end_dates</b>
+        <i class="text-muted">(fiscal_year)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/hr_settings.html b/erpnext/docs/current/models/hr/hr_settings.html
new file mode 100644
index 0000000..04848cd
--- /dev/null
+++ b/erpnext/docs/current/models/hr/hr_settings.html

@@ -0,0 +1,153 @@
+<!-- title: HR Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/hr_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>employee_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Employee Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>emp_created_by</code></td>
+            <td >
+                Select</td>
+            <td >
+                Employee Records to be created by
+                <p class="text-muted small">
+                    Employee record is created using selected field. </p>
+            </td>
+            <td>
+                <pre>Naming Series
+Employee Number</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>stop_birthday_reminders</code></td>
+            <td >
+                Check</td>
+            <td >
+                Stop Birthday Reminders
+                <p class="text-muted small">
+                    Don't send Employee Birthday Reminders</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>payroll_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Payroll Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>include_holidays_in_total_working_days</code></td>
+            <td >
+                Check</td>
+            <td >
+                Include holidays in Total no. of Working Days
+                <p class="text-muted small">
+                    If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.hr_settings.hr_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>HRSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/index.html b/erpnext/docs/current/models/hr/index.html
new file mode 100644
index 0000000..1fab52a
--- /dev/null
+++ b/erpnext/docs/current/models/hr/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module hr -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for hr</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/hr/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/hr/index.txt


diff --git a/erpnext/docs/current/models/hr/job_applicant.html b/erpnext/docs/current/models/hr/job_applicant.html
new file mode 100644
index 0000000..c04ad8d
--- /dev/null
+++ b/erpnext/docs/current/models/hr/job_applicant.html

@@ -0,0 +1,266 @@
+<!-- title: Job Applicant -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/job_applicant"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabJob Applicant</code></p>
+
+
+Applicant for a Job
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>applicant_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Applicant Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email Id
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Replied
+Rejected
+Hold</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>job_opening</code></td>
+            <td >
+                Link</td>
+            <td >
+                Job Opening
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/job_opening">Job Opening</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>thread_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Thread HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>communications</code></td>
+            <td >
+                Table</td>
+            <td class="text-muted" title="Hidden">
+                Communications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.job_applicant.job_applicant</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>JobApplicant</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_email_id_is_unique" href="#check_email_id_is_unique" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_email_id_is_unique</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/job_opening.html b/erpnext/docs/current/models/hr/job_opening.html
new file mode 100644
index 0000000..9199ebd
--- /dev/null
+++ b/erpnext/docs/current/models/hr/job_opening.html

@@ -0,0 +1,129 @@
+<!-- title: Job Opening -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/job_opening"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabJob Opening</code></p>
+
+
+Description of a Job Opening
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>job_title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Job Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                <p class="text-muted small">
+                    Job profile, qualifications required etc.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.job_opening.job_opening</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>JobOpening</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/job_applicant">Job Applicant</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_allocation.html b/erpnext/docs/current/models/hr/leave_allocation.html
new file mode 100644
index 0000000..b9b1aac
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_allocation.html

@@ -0,0 +1,531 @@
+<!-- title: Leave Allocation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_allocation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLeave Allocation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>leave_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_type">Leave Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>new_leaves_allocated</code></td>
+            <td >
+                Float</td>
+            <td >
+                New Leaves Allocated
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>carry_forward</code></td>
+            <td >
+                Check</td>
+            <td >
+                Add unused leaves from previous allocations
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>carry_forwarded_leaves</code></td>
+            <td >
+                Float</td>
+            <td >
+                Unused leaves
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>total_leaves_allocated</code></td>
+            <td >
+                Float</td>
+            <td >
+                Total Leaves Allocated
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_allocation">Leave Allocation</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.leave_allocation.leave_allocation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BackDatedAllocationError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveAllocation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update_after_submit" href="#on_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_leaves_allocated" href="#set_total_leaves_allocated" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_leaves_allocated</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_against_leave_applications" href="#validate_against_leave_applications" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_against_leave_applications</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_allocation_overlap" href="#validate_allocation_overlap" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_allocation_overlap</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_back_dated_allocation" href="#validate_back_dated_allocation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_back_dated_allocation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_new_leaves_allocated_value" href="#validate_new_leaves_allocated_value" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_new_leaves_allocated_value</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>validate that leave allocation is in multiples of 0.5</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_period" href="#validate_period" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_period</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_total_leaves_allocated" href="#validate_total_leaves_allocated" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_total_leaves_allocated</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LessAllocationError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverAllocationError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverlapError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ValueMultiplierError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves" href="#erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_allocation.leave_allocation.<b>get_carry_forwarded_leaves</b>
+        <i class="text-muted">(employee, leave_type, date, carry_forward=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_allocation.leave_allocation.validate_carry_forward" href="#erpnext.hr.doctype.leave_allocation.leave_allocation.validate_carry_forward" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_allocation.leave_allocation.<b>validate_carry_forward</b>
+        <i class="text-muted">(leave_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_allocation">Leave Allocation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_application.html b/erpnext/docs/current/models/hr/leave_application.html
new file mode 100644
index 0000000..e40ce3a
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_application.html

@@ -0,0 +1,933 @@
+<!-- title: Leave Application -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_application"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLeave Application</code></p>
+
+
+Apply / Approve Leaves
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Approved
+Rejected</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_12</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>leave_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_type">Leave Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>leave_balance</code></td>
+            <td >
+                Float</td>
+            <td >
+                Leave Balance Before Application
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>half_day</code></td>
+            <td >
+                Check</td>
+            <td >
+                Half Day
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>total_leave_days</code></td>
+            <td >
+                Float</td>
+            <td >
+                Total Leave Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Reason
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>column_break_15</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>leave_approver</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Approver
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>leave_approver_name</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Leave Approver Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>sb10</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>follow_via_email</code></td>
+            <td >
+                Check</td>
+            <td >
+                Follow via Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>column_break_17</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_application">Leave Application</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.leave_application.leave_application</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InvalidLeaveApproverError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveApplication</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="notify" href="#notify" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>notify</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="notify_employee" href="#notify_employee" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>notify_employee</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="notify_leave_approver" href="#notify_leave_approver" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>notify_leave_approver</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="show_block_day_warning" href="#show_block_day_warning" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>show_block_day_warning</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_back_dated_application" href="#validate_back_dated_application" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_back_dated_application</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_balance_leaves" href="#validate_balance_leaves" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_balance_leaves</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_block_days" href="#validate_block_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_block_days</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates" href="#validate_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates_acorss_allocation" href="#validate_dates_acorss_allocation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates_acorss_allocation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_leave_approver" href="#validate_leave_approver" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_leave_approver</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_leave_overlap" href="#validate_leave_overlap" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_leave_overlap</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_max_days" href="#validate_max_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_max_days</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveApproverIdentityError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveDayBlockedError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverlapError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.add_block_dates" href="#erpnext.hr.doctype.leave_application.leave_application.add_block_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>add_block_dates</b>
+        <i class="text-muted">(events, start, end, employee, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.add_department_leaves" href="#erpnext.hr.doctype.leave_application.leave_application.add_department_leaves" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>add_department_leaves</b>
+        <i class="text-muted">(events, start, end, employee, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.add_holidays" href="#erpnext.hr.doctype.leave_application.leave_application.add_holidays" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>add_holidays</b>
+        <i class="text-muted">(events, start, end, employee, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.add_leaves" href="#erpnext.hr.doctype.leave_application.leave_application.add_leaves" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>add_leaves</b>
+        <i class="text-muted">(events, start, end, match_conditions=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_approved_leaves_for_period" href="#erpnext.hr.doctype.leave_application.leave_application.get_approved_leaves_for_period" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_approved_leaves_for_period</b>
+        <i class="text-muted">(employee, leave_type, from_date, to_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_application.leave_application.get_approvers</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_approvers" href="#erpnext.hr.doctype.leave_application.leave_application.get_approvers" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_approvers</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_application.leave_application.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_events" href="#erpnext.hr.doctype.leave_application.leave_application.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_events</b>
+        <i class="text-muted">(start, end)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_holidays" href="#erpnext.hr.doctype.leave_application.leave_application.get_holidays" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_holidays</b>
+        <i class="text-muted">(employee, from_date, to_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_leave_allocation_records" href="#erpnext.hr.doctype.leave_application.leave_application.get_leave_allocation_records" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_leave_allocation_records</b>
+        <i class="text-muted">(date, employee=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on" href="#erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_leave_balance_on</b>
+        <i class="text-muted">(employee, leave_type, date, allocation_records=None, consider_all_leaves_in_the_allocation_period=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days" href="#erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>get_number_of_leave_days</b>
+        <i class="text-muted">(employee, leave_type, from_date, to_date, half_day=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_application.leave_application.is_lwp" href="#erpnext.hr.doctype.leave_application.leave_application.is_lwp" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_application.leave_application.<b>is_lwp</b>
+        <i class="text-muted">(leave_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_application">Leave Application</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_block_list.html b/erpnext/docs/current/models/hr/leave_block_list.html
new file mode 100644
index 0000000..0873555
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_block_list.html

@@ -0,0 +1,288 @@
+<!-- title: Leave Block List -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_block_list"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLeave Block List</code></p>
+
+
+Block Holidays on important days.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>leave_block_list_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Leave Block List Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>applies_to_all_departments</code></td>
+            <td >
+                Check</td>
+            <td >
+                Applies to Company
+                <p class="text-muted small">
+                    If not checked, the list will have to be added to each Department where it has to be applied.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>block_days</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Block Days
+                <p class="text-muted small">
+                    Stop users from making Leave Applications on following days.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>leave_block_list_dates</code></td>
+            <td >
+                Table</td>
+            <td >
+                Leave Block List Dates
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list_date">Leave Block List Date</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>allow_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Allow Users
+                <p class="text-muted small">
+                    Allow the following users to approve Leave Applications for block days.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>leave_block_list_allowed</code></td>
+            <td >
+                Table</td>
+            <td >
+                Leave Block List Allowed
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list_allow">Leave Block List Allow</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.leave_block_list.leave_block_list</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveBlockList</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.leave_block_list.leave_block_list.get_applicable_block_dates</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_block_list.leave_block_list.get_applicable_block_dates" href="#erpnext.hr.doctype.leave_block_list.leave_block_list.get_applicable_block_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_block_list.leave_block_list.<b>get_applicable_block_dates</b>
+        <i class="text-muted">(from_date, to_date, employee=None, company=None, all_lists=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_block_list.leave_block_list.get_applicable_block_lists" href="#erpnext.hr.doctype.leave_block_list.leave_block_list.get_applicable_block_lists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_block_list.leave_block_list.<b>get_applicable_block_lists</b>
+        <i class="text-muted">(employee=None, company=None, all_lists=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.leave_block_list.leave_block_list.is_user_in_allow_list" href="#erpnext.hr.doctype.leave_block_list.leave_block_list.is_user_in_allow_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.leave_block_list.leave_block_list.<b>is_user_in_allow_list</b>
+        <i class="text-muted">(block_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_block_list_allow.html b/erpnext/docs/current/models/hr/leave_block_list_allow.html
new file mode 100644
index 0000000..d23fa2b
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_block_list_allow.html

@@ -0,0 +1,84 @@
+<!-- title: Leave Block List Allow -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_block_list_allow"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabLeave Block List Allow</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>allow_user</code></td>
+            <td >
+                Link</td>
+            <td >
+                Allow User
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list">Leave Block List</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_block_list_date.html b/erpnext/docs/current/models/hr/leave_block_list_date.html
new file mode 100644
index 0000000..b2e708d
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_block_list_date.html

@@ -0,0 +1,87 @@
+<!-- title: Leave Block List Date -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_block_list_date"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabLeave Block List Date</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>block_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Block Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>reason</code></td>
+            <td >
+                Text</td>
+            <td >
+                Reason
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list">Leave Block List</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_control_panel.html b/erpnext/docs/current/models/hr/leave_control_panel.html
new file mode 100644
index 0000000..404bd329
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_control_panel.html

@@ -0,0 +1,325 @@
+<!-- title: Leave Control Panel -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_control_panel"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>employee_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee Type
+                <p class="text-muted small">
+                    Leave blank if considered for all employee types</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employment_type">Employment Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                <p class="text-muted small">
+                    Leave blank if considered for all branches</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                <p class="text-muted small">
+                    Leave blank if considered for all departments</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                <p class="text-muted small">
+                    Leave blank if considered for all designations</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>leave_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Leave Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_type">Leave Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>carry_forward</code></td>
+            <td >
+                Check</td>
+            <td >
+                Carry Forward
+                <p class="text-muted small">
+                    Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>no_of_days</code></td>
+            <td >
+                Float</td>
+            <td >
+                New Leaves Allocated (In Days)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>allocate</code></td>
+            <td >
+                Button</td>
+            <td >
+                Allocate
+                
+            </td>
+            <td>
+                <pre>allocate_leave</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.leave_control_panel.leave_control_panel</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveControlPanel</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="allocate_leave" href="#allocate_leave" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>allocate_leave</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_employees" href="#get_employees" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_employees</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="to_date_validation" href="#to_date_validation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>to_date_validation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_values" href="#validate_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/leave_type.html b/erpnext/docs/current/models/hr/leave_type.html
new file mode 100644
index 0000000..35630b5
--- /dev/null
+++ b/erpnext/docs/current/models/hr/leave_type.html

@@ -0,0 +1,200 @@
+<!-- title: Leave Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/leave_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLeave Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>leave_type_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Leave Type Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>max_days_allowed</code></td>
+            <td >
+                Data</td>
+            <td >
+                Max Days Leave Allowed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>is_carry_forward</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Carry Forward
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>is_encash</code></td>
+            <td >
+                Check</td>
+            <td class="text-muted" title="Hidden">
+                Is Encash
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>is_lwp</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Leave Without Pay
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>allow_negative</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Negative Balance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>include_holiday</code></td>
+            <td >
+                Check</td>
+            <td >
+                Include holidays within leaves as leaves
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.leave_type.leave_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LeaveType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_allocation">Leave Allocation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_application">Leave Application</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_control_panel">Leave Control Panel</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/offer_letter.html b/erpnext/docs/current/models/hr/offer_letter.html
new file mode 100644
index 0000000..c1b6bd5
--- /dev/null
+++ b/erpnext/docs/current/models/hr/offer_letter.html

@@ -0,0 +1,305 @@
+<!-- title: Offer Letter -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/offer_letter"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabOffer Letter</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>job_applicant</code></td>
+            <td >
+                Link</td>
+            <td >
+                Job Applicant
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/job_applicant">Job Applicant</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>applicant_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Applicant Name
+                
+            </td>
+            <td>
+                <pre>job_applicant.applicant_name</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Awaiting Response
+Accepted
+Rejected</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>offer_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Offer Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>offer_terms</code></td>
+            <td >
+                Table</td>
+            <td >
+                Offer Letter Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter_term">Offer Letter Term</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_14</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>select_terms</code></td>
+            <td >
+                Link</td>
+            <td >
+                Select Terms and Conditions
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.offer_letter.offer_letter</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OfferLetter</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/offer_letter_term.html b/erpnext/docs/current/models/hr/offer_letter_term.html
new file mode 100644
index 0000000..58a63ff
--- /dev/null
+++ b/erpnext/docs/current/models/hr/offer_letter_term.html

@@ -0,0 +1,108 @@
+<!-- title: Offer Letter Term -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/offer_letter_term"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabOffer Letter Term</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>offer_term</code></td>
+            <td >
+                Link</td>
+            <td >
+                Offer Term
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_term">Offer Term</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>value</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Value / Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/offer_term.html b/erpnext/docs/current/models/hr/offer_term.html
new file mode 100644
index 0000000..784db56
--- /dev/null
+++ b/erpnext/docs/current/models/hr/offer_term.html

@@ -0,0 +1,101 @@
+<!-- title: Offer Term -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/offer_term"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabOffer Term</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>offer_term</code></td>
+            <td >
+                Data</td>
+            <td >
+                Offer Term
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.offer_term.offer_term</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OfferTerm</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter_term">Offer Letter Term</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/process_payroll.html b/erpnext/docs/current/models/hr/process_payroll.html
new file mode 100644
index 0000000..0525f50
--- /dev/null
+++ b/erpnext/docs/current/models/hr/process_payroll.html

@@ -0,0 +1,574 @@
+<!-- title: Process Payroll -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/process_payroll"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Select Employees
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>send_email</code></td>
+            <td >
+                Check</td>
+            <td >
+                Send Email
+                <p class="text-muted small">
+                    Check if you want to send salary slip in mail to each employee while submitting salary slip</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>select_payroll_year_and_month</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Select Payroll Year and Month
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>month</code></td>
+            <td >
+                Select</td>
+            <td >
+                Month
+                
+            </td>
+            <td>
+                <pre>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>process_payroll</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Process Payroll
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>create_salary_slip</code></td>
+            <td >
+                Button</td>
+            <td >
+                Create Salary Slip
+                <p class="text-muted small">
+                    Creates salary slip for above mentioned criteria.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>submit_salary_slip</code></td>
+            <td >
+                Button</td>
+            <td >
+                Submit Salary Slip
+                <p class="text-muted small">
+                    Submit all salary slips for the above selected criteria</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>make_bank_entry</code></td>
+            <td >
+                Button</td>
+            <td >
+                Make Bank Entry
+                <p class="text-muted small">
+                    Create Bank Entry for the total salary paid for the above selected criteria</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>section_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>activity_log</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Activity Log
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.process_payroll.process_payroll</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ProcessPayroll</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_mandatory" href="#check_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_log" href="#create_log" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_log</b>
+        <i class="text-muted">(self, ss_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_sal_slip" href="#create_sal_slip" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_sal_slip</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Creates salary slip for selected employees if already not created</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_submit_log" href="#create_submit_log" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_submit_log</b>
+        <i class="text-muted">(self, all_ss, not_submitted_ss)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="format_as_links" href="#format_as_links" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>format_as_links</b>
+        <i class="text-muted">(self, ss_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_emp_list" href="#get_emp_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_emp_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns list of active employees based on selected criteria
+and for which salary structure exists</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_filter_condition" href="#get_filter_condition" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_filter_condition</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_joining_releiving_condition" href="#get_joining_releiving_condition" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_joining_releiving_condition</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_sal_slip_list" href="#get_sal_slip_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_sal_slip_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns list of salary slips based on selected criteria
+which are not submitted</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_total_salary" href="#get_total_salary" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_total_salary</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get total salary amount from submitted salary slip based on selected criteria</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_journal_entry" href="#make_journal_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_journal_entry</b>
+        <i class="text-muted">(self, salary_account=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="submit_salary_slip" href="#submit_salary_slip" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>submit_salary_slip</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Submit all salary slips based on selected criteria</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.process_payroll.process_payroll.get_month_details" href="#erpnext.hr.doctype.process_payroll.process_payroll.get_month_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.process_payroll.process_payroll.<b>get_month_details</b>
+        <i class="text-muted">(year, month)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_slip.html b/erpnext/docs/current/models/hr/salary_slip.html
new file mode 100644
index 0000000..198f142
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_slip.html

@@ -0,0 +1,851 @@
+<!-- title: Salary Slip -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_slip"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSalary Slip</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>month</code></td>
+            <td >
+                Select</td>
+            <td >
+                Month
+                
+            </td>
+            <td>
+                <pre>
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>total_days_in_month</code></td>
+            <td >
+                Float</td>
+            <td >
+                Working Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>leave_without_pay</code></td>
+            <td >
+                Float</td>
+            <td >
+                Leave Without Pay
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>payment_days</code></td>
+            <td >
+                Float</td>
+            <td >
+                Payment Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>bank_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Bank Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>bank_account_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Bank Account No.
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>email_check</code></td>
+            <td >
+                Check</td>
+            <td >
+                Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>earning_deduction</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Earning & Deduction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>earning</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Earning
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>html_21</code></td>
+            <td >
+                HTML</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>earnings</code></td>
+            <td >
+                Table</td>
+            <td >
+                Earnings
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip_earning">Salary Slip Earning</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>deduction</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Deduction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>html_24</code></td>
+            <td >
+                HTML</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>deductions</code></td>
+            <td >
+                Table</td>
+            <td >
+                Deductions
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip_deduction">Salary Slip Deduction</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>26</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break_25</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_26</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>arrear_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Arrear Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>leave_encashment_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Leave Encashment Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>gross_pay</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Gross Pay
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>total_deduction</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Deduction
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>net_pay</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Pay
+                <p class="text-muted small">
+                    Gross Pay + Arrear Amount +Encashment Amount - Total Deduction</p>
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>total_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                Total in words
+                <p class="text-muted small">
+                    Net Pay (in words) will be visible once you save the Salary Slip.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.salary_slip.salary_slip</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalarySlip</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_ded_total" href="#calculate_ded_total" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_ded_total</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_earning_total" href="#calculate_earning_total" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_earning_total</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_lwp" href="#calculate_lwp" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_lwp</b>
+        <i class="text-muted">(self, holidays, m)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_net_pay" href="#calculate_net_pay" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_net_pay</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_existing" href="#check_existing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_existing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_sal_struct" href="#check_sal_struct" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_sal_struct</b>
+        <i class="text-muted">(self, joining_date, relieving_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_emp_and_leave_details" href="#get_emp_and_leave_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_emp_and_leave_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_holidays_for_employee" href="#get_holidays_for_employee" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_holidays_for_employee</b>
+        <i class="text-muted">(self, start_date, end_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_leave_details" href="#get_leave_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_leave_details</b>
+        <i class="text-muted">(self, joining_date=None, relieving_date=None, lwp=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_payment_days" href="#get_payment_days" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_payment_days</b>
+        <i class="text-muted">(self, month, joining_date, relieving_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="pull_emp_details" href="#pull_emp_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>pull_emp_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="pull_sal_struct" href="#pull_sal_struct" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>pull_sal_struct</b>
+        <i class="text-muted">(self, struct)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_mail_funct" href="#send_mail_funct" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_mail_funct</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_slip_deduction.html b/erpnext/docs/current/models/hr/salary_slip_deduction.html
new file mode 100644
index 0000000..8135e2e
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_slip_deduction.html

@@ -0,0 +1,124 @@
+<!-- title: Salary Slip Deduction -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_slip_deduction"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSalary Slip Deduction</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>d_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/deduction_type">Deduction Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>d_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Default Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>d_depends_on_lwp</code></td>
+            <td >
+                Check</td>
+            <td >
+                Depends on Leave Without Pay
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>d_modified_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_slip_earning.html b/erpnext/docs/current/models/hr/salary_slip_earning.html
new file mode 100644
index 0000000..1ae861f
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_slip_earning.html

@@ -0,0 +1,124 @@
+<!-- title: Salary Slip Earning -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_slip_earning"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSalary Slip Earning</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>e_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/earning_type">Earning Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>e_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Default Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>e_depends_on_lwp</code></td>
+            <td >
+                Check</td>
+            <td >
+                Depends on Leave Without Pay
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>e_modified_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_structure.html b/erpnext/docs/current/models/hr/salary_structure.html
new file mode 100644
index 0000000..25030bd
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_structure.html

@@ -0,0 +1,601 @@
+<!-- title: Salary Structure -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_structure"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSalary Structure</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Designation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>is_active</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Active
+                
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>earning_deduction</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Monthly Earning & Deduction
+                <p class="text-muted small">
+                    Salary breakup based on Earning and Deduction.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>earning</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Earning
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>earnings</code></td>
+            <td >
+                Table</td>
+            <td >
+                Earnings
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure_earning">Salary Structure Earning</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>deduction</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Deduction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>deductions</code></td>
+            <td >
+                Table</td>
+            <td >
+                Deductions
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure_deduction">Salary Structure Deduction</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>total_earning</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Earning
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>total_deduction</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Deduction
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>net_pay</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Pay
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.salary_structure.salary_structure</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalaryStructure</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_test_insert" href="#before_test_insert" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_test_insert</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Make any existing salary structure for employee inactive.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_existing" href="#check_existing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_existing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_employee_details" href="#get_employee_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_employee_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_other_active_salary_structure" href="#get_other_active_salary_structure" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_other_active_salary_structure</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_ss_values" href="#get_ss_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_ss_values</b>
+        <i class="text-muted">(self, employee)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_earn_ded_table" href="#make_earn_ded_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_earn_ded_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_table" href="#make_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_table</b>
+        <i class="text-muted">(self, doct_name, tab_fname, tab_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_amount" href="#validate_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_employee" href="#validate_employee" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_employee</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_joining_date" href="#validate_joining_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_joining_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip" href="#erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.salary_structure.salary_structure.<b>make_salary_slip</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_structure_deduction.html b/erpnext/docs/current/models/hr/salary_structure_deduction.html
new file mode 100644
index 0000000..3c50b1b
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_structure_deduction.html

@@ -0,0 +1,110 @@
+<!-- title: Salary Structure Deduction -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_structure_deduction"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSalary Structure Deduction</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>d_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/deduction_type">Deduction Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>d_modified_amt</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>depend_on_lwp</code></td>
+            <td >
+                Check</td>
+            <td >
+                Reduce Deduction for Leave Without Pay (LWP)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/salary_structure_earning.html b/erpnext/docs/current/models/hr/salary_structure_earning.html
new file mode 100644
index 0000000..c6e20d0
--- /dev/null
+++ b/erpnext/docs/current/models/hr/salary_structure_earning.html

@@ -0,0 +1,110 @@
+<!-- title: Salary Structure Earning -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/salary_structure_earning"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSalary Structure Earning</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>e_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/earning_type">Earning Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>modified_value</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>depend_on_lwp</code></td>
+            <td >
+                Check</td>
+            <td >
+                Reduce Earning for Leave Without Pay (LWP)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hr/upload_attendance.html b/erpnext/docs/current/models/hr/upload_attendance.html
new file mode 100644
index 0000000..5c6f0d7
--- /dev/null
+++ b/erpnext/docs/current/models/hr/upload_attendance.html

@@ -0,0 +1,291 @@
+<!-- title: Upload Attendance -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hr/doctype/upload_attendance"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>download_template</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Download Template
+                <p class="text-muted small">
+                    Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>att_fr_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Attendance From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>att_to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Attendance To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>get_template</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Template
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>upload_attendance_data</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Import Attendance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>upload_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Upload HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>import_log</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Import Log
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hr.doctype.upload_attendance.upload_attendance</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>UploadAttendance</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.add_data" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.add_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>add_data</b>
+        <i class="text-muted">(w, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.add_header" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.add_header" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>add_header</b>
+        <i class="text-muted">(w)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.get_active_employees" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.get_active_employees" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>get_active_employees</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.get_dates" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.get_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>get_dates</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get list of dates in between from date and to date</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.get_existing_attendance_records" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.get_existing_attendance_records" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>get_existing_attendance_records</b>
+        <i class="text-muted">(args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.get_naming_series" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.get_naming_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>get_naming_series</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.upload_attendance.upload_attendance.get_template</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.get_template" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.get_template" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>get_template</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.hr.doctype.upload_attendance.upload_attendance.upload</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.hr.doctype.upload_attendance.upload_attendance.upload" href="#erpnext.hr.doctype.upload_attendance.upload_attendance.upload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.hr.doctype.upload_attendance.upload_attendance.<b>upload</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hub_node/hub_settings.html b/erpnext/docs/current/models/hub_node/hub_settings.html
new file mode 100644
index 0000000..a9b7599
--- /dev/null
+++ b/erpnext/docs/current/models/hub_node/hub_settings.html

@@ -0,0 +1,388 @@
+<!-- title: Hub Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hub_node/doctype/hub_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>publish</code></td>
+            <td >
+                Check</td>
+            <td >
+                Publish Items to Hub
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>publish_pricing</code></td>
+            <td >
+                Check</td>
+            <td >
+                Publish Pricing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>publish_availability</code></td>
+            <td >
+                Check</td>
+            <td >
+                Publish Availability
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>sync_now</code></td>
+            <td >
+                Button</td>
+            <td >
+                Sync Now
+                
+            </td>
+            <td>
+                <pre>sync</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>seller_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Seller Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>seller_country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Seller Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>seller_email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Seller Email
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>seller_city</code></td>
+            <td >
+                Data</td>
+            <td >
+                Seller City
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>seller_website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Seller Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>14</td>
+            <td ><code>section_break_13</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>seller_description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Seller Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>name_token</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Name Token
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>access_token</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Access Token
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.hub_node.doctype.hub_settings.hub_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>HubSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_args" href="#get_args" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_args</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="publish_selling_items" href="#publish_selling_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>publish_selling_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set <code>publish_in_hub</code>=1 for all Sales Items</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="register" href="#register" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>register</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Register at hub.erpnext.com, save <code>name_token</code> and <code>access_token</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="sync" href="#sync" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>sync</b>
+        <i class="text-muted">(self, verbose=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Sync items with hub.erpnext.com</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="unpublish" href="#unpublish" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>unpublish</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Unpublish from hub.erpnext.com</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_seller_details" href="#update_seller_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_seller_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update details at hub.erpnext.com</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/hub_node/index.html b/erpnext/docs/current/models/hub_node/index.html
new file mode 100644
index 0000000..6b618c4
--- /dev/null
+++ b/erpnext/docs/current/models/hub_node/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module hub_node -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/hub_node"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for hub_node</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/hub_node/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/hub_node/index.txt


diff --git a/erpnext/docs/current/models/index.html b/erpnext/docs/current/models/index.html
new file mode 100644
index 0000000..1c25b3e
--- /dev/null
+++ b/erpnext/docs/current/models/index.html

@@ -0,0 +1,21 @@
+<!-- title: ERPNext: Models (DocTypes) -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<p>Browse DocTypes by Module</p>
+
+<h3>Contents</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/index.txt


diff --git a/erpnext/docs/current/models/manufacturing/bom.html b/erpnext/docs/current/models/manufacturing/bom.html
new file mode 100644
index 0000000..108fc70
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/bom.html

@@ -0,0 +1,1125 @@
+<!-- title: BOM -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/bom"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabBOM</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item
+                <p class="text-muted small">
+                    Item to be manufactured or repacked</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>rm_cost_as_per</code></td>
+            <td >
+                Select</td>
+            <td >
+                Rate Of Materials Based On
+                
+            </td>
+            <td>
+                <pre>Valuation Rate
+Last Purchase Rate
+Price List</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>is_active</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Active
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Default
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>with_operations</code></td>
+            <td >
+                Check</td>
+            <td >
+                With Operations
+                <p class="text-muted small">
+                    Manage cost of operations</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>operations_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Operations
+                <p class="text-muted small">
+                    Specify the operations, operating cost and give a unique Operation no to your operations.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>operations</code></td>
+            <td >
+                Table</td>
+            <td >
+                Operations
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_operation">BOM Operation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>materials_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Materials
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_item">BOM Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>quantity</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                <p class="text-muted small">
+                    Quantity of item obtained after manufacturing / repacking from given quantities of raw materials</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>14</td>
+            <td ><code>costing</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Costing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>raw_material_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Raw Material Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>cb1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>total_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>more_info_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>col_break23</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_25</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Item Desription
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break_27</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td >
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Materials Required (Exploded)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>exploded_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Exploded_items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_explosion_item">BOM Explosion Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.bom.bom</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BOM</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_exploded_items" href="#add_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_exploded_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Add items to Flat BOM table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_to_cur_exploded_items" href="#add_to_cur_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_to_cur_exploded_items</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_cost" href="#calculate_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Calculate bom totals</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_op_cost" href="#calculate_op_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_op_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update workstation rate and calculates totals</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_rm_cost" href="#calculate_rm_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_rm_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Fetch RM rate as per today's valuation rate and calculate totals</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_recursion" href="#check_recursion" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_recursion</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check whether recursion occurs in any bom</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="clear_operations" href="#clear_operations" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>clear_operations</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_bom_material_detail" href="#get_bom_material_detail" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_bom_material_detail</b>
+        <i class="text-muted">(self, args=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get raw material details like uom, desc and rate</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_bom_unitcost" href="#get_bom_unitcost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_bom_unitcost</b>
+        <i class="text-muted">(self, bom_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_child_exploded_items" href="#get_child_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_child_exploded_items</b>
+        <i class="text-muted">(self, bom_no, qty)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Add all items from Flat BOM of child BOM</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_exploded_items" href="#get_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_exploded_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get all raw materials including items from child bom</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_item_det" href="#get_item_det" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_item_det</b>
+        <i class="text-muted">(self, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_rm_rate" href="#get_rm_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_rm_rate</b>
+        <i class="text-muted">(self, arg)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>Get raw material rate as per selected method, if bom exists takes bom cost
+</code></pre>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_valuation_rate" href="#get_valuation_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_valuation_rate</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get weighted average of valuation rate from all warehouses </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="manage_default_bom" href="#manage_default_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>manage_default_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Uncheck others if current one is selected as default,
+update default bom in item master</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update_after_submit" href="#on_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_bom_material_details" href="#set_bom_material_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_bom_material_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="traverse_tree" href="#traverse_tree" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>traverse_tree</b>
+        <i class="text-muted">(self, bom_list=[])</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_cost" href="#update_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_cost_and_exploded_items" href="#update_cost_and_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_cost_and_exploded_items</b>
+        <i class="text-muted">(self, bom_list=[])</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_exploded_items" href="#update_exploded_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_exploded_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update Flat BOM, following will be correct data</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_bom_links" href="#validate_bom_links" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_bom_links</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_main_item" href="#validate_main_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_main_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate main FG item</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_materials" href="#validate_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_materials</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate raw material entries </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_operations" href="#validate_operations" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_operations</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_rm_item" href="#validate_rm_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_rm_item</b>
+        <i class="text-muted">(self, item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.bom.bom.get_bom_items</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.bom.bom.get_bom_items" href="#erpnext.manufacturing.doctype.bom.bom.get_bom_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.bom.bom.<b>get_bom_items</b>
+        <i class="text-muted">(bom, company, qty=1, fetch_exploded=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.bom.bom.get_bom_items_as_dict" href="#erpnext.manufacturing.doctype.bom.bom.get_bom_items_as_dict" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.bom.bom.<b>get_bom_items_as_dict</b>
+        <i class="text-muted">(bom, company, qty=1, fetch_exploded=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.bom.bom.validate_bom_no" href="#erpnext.manufacturing.doctype.bom.bom.validate_bom_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.bom.bom.<b>validate_bom_no</b>
+        <i class="text-muted">(item, bom_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate BOM No of sub-contracted items</p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_item">BOM Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_replace_tool">BOM Replace Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/bom_explosion_item.html b/erpnext/docs/current/models/manufacturing/bom_explosion_item.html
new file mode 100644
index 0000000..80ec30c
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/bom_explosion_item.html

@@ -0,0 +1,267 @@
+<!-- title: BOM Explosion Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/bom_explosion_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabBOM Explosion Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>cb</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>section_break_3</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>qty_consumed_per_unit</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty Consumed Per Unit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/bom_item.html b/erpnext/docs/current/models/manufacturing/bom_item.html
new file mode 100644
index 0000000..0601b90
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/bom_item.html

@@ -0,0 +1,301 @@
+<!-- title: BOM Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/bom_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabBOM Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>bom_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Item Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                <p class="text-muted small">
+                    See "Rate Of Materials Based On" in Costing Section</p>
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>scrap</code></td>
+            <td >
+                Float</td>
+            <td >
+                Scrap %
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>qty_consumed_per_unit</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Qty Consumed Per Unit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/bom_operation.html b/erpnext/docs/current/models/manufacturing/bom_operation.html
new file mode 100644
index 0000000..d53451f
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/bom_operation.html

@@ -0,0 +1,166 @@
+<!-- title: BOM Operation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/bom_operation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabBOM Operation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>operation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Operation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/operation">Operation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>workstation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Workstation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Operation Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>hour_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Hour Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>time_in_mins</code></td>
+            <td >
+                Float</td>
+            <td >
+                Operation Time 
+                <p class="text-muted small">
+                    In minutes</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Operating Cost
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/bom_replace_tool.html b/erpnext/docs/current/models/manufacturing/bom_replace_tool.html
new file mode 100644
index 0000000..920b326
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/bom_replace_tool.html

@@ -0,0 +1,187 @@
+<!-- title: BOM Replace Tool -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/bom_replace_tool"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate "BOM Explosion Item" table as per new BOM
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>current_bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Current BOM
+                <p class="text-muted small">
+                    The BOM which will be replaced</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>new_bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                New BOM
+                <p class="text-muted small">
+                    The new BOM after replacement</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>replace</code></td>
+            <td >
+                Button</td>
+            <td >
+                Replace
+                
+            </td>
+            <td>
+                <pre>replace_bom</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.bom_replace_tool.bom_replace_tool</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>BOMReplaceTool</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_parent_boms" href="#get_parent_boms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_parent_boms</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="replace_bom" href="#replace_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>replace_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_new_bom" href="#update_new_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_new_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_bom" href="#validate_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/index.html b/erpnext/docs/current/models/manufacturing/index.html
new file mode 100644
index 0000000..ac1f284
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module manufacturing -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for manufacturing</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/manufacturing/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/manufacturing/index.txt


diff --git a/erpnext/docs/current/models/manufacturing/manufacturing_settings.html b/erpnext/docs/current/models/manufacturing/manufacturing_settings.html
new file mode 100644
index 0000000..d762d8b
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/manufacturing_settings.html

@@ -0,0 +1,271 @@
+<!-- title: Manufacturing Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/manufacturing_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>capacity_planning</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Capacity Planning
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>disable_capacity_planning</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disable Capacity Planning and Time Tracking
+                <p class="text-muted small">
+                    Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>allow_overtime</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Overtime
+                <p class="text-muted small">
+                    Plan time logs outside Workstation Working Hours.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>allow_production_on_holidays</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Production on Holidays
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>capacity_planning_for_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Capacity Planning For (Days)
+                <p class="text-muted small">
+                    Try planning operations for X days in advance.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>mins_between_operations</code></td>
+            <td >
+                Int</td>
+            <td >
+                Time Between Operations (in mins)
+                <p class="text-muted small">
+                    Default 10 mins</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>over_production_allowance_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Over Production Allowance Percentage
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>backflush_raw_materials_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Backflush Raw Materials Based On
+                
+            </td>
+            <td>
+                <pre>BOM
+Material Transferred for Manufacture</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>default_wip_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Work In Progress Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>default_fg_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Finished Goods Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ManufacturingSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings.get_mins_between_operations" href="#erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings.get_mins_between_operations" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings.<b>get_mins_between_operations</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/operation.html b/erpnext/docs/current/models/manufacturing/operation.html
new file mode 100644
index 0000000..343dc15
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/operation.html

@@ -0,0 +1,166 @@
+<!-- title: Operation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/operation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabOperation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>workstation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Workstation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Operation Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.operation.operation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Operation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_op_cost" href="#calculate_op_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_op_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_operation">BOM Operation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order_operation">Production Order Operation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/production_order.html b/erpnext/docs/current/models/manufacturing/production_order.html
new file mode 100644
index 0000000..3c1385e
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/production_order.html

@@ -0,0 +1,1198 @@
+<!-- title: Production Order -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/production_order"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabProduction Order</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>item</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-gift</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>PRO-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Stopped
+In Process
+Completed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>production_item</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item To Manufacture
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>bom_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>use_multi_level_bom</code></td>
+            <td >
+                Check</td>
+            <td >
+                Use Multi-Level BOM
+                <p class="text-muted small">
+                    Plan material for sub-assemblies</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty To Manufacture
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>material_transferred_for_manufacturing</code></td>
+            <td >
+                Float</td>
+            <td >
+                Material Transferred for Manufacturing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>produced_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Manufactured Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>warehouses</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouses
+                
+            </td>
+            <td>
+                <pre>icon-building</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>wip_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Work-in-Progress Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_12</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>fg_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>time</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Time
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>expected_delivery_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expected Delivery Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>planned_start_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Planned Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>planned_end_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Planned End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>column_break_13</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>actual_start_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Actual Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>actual_end_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Actual End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>operations_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Operations
+                
+            </td>
+            <td>
+                <pre>icon-wrench</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>operations</code></td>
+            <td >
+                Table</td>
+            <td >
+                Operations
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order_operation">Production Order Operation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>section_break_22</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Operation Cost
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>planned_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Planned Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>actual_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Actual Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>additional_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_24</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>total_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Item Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order
+                <p class="text-muted small">
+                    Manufacture against Sales Order</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.production_order.production_order</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemHasVariantError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OperationTooLongError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverProductionError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ProductionNotApplicableError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ProductionOrder</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_operating_cost" href="#calculate_operating_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_operating_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_time" href="#calculate_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_time</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_operation_fits_in_working_hours" href="#check_operation_fits_in_working_hours" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_operation_fits_in_working_hours</b>
+        <i class="text-muted">(self, d)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Raises expection if operation is longer than working hours in the given workstation.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_time_logs" href="#delete_time_logs" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_time_logs</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_holidays" href="#get_holidays" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_holidays</b>
+        <i class="text-muted">(self, workstation)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_time_logs" href="#make_time_logs" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_time_logs</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Capacity Planning. Plan time logs based on earliest availablity of workstation after
+Planned Start Date. Time logs will be created and remain in Draft mode and must be submitted
+before manufacturing entry can be made.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_actual_dates" href="#set_actual_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_actual_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_operation_start_end_time" href="#set_operation_start_end_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_operation_start_end_time</b>
+        <i class="text-muted">(self, i, d)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set start and end time for given operation. If first operation, set start as
+<code>planned_start_date</code>, else add time diff to end time of earlier operation.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_production_order_operations" href="#set_production_order_operations" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_production_order_operations</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Fetch operations from BOM and set in 'Production Order'</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="stop_unstop" href="#stop_unstop" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>stop_unstop</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Called from client side on Stop/Unstop event</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_operation_status" href="#update_operation_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_operation_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_planned_qty" href="#update_planned_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_planned_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_production_order_qty" href="#update_production_order_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_production_order_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update <strong>Manufactured Qty</strong> and <strong>Material Transferred for Qty</strong> in Production Order
+based on Stock Entry</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_cancel" href="#validate_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_delivery_date" href="#validate_delivery_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_delivery_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_operation_time" href="#validate_operation_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_operation_time</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_production_item" href="#validate_production_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_production_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_production_order_against_so" href="#validate_production_order_against_so" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_production_order_against_so</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_qty" href="#validate_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_sales_order" href="#validate_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_sales_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockOverProductionError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse" href="#erpnext.manufacturing.doctype.production_order.production_order.get_default_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.production_order.production_order.<b>get_default_warehouse</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.production_order.production_order.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.production_order.production_order.get_events" href="#erpnext.manufacturing.doctype.production_order.production_order.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.production_order.production_order.<b>get_events</b>
+        <i class="text-muted">(start, end, filters=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns events for Gantt / Calendar view rendering.</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>start</code></strong> -  Start date-time.</li>
+<li><strong><code>end</code></strong> -  End date-time.</li>
+<li><strong><code>filters</code></strong> -  Filters (JSON).</li>
+</ul>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.production_order.production_order.get_item_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.production_order.production_order.get_item_details" href="#erpnext.manufacturing.doctype.production_order.production_order.get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.production_order.production_order.<b>get_item_details</b>
+        <i class="text-muted">(item)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry" href="#erpnext.manufacturing.doctype.production_order.production_order.make_stock_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.production_order.production_order.<b>make_stock_entry</b>
+        <i class="text-muted">(production_order_id, purpose, qty=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.production_order.production_order.make_time_log</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.production_order.production_order.make_time_log" href="#erpnext.manufacturing.doctype.production_order.production_order.make_time_log" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.production_order.production_order.<b>make_time_log</b>
+        <i class="text-muted">(name, operation, from_time=None, to_time=None, qty=None, project=None, workstation=None, operation_id=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/production_order_operation.html b/erpnext/docs/current/models/manufacturing/production_order_operation.html
new file mode 100644
index 0000000..2fc1395
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/production_order_operation.html

@@ -0,0 +1,359 @@
+<!-- title: Production Order Operation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/production_order_operation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabProduction Order Operation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>operation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Operation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/operation">Operation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Operation Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>completed_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Completed Qty
+                <p class="text-muted small">
+                    Operation completed for how many finished goods?</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Pending
+Work in Progress
+Completed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>workstation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Workstation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>show_time_logs</code></td>
+            <td >
+                Button</td>
+            <td >
+                Show Time Logs
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>estimated_time_and_cost</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Estimated Time and Cost
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>planned_start_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Planned Start Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>planned_end_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Planned End Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>time_in_mins</code></td>
+            <td >
+                Float</td>
+            <td >
+                Operation Time
+                <p class="text-muted small">
+                    in Minutes</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>hour_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Hour Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>planned_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Planned Operating Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>section_break_9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Actual Time and Cost
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>actual_start_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Actual Start Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>actual_end_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Actual End Time
+                <p class="text-muted small">
+                    Updated via 'Time Log'</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>actual_operation_time</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Operation Time
+                <p class="text-muted small">
+                    in Minutes
+Updated via 'Time Log'</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>actual_operating_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Actual Operating Cost
+                <p class="text-muted small">
+                    (Hour Rate / 60) * Actual Operation Time</p>
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>make_time_log</code></td>
+            <td >
+                Button</td>
+            <td >
+                Make Time Log
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/production_plan_item.html b/erpnext/docs/current/models/manufacturing/production_plan_item.html
new file mode 100644
index 0000000..e649d62
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/production_plan_item.html

@@ -0,0 +1,217 @@
+<!-- title: Production Plan Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/production_plan_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabProduction Plan Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>bom_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>planned_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Planned Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>planned_start_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Planned Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>so_pending_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                SO Pending Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                <p class="text-muted small">
+                    Reserved Warehouse in Sales Order / Finished Goods Warehouse</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/production_plan_sales_order.html b/erpnext/docs/current/models/manufacturing/production_plan_sales_order.html
new file mode 100644
index 0000000..bf89b4e
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/production_plan_sales_order.html

@@ -0,0 +1,143 @@
+<!-- title: Production Plan Sales Order -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/production_plan_sales_order"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabProduction Plan Sales Order</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>sales_order_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                SO Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/production_planning_tool.html b/erpnext/docs/current/models/manufacturing/production_planning_tool.html
new file mode 100644
index 0000000..eb394cc
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/production_planning_tool.html

@@ -0,0 +1,725 @@
+<!-- title: Production Planning Tool -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/production_planning_tool"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>select_sales_orders</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Select Sales Orders
+                <p class="text-muted small">
+                    Select Sales Orders from which you want to create Production Orders.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>fg_item</code></td>
+            <td >
+                Link</td>
+            <td >
+                Filter based on item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Filter based on customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>get_sales_orders</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Sales Orders
+                <p class="text-muted small">
+                    Pull sales orders (pending to deliver) based on the above criteria</p>
+            </td>
+            <td>
+                <pre>get_open_sales_orders</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>sales_orders</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Orders
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_sales_order">Production Plan Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>items_for_production</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Select Items
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>get_items_from_so</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items From Sales Orders
+                
+            </td>
+            <td>
+                <pre>get_items_from_so</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>use_multi_level_bom</code></td>
+            <td >
+                Check</td>
+            <td >
+                Use Multi-Level BOM
+                <p class="text-muted small">
+                    If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>create_production_orders</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Production Orders
+                <p class="text-muted small">
+                    Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>raise_production_order</code></td>
+            <td >
+                Button</td>
+            <td >
+                Create Production Orders
+                <p class="text-muted small">
+                    Separate production order will be created for each finished good item.</p>
+            </td>
+            <td>
+                <pre>raise_production_order</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>sb5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Material Requirement
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>purchase_request_for_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Material Request For Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>raise_purchase_request</code></td>
+            <td >
+                Button</td>
+            <td >
+                Create Material Requests
+                <p class="text-muted small">
+                    Items to be requested which are "Out of Stock" considering all warehouses based on projected qty and minimum order qty</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>download_materials_required</code></td>
+            <td >
+                Button</td>
+            <td >
+                Download Materials Required
+                <p class="text-muted small">
+                    Download a report containing all raw materials with their latest inventory status</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.production_planning_tool.production_planning_tool</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ProductionPlanningTool</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_items" href="#add_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_items</b>
+        <i class="text-muted">(self, items)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_so_in_table" href="#add_so_in_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_so_in_table</b>
+        <i class="text-muted">(self, open_so)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Add sales orders in the table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="clear_item_table" href="#clear_item_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>clear_item_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="clear_so_table" href="#clear_so_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>clear_so_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_production_order" href="#create_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_production_order</b>
+        <i class="text-muted">(self, items)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create production order. Called from Production Planning Tool</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="download_raw_materials" href="#download_raw_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>download_raw_materials</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create csv data for required raw material to produce finished goods</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_csv" href="#get_csv" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_csv</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_distinct_items_and_boms" href="#get_distinct_items_and_boms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_distinct_items_and_boms</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Club similar BOM and item for processing
+bom<em>dict {
+    bom</em>no: ['sales_order', 'qty']
+}</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_item_details" href="#get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_item_details</b>
+        <i class="text-muted">(self, item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items" href="#get_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items_from_so" href="#get_items_from_so" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items_from_so</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Pull items from Sales Order, only proction item
+and subcontracted item will be pulled from Packing item
+and add items in the table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_open_sales_orders" href="#get_open_sales_orders" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_open_sales_orders</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Pull sales orders  which are pending to deliver based on criteria selected</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_projected_qty" href="#get_projected_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_projected_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_raw_materials" href="#get_raw_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_raw_materials</b>
+        <i class="text-muted">(self, bom_dict)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get raw materials considering sub-assembly items
+{
+    "item<em>code": [qty</em>required, description, stock<em>uom, min</em>order_qty]
+}</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_requested_items" href="#get_requested_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_requested_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_so_details" href="#get_so_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_so_details</b>
+        <i class="text-muted">(self, so)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Pull other details from so</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="insert_purchase_request" href="#insert_purchase_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>insert_purchase_request</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_items_dict" href="#make_items_dict" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_items_dict</b>
+        <i class="text-muted">(self, item_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="raise_production_order" href="#raise_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>raise_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>It will raise production order (Draft) for all distinct FG items</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="raise_purchase_request" href="#raise_purchase_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>raise_purchase_request</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Raise Material Request if projected qty is less than qty required
+Requested qty should be shortage qty considering minimum order qty</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_company" href="#validate_company" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_company</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_data" href="#validate_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_data</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/workstation.html b/erpnext/docs/current/models/manufacturing/workstation.html
new file mode 100644
index 0000000..cd5c7eb
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/workstation.html

@@ -0,0 +1,474 @@
+<!-- title: Workstation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/workstation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabWorkstation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>description_and_warehouse</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>workstation_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Workstation Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>holiday_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Holiday List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday_list">Holiday List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>over_heads</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Operating Costs
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>hour_rate_electricity</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Electricity Cost
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>hour_rate_consumable</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Consumable Cost
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>hour_rate_rent</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rent Cost
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>hour_rate_labour</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Wages
+                <p class="text-muted small">
+                    Wages per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>hour_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Hour Rate
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>working_hours_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Working Hours
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>working_hours</code></td>
+            <td >
+                Table</td>
+            <td >
+                Working Hours
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation_working_hour">Workstation Working Hour</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.manufacturing.doctype.workstation.workstation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NotInWorkingHoursError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverlapError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Workstation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_bom_operation" href="#update_bom_operation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_bom_operation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_overlap_for_operation_timings" href="#validate_overlap_for_operation_timings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_overlap_for_operation_timings</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check if there is no overlap in setting Workstation Operating Hours</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>WorkstationHolidayError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.workstation.workstation.check_if_within_operating_hours" href="#erpnext.manufacturing.doctype.workstation.workstation.check_if_within_operating_hours" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.workstation.workstation.<b>check_if_within_operating_hours</b>
+        <i class="text-muted">(workstation, operation, from_datetime, to_datetime)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.workstation.workstation.check_workstation_for_holiday" href="#erpnext.manufacturing.doctype.workstation.workstation.check_workstation_for_holiday" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.workstation.workstation.<b>check_workstation_for_holiday</b>
+        <i class="text-muted">(workstation, from_datetime, to_datetime)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list" href="#erpnext.manufacturing.doctype.workstation.workstation.get_default_holiday_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.workstation.workstation.<b>get_default_holiday_list</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.manufacturing.doctype.workstation.workstation.is_within_operating_hours" href="#erpnext.manufacturing.doctype.workstation.workstation.is_within_operating_hours" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.manufacturing.doctype.workstation.workstation.<b>is_within_operating_hours</b>
+        <i class="text-muted">(workstation, operation, from_datetime, to_datetime)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_operation">BOM Operation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/operation">Operation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order_operation">Production Order Operation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/manufacturing/workstation_working_hour.html b/erpnext/docs/current/models/manufacturing/workstation_working_hour.html
new file mode 100644
index 0000000..4075baf
--- /dev/null
+++ b/erpnext/docs/current/models/manufacturing/workstation_working_hour.html

@@ -0,0 +1,123 @@
+<!-- title: Workstation Working Hour -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/manufacturing/doctype/workstation_working_hour"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabWorkstation Working Hour</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>start_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Start Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>end_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                End Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>section_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>enabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Enabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/activity_cost.html b/erpnext/docs/current/models/projects/activity_cost.html
new file mode 100644
index 0000000..cd5119f
--- /dev/null
+++ b/erpnext/docs/current/models/projects/activity_cost.html

@@ -0,0 +1,260 @@
+<!-- title: Activity Cost -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/activity_cost"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabActivity Cost</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>activity_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Activity Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/activity_type">Activity Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>employee_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Employee Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>billing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billing Rate
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break_6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>costing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Costing Rate
+                <p class="text-muted small">
+                    per hour</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.activity_cost.activity_cost</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ActivityCost</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_unique" href="#check_unique" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_unique</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_title" href="#set_title" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_title</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>DuplicationError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/activity_type.html b/erpnext/docs/current/models/projects/activity_type.html
new file mode 100644
index 0000000..4055764
--- /dev/null
+++ b/erpnext/docs/current/models/projects/activity_type.html

@@ -0,0 +1,146 @@
+<!-- title: Activity Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/activity_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabActivity Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>activity_type</code></td>
+            <td >
+                Data</td>
+            <td >
+                Activity Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>costing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Default Costing Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>billing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Default Billing Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.activity_type.activity_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ActivityType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/activity_cost">Activity Cost</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/dependent_task.html b/erpnext/docs/current/models/projects/dependent_task.html
new file mode 100644
index 0000000..d8dfa41
--- /dev/null
+++ b/erpnext/docs/current/models/projects/dependent_task.html

@@ -0,0 +1,72 @@
+<!-- title: Dependent Task -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/dependent_task"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabDependent Task</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>task</code></td>
+            <td >
+                Link</td>
+            <td >
+                Task
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/index.html b/erpnext/docs/current/models/projects/index.html
new file mode 100644
index 0000000..85b7c57
--- /dev/null
+++ b/erpnext/docs/current/models/projects/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module projects -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for projects</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/projects/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/projects/index.txt


diff --git a/erpnext/docs/current/models/projects/project.html b/erpnext/docs/current/models/projects/project.html
new file mode 100644
index 0000000..40cd915
--- /dev/null
+++ b/erpnext/docs/current/models/projects/project.html

@@ -0,0 +1,918 @@
+<!-- title: Project -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/project"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabProject</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>project_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Completed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>project_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Project Type
+                
+            </td>
+            <td>
+                <pre>Internal
+External
+Other</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>is_active</code></td>
+            <td >
+                Select</td>
+            <td >
+                Is Active
+                
+            </td>
+            <td>
+                <pre>Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>priority</code></td>
+            <td >
+                Select</td>
+            <td >
+                Priority
+                
+            </td>
+            <td>
+                <pre>Medium
+Low
+High</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_12</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>expected_start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expected Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>expected_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expected End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>customer_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>sb_milestones</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Tasks
+                
+            </td>
+            <td>
+                <pre>icon-flag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>tasks</code></td>
+            <td >
+                Table</td>
+            <td >
+                Tasks
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project_task">Project Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>percent_complete</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Tasks Completed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-list</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>notes</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Notes
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>section_break_18</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>actual_start_date</code></td>
+            <td >
+                Data</td>
+            <td >
+                Actual Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>actual_time</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Time (in Hours)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>column_break_20</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>actual_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Actual End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_26</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>estimated_costing</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Estimated Costing
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>project_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>total_costing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Costing Amount (via Time Logs)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>total_expense_claim</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Expense Claim (via Expense Claims)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>column_break_28</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>total_billing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Billing Amount (via Time Logs)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>total_purchase_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Purchase Cost (via Purchase Invoice)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>36</td>
+            <td ><code>margin</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>gross_margin</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Gross Margin
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>column_break_37</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>per_gross_margin</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Gross Margin %
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.project.project</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Project</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__setup__" href="#__setup__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__setup__</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_tasks" href="#get_tasks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_tasks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Load project tasks for quick view</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="sync_tasks" href="#sync_tasks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>sync_tasks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>sync tasks and remove table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_costing" href="#update_costing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_costing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_percent_complete" href="#update_percent_complete" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_percent_complete</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_project" href="#update_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_project</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_purchase_costing" href="#update_purchase_costing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_purchase_costing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates" href="#validate_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.project.project.get_cost_center_name</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.project.project.get_cost_center_name" href="#erpnext.projects.doctype.project.project.get_cost_center_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.project.project.<b>get_cost_center_name</b>
+        <i class="text-muted">(project_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_ledger_entry">Stock Ledger Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/project_task.html b/erpnext/docs/current/models/projects/project_task.html
new file mode 100644
index 0000000..64f8c8c
--- /dev/null
+++ b/erpnext/docs/current/models/projects/project_task.html

@@ -0,0 +1,186 @@
+<!-- title: Project Task -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/project_task"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabProject Task</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Working
+Pending Review
+Closed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>edit_task</code></td>
+            <td >
+                Button</td>
+            <td >
+                View Task
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>task_id</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Task ID
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/task.html b/erpnext/docs/current/models/projects/task.html
new file mode 100644
index 0000000..9faf97b
--- /dev/null
+++ b/erpnext/docs/current/models/projects/task.html

@@ -0,0 +1,760 @@
+<!-- title: Task -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/task"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTask</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>subject</code></td>
+            <td >
+                Data</td>
+            <td >
+                Subject
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>project</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Working
+Pending Review
+Closed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>priority</code></td>
+            <td >
+                Select</td>
+            <td >
+                Priority
+                
+            </td>
+            <td>
+                <pre>Low
+Medium
+High
+Urgent</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Depends On
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>depends_on</code></td>
+            <td >
+                Table</td>
+            <td >
+                depends_on
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task_depends_on">Task Depends On</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_10</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>exp_start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expected Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>expected_time</code></td>
+            <td >
+                Float</td>
+            <td >
+                Expected Time (in hours)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>exp_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expected End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>actual</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>act_start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Actual Start Date (via Time Logs)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>actual_time</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Time (in hours)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break_15</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>act_end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Actual End Date (via Time Logs)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>section_break_17</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>total_costing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Costing Amount (via Time Logs)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>total_expense_claim</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Expense Claim (via Expense Claim)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>column_break_20</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>total_billing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Billing Amount (via Time Logs)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>more_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>review_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Review Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>closing_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Closing Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.task.task</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CircularReferenceError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Task</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_recursion" href="#check_recursion" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_recursion</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_customer_details" href="#get_customer_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_customer_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_project_details" href="#get_project_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_project_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="reschedule_dependent_tasks" href="#reschedule_dependent_tasks" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>reschedule_dependent_tasks</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_project" href="#update_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_project</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_time_and_costing" href="#update_time_and_costing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_time_and_costing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_total_expense_claim" href="#update_total_expense_claim" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_total_expense_claim</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates" href="#validate_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_status" href="#validate_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.task.task.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.task.task.get_events" href="#erpnext.projects.doctype.task.task.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.task.task.<b>get_events</b>
+        <i class="text-muted">(start, end, filters=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns events for Gantt / Calendar view rendering.</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>start</code></strong> -  Start date-time.</li>
+<li><strong><code>end</code></strong> -  End date-time.</li>
+<li><strong><code>filters</code></strong> -  Filters (JSON).</li>
+</ul>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.task.task.get_project" href="#erpnext.projects.doctype.task.task.get_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.task.task.<b>get_project</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.task.task.set_multiple_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.task.task.set_multiple_status" href="#erpnext.projects.doctype.task.task.set_multiple_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.task.task.<b>set_multiple_status</b>
+        <i class="text-muted">(names, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/dependent_task">Dependent Task</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project_task">Project Task</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task_depends_on">Task Depends On</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/task_depends_on.html b/erpnext/docs/current/models/projects/task_depends_on.html
new file mode 100644
index 0000000..2789d4c
--- /dev/null
+++ b/erpnext/docs/current/models/projects/task_depends_on.html

@@ -0,0 +1,108 @@
+<!-- title: Task Depends On -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/task_depends_on"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabTask Depends On</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>task</code></td>
+            <td >
+                Link</td>
+            <td >
+                Task
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>subject</code></td>
+            <td >
+                Text</td>
+            <td >
+                Subject
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/time_log.html b/erpnext/docs/current/models/projects/time_log.html
new file mode 100644
index 0000000..99dd80b
--- /dev/null
+++ b/erpnext/docs/current/models/projects/time_log.html

@@ -0,0 +1,1107 @@
+<!-- title: Time Log -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/time_log"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTime Log</code></p>
+
+
+Log of Activities performed by users against Tasks that can be used for tracking time, billing.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>TL-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Submitted
+Batched for Billing
+Billed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>from_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                From Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>hours</code></td>
+            <td >
+                Float</td>
+            <td >
+                Hours
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>to_time</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                To Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>activity_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Activity Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/activity_type">Activity Type</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>project</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>task</code></td>
+            <td >
+                Link</td>
+            <td >
+                Task
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>section_break_12</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>user</code></td>
+            <td >
+                Link</td>
+            <td >
+                User
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>for_manufacturing</code></td>
+            <td >
+                Check</td>
+            <td class="text-muted" title="Hidden">
+                For Manufacturing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>billable</code></td>
+            <td >
+                Check</td>
+            <td >
+                Billable
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break_11</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>production_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Production Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>operation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Operation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/operation">Operation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>operation_id</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Operation ID
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>workstation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Workstation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/workstation">Workstation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>completed_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Completed Qty
+                <p class="text-muted small">
+                    Operation completed for how many finished goods?</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>note</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Note
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>27</td>
+            <td ><code>section_break_24</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>costing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Costing Rate based on Activity Type (per hour)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>costing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Costing Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>column_break_25</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>billing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billing Rate based on Activity Type (per hour)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>billing_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billing Amount
+                <p class="text-muted small">
+                    Will be updated only if Time Log is 'Billable'</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>section_break_29</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>time_log_batch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Time Log Batch
+                <p class="text-muted small">
+                    Will be updated when batched.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>sales_invoice</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Invoice
+                <p class="text-muted small">
+                    Will be updated when billed.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.time_log.time_log</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NegativeHoursError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NotSubmittedError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverProductionLoggedError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OverlapError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TimeLog</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_cancel" href="#before_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_update_after_submit" href="#before_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_total_hours" href="#calculate_total_hours" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_total_hours</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_workstation_timings" href="#check_workstation_timings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_workstation_timings</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Checks if <strong>Time Log</strong> is between operating hours of the <strong>Workstation</strong>.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_operation_start_end_time" href="#get_operation_start_end_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_operation_start_end_time</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns Min From and Max To Dates of Time Logs against a specific Operation. </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_overlap_for" href="#get_overlap_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_overlap_for</b>
+        <i class="text-muted">(self, fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_time_log_summary" href="#get_time_log_summary" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_time_log_summary</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns 'Actual Operating Time'. </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="move_to_next_day" href="#move_to_next_day" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>move_to_next_day</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Move start and end time one day forward</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="move_to_next_non_overlapping_slot" href="#move_to_next_non_overlapping_slot" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>move_to_next_non_overlapping_slot</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>If in overlap, set start as the end point of the overlapping time log</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="move_to_next_working_slot" href="#move_to_next_working_slot" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>move_to_next_working_slot</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Move to next working slot from workstation</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_project_if_missing" href="#set_project_if_missing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_project_if_missing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set project if task is set</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_status" href="#set_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_title" href="#set_title" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_title</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set default title for the Time Log</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_cost" href="#update_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_production_order" href="#update_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Updates <code>start_date</code>, <code>end_date</code>, <code>status</code> for operation in Production Order.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_task_and_project" href="#update_task_and_project" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_task_and_project</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update costing rate in Task or Project if either is set</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_manufacturing" href="#validate_manufacturing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_manufacturing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_overlap" href="#validate_overlap" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_overlap</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Checks if 'Time Log' entries overlap for a user, workstation. </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_overlap_for" href="#validate_overlap_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_overlap_for</b>
+        <i class="text-muted">(self, fieldname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_production_order" href="#validate_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Throws 'NotSubmittedError' if <strong>production order</strong> is not submitted. </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_time_log_for" href="#validate_time_log_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_time_log_for</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_timings" href="#validate_timings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_timings</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.time_log.time_log.get_activity_cost</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.time_log.time_log.get_activity_cost" href="#erpnext.projects.doctype.time_log.time_log.get_activity_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.time_log.time_log.<b>get_activity_cost</b>
+        <i class="text-muted">(employee=None, activity_type=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.time_log.time_log.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.time_log.time_log.get_events" href="#erpnext.projects.doctype.time_log.time_log.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.time_log.time_log.<b>get_events</b>
+        <i class="text-muted">(start, end, filters=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns events for Gantt / Calendar view rendering.</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>start</code></strong> -  Start date-time.</li>
+<li><strong><code>end</code></strong> -  End date-time.</li>
+<li><strong><code>filters</code></strong> -  Filters like workstation, project etc.</li>
+</ul>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch_detail">Time Log Batch Detail</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/time_log_batch.html b/erpnext/docs/current/models/projects/time_log_batch.html
new file mode 100644
index 0000000..303acf0
--- /dev/null
+++ b/erpnext/docs/current/models/projects/time_log_batch.html

@@ -0,0 +1,406 @@
+<!-- title: Time Log Batch -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/time_log_batch"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTime Log Batch</code></p>
+
+
+Batch Time Logs for Billing.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>TLB-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Submitted
+Billed
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>sales_invoice</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Invoice
+                <p class="text-muted small">
+                    Will be updated after Sales Invoice is Submitted.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>time_logs</code></td>
+            <td >
+                Table</td>
+            <td >
+                Time Logs
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch_detail">Time Log Batch Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_8</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>total_hours</code></td>
+            <td >
+                Float</td>
+            <td >
+                Total Hours
+                <p class="text-muted small">
+                    updated via Time Logs</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>total_billing_amount</code></td>
+            <td >
+                Float</td>
+            <td >
+                Total Billing Amount
+                <p class="text-muted small">
+                    updated via Time Logs</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.projects.doctype.time_log_batch.time_log_batch</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TimeLogBatch</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_cancel" href="#before_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_update_after_submit" href="#before_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_status" href="#set_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, time_log_batch)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_time_log_values" href="#update_time_log_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_time_log_values</b>
+        <i class="text-muted">(self, d, tl)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_time_log_is_submitted" href="#validate_time_log_is_submitted" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_time_log_is_submitted</b>
+        <i class="text-muted">(self, tl)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.projects.doctype.time_log_batch.time_log_batch.make_sales_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.projects.doctype.time_log_batch.time_log_batch.make_sales_invoice" href="#erpnext.projects.doctype.time_log_batch.time_log_batch.make_sales_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.projects.doctype.time_log_batch.time_log_batch.<b>make_sales_invoice</b>
+        <i class="text-muted">(source_name, target=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/projects/time_log_batch_detail.html b/erpnext/docs/current/models/projects/time_log_batch_detail.html
new file mode 100644
index 0000000..69430e5
--- /dev/null
+++ b/erpnext/docs/current/models/projects/time_log_batch_detail.html

@@ -0,0 +1,132 @@
+<!-- title: Time Log Batch Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/projects/doctype/time_log_batch_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabTime Log Batch Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>time_log</code></td>
+            <td >
+                Link</td>
+            <td >
+                Time Log
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log">Time Log</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>hours</code></td>
+            <td >
+                Float</td>
+            <td >
+                Hours
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>section_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>activity_type</code></td>
+            <td >
+                Data</td>
+            <td >
+                Activity Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>billing_amount</code></td>
+            <td >
+                Float</td>
+            <td >
+                Billing Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/time_log_batch">Time Log Batch</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/campaign.html b/erpnext/docs/current/models/selling/campaign.html
new file mode 100644
index 0000000..7019a25
--- /dev/null
+++ b/erpnext/docs/current/models/selling/campaign.html

@@ -0,0 +1,207 @@
+<!-- title: Campaign -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/campaign"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCampaign</code></p>
+
+
+Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. 
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>campaign_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Campaign Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Naming Series
+                
+            </td>
+            <td>
+                <pre>Campaign-.####</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.campaign.campaign</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Campaign</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/customer.html b/erpnext/docs/current/models/selling/customer.html
new file mode 100644
index 0000000..50587a7
--- /dev/null
+++ b/erpnext/docs/current/models/selling/customer.html

@@ -0,0 +1,1129 @@
+<!-- title: Customer -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/customer"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCustomer</code></p>
+
+
+Buyer of Goods and Services.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>basic_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>CUST-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Full Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>customer_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                <pre>
+Company
+Individual</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>lead_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Lead
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>tax_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Tax ID
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>is_frozen</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Frozen
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>default_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Billing Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>default_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>default_taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>address_contacts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Address and Contact
+                
+            </td>
+            <td>
+                <pre>icon-map-marker</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>address_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>contact_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Contact HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>default_receivable_accounts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Default Receivable Accounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounts
+                <p class="text-muted small">
+                    Mention if non-standard receivable account</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>column_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Credit Limit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>credit_days_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Credit Days Based On
+                
+            </td>
+            <td>
+                <pre>
+Fixed Days
+Last Day of the Next Month</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>credit_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Credit Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>credit_limit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit Limit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>26</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Customer Details
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>customer_details</code></td>
+            <td >
+                Text</td>
+            <td >
+                Customer Details
+                <p class="text-muted small">
+                    Additional information regarding the customer.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>29</td>
+            <td ><code>sales_team_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Partner and Commission
+                
+            </td>
+            <td>
+                <pre>icon-group</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>default_sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>default_commission_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Commission Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>32</td>
+            <td ><code>sales_team_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Team
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>sales_team</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Team Details
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_team">Sales Team</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>communications</code></td>
+            <td >
+                Table</td>
+            <td class="text-muted" title="Hidden">
+                Communications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.customer.customer</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Customer</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_lead_address_contact" href="#create_lead_address_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_lead_address_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_customer_address" href="#delete_customer_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_customer_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_customer_contact" href="#delete_customer_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_customer_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_customer_name" href="#get_customer_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_customer_name</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Load address and contacts in <code>__onload</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_address" href="#update_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_contact" href="#update_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_customer_address" href="#update_customer_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_customer_address</b>
+        <i class="text-muted">(self, newdn, set_field)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_lead_status" href="#update_lead_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_lead_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_name_with_customer_group" href="#validate_name_with_customer_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_name_with_customer_group</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.customer.customer.check_credit_limit" href="#erpnext.selling.doctype.customer.customer.check_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.customer.customer.<b>check_credit_limit</b>
+        <i class="text-muted">(customer, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.customer.customer.get_credit_limit" href="#erpnext.selling.doctype.customer.customer.get_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.customer.customer.<b>get_credit_limit</b>
+        <i class="text-muted">(customer, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.customer.customer.get_customer_list" href="#erpnext.selling.doctype.customer.customer.get_customer_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.customer.customer.<b>get_customer_list</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.customer.customer.get_customer_outstanding" href="#erpnext.selling.doctype.customer.customer.get_customer_outstanding" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.customer.customer.<b>get_customer_outstanding</b>
+        <i class="text-muted">(customer, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.customer.customer.get_dashboard_info</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.customer.customer.get_dashboard_info" href="#erpnext.selling.doctype.customer.customer.get_dashboard_info" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.customer.customer.<b>get_dashboard_info</b>
+        <i class="text-muted">(customer)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/issue">Issue</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_customer_detail">Item Customer Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_sales_order">Production Plan Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sms_center">SMS Center</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/index.html b/erpnext/docs/current/models/selling/index.html
new file mode 100644
index 0000000..996d15c
--- /dev/null
+++ b/erpnext/docs/current/models/selling/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module selling -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for selling</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/selling/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/selling/index.txt


diff --git a/erpnext/docs/current/models/selling/industry_type.html b/erpnext/docs/current/models/selling/industry_type.html
new file mode 100644
index 0000000..fea6c1a
--- /dev/null
+++ b/erpnext/docs/current/models/selling/industry_type.html

@@ -0,0 +1,101 @@
+<!-- title: Industry Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/industry_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabIndustry Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>industry</code></td>
+            <td >
+                Data</td>
+            <td >
+                Industry
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.industry_type.industry_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>IndustryType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/installation_note.html b/erpnext/docs/current/models/selling/installation_note.html
new file mode 100644
index 0000000..e661531
--- /dev/null
+++ b/erpnext/docs/current/models/selling/installation_note.html

@@ -0,0 +1,622 @@
+<!-- title: Installation Note -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/installation_note"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabInstallation Note</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>installation_note</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Installation Note
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>IN-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>inst_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Installation Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>inst_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Installation Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Submitted
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>item_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note_item">Installation Note Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.installation_note.installation_note</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>InstallationNote</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_item_table" href="#check_item_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_item_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_prevdoc_serial_no" href="#get_prevdoc_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_prevdoc_serial_no</b>
+        <i class="text-muted">(self, prevdoc_detail_docname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="is_serial_no_added" href="#is_serial_no_added" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>is_serial_no_added</b>
+        <i class="text-muted">(self, item_code, serial_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="is_serial_no_exist" href="#is_serial_no_exist" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>is_serial_no_exist</b>
+        <i class="text-muted">(self, item_code, serial_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="is_serial_no_match" href="#is_serial_no_match" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>is_serial_no_match</b>
+        <i class="text-muted">(self, cur_s_no, prevdoc_s_no, prevdoc_docname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_installation_date" href="#validate_installation_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_installation_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_serial_no" href="#validate_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_serial_no</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/installation_note_item.html b/erpnext/docs/current/models/selling/installation_note_item.html
new file mode 100644
index 0000000..90a198c
--- /dev/null
+++ b/erpnext/docs/current/models/selling/installation_note_item.html

@@ -0,0 +1,156 @@
+<!-- title: Installation Note Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/installation_note_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabInstallation Note Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Data</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Against Document Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Against Document No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Document Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Installed Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/product_bundle.html b/erpnext/docs/current/models/selling/product_bundle.html
new file mode 100644
index 0000000..c980fe4
--- /dev/null
+++ b/erpnext/docs/current/models/selling/product_bundle.html

@@ -0,0 +1,206 @@
+<!-- title: Product Bundle -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/product_bundle"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabProduct Bundle</code></p>
+
+
+Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have "Is Stock Item" as "No" and "Is Sales Item" as "Yes".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>basic_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>new_item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>3</td>
+            <td ><code>item_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                <p class="text-muted small">
+                    List items that form the package.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/product_bundle_item">Product Bundle Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.product_bundle.product_bundle</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ProductBundle</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_main_item" href="#validate_main_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_main_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validates, main Item is not a stock item</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.product_bundle.product_bundle.get_new_item_code" href="#erpnext.selling.doctype.product_bundle.product_bundle.get_new_item_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.product_bundle.product_bundle.<b>get_new_item_code</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/product_bundle_item.html b/erpnext/docs/current/models/selling/product_bundle_item.html
new file mode 100644
index 0000000..b368e86
--- /dev/null
+++ b/erpnext/docs/current/models/selling/product_bundle_item.html

@@ -0,0 +1,141 @@
+<!-- title: Product Bundle Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/product_bundle_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabProduct Bundle Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>rate</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/product_bundle">Product Bundle</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/quotation.html b/erpnext/docs/current/models/selling/quotation.html
new file mode 100644
index 0000000..617246d
--- /dev/null
+++ b/erpnext/docs/current/models/selling/quotation.html

@@ -0,0 +1,1502 @@
+<!-- title: Quotation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/quotation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabQuotation</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>QTN-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>quotation_to</code></td>
+            <td >
+                Select</td>
+            <td >
+                Quotation To
+                
+            </td>
+            <td>
+                <pre>
+Lead
+Customer</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>lead</code></td>
+            <td >
+                Link</td>
+            <td >
+                Lead
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer / Lead Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>order_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Order Type
+                
+            </td>
+            <td>
+                <pre>
+Sales
+Maintenance
+Shopping Cart</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                <p class="text-muted small">
+                    Rate at which customer's currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td class="danger" title="Mandatory"><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                <p class="text-muted small">
+                    Rate at which Price list currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>26</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>sec_break23</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break_28</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>column_break_34</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>shipping_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>section_break_36</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>41</td>
+            <td ><code>section_break_39</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>column_break_42</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>45</td>
+            <td ><code>section_break_44</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>50</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                <p class="text-muted small">
+                    In Words will be visible once you save the Quotation.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>58</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Term Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>61</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>shipping_address_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>65</td>
+            <td ><code>shipping_address</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>col_break98</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>69</td>
+            <td ><code>print_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Print Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>71</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>72</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Existing Customer
+Reference
+Advertisement
+Cold Calling
+Exhibition
+Supplier Reference
+Mass Mailing
+Customer's Vendor
+Campaign</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>75</td>
+            <td ><code>order_lost_reason</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Quotation Lost Reason
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Draft
+Submitted
+Ordered
+Lost
+Cancelled
+Open
+Replied</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>enq_det</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Opportunity Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.quotation.quotation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Quotation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.selling_controller.SellingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_item_table" href="#check_item_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_item_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="declare_order_lost" href="#declare_order_lost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>declare_order_lost</b>
+        <i class="text-muted">(self, arg)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="has_sales_order" href="#has_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>has_sales_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="print_other_charges" href="#print_other_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>print_other_charges</b>
+        <i class="text-muted">(self, docname)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_opportunity" href="#update_opportunity" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_opportunity</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_order_type" href="#validate_order_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_order_type</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_quotation_to" href="#validate_quotation_to" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_quotation_to</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.quotation.quotation._make_customer" href="#erpnext.selling.doctype.quotation.quotation._make_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.quotation.quotation.<b>_make_customer</b>
+        <i class="text-muted">(source_name, ignore_permissions=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.quotation.quotation._make_sales_order" href="#erpnext.selling.doctype.quotation.quotation._make_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.quotation.quotation.<b>_make_sales_order</b>
+        <i class="text-muted">(source_name, target_doc=None, ignore_permissions=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.quotation.quotation.make_sales_order</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.quotation.quotation.make_sales_order" href="#erpnext.selling.doctype.quotation.quotation.make_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.quotation.quotation.<b>make_sales_order</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/quotation_item.html b/erpnext/docs/current/models/selling/quotation_item.html
new file mode 100644
index 0000000..7fb24e2
--- /dev/null
+++ b/erpnext/docs/current/models/selling/quotation_item.html

@@ -0,0 +1,557 @@
+<!-- title: Quotation Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/quotation_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabQuotation Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>customer_item_code</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer's Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break_7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Against Doctype
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Against Docname
+                
+            </td>
+            <td>
+                <pre>prevdoc_doctype</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html
new file mode 100644
index 0000000..708b37a
--- /dev/null
+++ b/erpnext/docs/current/models/selling/sales_order.html

@@ -0,0 +1,2379 @@
+<!-- title: Sales Order -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/sales_order"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSales Order</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>SO-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>order_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Order Type
+                
+            </td>
+            <td>
+                <pre>
+Sales
+Maintenance
+Shopping Cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>delivery_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Delivery Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>po_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer's Purchase Order
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>po_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Customer's Purchase Order Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>shipping_address_name</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>shipping_address</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                <p class="text-muted small">
+                    Rate at which customer's currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td class="danger" title="Mandatory"><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td class="danger" title="Mandatory"><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                <p class="text-muted small">
+                    Rate at which Price list currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>29</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td class="danger" title="Mandatory"><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>section_break_31</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>column_break_33a</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>column_break_33</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>column_break_38</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>shipping_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>42</td>
+            <td ><code>section_break_40</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>45</td>
+            <td ><code>section_break_43</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>column_break_46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>49</td>
+            <td ><code>section_break_48</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>column_break_50</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>54</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                <p class="text-muted small">
+                    In Words will be visible once you save the Sales Order.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>advance_paid</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Advance Paid
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>63</td>
+            <td ><code>packing_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Packing List
+                
+            </td>
+            <td>
+                <pre>icon-suitcase</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>packed_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Packed Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>65</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>68</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>col_break45</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>71</td>
+            <td class="danger" title="Mandatory"><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>col_break46</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>75</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                <p class="text-muted small">
+                    Track this Sales Order against any Project</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td ><code>column_break_77</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Existing Customer
+Reference
+Advertisement
+Cold Calling
+Exhibition
+Supplier Reference
+Mass Mailing
+Customer's Vendor
+Campaign</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>81</td>
+            <td ><code>printing_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>85</td>
+            <td ><code>section_break_78</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Billing and Delivery Status
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+To Deliver and Bill
+To Bill
+To Deliver
+Completed
+Stopped
+Cancelled
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>delivery_status</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Delivery Status
+                
+            </td>
+            <td>
+                <pre>Not Delivered
+Fully Delivered
+Partly Delivered
+Closed
+Not Applicable</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>per_delivered</code></td>
+            <td >
+                Percent</td>
+            <td >
+                %  Delivered
+                <p class="text-muted small">
+                    % of materials delivered against this Sales Order</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>column_break_81</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>90</td>
+            <td ><code>per_billed</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Amount Billed
+                <p class="text-muted small">
+                    % of materials billed against this Sales Order</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>91</td>
+            <td ><code>billing_status</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Billing Status
+                
+            </td>
+            <td>
+                <pre>Not Billed
+Fully Billed
+Partly Billed
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>92</td>
+            <td ><code>sales_team_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Commission
+                
+            </td>
+            <td>
+                <pre>icon-group</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>93</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>94</td>
+            <td ><code>column_break7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>95</td>
+            <td ><code>commission_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Commission Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>96</td>
+            <td ><code>total_commission</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Commission
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>97</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Team
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>98</td>
+            <td ><code>sales_team</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Team1
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_team">Sales Team</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>99</td>
+            <td ><code>recurring_order</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Recurring Order
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>100</td>
+            <td ><code>is_recurring</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Recurring
+                <p class="text-muted small">
+                    Check if recurring order, uncheck to stop recurring or put proper End Date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>101</td>
+            <td ><code>recurring_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Recurring Type
+                <p class="text-muted small">
+                    Select the period when the invoice will be generated automatically</p>
+            </td>
+            <td>
+                <pre>
+Monthly
+Quarterly
+Half-yearly
+Yearly</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>102</td>
+            <td ><code>from_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                From Date
+                <p class="text-muted small">
+                    Start date of current order's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>103</td>
+            <td ><code>to_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                To Date
+                <p class="text-muted small">
+                    End date of current order's period</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>104</td>
+            <td ><code>repeat_on_day_of_month</code></td>
+            <td >
+                Int</td>
+            <td >
+                Repeat on Day of Month
+                <p class="text-muted small">
+                    The day of the month on which auto order will be generated e.g. 05, 28 etc </p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>105</td>
+            <td ><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                <p class="text-muted small">
+                    The date on which recurring order will be stop</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>106</td>
+            <td ><code>column_break83</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>107</td>
+            <td ><code>next_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Next Date
+                <p class="text-muted small">
+                    The date on which next invoice will be generated. It is generated on submit.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>108</td>
+            <td ><code>recurring_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Recurring Id
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>109</td>
+            <td ><code>notification_email_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Notification Email Address
+                <p class="text-muted small">
+                    Enter email id separated by commas, order will be mailed automatically on particular date</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>110</td>
+            <td ><code>recurring_print_format</code></td>
+            <td >
+                Link</td>
+            <td >
+                Recurring Print Format
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/print_format">Print Format</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.sales_order.sales_order</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalesOrder</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.selling_controller.SellingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_update_after_submit" href="#before_update_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_update_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_credit_limit" href="#check_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_credit_limit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_modified_date" href="#check_modified_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_modified_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_nextdoc_docstatus" href="#check_nextdoc_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_nextdoc_docstatus</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="product_bundle_has_stock_item" href="#product_bundle_has_stock_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>product_bundle_has_stock_item</b>
+        <i class="text-muted">(self, product_bundle)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns true if product bundle has stock item</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_delivery_status" href="#update_delivery_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_delivery_status</b>
+        <i class="text-muted">(self, po_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Update delivery status from Purchase Order for drop shipping</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_enquiry_status" href="#update_enquiry_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_enquiry_status</b>
+        <i class="text-muted">(self, prevdoc, flag)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_prevdoc_status" href="#update_prevdoc_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_prevdoc_status</b>
+        <i class="text-muted">(self, flag)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_reserved_qty" href="#update_reserved_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_reserved_qty</b>
+        <i class="text-muted">(self, so_item_rows=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update requested qty (before ordered_qty is updated)</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_delivery_date" href="#validate_delivery_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_delivery_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_drop_ship" href="#validate_drop_ship" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_drop_ship</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_for_items" href="#validate_for_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_for_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_order_type" href="#validate_order_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_order_type</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_po" href="#validate_po" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_po</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_proj_cust" href="#validate_proj_cust" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_proj_cust</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_sales_mntc_quotation" href="#validate_sales_mntc_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_sales_mntc_quotation</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_supplier_after_submit" href="#validate_supplier_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_supplier_after_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check that supplier is the same after submit if PO is already made</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>WarehouseRequired</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.get_events</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.get_events" href="#erpnext.selling.doctype.sales_order.sales_order.get_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>get_events</b>
+        <i class="text-muted">(start, end, filters=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns events for Gantt / Calendar view rendering.</p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>start</code></strong> -  Start date-time.</li>
+<li><strong><code>end</code></strong> -  End date-time.</li>
+<li><strong><code>filters</code></strong> -  Filters (JSON).</li>
+</ul>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.get_list_context" href="#erpnext.selling.doctype.sales_order.sales_order.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.get_supplier</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.get_supplier" href="#erpnext.selling.doctype.sales_order.sales_order.get_supplier" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>get_supplier</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_delivery_note</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_delivery_note" href="#erpnext.selling.doctype.sales_order.sales_order.make_delivery_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_delivery_note</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule" href="#erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_maintenance_schedule</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit" href="#erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_maintenance_visit</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_material_request</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_material_request" href="#erpnext.selling.doctype.sales_order.sales_order.make_material_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_material_request</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment" href="#erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_purchase_order_for_drop_shipment</b>
+        <i class="text-muted">(source_name, for_supplier, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" href="#erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>make_sales_invoice</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders" href="#erpnext.selling.doctype.sales_order.sales_order.stop_or_unstop_sales_orders" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>stop_or_unstop_sales_orders</b>
+        <i class="text-muted">(names, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.selling.doctype.sales_order.sales_order.update_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.selling.doctype.sales_order.sales_order.update_status" href="#erpnext.selling.doctype.sales_order.sales_order.update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.selling.doctype.sales_order.sales_order.<b>update_status</b>
+        <i class="text-muted">(status, name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_sales_order">Production Plan Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/sales_order_item.html b/erpnext/docs/current/models/selling/sales_order_item.html
new file mode 100644
index 0000000..92214ce
--- /dev/null
+++ b/erpnext/docs/current/models/selling/sales_order_item.html

@@ -0,0 +1,771 @@
+<!-- title: Sales Order Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/sales_order_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSales Order Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>customer_item_code</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer's Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break_7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>section_break_simple1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Basic Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>section_break_24</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break_27</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>drop_ship_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Drop Ship
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>delivered_by_supplier</code></td>
+            <td >
+                Check</td>
+            <td >
+                Supplier delivers to Customer
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse and Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Delivery Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>target_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Link</td>
+            <td >
+                Quotation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>projected_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Projected Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>ordered_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Ordered Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>delivered_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Delivered Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>returned_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Returned Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>billed_amt</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Billed Amt
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>planned_qty</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Planned Quantity
+                <p class="text-muted small">
+                    For Production</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>produced_qty</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Produced Quantity
+                <p class="text-muted small">
+                    For Production</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td class="text-muted" title="Hidden">
+                Sales Order Date
+                <p class="text-muted small">
+                    Used for Production Plan</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/sales_team.html b/erpnext/docs/current/models/selling/sales_team.html
new file mode 100644
index 0000000..acca398
--- /dev/null
+++ b/erpnext/docs/current/models/selling/sales_team.html

@@ -0,0 +1,181 @@
+<!-- title: Sales Team -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/sales_team"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSales Team</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>sales_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>contact_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Contact No.
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>allocated_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Contribution (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>allocated_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Contribution to Net Total
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>incentives</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Incentives
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>parenttype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Parenttype
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/selling_settings.html b/erpnext/docs/current/models/selling/selling_settings.html
new file mode 100644
index 0000000..9582984
--- /dev/null
+++ b/erpnext/docs/current/models/selling/selling_settings.html

@@ -0,0 +1,270 @@
+<!-- title: Selling Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/selling_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Settings for Selling Module
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>cust_master_name</code></td>
+            <td >
+                Select</td>
+            <td >
+                Customer Naming By
+                
+            </td>
+            <td>
+                <pre>Customer Name
+Naming Series</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>campaign_naming_by</code></td>
+            <td >
+                Select</td>
+            <td >
+                Campaign Naming By
+                
+            </td>
+            <td>
+                <pre>Campaign Name
+Naming Series</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>so_required</code></td>
+            <td >
+                Select</td>
+            <td >
+                Sales Order Required
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>dn_required</code></td>
+            <td >
+                Select</td>
+            <td >
+                Delivery Note Required
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>maintain_same_sales_rate</code></td>
+            <td >
+                Check</td>
+            <td >
+                Maintain Same Rate Throughout Sales Cycle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>editable_price_list_rate</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow user to edit Price List Rate in transactions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>allow_multiple_items</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Item to be added multiple times in a transaction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>allow_against_multiple_purchase_orders</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow multiple Sales Orders against a Customer's Purchase Order
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.selling_settings.selling_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SellingSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/selling/sms_center.html b/erpnext/docs/current/models/selling/sms_center.html
new file mode 100644
index 0000000..4be0110
--- /dev/null
+++ b/erpnext/docs/current/models/selling/sms_center.html

@@ -0,0 +1,342 @@
+<!-- title: SMS Center -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/selling/doctype/sms_center"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>send_to</code></td>
+            <td >
+                Select</td>
+            <td >
+                Send To
+                
+            </td>
+            <td>
+                <pre>
+All Contact
+All Customer Contact
+All Supplier Contact
+All Sales Partner Contact
+All Lead (Open)
+All Employee (Active)
+All Sales Person</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>department</code></td>
+            <td >
+                Link</td>
+            <td >
+                Department
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/department">Department</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>branch</code></td>
+            <td >
+                Link</td>
+            <td >
+                Branch
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/branch">Branch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>create_receiver_list</code></td>
+            <td >
+                Button</td>
+            <td >
+                Create Receiver List
+                
+            </td>
+            <td>
+                <pre>create_receiver_list</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>receiver_list</code></td>
+            <td >
+                Code</td>
+            <td >
+                Receiver List
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break9</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>message</code></td>
+            <td >
+                Text</td>
+            <td >
+                Message
+                <p class="text-muted small">
+                    Messages greater than 160 characters will be split into multiple messages</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>total_characters</code></td>
+            <td >
+                Int</td>
+            <td >
+                Total Characters
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>total_messages</code></td>
+            <td >
+                Int</td>
+            <td >
+                Total Message(s)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>send_sms</code></td>
+            <td >
+                Button</td>
+            <td >
+                Send SMS
+                
+            </td>
+            <td>
+                <pre>send_sms</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.selling.doctype.sms_center.sms_center</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SMSCenter</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_receiver_list" href="#create_receiver_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_receiver_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_receiver_nos" href="#get_receiver_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_receiver_nos</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send_sms" href="#send_sms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send_sms</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/authorization_control.html b/erpnext/docs/current/models/setup/authorization_control.html
new file mode 100644
index 0000000..390a580
--- /dev/null
+++ b/erpnext/docs/current/models/setup/authorization_control.html

@@ -0,0 +1,157 @@
+<!-- title: Authorization Control -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/authorization_control"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.authorization_control.authorization_control</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AuthorizationControl</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="bifurcate_based_on_type" href="#bifurcate_based_on_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>bifurcate_based_on_type</b>
+        <i class="text-muted">(self, doctype_name, total, av_dis, based_on, doc_obj, val, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_appr_user_role" href="#get_appr_user_role" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_appr_user_role</b>
+        <i class="text-muted">(self, det, doctype_name, total, based_on, condition, item, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_approver_name" href="#get_approver_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_approver_name</b>
+        <i class="text-muted">(self, doctype_name, total, doc_obj=)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_value_based_rule" href="#get_value_based_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_value_based_rule</b>
+        <i class="text-muted">(self, doctype_name, employee, total_claimed_amount, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_approving_authority" href="#validate_approving_authority" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_approving_authority</b>
+        <i class="text-muted">(self, doctype_name, company, total, doc_obj=)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_auth_rule" href="#validate_auth_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_auth_rule</b>
+        <i class="text-muted">(self, doctype_name, total, based_on, cond, company, item=)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/authorization_rule.html b/erpnext/docs/current/models/setup/authorization_rule.html
new file mode 100644
index 0000000..900092c
--- /dev/null
+++ b/erpnext/docs/current/models/setup/authorization_rule.html

@@ -0,0 +1,418 @@
+<!-- title: Authorization Rule -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/authorization_rule"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAuthorization Rule</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>transaction</code></td>
+            <td >
+                Select</td>
+            <td >
+                Transaction
+                
+            </td>
+            <td>
+                <pre>
+Sales Order
+Purchase Order
+Quotation
+Delivery Note
+Sales Invoice
+Purchase Invoice
+Purchase Receipt
+Appraisal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Based On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Average Discount
+Customerwise Discount
+Itemwise Discount
+Not Applicable</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>customer_or_item</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Customer or Item
+                
+            </td>
+            <td>
+                <pre>Customer
+Item</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>master_name</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Customer / Item Name
+                
+            </td>
+            <td>
+                <pre>customer_or_item</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_17</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>value</code></td>
+            <td >
+                Float</td>
+            <td >
+                Authorized Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>system_role</code></td>
+            <td >
+                Link</td>
+            <td >
+                Applicable To (Role)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/role">Role</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>to_emp</code></td>
+            <td >
+                Link</td>
+            <td >
+                Applicable To (Employee)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>system_user</code></td>
+            <td >
+                Link</td>
+            <td >
+                Applicable To (User)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>to_designation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Applicable To (Designation)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/designation">Designation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>section_break_13</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>approving_role</code></td>
+            <td >
+                Link</td>
+            <td >
+                Approving Role (above authorized value)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/role">Role</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>column_break_15</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>approving_user</code></td>
+            <td >
+                Link</td>
+            <td >
+                Approving User  (above authorized value)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.authorization_rule.authorization_rule</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AuthorizationRule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_duplicate_entry" href="#check_duplicate_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_duplicate_entry</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_rule" href="#validate_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_rule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/brand.html b/erpnext/docs/current/models/setup/brand.html
new file mode 100644
index 0000000..7b8ec7f
--- /dev/null
+++ b/erpnext/docs/current/models/setup/brand.html

@@ -0,0 +1,203 @@
+<!-- title: Brand -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/brand"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabBrand</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>brand</code></td>
+            <td >
+                Data</td>
+            <td >
+                Brand Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.brand.brand</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Brand</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity_item">Opportunity Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html
new file mode 100644
index 0000000..e2e6886
--- /dev/null
+++ b/erpnext/docs/current/models/setup/company.html

@@ -0,0 +1,1622 @@
+<!-- title: Company -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/company"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCompany</code></p>
+
+
+Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>company_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Company
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>abbr</code></td>
+            <td >
+                Data</td>
+            <td >
+                Abbr
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>change_abbr</code></td>
+            <td >
+                Button</td>
+            <td >
+                Change Abbreviation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>domain</code></td>
+            <td >
+                Select</td>
+            <td >
+                Domain
+                
+            </td>
+            <td>
+                <pre>Distribution
+Manufacturing
+Retail
+Services</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>charts_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Default Values
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>default_letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>default_holiday_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Holiday List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/holiday_list">Holiday List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>default_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>chart_of_accounts</code></td>
+            <td >
+                Select</td>
+            <td >
+                Chart of Accounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>default_terms</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>default_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounts Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>default_bank_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Bank Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>default_cash_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Cash Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>default_receivable_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Receivable Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>round_off_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Round Off Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>default_payable_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Payable Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>default_expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Cost of Goods Sold Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>default_income_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Income Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>round_off_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Round Off Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_22</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>credit_days_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Credit Days Based On
+                
+            </td>
+            <td>
+                <pre>
+Fixed Days
+Last Day of the Next Month</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>credit_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Credit Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>credit_limit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit Limit
+                
+            </td>
+            <td>
+                <pre>default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>column_break_26</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>yearly_bgt_flag</code></td>
+            <td >
+                Select</td>
+            <td >
+                If Yearly Budget Exceeded (for expense account)
+                
+            </td>
+            <td>
+                <pre>
+Warn
+Ignore
+Stop</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>monthly_bgt_flag</code></td>
+            <td >
+                Select</td>
+            <td >
+                If Monthly Budget Exceeded (for expense account)
+                
+            </td>
+            <td>
+                <pre>
+Warn
+Ignore
+Stop</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>auto_accounting_for_stock_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Stock Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>stock_received_but_not_billed</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock Received But Not Billed
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>stock_adjustment_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock Adjustment Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>column_break_32</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>expenses_included_in_valuation</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expenses Included In Valuation
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>company_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Company Info
+                <p class="text-muted small">
+                    For reference only.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>phone_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Phone No
+                
+            </td>
+            <td>
+                <pre>Phone</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>fax</code></td>
+            <td >
+                Data</td>
+            <td >
+                Fax
+                
+            </td>
+            <td>
+                <pre>Phone</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>45</td>
+            <td ><code>registration_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>registration_details</code></td>
+            <td >
+                Code</td>
+            <td >
+                Registration Details
+                <p class="text-muted small">
+                    Company registration numbers for your reference. Tax numbers etc.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>delete_company_transactions</code></td>
+            <td >
+                Button</td>
+            <td >
+                Delete Company Transactions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.company.company</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Company</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_set_default_account" href="#_set_default_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_set_default_account</b>
+        <i class="text-muted">(self, fieldname, account_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_acc" href="#add_acc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_acc</b>
+        <i class="text-muted">(self, lst)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_transactions_exist" href="#check_if_transactions_exist" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_transactions_exist</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_default_accounts" href="#create_default_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_default_accounts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_default_cost_center" href="#create_default_cost_center" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_default_cost_center</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_default_warehouses" href="#create_default_warehouses" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_default_warehouses</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="install_country_fixtures" href="#install_country_fixtures" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>install_country_fixtures</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Trash accounts and cost centers for this company if no gl entry exists</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_default_accounts" href="#set_default_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_default_accounts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_currency" href="#validate_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_currency</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_default_accounts" href="#validate_default_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_default_accounts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.company.company.get_company_currency" href="#erpnext.setup.doctype.company.company.get_company_currency" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.company.company.<b>get_company_currency</b>
+        <i class="text-muted">(company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.company.company.get_name_with_abbr" href="#erpnext.setup.doctype.company.company.get_name_with_abbr" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.company.company.<b>get_name_with_abbr</b>
+        <i class="text-muted">(name, company)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.setup.doctype.company.company.replace_abbr</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.company.company.replace_abbr" href="#erpnext.setup.doctype.company.company.replace_abbr" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.company.company.<b>replace_abbr</b>
+        <i class="text-muted">(company, old, new)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/appraisal">Appraisal</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/attendance">Attendance</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/authorization_rule">Authorization Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form">C-Form</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/email_digest">Email Digest</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/expense_claim">Expense Claim</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year_company">Fiscal Year Company</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/gl_entry">GL Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/global_defaults">Global Defaults</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/issue">Issue</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_application">Leave Application</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/leave_block_list">Leave Block List</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/mode_of_payment_account">Mode of Payment Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_reconciliation">Payment Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/payment_tool">Payment Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/period_closing_voucher">Period Closing Voucher</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/process_payroll">Process Payroll</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_slip">Salary Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/salary_structure">Salary Structure</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_settings">Shopping Cart Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_ledger_entry">Stock Ledger Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/task">Task</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/currency_exchange.html b/erpnext/docs/current/models/setup/currency_exchange.html
new file mode 100644
index 0000000..03167d7
--- /dev/null
+++ b/erpnext/docs/current/models/setup/currency_exchange.html

@@ -0,0 +1,157 @@
+<!-- title: Currency Exchange -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/currency_exchange"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCurrency Exchange</code></p>
+
+
+Specify Exchange Rate to convert one currency into another
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>from_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>to_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                To Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>exchange_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.currency_exchange.currency_exchange</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CurrencyExchange</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/customer_group.html b/erpnext/docs/current/models/setup/customer_group.html
new file mode 100644
index 0000000..0b19ad4
--- /dev/null
+++ b/erpnext/docs/current/models/setup/customer_group.html

@@ -0,0 +1,445 @@
+<!-- title: Customer Group -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/customer_group"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabCustomer Group</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>customer_group_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Group Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>parent_customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>is_group</code></td>
+            <td >
+                Select</td>
+            <td >
+                Has Child Node
+                <p class="text-muted small">
+                    Only leaf nodes are allowed in transaction</p>
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>default_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>credit_days_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Credit Days Based On
+                
+            </td>
+            <td>
+                <pre>
+Fixed Days
+Last Day of the Next Month</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>credit_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Credit Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>credit_limit</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Credit Limit
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                old_parent
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>default_receivable_account</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Default Receivable Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounts
+                <p class="text-muted small">
+                    Mention if non-standard receivable account applicable</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.customer_group.customer_group</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>CustomerGroup</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.utils.nestedset.NestedSet</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_name_with_customer" href="#validate_name_with_customer" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_name_with_customer</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/selling_settings">Selling Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_settings">Shopping Cart Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/email_digest.html b/erpnext/docs/current/models/setup/email_digest.html
new file mode 100644
index 0000000..9c8557f
--- /dev/null
+++ b/erpnext/docs/current/models/setup/email_digest.html

@@ -0,0 +1,739 @@
+<!-- title: Email Digest -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/email_digest"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabEmail Digest</code></p>
+
+
+Send regular summary reports via Email.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Email Digest Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>enabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Enabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                For Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>frequency</code></td>
+            <td >
+                Select</td>
+            <td >
+                How frequently?
+                
+            </td>
+            <td>
+                <pre>Daily
+Weekly
+Monthly</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>next_send</code></td>
+            <td >
+                Data</td>
+            <td >
+                Next email will be sent on:
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>recipient_list</code></td>
+            <td >
+                Text</td>
+            <td >
+                Recipients
+                <p class="text-muted small">
+                    Note: Email will not be sent to disabled users</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>addremove_recipients</code></td>
+            <td >
+                Button</td>
+            <td >
+                Add/Remove Recipients
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>accounts_module</code></td>
+            <td class="info">
+                Column Break</td>
+            <td class="text-muted" title="Hidden">
+                Income / Expense
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>income</code></td>
+            <td >
+                Check</td>
+            <td >
+                Income
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>expenses_booked</code></td>
+            <td >
+                Check</td>
+            <td >
+                Expense
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>bank_balance</code></td>
+            <td >
+                Check</td>
+            <td >
+                Bank Balance
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>income_year_to_date</code></td>
+            <td >
+                Check</td>
+            <td >
+                Annual Income
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>expense_year_to_date</code></td>
+            <td >
+                Check</td>
+            <td >
+                Annual Expense
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>column_break_16</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Receivables / Payables
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>invoiced_amount</code></td>
+            <td >
+                Check</td>
+            <td >
+                Receivables
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>payables</code></td>
+            <td >
+                Check</td>
+            <td >
+                Payables
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>other</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Other
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>add_quote</code></td>
+            <td >
+                Check</td>
+            <td >
+                Add Quote
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.email_digest.email_digest</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EmailDigest</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="fmt_money" href="#fmt_money" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>fmt_money</b>
+        <i class="text-muted">(self, value)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_bank_balance" href="#get_bank_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_bank_balance</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_calendar_events" href="#get_calendar_events" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_calendar_events</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get calendar events for given user</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_expense_year_to_date" href="#get_expense_year_to_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_expense_year_to_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get income to date</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_expenses_booked" href="#get_expenses_booked" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_expenses_booked</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_from_to_date" href="#get_from_to_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_from_to_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_income" href="#get_income" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_income</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get income for given period</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_income_year_to_date" href="#get_income_year_to_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_income_year_to_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get income to date</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_invoiced_amount" href="#get_invoiced_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_invoiced_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_msg_html" href="#get_msg_html" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_msg_html</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Build email digest content</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_next_sending" href="#get_next_sending" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_next_sending</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_notifications" href="#get_notifications" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_notifications</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get notifications for user</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_payables" href="#get_payables" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_payables</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_period_amounts" href="#get_period_amounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_period_amounts</b>
+        <i class="text-muted">(self, accounts)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get amounts for current and past periods</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_root_type_accounts" href="#get_root_type_accounts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_root_type_accounts</b>
+        <i class="text-muted">(self, root_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_todo_list" href="#get_todo_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_todo_list</b>
+        <i class="text-muted">(self, user_id=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get to-do list</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_type_balance" href="#get_type_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_type_balance</b>
+        <i class="text-muted">(self, fieldname, account_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_users" href="#get_users" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_users</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get list of users</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_year_to_date_balance" href="#get_year_to_date_balance" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_year_to_date_balance</b>
+        <i class="text-muted">(self, root_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Get income to date</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="send" href="#send" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>send</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_accounting_cards" href="#set_accounting_cards" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_accounting_cards</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Create accounting cards if checked</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_dates" href="#set_dates" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_dates</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_style" href="#set_style" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_style</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set standard digest style</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_title" href="#set_title" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_title</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set digest title</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.setup.doctype.email_digest.email_digest.get_digest_msg</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.email_digest.email_digest.get_digest_msg" href="#erpnext.setup.doctype.email_digest.email_digest.get_digest_msg" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.email_digest.email_digest.<b>get_digest_msg</b>
+        <i class="text-muted">(name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.email_digest.email_digest.send" href="#erpnext.setup.doctype.email_digest.email_digest.send" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.email_digest.email_digest.<b>send</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/features_setup.html b/erpnext/docs/current/models/setup/features_setup.html
new file mode 100644
index 0000000..d5d8e5e
--- /dev/null
+++ b/erpnext/docs/current/models/setup/features_setup.html

@@ -0,0 +1,466 @@
+<!-- title: Features Setup -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/features_setup"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>materials</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Materials
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>fs_item_serial_nos</code></td>
+            <td >
+                Check</td>
+            <td >
+                Item Serial Nos
+                <p class="text-muted small">
+                    To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>fs_item_batch_nos</code></td>
+            <td >
+                Check</td>
+            <td >
+                Item Batch Nos
+                <p class="text-muted small">
+                    To track items in sales and purchase documents with batch nos. "Preferred Industry: Chemicals"</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>fs_brands</code></td>
+            <td >
+                Check</td>
+            <td >
+                Brands
+                <p class="text-muted small">
+                    To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>fs_item_barcode</code></td>
+            <td >
+                Check</td>
+            <td >
+                Item Barcode
+                <p class="text-muted small">
+                    To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>fs_item_advanced</code></td>
+            <td >
+                Check</td>
+            <td >
+                Item Advanced
+                <p class="text-muted small">
+                    1. To maintain the customer wise item code and to make them searchable based on their code use this option</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>fs_item_group_in_details</code></td>
+            <td >
+                Check</td>
+            <td >
+                Item Groups in Details
+                <p class="text-muted small">
+                    To get Item Group in details table</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>sales_and_purchase</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales and Purchase
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>fs_exports</code></td>
+            <td >
+                Check</td>
+            <td >
+                Exports
+                <p class="text-muted small">
+                    All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>fs_imports</code></td>
+            <td >
+                Check</td>
+            <td >
+                Imports
+                <p class="text-muted small">
+                    All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>fs_discounts</code></td>
+            <td >
+                Check</td>
+            <td >
+                Sales Discounts
+                <p class="text-muted small">
+                    Field available in Delivery Note, Quotation, Sales Invoice, Sales Order</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>fs_purchase_discounts</code></td>
+            <td >
+                Check</td>
+            <td >
+                Purchase Discounts
+                <p class="text-muted small">
+                    Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>fs_after_sales_installations</code></td>
+            <td >
+                Check</td>
+            <td >
+                After Sale Installations
+                <p class="text-muted small">
+                    To track any installation or commissioning related work after sales</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>fs_projects</code></td>
+            <td >
+                Check</td>
+            <td >
+                Projects
+                <p class="text-muted small">
+                    Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>fs_sales_extras</code></td>
+            <td >
+                Check</td>
+            <td >
+                Sales Extras
+                <p class="text-muted small">
+                    If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>fs_recurring_invoice</code></td>
+            <td >
+                Check</td>
+            <td >
+                Recurring Invoice
+                <p class="text-muted small">
+                    Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>fs_pos</code></td>
+            <td >
+                Check</td>
+            <td >
+                Point of Sale
+                <p class="text-muted small">
+                    To enable "Point of Sale" features</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>fs_pos_view</code></td>
+            <td >
+                Check</td>
+            <td >
+                POS View
+                <p class="text-muted small">
+                    To enable "Point of Sale" view</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>23</td>
+            <td ><code>production</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Manufacturing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>fs_manufacturing</code></td>
+            <td >
+                Check</td>
+            <td >
+                Manufacturing
+                <p class="text-muted small">
+                    If you involve in manufacturing activity. Enables Item 'Is Manufactured'</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>fs_quality</code></td>
+            <td >
+                Check</td>
+            <td >
+                Quality
+                <p class="text-muted small">
+                    If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>27</td>
+            <td ><code>miscelleneous</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Miscelleneous
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>fs_page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                <p class="text-muted small">
+                    If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>fs_more_info</code></td>
+            <td >
+                Check</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.features_setup.features_setup</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>FeaturesSetup</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update settings in defaults</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/global_defaults.html b/erpnext/docs/current/models/setup/global_defaults.html
new file mode 100644
index 0000000..ffb3197
--- /dev/null
+++ b/erpnext/docs/current/models/setup/global_defaults.html

@@ -0,0 +1,241 @@
+<!-- title: Global Defaults -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/global_defaults"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>default_company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>current_fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Current Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>default_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>hide_currency_symbol</code></td>
+            <td >
+                Select</td>
+            <td >
+                Hide Currency Symbol
+                <p class="text-muted small">
+                    Do not show any symbol like $ etc next to currencies.</p>
+            </td>
+            <td>
+                <pre>
+No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>disable_rounded_total</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disable Rounded Total
+                <p class="text-muted small">
+                    If disable, 'Rounded Total' field will not be visible in any transaction</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.global_defaults.global_defaults</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>GlobalDefaults</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_defaults" href="#get_defaults" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_defaults</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update defaults</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="toggle_rounded_total" href="#toggle_rounded_total" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>toggle_rounded_total</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/index.html b/erpnext/docs/current/models/setup/index.html
new file mode 100644
index 0000000..f41e253
--- /dev/null
+++ b/erpnext/docs/current/models/setup/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module setup -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for setup</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/setup/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/setup/index.txt


diff --git a/erpnext/docs/current/models/setup/item_group.html b/erpnext/docs/current/models/setup/item_group.html
new file mode 100644
index 0000000..5d07f71
--- /dev/null
+++ b/erpnext/docs/current/models/setup/item_group.html

@@ -0,0 +1,717 @@
+<!-- title: Item Group -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/item_group"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabItem Group</code></p>
+
+
+Item Classification
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>gs</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                General Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>item_group_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Group Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>parent_item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>is_group</code></td>
+            <td >
+                Select</td>
+            <td >
+                Has Child Node
+                <p class="text-muted small">
+                    Only leaf nodes are allowed in transaction</p>
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>default_income_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Income Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>default_expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Expense Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>default_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>sb9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Website Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>show_in_website</code></td>
+            <td >
+                Check</td>
+            <td >
+                Show in Website
+                <p class="text-muted small">
+                    Check this if you want to show in website</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>page_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Page Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>parent_website_route</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Parent Website Route
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>slideshow</code></td>
+            <td >
+                Link</td>
+            <td >
+                Slideshow
+                <p class="text-muted small">
+                    Show this slideshow at the top of the page</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/website/website_slideshow">Website Slideshow</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                <p class="text-muted small">
+                    HTML / Banner that will show on the top of product list.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>website_specifications</code></td>
+            <td >
+                Table</td>
+            <td >
+                Website Specifications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_website_specification">Item Website Specification</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                old_parent
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.item_group.item_group</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemGroup</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.utils.nestedset.NestedSet, frappe.website.website_generator.WebsiteGenerator</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_context" href="#get_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_context</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_parent_website_route" href="#set_parent_website_route" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_parent_website_route</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Overwrite <code>parent_website_route</code> from <code>WebsiteGenerator</code>.
+Only set <code>parent_website_route</code> if parent is visble.</p>
+
+<p>e.g. If <code>show_in_website</code> is set for Products then url should be <code>/products</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_name_with_item" href="#validate_name_with_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_name_with_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.get_child_groups" href="#erpnext.setup.doctype.item_group.item_group.get_child_groups" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>get_child_groups</b>
+        <i class="text-muted">(item_group_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.get_group_item_count" href="#erpnext.setup.doctype.item_group.item_group.get_group_item_count" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>get_group_item_count</b>
+        <i class="text-muted">(item_group)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.get_item_for_list_in_html" href="#erpnext.setup.doctype.item_group.item_group.get_item_for_list_in_html" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>get_item_for_list_in_html</b>
+        <i class="text-muted">(context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.get_parent_item_groups" href="#erpnext.setup.doctype.item_group.item_group.get_parent_item_groups" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>get_parent_item_groups</b>
+        <i class="text-muted">(item_group_name)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.get_product_list_for_group" href="#erpnext.setup.doctype.item_group.item_group.get_product_list_for_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>get_product_list_for_group</b>
+        <i class="text-muted">(product_group=None, start=0, limit=10)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.item_group.item_group.invalidate_cache_for" href="#erpnext.setup.doctype.item_group.item_group.invalidate_cache_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.item_group.item_group.<b>invalidate_cache_for</b>
+        <i class="text-muted">(doc, item_group=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity_item">Opportunity Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_settings">Stock Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/target_detail">Target Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/website_item_group">Website Item Group</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/naming_series.html b/erpnext/docs/current/models/setup/naming_series.html
new file mode 100644
index 0000000..84d8d56
--- /dev/null
+++ b/erpnext/docs/current/models/setup/naming_series.html

@@ -0,0 +1,386 @@
+<!-- title: Naming Series -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/naming_series"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Set prefix for numbering series on your transactions
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>setup_series</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Setup Series
+                <p class="text-muted small">
+                    Set prefix for numbering series on your transactions</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>select_doc_for_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Select Transaction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>help_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Help HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>set_options</code></td>
+            <td >
+                Text</td>
+            <td >
+                Series List for this Transaction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>user_must_always_select</code></td>
+            <td >
+                Check</td>
+            <td >
+                User must always select
+                <p class="text-muted small">
+                    Check this if you want to force the user to select a series before saving. There will be no default if you check this.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>update</code></td>
+            <td >
+                Button</td>
+            <td >
+                Update
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>update_series</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Update Series
+                <p class="text-muted small">
+                    Change the starting / current sequence number of an existing series.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>prefix</code></td>
+            <td >
+                Select</td>
+            <td >
+                Prefix
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>current_value</code></td>
+            <td >
+                Int</td>
+            <td >
+                Current Value
+                <p class="text-muted small">
+                    This is the number of the last created transaction with this prefix</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>update_series_start</code></td>
+            <td >
+                Button</td>
+            <td >
+                Update Series Number
+                
+            </td>
+            <td>
+                <pre>update_series_start</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.naming_series.naming_series</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NamingSeries</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_duplicate" href="#check_duplicate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_duplicate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_current" href="#get_current" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_current</b>
+        <i class="text-muted">(self, arg=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get series current</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_options" href="#get_options" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_options</b>
+        <i class="text-muted">(self, arg=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_transactions" href="#get_transactions" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_transactions</b>
+        <i class="text-muted">(self, arg=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="insert_series" href="#insert_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>insert_series</b>
+        <i class="text-muted">(self, series)</i>
+    </p>
+	<div class="docs-attr-desc"><p>insert series if missing</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="scrub_options_list" href="#scrub_options_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>scrub_options_list</b>
+        <i class="text-muted">(self, ol)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_series_for" href="#set_series_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_series_for</b>
+        <i class="text-muted">(self, doctype, ol)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_series" href="#update_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_series</b>
+        <i class="text-muted">(self, arg=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update series list</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_series_start" href="#update_series_start" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_series_start</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_series_name" href="#validate_series_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_series_name</b>
+        <i class="text-muted">(self, n)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NamingSeriesNotSetError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.naming_series.naming_series.get_default_naming_series" href="#erpnext.setup.doctype.naming_series.naming_series.get_default_naming_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.naming_series.naming_series.<b>get_default_naming_series</b>
+        <i class="text-muted">(doctype)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.naming_series.naming_series.set_by_naming_series" href="#erpnext.setup.doctype.naming_series.naming_series.set_by_naming_series" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.naming_series.naming_series.<b>set_by_naming_series</b>
+        <i class="text-muted">(doctype, fieldname, naming_series, hide_name_field=True)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/notification_control.html b/erpnext/docs/current/models/setup/notification_control.html
new file mode 100644
index 0000000..035b47c
--- /dev/null
+++ b/erpnext/docs/current/models/setup/notification_control.html

@@ -0,0 +1,364 @@
+<!-- title: Notification Control -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/notification_control"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Send automatic emails to Contacts on Submitting transactions.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>send_autonotification_for</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Prompt for Email on Submission of
+                <p class="text-muted small">
+                    When any of the checked transactions are "Submitted", an email pop-up automatically opened to send an email to the associated "Contact" in that transaction, with the transaction as an attachment. The user may or may not send the email.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>sales</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Sales
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>quotation</code></td>
+            <td >
+                Check</td>
+            <td >
+                Quotation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>sales_order</code></td>
+            <td >
+                Check</td>
+            <td >
+                Sales Order
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>delivery_note</code></td>
+            <td >
+                Check</td>
+            <td >
+                Delivery Note
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>sales_invoice</code></td>
+            <td >
+                Check</td>
+            <td >
+                Sales Invoice
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>purchase</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Purchase
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>purchase_order</code></td>
+            <td >
+                Check</td>
+            <td >
+                Purchase Order
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>purchase_receipt</code></td>
+            <td >
+                Check</td>
+            <td >
+                Purchase Receipt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>expense_claim</code></td>
+            <td >
+                Check</td>
+            <td >
+                Expense Claim
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>customize_the_notification</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Customize the Notification
+                <p class="text-muted small">
+                    Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>select_transaction</code></td>
+            <td >
+                Select</td>
+            <td >
+                Select Transaction
+                
+            </td>
+            <td>
+                <pre>
+Quotation
+Sales Order
+Delivery Note
+Sales Invoice
+Purchase Order
+Purchase Receipt
+Expense Claim
+Expense Claim Approved
+Expense Claim Rejected</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>custom_message</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Custom Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>set_message</code></td>
+            <td >
+                Button</td>
+            <td >
+                Update
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>quotation_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Quotation Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>sales_order_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Sales Order Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>delivery_note_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Delivery Note Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>sales_invoice_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Sales Invoice Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>purchase_order_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Order Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>purchase_receipt_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Receipt Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>expense_claim_approved_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Expense Claim Approved Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>expense_claim_rejected_message</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Expense Claim Rejected Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.notification_control.notification_control</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>NotificationControl</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/print_heading.html b/erpnext/docs/current/models/setup/print_heading.html
new file mode 100644
index 0000000..b0c9482
--- /dev/null
+++ b/erpnext/docs/current/models/setup/print_heading.html

@@ -0,0 +1,212 @@
+<!-- title: Print Heading -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/print_heading"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPrint Heading</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>print_heading</code></td>
+            <td >
+                Data</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.print_heading.print_heading</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PrintHeading</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/quotation_lost_reason.html b/erpnext/docs/current/models/setup/quotation_lost_reason.html
new file mode 100644
index 0000000..ea5a2b6
--- /dev/null
+++ b/erpnext/docs/current/models/setup/quotation_lost_reason.html

@@ -0,0 +1,87 @@
+<!-- title: Quotation Lost Reason -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/quotation_lost_reason"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabQuotation Lost Reason</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>order_lost_reason</code></td>
+            <td >
+                Data</td>
+            <td >
+                Quotation Lost Reason
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.quotation_lost_reason.quotation_lost_reason</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>QuotationLostReason</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/sales_partner.html b/erpnext/docs/current/models/setup/sales_partner.html
new file mode 100644
index 0000000..7e8f4e7
--- /dev/null
+++ b/erpnext/docs/current/models/setup/sales_partner.html

@@ -0,0 +1,559 @@
+<!-- title: Sales Partner -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/sales_partner"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSales Partner</code></p>
+
+
+A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>partner_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Sales Partner Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>partner_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Partner Type
+                
+            </td>
+            <td>
+                <pre>
+Channel Partner
+Distributor
+Dealer
+Agent
+Retailer
+Implementation Partner
+Reseller</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>commission_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Commission Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>address_contacts</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Address & Contacts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>address_desc</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address Desc
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>address_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Address HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_desc</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Contact Desc
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>contact_html</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Contact HTML
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>partner_target_details_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Partner Target
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>targets</code></td>
+            <td >
+                Table</td>
+            <td >
+                Targets
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/target_detail">Target Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>distribution_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Distribution
+                <p class="text-muted small">
+                    Select Monthly Distribution to unevenly distribute targets across months.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>website</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>show_in_website</code></td>
+            <td >
+                Check</td>
+            <td >
+                Show In Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>section_break_17</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>logo</code></td>
+            <td >
+                Attach</td>
+            <td >
+                Logo
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>partner_website</code></td>
+            <td >
+                Data</td>
+            <td >
+                Partner's Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>column_break_20</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>page_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Page Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>section_break_22</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>introduction</code></td>
+            <td >
+                Text</td>
+            <td >
+                Introduction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>parent_website_route</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Parent Website Route
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.sales_partner.sales_partner</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalesPartner</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.website.website_generator.WebsiteGenerator</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_contacts" href="#get_contacts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_contacts</b>
+        <i class="text-muted">(self, nm)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_context" href="#get_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_context</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Load address and contacts in <code>__onload</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sms_center">SMS Center</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/sales_person.html b/erpnext/docs/current/models/setup/sales_person.html
new file mode 100644
index 0000000..af5b3fe
--- /dev/null
+++ b/erpnext/docs/current/models/setup/sales_person.html

@@ -0,0 +1,402 @@
+<!-- title: Sales Person -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/sales_person"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSales Person</code></p>
+
+
+All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>name_and_employee_id</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Name and Employee ID
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>sales_person_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Sales Person Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>parent_sales_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Sales Person
+                <p class="text-muted small">
+                    Select company name first.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>is_group</code></td>
+            <td >
+                Select</td>
+            <td >
+                Has Child Node
+                
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>employee</code></td>
+            <td >
+                Link</td>
+            <td >
+                Employee
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/employee">Employee</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                old_parent
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>target_details_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Person Targets
+                <p class="text-muted small">
+                    Set targets Item Group-wise for this Sales Person.</p>
+            </td>
+            <td>
+                <pre>icon-bullseye</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>targets</code></td>
+            <td >
+                Table</td>
+            <td >
+                Targets
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/target_detail">Target Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>distribution_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Distribution
+                <p class="text-muted small">
+                    Select Monthly Distribution to unevenly distribute targets across months.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>communications</code></td>
+            <td >
+                Table</td>
+            <td class="text-muted" title="Hidden">
+                Communications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/communication">Communication</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.sales_person.sales_person</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SalesPerson</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.utils.nestedset.NestedSet</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_email_id" href="#get_email_id" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_email_id</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_employee_id" href="#validate_employee_id" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_employee_id</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_detail">Maintenance Schedule Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_item">Maintenance Schedule Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit_purpose">Maintenance Visit Purpose</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_team">Sales Team</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/sms_parameter.html b/erpnext/docs/current/models/setup/sms_parameter.html
new file mode 100644
index 0000000..fdb61ff
--- /dev/null
+++ b/erpnext/docs/current/models/setup/sms_parameter.html

@@ -0,0 +1,87 @@
+<!-- title: SMS Parameter -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/sms_parameter"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabSMS Parameter</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>parameter</code></td>
+            <td >
+                Data</td>
+            <td >
+                Parameter
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sms_settings">SMS Settings</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/sms_settings.html b/erpnext/docs/current/models/setup/sms_settings.html
new file mode 100644
index 0000000..b4cc3b4
--- /dev/null
+++ b/erpnext/docs/current/models/setup/sms_settings.html

@@ -0,0 +1,302 @@
+<!-- title: SMS Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/sms_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>sms_gateway_url</code></td>
+            <td >
+                Data</td>
+            <td >
+                SMS Gateway URL
+                <p class="text-muted small">
+                    Eg. smsgateway.com/api/send_sms.cgi</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>message_parameter</code></td>
+            <td >
+                Data</td>
+            <td >
+                Message Parameter
+                <p class="text-muted small">
+                    Enter url parameter for message</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>receiver_parameter</code></td>
+            <td >
+                Data</td>
+            <td >
+                Receiver Parameter
+                <p class="text-muted small">
+                    Enter url parameter for receiver nos</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>sms_sender_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                SMS Sender Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>static_parameters_section</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>parameters</code></td>
+            <td >
+                Table</td>
+            <td >
+                Static Parameters
+                <p class="text-muted small">
+                    Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sms_parameter">SMS Parameter</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.sms_settings.sms_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SMSSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.create_sms_log" href="#erpnext.setup.doctype.sms_settings.sms_settings.create_sms_log" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>create_sms_log</b>
+        <i class="text-muted">(args, sent_to)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number" href="#erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>get_contact_number</b>
+        <i class="text-muted">(contact_name, value, key)</i>
+    </p>
+	<div class="docs-attr-desc"><p>returns mobile number of the contact</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.get_sender_name" href="#erpnext.setup.doctype.sms_settings.sms_settings.get_sender_name" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>get_sender_name</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p>returns name as SMS sender</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.scrub_gateway_url" href="#erpnext.setup.doctype.sms_settings.sms_settings.scrub_gateway_url" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>scrub_gateway_url</b>
+        <i class="text-muted">(url)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.send_request" href="#erpnext.setup.doctype.sms_settings.sms_settings.send_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>send_request</b>
+        <i class="text-muted">(gateway_url, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.setup.doctype.sms_settings.sms_settings.send_sms</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.send_sms" href="#erpnext.setup.doctype.sms_settings.sms_settings.send_sms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>send_sms</b>
+        <i class="text-muted">(receiver_list, msg, sender_name=)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.send_via_gateway" href="#erpnext.setup.doctype.sms_settings.sms_settings.send_via_gateway" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>send_via_gateway</b>
+        <i class="text-muted">(arg)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.setup.doctype.sms_settings.sms_settings.validate_receiver_nos" href="#erpnext.setup.doctype.sms_settings.sms_settings.validate_receiver_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.setup.doctype.sms_settings.sms_settings.<b>validate_receiver_nos</b>
+        <i class="text-muted">(receiver_list)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/supplier_type.html b/erpnext/docs/current/models/setup/supplier_type.html
new file mode 100644
index 0000000..45066a0
--- /dev/null
+++ b/erpnext/docs/current/models/setup/supplier_type.html

@@ -0,0 +1,174 @@
+<!-- title: Supplier Type -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/supplier_type"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSupplier Type</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>supplier_type</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>credit_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Credit Days
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>3</td>
+            <td ><code>default_payable_account</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Default Payable Account
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>accounts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Accounts
+                <p class="text-muted small">
+                    Mention if non-standard receivable account applicable</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/party_account">Party Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.supplier_type.supplier_type</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SupplierType</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/buying_settings">Buying Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/tax_rule">Tax Rule</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/target_detail.html b/erpnext/docs/current/models/setup/target_detail.html
new file mode 100644
index 0000000..c36f0ee
--- /dev/null
+++ b/erpnext/docs/current/models/setup/target_detail.html

@@ -0,0 +1,143 @@
+<!-- title: Target Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/target_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabTarget Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>target_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Target Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>target_amount</code></td>
+            <td >
+                Float</td>
+            <td >
+                Target  Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/terms_and_conditions.html b/erpnext/docs/current/models/setup/terms_and_conditions.html
new file mode 100644
index 0000000..cfb4a4f
--- /dev/null
+++ b/erpnext/docs/current/models/setup/terms_and_conditions.html

@@ -0,0 +1,224 @@
+<!-- title: Terms and Conditions -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/terms_and_conditions"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTerms and Conditions</code></p>
+
+
+Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.terms_and_conditions.terms_and_conditions</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>TermsandConditions</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/hr/offer_letter">Offer Letter</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/territory.html b/erpnext/docs/current/models/setup/territory.html
new file mode 100644
index 0000000..c3c2d10
--- /dev/null
+++ b/erpnext/docs/current/models/setup/territory.html

@@ -0,0 +1,446 @@
+<!-- title: Territory -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/territory"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabTerritory</code></p>
+
+
+Classification of Customers by region
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>territory_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Territory Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>parent_territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>is_group</code></td>
+            <td >
+                Select</td>
+            <td >
+                Has Child Node
+                <p class="text-muted small">
+                    Only leaf nodes are allowed in transaction</p>
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>territory_manager</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory Manager
+                <p class="text-muted small">
+                    For reference</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>lft</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                lft
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>rgt</code></td>
+            <td >
+                Int</td>
+            <td class="text-muted" title="Hidden">
+                rgt
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>old_parent</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                old_parent
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>target_details_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Territory Targets
+                <p class="text-muted small">
+                    Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>targets</code></td>
+            <td >
+                Table</td>
+            <td >
+                Targets
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/target_detail">Target Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>distribution_id</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Distribution
+                <p class="text-muted small">
+                    Select Monthly Distribution to unevenly distribute targets across months.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/monthly_distribution">Monthly Distribution</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.territory.territory</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Territory</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.utils.nestedset.NestedSet</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/c_form_invoice_detail">C-Form Invoice Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/selling_settings">Selling Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/uom.html b/erpnext/docs/current/models/setup/uom.html
new file mode 100644
index 0000000..8a0ccc5
--- /dev/null
+++ b/erpnext/docs/current/models/setup/uom.html

@@ -0,0 +1,348 @@
+<!-- title: UOM -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/uom"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabUOM</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>uom_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                UOM Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>must_be_whole_number</code></td>
+            <td >
+                Check</td>
+            <td >
+                Must be Whole Number
+                <p class="text-muted small">
+                    Check this to disallow fractions. (for Nos)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.setup.doctype.uom.uom</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>UOM</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/bin">Bin</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_explosion_item">BOM Explosion Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_item">BOM Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity_item">Opportunity Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip">Packing Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip_item">Packing Slip Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/product_bundle_item">Product Bundle Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item_supplied">Purchase Order Item Supplied</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_receipt_item_supplied">Purchase Receipt Item Supplied</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_ledger_entry">Stock Ledger Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_settings">Stock Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/uom_conversion_detail">UOM Conversion Detail</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/setup/website_item_group.html b/erpnext/docs/current/models/setup/website_item_group.html
new file mode 100644
index 0000000..8562a30
--- /dev/null
+++ b/erpnext/docs/current/models/setup/website_item_group.html

@@ -0,0 +1,84 @@
+<!-- title: Website Item Group -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/setup/doctype/website_item_group"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabWebsite Item Group</code></p>
+
+
+Cross Listing of Item in multiple groups
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/shopping_cart/index.html b/erpnext/docs/current/models/shopping_cart/index.html
new file mode 100644
index 0000000..3a75236
--- /dev/null
+++ b/erpnext/docs/current/models/shopping_cart/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module shopping_cart -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/shopping_cart"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for shopping_cart</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/buying/print_format/drop_shipping/__init__.py b/erpnext/docs/current/models/shopping_cart/index.txt
similarity index 100%
copy from erpnext/buying/print_format/drop_shipping/__init__.py
copy to erpnext/docs/current/models/shopping_cart/index.txt


diff --git a/erpnext/docs/current/models/shopping_cart/shopping_cart_settings.html b/erpnext/docs/current/models/shopping_cart/shopping_cart_settings.html
new file mode 100644
index 0000000..f685f38
--- /dev/null
+++ b/erpnext/docs/current/models/shopping_cart/shopping_cart_settings.html

@@ -0,0 +1,347 @@
+<!-- title: Shopping Cart Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/shopping_cart/doctype/shopping_cart_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Default settings for Shopping Cart
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>enabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Enable Shopping Cart
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>default_customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>quotation_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Quotation Series
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ShoppingCartSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_shipping_rules" href="#get_shipping_rules" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_shipping_rules</b>
+        <i class="text-muted">(self, shipping_territory)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_tax_master" href="#get_tax_master" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_tax_master</b>
+        <i class="text-muted">(self, billing_territory)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_exchange_rates_exist" href="#validate_exchange_rates_exist" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_exchange_rates_exist</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check if exchange rates exist for all Price List currencies (to company's currency)</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_tax_rule" href="#validate_tax_rule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_tax_rule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ShoppingCartSetupError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.check_shopping_cart_enabled" href="#erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.check_shopping_cart_enabled" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.<b>check_shopping_cart_enabled</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.get_shopping_cart_settings" href="#erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.get_shopping_cart_settings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.<b>get_shopping_cart_settings</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.is_cart_enabled" href="#erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.is_cart_enabled" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.<b>is_cart_enabled</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings" href="#erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.<b>validate_cart_settings</b>
+        <i class="text-muted">(doc, method)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/batch.html b/erpnext/docs/current/models/stock/batch.html
new file mode 100644
index 0000000..b0361a9
--- /dev/null
+++ b/erpnext/docs/current/models/stock/batch.html

@@ -0,0 +1,261 @@
+<!-- title: Batch -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/batch"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabBatch</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>batch_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Batch ID
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>item</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>expiry_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Expiry Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Batch Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.batch.batch</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Batch</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="item_has_batch_enabled" href="#item_has_batch_enabled" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>item_has_batch_enabled</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip_item">Packing Slip Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_receipt_item_supplied">Purchase Receipt Item Supplied</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/bin.html b/erpnext/docs/current/models/stock/bin.html
new file mode 100644
index 0000000..b3ebddf
--- /dev/null
+++ b/erpnext/docs/current/models/stock/bin.html

@@ -0,0 +1,328 @@
+<!-- title: Bin -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/bin"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabBin</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>reserved_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Reserved Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>ordered_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Ordered Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>indented_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity Requested for Purchase
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>planned_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Planned Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>projected_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Projected Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>ma_rate</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                Moving Average Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>fcfs_rate</code></td>
+            <td >
+                Float</td>
+            <td class="text-muted" title="Hidden">
+                FCFS Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Valuation Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>stock_value</code></td>
+            <td >
+                Float</td>
+            <td >
+                Stock Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.bin.bin</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Bin</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_first_sle" href="#get_first_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_first_sle</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_qty" href="#update_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_qty</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_stock" href="#update_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_stock</b>
+        <i class="text-muted">(self, args, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
new file mode 100644
index 0000000..bb10eed
--- /dev/null
+++ b/erpnext/docs/current/models/stock/delivery_note.html

@@ -0,0 +1,2062 @@
+<!-- title: Delivery Note -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/delivery_note"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabDelivery Note</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>delivery_to_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Delivery To
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>DN-
+DN-RET-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Billing Address Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Billing Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>shipping_address_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>shipping_address</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Shipping Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>po_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer's Purchase Order No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>po_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Customer's Purchase Order Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>is_return</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Return
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>return_against</code></td>
+            <td >
+                Link</td>
+            <td >
+                Return Against Delivery Note
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                <p class="text-muted small">
+                    Rate at which customer's currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>col_break23</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>selling_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td class="danger" title="Mandatory"><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td class="danger" title="Mandatory"><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                <p class="text-muted small">
+                    Rate at which Price list currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td class="danger" title="Mandatory"><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>32</td>
+            <td ><code>packing_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Packing List
+                
+            </td>
+            <td>
+                <pre>icon-suitcase</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>packed_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Packed Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>product_bundle_help</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Product Bundle Help
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>35</td>
+            <td ><code>section_break_31</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>column_break_33</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>41</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                <p class="text-muted small">
+                    If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges_template">Sales Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>column_break_39</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>shipping_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Shipping Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/shipping_rule">Shipping Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>45</td>
+            <td ><code>section_break_41</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_taxes_and_charges">Sales Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>48</td>
+            <td ><code>section_break_44</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>column_break_47</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>52</td>
+            <td ><code>section_break_49</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>column_break_51</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>57</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                <p class="text-muted small">
+                    In Words will be visible once you save the Delivery Note.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                <p class="text-muted small">
+                    In Words (Export) will be visible once you save the Delivery Note.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>65</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>68</td>
+            <td ><code>transporter_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Transporter Info
+                
+            </td>
+            <td>
+                <pre>icon-truck</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>transporter_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Transporter Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>col_break34</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>71</td>
+            <td ><code>lr_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Vehicle No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>lr_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Vehicle Dispatch Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>73</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>75</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>col_break21</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>78</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                <p class="text-muted small">
+                    Track this Delivery Note against any Project</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>campaign</code></td>
+            <td >
+                Link</td>
+            <td >
+                Campaign
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/campaign">Campaign</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>source</code></td>
+            <td >
+                Select</td>
+            <td >
+                Source
+                
+            </td>
+            <td>
+                <pre>
+Existing Customer
+Reference
+Advertisement
+Cold Calling
+Exhibition
+Supplier Reference
+Mass Mailing
+Customer's Vendor
+Campaign</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>column_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td class="danger" title="Mandatory"><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                <p class="text-muted small">
+                    Time at which items were delivered from warehouse</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>85</td>
+            <td ><code>printing_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>column_break_88</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>print_without_amount</code></td>
+            <td >
+                Check</td>
+            <td >
+                Print Without Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>90</td>
+            <td ><code>section_break_83</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Status
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>91</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Cancelled
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>92</td>
+            <td ><code>per_installed</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Installed
+                <p class="text-muted small">
+                    % of materials delivered against this Delivery Note</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>93</td>
+            <td ><code>installation_status</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Installation Status
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>94</td>
+            <td ><code>column_break_89</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>95</td>
+            <td ><code>to_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                To Warehouse
+                <p class="text-muted small">
+                    Required only for sample item.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>96</td>
+            <td ><code>excise_page</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Excise Page Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>97</td>
+            <td ><code>instructions</code></td>
+            <td >
+                Text</td>
+            <td >
+                Instructions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>98</td>
+            <td ><code>sales_team_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Commission
+                
+            </td>
+            <td>
+                <pre>icon-group</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>99</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>100</td>
+            <td ><code>column_break7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>101</td>
+            <td ><code>commission_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Commission Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>102</td>
+            <td ><code>total_commission</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Commission
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>103</td>
+            <td ><code>section_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Team
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>104</td>
+            <td ><code>sales_team</code></td>
+            <td >
+                Table</td>
+            <td >
+                Sales Team1
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_team">Sales Team</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.delivery_note.delivery_note</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>DeliveryNote</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.selling_controller.SellingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_print" href="#before_print" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_print</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="cancel_packing_slips" href="#cancel_packing_slips" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>cancel_packing_slips</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Cancel submitted packing slips related to this delivery note</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_credit_limit" href="#check_credit_limit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_credit_limit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_next_docstatus" href="#check_next_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_next_docstatus</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_actual_qty" href="#set_actual_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_actual_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="so_required" href="#so_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>so_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check in manage account if sales order required or not</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_current_stock" href="#update_current_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_current_stock</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_for_items" href="#validate_for_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_for_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_packed_qty" href="#validate_packed_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_packed_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate that if packed qty exists, it should be equal to qty</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_proj_cust" href="#validate_proj_cust" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_proj_cust</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check for does customer belong to same project as entered..</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.get_invoiced_qty_map" href="#erpnext.stock.doctype.delivery_note.delivery_note.get_invoiced_qty_map" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>get_invoiced_qty_map</b>
+        <i class="text-muted">(delivery_note)</i>
+    </p>
+	<div class="docs-attr-desc"><p>returns a map: {dn<em>detail: invoiced</em>qty}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.get_list_context" href="#erpnext.stock.doctype.delivery_note.delivery_note.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note" href="#erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>make_installation_note</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip" href="#erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>make_packing_slip</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice" href="#erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>make_sales_invoice</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.make_sales_return</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.make_sales_return" href="#erpnext.stock.doctype.delivery_note.delivery_note.make_sales_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>make_sales_return</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status" href="#erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.delivery_note.delivery_note.<b>update_delivery_note_status</b>
+        <i class="text-muted">(docname, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip">Packing Slip</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html
new file mode 100644
index 0000000..56e3837
--- /dev/null
+++ b/erpnext/docs/current/models/stock/delivery_note_item.html

@@ -0,0 +1,781 @@
+<!-- title: Delivery Note Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/delivery_note_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabDelivery Note Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>barcode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Barcode
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>customer_item_code</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer's Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Float</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>section_break_1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>section_break_25</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>column_break_28</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse and Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>target_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                To Warehouse (Optional)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Available Qty at From Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>actual_batch_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Available Batch Qty at From Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Expense Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>against_sales_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Against Sales Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>against_sales_invoice</code></td>
+            <td >
+                Link</td>
+            <td >
+                Against Sales Invoice
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>so_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Against Sales Order Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>si_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Against Sales Invoice Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>installed_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Installed Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/index.html b/erpnext/docs/current/models/stock/index.html
new file mode 100644
index 0000000..d5cbddb
--- /dev/null
+++ b/erpnext/docs/current/models/stock/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module stock -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for stock</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/stock/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/stock/index.txt


diff --git a/erpnext/docs/current/models/stock/item.html b/erpnext/docs/current/models/stock/item.html
new file mode 100644
index 0000000..fd40e50
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item.html

@@ -0,0 +1,2398 @@
+<!-- title: Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabItem</code></p>
+
+
+A Product or a Service that is bought, sold or kept in stock.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>name_and_description_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-flag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>ITEM-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>variant_of</code></td>
+            <td >
+                Link</td>
+            <td >
+                Variant Of
+                <p class="text-muted small">
+                    If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Unit of Measure
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>is_stock_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Maintain Stock
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td >
+                Image
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>section_break_11</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td >
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>barcode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Barcode
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>inventory</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Inventory
+                
+            </td>
+            <td>
+                <pre>icon-truck</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>default_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>end_of_life</code></td>
+            <td >
+                Date</td>
+            <td >
+                End of Life
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>has_batch_no</code></td>
+            <td >
+                Check</td>
+            <td >
+                Has Batch No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>has_serial_no</code></td>
+            <td >
+                Check</td>
+            <td >
+                Has Serial No
+                <p class="text-muted small">
+                    Selecting "Yes" will give a unique identity to each entity of this item which can be viewed in the Serial No master.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>serial_no_series</code></td>
+            <td >
+                Data</td>
+            <td >
+                Serial Number Series
+                <p class="text-muted small">
+                    Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>is_asset_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Fixed Asset Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>tolerance</code></td>
+            <td >
+                Float</td>
+            <td >
+                Allow over delivery or receipt upto this percent
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>valuation_method</code></td>
+            <td >
+                Select</td>
+            <td >
+                Valuation Method
+                
+            </td>
+            <td>
+                <pre>
+FIFO
+Moving Average</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>warranty_period</code></td>
+            <td >
+                Data</td>
+            <td >
+                Warranty Period (in days)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>net_weight</code></td>
+            <td >
+                Float</td>
+            <td >
+                Net Weight
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>weight_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Weight UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>reorder_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Auto re-order
+                
+            </td>
+            <td>
+                <pre>icon-rss</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>re_order_level</code></td>
+            <td >
+                Float</td>
+            <td >
+                Re-order Level
+                <p class="text-muted small">
+                    Automatically create Material Request if quantity falls below this level</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>re_order_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Re-order Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>apply_warehouse_wise_reorder_level</code></td>
+            <td >
+                Check</td>
+            <td >
+                Apply Warehouse-wise Reorder Level
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>section_break_31</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reorder level based on Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>reorder_levels</code></td>
+            <td >
+                Table</td>
+            <td >
+                Reorder level based on Warehouse
+                <p class="text-muted small">
+                    Will also apply for variants unless overrridden</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_reorder">Item Reorder</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>36</td>
+            <td ><code>variants_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Variants
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>has_variants</code></td>
+            <td >
+                Check</td>
+            <td >
+                Has Variants
+                <p class="text-muted small">
+                    If this item has variants, then it cannot be selected in sales orders etc.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>attributes</code></td>
+            <td >
+                Table</td>
+            <td class="text-muted" title="Hidden">
+                Attributes
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_variant_attribute">Item Variant Attribute</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>39</td>
+            <td ><code>purchase_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Purchase Details
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>is_purchase_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Purchase Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>min_order_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Minimum Order Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>lead_time_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Lead Time in days
+                <p class="text-muted small">
+                    Average time taken by the supplier to deliver</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>buying_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Buying Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Expense Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>unit_of_measure_conversion</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Unit of Measure Conversion
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>uoms</code></td>
+            <td >
+                Table</td>
+            <td >
+                UOMs
+                <p class="text-muted small">
+                    Will also apply for variants</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/uom_conversion_detail">UOM Conversion Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>last_purchase_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Last Purchase Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>48</td>
+            <td ><code>supplier_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Supplier Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>default_supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>delivered_by_supplier</code></td>
+            <td >
+                Check</td>
+            <td >
+                Delivered by Supplier (Drop Ship)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>manufacturer</code></td>
+            <td >
+                Data</td>
+            <td >
+                Manufacturer
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>manufacturer_part_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Manufacturer Part Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Item Code for Suppliers
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>supplier_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Supplier Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_supplier">Item Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>55</td>
+            <td ><code>sales_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Sales Details
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>is_sales_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Sales Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>is_service_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Service Item
+                <p class="text-muted small">
+                    Allow in Sales Order of type "Service"</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>publish_in_hub</code></td>
+            <td >
+                Check</td>
+            <td class="text-muted" title="Hidden">
+                Publish in Hub
+                <p class="text-muted small">
+                    Publish Item to hub.erpnext.com</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>synced_with_hub</code></td>
+            <td >
+                Check</td>
+            <td class="text-muted" title="Hidden">
+                Synced With Hub
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>income_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Income Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>61</td>
+            <td ><code>selling_cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Selling Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                Customer Item Codes
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>customer_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Customer Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_customer_detail">Item Customer Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>max_discount</code></td>
+            <td >
+                Float</td>
+            <td >
+                Max Discount (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>65</td>
+            <td ><code>item_tax_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Item Tax
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Taxes
+                <p class="text-muted small">
+                    Will also apply for variants</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_tax">Item Tax</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>67</td>
+            <td ><code>inspection_criteria</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Inspection Criteria
+                
+            </td>
+            <td>
+                <pre>icon-search</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td ><code>inspection_required</code></td>
+            <td >
+                Check</td>
+            <td >
+                Inspection Required
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>quality_parameters</code></td>
+            <td >
+                Table</td>
+            <td >
+                Quality Parameters
+                <p class="text-muted small">
+                    Will also apply to variants</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_quality_inspection_parameter">Item Quality Inspection Parameter</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>70</td>
+            <td ><code>manufacturing</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Manufacturing
+                
+            </td>
+            <td>
+                <pre>icon-cogs</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>71</td>
+            <td ><code>is_pro_applicable</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Production Order
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td ><code>is_sub_contracted_item</code></td>
+            <td >
+                Check</td>
+            <td >
+                Supply Raw Materials for Purchase
+                <p class="text-muted small">
+                    If subcontracted to a vendor</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>column_break_74</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>default_bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default BOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>75</td>
+            <td ><code>customer_code</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>76</td>
+            <td ><code>website_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Website
+                
+            </td>
+            <td>
+                <pre>icon-globe</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td ><code>show_in_website</code></td>
+            <td >
+                Check</td>
+            <td >
+                Show in Website
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td ><code>page_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Page Name
+                <p class="text-muted small">
+                    website page link</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>79</td>
+            <td ><code>weightage</code></td>
+            <td >
+                Int</td>
+            <td >
+                Weightage
+                <p class="text-muted small">
+                    Items with higher weightage will be shown higher</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>slideshow</code></td>
+            <td >
+                Link</td>
+            <td >
+                Slideshow
+                <p class="text-muted small">
+                    Show a slideshow at the top of the page</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/website/website_slideshow">Website Slideshow</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>website_image</code></td>
+            <td >
+                Attach</td>
+            <td >
+                Image
+                <p class="text-muted small">
+                    Item Image (if not slideshow)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>thumbnail</code></td>
+            <td >
+                Data</td>
+            <td >
+                Thumbnail
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>cb72</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>website_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Website Warehouse
+                <p class="text-muted small">
+                    Show "In Stock" or "Not in Stock" based on stock available in this warehouse.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>85</td>
+            <td ><code>website_item_groups</code></td>
+            <td >
+                Table</td>
+            <td >
+                Website Item Groups
+                <p class="text-muted small">
+                    List this Item in multiple groups on the website.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/website_item_group">Website Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>86</td>
+            <td ><code>sb72</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Website Specifications
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>copy_from_item_group</code></td>
+            <td >
+                Button</td>
+            <td >
+                Copy From Item Group
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>website_specifications</code></td>
+            <td >
+                Table</td>
+            <td >
+                Website Specifications
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_website_specification">Item Website Specification</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>web_long_description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Website Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>90</td>
+            <td ><code>parent_website_route</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Parent Website Route
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.item.item</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Item</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.website.website_generator.WebsiteGenerator</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_default_uom_in_conversion_factor_table" href="#add_default_uom_in_conversion_factor_table" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_default_uom_in_conversion_factor_table</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_insert" href="#before_insert" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_insert</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="cant_change" href="#cant_change" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>cant_change</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_active_boms" href="#check_for_active_boms" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_active_boms</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_sle_exists" href="#check_if_sle_exists" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_sle_exists</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_item_tax" href="#check_item_tax" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_item_tax</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check whether Tax Rate is not entered twice for same Tax Type</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_warehouse_is_set_for_stock_item" href="#check_warehouse_is_set_for_stock_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_warehouse_is_set_for_stock_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="copy_specification_from_item_group" href="#copy_specification_from_item_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>copy_specification_from_item_group</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="fill_customer_code" href="#fill_customer_code" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>fill_customer_code</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Append all the customer codes and insert into "customer_code" field of item table </p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_context" href="#get_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_context</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="make_thumbnail" href="#make_thumbnail" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>make_thumbnail</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Make a thumbnail of <code>website_image</code></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="recalculate_bin_qty" href="#recalculate_bin_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>recalculate_bin_qty</b>
+        <i class="text-muted">(self, newdn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_attribute_context" href="#set_attribute_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_attribute_context</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_disabled_attributes" href="#set_disabled_attributes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_disabled_attributes</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Disable selection options of attribute combinations that do not result in a variant</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_last_purchase_rate" href="#set_last_purchase_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_last_purchase_rate</b>
+        <i class="text-muted">(self, newdn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_variant_context" href="#set_variant_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_variant_context</b>
+        <i class="text-muted">(self, context)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_item_desc" href="#update_item_desc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_item_desc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_item_price" href="#update_item_price" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_item_price</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_template_item" href="#update_template_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_template_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Set Show in Website for Template Item if True for its Variant</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_template_tables" href="#update_template_tables" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_template_tables</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_variants" href="#update_variants" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_variants</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_attributes" href="#validate_attributes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_attributes</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_barcode" href="#validate_barcode" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_barcode</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_conversion_factor" href="#validate_conversion_factor" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_conversion_factor</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_has_variants" href="#validate_has_variants" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_has_variants</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item_type" href="#validate_item_type" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item_type</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_name_with_item_group" href="#validate_name_with_item_group" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_name_with_item_group</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_reorder_level" href="#validate_reorder_level" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_reorder_level</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_uom" href="#validate_uom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_uom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_variant_attributes" href="#validate_variant_attributes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_variant_attributes</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse_for_reorder" href="#validate_warehouse_for_reorder" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse_for_reorder</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>WarehouseNotSet</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item._msgprint" href="#erpnext.stock.doctype.item.item._msgprint" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>_msgprint</b>
+        <i class="text-muted">(msg, verbose)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.check_stock_uom_with_bin" href="#erpnext.stock.doctype.item.item.check_stock_uom_with_bin" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>check_stock_uom_with_bin</b>
+        <i class="text-muted">(item, stock_uom)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.get_last_purchase_details" href="#erpnext.stock.doctype.item.item.get_last_purchase_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>get_last_purchase_details</b>
+        <i class="text-muted">(item_code, doc_name=None, conversion_rate=1.0)</i>
+    </p>
+	<div class="docs-attr-desc"><p>returns last purchase details in stock uom</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.invalidate_cache_for_item" href="#erpnext.stock.doctype.item.item.invalidate_cache_for_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>invalidate_cache_for_item</b>
+        <i class="text-muted">(doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.validate_cancelled_item" href="#erpnext.stock.doctype.item.item.validate_cancelled_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>validate_cancelled_item</b>
+        <i class="text-muted">(item_code, docstatus=None, verbose=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.validate_end_of_life" href="#erpnext.stock.doctype.item.item.validate_end_of_life" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>validate_end_of_life</b>
+        <i class="text-muted">(item_code, end_of_life=None, disabled=None, verbose=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.item.item.validate_is_stock_item" href="#erpnext.stock.doctype.item.item.validate_is_stock_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.item.item.<b>validate_is_stock_item</b>
+        <i class="text-muted">(item_code, is_stock_item=None, verbose=1)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/bin">Bin</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_explosion_item">BOM Explosion Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom_item">BOM Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note_item">Installation Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_price">Item Price</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_item">Landed Cost Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_detail">Maintenance Schedule Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_item">Maintenance Schedule Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit_purpose">Maintenance Visit Purpose</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity_item">Opportunity Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip_item">Packing Slip Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/product_bundle">Product Bundle</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/product_bundle_item">Product Bundle Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation_item">Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_ledger_entry">Stock Ledger Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation_item">Stock Reconciliation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_attribute.html b/erpnext/docs/current/models/stock/item_attribute.html
new file mode 100644
index 0000000..d5870a6
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_attribute.html

@@ -0,0 +1,286 @@
+<!-- title: Item Attribute -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_attribute"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabItem Attribute</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>attribute_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Attribute Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>numeric_values</code></td>
+            <td >
+                Check</td>
+            <td >
+                Numeric Values
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>3</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>from_range</code></td>
+            <td >
+                Float</td>
+            <td >
+                From Range
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>increment</code></td>
+            <td >
+                Float</td>
+            <td >
+                Increment
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>to_range</code></td>
+            <td >
+                Float</td>
+            <td >
+                To Range
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_5</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>item_attribute_values</code></td>
+            <td >
+                Table</td>
+            <td >
+                Item Attribute Values
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_attribute_value">Item Attribute Value</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.item_attribute.item_attribute</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemAttribute</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_attribute_values" href="#validate_attribute_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_attribute_values</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_duplication" href="#validate_duplication" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_duplication</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_numeric" href="#validate_numeric" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_numeric</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemAttributeIncrementError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_variant">Item Variant</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_variant_attribute">Item Variant Attribute</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_attribute_value.html b/erpnext/docs/current/models/stock/item_attribute_value.html
new file mode 100644
index 0000000..f960e71
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_attribute_value.html

@@ -0,0 +1,88 @@
+<!-- title: Item Attribute Value -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_attribute_value"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Attribute Value</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>attribute_value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Attribute Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>abbr</code></td>
+            <td >
+                Data</td>
+            <td >
+                Abbreviation
+                <p class="text-muted small">
+                    This will be appended to the Item Code of the variant. For example, if your abbreviation is "SM", and the item code is "T-SHIRT", the item code of the variant will be "T-SHIRT-SM"</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_attribute">Item Attribute</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_customer_detail.html b/erpnext/docs/current/models/stock/item_customer_detail.html
new file mode 100644
index 0000000..cc85202
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_customer_detail.html

@@ -0,0 +1,96 @@
+<!-- title: Item Customer Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_customer_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Customer Detail</code></p>
+
+
+For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>customer_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>ref_code</code></td>
+            <td >
+                Data</td>
+            <td >
+                Ref Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_price.html b/erpnext/docs/current/models/stock/item_price.html
new file mode 100644
index 0000000..8f83c6a
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_price.html

@@ -0,0 +1,363 @@
+<!-- title: Item Price -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_price"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabItem Price</code></p>
+
+
+Multiple Item prices.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>price_list_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                <pre>icon-tags</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>buying</code></td>
+            <td >
+                Check</td>
+            <td >
+                Buying
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>selling</code></td>
+            <td >
+                Check</td>
+            <td >
+                Selling
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>item_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>col_br_1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>item_description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Item Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>section_break_12</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>bulk_import_help</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Bulk Import Help
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.item_price.item_price</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemPrice</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_duplicate_item" href="#check_duplicate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_duplicate_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_item_details" href="#update_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_item_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_price_list_details" href="#update_price_list_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_price_list_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item" href="#validate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_price_list" href="#validate_price_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_price_list</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>ItemPriceDuplicateItem</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_quality_inspection_parameter.html b/erpnext/docs/current/models/stock/item_quality_inspection_parameter.html
new file mode 100644
index 0000000..3bbc2ca
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_quality_inspection_parameter.html

@@ -0,0 +1,87 @@
+<!-- title: Item Quality Inspection Parameter -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_quality_inspection_parameter"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Quality Inspection Parameter</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>specification</code></td>
+            <td >
+                Data</td>
+            <td >
+                Parameter
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Acceptance Criteria
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_reorder.html b/erpnext/docs/current/models/stock/item_reorder.html
new file mode 100644
index 0000000..6b4e051
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_reorder.html

@@ -0,0 +1,123 @@
+<!-- title: Item Reorder -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_reorder"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Reorder</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>warehouse_reorder_level</code></td>
+            <td >
+                Float</td>
+            <td >
+                Re-order Level
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>warehouse_reorder_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Re-order Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>material_request_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Material Request Type
+                
+            </td>
+            <td>
+                <pre>Purchase
+Transfer</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_supplier.html b/erpnext/docs/current/models/stock/item_supplier.html
new file mode 100644
index 0000000..9d46e27
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_supplier.html

@@ -0,0 +1,96 @@
+<!-- title: Item Supplier -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_supplier"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Supplier</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>supplier_part_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Part Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_tax.html b/erpnext/docs/current/models/stock/item_tax.html
new file mode 100644
index 0000000..2b6e077
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_tax.html

@@ -0,0 +1,96 @@
+<!-- title: Item Tax -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_tax"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Tax</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>tax_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Tax
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>tax_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Tax Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_variant.html b/erpnext/docs/current/models/stock/item_variant.html
new file mode 100644
index 0000000..3e05625
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_variant.html

@@ -0,0 +1,84 @@
+<!-- title: Item Variant -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_variant"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Variant</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_attribute</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Attribute
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_attribute">Item Attribute</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>item_attribute_value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Attribute Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_variant_attribute.html b/erpnext/docs/current/models/stock/item_variant_attribute.html
new file mode 100644
index 0000000..171e5f9
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_variant_attribute.html

@@ -0,0 +1,180 @@
+<!-- title: Item Variant Attribute -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_variant_attribute"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Variant Attribute</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>attribute</code></td>
+            <td >
+                Link</td>
+            <td >
+                Attribute
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_attribute">Item Attribute</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>attribute_value</code></td>
+            <td >
+                Data</td>
+            <td >
+                Attribute Value
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>numeric_values</code></td>
+            <td >
+                Check</td>
+            <td >
+                Numeric Values
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>from_range</code></td>
+            <td >
+                Float</td>
+            <td >
+                From Range
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>increment</code></td>
+            <td >
+                Float</td>
+            <td >
+                Increment
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break_8</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>to_range</code></td>
+            <td >
+                Float</td>
+            <td >
+                To Range
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/item_website_specification.html b/erpnext/docs/current/models/stock/item_website_specification.html
new file mode 100644
index 0000000..59a9921
--- /dev/null
+++ b/erpnext/docs/current/models/stock/item_website_specification.html

@@ -0,0 +1,94 @@
+<!-- title: Item Website Specification -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/item_website_specification"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabItem Website Specification</code></p>
+
+
+Table for Item that will be shown in Web Site
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>label</code></td>
+            <td >
+                Data</td>
+            <td >
+                Label
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/landed_cost_item.html b/erpnext/docs/current/models/stock/landed_cost_item.html
new file mode 100644
index 0000000..e609577
--- /dev/null
+++ b/erpnext/docs/current/models/stock/landed_cost_item.html

@@ -0,0 +1,195 @@
+<!-- title: Landed Cost Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/landed_cost_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabLanded Cost Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>purchase_receipt</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Receipt
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>applicable_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Applicable Charges
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>purchase_receipt_item</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Receipt Item
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/landed_cost_purchase_receipt.html b/erpnext/docs/current/models/stock/landed_cost_purchase_receipt.html
new file mode 100644
index 0000000..8e9c49e
--- /dev/null
+++ b/erpnext/docs/current/models/stock/landed_cost_purchase_receipt.html

@@ -0,0 +1,141 @@
+<!-- title: Landed Cost Purchase Receipt -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/landed_cost_purchase_receipt"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabLanded Cost Purchase Receipt</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>purchase_receipt</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Receipt
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/landed_cost_taxes_and_charges.html b/erpnext/docs/current/models/stock/landed_cost_taxes_and_charges.html
new file mode 100644
index 0000000..549a1e8
--- /dev/null
+++ b/erpnext/docs/current/models/stock/landed_cost_taxes_and_charges.html

@@ -0,0 +1,108 @@
+<!-- title: Landed Cost Taxes and Charges -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/landed_cost_taxes_and_charges"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabLanded Cost Taxes and Charges</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/landed_cost_voucher.html b/erpnext/docs/current/models/stock/landed_cost_voucher.html
new file mode 100644
index 0000000..67ae1a1
--- /dev/null
+++ b/erpnext/docs/current/models/stock/landed_cost_voucher.html

@@ -0,0 +1,426 @@
+<!-- title: Landed Cost Voucher -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/landed_cost_voucher"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabLanded Cost Voucher</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>purchase_receipts</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Receipts
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_purchase_receipt">Landed Cost Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>get_items_from_purchase_receipts</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items From Purchase Receipts
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Receipt Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_item">Landed Cost Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_taxes_and_charges">Landed Cost Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>distribute_charges_based_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Distribute Charges Based On
+                
+            </td>
+            <td>
+                <pre>
+Qty
+Amount</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>sec_break2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>landed_cost_help</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Landed Cost Help
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.landed_cost_voucher.landed_cost_voucher</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>LandedCostVoucher</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_mandatory" href="#check_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items_from_purchase_receipts" href="#get_items_from_purchase_receipts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items_from_purchase_receipts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_applicable_charges_for_item" href="#set_applicable_charges_for_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_applicable_charges_for_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_taxes_and_charges" href="#set_total_taxes_and_charges" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_taxes_and_charges</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_landed_cost" href="#update_landed_cost" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_landed_cost</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_rate_in_serial_no" href="#update_rate_in_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_rate_in_serial_no</b>
+        <i class="text-muted">(self, purchase_receipt)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_purchase_receipts" href="#validate_purchase_receipts" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_purchase_receipts</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_voucher">Landed Cost Voucher</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/material_request.html b/erpnext/docs/current/models/stock/material_request.html
new file mode 100644
index 0000000..2751fe8
--- /dev/null
+++ b/erpnext/docs/current/models/stock/material_request.html

@@ -0,0 +1,735 @@
+<!-- title: Material Request -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/material_request"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabMaterial Request</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>type_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-pushpin</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>material_request_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Type
+                
+            </td>
+            <td>
+                <pre>Purchase
+Material Transfer
+Material Issue</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>MREQ-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>get_items_from_product_bundle</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Product Bundle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>requested_by</code></td>
+            <td >
+                Data</td>
+            <td >
+                Requested For
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Transaction Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Stopped
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>per_ordered</code></td>
+            <td >
+                Percent</td>
+            <td >
+                % Ordered
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>printing_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions Content
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.material_request.material_request</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>MaterialRequest</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_already_pulled" href="#check_if_already_pulled" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_already_pulled</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_modified_date" href="#check_modified_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_modified_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_completed_qty" href="#update_completed_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_completed_qty</b>
+        <i class="text-muted">(self, mr_items=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_requested_qty" href="#update_requested_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_requested_qty</b>
+        <i class="text-muted">(self, mr_item_rows=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p>update requested qty (before ordered_qty is updated)</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_qty_against_so" href="#validate_qty_against_so" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_qty_against_so</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_schedule_date" href="#validate_schedule_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_schedule_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.get_material_requests_based_on_supplier" href="#erpnext.stock.doctype.material_request.material_request.get_material_requests_based_on_supplier" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>get_material_requests_based_on_supplier</b>
+        <i class="text-muted">(supplier)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.material_request.material_request.make_purchase_order</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.make_purchase_order" href="#erpnext.stock.doctype.material_request.material_request.make_purchase_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>make_purchase_order</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier" href="#erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>make_purchase_order_based_on_supplier</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.material_request.material_request.make_stock_entry</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.make_stock_entry" href="#erpnext.stock.doctype.material_request.material_request.make_stock_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>make_stock_entry</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.material_request.material_request.make_supplier_quotation</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.make_supplier_quotation" href="#erpnext.stock.doctype.material_request.material_request.make_supplier_quotation" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>make_supplier_quotation</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.set_missing_values" href="#erpnext.stock.doctype.material_request.material_request.set_missing_values" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>set_missing_values</b>
+        <i class="text-muted">(source, target_doc)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty" href="#erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>update_completed_and_requested_qty</b>
+        <i class="text-muted">(stock_entry, method)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.material_request.material_request.update_item" href="#erpnext.stock.doctype.material_request.material_request.update_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.material_request.material_request.<b>update_item</b>
+        <i class="text-muted">(obj, target, source_parent)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
new file mode 100644
index 0000000..960226e
--- /dev/null
+++ b/erpnext/docs/current/models/stock/material_request_item.html

@@ -0,0 +1,407 @@
+<!-- title: Material Request Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/material_request_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMaterial Request Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>9</td>
+            <td ><code>quantity_and_warehouse</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Warehouse
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                For Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td class="danger" title="Mandatory"><code>schedule_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Required Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td >
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>lead_time_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Lead Time Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>sales_order_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Order No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>min_order_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Min Order Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>projected_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Projected Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>ordered_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Completed Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/packed_item.html b/erpnext/docs/current/models/stock/packed_item.html
new file mode 100644
index 0000000..76741ce
--- /dev/null
+++ b/erpnext/docs/current/models/stock/packed_item.html

@@ -0,0 +1,395 @@
+<!-- title: Packed Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/packed_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPacked Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>parent_item</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_6</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                From Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>target_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                To Warehouse (Optional)
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break_9</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>section_break_9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break_11</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>section_break_13</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>projected_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Projected Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break_16</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Prevdoc DocType
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>parent_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Parent Detail docname
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/packing_slip.html b/erpnext/docs/current/models/stock/packing_slip.html
new file mode 100644
index 0000000..6679bc3
--- /dev/null
+++ b/erpnext/docs/current/models/stock/packing_slip.html

@@ -0,0 +1,592 @@
+<!-- title: Packing Slip -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/packing_slip"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPacking Slip</code></p>
+
+
+Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>packing_slip_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>delivery_note</code></td>
+            <td >
+                Link</td>
+            <td >
+                Delivery Note
+                <p class="text-muted small">
+                    Indicates that the package is a part of this delivery (Only Draft)</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>PS-</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>from_case_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                From Package No.
+                <p class="text-muted small">
+                    Identification of the package for the delivery (for print)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>to_case_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                To Package No.
+                <p class="text-muted small">
+                    If more than one package of the same type (for print)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>package_item_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>get_items</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip_item">Packing Slip Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>14</td>
+            <td ><code>package_weight_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Package Weight Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>net_weight_pkg</code></td>
+            <td >
+                Float</td>
+            <td >
+                Net Weight
+                <p class="text-muted small">
+                    The net weight of this package. (calculated automatically as sum of net weight of items)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>net_weight_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Net Weight UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>gross_weight_pkg</code></td>
+            <td >
+                Float</td>
+            <td >
+                Gross Weight
+                <p class="text-muted small">
+                    The gross weight of the package. Usually net weight + packaging material weight. (for print)</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>gross_weight_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Gross Weight UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>letter_head_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>22</td>
+            <td ><code>misc_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip">Packing Slip</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.packing_slip.packing_slip</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PackingSlip</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_details_for_packing" href="#get_details_for_packing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_details_for_packing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns
+* 'Delivery Note Items' query result as a list of dict
+* Item Quantity dict of current packing slip doc
+* No. of Cases of this packing slip</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items" href="#get_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_recommended_case_no" href="#get_recommended_case_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_recommended_case_no</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns the next case no. for a new packing slip for a delivery
+note</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="recommend_new_qty" href="#recommend_new_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>recommend_new_qty</b>
+        <i class="text-muted">(self, item, ps_item_qty, no_of_cases)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Recommend a new quantity and raise a validation exception</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_item_details" href="#update_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_item_details</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Fill empty columns in Packing Slip Item</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><ul>
+<li>Validate existence of submitted Delivery Note</li>
+<li>Case nos do not overlap</li>
+<li>Check if packed qty doesn't exceed actual qty of delivery note</li>
+</ul>
+
+<p>It is necessary to validate case nos before checking quantity</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_case_nos" href="#validate_case_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_case_nos</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate if case nos overlap. If they do, recommend next case no.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_delivery_note" href="#validate_delivery_note" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_delivery_note</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validates if delivery note has status as draft</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_items_mandatory" href="#validate_items_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_items_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_qty" href="#validate_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check packed qty across packing slips and delivery note</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.packing_slip.packing_slip.item_details" href="#erpnext.stock.doctype.packing_slip.packing_slip.item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.packing_slip.packing_slip.<b>item_details</b>
+        <i class="text-muted">(doctype, txt, searchfield, start, page_len, filters)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip">Packing Slip</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/packing_slip_item.html b/erpnext/docs/current/models/stock/packing_slip_item.html
new file mode 100644
index 0000000..4581510
--- /dev/null
+++ b/erpnext/docs/current/models/stock/packing_slip_item.html

@@ -0,0 +1,219 @@
+<!-- title: Packing Slip Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/packing_slip_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPacking Slip Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>net_weight</code></td>
+            <td >
+                Float</td>
+            <td >
+                Net Weight
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>weight_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Weight UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>dn_detail</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                DN Detail
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packing_slip">Packing Slip</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html
new file mode 100644
index 0000000..4d127cd
--- /dev/null
+++ b/erpnext/docs/current/models/stock/price_list.html

@@ -0,0 +1,426 @@
+<!-- title: Price List -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/price_list"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPrice List</code></p>
+
+
+Price List Master
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>enabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Enabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>sb_1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>price_list_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Price List Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>buying</code></td>
+            <td >
+                Check</td>
+            <td >
+                Buying
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>selling</code></td>
+            <td >
+                Check</td>
+            <td >
+                Selling
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>column_break_3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>countries</code></td>
+            <td >
+                Table</td>
+            <td >
+                Applicable for Countries
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list_country">Price List Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.price_list.price_list</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PriceList</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_default_if_missing" href="#set_default_if_missing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_default_if_missing</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_item_price" href="#update_item_price" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_item_price</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/buying_settings">Buying Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_price">Item Price</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/selling_settings">Selling Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/shopping_cart/shopping_cart_settings">Shopping Cart Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/price_list_country.html b/erpnext/docs/current/models/stock/price_list_country.html
new file mode 100644
index 0000000..1854b69
--- /dev/null
+++ b/erpnext/docs/current/models/stock/price_list_country.html

@@ -0,0 +1,84 @@
+<!-- title: Price List Country -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/price_list_country"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPrice List Country</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
new file mode 100644
index 0000000..4dac156
--- /dev/null
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html

@@ -0,0 +1,1837 @@
+<!-- title: Purchase Receipt -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/purchase_receipt"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Receipt</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>supplier_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>PREC-
+PREC-RET-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                <p class="text-muted small">
+                    Time at which materials were received</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>is_return</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Return
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>return_against</code></td>
+            <td >
+                Link</td>
+            <td >
+                Return Against Purchase Receipt
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>currency_and_price_list</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Currency and Price List
+                
+            </td>
+            <td>
+                <pre>icon-tag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td class="danger" title="Mandatory"><code>conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Exchange Rate
+                <p class="text-muted small">
+                    Rate at which supplier's currency is converted to company's base currency</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>buying_price_list</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/price_list">Price List</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>price_list_currency</code></td>
+            <td >
+                Link</td>
+            <td >
+                Price List Currency
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/currency">Currency</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>plc_conversion_rate</code></td>
+            <td >
+                Float</td>
+            <td >
+                Price List Exchange Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>ignore_pricing_rule</code></td>
+            <td >
+                Check</td>
+            <td >
+                Ignore Pricing Rule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>get_current_stock</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Current Stock
+                
+            </td>
+            <td>
+                <pre>get_current_stock</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>get_items_from_product_bundle</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items from Product Bundle
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>28</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td class="danger" title="Mandatory"><code>base_net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break_27</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>net_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>taxes_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                <p class="text-muted small">
+                    Add / Edit Taxes and Charges</p>
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>taxes_and_charges</code></td>
+            <td >
+                Link</td>
+            <td >
+                Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges_template">Purchase Taxes and Charges Template</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>taxes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purchase Taxes and Charges
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_taxes_and_charges">Purchase Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>other_charges_calculation</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Taxes and Charges Calculation
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>38</td>
+            <td ><code>totals</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-money</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>base_taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>base_taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>base_total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>taxes_and_charges_added</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Added
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>taxes_and_charges_deducted</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Taxes and Charges Deducted
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>total_taxes_and_charges</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Taxes and Charges
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>46</td>
+            <td ><code>section_break_42</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Discount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>apply_discount_on</code></td>
+            <td >
+                Select</td>
+            <td >
+                Apply Additional Discount On
+                
+            </td>
+            <td>
+                <pre>
+Grand Total
+Net Total</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>column_break_44</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>base_discount_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Discount Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>51</td>
+            <td ><code>section_break_46</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>base_grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>base_in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words (Company Currency)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>base_rounded_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rounded Total (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>column_break_50</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>grand_total</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Grand Total
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>in_words</code></td>
+            <td >
+                Data</td>
+            <td >
+                In Words
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>58</td>
+            <td ><code>terms_section_break</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td>
+                <pre>icon-legal</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>tc_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Terms
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/terms_and_conditions">Terms and Conditions</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>terms</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Terms and Conditions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>61</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Details
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>62</td>
+            <td ><code>supplier_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>63</td>
+            <td ><code>column_break_57</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>64</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>65</td>
+            <td ><code>raw_material_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Raw Materials Supplied
+                
+            </td>
+            <td>
+                <pre>icon-table</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>66</td>
+            <td ><code>is_subcontracted</code></td>
+            <td >
+                Select</td>
+            <td >
+                Raw Materials Supplied
+                
+            </td>
+            <td>
+                <pre>No
+Yes</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>67</td>
+            <td ><code>supplier_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>68</td>
+            <td ><code>supplied_items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Supplied Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_receipt_item_supplied">Purchase Receipt Item Supplied</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>69</td>
+            <td ><code>bill_no</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Bill No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>70</td>
+            <td ><code>bill_date</code></td>
+            <td >
+                Date</td>
+            <td class="text-muted" title="Hidden">
+                Bill Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>71</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>72</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Cancelled
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>73</td>
+            <td ><code>rejected_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Rejected Warehouse
+                <p class="text-muted small">
+                    Warehouse where you are maintaining stock of rejected items</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>74</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>75</td>
+            <td ><code>range</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Range
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>76</td>
+            <td ><code>column_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>77</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>78</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>79</td>
+            <td ><code>printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>80</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>81</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>82</td>
+            <td ><code>other_details</code></td>
+            <td >
+                HTML</td>
+            <td class="text-muted" title="Hidden">
+                Other Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>83</td>
+            <td ><code>instructions</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Instructions
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>84</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>85</td>
+            <td ><code>transporter_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Transporter Details
+                
+            </td>
+            <td>
+                <pre>icon-truck</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>86</td>
+            <td ><code>transporter_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Transporter Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>87</td>
+            <td ><code>column_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>88</td>
+            <td ><code>lr_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Vehicle Number
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>89</td>
+            <td ><code>lr_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Vehicle Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.purchase_receipt.purchase_receipt</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>PurchaseReceipt</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.buying_controller.BuyingController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="bk_flush_supp_wh" href="#bk_flush_supp_wh" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>bk_flush_supp_wh</b>
+        <i class="text-muted">(self, sl_entries)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_for_stopped_or_closed_status" href="#check_for_stopped_or_closed_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_for_stopped_or_closed_status</b>
+        <i class="text-muted">(self, pc_obj)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_next_docstatus" href="#check_next_docstatus" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_next_docstatus</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_already_received_qty" href="#get_already_received_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_already_received_qty</b>
+        <i class="text-muted">(self, po, po_detail)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_current_stock" href="#get_current_stock" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_current_stock</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_entries" href="#get_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_entries</b>
+        <i class="text-muted">(self, warehouse_account=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_po_qty_and_warehouse" href="#get_po_qty_and_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_po_qty_and_warehouse</b>
+        <i class="text-muted">(self, po_detail)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_rate" href="#get_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_rate</b>
+        <i class="text-muted">(self, arg)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="po_required" href="#po_required" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>po_required</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_landed_cost_voucher_amount" href="#set_landed_cost_voucher_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_landed_cost_voucher_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_ordered_qty" href="#update_ordered_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_ordered_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_stock_ledger" href="#update_stock_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_stock_ledger</b>
+        <i class="text-muted">(self, allow_negative_stock=False, via_landed_cost_voucher=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_accepted_rejected_qty" href="#validate_accepted_rejected_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_accepted_rejected_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_inspection" href="#validate_inspection" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_inspection</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_purchase_return" href="#validate_purchase_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_purchase_return</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_rejected_warehouse" href="#validate_rejected_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_rejected_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_previous_doc" href="#validate_with_previous_doc" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_previous_doc</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.get_invoiced_qty_map" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.get_invoiced_qty_map" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>get_invoiced_qty_map</b>
+        <i class="text-muted">(purchase_receipt)</i>
+    </p>
+	<div class="docs-attr-desc"><p>returns a map: {pr<em>detail: invoiced</em>qty}</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>make_purchase_invoice</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_return" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>make_purchase_return</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>update_purchase_receipt_status</b>
+        <i class="text-muted">(docname, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_item">Landed Cost Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_purchase_receipt">Landed Cost Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice_item">Purchase Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
new file mode 100644
index 0000000..f457977
--- /dev/null
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html

@@ -0,0 +1,939 @@
+<!-- title: Purchase Receipt Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/purchase_receipt_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabPurchase Receipt Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>barcode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Barcode
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>section_break_4</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>received_and_accepted</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Received and Accepted
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>received_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Recd Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Accepted Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>rejected_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Rejected Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td class="danger" title="Mandatory"><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td >
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>rate_and_amount</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Rate and Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>discount_percentage</code></td>
+            <td >
+                Percent</td>
+            <td >
+                Discount on Price List Rate (%)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>base_price_list_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Price List Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td class="danger" title="Mandatory"><code>base_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>base_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>pricing_rule</code></td>
+            <td >
+                Link</td>
+            <td >
+                Pricing Rule
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pricing_rule">Pricing Rule</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>section_break_29</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount
+                
+            </td>
+            <td>
+                <pre>currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>column_break_32</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>base_net_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Rate (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>base_net_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Net Amount (Company Currency)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>37</td>
+            <td ><code>warehouse_and_reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse and Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Accepted Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>rejected_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Rejected Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>qa_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Quality Inspection
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>schedule_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Required By
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>44</td>
+            <td ><code>stock_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty as per Stock UOM
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Prevdoc Doctype
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>47</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Purchase Order Item No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>bom</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>rejected_serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Rejected Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>rm_supp_cost</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Raw Materials Supplied Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>56</td>
+            <td ><code>item_tax_amount</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>57</td>
+            <td ><code>landed_cost_voucher_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Landed Cost Voucher Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>58</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Currency</td>
+            <td class="text-muted" title="Hidden">
+                Valuation Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>59</td>
+            <td ><code>item_tax_rate</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Item Tax Rate
+                <p class="text-muted small">
+                    Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>60</td>
+            <td ><code>page_break</code></td>
+            <td >
+                Check</td>
+            <td >
+                Page Break
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/serial_no.html b/erpnext/docs/current/models/stock/serial_no.html
new file mode 100644
index 0000000..67dbcd1
--- /dev/null
+++ b/erpnext/docs/current/models/stock/serial_no.html

@@ -0,0 +1,1105 @@
+<!-- title: Serial No -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/serial_no"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSerial No</code></p>
+
+
+Distinct unit of an Item
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>serial_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                <p class="text-muted small">
+                    Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>brand</code></td>
+            <td >
+                Link</td>
+            <td >
+                Brand
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>purchase_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Purchase / Manufacture Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>purchase_document_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Creation Document Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>purchase_document_no</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Creation Document No
+                
+            </td>
+            <td>
+                <pre>purchase_document_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>purchase_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Creation Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>purchase_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Creation Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>purchase_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Incoming Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>column_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>21</td>
+            <td ><code>delivery_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Delivery Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>delivery_document_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Delivery Document Type
+                
+            </td>
+            <td>
+                <pre>
+Delivery Note
+Sales Invoice
+Stock Entry
+Purchase Receipt</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>delivery_document_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Delivery Document No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>delivery_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Delivery Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>delivery_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Delivery Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>is_cancelled</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Is Cancelled
+                
+            </td>
+            <td>
+                <pre>
+Yes
+No</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>column_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>30</td>
+            <td ><code>warranty_amc_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warranty / AMC Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>column_break6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>maintenance_status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Maintenance Status
+                
+            </td>
+            <td>
+                <pre>
+Under Warranty
+Out of Warranty
+Under AMC
+Out of AMC</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>warranty_period</code></td>
+            <td >
+                Int</td>
+            <td >
+                Warranty Period (Days)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>column_break7</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>warranty_expiry_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Warranty Expiry Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>amc_expiry_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                AMC Expiry Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>37</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>serial_no_details</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Serial No Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.serial_no.serial_no</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNo</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.stock_controller.StockController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, old, new, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>rename serial_no text fields</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, old, new, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_last_sle" href="#get_last_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_last_sle</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_stock_ledger_entries" href="#get_stock_ledger_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_stock_ledger_entries</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_stock_ledger_entry" href="#on_stock_ledger_entry" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_stock_ledger_entry</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_maintenance_status" href="#set_maintenance_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_maintenance_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_purchase_details" href="#set_purchase_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_purchase_details</b>
+        <i class="text-muted">(self, purchase_sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_sales_details" href="#set_sales_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_sales_details</b>
+        <i class="text-muted">(self, delivery_sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item" href="#validate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate whether serial no is required for this item</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoCannotCannotChangeError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoCannotCreateDirectError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoDuplicateError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoItemError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoNotExistsError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoNotRequiredError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoQtyError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoRequiredError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SerialNoWarehouseError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.allow_serial_nos_with_different_item" href="#erpnext.stock.doctype.serial_no.serial_no.allow_serial_nos_with_different_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>allow_serial_nos_with_different_item</b>
+        <i class="text-muted">(sle_serial_no, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Allows same serial nos for raw materials and finished goods 
+in Manufacture / Repack type Stock Entry</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.get_item_details" href="#erpnext.stock.doctype.serial_no.serial_no.get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>get_item_details</b>
+        <i class="text-muted">(item_code)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.get_serial_nos" href="#erpnext.stock.doctype.serial_no.serial_no.get_serial_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>get_serial_nos</b>
+        <i class="text-muted">(serial_no)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.make_serial_no" href="#erpnext.stock.doctype.serial_no.serial_no.make_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>make_serial_no</b>
+        <i class="text-muted">(serial_no, sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.process_serial_no" href="#erpnext.stock.doctype.serial_no.serial_no.process_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>process_serial_no</b>
+        <i class="text-muted">(sle)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.update_serial_nos" href="#erpnext.stock.doctype.serial_no.serial_no.update_serial_nos" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>update_serial_nos</b>
+        <i class="text-muted">(sle, item_det)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.update_serial_nos_after_submit" href="#erpnext.stock.doctype.serial_no.serial_no.update_serial_nos_after_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>update_serial_nos_after_submit</b>
+        <i class="text-muted">(controller, parentfield)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.serial_no.serial_no.validate_serial_no" href="#erpnext.stock.doctype.serial_no.serial_no.validate_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.serial_no.serial_no.<b>validate_serial_no</b>
+        <i class="text-muted">(sle, item_det)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/quality_inspection">Quality Inspection</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_entry.html b/erpnext/docs/current/models/stock/stock_entry.html
new file mode 100644
index 0000000..64d31eb
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_entry.html

@@ -0,0 +1,1613 @@
+<!-- title: Stock Entry -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_entry"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabStock Entry</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>title</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Title
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>STE-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>purpose</code></td>
+            <td >
+                Select</td>
+            <td >
+                Purpose
+                
+            </td>
+            <td>
+                <pre>Material Issue
+Material Receipt
+Material Transfer
+Material Transfer for Manufacture
+Manufacture
+Repack
+Subcontract</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>production_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Production Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>purchase_order</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Order
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>delivery_note_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Delivery Note No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>sales_invoice_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Invoice No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>purchase_receipt_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Purchase Receipt No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>from_bom</code></td>
+            <td >
+                Check</td>
+            <td >
+                From BOM
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>col2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>14</td>
+            <td ><code>sb1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>bom_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                BOM No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>fg_completed_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                For Quantity
+                <p class="text-muted small">
+                    As per Stock UOM</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>cb1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>use_multi_level_bom</code></td>
+            <td >
+                Check</td>
+            <td >
+                Use Multi-Level BOM
+                <p class="text-muted small">
+                    Including items for sub assemblies</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>get_items</code></td>
+            <td >
+                Button</td>
+            <td >
+                Get Items
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>20</td>
+            <td ><code>section_break_12</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>from_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Source Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>cb0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>to_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Target Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>24</td>
+            <td ><code>sb0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>get_stock_and_rate</code></td>
+            <td >
+                Button</td>
+            <td >
+                Update Rate and Availability
+                
+            </td>
+            <td>
+                <pre>get_stock_and_rate</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>27</td>
+            <td ><code>section_break_19</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>total_incoming_value</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Incoming Value
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>column_break_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>total_outgoing_value</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Outgoing Value
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>value_difference</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Value Difference (Out - In)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>difference_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Difference Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>33</td>
+            <td ><code>additional_costs_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Additional Costs
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>additional_costs</code></td>
+            <td >
+                Table</td>
+            <td >
+                Additional Costs
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/landed_cost_taxes_and_charges">Landed Cost Taxes and Charges</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>total_additional_costs</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Additional Costs
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>36</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Customer or Supplier Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>supplier_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Supplier Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>column_break_39</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>42</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>43</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>44</td>
+            <td ><code>printing_settings</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Printing Settings
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>45</td>
+            <td ><code>select_print_heading</code></td>
+            <td >
+                Link</td>
+            <td >
+                Print Heading
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/print_heading">Print Heading</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>46</td>
+            <td ><code>letter_head</code></td>
+            <td >
+                Link</td>
+            <td >
+                Letter Head
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/print/letter_head">Letter Head</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>47</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>48</td>
+            <td ><code>project_name</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project Name
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>49</td>
+            <td ><code>remarks</code></td>
+            <td >
+                Text</td>
+            <td >
+                Remarks
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>50</td>
+            <td ><code>col5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>51</td>
+            <td ><code>total_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Total Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>52</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>53</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>54</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>55</td>
+            <td ><code>credit_note</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Credit Note
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.stock_entry.stock_entry</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>DuplicateEntryForProductionOrderError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>IncorrectValuationRateError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OperationsNotCompleteError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockEntry</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.stock_controller.StockController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_to_stock_entry_detail" href="#add_to_stock_entry_detail" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_to_stock_entry_detail</b>
+        <i class="text-muted">(self, item_dict, bom_no=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="calculate_rate_and_amount" href="#calculate_rate_and_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>calculate_rate_and_amount</b>
+        <i class="text-muted">(self, force=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_duplicate_entry_for_production_order" href="#check_duplicate_entry_for_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_duplicate_entry_for_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_operations_completed" href="#check_if_operations_completed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_operations_completed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Check if Time Logs are completed against before manufacturing to capture operating costs.</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="distribute_additional_costs" href="#distribute_additional_costs" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>distribute_additional_costs</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_bom_raw_materials" href="#get_bom_raw_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_bom_raw_materials</b>
+        <i class="text-muted">(self, qty)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_entries" href="#get_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_entries</b>
+        <i class="text-muted">(self, warehouse_account)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_issued_qty" href="#get_issued_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_issued_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_item_details" href="#get_item_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_item_details</b>
+        <i class="text-muted">(self, args=None, for_update=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items" href="#get_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_pending_raw_materials" href="#get_pending_raw_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_pending_raw_materials</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>issue (item quantity) that is pending to issue or desire to transfer,
+whichever is less</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_stock_and_rate" href="#get_stock_and_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_stock_and_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_transfered_raw_materials" href="#get_transfered_raw_materials" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_transfered_raw_materials</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_uom_details" href="#get_uom_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_uom_details</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns dict <code>{"conversion_factor": [value], "transfer_qty": qty * [value]}</code></p>
+
+<p><strong>Parameters:</strong></p>
+
+<ul>
+<li><strong><code>args</code></strong> -  dict with <code>item_code</code>, <code>uom</code> and <code>qty</code></li>
+</ul>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_warehouse_details" href="#get_warehouse_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_warehouse_details</b>
+        <i class="text-muted">(self, args)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="load_items_from_bom" href="#load_items_from_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>load_items_from_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="onload" href="#onload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>onload</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_actual_qty" href="#set_actual_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_actual_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_basic_rate" href="#set_basic_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_basic_rate</b>
+        <i class="text-muted">(self, force=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>get stock and incoming rate on posting date</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_basic_rate_for_finished_goods" href="#set_basic_rate_for_finished_goods" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_basic_rate_for_finished_goods</b>
+        <i class="text-muted">(self, raw_material_cost)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_amount" href="#set_total_amount" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_amount</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_total_incoming_outgoing_value" href="#set_total_incoming_outgoing_value" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_total_incoming_outgoing_value</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_transfer_qty" href="#set_transfer_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_transfer_qty</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_production_order" href="#update_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_stock_ledger" href="#update_stock_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_stock_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_valuation_rate" href="#update_valuation_rate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_valuation_rate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_batch" href="#validate_batch" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_batch</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_bom" href="#validate_bom" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_bom</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_finished_goods" href="#validate_finished_goods" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_finished_goods</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>validation: finished good quantity should be same as manufacturing quantity</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item" href="#validate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_production_order" href="#validate_production_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_production_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_purchase_order" href="#validate_purchase_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_purchase_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Throw exception if more raw material is transferred against Purchase Order than in
+the raw materials supplied table</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_purpose" href="#validate_purpose" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_purpose</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_warehouse" href="#validate_warehouse" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_warehouse</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>perform various (sometimes conditional) validations on warehouse</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_with_material_request" href="#validate_with_material_request" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_with_material_request</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_entry.stock_entry.get_additional_costs" href="#erpnext.stock.doctype.stock_entry.stock_entry.get_additional_costs" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_entry.stock_entry.<b>get_additional_costs</b>
+        <i class="text-muted">(production_order=None, bom_no=None, fg_qty=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_entry.stock_entry.get_operating_cost_per_unit" href="#erpnext.stock.doctype.stock_entry.stock_entry.get_operating_cost_per_unit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_entry.stock_entry.<b>get_operating_cost_per_unit</b>
+        <i class="text-muted">(production_order=None, bom_no=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details" href="#erpnext.stock.doctype.stock_entry.stock_entry.get_production_order_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_entry.stock_entry.<b>get_production_order_details</b>
+        <i class="text-muted">(production_order)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/journal_entry">Journal Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_entry_detail.html b/erpnext/docs/current/models/stock/stock_entry_detail.html
new file mode 100644
index 0000000..c756df3
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_entry_detail.html

@@ -0,0 +1,656 @@
+<!-- title: Stock Entry Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_entry_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabStock Entry Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>barcode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Barcode
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>2</td>
+            <td ><code>section_break_2</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>s_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Source Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>col_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>t_warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Target Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>col_break2</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>section_break_8</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>image</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Image
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>image_view</code></td>
+            <td >
+                Image</td>
+            <td >
+                Image View
+                
+            </td>
+            <td>
+                <pre>image</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>quantity_and_rate</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Quantity and Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>basic_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Basic Rate (as per Stock UOM)
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>basic_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Basic Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>additional_cost</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Additional Cost
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Amount
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Valuation Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td class="danger" title="Mandatory"><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td >
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td class="danger" title="Mandatory"><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td class="danger" title="Mandatory"><code>transfer_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Qty as per Stock UOM
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>27</td>
+            <td ><code>serial_no_batch</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Serial No / Batch
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/batch">Batch</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>31</td>
+            <td ><code>accounting</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Accounting
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Difference Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>34</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>35</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Qty (at source/target)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td ><code>bom_no</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                BOM No
+                <p class="text-muted small">
+                    BOM No. for a Finished Good Item</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/bom">BOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>col_break6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>material_request</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Material Request
+                <p class="text-muted small">
+                    Material Request used to make this Stock Entry</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>material_request_item</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Material Request Item
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_ledger_entry.html b/erpnext/docs/current/models/stock/stock_ledger_entry.html
new file mode 100644
index 0000000..7f84b84
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_ledger_entry.html

@@ -0,0 +1,552 @@
+<!-- title: Stock Ledger Entry -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_ledger_entry"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabStock Ledger Entry</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>batch_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Batch No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>voucher_type</code></td>
+            <td >
+                Link</td>
+            <td >
+                Voucher Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>voucher_no</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Voucher No
+                
+            </td>
+            <td>
+                <pre>voucher_type</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>voucher_detail_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Voucher Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>actual_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>incoming_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Incoming Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>outgoing_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Outgoing Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>qty_after_transaction</code></td>
+            <td >
+                Float</td>
+            <td >
+                Actual Qty After Transaction
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Valuation Rate
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>stock_value</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Stock Value
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>stock_value_difference</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Stock Value Difference
+                
+            </td>
+            <td>
+                <pre>Company:company:default_currency</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>stock_queue</code></td>
+            <td >
+                Text</td>
+            <td class="text-muted" title="Hidden">
+                Stock Queue (FIFO)
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>project</code></td>
+            <td >
+                Link</td>
+            <td >
+                Project
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>fiscal_year</code></td>
+            <td >
+                Data</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>is_cancelled</code></td>
+            <td >
+                Select</td>
+            <td class="text-muted" title="Hidden">
+                Is Cancelled
+                
+            </td>
+            <td>
+                <pre>
+No
+Yes</pre>
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockFreezeError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockLedgerEntry</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="actual_amt_check" href="#actual_amt_check" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>actual_amt_check</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_stock_frozen_date" href="#check_stock_frozen_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_stock_frozen_date</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="scrub_posting_time" href="#scrub_posting_time" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>scrub_posting_time</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_batch" href="#validate_batch" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_batch</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item" href="#validate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_mandatory" href="#validate_mandatory" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_mandatory</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry.on_doctype_update" href="#erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry.on_doctype_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry.<b>on_doctype_update</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_reconciliation.html b/erpnext/docs/current/models/stock/stock_reconciliation.html
new file mode 100644
index 0000000..a5be239
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_reconciliation.html

@@ -0,0 +1,589 @@
+<!-- title: Stock Reconciliation -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_reconciliation"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabStock Reconciliation</code></p>
+
+
+This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>posting_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Posting Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>posting_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Posting Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>col1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>sb9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation_item">Stock Reconciliation Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_9</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>expense_account</code></td>
+            <td >
+                Link</td>
+            <td >
+                Difference Account
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>cost_center</code></td>
+            <td >
+                Link</td>
+            <td >
+                Cost Center
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/cost_center">Cost Center</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>reconciliation_json</code></td>
+            <td >
+                Long Text</td>
+            <td class="text-muted" title="Hidden">
+                Reconciliation JSON
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break_13</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>difference_amount</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Difference Amount
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>fold_15</code></td>
+            <td >
+                Fold</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>section_break_16</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.stock_reconciliation.stock_reconciliation</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>EmptyStockReconciliationItemsError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>OpeningEntryAccountError</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockReconciliation</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.stock_controller.StockController</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="__init__" href="#__init__" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>__init__</b>
+        <i class="text-muted">(self, arg1, arg2=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="delete_and_repost_sle" href="#delete_and_repost_sle" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>delete_and_repost_sle</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>Delete Stock Ledger Entries related to this voucher
+</code></pre>
+
+<p>and repost future Stock Ledger Entries</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_gl_entries" href="#get_gl_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_gl_entries</b>
+        <i class="text-muted">(self, warehouse_account=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_items_for" href="#get_items_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_items_for</b>
+        <i class="text-muted">(self, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="insert_entries" href="#insert_entries" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>insert_entries</b>
+        <i class="text-muted">(self, row)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Insert Stock Ledger Entries</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="remove_items_with_no_change" href="#remove_items_with_no_change" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>remove_items_with_no_change</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Remove items if qty or rate is not changed</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_stock_ledger" href="#update_stock_ledger" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_stock_ledger</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><pre><code>find difference between current and expected entries
+</code></pre>
+
+<p>and create stock ledger entries based on the difference</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_data" href="#validate_data" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_data</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_expense_account" href="#validate_expense_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_expense_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_item" href="#validate_item" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_item</b>
+        <i class="text-muted">(self, item_code, row_num)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items" href="#erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.<b>get_items</b>
+        <i class="text-muted">(warehouse, posting_date, posting_time)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_stock_balance_for</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_stock_balance_for" href="#erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_stock_balance_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.<b>get_stock_balance_for</b>
+        <i class="text-muted">(item_code, warehouse, posting_date, posting_time)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_reconciliation_item.html b/erpnext/docs/current/models/stock/stock_reconciliation_item.html
new file mode 100644
index 0000000..7bd78ca
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_reconciliation_item.html

@@ -0,0 +1,179 @@
+<!-- title: Stock Reconciliation Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_reconciliation_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabStock Reconciliation Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>warehouse</code></td>
+            <td >
+                Link</td>
+            <td >
+                Warehouse
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>3</td>
+            <td ><code>section_break_3</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Quantity
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>valuation_rate</code></td>
+            <td >
+                Currency</td>
+            <td >
+                Valuation Rate
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>column_break_6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>current_qty</code></td>
+            <td >
+                Float</td>
+            <td >
+                Current Qty
+                <p class="text-muted small">
+                    Before reconciliation</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>current_valuation_rate</code></td>
+            <td >
+                Read Only</td>
+            <td >
+                Current Valuation Rate
+                <p class="text-muted small">
+                    Before reconciliation</p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation">Stock Reconciliation</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/stock_settings.html b/erpnext/docs/current/models/stock/stock_settings.html
new file mode 100644
index 0000000..cc1aea5
--- /dev/null
+++ b/erpnext/docs/current/models/stock/stock_settings.html

@@ -0,0 +1,337 @@
+<!-- title: Stock Settings -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/stock_settings"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+Settings
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_naming_by</code></td>
+            <td >
+                Select</td>
+            <td >
+                Item Naming By
+                
+            </td>
+            <td>
+                <pre>Item Code
+Naming Series</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Item Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>stock_uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                Default Stock UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>column_break_4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>valuation_method</code></td>
+            <td >
+                Select</td>
+            <td >
+                Default Valuation Method
+                
+            </td>
+            <td>
+                <pre>FIFO
+Moving Average</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>tolerance</code></td>
+            <td >
+                Float</td>
+            <td >
+                Allowance Percent
+                <p class="text-muted small">
+                    Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>7</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>auto_insert_price_list_rate_if_missing</code></td>
+            <td >
+                Check</td>
+            <td >
+                Auto insert Price List rate if missing
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>allow_negative_stock</code></td>
+            <td >
+                Check</td>
+            <td >
+                Allow Negative Stock
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_10</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>automatically_set_serial_nos_based_on_fifo</code></td>
+            <td >
+                Check</td>
+            <td >
+                Automatically Set Serial Nos based on FIFO
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>auto_material_request</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Auto Material Request
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>auto_indent</code></td>
+            <td >
+                Check</td>
+            <td >
+                Raise Material Request when stock reaches re-order level
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>reorder_email_notify</code></td>
+            <td >
+                Check</td>
+            <td >
+                Notify by Email on creation of automatic Material Request
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>15</td>
+            <td ><code>freeze_stock_entries</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Freeze Stock Entries
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>stock_frozen_upto</code></td>
+            <td >
+                Date</td>
+            <td >
+                Stock Frozen Upto
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>stock_frozen_upto_days</code></td>
+            <td >
+                Int</td>
+            <td >
+                Freeze Stocks Older Than [Days]
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>stock_auth_role</code></td>
+            <td >
+                Link</td>
+            <td >
+                Role Allowed to edit frozen stock
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/role">Role</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.stock_settings.stock_settings</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>StockSettings</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/uom_conversion_detail.html b/erpnext/docs/current/models/stock/uom_conversion_detail.html
new file mode 100644
index 0000000..aef8f31
--- /dev/null
+++ b/erpnext/docs/current/models/stock/uom_conversion_detail.html

@@ -0,0 +1,96 @@
+<!-- title: UOM Conversion Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/uom_conversion_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabUOM Conversion Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>uom</code></td>
+            <td >
+                Link</td>
+            <td >
+                UOM
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>conversion_factor</code></td>
+            <td >
+                Float</td>
+            <td >
+                Conversion Factor
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html
new file mode 100644
index 0000000..6945901
--- /dev/null
+++ b/erpnext/docs/current/models/stock/warehouse.html

@@ -0,0 +1,682 @@
+<!-- title: Warehouse -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/warehouse"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabWarehouse</code></p>
+
+
+A logical Warehouse against which stock entries are made.
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>warehouse_detail</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse Detail
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>warehouse_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Warehouse Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>create_account_under</code></td>
+            <td >
+                Link</td>
+            <td >
+                Parent Account
+                <p class="text-muted small">
+                    Account for the warehouse (Perpetual Inventory) will be created under this Account.</p>
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>disabled</code></td>
+            <td >
+                Check</td>
+            <td >
+                Disabled
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>warehouse_contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Warehouse Contact Info
+                <p class="text-muted small">
+                    For Reference Only.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Email Id
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>phone_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Phone No
+                
+            </td>
+            <td>
+                <pre>Phone</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>mobile_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Mobile No
+                
+            </td>
+            <td>
+                <pre>Phone</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>address_line_1</code></td>
+            <td >
+                Data</td>
+            <td >
+                Address Line 1
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>address_line_2</code></td>
+            <td >
+                Data</td>
+            <td >
+                Address Line 2
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>city</code></td>
+            <td >
+                Data</td>
+            <td >
+                City
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>state</code></td>
+            <td >
+                Data</td>
+            <td >
+                State
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>pin</code></td>
+            <td >
+                Int</td>
+            <td >
+                PIN
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.stock.doctype.warehouse.warehouse</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Warehouse</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="add_abbr_if_missing" href="#add_abbr_if_missing" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>add_abbr_if_missing</b>
+        <i class="text-muted">(self, dn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="after_rename" href="#after_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>after_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="before_rename" href="#before_rename" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>before_rename</b>
+        <i class="text-muted">(self, olddn, newdn, merge=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_account_head" href="#create_account_head" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_account_head</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_account" href="#get_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_account</b>
+        <i class="text-muted">(self, warehouse)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="recalculate_bin_qty" href="#recalculate_bin_qty" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>recalculate_bin_qty</b>
+        <i class="text-muted">(self, newdn)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="rename_account_for" href="#rename_account_for" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>rename_account_for</b>
+        <i class="text-muted">(self, olddn, newdn, merge)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_parent_account" href="#update_parent_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_parent_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_parent_account" href="#validate_parent_account" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_parent_account</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/account">Account</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/bin">Bin</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note_item">Delivery Note Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item_reorder">Item Reorder</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/manufacturing_settings">Manufacturing Settings</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/material_request_item">Material Request Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/packed_item">Packed Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/pos_profile">POS Profile</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_order">Production Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_plan_item">Production Plan Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/manufacturing/production_planning_tool">Production Planning Tool</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order_item">Purchase Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt_item">Purchase Receipt Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice_item">Sales Invoice Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order_item">Sales Order Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry">Stock Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_entry_detail">Stock Entry Detail</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_ledger_entry">Stock Ledger Entry</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/stock_reconciliation_item">Stock Reconciliation Item</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation_item">Supplier Quotation Item</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/index.html b/erpnext/docs/current/models/support/index.html
new file mode 100644
index 0000000..c72134d
--- /dev/null
+++ b/erpnext/docs/current/models/support/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module support -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for support</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/docs/current/models/support/index.txt
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/docs/current/models/support/index.txt


diff --git a/erpnext/docs/current/models/support/issue.html b/erpnext/docs/current/models/support/issue.html
new file mode 100644
index 0000000..60a27b2
--- /dev/null
+++ b/erpnext/docs/current/models/support/issue.html

@@ -0,0 +1,592 @@
+<!-- title: Issue -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/issue"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabIssue</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>subject_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Subject
+                
+            </td>
+            <td>
+                <pre>icon-flag</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>ISS-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>subject</code></td>
+            <td >
+                Data</td>
+            <td >
+                Subject
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>cb00</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Open
+Replied
+Hold
+Closed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>raised_by</code></td>
+            <td >
+                Data</td>
+            <td >
+                Raised By (Email)
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>fold</code></td>
+            <td >
+                Fold</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>section_break_7</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>description</code></td>
+            <td >
+                Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break_9</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>resolution_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Resolution Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>first_responded_on</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                First Responded On
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>13</td>
+            <td ><code>additional_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-pushpin</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>lead</code></td>
+            <td >
+                Link</td>
+            <td >
+                Lead
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>contact</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>column_break_16</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>section_break_19</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>resolution_details</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Resolution Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>opening_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Opening Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>opening_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Opening Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>content_type</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Content Type
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>attachment</code></td>
+            <td >
+                Attach</td>
+            <td class="text-muted" title="Hidden">
+                Attachment
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.support.doctype.issue.issue</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Issue</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_lead_contact" href="#set_lead_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_lead_contact</b>
+        <i class="text-muted">(self, email_id)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_status" href="#update_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_status</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.auto_close_tickets" href="#erpnext.support.doctype.issue.issue.auto_close_tickets" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>auto_close_tickets</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.get_issue_list" href="#erpnext.support.doctype.issue.issue.get_issue_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>get_issue_list</b>
+        <i class="text-muted">(doctype, txt, filters, limit_start, limit_page_length=20)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.get_list_context" href="#erpnext.support.doctype.issue.issue.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.has_website_permission" href="#erpnext.support.doctype.issue.issue.has_website_permission" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>has_website_permission</b>
+        <i class="text-muted">(doc, ptype, user, verbose=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.support.doctype.issue.issue.set_multiple_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.set_multiple_status" href="#erpnext.support.doctype.issue.issue.set_multiple_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>set_multiple_status</b>
+        <i class="text-muted">(names, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.support.doctype.issue.issue.set_status</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.issue.issue.set_status" href="#erpnext.support.doctype.issue.issue.set_status" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.issue.issue.<b>set_status</b>
+        <i class="text-muted">(name, status)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/maintenance_schedule.html b/erpnext/docs/current/models/support/maintenance_schedule.html
new file mode 100644
index 0000000..f113722
--- /dev/null
+++ b/erpnext/docs/current/models/support/maintenance_schedule.html

@@ -0,0 +1,685 @@
+<!-- title: Maintenance Schedule -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/maintenance_schedule"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabMaintenance Schedule</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Submitted
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>transaction_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Transaction Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>6</td>
+            <td ><code>items_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-shopping-cart</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>items</code></td>
+            <td >
+                Table</td>
+            <td >
+                Items
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_item">Maintenance Schedule Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>schedule</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Schedule
+                
+            </td>
+            <td>
+                <pre>icon-time</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>generate_schedule</code></td>
+            <td >
+                Button</td>
+            <td >
+                Generate Schedule
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>schedules</code></td>
+            <td >
+                Table</td>
+            <td >
+                Schedules
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule_detail">Maintenance Schedule Detail</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>11</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Info
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>column_break_17</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td class="danger" title="Mandatory"><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td class="danger" title="Mandatory"><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.support.doctype.maintenance_schedule.maintenance_schedule</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>MaintenanceSchedule</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_serial_no_added" href="#check_serial_no_added" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_serial_no_added</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="create_schedule_list" href="#create_schedule_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>create_schedule_list</b>
+        <i class="text-muted">(self, start_date, end_date, no_of_visit, sales_person)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="generate_schedule" href="#generate_schedule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>generate_schedule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_amc_date" href="#update_amc_date" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_amc_date</b>
+        <i class="text-muted">(self, serial_nos, amc_expiry_date=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_dates_with_periodicity" href="#validate_dates_with_periodicity" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_dates_with_periodicity</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_maintenance_detail" href="#validate_maintenance_detail" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_maintenance_detail</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_sales_order" href="#validate_sales_order" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_sales_order</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_schedule" href="#validate_schedule" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_schedule</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_schedule_date_for_holiday_list" href="#validate_schedule_date_for_holiday_list" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_schedule_date_for_holiday_list</b>
+        <i class="text-muted">(self, schedule_date, sales_person)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_serial_no" href="#validate_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_serial_no</b>
+        <i class="text-muted">(self, serial_nos, amc_start_date)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit" href="#erpnext.support.doctype.maintenance_schedule.maintenance_schedule.make_maintenance_visit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.maintenance_schedule.maintenance_schedule.<b>make_maintenance_visit</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/maintenance_schedule_detail.html b/erpnext/docs/current/models/support/maintenance_schedule_detail.html
new file mode 100644
index 0000000..859581e
--- /dev/null
+++ b/erpnext/docs/current/models/support/maintenance_schedule_detail.html

@@ -0,0 +1,153 @@
+<!-- title: Maintenance Schedule Detail -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/maintenance_schedule_detail"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMaintenance Schedule Detail</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>scheduled_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Scheduled Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>actual_date</code></td>
+            <td >
+                Date</td>
+            <td class="text-muted" title="Hidden">
+                Actual Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>sales_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/maintenance_schedule_item.html b/erpnext/docs/current/models/support/maintenance_schedule_item.html
new file mode 100644
index 0000000..5230a66
--- /dev/null
+++ b/erpnext/docs/current/models/support/maintenance_schedule_item.html

@@ -0,0 +1,233 @@
+<!-- title: Maintenance Schedule Item -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/maintenance_schedule_item"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMaintenance Schedule Item</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>description</code></td>
+            <td >
+                Data</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>4</td>
+            <td ><code>schedule_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td class="danger" title="Mandatory"><code>start_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Start Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>end_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                End Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>periodicity</code></td>
+            <td >
+                Select</td>
+            <td >
+                Periodicity
+                
+            </td>
+            <td>
+                <pre>
+Weekly
+Monthly
+Quarterly
+Half Yearly
+Yearly
+Random</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td class="danger" title="Mandatory"><code>no_of_visits</code></td>
+            <td >
+                Int</td>
+            <td >
+                No of Visits
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>sales_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>reference</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Data</td>
+            <td >
+                Against Docname
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/maintenance_visit.html b/erpnext/docs/current/models/support/maintenance_visit.html
new file mode 100644
index 0000000..111168a
--- /dev/null
+++ b/erpnext/docs/current/models/support/maintenance_visit.html

@@ -0,0 +1,666 @@
+<!-- title: Maintenance Visit -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/maintenance_visit"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabMaintenance Visit</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td class="text-muted" title="Hidden">
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td class="danger" title="Mandatory"><code>mntc_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Maintenance Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>mntc_time</code></td>
+            <td >
+                Time</td>
+            <td >
+                Maintenance Time
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>12</td>
+            <td ><code>maintenance_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-wrench</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td class="danger" title="Mandatory"><code>completion_status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Completion Status
+                
+            </td>
+            <td>
+                <pre>
+Partially Completed
+Fully Completed</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>column_break_14</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td class="danger" title="Mandatory"><code>maintenance_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Maintenance Type
+                
+            </td>
+            <td>
+                <pre>
+Scheduled
+Unscheduled
+Breakdown</pre>
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>section_break0</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-wrench</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td class="danger" title="Mandatory"><code>purposes</code></td>
+            <td >
+                Table</td>
+            <td >
+                Purposes
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit_purpose">Maintenance Visit Purpose</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>18</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>customer_feedback</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Customer Feedback
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Data</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Draft
+Cancelled
+Submitted</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td >
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>25</td>
+            <td ><code>contact_info_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Info
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.support.doctype.maintenance_visit.maintenance_visit</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>MaintenanceVisit</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="check_if_last_visit" href="#check_if_last_visit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>check_if_last_visit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>check if last maintenance visit against same sales order/ Warranty Claim</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_submit" href="#on_submit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_submit</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="update_customer_issue" href="#update_customer_issue" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>update_customer_issue</b>
+        <i class="text-muted">(self, flag)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_serial_no" href="#validate_serial_no" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_serial_no</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/maintenance_visit_purpose.html b/erpnext/docs/current/models/support/maintenance_visit_purpose.html
new file mode 100644
index 0000000..8937eff
--- /dev/null
+++ b/erpnext/docs/current/models/support/maintenance_visit_purpose.html

@@ -0,0 +1,212 @@
+<!-- title: Maintenance Visit Purpose -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/maintenance_visit_purpose"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+<span class="label label-info">Child Table</span>
+
+
+    <p><b>Table Name:</b> <code>tabMaintenance Visit Purpose</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>description</code></td>
+            <td >
+                Text Editor</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>work_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>service_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_person">Sales Person</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>work_done</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Work Done
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>prevdoc_doctype</code></td>
+            <td >
+                Link</td>
+            <td >
+                Document Type
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/doctype">DocType</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>prevdoc_docname</code></td>
+            <td >
+                Dynamic Link</td>
+            <td >
+                Against Document No
+                
+            </td>
+            <td>
+                <pre>prevdoc_doctype</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>prevdoc_detail_docname</code></td>
+            <td >
+                Data</td>
+            <td class="text-muted" title="Hidden">
+                Against Document Detail No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    
+    
+    <h4>Child Table Of</h4>
+    <ul>
+    
+        <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+    
+    </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/support/warranty_claim.html b/erpnext/docs/current/models/support/warranty_claim.html
new file mode 100644
index 0000000..c27875e
--- /dev/null
+++ b/erpnext/docs/current/models/support/warranty_claim.html

@@ -0,0 +1,780 @@
+<!-- title: Warranty Claim -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/support/doctype/warranty_claim"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabWarranty Claim</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>customer_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>naming_series</code></td>
+            <td >
+                Select</td>
+            <td >
+                Series
+                
+            </td>
+            <td>
+                <pre>CI-</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>
+Open
+Closed
+Work In Progress
+Cancelled</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>complaint_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Issue Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>serial_no</code></td>
+            <td >
+                Link</td>
+            <td >
+                Serial No
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/serial_no">Serial No</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td class="danger" title="Mandatory"><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>customer_address</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Address
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/address">Address</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>contact_person</code></td>
+            <td >
+                Link</td>
+            <td >
+                Contact Person
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/utilities/contact">Contact</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr class="info">
+            <td>10</td>
+            <td ><code>issue_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-ticket</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td class="danger" title="Mandatory"><code>complaint</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Issue
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>item_code</code></td>
+            <td >
+                Link</td>
+            <td >
+                Item Code
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>item_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Item Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>description</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Description
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>warranty_amc_status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Warranty / AMC Status
+                
+            </td>
+            <td>
+                <pre>
+Under Warranty
+Out of Warranty
+Under AMC
+Out of AMC</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>warranty_expiry_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                Warranty Expiry Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>amc_expiry_date</code></td>
+            <td >
+                Date</td>
+            <td >
+                AMC Expiry Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>19</td>
+            <td ><code>resolution_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Resolution
+                <p class="text-muted small">
+                    To assign this issue, use the "Assign" button in the sidebar.</p>
+            </td>
+            <td>
+                <pre>icon-thumbs-up</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>resolution_date</code></td>
+            <td >
+                Datetime</td>
+            <td >
+                Resolution Date
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>resolved_by</code></td>
+            <td >
+                Link</td>
+            <td >
+                Resolved By
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>resolution_details</code></td>
+            <td >
+                Text</td>
+            <td >
+                Resolution Details
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>23</td>
+            <td ><code>contact_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Contact Info
+                
+            </td>
+            <td>
+                <pre>icon-bullhorn</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>col_break3</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>25</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>26</td>
+            <td ><code>customer_group</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer Group
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/customer_group">Customer Group</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>27</td>
+            <td ><code>territory</code></td>
+            <td >
+                Link</td>
+            <td >
+                Territory
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/territory">Territory</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>28</td>
+            <td ><code>contact_display</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>29</td>
+            <td ><code>contact_mobile</code></td>
+            <td >
+                Data</td>
+            <td >
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>30</td>
+            <td ><code>contact_email</code></td>
+            <td >
+                Data</td>
+            <td >
+                Contact Email
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>31</td>
+            <td ><code>col_break4</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>32</td>
+            <td ><code>service_address</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Service Address
+                <p class="text-muted small">
+                    If different than customer address</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>33</td>
+            <td ><code>address_display</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>34</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>35</td>
+            <td ><code>col_break5</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>36</td>
+            <td class="danger" title="Mandatory"><code>company</code></td>
+            <td >
+                Link</td>
+            <td >
+                Company
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/company">Company</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>37</td>
+            <td class="danger" title="Mandatory"><code>fiscal_year</code></td>
+            <td >
+                Link</td>
+            <td >
+                Fiscal Year
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/fiscal_year">Fiscal Year</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>38</td>
+            <td ><code>col_break6</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>39</td>
+            <td ><code>complaint_raised_by</code></td>
+            <td >
+                Data</td>
+            <td >
+                Raised By
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>40</td>
+            <td ><code>from_company</code></td>
+            <td >
+                Data</td>
+            <td >
+                From Company
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>41</td>
+            <td ><code>amended_from</code></td>
+            <td >
+                Link</td>
+            <td class="text-muted" title="Hidden">
+                Amended From
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+
+                
+            </td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.support.doctype.warranty_claim.warranty_claim</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>WarrantyClaim</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.utilities.transaction_base.TransactionBase</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_feed" href="#get_feed" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_feed</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_cancel" href="#on_cancel" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_cancel</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit" href="#erpnext.support.doctype.warranty_claim.warranty_claim.make_maintenance_visit" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.support.doctype.warranty_claim.warranty_claim.<b>make_maintenance_visit</b>
+        <i class="text-muted">(source_name, target_doc=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/utilities/address.html b/erpnext/docs/current/models/utilities/address.html
new file mode 100644
index 0000000..22c349e
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/address.html

@@ -0,0 +1,710 @@
+<!-- title: Address -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities/doctype/address"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAddress</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>address_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-map-marker</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>address_title</code></td>
+            <td >
+                Data</td>
+            <td >
+                Address Title
+                <p class="text-muted small">
+                    Name of person or organization that this address belongs to.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td class="danger" title="Mandatory"><code>address_type</code></td>
+            <td >
+                Select</td>
+            <td >
+                Address Type
+                
+            </td>
+            <td>
+                <pre>Billing
+Shipping
+Office
+Personal
+Plant
+Postal
+Shop
+Subsidiary
+Warehouse
+Other</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td class="danger" title="Mandatory"><code>address_line1</code></td>
+            <td >
+                Data</td>
+            <td >
+                Address Line 1
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>address_line2</code></td>
+            <td >
+                Data</td>
+            <td >
+                Address Line 2
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td class="danger" title="Mandatory"><code>city</code></td>
+            <td >
+                Data</td>
+            <td >
+                City/Town
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>state</code></td>
+            <td >
+                Data</td>
+            <td >
+                State
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>pincode</code></td>
+            <td >
+                Data</td>
+            <td >
+                Postal Code
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td class="danger" title="Mandatory"><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email Id
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>phone</code></td>
+            <td >
+                Data</td>
+            <td >
+                Phone
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>fax</code></td>
+            <td >
+                Data</td>
+            <td >
+                Fax
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>is_primary_address</code></td>
+            <td >
+                Check</td>
+            <td >
+                Preferred Billing Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>is_shipping_address</code></td>
+            <td >
+                Check</td>
+            <td >
+                Preferred Shipping Address
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>16</td>
+            <td ><code>linked_with</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td>
+                <pre>icon-pushpin</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>17</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>22</td>
+            <td ><code>column_break_22</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>23</td>
+            <td ><code>lead</code></td>
+            <td >
+                Link</td>
+            <td >
+                Lead
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/lead">Lead</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>24</td>
+            <td ><code>lead_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Lead Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.utilities.doctype.address.address</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Address</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="_unset_other" href="#_unset_other" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>_unset_other</b>
+        <i class="text-muted">(self, is_address_type)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="get_display" href="#get_display" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>get_display</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="link_address" href="#link_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>link_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Link address based on owner</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_primary_address" href="#validate_primary_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_primary_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate that there can only be one primary address for particular customer, supplier</p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_shipping_address" href="#validate_shipping_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_shipping_address</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Validate that there can only be one shipping address for particular customer, supplier</p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.utilities.doctype.address.address.get_address_display</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.address.address.get_address_display" href="#erpnext.utilities.doctype.address.address.get_address_display" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.address.address.<b>get_address_display</b>
+        <i class="text-muted">(address_dict)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.address.address.get_list_context" href="#erpnext.utilities.doctype.address.address.get_list_context" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.address.address.<b>get_list_context</b>
+        <i class="text-muted">(context=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.address.address.get_territory_from_address" href="#erpnext.utilities.doctype.address.address.get_territory_from_address" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.address.address.<b>get_territory_from_address</b>
+        <i class="text-muted">(address)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Tries to match city, state and country of address to existing territory</p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.address.address.has_website_permission" href="#erpnext.utilities.doctype.address.address.has_website_permission" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.address.address.<b>has_website_permission</b>
+        <i class="text-muted">(doc, ptype, user, verbose=False)</i>
+    </p>
+	<div class="docs-attr-desc"><p>Returns true if customer or lead matches with user</p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/utilities/address_template.html b/erpnext/docs/current/models/utilities/address_template.html
new file mode 100644
index 0000000..e1f977e
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/address_template.html

@@ -0,0 +1,175 @@
+<!-- title: Address Template -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities/doctype/address_template"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabAddress Template</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td class="danger" title="Mandatory"><code>country</code></td>
+            <td >
+                Link</td>
+            <td >
+                Country
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/geo/country">Country</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>is_default</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Default
+                <p class="text-muted small">
+                    This format is used if country specific format is not found</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>template</code></td>
+            <td >
+                Code</td>
+            <td >
+                Template
+                <p class="text-muted small">
+                    <h4>Default Template</h4>
+<p>Uses <a href="http://jinja.pocoo.org/docs/templates/">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre></p>
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.utilities.doctype.address_template.address_template</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>AddressTemplate</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_update" href="#on_update" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_update</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/utilities/contact.html b/erpnext/docs/current/models/utilities/contact.html
new file mode 100644
index 0000000..dd33f13
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/contact.html

@@ -0,0 +1,614 @@
+<!-- title: Contact -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities/doctype/contact"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabContact</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr class="info">
+            <td>1</td>
+            <td ><code>contact_section</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>icon-user</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td class="danger" title="Mandatory"><code>first_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                First Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>last_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Last Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>email_id</code></td>
+            <td >
+                Data</td>
+            <td >
+                Email Id
+                
+            </td>
+            <td>
+                <pre>Email</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>5</td>
+            <td ><code>cb00</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>status</code></td>
+            <td >
+                Select</td>
+            <td >
+                Status
+                
+            </td>
+            <td>
+                <pre>Passive
+Open
+Replied</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>phone</code></td>
+            <td >
+                Data</td>
+            <td >
+                Phone
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>8</td>
+            <td ><code>contact_details</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                Reference
+                
+            </td>
+            <td>
+                <pre>icon-pushpin</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>user</code></td>
+            <td >
+                Link</td>
+            <td >
+                User Id
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/core/user">User</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>customer</code></td>
+            <td >
+                Link</td>
+            <td >
+                Customer
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/customer">Customer</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>11</td>
+            <td ><code>customer_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Customer Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>12</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>13</td>
+            <td ><code>supplier</code></td>
+            <td >
+                Link</td>
+            <td >
+                Supplier
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier">Supplier</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>14</td>
+            <td ><code>supplier_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Supplier Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>15</td>
+            <td ><code>sales_partner</code></td>
+            <td >
+                Link</td>
+            <td >
+                Sales Partner
+                
+            </td>
+            <td>
+                
+                
+
+
+<a href="https://frappe.github.io/erpnext/current/models/setup/sales_partner">Sales Partner</a>
+
+
+                
+            </td>
+        </tr>
+        
+        <tr >
+            <td>16</td>
+            <td ><code>is_primary_contact</code></td>
+            <td >
+                Check</td>
+            <td >
+                Is Primary Contact
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>17</td>
+            <td ><code>more_info</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                More Information
+                
+            </td>
+            <td>
+                <pre>icon-file-text</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>18</td>
+            <td ><code>mobile_no</code></td>
+            <td >
+                Data</td>
+            <td >
+                Mobile No
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>19</td>
+            <td ><code>department</code></td>
+            <td >
+                Data</td>
+            <td >
+                Department
+                <p class="text-muted small">
+                    Enter department to which this Contact belongs</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>20</td>
+            <td ><code>designation</code></td>
+            <td >
+                Data</td>
+            <td >
+                Designation
+                <p class="text-muted small">
+                    Enter designation of this Contact</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>21</td>
+            <td ><code>unsubscribed</code></td>
+            <td >
+                Check</td>
+            <td >
+                Unsubscribed
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.utilities.doctype.contact.contact</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>Contact</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from erpnext.controllers.status_updater.StatusUpdater</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="autoname" href="#autoname" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>autoname</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="on_trash" href="#on_trash" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>on_trash</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="set_user" href="#set_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>set_user</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate" href="#validate" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+        
+    
+    
+	<p class="docs-attr-name">
+        <a name="validate_primary_contact" href="#validate_primary_contact" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		<b>validate_primary_contact</b>
+        <i class="text-muted">(self)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.utilities.doctype.contact.contact.get_contact_details</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.contact.contact.get_contact_details" href="#erpnext.utilities.doctype.contact.contact.get_contact_details" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.contact.contact.<b>get_contact_details</b>
+        <i class="text-muted">(contact)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.utilities.doctype.contact.contact.invite_user</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.contact.contact.invite_user" href="#erpnext.utilities.doctype.contact.contact.invite_user" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.contact.contact.<b>invite_user</b>
+        <i class="text-muted">(contact)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+        <h4>Linked In:</h4>
+        <ul>
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/delivery_note">Delivery Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/installation_note">Installation Note</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/issue">Issue</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_schedule">Maintenance Schedule</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/maintenance_visit">Maintenance Visit</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/crm/opportunity">Opportunity</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/purchase_invoice">Purchase Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/purchase_order">Purchase Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/stock/purchase_receipt">Purchase Receipt</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/quotation">Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/accounts/sales_invoice">Sales Invoice</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/buying/supplier_quotation">Supplier Quotation</a>
+
+</li>
+			
+        
+			
+            <li>
+
+
+<a href="https://frappe.github.io/erpnext/current/models/support/warranty_claim">Warranty Claim</a>
+
+</li>
+			
+        
+        </ul>
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/utilities/index.html b/erpnext/docs/current/models/utilities/index.html
new file mode 100644
index 0000000..8c7f74a
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/index.html

@@ -0,0 +1,19 @@
+<!-- title: Module utilities -->
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<h3>DocTypes for utilities</h3>
+
+{index}
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/fixtures/__init__.py b/erpnext/docs/current/models/utilities/index.txt
similarity index 100%
rename from erpnext/setup/page/setup_wizard/fixtures/__init__.py
rename to erpnext/docs/current/models/utilities/index.txt


diff --git a/erpnext/docs/current/models/utilities/rename_tool.html b/erpnext/docs/current/models/utilities/rename_tool.html
new file mode 100644
index 0000000..efff0c4
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/rename_tool.html

@@ -0,0 +1,147 @@
+<!-- title: Rename Tool -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities/doctype/rename_tool"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+<span class="label label-info">Single</span>
+
+
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>select_doctype</code></td>
+            <td >
+                Select</td>
+            <td >
+                Select DocType
+                <p class="text-muted small">
+                    Type of document to rename.</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>file_to_rename</code></td>
+            <td >
+                Attach</td>
+            <td >
+                File to Rename
+                <p class="text-muted small">
+                    Attach .csv file with two columns, one for the old name and one for the new name</p>
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>rename_log</code></td>
+            <td >
+                HTML</td>
+            <td >
+                Rename Log
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.utilities.doctype.rename_tool.rename_tool</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>RenameTool</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.utilities.doctype.rename_tool.rename_tool.get_doctypes</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.rename_tool.rename_tool.get_doctypes" href="#erpnext.utilities.doctype.rename_tool.rename_tool.get_doctypes" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.rename_tool.rename_tool.<b>get_doctypes</b>
+        <i class="text-muted">()</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+	
+        
+    
+    <p><span class="label label-info">Public API</span>
+        <br><code>/api/method/erpnext.utilities.doctype.rename_tool.rename_tool.upload</code>
+    </p>
+	<p class="docs-attr-name">
+        <a name="erpnext.utilities.doctype.rename_tool.rename_tool.upload" href="#erpnext.utilities.doctype.rename_tool.rename_tool.upload" class="text-muted small">
+            <i class="icon-link small" style="color: #ccc;"></i></a>
+		erpnext.utilities.doctype.rename_tool.rename_tool.<b>upload</b>
+        <i class="text-muted">(select_doctype=None, rows=None)</i>
+    </p>
+	<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+	<br>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/current/models/utilities/sms_log.html b/erpnext/docs/current/models/utilities/sms_log.html
new file mode 100644
index 0000000..7c89c99
--- /dev/null
+++ b/erpnext/docs/current/models/utilities/sms_log.html

@@ -0,0 +1,197 @@
+<!-- title: SMS Log -->
+
+
+
+
+
+<div class="dev-header">
+
+<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
+	Version 6.x.x</a>
+
+
+	<a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/utilities/doctype/sms_log"
+		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
+
+</div>
+
+
+
+
+
+    <p><b>Table Name:</b> <code>tabSMS Log</code></p>
+
+
+
+
+<h3>Fields</h3>
+
+<table class="table table-bordered" style="table-layout: fixed;">
+    <thead>
+        <tr>
+            <th style="width: 5%">Sr</th>
+            <th style="width: 25%">Fieldname</th>
+            <th style="width: 20%">Type</th>
+            <th style="width: 25%">Label</th>
+            <th style="width: 25%">Options</th>
+        </tr>
+    </thead>
+    <tbody>
+        
+        <tr >
+            <td>1</td>
+            <td ><code>sender_name</code></td>
+            <td >
+                Data</td>
+            <td >
+                Sender Name
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>2</td>
+            <td ><code>sent_on</code></td>
+            <td >
+                Date</td>
+            <td >
+                Sent On
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>3</td>
+            <td ><code>column_break0</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>4</td>
+            <td ><code>message</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Message
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr class="info">
+            <td>5</td>
+            <td ><code>sec_break1</code></td>
+            <td >
+                Section Break</td>
+            <td >
+                
+                
+            </td>
+            <td>
+                <pre>Simple</pre>
+            </td>
+        </tr>
+        
+        <tr >
+            <td>6</td>
+            <td ><code>no_of_requested_sms</code></td>
+            <td >
+                Int</td>
+            <td >
+                No of Requested SMS
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>7</td>
+            <td ><code>requested_numbers</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Requested Numbers
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>8</td>
+            <td ><code>column_break1</code></td>
+            <td class="info">
+                Column Break</td>
+            <td >
+                
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>9</td>
+            <td ><code>no_of_sent_sms</code></td>
+            <td >
+                Int</td>
+            <td >
+                No of Sent SMS
+                
+            </td>
+            <td></td>
+        </tr>
+        
+        <tr >
+            <td>10</td>
+            <td ><code>sent_to</code></td>
+            <td >
+                Small Text</td>
+            <td >
+                Sent To
+                
+            </td>
+            <td></td>
+        </tr>
+        
+    </tbody>
+</table>
+
+
+    <hr>
+    <h3>Controller</h3>
+    <h4>erpnext.utilities.doctype.sms_log.sms_log</h4>
+
+    
+
+
+
+	
+        
+	<h3 style="font-weight: normal;">Class <b>SMSLog</b></h3>
+    
+    <p style="padding-left: 30px;"><i>Inherits from frappe.model.document.Document</i></h4>
+    
+    <div class="docs-attr-desc"><p></p>
+</div>
+    <div style="padding-left: 30px;">
+        
+    </div>
+    <hr>
+
+	
+
+
+    
+    
+
+
+<!-- autodoc -->
+<!-- jinja -->
+<!-- static -->
\ No newline at end of file

diff --git a/erpnext/docs/index.html b/erpnext/docs/index.html
new file mode 100644
index 0000000..99ef849
--- /dev/null
+++ b/erpnext/docs/index.html

@@ -0,0 +1,74 @@
+<!-- title: ERPNext: Documentation -->
+<!-- description: ERPNext Documentation -->
+<!-- no-breadcrumbs -->
+<style>
+ 
+</style>
+
+<!-- start-hero -->
+<div class="splash">
+ <div class="container">
+  <div class="col-sm-10 col-sm-offset-1">
+   <div class="jumbotron">
+    <h1>ERPNext Documentation</h1>
+    <p>Detailed explanation for all ERPNext features and developer API</p>
+   </div>
+   <div class="section" style="padding-top: 0px; margin-top: -30px;">
+      <div class="fake-browser-frame">
+       <img class="img-responsive browser-image feature-image"
+              src="assets/img/home.png">
+      </div>
+   </div>
+  </div>
+ </div>
+</div>
+<!-- end-hero -->
+
+
+<div class="container">
+ <div class="col-sm-10 col-sm-offset-1">
+  <div class="section">
+      <p>ERPNext is a fully featured ERP system designed for Small and Medium Sized
+business. ERPNext covers a wide range of features including Accounting, CRM,
+Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &amp;
+Payroll, Website, E-Commerce and much more.</p>
+
+<p>ERPNext is based on the Frappe Framework is highly customizable and extendable.
+You can create Custom Form, Fields, Scripts and can also create your own Apps
+to extend ERPNext functionality.</p>
+
+<p>ERPNext is Open Source under the GNU General Public Licence v3 and has been
+listed as one of the Best Open Source Softwares in the world by my online
+blogs.</p>
+
+  </div>
+ </div>
+</div>
+
+
+
+<div class="container">
+ <div class="col-sm-10 col-sm-offset-1">
+  <div class="section" id="install">
+    <h2>Install</h2>
+    <h4>From your site</h4>
+    <p>To install this app, login to your site and click on "Installer". Search for <b>ERPNext</b> and click on "Install"</p>
+    <h4>Using Bench</h4>
+    <p>Go to your bench folder and setup the new app</p>
+    <pre><code class="sh">$ bench get-app erpnext https://github.com/frappe/erpnext
+$ bench new-site testsite
+$ bench --site testsite install-app erpnext</code></pre>
+    <p>Login to your site to configure the app.</p>
+    <p><a href="install.html">Detailed Installation Steps</a></p>
+   </div>
+   <div class="section">
+       <h2>Author</h2>
+
+       <p>Frappe Technologies Pvt. Ltd. (info@erpnext.com)</p>
+   </div>
+ </div>
+</div>
+
+
+<!-- autodoc -->
+<!-- jinja -->
\ No newline at end of file

diff --git a/erpnext/docs/index.txt b/erpnext/docs/index.txt
new file mode 100644
index 0000000..2ae026e
--- /dev/null
+++ b/erpnext/docs/index.txt

@@ -0,0 +1,9 @@
+assets
+contents
+contents
+current
+index
+install
+license
+license
+user
\ No newline at end of file

diff --git a/erpnext/docs/install.md b/erpnext/docs/install.md
new file mode 100644
index 0000000..26ad128
--- /dev/null
+++ b/erpnext/docs/install.md

@@ -0,0 +1,30 @@
+<!-- title: ERPNext Installation -->
+
+# Installation
+
+ERPNext is based on the <a href="https://frappe.io">Frappe Framework</a>, a full stack web framework based on Python, MariaDB, Redis, Node.
+
+To intall ERPNext, you will have to install the <a href="https://github.com/frappe/bench">Frappe Bench</a>, the command-line, package manager and site manager for Frappe Framework. For more details, read the Bench README.
+
+After you have installed Frappe Bench, go to you bench folder, which is     `frappe.bench` by default and setup **erpnext**.
+
+    bench get-app erpnext {{ source_link }}
+
+Then create a new site to install the app.
+
+    bench new-site mysite
+
+This will create a new folder in your `/sites` directory and create a new database for this site.
+
+Next, install erpnext in this site
+
+    bench --site mysite install-app erpnext
+
+To run this locally, run
+
+    bench start
+
+Fire up your browser and go to http://localhost:8000 and you should see the login screen. Login as **Administrator** and **admin** (or the password you set at the time of `new-site`) and you are set.
+
+<!-- jinja -->
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
new file mode 100644
index 0000000..b0310f6
--- /dev/null
+++ b/erpnext/docs/license.html

@@ -0,0 +1,184 @@
+<!-- title: License GNU General Public License (v3) -->
+
+<h1>GNU General Public License (v3)</h1>
+
+<h2>ERPNext License Info</h2>
+
+<p>(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
+ERPNext is a trademark of Frappe Technologies</p>
+
+<p>The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)</p>
+
+<h2>GNU GENERAL PUBLIC LICENSE</h2>
+
+<p>Version 3, 29 June 2007</p>
+
+<p>http://www.gnu.org/copyleft/gpl.html</p>
+
+<p>TERMS AND CONDITIONS
+0. Definitions.</p>
+
+<p>“This License” refers to version 3 of the GNU General Public License.</p>
+
+<p>“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.</p>
+
+<p>“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.</p>
+
+<p>To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.</p>
+
+<p>A “covered work” means either the unmodified Program or a work based on the Program.</p>
+
+<p>To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.</p>
+
+<p>To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+1. Source Code.</p>
+
+<p>The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.</p>
+
+<p>A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.</p>
+
+<p>The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.</p>
+
+<p>The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that same work.
+2. Basic Permissions.</p>
+
+<p>All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.</p>
+
+<p>No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+4. Conveying Verbatim Copies.</p>
+
+<p>You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. Conveying Modified Source Versions.</p>
+
+<p>You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:</p>
+
+<pre><code>a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+</code></pre>
+
+<p>A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+6. Conveying Non-Source Forms.</p>
+
+<p>You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:</p>
+
+<pre><code>a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+</code></pre>
+
+<p>A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.</p>
+
+<p>A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.</p>
+
+<p>“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+7. Additional Terms.</p>
+
+<p>“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:</p>
+
+<pre><code>a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+</code></pre>
+
+<p>All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+8. Termination.</p>
+
+<p>You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+9. Acceptance Not Required for Having Copies.</p>
+
+<p>You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. Automatic Licensing of Downstream Recipients.</p>
+
+<p>Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.</p>
+
+<p>An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+11. Patents.</p>
+
+<p>A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.</p>
+
+<p>A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.</p>
+
+<p>If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.</p>
+
+<p>A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+12. No Surrender of Others' Freedom.</p>
+
+<p>If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+13. Use with the GNU Affero General Public License.</p>
+
+<p>Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+14. Revised Versions of this License.</p>
+
+<p>The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+15. Disclaimer of Warranty.</p>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+16. Limitation of Liability.</p>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+17. Interpretation of Sections 15 and 16.</p>
+
+<p>If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/license.md b/erpnext/docs/license.md
new file mode 100644
index 0000000..b0310f6
--- /dev/null
+++ b/erpnext/docs/license.md

@@ -0,0 +1,184 @@
+<!-- title: License GNU General Public License (v3) -->
+
+<h1>GNU General Public License (v3)</h1>
+
+<h2>ERPNext License Info</h2>
+
+<p>(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
+ERPNext is a trademark of Frappe Technologies</p>
+
+<p>The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)</p>
+
+<h2>GNU GENERAL PUBLIC LICENSE</h2>
+
+<p>Version 3, 29 June 2007</p>
+
+<p>http://www.gnu.org/copyleft/gpl.html</p>
+
+<p>TERMS AND CONDITIONS
+0. Definitions.</p>
+
+<p>“This License” refers to version 3 of the GNU General Public License.</p>
+
+<p>“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.</p>
+
+<p>“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.</p>
+
+<p>To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.</p>
+
+<p>A “covered work” means either the unmodified Program or a work based on the Program.</p>
+
+<p>To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.</p>
+
+<p>To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+1. Source Code.</p>
+
+<p>The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.</p>
+
+<p>A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.</p>
+
+<p>The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.</p>
+
+<p>The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that same work.
+2. Basic Permissions.</p>
+
+<p>All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.</p>
+
+<p>No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+4. Conveying Verbatim Copies.</p>
+
+<p>You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. Conveying Modified Source Versions.</p>
+
+<p>You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:</p>
+
+<pre><code>a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+</code></pre>
+
+<p>A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+6. Conveying Non-Source Forms.</p>
+
+<p>You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:</p>
+
+<pre><code>a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+</code></pre>
+
+<p>A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.</p>
+
+<p>A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.</p>
+
+<p>“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+7. Additional Terms.</p>
+
+<p>“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:</p>
+
+<pre><code>a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+</code></pre>
+
+<p>All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+8. Termination.</p>
+
+<p>You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+9. Acceptance Not Required for Having Copies.</p>
+
+<p>You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. Automatic Licensing of Downstream Recipients.</p>
+
+<p>Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.</p>
+
+<p>An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+11. Patents.</p>
+
+<p>A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.</p>
+
+<p>A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.</p>
+
+<p>If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.</p>
+
+<p>A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+12. No Surrender of Others' Freedom.</p>
+
+<p>If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+13. Use with the GNU Affero General Public License.</p>
+
+<p>Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+14. Revised Versions of this License.</p>
+
+<p>The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+15. Disclaimer of Warranty.</p>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+16. Limitation of Liability.</p>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+17. Interpretation of Sections 15 and 16.</p>
+
+<p>If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>
+
+
+<!-- autodoc -->
\ No newline at end of file

diff --git a/erpnext/docs/temp.py b/erpnext/docs/temp.py
new file mode 100644
index 0000000..0cddeaa
--- /dev/null
+++ b/erpnext/docs/temp.py

@@ -0,0 +1,10 @@
+import os, re
+
+for basepath, folders, files in os.walk("."):
+	for f in files:
+		if f.endswith(".html") or f.endswith(".md"):
+			with open(os.path.join(basepath, f), "r") as c:
+				content = c.read()
+
+			for path in re.findall("""{{.?docs_base_url.?}}([^'"\)]*)""", content):
+				print path

diff --git a/erpnext/docs/user/index.md b/erpnext/docs/user/index.md
new file mode 100644
index 0000000..0394638
--- /dev/null
+++ b/erpnext/docs/user/index.md

@@ -0,0 +1,3 @@
+# User Manual and Videos
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/index.txt b/erpnext/docs/user/index.txt
new file mode 100644
index 0000000..f5c0c05
--- /dev/null
+++ b/erpnext/docs/user/index.txt

@@ -0,0 +1,2 @@
+manual
+videos

diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
new file mode 100644
index 0000000..83757e0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/contact.md

@@ -0,0 +1,47 @@
+# Contact and Address
+
+Contacts are not necessarily linked to another document. They can be stand alone, just a Contact with a First Name not linked to any other document or 
+Contacts can be linked to a Party, that is either a Customer or a Supplier.
+
+The Contact_ID is automatically created:
+
+1. If only a First Name is entered that First Name defines the ID , thus First name (only)
+2. If a First Name and a Party is linked the ID becomes “FirstName-Party”
+ 
+Contacts can, but do not have to be linked, to:  User, Customer, Supplier, and Sales Partner. Since Customers and Addresses are not directly linked to a User, all links go via Contacts.
+
+A Contact can be linked to the (web) user. If that user is also a Customer, it is linked to the Customer by the Customer ID
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+To create a new Contact go to,
+
+> CRM > Contact > New
+
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact.png">
+
+Or you can add a Contact or Address directly from the Customer record, click on “New
+Contact” or “New Address”.
+
+<img class="screenshot" alt="Contact" src="{{docs_base_url}}/assets/img/crm/contact-from-cust.png">
+
+> Tip: When you select a Customer in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”.
+
+To Import multiple Contacts and Addresses from a spreadsheet, use the Data
+Import Tool.
+
+---
+
+### Address Titles
+
+The Address Title (Name of person or organization that this address belongs to) is a free format unlinked field. The ID is automatically created from the Address Title upper score Address Type. (AdressTitle-AddressType).
+
+### Address Linking
+
+Addresses can be entered individually (unlinked)  or linked to customers, leads, suppliers or Sales Partners. 
+
+Linking is done in the reference section where the links can be established.
+
+(Contributed by Robert Becht)

diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
new file mode 100644
index 0000000..90a4228
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/customer.md

@@ -0,0 +1,72 @@
+A customer, who is sometimes known as a client, buyer, or purchaser is the one
+who receives goods, services, products, or ideas, from a seller for a monetary
+consideration. A customer can also receive goods or services from a vendor or
+a supplier for other valuable considerations.
+
+A customer is uniquely identified by the Customer ID. Normally this ID is identical to the customer Full Name, but in case of duplicate Full Name, a Name-1 is created as ID.
+
+You can either directly create your Customers via
+
+> Selling > Customer
+
+or upload it via the Data Import Tool.
+
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer.png">
+
+> Note: Customers are separate from Contacts and Addresses. A Customer can
+have multiple Contacts and Addresses.
+
+### Contacts and Addresses
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+Read [Contact]({{docs_base_url}}/user/manual/en/crm/contact.html) to know more.
+
+Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the customer information the linking of customer and User is through [Contacts]({{docs_base_url}}/user/manual/en/crm/contact.html)
+
+### Integration with Accounts
+
+In ERPNext, there is a separate Account record for each Customer, for each
+Company.
+
+When you create a new Customer, ERPNext will automatically create an Account
+Ledger for the Customer under “Accounts Receivable” in the Company set in the
+Customer record.
+
+> Advanced Tip: If you want to change the Account Group under which the
+Customer Account is created, you can set it in the Company master.
+
+If you want to create an Account in another Company, just change the Company
+value and “Save” the Customer again.
+
+### Customer Settings
+
+You can link a Price List to a Customer (select “Default Price List”), so that
+when you select that Customer, the Price List will be automatically selected.
+
+You can set “Credit Days”, so that it is automatically set due date in the Sales
+Invoices made against this Customer. Credit Days can be defined as fixed days or last day of the next month based on invoice date.
+
+You can set how much credit you want to allow for a Customer by adding the
+“Credit Limit”. You can also set a global “Credit Limit” in the Company
+master. Classifying Customers
+
+ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/crm/setup/customer-group.html) 
+and also divide them into [Territories]({{docs_base_url}}/user/manual/en/crm/setup/territory.html)
+Grouping will help you get better analysis of your data and
+identify which Customers are profitable and which are not. Territories will
+help you set sales targets for the respective territories.
+You can also mention [Sales Person]({{docs_base_url}}/user/manual/en/crm/setup/sales-person.html) against a customer.
+
+### Sales Partner
+
+A Sales Partner is a third party distributor / dealer / commission agent /
+affiliate / reseller who sells the companies products, for a commission. This
+is useful if you make the end sale to the Customer, involving your Sales
+Partner.
+
+If you sell to your Sales Partner who in-turn sells it to the Customer, then
+you must make a Customer instead.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md
new file mode 100644
index 0000000..20639a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/index.md

@@ -0,0 +1,8 @@
+#CRM
+
+ERPNext helps you track business **Opportunities** from **Leads** and
+**Customers**, send them **Quotations** and make confirmed **Sales Orders**.
+
+The CRM Module helps maintain Leads, Oppurtunities and Customers.
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/index.txt b/erpnext/docs/user/manual/en/CRM/index.txt
new file mode 100644
index 0000000..204123a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/index.txt

@@ -0,0 +1,6 @@
+lead
+customer
+opportunity
+contact
+newsletter
+setup
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
new file mode 100644
index 0000000..8bcbc05
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/lead.md

@@ -0,0 +1,60 @@
+To get the customer through the door, you may be doing all or any of the
+following:
+
+  * Listing your product on directories.
+  * Maintaining an updated and searchable website.
+  * Meeting people at trade events.
+  * Advertising your product or services.
+
+When you send out the word that you are around and have something valuable to
+offer, people will come in to check out your product. These are your Leads.
+
+They are called Leads because they may lead you to a sale. Sales people
+usually work on leads by calling them, building a relationship and sending
+information about their products or services. It is important to track all
+this conversation to enable another person who may have to follow-up on that
+contact. The new person is then able to know the history of that particular
+Lead.
+
+---
+
+Leads are the  entities constituting a first contact. Leads can be created by a system users or by a web-user. When a lead is created minimal info (name,email) is entered and the lead is (default) linked to the active system user, the owner of the lead  A user configurable drop list is used to classify Status of the lead (Open, Replied etc)
+
+To create a Lead, go to:
+
+> Selling > Lead > New Lead
+
+<img class="screenshot" alt="Lead" src="{{docs_base_url}}/assets/img/crm/lead.png">
+
+ERPNext gives you a lot of options you may want to store about your Leads. For
+example what is the source, how likely are they to give you business etc. If
+you have a healthy number of leads, this information will help you prioritize
+who you want to work with.
+
+> **Tip:** ERPNext makes it easy to follow-up on leads by updating the “Next
+Contact” details. This will add a new event in the Calendar for the User who
+has to contact the lead next.
+
+### Difference between Lead, Contact and Customer
+
+The difference is that a Lead is a potential Customer, someone who can give
+you business. A Customer is an organization or individual who has given you
+business before (and has an Account in your system). A Contact is a person who
+belongs to the Customer.
+
+A Lead can be converted to a Customer by clicking on the “Create Customer”
+button. Once the Customer is created, the Lead becomes “Converted” and any
+further Opportunities from the same source can be created against the
+Customer.
+
+---
+
+### Creation via Portal
+
+If a someone creates an account through the website interface is Lead is automatically created, status is Open and the Owner is the webuser.
+
+After registration the webform Addresses is called, where the web user can enter address information.The address is linked to the lead using the **Lead Name-Address Type** as ID.
+
+If using the Cart functionality, items are ordered the Lead is Converted and a Customer is created using the Web-User Name. Because a Customer can only be linked to a webuser using the (foreign) ID in Contact, such contact has to be created as well.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
new file mode 100644
index 0000000..c4d9c9d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md

@@ -0,0 +1,19 @@
+A newsletter is a short written report that tells about the recent activities
+of an organization. It is generally sent to members of the organization,
+potential clients customers or potential leads.
+
+In ERPNext, you can use this UI to send any type of communication to a large
+number of audience. The process of sending bulk email to a target audience is
+very simple and easy.
+
+Select the list that you want to send the email to. Fill in your content in
+the message box, and send your newsletter.If you wish to test your email, to
+see how it looks to the recepient, you can use the test function. Save the
+document before testing. A test email will be sent to your email id. You can
+send the email to all the intended receipients by clicking on the send button.
+
+<img class="screenshot" alt="Newsletter - New" src="{{docs_base_url}}/assets/img/crm/newsletter-new.png">
+
+<img class="screenshot" alt="Newsletter - Test" src="{{docs_base_url}}/assets/img/crm/newsletter-test.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
new file mode 100644
index 0000000..9f44fdf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md

@@ -0,0 +1,30 @@
+When you know a Lead is looking for some products or services to buy, you can
+track that as an Opportunity.
+
+You can create an Opportunity from:
+
+> Selling > Opportunity > New Opportunity
+
+or open a “Open” Lead and click on “Create Opportunity” button.
+
+#### Figure 1: Create Opportunity 
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/opportunity.png">
+
+You can also open a “Open” Lead and click on “Create Opportunity” button.
+
+#### Figure 2: Create Opportunity from an open Lead
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
+
+An Opportunity can also come from an existing Customer. You can create
+multiple Opportunities against the same Lead. In Opportunity, apart from the
+Communication, you can also add the Items for which the Lead or Contact is
+looking for.
+
+> Best Practice: Leads and Opportunities are often referred as your “Sales
+Pipeline” this is what you need to track if you want to be able to predict how
+much business you are going to get in the future. Its always a good idea to be
+able to track what is coming in order to adjust your resources.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
new file mode 100644
index 0000000..baf6ba4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md

@@ -0,0 +1,20 @@
+A Campaign is a full-scale implementation of a sales strategy to promote a
+product or a service. This is done in a market segment of a particular
+geographical area, to achieve specified objectives.
+
+<img class="screenshot" alt="Campaign" src="{{docs_base_url}}/assets/img/crm/campaign.png">
+
+You can track [Lead]({{docs_base_url}}/user/manual/en/crm/lead.html), [Opportunity]({{docs_base_url}}/user/manual/en/crm/opportunity.html), [Quotation]({{docs_base_url}}/user/manual/en/selling/quotation.html) against a campaign.
+
+###Track Leads against Campaign
+
+* To track a 'Lead' against a campaign select 'View Leads'.
+
+<img class="screenshot" alt="Campaign - View Leads" src="{{docs_base_url}}/assets/img/crm/campaign-view-leads.png">
+
+* You shall get a filtered list of all leads made against that campaign.
+* You can also create new leads by clicking 'New'
+
+<img class="screenshot" alt="Campaign - New Lead" src="{{docs_base_url}}/assets/img/crm/campaign-new-lead.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
new file mode 100644
index 0000000..007f445
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md

@@ -0,0 +1,14 @@
+Customer groups allow you to organize your customers. You can also have discounts based on customer groups.
+You can also get trend analysis for each
+group. Typically Customers are grouped by market segment (that is usually
+based on your domain).
+
+<img class="screenshot" alt="Customer Group Tree" src="{{docs_base_url}}/assets/img/crm/customer-group-tree.png">
+
+> Tip: If you think all this is too much effort, you can leave it at “Default
+Customer Group”. But all this effort, will pay off when you start getting
+reports. An example of a sample report is given below:
+
+![Sales Analytics]({{docs_base_url}}/assets/old_images/erpnext/sales-analytics-customer.png)
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/setup/index.md b/erpnext/docs/user/manual/en/CRM/setup/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/index.md

@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/setup/index.txt b/erpnext/docs/user/manual/en/CRM/setup/index.txt
new file mode 100644
index 0000000..3d960aa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/index.txt

@@ -0,0 +1,3 @@
+campaign
+customer-group
+sales-person
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
new file mode 100644
index 0000000..114003b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md

@@ -0,0 +1,14 @@
+Sales Persons behave exactly like Territories. You can create an organization
+chart of Sales Persons where each Sales Person’s target can be set
+individually. Again as in Territory, the target has to be set against Item
+Group.
+
+<img class="screenshot" alt="Sales Person Tree" src="{{docs_base_url}}/assets/img/crm/sales-person-tree.png">
+
+####Sales Person in Transactions
+
+You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice.
+Click [here](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions) to learn more 
+about how Sales Persons are used in the transactions of Sales Cycle.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/accounting-entries.md b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
new file mode 100644
index 0000000..7aeff24
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/accounting-entries.md

@@ -0,0 +1,58 @@
+The concept of accounting is explained with an example given below: We will
+take a "Tea Stall" as a company and see how to book accounting entries for the
+business.
+
+  * Mama (The Tea-stall owner) invests Rs 25000 to start the business.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-1.png)
+
+__Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other
+words, company is liable to pay 25000 to Mama in the future. So, account
+"Mama" is a liability account and it is credited. Company's cash balance will
+be increased due to the investment, "Cash" is an asset to the company and it
+will debited.
+
+  * The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-2.png)
+
+__Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the
+company and raw materials "Current Assets" (since they are used for day-to-day
+business), of the company. So, "Equipments" and "Stock in Hand" accounts have
+been debited to increase the value. He pays 2000, so "Cash" account will be
+reduced by that amount, hence credited and he is liable to pay 3000 to "Super
+Bazaar" later, so Super Bazaar will be credited by 3000.
+
+  * Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-3.png)
+
+__Analysis:__ Income has been booked in "Sales of Tea" account which has been
+credited to increase the value and the same amount will be debited to "Cash"
+account. Lets say, to make 325 cups of tea, it costs Rs. 800, so "Stock in
+Hand" will be reduced (Cr) by 800 and expense will be booked in "Cost of goods
+sold" account by same amount.
+
+At the end of the month, the company paid the rent amount of stall (5000) and
+salary of one employee (8000), who joined from the very first day.
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-4.png)
+
+### Booking Profit
+
+As month progress, company purchased more raw materials for the business.
+After a month he books profit to balance the "Balance Sheet" and "Profit and
+Loss Statements" statements. Profit belongs to Mama and not the company hence
+its a liability for the company (it has to pay it to Mama). When the Balance
+Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not
+yet been booked. To book profit, the following entry has to be made:
+
+![A&L]({{docs_base_url}}/assets/old_images/erpnext/assets-5.png)
+
+Explanation: Company's net sales and expenses are 40000 and 20000
+respectively. So, company made a profit of 20000. To make the profit booking
+entry, "Profit or Loss" account has been debited and "Capital Account" has
+been credited. Company's net cash balance is 44000 and there is some raw
+materials available worth 1000 rupees.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
new file mode 100644
index 0000000..61470b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md

@@ -0,0 +1,43 @@
+Some of the major accounting reports are:
+
+### General Ledger
+
+General Ledger is based on the table GL Entry and can be filtered by Account
+and between a period. This will help you to get a full update for all entries
+done in that period for that Account.
+
+<img alt="General Ledger" class="screenshot"
+    src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
+
+### Trial Balance
+
+Trial Balance is the list of Account balances for all your Accounts
+(“Ledger” and “Group”) on a particular date. For each Account it will give you
+the:
+
+  * Opening
+  * Debits
+  * Credits
+  * Closing
+
+<img alt="Trial Balance" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/trial-balance.png">
+
+The sum of all closing balances in a Trial Balance must be zero.
+
+### Accounts Payable and Accounts Receivable (AP / AR)
+
+These reports help you to track the outstanding invoices sent to Customer and
+Suppliers. In this report, you will get your outstanding amounts period wise.
+i.e. between 0-30 days, 30-60 days and so on.
+
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+
+### Sales and Purchase Register
+
+In this report, each tax Account is transposed in columns. For each Invoice and
+invoice Item, you will get the amount of individual tax that has been paid,
+based on the Taxes and Charges table.
+
+<img alt="Sales Register" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/sales-register.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
new file mode 100644
index 0000000..042e800
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md

@@ -0,0 +1,62 @@
+Payment done by the customer before accepting delivery of the product is an
+Advance Payment. For Orders of high value, the business houses expect to
+receive advance.
+
+  
+__For Example:__ Consider a customer- Jane D'souza placing an order for a double
+bed costing $10000 She is asked to give some advance before the furniture
+house begins work on her order. She gives them $5000 in cash.
+
+  
+Go to Accounts and open a new Journal Entry to make the advance entry.
+
+> Accounts > Documents > Journal Entry > New Journal Entry  
+
+Mention the voucher type as cash voucher. This differs for different
+customers. If somebody pays by cheque the voucher type will be Bank Voucher.
+Then select the customer account and make the respective debit and credit
+entries.  
+
+Since the customer has given $5000 as cash advance,it will be recorded as a
+credit entry against the customer. To balance it with the debit entry [Double
+accounting Entry] enter $5000 as debit against the company's cash account. In
+the row "Is Advance" click 'Yes'.
+
+#### Figure 1 : Journal Entry -Advance Entry  
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-1.png">
+
+### Double Entry Accounting  
+
+Double entry bookkeeping is a system of accounting in which every transaction
+has a corresponding positive and negative entry : debits and credits. Every
+transaction involves a [debit entry
+](http://www.e-conomic.co.uk/accountingsystem/glossary/debit)in one account
+and a [credit
+entry](http://www.e-conomic.co.uk/accountingsystem/glossary/credit) in another
+account. This means that every transaction must be recorded in two accounts;
+one account will be debited because it receives value and the other account
+will be credited because it has given value.
+
+  
+#### Figure 2: Transaction and Difference Entry
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-2.png">
+
+Save and submit the JV. If this document is not saved it will not be pulled in
+other accounting documents.
+
+When you make a new Sales Invoice for the same customer, mention the advance
+in the Sales Invoice Form.
+
+To link the Sales Invoice to the Journal Entry which mentions the advance
+payment entry, click on ‘Get Advances Received’.  Allocate the amount of
+advance in the advances table. The accounting will be adjusted accordingly.
+
+#### Figure 3: Receive Advance 
+
+<img class="screenshot" alt="Advace Payment" src="{{docs_base_url}}/assets/img/accounts/advance-payment-3.png">
+
+Save and submit the Sales Invoice.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
new file mode 100644
index 0000000..6eba288
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md

@@ -0,0 +1,72 @@
+<h1>Accounting for Projects</h1>
+
+Accounting for the projects is tracked via Cost Center in ERPNext. This will require you creating separate Cost Center for each Project. Separate Cost Center for each Project all allow:<
+
+- Allocating budget against specific Cost Center.
+- Getting Profitability Report for each Project.
+
+Let's check steps on how Project and Cost Center should be linked, and used in the sales and purchase transactions.
+
+### 1. Linking Project and Cost Center
+
+#### 1.1 Create Project
+
+You should first create new Project from:
+
+`Projects > Project > New`
+
+In the Project, you will find field to set default Cost Center for this Project.
+
+#### 1.2 Create Cost Center
+
+Since budgeting and costing for each Project will be managed separately, you should create separate Cost Center for each Project.
+
+To create new Cost Center, go to:
+
+`Accounts > Setup > Cost Center`
+
+[Click here to learn on how to add new Cost Center](https://erpnext.com/user-guide/accounts/cost-centers-and-budgeting).
+
+#### 1.3 Update Cost Center in the Project
+
+After creating Cost Center, come back to Project master, and select Cost Center creating for this Project under Default Cost Center field.
+
+![Project Default Cost Center]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 3.52.10 pm.png)
+
+With this, you will have Cost Center being fetched automatically in the Sales and Purchase transactions based on selection of Cost Center.
+
+Let's check how this setting will affect your sales and purchase entries.
+
+### 2. Selecting Project and Cost Center in the Sales and Purchase Transactions
+
+#### 2.1 Selecting Project in the Sales Transactions
+
+In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction.
+
+![Cost Center in Sales]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 3.58.45 pm.png)
+
+#### 2.2 Selecting Project in the Purchase Cycle Transactions
+
+In the purchase transactions, Project will be define for each item. This is because you can create a consolidated purchase entry of materials for various projects. Just like it works in sales cycle, same way in the purchase transactions, on selection of Project, its default cost center will be fetched automatically.
+
+![Cost Center in Purchase]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 4.20.30 pm.png)
+
+### 3. Accounting Report for a Project
+
+#### 3.1 Projectwise Profitability
+
+Since Project's Cost Center has been updated in both sales and purchase entries made for a specific transaction, system will provide you a projectwise profitability report. Profitability for a Project will be derived based on total value income booked minus total value of expense booked where common Cost Center (of a Project) is tagged.
+
+![Financial Analytics for a Project]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-26 at 4.10.37 pm.png)
+
+#### 3.2 Projectwise Budgeting
+
+If you have also define budgets in the Cost Center of a Project, you will get Budget Variance Report for a Cost Center of a Project.
+
+To check Budget Variance report, go to:
+
+`Accounts > Standard Reports > Budget Variance Report`
+
+[Click here for detailed help on how to do budgeting from Cost Center](https://erpnext.com/user-guide/accounts/budgeting).
+
+<!-- markdown -->

diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
new file mode 100644
index 0000000..c2f2061
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/c-form.md

@@ -0,0 +1,47 @@
+<h1>C-Form</h1>
+
+C-Form functionality is only applicable for Indian customers.
+
+**What is C-Form?**
+
+C-Form is issued by the Customer. If Customer Issues C-Form, supplier applies discounted CST (central sales tax) in the invoice. C-Form is only applicable on the inter-state transactions.
+
+C-Form functionality in ERPNext allows Supplier to update C-Form No. as received from Customer in the submitted Sales Invoice. Also you can create report on Sales Invoice and track invoices for which C-Form has not yet been received from Customer.
+
+Following are step to manage C-Form related sales in ERPNext.
+
+####Set C-Form Applicability
+
+While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value.
+ 
+![C-form]({{docs_base_url}}/assets/img/articles/Selection_0028c9f9a.png)
+
+Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer.
+
+####Create C-Form Record
+
+After receiving C-Form from your Customer, you should update that C-Form no. in the Sales Invoice by creating C-Form record.
+
+Go to `Accounts > Setup > C-Form > New`
+
+Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table.
+
+![New C-Form]({{docs_base_url}}/assets/img/articles/Selection_020f01c1e.png)
+
+####Save & Submit C-Form
+
+After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice.
+
+![C-Form]({{docs_base_url}}/assets/img/articles/Selection_02178f9d6.png)
+
+C-Form serial no will be updated in related invoice under the field 'C-Form No'.
+
+![C-Form No]({{docs_base_url}}/assets/img/articles/Selection_022b7c6d5.png)
+
+####Tracking Pending Invoice for C-Form
+
+To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly.
+
+![C-Form Report]({{docs_base_url}}/assets/img/articles/Selection_026.png)
+
+<!-- markdown -->

diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
new file mode 100644
index 0000000..02cbd66
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md

@@ -0,0 +1,28 @@
+<h1>Changing Parent Account</h1>
+
+Chart of Account has hierarchical structure. This means each account has a parent account defined for it. You will have few ledger preset, and few ledger (like for Customer, Supplier, Warehouse) will be auto-created based on their master record. These ledger will be placed under pre-defined groups in the Chart of Account. If needed you can place specific account under another group by changing its Parent Account.
+
+Following are the steps to edit Parent for specific Account.
+
+####1. Go to Chart of Account
+
+`Accounts > Setup > Chart of Account`
+
+Click on Account for which Parent Account is to be changed.
+
+####2. Edit Account
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_080.png)  
+
+####3. Change Parent Account
+
+Search and select preferred Parent Account and save.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_084.png)
+
+Refresh system from Help menu to experience the change.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_085.png)
+
+<div class="well">Note: Change of Parent Account is not applicable for Root Accounts.</div>
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
new file mode 100644
index 0000000..6770fa3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md

@@ -0,0 +1,27 @@
+<h1>Customer for Multiple Company</h1>
+
+ERPNext allows you managing multiple companies in one ERPNext account. It is possible that you will have Customer and Supplier which would belong to more than one company of yours. While creating sales and purchase transactions, system shows result of Customer and Suppliers for that Company only.
+
+It means if you have added (say) Wind Mills Limited as a customer for the first company, you will not be able to select it as a customer when creating Sales Order (or any other sales transaction) for another company.
+
+There are two approach to address this scenario.
+
+####Create Another Customer Record
+
+You should create another Customer record for Wind Mills Limited, but for the second company.
+
+If you try adding another customer with exact same name (as Wind Mills Limited), system will throw a validation message that, account already exist for Wind Mills Limited.
+
+![Common Customer]({{docs_base_url}}/assets/img/articles/$SGrab_306.png)
+
+>To be able to track customerwise receivables, ERPNext created accounting ledger for each customer in the Chart of Account, under Accounts Receivable group.
+
+As indicated in the error message, since Account Name already exist for the first customer, you should change customer name for second customer a bit (say Wind Mills Pvt. Limited) to bring uniqueness in it. Then you will be able to save Customer correctly.
+
+####Change Company in Existing Customer
+
+Since creating another Customer record for the same party will be over-load in the system, you can change company in the exist Customer master of Wind Mills Limited, and re-save it. On saving customer again, it will create another accounting ledger for Wind Mills in the Chart of Account of second company.
+
+![Common Customer Account]({{docs_base_url}}/assets/img/articles/$SGrab_307.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
new file mode 100644
index 0000000..026657f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md

@@ -0,0 +1,30 @@
+<h1>Depreciation for Fixed Asset Items</h1>
+
+Depereciation of fixed asset items.
+
+####Separate Group of Depreciation Account
+
+![Fixed Asset Account]({{docs_base_url}}/assets/img/articles/$SGrab_384.png)
+
+####Depreciation Entry for Fixed Asset Items
+
+Depreciation is when you write off certain value of your assets as an expense. For example if you have a computer that you will use for say 5 years, you can distribute its expense over the period and pass a
+Journal Voucher at the end of each year reducing its value by a certain percentage.
+
+As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. In the Stock Reconciliation template, you should only enter Item's Code, Warehouse and its current value.
+
+Let's assume current value of our computer is $250, and its purchase value was $320.
+
+![Fixed Asset Depreciation]({{docs_base_url}}/assets/img/articles/$SGrab_385.png)
+
+In this case, depreciation amount of Computer will be $70 ($320-$250). Depreciation Amount will be booked under Difference (expense) Account selected in the stock reconciliation.
+
+![Fixed Asset Depreciation]({{docs_base_url}}/assets/img/articles/$SGrab_386.png)
+
+Following is how general ledger will be posted for fixed this Stock Reconciliation.
+
+![Fixed Asset General Ledger]({{docs_base_url}}/assets/img/articles/$SGrab_387.png)
+
+Click [here](https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item) for steps to be followed when making Stock Reconciliation entry.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
new file mode 100644
index 0000000..30cae4e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html

@@ -0,0 +1,16 @@
+<h1>Difference Entry Button </h1>
+
+As per accounting standards Debit amount must be equal to Credit amount. If these amounts are not equal, then entry will not be executed in system. Also system will through validation message. And difference amount will reflect under Difference (Dr-Cr) field.
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_002.png"><br>
+When you press 'Make Difference Entry' button, one new Row will be added under Journal Entry Accounts table with difference amount. You can edit that row to select appropriate account.
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_003.png">
+<br>
+<br>On selecting account under new row, you will be able to submit Journal Entry.
+<br>
+<br>
+<div class="well">If debit and credit amount entered for accounts are already tallying, then you need not click on "Make Difference Entry" button.</div>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
new file mode 100644
index 0000000..e22a3ef
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md

@@ -0,0 +1,32 @@
+<h1>Fixing Fiscal Year's Error</h1>
+
+While creating entries in ERPNext, system validates if dates (like Posting Date, Transaction Date etc.) matches with Fiscal Year selected in the entry. If not, system through an error message saying:
+
+`Date ##-##-#### not in fiscal year`
+
+You are more likely to receive this error message if your Fiscal Year has changes, but you still have old Fiscal Year updated. To ensure new Fiscal Year is auto updated in the transactions, you should setup your master as instructed below.
+
+####Create New Fiscal Year
+
+Only User with System Manager's Role Assigned has permission to create new Fiscal Year. To create new Fiscal Year, go to:
+
+`Accounts > Setup > Fiscal Year`
+
+Click [here](https://erpnext.com/user-guide/accounts/fiscal-year) to learn more about Fiscal Year master.
+
+####Set Fiscal Year as Default
+
+After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
+
+![Fiscal Year Default]({{docs_base_url}}/assets/img/articles/$SGrab_393.png)
+
+Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
+
+`Setup > Settings > Global Default`
+
+![Fiscal Year Global Default]({{docs_base_url}}/assets/img/articles/$SGrab_394.png)
+
+Then Save Global Default, and refresh browser of your ERPNext account. After this, you will have default Fiscal Year auto-updated in your transactions as well.
+
+Note: In transactions, you can manually select required Fiscal Year from More Info section. You might have to click on "View Details" button to access View Details section, and edit Fiscal Year.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
new file mode 100644
index 0000000..38ecaf5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html

@@ -0,0 +1,3 @@
+<h1>How to freeze accounting entries upto a specific date?</h1>
+
+To freeze accounting entries upto a certain date, follow these steps:<br><br>1. Go to <b>Accounts -&gt; Setup -&gt; Accounts Settings</b>.<br>2. Set the date in <b>Accounts Frozen Upto</b> field.<br><img src="{{docs_base_path}}/assets/img/articles/freeze-accounting-entry.png" height="302" width="488"><br><br>Now, the system will not allow to make accounting entries before that date. <br><br>But you can allow a specific <b>Role,</b> to make/edit accounting entries before that date. To do that set the desired <b>Role</b>, in <b>Role Allowed to Set Frozen Accounts &amp; Edit Frozen Entries</b> field.<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
new file mode 100644
index 0000000..d76a331
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md

@@ -0,0 +1,28 @@
+<h1>How To Freeze Accounting Ledger?</h1>
+
+You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
+
+#### 1. Set Frozen Accounts Modifier
+
+To set frozen accounts modifier go to `Accounts > Setup > Accounts Setting`
+
+Search and select Role under Frozen Accounts Modifier field and save the Account Settings form. 
+   
+![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_001f1e2ff.png)
+
+#### 2. Edit Accounting Ledger.
+
+To edit accounting ledger go to `Accounts > Setup > Chart of Accounts`
+
+![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_0027e4d09.png)
+
+#### 3. Set Frozen Status of Ledger.
+
+![Account Settings]({{docs_base_url}}/assets/img/articles/Selection_003bf981b.png)
+
+Set Frozen field status of ledger as 'Yes' and save the ledger form. On save this ledger will be frozen and you will became unable to search this ledger in accounting transactions. 
+
+<div class ="well"> Note: If you want to make accounting transaction against this ledger in the future, then that time again set frozen field status as 'No'.</div>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
new file mode 100644
index 0000000..5ba6d17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md

@@ -0,0 +1,16 @@
+<h1>How to Nullify Balance From Temporary Accounts? </h1>
+
+There are two separate temporary accounts in Chart of Accounts. One is Temporary Account (Assets) and other one is Temporary Account (Liabilities). These accounts are available under Application of Funds and Source of Funds in Chart of Accounts respectively.
+
+These temporary accounts only used to update opening balances. [Click here to learn about update Opening balances](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account)
+
+After completing all opening entries against these temporary accounts balances for both accounts will updated. And Debit balance of Temporary Account (Assets) will became equal to Credit balance of Temporary Account (Liabilities).
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it.
+To nullify balance in these accounts, you should create a new Journal Voucher, where will you update  balances against these accounts. To create new Journal Entry go to `Accounts &gt; Documents &gt; Journal Entry
+
+![Journal Entry]({{docs_base_url}}/assets/img/articles/$SGrab_432.png)
+
+On submit of this journal entry, balances of these temporary accounts will be set to Zero.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.md b/erpnext/docs/user/manual/en/accounts/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
new file mode 100644
index 0000000..08a69e3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt

@@ -0,0 +1,21 @@
+accounting-for-projects
+c-form
+changing-parent-account
+customer-for-multiple-company
+depreciation-for-fixed-asset-items
+difference-entry-button
+fiscal-year-error
+how-to-freeze-accounting-entries-upto-a-specific-date
+how-to-freeze-accounting-ledger
+how-to-nullify-balance-from-temporary-accounts
+manage-foreign-exchange-difference
+managing-transactions-in-multiple-currency
+new-fiscal-year-auto-create-feature
+pos-view
+post-dated-cheque-entry
+pricing-rule
+recurring-order-and-invoices
+update-stock-option-in-sales-invoice
+updating-opening-balance-in-accounts-using-temporary-account
+what-is-the-differences-of-total-and-valuation-in-tax-and-charges
+withdrawing-salary-from-owners-equity-account

diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
new file mode 100644
index 0000000..6e24f86
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md

@@ -0,0 +1,25 @@
+<h1>Manage Foreign Exchange Difference</h1>
+
+When you book Sales Invoices and Purchase invoices in multiple currencies, you will have to deal with currency difference while booking payment entry. You can easily manage this in ERPNext in following ways.  
+
+####Add Expense Account
+
+To mange currency difference, create Account **Foreign Exchange Gain/Loss**.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_577.png)
+
+####Book Payment Entry
+
+In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/ Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
+
+####Scenario
+
+Below is the Sales Invoice for a customer in Europe. The base currency of a Company in USD. Sales Invoice is  made at the exchange rate (USD to Eur) of 1.128.
+
+![Sales Invoice]({{docs_base_url}}/assets/img/articles/Selection_576.png)
+
+When receiving payment from the customer, exchange rate changed to 1.20. As per the update in the exchange rate, payment was for $120. Following is how payment entry will be booked to adjust the difference amount.
+
+![Journal Entry image]({{docs_base_url}}/assets/img/articles/Selection_578.png) 
+
+<!-- markdown -->

diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
new file mode 100644
index 0000000..3757a69
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html

@@ -0,0 +1,39 @@
+<h1>Managing Transactions In Multiple Currency</h1>
+
+You can make transaction in your base currency as well as in customer or supplier currencies. When you make transaction in your customer or supplier currency, the same currency reflects only in print format of that transaction. And system pass back end
+entry in your base currency.
+<br>
+<br>To understand this scenario will take example of Sales Invoice, where your base currency is INR and your customer currency is USD.
+<br>
+<br>Following are steps to create Sales Invoice in customer currency.
+<br>&nbsp;
+<br><b>Step 1:</b> Go to Selling &gt;&gt; Documents &gt;&gt; Sales Invoice &gt;&gt; (+) New.
+<br>
+<br><b>Step 2:</b> Select Customer and Enter other details.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_012.png">
+<br><b>Step 3:</b> Select customer currency and related Price List.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_016.png">
+<br>
+<br>
+<br>On selecting customer currency 'Exchange Rate' field will open under Currency field, where you will enter exchange rate of customer currency to basic currency. In our case for USD to INR. You can check exchange rate online
+for your customer currency to your currency.
+<br>
+<br>Also you can set default customer currency in customer master. Which will auto fetch in transactions.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_017.png">&nbsp;
+<br>System has Currency Exchange master, where you can set currency exchange masters for your multiple currencies. To Set this go to Accounts &gt; Setup &gt; Currency Exchange. <br><br><b>Step 4:</b> Select Item details.<br>
+<br>On selecting Item details Sales invoice Total section will look like below image.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_018.png" width="750">
+<br>
+<br>
+<br>
+<b>Step 5:</b> Save and Submit <br><br>Enter other details like Taxes and charges, Terms and Condition if there and save and submit the invoice form. After submit click on Printer Icon to check print preview. The same document print or email document will you send to your customer or supplier.<br>For our case it will look as below image.<br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_019.png">&nbsp;&nbsp; <br>
+<br>
+<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
new file mode 100644
index 0000000..5b6c10f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html

@@ -0,0 +1,3 @@
+<h1>New Fiscal Year Auto-Create feature</h1>
+
+New Fiscal Year needs to be created each year at the end of the previous fiscal year. This Process however has been automated in ERPNext.<div><br></div><div>3 days prior to the end of the existing fiscal year; the system shall check if the user has created a new fiscal year for the incoming year. If not the system generates a new fiscal year. All fiscal year Companies are also linked with the new fiscal year as in the previous year.<br><br></div><div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-03 at 5.03.10 pm.png"><br></div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/pos-view.html b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
new file mode 100644
index 0000000..fb3c500
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html

@@ -0,0 +1,3 @@
+<h1>POS View</h1>
+
+POS view renders form in a different layout, mainly designed for the quick selection of items. This view has primarily been designed for the retail business, who needs to be quick at invoicing.<div><br></div><div><img src="{{docs_base_path}}/assets/img/articles/$SGrab_219.png"><br></div><div><br></div><div>Using POS View, you can make complete Sales Invoice, without switching to standard form view.<br><div><br></div><div><b>Question: Why do I get error message for missing fields when making Purchase Receipt or other sales/purchase transactions from POS View?</b></div></div><div><br></div><div>Though POS View is mainly designed for Sales Invoice, but it is also made available in all the sales and purchase transactions. In other transactions, POS View is only meant for quick selection of items. This view will not provide all the fields which are available in the standard form view. Hence, you shall use POS View in other transactions just for Item selection, and revert to form view for enter values in other mandatory fields.</div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
new file mode 100644
index 0000000..12957d9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md

@@ -0,0 +1,32 @@
+<h1>Post Dated Cheque Entry</h1>
+
+Post Dated Cheque is a cheque dated on future date given to another party. This actually works as an advance payment which will could be cleared post cheque date only.
+
+In ERPNext, you can manage post dated cheque entries via journal voucher. Following are step to book payment entry for post dated cheque.
+
+####New Journal Voucher
+
+To open new journal voucher go to 
+
+`Accounts > Documents > Journal Voucher > New`
+
+####Set Posting Date and other details
+
+Assuming your Cheque Date is 31st December, 2014 (or any future date) and you need value of this cheque to reflect in the bank balance after cheque date only.
+
+![Journal Voucher]({{docs_base_url}}/assets/img/articles/Selection_005d73bc7.png)
+
+Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+
+####Step 3: Save and Submit Journal Voucher
+
+After entering required details Save and Submit the Journal Voucher.
+
+####Adjusting Post Dated  Cheque Entry
+
+If Post Dated Journal Voucher needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool](https://erpnext.com/user-guide/accounts/payment-reconciliation).
+
+When cheque is cleared in the future date, i.e. actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](https://erpnext.com/user-guide/accounts/bank-reconciliation).
+
+You might find value of this Journal Voucher already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of balance as per system, and balance expected in the bank.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
new file mode 100644
index 0000000..f1caf62
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md

@@ -0,0 +1,75 @@
+<h1>Pricing Rule</h1>
+
+Pricing Rule allows you to define rules based on which item's price or discount to be applied is determined.
+
+### Scenario:
+
+Following are the few cases which can be addressed using Pricing Rule.
+
+1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount. 
+
+2. For Customer "XYZ", selling price for the specific or group of "Products" should be updated as ###.
+
+3. Items categorized under specific Item Group has same selling or buying price.
+
+4. Customers catering to specific Customer Group has same selling price.
+
+5. Supplier's categorized under common Supplier Type should have same buying rate applied.
+
+To have %Discount and Price List Rate for an Item auto-applied, you should set Pricing Rules for it.
+
+Pricing Rule master has two sections:
+
+### 1. Applicability Section:
+
+In this section, conditions are set for the Pricing Rule. When transaction meets condition as specified in the Pricing Rule, Price or Discount as specified in the Item master will be applicable. You can set condition on following values.
+
+####1.1 Applicable On:
+
+![Applicable On]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.26.23 pm.png)
+
+If you want Pricing Rule to be applied on all the items, you should apply rule based on Item Group, and select most Parent Item Group for a value.
+
+####1.2 Applicable For:
+
+Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
+
+![Applicable for]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.27.31 pm.png)
+
+####1.3 Quantity:
+
+Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
+
+![Pricing Rule Qty limit]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.28.05 pm.png)
+
+###2. Application:
+
+Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+
+![Pricing Rule Apply on]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.33.24 pm.png)
+
+####2.1 Price
+
+Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+
+![Pricing Rule Price]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.30.27 pm.png)
+
+####2.2 Discount Percentage
+
+Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
+
+![Rule Discount Percent]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.31.01 pm.png)
+
+#### Validity
+
+Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
+
+![Pricing Rule Validity]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.36.29 pm.png)
+
+####Disable
+
+Check Disable to inactive specific Pricing Rule.
+
+![Pricing Rule Disabled]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-09 at 1.37.38 pm.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
new file mode 100644
index 0000000..6893761
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html

@@ -0,0 +1,3 @@
+<h1>Recurring Orders and Invoices</h1>
+
+If you have a contract with a <b>Customer</b> where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices. <br><br><h4>Scenario:</h4><br>Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Order for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Order as recurring. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer.<br><br>Feature of setting document as recurring is available in Sales Order, Sales Invoice, Purchase Order and Purchase Invoice.<br><br>Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check <b>Is Recurring</b> to set document as recurring.<br><br><img src="{{docs_base_path}}/assets/img/articles/is-recurring.gif"><br><br><b>From Date and To Date: </b>This defines contract period with the customer.<br><br><b>Repeat on the Day of Month: </b>If recurring type is set as Monthly, then it will be day of the month on which&nbsp; recurring invoice will be generated.<br><br><b>End Date:</b> Date after which auto-creation of recurring invoice will be stopped.<br><br><b>Notification Email Address:</b> Email Addresses (separated by comma) on which recurring invoice will be emailed when auto-generated.<br><br><b>Recurring ID: </b>Recurring ID will be original document id which will be linked to all corresponding recurring document. For example, original Sales Invoice's id will be updated into all recurring Sales Invoices.<br><br><b>Recurring Print Format:</b> Select a print format to define document view which should be emailed to customer.<br><br><h4>Exception Handling:</h4><p>In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.</p><p>Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.</p><p>On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.<br></p>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
new file mode 100644
index 0000000..106f383
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html

@@ -0,0 +1,3 @@
+<h1>Update Stock Option in Sales Invoice</h1>
+
+The <i>Update Stock</i> check box is available in the <i>Items</i> section within <i>Sales Invoice</i> form.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_updatestk_field.png" height="221" width="603"><br><br>Usually the Sales Invoice is a voucher specifying the amount to be paid against Quantity delivered/to be delivered as per a particular Sales Order.<br><br>Checking the update Stock option before submitting an Invoice will directly deduct the Stock from the Inventory on submission of the Sales Invoice. In such a case the Sales Invoice also satisfies the function of a Delivery Note.<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
new file mode 100644
index 0000000..4962b82
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md

@@ -0,0 +1,44 @@
+<h1>Updating Opening Balance in Accounts using Temporary Account</h1>
+
+For updating opening balances in the Accounts, you will need to use temporary adjustment accounts. In the Chart of Account, two adjustment accounts will be created by default.
+
+1. Temporary Account (Assets)
+2. Temporary Account (Liabilities)
+
+Since ERPNext is a double entry accounting system, it requires balancing on debit side with credit side in an accounting entry. When start working on fresh ERPNext account, you will have to update opening balance in your Balance Sheet accounts. You can update opening balance in account(s), and use Temporary Account for balancing purpose.
+
+Let's consider a scenario of updating opening balance in an Account using temporary account.
+
+#### Identifying Accounts to Update Opening Balance
+
+Say we have following customer's ledger, and have receivable from them. This receivable should be updated as opening balance in their account.
+
+1. Comtek Solutions
+1. Walky Tele Solution
+
+Also we can update opening balance on Bank and Cash account.
+
+1. Bank of Baroda
+1. Cash
+
+All these accounts are located on the Current Asset side, hence will have Debit balance.
+
+#### Identifying Temporary Account
+
+To update debit balance in them, we will have to select Credit account for balancing it. Out of the temporary accounts available, we can use `Temporary Account (Liabilities)`.
+
+##### Opening Balance Entry
+
+For Current Asset account, their current balance will be updated on the Debit side. The total value of Debit will be entered as Credit Balance for the Temporary Account (Liability).
+
+![Debit Opening Balance]({{docs_base_url}}/assets/img/articles/$SGrab_431.png)
+
+Same way, you will update opening balance for the liability account. Since Liability accounts will have credit balance, you will have to select Temporary Account (Asset), which is a Debit account for balancing purpose.
+
+After you have updated opening balance in all the Asset and Liability account, you will find that balance in the temporary account will be equal. If balance in temporary accounts is not equal, it must be because opening balance is not updated in some account, or other account was used for balancing purpose.
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it. To nullify balance in these accounts, you should create a Journal Voucher which will set balance as zero in these account.
+
+![Temporary Account Nullified]({{docs_base_url}}/assets/img/articles/$SGrab_432.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
new file mode 100644
index 0000000..3d1c7db
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html

@@ -0,0 +1,34 @@
+<h1>Purchase Tax or Charges Categories</h1>
+
+Consider Tax or Charge field in Purchase Taxes and Charges master has three values.<br><br><ol>
+    <li>Total</li>
+    <li>Valuation</li>
+    <li>Total and Valuation<br><br><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-04-15 at 6.04.02 pm.png"><br></li>
+</ol>
+<p>Let's consider an example to understand an effect of value selected in Consider Tax or Charge field.</p>
+<p>We purchase 10 units of item, at the rate of 800, total purchase amount would be 800. Purchased item has 4% VAT tax and INR 100 transportation charges were incurred.
+
+</p><h4>Total:</h4>
+
+<p>An amount of tax/charge categorized Total will be accounted in the total of purchase transactions, but not in the value of purchased item.</p>
+<p>If VAT 4% is applied on item, it will amount to INR 32. Since VAT is the <a href="https://frappe.io/blog/erpnext-features/managing-consumption-tax" target="_blank">consumption tax</a>, its should be added value of Purchase Order/Invoice, since it will
+    be included in payable towards supplier, but its should not be added to the value of Purchased item.</p>
+<p>Hence for tax or charge you wish to be added to transaction total but not to the valuation of item, it should be categorized as Total.</p>
+<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account.
+    <br>
+</p>
+<h4>Valuation:</h4>
+<p>An amount of tax/charge categorized as Valuation will be added in the value of purchased item, but will not be added to the value of purchase transaction.</p>
+<p>Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, it will be not be added to the total of purchase transaction, because it should not be reflected to supplier,
+    as it will be irrelevant for them.
+    <br>
+</p>
+<p>When Purchase Invoice is submitted, value of tax/charge is booked in respective account. Transportation expense will be booked
+    <br>
+</p>
+<h4>Total and Valuation:</h4>
+<p>An amount of tax/charge categorized as for Total and Valuation will be added in the value of purchase item, as well as will be included in the totals of purchase transactions.</p>
+<p>Let's assume that transporter was arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this INR 100 transportation charges will be
+    added to actual purchase amount of INR 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
+    <br>
+</p>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
new file mode 100644
index 0000000..860f6eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md

@@ -0,0 +1,21 @@
+<h1>WIthdrawing Salary from Owner's Equity Account</h1>
+
+### Question
+
+After meeting with my accountant here in the US, I was informed that with my company being a sole member, I should not pay myself a salary that would hit the direct expenses account but instead should take a "draw" that hits the balance sheet and not the expenses. Can you please advise how I should set this up in ERP Next please?
+
+### Answer
+
+1. Create an account for **Owner's Equity** under Liabilities if you already do not have. This account will be your investment in the business and the accumulated profits (or losses). It will have a "Credit" type balance.
+2. In an Version 5, Equity will be a new head (not under Liabilities). (In either case Assets = Owner's Equity + Liabilities, so your balance sheet will be okay [Learn more about owner's equity account](http://www.accountingcoach.com/blog/what-is-owners-equity)).
+3. Create an account for **Owner's Draws** under **Owner's Equity**.
+4. Note that the balance of **Owner's Draws** will always be negative since you are reducing money from your total equity / profits.
+
+### Example
+
+Example journal entry (using Journal Voucher in ERPNext) for a withdrawal of $1000 would be:
+
+1. Credit **Cash** $1000
+2. Debit **Owner's Draws** $1000
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
new file mode 100644
index 0000000..a5f35d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md

@@ -0,0 +1,58 @@
+ERPNext will help you set and manage budgets on your Cost Centers. This is
+useful when, for example, you are doing online sales. You have a budget for
+search ads, and you want ERPNext to stop or warn you from over spending, based
+on that budget.
+
+Budgets are also great for planning purposes. When you are making plans for
+the next financial year, you would typically target a revenue based on which
+you would set your expenses. Setting a budget will ensure that your expenses
+do not get out of hand, at any point, as per your plans.
+
+You can define it in the Cost Center. If you have seasonal sales you can also
+define a budget distribution that the budget will follow.
+
+In order to allocate budget, go to Accounts > Setup > Chart of Cost Centers and click on Chart of Cost Center.
+Select a Cost Center and click on Open.
+
+#### Step 1: Click on Edit.
+
+![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-1.png)  
+
+<img alt="Accounts Receivable" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+
+#### Step 2: Enter Monthly Distribution.
+
+![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-2-1.png)
+
+
+If you leave the** **distribution ID blank, ERPNext will calculate on a yearly
+basis or in equal proportion for every month.
+
+#### Step 3:Add New Row and select budget account.  
+
+
+
+![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-3.png)  
+
+
+
+### To Create New Distribution ID
+
+ERPNext allows you to take a few budget actions. It signifies whether to stop
+, warn or Ignore  if you exceed budgets.  
+
+![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4.png)
+
+
+
+These can be defined from the Company record.
+
+![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4-1.png)  
+
+
+
+Even if you choose to “ignore” budget overruns, you will get a wealth of
+information from the “Budget vs Actual” variance report. This report shows
+month wise actual expenses as compared to the budgeted expenses.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
new file mode 100644
index 0000000..99760e7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md

@@ -0,0 +1,128 @@
+The Chart of Accounts forms the blueprint of your organization. The overall
+structure of your Chart of Accounts is based on a system of double entry
+accounting that has become a standard all over the world to quantify how a
+company is doing financially.
+
+The Chart of Accounts helps you to answer:
+
+  * What is your organisation worth?
+  * How much debt have you taken?
+  * How much profit are you making (and hence paying tax)?
+  * How much are you selling?
+  * What is your expense break-up
+
+You may note that as a business manager, it is very valuable to see how well
+your business is doing.
+
+> Tip: If you can’t read a Balance Sheet (It took me a long time to
+figure this out) it's a good opportunity to start learning about this. It will
+be worth the effort. You can also take the help of your accountant to setup
+your Chart of Accounts.
+
+Financial statement of your company is easily viewable in ERPNext. An Example
+of a financial statement is given below:
+
+<img class="screenshot" alt="Financial Analytics Balance Sheet" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-bl.png">
+
+To edit your Chart of Accounts in ERPNext go to:
+
+>  Accounts > Setup > Chart of Accounts
+
+Chart of Accounts is a tree view of the names of the Accounts (Ledgers and
+Groups) that a Company requires to manage its books of accounts. ERPNext sets
+up a simple chart of accounts for each Company you create, but you have to
+modify it according to your needs and legal requirements. For each company,
+Chart of Accounts signifies the way to classify the accounting entries, mostly
+based on statutory (tax, compliance to government regulations) requirements.
+
+Let us understand the main groups of the Chart of Accounts.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-1.png">
+
+### Balance Sheet Accounts
+
+The Balance Sheet has Application of Funds (/assets) and Sources of Funds
+(Liabilities) that signify the net-worth of your company at any given time.
+When you begin or end a financial period, all the Assets are equal to the
+Liabilities.
+
+> Accounting: If you are new to accounting, you might be wondering, how can
+Assets be equal to Liabilities? That would mean the company has nothing of its
+own. Thats right. All the “investment” made in the company to buy assets (like
+land, furniture, machines) is made by the owners and is a liability to the
+company. If the company would want to shut down, it would need to sell all the
+assets and pay back all the liabilities (including profits) to the owners,
+leaving itself with nothing.
+
+All the accounts under this represent an asset owned by the company like "Bank
+Account", "Land and Property", "Furniture" or a liability (funds that the
+company owes to others) like "Owners funds", "Debt" etc.
+
+Two special accounts to note here are Accounts Receivable (money you have to
+collect from your customers) and Accounts Payable (money you have to pay to
+your suppliers) under Assets and Liabilities respectively.
+
+### Profit and Loss Accounts
+
+Profit and Loss is the group of Income and Expense accounts that represent
+your accounting transactions over a period.
+
+Unlike Balance sheet accounts, Profit and Loss accounts (or PL accounts) do
+not represent net worth (/assets), but rather represent the amount of money
+spent and collected in servicing customers during the period. Hence at the
+beginning and end of your Fiscal Year, they become zero.
+
+In ERPNext it is easy to create a Profit and Loss analysis chart. An example
+of a Profit and Loss analysis chart is given below:
+
+<img class="screenshot" alt="Financial Analytics Profit and Loss Statement" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-pl.png">
+
+(On the first day of the year you have not made any profit or loss, but you
+still have assets, hence balance sheet accounts never become zero at the
+beginning or end of a period)
+
+### Groups and Ledgers
+
+There are two main kinds of Accounts in ERPNext - Group and Ledger. Groups can
+have sub-groups and ledgers within them, whereas ledgers are the leaf nodes of
+your chart and cannot be further classified.
+
+Accounting Transactions can only be made against Ledger Accounts (not Groups)
+
+> Info: The term "Ledger" means a page in an accounting book where entries are
+made. There is usually one ledger for each account (like a Customer or a
+Supplier).
+
+> Note: An Account “Ledger” is also sometimes called as Account “Head”.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-2.png">
+
+### Other Account Types
+
+In ERPNext, you can also specify more information when you create a new
+Account, this is there to help you select that particular account in a
+scenario like Bank Account or a Tax Account and has no effect on the Chart
+itself.
+
+### Creating / Editing Accounts
+
+To create new Accounts, explore your Chart of Accounts and click on an Account
+group under which you want to create the new Account. On the right side, you
+will see an option to “Open” or “Add Child” a new Account.
+
+<img class="screenshot" alt="Chart of Accounts" src="{{docs_base_url}}/assets/img/accounts/chart-of-accounts-3.png">
+
+Option to create will only appear if you click on a Group (folder) type
+Account.
+
+ERPNext creates a standard structure for you when the Company is created but
+it is up to you to modify or add or remove accounts.
+
+Typically, you might want to create Accounts for
+
+  * Types of Expenses (travel, salaries, telephone etc) under Expenses.
+  * Taxes (VAT, Sales Tax etc based on your country) under Current Liabilities.
+  * Types of Sales (for example, Product Sales, Service Sales etc.) under Income.
+  * Types of Assets (building, machinery, furniture etc.) under Fixed Assets.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
new file mode 100644
index 0000000..299e670
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md

@@ -0,0 +1,34 @@
+  
+
+A credit limit is the maximum amount of credit that a financial institution or
+other lender will extend to a debtor for a particular line of credit. From an
+organisation's perspective, it is the maximum amount of credit which a
+customer gets on goods purchased.  
+
+To set credit limit go to Customer - Master
+
+> Selling > Document > Customer 
+
+  
+#### Figure 1: Credit Limit
+
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-1.png">
+
+Go to the 'More Info section' and enter the amount in the field Credit Limit.
+
+In case a need arises to allow more credit to the customer as a good-will, the
+Credit Controller has access to submit order even if credit limit is crossed.
+
+To allow any other role to submit transactions by customers whose credit limit
+has expired, go to accounting settings and make changes.
+
+In the field Credit Controller, select the role who would be authorized to
+accept orders or raise credit limits of customers.
+  
+#### Figure 2: Credit Controller
+
+<img class="screenshot" alt="Credit Limit" src="{{docs_base_url}}/assets/img/accounts/credit-limit-2.png">
+
+Save the changes.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
new file mode 100644
index 0000000..ab93126
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/index.md

@@ -0,0 +1,13 @@
+At the end of sales and purchase cycle comes billing and payments. You may have
+an accountant in your team, or you may be doing accounting yourself, or you may
+have outsourced your accounting. In all the cases financial accounting forms the core of any business management system like an ERP.
+
+In ERPNext, your accounting operations consists of 3 main transactions:
+
+  * Sales Invoice: The bills that you raise to your Customers for the products or services you provide.
+  * Purchase Invoice: Bills that your Suppliers give you for their products or services.
+  * Journal Entrys: For accounting entries, like payments, credit and other types.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
new file mode 100644
index 0000000..323764e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/index.txt

@@ -0,0 +1,18 @@
+journal-entry
+sales-invoice
+purchase-invoice
+chart-of-accounts
+making-payments
+advance-payment-entry
+credit-limit
+opening-entry
+accounting-reports
+accounting-entries
+budgeting
+opening-accounts
+item-wise-tax
+point-of-sale-pos-invoice
+multi-currency-accounting
+tools
+setup
+articles

diff --git a/erpnext/docs/user/manual/en/accounts/item-wise-tax.md b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
new file mode 100644
index 0000000..8c1fc86
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md

@@ -0,0 +1,30 @@
+
+Taxes selected in the Tax and Other Charges in transactions are applied on all the items. If you need different taxes applied on items selected in the same transaction, you should setup you item and tax master as explained in the steps below.
+
+####Step 1: Mention Tax Applicable in the Item master
+
+Item master has tax table where you can list taxes which will be applied on it.
+
+![Item wise Tax]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax.png)
+
+Tax rate mentioned in the item master gets preference over tax rate entered in the transactions. 
+
+For example, if you provide tax rate for VAT as 10% for item ABC, where for same VAT ledger 12% rate is entered in the Sales Order/Invoice, for item ABC, tax rate applied would be 10%, as mentioned in the item master.
+
+####Step 2: Setup Taxes and Other Charges
+
+In Taxes and Other Charges master, you should select all the applicable taxes which could be applicable on item.
+
+For example, if few items has VAT 5 applied on them, other has Service Tax applied, and some other has Excise Duty applicable, then you tax master should have all these taxes selected.
+
+![item wise tax master]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax-master.png)
+
+####Step 3: Set Tax Rate as Zero in Taxes and Charges Template
+
+In the Taxes and Other Charges master, tax rate will be updated as ZERO. It means, tax rate applicable on items will be pulled from the respective Item master. While for other items, 0% tax will be applied, means no other taxes will be applied on that item.
+
+Based on the above setting, you will have taxes applied on items as mentioned in the respective item master. Check following for an instance.
+
+![item wise tax calculation]({{docs_base_url}}/assets/old_images/erpnext/item-wise-tax-calc.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
new file mode 100644
index 0000000..68ba22a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md

@@ -0,0 +1,71 @@
+All types of accounting entries other than **Sales Invoice** and **Purchase
+Invoice** are made using the **Journal Entry**. A **Journal Entry** 
+is a standard accounting transaction that affects
+multiple Accounts and the sum of debits is equal to the sum of credits.
+
+To create a Journal Entry go to:
+
+> Accounts > Documents > Journal Entry > New
+
+<img class="screenshot" alt="Journal Entry" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
+
+In a Journal Entry, you must select.
+
+  * Type of Voucher from the drop down.
+  * Add rows for the individual accounting entries. In each row, you must specify: 
+    * The Account that will be affected
+    * The amount to Debit or Credit
+    * The Cost Center (if it is an Income or Expense)
+    * Against Voucher: Link it to a voucher or invoice if it affects the “outstanding” amount of that invoice.
+    * Is Advance: Select “Yes” if you want to make it selectable in an Invoice. Other information in case it is a Bank Payment or a bill.
+
+#### Difference
+
+The “Difference” field is the difference between the Debit and Credit amounts.
+This should be zero if the Journal Entry is to be “Submitted”. If this
+number is not zero, you can click on “Make Difference Entry” to add a new row
+with the amount required to make the total as zero.
+
+* * *
+
+## Common Entries
+
+A look at some of the common accounting entries that can be done via Journal
+Voucher.
+
+#### Expenses (non accruing)
+
+Many times it may not be necessary to accrue an expense, but it can be
+directly booked against an expense Account on payment. For example a travel
+allowance or a telephone bill. You can directly debit Telephone Expense
+(instead of your telephone company) and credit your Bank on payment.
+
+  * Debit: Expense Account (like Telephone expense)
+  * Credit: Bank or Cash Account
+
+#### Bad Debts or Write Offs
+
+If you are writing off an Invoice as a bad debt, you can create a Journal
+Voucher similar to a Payment, except instead of debiting your Bank, you can
+debit an Expense Account called Bad Debts.
+
+  * Debit: Bad Debts Written Off
+  * Credit: Customer
+
+> Note: There may be regulations in your country before you can write off bad
+debts.
+
+#### Depreciation
+
+Depreciation is when you write off certain value of your assets as an expense.
+For example if you have a computer that you will use for say 5 years, you can
+distribute its expense over the period and pass a Journal Entry at the end
+of each year reducing its value by a certain percentage.
+
+  * Debit: Depreciation (Expense)
+  * Credit: Asset (the Account under which you had booked the asset to be depreciated)
+
+> Note: There may be regulations in your country that define by how much
+amount you can depreciate a class of Assets.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/making-payments.md b/erpnext/docs/user/manual/en/accounts/making-payments.md
new file mode 100644
index 0000000..2038e6f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/making-payments.md

@@ -0,0 +1,98 @@
+Payments made against Sales Invoices or Purchase Invoices can be made by
+clicking on “Make Payment Entry” button on “Submitted” invoices.
+
+  1. Update the “Bank Account” (you can also set the default account in the Company master).
+  2. Update posting date.
+  3. Enter the cheque number, cheque date.
+  4. Save and Submit.
+
+<img class="screenshot" alt="Manking Payment" src="{{docs_base_url}}/assets/img/accounts/make-payment.png">
+
+Payments can also be made independent of invoices by creating a new Journal
+Voucher and selecting the type of payment.
+
+#### Incoming Payment
+
+For payments from Customers,
+
+  * Debit: Bank or Cash Account
+  * Credit: Customer
+
+> Note: Remember to add “Against Sales Invoice” or “Is Advance” as applicable.
+
+#### Outgoing Payment
+
+For payments to Suppliers,
+
+  * Debit: Supplier
+  * Credit: Bank or Cash Account
+
+### Example Payment Journal Entry
+
+<img class="screenshot" alt="Manking Payment" src="{{docs_base_url}}/assets/img/accounts/new-bank-entry.png">
+
+* * *
+
+### Reconciling Cheque Payments
+
+If you are receiving payments or making payments via cheques, the bank
+statements will not accurately match the dates of your entry, this is because
+the bank usually takes time to “clear” these payments. Also you may have
+mailed a cheque to your Supplier and it may be a few days before it is
+received and deposited by the Supplier. In ERPNext you can synchronize your
+bank statements and your Journal Entrys using the “Bank Reconciliation”
+tool.
+
+To use this, go to:
+
+> Accounts > Tools > Bank Reconciliation
+
+Select your “Bank” Account and enter the dates of your statement. Here you
+will get all the “Bank Voucher” type entries. In each of the entry on the
+right most column, update the “Clearance Date” and click on “Update”.
+
+By doing this you will be able to sync your bank statements and entries into
+the system.
+
+* * *
+
+## Managing Outstanding Payments
+
+In most cases, apart from retail sales, billing and payments are separate
+activities. There are several combinations in which these payments are done.
+These cases apply to both sales and purchases.
+
+  * They can be upfront (100% in advance).
+  * Post shipment. Either on delivery or within a few days of delivery.
+  * Part in advance and part on or post delivery.
+  * Payments can be made together for a bunch of invoices.
+  * Advances can be given together for a bunch of invoices (and can be split across invoices).
+
+ERPNext allows you to manage all these scenarios. All accounting entries (GL
+Entry) can be made against a Sales Invoice, Purchase Invoice or Journal
+Vouchers (in special cases, an invoice can be made via a Sales Invoice too).
+
+The total outstanding amount against an invoice is the sum of all the
+accounting entries that are made “against” (or are linked to) that invoice.
+This way you can combine or split payments in Journal Entrys to manage the
+scenarios.
+
+### Matching Payments to Invoices
+
+In complex scenarios, especially in the capital goods industry, sometimes
+there is no direct link between payments and invoices. You send invoices to
+your Customers and your Customer sends you block payments or payments based on
+some schedule that is not linked to your invoices.
+
+In such cases, you can use the Payment to Invoice Matching Tool.
+
+> Accounts > Tools > Payment Reconciliation
+
+In this tool, you can select an account (your Customer’s account) and click on
+“Pull Payment Entries” and it will select all un-linked Journal Entrys and
+Sales Invoices from that Customer.
+
+To cancel off some payments and invoices, select the Invoices and Journal
+Vouchers and click on “Reconcile”.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
new file mode 100644
index 0000000..a674f21
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md

@@ -0,0 +1,119 @@
+In ERPNext, you can make accounting entries in multiple currency. For example, if you have a bank account in foreign currency, you can make transactions in that currency and system will show bank balance in that specific currency only.
+
+## Setup
+
+To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
+
+<img class="screenshot" alt="Set Currency from Chart of Accounts"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/chart-of-accounts.png">
+
+You can also assign / modify the currency by opening specific Account record for existing Accounts.
+
+<img class="screenshot" alt="Modify Account Currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/account.png">
+
+For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency.
+
+<img class="screenshot" alt="Customer Accounting Currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/customer.png">
+
+
+Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party.
+
+You can change accounting currency in Party / Account record, until making any transactions against them. After making accounting entries, system will not allow to change the accounting currency for both Party / Account record.
+
+In case of multi-company setup, accounting currency of Party must be same for all the companies.
+
+## Transactions
+
+### Sales Invoice
+
+In Sales Invoice, transaction currency must be same as accounting currency of Customer if Customer's accounting currency is other than Company Currency. Otherwise, you can select any currency in Invoice. On selection of Customer, system will fetch Receivable account from Customer / Company. The currency of receivable account must be same as Customer's accounting currency.
+
+Now, in POS, Paid Amount will be enetered in transaction currency, instead of earlier Company Currency. Write Off Amount will also be entered in transaction currency.
+
+Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
+
+<img class="screenshot" alt="Sales Invoice Outstanding"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/sales-invoice.png">
+
+### Purchase Invoice
+
+Similarly, in Purchase Invoice, accounting entries will be made based on Supplier's accounting currency. Outstanding Amount and Advance Amount will also be shown in the supplier's accounting currency. Write Off Amount will now be entered in transaction currency.
+
+### Journal Entry
+
+In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies.
+
+<img class="screenshot" alt="Journal Entry Exchange Rate"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-multi-currency.png">
+
+ 
+In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually.
+
+In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
+
+<img class="screenshot" alt="Journal Entry in multi currency"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/journal-entry-row.png">
+
+#### Example 1: Payment Entry  Against Customer With Alternate Currency
+
+Suppose, default currency of the company is INR and customer's accounting currency is USD. Customer made full payment against an outstanding invoice of USD 100. Exchange Rate (USD -> INR) in Sales Invoice was 60.
+
+Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference.
+
+<img class="screenshot" alt="Payment Entry"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/payment-entry.png">
+
+#### Example 2: Inter-bank Transfer (USD -> INR)
+
+Suppose, default currency of the company is INR. You have an Paypal account for which Currency is USD. You receive payments in the paypal account and lets say, paypal transfers amount once in a week to your other bank account which is managed in INR. 
+
+Paypal account gets debited on different date with different exchange rate, but on transfer date the exchange rate can be different. Hence, there is generally Exchange Loss / Gain on the transfer entry.
+In the bank transfer entry, system sets exchange rate based on the average incoming exchange rate Paypal account. You need to calculate and enter Exchange Loss / Gain based on the average exchange rate and the exchange rate on the transfer date.
+
+Lets say, Paypal account debited by following amounts over the week, which has not been transferred to your other bank account.
+
+<table class="table table-bordered">
+	<thead>
+		<tr>
+			<td>Date</td>
+			<td>Account</td>
+			<td>Debit (USD)</td>
+			<td>Exchange Rate</td>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>2015-09-02</td>
+			<td>Paypal</td>
+			<td>100</td>
+			<td>60</td>
+		</tr>
+		<tr>
+			<td>2015-09-02</td>
+			<td>Paypal</td>
+			<td>100</td>
+			<td>61</td>
+		</tr>
+		<tr>
+			<td>2015-09-02</td>
+			<td>Paypal</td>
+			<td>100</td>
+			<td>64</td>
+		</tr>
+	</tbody>
+</table>
+
+
+Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below:
+
+<img class="screenshot" alt="Inter Bank Transfer"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/bank-transfer.png">
+
+
+## Reports
+
+### General Ledger
+
+In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency.
+
+<img class="screenshot" alt="General Ledger Report"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/general-ledger.png">
+
+### Accounts Receivable / Payable
+
+In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
+
+<img class="screenshot" alt="Accounts Receivable Report"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/accounts-receivable.png">
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
new file mode 100644
index 0000000..214642d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md

@@ -0,0 +1,94 @@
+Now that you have completed most of the setup, its time to start moving in!
+
+There are two important sets of data you need to enter before you start your
+operations.
+
+  * Opening Account balances.
+  * Opening Stock balances.
+
+To setup your accounts and stock correctly you will need accurate data to work
+with. Make sure you have the data setup for this.
+
+### Opening Accounts
+
+We usually recommend that you start using accounting in a new financial year,
+but you could start midway too. To setup your accounts, you will need the
+following for the “day” you start using accounting in ERPNext:
+
+Opening capital accounts - like your shareholder’s (or owner’) capital, loans,
+bank balances on that day. List of outstanding sales and purchase invoices
+(Payables and Receivables).
+
+Based on Voucher Type
+
+You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced.
+
+<img class="screenshot" alt="Opening Account" src="{{docs_base_url}}/assets/img/accounts/opening-account-1.png">
+
+ Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts.
+
+#### Temporary Accounts
+
+A nice way to simplify opening is to use a temporary account
+just for opening. These accounts will become zero once all your old
+invoices and opening balances of bank, debt stock etc are entered.
+In the standard chart of accounts, a **Temperory Opening** account is created under
+assets
+
+#### The Opening Entry
+
+In ERPNext Opening Accounts are setup by submitting a special Journal Entries
+(Journal Entry).
+
+Note: Make sure to set “Is Opening” as “Yes” in the More Info section.
+
+> Setup > Opening Accounts and Stock > Opening Accounting Entries.
+
+Complete Journal Entries on the Debit and Credit side.
+
+![Opening Entry]({{docs_base_url}}/assets/old_images/erpnext/opening-entry-1.png)
+
+ To update opening balance is to make Journal Entry for an individual/group of accounts.
+
+For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
+
+![Opening Temp Entry]({{docs_base_url}}/assets/old_images/erpnext/image-temp-opening.png)
+
+
+![Opening Entry]({{docs_base_url}}/assets/old_images/erpnext/opening-entry-2.png)
+
+Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing.
+
+This way, you can update opening balance in Asset and Liability accounts.
+
+You can make two Opening Journal Entrys:
+
+  * For all assets (excluding Accounts Receivables): This entry will contain all your assets except the amounts you are expecting from your Customers against outstanding Sales Invoices. You will have to update your receivables by making an individual entry for each Invoice (this is because, the system will help you track the invoices which are yet to be paid). You can credit the sum of all these debits against the **Temperory Opening** account.
+  * For all liabilities: Similarly you need to pass a Journal Entry for your Opening Liabilities (except for the bills you have to pay) against **Temperory Opening** account.
+  * In this method you can update opening balance of specific balancesheet accounts and not for all.
+  * Opening entry is only for balance sheet accounts and not for expense or Income accounts.
+
+After completing the accounting entries, the trial balance report will look
+like the one given below:
+
+
+![Trial Balance]({{docs_base_url}}/assets/old_images/erpnext/trial-balance-1.png)
+
+#### Outstanding Invoices
+
+After your Opening Journal Entrys are made, you will need to enter each
+Sales Invoice and Purchase Invoice that is yet to be paid.
+
+Since you have already booked the income or expense on these invoices in the
+previous period, select the temp opening account **Temporary Opening** in the “Income” and
+“Expense” accounts.
+
+> Note: Make sure to set each invoice as “Is Opening”!
+
+If you don’t care what items are in that invoice, just make a dummy item entry
+in the Invoice. Item code in the Invoice is not necessary, so it should not be
+such a problem.
+
+Once all your invoices are entered, your **Temperory Opening** account will have a balance of zero!
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/opening-entry.md b/erpnext/docs/user/manual/en/accounts/opening-entry.md
new file mode 100644
index 0000000..da0b0f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/opening-entry.md

@@ -0,0 +1,7 @@
+If you are a new company you can start using ERPNext accounting module by
+going to chart of accounts.
+
+However, if you are migrating from a legacy accounting system like Tally or a
+Fox Pro based software, please visit [Opening Entry.]({{docs_base_url}}/user/manual/en/accounts/opening-accounts.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
new file mode 100644
index 0000000..8f646f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md

@@ -0,0 +1,98 @@
+# Point of Sale Invoice
+
+Point of Sale (POS) is the place where a retail transaction is completed. It
+is the point at which a customer makes a payment to the merchant in exchange
+for goods or services. For retail operations, the delivery of goods, accrual
+of sale and payment all happens in one event, that is usually called the
+“Point of Sale”.
+
+You can make a Sales Invoice of type POS by checking on “Is POS”. When you
+check this, you will notice that some fields get hidden and some new ones
+emerge.
+
+> Tip: In retail, you may not create a separate Customer record for each
+customer. You can create a general Customer called “Walk-in Customer” and make
+all your transactions against this Customer record.
+
+#### Setting Up POS
+
+In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS:
+
+1. Enable POS View via (Setup > Customize > Feature Setup)
+2. Create a [POS Setting]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record
+
+#### Switch to POS View
+
+Open any sales / purchase transaction. Click on the Computer <i class="icon-desktop"></i> Icon.
+
+#### Different sections of the POS
+
+  * Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note.
+  * In your Items table, update inventory information like Warehouse (saved as default), Serial Number, or Batch Number if applicable.
+  * Update Payment Details like your Bank / Cash Account, Paid amount etc.
+  * If you are writing off certain amount. For example when you receive extra cash as a result of not having exact denomination of change, check on ‘Write off Outstanding Amount’ and set the Account.
+
+### Adding an Item
+
+At the billing counter, the retailer needs to select Items which the consumer
+buys. In the POS interface you can select an Item by two methods. One, is by
+clicking on the Item image and the other, is through the Barcode / Serial No.
+
+**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts.
+
+**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
+
+![POS]({{docs_base_url}}/assets/old_images/erpnext/pos-add-item.png)
+
+> Tip: To change the quantity of an Item, enter your desired quantity in the
+quantity box. These are mostly used if the same Item is purchased in bulk.
+
+If your product list is very long use the Search field, type the product name
+in Search box.
+
+### Removing an Item
+
+There are two ways to remove an Item.
+
+  * Select an Item by clicking on the row of that Item from Item cart. Then click on “Del” button. OR
+
+  * Enter 0(zero) quantity of any item to delete that item.
+
+To remove multiple Items together, select multiple rows & click on “Del”
+button.
+
+> Delete button appears only when Items are selected.
+
+![POS]({{docs_base_url}}/assets/old_images/erpnext/pos-remove-item.png)
+
+### Make Payment
+
+After all the Items and their quantities are added into the cart, you are
+ready to make the Payment. Payment process is divided into 3 steps -
+
+  1. Click on “Make Payment” to get the Payment window.
+  2. Select your “Mode of Payment”.
+  3. Click on “Pay” button to Save the document.
+
+![POS Payment]({{docs_base_url}}/assets/old_images/erpnext/pos-make-payment.png)
+
+Submit the document to finalise the record. After the document is submitted,
+you can either print or email it directly to the customer.
+
+#### Accounting entries (GL Entry) for a Point of Sale:
+
+Debits:
+
+  * Customer (grand total) 
+  * Bank / Cash (payment)
+
+Credits:
+
+  * Income (net total, minus taxes for each Item) 
+  * Taxes (liabilities to be paid to the government)
+  * Customer (payment)
+  * Write Off (optional)
+
+To see entries after “Submit”, click on “View Ledger”.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
new file mode 100644
index 0000000..433219c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md

@@ -0,0 +1,71 @@
+Purchase Invoice is the exact opposite of your Sales Invoice. It is the bill
+that your Supplier sends you for products or services delivered. Here you
+accrue expenses to your Supplier. Making a Purchase Invoice is very similar to
+making a Purchase Order.
+
+To make a new Purchase Invoice, go to:
+
+> Accounts > Documents > Purchase Invoice > New Purchase Invoice
+
+or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
+
+<img class="screenshot" alt="Purchase Invoice" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice.png">
+
+The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
+“Bill Date” helps to track the bill number as set by your Supplier for
+reference.
+
+#### Accounting Impact
+
+Like in Sales Invoice, you have to enter an Expense or an Asset account for
+each row in your Items table. This helps to indicate if the Item is an Asset
+or an Expense. You must also enter a Cost Center. These can also be set in the
+Item master.
+
+The Purchase Invoice will affect your accounts as follows:
+
+Accounting entries (GL Entry) for a typical double entry “purchase”:
+
+Debits:
+
+  * Expense or Asset (net totals, excluding taxes)
+  * Taxes (/assets if VAT-type or expense again).
+
+Credits:
+
+  * Supplier
+
+To see entries in your Purchase Invoice after you “Submit”, click on “View
+Ledger”.
+
+* * *
+
+#### Is purchase an “Expense” or an “Asset”?
+
+If the Item is consumed immediately on purchase, or if it is a service, then
+the purchase becomes an “Expense”. For example, a telephone bill or travel
+bill is an “Expense” - it is already consumed.
+
+For inventory Items, that have a value, these purchases are not yet “Expense”,
+because they still have a value while they remain in your stock. They are
+“Assets”. If they are raw-materials (used in a process), they will become
+“Expense” the moment they are consumed in the process. If they are to be sold
+to a Customer, they become “Expense” when you ship them to the Customer.
+
+* * *
+
+#### Deducting Taxes at Source
+
+In many countries, the law may require you to deduct taxes, while paying your
+suppliers. These taxes could be based on a standard rate. Under these type of
+schemes, typically if a Supplier crosses a certain threshold of payment, and
+if the type of product is taxable, you may have to deduct some tax (which you
+pay back to your government, on your Supplier’s behalf).
+
+To do this, you will have to make a new Tax Account under “Tax Liabilities” or
+similar and credit this Account by the percent you are bound to deduct for
+every transaction.
+
+For more help, please contact your Accountant!
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
new file mode 100644
index 0000000..f9a453e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md

@@ -0,0 +1,74 @@
+A Sales Invoice is a bill that you send to your customers, against which the customer processes the payment. Sales Invoice is an accounting transaction. On submission of Sales Invoice,  the system updates the receivable and books income against a Customer Account.
+
+You can create a Sales Invoice directly from
+
+> Accounting > Documents > Sales Invoice > New Sales Invoice
+
+or Click on Make Invoice at the right hand corner of the Delivery Note.
+
+<img class="screenshot" alt="Sales Invoice" src="{{docs_base_url}}/assets/img/accounts/sales-invoice.png">
+
+#### Accounting Impact
+
+All Sales must be booked against an “Income Account”. This refers to an
+Account in the “Income” section of your Chart of Accounts. It is a good
+practice to classify your income by type (like product income, service income
+etc). The Income Account must be set for each row of the Items table.
+
+> Tip: To set default Income Accounts for Items, you can set it in the Item or
+Item Group.
+
+The other account that is affected is the Account of the Customer. That is
+automatically set from “Debit To” in the heading section.
+
+You must also mention the Cost Centers in which your Income must be booked.
+Remember that your Cost Centers tell you the profitability of the different
+lines of business or product. You can also set a default Cost Center in the
+Item master.
+
+#### Accounting entries (GL Entry) for a typical double entry “Sale”:
+
+When booking a sale (accrual):
+
+**Debit:** Customer (grand total) **Credit:** Income (net total, minus taxes for each Item) **Credit:** Taxes (liabilities to be paid to the government)
+
+> To see entries in your Sales Invoice after you “Submit”, click on “View
+Ledger”.
+
+#### Dates
+
+Posting Date: The date on which the Sales Invoice will affect your books of
+accounts i.e. your General Ledger. This will affect all your balances in that
+accounting period.
+
+Due Date: The date on which the payment is due (if you have sold on credit).
+This can be automatically set from the Customer master.
+
+#### Recurring Invoices
+
+If you have a contract with a Customer where you bill the Customer on a
+monthly, quarterly, half-yearly or annual basis, you can check the “Recurring
+Invoice” box. Here you can fill in the details of how frequently you want to
+bill this Invoice and the period for which the contract is valid.
+
+ERPNext will automatically create new Invoices and mail it to the email ids
+you set.
+
+* * *
+
+#### "Pro Forma" Invoice
+
+If you want to give an Invoice to a Customer to make a payment before you
+deliver, i.e. you operate on a payment first basis, you should create a
+Quotation and title it as a “Pro-forma Invoice” (or something similar) using
+the Print Heading feature.
+
+“Pro Forma” means for formality. Why do this? Because if you book a Sales
+Invoice it will show up in your “Accounts Receivable” and “Income”. This is
+not ideal as your Customer may or may not decide to pay up. But since your
+Customer wants an “Invoice”, you could give the Customer a Quotation (in
+ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
+
+This is a fairly common practice. We follow this at Frappe too.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
new file mode 100644
index 0000000..5242b39
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md

@@ -0,0 +1,10 @@
+
+<img class="screenshot" alt="Account Settings" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
+
+* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
+
+* Role Allowed to Set Frozen Accounts & Edit Frozen Entries: Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts.
+
+* Credit Controller: Role that is allowed to submit transactions that exceed credit limits set.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
new file mode 100644
index 0000000..8b9fcc1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md

@@ -0,0 +1,78 @@
+Your Chart of Accounts is mainly designed to provide reports to the government
+and tax authorities. Most businesses have multiple activities like different
+product lines, market segments, areas of business, etc that share some common
+overheads. They should ideally have their own structure to report, whether they
+are profitable or not. For this purpose, there is an alternate structure,
+called the Chart of Cost Centers.
+
+### Cost Center
+
+You can create a tree of Cost Centers to represent your business better. Each
+Income / Expense entry is also tagged against a Cost Center.
+
+For example, if you have two types of sales:
+
+  * Walk-in Sales
+  * Online Sales
+
+You may not have shipping expenses for your walk-in customers, and no shop-
+rent for your online customers. If you want to get the profitability of each
+of these separately, you should create the two as Cost Centers and mark all
+sales as either "Walk-in" or "Online". Mark your all your purchases in the
+same way.
+
+Thus when you do your analysis you get a better understanding as to which side
+of your business is doing better. Since ERPNext has an option to add multiple
+Companies, you can create Cost Centers for each Company and manage it
+separately.
+
+Chart of Cost Centers
+
+To setup your Chart of Cost Centers go to:
+
+> Accounts > Setup > Chart of Cost Centers
+
+![Chart of Cost Center]({{docs_base_url}}/assets/old_images/erpnext/chart-of-cost-centers.png)
+
+Cost centers help you in one more activity, budgeting.
+
+### Budgeting
+
+ERPNext will help you set and manage budgets on your Cost Centers. This is
+useful when, for example, you are doing online sales. You have a budget for
+search ads, and you want ERPNext to stop or warn you from over spending, based
+on that budget.
+
+Budgets are also great for planning purposes. When you are making plans for
+the next financial year, you would typically target a revenue based on which
+you would set your expenses. Setting a budget will ensure that your expenses
+do not get out of hand, at any point, as per your plans.
+
+You can define it in the Cost Center. If you have seasonal sales you can also
+define a budget distribution that the budget will follow.
+
+> Accounts > Setup > Budget Distribution > New Budget Distribution
+
+![Budget Distribution]({{docs_base_url}}/assets/old_images/erpnext/budgeting.png)
+
+#### Budget Actions
+
+ERPNext allows you to either:
+
+  * Stop.
+  * Warn or, 
+  * Ignore 
+
+if you exceed budgets.
+
+These can be defined from the Company record.
+
+Even if you choose to “ignore” budget overruns, you will get a wealth of
+information from the “Budget vs Actual” variance report.
+
+> Note: When you set a budget, it has to be set as per Account under the Cost
+Center. For example if you have a Cost Center “Online Sales”, you can restrict
+“Advertising Budget” by creating a row with that Account and defining the
+amount.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
new file mode 100644
index 0000000..618d20b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md

@@ -0,0 +1,23 @@
+A fiscal year is also known as a financial year or a budget year. It is used
+for calculating financial statements in businesses and other organisations.
+The fiscal year may or may not be the same as a calendar year. For tax
+purposes, companies can choose to be calendar-year taxpayers or fiscal-year
+taxpayers. In many jurisdictions, regulatory laws regarding accounting and
+taxation require such reports once per twelve months. However, it is not
+mandatory that the period should be a calendar year (that is, 1 January to 31
+December).
+
+A fiscal year usually starts at the beginning of a quarter, such as April 1,
+July 1 or October 1. However, most companies' fiscal year also coincides with
+the calendar year, which starts January 1. For the most part, it is simpler
+and easier that way. For some organizations, there are advantages in starting
+the fiscal year at a different time. For example, businesses that are seasonal
+might start their fiscal year on July 1 or October 1. A business that has most
+of its income in the fall and most of its expenses in the spring might also
+choose to start its fiscal year on October 1. That way, they know what their
+income will be for that year, and can adjust their expenses to maintain their
+desired profit margins.
+
+<img class="screenshot" alt="Fiscal Year" src="{{docs_base_url}}/assets/img/accounts/fiscal-year.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/setup/index.md b/erpnext/docs/user/manual/en/accounts/setup/index.md
new file mode 100644
index 0000000..7b45044
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/index.md

@@ -0,0 +1,3 @@
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/setup/index.txt b/erpnext/docs/user/manual/en/accounts/setup/index.txt
new file mode 100644
index 0000000..916f96c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/index.txt

@@ -0,0 +1,4 @@
+fiscal-year
+cost-center
+accounts-settings
+tax-rule
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
new file mode 100644
index 0000000..bfcf6f0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md

@@ -0,0 +1,21 @@
+You can define which [Tax Template]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
+
+You can define Tax Rules for Sales or Purchase Taxes. 
+While making a Transaction the system will select and apply tax template based on the tax rule defined.
+The system selects Tax Rule with maximum matching Filters.
+
+Let us consider a senario to understand Tax Rule Better.
+
+Suppose we define 2 Tax Rules as below.
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-1.png">
+
+<img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule-2.png">
+
+Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom
+
+Now supposed we try to create a Sales Order for a customer whose default Billing Country is India, system shall select Tax Rule 1.
+In case the customers Billing Country was United Kingdom, the system would have selected Tax Rule 2.
+

diff --git a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
new file mode 100644
index 0000000..f2afe76
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md

@@ -0,0 +1,52 @@
+### Bank Reconciliation Statement
+
+A Bank Reconciliation is a process that explains the difference between the
+bank balance shown in an organisation's bank statement, as supplied by the
+bank, and the corresponding amount shown in the organisation's own accounting
+records at a particular point in time.  
+
+Such differences may occur, for example, because a cheque or a list of cheques
+issued by the organisation has not been presented to the bank, a banking
+transaction, such as a credit received, or a charge made by the bank, has not
+yet been recorded in the organisations books, or either the bank or the
+organisation itself has made an error.
+
+The Bank Reconciliation statement in ERPNext comes in the form of a report.
+
+#### Figure 1: Bank Reconciliation Statement
+
+![]({{docs_base_url}}/assets/old_images/erpnext/bank-reconciliation-2.png)  
+
+  
+
+When you get the report, check whether the field 'Balance as per bank' matches
+the Bank Account Statement. If there is a match then all the clearance dates
+are updated. If there is a mismatch then check clearance dates and journal
+entries.
+
+To add clearance entries go to Accounts > Tools > Bank Reconciliation
+
+### Bank Reconciliation Tool
+
+The Bank Reconciliation tool in ERPNext, helps add clearance dates to the
+account statements. To Reconcile cheque payments go to Accounts and click on
+Bank Reconciliation.  
+
+__Step 1:__ Select the Bank Account against which you intend to reconcile. For
+example; HDFC Bank, ICICI Bank, or Citibank etc.
+
+__Step 2:__ Select the Date range that you wish to reconcile for.
+
+__Step 3:__ Click on 'Get Reconciled Entries'
+
+All the entries in the specified date range will be shown in a table below.
+
+__Step 4:__ Click on the JV from the table and update clearance date.
+
+#### Figure 2: Bank Reconciliation Tool
+
+<img class="screenshot" alt="Bank Reconciliation" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation.png">
+
+__Step 5:__ Click on the button 'Update Clearance Date'.
+ 
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.md b/erpnext/docs/user/manual/en/accounts/tools/index.md
new file mode 100644
index 0000000..7b45044
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.md

@@ -0,0 +1,3 @@
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/tools/index.txt b/erpnext/docs/user/manual/en/accounts/tools/index.txt
new file mode 100644
index 0000000..7f93166
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/index.txt

@@ -0,0 +1,4 @@
+bank-reconciliation
+payment-reconciliation
+period-closing-voucher
+payment-tool
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
new file mode 100644
index 0000000..c719623
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md

@@ -0,0 +1,31 @@
+Reconciliation is an accounting process used to compare two sets of records to
+ensure the figures are in agreement and are accurate. It is the key process
+used to determine whether the money leaving an account matches the amount
+spent, ensuring the two values are balanced at the end of the recording
+period. In Payment Reconciliation, the invoices are matched against the
+payments made to the bank. Thus if you have many payments which are not
+reconciled with their respective invoices, you can use the payment
+reconciliation tool.
+
+To use Payment Reconciliation Tool go to,
+
+Accounts > Tools > Payment Reconciliation
+
+<img class="screenshot" alt="Payment Reconciliation" src="{{docs_base_url}}/assets/img/accounts/payment-reconcile-tool.png">
+
+__Step 1:__ Select the Account against whom the payments need to be reconciled.
+
+__Step 2:__ Mention the Voucher Type, whether it is Purchase Invoice, Sales
+Invoice or Journal Entry.
+
+__Step 3:__ Select the Voucher Number and click on 'Get Unreconcilled Entries'.  
+
+* All the payment entries will be pulled into a table below.
+
+__Step 4:__ Click on the entry row to allocate a particular amount.
+
+__Step 5:__ Click on the button 'Reconcile'
+
+* You will get a message that says 'Amount allocated successfully'
+
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
new file mode 100644
index 0000000..a5d6966
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md

@@ -0,0 +1,24 @@
+###Payment Tool
+The Payment Tool Feature allows non-accounting personnel to generate Journal Entrys by populating relevant fields in the Journal Entry with account and payment details.
+
+To go to Payment Tool, click on Accounts > Tools > Payment Tool.
+
+1. Select the Company Name.
+2. Select the Party Type (Customer or Supplier) and the name of the customer or supplier against whom the payment has been made or received.
+3. Use the Received Or Paid field to specify 'Received' if payment is being received or 'Paid' if User is making the payment.
+4. Select the Mode of Payment and the Payment Account .
+5. Enter the Reference Number and Reference Date of the payment, for instance, the Cheque no. and Cheque date in case the payment is being made by cheque.
+6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section.
+	* __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually.
+
+<img class="screenshot" alt="Payment Tool" src="{{docs_base_url}}/assets/img/accounts/payment-tool-1.png">
+
+7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
+
+<img class="screenshot" alt="Payment Tool" src="{{docs_base_url}}/assets/img/accounts/payment-tool-2.png">
+
+8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
+
+<img class="screenshot" alt="Payment Tool" src="{{docs_base_url}}/assets/img/accounts/payment-tool-3.png">
+	
+{next}

diff --git a/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
new file mode 100644
index 0000000..fbec8d1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md

@@ -0,0 +1,30 @@
+At the end of every year or (quarterly or maybe even monthly), after completing auditing, you can close your books of accounts. This means that you make all your special entries like:
+
+  * Depreciation
+  * Change in value of Assets
+  * Defer taxes and liabilities
+  * Update bad debts
+
+etc. and book your Profit or Loss.
+
+By doing this, your balance in your Income and Expense Accounts become zero. You start a new Fiscal Year (or period) with a balanced Balance Sheet and fresh Profit and Loss account.
+
+In ERPNext after making all the special entries via Journal Entry for the current fiscal year, you should set all your Income and Expense accounts to zero via:
+
+> Accounts > Tools > Period Closing Voucher
+
+**Posting Date** will be when this entry should be executed. If your Fiscal Year ends on 31st December, then that date should be selected as Posting Date in the Period Closing Voucher.
+
+**Transaction Date** will be Period Closing Voucher's creation date.
+
+**Closing Fiscal Year** will be an year for which you are closing your financial statement.
+
+<img class="screenshot" alt="Period Closing Voucher" src="{{docs_base_url}}/assets/img/accounts/period-closing-voucher.png">
+
+This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility account like Reserves and Surplus, or Capital Fund account as Closing Account.
+
+The Period Closing Voucher will make accounting entries (GL Entry) making all your Income and Expense Accounts zero and transferring Profit/Loss balance to the Closing Account.
+
+<div class=well>If accounting entries are made in a closing fiscal year, even after Period Closing Voucher was created for that Fiscal Year, you should create another Period Closing Voucher. Later voucher will only transfer the pending P&L balance into Closing Account Head.</div>
+
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/articles/index.md b/erpnext/docs/user/manual/en/buying/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt
new file mode 100644
index 0000000..c0ed867
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.txt

@@ -0,0 +1,3 @@
+maintaining-suppliers-part-no-in-item
+managing-purchase-uom-and-stock-uom
+select-material-requests-based-on-supplier
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
new file mode 100644
index 0000000..52f4c97
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md

@@ -0,0 +1,20 @@
+<h1>Maintaining Supplier's Item Code in the Item master</h1>
+
+Since each company has their own item coding standards, for each item, your item code differ from supplier's Item Code. ERPNext allows you to track Supplier's Item Code in your item master, so that you refer to each others item code while transacting. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
+
+#### 1. Updating Supplier Item Code In Item
+
+Under Purchase section in the Item master, you will find table to track Item Code for each Supplier.
+
+![Item Supplier Item Code]({{docs_base_url}}/assets/img/articles/Supplier Item Code.png)
+
+#### 2. Supplier's Item Code in Transactions
+
+Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
+
+![Supplier Item Code in transaction]({{docs_base_url}}/assets/img/articles/Supplier Item Code in Purchase Order.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
new file mode 100644
index 0000000..d4d97be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md

@@ -0,0 +1,47 @@
+<h1>Managing Purchase UoM and Stock UoM</h1>
+
+When purchasing an item, you can set purchase UoM (Unit of Measurement) which could be different from item's stock UoM.
+
+### Scenario:
+
+Item ABC is stocked in Nos, but purchased in Cartons. Hence in the Purchase Order, you will need to update UoM as Carton.
+
+### 1. Editing Purchase UoM
+
+
+#### Step 1.1: Edit UoM in the Purchase Order
+
+In the Purchase Order, you will find two UoM fied.
+
+- UoM
+- Stock UoM
+
+In both the fields, default UoM of an item will be updated. You should edit UoM field, and select Purchase UoM (Carton in this case).
+
+![Item Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.10.35 pm.png)
+
+#### Step 1.2: Update UoM Conversion Factor
+
+In one Carton, if you get 20 Nos. of item ABC, then UoM Conversion Factor would be 20. 
+
+![Item Conversion Factor]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.11.58 pm.png)
+
+Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one carton, then Qty in the stock UoM will be set as 20.
+
+![Purchase Qty in Default UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.14.46 pm.png)
+
+### 2. Stock Ledger Posting
+
+Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item only. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
+
+With this, we can conclude that, updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
+
+![Print Format in Purchase UoM]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.15.27 pm.png)
+
+### 3. Setting Conversion Factor in the Item master
+
+In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
+
+![Purchase UoM master]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 4.13.16 pm.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
new file mode 100644
index 0000000..6b59695
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md

@@ -0,0 +1,19 @@
+<h1>Select Material Requests based on Supplier</h1>
+
+<b>Question</b>: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?<br>
+<br><b>Answer</b>:
+<br>
+<br>Material Requests can be individually fetched from Purchase Orders using the 'From Material Request' button. However this procedure becomes tedious when there are multiple Material Requests for items that are purchased from a single supplier.<br>
+<br>A more efficient way;
+<br>
+<br><u><b>Step 1:</b></u> When creating a Purchase order use the <i>'For Supplier'</i> button in the form.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_forsupp.png" height="238" width="747"><br>
+<br><u><b>Step 2:</b></u> In the 'Get From Supplier' pop-up enter the Supplier name and click on <i>'Get'</i>.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_popup.png"><br>
+<br><u><b>Step 3:</b></u> All the items associated with a Material Request and having the default Supplier, will be fetched in the Items Table. Any Item that is not required can be deleted.
+<br>
+<br><img src="{{docs_base_url}}/assets/img/articles/kb_po_itemtable.png" height="388" width="645"><br>
+<br><div class="well">Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.</div>
+<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/index.md b/erpnext/docs/user/manual/en/buying/index.md
new file mode 100644
index 0000000..55589ad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/index.md

@@ -0,0 +1,15 @@
+# Buying
+
+If your business involves physical goods, buying is one of your core business
+activity. Your suppliers are as important as your customers and they must be
+provided with as much accurate information as possible.
+
+Buying in right amounts, in right quantities, can affect your cash flow and
+profitability.
+
+ERPNext contains a set of transactions that will make your buying process as
+efficient and seamless as possible.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/buying/index.txt b/erpnext/docs/user/manual/en/buying/index.txt
new file mode 100644
index 0000000..a12bb06
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/index.txt

@@ -0,0 +1,6 @@
+supplier
+supplier-quotation
+purchase-order
+setup
+articles
+purchase-taxes

diff --git a/erpnext/docs/user/manual/en/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
new file mode 100644
index 0000000..e7f2429
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md

@@ -0,0 +1,86 @@
+A Purchase Order is analogous to a Sales Order. It is usually a binding
+contract with your Supplier that you promise to buy a set of Items under the
+given conditions.
+
+A Purchase Order can be automatically created from a Material Request or
+Supplier Quotation.
+
+#### Purchase Order Flow Chart
+
+![Purchase Order]({{docs_base_url}}/assets/old_images/erpnext/purchase-order-f.jpg)
+
+In ERPNext, you can also make a Purchase Order directly by going to:
+
+> Buying > Documents > Purchase Order > New Purchase Order
+
+#### Create Purchase Order
+
+<img class="screenshot" alt="Purchase Order" src="{{docs_base_url}}/assets/img/buying/purchase-order.png">
+
+Entering a Purchase Order is very similar to a Purchase Request, additionally
+you will have to set:
+
+  * Supplier.
+  * A “Required By” date on each Item: If you are expecting part delivery, your Supplier will know how much quantity to deliver at which date. This will help you from preventing over-supply. It will also help you to track how well your Supplier is doing on timeliness.
+
+### Taxes
+
+If your Supplier is going to charge you additional taxes or charge like a
+shipping or insurance charge, you can add it here. It will help you to
+accurately track your costs. Also, if some of these charges add to the value
+of the product you will have to mention them in the Taxes table. You can also
+use templates for your taxes. For more information on setting up your taxes
+see the Purchase Taxes and Charges Template.
+
+### Value Added Taxes (VAT)
+
+Many a times, the tax paid by you to a Supplier, for an Item, is the same tax
+which you collect from your Customer. In many regions, what you pay to your
+government is only the difference between what you collect from your Customer
+and what you pay to your Supplier. This is called Value Added Tax (VAT).
+
+For example you buy Items worth X and sell them for 1.3X. So your Customer
+pays 1.3 times the tax you pay your Supplier. Since you have already paid tax
+to your Supplier for X, what you owe your government is only the tax on 0.3X.
+
+This is very easy to track in ERPNext since each tax head is also an Account.
+Ideally you must create two Accounts for each type of VAT you pay and collect,
+“Purchase VAT-X” (asset) and “Sales VAT-X” (liability), or something to that
+effect. Please contact your accountant if you need more help or post a query
+on our forums!
+
+  
+
+#### Purchase UOM and Stock UOM Conversion
+
+You can change your UOM as per your stock requirements in the Purchase Order
+form.
+
+For example, If you have bought your raw material in large quantities with UOM
+-boxes, and wish to stock them in UOM- Nos; you can do so while making your
+Purchase Order.
+
+__Step 1:__ Store UOM as Nos in the Item form.
+
+Note: The UOM in the Item form is the stock UOM.
+
+__Step 2:__ In the Purchase Order mention UOM as Box. (Since material arrives in
+Boxes)
+
+__Step 3:__ In the Warehouse and Reference section, the UOM will be pulled in as
+Nos (from the Item form)
+
+#### Figure 3: Conversion of Purchase UOM to stock UOM
+
+
+<img class="screenshot" alt="Purchase Order - UOM" src="{{docs_base_url}}/assets/img/buying/purchase-order-uom.png">
+
+__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
+100 pieces.  
+
+__Step 5:__  Notice that the stock quantity will be updated accordingly.
+
+__Step 6:__ Save and Submit the Form.
+
+  
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
new file mode 100644
index 0000000..871ff96
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md

@@ -0,0 +1,38 @@
+For Tax Accounts that you want to use in the tax templates, you must mention
+them as type “Tax” in your Chart of Accounts.
+
+Similar to your Sales Taxes and Charges Template is the Purchase Taxes and
+Charges Master. This is the tax template that you can use in your Purchase
+Orders and Purchase Invoices.
+
+> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
+Master
+
+![Purchase-Taxes]({{docs_base_url}}/assets/old_images/erpnext/purchase-taxes.png)
+
+  
+
+You can specify if the tax / charge is only for valuation (not a part of
+total) or only for total (does not add value to the item) or for both.
+
+If you select a particular tax as your Default tax, the system will apply this
+tax to all the purchase transactions by default. 
+
+### Calculation Type
+
+This can be on Net Total (that is the sum of basic amount). On Previous Row
+Total / Amount (for cumulative taxes or charges). If you select this option,
+the tax will be applied as a percentage of the previous row (in the tax table)
+amount or total. Actual (as mentioned).
+
+  * **Account Head:** The Account ledger under which this tax will be booked.
+  * **Cost Center:** If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+  * **Description:** Description of the tax (that will be printed in invoices / quotes).
+  * **Rate:** Tax rate.
+  * **Amount:** Tax amount.
+  * **Total:** Cumulative total to this point.
+  * **Enter Row:** If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+  * **Consider Tax or Charge for:** In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+  * **Add or Deduct:** Whether you want to add or deduct the tax.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
new file mode 100644
index 0000000..d4c390b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md

@@ -0,0 +1,39 @@
+Buying Settings is where you can define properties which will be applied in the Buying module's transactions. 
+
+![Buying Settings]({{docs_base_url}}/assets/img/buying/buying-settings.png)
+
+Let us look at the various options that can be configured:
+
+### 1. Supplier Naming By
+
+When a Supplier is saved, system generates a unique identity or name for that Supplier which can be used to refer the Supplier in various Buying transactions.
+
+If not configured otherwise, ERPNext uses the Supplier's Name as the unique name. If you want to identify Suppliers using names like SUPP-00001, SUPP-00002, or such other patterned series, select the value of Supplier Naming By as "Naming Series".
+
+You can define or select the Naming Series pattern from:
+
+> Setup > Settings > Naming Series
+
+[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html)
+
+### 2. Default Supplier Type
+
+Configure what should be the value of Supplier Type when a new Supplier is created.
+
+### 3. Default Buying Price List
+
+Configure what should be the value of Buying Price List when a new Buying transaction is created.
+
+### 4. Maintain Same Rate Throughout Purchase Cycle
+
+If this is checked, ERPNext will stop you if you change the Item's price in a Purchase Invoice or Purchase Receipt created based on a Purchase Order, i.e. it will maintain the same price throughout the purchase cycle. If there is a requirement where you need the Item's price to change, you should uncheck this option.
+
+### 5. Purchase Order Required
+
+If this option is configured "Yes", ERPNext will prevent you from creating a Purchase Invoice or a Purchase Receipt without first creating a Purchase Order.
+
+### 6. Purchase Receipt Required
+
+If this option is configured "Yes", ERPNext will prevent you from creating a Purchase Invoice without first creating a Purchase Receipt.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/setup/index.md b/erpnext/docs/user/manual/en/buying/setup/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/index.md

@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/setup/index.txt b/erpnext/docs/user/manual/en/buying/setup/index.txt
new file mode 100644
index 0000000..980e226
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/index.txt

@@ -0,0 +1,2 @@
+buying-settings
+supplier-type
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
new file mode 100644
index 0000000..61f65fa
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md

@@ -0,0 +1,28 @@
+A supplier may be distinguished from a contractor or subcontractor, who
+commonly adds specialized input to deliverables. A supplier is also known as a
+vendor. There are different types of suppliers based on their goods and
+products.
+
+ERPNext allows you to create your own categories of suppliers. These
+categories are known as Supplier Type. For Example, if your suppliers are
+mainly pharmaceutical companies and FMCG distributors, You can create a new
+Type for them and name them accordingly.
+
+Based on what the suppliers supply, they are classified into different
+categories called Supplier Type. There can be different types of suppliers.
+You can create your own category of Supplier Type.
+
+> Buying > Setup > Supplier Type > New Supplier Type
+
+<img class="screenshot" alt="Supplier Type" src="{{docs_base_url}}/assets/img/buying/supplier-type.png">
+
+You can classify your suppliers from a range of choice available in ERPNext.
+Choose from a set of given options like Distributor, Electrical,Hardware,
+Local, Pharmaceutical, Raw material, Services etc.
+
+Classifying your supplier into different types facilitates accounting and
+payments.
+
+Type your new supplier category and Save.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
new file mode 100644
index 0000000..0f1d51a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md

@@ -0,0 +1,33 @@
+A Supplier Quotation is a formal statement of promise by potential supplier to
+supply the goods or services required by a buyer, at specified prices, and
+within a specified period. A quotation may also contain terms of sale and
+payment, and warranties. Acceptance of quotation by the buyer constitutes an
+agreement binding on both parties.
+
+You can make a supplier quotation from a Material Request
+
+#### Supplier Quotation Flow-Chart
+
+![Supplier Quotation]({{docs_base_url}}/assets/old_images/erpnext/supplier-quotation-f.jpg)
+
+You can also make a Supplier Quotation directly from:
+
+> Buying > Documents > Supplier Quotation > New Supplier Quotation
+
+#### Create Supplier Quotation
+
+<img class="screenshot" alt="Supplier Quotation" src="{{docs_base_url}}/assets/img/buying/supplier-quotation.png">
+
+If you have multiple Suppliers who supply you with the same Item, you
+usually send out a message (Request for Quote) to various Suppliers. In
+many cases, especially if you have centralized buying, you may want to record
+all the quotes so that
+
+  * You can easily compare prices in the future 
+  * Audit whether all Suppliers were given the opportunity to quote.
+
+Supplier Quotations are not necessary for most small businesses. Always
+evaluate the cost of collecting information to the value it really provides!
+You could only do this for high value items.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
new file mode 100644
index 0000000..455e060
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/supplier.md

@@ -0,0 +1,37 @@
+Suppliers are companies or individuals who provide you with products or
+services. They are treated in exactly the same manner as Customers in ERPNext.
+
+You can create a new Supplier via:
+
+> Buying > Documents > Supplier > New Supplier
+
+<img class="screenshot" alt="Supplier Master" src="{{docs_base_url}}/assets/img/buying/supplier-master.png">
+
+### Contacts and Addresses
+
+Contacts and Addresses in ERPNext are stored separately so that you can attach
+multiple Contacts or Addresses to Customers and Suppliers. To add a Contact or
+Address go to Buying and click on “New Contact” or “New Address”.
+
+> Tip: When you select a Supplier in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”. So make sure you
+set your defaults correctly!
+
+### Integration with Accounts
+
+In ERPNext, there is a separate Account record for each Supplier, of Each
+company.
+
+When you create a new Supplier, ERPNext will automatically create an Account
+Ledger for the Supplier under “Accounts Payable” in the Company set in the
+Supplier record.
+
+> Advanced Tip: If you want to change the Account Group under which the
+Supplier Account is created, you can set it in the Company master.
+
+If you want to create an Account in another Company, just change the Company
+value and “Save” the Supplier again.
+
+> Tip: You can also import from the Data Import Tool
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
new file mode 100644
index 0000000..83d7bf6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md

@@ -0,0 +1,22 @@
+ERPNext Web Portal gives your customers quick access to their Orders, Invoices
+and Shipments Customers can check the status of their orders, invoices, and
+shipping status by logging on to the web.
+
+![Portal Menu]({{docs_base_url}}/assets/old_images/erpnext/portal-menu.png)
+
+Once an order is raised, either using the Shopping Cart or from within
+ERPNext, your customer can view the order and keep an eye on the billing and
+shipment status. When the invoice and payment against these orders are
+submitted, the customer can see the updated status on the portal, at a glance.
+
+![Customer Portal]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-orders-1.png)
+
+#### Invoice with paid status.
+
+![Invoice Paid]({{docs_base_url}}/assets/old_images/erpnext/portal-invoice-paid.png)
+
+#### Invoice with billed status.
+
+![Billed Invoice]({{docs_base_url}}/assets/old_images/erpnext/portal-order-billed.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
new file mode 100644
index 0000000..ddac7d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/index.md

@@ -0,0 +1,8 @@
+Customer Portal is designed to give easy accesibility to customers of a
+company.
+
+This portal allows customers to login and find out information relevant to them.They can trace communication history of their mails. They can also check order status by logging into the website.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/customer-portal/index.txt b/erpnext/docs/user/manual/en/customer-portal/index.txt
new file mode 100644
index 0000000..a029f6b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/index.txt

@@ -0,0 +1,4 @@
+customer-orders-invoices-and-shipping-status
+portal-login
+sign-up
+issues

diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
new file mode 100644
index 0000000..79ac676
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md

@@ -0,0 +1,22 @@
+The customer portal makes it very easy for a customer to raise concerns. A
+simple and intuitive interface facilitates your customer to report their
+concerns as Issues. They can view the complete thread of their
+conversation.
+
+#### Empty Ticket List
+
+![Ticket List]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-list-empty.png)
+
+#### New Issue
+
+![New Ticket]({{docs_base_url}}/assets/old_images/erpnext/portal-new-ticket.png)
+
+#### Open Issue
+
+![Open Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-1.png)
+
+#### Reply on Issue
+
+![Reply Issue]({{docs_base_url}}/assets/old_images/erpnext/portal-ticket-reply.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
new file mode 100644
index 0000000..4a3b60c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md

@@ -0,0 +1,6 @@
+To login into the customer account, the customer has to use his email id and
+the password sent by ERPNext; generated through the sign-up process.
+
+![Login]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-login.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
new file mode 100644
index 0000000..01929ec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md

@@ -0,0 +1,22 @@
+Customers have to log-in to the Company Website, and sign-up as a customer.
+
+#### Step 1: Click on Login Icon
+
+![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-1.png)
+
+  
+
+#### Step 2: Click on Sign Up Icon
+
+![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-2.png)
+
+  
+
+#### Step 3: Enter Customer Name and ID
+
+![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-3.png)
+
+After the sign up process, a mail will be sent to the customers email id with
+the password details.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
new file mode 100644
index 0000000..7460568
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md

@@ -0,0 +1,26 @@
+<h1>Allow Fields to be Changed After Submit</h1>
+
+In many cases a field may need to be changed even after the document has been submitted to allow flexibility. The _Allow On Submit_ option is available for such a purpose. Certain standard fields in Doctypes are set as Allow On Submit by default (such as _Letterhead_ and _Print Heading_ in Invoices). The user can set Custom Fields as Allow On Submit using Customize Form.
+
+**Note:** Standard Fields cannot be set as Allow On Submit by a User
+
+#### Step 1: Go to Customize Form in Setup Module.
+
+```Setup >> Customize >> Customize Form```
+
+#### 
+####Step 2: Select the form containing the desired Custom Field in _Enter Form Type_ field.
+
+![]({{docs_base_url}}/assets/img/articles/kb_custom_name.png)
+
+#### **Step 3:** In the _Fields_ section, scroll down, click on the Custom field and check the _Allow On Submit._
+
+![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinform.png)
+
+_This field can now be changed even after the Document is submitted_.
+
+**Note:** The Custom Fields can also be set as Allow On Submit during the time of creation by checking the Allow On Submit option that is available.
+![]({{docs_base_url}}/assets/img/articles/kb_allowonsubmit_checkinfield.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
new file mode 100644
index 0000000..cf27229
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html

@@ -0,0 +1,7 @@
+<h1>Creating Custom Link Fields</h1>
+
+Users can create Custom Link Fields within DocTypes by following these steps;
+
+
+
+<br><h4>Step 1: Go to Customize Form in Setup Module.</h4><code>Setup &gt;&gt; Customize &gt;&gt; Customize Form</code><br><br><h4>Step 2: Select the desired form in <em>Enter Form Type</em> field.</h4><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png" height="194" width="697"><br><br><h4><strong>Step 3:</strong> In the <em>Fields</em> section;</h4><p>Insert a new Field row and set the attributes as;</p><ul><li><b>Label: </b>Desired label that user wishes to display in the form</li><li><b>Type: </b>Set as 'Link'</li><li><b>Name: </b>Desired name for the field</li><li><b>Options: </b>Enter the name of the Doctype to which the field is linked<br></li></ul><br><img src="{{docs_base_path}}/assets/img/articles/kb_customlink_newfield.png" height="311" width="697"><br><br><br><h4>Note: Please refer to https://frappe.io/kb/customization/form-architecture for more information about the form structure<br></h4><!-- html -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
new file mode 100644
index 0000000..cc7ac01
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md

@@ -0,0 +1,29 @@
+<h1>Customizing Sorting Order in the List View</h1>
+
+**Question:** I want records in my Item List sorted based on Desc Order of Item Code.
+
+**Answers:** Following are the steps to customize Sort Order for the Item master. These steps will be applicable for customizing Sort Order for the other documents as well.
+
+####Step 1: Go to Customize Form
+
+`Setup > Customize > Customize Form`
+
+####Step 2: Select Doctype
+
+Select document for which you Sort Order is to be customized. Considering a scenario, Item should be selected in the Doctype field.
+
+####Step 3: Update Sort Details
+
+In the Customize Form, you will find these fields.
+
+![Sort Order field]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-02 at 3.26.51 pm.png)
+
+1. Sort Field
+
+Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
+
+2. Sort Order
+
+Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
new file mode 100644
index 0000000..bb0461c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md

@@ -0,0 +1,23 @@
+<h1>Deleting Custom Reports</h1>
+
+ERPNext has several [types of reports](https://erpnext.com/kb/report/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
+
+If there is a report custom report which needs to be deleted, it can be achieved by following steps given below. Please note that its applicable only for the Custom Report, and not for the standard reports.
+
+####Report List
+
+In the Awesome Bar, type and select "Report List" for an option.
+
+![Report Search]({{docs_base_url}}/assets/img/articles/$SGrab_316.png)
+
+####Selecting and Deleting Report
+
+The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
+
+![Report List]({{docs_base_url}}/assets/img/articles/$SGrab_317.png)
+
+Or you can open that report, and delete it from File menu option.
+
+![Report Delete]({{docs_base_url}}/assets/img/articles/$SGrab_318.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
new file mode 100644
index 0000000..2f9655c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md

@@ -0,0 +1,23 @@
+<h1>Disable Rounded Total</h1>
+
+Each transaction in ERPNext has Standard print format. For transactions, Standard print format covers Rounded Total for that transaction by default.
+
+![Print Preview]({{docs_base_url}}/assets/img/articles/Selection_053.png)
+
+If you don't wish rounded total to be shown in the Standard Print Format, please complete following settings.
+
+####1. Go to Global Settings
+
+`Setup > Settings > Global Settings`
+
+####2. Set Global Defaults
+
+Check Disable Rounded Total, and Save Global Defaults.
+
+![Global Default]({{docs_base_url}}/assets/img/articles/Selection_052.png)
+
+For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
+   
+<div class=well>Note: This setting will only affect Standard print formats.</div>
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
new file mode 100644
index 0000000..6b1c38b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html

@@ -0,0 +1,168 @@
+<h1>Field Types</h1>
+
+<p>Following are the types of fields you can define while creating new ones, or while amend standard ones.</p>
+<ul>
+    <li><b>Attach:</b>
+
+        <br>
+        <br>Attach field allows you browsing file from File Manager and attach in the transaction.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_184.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Button:</b>
+
+        <br>
+        <br>This Field Type will generate a Button, on clicking which you can execute some function.
+        <br>
+        <br>
+    </li>
+    <li><b>Check:</b>
+
+        <br>
+        <br>Check will generate a check box field.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_185.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Column Break:</b>
+
+        <br>
+        <br>Since ERPNext has two column layout, using Column Break fields, you can divide set of fields on either side.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_186.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Currency:</b>
+
+        <br>
+        <br>Currency field holds numeric value, upto two decimal place. Also you can have currency symbol being shown for the currency field.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_187.png">
+        <br>
+        <br>
+    </li>
+</ul>
+<ul>
+    <li><b>Data:</b>
+
+        <br>
+        <br>Data field allows you entering value upto 255 character.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_183.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Date and Time:<br><br></b>This field will give you date and time picker, with value for current date and time (as provided by your computer) set by default.
+        <br>
+        <br><b><img src="{{docs_base_path}}/assets/img/articles/$SGrab_188.png"><br><br></b>
+
+    </li>
+    <li><b>Dynamic Link:<br><br></b>Link field is one which pulls data from another master/table. Dynamic link field is connected with multiple masters at the same time. Its link is determined based on value selected in the previous field.
+        <br>
+        <br>Example: Customer will be Dynamic field in the Quotation form. If use selects Quotation made for Customer, then Customer field will be linked to Customer master, and suggest records accordingly. If user selects that Quotation is for Lead, then same Customer
+        field will be linked to Lead master.
+        <br>
+        <br>
+    </li>
+    <li><b>Float:</b>
+
+        <br>
+        <br>Float field carries numeric value, upto six decimal place. Float Precision set in Setup &gt;&gt; Settings &gt;&gt; System Setting will be applicable on all the link field. For float field, decimal places generated will be as define in Float Precision.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_189.png">
+        <br>If you need more than two decimal place in the Currency field, you can change its field type to Float field from Customize Form.
+        <br>
+        <br>
+    </li>
+    <li><b>Image:</b>
+
+        <br>
+        <br>Image field will render an image file selected in another attach field.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_190b611f3.png">
+        <br>
+        <br>For the Image field, under Option, Attach field name should be provide which this field will refer to for image file, and render that image file.
+        <br>
+        <br>
+    </li>
+    <li><b>Int (Integer):</b>
+
+        <br>
+        <br>Integer field holds numeric value, without decimal place.
+        <br>
+        <br>
+    </li>
+    <li>Link Field:
+        <br>
+        <br>Link field is connected with another master from where it fetches data.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_191.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Password:<br><br></b>Password field will decode value in it. Extra coding will be required for validating password of specific user.<b><br><br></b>
+
+    </li>
+    <li><b>Read Only:<br><br></b>Read Only field will carry data fetched from another form, but they themselves will be non-editable. You should set Read Only as field type if its source for value is predetermined.
+        <br>
+        <br>
+    </li>
+    <li><b>Section Break:</b>
+
+        <br>
+        <br>Section Break can be used to divide form in multiple section.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_192.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Select:<br><br></b>Select will be the drop-down field, with possible results (separate by row) define in the Option.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_193.png">
+        <br><b><br></b>
+
+    </li>
+    <li><b>Small Text:</b>
+
+        <br>
+        <br>Small Text field carries general text content, has little more character limit than Data field.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_194.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Table:</b>
+
+        <br>
+        <br>Table will be (sort of) Link field which will render another docytpe within the current form. For example, Item table in the Sales Order form is Table field, which is linked to Sales Order Item doctype.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_196.png">
+        <br>
+        <br>
+    </li>
+    <li><b>Text Editor:</b>
+
+        <br>
+        <br>Text Editor will be large text field, with tools to format text.
+        <br>
+        <br>
+        <img src="{{docs_base_path}}/assets/img/articles/$SGrab_198.png">
+        <br>
+    </li>
+</ul>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
new file mode 100644
index 0000000..450bfb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html

@@ -0,0 +1,24 @@
+<h1>Increase Max Attachments</h1>
+
+You can increase Number of attachments which can be added to particular documents via Customize Form.
+<br>
+<br>Let's assume we need to increase Max Attachment limit for Quotation to five. Following will be the steps to achieve this.
+<br>
+<br>
+<b>Step 1</b>: Go to Setup &gt; Customize &gt; Customize Form.
+    <br>
+    <br><b>Step 2</b>: Enter Form Type.<br>&nbsp;
+    <br>In our case, it will be "Quotation".
+    <br><br><img src="{{docs_base_path}}/assets/img/articles/Selection_0179888b3.png"><br>
+    <br><b>Step 3:</b> Increase Numbers under the Max Attachments field.
+<br>
+    <br><br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_018ea50ef.png">
+    <br>
+    <br>After increasing numbers update the Customization Form.
+<br>
+<br>
+<div class="well">Note: Max limit/size of an attachment is 1MB.</div>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
new file mode 100644
index 0000000..a810705
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt

@@ -0,0 +1,16 @@
+allow-fields-to-be-changed-after-submit
+creating-custom-link-field
+customizing-sorting-order-in-the-list-view
+deleting-custom-reports
+disable-rounded-total
+field-types
+increase-max-attachments
+make-field-visible-in-print-format
+making-custom-reports-in-erpnext
+managing-dynamic-link-fields
+module-visibility
+perm-level-error-in-permission-manager
+search-record-by-specific-field
+set-language
+set-precision-for-float-currency-and-percent-fields
+user-restriction

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
new file mode 100644
index 0000000..ffdd9d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html

@@ -0,0 +1,5 @@
+<h1>Make Fields Visible In Print Format</h1>
+
+The standard print formats only display certain fields by default. In case the user prefers more information from fields to be displayed, this can be achieved by using the <i>Customize Form</i> feature.<b><br><br>Step 1:</b> Go to Customize Form in Setup Module.<br><br>
+<div class="well">Setup &gt;&gt; Customize &gt;&gt; Customize Form</div>
+<b>Step 2: </b>Select the desired form in <i>Enter Form Type</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_name.png"><br><br><b>Step 3:</b> In the <i>Fields</i> section, click on the field that must be visible in the Print Format and remove the check on <i>Print Hide</i> field.<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_custom_printhide.png" height="214" width="674"><br><br>The field will now be visible in all print formats for that Document type.<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
new file mode 100644
index 0000000..540d1cd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md

@@ -0,0 +1,53 @@
+<h1>Reports in ERPNext</h1>
+
+There are three kind of reports in ERPNext.
+
+###1. Query Report
+
+Query Report is written in SQL which pull values from database and fetch in the report. Though SQL queries can be written from front end, like HTML for customer print format, its restricted from hosted users. Because it will allow users with no access to specific report to query data from query report.
+
+Check Purchase Order Item to be Received report in Stock module for example of Query report.
+
+###2. Script Report
+
+Script Reports are written in Python and stored on server side. These are complex reports which involves exception of logic and calculation. Since these reports are written on server side, its not available for hosted users.
+
+Check Financial Analytics report in Accounts module for example of Script Report.
+
+###3. Report Builder
+
+Report Builder is an in-built report customization tool in ERPNext. This allows you to define fields of the form which shall appear as column in the report. Also you can set required filters and do sorting as per your preference.
+
+Each form in ERPNext has Report Builder option in its list view.
+
+![Report Builder Icon]({{docs_base_url}}/assets/img/articles/Selection_046.png)
+
+####Adding Column in Report
+
+Go to Menu and click on Pick Column option to select field which should be added as column in the report. You can also select the field from the child table (eg. Item table in Sales Invoice) of the form.
+
+![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_050.png)
+
+####Applying Filters
+
+All the fields of the form will be applicable for setting filter as well.
+
+![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_238.png)
+
+####Sorting
+
+Select field based on which report will be sorted.
+
+![Report Pick Column]({{docs_base_url}}/assets/img/articles/Selection_052f7b160.png)
+
+####Save Report
+
+Go to Menu and click on Save button to have this report saved with selected column, filters and sorting.
+
+![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_241.png)
+
+Saved reports appear under Customize section in the module's home page. Customize Report section only appear if you have custom reports being saved for documents of that module.
+
+![Report Pick Column]({{docs_base_url}}/assets/img/articles/$SGrab_242.png)
+
+<!-- markdown --> 
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
new file mode 100644
index 0000000..c14ef39
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md

@@ -0,0 +1,46 @@
+<h1>Managing Dynamic Link Fields</h1>
+
+Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field can benefit us.
+
+While creating Opportunity or Quotation, we have to explicitly define if it is for Lead or Customer. Based on our selection (Lead/Customer), another link field shows up where we can select actual Lead or Customer for whom we are creating this Quotation.
+
+If you set later field as Dynamic Link, where we select actual Lead or Customer, this field will be able to search Leads as well as Customers. Hence we need not insert separate link fields for Customer and Lead.
+
+Let's check steps to insert Custom Dynamic Field. For an instance, we will insert it under Journal Voucher Form.
+
+####Insert Link Field for Doctype
+
+Firstly we will create a link field which will be linked to the Doctype.
+
+![Custom Link Field]({{docs_base_url}}/assets/img/articles/$SGrab_349.png)
+
+By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order Doctype, Purchase Order Doctype and other form's doctype created under it as child Doctype.
+
+-- Doctype<br>
+----- Sales Order<br>
+----- Purchase Invoice<br>
+----- Quotation<br>
+----- Sales Invoice<br>
+----- Employee<br>
+----- Production Order<br>
+and so on, till all the forms/document of ERPNext is covered.
+
+So linking this field with parent Doctype master list all the child doctypes/forms.
+
+![journal Voucher Link Field]({{docs_base_url}}/assets/img/articles/$SGrab_352.png)
+
+####Insert Dynamic Link Field
+
+It will be "Dynamic Link" for Field Type, and field name of Doctype field mentioned in its Option field.
+
+![Custom Dynamic Field]({{docs_base_url}}/assets/img/articles/$SGrab_350.png)
+
+This field will allow us to select document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, this field will list all the Sales Orders id. If we select Purchase Invoice in the prior field, this field will render all the Purchase Order for our selection.
+
+![Journal Voucher Dynamic Field ]({{docs_base_url}}/assets/img/articles/$SGrab_353.png)
+
+####Customizing options in the Doctype Link field
+
+Bydefault, Docytpe link field will provide all the forms/doctypes for selection. If you wish this field to show certain specific doctypes in the search result, you will need to write Custom Script for it.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
new file mode 100644
index 0000000..837ca92
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md

@@ -0,0 +1,17 @@
+<h1>Module Visibility</h1>
+
+If you have permission on specific module, but it is still not visible to you, following is how you should go about checking setting to make it visible again.
+
+As step zero, reassure that you have role assigned which is required for accessing Website and Shopping Cart module. For modules in question, you should have "Website Manager" role assigned. If permissions has been customized in your account, check Role Permission Manager to know which Role has permission on Website and Shopping Cart module.
+
+If modules are hidden in-spite of assignment of required permission, then you should check if Website and Shopping Cart module is not disabled from All Application option on your desk/home page.
+
+![All Applications]({{docs_base_url}}/assets/img/articles/$SGrab_223.png)
+
+If modules are still not visible, check if it is hidden by System Manager from Show/Hide Modules option in the Setup module.
+
+<div class="well">Setup &gt;&gt; Settings &gt;&gt; Show / Hide Modules</div>Ensure required module are checked, and not disabled in this page. If you just enabled/activated it, update Show/Hide Module page, and check your home page after Help &gt;&gt; Clear Cache.
+
+<div class="well">Note: In this help page, Website and Shopping Cart module is considered as an example. You can troubleshoot visibility issues for other modules following same steps.</div>
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md
new file mode 100644
index 0000000..2fb27b6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager.md

@@ -0,0 +1,19 @@
+<h1>Perm Level Error in Permission Manager</h1>
+
+While customizing rules in the [Permission Manager](https://erpnext.com/user-guide/setting-up/permissions/role-based-permissions), you might receive an error message saying:
+
+`For System Manager_ (or other role) _at level 2_ (or other level) _in Customer_ (or document) _in row 8: Permission at level 0 must be set before higher levels are set`.
+
+Error message indicates problem in the existing permission setting for this document.
+
+For any role, before assigning permission at Perm Level 1, 2, permission at Perm Level 0 must be assigned. Error message says that System Manager has been assigned permission at Perm Level 1 and 2, but not at level 0. You should first correct the permission for System Manager's role by:
+
+- Assigning permission to System Manager at level 0.
+
+Or
+
+- By removing permission at level 1 and 2.
+
+After executing one of the above step, you should try adding additional rules in the Role Permission Manager.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
new file mode 100644
index 0000000..1505964
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md

@@ -0,0 +1,21 @@
+<h1>Search Record by Specific Field</h1>
+
+While creating any document in ERPNext, you might have to select other record id in it (like selecting Customer in Quotation). For ease in selecting other record, you can search them based on value in various fields of that record. Search By functionality enables you searching and filtering records based on value in the specific fields of that record.
+
+Let's consider an example to learn Search By functionality better. While creating Sales Order, we need to select Customer in it. If we need to filter search result of Customer for specific Customer Group, we should go about following these steps to achieve it.
+
+####Search By in Customize Form
+
+In the Customize Form tool, you will find field called Search Field. You should enter field names based on which we can search and filter result for this document.
+
+Considering our scenario, we should update name of Customer Group field for Customer in the Customize Form.
+
+![Search By in Customize Form]()
+
+####Searching in Another Record.
+
+While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
+
+![Search for master]()
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
new file mode 100644
index 0000000..91e9e5f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md

@@ -0,0 +1,38 @@
+<h1>Change the Language</h1>
+
+ERPNext is an multi-lingual application, which means user can select a preferred language for one's ERPNext account.
+
+### 1. Setting Language in User's Account
+
+Following are the steps to set language in your ERPNext account.
+
+#### 1.1 Go to My Setting
+
+![My Setting]({{docs_base_url}}/assets/img/articles/$SGrab_428.png)
+
+#### 1.2 Select Language
+
+![Select Language]({{docs_base_url}}/assets/img/articles/$SGrab_429.png)
+
+#### 1.3 Save User
+
+On saving User after selecting language, your ERPNext account will be refresh automatically. Then you will see ERPNext translated in your selected language.
+
+Being a System Manager, you can set language in other user's master as well.
+
+### 2. Set Language Globally for an Account
+
+#### 2.1 Go to Setup
+
+`Setup > Settings > System Settings`
+
+#### Set Language
+
+![Global Language]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-05 at 4.35.12 pm.png)
+
+#### Save
+
+Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
+
+Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://frappe.io/translator).
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
new file mode 100644
index 0000000..2cc39e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md

@@ -0,0 +1,26 @@
+<h1>Set Precision for Float, Currency and Percent fields</h1>
+
+In ERPNext, default precision for `Float`, `Currency` and `Percent` field is 3. So, you can enter any number up-to 3 decimals in such fields.
+
+You can also change / customize the precision settings globally or for a specific field.
+
+To change the precision globally, go to `Setup > Settings > System Settings`.
+![Global Precision]({{docs_base_url}}/assets/img/articles/precision-global.png)
+
+You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
+![Field-wise Precision]({{docs_base_url}}/assets/img/articles/precision-fieldwise.png)
+
+**Note:**
+If you are changing precision of a field to a higher number, all the related fields should also be set to the same precision.
+
+For example, if you want to calculate invoice total upto 5 decimals, you need to change the precision of all related fields, which resulted total. In this case you have to change following fields to get correct total.
+
+    Sales Invoice Item: price_list_rate, base_price_list_rate, rate, base_rate, amount and base_amount
+    
+    Taxes and Charges: tax_amount, total and tax_amount_after_discount
+    
+    Sales Invoice: net_total, other_charges_total, discount_amount and grand_total
+
+And precision should be changed in all related documents as well, to get correct mapping. In this case, same precision should be set for Quotation, Sales order, Delivery Note and Sales Invoice.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
new file mode 100644
index 0000000..09f9cb1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html

@@ -0,0 +1,29 @@
+<h1>Owner Restriction</h1>
+
+To restricting user based on Owner (creator of record),&nbsp; form/document should have field linked with User master. If that document is not linked with user, then you should create <a href="https://erpnext.com/user-guide/customize-erpnext/custom-field" target="_blank">custom field</a> and link it with User master.
+<br>
+<br>Following are the steps to restrict User based on Owner.
+<br>
+<br><b>Step 1: </b>Go to:
+<br>
+<br>Setup &gt; Permissions &gt; Role Permissions Manager
+<br>
+<br><b>Step 2:</b> Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
+<br>&nbsp;
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0045d151c.png"><br>
+<br><b>Step 3:</b> For Role to be resricted (Sales User in this case), check "Apply User Restriction". On checking Apply User Permission, two links will be show up called:
+<br>
+<br>- Select Document Type
+<br>- Select User Permissions
+<br>
+<br>Click on "Select Document Type".
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0028834c2.png" height="168" width="691">
+<br>
+<br><b>Step 4:</b> Check mark on User, and un-check for others. If you want user to be restricted based on some other criteria as well, like territory, customer groups, then that should be checked as well.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_003fea339.png">&nbsp;
+<br>
+<div class="well">When restricting User based on User master itself, then there is no need to create User Permission Setting.</div>

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
new file mode 100644
index 0000000..fdca8da
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md

@@ -0,0 +1,74 @@
+DocType or Document Type is a tool to insert form in ERPNext. The forms like Sales Order,
+Sales Invoices, Production Order are added as Doctype in the backend. Let's assume we are
+creating a Custom Doctype for a Book.
+
+Custom Doctype allows you to insert custom forms in ERPNext as per your requirement.
+
+To create a new **DocType**, go to:
+
+`Setup > Customize > Doctype > New`
+
+#### Doctype Detail
+
+1. Module: Select module in which this Doctype should be placed.
+1. Document Type: Specify if this Doctype will be to carry master data, or to track transactions. Doctype
+for book will be added as Master.
+1. Is Child table: If this Doctype is to be inserted as table into another Doctype, like Item table
+in the Sales Order Doctype, then you should check Is Child Table. Else no.
+1. Is Single: If checked, this Doctype will become a single form, like Selling Setting, which user will
+not be able to re-produce.
+1. Custom?: This field will be checked by default when adding Custom Doctype.
+
+![Doctype Basic]({{docs_base_url}}/assets/img/setup/customize/doctype-basics.png)
+
+#### Fields
+
+In the Fields Table, you can add the fields (properties) of the DocType (Article).
+
+Fields are much more than database columns, they can be:
+
+1. Columns in the database
+1. For Layout (section / column breaks)
+1. Child tables (Table type field)
+1. HTML
+1. Actions (button)
+1. Attachments or Images
+
+![Doctype fields]({{docs_base_url}}/assets/img/setup/customize/Doctype-all-fields.png)
+
+When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column.
+
+You can also set other properties of the field like whether it is mandatory, read only etc.
+
+#### Naming
+
+In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**.
+
+![Doctype Naming]({{docs_base_url}}/assets/img/setup/customize/doctype-field-naming.png)
+
+#### Permission
+
+In this table, you should select roles and define permission roles for them for this Doctype.
+
+![Doctype Permissions]({{docs_base_url}}/assets/img/setup/customize/Doctype-permissions.png)
+
+#### Save Doctype
+
+On saving doctype, you will get pop-up to provide name for this Doctype.
+
+![Doctype Save]({{docs_base_url}}/assets/img/setup/customize/Doctype-save.png)
+
+#### Doctype in System
+
+To check this Doctype, open Module defined for this doctype. Since we have added Books doctype in the
+Human Resource module, to access this doctype, go to:
+
+`Human Resource > Document > Book`
+
+![Doctype List]({{docs_base_url}}/assets/img/setup/customize/Doctype-list-view.png)
+
+#### Book master
+
+Using the fields entered, following is the master one book.
+
+![Doctype List]({{docs_base_url}}/assets/img/setup/customize/Doctype-book-added.png)

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
new file mode 100644
index 0000000..8aefa80
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md

@@ -0,0 +1,77 @@
+Custom Field feature allows you to insert fields in the existing masters and transactions as per your requirement. While inseting custom field, you can define its properties like.
+
+* Field Name/Label
+* Field Type
+* Mandatory/Non-Mandatory
+* Insert After Field
+
+To add a Custom Field, go to:
+
+> Setup > Customize > Custom Field > New Custom Field
+
+You can also insert new Custom Field from [Customize Form](https://erpnext.com/customize-erpnext/customize-form) tool.
+
+In Customize Form, for each field, you will find plus (+) option. When click on it, new row will be inserted above that field. You can enter properties for your Custom Field in the newly added blank row.
+
+![Customize Form Custom Field]({{docs_base_url}}/assets/old_images/erpnext/customize-form-custom-field.png)
+
+Following are the steps to insert Custom Field in the existing form.
+
+####New Custom Field form / Row in Customize Form
+
+As mentioned above, you can insert Custom Field from Custom Field form, and also from Customize Form.
+
+####Select Document/Form
+
+You should select transaction or master in which you want to insert custom field. Let's assume you need to insert a custom link field in the Quotation form. In this case, Document will be "Quotation".
+
+![Custom Field Document]({{docs_base_url}}/assets/old_images/erpnext/custom-field-document.png)
+
+####Set Field Label
+
+Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again.
+
+![Custom Field Label]({{docs_base_url}}/assets/old_images/erpnext/custom-field-label.png)
+
+####Select Insert After
+
+This field will have all the existing field of the form/doctype selected. Your Custom Field will be placed after field you select in the Insert After field.
+
+![Custom Field Insert]({{docs_base_url}}/assets/old_images/erpnext/custom-field-insert.png)
+
+####Select Field Type
+
+Click [here](https://erpnext.com/kb/customize/field-types) to learn more about types of field you can set for your Custom Field.
+
+![Custom Field Type]({{docs_base_url}}/assets/old_images/erpnext/custom-field-type.png)
+
+####Set Option
+
+If you are creating a Link field, then Doctype name with which this field will be linked to will be entered in the Option field. Click [here](https://erpnext.com/kb/customize/creating-custom-link-field) to learn more about creating custom link field.
+
+![Custom Field Link]({{docs_base_url}}/assets/old_images/erpnext/custom-field-link.png)
+
+If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row.
+
+![Custom Field Option]({{docs_base_url}}/assets/old_images/erpnext/custom-field-option.png)
+
+For other field types, like Data, Date, Currency etc., Opton field will be left blank.
+
+####Set More Properties
+
+You can set properties as:
+
+1. Mandatory: Should this field be mandatory or non-mandatory.
+1. Print Hide: Should this field be visible in the print format or no.
+1. Field Description: It will be short field description which will appear just below that field.
+1. Default Value: Value entered in this field will be auto-updated in this field.
+1. Read Only: Checking this option will make custom field non-editable.
+1. Allow on Submit: Checking this option will allow editing value in the field when in submitted transaction.
+
+![Custom Field Properties]({{docs_base_url}}/assets/old_images/erpnext/custom-field-properties.png)
+
+####Deleting Custom Field
+
+Given a permission, user will be able to delete Custom Fields. Incase, it was deleted by default, if you add another Custom Field with same name. Then you shall see new field auto-mapped with old-deleted Custom Field.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
new file mode 100644
index 0000000..12054be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md

@@ -0,0 +1,23 @@
+# Add a Custom Button
+
+	frappe.ui.form.on("Event", "refresh", function(frm) {
+		frm.add_custom_button(__("Do Something"), function() {
+			// When this button is clicked, do this
+			
+			var subject = frm.doc.subject;
+			var event_type = frm.doc.event_type;
+			
+			// do something with these values, like an ajax request 
+			// or call a server side frappe function using frappe.call
+			$.ajax({
+				url: "http://example.com/just-do-it",
+				data: {
+					"subject": subject,
+					"event_type": event_type
+				}
+				
+				// read more about $.ajax syntax at http://api.jquery.com/jquery.ajax/
+			
+			});
+		});
+	});

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
new file mode 100644
index 0000000..b77c9b8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md

@@ -0,0 +1,25 @@
+To pull a value of a link on selection, use the `add_fetch` method.
+
+    
+    
+    add_fetch(link_fieldname, source_fieldname, target_fieldname)
+    
+
+### Example
+
+You create Custom Field **VAT ID** (`vat_id`) in **Customer** and **Sales
+Invoice** and want to make sure this value gets updated every time you select
+a Customer in a Sales Invoice.
+
+Then in the Sales Invoice Custom Script, add this line:
+
+    
+    
+    cur_frm.add_fetch('customer','vat_id','vat_id')
+    
+
+* * *
+
+See: [How to create a custom script]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-scripts.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
new file mode 100644
index 0000000..0d080af
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md

@@ -0,0 +1,11 @@
+# Date Validation
+
+
+	frappe.ui.form.on("Event", "validate", function(frm) {
+        if (frm.doc.from_date < get_today()) {
+            msgprint(__("You can not select past date in From Date"));
+            throw "past date selected"
+        }
+	});
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
new file mode 100644
index 0000000..960aa89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md

@@ -0,0 +1,39 @@
+Add this in the Custom Script of **Item**, so that the new Item Code is
+generated just before the a new Item is saved.
+
+
+(Thanks to Aditya Duggal)
+
+
+
+    cur_frm.cscript.custom_validate = function(doc) {
+        // clear item_code (name is from item_code)
+        doc.item_code = "";
+
+        // first 2 characters based on item_group
+        switch(doc.item_group) {
+            case "Test A":
+                doc.item_code = "TA";
+                break;
+            case "Test B":
+                doc.item_code = "TB";
+                break;
+            default:
+                doc.item_code = "XX";
+        }
+
+        // add next 2 characters based on brand
+        switch(doc.brand) {
+            case "Brand A":
+                doc.item_code += "BA";
+                break;
+            case "Brand B":
+                doc.item_code += "BB";
+                break;
+            default:
+                doc.item_code += "BX";
+        }
+    }
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
new file mode 100644
index 0000000..78edcfc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md

@@ -0,0 +1,18 @@
+### How to Create a Custom Script
+
+Create a Custom Script (you must have System Manager role for this):
+
+  1. Got to: Setup > Custom Script > New Custom Script
+  2. Select the DocType in which you want to add the Custom Script
+
+* * *
+
+### Notes
+
+  1. Server Custom Scripts are only available for the Administrator.
+  2. Client Custom Scripts are in Javascript and Server Custom Scripts are in Python.
+  3. For testing, make sure to go to Tools > Clear Cache and refresh after updating a Custom Script.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt
new file mode 100644
index 0000000..2b49755
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt

@@ -0,0 +1,10 @@
+custom-script-fetch-values-from-master
+date-validation
+generate-item-code-based-on-custom-logic
+make-read-only-after-saving
+restrict-cancel-rights
+restrict-purpose-of-stock-entry
+restrict-user-based-on-child-record
+sales-invoice-id-based-on-sales-order-id
+update-date-field-based-on-value-in-other-date-field
+custom-button

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
new file mode 100644
index 0000000..4fda1bd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md

@@ -0,0 +1,12 @@
+Use the method `cur_frm.set_df_property` to update the field's display.
+
+In this script we also use the `__islocal` property of the doc to check if the
+document has been saved atleast once or is never saved. If `__islocal` is `1`,
+then the document has never been saved.
+
+    frappe.ui.form.on("MyDocType", "refresh", function(frm) {
+        // use the __islocal value of doc, to check if the doc is saved or not
+        frm.set_df_property("myfield", "read_only", frm.doc.__islocal ? 0 : 1);
+    }
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
new file mode 100644
index 0000000..e5037fe
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md

@@ -0,0 +1,17 @@
+Add a handler to `custom_before_cancel` event:
+
+
+
+    cur_frm.cscript.custom_before_cancel = function(doc) {
+        if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+                && user_roles.indexOf("System Manager")==-1) {
+            if (flt(doc.grand_total) > 10000) {
+                msgprint("You can not cancel this transaction, because grand total \
+                    is greater than 10000");
+                validated = false;
+            }
+        }
+    }
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
new file mode 100644
index 0000000..9b37eb5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md

@@ -0,0 +1,10 @@
+
+    frappe.ui.form.on("Material Request", "validate", function(frm) {
+        if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
+            msgprint("You are only allowed Material Receipt");
+            throw "Not allowed";
+        }
+    }
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
new file mode 100644
index 0000000..6c36a14
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md

@@ -0,0 +1,20 @@
+
+    // restrict certain warehouse to Material Manager
+    cur_frm.cscript.custom_validate = function(doc) {
+        if(user_roles.indexOf("Material Manager")==-1) {
+
+            var restricted_in_source = wn.model.get("Stock Entry Detail",
+                {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
+
+            var restricted_in_target = wn.model.get("Stock Entry Detail",
+                {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
+
+            if(restricted_in_source.length || restricted_in_target.length) {
+                msgprint("Only Material Manager can make entry in Restricted Warehouse");
+                validated = false;
+            }
+        }
+    }
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
new file mode 100644
index 0000000..72dbb6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md

@@ -0,0 +1,19 @@
+Below script allows you to get naming series in Sales Invoice, same as of corresponding Sales Order.
+Invoice uses a prefix M- but the number duplicates the SO doc name (number).
+
+Example: If Sales Order id is SO-12345, then corresponding Sales Invoice id will be set as M-12345.
+
+    frappe.ui.form.on("Sales Invoice", "refresh", function(frm){
+        var sales_order = frm.doc.items[0].sales_order.replace("M", "M-");
+        if (!frm.doc.__islocal && sales_order && frm.doc.name!==sales_order){
+            frappe.call({
+            method: 'frappe.model.rename_doc.rename_doc',
+            args: {
+                doctype: frm.doctype,
+                old: frm.docname,
+                "new": sales_order,
+                "merge": false
+           },
+        });
+        }
+    });

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
new file mode 100644
index 0000000..b7a5e1c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md

@@ -0,0 +1,7 @@
+Below script would auto-set value for the date field, based on the value in another date field.
+
+Example: Production Due Date must be set as two days before Delivery Date. If you have Production Due Date field already, with field type as Date, as per the below given script, date will be auto-updated in it, two days prior Deliver Date.
+
+    cur_frm.cscript.custom_delivery_date = function(doc, cdt, cd){
+    cur_frm.set_value("production_due_date", frappe.datetime.add_days(doc.delivery_date, -2));
+     }

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
new file mode 100644
index 0000000..e5e9d74
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md

@@ -0,0 +1,11 @@
+If you wish to change any ERPNext form formats, you can do so by using Custom
+Scripts. For example, if you wish to add a submit button after saving, to a
+Lead form, you can do so by creating your own script.
+
+> Setup > Customization > Custom Script
+
+![Custom Script]({{docs_base_url}}/assets/old_images/erpnext/custom-script.png)
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt
new file mode 100644
index 0000000..0fd3d46
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt

@@ -0,0 +1 @@
+custom-script-examples
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
new file mode 100644
index 0000000..232f34b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md

@@ -0,0 +1,107 @@
+<!--markdown-->
+Before we venture to learn form customization tool, click [here](https://kb.frappe.io/kb/customization/form-architecture) to understand the architecture of forms in ERPNext. It shall help you in using Customize Form tool more efficiently.
+
+Customize Form is the tool which allows user to customize the property of standard fields as per the requirement. Let's assume we need to set Project Name field as mandatory in the Sales Order form. Following are the steps which shall be followed to achieve this.
+
+####Step 1: Go to Customize Form
+
+You can go to Customize Form from:
+
+> Setup >> Customize >> Customize Form
+
+System Manager will find Customize Form option in the Sales Order list (or any other form for that matter) view as well.
+
+![Customize Form List View]({{docs_base_url}}/assets/old_images/erpnext/customize-form-list-view.png)
+
+####Step 2: Select Docytpe/Document
+
+You should select Docytpe/Document which has field-to-be-customized located in it.
+
+![Customize Form Document]({{docs_base_url}}/assets/old_images/erpnext/customize-form-document.png)
+
+####Step 3:Edit Property
+
+On selecting Doctype/table, you will have all the fields of the table updated as rows in the Customize Form table. You should drill down to field you need to work on, Project Name in this case.
+
+On clicking Project Name row, fields to set various property for this field will be shown. To Customize the mandatory property for a field, there is a field called "Mandatory". Checking this field will set Project Name field as mandatory in the Quotation form.
+
+![Customize Form Mandatory]({{docs_base_url}}/assets/old_images/erpnext/customize-form-mandatory.png)
+
+Like this, you can customize following properties of the field.
+
+* Change field types (for e.g. you want to increase the number of decimal places, you can convert come fields from Float to Currency).
+* Change labels to suit your industry / language.
+* Make certain fields mandatory.
+* Hide certain fields.
+* Change layout (sequence of fields). To do this, select a field in the grid and click on“Up” or “Down” in the grid toolbar.
+* Add / edit “Select” Options. (for example, you can add more sources in Leads etc).
+
+####Step 4: Update
+
+![Customize Form Update]({{docs_base_url}}/assets/old_images/erpnext/customize-form-update.png)
+
+Before checking Sales Order form, you should clear cache and refresh browser tab for customization to take effect.
+
+For Customize Form, you can also allow attachments, set max number of attachments and set the default Print Format.
+
+>Note: Though we want you to do everything you can to customize your ERP based on your business needs, we recommend that you do not make “wild” changes to the forms. This is because, these changes may affect certain operations and may mess up your forms. Make small changes and see its effect before doing some more.
+
+Following are the properties which you can customize for a specific field from Customize Form.
+<style>
+    td {
+    padding:5px 10px 5px 5px;
+    };
+    img {
+    align:center;
+    };
+table, th, td {
+    border: 1px solid black;
+    border-collapse: collapse;
+}
+</style>
+<table border="1" width="700px">
+  <tbody>
+    <tr>
+      <td style="text-align: center;"><b>Field property</b></td>
+      <td style="text-align: center;"><b>Purpose</b></td>
+    </tr>
+    <tr>
+      <td>Print hide</td>
+      <td>Checking it will hide field from Standard print format.</td>
+    </tr>
+    <tr>
+      <td>Hidden</td>
+      <td>Checking it field will hide field in the data entry form.</td>
+    </tr>
+    <tr>
+      <td>Mandatory</td>
+      <td>Checking it will set field as mandatory.</td>
+    </tr>
+    <tr>
+      <td>Field Type</td>
+      <td>Click <a href="https://erpnext.com/kb/customize/field-types">here</a> to learn about of fields types.</td>
+    </tr>
+    <tr>
+      <td>Options</td>
+      <td>Possible result for a drop down fields can be listed here. Also for a link field, relevant Doctype can be provided.</td>
+    </tr>
+    <tr>
+      <td>Allow on submit</td>
+      <td>Checking it will let user update value in field even in submitted form.</td>
+    </tr>
+    <tr>
+      <td>Default</td>
+      <td>Value defined in default will be pulled on new record creation.</td>
+    </tr>
+    <tr>
+      <td>Description</td>
+      <td>Gives field description for users understanding.</td>
+    </tr>
+    <tr>
+      <td>Label</td>
+      <td>Label is the field name which appears in form.</td>
+    </tr>
+  </tbody>
+</table>
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/document-title.md b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
new file mode 100644
index 0000000..639e358
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md

@@ -0,0 +1,33 @@
+You can customize the title of documents based on properties so that you have meaningful information for the list views.
+
+For example the default title on **Quotation** is the customer name, but if you are dealing a few customers and sending lots of quotes to the same customer, you may want to customize.
+
+#### Setting Title Fields
+
+From ERPNext Version 6.0 onwards, all transactions have a `title` property. If there is not a title property, you can add a **Custom Field** as title and set the **Title Field** via **Customize Form**.
+
+You can set the default value of that property by using Python style string formatting in **Default** or **Options**
+
+To edit a default title, go to
+
+1. Setup > Customize > Customize Form
+2. Select your transaction
+3. Edit the **Default** field in your form
+
+#### Defining Titles
+
+You can define the title by setting document properties in braces `{}`. For example if your document has properties `customer_name` and `project` here is how you can set the default title:
+
+    {customer_name} for {project}
+
+<img class="screenshot" alt = "Customize Title"
+    src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
+
+#### Fixed or Editable Titles
+
+If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document.
+
+<img class="screenshot" alt = "Editable Title"
+    src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
+
+If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated.

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
new file mode 100644
index 0000000..60addc1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md

@@ -0,0 +1,30 @@
+### Hiding Unused Features
+
+As you have seen from this manual that ERPNext contains tons of features which
+you may not use. We have observed that most users start with using 20% of the
+features, though a different 20%. To hide fields belonging to features you
+dont require, go to:
+
+> Setup > Tools > Hide/Unhide Features
+
+![Hide Features]({{docs_base_url}}/assets/old_images/erpnext/hide-features.png)
+
+Check / uncheck the features you want to use and refresh your page for the
+changes to take effect.
+
+* * *
+
+### Hiding Module Icons
+
+To hide modules (icons) from the home page, go to:
+
+Setup > Tools> Modules Setup
+
+![Hide/Unhide Modules]({{docs_base_url}}/assets/old_images/erpnext/hide-module.png)
+
+> Note: Modules are automatically hidden for users that have no permissions on
+the documents within that module. For example, if a user has no permissions on
+Purchase Order, Purchase Request, Supplier, the “Buying” module will
+automatically be hidden.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/index.md b/erpnext/docs/user/manual/en/customize-erpnext/index.md
new file mode 100644
index 0000000..2132a95
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.md

@@ -0,0 +1,13 @@
+# Customize ERPNext
+
+ERPNext offers many tools to customize the system.
+
+You simplify the forms by hiding features you don’t need using Disable
+Features and Module Setup, add Custom Fields, change form properties, like
+adding more options to drop-downs or hiding fields using Customize Form View
+and make your own Print Formats by using HTML Templates. You can also create
+multiple Letter Heads for your Prints.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
new file mode 100644
index 0000000..1113395
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.txt

@@ -0,0 +1,8 @@
+custom-field
+custom-doctype
+custom-scripts
+customize-form
+document-title
+hiding-modules-and-features
+print-format
+articles

diff --git a/erpnext/docs/user/manual/en/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
new file mode 100644
index 0000000..e3c9450
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md

@@ -0,0 +1,106 @@
+<!-- no-jinja -->
+
+Print Formats are the layouts that are generated when you want to Print or
+Email a transaction like a Sales Invoice. There are two types of Print
+Formats,
+
+  * The auto-generated “Standard” Print Format: This type of format follows the same layout as the form and is generated automatically by ERPNext.
+  * Based on the Print Format document. There are templates in HTML that will be rendered with data.
+
+ERPNext comes with a number of pre-defined templates in three styles: Modern,
+Classic and Standard.
+
+You can modify the templates or create your own. Editing
+ERPNext templates is not allowed because they may be over-written in an
+upcoming release.
+
+To create your own versions, open an existing template from:
+
+> Setup > Printing > Print Formats
+
+![Print Format]({{docs_base_url}}/assets/old_images/erpnext/customize/print-format.png)
+
+Select the type of Print Format you want to edit and click on the “Copy”
+button on the right column. A new Print Format will open up with “Is Standard”
+set as “No” and you can edit the Print Format.
+
+Editing a Print Format is a long discussion and you will have to know a bit of
+HTML, CSS, Python to learn this. For help, please post on our forum.
+
+Print Formats are rendered on the server side using the [Jinja Templating Language](http://jinja.pocoo.org/docs/templates/). All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.
+
+For styling, the [Boostrap CSS Framework](http://getbootstrap.com/) is provided and you can enjoy the full range of classes.
+
+> Note: Pre-printed stationary is usually not a good idea because your Prints
+will look incomplete (inconsistent) when you send them by mail.
+
+#### References
+
+1. [Jinja Tempalting Language: Reference](http://jinja.pocoo.org/docs/templates/)
+1. [Bootstrap CSS Framework](http://getbootstrap.com/)
+
+#### Print Settings
+
+To edit / update your print and PDF settings, go to:
+
+> Setup > Printing and Branding > Print Settings
+
+![Print Format]({{docs_base_url}}/assets/old_images/erpnext/customize/print-settings.png)
+
+#### Example
+
+{% set example = '''<h3>{{ doc.select_print_heading or "Invoice" }}</h3>
+	<div class="row">
+		<div class="col-md-3 text-right">Customer Name</div>
+		<div class="col-md-9">{{ doc.customer_name }}</div>
+	</div>
+	<div class="row">
+		<div class="col-md-3 text-right">Date</div>
+		<div class="col-md-9">{{ doc.get_formatted("invoice_date") }}</div>
+	</div>
+	<table class="table table-bordered">
+		<tbody>
+			<tr>
+				<th>Sr</th>
+				<th>Item Name</th>
+				<th>Description</th>
+				<th class="text-right">Qty</th>
+				<th class="text-right">Rate</th>
+				<th class="text-right">Amount</th>
+			</tr>
+			{%- for row in doc.items -%}
+			<tr>
+				<td style="width: 3%;">{{ row.idx }}</td>
+				<td style="width: 20%;">
+					{{ row.item_name }}
+					{% if row.item_code != row.item_name -%}
+					<br>Item Code: {{ row.item_code}}
+					{%- endif %}
+				</td>
+				<td style="width: 37%;">
+					<div style="border: 0px;">{{ row.description }}</div></td>
+				<td style="width: 10%; text-align: right;">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>
+				<td style="width: 15%; text-align: right;">{{
+					row.get_formatted("rate", doc) }}</td>
+				<td style="width: 15%; text-align: right;">{{
+					row.get_formatted("amount", doc) }}</td>
+			</tr>
+			{%- endfor -%}
+		</tbody>
+	</table>''' %}
+
+    {{ example|e }}
+
+#### Notes
+
+1. To get date and currency formatted values use, `doc.get_formatted("fieldname")`
+1. For translatable strings, us `{{ _("This string is translated") }}`
+
+#### Footers
+
+Many times you may want to have a standard footer for your prints with your
+address and contact information. Unfortunately due to the limited print
+support in HTML pages, it is not possible unless you get it scripted. Either
+you can use pre-printed stationary or add this information in your header.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
new file mode 100644
index 0000000..d3ec301
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md

@@ -0,0 +1,24 @@
+In ERPNext, you can manage Employee Appraisals by creating an Appraisal
+Template for each role with the parameters that define the performance by
+giving appropriate weightage to each parameter.
+
+> Human Resource > Appraisal > New
+
+#### Step 1: Select an Appraisal Template
+
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal.png">
+
+After you select the template, the remaining form appears.
+
+#### Step 2: Enter Employee Details
+
+<img class="screenshot" alt="Appraisal" src="{{docs_base_url}}/assets/img/human-resources/appraisal-employee.png">
+
+Once the Appraisal Template is completed, you can create Appraisal records for
+each period where you track performance. You can give points out of 5 for each
+parameter and the system will calculate the overall performance of the
+Employee.
+
+To make the Appraisal final, make sure to “Submit” it.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
new file mode 100644
index 0000000..fddab31
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md

@@ -0,0 +1,55 @@
+<h1>Employees Loan Management</h1>
+
+Employee Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the Employee loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary.
+
+Let's check below how accounting can be managed for Employee Loan in ERPNext.
+
+### 1. Setup Masters
+
+Create following Groups and Ledgers in Chart of Accounts if not there.
+      
+#### 1.1  Employee Loan Account
+
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](https://erpnext.com/kb/setup/managing-tree-structure-masters)
+
+![CoA]({{docs_base_url}}/assets/img/articles/Selection_433.png)
+
+#### 1.2 Salaries Account
+
+Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
+
+![CoA]({{docs_base_url}}/assets/img/articles/Selection_434.png)
+
+#### 1.3 Interest Account
+
+Create Ledger as 'Interest on Loan' under Indirect Income.
+
+### 2. Book Loan Amount
+
+Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.  
+
+![Loan Entry]({{docs_base_url}}/assets/img/articles/Selection_435.png)
+
+### 3. Book Loan Recovery and Interest
+
+#### 3.1 Loan Recovery Entry
+
+If your employee pays separately for his/her loan installment and loan interest, then create journal voucher. 
+
+![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_436.png)
+
+#### 3.2 Loan Adjustment in Salary
+
+And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
+
+![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_437.png)
+
+In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
+
+### 4. Loan Account Report
+
+After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
+
+![Loan Reco]({{docs_base_url}}/assets/img/articles/Selection_439.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.md b/erpnext/docs/user/manual/en/human-resources/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.txt b/erpnext/docs/user/manual/en/human-resources/articles/index.txt
new file mode 100644
index 0000000..3fbdc5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.txt

@@ -0,0 +1,2 @@
+employees-loan-management
+leave-calculation-in-salary-slip
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
new file mode 100644
index 0000000..7153708
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md

@@ -0,0 +1,52 @@
+<h1>Leave Calculation In Salary Slip</h1>
+
+There are two types of leave which user can apply for.
+<br>
+<br>
+<ol>
+    <li>Paid Leave (Sick Leave, Privilege Leave, Casual Leave etc.)</li>
+    <li>Unpaid Leave
+        <br>
+    </li>
+</ol>Paid Leave are firstly allocated by HR manager. As and when Employee creates Leave Application, leaves allocated to him/her are deducted. These leaves doesn't have impact on the employee's Salary Slip.
+<br>
+<br>When Employee is out of paid leave, he create Leave Application for unpaid leave. The term used for unpaid leave in ERPNext is Leave Without Pay (LWP). These leaves does have impact on the Employee's Salary Slip.
+<br>
+<br>
+<div class="well">Just marking Absent in the Attendance record do not have impact on salary calculation of an Employee, as that absenteeism could be because of paid leave. Hence creating Leave Application should be created incase of absenteeism.<br></div>Let's consider
+a scenario to understand how leaves impact employees Salary Slip.
+<br>
+<br><b>Masters:</b>
+
+<br>
+<br>
+<ol>
+    <li>Setup Employee</li>
+    <li>Allocate him paid leaves</li>
+    <li>Create Salary Structure for that Employee. In the Earning and Deduction table, select which component of salary should be affected if Employee takes LWP.</li>
+    <li>Create Holiday List (if any), and link it with Employee master.</li>
+</ol>
+<p>When creating Salary Slip for an Employee, following is what you will see:</p>
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_282.png">
+<br>
+<br><b>Working Days:</b> Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
+<br>
+<br>
+<div class="well">Human Resource &gt;&gt; Setup &gt;&gt; HR Setting
+    <br>
+    <br>Uncheck field "Include Holidays in Total No. of Working Days"
+    <br>
+</div>Holidays are counted based on Holiday List attached to the Employee's master.<b><br><br>Leave Without Pay: </b>Leave Without Pay is updated based on Leave Application made for this Employee, in the month for which Salary Slip is created, and which has
+Leave Type as "Leave Without Pay".
+<br>
+<br><b>Payment Days:</b> Following is how Payment Days are calculated:
+<br>
+<br>Payment Days = Working Days - Leave Without Pay
+<br>
+<br>As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
+<br>
+<br>
+<img src="{{docs_base_url}}/assets/img/articles/SGrab_283.png" width="760"><br>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/attendance.md b/erpnext/docs/user/manual/en/human-resources/attendance.md
new file mode 100644
index 0000000..7c3b9b6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/attendance.md

@@ -0,0 +1,14 @@
+An Attendance record stating that an Employee has been present on a particular
+day can be created manually by:
+
+> Human Resources > Attendance > New Attendance
+
+<img class="screenshot" alt="Attendence" src="{{docs_base_url}}/assets/img/human-resources/attendence.png">
+
+You can get a monthly report of your Attendance data by going to the “Monthly
+Attendance Details” report.
+
+You can also bulk uppload attendence using the [Upload Attendence Tool ]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html)
+
+{next}
+

diff --git a/erpnext/docs/user/manual/en/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
new file mode 100644
index 0000000..fd14aa9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md

@@ -0,0 +1,9 @@
+There are many fields you can add in your Employee records.
+
+To create new Employee go to:
+
+> Human Resources > Employee > New
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/employee.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
new file mode 100644
index 0000000..187bf49
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md

@@ -0,0 +1,39 @@
+Expense Claim is made when Employee’s make expenses out of their pocket on
+behalf of the company. For example, if they take a customer out for lunch,
+they can make a request for reimbursement via the Expense Claim form.
+
+To make a new Expense Claim, go to:
+
+> HR > Expense Claim > New Expense Claim
+
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim.png">
+
+Set the Employee ID, date and the list of expenses that are to be claimed and
+“Submit” the record.
+
+### Approving Expenses
+
+The person making the claim must also set the id of the user who will
+“Approve” these expenses and set the “Assign To” to notify the user of the
+request Approve.
+
+If the Approver sees the “form”, she or he can update the “Approved Amounts”
+and click on “Approve”. To cancel the claim, they can click on the “Reject”
+button.
+
+Comments can be added in the Comments section explaining why the claim was
+approved or rejected.
+
+### Booking the Expense and Reimbursement
+
+The approved Expense Claim must then be converted into a Journal Entry and a
+payment must be made. Note: This amount should not be clubbed with Salary
+because the amount will then be taxable to the Employee.
+
+### Linking with Task & Project
+
+* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
+
+<img class="screenshot" alt="Expense Claim - Project Link" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
new file mode 100644
index 0000000..1a98ad3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md

@@ -0,0 +1,59 @@
+Holiday List is a list which contains the dates of holidays along with the
+occasion of that holiday. The list is generally valid for one calendar year.  
+
+Most organisations have a standard Holiday-List for their employees. Some even
+have different holiday lists for laborers and a different one for management
+staff.
+
+  
+
+To set up a holiday list in the system, Go to Human Resources Module and Click
+on Holiday List.
+
+  
+
+> Human Resources >Holiday List > New Holiday List  
+
+  
+#### Figure 1: Holiday List
+
+![]({{docs_base_url}}/assets/old_images/erpnext/holiday-list-1.png)  
+
+  
+
+__Step 1:__ Give a name to the Holiday list
+
+__Step 2:__ Mention the Fiscal Year  
+
+__Step 3:__ State the Weekly  off.  
+
+__Step 4:__ Click on the button 'Get Weekly Off Dates'  
+
+This step will fill the box below with yearly off dates with day as the
+description.
+
+__Step 5:__ Click on Add new row to add more dates  
+
+Mention the holiday reason in the description and select the date from the
+'Date' field.
+
+  
+#### Figure 2: Adding new holidays to the list
+
+![]({{docs_base_url}}/assets/old_images/erpnext/holiday-list-2.png)  
+
+  
+
+> Note 1: If you have selected a holiday list in the Employment Details form,
+the system will give priority to the form mentioned here. It will fetch the
+list mentioned in the form rather than the one which you may have specified as
+Default; However, if there is no list in the employment details form, the
+default list will be fetched.
+
+
+> Note 2: You can form as many holiday lists as you wish. For example, if you
+have a mill, you can have one list for mill workers and another list for
+office staff. You can manage between lists by attaching their respective
+holiday list to their respective employment detail form.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
new file mode 100644
index 0000000..8f29974
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md

@@ -0,0 +1,35 @@
+The HR module has a setup process where you create the masters for all the
+major activities.
+
+### Organization Setup
+
+To setup your Employee master you must first create:
+
+  * Employment Type (like Permanent, Temp, Contractor, Intern etc).
+  * Branch (if there are multiple offices).
+  * Department (if any, like Accounting, Sales etc).
+  * Designation (CEO, Sales Manager etc).
+  * Grade (A, B, C etc, usually based on seniority).
+
+### Leave Setup
+
+To setup Leaves, create:
+
+  * Leave Type (like Sick Leave, Travel Leave etc)
+  * Holiday List (list of annual holidays for the year - these days will not be considered in Leave Applications).
+
+### Payroll (Salary) Setup
+
+In ERPNext, salaries have two types of components, earnings (basic salary,
+expenses paid by the company, like telephone bill, travel allowance etc) and
+deductions (amounts deducted for taxes, social security etc). To setup
+payroll, you must first setup all the different types of earnings and
+deductions. These are
+
+  * Earning Type
+  * Deduction Type
+
+These are just labels, we will see how to use them when we discuss the payroll
+section.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
new file mode 100644
index 0000000..664c07d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md

@@ -0,0 +1,34 @@
+Human Resources Reports
+
+### Employee Leave Balance
+
+Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
+
+<img alt="Employee Leave Balance" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-balance-report.png">
+
+### Employee Birthday
+
+Employee Birthday Report shows Birthdays of your employees.
+
+<img alt="Employee Birthday" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-birthday-report.png">
+
+### Employee Information
+
+Employee Information Report shows Report View of important information recorded in Employee master.
+
+<img alt="Employee Information" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/employee-information-report.png">
+
+### Monthly Salary Register
+
+Monthly Salary Register shows net pay and its components of employee(s) at a glance.
+
+<img alt="Monthly Salary Register" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-salary-register-report.png">
+
+
+### Monthly Attendance Sheet
+
+Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
+
+<img alt="Monthly Attendance Sheet" class="screenshot" src="{{docs_base_url}}/assets/img/human-resources/monthly-attendance-sheet-report.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
new file mode 100644
index 0000000..02fcfc6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/index.md

@@ -0,0 +1,14 @@
+The Human Resources (HR) Module covers the processes linked to managing a team
+of co-workers. Most important feature here is processing the payroll by using
+Process Payroll to generate Salary Slips. Most countries have complex tax
+rules stating which expenses the company can make on behalf of the Employees.
+There are a set of rules for the company to deduct taxes and social security
+from employee payroll. ERPNext allows to accomodate all types of taxes and
+their calculation.
+
+It also maintains a complete employee database including contact information,
+salary details, attendance, performance evaluation, and appraisal records.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
new file mode 100644
index 0000000..caa3292
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt

@@ -0,0 +1,15 @@
+employee
+leave-application
+expense-claim
+attendance
+salary-and-payroll
+appraisal
+job-applicant
+job-opening
+offer-letter
+tools
+human-resources-reports
+setup
+holiday-list
+human-resource-setup
+articles

diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
new file mode 100644
index 0000000..75e6a85
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md

@@ -0,0 +1,25 @@
+You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/manual/en/human-resources/job-opening.html).
+
+To create a new Job Applicant go to 
+
+> Human Resource > Job Applicant > New
+
+<img class="screenshot" alt="Job Applicant" src="{{docs_base_url}}/assets/img/human-resources/job-applicant.png">
+
+### Linking with an Email Account
+
+You can link Job Application with an Email account.
+Suppose you link Job Application with an email job@example.com 
+system shall create a New Job Applicant against each email received on the mailbox.
+
+* To link Email Account with Job Applicant, go to
+
+> Setup > Email Account > New 
+
+* Enter the email id and the password, and select 'Enable Incoming'
+
+* In 'Append To' select 'Job Applicant'
+
+<img class="screenshot" alt="Email Account" src="{{docs_base_url}}/assets/img/human-resources/email-account.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
new file mode 100644
index 0000000..7e4f0c3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md

@@ -0,0 +1,10 @@
+You can make a record of the open vacancies in your company using Job Opening.
+
+To create a new Job Opening go to 
+
+> Human Resource > Job Opening > New
+
+<img class="screenshot" alt="Job Opening" src="{{docs_base_url}}/assets/img/human-resources/job-opening.png">
+
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
new file mode 100644
index 0000000..59c963f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md

@@ -0,0 +1,24 @@
+If your company has a formal system where Employees have to apply for leaves
+to be able to qualify as paid leaveas, you can create Leave Application to
+track approval and usage of leaves. You have to mention the Employee, Leave
+Type and the period for which the leave is taken.
+
+> Human Resources > Leave Application > New Leave Application
+
+<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
+
+###Setting Leave Approver
+
+* A leave approver is a user who can approve an leave application for an employee. 
+
+* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
+
+<img class="screenshot" alt="Leave Approver" src="{{docs_base_url}}/assets/img/human-resources/employee-leave-approver.png">
+
+> Tip : If you want all users to create their own Leave Applications, you can set
+their “Employee ID” as a match rule in the Leave Application Permission
+settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html)
+for more info.
+
+You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/manual/en/human-resources/setup/leave-allocation.html)
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
new file mode 100644
index 0000000..9e8c966
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md

@@ -0,0 +1,16 @@
+Offer Letter is given to candidate after Interview & selection which states the offered salary package, 
+designation, grade, department working, no of days entitled for leave.
+
+In ERPNext you can make a record of the Offer Letters that you can given to candidates. To create a new offer Letter go to 
+
+> Human Resource > Offer Letter > New
+
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
+
+> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/manual/en/human-resources/job-applicant.html)
+
+There is a pre-designed print format to print you offer letter.
+
+<img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter-print.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
new file mode 100644
index 0000000..05e01e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md

@@ -0,0 +1,116 @@
+Salary is a fixed amount of money or compensation paid to an employee by an employer in return for the work performed . 
+
+Payroll is the administration of financial records of employees' salaries, wages, bonuses, net pay, and deductions.
+
+To process Payroll in ERPNext,
+
+  1. Create Salary Structures for all Employees.
+  2. Generate Salary Slips via Process Payroll.
+  3. Book the Salary in your Accounts.
+
+### Salary Structure
+
+The Salary Structure represents how Salaries are calculated based on Earnings
+and Deductions. 
+
+Salary structures are used to help organizations:
+  1. Maintain pay levels that are competitive with the external labor market,
+  2. Maintain internal pay relationships among jobs,
+  3. Recognize and reward differences in level of responsibility, skill, and performance, and manage pay expenditures.
+
+The usual components of the salary structure (in india) include:
+
+__Basic Salary:__ It is the taxable base income and generally not more than 40% of CTC.
+
+__House Rent Allowance:__ The HRA constitutes 40 to 50% of the basic salary.
+
+__Special Allowances:__ Makes up for the remainder part of the salary, mostly smaller than the basic salary which is completely taxable.
+
+__Leave Travel Allowance:__ The non-taxable amount paid by the employer to the employee for vacation/trips with family within India.
+
+__Gratuity:__ It is basically a lump sum amount paid by the employer when the employee resigns from the organization or retires.
+
+__PF:__ Fund collected during emergency or old age. 12% of the basic salary is automatically deducted and goes to the employee provident fund.
+
+__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax free up to Rs.15,000.
+
+__Bonus:__ Taxable part of the CTC, usually a once a year lump sum amount, given to the employee based on the individual’s as well as the organizational performance for the year.
+
+__Employee Stock Options:__ ESOPS are Free/discounted shares given by the company to the employees. This is done to primarily increase employee retention.
+
+To create a new Salary Structure go to:
+
+> Human Resources > Setup > Salary Structure > New Salary Structure
+
+#### Figure 1:Salary Structure
+
+<img class="screenshot" alt="Salary Structure" src="{{docs_base_url}}/assets/img/human-resources/salary-structure.png">
+
+### In the Salary Structure,
+
+  * Select the Employee
+  * Set the starting date from which this is valid (Note: There can only be one Salary Structure that can be “Active” for an Employee during any period)
+  * In the “Earnings” and “Deductions” table all your defined Earning Type and Deductions Type will be auto-populated. Set the values of the Earnings and Deductions and save the Salary Structure.
+
+### Leave Without Pay (LWP)
+
+Leave Without Pay (LWP) happens when an Employee runs out of allocated leaves
+or takes a leave without an approval (via Leave Application). If you want
+ERPNext to automatically deduct salary in case of LWP, then you must check on
+the “Apply LWP” column in the Earning Type and Deduction Type masters. The
+amount of pay cut is the proportion of LWP days divided by the total working
+days for the month (based on the Holiday List).
+
+If you don’t want ERPNext to manage LWP, just don’t click on LWP in any of the
+Earning Types and Deduction Types.
+
+* * *
+
+### Creating Salary Slips
+
+Once the Salary Structure is created, you can make a salary slip from the same
+form or you can process your payroll for the month using Process Payroll.
+
+To create a salary slip from Salary Structure, click on the button Make Salary
+Slip.
+
+#### Figure 2: Salary Slip
+
+<img class="screenshot" alt="Salary Slip" src="{{docs_base_url}}/assets/img/human-resources/salary-slip.png">
+
+You can also create salary slip for multiple employees using Process Payroll:
+
+> Human Resources > Process Payroll
+
+#### Figure 3: Process Payroll
+
+<img class="screenshot" alt="Process Payroll" src="{{docs_base_url}}/assets/img/human-resources/process-payroll.png">
+
+In Process Payroll,
+
+  1. Select the Company for which you want to create the Salary Slips.
+  2. Select the Month and the Year for which you want to create the Salary Slips.
+  3. Click on “Create Salary Slips”. This will create Salary Slip records for each active Employee for the month selected. If the Salary Slips are created, the system will not create any more Salary Slips. All updates will be shown in the “Activity Log” section.
+  4. Once all Salary Slips are created, you can check if they are created correctly or edit it if you want to deduct Leave Without Pay (LWP).
+  5. After checking, you can “Submit” them all together by clicking on “Submit Salary Slips”. 1. If you want them to be automatically emailed to the Employee, make sure to check the “Send Email” box.
+
+### Booking Salaries in Accounts
+
+The final step is to book the Salaries in your Accounts.
+
+Salaries in businesses are usually dealt with extreme privacy. In most cases,
+the companies issues a single payment to the bank combining all salaries and
+the bank distributes the salaries to each employee’s salary account. This way
+there is only one payment entry in the company’s books of accounts and anyone
+with access to the company’s accounts will not have access to the individual
+salaries.
+
+The salary payment entry is a Journal Entry entry that debits the total
+salary of all Employees to the Salary Account and credits the company’s bank
+Account.
+
+To generate your salary payment voucher from Process Payroll, click on
+“Make Bank Voucher” and a new Journal Entry with the total salaries will be
+created.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
new file mode 100644
index 0000000..8116ca4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md

@@ -0,0 +1,5 @@
+Branches of your organization
+
+<img class="screenshot" alt="Branch" src="{{docs_base_url}}/assets/img/human-resources/branch.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
new file mode 100644
index 0000000..4371b62
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md

@@ -0,0 +1,10 @@
+You can make a record of the tax and other salary deductions and describe it as Deduction Type
+
+To create a new Deduction Type
+
+> Human Resource > Setup > Deduction Type > New
+
+<img class="screenshot" alt="Deduction Type" src="{{docs_base_url}}/assets/img/human-resources/deduction-type.png">
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
new file mode 100644
index 0000000..1b088b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md

@@ -0,0 +1,5 @@
+Departments in your organization
+
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
new file mode 100644
index 0000000..1de779e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md

@@ -0,0 +1,5 @@
+Designations in your organization
+
+<img class="screenshot" alt="Designation" src="{{docs_base_url}}/assets/img/human-resources/designation.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
new file mode 100644
index 0000000..e5c35c6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md

@@ -0,0 +1,10 @@
+You can make a record of the Salary Components and describe it as Earning Type
+
+To create a new Earning Type
+
+> Human Resource > Setup > Earning Type > New
+
+<img class="screenshot" alt="Earning Type" src="{{docs_base_url}}/assets/img/human-resources/earning-type.png">
+
+
+{next}

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
new file mode 100644
index 0000000..37d0fd3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md

@@ -0,0 +1,5 @@
+Various employment contracts you have with your employees.
+
+<img class="screenshot" alt="Employment Type" src="{{docs_base_url}}/assets/img/human-resources/employment-type.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
new file mode 100644
index 0000000..31094f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md

@@ -0,0 +1,5 @@
+You can specify the Holidays for a particular year using Holiday List.
+
+<img class="screenshot" alt="Holiday List" src="{{docs_base_url}}/assets/img/human-resources/holiday-list.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
new file mode 100644
index 0000000..1741df4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md

@@ -0,0 +1,7 @@
+# HR Settings
+
+GLobal settings for HR related documents
+
+<img class="screenshot" alt="HR Settings" src="{{docs_base_url}}/assets/img/human-resources/hr-settings.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.md b/erpnext/docs/user/manual/en/human-resources/setup/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
new file mode 100644
index 0000000..550236a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.txt

@@ -0,0 +1,10 @@
+hr-settings
+employment-type
+branch
+department
+designation
+earning-type
+deduction-type
+leave-allocation
+leave-type
+holiday-list

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
new file mode 100644
index 0000000..0e8ee94
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md

@@ -0,0 +1,7 @@
+Helps you allocate Leaves to a particular Employee
+
+<img class="screenshot" alt="Leave Allocation" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
+
+To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/leave-allocation-tool.html)
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
new file mode 100644
index 0000000..d52cb2e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md

@@ -0,0 +1,9 @@
+Specify the Type of Leave that can be allocated against an Employee
+
+<img class="screenshot" alt="Leave Type" src="{{docs_base_url}}/assets/img/human-resources/leave-type.png">
+
+* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
+* 'Is LWP' specifies if the Leave is without Pay.
+* 'Allow Negative Balance' specifies if system can maintain negative leaves.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.md b/erpnext/docs/user/manual/en/human-resources/tools/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
new file mode 100644
index 0000000..3da2e71
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.txt

@@ -0,0 +1,2 @@
+upload-attendance
+leave-allocation-tool
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
new file mode 100644
index 0000000..56e8d3d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md

@@ -0,0 +1,5 @@
+Leave Allocation tool helps you allocated a specific number of leaves for your employees.
+
+<img class="screenshot" alt="Leave Application" src="{{docs_base_url}}/assets/img/human-resources/leave-application.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
new file mode 100644
index 0000000..adfc66d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md

@@ -0,0 +1,9 @@
+This tool helps you to upload bulk attendence from a csv file.
+
+To upload the attendance go to:
+
+> Human Resources > Upload Attendance
+
+<img class="screenshot" alt="Attendence upload" src="{{docs_base_url}}/assets/img/human-resources/attendence-upload.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/index.md b/erpnext/docs/user/manual/en/index.md
new file mode 100644
index 0000000..2184273
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.md

@@ -0,0 +1,5 @@
+# User Manual (English)
+
+### Contents:
+
+{index}

diff --git a/erpnext/docs/user/manual/en/index.txt b/erpnext/docs/user/manual/en/index.txt
new file mode 100644
index 0000000..97a8cd8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.txt

@@ -0,0 +1,15 @@
+introduction
+setting-up
+accounts
+stock
+CRM
+selling
+buying
+manufacturing
+projects
+support
+human-resources
+customer-portal
+website
+using-erpnext
+customize-erpnext

diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
new file mode 100644
index 0000000..e445963
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md

@@ -0,0 +1,423 @@
+Before you start implementation, lets get familiar with the terminology that
+is used and some basic concepts in ERPNext.
+
+* * *
+
+### Basic Concepts
+
+#### Company
+
+This represents the Company records for which ERPNext is setup. With this same
+setup, you can create multiple Company records, each representing a different
+legal entity. The accounting for each Company will be different, but they will
+share the Customer, Supplier and Item records.
+
+> Setup > Company
+
+#### Customer
+
+Represents a customer. A Customer can be an individual or an organizations.
+You can create multiple Contacts and Addresses for each Customer.
+
+> Selling > Customer
+
+#### Supplier
+
+Represents a supplier of goods or services. Your telephone company is a
+Supplier, so is your raw materials Supplier. Again, a Supplier can be an
+individual or an organization and has multiple Contacts and Addresses.
+
+> Buying > Supplier
+
+#### Item
+
+A Product, sub-product or Service that is either bought, sold or manufactured
+and is uniquely identified.
+
+> Stock > Item
+
+#### Account
+
+An Account is a heading under which financial and business transactions are
+carried on. For example, “Travel Expense” is an account, “Customer Zoe”,
+“Supplier Mae” are accounts. ERPNext creates accounts for Customers and
+Suppliers automatically.
+
+> Accounts > Chart of Accounts
+
+#### Address
+
+An address represents location details of a Customer or Supplier. These can be
+of different locations such as Head Office, Factory, Warehouse, Shop etc.
+
+> Selling > Address
+
+#### Contact
+
+An individual Contact belongs to a Customer or Supplier or is just an
+independent. A Contact has a name and contact details like email and phone
+number.
+
+> Selling > Contact
+
+#### Communication
+
+A list of all Communication with a Contact or Lead. All emails sent from the
+system are added to the Communication table.
+
+> Support > Communication
+
+#### Price List
+
+A Price List is a place where different rate plans can be stored. It’s a name
+you give to a set of Item Prices stored under a particular List.
+
+> Selling > Price List
+
+
+> Buying > Price List
+
+* * *
+
+### Accounting
+
+#### Fiscal Year
+
+Represents a Financial Year or Accounting Year. You can operate multiple
+Fiscal Years at the same time. Each Fiscal Year has a start date and an end
+date and transactions can only be recorded in this period. When you “close” a
+fiscal year, it's balances are transferred as “opening” balances for the next
+fiscal year.
+
+> Setup > Company > Fiscal Year
+
+#### Cost Center
+
+A Cost Center is like an Account, but the only difference is that its
+structure represents your business more closely than Accounts.
+For example, in your Chart of Accounts, you can separate your expenses by its type 
+(i.e., travel, marketing, etc.). In your Chart of Cost Centers, you can separate 
+them by product line or business group (e.g., online sales, retail sales, etc.).
+
+> Accounts > Chart of Cost Centers
+
+#### Journal Entry
+
+A document that contains General Ledger (GL) entries and the sum of Debits and
+Credits of those entries is the same. In ERPNext you can update Payments,
+Returns, etc., using Journal Entrys.
+
+> Accounts > Journal Entry
+
+#### Sales Invoice
+
+A bill sent to Customers for delivery of Items (goods or services).
+
+> Accounts > Sales Invoice
+
+#### Purchase Invoice
+
+A bill sent by a Supplier for delivery of Items (goods or services).
+
+> Accounts > Purchase Invoice
+
+#### Currency
+
+ERPNext allows you to book transactions in multiple currencies. There is only
+one currency for your book of accounts though. While posting your Invoices with
+payments in different currencies, the amount is converted to the default
+currency by the specified conversion rate.
+
+> Setup > Currency
+
+* * *
+
+### Selling
+
+#### Customer Group
+
+A classification of Customers, usually based on market segment.
+
+> Selling > Setup > Customer Group
+
+#### Lead
+
+A person who could be a future source of business. A Lead may generate
+Opportunities. (from: “may lead to a sale”).
+
+> Selling > Lead
+
+#### Opportunity
+
+A potential sale. (from: “opportunity for a business”).
+
+> Selling > Opportunity
+
+#### Sales Order
+
+A note confirming the terms of delivery and price of an Item (product or
+service) by the Customer. Deliveries, Production Orders and Invoices are made
+on basis of Sales Orders.
+
+> Selling > Sales Order
+
+#### Territory
+
+A geographical area classification for sales management. You can set targets
+for Territories and each sale is linked to a Territory.
+
+> Selling > Setup > Territory
+
+#### Sales Partner
+
+A third party distributer / dealer / affiliate / commission agent who sells
+the company’s products usually for a commission.
+
+> Selling > Setup > Sales Partner
+
+#### Sales Person
+
+Someone who pitches to the Customer and closes deals. You can set targets for
+Sales Persons and tag them in transactions.
+
+> Selling > Setup > Sales Person
+
+* * *
+
+### Buying
+
+#### Purchase Order
+
+A contract given to a Supplier to deliver the specified Items at the specified
+cost, quantity, dates and other terms.
+
+> Buying > Purchase Order
+
+#### Material Request
+
+A request made by a system User, or automatically generated by ERPNext based
+on reorder level or projected quantity in Production Plan for purchasing a set
+of Items.
+
+> Buying > Material Request
+
+* * *
+
+### Stock (Inventory)
+
+#### Warehouse
+
+A logical Warehouse against which stock entries are made.
+
+> Stock > Warehouse
+
+#### Stock Entry
+
+Material transfer from a Warehouse, to a Warehouse or from one Warehouse to
+another.
+
+> Stock > Stock Entry
+
+#### Delivery Note
+
+A list of Items with quantities for shipment. A Delivery Note will reduce the
+stock of Items for the Warehouse from where you ship. A Delivery Note is
+usually made against a Sales Order.
+
+> Stock > Delivery Note
+
+#### Purchase Receipt
+
+A note stating that a particular set of Items were received from the Supplier,
+most likely against a Purchase Order.
+
+> Stock > Purchase Receipt
+
+#### Serial Number
+
+A unique number given to a particular unit of an Item.
+
+> Stock > Serial Number
+
+#### Batch
+
+A number given to a group of units of a particular Item that may be purchased
+or manufactured in a group.
+
+> Stock > Batch
+
+#### Stock Ledger Entry
+
+A unified table for all material movement from one warehouse to another. This
+is the table that is updated when a Stock Entry, Delivery Note, Purchase
+Receipt, and Sales Invoice (POS) is made.
+
+#### Stock Reconciliation
+
+Update Stock of multiple Items from a spreadsheet (CSV) file.
+
+> Stock > Stock Reconciliation
+
+#### Quality Inspection
+
+A note prepared to record certain parameters of an Item at the time of Receipt
+from Supplier, or Delivery to Customer.
+
+> Stock > Quality Inspection
+
+#### Item Group
+
+A classification of Item.
+
+> Stock > Setup > Item Group
+
+* * *
+
+### Human Resource Management
+
+#### Employee
+
+Record of a person who has been in present or past, in the employment of the
+company.
+
+> Human Resources > Employee
+
+#### Leave Application
+
+A record of an approved or rejected request for leave.
+
+> Human Resource > Leave Application
+
+#### Leave Type
+
+A type of leave (e.g., Sick Leave, Maternity Leave, etc.).
+
+> Human Resource > Leave and Attendance > Leave Type
+
+#### Process Payroll
+
+A tool that helps in creation of multiple Salary Slips for Employees.
+
+> Human Resource > Salary and Payroll > Process Payroll
+
+#### Salary Slip
+
+A record of the monthly salary given to an Employee.
+
+> Human Resource > Salary Slip
+
+#### Salary Structure
+
+A template identifying all the components of an Employees' salary (earnings), 
+tax and other social security deductions.
+
+> Human Resource > Salary and Payroll > Salary Structure
+
+#### Appraisal
+
+A record of the performance of an Employee over a specified period based on
+certain parameters.
+
+> Human Resources > Appraisal
+
+#### Appraisal Template
+
+A template recording the different parameters of an Employees' performance and
+their weightage for a particular role.
+
+> Human Resources > Employee Setup > Appraisal Template
+
+#### Attendance
+
+A record indicating presence or absence of an Employee on a particular day.
+
+> Human Resources > Attendance
+
+* * *
+
+### Manufacturing
+
+#### Bill of Materials (BOM)
+
+A list of Operations and Items with their quantities, that are required to
+produce another Item. A Bill of Materials (BOM) is used to plan purchases and
+do product costing.
+
+> Manufacturing > BOM
+
+#### Workstation
+
+A place where a BOM operation takes place. It is useful to calculate the
+direct cost of the product.
+
+> Manufacturing > Workstation
+
+#### Production Order
+
+A document signaling production (manufacture) of a particular Item with
+specified quantities.
+
+> Manufacturing > Production Order
+
+#### Production Planning Tool
+
+A tool for automatic creation of Production Orders and Purchase Requests based
+on Open Sales Orders in a given period.
+
+> Manufacturing > Production Planning Tool
+
+* * *
+
+### Website
+
+#### Blog Post
+
+A short article that appears in the “Blog” section of the website generated
+from the ERPNext website module. Blog is a short form of “Web Log”.
+
+> Website > Blog Post
+
+#### Web Page
+
+A web page with a unique URL (web address) on the website generated from
+ERPNext.
+
+> Website > Web Page
+
+* * *
+
+### Setup / Customization
+
+#### Custom Field
+
+A user defined field on a form / table.
+
+> Setup > Customize ERPNext > Custom Field
+
+#### Global Defaults
+
+This is the section where you set default values for various parameters of the
+system.
+
+> Setup > Data > Global Defaults
+
+#### Print Heading
+
+A title that can be set on a transaction just for printing. For example, you
+want to print a Quotation with a title “Proposal” or “Pro forma Invoice”.
+
+> Setup > Branding and Printing > Print Headings
+
+#### Terms and Conditions
+
+Text of your terms of contract.
+
+> Selling > Setup > Terms and Conditions
+
+#### Unit of Measure (UOM)
+
+How quantity is measured for an Item. E.g., Kg, No., Pair, Packet, etc.
+
+> Stock > Setup > UOM
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
new file mode 100644
index 0000000..0c2a0a5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md

@@ -0,0 +1,19 @@
+ERPNext is a modern tool that covers not only accounting but also all other
+business functions, on an integrated platform. It has many benefits over both
+traditional accounting as well as ERP applications.
+
+### Benefits over traditional accounting software:
+
+  * Do a lot more than just accounting! Manage inventory, billing, quotes, leads, payroll and a lot more.
+  * Keep all your data safe and in one place. Don’t keep hunting for data when you need it across spreadsheets and different computers. Manage everyone on the same page. All users get the same updated data.
+  * Stop repetitive work. Don’t enter the same information from your word processor to your accounting tool. It's all integrated.
+  * Keep track. Get the entire history of a customer or a deal in one place.
+
+### Benefits over big ERPs
+
+  * $$$ - Saves money.
+  * **Easier to configure:** Big ERPs are notoriously hard to setup and will ask you a zillion questions before you can do something meaningful.
+  * **Easier to use:** Modern web like user interface will keep your users happy and in familiar territory.
+  * **Open Source :** This software is always free and you can host it anywhere you like.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
new file mode 100644
index 0000000..5439d51
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md

@@ -0,0 +1,35 @@
+There are many ways to get started with ERPNext.
+
+### 1\. See the Demo
+
+If you want to check out the user interface and **feel** the application, just
+see the demo at:
+
+  * <https://demo.erpnext.com>
+
+### 2\. Start a Free Account at ERPNext.com
+
+
+ERPNext.com is managed by the organization (Frappe) that publishes ERPNext.
+You can start with your own account by [signing up on the
+website](https://erpnext.com).
+
+You can also decide to host your application at erpnext.com by buying the
+hosting plans. This way you support the organization that develops and
+improves ERPNext. You also get one-to-one functional (usage) support with the
+hosting plans.
+
+### 3\. Download a Virtual Machine
+
+To avoid the trouble of installing an instance, ERPNext is available as a
+Virtual Image (a full loaded operating system with ERPNext installed). You can
+use this on **any** platform including Microsoft Windows.
+
+[Click here to see instructions on how to use the Virtual
+Image](https://erpnext.com/download)
+
+### 4\. Install ERPNext on your Unix/Linux/Mac machine
+
+If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/frappe-bench).
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
new file mode 100644
index 0000000..bbfbbd6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md

@@ -0,0 +1,32 @@
+Before you start managing your Operations in EPRNext, you must first become
+familiar with the system and the terms used. For this we recommend
+implementation should happen in two phases.
+
+  * A **Test Phase**, where you enter dummy records representing your day to day transactions and a **Live Phase**, where we start entering live data.
+
+### Test Phase
+
+  * Read the Manual
+  * Create a free account at [https://erpnext.com](https://erpnext.com) (the easiest way to experiment).
+  * Create your first Customer, Supplier and Item. Add a few more so you get familiar with them.
+  * Create Customer Groups, Item Groups, Warehouses, Supplier Groups, so that you can classify your Items.
+  * Complete a standard sales cycle - Lead > Opportunity > Quotation > Sales Order > Delivery Note > Sales Invoice > Payment (Journal Entry)
+  * Complete a standard purchase cycle - Material Request > Purchase Order > Purchase Receipt > Payment (Journal Entry).
+  * Complete a manufacturing cycle (if applicable) - BOM > Production Planning Tool > Production Order > Material Issue
+  * Replicate a real life scenario into the system.
+  * Create custom fields, print formats etc as required.
+
+### Live Phase
+
+Once you are familiar with ERPNext, start entering your live data!
+
+  * Clean up the account of test data or better, start a fresh install.
+  * If you just want to clear your transactions and not your master data like Item, Customer, Supplier, BOM etc, you can click delete the Company against which you have made the transactions and start with a fresh Bill of Materials. To delete a company, open the Company Record via Setup > Masters > Company and delete the company by clicking on the **Delete Company** button at the bottom.
+  * You can also setup a new account at [https://erpnext.com](https://erpnext.com), and use the 30-day free trial. [Find out more ways of deploying ERPNext](/introduction/getting-started-with-erpnext)
+  * Setup all the modules with Customer Groups, Item Groups, Warehouses, BOMs etc.
+  * Import Customers, Suppliers, Items, Contacts and Addresses using Data Import Tool.
+  * Import opening stock using Stock Reconciliation Tool.
+  * Create opening accounting entries via Journal Entry and create outstanding Sales Invoices and Purchase Invoices.
+  * If you need help, [you can buy support](https://erpnext.com/pricing) or [ask in the user forum](https://discuss.erpnext.com).
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
new file mode 100644
index 0000000..76e77b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/index.md

@@ -0,0 +1,46 @@
+## What is an ERP and why should I care?
+
+(If you are already convinced you need an all-in-one system for your
+organization, you can skip this page.)
+
+If you are running a small business that has a few employees, you understand
+that it's hard to manage the dynamic nature of doing businesses. You are
+already using a software like Accounting, and may be some more to manage your
+inventory and sales (or CRM).
+
+An ERP brings all of this together in one place.
+
+Small businesses are not so different from large ones. They contain most of
+the complexities of a large business along with many other constraints. Small
+businesses have to communicate with customers, do accounts, pay taxes, do
+payroll, manage timelines, deliver quality, answer questions, and keep
+everyone happy just like in large businesses.
+
+Large businesses have the advantage of using advanced data systems to manage
+their process efficiently. Small businesses, on the other hand, typically
+struggle to keep things organized. They often use a mix of apps like
+spreadsheets, accounting software, web CRM etc to manage.The problem is, not
+everyone is on the same page. An ERP changes that.
+
+## What is ERPNext?
+
+ERPNext helps you to manage all your business information in one application
+and use it to manage operations and take decisions based on data.
+
+Among other things, ERPNext will help you to:
+
+  * Track all Invoices and Payments.
+  * Know what quantity of which product is available in stock.
+  * Identify open customer queries.
+  * Manage payroll.
+  * Assign tasks and follow up on them.
+  * Maintain a database of all your customers, suppliers and their contacts.
+  * Prepare quotes.
+  * Get reminders on maintenance schedules.
+  * Publish your website.
+
+And a lot lot lot more.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/introduction/index.txt b/erpnext/docs/user/manual/en/introduction/index.txt
new file mode 100644
index 0000000..535fcfe
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/index.txt

@@ -0,0 +1,7 @@
+do-i-need-an-erp
+open-source
+getting-started-with-erpnext
+the-champion
+implementation-strategy
+key-workflows
+concepts-and-terms

diff --git a/erpnext/docs/user/manual/en/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
new file mode 100644
index 0000000..8c8d6ec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md

@@ -0,0 +1,14 @@
+# Flow Chart Of Transactions In ERPNext
+
+This diagram covers how ERPNext tracks your company information across key
+functions. This diagram does not cover all the features of ERPNext.
+
+![]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
+
+
+[Full Resolution]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
+
+_Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
+steps if you want to simplify the process._
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/open-source.md b/erpnext/docs/user/manual/en/introduction/open-source.md
new file mode 100644
index 0000000..0089ba8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/open-source.md

@@ -0,0 +1,33 @@
+The source code is an Open Source software. It is open for anyone to
+understand, extend or improve. And it is free!
+
+Advantages of an Open Source software are:
+
+  1. You can choose to change your service provider anytime.
+  2. You can host the application anywhere, including your own server to gain complete ownership and privacy of the data.
+  3. You can access a community to support you, incase you need help. You are not dependant on your service provider.
+  4. You can benefit from using a product that is critiqued and used by a wide range of people, who have reported hundreds of issues and suggestions to make this product better, and this will always continue.
+
+
+---
+
+### ERPNext Source Code
+
+ERPnext source repository is hosted at GitHub and can be found here
+
+- [https://github.com/frappe/erpnext](https://github.com/frappe/erpnext)
+
+
+---
+
+### Alternatives
+
+There are many Open Source ERPs you can consider. Popular ones are:
+
+  1. Odoo
+  2. OpenBravo
+  3. Apache OfBiz
+  4. xTuple
+  5. Compiere (and forks)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
new file mode 100644
index 0000000..21a2383
--- /dev/null
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md

@@ -0,0 +1,46 @@
+<!-- no-heading -->
+
+<h1 class="white">The Champion</h1>
+
+<img class="cover" src="{{docs_base_url}}/assets/old_images/erpnext/implementation-image.png">
+
+We have seen dozens of ERP implementations over the past few years and we
+realize that successful implementation is a lot about intangibles and
+attitude.
+
+**ERPs are not required.**
+
+Like exercise.
+
+Human body may seem like it does not require exercise today or even tomorrow,
+but in the long run, if you wish to maintain your body and its health, you
+should get on the treadmill.
+
+In the same way, ERPs improve the health of your organization over a long run
+by keeping it fit and efficient. The more you delay putting things in order,
+the more time you lose, and the closer you get to a major disaster.
+
+So when you start implementing an ERP, keep your sight on the long term
+benefits. Like exercise, its painful in the short run, but will do wonders if
+you stay on course.
+
+* * *
+
+## The Champion
+
+ERP means organization wide change and it does not happen without effort.
+Every change requires a champion and it is the duty of the champion to
+organize and energize the entire team towards implementation. The champion
+needs to be resilient incase something goes wrong .
+
+In many organizations we have seen, the champion is most often the owner or a
+senior manager. Occasionally, the champion is an outsider who is hired for a
+particular purpose.
+
+In either case, you must identify your champion first.
+
+Most likely it's **you!**
+
+Lets Begin!
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.md b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
new file mode 100644
index 0000000..59f3503
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt

@@ -0,0 +1,4 @@
+nested-bom-structure
+partial-production-entry
+production-planning-subassembly
+valuation-based-on-field-in-bom
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
new file mode 100644
index 0000000..266ae12
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md

@@ -0,0 +1,30 @@
+<h1>Nested BOM Structure</h1>
+
+**Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario?
+
+**Answer:** You should create BOM for item in the order of their production. Let's consider an example to understand this better.
+
+If Computer manufacturer assembles Hard Disk and DVD Drive (sub-assemblies) themselves, they should first create BOM for Hard Disk and DVD Drive. After that BOM for Computer will be created, which is finished and saleable item. BOM of computer will have&nbsp;
+Hard Disk and DVD Drive (sub-assemblies) will be selected as raw-material items in it. BOM ID will be fetched for the respective sub-assembly item.
+
+
+<img src="{{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-02 at 3.58.19 pm.png">
+
+<br>Following is how the structure of nested BOM will look:
+<br>
+<br><b>Computer (FG Item)</b>
+<br><b>---</b> Mother Board
+<br><b>---</b> SMTP
+<br><b>---</b> Accessories and wires
+<br><b>---</b>  <i>Hard Disk (sub-assembly)</i>
+<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ------ Item A
+<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ------ Item B
+<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ------ Item C
+<br><b>---</b>  <i>DVD Drive (sub-assembly)</i>
+<br>&nbsp;&nbsp;&nbsp; &nbsp; ------ Item X
+<br>&nbsp; &nbsp; &nbsp; ------ Item Y
+<br>&nbsp;&nbsp; &nbsp;&nbsp; ------ Item Z
+<br>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md
new file mode 100644
index 0000000..e2a702e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md

@@ -0,0 +1,25 @@
+<h1>Partial Production Entry</h1>
+
+If you completed production for few items, then you can make Partial Production Entry for that items in system. For example, your production order is for 15 quantity and you completed production for 10 quantity only. Then you can make production entry for 5 quantity. Following are step to make Partial Production Entry
+
+#### 1. Stock Entry
+
+Click on Update Finish Goods button from submitted Product Order, You will land on new Stock entry form.
+
+#### 2. Edit Manufacturing Quantity
+
+In the Update Finished Goods entry, check "From Bill of Material section", and edit Manufacturing Quantity to actual quantity produced.  Production Order quantity will be fetched as Manufacturing Quantity by default.
+
+#### 3. Update Qty of Items
+
+Click on **Get Items**. With this, quantity will be updated for both raw-material as well as finish good item. 
+
+![FGE STE]({{docs_base_url}}/assets/img/articles/Selection_078.png)
+
+#### 4. Save and Submit 
+
+After updating quantity in stock entry form, save and submit the stock entry. On submit stock will update for quantity entered in this stock entry.
+
+When will you create another finish goods entry against this Production Order, system will only fetch pending quantity to be produced.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html
new file mode 100644
index 0000000..5568750
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html

@@ -0,0 +1,8 @@
+<h1>Production Planning & Subassembly</h1>
+
+if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.<br><br>Production Planning Tool has field called "Use Multi-Level BOM", checking which will consider raw-material of sub-assemblies as well in the material planning. If this field is not checked, then it will consider sub-assembly as an item, and won't consider raw-material required for the manufacturing of that sub-assembly.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_203.png"><br><br>You will find same field in the Production Order and Stock Entry as well.<br><br>This feature is very useful for the companies who create BOM for the
+ sub-assemblies, but Production Order is created only for the finished 
+item. They do not create separate Production Order for the 
+sub-assemblies, but raw-materials as listed in the BOM of sub-assembly 
+items are consumed in the production process, and not sub-assembly item 
+directly.<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html
new file mode 100644
index 0000000..4460ce0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html

@@ -0,0 +1,10 @@
+<h1>'Valuation Based On' Field in BOM</h1>
+
+<div><b>Question:</b> What do the various options in <i>Valuation Based On </i>Field in Bill Of Materials (BOM) Form mean? <br><br><b>Answer:</b> There are 3 available options in the <i>Valuation Based On</i> field;<br><br><img src="{{docs_base_path}}/assets/img/articles/kb_bom_field.png"><br><br><ul><li><b><i>Valuation Rate:</i></b> <br></li><ul><li>Item valuation rate is 
+defined based on it's purchase/manufacture value + other charges. <br></li><li>For 
+Purchase Item, it is defined based on charges entered in the Purchase 
+Receipt. If you don't have any Purchase Receipt
+ made for an item or a Stock Reconciliation, then you won't have 
+Valuation Rate for that item.</li></ul></ul><ul><li><b><i>Price List Rate:</i></b> <br></li><ul><li>Just like you pull item prices in sales and purchase transaction, it can be pulled in BOM via Price List Rate.</li></ul></ul></div><div><ul><li><i><b>Last Purchase Rate</b>:</i> <br></li><ul><li>It will be the last Purchase Rate value of an item. This 
+value is updated in the item master as well, based on rate in the 
+Purchase Order for this item.</li></ul></ul><p><br></p></div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
new file mode 100644
index 0000000..34d8530
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md

@@ -0,0 +1,41 @@
+At the heart of the Manufacturing system is the **Bill of Materials** (BOM).
+The **BOM** is a list of all materials (either bought or made) and operations
+that go into a finished product or sub-Item. In ERPNext, the component could
+have its own BOM hence forming a tree of Items with multiple levels.
+
+To make accurate Purchase Requests, you must always maintain correct BOMs.
+To make a new BOM:
+
+> Manufacturing > Bill of Materials > New BOM
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom.png">
+
+* To add Operations select 'With Operation'. The Operations table shall appear.
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/bom-operations.png">
+
+  * Select the Item for which you want to make the BOM.
+  * Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
+  * Workstations are defined only for product costing and Production Order Operations scheduling purposes not inventory. 
+  * Inventory is tracked in Warehouses not Workstations.
+
+###Costing of a BOM
+
+* The Costing section in BOM gives an approximate cost of producing the Item.
+
+* Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap.
+
+<img class="screenshot" alt="Costing" src="{{docs_base_url}}/assets/img/manufacturing/bom-costing.png">
+
+* This cost can be updated on by using the 'Update Cost' button.
+
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
+
+### Materials Required(exploded) 
+
+This table lists down all the Material required for the Item to be Manufactured.
+It also fetches sub-assemblies along with the quantity.
+
+<img class="screenshot" alt="Exploded Section" src="{{docs_base_url}}/assets/img/manufacturing/bom-exploded.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/index.md b/erpnext/docs/user/manual/en/manufacturing/index.md
new file mode 100644
index 0000000..3fcccf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/index.md

@@ -0,0 +1,10 @@
+# Manufacturing
+
+The Manufacturing module in ERPNext helps you to maintain multi-level Bill of
+Materials (BOMs) for your Items. 
+It helps in product costing, production planning, creating production orders for your manufacturing shop floors and 
+planning inventory by getting your material requirement via BOMs (also called Material Requirements Planning MRP).
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/manufacturing/index.txt b/erpnext/docs/user/manual/en/manufacturing/index.txt
new file mode 100644
index 0000000..3b932a5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/index.txt

@@ -0,0 +1,9 @@
+introduction
+bill-of-materials
+production-order
+workstation
+operation
+subcontracting
+tools
+setup
+articles

diff --git a/erpnext/docs/user/manual/en/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
new file mode 100644
index 0000000..f9d827c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md

@@ -0,0 +1,24 @@
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing.png">
+
+### Types of Production Planning
+
+Broadly there are three types of Production Planning Systems
+
+  * __Make-to-Stock:__ In these systems, production is planned based on a forecast and the Items are then sold to distributors or customers. All fast moving consumer goods that are sold in retail shops like soaps, packaged water etc and electronics like phones etc are Made-to-Stock.
+  * __Make-to-Order:__ In these systems, manufacturing takes place after a firm order is placed by a customer.
+  * __Engineer-to-Order:__ In this case each sale is a separate project and has to be designed and engineered to the requirements of the customer. Common examples of this are any custom business like furniture, machine tools, speciality devices, metal fabrication etc.
+
+Most small and medium sized manufacturing businesses are based on a make-to-
+order or engineer-to-order system and so is ERPNext.
+
+For engineer-to-order systems, the Manufacturing module should be used along
+with the Projects module..
+
+#### Manufacturing and Inventory
+
+You can track work-in-progress by creating work-in-progress Warehouses.
+
+ERPNext will help you track material movement by automatically creating Stock
+Entries from your Production Orders by building from Bill of Materials.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
new file mode 100644
index 0000000..b21304e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md

@@ -0,0 +1,11 @@
+### Operation
+
+Stores a list of all Manufacturing Operations, its description and the Default Workstation for the Operation.
+
+You can also create a Operation by:
+
+> Manufacturing > Documents > Operation > New
+
+<img class="screenshot" alt="Operation" src="{{docs_base_url}}/assets/img/manufacturing/operation.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
new file mode 100644
index 0000000..5ded4f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md

@@ -0,0 +1,106 @@
+Production Order (also called as Work Order) is a document that is given to
+the manufacturing shop floor by the Production Planner as a signal to produce
+a certain quantity of a certain Item. Production Order also helps to generate
+the material requirements (Stock Entry) for the Item to be produced from its
+**Bill of Materials**.
+
+The **Production Order** is generated from the **Production Planning
+Tool** based on Sales Orders. You can also create a direct Production Order
+by:
+
+> Manufacturing > Documents > Production Order > New
+
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/production-order.png">
+
+### Creating Production Orders
+
+  * Select the Item to be produced.
+  * The default BOM for that item will be fetched by the system. You can also change BOM.
+  * If the selected BOM has operartion mentioned in it, the system shall fetch all operations from BOM.
+  * Mention the Planned Start Date (an Estimated Date at which you want the Production to begin.)
+  * Select Warehouses. Work-in-Progress Warehouse is where your Items will be transferred when you begin production and Target Warehouse is  where you store finished Items before they are shipped.
+
+> Note : You can save a Production Order without selecting the warehouses, but warehouses are mandatory for submitting a Production Order
+
+###Reassigning Workstation/Duration for Operations
+
+* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
+
+<img class="screenshot" alt="PO Opeartions" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations.png">
+
+* If you wish to reassign the wrokstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
+
+<img class="screenshot" alt="PO reassigning Operations" src="{{docs_base_url}}/assets/img/manufacturing/PO-reassigning-operations.png">
+
+* Select the respective operation, and change its workstation.
+* You can also change the Operating Time for that operation
+
+### Capacity Planning in Production Order
+
+* When a Production Order is submitted, based on the Planned Start Date and the availability of the workstations, system schedules all operations for the Production Order (if Production Order has operations specified).
+* Drafts of Time Logs are also created based on the scheduled operations.
+
+### Transfering Materials for Manufacturing
+
+* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
+* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+
+* Click on 'Transfer Materials for Manufacturing'.
+
+<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Material Transfer Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-qty.png">
+
+* Submit the Stock Entry
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-SE-for-material-transfer.png">
+
+* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
+
+<img class="screenshot" alt="Stock Entry for PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer-updated.png">
+
+### Making Time Logs
+
+* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html)
+* Time Logs are created against Production Order Operations.
+* Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
+* To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.
+
+<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+
+###Updating Finished Goods
+
+* Once you are done with the Production Order you need to update the Finished Goods.
+* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+* Click on 'Update Finished Goods'.
+
+<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
+
+* Mention the quantity of materials to be transfered.
+
+<img class="screenshot" alt="Update Finished Goods Qty" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update-qty.png">
+
+ > Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
+ 
+### Stopping a Production Order
+
+* When you stop a Production Order its status is changed to Stop indicating that all production process against that Production Order is to be ceased.
+* To stop the Production Order click on the 'stop' Button
+
+  1. On Submitting the Production Order, the system will reserve a slot for each of the Production Order Operations serially after the planned start date based on the workstation availability. The Workstation availability depends on the Workstation timings, holiday list and if some other Production Order Operation was scheduled in that slot. You can mention the number of days for the system to try scheduling the operations in the Manufacturing Settings. This is set to 30 Days by default. If the operation requires time exceeding the available slot, system shall ask you to break the operations. Once the scheduling is done system shall create Time Logs and save them. You can Modify them and submit them later.
+  2. You can also create additional time logs against an Operation. For doing so select the respective operation and click on 'Make Time Log'
+  3. Transfer Raw Material: This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
+  4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
+  5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
+
+<img class="screenshot" alt="PO - stop" src="{{docs_base_url}}/assets/img/manufacturing/PO-stop.png">
+
+* You can Also re-start a stopped Production Order.
+
+> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form.
+
+> Note : In order to make a Production Order against an Item you must specify 'Yes' to "Allow Production Order" on the Item form.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/index.md b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
new file mode 100644
index 0000000..ec22505
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/index.md

@@ -0,0 +1,5 @@
+Global settings for manufacturing Processes
+
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/index.txt b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt
new file mode 100644
index 0000000..68a2ad8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt

@@ -0,0 +1 @@
+manufacturing-settings
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
new file mode 100644
index 0000000..dc59689
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md

@@ -0,0 +1,15 @@
+* Manufacturing Settings can be found at 
+
+> Manufacturing > Production Order > Setup > Manufacturing Settings
+
+<img class="screenshot" alt="Manufacturing Settings" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-settings.png">
+
+* Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours)
+
+* Allow Production on Holidays - Specify if system is to allow scheduling of operations on Holidays.
+
+* Capacity Planning for (Days) - Specify no. of Days for Capacity Planning.
+
+* Time Between Operations (in mins) - Specify the gap between two Production Operations.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
new file mode 100644
index 0000000..6f2b86b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md

@@ -0,0 +1,40 @@
+Subcontracting is a type of job contract that seeks to outsource certain types
+of work to other companies. It allows work on more than one phase of the
+project to be done at once, often leading to a quicker completion.
+Subcontracting is practiced by various industries. For example, manufacturers
+making a number of products from complex components subcontract certain
+components and package them at their facilities.  
+
+If your business involves outsourcing certain processes to a third party
+Supplier, where you buy the raw material from, you can track this by using the
+sub-contracting feature of ERPNext.  
+
+### Setup Sub-Contracting:
+
+  1. Create separate Items for the unprocessed and the processed product. For example if you supply unpainted X to your Supplier and the Supplier returns you X, you can create two Items: “X-unpainted” and “X”.
+  2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
+  3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
+
+![Subcontract]({{docs_base_url}}/assets/old_images/erpnext/subcontract.png)
+
+  
+
+__Step 1:__ Make a Bill of Materials for the processed Item, with the unprocessed
+Items as sub-items. For example, If you are manufacturing a pen, the processed
+pen will be named under Bill of Materials(BOM), whereas, the refill, knob, and
+other items which go into the making of pen, will be categorized as sub-items.
+
+__Step 2:__ Make a Purchase Order for the processed Item. When you “Save”, in the “Raw Materials Supplied”, all your un-processed Items will be updated based on your Bill of Materials.
+
+__Step 3:__ Make a Stock Entry to deliver the raw material Items to your Supplier.
+
+__Step 4:__ Receive the Items from your Supplier via Purchase Receipt. Make sure to check the “Consumed Quantity” in the “Raw Materials” table so that the
+correct stock is maintained at the Supplier’s end.
+
+> Note 1: Make sure that the “Rate” of processed Item is the processing rate
+(excluding the raw material rate).
+
+> Note 2: ERPNext will automatically add the raw material rate for your
+valuation purpose when you receive the finished Item in your stock.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
new file mode 100644
index 0000000..794d982
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md

@@ -0,0 +1,44 @@
+# BOM Replace Tool
+
+Replace BOM is the utility to replace BOM of sub-assembly item, which is already updated in the BOM of Finished Good item.
+
+To use the Production Planning Tool, go to:
+
+> Manufacturing > Tools > BOM Replace Tool
+
+Let's consider a scenario to understand this better.
+
+If company manufactures computers, Bill of Material of its finished item will constitute of:
+
+1. Monitor
+1. Key Board
+1. Mouse
+1. CPU
+
+Out of all the items above, CPU is asembled separately. Hence separate BOM will be created for the CPU. Following are the items from the BOM of CPU.
+
+1. 250 GB Hard Disk
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+If we have more items to be added , or existing items to be edited in the BOM of CPU, then we should create new BOM for it.
+
+1. _350 GB Hard Disk_
+1. Mother Board
+1. Processor
+1. SMTP
+1. DVD player
+
+To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool.
+
+<img class="screenshot" alt="BOM replace Tool" src="{{docs_base_url}}/assets/img/manufacturing/bom-replace-tool.png">
+
+In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
+
+**Will BOM Replace Tool work for replacing finsihed item in BOM?**
+
+No. You should Cancel and Amend current BOM, or create a new BOM for finished item.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.md b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
new file mode 100644
index 0000000..259b5eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.md

@@ -0,0 +1,4 @@
+
+### Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
new file mode 100644
index 0000000..aaf7cec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt

@@ -0,0 +1,2 @@
+production-planning-tool
+bom-replace-tool
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
new file mode 100644
index 0000000..61ec4c7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md

@@ -0,0 +1,62 @@
+Production Planning Tool helps you plan production and purchase of Items for a
+period (usually a week or a month).
+
+This list of Items can be generated from the open Sales Orders in the system
+and will generate:
+
+  * Production Orders for each Item.
+  * Purchase Requests for Items whose Projected Quantity is likely to fall below zero.
+
+To use the Production Planning Tool, go to:
+
+> Manufacturing > Tools > Production Planning Tool
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt.png">
+
+
+
+#### Step 1: Select and get Sales Order
+
+* Select sales orders for MRP using filters (Time, Item, and Customer)
+* Click on Get Sales Order to generate a list.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-sales-orders.png">
+
+
+
+#### Step 2: Get Item from Sales Orders.
+
+You can add/remove or change quantity of these Items.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-get-item.png">
+
+#### Step 3: Create Production Orders
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-production-order.png">
+
+
+
+#### Step 4: Create Material Request
+
+Create Material Request for Items with projected shortfall.
+
+<img class="screenshot" alt="Production Planing Tool" src="{{docs_base_url}}/assets/img/manufacturing/ppt-create-material-request.png">
+
+
+
+The Production Planning Tool is used in two stages:
+
+  * Selection of Open Sales Orders for the period based on “Expected Delivery Date”.
+  * Selection of Items from those Sales Orders.
+
+The tool will update if you have already created Production Orders for a
+particular Item against its Sales Order (“Planned Quantity”).
+
+You can always edit the Item list and increase / reduce quantities to plan
+your production.
+
+> Note: How do you change a Production Plan? The output of the Production
+Planning Tool is the Production Order. Once your orders are created, you can
+change them by amending the Production Orders.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
new file mode 100644
index 0000000..0ff2a6b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md

@@ -0,0 +1,19 @@
+### Workstation
+
+Workstation stores information regarding the place where the workstation operations is carried out.
+Data regarding the operation cost of the place can be stored here.
+We can also specify the workstation operation timings and a Holiday List.
+
+You can also create a Workstation by:
+
+> Manufacturing > Documents > Workstation > New
+
+<img class="screenshot" alt="Workstation" src="{{docs_base_url}}/assets/img/manufacturing/workstation.png">
+
+In workstation specify the workstation working hours under the 'working hour' section. 
+You can also specify the working hours based on shifts.
+While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified.	
+
+> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{docs_base_url}}/user/manual/en/manufacturing/setup/manufacturing-settings.html)
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
new file mode 100644
index 0000000..d4e2106
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md

@@ -0,0 +1,4 @@
+Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
+This rate is pulled by the system while making Time Logs. It is used for Project Costing.
+
+<img class="screenshot" alt="Activity Cost" src="{{docs_base_url}}/assets/img/project/activity_cost.png">

diff --git a/erpnext/docs/user/manual/en/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
new file mode 100644
index 0000000..7f37f51
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md

@@ -0,0 +1,13 @@
+Activity Type makes a list of the different types of activities against which a Time Log can be made.
+
+<img class="screenshot" alt="Activity Type" src="{{docs_base_url}}/assets/img/project/activity_type.png">
+
+By default the following Activity Types are created.
+
+* Planning
+* Research
+* Proposal Writing
+* Execution
+* Communication
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/articles/index.md b/erpnext/docs/user/manual/en/projects/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/articles/index.txt b/erpnext/docs/user/manual/en/projects/articles/index.txt
new file mode 100644
index 0000000..56c193c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.txt

@@ -0,0 +1 @@
+project-costing
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
new file mode 100644
index 0000000..e5c5940
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md

@@ -0,0 +1,39 @@
+<h1>Project Costing</h1>
+
+Each project has multiple task associated with it. To track actual costing of a Project, primarily in terms of services, user has to create Time Log based on actual time spent on Project-Task. Following the steps on how you can track actual service cost against Project.
+
+#### Activity Type
+
+Activity Type is a master of service offered by your personnel. You can add new Activity type from:
+
+`Project > Activity Type > New`	
+
+#### Activity Cost
+
+Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type.
+
+![Activity Cost]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.57.01 pm.png)
+
+#### Time Log
+
+Based on Actual Time spent on the Project-Task, Employee will create a time log.
+
+![Time Log]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 4.59.49 pm.png)
+
+On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master. 
+
+![Time Log Costing]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.00.06 pm.png)
+
+Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
+
+#### Costing in Project and Task
+
+Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master. 
+
+![Costing in Task]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.54 pm.png)
+
+Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
+
+![Costing in Project]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-06-11 at 5.02.29 pm.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/index.md b/erpnext/docs/user/manual/en/projects/index.md
new file mode 100644
index 0000000..220c67f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/index.md

@@ -0,0 +1,13 @@
+ERPNext helps you manage your Projects by breaking them into Tasks and
+allocating them to different people.
+
+Purchasing and selling can also be tracked against Projects and this can help
+the company keep tabs on its budget, delivery and profitability for a Project.
+
+Projects can be used to manage internal projects, manufacturing jobs or
+service jobs. For service jobs, Time Sheets can also be created that can be
+used to bill Customers if billing is done on a Time & Money basis.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/projects/index.txt b/erpnext/docs/user/manual/en/projects/index.txt
new file mode 100644
index 0000000..f2bae77
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/index.txt

@@ -0,0 +1,7 @@
+tasks
+project
+time-log
+time-log-batch
+activity-type
+activity-cost
+articles

diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
new file mode 100644
index 0000000..e8a0e0e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project.md

@@ -0,0 +1,87 @@
+Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project.png">
+
+### Managing tasks
+Project can be divided into multiple Tasks.
+Task can be created via Project document itself or can be created via  [Task]({{docs_base_url}}/user/manual/en/projects/tasks.html)
+
+<img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
+
+* To view Task made against a Project click on 'Tasks'
+
+<img class="screenshot" alt="Project - View Task" src="{{docs_base_url}}/assets/img/project/project_view_task.png">
+
+<img class="screenshot" alt="Project - Task List" src="{{docs_base_url}}/assets/img/project/project_task_list.png">
+
+* You can also view the Tasks from the Project document itself
+
+<img class="screenshot" alt="Project - Task Grid" src="{{docs_base_url}}/assets/img/project/project_task_grid.png">
+
+### Managing time
+
+ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Project.
+You can create Time Logs against each task.
+The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
+
+* To view Time Log made against a Project click on 'Time Logs'
+
+<img class="screenshot" alt="Project - View Time Log" src="{{docs_base_url}}/assets/img/project/project_view_time_log.png">
+
+<img class="screenshot" alt="Project - Time Log List" src="{{docs_base_url}}/assets/img/project/project_time_log_list.png">
+
+* You can also create a Time Log directlly and link it to the Project.
+
+<img class="screenshot" alt="Project - Link Time Log" src="{{docs_base_url}}/assets/img/project/project_time_log_link.png">
+
+### Managing expenses
+
+You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a project task.
+The system shall update the total amount from expense claims in the project costing section.
+
+* To view Expense Claims made against a Project click on 'Expense Claims'
+
+<img class="screenshot" alt="Project - View Expense Claim" src="{{docs_base_url}}/assets/img/project/project_view_expense_claim.png">
+
+* You can also create a Expense Claims directlly and link it to the Project.
+
+<img class="screenshot" alt="Project - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/project_expense_claim_link.png">
+
+* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
+
+<img class="screenshot" alt="Project - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/project_total_expense_claim.png">
+
+### Cost Center
+
+You can make a [Cost Center]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
+
+<img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
+
+###Project Costing
+
+The Project Costing section helps you track the time and expenses incurred against the project.
+
+<img class="screenshot" alt="Project - Costing" src="{{docs_base_url}}/assets/img/project/project_costing.png">
+
+* The Costing Section is updated based on Time Logs made.
+
+* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
+
+###Billing
+
+You can make/link a [Sales Order]({{docs_base_url}}/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
+
+<img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
+
+###Gantt Chart
+
+A Gantt Chart illustrates a project schedule.
+ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
+
+* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
+
+<img class="screenshot" alt="Project - View Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_view_gantt_chart.png">
+
+<img class="screenshot" alt="Project - Gantt Chart" src="{{docs_base_url}}/assets/img/project/project_gantt_chart.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
new file mode 100644
index 0000000..f04406f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/tasks.md

@@ -0,0 +1,59 @@
+Project is divided into Tasks. 
+In ERPNext, you can also create a Task independently.
+
+<img class="screenshot" alt="Task" src="{{docs_base_url}}/assets/img/project/task.png">
+
+### Status of the Task
+
+A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled.
+
+<img class="screenshot" alt="Task - Status" src="{{docs_base_url}}/assets/img/project/task_status.png">
+
+* By default each new Task created shall have the status set to 'Open'.
+
+* If a Time Log is made against a task, its status shall be set to 'Working'.
+
+### Dependent Task
+
+You can specify a list of dependent task under the 'Depends On' section.
+
+<img class="screenshot" alt="Depends On" src="{{docs_base_url}}/assets/img/project/task_depends_on.png">
+
+* You cannot close the parent Task until all 'Dependant Task' are closed.
+
+* If the Dependent Task are delayed and overlap with the expected Start Date of the Parent task, the system will reschedule the parent task.
+
+### Managing Time
+
+ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Task.
+You can create multiple Time Logs against each task.
+The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
+
+* To view Time Log made against a Task click on 'Time Logs'
+
+<img class="screenshot" alt="Task - View Time Log" src="{{docs_base_url}}/assets/img/project/task_view_time_log.png">
+
+<img class="screenshot" alt="Task - Time Log List" src="{{docs_base_url}}/assets/img/project/task_time_log_list.png">
+
+* You can also create a Time Log directlly and link it to the Task.
+
+<img class="screenshot" alt="Task - Link Time Log" src="{{docs_base_url}}/assets/img/project/task_time_log_link.png">
+
+### Managing Expenses
+
+You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resource-management/expense-claim.html) against a task.
+The system shall update the total amount from expense claims in the costing section.
+
+* To view Expense Claims made against a Task click on 'Expense Claims'
+
+<img class="screenshot" alt="Task - View Expense Claim" src="{{docs_base_url}}/assets/img/project/task_view_expense_claim.png">
+
+* You can also create a Expense Claims directlly and link it to the Task.
+
+<img class="screenshot" alt="Task - Link Expense Claim" src="{{docs_base_url}}/assets/img/project/task_expense_claim_link.png">
+
+* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
+
+<img class="screenshot" alt="Task - Total Expense Claim" src="{{docs_base_url}}/assets/img/project/task_total_expense_claim.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
new file mode 100644
index 0000000..d48633a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md

@@ -0,0 +1,23 @@
+You can bill Time Logs by batching them together. This gives you the flexiblity to manage your customer billing in the way you want. To create a new Time Log Batch, go to 
+
+> Projects > Time Log Batch > New Time Log Batch
+
+OR
+
+Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch.gif">
+
+###Making Sales Invoice
+
+* After submitting the Time Log Batch, "Make Invoice" button shall appear.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch_make_invoice.png">
+
+* Click on that button to raise a Sales Invoice against the Time Log Batch.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_batch_sales_invoice.png">
+
+* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Log Batch and their status will change to "Billed".
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/projects/time-log.md b/erpnext/docs/user/manual/en/projects/time-log.md
new file mode 100644
index 0000000..5d4c4a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/time-log.md

@@ -0,0 +1,49 @@
+Time Logs are a way to track time worked.
+They can be used to track the following
+
+* Billable work to Customers
+* Production Order Operations
+* Tasks
+* Project
+* Internal References
+
+<img class="screenshot" alt="Time Log" src="{{docs_base_url}}/assets/img/project/time_log.png">
+
+###Creating Time Logs
+
+1. To create a new Time Log, you can go to 
+> Projects > Time Log > new Time Log
+
+2. You can also create a new Time Log via Calendar
+
+To create Time Logs via Calender, go to Time Log and select Calendar.
+
+<img class="screenshot" alt="Time Log - View Calender" src="{{docs_base_url}}/assets/img/project/time_log_view_calendar.png">
+
+* To create a Time Log for multiple days, click and drag the cursor across days.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_calendar_day.gif">
+
+* You can also create Time Logs from 'week' and 'day' view of the calender.
+
+<img class="screenshot" alt="Time Log - Drag Calender" src="{{docs_base_url}}/assets/img/project/time_log_calendar_week.gif">
+
+* Time Logs for Manufacturing processes needs to be created from the Production Order. 
+* To create more Time Logs against Operations select the respective operation and click on the 'Make Time Log' button.
+
+###Billing using Time Logs
+
+* If you wish to bill against a Time Log you need to select the 'Billable' option.
+
+* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost]({{docs_base_url}}/user/manual/en/projects/activity-cost.html) 
+	based on the Employee and Activity Type specified.
+
+* The system shall then calculate the Costing and Billing amount based on the Hours mentioned in the Time Log.
+
+* If 'Billable' is not selected, the system shall display the 'Billing Amount' as 0.
+
+<img class="screenshot" alt="Time Log - Costing" src="{{docs_base_url}}/assets/img/project/time_log_costing.png">
+
+* After submitting the Time Log, you need to create [Time Log batch]({{docs_base_url}}/user/manual/en/projects/time-log-batch.html) to further bill the Time Log.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
new file mode 100644
index 0000000..9dfc730
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md

@@ -0,0 +1,31 @@
+<h1>Applying Discount</h1>
+
+There are two ways Discount can be applied on an items in the sales transactions.
+
+#### 1. Discount on "Price List Rate" of an item
+
+In the Item table of transaction, after Price List Rate field, you will find Discount (%) field. Discount Rate applied in this field will be applicable on the Price List Rate of an item.
+
+Before applying Discount (%). 
+
+![Before discount]({{docs_base_url}}/assets/img/articles/Selection_00616c670.png)
+
+After applying Discount (%) under Discount on Price List Rate (%) field.
+
+![After discount]({{docs_base_url}}/assets/img/articles/Selection_007f81dc2.png)
+     
+You can apply percent discount in all sales and purchase transactions.
+
+#### 2. Discount on Grand Total
+
+In transactions, after Taxes and Charges table, you will find option to enter "Additional Discount Amount". Based on Amount entered in this field, item's Basic Rate and Taxes will be recalculated.
+
+Before applying Additional Discount Amount,
+
+![Discount]({{docs_base_url}}/assets/img/articles/Selection_0085ca13e.png)
+
+After applying Additional Discount Amount.
+
+![Discount Amount]({{docs_base_url}}/assets/img/articles/Selection_010496ae2.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
new file mode 100644
index 0000000..8c3af05
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md

@@ -0,0 +1,34 @@
+**Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer
+
+In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sales Order.
+
+> Selling > Documents > Sales Order > Purchase Order
+
+#### Setup on Item Master
+
+Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
+<img class="screenshot" alt="Setup Item Master" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-item-master.png">
+
+#### Setup on Sales Order
+If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
+
+You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-sales-order-item.png">
+
+#### Create Purchase Order
+After submitting a Sales Order, create Puchase Order.<br> 
+<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/drop-ship-sales-order.png">
+
+From Sales Order, all items, having **Supplier delivers to Customer**  checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order. 
+
+It will automatically set Customer, Customer Address and Contact Person.
+
+After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
+<img class="screenshot" alt="Purchase Order for Drop Shipping" src="{{docs_base_url}}/assets/img/selling/drop-ship-purchase-order.png">
+
+<span style="color:#18B52D">**_Close_**</span>, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
+<img class="screenshot" alt="Close Sales Order" src="{{docs_base_url}}/assets/img/selling/close-sales-order.png">
+
+###Drop Shipping Print Format
+You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
+<img class="screenshot" alt="Drop Dhip Print Format" src="{{docs_base_url}}/assets/img/selling/drop-ship-print-format.png">
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
new file mode 100644
index 0000000..2fafa68
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md

@@ -0,0 +1,28 @@
+<h1>ERPNext for Service Organizations</h1>
+
+**Question:** At first look, ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by service companies as well?
+
+**Answer:**
+About 30% of ERPNext customers comes from services background. These are companies into software development, certification services, individual consultants and many more. Being into services business ourselves, we use ERPNext to manage our sales, accounting, support and HR operations.
+
+https://conf.erpnext.com/2014/videos/umair-sayyed
+
+###Master Setup
+
+Between the service and trading company, the most differentiating master is an item master. While trading and manufacturing business has stock item, with warehouse and other stock details, service items will have none of these details.
+
+To create a services item, which will be non-stock item, in the Item master, you should set "Is Stock Item" field as "No".
+
+![non-stock item]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png)
+
+###Hiding Non-required Features
+
+####Feature Setup
+
+In Feature Setup, you can activate specific functionalities, and disable others. Based on this setting, forms and fields not required for your business will be hidden. [More on feature setup here](https://manual.erpnext.com/customize-erpnext/hiding-modules-and-features).
+
+####Permissions
+
+ERPNext is the permission driven system. User will be able to access system based on permissions assigned to him/her. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from user. [More on permission management in ERPNext here](https://manual.erpnext.com/setting-up/users-and-permissions).
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/index.md b/erpnext/docs/user/manual/en/selling/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/index.txt b/erpnext/docs/user/manual/en/selling/articles/index.txt
new file mode 100644
index 0000000..70b4ac2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.txt

@@ -0,0 +1,6 @@
+applying-discount
+drop-shipping
+erpnext-for-services-organization
+manage-shipping-rule
+managing-sales-persons-in-sales-transactions
+stopping-sales-order
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
new file mode 100644
index 0000000..c9c4f91
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md

@@ -0,0 +1,25 @@
+<h1>Manage Shipping Rule</h1>
+
+Shipping Rule master help you define rules based on which shipping charge will be applied on sales transactions.
+
+Most of the companies (mainly retail) have shipping charge applied based on invoice total. If invoice value is above certain range, then shipping charge applied will be lesser. If invoice total is less, then shipping charges applied will be higher. You can setup Shipping Rule to address the requirement of varying shipping charge based on total.
+
+To setup Shipping Rule, go to:
+
+Selling/Accounts >> Setup >> Shipping Rule
+
+Here is an example of Shipping Rule master:
+
+![Shipping Rule Master]({{docs_base_url}}/assets/img/articles/$SGrab_258.png)
+
+Referring above, you will notice that shipping charges are reducing as range of total is increasing. This shipping charge will only be applied if transaction total falls under one of the above range, else not.
+
+If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of sales transaction. Hence these details are tracked as well in the Shipping Rule itself.
+
+![Shipping Rule Filters]({{docs_base_url}}/assets/img/articles/$SGrab_260.png)
+
+Apart from price range, Shipping Rule will also validate if its territory and company matches with that of Customer's territory and company.
+
+Following is an example of how shipping charges are auto-applied on sales order based on Shipping Rule.
+
+![Shipping Rule Application]({{docs_base_url}}/assets/img/articles/$SGrab_261.png)
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
new file mode 100644
index 0000000..ae92e63
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md

@@ -0,0 +1,43 @@
+<h1>Managing Sales Persons In Sales Transactions</h1>
+
+In ERPNext, Sales Person master is maintained in [tree structure](https://erpnext.com/kb/setup/managing-tree-structure-masters). Sales Person table is available in all the Sales transactions, at the bottom of  transactions form.
+
+If you have specific Sales Person attached to Customer, you can mention Sales Person details in the Customer master itself. On selection of Customer in the transactions, you will have Sales Person details auto-fetched in that transaction.
+
+####Sales Person Contribution
+
+If you have more than one sales person working together on an order, then with listing all the sales person for that order, you will also need to define contribution based on their effort. For example, Sales Person Aasif, Harish and Jivan are working on order. While Aasif and Harish followed this order throughout, Jivan got involved just in the end. Accordingly you should define % Contribution in the sales transaction as:
+
+![Sales Person]({{docs_base_url}}/assets/img/articles/Selection_01087d575.png)
+
+Where Sales Order Net Total is 30,000.
+
+<div class=well>Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then enter % Contribution as 100% for him/her.</div>
+
+####Sales Person Transaction Report
+
+You can check Sales Person Transaction Report from 
+
+`Selling > Standard Reports > Sales Person-wise Transaction Summary`
+
+This report will be generated based on Sales Order, Delivery Note and Sales Invoice. This report will give you total amount of sales made by an employee over a period. Based on data provided from this report, you can determine incentives and plan appraisal for an employee.
+
+![SP Report]({{docs_base_url}}/assets/img/articles/Selection_011.png)
+
+####Sales Person wise Commission
+
+ERPNext doesn't calculate commission payable to an Employee, but only provide total amount of sales made by him/her. As a work around, you can add your Sales Person as Sales Partner, as commission calculation feature is readily available in ERPNext. You can check Sales Partner's Commission report from 
+
+`Accounts > Standard Reports > Sales Partners Commission`
+
+####Disable Sales Person Feature
+
+If you don't track sales person wise performance, and doesn't wish to use this feature, you can disable it from:
+
+`Setup > Customize > Features Setup` 
+
+![Feature Setup]({{docs_base_url}}/assets/img/articles/Selection_01244aec7.png)
+
+After uncheck Sales Extras from Sales and Purchase section, refresh your ERPNext account's tab, so that forms will take effect based on your setting.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
new file mode 100644
index 0000000..96a15de
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md

@@ -0,0 +1,17 @@
+<h1>Stopping a Sales Order</h1>
+
+In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
+
+![stop Sales Order]({{docs_base_url}}/assets/img/articles/$SGrab_439.png)
+
+####Scenario
+
+East Wind receives an order for ten laptops. Sales Order is also created for ten units. Due to scarcity of stock, only seven units are delivered to customer. Pending three units are to be delivered soon. Customer inform East Wind need not deliver pending item, as they have purchased it from other vendor.
+
+In this case, after East Wind will create Delivery Note and Sales Invoice only for the seven units of Laptop, and set Sales Order as stopped.
+
+![Sales Order Stopped]({{docs_base_url}}/assets/img/articles/$SGrab_440.png)
+
+Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
new file mode 100644
index 0000000..36a99d2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/index.md

@@ -0,0 +1,11 @@
+# Selling
+
+Selling is the communication that happens with the customer prior to and
+during the sale. You might be managing all the communication yourself or you
+may have a small team of sales people to handle this. ERPNext helps you track
+the communication leading up to the sale, by keeping all your documents in an
+organized and searchable manner.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/selling/index.txt b/erpnext/docs/user/manual/en/selling/index.txt
new file mode 100644
index 0000000..3f414d1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/index.txt

@@ -0,0 +1,4 @@
+quotation
+sales-order
+setup
+articles

diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
new file mode 100644
index 0000000..027a515
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/quotation.md

@@ -0,0 +1,89 @@
+During a sale, the customer may request for a written note about the products
+or services you are planning to offer, along with the prices and other terms
+of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
+Invoice”or a Quotation.
+
+To create a new Quotation go to:
+
+> Selling > Quotation > New Quotation
+
+###Creating Quotation from Oppurtunity
+
+You can also create a Quotation from an Opportunity.
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
+
+Or You can create a new Quotation and pull details from an Opportunity.
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
+
+A Quotation contains details about:
+
+  * The recipient of the Quotation
+  * The Items and quantities you are offering.
+  * The rates at which they are offered. For details refer 
+  * The taxes applicable.
+  * Other charges (like shipping, insurance) if applicable.
+  * The validity of contract.
+  * The time of delivery.
+  * Other conditions.
+
+> Tip: Images look great on Quotations. To add images to your Quotations,
+attach the corresponding image in the Item master.
+
+### Rates
+
+The rates you quote may depend on two things.
+
+  * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List]({{docs_base_url}}/user/manual/en/setting-up/price-lists.html)
+
+  * The Currency: If you are quoting to a Customer in a different currency, you will have to update the conversion rates to enable ERPNext to save the information in your standard Currency. This will help you to analyze the value of your Quotations in standard Currency.
+
+### Taxes
+
+To add taxes to your Quotation, you can either select a tax template, Sales
+Taxes and Charges Template or add the taxes on your own. To understand taxes in
+detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
+
+You can add taxes in the same manner as the Sales Taxes and Charges Template.
+
+### Terms and Conditions
+
+Each Quotation must ideally contain a set of terms, of your contract. It is
+usually a good idea to make templates of your Terms and Conditions, so that
+you have a standard set of terms. You can do this by going to:
+
+> Selling > Terms and Conditions
+
+#### What should Terms and Conditions Contain?
+
+  * Validity of the offer.
+  * Payment Terms (In Advance, On Credit, part advance etc).
+  * What is extra (or payable by the Customer).
+  * Safety / usage warning.
+  * Warranty if any.
+  * Returns Policy.
+  * Terms of shipping, if applicable.
+  * Ways of addressing disputes, indemnity, liability, etc.
+  * Address and Contact of your Company.
+
+### Submission
+
+Quotation is a “Submittable” transaction. Since you send this Quotation to
+your Customer or Lead, you must freeze it so that changes are not made after
+you send the Quotation. See Document Stages.
+
+> Tip: Quotations can also be titled as “Proforma Invoice” or “Proposal”.
+Select the right heading in the “Print Heading” field in the “More Info”
+section. To create new Print Headings go to Setup > Branding and Printing >
+Print Headings.
+
+### Discount
+
+While making your sales transactions like a Quotation (or Sales Order) you
+would already have noticed that there is a “Discount” column. On the left is
+the “Price List Rate” on the right is the “Basic Rate”. You can add a
+“Discount” value to update the basic rate. To understand more about discount
+read [Discount.](http://erpnext.org/discount)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
new file mode 100644
index 0000000..269473a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md

@@ -0,0 +1,119 @@
+# Sales Order
+
+The Sales Order confirms your sales and triggers purchase (**Material
+Request**) shipment (**Delivery Note**), billing (**Sales Invoice**) and
+manufacturing (**Production Plan**)
+
+A Sales Order is usually a binding Contract with your Customer.
+
+Once your customer confirms the Quotation you can convert your Quotation into
+a Sales Order.
+
+### Sales Order Flow-Chart
+
+![Sales Order]({{docs_base_url}}/assets/old_images/erpnext/sales-order-f.jpg)
+
+To create a new Sales Order go to:
+
+> Selling > Sales Order > New Sales Order
+
+### Creating Sales Order from Quotation
+
+You can also create a Sales Order from a submitted Quotation.
+
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-SO-from-quote.png">
+
+Or you can create a new Sales Order and pull details from an Quotation.
+
+<img class="screenshot" alt="Make Sales Order from Quotation" src="{{docs_base_url}}/assets/img/selling/make-so.gif">
+
+Most of the information in your Sales Order is the same as the Quotation.
+There are a few amongst other things that a Sales Order will ask you to
+update.
+
+  * Expected date of delivery.
+  * Customer Purchase Order number: If your customer has sent you a Purchase Order, you can update its number for future reference (in billing).
+
+### Packing List
+
+The “Packing List” table will be automatically updated when you “Save” the
+Sales Order. If any Items in your table are Product Bundle (packets), then the
+“Packing List” will contain the exploded (detailed) list of your Items.
+
+### Reservation and Warehouses
+
+If your Sales Order contains Items for which inventory is tracked (Is Stock
+Item is “Yes”) then, ERPNext will ask you for “Reservation Warehouse”. If you
+have set a default Warehouse for the Item, it will automatically set this
+Warehouse here.
+
+This “reserved” quantity will help you project what is the quantity you need
+to purchase based on all your commitments.
+
+### Sales Team
+
+**Sales Partner:** If this Sale was booked via a Sales Partner, you can update the Sales Partner’s details with commission and other info that you can aggregate.
+
+**Sales Persons:** ERPNext allows you to tag multiple Sales Persons who may have worked on this deal. You can also split the amount in targets of different Sales Persons and track how much incentives they earned on this deal.
+
+### Recurring Sales Orders
+
+If you have a recurring contract with a Customer where you are required to generate a Sales Order on a monthly, quarterly, half-yearly or annual basis, you can check the “Convert To Recurring Order” box. 
+
+Here you can fill in the details like; of how frequently you want to generate an Order in the 'Recurring Type' field, specify the day of of the month on which the Order needs to be generated in the 'Repeat On Day Of Month' field and the date on which the recurring orders should stop in the 'End Date' field.
+
+**Recurring Type:** Here you can update how frequently you want to generate an Order.
+
+**Repeat On Day Of Month:** You can specify the day of of the month on which the Order needs to be generated.
+
+**End Date:** The date on which the recurring orders should stop can be specified here.
+
+On updating the Sales Order, a Recurring ID will be generated which will be same for all recurring orders generated from this particular Sales Order.
+
+ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field.
+
+<img class="screenshot" alt="Reccuring Sales Order" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
+
+### Next Steps
+
+Once you “Submit” your Sales Order, you can now trigger different aspects of
+your organization:
+
+  * To begin purchase click on “Make Purchase Request”
+  * To make a shipment entry click on “Make Delivery Note”
+  * To bill, make “Make Sales Invoice”
+  * To stop further process on this Sales Order, click on “Stop”
+
+### Submission
+
+Sales Order is a “Submittable” transaction. See Document Stages. You will be
+able to execute dependent steps (like making a Delivery Note) only after
+“Submitting” this Sales Order.
+
+### Sales Order with Order type Maintenance
+
+When the 'Order Type' of the Sales Order is 'Maintenance' follow the steps
+given below:
+
+__Step 1:__ Enter Currency, Price list and Item details.
+
+__Step 2:__ Mention taxes and other information.
+
+__Step 3:__ Save and Submit the form
+
+__Step 4:__ Once the form is submitted, the Action button will provide three
+choices.i) Maintenance Visit ii) Maintenance Schedule iii) Invoice.
+
+
+
+> **Note 1:**   
+By clicking on the Action button and selecting 'Maintenance Visit' you can directly fill the visit form. The Sales Order details will be fetched directly.    
+
+> **Note 2:**    
+By clicking on the Action button and selecting 'Maintenance Schedule' you can fill the schedule details. The Sales Order details will be fetched directly.
+
+> **Note 3:**    
+By clicking on the Invoice button you can make an Invoice for your
+services . The sales orders details will be fetched directly.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/index.md b/erpnext/docs/user/manual/en/selling/setup/index.md
new file mode 100644
index 0000000..0ab4b5a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.md

@@ -0,0 +1,7 @@
+This section includes information on how to setup customer groups, sales partners, sales persons and terms and conditions.
+
+It has instructions on how to configure selling settings, in order to enable default fields.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/selling/setup/index.txt b/erpnext/docs/user/manual/en/selling/setup/index.txt
new file mode 100644
index 0000000..22a335b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.txt

@@ -0,0 +1,6 @@
+selling-settings
+sales-partner
+shipping-rule
+product-bundle
+item-price
+sales-person-target-allocation

diff --git a/erpnext/docs/user/manual/en/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
new file mode 100644
index 0000000..b877e8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md

@@ -0,0 +1,43 @@
+Item Price is the record in which you can log sellig and buying rate of an item.
+
+There are two ways to reach to new Item Price form.
+
+> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+
+Or
+
+> Item >> Add/Edit Prices >> Click on "+"  >> New Item Price
+
+Following are the steps to create new Item Price.
+
+Step 1: Select Price List
+
+You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
+
+![Item Price list]({{docs_base_url}}/assets/old_images/erpnext/item-price-list.png)
+
+On selection of Price List, its currency and for selling or buying property will be fetched as well.
+
+To have Item Price fetching in the sales or purchase transaction, you should have Price List id selected in the transaction, just above Item table.
+
+Step 2: Select Item
+
+Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
+
+![Item Price Item]({{docs_base_url}}/assets/old_images/erpnext/item-price-item.png)
+
+Step 3: Enter Rate
+
+Enter selling/buying rate of an item in Price List currency.
+
+![Item Price Rate]({{docs_base_url}}/assets/old_images/erpnext/item-price-rate.png)
+
+Step 4: Save Item Price
+
+To check all Item Price together, go to:
+
+Stock >> Main Report >> Itemwise Price List Rate
+
+You will find option to create new Item Price record (+) in this report as well.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
new file mode 100644
index 0000000..fa7f948
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md

@@ -0,0 +1,47 @@
+#Product Bundle
+
+Product Bundle stands for Sales Bill-of-Material. It's a master where you can list item which are bundled together and 
+sold as one item. For instance, when laptop is delivered, you need to ensure that charger, mouse and laptop bag are 
+delivered and stock level of these items gets affected. To address this scenario, you can set create Product Bundle for 
+the main item, i.e. laptop, and list deliverable items i.e. laptop + charger + other accessories as child items.
+  
+Following are the steps on how to setup Product Bundle master, and how is it used in the sales transactions.
+
+####Create new Product Bundle
+
+To create new Product Bundle, Go to:
+
+Selling > Setup > Product Bundle > New
+
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.png">
+
+###Select Parent Item
+
+In Product Bundle master, there are two sections. Product Bundle Item and Package Item.
+
+In Product Bundle item, you will select a Parent Item. The parent item must be a <b>non-stock item</b>. 
+This is non-stock item because there is no stock maintained for it but only the Package Items. 
+If you want to maintain stock for the Parent Item, then you must create a regular Bill of Material (BOM) 
+and package them using a Stock Entry Transactions.
+
+###Select Child Items
+
+In Package Item section, you will list all the child items for which we maintain stock and is delivered to customer.
+
+###Product Bundle in the Sales Transactions
+
+When making Sales transactions like Sales Invoice, Sales Order and Delivery Note, 
+Parent Item will be selected in the main item table.
+
+<img class="screenshot" alt="Product Bundle" src="{{docs_base_url}}/assets/img/selling/product-bundle.gif">
+
+On selection on Parent Item in the main item table, its child items will be fetched in Packing List 
+table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo. 
+in packing List table itself. On submission of transaction, system will reduce the stock level of child items from 
+warehouse specified in Packing List table.
+
+<div class="well"><b>Use Product Bundle to Manage Schemes:</b>
+<br>
+This work-around in Product Bundle was discovered when a customer dealing into nutrition product asked for feature to manage schemes like "Buy One Get One Free". To manage the same, he created a non-stock item which was used as Parent Item. In description of item, he entered scheme details with items image indicating the offer. The saleable product was selected in Package Item where qty was two. Hence every time they sold one qty of Parent item under scheme, system deducted two quantities of product from Warehouse.</div>
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
new file mode 100644
index 0000000..1174969
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md

@@ -0,0 +1,34 @@
+People who assist you in getting business are termed as Sales Partners. Sales Partners can be represented by different names in ERPNext. You can call them Channel Partner, Distributor, Dealer, Agent, Retailer, Implementation Partner, Reseller etc.
+
+For each Sales Partner, you can define commission offer to them. When Sales Partner is selected in transactions, there commission is calculated over Net Total of Sales Order/Invoice or Delivery Note.
+
+You can track Sales Personwise commission in the report under Selling module.
+
+To create a sales partner go to:
+
+`Selling > Setup > Sales Partner`
+
+Sales Partners are saved with Sales Partner name provided by user.
+
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner.png">
+
+You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
+
+### Including Sales Partners in Your Website
+
+To include the name of your Partner on your website, check the "Show in
+Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner.
+
+<img class="screenshot" alt="Sales Partner" src="{{docs_base_url}}/assets/img/selling/sales-partner-website.png">
+
+To see listing of partner, you should go to:
+
+https://example.erpnext.com/partners
+
+![Sales Partner Listing]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-listing.png)
+
+Following is the complete partners details published on the website.
+
+![Sales Partner Published]({{docs_base_url}}/assets/old_images/erpnext/sales-partner-published.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
new file mode 100644
index 0000000..134a9b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md

@@ -0,0 +1,86 @@
+With management of Sales Person, ERPNext also allow you to assign target to Sales Persons based on Item Group and Territory. Based on target allocated and actual sales booked by Sales Person, you will get target variance report for the Sales Person.
+
+###1. Sales Person - Item Groupwise Target Allocation
+
+####1.1 Open Sales Person's Master
+
+To allocate target, you should open specific Sales Person master.
+
+`Selling > Setup > Sales Person > (Open Sales Person)`
+
+####1.2 Allocate Item Groupwise Target
+
+In the Sales Person master, you will find table called Sales Person Target.
+
+![Sales Person Target Item Group]({{docs_base_url}}/assets/old_images/erpnext/sales-person-target-item-group.png)
+
+In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. 
+
+<div class=well>You can give target in amount or quantity, or in both. Item Group can also be left blank. In this case the system will calculate target based on all the Items.</div>
+
+####1.3 Target Distribution
+
+If you wish to spread allocated target across months, then you shoult setup Target Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation).
+
+![Sales Person Target Distribution]({{docs_base_url}}/assets/old_images/erpnext/sales-person-target-distribution.png)
+
+####Report - Sales Person Target Variance Item Groupwise
+
+To check this report, go to:
+
+`Selling > Standard Report > Sales Person Target Variance (Item Group-wise)'
+
+This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
+
+![Sales Person Item Group Report]({{docs_base_url}}/assets/old_images/erpnext/sales-person-item-group-report.png)
+
+As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
+
+---
+
+###2. Sales Person - Territorywise Target Allocation
+
+To allocate target to Sales Person based on Territory, you can should select specific Sales Person in the Territory master. This Sales Person is entered just for the reference. Sales Person details are not updated in the variance report of Territorywise Target Allocation.
+
+####2.1 Go to Territory master
+
+`Selling > Setup > Territory > (Open specific Territory master)`
+
+In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
+
+![Sales Person Territory Manager]({{docs_base_url}}/assets/old_images/erpnext/sales-person-territory-manager.png)
+
+####2.2 Allocating Target
+
+Allocation Target in the Territory master is same as in Sales Person master. You can follow same steps as given above to specify target in the Territory master as well.
+
+####2.3 Target Distribution
+
+Using this master, you can divide target Qty or Amount across various months.
+
+####2.4 Report - Territory Target Variance Item Groupwise
+
+This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
+
+![Sales Person Territory Report]({{docs_base_url}}/assets/old_images/erpnext/sales-person-territory-report.png)
+
+---
+
+###3. Target Distribution
+
+Target Distribution master allows you to divide allocated target across multiple months. If your product and services is seasonal, you can distribute the sales target accordingly. For example, if you are into umbrella business, then target allocated in the monsoon seasion will be higher than in other months.
+
+To create new Budget Distriibution master, go to:
+
+`Accounts > Setup > Budget Distributon`
+
+![Target Distribution]({{docs_base_url}}/assets/old_images/erpnext/target-distribution.png)
+
+You can link target distribution while allocation targets in Sales Person as well as in Territory master.
+
+###See Also
+
+1. [Managing Sales Person](https://erpnext.com/selling/selling-setup/sales-person)
+2. [Using Sales Person in transactions](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
new file mode 100644
index 0000000..d5d7117
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md

@@ -0,0 +1,71 @@
+Selling Setting is where you can define propertiese which will be applied in your selling transactions. 
+Let's check into each property one by one.
+
+<img class="screenshot" alt="Selling Settings" src="{{docs_base_url}}/assets/img/selling/selling-settings.png">
+
+####1. Customer Naming By
+
+When customer is saved, system generated unique ID for that Customer. Using that Customer ID, 
+you can select Customer in other transactions.
+
+Bydefault Customer will be saved with Customer Name. If you wish to save Customer using 
+a naming series, you should set Customer Naming By as "Naming Series".
+
+Example of Customer Id's saved in Naming Series - `CUST00001,CUST00002, CUST00003...` and so on.
+
+You can set Naming Series for customer naming from:
+
+> Setup > Settings > Naming Series`
+
+####2. Campaign Naming By
+
+Just like for Customer, you can also configure as how ID will be generated for the Campaign master. 
+Bydefault Campaign will be saved with Campaign Name provided while its creation.
+
+####3. Default Customer Group
+
+Customer Group in this field will be auto-updated when you open new Customer form.
+While converting Quotation created for Lead into Sales Order, system attempts to convert 
+Lead into Customer in the backend. While creating Customer in the backend, system pickup 
+Customer Group and Territory as defined in the Selling Setting. If system doesn't find 
+any values, then following validation message will be raised.
+To resolve this, you should:
+Either manually convert Lead into Customer, and define Customer Group and Territory manually while 
+creating Customer or define Default Customer Group and Territory in the Selling Setting. 
+Then you should have Lead automatically converted into Customer when convert Quotation into Sales Order.
+
+####4. Default Territory
+
+Territory defined in this field will be auto-updated in the Territory field of Customer master.
+
+Just like Customer Group, Territory is also checked when system tries creating Customer in the backend.
+
+####5. Default Price List
+
+Price List set in this field will be auto-updated in the Price List field of Sales transactions.
+
+####6. Sales Order Required
+
+If you wish to make Sales Order creation mandatory before creation of Sales Invoice, then you should 
+set Sales Order Required field as Yes. Bydefault, this will be "No" for a value.
+
+####7. Delivery Note Required
+
+To make Delivery Note creation as mandatory before Sales Invoice creation, you should set 
+this field as "Yes". It will be "No" by default.
+
+####8. Maintain Same Rate Throughout Sales Cycle
+
+System bydefault validates that item price will be same throughout sales cycle 
+(Sales Order - Delivery Note - Sales Invoice). If you could have item price changing within the cycle, 
+and you need to bypass validation of same rate throughout cycle, then you should uncheck this field and save.
+
+####9. Allow User to Edit Price List Rate in Transaction
+
+Item table of the sale transactions has field called Price List Rate. This field be non-editale 
+by default in all the sales transactions. This is to ensure that price of an item is fetched from 
+Item Price record, and user is not able to edit it.
+
+If you need to enable user to edit Item Price, fetched from Price List of an item, you should uncheck this field.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
new file mode 100644
index 0000000..c4369cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md

@@ -0,0 +1,6 @@
+Using Shipping Rule you can define the cost for delivering the product to the customer.
+You can define different shipping rules for the same item across different territories.
+
+<img class="screenshot" alt="Shipping Rule" src="{{docs_base_url}}/assets/img/selling/shipping-rule.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
new file mode 100644
index 0000000..c65cc8b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md

@@ -0,0 +1,17 @@
+<h1>Change Password</h1>
+
+Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
+
+
+####Step 1: Go to My Setting.
+
+![Image]({{docs_base_url}}/assets/img/articles/SGrab_250.png)
+
+####Step 2: Set New Password.
+
+![NEW]({{docs_base_url}}/assets/img/articles/Selection_014dd1559.png)
+
+Enter the new password and save the form to save changes. 
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
new file mode 100644
index 0000000..04e5203
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md

@@ -0,0 +1,20 @@
+<h1>Delete All Related Transactions for a Company</h1>
+
+Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.
+
+Version 5 onwards, you can now delete all dummy transactions related to a company.
+
+To do that, open the company record.
+ 
+`Setup > Accounts > Company` or  `Accounts > Setup > Company`
+
+In Company master, click on the **Delete Company Transactions** button right at the bottom of the form. Then you must re-type the company name to confirm if you are sure you want to continue with this.
+
+This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
+
+![Delete Company]({{docs_base_url}}/assets/img/articles/delete-company.png)
+
+
+**Note:** If you want to delete the company record itself, the use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
new file mode 100644
index 0000000..366d8a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html

@@ -0,0 +1,28 @@
+<h1>Edit Submitted Document</h1>
+
+&nbsp;To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
+<br>
+<br><b>Step 1: Cancel Submitted Document</b><br>
+<br>You will find Cancel button on upper right corner of submitted document.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_001.png">
+<br>
+<br><b>Step 2: Amend the document</b><br>
+<br>On cancellation of submitted document, <b>Amend</b> button will be became visible.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_00256341a.png">
+<br>
+<br><b>Step 3: Save and Submit the document</b><br>
+<br>On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
+<br>
+<br>
+<img src="{{docs_base_path}}/assets/img/articles/Selection_0036e00ef.png">
+<br>
+<br><div class="well">Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. Example:<br><br>If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.<br>
+</div><br>
+<br>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.md b/erpnext/docs/user/manual/en/setting-up/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
new file mode 100644
index 0000000..6f99f89
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt

@@ -0,0 +1,13 @@
+change-password
+delete-a-company-and-all-related-transactions
+edit-submitted-document
+integrating-erpnext-with-other-application
+manage-header-and-footer
+managing-multiple-companies
+managing-perm-level
+managing-tree-structure-masters
+naming-series-current-value
+overwriting-data-from-data-import-tool
+rename-user
+setting-up-dropbox-backups
+using-custom-domain-on-erpnext
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
new file mode 100644
index 0000000..1b7adf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md

@@ -0,0 +1,14 @@
+<h1>Integrating ERPNext with other Applications</h1>
+
+For now, ERPNext doesn't have out-of-the-box integration available for the third party applications. However, Frappe has REST API using which you can get ERPNext integrated with any other solution.
+
+Learn more about Frappe API here.
+
+[https://frappe.io/help/rest_api](https://frappe.io/help/rest_api)
+
+For experts services on integration, you can connect with our service providers from community portal.
+
+[https://frappe.io/community/service-providers](https://frappe.io/community/service-providers)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
new file mode 100644
index 0000000..eee9618
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html

@@ -0,0 +1,4 @@
+<h1>Manage Header And Footer</h1>
+
+<h1>Manage Header And Footer</h1>
+

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
new file mode 100644
index 0000000..dc9f667
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md

@@ -0,0 +1,42 @@
+<h1>Managing Multiple Companies</h1>
+
+<h1>Managing Multiple Companies</h1>
+
+ERPNext allows you to create multiple companies in the same/common ERPNext account.
+
+With this, you will find option to select Company in your transactions. While most of the transactions will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which can be used across all the companies.
+
+If you have separate teams working on each company, you can also restrict the access of user to the data of specific company. Click [here](https://manual.erpnext.com/search?txt=user%20permission) to know more about how to set permission to achieve the same.
+
+Following are the steps to create companies in your ERPNext account.
+
+####Go to Setup Module
+
+`Setup &gt; Masters &gt; Company &gt; New`
+
+####Enter Company Details
+
+Company master will be saved with Company Name provided at the time of its creation. 
+
+![New Company]({{docs_base_url}}/assets/img/articles/SGrab_343.png)
+
+Also, you can define other properties for new company like:
+
+* Country
+* Currency
+* Default Cash and Bank Account
+* Income/Expense Account
+* Company Registration Details
+
+Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement. 
+
+![New Company]({{docs_base_url}}/assets/img/articles/SGrab_344.png)
+
+####Chart of Account for New Company
+
+A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
+
+![Company]({{docs_base_url}}/assets/img/articles/SGrab_342.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
new file mode 100644
index 0000000..c44d1ea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md

@@ -0,0 +1,27 @@
+<h1>Managing Perm Level in Permission Manager</h1>
+
+<h1>Managing Perm Level in Permission Manager</h1>
+
+In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
+
+Perm Level for a field can be defined in the [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+![Customize Form]({{docs_base_url}}/assets/img/articles/$SGrab_256.png)
+
+If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
+
+Delivery Note is accessible to Stock Manager as well as Stock User. You don't wish Stock User to access Amount related field in Delivery Note, but other field should be visible just like it is visible Stock Manager.
+
+For the amount related fields, you should set Perm Level as (say) 2.
+
+For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
+
+![Perm Level Manager]({{docs_base_url}}/assets/img/articles/$SGrab_253.png)
+
+Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
+
+![Perm Level User]({{docs_base_url}}/assets/img/articles/$SGrab_254.png)
+
+Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
+
+<!-- markdown -->

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
new file mode 100644
index 0000000..0de7869
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md

@@ -0,0 +1,58 @@
+<h1>Managing Tree Structure Masters</h1>
+
+<h1>Managing Tree Structure Masters</h1>
+
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent masters, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy. 
+
+Following is the partial list of masters which are maintained in the tree structure.
+
+* Chart of Accounts
+
+* Chart of Cost Centers
+
+* Customer Group
+
+* Territory
+
+* Sales Person
+
+* Item Group
+
+Following are the steps to manage and create record in the tree structured master. Let's consider Territory master to understand managing tree masters.
+
+####Step 1 : Go to Master
+
+`Selling > Setup > Territory`
+
+Also you can type master name in Awesome Bar to go to the related master.
+
+Tree master allows you to set Parent Territories, and Child Territories Groups under those Parents.
+
+####Step 2 : New Parent Territory
+
+![Territory Group]({{docs_base_url}}/assets/img/articles/Sselection_013.png)
+
+When click on Parent Territory, you will see option to add child territory under it. All default Territory groups will be listed under parent group called "All Territories". You can add further parent or child Territory Groups under it.
+
+####Step 3: Name The Territory Group
+
+When click on Add Child, a dialog box will provide two fields.
+
+**Territory Group Name**
+
+Territory will be saved with Territory Name provided here.
+
+**Group Node**
+
+If Group Node selected as Yes, then this Territory will be created as Parent, which means you can further create sub-territories under it. If select No, then it will become child Territory which you will be able to select in another masters.
+
+<div class="well">Only child Territory Groups are selectable in another masters and transactions.</div>
+![Child Territory]({{docs_base_url}}/assets/img/articles/Selection_0124080f1.png)
+
+Following is how Child Territories will be listed under a Parent Territory.
+
+![Territory Tree]({{docs_base_url}}/assets/img/articles/Selection_014.png)
+
+Following this steps, you can manage other tree masters in ERPNext.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
new file mode 100644
index 0000000..47cf1a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md

@@ -0,0 +1,63 @@
+<h1>Setting the Current Value for Naming Series</h1>
+
+<h1>Setting the Current Value for Naming Series</h1>
+
+Naming Series feature allows you to define prefix for number series of documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO00001, SO00002... and so on. Click [here](https://erpnext.com/user-guide/setting-up/document-naming-series) to learn how you can customize Number Series for a transaction/master in ERPNext.
+
+### 1. Setting the Current Value
+
+Naming Series feature also offers a tool where you can set Current Value for specific prefix. This is generally required if you have recently started using ERPNext, and have old transactions in the previous system, and you want the numbering series to start in from where it ended in the old system. Let's consider a scenario to learn this better.
+
+For example, you have 322 Sales Orders created in your old system with SO00322 as highest Sales Order Id. In ERPNext, you need the first Sales Order to pick up #323 when it is saved. To enable this, you should set Current Value for SO series in following steps.
+
+#### Go to Naming Series Tool
+
+`Setup > System > Naming Series`
+
+#### Update Series Section
+
+![Update Series Section]({{docs_base_url}}/assets/img/articles/$SGrab_420.png)
+
+#### Select Prefix
+
+Considering our scenario, prefix for Sales Order will be "SO".
+
+![Series Prefix]({{docs_base_url}}/assets/img/articles/$SGrab_418.png)
+
+#### Current Value
+
+If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
+
+![Series Current Value]({{docs_base_url}}/assets/img/articles/$SGrab_419.png)
+
+With this setting, you will have numbering for the New Sales Orders starting with #323.
+
+### 2. Error Due Series Number
+
+If you receive a Duplicate Name error while saving a transaction, for example, while saving Item Price, you receive an error saying:
+
+`Duplicate name Item Price RFD/00016`
+
+This error message indicates that when you are saving Item Price, system is trying to allocate "RFD/00016" to that Item Price record. But it is finding that Item Price with this ID is already existing in your system.
+
+This error could arise because Current Value for Series/Prefix of Item Price is disturbed and not in sync with actual Current Value. While actual Current Value for Item Price could be 20 (or any number more than 16), someone has set Current Value for this series as 15. 
+
+To confirm actual Current Value for particular Series, you should check report for document in question (Item Price in this case), and check for the Item Price ID with highest value. 
+
+Let's assume we find that actual Current Value for Item price is 22, then you go Naming Series, and set Current Value for the Prefix/Series of Item Price to 22, and Update Series Number.
+
+These instructions is applicable for all the documents in ERPNext for which user can customize Series and its Current Value.
+
+Let's consider another scenario to learn this better. On assigning a document to another user, error message says:
+
+`Duplicate name ToDo TDI00014286`
+
+This indicate the Current Value for Series/Prefix of ToDo (TDI) has been disturbed. You should follow these steps to correct value for Current Value for TDI prefix.
+
+1. Check ToDo report for the highest ToDo id value.
+1. Setup >> Settings >> Naming Series
+1. Check section B of Update Series
+1. Select Prefix for ToDo "TDI"
+1. Ensure that highest number for ToDo is updated as Current Value in Naming Series. If not, correct Current Value, and click on "Update Series Numbering".
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
new file mode 100644
index 0000000..1ae6cb5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html

@@ -0,0 +1,11 @@
+<h1>Overwriting Data from Data Import Tool</h1>
+
+<h1>Overwriting Data from Data Import Tool</h1>
+
+Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
+<br>
+<br><div class="well">Over-writing data from Data Import Tool works only for Saved transactions, and not for Submitted ones.</div>
+Let's assume there are no. of items for which we need to overwrite Item Group.
+Following are the steps to go about overwriting Item Groups for existing Items.<br><br><h4>Step 1: Download Template</h4><br>Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.<br><br>Setup &gt;&gt; Data &gt;&gt; Import/Export Data<br><br>Since items to be over-written will be already available in the system, while downloading template, "Download with data" field should be checked. With this, we will have all the existing items being downloaded with the template.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_285.png"><br><br><h4>Step 2: Prepare Data</h4><br>In the download template, We will only keep rows of the items to be worked on and delete the rest. Then we will enter new value in the Item Group column for an item. Since Item Group is a master in itself, we should ensure that Item Group entered in the excel file is already available in the Item Group master as well.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_287.png"><br><br>Since we are overwriting only Item Group, only following columns will be mandatory.<br><br><ol><li>Column A (since it has main values of template)<br></li><li>Name (Column B)<br></li><li>Item Group<br></li></ol>Columns of other field which won't have any impact of overwriting can be
+ removed, even if they are mandatory. This is applicable only for 
+overwriting, and not when importing new records.<br><br><h4>Step 3: Import Data</h4><br>Once excel file is ready for importing, come back to Data Import Tool in ERPNext. We should first browser and select the File/template which has data to be overwritten. "Overwrite" field should be checked since we are overwriting Item Group in the existing items.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_288.png"><br><br><h4>Step 4: Upload</h4><br>On clicking Upload and Import, if values as provided in the spreadsheet file is validated, it will be successfully updated in the item master.<br><br><img src="{{docs_base_path}}/assets/img/articles/$SGrab_289.png"><br><br>If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row, and then try importing/uploading file again. If validation fails for even one row, none of the records are imported/updated.<br>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
new file mode 100644
index 0000000..51fb637
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md

@@ -0,0 +1,31 @@
+<h1>Rename User</h1>
+
+<h1>Rename User</h1>
+
+Renaming functionality allows you to edit id of specific record. User is saved with person's email id. Only User with System Manager's role will be able to rename User IDs.
+
+Following are the steps to rename user id.
+
+#### Step 1: Go to User List
+
+Setup &gt; Users &gt; User
+
+Click to open user id you want to rename.
+
+#### Step 2: Go to Menu and click on Rename option. 
+
+When will you click on Rename option, pop up will open on same form. 
+
+<img src="{{docs_base_url}}/assets/img/articles/Selection_019811b13.png">
+
+
+#### Step 3: Enter new user ID and Press Rename Button.
+
+
+<img src="{{docs_base_url}}/assets/img/articles/Selection_021ac61a5.png"> 
+
+After successful renaming user can login to their ERPNext account with new ID.
+
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
new file mode 100644
index 0000000..1b7e4f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html

@@ -0,0 +1,74 @@
+<h1>Setting Up Dropbox Backups</h1>
+
+<h1>Setting Up Dropbox Backups</h1>
+
+<p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">If you wish to store your backups on a periodic basis,on Dropbox, you can do it directly through ERPNext.</p>
+<blockquote style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px; background-color: rgb(247, 247, 247);">
+    <p>Setup &gt; Manage 3rd Party Backups</p>
+</blockquote>
+<p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;"><strong>Step 1:</strong>&nbsp;Click on Integrations &gt; Backup Manager
+    <br>
+</p>
+<br>
+<div>
+    <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">In the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', select whether you wish to upload Daily, Weekly or Never.</p>
+    <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;"><strong>Step 2</strong> Click on&nbsp;<strong>Allow Dropbox Access</strong>.</p>
+    <blockquote style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px; background-color: rgb(247, 247, 247);">
+        <p>Tip: In future, if you wish to discontinue uploading backups to dropbox, then select the Never option.</p>
+    </blockquote>
+    <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-09-23 at 1.02.52 pm.png">
+</div>
+<div>&nbsp;
+    <br>
+</div>
+<div><b>
+    Step 3</b>
+    <br>
+</div>
+<div>
+    <p style="font-family: 'Noto Sans', sans-serif; line-height: 23.7999992370605px;">You need to login to your dropbox account, with your user id and password.</p>
+</div>
+<div>
+    <img src="{{docs_base_path}}/assets/img/articles/dropbox-access.png" style="line-height: 1.42857143;">&nbsp;
+    <br>
+</div>
+<div>
+    <br>
+    <hr>
+</div>
+<div>
+     <h3 style="font-family: 'Noto Sans', Helvetica, Arial, sans-serif; color: rgb(51, 51, 51);">Open Source Users</h3>
+
+</div>
+<div>
+    <br>
+</div>
+<div><b>Step 1: </b>Go to&nbsp;<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
+
+</div>
+<div><b>Step 2:</b> Create a new app</div>
+<div>
+    <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-11 at 11.22.38 pm.png">
+    <br>
+</div>
+<div><b>Step 3: </b>Fill in details for the app.</div>
+<div>
+    <img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-11 at 11.23.32 pm.png">
+    <br>
+</div>
+<div>
+    <br>
+</div>
+<div><b>Step 4: </b>After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,</div>
+<div>
+    <br>
+</div>
+<div><pre><code>{ 
+ "db_name": "demo", 
+ "db_password": "DZ1Idd55xJ9qvkHvUH", 
+ "dropbox_access_key": "ACCESSKEY", 
+ "dropbox_secret_key": "SECRECTKEY" 
+} </code></pre>
+    <br>
+</div>
+<div><b>Step 5: </b>Setup dropbox backups from the backup manager as shown in previous section.</div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
new file mode 100644
index 0000000..ff631b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md

@@ -0,0 +1,13 @@
+<!-- markdown -->
+
+If you have subscribed to any of the plans at [ERPNext](https://erpnext.com), you can have us serve your site on your custom domain (for example at http://example.com). This enables your website to be served on a custom domain.
+
+To enable this feature, you will first have to edit DNS settings of your domain as follows.
+
+- Make a CNAME record for a subdomain (www in most cases) to {youraccountname}.erpnext.com
+- If you want serve the website on a naked domain (ie. http://example.com), set a URL redirect to http://www.example.com and not a CNAME record. Making a CNAME record in this case can have unexpected consequences including you not being able to receive emails anymore.
+
+After you've setup the DNS records, you will have to raise a support ticket by sending an email to support@erpnext.com and we'll take it from there.
+
+**Note**: We do not support HTTPS on custom domains. HTTPS enables end to end encryption (from your browser to our server). Although not critical for the website but we strongly recommend against using the ERPNext app over an unencrypted protocol. To be safe always use the ERP at your erpext.com address.
+

diff --git a/erpnext/docs/user/manual/en/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
new file mode 100644
index 0000000..6b79b6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md

@@ -0,0 +1,43 @@
+Authorization Rule is a tool to define rule for conditional authorization.
+
+If you sales and purchase transactions of higher value or discount requires an authorization from senior manager, you can set authorization rule for it.
+
+To create new Authorization Rule, go to:
+
+> Setup > Customize > Authorization Rule
+
+Let's consider an example of Authorization Rule to learn better.
+
+Assume that Sales Manager needs to authorize Sales Orders, only if its Grand Total value exceeds 10000. If Sales Orer values is less than 10000, then even Sales User will be able to submit it. It means Submit permision of Sales User will be restricted only upto Sales Order of Grand Total less than 10000.
+
+**Step 1:**
+
+Open new Authorization Rule
+
+**Step 2:**
+
+Select Company and Transaction on which Authorization Rule will be applicable. This functionality is available for limited transactions only.
+
+**Step 3:**
+
+Select Based On. Authorization Rule will be applied based on value selected in this field.
+
+**Step 4:**
+
+Select Role on whom this Authorization Rule will be applicable. As per the example considered, Sales User will be selected as Application To (Role). To be more specific you can also select Applicale To User, if you wish to apply to rule for specific Sales User, and not all Sales User. Its okay to not select Sales User, as its not mandatory.
+
+**Step 5:**
+
+Select approvers Role. It will be Sales Manager role which if assigned to user, will be able to submit Sales Order above 10000. Also you can select specific Sales Manager, and then rule should be applicable for that User only. Selecting Approving User field is not mandatory.
+
+**Step 6:**
+
+Set Above Value. Given the exmaple, Above Value will be set as 10000.
+
+<img class="screenshot" alt="Authorization Rule" src="{{docs_base_url}}/assets/img/setup/auth-rule.png">
+
+If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
+
+>If you wish to restrict Sales User from submitting Sales Orders, then instead of creating Authorization Rule, you should remove submit previledge from Role Permission Manager for Sales User.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
new file mode 100644
index 0000000..2077842
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/bar-code.md

@@ -0,0 +1,50 @@
+A Barcode is a machine-readable code in the form of numbers and a pattern of
+parallel lines of varying widths, printed on a commodity and used especially
+for stock control.
+
+When you purchase an item from any store, you will notice a label with thin,
+black lines across it, along with a variation of different numbers. This label
+is then scanned by the cashier, and the item's description and price
+automatically comes up. This set of lines and numbers on the label are termed
+as bar-code.
+
+A bar-code machine scans the number from the label of an Item. To work with
+ERPNext and the bar-code mechanism, connect the bar-code machine to your
+operating hardware. Then go to ERPNext setup and activate bar-code by going to
+tools and clicking on 'hide / unhide features'. Under Materials, feature
+setup, check the box that says Item Barcode.
+
+> Setup > Customize > Hide/ Unhide Features > Item Barcode.
+
+#### Figure 1: Check the box 'Item Barcode'
+
+<img class="screenshot" alt="Barcode" src="{{docs_base_url}}/assets/img/setup/barcode-1.png">
+
+
+To start scanning with a bar-code, go to  
+
+> Accounts > Sales Invoice
+
+Under Item, click on Add new row. The item row will expand to show new fields.
+Place your cursor on the bar-code field and begin scanning. The bar-code will
+be updated in the field. Once the bar-code is entered, all the Item details
+will be fetched automatically by the system.
+
+For more ease, activate the POS view in ERPnext. The activation process is
+same as the bar-code activation. Go to Setup and click on 'hide/unhide
+features'. Check the 'POS view' box.
+
+Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
+
+  
+#### Figure 2: Check the box 'Is POS'
+
+<img class="screenshot" alt="Barcode" src="{{docs_base_url}}/assets/img/setup/barcode-2.png">
+
+
+Go to Item and click on Add new row.  
+
+The cursor will automatically be placed in the bar-code field. Thus you can
+immediately scan the bar-code and proceed with your operations.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
new file mode 100644
index 0000000..72f36c0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md

@@ -0,0 +1,22 @@
+Can be used in any Sales Transaction with **Sales Team** Table:
+
+    
+    
+    cur_frm.cscript.custom_validate = function(doc) {
+        // calculate incentives for each person on the deal
+        total_incentive = 0
+        $.each(wn.model.get("Sales Team", {parent:doc.name}), function(i, d) {
+    
+            // calculate incentive
+            var incentive_percent = 2;
+            if(doc.grand_total > 400) incentive_percent = 4;
+    
+            // actual incentive
+            d.incentives = flt(doc.grand_total) * incentive_percent / 100;
+            total_incentive += flt(d.incentives)
+        });
+    
+        doc.total_incentive = total_incentive;
+    }
+    
+

diff --git a/erpnext/docs/user/manual/en/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
new file mode 100644
index 0000000..e73aa25
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/company-setup.md

@@ -0,0 +1,10 @@
+Enter your company details to complete Company Setup. Mention the type of
+business, under Domain. You can enter manufacturing, retail, or services
+depending on the nature of your business activity. If you have more than one
+companies, create the setup under the Company Setup page.
+
+After clicking on Setup, go to Masters and click on Company.
+
+> Setup > Masters > Company > New Company
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
new file mode 100644
index 0000000..499ee32
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md

@@ -0,0 +1,17 @@
+# Bulk Renaming of Records
+
+You can rename a document if ERPNext (if it is allowed) by going to **Menu > Rename** in the document.
+
+Alternatively, if you want to rename a whole bunch of records, just go to:
+
+> Setup > Data > Rename Tool
+
+This tool will allow you to rename multiple records at the same time.
+
+### Example
+
+To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
+
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
new file mode 100644
index 0000000..e59ed21
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md

@@ -0,0 +1,110 @@
+The Data Import Tool is a great way to upload (or edit) bulk data, specially
+master data, into the system.
+
+To Open the data import tool, you either go to Setup or go to the Transaction
+you want to Import. If Data Import is allowed, you will see an Import Button:
+
+<img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
+
+The tool has two sections, one to download a template and the second to upload
+the data.
+
+(Note: Only those DocTypes are allowed for Import whose Document Type is
+"Master" or Allow Import property is set.)
+
+### 1\. Downloading The Template
+
+Data in ERPNext is stored in tables, much like a spreadsheet with columns and
+rows of data. Each entity in ERPNext can have multiple child tables associated
+with it too. The child tables are linked to the parent tables and are
+implemented where there are multiple values for any property. For example an
+Item can have multiple prices, An Invoice has multiple Items and so on.
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
+
+  * Click on the table you want to download or "All Tables"
+  * For bulk editing, you can click on "Download With Data"
+
+### 2\. Fill in the Template
+
+After downloading the template, open it in a spreadsheet application and fill
+in the data below the column headings.
+
+![Spreadsheet]({{docs_base_url}}/assets/old_images/erpnext/import-3.png)
+
+Then export your template or save it as a **Comma Separated Values** (CSV)
+file.
+
+![Spreadsheet]({{docs_base_url}}/assets/old_images/erpnext/import-4.png)
+
+### 3\. Upload the .csv File
+
+Finally attach the .csv file in the section. Click on the "Upload and Import"
+button.
+
+<img alt="Upload" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-3.png">
+
+#### Notes:
+
+1. Make sure that if your application allows, use encoding as UTF-8.
+1. Keep the ID column blank for new records.
+
+### 4\. Uploading All Tables (Main + Child)
+
+If you select all tables, you will get columns belonging to all the tables in
+one row separated by `~` columns.
+
+If you have multiple child rows then you must start a new main item on a new
+row. See the example:
+
+
+    Main Table                          ~   Child Table
+    Column 1    Column 2    Column 3    ~   Column 1    Column 2    Column 3
+    v11         v12         v13             c11         c12         c13
+                                            c14         c15         c17
+    v21         v22         v23             c21         c22         c23
+
+> To see how its done, enter a few records manually using forms and export
+"All Tables" with "Download with Data"
+
+### 5\. Overwriting
+
+ERPNext also allows you to overwrite all / certain columns. If you want to
+update certain columns, you can download the template with data. Remember to
+check on the “Overwrite” box before uploading.
+
+> Note: For child records, if you select Overwrite, it will delete all the
+child records of that parent.
+
+### 6\. Upload Limitations
+
+ERPNext restricts the amount of data you can upload in one file. Though the
+number may vary based on the type of data. It is usually safe to upload around
+1000 rows of a table at one go. If the system will not accept, then you will
+see an error.
+
+Why is this? Uploading a lot of data can cause your system to crash, specially
+if there are other users doing things in parallel. Hence ERPNext restricts the
+number of “writes” you can process in one request.
+
+***
+
+#### How to Attach files?
+
+When you open a form, on the right sidebar, you will see a section to attach
+files. Click on “Add” and select the file you want to attach. Click on
+“Upload” and you are set.
+
+#### What is a CSV file?
+
+A CSV (Comma Separated Value) file is a data file that you can upload into
+ERPNext to update various data. Any spreadsheet file from popular spreadsheet
+applications like MS Excel or Open Office Spreadsheet can be saved as a CSV
+file.
+
+If you are using Microsoft Excel and using non-English characters, make sure
+to save your file encoded as UTF-8. For older versions of Excel, there is no
+clear way of saving as UTF-8. So save your file as a CSV, then open it in
+Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.md b/erpnext/docs/user/manual/en/setting-up/data/index.md
new file mode 100644
index 0000000..60942fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.md

@@ -0,0 +1,7 @@
+# Data Management
+
+You can import, export bulk edit data from and to spreadsheet files (**.csv**) from the Data Import Export Tool. This tool will be very helpful initially to setup your data from other systems.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
new file mode 100644
index 0000000..998b5a2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/data/index.txt

@@ -0,0 +1,2 @@
+data-import-tool
+bulk-rename

diff --git a/erpnext/docs/user/manual/en/setting-up/email/.md b/erpnext/docs/user/manual/en/setting-up/email/.md
new file mode 100644
index 0000000..feb724f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md

@@ -0,0 +1,95 @@
+Emails are the nervous system of business communication and ERPNext has been
+designed to make good use of this.
+
+## Sending Emails
+
+You can email any document from the system, by clicking on the “Email” button
+on the right sidebar. Before that you will need to set your outgoing email
+settings (SMTP server).
+
+All emails sent from the system are added to the Communication table.
+
+> **Info:** What is SMTP? There are two types of email services, sending and
+receiving emails. Sending is done via a protocol called SMTP (Simple Mail
+Transfer Protocol) and the server (computer) that sends your email to its
+destination is called SMTP Server.
+
+
+Bulk Emails, especially those that are sent without consent (spam), are considered as bad behavior. While it may be okay to send emails to those who have “opted-in” to receive mails, it is very difficult for the internet community to know what is spam and what is allowed. To overcome this problem, most email servers share a black and white list of email senders. If your emails have been marked as spam, you will be blacklisted. So be careful. Many times, it may be a good idea to send email via whitelisted services also known as SMTP relay services which are paid services.These
+services will block you from sending spam while ensuring that most of your email does not go in the spam folder. There are many such services available like SendGrid and SMTP.com.
+
+To setup your outgoing mails, go to
+
+> Setup > Outgoing Email Settings
+
+#### Figure 1: Set up outgoing mail server.
+
+![Email Settings]({{docs_base_url}}/assets/old_images/erpnext/email-settings1.png)
+
+Set your outgoing mail server settings here. These are the same settings you
+would use in your Outlook, Thunderbird, Apple Mail or other such email
+applications. If you are not sure, get in touch with your email service
+provider.
+
+> **Tip:** If you are using EPRNext hosted service, keep the first section
+blank. Emails will still be sent from your email id, but via our SMTP relay
+service.
+
+### Creating Issues from Incoming Emails
+
+A very useful email integration is to sync the incoming emails from support
+inbox into Issue, so that you can track, assign and monitor support
+issues.
+
+> **Case Study:** Here at ERPNext, we have regularly tracked incoming support
+issues via email at “support@erpnext.com”. At the time of writing we had
+answered more than 3000 tickets via this system.
+
+To setup your Support integration, go to:
+
+> Setup > Support Email Settings
+
+#### Figure 2: Setup support Integration
+
+![Email Settings]({{docs_base_url}}/assets/old_images/erpnext/email-settings2.png)
+
+To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3
+is a way of extracting emails from your mailbox. It should be fairly easy to
+find out what your POP3 settings are. If you have problems, contact your email
+service provider). If you want to setup an auto reply, check on the “Send
+Autoreply” box and whenever someone sends an email, an autoreply will be sent.
+Add a custom signature which you want to send with your replies.
+
+### Setting Auto-notification on Documents
+
+ERPNext allows you to automatically email documents on “Submission” to the
+contact mentioned in the document. To set this up, go to:
+
+> Setup > Tools > Enable / Disable Notifications.
+
+#### Figure 3: Set Auto Notification
+
+![Auto Notification]({{docs_base_url}}/assets/old_images/erpnext/auto-notification.png)
+
+Check on the transactions you want to send via email directly on Submission
+and add a custom message if you want on these documents.
+
+### Email Digests
+
+Email Digests allow you to get regular updates about your sales, expenses and
+other critical numbers directly in your Inbox.
+
+Set your frequency, check all the items you want to receive in your weekly
+update and select the user ids whom you want to send the Digest to.
+
+Email Digests are a great way for top managers to keep track of the big
+numbers like “Sales Booked” or “Amount Collected” or “Invoices Raised” etc.
+
+To setup Email Digests, go to:
+
+> Setup > Email Digest > New Email Digest
+
+#### Figure 4: Set up Email Digest
+
+![Email Digest]({{docs_base_url}}/assets/old_images/erpnext/email-digest.png)
+

diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
new file mode 100644
index 0000000..4392bf4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md

@@ -0,0 +1,39 @@
+# Email Accounts
+
+You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be atleast one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us.
+
+> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like GMail will restrict you to a limited number of emails per day.
+
+### Default Email Accounts
+
+ERPNext will create templates for a bunch of email accounts by default. Not all of them are enabled. To enable them, you must set your account details.
+
+There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
+
+<img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-account-list.png">
+
+### Outgoing Email Accounts
+
+All emails sent from the system, either by the user to a contact or notifications or transaction emails, will be sent from an Outgoing Email Account.
+
+To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you.
+
+<img class="screenshot" alt="Outgoing EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-sending.png">
+
+### Incoming Email Accounts
+
+To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you.
+
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-incoming.png">
+
+### How ERPNext handles replies
+
+In ERPNext when you send an email to a contact like a customer, the sender will be the user who sent the email. In the **Reply-To** property, the email id will be of the default incoming account (like `replies@yourcompany.com`). ERPNext will automatically extract these emails from the incoming account and tag it to the relvant communication
+
+### Notification for unreplied messages
+
+If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
+
+<img class="screenshot" alt="Incoming EMail" src="{{docs_base_url}}/assets/img/setup/email/email-account-unreplied.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
new file mode 100644
index 0000000..f4cccd3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md

@@ -0,0 +1,41 @@
+# Email Alerts
+
+You can configure various email alerts in your system to remind you of important activities such as:
+
+1. Completion date of a Task.
+1. Expected Delivery Date of a Sales Order.
+1. Expected Payment Date.
+1. Reminder of followup.
+1. If an Order greater than a particular value is received or sent.
+1. Expiry notification for a Contract.
+1. Completion / Status change of a Task.
+
+For this, you need to setup an Email Alert.
+
+> Setup > Email > Email Alert
+
+### Setting Up An Alert
+
+To setup an Email Alert:
+
+1. Select which Document Type you want watch changes on
+1. Define what events you want to watch. Events are:
+	1. New: When a new document of the selected type is made.
+	2. Save / Submit / Cancel: When a document of the selected type is saved, submitted, cancelled.
+	3. Value Change: When a particular value in the selected type changes.
+	4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations.
+1. Set additional conditions if you want.
+1. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids.
+1. Compose the message
+
+---
+
+### Example
+
+1. Defining the Criteria
+    <img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/email/email-alert-1.png">
+
+1. Setting the Recipients and Message
+    <img class="screenshot" alt="Set Message" src="{{docs_base_url}}/assets/img/setup/email/email-alert-2.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
new file mode 100644
index 0000000..5fa836e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md

@@ -0,0 +1,17 @@
+# Email Digest
+
+Email Digests allow you to get regular updates about your sales, expenses and other critical numbers directly in your Inbox.
+
+Email Digests are a great way for top managers to keep track of the big numbers like “Sales Booked” or “Amount Collected” or “Invoices Raised” etc.
+
+To set up Email Digest, go to:
+
+> Setup > Email > Email Digest
+
+## Example
+
+Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to.
+
+<img class="screenshot" alt="Email Digest" src="{{docs_base_url}}/assets/img/setup/email/email-digest.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.md b/erpnext/docs/user/manual/en/setting-up/email/index.md
new file mode 100644
index 0000000..74ef1cc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.md

@@ -0,0 +1,7 @@
+# Email
+
+Email is at the heart of electronic communication and ERPNext is deeply integrated with Email. You can create multiple email accounts, automatically create transactions like Lead, Issue from incoming emails, send documents to your contacts via ERPnext. You can also setup email digests and email alerts to send you reminders.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
new file mode 100644
index 0000000..86e75c2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt

@@ -0,0 +1,5 @@
+email-account
+email-alerts
+email-digest
+sending-email
+setting-up-email

diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
new file mode 100644
index 0000000..504c76d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md

@@ -0,0 +1,9 @@
+# Sending Email from any Document
+
+In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
+
+**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/index.md b/erpnext/docs/user/manual/en/setting-up/index.md
new file mode 100644
index 0000000..9f5de0f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/index.md

@@ -0,0 +1,13 @@
+# Setting Up
+
+Setting up an ERP system is like starting your business all over again,
+although in the virtual world. Thankfully it is not as hard as the real
+business and you get to do a trial too!
+
+Implementation requires the implementer to take a step back and set aside some
+time to do this right. This is usually not a couple-of-hours, after-work kind
+of a project.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/index.txt b/erpnext/docs/user/manual/en/setting-up/index.txt
new file mode 100644
index 0000000..9237825
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/index.txt

@@ -0,0 +1,19 @@
+setup-wizard
+users-and-permissions
+settings
+data
+email
+print
+setting-up-taxes
+pos-setting
+price-lists
+authorization-rule
+sms-setting
+stock-reconciliation-for-non-serialized-item
+territory
+third-party-backups
+workflows
+bar-code
+company-setup
+calculate-incentive-for-sales-team
+articles

diff --git a/erpnext/docs/user/manual/en/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
new file mode 100644
index 0000000..9bfd819
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md

@@ -0,0 +1,23 @@
+# Point of Sale Setting
+
+POS includes advanced features to cater to different functionality, such as
+inventory management, CRM, financials, warehousing, etc., all built into the
+POS software. Prior to the modern POS, all of these functions were done
+independently and required the manual re-keying of information, which could
+lead to entry errors.
+
+If you are in retail operations, you want your Point of Sale to be as quick
+and efficient as possible. To do this, you can create a POS Setting for a user
+from:
+
+> Accounts > Setup > Point-of-Sale Setting
+
+Set default values as defined.
+
+<img class="screenshot" alt="POS Setting" src="{{docs_base_url}}/assets/img/pos-setting/pos-setting.png">
+
+> Important : If you specify a particular User, the POS setting will be
+applied only to that User. If the User option is left blank, the setting will
+be set for all users. To understand POS in detail visit [Point of Sale]({{docs_base_url}}/user/manual/en/accounts/point-of-sale-pos-invoice.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
new file mode 100644
index 0000000..156e66d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md

@@ -0,0 +1,21 @@
+ERPNext lets you maintain multiple selling and buying prices for an Item using Price Lists. A PriceList is a name you can give to a set of Item prices. 
+
+Why would you want Price Lists? You have different prices for different zones (based on the shipping costs), for different currencies etc.
+
+An Item can have multiple prices based on customer, currency, region, shipping cost etc, which can be stored as different rate plans. In ERPNext, you are required to store all the lists separately. Buying Price List is different from Selling Price List and thus is stored separately.
+
+You can create new Price List
+
+> Selling/Buying/Stock  > Setup > Price List >> New
+
+<img class="screenshot" alt="Price List" src="{{docs_base_url}}/assets/img/price-list/price-list.png">
+
+* These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price.
+
+* To disable specific Price List, uncheck Enabled field in it. Disabled Price List will not be availale for selection in the Sales and Purchase transactions.
+
+* Standard Buying and Selling Price List are created by default.
+
+To disable specific Price List, uncheck Enabled field in it. Disabled Price List will not be availale for selection in the Sales and Purchase transactions.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
new file mode 100644
index 0000000..c2b9bb7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md

@@ -0,0 +1,31 @@
+# Address Template
+
+Each region has its own way of defining Addresses. To manage multiple address formats for your Documents (like Quotation, Purchase Invoice etc.), you can create country-wise **Address Templates**.
+
+> Setup > Printing and Branding > Address Template
+
+A default Address Template is created when you setup the system. You can either edit or update it or create a new template.
+
+One template is default and will apply to all countries that do not have an specific template.
+
+#### Template
+
+The templating engine is based on HTML and the [Jinja Templating](http://jinja.pocoo.org/docs/templates/) system and all the fields (including Custom Fields) will be available for creating the template.
+
+Here is the default template:
+
+	{{ address_line1 }}<br>
+	{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+	{{ city }}<br>
+	{% if state %}{{ state }}<br>{% endif -%}
+	{% if pincode %}PIN:  {{ pincode }}<br>{% endif -%}
+	{{ country }}<br>
+	{% if phone %}Phone: {{ phone }}<br>{% endif -%}
+	{% if fax %}Fax: {{ fax }}<br>{% endif -%}
+	{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
+
+### Example
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/address-format.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.md b/erpnext/docs/user/manual/en/setting-up/print/index.md
new file mode 100644
index 0000000..1204cbc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.md

@@ -0,0 +1,7 @@
+# Printing and Branding
+
+Documents that you send to your customers carry your brand and image and they must be tailored to your requirements. ERPNext gives you many options so that you can set your oraganization's branding in your documents.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
new file mode 100644
index 0000000..0ddb217
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt

@@ -0,0 +1,6 @@
+print-settings
+print-format-builder
+print-headings
+letter-head
+address-template
+terms-and-conditions

diff --git a/erpnext/docs/user/manual/en/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
new file mode 100644
index 0000000..d3c24f2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md

@@ -0,0 +1,23 @@
+# Letter Heads
+
+You can manage multiple letter heads in ERPNext. In a letter head you can:
+
+  * Create an image with your logo, brand and other information that you want to put on your letter head.
+  * Attach the image in your Letter Head record by clicking on image icon to automatically generate the HTML required for this Letter Head.
+  * If you want to make this the default letter head, click on “Is Default”.
+
+Your letter head will now appear in all Prints and Emails of documents.
+
+You can create / manage Letter Heads from:
+
+> Setup > Printing > Letter Head > New Letter Head
+
+### Example
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head.png">
+
+This is how the letter head looks in a document print:
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/letter-head-1.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
new file mode 100644
index 0000000..f979927
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md

@@ -0,0 +1,37 @@
+# Print Format Builder
+
+The Print Format Builder helps you quickly make a simple customized Print Format by dragging and dropping data fields and adding custom text or HTML.
+
+You can create a new Print Format either by going to:
+
+> Setup > Printing and Branding > Print Format Builder
+
+or Open the document for which you want to make a print format. Click the Printer icon, or go to Menu > Print and click on the **Edit** button. Note: You must have System Manager permission to do this.
+
+### Step 1: Make a new Format
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-1.gif">
+
+### Step 2: Add a new Field
+
+To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings <i class="octicon octicon-gear"></i> icon.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-2.gif">
+
+### Step 3
+
+To remove a field, just drag it back into the fields sidebar.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-3.gif">
+
+### Step 4
+
+You can add customized text, HTML in your print format, just add the **Custom HTML** field (in dark colour) and add it to the the place where you want to add the text.
+
+Then click on **Edit HTML** to edit your content.
+
+<img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/print/print-format-builder-4.gif">
+
+To save your format, just click on the **Save** button on the top.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
new file mode 100644
index 0000000..98fbf53
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md

@@ -0,0 +1,17 @@
+Print Headings are the names which you can give to your sales invoices,
+supplier quotations etc. You can create a list of names for different business
+communications.
+
+You can create print headings from :
+
+> Setup > Printing > Print Heading > New Print Heading
+
+#### Figure 1: Save Print Heading
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading.png">
+
+Example of a change in print heading is shown below:
+
+<img class="screenshot" alt="Print Heading" src="{{docs_base_url}}/assets/img/setup/print/print-heading-1.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
new file mode 100644
index 0000000..cdf3c54
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md

@@ -0,0 +1,11 @@
+# Print Settings
+
+In Print Settings you can set your default printing preferences like Paper Size, default text size, whether you want output as PDF or HTML etc.
+
+To edit print settings, go to:
+
+> Setup > Printing and Branding > Print Settings
+
+<img class="screenshot" alt="Print Settings" src="{{docs_base_url}}/assets/img/setup/print/print-settings.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
new file mode 100644
index 0000000..8c939d0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md

@@ -0,0 +1,25 @@
+Terms and conditions are the general and special arrangements, provisions, requirements, rules, specifications, and standards that a company follows. These specifications are an integral part of an agreement or contract that the company gets into with its customers, suppliers or partners.
+
+### 1. Make a new Terms and Conditions
+
+To setup Terms and Condition master, go to:
+
+`Selling > Terms and Condition > New`
+
+<img class="screenshot" alt="Terms and Conditions" src="{{docs_base_url}}/assets/img/setup/print/terms-1.png">
+
+### 2. Editing in HTML
+
+Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML.
+
+<img class="screenshot" alt="Terms and Conditions, Edit HTML" src="{{docs_base_url}}/assets/img/setup/print/terms-2.png">
+
+This also allows you to use Terms and Condition master for footer, which otherwise is not availale in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format.
+
+### 3. Select in Transaction
+
+In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master.
+
+<img class="screenshot" alt="Terms and Conditions, Select in document" src="{{docs_base_url}}/assets/img/setup/print/terms-3.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
new file mode 100644
index 0000000..a3c11ab
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md

@@ -0,0 +1,99 @@
+One of the primary motivator for compulsory use of accounting tools is
+calculation of Taxes. You may or may not make money but your government will
+(to help your country be safe and prosperous). And if you don’t calculate your
+taxes correctly, they get very unhappy. Ok, philosophy aside, ERPNext allows
+you to make configurable tax templates that you can apply to your sales or
+purchase.
+
+### Tax Accounts
+
+For Tax Accounts that you want to use in the tax templates, you must go to
+Chart of Accounts and mention them as type “Tax” in your Chart of Item.
+
+## Item Tax
+
+If some of your Items require different tax rates as compared to others,
+mention them in the Item tax table. Even if you have selected your sales and
+purchase taxes as default tax rates, the system will pull the Item tax rate
+for calculations. Item tax will get preference over other sales or purchase
+taxes. However, if you wish to apply default sales and purchase taxes, do not
+mention item tax rates in the Item master. The system will then select the
+sales or purchase tax rate specified by you as default rates.
+
+Item Tax table can be found as a section within the Item Master document.
+
+<img class="screenshot" alt="Item Tax" src="{{docs_base_url}}/assets/img/taxes/item-tax.png">
+
+  * **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
+
+<img class="screenshot" alt="Inclusive Tax" src="{{docs_base_url}}/assets/img/taxes/inclusive-tax.png">
+
+  * **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account
+  * **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table.
+
+## Sales Taxes and Charges Template
+
+You must usually collect taxes from your Customer and pay them to the
+government. At times, you may have to pay multiple taxes to multiple
+government bodies like local government, state or provincial and federal or
+central government.
+
+The way ERPNext sets up taxes is via templates. Other types of charges that
+may apply to your invoices (like shipping, insurance etc.) can also be
+configured as taxes.
+
+Select template and modify as per your need.
+
+To create a new sales tax template called Sales Taxes and Charges Template, you
+have to go to:
+
+> Setup > Accounts > Sales Taxes and Charge Master
+
+<img class="screenshot" alt="Sales Tax Master" src="{{docs_base_url}}/assets/img/taxes/sales-tax-master.png">
+
+When you create a new master, you will have to add a row for each tax type.
+
+The tax rate you define here will be the standard tax rate for all Items. If
+there are Items that have different rates, they must be added in the Item Tax
+table in the Item master.
+
+In each row, you have to mention:
+
+  * Calculation Type:
+
+    * On Net Total : This can be on net total (total amount without taxes).
+    * On Previous Row Total/Amount: You can apply taxes on previous row total / amount. If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total. Previous row amount means a particular tax amount.And, previous row total means net total plus taxes applied up to that row. In the Enter Row Field, mention row number on which you want to apply the current tax. If you want to apply the tax on the 3rd row, mention "3" in the Enter Row field.
+
+    * Actual : Enter as per actual amount in rate column.
+
+  * Account Head: The Account ledger under which this tax will be booked
+
+  * Cost Center: If the tax / charge is an income (like shipping) it needs to be booked against - a Cost Center.
+  * Description: Description of the tax (that will be printed in invoices / quotes).
+  * Rate: Tax rate.
+  * Amount: Tax amount.
+  * Total: Cumulative total to this point.
+  * Enter Row: If based on "Previous Row Total" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+  * Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the rate in your main item table. This is useful when you want to give a flat price (inclusive of all taxes) to your customers.
+
+Once you setup your template, you can select this in your sales transactions.
+
+## Purchase Taxes and Charges Template
+
+Similar to your Sales Taxes and Charges Template is the Purchase Taxes and
+Charges Master.
+
+This is the tax template that you can use in your Purchase Orders and Purchase
+Invoices. If you have value added taxes (VAT), where you pay to the government
+the difference between your incoming and outgoing taxes, you can select the
+same Account that you use for sales taxes.
+
+The columns in this table are similar to the Sales Taxes and Charges Template
+with the difference as follows:
+
+Consider Tax or Charge for: In this section you can specify if the tax /
+charge is only for valuation (not a part of total) or only for total (does not
+add value to the item) or for both.
+
+{next}
+

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
new file mode 100644
index 0000000..412572a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md

@@ -0,0 +1,11 @@
+# Global Defaults
+
+You can set default values for your documents from Global Defaults
+
+> Setup > Settings > Global Defaults
+
+Whenever a new document is created, these values will be set as default.
+
+<img class="screenshot" alt="Global Defaults" src="{{docs_base_url}}/assets/img/setup/settings/global-defaults.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/index.md b/erpnext/docs/user/manual/en/setting-up/settings/index.md
new file mode 100644
index 0000000..4cba991
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/index.md

@@ -0,0 +1,7 @@
+# Settings
+
+In `Setup > Settings` you will find ways to manage your system settings like defaults, number and currency formats, global session timeout settings etc.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/index.txt b/erpnext/docs/user/manual/en/setting-up/settings/index.txt
new file mode 100644
index 0000000..e33aedc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/index.txt

@@ -0,0 +1,4 @@
+system-settings
+module-settings
+naming-series
+global-defaults

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
new file mode 100644
index 0000000..ecfb282
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md

@@ -0,0 +1,15 @@
+# Show or Hide Modules
+
+You can globally switch off certain desktop module via:
+
+> Setup > Settings > Show or Hide Modules
+
+For example if you are in the services business, you want to hide the Manufacturing Module, you can do this via **Show or Hide Modules**
+
+### Example
+
+Check / uncheck the items to show / hide.
+
+<img class="screenshot" alt="Module Settings" src="{{docs_base_url}}/assets/img/setup/settings/show-hide-modules.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
new file mode 100644
index 0000000..df7de6d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md

@@ -0,0 +1,48 @@
+# Naming Series
+
+### 1. Introduction
+
+Data records are broadly classified as “Master” or “Transaction”. A master
+record is a record that has a “name”, for example a Customer, Item, Supplier,
+Employee etc. A Transaction is a record that has a “number”. Examples of
+transactions include Sales Invoices, Quotations etc. You make transactions
+against a number of master records.
+
+ERPNext allows you to make prefixes to your transactions, with each prefix
+forming its own series. For example a series with prefix INV12 will have
+numbers INV120001, INV120002 and so on.
+
+You can have multiple series for all your transactions. It is common to have a
+separate series for each financial year. For example in Sales Invoice you
+could have:
+
+  * INV120001
+  * INV120002
+  * INV-A-120002
+
+etc. You could also have a separate series for each type of Customer or for
+each of your retail outlets.
+
+### 2. Managing Naming Series for Documents
+
+To setup a series, go to:
+
+> Setup > Tools > Update Numbering Series
+
+In this form,
+
+  1. Select the transaction for which you want to make the series The system will update the current series in the text box.
+  2. Edit the series as required with unique prefixes for each series. Each prefix must be on a new line.
+  3. The first prefix will be the default prefix. If you want the user to explicitly select a series instead of the default one, check the “User must always select” check box.
+
+You can also update the starting point of a series by entering the series
+name and the starting point in the “Update Series” section.
+
+### 3. Example
+
+See how to set the naming series
+
+<img class="screenshot" alt="Naming Series" src="{{docs_base_url}}/assets/img/setup/settings/naming-series.gif">
+
+{next}
+

diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
new file mode 100644
index 0000000..053b4f1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md

@@ -0,0 +1,11 @@
+# System Settings
+
+You can localize ERPNext to use particular timezone, date, number or currency format and also set global session expiry via System Settings.
+
+To open System Settings, go to:
+
+> Setup > Settings > System Settings
+
+<img class="screenshot" alt="System Settings" src="{{docs_base_url}}/assets/img/setup/settings/system-settings.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
new file mode 100644
index 0000000..244d893
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md

@@ -0,0 +1,7 @@
+# Setup Wizard
+
+The Setup Wizard helps you quickly setup your ERPnext by helping you create your company, Items, Customer, Suppliers and will also setup a basic website with this data.
+
+Here is a quick overview of the steps:
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
new file mode 100644
index 0000000..74f6a42
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt

@@ -0,0 +1,10 @@
+step-1-language
+step-2-currency-and-timezone
+step-3-user-details
+step-4-company-details
+step-5-letterhead-and-logo
+step-6-add-users
+step-7-tax-details
+step-8-customer-names
+step-9-suppliers
+step-10-item

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
new file mode 100644
index 0000000..00219fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md

@@ -0,0 +1,11 @@
+# Step 1: Language
+
+Select your language. ERPNext is available in more than 20 languages.
+
+<img alt="Language" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-1.png">
+
+---
+
+Translations are contributed by the ERPNext Community. If you want to contribute, [please checkout the translator portal](https://translate.erpnext.com).
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
new file mode 100644
index 0000000..bc71b98
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md

@@ -0,0 +1,16 @@
+# Step 9: Item Names
+
+In this final step, please enter the names of the Items you buy or sell.
+
+<img alt="Add Items" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png">
+
+Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later.
+
+---
+
+## Thats it!
+
+Once you are done with the setup wizard you will see the familiar desktop page.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
new file mode 100644
index 0000000..5dc1648
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md

@@ -0,0 +1,13 @@
+# Step 2: Currency and Timezone
+
+Set your country name, currency and timezone.
+
+<img alt="Currency" class="screenshot" src="{{docs_base_url}}/assets/img/setup-wizard/step-2.png">
+
+---
+
+### Default Currency
+
+For most countries, your currency and timezone will be automatically set
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
new file mode 100644
index 0000000..b9eff18
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md

@@ -0,0 +1,12 @@
+# Step 3: User Details
+
+Enter Users Profile Details like Name, User ID and preferred password.
+
+<img alt="User" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png">
+
+---
+
+Note: Add your own photograph, not your company's
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
new file mode 100644
index 0000000..f88d31c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md

@@ -0,0 +1,22 @@
+# Step 4: Company Details
+
+Enter Company Details like Name, Abbreviation and Financial Year Details.
+
+<img alt="Company Details" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png">
+
+---
+
+### Company Abbreviation
+
+These will be appened to your **Account** Heads, for example if your abbreviation is **WP**, then your Sales account will be **Sales - WPL**
+
+For Example: East Wind will be abbreviated as EW. Shades of Green will be abbreviated as SOG. In case you wish to give your own abbreviation, you can do so. The text field allows any type of text.
+
+### Financial Year
+
+Any annual period at the end of which a firm's accounts are made up is called a Financial Year. Some countries have their account year starting from 1st January and some 1st April.
+
+The end date will be set automatically
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
new file mode 100644
index 0000000..8694960
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md

@@ -0,0 +1,24 @@
+# Step 5: Letterhead and Logo
+
+Attach Company Letterhead and Company Logo.
+
+<img alt="Company Logo and Letterhead" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png">
+
+---
+
+### Letterhead
+
+A letterhead is the heading at the top of a sheet of letter paper (stationery). That heading usually consists of a name and an address, and a logo or corporate design.
+
+Click on the box ‘Attach Letterhead’ . Select the image file from the place it is stored and click enter.
+
+You may choose to skip this step if your letterhead is not ready.
+
+To select letterhead later through the setup module, read [Letter-head]({{docs_base_url}}/user/manual/en/setting-up/print/letter-head.html)
+
+#### To "attach as web-link"
+
+For any attachments in ERPNext, you can also attach as a web-link. If you are using other tools like Dropbox or Google Docs to manage your files, you can set its public link.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
new file mode 100644
index 0000000..7e8f083
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md

@@ -0,0 +1,8 @@
+# Step 6: Add Users
+
+Add other users and assign them roles based on their job responsibilities.
+
+<img alt="Users" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
new file mode 100644
index 0000000..1d353b6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md

@@ -0,0 +1,22 @@
+# Step 6: Tax Details
+
+Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
+
+<img alt="Tax Details" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png">
+
+Just set the tax name and the standard percentage levied.
+
+---
+
+Some examples of tax types are given below.
+
+#### VAT
+
+A value added tax (VAT) is a form of consumption tax. From the perspective of the buyer, it is a tax on the purchase price. From that of the seller, it is a tax only on the value added to a product, material, or a service. From an accounting point of view, by the stage of its manufacture or distribution. The manufacturer remits to the government the difference between these two amounts, and retains the rest for themselves to offset the taxes they had previously paid on the inputs.
+
+The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
+
+To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
new file mode 100644
index 0000000..cde4648
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md

@@ -0,0 +1,23 @@
+# Step 7: Customers
+
+Enter your Customer names and the contact person from that organisation.
+
+
+<img alt="Customers" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png">
+
+---
+
+#### Difference between a customer name and a contact name
+
+A customer name is the name of the organisation and a contact name is the name of the user who is operating the ERPNext system.
+
+For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
+
+Customer Name: American Power Mills
+
+Contact Name:  Shiv Agarwal
+
+To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/manual/en/CRM/customer.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md
new file mode 100644
index 0000000..0e4b96a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md

@@ -0,0 +1,12 @@
+# Step 8: Suppliers
+
+Enter a few of your Suppliers' names.
+
+<img alt="Suppliers" class="screenshot"
+src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png">
+
+---
+
+To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier-master.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
new file mode 100644
index 0000000..4871ed1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md

@@ -0,0 +1,40 @@
+# SMS Setting
+
+To integrate SMS in ERPNext, approach a SMS Gateway Provider who provides HTTP
+API. They will create an account for you and will provide an unique username
+and password.
+
+To configure SMS Settings in ERPNext, find out their HTTP API (a document
+which describes the method of accessing their SMS interface from 3rd party
+applications). In this document, you will get an URL which is used to send the
+SMS using HTTP request. Using this URL, you can configure SMS Settings in
+ERPNext.
+
+Example URL:  
+
+    
+    
+    http://instant.smses.com/web2sms.php?username=<USERNAME>&password;=<PASSWORD>&to;=<MOBILENUMBER>&sender;=<SENDERID>&message;=<MESSAGE>
+    
+
+![SMS Settings]({{docs_base_url}}/assets/old_images/erpnext/sms-setting2.jpg)
+
+> Note: the string up to the "?" is the SMS Gateway URL
+
+Example:
+
+    
+    
+    http://instant.smses.com/web2sms.php?username=abcd&password;=abcd&to;=9900XXXXXX&sender;
+    =DEMO&message;=THIS+IS+A+TEST+SMS
+
+The above URL will send SMS from account abcd to mobile number 9900XXXXXX with
+sender ID as DEMO with text message as "THIS IS A TEST SMS"
+
+Note that some parameters in the URL are static.You will get static values
+from your SMS Provider like username, password etc. These static values should
+be entered in the Static Parameters table.
+
+![SMS Setting]({{docs_base_url}}/assets/old_images/erpnext/sms-settings1.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
new file mode 100644
index 0000000..bd46bf1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md

@@ -0,0 +1,154 @@
+Stock Reconciliation is the process of counting and evaluating stock-in-trade,
+usually at an organisations year end in order to value the total stock for
+preparation of the accounts. In this process actual physical stocks are
+checked and recorded in the system. The actual stocks and the stock in the system should be in agreement and accurate. If they are not, you can
+use the stock reconciliation tool to reconcile stock balance and value with actuals.
+
+**Difference between Serialized and Non-serialized Items.**
+
+A serial number is a unique, identifying number or group of numbers and
+letters assigned to an individual Item. Serialized items are generally high value items for which you need to warranty's and service agreements. Mostly items as machinery, equipments and high-value electronics (computers, printers etc.) are serialized.
+
+Non Serialized items are generally fast moving and low value item, hence doesn't need tracking for each unit. Items like screw, cotton waste, other consumables, stationary products can be categorized as non-serialized.
+
+> Stock Reconciliation option is available for the non serialized Items only. For seriazlized and batch items, you should create Material Receipt entry in Stock Entry form.
+
+### Opening Stocks
+
+You can upload your opening stock balance in the system using Stock Reconciliation.
+Stock Reconciliation will update your stock for a given Item on a given date
+for a given Warehouse to the given quantity.
+
+To perform Stock Reconciliation, go to:
+
+> Stock > Tools > Stock Reconciliation > New
+
+#### Step 1: Download Template
+
+A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option.
+
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-1.png">
+
+#### Step 2: Enter Data in csv file.
+
+![Stock Reco Data]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-data.png)
+
+The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
+
+#### **Step 3: Upload file and Enter Values in Stock Reconciliation Form
+
+<img class="screenshot" alt="Stock Reconciliation" src="{{docs_base_url}}/assets/img/setup/stock-recon-2.png">
+
+**Posting Date**
+
+Posting Date will be date when you want uploaded stock to reflect in the report. Posting Date selection option allows you making back dated stock reconcialiation as well.
+
+**Difference Account:**
+
+When making Stock Reconciliation for updating **opening balance**, then you should select Balance Sheet account. By default **Temporary Opening** is created in the chart of account which can be used here.
+
+If you are making Stock Reconciliation for **correcting stock level or valuation of an item**, then you can select any expense account in which you would want difference amount (derived from difference of valuation of item) should be booked. If Expense Account is selected as Difference Account, you will also need to select Cost Center as it is mandatory with any income and expense account selection.
+
+After reviewing saved Reconciliation Data, submit the Stock Reconciliation. On
+successful submission, the data will be updated in the system. To check the
+submitted data go to stock and view stock level report.
+
+Note: While filling the valuation rates of Items, if you wish to find out the
+valuation rates of all items, you can go to stock and click on Item Prices
+report. The report will show you all types of rates.
+
+#### Step 4: Review the reconciliation data
+
+![Stock Reco Review]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-upload.png)
+
+### Stock Ledger Report
+
+![Stock Reco Ledger]({{docs_base_url}}/assets/old_images/erpnext/stock-reco-ledger.png)
+
+**How Stock Reconciliation Works**
+
+Stock Reconciliation on a specific date means balance quantity frozen for that item on reconciliation date, and shall not get affected due to stock entries made before its date.
+
+Example:
+
+Item Code: ABC001
+Warehouse: Mumbai
+Let's assume stock as on 10th January is 100 nos.
+Stock Reconciliation is made on 12th January to bring stock balance to 150 nos.
+Existing Stock Ledger:
+<html>
+<style>
+    td {
+    padding:5px 10px 5px 5px;
+    };
+    img {
+    align:center;
+    };
+	table, th, td {
+    border: 1px solid black;
+    border-collapse: collapse;
+	}
+</style>
+ <table border="1" cellspacing="0px">
+            <tbody>
+                <tr align="center" bgcolor="#EEE">
+                    <td><b>Posting Date</b>
+                    </td>
+                    <td><b>Qty</b>
+                    </td>
+                    <td><b>Balance Qty</b>
+                    </td>
+                    <td><b>Voucher Type</b>
+                    </td>
+                </tr>
+                <tr>
+                    <td>10/01/2014</td>
+                    <td align="center">100</td>
+                    <td>100&nbsp;</td>
+                    <td>Purchase Receipt</td>
+                </tr>
+                <tr>
+                    <td>12/01/2014</td>
+                    <td align="center">50</td>
+                    <td>150</td>
+                    <td>Stock Reconciliation</td>
+                </tr>
+            </tbody>
+        </table>
+</html>
+Let's assume Purchase Receipt entry is made on 5th January, 2014, that is on date before Stock Reconciliation entry.
+<html>
+	<table border="1" cellspacing="0px">
+        <tbody>
+            <tr align="center" bgcolor="#EEE">
+                <td><b>Posting Date</b></td>
+                <td><b>Qty</b></td>
+                <td><b>Balance Qty</b></td>
+                <td><b>Voucher Type</b></td>
+            </tr>
+            <tr>
+                <td>05/01/2014</td>
+                <td align="center">20</td>
+                <td style="text-align: center;">20</td>
+                <td>Purchase Receipt</td>
+            </tr>
+            <tr>
+                <td>10/01/2014</td>
+                <td align="center">100</td>
+                <td style="text-align: center;">120</td>
+                <td>Purchase Receipt</td>
+            </tr>
+            <tr>
+                <td>12/01/2014</td>
+                <td align="center"><br></td>
+                <td style="text-align: center;"><b>150</b></td>
+                <td>Stock Reconciliation<br></td>
+            </tr>
+        </tbody>
+	</table>
+</html>
+As per the updated logic, irrespective of receipt/issue entry made for an item, balance quantity as set via Stock Reconciliation will not be affected.
+
+> Check out the video tutorial at https://www.youtube.com/watch?v=0yPgrtfeCTs
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
new file mode 100644
index 0000000..3a1abfd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md

@@ -0,0 +1,10 @@
+If your business operates in multiple Territories (could be countries, states
+or cities) it is usually a great idea to build your structure in the system.
+Once you group your Customers by Territories, you can set annual targets for
+each Item Group and get reports that will show your actual performance in the
+territory v/s what you had planned.
+You can also set different pricing for the same product sold across different territories.
+
+<img class="screenshot" alt="Territory Tree" src="{{docs_base_url}}/assets/img/crm/territory-tree.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
new file mode 100644
index 0000000..c4e74ca
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md

@@ -0,0 +1,54 @@
+If you wish to store your backups on a periodic basis,on Dropbox, you can do
+it directly through ERPNext.
+
+> Setup > Manage 3rd Party Backups
+
+__Step 1:__ Click on Setup.
+
+__Step 2:__ Click on Manage Third Party Backup
+
+#### Figure 1: Manage Third Party Backup
+
+![Third Party Backups]({{docs_base_url}}/assets/old_images/erpnext/third-party-backups.png)
+
+On the Backup Manager page, enter the email addresses of those people whom you
+wish to notify about the upload status. Under the topic 'Sync with Dropbox',
+select whether you wish to upload Daily, Weekly or Never. 
+
+__Step 3__ Click on **Allow Dropbox Access**.
+
+> Tip: In future, if you wish to discontinue uploading backups to dropbox,
+then select the Never option.
+
+#### Figure 2: Allow Dropbox Access
+
+![Backup Manager]({{docs_base_url}}/assets/old_images/erpnext/backup-manager.png)
+
+You need to login to your dropbox account, with your user id and password.
+
+![Dropbox Access]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png)
+
+## Open Source Users
+
+Installing Pre-Requisites
+
+    
+    
+    pip install dropbox
+    pip install google-api-python-client
+    
+
+  
+
+#### Create an App in Dropbox
+
+First create your Dropbox account and create a new app (https://www.dropbox.com/developers/apps).
+After successful creation of account you will receive `app_key`, `app_secret` and `access_type`. Now edit `site_config.json` of your site (/frappe-bench/sites/your-site/) and add the following lines:
+- `"dropbox_access_key": "app_key",` and 
+- `"dropbox_secret_key": "app_secret"`
+
+Then you can go to the "Integrations" module and Allow Dropbox Access.
+
+> Note: Please ensure Allow Pop-ups are enabled in your browser.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
new file mode 100644
index 0000000..dfd9ea0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md

@@ -0,0 +1,48 @@
+# Adding Users
+
+Users can be added by the System Manager. If you are a System Manager, you can add Users via
+
+There are two main classes of users: Web Users and System Users. System Users are people using ERPNext in the company. Web users are customers or suppliers (or portal users).
+  
+Under User a lot of info can be entered. For the sake of usability the information entered for webs users is minimal: First Name and email.
+Important is to realize that the email address is the unique key (ID) identifying the Users.
+
+> Setup > User
+
+### 1. List of Users
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-1.png" alt="User List">
+
+
+To add a new user, click on "New"
+
+### 2. Add the user details
+
+Add user details such as First Name, Last Name, Email etc.
+
+The user's Email will become the user id.
+
+After adding these details, save the user.
+
+### 3. Setting Roles
+
+After saving, you will see a list of roles and a checkbox next to it. Just check the roles you want the
+the user to have and save the document. To click on what permissions translate into roles, click on the role
+name.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-2.png" alt="User Roles">
+
+### 4. Setting Module Access
+
+Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-3.png" alt="User Block Module">
+
+### 5. Security Settings
+
+If you wish to give the user access to the system only between office hours,
+or during weekends, mention it under security settings.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-4.png" alt="User Security">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
new file mode 100644
index 0000000..05ad060
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md

@@ -0,0 +1,11 @@
+
+In ERPNext, you can create multiple users and assign them different roles. There are some users which can only access the public facing part of ERPNext (i.e. the website). Such users are called "Website Users".
+
+ERPNext implements permission control at the User and Role level. Each user in the system can be assigned multiple
+roles and permissions.
+
+The most important role is the "System Manager". Any user having this role can add other users and set roles to all users.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
new file mode 100644
index 0000000..b00f32a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt

@@ -0,0 +1,4 @@
+adding-users
+role-based-permissions
+user-permissions
+sharing

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
new file mode 100644
index 0000000..0c4042c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md

@@ -0,0 +1,74 @@
+# Role Based Permissions
+
+ERPNext has a role-based permission system. It means that you can assign Roles to Users, and set Permissions on Roles. The permission structure also allows you to define different permission rules for different fields, using a concept called **Permission "Level"** of a field. Once roles are assigned to a user, it gives you the ability to limit access for a user to only specific documents.
+
+To start with, go to:
+> Setup > Permissions > Role Permissions Manager
+
+<img alt="Manage Read, Write, Create, Submit, Amend access using the Role Permissions Manager" class="screenshot" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application.png">
+
+Permissions are applied on a combination of:
+
+  * **Roles:** As we saw earlier, Users are assigned to Roles and it is on these Roles that permission rules are applied.
+
+  *Examples of Roles include Accounts Manager, Employee, HR User.*
+
+  * **Document Types:** Each type of document, master or transaction, has a separate list of Role based permissions.
+
+  *Examples of Document Types are Sales Invoice, Leave Application, Stock Entry, etc.*
+
+  * **Permission "Levels":** In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3, etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
+
+    *Permission "Level" connects the group of fields with level X to a permission rule with level X.*
+
+  * **Document Stages:** Permissions are applied on each stage of the document like on Creation, Saving, Submission, Cancellation and Amendment. A role can be permitted to Print, Email, Import or Export data, access Reports, or define User Permissions.
+
+  * **Apply User Permissions:** This switch decides whether User Permissions should be applied for the role on selected Document Stages.
+
+	If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields.
+
+	To set, User Permissions go to:
+    > Setup > Permissions > [User Permissions Manager]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
+
+---
+
+**To add a new rule**, click on "Add a New Rule" button and a pop-up box will ask you to select a Role and a Permission Level. Once you select this and click on "Add", this will add a new row to your rules table.
+
+---
+
+Leave Application is a good **example** that encompasses all areas of Permission System.
+
+<img class="screenshot" alt="Leave Application Form should be created by an Employee, and approved by Leave Approver or HR User" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-application-form.png">
+
+   1. **It should be created by an Employee.**
+     For this, Employee Role should be given Read, Write, Create permissions.
+
+<img class="screenshot" alt="Giving Read, Write and Create Permissions to Employee for Leave Application"  src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-employee-role.png">
+
+   1. **An Employee should only be able to access his/her Leave Application.**
+     Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
+
+<img class="screenshot" alt="Limiting access to Leave Applications for a user with Employee Role via User Permissions Manager" src="{{docs_base_url}}/assets/old_images/erpnext/setting-up-permissions-employee-user-permissions.png">
+
+   1. **HR Manager should be able to see all Leave Applications.**
+     Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled.
+
+<img class="screenshot" alt="Giving Submit and Cancel permissions to HR Manager for Leave Applications. 'Apply User Permissions' is unchecked to give full access." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-manager-role.png">
+
+   2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
+     Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
+
+<img class="screenshot" alt="Giving Read, Write and Submit permissions to Leave Approver for Leave Applications.'Apply User Permissions' is checked to limit access based on Employee." src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-leave-approver-role.png">
+
+   3. **It should be Approved / Rejected only by HR User or Leave Approver.**
+     The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1.
+
+<img class="screenshot" alt="Limiting read access for a set of fields to certain Roles" src="{{docs_base_url}}/assets/old_images/erpnext/setting-up-permissions-level-1.png">
+
+
+   4. **HR User should be able to delegate Leave Applications to his/her subordinates**
+     HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
+
+<img class="screenshot" alt="Let HR User delegate access to Leave Applications by checking 'Set User Permissions'. This will allow HR User to access User Permissions Manager for 'Leave Application'" src="{{docs_base_url}}/assets/img/users-and-permissions/setting-up-permissions-hr-user-role.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
new file mode 100644
index 0000000..a939e65
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md

@@ -0,0 +1,9 @@
+# Sharing
+
+In addition to user and role permissions, you can also Share a document with another user if you have sharing rights.
+
+To share a document, open the document, click on the "+" icon under sharing and select the user
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/share.gif">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
new file mode 100644
index 0000000..c1cefc6
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md

@@ -0,0 +1,72 @@
+# User Permissions
+
+Limit access for a User to a set of documents using User Permissions Manager
+
+Role Base Permissions define the periphery of document types within which a user with a set of Roles can move around in. However, you can have an even finer control by defining User Permissions for a User. By setting specific documents in User Permissions list, you can limit access for that User to specific documents of a particular DocType, on the condition that "Apply User Permissions" is checked in Role Permissions Manager.
+
+To start with, go to:
+> Setup > Permissions > User Permissions Manager
+
+<figure>
+	<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company.png"
+		class="img-responsive" alt="User Permissions Manager">
+	<figcaption>User Permissions Manager displaying how users can access only a specific Company.</figcaption>
+</figure>
+
+#### Example
+
+User 'aromn@example.com' has Sales User role and we want to limit the user to access records for only a specific Company 'Wind Power LLC'.
+
+  1. We add a User Permissions row for Company.
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permission-user-limited-by-company.png"
+			class="img-responsive" alt="User Permissions For Company">
+		<figcaption>Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.</figcaption>
+	</figure>
+
+  1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company-role-all.png"
+			class="img-responsive" alt="Role Permissions for All on Company">
+		<figcaption>Read Permission with Apply User Permissions checked for DocType Company.</figcaption>
+	</figure>
+
+  1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-company-wind-power-llc.png"
+			class="img-responsive" alt="Effect of Role and User Permissions on Company">
+		<figcaption>Access is limited to Company 'Wind Power LLC'.</figcaption>
+	</figure>
+
+  1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
+These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-quotation-sales-user.png"
+			class="img-responsive" alt="Sales User Role Permissions for Quotation">
+		<figcaption>Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.</figcaption>
+	</figure>
+	<figure>
+		<img src="{{docs_base_url}}/assets/old_images/erpnext/user-permissions-quotation-list.png"
+			class="img-responsive" alt="Quotation List limited to results for Company 'Wind Power LLC'">
+		<figcaption>Quotation List is limited to results for Company 'Wind Power LLC' for User 'aromn@example.com'.</figcaption>
+	</figure>
+
+  1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-lead-role-permissions.png"
+			class="img-responsive" alt="Role Permissions on Lead for Sales User Role">
+		<figcaption>Sales User can Read, Write and Create Leads limited by User Permissions.</figcaption>
+	</figure>
+	<figure>
+		<img src="{{docs_base_url}}/assets/img/users-and-permissions/user-permissions-ignore-user-permissions.png"
+			class="img-responsive" alt="Set Ingore User Permissions from Setup > Customize > Customize Form">
+		<figcaption>Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.</figcaption>
+	</figure>
+	<figure>
+		<img src="{{docs_base_url}}/assets/old_images/erpnext/user-permissions-lead-based-on-territory.png"
+			class="img-responsive" alt="Lead List is limited to records with Territory 'United States'">
+		<figcaption>Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.</figcaption>
+	</figure>
+
+{next}
+

diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
new file mode 100644
index 0000000..a4ddc38
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md

@@ -0,0 +1,66 @@
+In order to allow multiple people to submit multiple requests, for approvals,
+by multiple users, ERPNext requires you to fill the workflow conditions.
+ERPNext tracks the multiple permissions before submission.
+
+Example of a leave application workflow is given below:
+
+If an user applies for a leave, then his request will be sent to the HR
+department. The HR department(HR User) will either reject or approve this
+request. Once this process is completed, the user's Manager(leave approver)
+will get an indication that the HR department has Accepted or Rejected. The
+Manager, who is the approving authority, will either Approve or Reject this
+request. Accordingly,the user will get his Approved or Rejected status.
+
+![Workflow]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-fl.jpg)
+
+To make this Workflow and transition rules go to :
+
+> Setup > Workflow > New Workflow
+
+#### Step 1: Enter the different states of Leave Approval Process.
+
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-1.png">
+
+#### Step 2: Enter Transition Rules.
+
+<img class="screenshot" alt="Workflow" src="{{docs_base_url}}/assets/img/setup/workflow-2.png">
+
+#### Notes:
+
+> Note 1: When you make a workflow you essentially overwrite the code that is
+written for that document. Thus the document will function based on your
+workflow and not based on the pre-set code settings. Hence there might be no
+submit button / option if you have not specified it in the workflow.
+
+> Note 2: Document status of saved is 0, of submitted is 1, and of cancelled is
+2.
+
+> Note 3: A document cannot be cancelled unless it is submitted.
+
+> Note 4: If you wish to give the option to cancel, you will have to write a
+workflow transition step that says from submitted you can cancel.
+
+  
+
+#### Example of a Leave Application Process:  
+
+Go to the Human Resources Module and click on Leave Application. Apply for a
+Leave.
+
+When a Leave Application is submitted, the status on the right hand corner of
+the page shows as "Applied"
+
+![Workflow Employee LA]({{docs_base_url}}/assets/old_images/erpnext/workflow-employee-la.png)
+
+When the HR User logs in, he can either Approve or Reject. If approved the
+status on the right hand corner of the page shows as Approved. However, a blue
+band of information is displayed saying approval is pending by leave approver.
+
+![Leave Approver]({{docs_base_url}}/assets/old_images/erpnext/workflow-hr-user-la.png)
+
+When the leave approver opens the Leave Application page, he should select the
+status and convert to Approved or Rejected.
+
+![Workflow Leave Approver]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-approver-la.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
new file mode 100644
index 0000000..b758ff7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md

@@ -0,0 +1,69 @@
+The value of available inventory is treated as an Asset in company's Chart of
+Accounts. Depending on the type of items, it can be treated as Fixed Asset or
+Current Asset. To prepare Balance Sheet, you should make the accounting
+entries for those assets. There are generally two different methods of
+accounting for inventory:
+
+### **Auto / Perpetual Inventory**
+
+In this process, for each stock transactions, the system posts relevant
+accounting entries to sync stock balance and accounting balance. This is the
+default setting in ERPNext for new accounts.
+
+When you buy and receive items, those items are booked as the company’s assets
+(stock-in-hand / fixed-assets). When you sell and deliver those items, an
+expense (cost-of-goods-sold) equal to the buying cost of the items is booked.
+General Ledger entries are made after every stock transaction. As a result,
+the value as per Stock Ledger always remains same with the relevant account
+balance. This improves accuracy of Balance Sheet and Profit and Loss
+statement.
+
+To check accounting entries for a particular stock transaction, please check
+[examples]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html)
+
+#### **Advantages**
+
+Perpetual Inventory system will make it easier for you to maintain accuracy of
+company's asset and expense values. Stock balances will always be synced with
+relevant account balances, so no more periodic manual entry has to be done to
+balance them.
+
+In case of new back-dated stock transactions or cancellation/amendment of an
+existing transaction, all the future Stock Ledger entries and GL Entries will
+be recalculated for all items of that transaction. The same is applicable if
+any cost is added to the submitted Purchase Receipt, later through the Landed
+Cost Wizard.
+
+> Note: Perpetual Inventory totally depends upon the item valuation rate.
+Hence, you have to be more careful entering valuation rate while making any
+incoming stock transactions like Purchase Receipt, Material Receipt, or
+Manufacturing / Repack.
+
+* * *
+
+### **Periodic Inventory**
+
+In this method, accounting entries are manually created periodically, to sync
+stock balance and relevant account balance. The system does not create
+accounting entries automatically for assets, at the time of material purchases
+or sales.
+
+In an accounting period, when you buy and receive items, an expense is booked
+in your accounting system. You sell and deliver some of these items.
+
+At the end of an accounting period, the total value of items to be sold, need
+to be booked as the company’s assets, often known as stock-in-hand.
+
+The difference between the value of the items remaining to be sold and the
+previous period’s stock-in-hand value can be positive or negative. If
+positive, this value is removed from expenses (cost-of-goods-sold) and is
+added to assets (stock-in-hand / fixed-assets). If negative, a reverse entry
+is passed.
+
+This complete process is called Periodic Inventory.
+
+If you are an existing user using Periodic Inventory and want to use Perpetual
+Inventory, you have to follow some steps to migrate. For details, check
+[Migration From Periodic Inventory]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
new file mode 100644
index 0000000..21624e5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt

@@ -0,0 +1,2 @@
+perpetual-inventory
+migrate-to-perpetual-inventory

diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
new file mode 100644
index 0000000..ffc5f40
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md

@@ -0,0 +1,38 @@
+Existing Users, need to follow some steps to activate the new Perpetual
+Inventory system. As Perpetual Inventory always maintains a sync between stock
+and account balance, it is not possible to enable it with existing Warehouse
+setup. You have to create a whole new set of Warehouses, each linked to
+relevant account.
+
+Steps:
+
+  * Nullify the balance of account heads (stock-in-hand / fixed-asset) which you are using to maintain available stock value, through a Journal Entry.
+
+  * As existing warehouses are linked to stock transactions which does not have corresponding accounting entries, those warehouses can not be used for perpetual inventory. You have to create new warehouses for the future stock transactions which will be linked to their respective accounts. While creating new warehouses, select an account group under which the child account for the warehouse will be created.
+
+  * Setup the following default accounts for each Company 
+
+    * Stock Received But Not Billed
+    * Stock Adjustment Account
+    * Expenses Included In Valuation
+    * Cost Center
+  * Activate Perpetual Inventory
+
+> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+
+![Activation]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-1.png)  
+  
+
+  * Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
+
+System will not post any accounting entries for existing stock transactions
+submitted prior to the activation of Perpetual Inventory as those old
+warehouses will not be linked to any account. If you create any new
+transaction or modify/amend existing transactions, with old warehouse, there
+will be no corresponding accounting entries. You have to manually sync stock
+and account balance through Journal Entry.
+
+> Note: If you are already using old Perpetual Inventory system, it will be
+deactivated automatically. You need to follow the above steps to reactivate
+it.
+

diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
new file mode 100644
index 0000000..fbe880f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md

@@ -0,0 +1,371 @@
+In perpetual inventory, system creates accounting entries for each stock
+transactions, so that stock and account balance will always remain same. The
+account balance will be posted against their respective account heads for each
+Warehouse. On saving of a Warehouse, the system will automatically create an
+account head with the same name as warehouse. As account balance is maintained
+for each Warehouse, you should create Warehouses, based on the type of items
+(Current / Fixed Assets) it stores.
+
+At the time of items received in a particular warehouse, the balance of asset
+account (linked to that warehouse) will be increased. Similarly when you
+deliver some items from that warehouse, an expense will be booked and the
+asset account will be reduced, based on the valuation amount of those items.
+
+## **Activation**
+
+  1. Setup the following default accounts for each Company 
+
+    * Stock Received But Not Billed
+    * Stock Adjustment Account
+    * Expenses Included In Valuation
+    * Cost Center
+  2. In perpetual inventory, the system will maintain seperate account balance for each warehouse under separate account head. To create that account head, enter "Create Account Under" in Warehouse master.
+
+  3. Activate Perpetual Inventory
+
+> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
+
+* * *
+
+## **Example**
+
+Consider following Chart of Accounts and Warehouse setup for your company:
+
+#### Chart of Accounts
+
+  * Assets (Dr) 
+    * Current Assets
+    * Accounts Receivable 
+      * Jane Doe
+    * Stock Assets 
+      * Stores
+      * Finished Goods
+      * Work In Progress
+    * Tax Assets 
+      * VAT
+    * Fixed Assets
+    * Fixed Asset Warehouse
+  * Liabilities (Cr) 
+    * Current Liabilities
+    * Accounts Payable 
+      * East Wind Inc.
+    * Stock Liabilities 
+      * Stock Received But Not Billed
+    * Tax Liabilities 
+      * Service Tax
+  * Income (Cr) 
+    * Direct Income
+    * Sales Account
+  * Expenses (Dr) 
+    * Direct Expenses
+    * Stock Expenses 
+      * Cost of Goods Sold
+      * Expenses Included In Valuation
+      * Stock Adjustment
+      * Shipping Charges
+      * Customs Duty
+
+#### Warehouse - Account Configuration
+
+  * Stores
+  * Work In Progress
+  * Finished Goods
+  * Fixed Asset Warehouse
+
+### **Purchase Receipt**
+
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of
+item "Desktop" at **$100** from supplier "East Wind Inc". Following are the
+details of Purchase Receipt:
+
+**Supplier:** East Wind Inc.
+
+**Items:**
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Warehouse</th>
+            <th>Qty</th>
+            <th>Rate</th>
+            <th>Amount</th>
+            <th>Valuation Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>RM0001</td>
+            <td>Stores</td>
+            <td>10</td>
+            <td>200</td>
+            <td>2000</td>
+            <td>2200</td>
+        </tr>
+        <tr>
+            <td>Desktop</td>
+            <td>Fixed Asset Warehouse</td>
+            <td>5</td>
+            <td>100</td>
+            <td>500</td>
+            <td>550</td>
+        </tr>
+    </tbody>
+</table>
+<p><strong>Taxes:</strong>
+</p>
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Account</th>
+            <th>Amount</th>
+            <th>Category</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Shipping Charges</td>
+            <td>100</td>
+            <td>Total and Valuation</td>
+        </tr>
+        <tr>
+            <td>VAT</td>
+            <td>120</td>
+            <td>Total</td>
+        </tr>
+        <tr>
+            <td>Customs Duty</td>
+            <td>150</td>
+            <td>Valuation</td>
+        </tr>
+    </tbody>
+</table>
+<p><strong>Stock Ledger</strong>
+</p>
+
+![pr<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-2.png)
+
+**General Ledger**
+
+![pr<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-3.png)
+
+As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
+Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
+Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
+
+* * *
+
+### **Purchase Invoice**
+
+On receiving Bill from supplier, for the above Purchase Receipt, you will make
+Purchase Invoice for the same. The general ledger entries are as follows:
+
+**General Ledger**
+
+![pi<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png)
+
+Here "Stock Received But Not Billed" account is debited and nullified the
+effect of Purchase Receipt.
+
+* * *
+
+### **Delivery Note**
+
+Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
+at $300. Following are the details of Delivery Note:
+
+**Customer:** Jane Doe
+
+**Items:**
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Warehouse</th>
+            <th>Qty</th>
+            <th>Rate</th>
+            <th>Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>RM0001</td>
+            <td>Stores</td>
+            <td>5</td>
+            <td>300</td>
+            <td>1500</td>
+        </tr>
+    </tbody>
+</table>
+<p><strong>Taxes:</strong>
+</p>
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Account</th>
+            <th>Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>Service Tax</td>
+            <td>150</td>
+        </tr>
+        <tr>
+            <td>VAT</td>
+            <td>100</td>
+        </tr>
+    </tbody>
+</table>
+
+**Stock Ledger**
+
+![dn<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png)
+
+**General Ledger**
+
+![dn<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-6.png)
+
+As item is delivered from "Stores" warehouse, "Stores" account is credited and
+equal amount is debited to the expense account "Cost of Goods Sold". The
+debit/credit amount is equal to the total valuation amount (buying cost) of
+the selling items. And valuation amount is calculated based on your prefferred
+valuation method (FIFO / Moving Average) or actual cost of serialized items.
+
+    
+    
+        
+    In this example, we have considered valuation method as FIFO. 
+    Valuation Rate  = Purchase Rate + Charges Included in Valuation 
+                    = 200 + (250 * (2000 / 2500) / 10) 
+                    = 220
+    Total Valuation Amount  = 220 * 5 
+                            = 1100
+        
+    
+
+* * *
+
+### **Sales Invoice with Update Stock**
+
+Lets say, you did not make Delivery Note against the above order and instead
+you have made Sales Invoice directly, with "Update Stock" options. The details
+of the Sales Invoice are same as the above Delivery Note.
+
+**Stock Ledger**
+
+![si<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png)
+
+**General Ledger**
+
+![si<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-8.png)
+
+Here, apart from normal account entries for invoice, "Stores" and "Cost of
+Goods Sold" accounts are also affected based on the valuation amount.
+
+* * *
+
+### **Stock Entry (Material Receipt)**
+
+**Items:**
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Target Warehouse</th>
+            <th>Qty</th>
+            <th>Rate</th>
+            <th>Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>RM0001</td>
+            <td>Stores</td>
+            <td>50</td>
+            <td>220</td>
+            <td>11000</td>
+        </tr>
+    </tbody>
+</table>
+
+**Stock Ledger**
+
+![mr<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png)
+
+**General Ledger**
+
+![mr<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png)
+
+* * *
+
+### **Stock Entry (Material Issue)**
+
+**Items:**
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Source Warehouse</th>
+            <th>Qty</th>
+            <th>Rate</th>
+            <th>Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>RM0001</td>
+            <td>Stores</td>
+            <td>10</td>
+            <td>220</td>
+            <td>2200</td>
+        </tr>
+    </tbody>
+</table>
+
+**Stock Ledger**
+
+![mi<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png)
+
+**General Ledger**
+
+![mi<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png)
+
+* * *
+
+### **Stock Entry (Material Transfer)**
+
+**Items:**
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Source Warehouse</th>
+            <th>Target Warehouse</th>
+            <th>Qty</th>
+            <th>Rate</th>
+            <th>Amount</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>RM0001</td>
+            <td>Stores</td>
+            <td>Work In Progress</td>
+            <td>10</td>
+            <td>220</td>
+            <td>2200</td>
+        </tr>
+    </tbody>
+</table>
+
+**Stock Ledger**
+
+![mtn<em>stock</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png)
+
+**General Ledger**
+
+![mtn<em>general</em>ledger]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png)
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
new file mode 100644
index 0000000..bfee143
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md

@@ -0,0 +1,15 @@
+<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+
+<h1>Allow over delivery / billing against Sales Order upto certain limit</h1>
+
+To setup over delivery / receipt / billing against a Sales / Purchase Order upto certain limit:
+
+1. Go to `Stock > Setup > Stock Settings`.
+2. Set `Allowance Percentage` and save the Stock Settings.
+![Allowance Percentage]({{docs_base_url}}/assets/img/articles/allowance_percentage.png)
+For example: If you have ordered 100 units. and your Allowance is 50% then you are allowed to receive 150 units.
+3. To set item-specific limit, set `Allowance Percentage` in `Item` master.
+![Allowance Percentage in Item]({{docs_base_url}}/assets/img/articles/allowance_percentage_item.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
new file mode 100644
index 0000000..e95b113
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md

@@ -0,0 +1,25 @@
+<h1>Auto Creation of Material Request</h1>
+
+<h1>Auto Creation of Material Request</h1>
+
+ERPNext allows you to define item-wise and warehouse-wise reorder level in the item master. Reorder level is the item's stock level at which item should be re-ordered.
+
+With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
+
+![Item Reorder Level]({{docs_base_url}}/assets/img/articles/$SGrab_391.png)
+
+You can have Material Request automatically created for items whose stock level reaches re-order level. You can enable this feature from:
+
+`Stock > Setup > Stock Settings`
+
+![Item Reorder Stock Setting]({{docs_base_url}}/assets/img/articles/$SGrab_392.png)
+
+A separate Material Request will be created for each item. User with Purchase Manager's role will be informed about these Material Request. He can further process this Material Request, and create Supplier Quotation and Purchase Order against it.
+
+If auto creation of Material Request is failed, Purchase Manager will be informed about error message via email. One of the most encountered error message is:
+
+**An error occurred for certain Items while creating Material Requests based on Re-order level.
+Date 01-04-2015 not in any Fiscal Year.**
+
+One of the reason of error could be Fiscal Year as well. Click [here](https://erpnext.com/kb/accounts/fiscal-year-error) to learn more about it.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
new file mode 100644
index 0000000..6115ed5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html

@@ -0,0 +1,27 @@
+<h1>Creating Depreciation For Item</h1>
+
+<h1>Creating Depreciation For Item</h1>
+
+<b>Question:</b> A Fixed Asset Item has been purchased and stored in a warehouse. How can the user create a depreciation for a Fixed Asset Item?<u><b><br><br></b></u><b>Answer:</b><u><b><br><br></b></u>Though there is no direct, automated method to book
+Asset Depreciation. A suitable work around to achieve this is by creating a Stock Reconciliation Entry.
+<br><u><b><br>Step 1:</b></u> In the Attachment file, fill in the appropriate columns;
+<br>
+<ul>
+    <li><i>Item Code</i> whose value is to be depreciated</li>
+    <li><i>Warehouse </i>in which it is stored</li>
+    <li><i>Qty (Quantity) </i>Leave this column blank</li>
+    <li>&nbsp;<i>Valuation Rate </i>Enter the Value after Depreciation</li>
+</ul>
+<p>
+    <br>
+</p>
+<img src="{{docs_base_path}}/assets/img/articles/kb_deprec_csv.png"><br>
+<p><u><b><br></b></u>
+</p>
+<p><u><b>Step 2:</b></u> In the Stock Reconciliation Form, enter the Expense account for depreciation in <i>Difference Account</i>.</p>
+<br><img src="{{docs_base_path}}/assets/img/articles/kb_deprec_form.png" height="302" width="652"><br>
+<p>
+    <br>
+</p>
+<div class="well">Note: For more information on Stock Reconciliation, see the <a href="https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item" target="_blank">User Guide</a>.</div>
+<div class="well"> Note: An Automated Asset Depreciation feature in on our To-Do List. See this <a href="https://github.com/frappe/erpnext/issues/191" target="_blank">Github Issue</a>.</div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/index.md b/erpnext/docs/user/manual/en/stock/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
new file mode 100644
index 0000000..fc039b1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt

@@ -0,0 +1,15 @@
+allow-over-delivery-billing-against-sales-order-upto-certain-limit
+auto-creation-of-material-request
+creating-depreciation-for-item
+is-stock-item-field-frozen-in-item-master
+manage-rejected-finished-goods-items
+managing-assets
+managing-batch-wise-inventory
+managing-fractions-in-uom
+opening-stock-balance-entry-for-the-serialized-and-batch-item
+repack-entry
+serial-no-naming
+stock-entry-purpose
+stock-level-report
+track-items-using-barcode
+using-batch-feature-in-stock-entry
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
new file mode 100644
index 0000000..a012827
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md

@@ -0,0 +1,19 @@
+<h1>Is Stock Item field Frozen in the Item master</h1>
+
+<h1>Is Stock Item field Frozen in the Item master</h1>
+
+In the item master, you might witness values in the following fields be frozen.
+
+1. Is Stock Item
+1. Has Batch No.
+1. Has Serial No.
+
+![Item Field Frozen]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-16 at 2.52.56 pm.png)
+
+For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
+
+For the serialized item, since its stock level is calculated based on count of available Serial Nos., setting Item as non-serialized mid-way will break the sync, and item's stock level shown in the report will not be accurate, hence Has Serial No. field is froze.
+
+To make these fields editable once again, you should delete all the stock transactions made for this item. For the Serialized and Batch Item, you should also delete Serial No. and Batch No. record for this item.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
new file mode 100644
index 0000000..9bb0103
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md

@@ -0,0 +1,32 @@
+<h1>Manage Rejected Finished Goods Items</h1>
+
+<h1>Manage Rejected Finished Goods Items</h1>
+
+There could be manufactured Items which would not pass quality test, and would be rejected.
+
+Standard manufacturing process in ERPNext doesn't cover managing rejected items separately. Hence you should create finished goods entry for both accepted as well as rejected items. With this, you will have rejected items also received in the finished goods warehouse.
+
+To move rejected items from the finished goods warehouse, you should create Material Transfer entry. Steps below to create Material Transfer entry.
+
+####New Stock Entry
+
+`Stock > Stock Entry > New`
+
+####Entry Purpose
+
+Purpose = Material Transfer
+
+####Warehouse
+
+Source Warehouse = Finished Goods warehouse
+Target Warehouse = Rejected items warehouse
+
+####Items
+
+Select item which failed quality test, and enter total rejected items as Qty.
+
+####Submit Stock Entry
+
+On Saving and Submitting Stock Entry, stock of rejected items will be moved from Finished Goods Warehouse to Rejected Warehouse.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
new file mode 100644
index 0000000..5032dcd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md

@@ -0,0 +1,24 @@
+<h1>Managing Assets</h1>
+
+<h1>Managing Assets</h1>
+
+Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items in a separate Warehouse.
+
+Item can be created for each type of an asset. Whereas unique Serial No. will be created for each unit of that asset item. Maintaining serialized inventory of asset item will have in tracking item's warranty and expiry details.
+
+####Fixed Asset Master
+
+While creating Item Code for the fixed asset item, you should updated field "Is Fixed Asset" as "Yes".
+
+![Fixed Asset Item]({{docs_base_url}}/assets/img/articles/$SGrab_383.png)
+
+Other item properties like Stock/Non-stock item can be updated on the nature of asset. Like patent and trademarks will be non-stock assets.
+
+If your asset item is serialized, click [here](https://erpnext.com/user-guide/stock/serialized-inventory) to learn how serialized inventory is managed in ERPNext.
+
+####Warehouse for Fixed Asset
+
+Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items will be done in that fixed asset warehouse only.
+
+Also, as per the perpetual inventory valuation system, you will have accounting ledger auto-created for the warehouse. You can move the accounting ledger of warehouse created for fixed asset from Stock Asset group to fixed asset group. This will be helpful while preparing financial statement for a company.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
new file mode 100644
index 0000000..23cd46d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html

@@ -0,0 +1,5 @@
+<h1>Managing Batch wise Inventory</h1>
+
+<h1>Managing Batch wise Inventory</h1>
+
+To maintain batches against an Item you need to mention 'has batch no' as yes in the Item Master. You can create a new Batch from&nbsp;<div><br></div><div><p >Stock &gt; Documents &gt; Batch &gt; New</p></div><div><br></div><div>To learn more about batch check out the manual page at&nbsp;https://manual.erpnext.com/contents/stock/batch</div><div><br></div><div>While making a purchase receipt or delivery note, mention the batch number against the item.</div><div><br></div><div><p ><strong>Batch No. in Purchase Receipt</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.33.37 pm.png"><br></p><p ><strong>Batch No. in Delivery Note</strong></p><p ><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2015-06-23 at 5.35.28 pm.png"><br></p><p ><b>Batch-wise Stock Balance Report</b></p><p >To check batch-wise stock balance report, go to:</p><p >Stock &gt; Standard Reports &gt; Batch-wise Balance History</p><p ><br></p></div>

diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
new file mode 100644
index 0000000..75acd38
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md

@@ -0,0 +1,34 @@
+<h1>Managing Fractions in UoM</h1>
+
+<h1>Managing Fractions in UoM</h1>
+
+UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc.
+
+There are few UoMs which cannot have value decimal places. For example, if we have television for an item, with Nos as its UoM, we cannot have 1.5 Nos. of television, or 3.7 Nos. of computer sets. The value of quantity for these items must be whole number.
+
+You can configure if particular UoM can have value in decimal place or no. Bydefault, decimal places will be allowed in all the UoMs. To restrict decimal places or value in fraction for any UoM, you should follow these steps.
+
+####UoM List
+
+For UoM list, go to:
+
+`Stock > Setup > UoM`
+
+For the list of UoM, select one which you want to restrict value in fraction. Let's assume that UoM is Nos.
+
+####Configure
+
+In the UoM form, you will find a field called "Must be whole number". Check this field to restrict user from enter decimal places in quantity field for item with this UoM.
+
+![UoM Whole No]({{docs_base_url}}/assets/img/articles/$SGrab_390.png)
+
+####While Creating Entry
+
+While creating transaction, if you enter value in fraction for item who's UoM has "Must be whole number" checked, you will get error message stating:
+
+`Quantity cannot be a fraction at row #`
+
+![UoM Fraction Error]({{docs_base_url}}/assets/img/articles/$SGrab_389.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
new file mode 100644
index 0000000..5251a8e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md

@@ -0,0 +1,63 @@
+<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+
+<h1>Opening Stock Balance Entry for the Serialized and Batch Item</h1>
+
+Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them will be update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/serialized-inventory).
+
+Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
+
+In the ERPNext, stock level of a serialized items is derived based on the count of Serial Nos for that item. Hence, unless Serial Nos. are created for the serialized item, its stock level will not be updated. In the Stock Reconciliation Tool, you can only update opening quantity of an item, and not their Serial No. and Batch No.
+
+Let's check steps for create opening stock balance entry for the Serialized and Batch item.
+
+#### Step 1: New Stock Entry
+
+`Stock > Stock Entry > New`
+
+#### Step 2: Select Purpose
+
+Stock Entry Purpose should be updated as `Material Receipt`.
+
+#### Step 3: Update Posting Date
+
+Posting Date should be date on which you wish to update opening balance for an item.
+
+#### Step 4: Update Target Warehouse
+
+Target Warehouse will be one in which opening balance of an item will be updated.
+
+#### Step 5: Select Items
+
+Select Items in the Stock Entry table.
+
+#### Step 6: Update Opening Qty
+
+For the serialized item, you should update as many Serial Nos as their Qty. If you have updated Prefix in the Item master, on the submission of Stock Entry Serial Nos. will be auto-created following that prefix.
+
+![Item Serial No. Prefix]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.13.50 pm.png)
+
+For a batch item, you should provide Batch ID in which opening balance will be updated. You should keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
+
+`Stock > Setup > Batch > New`
+
+[Click here to learn how Batchwise inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/batchwise-inventory).
+
+#### Step 7: Update Valuation Rate an Item
+
+Valuation Rate is the mandatory field, where you should update `per unit value of item`. If you have unit of items having different valuation rates, they should be updated in a separate row, with different Valuation Rate.
+
+#### Step 8: Difference Account
+
+As per perpetual inventory valuation system, accounting entry is created for every stock entry. Accounting system followed in the ERPNext requires Total Debit in an entry matching with Total Credit. On the submission of Stock Entry, system Debits accounting ledger of a Warehouse by total value of items. To balance the same, we use Temporary Liability account in the Difference Account field. [Click here to learn more about use of Temporary Accounts in updating opening balance](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account).
+
+![Difference Account]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.20.52 pm.png)
+
+#### Step 9: Save and Submit Stock Entry
+
+On submission of Stock Entry, stock ledger entry will be posted, and opening balance will be updated for the items on a given posting date.
+
+If Serial Nos. for your items are set to be created based on prefix, then on submission of Stock Entry, Serial Nos. will be created as well.
+
+![Serial No Creation]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-19 at 5.28.57 pm.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
new file mode 100644
index 0000000..59bf983
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md

@@ -0,0 +1,35 @@
+<h1>Repack Entry</h1>
+
+<h1>Repack Entry</h1>
+
+If you buy items in bulk to be repacked into smaller packs, you can create a **Stock Entry** of type "Repack". For example, item bought in tons can be repacked into Kgs. 
+
+Notes:
+1. Separate purchase and repacked Items must be made.
+2. Repack entry can be made with or without BOM (Bill of Material).
+
+Let's check below scenario to understand this better.
+
+Assume you buy crude oil in barrel, and get diesel and gasoline as its output. To create production entry, go to:
+
+#### 1. New Stock Entry
+
+`Stock > Documents > Stock Entry > New Stock Entry`
+
+#### 2. Enter Items
+
+Select Purpose as 'Repack Entry'.
+
+For raw-material/input item, only Source Warehouse will be provided.
+
+For repacked/production item, only Target Warehouse will be entered. You will have to provide valuation for the repacked/production item.
+
+![New STE]({{docs_base_url}}/assets/img/articles/Selection_071.png)
+
+#### 3. Submit Stock Entry
+
+On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repacked/production item will be added in the Target Warehouse.
+
+![New STE]({{docs_base_url}}/assets/img/articles/Selection_072.png)
+
+<!-- markdown --> 
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
new file mode 100644
index 0000000..c4e8774
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md

@@ -0,0 +1,41 @@
+<h1>Serial No. Naming</h1>
+
+<h1>Serial No. Naming</h1>
+
+Serial Nos. are unique value assigned on each unit of an item. Serial no. helps in locating and tracking item's warranty and expiry details.
+
+To make item Serialized, in the Item master, on selecting **Has Serial No** field should be updated as "Yes".
+
+There are two ways Serial no. can be generated in ERPNext.
+
+###1. Serializing Purchase Items
+
+If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you should follow this approach. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial No. entered for an item.
+
+If received items already has its Serial No. barcoded, you can simply scan that barcode for entering Serial No. in the Purchase Receipt. Click [here](https://frappe.io/blog/management/using-barcodes-to-ease-data-entry) to learn more about it.
+
+On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
+
+![Serial Nos]({{docs_base_url}}/assets/img/articles/Selection_061.png)
+
+Generated Serial numbers will be updated for each item.
+
+![Serial Nos]({{docs_base_url}}/assets/img/articles/Selection_062.png)
+
+###2. Serializing Manufacturing Item
+
+To Serialize Manufacturing Item, you can define Series for Serial No. Generation in the Item master itself. Following that series, system will create Serial Nos. for Item when its Production entry is made.
+
+####2.1 Serial No. Series
+
+When Item is set as serialized, it will allow you to mentioned Series for it.
+
+![Item Serial No. Series]({{docs_base_url}}/assets/img/articles/Selection_049.png)
+
+####2.2 Production Entry for Serialized Item
+
+On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
+
+![Serial No]({{docs_base_url}}/assets/img/articles/Selection_054.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
new file mode 100644
index 0000000..26b6346
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md

@@ -0,0 +1,53 @@
+<h1>Stock Entry Purpose</h1>
+
+<h1>Stock Entry Purpose</h1>
+
+Stock Entry document records Item movement from a Warehouse, to a Warehouse and between Warehouses. And in stock entry form selection of 'Purpose' belongs to type of item movement. Following are the uses of Stock Entry Purposes in stock entry form.
+
+#### 1.Purpose = Material Issue
+
+This purpose is selected to issue item from a warehouse. In this stock entry, you should define Source Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+![Material Issue]({{docs_base_url}}/assets/img/articles/Selection_440.png)
+
+#### 2.Purpose = Material Receipt
+
+This purpose is selected to receive item in a warehouse. In this stock entry, you should define Target Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+![Material Receipt]({{docs_base_url}}/assets/img/articles/Selection_442.png)
+
+#### 3.Purpose = Material Transfer
+
+This purpose is selected to transfer item from warehouse to warehouse or to transfer raw material for production. In this stock entry, you should define Source Warehouse and Target Warehouse also.
+
+![Material Transfer]({{docs_base_url}}/assets/img/articles/Selection_443.png)
+ 
+#### 4.Purpose = Manufacture
+
+This purpose is selected to perform finished goods entry. This purpose is auto selected in stock entry form, when you Update Finished Goods entry from Submitted Production Order. ![Check this page to know more about Manufacturing](https://erpnext.com/user-guide/guide-books/engineer-to-order/stock-entry)
+
+![Manufacture]({{docs_base_url}}/assets/img/articles/Selection_444.png) 
+
+#### 5.Purpose = Repack
+
+This purpose is selected to perform repack of item. ![Check this page to know more about Repack entry](https://erpnext.com/kb/stock/repack-entry)
+
+#### 6.Purpose = Subcontract
+
+This purpose is selected to transfer row material to supplier for manufacturing subcontracting item.![Check this page to know more about Subcontracting](https://erpnext.com/user-guide/manufacturing/subcontracting)
+
+![Subcontract]({{docs_base_url}}/assets/img/articles/Selection_445.png)
+
+#### 6.Purpose = Sales Return
+
+This purpose is selected to receive returned item by customer. ![Check this page to know more about Sales Return](https://erpnext.com/user-guide/stock/sales-return)
+
+![Sales Return]({{docs_base_url}}/assets/img/articles/Selection_446.png)
+
+#### 6.Purpose = Purchase Return
+
+This purpose is selected to issue purchased item to supplier. ![Check this page to know more about Purchase Return](https://erpnext.com/user-guide/stock/purchase-return)
+
+![Purchase Return]({{docs_base_url}}/assets/img/articles/Selection_447.png)
+        
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
new file mode 100644
index 0000000..fa92612
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md

@@ -0,0 +1,41 @@
+<h1>Stock Level Report</h1>
+
+<h1>Stock Level Report</h1>
+
+Stock Level report list stock item's quantity available in a particular warehouse.
+
+There are multiple reports available you can check for item's stock level.
+
+####Stock Projected Quantity Report
+
+You can access this report from `Stock > Main Report > Stock Projected Quantity`
+
+This report list item wise - warehouse wise stock level of an item considering all the stock transactions. With Actual Quantity of an item, it also provide other details like:
+
+1. Actual Qty: Quantity available in the warehouse.
+2. Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+3. Requested Qty: Quantity requested for purchase, but not ordered.
+4. Ordered Qty: Quantity ordered for purchase, but not received.
+5. Reserved Qty: Quantity ordered for sale, but not delivered.
+6. Project Qty: Project Quantity is calculated as
+
+<div class="well">Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty - Reserved Qty</div>
+
+The projected inventory is used by the planning system to monitor the reorder point and to determine the reorder quantity. The projected Quantity is used by the planning engine to monitor the safety stock levels. These levels are maintained to serve unexpected demands.
+
+Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity.
+
+####Stock Balance Report
+
+Stock Ledger report helps you check stock balance of an item on a given date. 
+
+You can access this report from
+
+`Stock > Main Report > Stock Balance`
+
+This allows you to go back in time, and check what was stock level of an item in a particular warehouse in the near past. 
+
+With item's stock levels, you will also get their valuation details in this report.
+
+Based on the date filters, this report provides item's Opening Stock on From Date, and Closing Stock on To From. It will also list the In Quantity and Out Quantity for an item between the date range.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
new file mode 100644
index 0000000..5b0d99a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md

@@ -0,0 +1,20 @@
+<h1>Track items using Barcode</h1>
+
+A barcode, is a code using multiple lines and spaces of varying widths, designed to represent some alpha-numeric characters. For example, in retail, it generally represents item code / serial number. Most barcode scanners behave like an external keyboard. When it scans a barcode, the data appears in the computer screens at the point of cursor.
+
+To enable barcode feature in ERPNext go to `Setup –> Customize –> Features Setup` and check "Item Barcode" option.
+![Features Setup]({{docs_base_url}}/assets/img/articles/feature-setup-barcode.png)
+
+Now, a new field "Barcode" will be appear in Item master, enter barcode while creating a new item. You can update barcode field for existing items using "Data Import Tool".
+
+If you are creating your own barcode, then you should print those same barcodes and attach to your products.
+![Item Barcode]({{docs_base_url}}/assets/img/articles/item-barcode.png)
+
+
+Once you have updated barcode field in item master, you can fetch items using barcode in Delivery Note, Sales Invoice and Purchase Receipt document.
+
+For example, in Delivery Note Item table, a new field "Barcode" will be appear and if you point your mouse cursor to that field and scan the barcode using Barcode Scanner, the code will appear in that field. At the same time, system will pull item details, based on the barcode.
+![Delivery Note Barcode]({{docs_base_url}}/assets/img/articles/delivery-note-barcode.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
new file mode 100644
index 0000000..eeb5cdf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md

@@ -0,0 +1,13 @@
+<h1>Using Batch feature in Stock Entry.</h1>
+
+1. You need to first create an Item Master Record. You can do so by typing 'new Item' in the Awesome bar.
+    <img class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 17:56:19.png">
+2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
+    <img  class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:00:57.png">
+    NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
+3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
+4. Fill in the batch related details and save the Doc.
+    <img  class="screenshot"
+     src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:09:42.png">
+5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.<br>
+    <img  class="screenshot" src="{{docs_base_url}}/assets/img/articles/Screenshot from 2014-11-18 18:13:22.png"><br></div>

diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
new file mode 100644
index 0000000..e6a1253
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/batch.md

@@ -0,0 +1,25 @@
+Batch inventory feature in ERPNext allows you to group multiple units of an item, 
+and assign them a unique value/number/tag called Batch No.
+
+The practise of stocking based on batch is mainly followed in the pharmaceutical industry. 
+Medicines/drugs produced in a particular batched is assigned a unique id. 
+This helps them updating and tracking manufacturing and expiry date for all the units produced under specific batch.
+
+> Note: To set item as a batch item, "Has Batch No" field should be updated as Yes in the Item master.
+
+On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item, 
+you should provide item's Batch No. To create new Batch No. master for an item, go to:
+
+> Stock > Setup > Batch > New
+
+Batch master is created before creation of Purchase Receipt. 
+Hence eveytime there is Purchase Receipt or Production entry being made for a batch item, 
+you will first create its Batch No, and then select it in Purcase order or Production Entry.
+
+<img class="screenshot" alt="batch" src="{{docs_base_url}}/assets/img/stock/batch.png">
+
+> Note: In stock transactions, Batch IDs will be filtered based on Item Code, Warehouse, 
+Batch Expiry Date (compared with Posting date of a transaction) and Actual Qty in Warehouse. 
+While searching for Batch ID  without value in Warehouse field, then Actual Qty filter won't be applied.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
new file mode 100644
index 0000000..358f037
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md

@@ -0,0 +1,56 @@
+A Delivery Note is made when a shipment is shipped from the company’s
+Warehouse.
+
+A copy of the Delivery Note is usually sent with the transporter. The Delivery
+Note contains the list of Items that are sent in the shipment and updates the
+inventory.
+
+The entry of the Delivery Note is very similar to a Purchase Receipt. You can
+create a new Delivery Note from:
+
+> Stock > Delivery Note > New
+
+or from a “Submitted” Sales Order (that is not already shipped) by clicking on
+“Make Delivery Note”.
+
+<img class="screenshot" alt="Delivery Note" src="{{docs_base_url}}/assets/img/stock/delivery-note.png">
+
+You can also “fetch” the details from an unshipped Sales Order.
+
+You will notice that all the information about unshipped Items and other
+details are carried over from your Sales Order.
+
+### Shipping Packets or Items with Product Bundle
+
+If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/manual/en/selling/setup/sales-bom.html), ERPNext will automatically
+create a “Packing List” table for you based on the sub-Items in that Item.
+
+If your Items are serialized, then for Product Bundle type of Items, you will have
+to update the Serial Number in the “Packing List” table.
+
+### Packing Items in to Cases, for Container Shipment
+
+If you are doing container shipment or by weight, then you can use the Packing
+Slip to breakup your Delivery Note into smaller units. To make a Packing Slip
+go to:
+
+> Stock > Packing Slip > New Packing Slip
+
+You can create multiple Packing Slips for your Delivery Note and ERPNext will
+ensure that the quantities in the Packing Slip do not exceed the quantities in
+the Delivery Note.
+
+* * *
+
+#### Q. How to Print Without Amounts?
+
+If you want to print your Delivery Notes without the amount (this might be
+useful if you are shipping high value items), just check the “Print without
+Amount” box in the “More Info” section.
+
+#### What happens when the Delivery Note is “Submitted”?
+
+A Stock Ledger Entry is made for each Item and stock is updated. Pending
+Quantity in the Sales Order is updated (if applicable).
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
new file mode 100644
index 0000000..971c33c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/index.md

@@ -0,0 +1,27 @@
+For most small business that deal in physical goods, a large part of their net
+worth is invested in the stock in hand.
+
+### Material Flow
+
+There are three main types of entries:
+
+  * Purchase Receipt: Items received from Suppliers against Purchase Orders.
+  * Stock Entry: Items transferred from one Warehouse to another.
+  * Delivery Note: Items shipped to Customers.
+
+#### How does ERPNext track stock movement / levels?
+
+Tracking stock is not just about adding and subtracting quantities. Some
+complications arise when:
+
+  * Back-dated (past) entries are made / edited: This affects future stock levels and may lead to negative stock.
+  * Stock has to be valued based on First-in-First-out: ERPNext needs to maintain a sequence of all transactions to know the exact value of your Items.
+  * Stock reports are required at any point in time in the past: You have to lookup what was the quantity / value your stock of Item X on date Y.
+
+To manage this, ERPNext collects all inventory transactions in a table called
+the Stock Ledger Entry. All Purchase Receipts, Stock Entries and Delivery
+Notes update this table.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/stock/index.txt b/erpnext/docs/user/manual/en/stock/index.txt
new file mode 100644
index 0000000..b89abe1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/index.txt

@@ -0,0 +1,18 @@
+material-request
+stock-entry
+delivery-note
+purchase-receipt
+installation-note
+item
+warehouse
+serial-no
+batch
+projected-quantity
+accounting-of-inventory-stock
+tools
+setup
+sales-return
+purchase-return
+articles
+opening-stock
+stock-how-to

diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
new file mode 100644
index 0000000..0519652
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md

@@ -0,0 +1,5 @@
+You can use installation note to record the instalation of a product having a serial number.
+
+<img class="screenshot" alt="Installation Note" src="{{docs_base_url}}/assets/img/stock/installation-note.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
new file mode 100644
index 0000000..4af8eff
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.md

@@ -0,0 +1,93 @@
+An Item is your companys' product or a service. The term Item is applicable to your core products as well as your raw materials. It can be a product or service that you buy/sell from your customers/ suppliers. ERPNext allows you to manage all sorts of items like raw-materials, sub-assemblies, finished goods, item variants and service items.
+
+ERPNext is optimized for itemized management of your sales and purchase. If you are in services, you can create an Item for each services that your offer. Completing the Item Master is very essential for successful implementation of ERPNext.
+
+## Item Properties
+
+  * **Item Name:** Item name is the actual name of your product or service.
+  * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{docs_base_url}}/user/manual/en/stock/item/item-codification.html)
+  * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{docs_base_url}}/user/manual/en/stock/setup/item-group.html)
+  * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list.
+  * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
+  * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html)
+  
+### Upload an Image
+
+To upload an image for your icon that will appear in all transactions, save
+the partially filled form. Only after your file is saved  the 'upload' button will
+work above the Image icon. Click on this sign and upload the image.
+
+### Inventory : Warehouse and Stock Setting
+
+In ERPNext, you can select different type of Warehouses to stock your
+different Items. This can be selected based on Item types. It could be Fixed
+Asset Item, Stock Item or even Manufacturing Item.
+
+  * **Stock Item:** If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.
+  * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions. 
+  * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults. 
+  * **Valuation Method:** There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit “ Item Valuation, FIFO and Moving Average”.
+
+### Serialized and Batched Inventory
+
+These numbers help to track individual units or batches of Items which you sell. It also tracks warranty and returns. In case any individual Item is recalled by the supplier the number system helps to track individual Item. The numbering system also manages expiry dates. Please note that if you sell your items in thousands, and if the items are very small like pens or erasers, you need not serialize them. In ERPNext, you will have to mention the serial number in some accounting entries. To create serial numbers you will have to manually create all the numbers in your entries. If your product is not a big consumer durable Item, if it has no warranty and has no chances of being recalled, avoid giving serial numbers.
+
+> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
+
+  * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)  
+
+### Re Ordering
+
+  * **Re-order level** suggests the amount of stock balance in the Warehouse. 
+  * **Re-order Qty** suggests the amount of stock to be ordered to maintain minimum stock levels.
+  * **Minimum Order Qty** is the minimum quantity for which a Material Request / Purchase Order must be made.
+
+### Item Tax
+
+These settings are required only if a particular Item has a different tax rate
+than the rate defined in the standard tax Account. For example, If you have a
+tax Account, “VAT 10%” and this particular Item is exempted from tax, then you
+select “VAT 10%” in the first column, and set “0” as the tax rate in the
+second column.
+
+Go to [Setting Up Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail.
+
+### Inspection
+
+Inspection Required: If an incoming inspection (at the time of delivery from
+the Supplier) is mandatory for this Item, mention “Inspection Required” as
+“Yes”. The system will ensure that a Quality Inspection will be prepared and
+approved before a Purchase Receipt is submitted.
+
+Inspection Criteria: If a Quality Inspection is prepared for this Item, then
+this template of criteria will automatically be updated in the Quality
+Inspection table of the Quality Inspection. Examples of Criteria are: Weight,
+Length, Finish etc.
+
+### Purchase Details
+
+![Purchase Details]({{docs_base_url}}/assets/old_images/erpnext/item-purchase.png)
+
+**Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
+
+**Default Expense Account:** It is the account in which cost of the Item will be debited.
+
+**Default Cost Centre:** It is used for tracking expense for this Item.
+
+### Sales Details
+
+![Sales Details]({{docs_base_url}}/assets/old_images/erpnext/item-sales.png)
+
+**Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
+
+**Cost Centre:** Cost center selected here will be fetched automatically in sales invoice for this item.
+
+### Manufacturing And Website
+
+![Manufacturing]({{docs_base_url}}/assets/old_images/erpnext/item-manufacturing-website.png)
+
+Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
+
+### Learn more about Item
+
+{index}

diff --git a/erpnext/docs/user/manual/en/stock/item/index.txt b/erpnext/docs/user/manual/en/stock/item/index.txt
new file mode 100644
index 0000000..4e66875
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.txt

@@ -0,0 +1,6 @@
+item-price
+item-codification
+item-variants
+purchase-details
+reorder
+item-valuation-fifo-and-moving-average

diff --git a/erpnext/docs/user/manual/en/stock/item/item-codification.md b/erpnext/docs/user/manual/en/stock/item/item-codification.md
new file mode 100644
index 0000000..eeb4f49
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-codification.md

@@ -0,0 +1,78 @@
+If you already have a full-fledged business with a number of physical items,
+you would have probably coded your items. If you have not, you have a choice.
+We recommend that you should codify if you have lot of products with long or
+complicated names. In case you have few products with short names, it is
+preferable to keep the Item Code same as Item Name.
+
+Item codification has been a sensitive topic and wars have been fought on this
+(not joking). In our experience, when you have items that cross a certain
+size, life without codification is a nightmare.
+
+### Benefits
+
+  * Standard way of naming things.
+  * Less likely to have duplicates.
+  * Explicit definition.
+  * Helps to quickly find if a similar item exists.
+  * Item names get longer and longer as more types get introduced. Codes are shorter.
+
+### Pain
+
+  * You have to remember the codes!
+  * Harder for new team members to pick up.
+  * You have to create new codes all the time.
+
+### Example
+
+You should have a simple manual / cheat-sheet to codify your Items instead of
+just numbering them sequentially. Each letter should mean something. Here is
+an example:
+
+If your business involves wooden furniture, then you may codify as follows:
+
+Item Codification Summary Sheet (SAMPLE)
+
+    
+    
+    First letter: "Material"            Third letter: "Size"
+    
+    - W - Wood                          - 0 - less than 1mm
+    - H - Hardware                      - 1 - 1mm - 5mm
+    - G - Glass                         - 2 - 5mm - 10mm
+    - U - Upholstery                    - 3 - 10mm - 10cm
+    - P - Plastic
+    
+    Second Letter: "Type"
+    
+    For Wood:                           For Hardware:
+    
+    - S - Sheet                         - S - Screw
+    - B - Bar                           - N - Nut
+    - L - L-section                     - W - Washer
+    - M - Molded                        - B - Bracket
+    - R - Round
+    
+
+The last few letters could be sequential. So by looking at code **WM304** \-
+you know its a wooden molding less than 10cm in size
+
+### Standardization
+
+If you have more than one person naming items, the style of naming items will
+change for everyone. Sometimes, even for one person, he or she may forget how
+they had named the item and may create a duplicate name _"Wooden Sheet 3mm" or
+"3mm Sheet of Wood"?_
+
+### Rationalizing
+
+It is a good practice to have minimum varieties of items so that you keep
+minimum stock, housekeeping is simpler etc. When you are planning a new
+product and you want to know if you are already purchasing a part in some
+other product, the item codes will help you quickly determine if you are using
+a similar raw material in another product.
+
+We believe if you do this small investment, it will help you rationalize
+things as your business grows, though its okay not to codify if you have less
+items.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/item/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
new file mode 100644
index 0000000..b877e8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md

@@ -0,0 +1,43 @@
+Item Price is the record in which you can log sellig and buying rate of an item.
+
+There are two ways to reach to new Item Price form.
+
+> Selling/Buying/Stock >> Setup >> Item Price >> New Item Price
+
+Or
+
+> Item >> Add/Edit Prices >> Click on "+"  >> New Item Price
+
+Following are the steps to create new Item Price.
+
+Step 1: Select Price List
+
+You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
+
+![Item Price list]({{docs_base_url}}/assets/old_images/erpnext/item-price-list.png)
+
+On selection of Price List, its currency and for selling or buying property will be fetched as well.
+
+To have Item Price fetching in the sales or purchase transaction, you should have Price List id selected in the transaction, just above Item table.
+
+Step 2: Select Item
+
+Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
+
+![Item Price Item]({{docs_base_url}}/assets/old_images/erpnext/item-price-item.png)
+
+Step 3: Enter Rate
+
+Enter selling/buying rate of an item in Price List currency.
+
+![Item Price Rate]({{docs_base_url}}/assets/old_images/erpnext/item-price-rate.png)
+
+Step 4: Save Item Price
+
+To check all Item Price together, go to:
+
+Stock >> Main Report >> Itemwise Price List Rate
+
+You will find option to create new Item Price record (+) in this report as well.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
new file mode 100644
index 0000000..9344870
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md

@@ -0,0 +1,28 @@
+### How are Items Valued?
+
+One of the major features of any inventory system is that you can find out the
+value of any item based on its historic or average price. You can also find
+the value of all your items for your balance sheet.
+
+Valuation is important because:
+
+  * The buying price may fluctuate.
+  * The value may change because of some process (value add).
+  * The value may change because of decay, loss etc.
+
+You may encounter these terms, so lets clarify:
+
+  * Rate: Rate at which the transaction takes place.
+  * Valuation Rate: Rate at which the items value is set for your valuation.
+
+There are two major ways in which ERPNext values your items.
+
+  * **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
+
+![FIFO]({{docs_base_url}}/assets/old_images/erpnext/fifo.png)
+
+  * **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
+
+> New Value X2 = (X * Y + X1 * Y1) / (Y + Y1)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
new file mode 100644
index 0000000..cee3ab1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md

@@ -0,0 +1,24 @@
+A Item Variant is a different version of a Item, such as differing sizes or differing colours.
+Without Item variants, you would have to treat the small, medium and large versions of a t-shirt as three separate Items; 
+Item variants let you treat the small, medium and large versions of a t-shirt as variations of the same Item.
+
+To use Item Variants in ERPNext, create an Item and check 'Has Variants'
+
+* The Item shall then be referred as a 'Template'
+
+<img class="screenshot" alt="Has Variants" src="{{docs_base_url}}/assets/img/stock/item-has-variants.png">
+
+On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
+In case the attribute has Numeric Values, you can specify the range and increment values here. 
+
+<img class="screenshot" alt="Valid Attributes" src="{{docs_base_url}}/assets/img/stock/item-attributes.png">
+
+> Note: You cannot make Transactions against a 'Template'
+
+To create 'Item Variants' against a 'Template' select 'Make Variants'
+
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant.png">
+
+<img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant-1.png">
+
+To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/manual/en/stock/setup/item-attribute.html)

diff --git a/erpnext/docs/user/manual/en/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
new file mode 100644
index 0000000..5749178
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md

@@ -0,0 +1,22 @@
+# purchase details
+
+# How Do I Track Warranty Status?
+
+To track a warranty period, it is necessary that the Item is a serialized Item.
+When this Item is delivered, the delivery date and the expiry period is saved in the serial number master. Through the serial number master you can track the warranty status.
+
+A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
+
+![Warranty]({{docs_base_url}}/assets/old_images/erpnext/faq-warranty.png)
+
+# How To Name A Manufacturer Part Number?
+
+Go to the purchase details section of the Item form, and enter the number on the right hand side in the field ‘Manufacturer Part Number’
+
+> Stock > Item
+
+A manufacturer part number is a series of numbers and /or letters that has been given to a part by the manufacturer. The manufacturer part number belongs to the manufacturer and helps distinguish the part from other manufacturers. If two parts come from different manufacturers, they will have different MPNs. This allows businesses to identify which company made the part.
+
+![Part No]({{docs_base_url}}/assets/old_images/erpnext/faq-manufacturer-part-no.png)
+
+__For Example:__ A refrigerator will have different parts which will have manufacturer part number. Thus, when any part fails and you want to replace it, you can simply order that part based on its part number.

diff --git a/erpnext/docs/user/manual/en/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
new file mode 100644
index 0000000..4537d95
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md

@@ -0,0 +1,26 @@
+# Re-Order 
+
+# How To Setup Re-order Level?
+
+Go to the Re-order section of the Item form in the Stock module.
+
+> Stock > Item
+
+The Re-order level is the point at which stock on a particular item has diminished to a point where it needs to be replenished. To order based on Re-order level can avoid shortages. Re-order level can be determined based on the lead time and the average daily consumption.
+
+![Reorder Level]({{docs_base_url}}/assets/old_images/erpnext/faq-reorder-level.png)
+
+__For example:__ You can set your reorder level of bath towels at 10. When there are only 10 towels remaining in stock, the system will either send a mail or take action depending upon what you have selected in global settings.
+
+# How To Setup Reorder Quantity?
+
+To setup Reorder quantity, go to the Re-order section of the Item form. In the field ‘Re-order Qty’ type the amount that is needed.
+
+> Stock> Item
+
+Re-order quantity is the quantity to order, so that the sum of ordering cost and holding cost is at its minimum.The re-order quantity is based on the minimum order quantity specified by the supplier and many other factors.
+
+![Reorder Quantity]({{docs_base_url}}/assets/old_images/erpnext/faq-reorder-qty.png)
+
+__For example:__ If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
+

diff --git a/erpnext/docs/user/manual/en/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
new file mode 100644
index 0000000..a609756
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/material-request.md

@@ -0,0 +1,30 @@
+A Material Request is a simple document identifying a requirement of a set of
+Items (products or services) for a particular reason.
+
+![Workflow]({{docs_base_url}}/assets/old_images/erpnext/material-request-workflow.jpg)
+
+To generate a Material Request manually go to:
+
+> Stock > Documents > Material Request > New
+
+#### Creating Material Request 
+
+<img class="screenshot" alt="Material Request" src="{{docs_base_url}}/assets/img/buying/material-request.png">
+
+A Material Request can be generated:
+
+  * Automatically from a Sales Order.
+  * Automatically when the Projected Quantity of an Item in stores reaches a particular level.
+  * Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities.
+  * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{docs_base_url}}/user/manual/en/stock/projected-quantity.html) for this Item.
+
+A Material Request can be of type:
+
+* Purchase - If the request material is to be purchased.
+* Material Transfer - If the requested material is to be shifted from one warehouse to another.
+* Material Issue - If the requested material is to be Issued.
+
+> Info: Material Request is not mandatory. It is ideal if you have centralized
+buying so that you can collect this information from various departments.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
new file mode 100644
index 0000000..4d2d727
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/opening-stock.md

@@ -0,0 +1,15 @@
+# Opening Stock
+
+<p class="lead"> Opening Stock is the Stock quantity in the beginning of every accounting year of an organisation. The closing Stock with the prior accounting year becomes the opening Stock with the existing accounting year.</p>
+
+Opening Stock can be done for serialized Items as well as non-serialized Items.To update opening stock for non-serialized Item, you should perform Stock Reconciliation. For serialised Item, you can make Stock Entry of type Material Receipt.
+
+> Stock > Stock Reconciliation > New Stock Reconciliation
+
+In both cases, you should enter "Difference/Expense Account" as **Temporary Opening** account. On submission of the document, system will debit Warehouse account which is an asset account and credit difference/expense account. Before making these entries, make sure you have enabled "Perpetual Inventory" by checking Stock Settings page.
+
+If you are not making opening Stock Entry, you can select "Stock Adjustment" account in Difference/Expense Account field which is an expense account.
+
+To understand Opening Stock for serialzed Items visit [Stock Reconciliation]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
new file mode 100644
index 0000000..9251a1b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md

@@ -0,0 +1,26 @@
+Projected Quantity is the level of stock that is predicted for a particular
+Item, based on the current stock levels and other requirements. It is the
+quantity of gross inventory that includes supply and demand in the past which
+is done as part of the planning process.
+
+The projected inventory is used by the planning system to monitor the reorder
+point and to determine the reorder quantity. The projected Quantity is used by
+the planning engine to monitor the safety stock levels. These levels are
+maintained to serve unexpected demands.
+
+Having a tight control of the projected inventory is crucial to determine
+shortages and to calculate the right order quantity.
+
+![Projected Quantity Stock Report]({{docs_base_url}}/assets/old_images/erpnext/projected-quantity-stock-report.png)
+
+
+> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
+Reserved Qty
+
+  * Actual Qty: Quantity available in the warehouse.
+  * Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+  * Requested Qty: Quantity requested for purchase, but not ordered.
+  * Ordered Qty: Quantity ordered for purchase, but not received.
+  * Reserved Qty: Quantity ordered for sale, but not delivered.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
new file mode 100644
index 0000000..0f43b58
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md

@@ -0,0 +1,78 @@
+Purchase Receipts are made when you accept material from your Supplier usually
+against a Purchase Order.
+
+You can also accept Purchase Receipts directly ( Set Purchase Order
+Required as “No” in Global Defaults).
+
+You can make a Purchase Receipt directly from:
+
+> Stock > Purchase Receipt > New Purchase Receipt
+
+or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
+
+<img class="screenshot" alt="Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-receipt.png">
+
+### Rejections
+
+In the Purchase Receipt, you are required to enter whether all the materials
+you receive are of acceptable quality (in case you check). If you have any
+rejections, update the “Rejected Quantity” column in the Items table.
+
+If you reject, you are required to enter a “Rejected Warehouse” to indicate
+where you are storing the rejected Items.
+
+### Quality Inspections
+
+If for certain Items, it is mandatory to record Quality Inspections (if you
+have set it in your Item master), you will need to update the “Quality
+Inspection No” (QA No) column. The system will only allow you to “Submit” the
+Purchase Receipt if you update the “Quality Inspection No”.
+
+### UOM Conversions
+
+If your Purchase Order for an Item is in a different Unit of Measure (UOM)
+than what you stock (Stock UOM), then you will need to update the “UOM
+Conversion Factor”. 
+
+### Currency Conversions
+
+Since the incoming Item affects the value of your inventory, it is important
+to convert it into your base Currency, if you have ordered in another
+Currency. You will need to update the Currency Conversion Rate if applicable.
+
+### Taxes and Valuation
+
+Some of your taxes and charges may affect your Items value. For example, a Tax
+may not be added to your Item’s valuation, because if you sell the Item, you
+will have to add the tax at that time. So make sure to mark all your taxes in
+the Taxes and Charges table correctly for accurate valuation.
+
+### Serial Numbers and Batches
+
+If your Item is serialized or batched, you will have to enter Serial Number
+and Batch in the Item's table. You are allowed to enter multiple Serial Numbers
+in one row (each on a separate line) and you must enter the same number of
+Serial Numbers as the quantity. You must enter each Batch number on a separate
+line.
+
+* * *
+
+#### What happens when the Purchase Receipt is “Submitted”?
+
+A Stock Ledger Entry is created for each Item adding the Item in the Warehouse
+by the “Accepted Quantity” If you have rejections, a Stock Ledger Entry is
+made for each Rejection. The “Pending Quantity” is updated in the Purchase
+Order.
+
+* * *
+
+#### Adding value to your Items post Purchase Receipt:
+
+Some times, certain expenses that add value to your purchased Items are known
+only after a while. Common example is, if you are importing the Items, you
+will come to know of Customs Duty etc only when your “Clearing Agent” sends
+you a bill. If you want to attribute this cost to your purchased Items, you
+will have to use the Landed Cost Wizard. Why “Landed Cost”? Because it
+represents the charges that you paid when it landed in your possession.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
new file mode 100644
index 0000000..328ed08
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md

@@ -0,0 +1,21 @@
+ERPNext has an option for products that are need to be returned to the
+supplier. This may be on account of a number of reasons like defects in goods,
+quality not matching, the buyer not needing the stock, etc.
+
+You can create a Purchase Return by simply making a Purchase Receipt with negative quantity.
+
+First open the original Purchase Receipt, against which supplier delivered the items.
+
+<img class="screenshot" alt="Original Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-original-purchase-receipt.png">
+
+Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
+
+<img class="screenshot" alt="Return Against Purchase Receipt" src="{{docs_base_url}}/assets/img/stock/purchase-return-against-purchase-receipt.png">
+
+On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-stock-ledger.png">
+
+If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/purchase-return-general-ledger.png">
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
new file mode 100644
index 0000000..1ce922d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md

@@ -0,0 +1,27 @@
+Goods sold being returned is quite a common practice in business. They could
+be returned by the customer on quality issues, non-delivery on agreed date, or
+any other reason. 
+
+In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sales Invoice with negative quantity.
+
+First open the original Delivery Note / Sales Invoice, against which customer returned the items.
+
+<img class="screenshot" alt="Original Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-original-delivery-note.png">
+
+Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
+
+<img class="screenshot" alt="Return Against Delivery Note" src="{{docs_base_url}}/assets/img/stock/sales-return-against-delivery-note.png">
+
+You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice.
+
+<img class="screenshot" alt="Return Against Sales Invoice" src="{{docs_base_url}}/assets/img/stock/sales-return-against-sales-invoice.png">
+
+On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-stock-ledger.png">
+
+In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited.
+
+If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
+
+<img class="screenshot" alt="Return Stock Ledger" src="{{docs_base_url}}/assets/img/stock/sales-return-general-ledger.png">
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
new file mode 100644
index 0000000..fbbfb1a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md

@@ -0,0 +1,33 @@
+As we discussed in the **Item** section, if an **Item** is _serialized_, a
+**Serial Number** (Serial No) record is maintained for each quantity of that
+**Item**. This information is helpful in tracking the location of the Serial
+No, its warranty and end-of-life (expiry) information.
+
+**Serial Nos** are also useful to maintain fixed assets. **Maintenance Schedules** can also be created against serial numbers for planning and scheduling maintenance activity for these assets (if they require maintenance).
+
+You can also track from which **Supplier** you purchased the **Serial No** and
+to which **Customer** you have sold it. The **Serial No** status will tell you
+its current inventory status.
+
+If your Item is _serialized_ you will have to enter the Serial Nos in the
+related column with each Serial No in a new line.
+You can maintain single units of serialized items using Serial Number.
+
+### Serial Nos and Inventory
+
+Inventory of an Item can only be affected if the Serial No is transacted via a
+Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales
+Invoice). When a new Serial No is created directly, its warehouse cannot be
+set.
+
+<img class="screenshot" alt="Serial Number" src="{{docs_base_url}}/assets/img/stock/serial-no.png">
+
+* The Status is set based on Stock Entry.
+
+* Only Serial Numbers with status 'Available' can be delivered.
+
+* Serial Nos can automatically be created from a Stock Entry or Purchase Receipt. If you mention Serial No in the Serial Nos column, it will automatically create those serial Nos.
+
+* If in the Item Master, the Serial No Series is mentioned, you can leave the Serial No column blank in a Stock Entry / Purchase Receipt and Serial Nos will automatically be set from that series.
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/setup/index.md b/erpnext/docs/user/manual/en/stock/setup/index.md
new file mode 100644
index 0000000..6f3f1cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/index.md

@@ -0,0 +1,3 @@
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/stock/setup/index.txt b/erpnext/docs/user/manual/en/stock/setup/index.txt
new file mode 100644
index 0000000..b21c4f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/index.txt

@@ -0,0 +1,3 @@
+stock-settings
+item-group
+item-attribute

diff --git a/erpnext/docs/user/manual/en/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
new file mode 100644
index 0000000..0b2ab74
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md

@@ -0,0 +1,16 @@
+You can define Attributes and attribute values for your Item Variants here.
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute.png">
+
+#### Non Numeric Attributes
+
+* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-non-numeric.png">
+
+#### Numeric Attributes
+
+* If your attribute is Numeric, select Numeric Values
+* Specify the Range and the Increment Value
+
+<img class="screenshot" alt="Attribute Master" src="{{docs_base_url}}/assets/img/stock/item-attribute-numeric.png">

diff --git a/erpnext/docs/user/manual/en/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
new file mode 100644
index 0000000..cf6a75a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md

@@ -0,0 +1,26 @@
+Item Group is the classification category. Depending on the type of product,
+categorise it under its respective field. If the product is
+service oriented, name it under the group head - service. If the
+product is used as a raw-material, you have to name it under the Raw-material
+category. In case, your product is used only in trading, you can categorise it
+under Trading.
+
+<img class="screenshot" alt="Item Group Tree" src="{{docs_base_url}}/assets/img/stock/item-group-tree.png">
+
+### Create a Item Group
+
+* Select an Item Group under which you wish to create the group.
+
+* Select 'Add Child'
+
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-new.gif">
+
+### Delete an Item Group
+
+* Select the Item Group you want to delete.
+
+* Select 'delete'
+
+<img class="screenshot" alt="Add Item Group" src="{{docs_base_url}}/assets/img/stock/item-group-del.gif">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
new file mode 100644
index 0000000..f8cb9ea
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md

@@ -0,0 +1,5 @@
+You can set default settings for your stock related transactions here.
+
+<img class="screenshot" alt="Stock Settings" src="{{docs_base_url}}/assets/img/stock/stock-settings.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
new file mode 100644
index 0000000..b7e0860
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md

@@ -0,0 +1,43 @@
+A Stock Entry is a simple document that lets you record Item movement from a
+Warehouse, to a Warehouse and between Warehouses.
+
+To make a Stock Entry you have to go to:
+
+> Stock > Stock Entry > New
+
+<img class="screenshot" alt="Stock Entry" src="{{docs_base_url}}/assets/img/stock/stock-entry.png">
+
+Stock Entries can be made for the following purposes:
+
+* Material Issue - If the material is being issued. (Outgoing Material)
+* Material Receipt - If the material is being received. (Incoming Material)
+* Material Transfer - If the material is being moved from one warehouse to another.
+* Material Transfer for Manufacturing - If the material being transfered is for Manufacturing Process.
+* Manufacture - If the Material is being received from a Manufacturing/Production Operation.
+* Repack - If the Original item/items is being repacked into new item/items.
+* Subcontract - If the Material is being issued for a sub-contract activity.
+
+In the Stock Entry you have to update the Items table with all your
+transactions. For each row, you must enter a “Source Warehouse” or a “Target
+Warehouse” or both (if you are recording a movement).
+
+**Additional Costs:**
+
+If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) assotiated with the process. The additional costs will be considered to calculate valuation rate of the items.
+
+To add additional costs, enter the description and amount of the cost in the Additional Costs table.
+
+<img class="screenshot" alt="Stock Entry Additional Costs" src="{{docs_base_url}}/assets/img/stock/additional-costs-table.png">
+
+The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate.
+
+<img class="screenshot" alt="Stock Entry Item Valuation Rate" src="{{docs_base_url}}/assets/img/stock/stock-entry-item-valuation-rate.png">
+
+If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
+
+<img class="screenshot" alt="Additional Costs General Ledger" src="{{docs_base_url}}/assets/img/stock/additional-costs-general-ledger.png">
+
+
+> **Note:** To update Stock from a spreadsheet, see Stock Reconciliation.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/stock-how-to.md b/erpnext/docs/user/manual/en/stock/stock-how-to.md
new file mode 100644
index 0000000..e0f5b2f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/stock-how-to.md

@@ -0,0 +1,2 @@
+This page contains most frequently asked questions on Stocks.
+

diff --git a/erpnext/docs/user/manual/en/stock/tools/index.md b/erpnext/docs/user/manual/en/stock/tools/index.md
new file mode 100644
index 0000000..6f3f1cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/index.md

@@ -0,0 +1,3 @@
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/stock/tools/index.txt b/erpnext/docs/user/manual/en/stock/tools/index.txt
new file mode 100644
index 0000000..3aca9b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/index.txt

@@ -0,0 +1,3 @@
+packing-slip
+quality-inspection
+landed-cost-voucher

diff --git a/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
new file mode 100644
index 0000000..1209aff
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md

@@ -0,0 +1,33 @@
+Landed Cost is the total cost of a product to reach the product at the buyer’s door. Landed costs include the original cost of the item, complete shipping costs, customs duties, taxes, insurance and currency conversion fees etc. All of these components might not be applicable in every shipment, but relevant components must be considered as a part of the landed cost.
+
+> To understand landed cost better, let’s take an example based on our daily lives. You need to purchase a new washing machine for your home. Before making actual purchase, you probably do some investigation to know the best price. In this process, you often found a better deal from a store which is long away from your home. But you should also consider shipping cost while buying from that store. Total cost including transportation might be more than the price you get in your nearby store. In that case you will choose to buy from  your nearest store, as landed cost of the item is cheaper in the nearest store.
+
+Similarly in business, identifying landed cost for a item / product is very crucial, as it helps to decide selling cost of that item and impacts company’s profitability. Hence all applicable landed cost charges should be included in item’s valuation rate.
+
+According to the [Third-Party Logistics Study](http://www.3plstudy.com/), only 45% of the respondents stated that they use Landed Cost extensively. The main reasons of not using Landed Cost are unavailability of necessary data (49%), lack of right tools (48%), do not have sufficient time (31%) and not sure how to apply landed cost (27%).
+
+### Landed Cost via Purchase Receipt
+
+In ERPNext, you can add landed cost related charges in “Taxes and Charges” table while creating Purchase Receipt (PR). You should add those charges for “Total and Valuation” or “Valuation”. Charges which are payable to the same supplier from whom you are buying the items, should be tagged as “Total and Valuation”. Otherwise if applicable charges are payable to a 3rd party, it should be tagged as “Valuation”. On submission of PR, system will calculate landed cost of all items, considering those charges and that landed cost will be considered to calculate item’s valuation rate (based on FIFO / Moving Average method).
+
+But in reality, while making Purchase Receipt we might not know all the charges which are applicable for landed cost. Your transporter can send the invoice after 1 month, but there is no point in waiting for booking Purchase Receipt till then. Companies who imports their products / parts, pays a huge amount as Customs Duty. And generally they get invoices from Customs Department after a period of time. In these cases, “Landed Cost Voucher” becomes handy, as it allows you to add those additional charges on a later date, and to update landed cost of purchased items.
+
+### Landed Cost Voucher
+
+You can update landed cost any time in the future via Landed Cost Voucher.
+
+> Stock > Tools > Landed Cost Voucher
+
+In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount.
+
+<img class="screenshot" alt="Landed Cost Vouher" src="{{docs_base_url}}/assets/img/stock/landed-cost.png">
+
+### What happend on submission?
+
+1. On submission of Landed Cost Voucher, the applicable landed cost charges are updated in Purchase Receipt Item table.
+
+2. Valuation Rate of items are recalculated based on new landed cost. 
+
+3. If you are using “Perpetual Inventory”, the system will post general ledger entries to correct Stock-in-Hand balance. It will debit (increase) corresponding “warehouse account” and credit (decrease) “Expense Included in Valuation” account. If items are already delivered, the Cost-of-Goods-Sold (CoGS) value has been booked as per old valuation rate. Hence, general ledger entries are reposted for all future outgoing entries of associated items, to correct CoGS value.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
new file mode 100644
index 0000000..0820959
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md

@@ -0,0 +1,7 @@
+A packing slip is a document listing the items in a shipment. Usually attached to the goods delivered.
+While Shipping a product 'Draft' for Delivery Notes are created.
+You can make a Packing Slip from these Delivery Notes (Draft)
+
+<img class="screenshot" alt="Packing Slip" src="{{docs_base_url}}/assets/img/stock/packing-slip.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
new file mode 100644
index 0000000..34bea40
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md

@@ -0,0 +1,8 @@
+In ERPNext, you can mark your incoming or outgoing products for Quality
+Inspection. To enable ERPNext to perform this function, go to :
+
+> Stock > Quality Inspection > New
+
+<img class="screenshot" alt="Quality Inspection" src="{{docs_base_url}}/assets/img/stock/quality-inspection.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
new file mode 100644
index 0000000..d86f401
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md

@@ -0,0 +1,38 @@
+A warehouse is a commercial building for storage of goods. Warehouses are used
+by manufacturers, importers, exporters, wholesalers, transport businesses,
+customs, etc. They are usually large plain buildings in industrial areas of
+cities, towns, and villages. They mostly have loading docks to load and unload
+goods from trucks.
+
+To go to Warehouse, click on Stock and go to Warehouse under Masters.  You
+could also go to the Setup module and click on Warehouse under Master Data.
+
+> Stock > Warehouse > New Warehouse
+
+<img class="screenshot" alt="Warehouse" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
+
+In ERPNext, every Warehouse must belong to a specific company, to maintain
+company wise stock balance. The Warehouses are saved with their respective
+company’s abbreviations. This facilitates in identifying which Warehouse
+belongs to which company, at a glance.
+
+You can include user restrictions for these Warehouses. In case you do not
+wish a particular user to operate on a particular Warehouse, you can refrain
+the user from accessing that Warehouse.
+
+### Merge Warehouse
+
+In day to day transactions, duplicate entries are done by mistake, resulting
+in duplicate Warehouses. Duplicate records can be merged into a single
+Warehouse. From the top bar of the system select the File menu. Select Rename
+and Enter the correct Warehouse and check the Merge button. The system will
+replace all the links of wrong Warehouse with the correct Warehouse, in all
+transactions. Also, the available quantity (actual qty, reserved qty, ordered
+qty etc) of all items in the duplicate warehouse will be transferred to the
+correct warehouse. Once merging is done, delete the duplicate Warehouse.
+
+> Note: ERPNext system maintains stock balance for every distinct combination
+of Item and Warehouse. Thus you can get stock balance for any specific Item in
+a particular Warehouse on any particular date.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/support/index.md b/erpnext/docs/user/manual/en/support/index.md
new file mode 100644
index 0000000..7777049
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/index.md

@@ -0,0 +1,15 @@
+Great customer support and maintenance is at the heart of any successful small
+business. ERPNext gives you the tools to track all incoming requests and issues
+from your customers so that you can respond quickly. Your database of incoming
+queries will also help you track where the biggest opportunities are for
+improvements.
+
+In this module, you can track incoming queries from your email using Support
+Ticket. You can keep track on Customer Issues raised by Customers on specific
+Serial No and respond to them based on their warranty and other information.
+You can also make Maintenance Schedules for Serial Nos and keep a record of
+all Maintenance Visits made to your Customers.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/support/index.txt b/erpnext/docs/user/manual/en/support/index.txt
new file mode 100644
index 0000000..eaff69e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/index.txt

@@ -0,0 +1,4 @@
+issue
+warranty-claim
+maintenance-visit
+maintenance-schedule

diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
new file mode 100644
index 0000000..246af8d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/issue.md

@@ -0,0 +1,47 @@
+Issue is an incoming query from your Customer, usually via email or
+from the “Contact” section of your website. (To fully integrate the Support
+Ticket to email, see the Email Settings section).
+
+> Tip: A dedicated support email id is a good way to integrate incoming
+queries via email. For example, you can send support queries to ERPNext at
+support@erpnext.com and it will automatically create a Issue in the
+Frappe system.
+
+
+
+> Support > Issue > New Issue
+
+<img class="screenshot" alt="Issue" src="{{docs_base_url}}/assets/img/support/issue.png">
+
+#### Discussion Thread
+
+When a new email is fetched from your mailbox, a new Issue record is
+created and an automatic reply is sent to the sender indicating the Support
+Ticket Number. The sender can send additional information to this email. All
+subsequent emails containing this Issue number in the subject will be
+added to this Issue thread. The sender can also add attachments to
+the email.
+
+Issue maintains all the emails which are sent back and forth against
+this issue in the system so that you can track what transpired between the
+sender and the person responding.
+
+#### Status
+
+When a new Issue is created, its status is “Open”, when it is
+replied, its status becomes “Waiting for Reply”. If the sender replies back
+its status again becomes “Open”.
+
+#### Closing
+
+You can either “Close” the Issue manually by clicking on “Close
+Ticket” in the toolbar or if its status is “Waiting For Reply” . If the sender
+does not reply in 7 days, then the Issue closes automatically.
+
+#### Allocation
+
+You can allocate the Issue by using the “Assign To” feature in the
+right sidebar. This will add a new To Do to the user and also send a message
+indicating that this Issue is allocated.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
new file mode 100644
index 0000000..e211562
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md

@@ -0,0 +1,31 @@
+All machines require regular maintenance, specially those that contain a lot
+of moving parts, so if you are in the business of maintaining those or have
+some of them in your own premises, this is a useful tool to plan a calendar of
+activities for its maintenance.
+
+If the Customer Issue refers to “Breakdown Maintenance”, this refers to
+“Preventive Maintenance”.
+
+To create a new Maintenance Schedule go to:
+
+> Support > Maintenance Schedule > New Maintenance Schedule
+
+<img class="screenshot" alt="Maintenance Schedule" src="{{docs_base_url}}/assets/img/support/maintenance-schedule.png">
+
+In the Maintenance Schedule, there are two sections:
+
+In the first section, you select the Items for which you want to generate the
+schedule and set how frequently you want to plan a visit or a maintenance.
+These can be optionally fetched from a Sales Order. After selecting the Items,
+“Save” the record.
+
+The second section contains the maintenance activities planned in the
+schedule. “Generate Schedule” will generate a separate row for each
+maintenance activity.
+
+Each Item in a Maintenance Schedule is allocated to a Sales Person.
+
+When the document is “Submitted” Calendar events are created in the User of
+the Sales Person for each maintenance.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
new file mode 100644
index 0000000..e93260d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md

@@ -0,0 +1,17 @@
+A Maintenance Visit is a record of a visit made by an engineer to a
+Customer’s premise usually against a Customer Issue. You can create a new
+Maintenance Visit from:
+
+> Support > Maintenance Visit > New Maintenance Visit
+
+<img class="screenshot" alt="Maintenance Visit" src="{{docs_base_url}}/assets/img/support/maintenance-visit.png">
+
+The Maintenance Visit contains information about the:
+
+  * Customer.
+  * The Items that were inspected / maintenance activity was carried out on.
+  * Details of actions taken.
+  * The person who carried out the actions.
+  * Feedback from the Customer.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
new file mode 100644
index 0000000..0a58e18
--- /dev/null
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md

@@ -0,0 +1,23 @@
+If you are selling **Items** under warranty or if you have sold and extended
+service contract like the Annual Maintenance Contract (AMC), your **Customer**
+may call you about an issue or a break-down and give you the Serial No of this
+Item.
+
+To record this, you can create a new **Warranty Claim** and add the
+**Customer** and **Item** / **Serial No**. The system will then automatically
+fetch the Serial No’s details and indicate whether this is under warranty or
+AMC.
+
+You must also add a description of the **Customer**’s issue and assign it to
+the person who needs to look into solving the issue.
+
+To create a new **Warranty Claim**:
+
+> Support > Warranty Claim > New Warranty Claim
+
+![Warranty Claim]({{docs_base_url}}/assets/img/support/warranty-claim.png)
+
+If a Customer visit is required to address the issue, you can create a new
+Maintenance Visit record from this.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
new file mode 100644
index 0000000..91f7950
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md

@@ -0,0 +1,10 @@
+<h1>Adding Attachments to Outgoing Messages</h1>
+
+ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext.
+
+If you have some files attached in your transaction (say Purchase Order), which needs to be emailed with Purchase Order details. When click on Email option, at the end of the Communication dialog box, you will find all the attachments listed with check-box option. You should check files which needs to be emailed as an attachment to recipient.
+
+![Emailing Attachments]({{docs_base_url}}/assets/img/articles/$SGrab_422.png)
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
new file mode 100644
index 0000000..27ad650
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md

@@ -0,0 +1,27 @@
+<h1>Checking Link Between Documents</h1>
+
+Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document.
+
+![linked with icon]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png)
+
+####Scenario
+
+If you need to check which Delivery Note and Sales Invoice has been created against Sales Order, you should open Sales Order document, and click on Linked With in it.
+
+![Sales Order Links]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png)
+
+Since Sales Order is a centralize transaction, using linked-with option in the Sales Order, you can track complete deal, like billing done, purchases made, manufacturing development against this particular order.
+
+####How It Works?
+
+When you check Linked With in for a Sales Order, it lists all the record where this Sales Order ID is updated. It will not show documents where this Sales Order Id is entered as text, and not in the link field.
+
+####Backward Links
+
+If I check Linked With in the Delivery Note, will it list Sales Order created before this delivery  note?
+
+Linked With function works only for the forward linkages. For the backward linkages, you should check current document itself. In the Delivery Note, you can check Item table to see which Sales Order it is linked with.
+
+![Linked With Backward]({{docs_base_url}}/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
new file mode 100644
index 0000000..dad85ad
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md

@@ -0,0 +1,27 @@
+<h1>Delete Submitted Document</h1>
+
+ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions.
+
+To delete any document from system you should cancel all linked documents. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against that Sales Order. Then you should cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order. If payment entry was also made against Sales Invoice, then you should first Cancel and Delete that Journal Voucher, and then come to Sales Invoice.
+
+Following are step to delete submitted documents.
+
+####1. Cancel Document
+
+To be able to delete Submitted document, it must be cancelled first. After document is cancelled, you will find option to delete it.
+
+![Cancel Sales Order]({{docs_base_url}}/assets/img/articles/Selection_064.png)
+
+####2. Delete Document
+
+After cancellation, go to File menu and click on Delete option.
+
+![Cancel Sales Order]({{docs_base_url}}/assets/img/articles/Selection_066.png)
+
+#### Deleting from List
+
+For bulk deletion, you can select multiple Cancelled records and delete them at once from the list.
+
+![Cancel Sales Order List]({{docs_base_url}}/assets/img/articles/Selection_069.png)
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
new file mode 100644
index 0000000..2a1c0b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md

@@ -0,0 +1,17 @@
+<h1>Duplicate a Record</h1>
+
+ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster.
+
+####Scenario
+
+An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you can open previous order, and Copy it to create new order faster. On copying, details of the previous transaction will be updated in the new form. You can make changes where needed and submit the transaction.
+
+You will find Copy option under:
+
+File > Copy
+
+![Copy]({{docs_base_url}}/assets/img/articles/Order Copy.png)
+
+When Copy function is executed, values are mapped field-by-field from existing to new form.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.md b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
new file mode 100644
index 0000000..460fa16
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt

@@ -0,0 +1,10 @@
+adding-attachments-to-outgoing-messages
+check-link-between-documents
+delete-submitted-document
+duplicate-record
+managing-attachments
+merging-documents
+rename-tool
+renaming-documents
+search-filters
+tree-master-renaming
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
new file mode 100644
index 0000000..e7420b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md

@@ -0,0 +1,20 @@
+<h1>Adding Attachments in a Documents</h1>
+
+ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured.
+
+Open to attach file is at the footer of a form.
+
+![Sales Order File Attachment]({{docs_base_url}}/assets/img/articles/$SGrab_406.png)
+
+Click on Attach to browse and select the file.
+
+![Sales Order Select File]({{docs_base_url}}/assets/img/articles/$SGrab_407.png)
+
+If you maintain separate server for the files, or use online service like Dropbox, you can provide link of a particular file in the document in ERPNext.
+
+![Sales Order File Link]({{docs_base_url}}/assets/img/articles/$SGrab_408.png)
+
+`For hosted users, limit of 1 MB is applied on file size.`
+
+To ensure there are not many files attached against the document, which can lead to your system slowing down, you can set limit as how many files can be attached against particular document. Click [here](https://erpnext.com/kb/customize/increase-max-attachments) to learn more about it.
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
new file mode 100644
index 0000000..08a2620
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md

@@ -0,0 +1,32 @@
+<h1>Merging Documents </h1>
+
+Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext. 
+
+Following are step to merge document in existing document. Let's assume we are merging Account Ledger.
+
+#### 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### 2: Go to Account 
+
+Click on Rename option of that account, which you want to merge in existing account.
+
+#### 3: Merge Account
+
+Enter existing account name in New Name field and check Mark on "Merge with existing" option. Then press 'Rename' button to merge.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_043.png)
+
+Following is how merged account will appear in the Chart of Account master.
+
+![New Account]({{docs_base_url}}/assets/img/articles/Selection_044.png)
+
+###Effect of Merging 
+
+Merging document affects existing transaction where this record is selected. As well as it will affected on existing document balance.
+
+<div class="well"> Note: You can't merge Group into Ledger documents. As well as Ledger into Group documents. Also this feature is applicable for few documents only.</div>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
new file mode 100644
index 0000000..3bae21d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md

@@ -0,0 +1,37 @@
+<h1>Rename Tool</h1>
+
+ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role.
+
+There are two ways you can rename records in your account. You can follow the approach based on how many records needs to be renamed.
+
+###Rename Record via Rename Tool
+
+Using this tool you can correct/rectify primary ids of 500 records at a time.
+
+Following are step to rename bulk records in ERPNext. Let's assume we are renaming Item Codes for existing Items.
+
+#### Step 1: Open Excel File
+
+In new excel file enter old Item Ids in one column and enter new Item Ids in exact next column. Then save data file in .csv format.
+
+![Data File]({{docs_base_url}}/assets/img/articles/Selection_018ef32b6.png)
+
+#### Step 2: Upload Data File
+
+To upload data file go to,
+
+`Setup > Data > Rename Tool`
+
+Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
+
+![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) 
+
+Following are the renamed Item Codes.
+
+![New Name]({{docs_base_url}}/assets/img/articles/Selection_019bf0547.png)
+
+###Rename Individual Document
+
+Click [here](https://erpnext.com/kb/tools/renaming-documents) for detailed steps on how to rename document one by one.
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
new file mode 100644
index 0000000..064f41d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md

@@ -0,0 +1,69 @@
+<h1>Renaming Documents</h1>
+
+ERPNext has Renaming feature which allows you to correct primary id of a record. 
+	
+Following are step to rename document in ERPNext. Let's assume we are renaming Item Code for existing Item.
+ 
+#### 1. Go to Item
+
+`Stock > Documents > Item List > (Open Item)`
+
+Open Item for which Item Code needs to be renamed.
+
+#### 2. Go to File
+
+![Item]({{docs_base_url}}/assets/img/articles/Selection_013.png)
+
+#### 3. Rename
+
+Enter desired Item Code, and click on "Rename".
+
+![Renamed Item]({{docs_base_url}}/assets/img/articles/Selection_0149d98bf.png)
+
+###Effect of Renaming
+
+Renaming document affects existing transaction where this record is selected. Consider given example, Item Code for a given item will be updated in the existing transaction as well.
+
+###See Also
+
+1. [Bulk Renaming](https://erpnext.com/kb/tools/rename-tool)
+2. [Document Merging](https://erpnext.com/kb/tools/merging-documents)
+
+**List of Renamable Documents**
+
+1. Contact        					     	
+2. Address         					     	
+3. Warehouse       			   
+4. Supplier        		
+5. Customer      						    	
+6. User           				    	
+7. Sales Partner  		
+8. Project	   		
+9. Cost Center	   	
+10. Item Group
+11. Item	   	
+12. Company
+13. Role
+14. Earning Type
+15. Note 
+16. Serial No
+17. Account
+18. Territory
+19. Terms and Conditions
+20. Supplier Type	
+21. Workstation		
+22. Employee
+23. Sales Taxes and Charges Master
+24. Purchase Taxes and Charges Master
+25. Price List
+26. Party Type	
+27. Mode of Payment
+28. Designation
+29. Department
+30. Deduction Type
+31. Customer Group
+32. Brand	
+33. Branch
+34. Sales Person
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
new file mode 100644
index 0000000..0853ab1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md

@@ -0,0 +1,39 @@
+<h1>Search Filters</h1>
+
+Search Filter option allows user to filter records based on value in the specific fields of that form.
+
+Search Filter option is available on the List View page of transactions.
+
+![Filter in List]({{docs_base_url}}/assets/img/articles/$SGrab_323.png)
+
+Each filter option has three fields to select value in.
+
+#### Field
+
+Select field of the form based on which you wish to filter records.
+
+![Filter Field]({{docs_base_url}}/assets/img/articles/$SGrab_327.png)
+
+#### Based On
+
+With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
+
+![Filter Based On]({{docs_base_url}}/assets/img/articles/$SGrab_328.png)
+
+#### Value
+
+A value should be entered in this field based on while records will be filtered.
+
+![Filter Value]({{docs_base_url}}/assets/img/articles/$SGrab_329.png)
+
+After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
+
+![Filter Result]({{docs_base_url}}/assets/img/articles/$SGrab_330.png)
+ 
+On the transactions, Document Status - Not Equal To - Cancelled is applied by default. With this, Cancelled transactions are hidden from the list. 
+
+![Default filter]({{docs_base_url}}/assets/img/articles/$SGrab_331.png)
+
+You can apply multiple filters on a list of transactions one-by-one. To remove specific filter, just click on cancelled (X) sign ahead of it.
+
+<!-- markdown -->

diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
new file mode 100644
index 0000000..30aa979
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md

@@ -0,0 +1,29 @@
+<h1>Tree Master Renaming</h1>
+
+There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext.
+
+Following are the steps to be followed for renaming Account/Ledger ID, master which is maintained in tree structure. These steps will be applicable for renaming any master which is maintained in tree structure.
+
+#### Step 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### Step 2: Go to Account 
+
+Expand Chart of Accounts and click on that account which you want to rename. When you click on that account, you will find Rename option.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_028.png)
+
+#### Step 2: Rename Account
+
+On clicking Rename option, dialog box will give you field to enter New Name for this Account. You should enter new name for the Account/Ledger and click on "Rename" button. On clicking Rename button, existing account will be renamed.
+
+![Account]({{docs_base_url}}/assets/img/articles/Selection_029.png)
+
+Following is how renamed account will appear in the Chart of Account master.
+
+![New Account]({{docs_base_url}}/assets/img/articles/Selection_030.png)
+  
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/using-erpnext/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
new file mode 100644
index 0000000..6ecd377
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md

@@ -0,0 +1,40 @@
+Assign To feature in ERPNext allows you to allocate particular document to specific user, whom needs to further work on that document.
+
+For example, if Sales Order needs to be approved/submitted by Sales Manager, first draft user can allocate that Sales Order to Sales Manager. On allocating document to Sales Manager, it will be added to that user's ToDo list. Same way, allocation can also be done to Material User and Account user who needs to create Delivery Note and Sales Invoice respectively against this Sales Note.
+
+<div class=well>Permissions restriction cannot be done based on Assigned To</div>
+
+Following are the steps to assign document to another user.
+
+#### Step 1: Click on the Assign To Button
+
+Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
+
+![Assigned To Icon]({{docs_base_url}}/assets/old_images/erpnext/assigned-to-icon.png)
+
+
+![Assigned To]({{docs_base_url}}/assets/old_images/erpnext/assigned-to.png)
+
+#### Step 2: Assign to User
+
+In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
+
+![Assign User]({{docs_base_url}}/assets/old_images/erpnext/assign-user.png)
+
+With assignment, you can also leave a comment for the review of asignee.
+
+####ToDo List of Assignee
+
+This transaction will appear in the To-do list of the ser in “Todo” section.
+
+![Assign Todo]({{docs_base_url}}/assets/old_images/erpnext/assign-todo.png)
+
+####Removing Assignment
+
+User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
+
+![Assign Remove]({{docs_base_url}}/assets/old_images/erpnext/assign-remove.png)
+
+Once assignment is set as completed, Status of its ToDo record will be set as Closed.
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
new file mode 100644
index 0000000..de564be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md

@@ -0,0 +1,63 @@
+The Calendar is a tool where you can create and share Events and also see
+auto-generated events from the system.
+
+You can switch calender view based on Month, Week and Day.
+
+###Creating Events in Calender
+
+####Creating Event Manually
+
+To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view.
+
+This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
+
+![Calender Event Manually]({{docs_base_url}}/assets/old_images/erpnext/calender-event-manually.png)
+
+Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
+
+####Event Based on Lead
+
+In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person person specified in this field.
+
+![Calender Event Lead]({{docs_base_url}}/assets/old_images/erpnext/calender-event-lead.png)
+
+####Birthday Event
+
+Birthday Event is created based on Date of Birth specified in the Employee master.
+
+###Recurring Events
+
+You can set events as recurring in specific interval by Checking the "Repeat This
+Event".
+
+![Calender Event Recurring]({{docs_base_url}}/assets/old_images/erpnext/calender-event-recurring.png)
+
+###Permission for Event
+
+You can set Event as Private or Public. Private Events will be visible only to you, and if any other user selected in the participants table. Instead of User, you can also assign permission for event based on Role.
+
+Public Event, like Birthday will be visible to all.
+
+![Calender Event Permission]({{docs_base_url}}/assets/old_images/erpnext/calender-event-permission.png)
+
+###Event Reminders
+
+There are two ways you can receive email reminder for an event.
+
+####Enable Reminder in Event
+
+In the Event master, checking "Send an email reminder in the morning" will trigger notifcation email to all the participants for this event.
+
+![Calender Event Notification]({{docs_base_url}}/assets/old_images/erpnext/calender-event-notification.png)
+
+####Create Email Digest
+
+To get email reminders for event, you should set Email Digest for Calender Events.
+
+Email Digest can be set from:
+
+`Setup > Email > Email Digest`
+
+![Calender Email Digest]({{docs_base_url}}/assets/old_images/erpnext/calender-email-digest.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
new file mode 100644
index 0000000..8ce9b68
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md

@@ -0,0 +1,19 @@
+### Assigned to
+
+You can email any transaction from the system by clicking on the “Assigned to”
+button in the right sidebar. A log of all your sent emails will be maintained
+in Communication.
+
+![Forms]({{docs_base_url}}/assets/old_images/erpnext/forms.png)
+
+### Comments
+
+Comments are a great way to add information about a transaction that is not a
+part of the transactions. Like some background information etc. Comments can
+be added in the right sidebar.
+
+### Tags
+
+[Read more about Tags]({{docs_base_url}}/user/manual/en/collaboration-tools/tags.html)  
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.md b/erpnext/docs/user/manual/en/using-erpnext/index.md
new file mode 100644
index 0000000..93f080e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.md

@@ -0,0 +1,15 @@
+We live in an era when people are very comfortable communicating, discussing,
+asking, assigning work and getting feedback electronically. The Internet acts
+as a great medium to collaborate on work too. Taking this concept into ERP
+system, we have designed a bunch of tools whereby you can Assign transactions,
+manage your To Dos, share and maintain a Calendar, maintain a company wise
+Knowledge Base, Tag and Comment on transactions and send your Orders, Invoices
+etc via Email. You can also send instant messages to other users using the
+Messaging tool.
+
+These tools are integrated into all aspects of the product so that you can
+effectively manage your data and collaborate with your co-workers.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
new file mode 100644
index 0000000..259835e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt

@@ -0,0 +1,8 @@
+to-do
+collaborating-around-forms
+messages
+notes
+calendar
+assignment
+tags
+articles

diff --git a/erpnext/docs/user/manual/en/using-erpnext/messages.md b/erpnext/docs/user/manual/en/using-erpnext/messages.md
new file mode 100644
index 0000000..dfa0526
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/messages.md

@@ -0,0 +1,12 @@
+You can send and receive messages from the system by using the Messages tool.
+If you send a message to a user, and the user is logged in, it will appear as
+a popup message and the unread messages counter in the top toolbar will be
+updated.
+
+![Message List]({{docs_base_url}}/assets/old_images/erpnext/message-list.png)
+
+You can choose to send message to all the users, or to specific user.
+
+![Messsage To]({{docs_base_url}}/assets/old_images/erpnext/message-to.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
new file mode 100644
index 0000000..cc88aec
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md

@@ -0,0 +1,21 @@
+You can store your long notes under this section. It can contain your partner lists, frequently used passwords, terms and conditions, or any other document which needs to be shared. Following are the steps to create new Note.
+
+####Go to Note
+
+`Home > Note > New`
+
+####Notes Details
+
+Enter Title and Context.
+
+![Note]({{docs_base_url}}/assets/old_images/erpnext/note.png)
+
+####Set Permissions to select Users
+
+To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table.
+
+![Note Permission]({{docs_base_url}}/assets/old_images/erpnext/note-permission.png)
+
+<div class=well>Notes can also be used as a knowledge base internally. You can also attach file in the Notes, and make it accessible to specific set of users only.</div>
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
new file mode 100644
index 0000000..6f6c983
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md

@@ -0,0 +1,5 @@
+Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list.
+
+![Tags]({{docs_base_url}}/assets/old_images/erpnext/tags-in-list.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/using-erpnext/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
new file mode 100644
index 0000000..03f84d5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md

@@ -0,0 +1,10 @@
+To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned
+by you are listed. You can also add your own to-do items in the list.
+
+![Todo List]({{docs_base_url}}/assets/old_images/erpnext/todo-list.png)
+
+When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo record itself.
+
+![Todo Close]({{docs_base_url}}/assets/old_images/erpnext/todo-close.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
new file mode 100644
index 0000000..3bad0df
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md

@@ -0,0 +1,69 @@
+### Add Products to the Website
+
+To list your Item on the Website, fill the Item details and save the file.
+Once the file is saved, a plus (+) button will appear next to the Image icon.
+Click on the plus button and add your Item image. The html code will be
+generated automatically.
+
+##### Step 1: Save Image
+
+![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage.png)
+
+  
+
+##### Step 2: Check the 'Show in Website' box.
+
+Under the Website section, please check the box that says 'show in Website'.
+Once the box is checked, the page will display other fields for entering
+information.
+
+![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage-1.png)
+
+  
+
+##### Step 3: Enter Website Details
+
+![Webimage]({{docs_base_url}}/assets/old_images/erpnext/item-webimage-2.png)
+
+The page name will be generated automatically. Mention the Item-Group under
+which the Item will be displayed.
+
+#### Item Groups
+
+Mention the Item Group under this column. If you wish to list your Item under
+the broad category products, name your Item Group as Products. In case you
+have various varieties of Item and want to classify them under different
+names, make Item Groups with those names and check the box that says 'show in
+Website'. For Example, if you wish to create a category called 'Bags', create
+a Item Group named Bags.
+
+![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-webimage-bags.png)
+
+Once the Item Group is created go to the Website Settings page under Website.
+Enter the Label, Url, and Parent Label.
+
+![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-website-settings.png)
+
+  
+
+#### Webpage labels
+
+![Webpage]({{docs_base_url}}/assets/old_images/erpnext/webpage-labels.png)
+
+Add more Items under a particular Item Group.
+
+To add more Items under a certain Label, mention the Item Group on the Item
+Page. The Items will be added automatically on the Webpage, under the Item
+Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
+check the 'Show in Website'box. The Items will be placed under the Label Bags
+on the Webpage.
+
+![Item Group]({{docs_base_url}}/assets/old_images/erpnext/itemgroup-websettings.png)
+
+  
+
+Item Group Display
+
+![Item Group Display]({{docs_base_url}}/assets/old_images/erpnext/webpage-itemgroup-display.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/website/articles/index.md b/erpnext/docs/user/manual/en/website/articles/index.md
new file mode 100644
index 0000000..0dff60b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.md

@@ -0,0 +1 @@
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
new file mode 100644
index 0000000..a89040a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt

@@ -0,0 +1,3 @@
+managing-user-sign-up-via-website
+website-security
+wesite-home-page
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
new file mode 100644
index 0000000..cef6b7a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html

@@ -0,0 +1,6 @@
+<h1>Managing User Sign Up via Website</h1>
+
+Users can sign up for ERPNext account via the ERPNext Website.<div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg"><br></div><div><br></div><div>As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.</div><div>One might want to disable this feature to prevent anonymous users from signing up via the web.</div><div>To do so -</div><div>1. Go to&nbsp;<span style="line-height: 1.42857143;">` Website > Setup > Website Settings `&nbsp;</span></div><div>2. In website settings doctype navigate to the misc section.</div><div>3. Check the disable SignUp check-box and save the doc.</div><div><br></div><div>Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.</div><div><br></div>
+
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.html b/erpnext/docs/user/manual/en/website/articles/website-security.html
new file mode 100644
index 0000000..1371ca5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.html

@@ -0,0 +1,3 @@
+<h1>Website Security</h1>
+
+<div><span style="line-height: 1.42857143;">One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.</span><br></div><div><span style="line-height: 1.42857143;"><br></span></div><div>Well at the moment this feature is not available. You cannot&nbsp;<span style="line-height: 1.42857143;">limit the access of the website generated by ERPNext to certain people.&nbsp;</span><span style="line-height: 1.42857143;">If you publish the website it will be&nbsp;</span><span style="line-height: 1.42857143;">publicly</span><span style="line-height: 1.42857143;">&nbsp;visible.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><span style="line-height: 1.42857143;">However while you cannot control who can view the website, you can always choose which items to display on the website.</span></div><div><span style="line-height: 1.42857143;"><br></span></div><div><ul><li><span style="line-height: 1.42857143;">To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox.</span><br></li></ul></div><div><span style="line-height: 1.42857143;"><br></span></div><div><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-26 at 10.43.51 am.png"></div></blockquote></div><div><ul><li><span style="line-height: 1.42857143;">You can also fill in the details of the product as to be shown on the website here.</span><br></li></ul></div>
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
new file mode 100644
index 0000000..363926e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md

@@ -0,0 +1,23 @@
+<h1>Wesite Home Page</h1>
+
+It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
+
+#### **Step 1: Open Website Settings Page.**
+To Open website settings page go to:
+
+`Website > Setup > Website Settings`
+
+
+#### **Step 2: Set Home page.**
+
+Enter standard page like, index, login, products, blog, about, contact etc. as Home Page in Landing Page section of Website Settings page. For e.g consider you want login page as your default website home page.      
+
+![Website Setting Home]({{docs_base_url}}/assets/img/articles/Selection_021.png)
+
+#### **Step 3: Save Website Settings Form.**
+
+After setting up Home Page Press 'Save' button from website settings page and refresh the system from Help menu.Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
+
+![Website Home Page]({{docs_base_url}}/assets/img/articles/Selection_022.png)    
+
+<!-- markdown -->
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md
new file mode 100644
index 0000000..dbf7b17
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/blog-post.md

@@ -0,0 +1,20 @@
+Blogs are a great way to share your thoughts about your business and keep your
+customers and readers updated of what you are up to.
+
+In the age of internet, writing assumes a lot of significance because when
+people come to your website, they want to read about you and your product.
+
+To create a new blog, just create a new Blog from:
+
+> Website > Blog > New Blog
+
+<img class="screenshot" alt="Blog Post" src="{{docs_base_url}}/assets/img/website/blog-post.png">
+
+You can format a blog using the Markdown format.You can also access your blog
+by going to the page “blog.html”.
+
+#### A sample blog-page.
+
+<img class="screenshot" alt="Blog Sample" src="{{docs_base_url}}/assets/img/website/blog-sample.png">
+
+{next}

diff --git a/erpnext/docs/user/manual/en/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
new file mode 100644
index 0000000..cb39f80
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/blogger.md

@@ -0,0 +1,6 @@
+Blogger is a user who can post blogs. 
+You can mention a shori bio about the blogger and also set a avatar here.
+
+<img class="screenshot" alt="Blogger" src="{{docs_base_url}}/assets/img/website/blogger.png">
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/index.md b/erpnext/docs/user/manual/en/website/index.md
new file mode 100644
index 0000000..a499316
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.md

@@ -0,0 +1,30 @@
+Websites are a core component of any business and having a good website
+usually means:
+
+  * Invest lot of money.
+  * Difficult to update.
+  * Not interactive.
+
+Unless you are a web designer yourself.
+
+Wouldn't it be nice if there was a way to update your product catalog on your
+site automatically from your ERP?
+
+We thought exactly the same and hence built a small Website Development app
+right inside ERPNext! Using ERPNext’s Website module, you can
+
+  1. Create Web Pages
+  2. Write a Blog
+  3. Publish your Product Catalog using the Item master
+
+We will soon be adding a shopping cart facility so that your customers can
+place orders and pay you online!
+
+Though not necessary, to make a good website, you might have to know a bit of
+HTML / CSS or hire the services of a professional. The good part is that once
+this is setup, you can add and edit content, blogs and products directly from
+your ERP.
+
+### Topics
+
+{index}

diff --git a/erpnext/docs/user/manual/en/website/index.txt b/erpnext/docs/user/manual/en/website/index.txt
new file mode 100644
index 0000000..846011d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.txt

@@ -0,0 +1,8 @@
+web-page
+blog-post
+web-form
+blogger
+setup
+add-products-to-website
+shopping-cart
+articles

diff --git a/erpnext/docs/user/manual/en/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
new file mode 100644
index 0000000..e14b2fd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/index.md

@@ -0,0 +1,5 @@
+Settings for your website can be mentioned under setup.
+
+###Topics
+
+{index}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/setup/index.txt b/erpnext/docs/user/manual/en/website/setup/index.txt
new file mode 100644
index 0000000..c3aaac9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/index.txt

@@ -0,0 +1,2 @@
+website-settings
+social-login-keys
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/setup/social-login-keys.md b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
new file mode 100644
index 0000000..b8784a3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md

@@ -0,0 +1,11 @@
+Social Login enables users to login to ERPNext via their Google, Facebook or GitHub account.
+
+### Enabling Social Logins.
+
+Checkout the following Video Tutorials to understand how to enable social logins on ERPNext
+
+* for FaceBook - https://www.youtube.com/watch?v=zC6Q6gIfiw8
+* for Google - https://www.youtube.com/watch?v=w_EAttrE9sw
+* for GitHub - https://www.youtube.com/watch?v=bG71DxxkVjQ
+
+{next}
\ No newline at end of file

diff --git a/erpnext/docs/user/manual/en/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
new file mode 100644
index 0000000..2415589
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md

@@ -0,0 +1,45 @@
+Most of the website related settings can be defined here.
+
+<img class="screenshot" alt="Website Settings" src="{{docs_base_url}}/assets/img/website/website-settings.png">
+
+####Landing Page
+
+* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/manual/en/website/web-page.html) must be the homepage of the website
+
+* Home Page is Products: if Checked, the Home page will be the default Item Group for the website.
+
+* Title Prefix: Set the browser title.
+
+####Website Theme
+
+Select the theme for the website. You can create new Theme for you website also.
+
+<img class="screenshot" alt="Website Theme" src="{{docs_base_url}}/assets/img/website/website-theme.png">
+
+* Select 'create new website theme' if you wish to customize the default website theme.
+
+####Banner
+
+You can add a banner/ logo to your website here. Attach the image and click on set banner from Image.
+An HTML code will be generated by the system under Banner HTML.
+
+<img class="screenshot" alt="Banner" src="{{docs_base_url}}/assets/img/website/banner.png">
+
+####Top Bar
+
+You can set the menus items in the Top Bar here.
+
+<img class="screenshot" alt="Top Bar" src="{{docs_base_url}}/assets/img/website/top-bar.png">
+
+ * Similarlly you can also set sidebar and footer links.
+ 
+####Integrations & Miscellaneous Settings
+
+You can integrate the website using Google Analytics and enable social media sharing for post shared on the website.
+
+<img class="screenshot" alt="Integrations" src="{{docs_base_url}}/assets/img/website/integrations.png">
+
+* You can disable public signup to your ERPNext account by checking 'disable signup'
+
+{next}
+

diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
new file mode 100644
index 0000000..773e162
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md

@@ -0,0 +1,41 @@
+On the Webpage, a shopping cart is an icon that allows you to store all the
+things that you have earmarked for purchasing. It is a graphical
+representation of a shopping basket or a shopping cart that allows you to save
+the items you intend to buy.
+
+This software displays the price of the product . It also displays shipping
+and handling charges, along with taxes, if applicable.
+
+To set up a shopping cart, go to the selling module.
+
+> Selling > Shopping Cart Settings
+
+#### Step 1: Enter Company Details and Default Territory.
+
+![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-1.png)
+
+  
+
+#### Step 2: Enter Price List, Tax Master and Shipping Rule.
+
+![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-2.png)
+
+  
+
+#### Shopping Cart Display
+
+On the Website, the shopping cart image will be seen below the Item price.
+Customers can click on the cart and enter the amount of quantity they wish to
+buy. The Item number will be stored on the right hand corner of the page, next
+to the flower sign.
+
+![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-display-1.png)
+
+  
+
+Click on the flower sign on the right hand side to see the cart details. Click
+on the cart to get the final amount details.
+
+![Shopping Cart]({{docs_base_url}}/assets/old_images/erpnext/shopping-cart-display-amount.png)
+
+{next}

diff --git a/erpnext/docs/user/manual/en/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
new file mode 100644
index 0000000..1668ac0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/web-form.md

@@ -0,0 +1,36 @@
+# Web Forms
+
+<p class="lead">Add forms to the website that will add / update data in your tables. Allow users to edit / manage multiple web forms</p>
+
+You can add forms in your website for example, Contact Us, Inquiry, Complaint etc. Data from these can fill up records like Lead, Opportunity, Issue etc. The user can also be allowed manage multiple records (like Complaints etc.)
+
+---
+
+### Creating
+
+To create a new **Web Form** go to:
+
+> Website > Web Form > New
+
+1. Set the Web Form title and url.
+1. Select the **DocType** in which you want the user to store the records.
+1. Select if you require the user to login, edit records, manage multiple records etc.
+1. Add the fields you want in the record.
+
+<img class="screenshot" alt="Web Form" src="{{docs_base_url}}/assets/img/website/web-form.png">
+
+---
+
+### Viewing
+
+Once you create the web form, you can view it on the url and test it out!
+
+<img class="screenshot" alt="Web form" src="{{docs_base_url}}/assets/img/website/web-form-view.png">
+
+---
+
+### Results
+
+Your data will be stored in the table you have selected
+
+{next}

diff --git a/erpnext/docs/user/manual/en/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
new file mode 100644
index 0000000..947891e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/web-page.md

@@ -0,0 +1,32 @@
+<p class="lead">Static Content like your Home Page, About Us, Contact Us, Terms pages can be created using the Web Page. </p>
+
+To create a new Web Page, go to:
+
+> Website > Web Page > New
+
+<img class="screenshot" alt="Web Page" src="{{docs_base_url}}/assets/img/website/web-page.png">
+
+#### Title
+
+The first thing to set is the title of your page. The title has the maximum
+weight for search engines so choose a title that reflects the keywords that
+you are targeting for your audience.
+
+#### Content
+
+After selecting your layout, you can add content (text, images, etc) to each
+of your content boxes. You can add content in Markdown or HTML format. Read
+the section on how to format using Markdown, for more details.
+
+#### Page Link
+
+The web link to your page will be the value of the “Page Name” field +
+“.html”. For example if your page name is contact-us, the web link of your
+page will be yoursite.com/contact-us.html.
+
+#### Images
+
+You can attach images to your web page and show them using the  HTML tag or
+using markdown format. the link to your file will be assets/manual_erpnext_com/old_images/erpnext/filename
+
+{next}

diff --git a/erpnext/docs/user/manual/index.md b/erpnext/docs/user/manual/index.md
new file mode 100644
index 0000000..47fc2c2
--- /dev/null
+++ b/erpnext/docs/user/manual/index.md

@@ -0,0 +1,5 @@
+# ERPNext User Manual
+
+Select your language
+
+1. [English](en)

diff --git a/erpnext/docs/user/manual/index.txt b/erpnext/docs/user/manual/index.txt
new file mode 100644
index 0000000..c574d07
--- /dev/null
+++ b/erpnext/docs/user/manual/index.txt

@@ -0,0 +1 @@
+en

diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
new file mode 100644
index 0000000..dcefe84
--- /dev/null
+++ b/erpnext/docs/user/videos/index.md

@@ -0,0 +1,35 @@
+# ERPNext Videos
+
+<h3>
+	<a class="no-decoration" href="{{docs_base_url}}/user/videos/learn">Learn ERPNext</a>
+</h3>
+
+<div class="row">
+    <div class="col-sm-4">
+        <a href="{{docs_base_url}}/user/videos/learn">
+            <img src="{{docs_base_url}}/assets/img/videos/learn.jpg" class="img-responsive" style="margin-top: 0px;">
+        </a>
+    </div>
+    <div class="col-sm-8">
+        Learn how to setup and use ERPNext in this series of videos that go through important processes step-by-step.
+    </div>
+</div>
+
+---
+
+<h3>
+	<a class="no-decoration" href="https://conf.erpnext.com/2014/videos">Conference Vidoes</a>
+</h3>
+
+<div class="row">
+    <div class="col-sm-4">
+        <a href="https://conf.erpnext.com/2014/videos">
+            <img src="{{docs_base_url}}/assets/img/videos/conf-2014.jpg" class="img-responsive" style="margin-top: 0px;">
+        </a>
+    </div>
+    <div class="col-sm-8">
+        Watch video presentations from the ERPNext team and users from the 2014 ERPNext Conference.
+        <br><br>
+		<a href="https://conf.erpnext.com">Join us at the ERPNext Conference on October 9th 2015 in Mumbai</a>
+    </div>
+</div>

diff --git a/erpnext/docs/user/videos/index.txt b/erpnext/docs/user/videos/index.txt
new file mode 100644
index 0000000..b2d525b
--- /dev/null
+++ b/erpnext/docs/user/videos/index.txt

@@ -0,0 +1 @@
+index
\ No newline at end of file

diff --git a/erpnext/docs/user/videos/learn/batch-inventory.md b/erpnext/docs/user/videos/learn/batch-inventory.md
new file mode 100644
index 0000000..9bd9229
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/batch-inventory.md

@@ -0,0 +1,9 @@
+# Batch Inventory
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/J0QKl7ABPKM" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:46**
+
+Batch inventory allows you to group multiple units of an item, and assign them a unique value/number/tag called Batch No.
+
+This video walks you through creating new Batch, and using it in stock transactions. Each batch can have certain expiry. In the stock module, you can check item's batchwise stock level.

diff --git a/erpnext/docs/user/videos/learn/bill-of-materials.md b/erpnext/docs/user/videos/learn/bill-of-materials.md
new file mode 100644
index 0000000..42695d9
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/bill-of-materials.md

@@ -0,0 +1,9 @@
+# Bill of Material
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/hDV0c1OeWLo" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:27**
+
+The BOM is a list of all materials (either bought or made) and operations that go into a finished product or sub-Item.
+
+This video walks you through creating masters (like Item, Operations, Workstation etc.) required for setting up BOM. Once you have all these masters in place, using them you can create Bill of Materials for the sub-assembly, finished and sub-contracted items.

diff --git a/erpnext/docs/user/videos/learn/chart-of-accounts.md b/erpnext/docs/user/videos/learn/chart-of-accounts.md
new file mode 100644
index 0000000..f71013f
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/chart-of-accounts.md

@@ -0,0 +1,9 @@
+# Chart of Accounts
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/DyR-DST-PyA" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:26**
+
+This tutorial walks you through setting up Accounts in the Chart of Account master. This is the most crucial master for getting your financial statement and other accounting reports correct.
+
+Chart of Account is a tree structure master which allows user to define parent and child relationship between accounts. Also there are various account types (like Income a/c, Expense a/c, Bank a/c, Tax a/c etc.) which helps you segregate and filter out other accounts while creating transactions.

diff --git a/erpnext/docs/user/videos/learn/customer-and-supplier.md b/erpnext/docs/user/videos/learn/customer-and-supplier.md
new file mode 100644
index 0000000..ba0c5b8
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/customer-and-supplier.md

@@ -0,0 +1,7 @@
+# Customer and Supplier
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/anoGi_RpQ20" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:21**
+
+This video demonstrate creating Customer and Suppliers in ERPNext. It also covers setting up masters required for creating Customer and Supplier like Customer Group, Territory and Supplier Type.

diff --git a/erpnext/docs/user/videos/learn/data-import-tool.md b/erpnext/docs/user/videos/learn/data-import-tool.md
new file mode 100644
index 0000000..10cd00f
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/data-import-tool.md

@@ -0,0 +1,8 @@
+# Data Import Tool
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/6wiriRKPhmg" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:24**
+
+This video walks you through on importing data in ERPNext from spreadsheet files. This tools allows you in faster migration of masters and transactions from legacy system into ERPNext. You can also use this tool to export data from ERPNext, and keep it as a backup
+of specific document type.

diff --git a/erpnext/docs/user/videos/learn/email-account.md b/erpnext/docs/user/videos/learn/email-account.md
new file mode 100644
index 0000000..0ac4e98
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/email-account.md

@@ -0,0 +1,7 @@
+# Email Account
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/YFYe0DrB95o" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:27**
+
+This video walks you through setting up Email Account for incoming and outgoing emails. For hosted users, outgoing email gateway is set by default. Based on incoming email, you can have new document (like Issue, Lead etc.) auto-created, and have email received on these id's appended to specified document.

diff --git a/erpnext/docs/user/videos/learn/employee.md b/erpnext/docs/user/videos/learn/employee.md
new file mode 100644
index 0000000..e7f78a3
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/employee.md

@@ -0,0 +1,7 @@
+# Employee
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/USfIUdZlUhw" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 1:59**
+
+This video walks you through adding Employee in ERPNext.

diff --git a/erpnext/docs/user/videos/learn/expense-claim.md b/erpnext/docs/user/videos/learn/expense-claim.md
new file mode 100644
index 0000000..296a678
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/expense-claim.md

@@ -0,0 +1,7 @@
+# Expense Claim
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/5SZHJF--ZFY" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:51**
+
+This tutorial walks you through managing Expense Claims in ERPNext. Employee create first draft of Expense Claim. User with Expense Claim Approver role review Expense Claim submitted by Employee, and update sanctioned amount in it. After Expense Claim is approved/submitted, Journal Entry is created Expense Claim.

diff --git a/erpnext/docs/user/videos/learn/field-customization.md b/erpnext/docs/user/videos/learn/field-customization.md
new file mode 100644
index 0000000..36e2a9e
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/field-customization.md

@@ -0,0 +1,9 @@
+# Field Customization
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/pJhL9mmxV_U" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:10**
+
+This video walks you through various field level customization options.
+
+Using Customize Form tool, you can insert custom field in the forms. Also you can change the property of standard fields like visibility in print format, should field be a mandatory or non-mandatory, should this field always carry unique value etc. Also you can customize location of a field on form.

diff --git a/erpnext/docs/user/videos/learn/index.css b/erpnext/docs/user/videos/learn/index.css
new file mode 100644
index 0000000..025e938
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/index.css

@@ -0,0 +1,17 @@
+.hero-and-content .page-container {
+	max-width: 100%;
+}
+
+.video-list li {
+	margin: 0px;
+	padding: 10px 0px;
+	border-bottom: 1px solid #d1d8dd;
+}
+
+.video-list li:last-child {
+	border-bottom: 0px;
+}
+
+.manual-feedback {
+	display: none;
+}

diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md
new file mode 100644
index 0000000..35e1ad7
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/index.md

@@ -0,0 +1,217 @@
+<!-- no-sidebar -->
+<!-- no-breadcrumbs -->
+<!-- title: Learn ERPNext -->
+<div style="max-width: 700px; margin: auto;">
+    <div class="row hero" style="padding-top: 50px; border-bottom: 0px;">
+        <div class="col-sm-12 hero-content">
+            <h1>ERPNext Video Tutorials</h1>
+            <p>Step-by-step guides to setting up and using ERPNext</p>
+        </div>
+    </div>
+    <br>
+    <h3>Using ERPNext</h3>
+    <ul class="list-unstyled video-list">
+        <li>
+            <a href="{{docs_base_url}}/user/videos/learn/navigation.html">
+              User Interface and Navigation</a>
+            <span class="text-muted pull-right">1:17</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Setting Up</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/setup-wizard.html">
+            The Setup Wizard</a>
+            <span class="text-muted pull-right">2:28</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/user-and-permission.html">
+            User and Permissions</a>
+            <span class="text-muted pull-right">4:20</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/data-import-tool.html">
+            Data Import Tool</a>
+            <span class="text-muted pull-right">3:24</span>
+    </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/printing-and-branding.html">
+            Printing and Branding</a>
+            <span class="text-muted pull-right">4:00</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/customer-and-supplier.html">
+            Customer and Supplier</a>
+            <span class="text-muted pull-right">3:21</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/item.html">
+            Item and Pricing</a>
+            <span class="text-muted pull-right">3:17</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/opening-stock.html">
+            Opening Stock</a>
+            <span class="text-muted pull-right">2:06</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/opening-account-balances.html">
+            Opening Account Balances</a>
+            <span class="text-muted pull-right">3:46</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/email-account.html">
+            Email Account</a>
+            <span class="text-muted pull-right">2:27</span>
+        </li>
+    </ul>
+    <br>
+    <h3>CRM and Sales</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/lead-to-quotation.html">
+            Lead to Quotation</a>
+            <span class="text-muted pull-right">2:00</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/sales-cycle.html">
+            Sales Order to Payment</a>
+              <span class="text-muted pull-right">4:28</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/product-bundle.html">
+            Product Bundle</a>
+            <span class="text-muted pull-right">2:31</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/newsletter.html">
+            Newsletter</a>
+            <span class="text-muted pull-right">2:04</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/taxes.html">
+            Taxes</a>
+            <span class="text-muted pull-right">3:00</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Buying</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/material-request-to-purchase-order.html">
+            Material Request to Purchase Order</a>
+            <span class="text-muted pull-right">2:25</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/purchase-cycle.html">
+            Purchase Order to Payment</a>
+              <span class="text-muted pull-right">3:16</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/taxes.html">
+            Taxes</a>
+            <span class="text-muted pull-right">3:00</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Stock</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/item.html">
+            Item and Pricing</a>
+            <span class="text-muted pull-right">3:17</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/item-variant.html">
+            Item Variant</a>
+            <span class="text-muted pull-right">2:38</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/opening-stock.html">
+            Opening Stock</a>
+            <span class="text-muted pull-right">2:06</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/stock-entries.html">
+            Stock Entries</a>
+              <span class="text-muted pull-right">3:46</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/serialized-inventory.html">
+            Seriralized Inventory</a>
+            <span class="text-muted pull-right">4:12</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/batch-inventory.html">
+            Batch Inventory</a>
+            <span class="text-muted pull-right">3:46</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/subcontracting.html">
+            Managing Subcontracting</a>
+            <span class="text-muted pull-right">4:37</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/quality-inspection.html">
+            Quality Inspection</a>
+            <span class="text-muted pull-right">2:36</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Accounts</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/chart-of-accounts.html">
+            Chart of Accounts</a>
+            <span class="text-muted pull-right">2:26</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/opening-account-balances.html">
+            Opening Account Balances</a>
+            <span class="text-muted pull-right">3:46</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/taxes.html">
+            Taxes</a>
+              <span class="text-muted pull-right">3:00</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Manufacturing</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/bill-of-materials.html">
+            Bill of Materials</a>
+            <span class="text-muted pull-right">3:27</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/production-planning.html">
+            Production Planning Tool</a>
+              <span class="text-muted pull-right">1:41</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/production-order.html">
+            Production Order</a>
+            <span class="text-muted pull-right">2:24</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Human Resource</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/employee.html">
+            Employee</a>
+            <span class="text-muted pull-right">1:59</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/processing-payroll.html">
+            Processing Payroll</a>
+              <span class="text-muted pull-right">4:00</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/leave-management.html">
+            Leave Management</a>
+            <span class="text-muted pull-right">2:50</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/expense-claim.html">
+            Expense Claim</a>
+            <span class="text-muted pull-right">2:52</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Retail</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/point-of-sale.html">
+            Point of Sale</a>
+            <span class="text-muted pull-right">2:34</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Project</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/project-and-task.html">
+            Project and Task</a>
+            <span class="text-muted pull-right">3:52</span>
+        </li>
+    </ul>
+    <br>
+    <h3>Customization</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/field-customization.html">
+            Field Customization</a>
+            <span class="text-muted pull-right">3:10</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/workflow.html">
+            Workflow</a>
+            <span class="text-muted pull-right">3:38</span>
+        </li>
+    </ul>
+</div>
+<div style="height: 70px;"></div>

diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt
new file mode 100644
index 0000000..ed1002c
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/index.txt

@@ -0,0 +1,36 @@
+batch-inventory
+bill-of-materials
+chart-of-accounts
+customer-and-supplier
+data-import-tool
+email-account
+employee
+expense-claim
+field-customization
+index
+item
+item-variant
+lead-to-quotation
+leave-management
+material-request-to-purchase-order
+navigation
+newsletter
+opening-account-balances
+opening-stock
+point-of-sale
+printing-and-branding
+processing-payroll
+product-bundle
+production-order
+production-planning
+project-and-task
+purchase-cycle
+quality-inspection
+sales-cycle
+serialized-inventory
+setup-wizard
+stock-entries
+subcontracting
+taxes
+user-and-permission
+workflow
\ No newline at end of file

diff --git a/erpnext/docs/user/videos/learn/item-variant.md b/erpnext/docs/user/videos/learn/item-variant.md
new file mode 100644
index 0000000..c171b9d
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/item-variant.md

@@ -0,0 +1,7 @@
+# Item Variant
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/kogIricF40I" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:38**
+
+This video tutorial helps you in setting up Item Attributes (like Size, Lenthg etc.) and creating item variants using these attributes.

diff --git a/erpnext/docs/user/videos/learn/item.md b/erpnext/docs/user/videos/learn/item.md
new file mode 100644
index 0000000..79d5caf
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/item.md

@@ -0,0 +1,7 @@
+# Item and Pricing
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/qXaEwld4_Ps" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:17**
+
+This tutorial walks you through managing stock and service item in ERPNext. For each item, you can track its standard selling and buying price using Price List.

diff --git a/erpnext/docs/user/videos/learn/lead-to-quotation.md b/erpnext/docs/user/videos/learn/lead-to-quotation.md
new file mode 100644
index 0000000..dcfef68
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/lead-to-quotation.md

@@ -0,0 +1,8 @@
+# Lead to Quotation
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/TxYX4r4JAKA" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:00**
+
+This video walks you through creating Lead in the CRM module. You can convert Lead into Opportunity, one which has good probability of conversion. When customer ask for the Quotation,
+you can fetch Lead and item details from Opportunity to Quotation.

diff --git a/erpnext/docs/user/videos/learn/leave-management.md b/erpnext/docs/user/videos/learn/leave-management.md
new file mode 100644
index 0000000..d4f64b7
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/leave-management.md

@@ -0,0 +1,7 @@
+# Leave Management
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/fc0p_AXebc8" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:49**
+
+This tutorial walks you through leave processing in ERPNext. Firstly, various leaves are allocated to Employees for a year. As and when needed, Employees apply for leave. Their application is reviewed and approved or rejected by Leave Approver. On approval/submission of Leave Application, leave allocated to Employee is reduced.

diff --git a/erpnext/docs/user/videos/learn/material-request-to-purchase-order.md b/erpnext/docs/user/videos/learn/material-request-to-purchase-order.md
new file mode 100644
index 0000000..506a99a
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/material-request-to-purchase-order.md

@@ -0,0 +1,7 @@
+# Material Request to Purchase Order
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4TN9kPyfIqM" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:25**
+
+This video walks you through creating Material Request. To request quotation from Supplier, you can forward Material Request to them. On receipt of quotation from supplier, Material Request's data will be fetched into Supplier Quotation. After evaluating multiple supplier quotations, favorable quotation's is converted into Purchase Order.

diff --git a/erpnext/docs/user/videos/learn/navigation.md b/erpnext/docs/user/videos/learn/navigation.md
new file mode 100644
index 0000000..40adb82
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/navigation.md

@@ -0,0 +1,7 @@
+# User Interface and Navigation
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/YDoI2DF4Lmc?list=PL3lFfCEoMxvxDHtYyQFJeUYkWzQpXwFM9" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 1:17**
+
+This video walks you through using the ERPNext "Desk" interface. The ERPNext User Interface is very web friendly and if you have used a website or mobile app before, the navigation should be very intuitive.

diff --git a/erpnext/docs/user/videos/learn/newsletter.md b/erpnext/docs/user/videos/learn/newsletter.md
new file mode 100644
index 0000000..9896309
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/newsletter.md

@@ -0,0 +1,9 @@
+# Newsletter
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/muLKsCrrDRo" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:04**
+
+A newsletter is a short written report that tells about the recent activities of an organization. It is generally sent to members of the organization, potential clients, customers or potential leads.
+
+This video walks you through managing Newsletter List, master containing email id's to whom Newsletter will be sent. You can compose Newsletter using rich text editor, and also in HTML editor.

diff --git a/erpnext/docs/user/videos/learn/opening-account-balances.md b/erpnext/docs/user/videos/learn/opening-account-balances.md
new file mode 100644
index 0000000..518b892
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/opening-account-balances.md

@@ -0,0 +1,7 @@
+# Opening Account Balances
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/kdgM20Q-q68" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:46**
+
+This video walks you through step to update opening account balances in ERPNext. Before updating opening balance for accounts, you should close your financial statements in the previous system. Closing balance of your legacy system should be updated as opening balance in ERPNext.

diff --git a/erpnext/docs/user/videos/learn/opening-stock.md b/erpnext/docs/user/videos/learn/opening-stock.md
new file mode 100644
index 0000000..6048039
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/opening-stock.md

@@ -0,0 +1,9 @@
+# Opening Stock
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/0yPgrtfeCTs" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:06**
+
+This tutorial demonstrates updating opening stock balance of an item. Following same steps, you can also reconcile stock of an item with respect to physical stock in a warehouse.
+
+If you maintain serialized inventory, [click here]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) for the tutorial on updating it's opening stock in ERPNext.

diff --git a/erpnext/docs/user/videos/learn/point-of-sale.md b/erpnext/docs/user/videos/learn/point-of-sale.md
new file mode 100644
index 0000000..5f6f229
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/point-of-sale.md

@@ -0,0 +1,9 @@
+# Point of Sale
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4WkelWkbP_c" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:34**
+
+Retail transaction has sales, goods delivery and payment happening at the same time. POS (Point of Sale) module in ERPNext allow you creating POS Invoices which manages all the functions involved in retail sales.
+
+This tutorial walks you through setting up POS profile and creating POS invoice in ERPNext. Each billing station can have separate POS profile. This allows in faster and efficient billing at the sales counters.

diff --git a/erpnext/docs/user/videos/learn/printing-and-branding.md b/erpnext/docs/user/videos/learn/printing-and-branding.md
new file mode 100644
index 0000000..555697d
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/printing-and-branding.md

@@ -0,0 +1,9 @@
+# Printing and Branding
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/cKZHcx1znMc" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:59**
+
+This video walks you through setting up of masters like your companies Letterhead and Logo.
+This tutorial also covers using tools to customize standard print formats, creating new print
+format, and setting up print headings (Quotation to Proposal) as per your requirement.

diff --git a/erpnext/docs/user/videos/learn/processing-payroll.md b/erpnext/docs/user/videos/learn/processing-payroll.md
new file mode 100644
index 0000000..e858ba6
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/processing-payroll.md

@@ -0,0 +1,7 @@
+# Processing Payroll
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/apgE-f25Rm0" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:00**
+
+This video walks you through processing payroll for Employees. You can maintain Salary Structure for each Employee. Based on it, you can create Salary Slips individually, or in bulk for all the Employees.

diff --git a/erpnext/docs/user/videos/learn/product-bundle.md b/erpnext/docs/user/videos/learn/product-bundle.md
new file mode 100644
index 0000000..c17456a
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/product-bundle.md

@@ -0,0 +1,9 @@
+# Product Bundle
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/yk3kPrRyRRc" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:31**
+
+Product Bundle (aka Sales Bill of Material) is a master where you can list items which are bundled together and sold as one item.
+
+This video walks you through setting up items, and creating Product Bundle master using them.

diff --git a/erpnext/docs/user/videos/learn/production-order.md b/erpnext/docs/user/videos/learn/production-order.md
new file mode 100644
index 0000000..dd2e30f
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/production-order.md

@@ -0,0 +1,9 @@
+# Production Order
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ZotgLyp2YFY" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:24**
+
+Production Order (also called as Work Order) is a document that is given to the manufacturing shop floor by the Production Planner as a signal to produce a certain quantity of a certain Item.
+
+This video walks you through creating Production Order in ERPNext. There will be several entries made against Production Order (like Material Transfer, Manufacture entry, Time Log) to track progress against Production Order.

diff --git a/erpnext/docs/user/videos/learn/production-planning.md b/erpnext/docs/user/videos/learn/production-planning.md
new file mode 100644
index 0000000..6ed409b
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/production-planning.md

@@ -0,0 +1,9 @@
+# Production Planning Tool
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/CzatSl4zJ2Y" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 1:41**
+
+Production Planning Tool helps you plan production and purchase of Items for a period.
+
+This video walks you through production planning for Sales Order item. Material Planning allows you to check required quantity of raw materials for manufacturing. You can create Material Request for the raw-material items for which sufficient stock is not available. From Production Planning Tool, you can also create Production Order for the finished items.

diff --git a/erpnext/docs/user/videos/learn/project-and-task.md b/erpnext/docs/user/videos/learn/project-and-task.md
new file mode 100644
index 0000000..6be77db
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/project-and-task.md

@@ -0,0 +1,9 @@
+# Project and Task
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/egxIGwtoKI4" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:52**
+
+This is the tutorial on managing Projects and Task in ERPNext.
+
+Project can be divided into multiple assignable Task. Based on Tasks of a Project, you can check its Gantt Chart view. To track actual time spent on Project or Task, user can create Time Logs.

diff --git a/erpnext/docs/user/videos/learn/purchase-cycle.md b/erpnext/docs/user/videos/learn/purchase-cycle.md
new file mode 100644
index 0000000..acf7642
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/purchase-cycle.md

@@ -0,0 +1,7 @@
+# Purchase Cycle
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/EK65tLdVUDk" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:16**
+
+This video walks you through purchase cycle in ERPNext. Purchase Order can be created directly, or by fetching data from Material Request or Supplier Quotation. When ordered items are received from Supplier, Purchase Receipt is created against Purchase Order. You can create Purchase Invoice from Purchase Order or Purchase Receipt. When making payment to Supplier, Journal Entry will be created against Purchase Invoice.

diff --git a/erpnext/docs/user/videos/learn/quality-inspection.md b/erpnext/docs/user/videos/learn/quality-inspection.md
new file mode 100644
index 0000000..b00a1c0
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/quality-inspection.md

@@ -0,0 +1,7 @@
+# Quality Inspection
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/WmtcF3Y40Fs" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:36**
+
+This video walks you through quality testing and reporting procedure for purchased, manufactured and item which are being delivered.

diff --git a/erpnext/docs/user/videos/learn/sales-cycle.md b/erpnext/docs/user/videos/learn/sales-cycle.md
new file mode 100644
index 0000000..d9b8e13
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/sales-cycle.md

@@ -0,0 +1,9 @@
+# Sales Cycle
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/7AMq4lqkN4A" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:28**
+
+This video walks you through sales cycle in ERPNext. On receipt of confirmation of order from Customer, Sales Order will be directly. When sales items is shipped to customer, Delivery Note is created against Sales Order. You can create Sales Invoice from Sales Order or Delivery Note.
+
+From Sales Order, you can track complete order like %delivered, %billed and payment status of Sales Invoice.

diff --git a/erpnext/docs/user/videos/learn/serialized-inventory.md b/erpnext/docs/user/videos/learn/serialized-inventory.md
new file mode 100644
index 0000000..e3b97e1
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/serialized-inventory.md

@@ -0,0 +1,9 @@
+# Serialized Inventory
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/gvOVlEwFDAk" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:11**
+
+If an Item is serialized, a Serial Number (Serial No) record is maintained for each unit of that Item. This information is helpful in tracking the location of the Serial No, its warranty and end-of-life (expiry) information.
+
+This video walks you through setting item as serialized item, and creating stock transaction for it. Mostly a high value items are set as serialized item which requires close tracking of its location and warranty expiry.

diff --git a/erpnext/docs/user/videos/learn/setup-wizard.md b/erpnext/docs/user/videos/learn/setup-wizard.md
new file mode 100644
index 0000000..378cc32
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/setup-wizard.md

@@ -0,0 +1,8 @@
+# Setup Wizard
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/oIOf_zCFWKQ" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 2:28**
+
+After successful setup of ERPNext account, on the first login, you will see Setup Wizard. The Setup Wizard helps you quickly setup your masters like your company, Items, Customer,
+Suppliers and will also setup a basic website with this data.

diff --git a/erpnext/docs/user/videos/learn/stock-entries.md b/erpnext/docs/user/videos/learn/stock-entries.md
new file mode 100644
index 0000000..2d31ec9
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/stock-entries.md

@@ -0,0 +1,7 @@
+# Stock Entries
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Njt107hlY3I" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:46**
+
+Stock Entry is a stock transaction, used for multiple purposes like inter-warehouse Material Transfer, Material Receipt for updating balance, Material Issue etc.

diff --git a/erpnext/docs/user/videos/learn/subcontracting.md b/erpnext/docs/user/videos/learn/subcontracting.md
new file mode 100644
index 0000000..331e892
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/subcontracting.md

@@ -0,0 +1,9 @@
+# Subcontracting
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ThiMCC2DtKo" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:36**
+
+Subcontracting is a type of job contract that seeks to outsource certain types of work to other companies.
+
+There are warehouses masters created in order to carryout subcontracting transaction. This video walks you through various steps involved like creating BOM, transfer raw-material to subcontractor, receiving processed goods from subcontractor.

diff --git a/erpnext/docs/user/videos/learn/taxes.md b/erpnext/docs/user/videos/learn/taxes.md
new file mode 100644
index 0000000..992aa1d
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/taxes.md

@@ -0,0 +1,7 @@
+# Taxes
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/nQ1zZdPgdaQ" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:00**
+
+This video walks you through setting up tax accounts in the Chart of Account. Based on the taxation rules, you can create multiple sales and purchase tax templates in ERPNext.

diff --git a/erpnext/docs/user/videos/learn/user-and-permission.md b/erpnext/docs/user/videos/learn/user-and-permission.md
new file mode 100644
index 0000000..62d728d
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/user-and-permission.md

@@ -0,0 +1,7 @@
+# User and Permissions
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/fnBoRhBrwR4" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 4:20**
+
+This video tutorial walks you through setting up User and their permissions in ERPNext. Role Permission Manager tool allows you to define restricted access for the user, based on various criterion like, value in the specific field on the form, creator of the document etc.

diff --git a/erpnext/docs/user/videos/learn/workflow.md b/erpnext/docs/user/videos/learn/workflow.md
new file mode 100644
index 0000000..a0e0e21
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/workflow.md

@@ -0,0 +1,9 @@
+# Workflow
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/yObJUg9FxFs" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:37**
+
+This video walks you through setting up Workflow for a document type.
+
+Bydefault, ERPNext has two level verification system for documents, Save and Submit. If you have more than one authority approving document, you can manage it via Workflow. Workflow allow you do define multiple stages through which document will be review and finally get approved, and who will be the approver at each stage.

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 51d0b5c..4d7eefb 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py

@@ -4,32 +4,12 @@
 app_name = "erpnext"
 app_title = "ERPNext"
 app_publisher = "Frappe Technologies Pvt. Ltd."
-app_description = """## ERPNext
-
-ERPNext is a fully featured ERP system designed for Small and Medium Sized
-business. ERPNext covers a wide range of features including Accounting, CRM,
-Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
-Payroll, Website, E-Commerce and much more.
-
-ERPNext is based on the Frappe Framework is highly customizable and extendable.
-You can create Custom Form, Fields, Scripts and can also create your own Apps
-to extend ERPNext functionality.
-
-ERPNext is Open Source under the GNU General Public Licence v3 and has been
-listed as one of the Best Open Source Softwares in the world by my online
-blogs.
-
-### Links
-
-- Website: [https://erpnext.com](https://erpnext.com)
-- GitHub: [https://github.com/frappe/erpnext](https://github.com/frappe/erpnext)
-- Forum: [https://discuss.erpnext.com](https://discuss.erpnext.com)
-- Frappe Framework: [https://frappe.io](https://frappe.io)
-
-"""
+app_description = """ERP made simple"""
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.7.7"
+app_version = "6.12.6"
+app_email = "info@erpnext.com"
+app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"
@@ -39,6 +19,10 @@
 web_include_js = "assets/js/erpnext-web.min.js"
 web_include_css = "assets/erpnext/css/website.css"
 
+# setup wizard
+setup_wizard_requires = "assets/erpnext/js/setup_wizard.js"
+setup_wizard_complete = "erpnext.setup.setup_wizard.setup_wizard.setup_complete"
+
 after_install = "erpnext.setup.install.after_install"
 
 boot_session = "erpnext.startup.boot.boot_session"
@@ -80,7 +64,7 @@
 	{"from_route": "/shipments", "to_route": "Delivery Note"},
 	{"from_route": "/shipments/<path:name>", "to_route": "order",
 		"defaults": {
-			"doctype": "Delivery Notes",
+			"doctype": "Delivery Note",
 			"parents": [{"title": _("Shipments"), "name": "shipments"}]
 		}
 	}
@@ -90,7 +74,8 @@
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Sales Invoice": "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"
+	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission",
+	"Address": "erpnext.utilities.doctype.address.address.has_website_permission"
 }
 
 permission_query_conditions = {
@@ -126,6 +111,9 @@
 	"Price List": {
 		"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
 	},
+	"Address": {
+		"validate": "erpnext.shopping_cart.cart.set_customer_in_address"
+	}
 }
 
 scheduler_events = {
@@ -148,6 +136,5 @@
 </div>"""
 
 get_translated_dict = {
-	("page", "setup-wizard"): "frappe.geo.country_info.get_translated_dict",
 	("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"
 }

diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index e395f49..c9393cd 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Appraisal Template", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "kra_template", 
    "oldfieldtype": "Link", 
@@ -68,6 +70,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "For Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
@@ -93,6 +96,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "For Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
@@ -116,6 +120,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -140,7 +145,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -166,6 +172,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "start_date", 
    "oldfieldtype": "Date", 
@@ -190,6 +197,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "end_date", 
    "oldfieldtype": "Date", 
@@ -214,6 +222,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Goals", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "Simple", 
@@ -237,6 +246,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Goals", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "appraisal_details", 
    "oldfieldtype": "Table", 
@@ -261,6 +271,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Calculate Total Score", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "calculate_total", 
@@ -284,6 +295,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Score (Out of 5)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_score", 
    "oldfieldtype": "Currency", 
@@ -307,6 +319,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -329,6 +342,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -351,6 +365,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -372,6 +387,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -395,6 +411,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -417,6 +434,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -441,6 +459,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -465,7 +484,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:38.259403", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.850937", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 

diff --git a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
index 95e0891..ef561da 100644
--- a/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
+++ b/erpnext/hr/doctype/appraisal_goal/appraisal_goal.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Goal", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "kra", 
    "oldfieldtype": "Small Text", 
@@ -44,6 +45,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Weightage (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "per_weightage", 
    "oldfieldtype": "Currency", 
@@ -90,6 +93,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Score (0-5)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "score", 
    "oldfieldtype": "Select", 
@@ -137,6 +142,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Score Earned", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "score_earned", 
    "oldfieldtype": "Currency", 
@@ -182,7 +189,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:38.437815", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.929884", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Goal", 

diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 5836f53..4903c58 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Appraisal Template Title", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "kra_title", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Goals", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "kra_sheet", 
    "oldfieldtype": "Table", 
@@ -91,7 +94,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:38.527810", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.974626", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Template", 

diff --git a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
index 874d05f..ccce527 100644
--- a/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
+++ b/erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "KRA", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "kra", 
    "oldfieldtype": "Small Text", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Weightage (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "per_weightage", 
    "oldfieldtype": "Currency", 
@@ -68,7 +70,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:38.594066", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.006632", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal Template Goal", 

diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index 0c36411..78391c8 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "Simple", 
@@ -42,7 +43,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -67,6 +69,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
@@ -114,7 +118,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -139,6 +144,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "leave_type", 
    "oldfieldtype": "Link", 
@@ -162,6 +168,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -185,6 +192,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Attendance Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "att_date", 
    "oldfieldtype": "Date", 
@@ -208,6 +216,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -232,6 +241,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -256,6 +266,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Attendance", 
    "permlevel": 0, 
@@ -277,7 +288,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:38.766621", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.089225", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 

diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index d5b9b61..96dcc32 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Data", 
@@ -42,7 +43,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:40.571426", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.974184", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Branch", 

diff --git a/erpnext/hr/doctype/deduction_type/deduction_type.json b/erpnext/hr/doctype/deduction_type/deduction_type.json
index 56a9efc..46e8923 100644
--- a/erpnext/hr/doctype/deduction_type/deduction_type.json
+++ b/erpnext/hr/doctype/deduction_type/deduction_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "deduction_name", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -66,7 +68,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:44.282690", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:44.572917", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Deduction Type", 

diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index 4607b72..2d2d287 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department_name", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Leave Block List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Leave Block List", 
    "permlevel": 0, 
@@ -65,7 +67,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:45.543232", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:45.172261", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Department", 

diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 43d057c..1a1cc32 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation_name", 
    "oldfieldtype": "Data", 
@@ -42,7 +43,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:45.651511", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:45.227540", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Designation", 

diff --git a/erpnext/hr/doctype/earning_type/earning_type.json b/erpnext/hr/doctype/earning_type/earning_type.json
index ea0d556..556bf41 100644
--- a/erpnext/hr/doctype/earning_type/earning_type.json
+++ b/erpnext/hr/doctype/earning_type/earning_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "earning_name", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -66,7 +68,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:47.553467", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:45.813984", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Earning Type", 

diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 3f328c3..dd54623 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salutation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "salutation", 
    "oldfieldtype": "Select", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Full Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
@@ -155,6 +161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -177,6 +184,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -198,6 +206,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -221,6 +230,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "User ID", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "User", 
    "permlevel": 0, 
@@ -243,6 +253,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee Number", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_number", 
    "oldfieldtype": "Data", 
@@ -266,6 +277,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date of Joining", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "date_of_joining", 
    "oldfieldtype": "Date", 
@@ -290,6 +302,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date of Birth", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "date_of_birth", 
    "oldfieldtype": "Date", 
@@ -313,6 +326,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Gender", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "gender", 
    "oldfieldtype": "Select", 
@@ -337,6 +351,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -359,6 +374,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employment Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -379,6 +395,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -401,6 +418,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -425,6 +443,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employment Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employment_type", 
    "oldfieldtype": "Link", 
@@ -450,6 +469,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Holiday List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "holiday_list", 
    "oldfieldtype": "Link", 
@@ -473,6 +493,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -494,6 +515,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Offer Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "scheduled_confirmation_date", 
    "oldfieldtype": "Date", 
@@ -517,6 +539,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Confirmation Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "final_confirmation_date", 
    "oldfieldtype": "Date", 
@@ -540,6 +563,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contract End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contract_end_date", 
    "oldfieldtype": "Date", 
@@ -563,6 +587,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date Of Retirement", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "date_of_retirement", 
    "oldfieldtype": "Date", 
@@ -586,6 +611,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Job Profile", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -606,6 +632,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -628,6 +655,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Link", 
@@ -652,6 +680,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Link", 
@@ -676,6 +705,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Link", 
@@ -701,6 +731,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company Email", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company_email", 
    "oldfieldtype": "Data", 
@@ -725,6 +756,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notice (days)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "notice_number_of_days", 
    "oldfieldtype": "Int", 
@@ -748,6 +780,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salary Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -771,6 +804,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Salary Mode", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "salary_mode", 
    "oldfieldtype": "Select", 
@@ -796,6 +830,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Bank Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bank_name", 
    "oldfieldtype": "Link", 
@@ -820,6 +855,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bank A/C No.", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bank_ac_no", 
    "oldfieldtype": "Data", 
@@ -843,6 +879,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Organization Profile", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -864,6 +901,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reports to", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reports_to", 
    "oldfieldtype": "Link", 
@@ -889,6 +927,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Approvers", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee Leave Approver", 
    "permlevel": 0, 
@@ -911,6 +950,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -931,6 +971,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -953,6 +994,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cell Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -974,6 +1016,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Personal Email", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Email", 
    "permlevel": 0, 
@@ -996,6 +1039,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unsubscribed", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1017,6 +1061,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Emergency Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "<h4 class=\"text-muted\">Emergency Contact Details</h4>", 
    "permlevel": 0, 
@@ -1039,6 +1084,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Emergency Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1060,6 +1106,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Relation", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1081,6 +1128,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Emergency Phone", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1101,6 +1149,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1123,6 +1172,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Permanent Address Is", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nRented\nOwned", 
    "permlevel": 0, 
@@ -1145,6 +1195,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Permanent Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1166,6 +1217,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Address Is", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nRented\nOwned", 
    "permlevel": 0, 
@@ -1188,6 +1240,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1209,6 +1262,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1231,6 +1285,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bio", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1252,6 +1307,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Personal Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1272,6 +1328,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1294,6 +1351,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Passport Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1315,6 +1373,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Date of Issue", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1336,6 +1395,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valid Upto", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1357,6 +1417,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Place of Issue", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1377,6 +1438,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1399,6 +1461,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Marital Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nSingle\nMarried\nDivorced\nWidowed", 
    "permlevel": 0, 
@@ -1421,6 +1484,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Blood Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nA+\nA-\nB+\nB-\nAB+\nAB-\nO+\nO-", 
    "permlevel": 0, 
@@ -1444,6 +1508,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Family Background", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1466,6 +1531,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Health Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1487,6 +1553,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Educational Qualification", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1508,6 +1575,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Education", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee Education", 
    "permlevel": 0, 
@@ -1530,6 +1598,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Previous Work Experience", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -1552,6 +1621,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "External Work History", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee External Work History", 
    "permlevel": 0, 
@@ -1574,6 +1644,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "History In Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -1596,6 +1667,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Internal Work History", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee Internal Work History", 
    "permlevel": 0, 
@@ -1618,6 +1690,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -1639,6 +1712,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1661,6 +1735,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resignation Letter Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "resignation_letter_date", 
    "oldfieldtype": "Date", 
@@ -1684,6 +1759,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Relieving Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "relieving_date", 
    "oldfieldtype": "Date", 
@@ -1707,6 +1783,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reason for Leaving", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reason_for_leaving", 
    "oldfieldtype": "Data", 
@@ -1730,6 +1807,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Encashed?", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "leave_encashed", 
    "oldfieldtype": "Select", 
@@ -1754,6 +1832,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Encashment Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "encashment_date", 
    "oldfieldtype": "Date", 
@@ -1777,6 +1856,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exit Interview Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "col_brk6", 
    "oldfieldtype": "Column Break", 
@@ -1801,6 +1881,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Held On", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "held_on", 
    "oldfieldtype": "Date", 
@@ -1824,6 +1905,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reason for Resignation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reason_for_resignation", 
    "oldfieldtype": "Select", 
@@ -1848,6 +1930,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "New Workplace", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "new_workplace", 
    "oldfieldtype": "Data", 
@@ -1871,6 +1954,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Feedback", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "feedback", 
    "oldfieldtype": "Text", 
@@ -1893,7 +1977,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-19 03:04:49.862553", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.290512", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 

diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 12c49c8..e781532 100644
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py

@@ -208,15 +208,15 @@
 			users = [u.email_id or u.name for u in get_enabled_system_users()]
 
 		for e in birthdays:
-			frappe.sendmail(recipients=filter(lambda u: u not in (e.company_email, e.personal_email), users),
+			frappe.sendmail(recipients=filter(lambda u: u not in (e.company_email, e.personal_email, e.user_id), users),
 				subject=_("Birthday Reminder for {0}").format(e.employee_name),
 				message=_("""Today is {0}'s birthday!""").format(e.employee_name),
-				reply_to=e.company_email or e.personal_email,
+				reply_to=e.company_email or e.personal_email or e.user_id,
 				bulk=True)
 
 def get_employees_who_are_born_today():
 	"""Get Employee properties whose birthday is today."""
-	return frappe.db.sql("""select name, personal_email, company_email, employee_name
+	return frappe.db.sql("""select name, personal_email, company_email, user_id, employee_name
 		from tabEmployee where day(date_of_birth) = day(%(date)s)
 		and month(date_of_birth) = month(%(date)s)
 		and status = 'Active'""", {"date": today()}, as_dict=True)

diff --git a/erpnext/hr/doctype/employee_education/employee_education.json b/erpnext/hr/doctype/employee_education/employee_education.json
index d0d4255..1049ce5 100644
--- a/erpnext/hr/doctype/employee_education/employee_education.json
+++ b/erpnext/hr/doctype/employee_education/employee_education.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "School/University", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "school_univ", 
    "oldfieldtype": "Small Text", 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qualification", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qualification", 
    "oldfieldtype": "Data", 
@@ -65,7 +67,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Level",  
+   "label": "Level", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "level", 
    "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year of Passing", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "year_of_passing", 
    "oldfieldtype": "Int", 
@@ -113,6 +117,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Class / Percentage", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "class_per", 
    "oldfieldtype": "Data", 
@@ -136,6 +141,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Major/Optional Subjects", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "maj_opt_subj", 
    "oldfieldtype": "Text", 
@@ -157,7 +163,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:49.501752", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.561817", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Education", 

diff --git a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json
index fc10848..cbd1b54 100644
--- a/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json
+++ b/erpnext/hr/doctype/employee_external_work_history/employee_external_work_history.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company_name", 
    "oldfieldtype": "Data", 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Data", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Salary", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "salary", 
    "oldfieldtype": "Currency", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "address", 
    "oldfieldtype": "Small Text", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contact", 
    "oldfieldtype": "Data", 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Experience", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_experience", 
    "oldfieldtype": "Data", 
@@ -155,7 +161,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:49.600116", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.610845", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee External Work History", 

diff --git a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
index 20f0240..fb82e7f 100644
--- a/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json
+++ b/erpnext/hr/doctype/employee_internal_work_history/employee_internal_work_history.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Select", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Select", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "from_date", 
    "oldfieldtype": "Date", 
@@ -113,6 +117,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "to_date", 
    "oldfieldtype": "Date", 
@@ -134,7 +139,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:49.685680", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.658225", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Internal Work History", 

diff --git a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json
index 07b43e2..9c40cea 100644
--- a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json
+++ b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Leave Approver", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "User", 
    "permlevel": 0, 
@@ -41,7 +42,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:49.771647", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.702691", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Leave Approver", 

diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index ab6d62d..5bd58d4 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Employment Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_type_name", 
    "oldfieldtype": "Data", 
@@ -42,7 +43,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:49.822148", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:46.733350", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employment Type", 

diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index a8d56fb..b16a98d 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json

@@ -1,6 +1,6 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "creation": "2013-01-10 16:34:14", 
@@ -19,12 +19,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "EXP", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -44,13 +46,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Approval Status",  
+   "label": "Approval Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "approval_status", 
    "oldfieldtype": "Select", 
    "options": "Draft\nApproved\nRejected", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -70,12 +74,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Approver", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "exp_approver", 
    "oldfieldtype": "Select", 
    "options": "User", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -94,10 +100,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -117,12 +125,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Claimed Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_claimed_amount", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -142,12 +152,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Sanctioned Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "total_sanctioned_amount", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -167,10 +179,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -189,12 +203,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expenses", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expense_voucher_details", 
    "oldfieldtype": "Table", 
    "options": "Expense Claim Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -212,10 +228,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -235,11 +253,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -258,12 +278,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "From Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
    "options": "Employee", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -282,11 +304,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -306,12 +330,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -330,12 +356,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -353,9 +381,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -374,11 +404,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount Reimbursed", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -397,11 +429,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remark", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remark", 
    "oldfieldtype": "Small Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -420,11 +454,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Project", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -443,11 +479,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Task", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Task", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -467,10 +505,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -489,11 +529,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employees Email Id", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "email_id", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -512,12 +554,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
    "options": "Expense Claim", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -536,7 +580,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:50.191920", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-07 10:38:37.072229", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
@@ -564,7 +610,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -580,6 +626,7 @@
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
+   "user_permission_doctypes": "[\"Employee\"]", 
    "write": 1
   }, 
   {
@@ -630,5 +677,6 @@
  "search_fields": "approval_status,employee,employee_name", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "title"
+ "title_field": "title", 
+ "version": 0
 }
\ No newline at end of file

diff --git a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
index 6e0be7d..d4e53a0 100644
--- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
+++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Expense Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expense_date", 
    "oldfieldtype": "Date", 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Expense Claim Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expense_type", 
    "oldfieldtype": "Link", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -113,6 +117,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -159,6 +165,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Claim Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "claim_amount", 
    "oldfieldtype": "Currency", 
@@ -206,6 +214,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -228,6 +237,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sanctioned Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "sanctioned_amount", 
    "oldfieldtype": "Currency", 
@@ -252,7 +262,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:50.425244", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.025506", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Detail", 

diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index a804cc5..460b3b8 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Claim Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expense_type", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -89,7 +92,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:50.532121", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.084611", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim Type", 

diff --git a/erpnext/hr/doctype/holiday/holiday.json b/erpnext/hr/doctype/holiday/holiday.json
index 6edca02..a7fc6a7 100644
--- a/erpnext/hr/doctype/holiday/holiday.json
+++ b/erpnext/hr/doctype/holiday/holiday.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "holiday_date", 
    "oldfieldtype": "Date", 
@@ -62,7 +64,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:51.356409", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.483435", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Holiday", 

diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index 70c7f22..999709d 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Holiday List Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "holiday_list_name", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Link", 
@@ -87,7 +90,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Weekly Off",  
+   "label": "Weekly Off", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "\nSunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", 
    "permlevel": 0, 
@@ -110,6 +114,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Weekly Off Dates", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "get_weekly_off_dates", 
    "permlevel": 0, 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Holidays", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "holiday_list_details", 
    "oldfieldtype": "Table", 
@@ -156,6 +162,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Clear Table", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "clear_table", 
    "permlevel": 0, 
@@ -177,7 +184,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:51.415692", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.519087", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Holiday List", 

diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.py b/erpnext/hr/doctype/holiday_list/holiday_list.py
index 336a081..b1cbca3 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.py
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.py

@@ -60,7 +60,7 @@
 
 	def update_default_holiday_list(self):
 		frappe.db.sql("""update `tabHoliday List` set is_default = 0
-			where ifnull(is_default, 0) = 1 and fiscal_year = %s""", (self.fiscal_year,))
+			where is_default = 1 and fiscal_year = %s""", (self.fiscal_year,))
 
 @frappe.whitelist()
 def get_events(start, end, filters=None):

diff --git a/erpnext/hr/doctype/holiday_list/test_records.json b/erpnext/hr/doctype/holiday_list/test_records.json
index 342bacb..a8cf56b 100644
--- a/erpnext/hr/doctype/holiday_list/test_records.json
+++ b/erpnext/hr/doctype/holiday_list/test_records.json

@@ -8,6 +8,10 @@
     "holiday_date": "2013-01-01"
    },
    {
+    "description": "Republic Day", 
+    "holiday_date": "2013-01-26"
+   },
+   {
     "description": "Test Holiday", 
     "holiday_date": "2013-02-01"
    }

diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index e80abe2..e1351ef 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Applicant Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Id", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Email", 
    "permlevel": 0, 
@@ -63,7 +65,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Open\nReplied\nRejected\nHold", 
    "permlevel": 0, 
@@ -85,6 +88,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -107,6 +111,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Job Opening", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Job Opening", 
    "permlevel": 0, 
@@ -128,6 +133,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -149,6 +155,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Thread HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -170,6 +177,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Communications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Communication", 
    "permlevel": 0, 
@@ -191,7 +199,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:53.861921", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.722773", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 

diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index a72118a..f4380ad 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Job Title", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,7 +42,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Open\nClosed", 
    "permlevel": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -85,7 +88,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:53.972949", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.769149", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Opening", 

diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
index 994dc3c..06c7693 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.js
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js

@@ -1,48 +1,62 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.cscript.onload = function(doc, dt, dn) {
-  if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()});
-}
-
-
 cur_frm.add_fetch('employee','employee_name','employee_name');
 
-cur_frm.cscript.employee = function(doc, dt, dn) {
-  calculate_total_leaves_allocated(doc, dt, dn);
-}
-
-cur_frm.cscript.leave_type = function(doc, dt, dn) {
-  calculate_total_leaves_allocated(doc, dt, dn);
-}
-
-cur_frm.cscript.fiscal_year = function(doc, dt, dn) {
-  calculate_total_leaves_allocated(doc, dt, dn);
-}
-
-cur_frm.cscript.carry_forward = function(doc, dt, dn) {
-  calculate_total_leaves_allocated(doc, dt, dn);
-}
-
-cur_frm.cscript.carry_forwarded_leaves = function(doc, dt, dn) {
-  set_multiple(dt,dn,{total_leaves_allocated : flt(doc.carry_forwarded_leaves)+flt(doc.new_leaves_allocated)});
-}
-
-cur_frm.cscript.new_leaves_allocated = function(doc, dt, dn) {
-  set_multiple(dt,dn,{total_leaves_allocated : flt(doc.carry_forwarded_leaves)+flt(doc.new_leaves_allocated)});
-}
-
-calculate_total_leaves_allocated = function(doc, dt, dn) {
-  if(cint(doc.carry_forward) == 1 && doc.leave_type && doc.fiscal_year && doc.employee){
-    return get_server_fields('get_carry_forwarded_leaves','','', doc, dt, dn, 1);
+frappe.ui.form.on("Leave Allocation", {
+	onload: function(frm) {
+		if(!frm.doc.from_date) frm.set_value("from_date", get_today());
+		
+		frm.set_query("employee", function() {
+			return {
+				query: "erpnext.controllers.queries.employee_query"
+			}
+		})
+	},
+	
+	employee: function(frm) {
+		frm.trigger("calculate_total_leaves_allocated");
+	},
+	
+	leave_type: function(frm) {
+		frm.trigger("calculate_total_leaves_allocated");
+	},
+	
+	carry_forward: function(frm) {
+		frm.trigger("calculate_total_leaves_allocated");
+	},
+	
+	carry_forwarded_leaves: function(frm) {
+		frm.set_value("total_leaves_allocated", 
+			flt(frm.doc.carry_forwarded_leaves) + flt(frm.doc.new_leaves_allocated));
+	},
+	
+	new_leaves_allocated: function(frm) {
+		frm.set_value("total_leaves_allocated", 
+			flt(frm.doc.carry_forwarded_leaves) + flt(frm.doc.new_leaves_allocated));
+	},
+	
+	calculate_total_leaves_allocated: function(frm) {
+		if (cint(frm.doc.carry_forward) == 1 && frm.doc.leave_type && frm.doc.employee) {
+			return frappe.call({
+				method: "erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves",
+				args: {
+					"employee": frm.doc.employee,
+					"date": frm.doc.from_date,
+					"leave_type": frm.doc.leave_type,
+					"carry_forward": frm.doc.carry_forward
+				},
+				callback: function(r) {
+					if (!r.exc && r.message) {
+						frm.set_value('carry_forwarded_leaves', r.message);
+						frm.set_value("total_leaves_allocated", 
+							flt(r.message) + flt(frm.doc.new_leaves_allocated));
+					}
+				}
+			})
+		} else if (cint(frm.doc.carry_forward) == 0) {
+			frm.set_value("carry_forwarded_leaves", 0);
+			frm.set_value("total_leaves_allocated", flt(frm.doc.new_leaves_allocated));
+		}
 	}
-  else if(cint(doc.carry_forward) == 0){
-    set_multiple(dt,dn,{carry_forwarded_leaves : 0,total_leaves_allocated : flt(doc.new_leaves_allocated)});
-  }
-}
-
-cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
-  return{
-    query: "erpnext.controllers.queries.employee_query"
-  }
-}
+})
\ No newline at end of file

diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 2f606bd..83383f8 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json

@@ -18,6 +18,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -40,6 +41,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
@@ -64,6 +66,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -84,6 +87,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -106,6 +110,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reason", 
    "oldfieldtype": "Small Text", 
@@ -129,6 +134,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -151,6 +157,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Leave Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "leave_type", 
    "oldfieldtype": "Link", 
@@ -175,6 +182,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -197,6 +205,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -218,6 +227,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -240,6 +250,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "New Leaves Allocated", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -262,6 +273,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Add unused leaves from previous allocations", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -284,6 +296,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unused leaves", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -305,6 +318,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Leaves Allocated", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -326,6 +340,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -349,7 +364,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-11-04 03:13:11.121463", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.377973", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 

diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.py b/erpnext/hr/doctype/leave_allocation/leave_allocation.py
index f846124..6740c6e 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.py

@@ -3,93 +3,112 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, flt, date_diff
+from frappe.utils import flt, date_diff, formatdate
 from frappe import _
 from frappe.model.document import Document
 from erpnext.hr.utils import set_employee_name
+from erpnext.hr.doctype.leave_application.leave_application import get_approved_leaves_for_period
+
+class OverlapError(frappe.ValidationError): pass
+class BackDatedAllocationError(frappe.ValidationError): pass
+class OverAllocationError(frappe.ValidationError): pass
+class LessAllocationError(frappe.ValidationError): pass
+class ValueMultiplierError(frappe.ValidationError): pass
 
 class LeaveAllocation(Document):
 	def validate(self):
 		self.validate_period()
 		self.validate_new_leaves_allocated_value()
-		self.check_existing_leave_allocation()
-		if not self.total_leaves_allocated:
-			self.total_leaves_allocated = self.new_leaves_allocated
-
+		self.validate_allocation_overlap()
+		self.validate_back_dated_allocation()
+		self.set_total_leaves_allocated()
+		self.validate_total_leaves_allocated()
 		set_employee_name(self)
 
 	def on_update_after_submit(self):
 		self.validate_new_leaves_allocated_value()
-
-	def on_update(self):
-		self.get_total_allocated_leaves()
+		self.set_total_leaves_allocated()
+		
+		frappe.db.set(self,'carry_forwarded_leaves', flt(self.carry_forwarded_leaves))
+		frappe.db.set(self,'total_leaves_allocated',flt(self.total_leaves_allocated))
+		
+		self.validate_against_leave_applications()
 
 	def validate_period(self):
 		if date_diff(self.to_date, self.from_date) <= 0:
-			frappe.throw(_("Invalid period"))
+			frappe.throw(_("To date cannot be before from date"))
 
 	def validate_new_leaves_allocated_value(self):
 		"""validate that leave allocation is in multiples of 0.5"""
 		if flt(self.new_leaves_allocated) % 0.5:
-			frappe.throw(_("Leaves must be allocated in multiples of 0.5"))
+			frappe.throw(_("Leaves must be allocated in multiples of 0.5"), ValueMultiplierError)
 
-	def check_existing_leave_allocation(self):
-		"""check whether leave for same type is already allocated or not"""
-		leave_allocation = frappe.db.sql("""select name from `tabLeave Allocation`
-			where employee='%s' and leave_type='%s' and to_date >= '%s' and from_date <= '%s' and docstatus=1
-		"""%(self.employee, self.leave_type, self.from_date, self.to_date))
+	def validate_allocation_overlap(self):
+		leave_allocation = frappe.db.sql("""
+			select name from `tabLeave Allocation`
+			where employee=%s and leave_type=%s and docstatus=1
+			and to_date >= %s and from_date <= %s""", 
+			(self.employee, self.leave_type, self.from_date, self.to_date))
 
 		if leave_allocation:
-			frappe.msgprint(_("Leaves for type {0} already allocated for Employee {1} for period {2} - {3}").format(self.leave_type,
-				self.employee, self.from_date, self.to_date))
-			frappe.throw(_('Reference') + ': <a href="#Form/Leave Allocation/{0}">{0}</a>'.format(leave_allocation[0][0]))
+			frappe.msgprint(_("{0} already allocated for Employee {1} for period {2} to {3}")
+				.format(self.leave_type, self.employee, formatdate(self.from_date), formatdate(self.to_date)))
+			
+			frappe.throw(_('Reference') + ': <a href="#Form/Leave Allocation/{0}">{0}</a>'
+				.format(leave_allocation[0][0]), OverlapError)
+				
+	def validate_back_dated_allocation(self):
+		future_allocation = frappe.db.sql("""select name, from_date from `tabLeave Allocation`
+			where employee=%s and leave_type=%s and docstatus=1 and from_date > %s 
+			and carry_forward=1""", (self.employee, self.leave_type, self.to_date), as_dict=1)
+		
+		if future_allocation:
+			frappe.throw(_("Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}")
+				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name), 
+					BackDatedAllocationError)
 
-	def get_leave_bal(self):
-		return self.get_leaves_allocated() - self.get_leaves_applied()
+	def set_total_leaves_allocated(self):
+		self.carry_forwarded_leaves = get_carry_forwarded_leaves(self.employee, 
+			self.leave_type, self.from_date, self.carry_forward)
+			
+		self.total_leaves_allocated = flt(self.carry_forwarded_leaves) + flt(self.new_leaves_allocated)
+		
+		if not self.total_leaves_allocated:
+			frappe.throw(_("Total leaves allocated is mandatory"))
 
-	def get_leaves_applied(self):
-		leaves_applied = frappe.db.sql("""select SUM(ifnull(total_leave_days, 0))
-			from `tabLeave Application` where employee=%s and leave_type=%s
-			and to_date<=%s and docstatus=1""",
-			(self.employee, self.leave_type, self.from_date))
-		return leaves_applied and flt(leaves_applied[0][0]) or 0
+	def validate_total_leaves_allocated(self):
+		if date_diff(self.to_date, self.from_date) <= flt(self.total_leaves_allocated):
+			frappe.throw(_("Total allocated leaves are more than days in the period"), OverAllocationError)
+			
+	def validate_against_leave_applications(self):
+		leaves_taken = get_approved_leaves_for_period(self.employee, self.leave_type, 
+			self.from_date, self.to_date)
+		
+		if flt(leaves_taken) > flt(self.total_leaves_allocated):
+			frappe.throw(_("Total allocated leaves {0} cannot be less than already approved leaves {1} for the period").format(self.total_leaves_allocated, leaves_taken), LessAllocationError)
 
-	def get_leaves_allocated(self):
-		leaves_allocated = frappe.db.sql("""select SUM(ifnull(total_leaves_allocated, 0))
-			from `tabLeave Allocation` where employee=%s and leave_type=%s
-			and to_date<=%s and docstatus=1 and name!=%s""",
-			(self.employee, self.leave_type, self.from_date, self.name))
-		return leaves_allocated and flt(leaves_allocated[0][0]) or 0
-
-	def allow_carry_forward(self):
-		"""check whether carry forward is allowed or not for this leave type"""
-		cf = frappe.db.sql("""select is_carry_forward from `tabLeave Type` where name = %s""",
-			self.leave_type)
-		cf = cf and cint(cf[0][0]) or 0
-		if not cf:
-			frappe.db.set(self,'carry_forward',0)
-			frappe.throw(_("Cannot carry forward {0}").format(self.leave_type))
-
-	def get_carry_forwarded_leaves(self):
-		if self.carry_forward:
-			self.allow_carry_forward()
-
-		prev_bal = 0
-		if cint(self.carry_forward) == 1:
-			prev_bal = self.get_leave_bal()
-
-		ret = {
-			'carry_forwarded_leaves': prev_bal,
-			'total_leaves_allocated': flt(prev_bal) + flt(self.new_leaves_allocated)
-		}
-		return ret
-
-	def get_total_allocated_leaves(self):
-		leave_det = self.get_carry_forwarded_leaves()
-		self.validate_total_leaves_allocated(leave_det)
-		frappe.db.set(self,'carry_forwarded_leaves',flt(leave_det['carry_forwarded_leaves']))
-		frappe.db.set(self,'total_leaves_allocated',flt(leave_det['total_leaves_allocated']))
-
-	def validate_total_leaves_allocated(self, leave_det):
-		if date_diff(self.to_date, self.from_date) <= leave_det['total_leaves_allocated']:
-			frappe.throw(_("Total allocated leaves are more than period"))
+@frappe.whitelist()
+def get_carry_forwarded_leaves(employee, leave_type, date, carry_forward=None):
+	carry_forwarded_leaves = 0
+	
+	if carry_forward:
+		validate_carry_forward(leave_type)
+		
+		previous_allocation = frappe.db.sql("""
+			select name, from_date, to_date, total_leaves_allocated
+			from `tabLeave Allocation`
+			where employee=%s and leave_type=%s and docstatus=1 and to_date < %s
+			order by to_date desc limit 1
+		""", (employee, leave_type, date), as_dict=1)
+		if previous_allocation:
+			leaves_taken = get_approved_leaves_for_period(employee, leave_type, 
+				previous_allocation[0].from_date, previous_allocation[0].to_date)
+		
+			carry_forwarded_leaves = flt(previous_allocation[0].total_leaves_allocated) - flt(leaves_taken)
+			
+	return carry_forwarded_leaves
+		
+def validate_carry_forward(leave_type):
+	if not frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
+		frappe.throw(_("Leave Type {0} cannot be carry-forwarded").format(leave_type))
+	
\ No newline at end of file

diff --git a/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py b/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py
index d36fb2c..3b22eb2 100644
--- a/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py
+++ b/erpnext/hr/doctype/leave_allocation/test_leave_allocation.py

@@ -4,7 +4,9 @@
 from frappe.utils import getdate
 
 class TestLeaveAllocation(unittest.TestCase):
-	def test_overlapping_allocation(self):		
+	def test_overlapping_allocation(self):
+		frappe.db.sql("delete from `tabLeave Allocation`")
+				
 		employee = frappe.get_doc("Employee", frappe.db.sql_list("select name from tabEmployee limit 1")[0])
 		leaves = [
 			{
@@ -13,7 +15,7 @@
 				"employee": employee.name,
 				"employee_name": employee.employee_name,
 				"leave_type": "_Test Leave Type",
-				"from_date": getdate("2015-10-1"),
+				"from_date": getdate("2015-10-01"),
 				"to_date": getdate("2015-10-31"),
 				"new_leaves_allocated": 5,
 				"docstatus": 1			
@@ -24,7 +26,7 @@
 				"employee": employee.name,
 				"employee_name": employee.employee_name,
 				"leave_type": "_Test Leave Type",
-				"from_date": getdate("2015-09-1"),
+				"from_date": getdate("2015-09-01"),
 				"to_date": getdate("2015-11-30"),
 				"new_leaves_allocated": 5			
 			}

diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index 835170a..9d44017 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js

@@ -66,14 +66,19 @@
 	},
 
 	get_leave_balance: function(frm) {
-		if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type && frm.doc.from_date && frm.doc.to_date) {
-			return frm.call({
-				method: "get_leave_balance",
+		if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type && frm.doc.from_date) {
+			return frappe.call({
+				method: "erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on",
 				args: {
 					employee: frm.doc.employee,
-					from_date: frm.doc.from_date,
-					to_date: frm.doc.to_date,
-					leave_type: frm.doc.leave_type
+					date: frm.doc.from_date,
+					leave_type: frm.doc.leave_type,
+					consider_all_leaves_in_the_allocation_period: true
+				},
+				callback: function(r) {
+					if (!r.exc && r.message) {
+						frm.set_value('leave_balance', r.message);
+					}
 				}
 			});
 		}
@@ -83,14 +88,20 @@
 		if(frm.doc.from_date && frm.doc.to_date) {
 			if (cint(frm.doc.half_day)==1) {
 				frm.set_value("total_leave_days", 0.5);
-			} else {
+			} else if (frm.doc.employee && frm.doc.leave_type){
 				// server call is done to include holidays in leave days calculations
 				return frappe.call({
-					method: 'erpnext.hr.doctype.leave_application.leave_application.get_total_leave_days',
-					args: { leave_app: frm.doc },
-					callback: function(response) {
-						if (response && response.message) {
-							frm.set_value('total_leave_days', response.message.total_leave_days);
+					method: 'erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days',
+					args: {
+						"employee": frm.doc.employee,
+						"leave_type": frm.doc.leave_type,
+						"from_date": frm.doc.from_date,
+						"to_date": frm.doc.to_date,
+						"half_day": frm.doc.half_day
+					},
+					callback: function(r) {
+						if (r && r.message) {
+							frm.set_value('total_leave_days', r.message);
 							frm.trigger("get_leave_balance");
 						}
 					}

diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 62e4cd8..bce60af 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json

@@ -22,6 +22,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Open\nApproved\nRejected", 
    "permlevel": 1, 
@@ -43,6 +44,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Leave Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Leave Type", 
    "permlevel": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Balance Before Application", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -107,6 +111,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -150,6 +156,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -171,6 +178,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Half Day", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -192,6 +200,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Leave Days", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -212,6 +221,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -235,6 +245,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reason", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -255,6 +266,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -277,6 +289,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee", 
    "permlevel": 0, 
@@ -299,6 +312,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -319,6 +333,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -342,6 +357,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Approver", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "User", 
    "permlevel": 0, 
@@ -364,6 +380,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Approver Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -386,6 +403,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -408,6 +426,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -419,28 +438,6 @@
    "unique": 0
   }, 
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Fiscal Year", 
-   "no_copy": 0, 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -452,6 +449,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Follow via Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -472,6 +470,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -493,6 +492,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -515,6 +515,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
@@ -537,6 +538,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Leave Application", 
    "permlevel": 0, 
@@ -559,7 +561,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2015-10-28 16:14:25.640730", 
+ "modified": "2015-11-16 06:29:49.454329", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -711,7 +713,7 @@
  ], 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", 
+ "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days", 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "employee_name"

diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 8c91173..fe1291f 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py

@@ -2,13 +2,13 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe, json
+import frappe
 from frappe import _
-
 from frappe.utils import cint, cstr, date_diff, flt, formatdate, getdate, get_link_to_form, \
 	comma_or, get_fullname
-from frappe import msgprint
 from erpnext.hr.utils import set_employee_name
+from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+
 
 class LeaveDayBlockedError(frappe.ValidationError): pass
 class OverlapError(frappe.ValidationError): pass
@@ -18,8 +18,7 @@
 from frappe.model.document import Document
 class LeaveApplication(Document):
 	def get_feed(self):
-		return _("{0}: From {0} of type {1}").format(self.status,
-			self.employee_name, self.leave_type)
+		return _("{0}: From {0} of type {1}").format(self.status, self.employee_name, self.leave_type)
 
 	def validate(self):
 		if not getattr(self, "__islocal", None) and frappe.db.exists(self.doctype, self.name):
@@ -29,7 +28,7 @@
 
 		set_employee_name(self)
 
-		self.validate_to_date()
+		self.validate_dates()
 		self.validate_balance_leaves()
 		self.validate_leave_overlap()
 		self.validate_max_days()
@@ -51,6 +50,8 @@
 		if self.status != "Approved":
 			frappe.throw(_("Only Leave Applications with status 'Approved' can be submitted"))
 
+		self.validate_back_dated_application()
+
 		# notify leave applier about approval
 		self.notify_employee(self.status)
 
@@ -58,9 +59,41 @@
 		# notify leave applier about cancellation
 		self.notify_employee("cancelled")
 
-	def show_block_day_warning(self):
-		from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
+	def validate_dates(self):
+		if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
+			frappe.throw(_("To date cannot be before from date"))
+		
+		if not is_lwp(self.leave_type):
+			self.validate_dates_acorss_allocation()
+			self.validate_back_dated_application()
 
+	def validate_dates_acorss_allocation(self):
+		def _get_leave_alloction_record(date):
+			allocation = frappe.db.sql("""select name from `tabLeave Allocation`
+				where employee=%s and leave_type=%s and docstatus=1
+				and %s between from_date and to_date""", (self.employee, self.leave_type, date))
+
+			return allocation and allocation[0][0]
+
+		allocation_based_on_from_date = _get_leave_alloction_record(self.from_date)
+		allocation_based_on_to_date = _get_leave_alloction_record(self.to_date)
+
+		if not (allocation_based_on_from_date or allocation_based_on_to_date):
+			frappe.throw(_("Application period cannot be outside leave allocation period"))
+
+		elif allocation_based_on_from_date != allocation_based_on_to_date:
+			frappe.throw(_("Application period cannot be across two alocation records"))
+
+	def validate_back_dated_application(self):
+		future_allocation = frappe.db.sql("""select name, from_date from `tabLeave Allocation`
+			where employee=%s and leave_type=%s and docstatus=1 and from_date > %s
+			and carry_forward=1""", (self.employee, self.leave_type, self.to_date), as_dict=1)
+
+		if future_allocation:
+			frappe.throw(_("Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}")
+				.format(formatdate(future_allocation[0].from_date), future_allocation[0].name))
+
+	def show_block_day_warning(self):
 		block_dates = get_applicable_block_dates(self.from_date, self.to_date,
 			self.employee, self.company, all_lists=True)
 
@@ -70,60 +103,40 @@
 				frappe.msgprint(formatdate(d.block_date) + ": " + d.reason)
 
 	def validate_block_days(self):
-		from erpnext.hr.doctype.leave_block_list.leave_block_list import get_applicable_block_dates
-
 		block_dates = get_applicable_block_dates(self.from_date, self.to_date,
 			self.employee, self.company)
 
-		if block_dates:
-			if self.status == "Approved":
-				frappe.throw(_("Cannot approve leave as you are not authorized to approve leaves on Block Dates"),
-					LeaveDayBlockedError)
-
-	def get_holidays(self):
-		return get_holidays(self)
-
-	def get_total_leave_days(self):
-		return get_total_leave_days(self)
-
-	def validate_to_date(self):
-		if self.from_date and self.to_date and \
-				(getdate(self.to_date) < getdate(self.from_date)):
-			frappe.throw(_("To date cannot be before from date"))
+		if block_dates and self.status == "Approved":
+			frappe.throw(_("You are not authorized to approve leaves on Block Dates"), LeaveDayBlockedError)
 
 	def validate_balance_leaves(self):
 		if self.from_date and self.to_date:
-			self.total_leave_days = self.get_total_leave_days()["total_leave_days"]
+			self.total_leave_days = get_number_of_leave_days(self.employee, self.leave_type,
+				self.from_date, self.to_date, self.half_day)
 
 			if self.total_leave_days == 0:
-				frappe.throw(_("The day(s) on which you are applying for leave are holiday. You need not apply for leave."))
+				frappe.throw(_("The day(s) on which you are applying for leave are holidays. You need not apply for leave."))
 
 			if not is_lwp(self.leave_type):
-				self.leave_balance = get_leave_balance(self.employee,
-					self.leave_type, self.from_date, self.to_date)["leave_balance"]
+				self.leave_balance = get_leave_balance_on(self.employee, self.leave_type, self.from_date, 
+					consider_all_leaves_in_the_allocation_period=True)
 
-				if self.status != "Rejected" \
-						and self.leave_balance - self.total_leave_days < 0:
-					#check if this leave type allow the remaining balance to be in negative. If yes then warn the user and continue to save else warn the user and don't save.
+				if self.status != "Rejected" and self.leave_balance < self.total_leave_days:
 					if frappe.db.get_value("Leave Type", self.leave_type, "allow_negative"):
-						frappe.msgprint(_("Note: There is not enough leave balance for Leave Type {0}").format(self.leave_type))
+						frappe.msgprint(_("Note: There is not enough leave balance for Leave Type {0}")
+							.format(self.leave_type))
 					else:
-						frappe.throw(_("There is not enough leave balance for Leave Type {0}").format(self.leave_type))
-
+						frappe.throw(_("There is not enough leave balance for Leave Type {0}")
+							.format(self.leave_type))
 
 	def validate_leave_overlap(self):
 		if not self.name:
 			self.name = "New Leave Application"
 
-		for d in frappe.db.sql("""select name, leave_type, posting_date,
-			from_date, to_date
+		for d in frappe.db.sql("""select name, leave_type, posting_date, from_date, to_date
 			from `tabLeave Application`
-			where
-			employee = %(employee)s
-			and docstatus < 2
-			and status in ("Open", "Approved")
-			and to_date >= %(from_date)s 
-			and from_date <= %(to_date)s
+			where employee = %(employee)s and docstatus < 2 and status in ("Open", "Approved")
+			and to_date >= %(from_date)s and from_date <= %(to_date)s
 			and name != %(name)s""", {
 				"employee": self.employee,
 				"from_date": self.from_date,
@@ -131,9 +144,12 @@
 				"name": self.name
 			}, as_dict = 1):
 
-			frappe.msgprint(_("Employee {0} has already applied for {1} between {2} and {3}").format(self.employee,
-				cstr(d['leave_type']), formatdate(d['from_date']), formatdate(d['to_date'])))
-			frappe.throw('<a href="#Form/Leave Application/{0}">{0}</a>'.format(d["name"]), OverlapError)
+			frappe.msgprint(_("Employee {0} has already applied for {1} between {2} and {3}")
+				.format(self.employee, cstr(d['leave_type']),
+					formatdate(d['from_date']), formatdate(d['to_date'])))
+
+			frappe.throw("""Exising Application: <a href="#Form/Leave Application/{0}">{0}</a>"""
+				.format(d["name"]), OverlapError)
 
 	def validate_max_days(self):
 		max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_days_allowed")
@@ -145,7 +161,8 @@
 		leave_approvers = [l.leave_approver for l in employee.get("leave_approvers")]
 
 		if len(leave_approvers) and self.leave_approver not in leave_approvers:
-			frappe.throw(_("Leave approver must be one of {0}").format(comma_or(leave_approvers)), InvalidLeaveApproverError)
+			frappe.throw(_("Leave approver must be one of {0}")
+				.format(comma_or(leave_approvers)), InvalidLeaveApproverError)
 
 		elif self.leave_approver and not frappe.db.sql("""select name from `tabUserRole`
 			where parent=%s and role='Leave Approver'""", self.leave_approver):
@@ -153,8 +170,8 @@
 				.format(get_fullname(self.leave_approver), self.leave_approver), InvalidLeaveApproverError)
 
 		elif self.docstatus==1 and len(leave_approvers) and self.leave_approver != frappe.session.user:
-			msgprint(_("Only the selected Leave Approver can submit this Leave Application"),
-				raise_exception=LeaveApproverIdentityError)
+			frappe.throw(_("Only the selected Leave Approver can submit this Leave Application"),
+				LeaveApproverIdentityError)
 
 	def notify_employee(self, status):
 		employee = frappe.get_doc("Employee", self.employee)
@@ -214,59 +231,92 @@
 		and user.name like %s
 		and approver.leave_approver=user.name""", (filters.get("employee"), "%" + txt + "%"))
 
-def get_holidays(leave_app):
+@frappe.whitelist()
+def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day=None):
+	if half_day:
+		return 0.5
+	number_of_days = date_diff(to_date, from_date) + 1
+	if not frappe.db.get_value("Leave Type", leave_type, "include_holiday"):
+		number_of_days = flt(number_of_days) - flt(get_holidays(employee, from_date, to_date))
+
+	return number_of_days
+
+@frappe.whitelist()
+def get_leave_balance_on(employee, leave_type, date, allocation_records=None, 
+		consider_all_leaves_in_the_allocation_period=False):
+	if allocation_records == None:
+		allocation_records = get_leave_allocation_records(date, employee).get(employee, frappe._dict())
+
+	allocation = allocation_records.get(leave_type, frappe._dict())
+	
+	if consider_all_leaves_in_the_allocation_period:
+		date = allocation.to_date
+	leaves_taken = get_approved_leaves_for_period(employee, leave_type, allocation.from_date, date)
+
+	return flt(allocation.total_leaves_allocated) - flt(leaves_taken)
+
+def get_approved_leaves_for_period(employee, leave_type, from_date, to_date):
+	leave_applications = frappe.db.sql("""
+		select employee, leave_type, from_date, to_date, total_leave_days
+		from `tabLeave Application`
+		where employee=%(employee)s and leave_type=%(leave_type)s
+			and status="Approved" and docstatus=1
+			and (from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (from_date < %(from_date)s and to_date > %(to_date)s))
+	""", {
+		"from_date": from_date,
+		"to_date": to_date,
+		"employee": employee,
+		"leave_type": leave_type
+	}, as_dict=1)
+
+	leave_days = 0
+	for leave_app in leave_applications:
+		if leave_app.from_date >= getdate(from_date) and leave_app.to_date <= getdate(to_date):
+			leave_days += leave_app.total_leave_days
+		else:
+			if leave_app.from_date < getdate(from_date):
+				leave_app.from_date = from_date
+			if leave_app.to_date > getdate(to_date):
+				leave_app.to_date = to_date
+
+			leave_days += get_number_of_leave_days(employee, leave_type,
+				leave_app.from_date, leave_app.to_date)
+
+	return leave_days
+
+def get_leave_allocation_records(date, employee=None):
+	conditions = (" and employee='%s'" % employee) if employee else ""
+
+	leave_allocation_records = frappe.db.sql("""
+		select employee, leave_type, total_leaves_allocated, from_date, to_date
+		from `tabLeave Allocation`
+		where %s between from_date and to_date and docstatus=1 {0}""".format(conditions), (date), as_dict=1)
+
+	allocated_leaves = frappe._dict()
+	for d in leave_allocation_records:
+		allocated_leaves.setdefault(d.employee, frappe._dict()).setdefault(d.leave_type, frappe._dict({
+			"from_date": d.from_date,
+			"to_date": d.to_date,
+			"total_leaves_allocated": d.total_leaves_allocated
+		}))
+
+	return allocated_leaves
+
+
+def get_holidays(employee, from_date, to_date):
 	tot_hol = frappe.db.sql("""select count(*) from `tabHoliday` h1, `tabHoliday List` h2, `tabEmployee` e1
 		where e1.name = %s and h1.parent = h2.name and e1.holiday_list = h2.name
-		and h1.holiday_date between %s and %s""", (leave_app.employee, leave_app.from_date,
-			leave_app.to_date))[0][0]
-	# below line is needed. If an employee hasn't been assigned with any holiday list then above will return 0 rows.
+		and h1.holiday_date between %s and %s""", (employee, from_date, to_date))[0][0]
+
 	if not tot_hol:
 		tot_hol = frappe.db.sql("""select count(*) from `tabHoliday` h1, `tabHoliday List` h2
 			where h1.parent = h2.name and h1.holiday_date between %s and %s
-			and ifnull(h2.is_default,0) = 1 and h2.fiscal_year = %s""",
-			(leave_app.from_date, leave_app.to_date, leave_app.fiscal_year))[0][0]
+			and h2.is_default = 1""", (from_date, to_date))[0][0]
+
 	return tot_hol
 
-@frappe.whitelist()
-def get_total_leave_days(leave_app):
-	# Parse Leave Application if neccessary
-	if isinstance(leave_app, str) or isinstance(leave_app, unicode):
-		leave_app = frappe.get_doc(json.loads(leave_app))
-
-	"""Calculates total leave days based on input and holidays"""
-	ret = {'total_leave_days' : 0.5}
-	if not leave_app.half_day:
-		tot_days = date_diff(leave_app.to_date, leave_app.from_date) + 1
-		if frappe.db.get_value("Leave Type", leave_app.leave_type, "include_holiday"):
-			ret = {
-				'total_leave_days' : flt(tot_days)
-			}
-		else:
-			holidays = leave_app.get_holidays()
-			ret = {
-				'total_leave_days' : flt(tot_days)-flt(holidays)
-			}
-
-	return ret
-
-@frappe.whitelist()
-def get_leave_balance(employee, leave_type, from_date, to_date):
-	leave_all = frappe.db.sql("""select total_leaves_allocated
-		from `tabLeave Allocation` where employee = %s and leave_type = %s
-		and from_date<=%s and to_date>=%s and docstatus = 1""", (employee,
-			leave_type, from_date, to_date))
-
-	leave_all = leave_all and flt(leave_all[0][0]) or 0
-
-	leave_app = frappe.db.sql("""select SUM(total_leave_days)
-		from `tabLeave Application`
-		where employee = %s and leave_type = %s and to_date>=%s and from_date<=%s
-		and status="Approved" and docstatus = 1""", (employee, leave_type, from_date, to_date))
-	leave_app = leave_app and flt(leave_app[0][0]) or 0
-
-	ret = {'leave_balance': leave_all - leave_app}
-	return ret
-
 def is_lwp(leave_type):
 	lwp = frappe.db.sql("select is_lwp from `tabLeave Type` where name = %s", leave_type)
 	return lwp and cint(lwp[0][0]) or 0

diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index 9e21708..67e211e 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py

@@ -44,7 +44,11 @@
 ]
 
 
-class TestLeaveApplication(unittest.TestCase):
+class TestLeaveApplication(unittest.TestCase):	
+	def setUp(self):
+		for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
+			frappe.db.sql("delete from `tab%s`" % dt)
+	
 	def tearDown(self):
 		frappe.set_user("Administrator")
 
@@ -97,6 +101,8 @@
 
 		frappe.db.set_value("Department", "_Test Department",
 			"leave_block_list", "_Test Leave Block List")
+			
+		make_allocation_record()
 
 		application = self.get_application(_test_records[0])
 		application.insert()
@@ -120,6 +126,9 @@
 		add_role("test2@example.com", "Leave Approver")
 
 		frappe.set_user("test@example.com")
+
+		make_allocation_record()
+		
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.insert()
@@ -135,7 +144,9 @@
 		add_role("test1@example.com", "Employee")
 		add_role("test@example.com", "Leave Approver")
 		self._add_employee_leave_approver("_T-Employee-0002", "test@example.com")
-
+		
+		make_allocation_record(employee="_T-Employee-0002")
+		
 		application = self.get_application(_test_records[1])
 		application.leave_approver = "test@example.com"
 
@@ -175,6 +186,9 @@
 
 		# create leave application as Employee
 		frappe.set_user("test@example.com")
+		
+		make_allocation_record()
+		
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test1@example.com"
 		application.insert()
@@ -196,6 +210,8 @@
 		self._add_employee_leave_approver("_T-Employee-0001", "test2@example.com")
 		self._remove_employee_leave_approver("_T-Employee-0001", "test1@example.com")
 
+		make_allocation_record()
+
 		application = self.get_application(_test_records[0])
 		frappe.set_user("test@example.com")
 
@@ -212,6 +228,9 @@
 		# create leave application as employee
 		# but submit as invalid leave approver - should raise exception
 		frappe.set_user("test@example.com")
+		
+		make_allocation_record()
+		
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.insert()
@@ -232,6 +251,9 @@
 		frappe.db.set_value("Employee", "_T-Employee-0001", "department", None)
 
 		frappe.set_user("test@example.com")
+		
+		make_allocation_record()
+		
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.insert()
@@ -246,4 +268,19 @@
 		frappe.db.sql("""delete from `tabEmployee Leave Approver` where parent=%s""",
 			"_T-Employee-0001")
 
-		frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)
\ No newline at end of file
+		frappe.db.set_value("Employee", "_T-Employee-0001", "department", original_department)
+		
+def make_allocation_record(employee=None, leave_type=None):
+	frappe.db.sql("delete from `tabLeave Allocation`")
+	
+	allocation = frappe.get_doc({
+		"doctype": "Leave Allocation",
+		"employee": employee or "_T-Employee-0001",
+		"leave_type": leave_type or "_Test Leave Type",
+		"from_date": "2013-01-01",
+		"to_date": "2015-12-31",
+		"new_leaves_allocated": 30
+	})
+	
+	allocation.insert(ignore_permissions=True)
+	allocation.submit()

diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index 56b4454..7dc0dde 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Leave Block List Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Year", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year", 
    "permlevel": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Applies to Company", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Block Days", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -130,6 +135,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Block List Dates", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Leave Block List Date", 
    "permlevel": 0, 
@@ -153,6 +159,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow Users", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -174,6 +181,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Block List Allowed", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Leave Block List Allow", 
    "permlevel": 0, 
@@ -195,7 +203,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:55.691200", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.553862", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List", 

diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.py b/erpnext/hr/doctype/leave_block_list/leave_block_list.py
index d1e39de..5d913f2 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.py
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.py

@@ -58,7 +58,7 @@
 
 	# global
 	for block_list in frappe.db.sql_list("""select name from `tabLeave Block List`
-		where ifnull(applies_to_all_departments,0)=1 and company=%s""", company):
+		where applies_to_all_departments=1 and company=%s""", company):
 		add_block_list(block_list)
 
 	return list(set(block_lists))

diff --git a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json
index 33a61d7..7d5092d 100644
--- a/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json
+++ b/erpnext/hr/doctype/leave_block_list_allow/leave_block_list_allow.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Allow User", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "User", 
    "permlevel": 0, 
@@ -40,7 +41,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:55.787281", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.599178", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List Allow", 

diff --git a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json
index 52da5b6..119e200 100644
--- a/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json
+++ b/erpnext/hr/doctype/leave_block_list_date/leave_block_list_date.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Block Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reason", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,7 +64,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:55.839918", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.626901", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Block List Date", 

diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index f7f96b6..e218ecd 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Leave Type Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "leave_type_name", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Max Days Leave Allowed", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "max_days_allowed", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Is Carry Forward", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_carry_forward", 
    "oldfieldtype": "Check", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Is Encash", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_encash", 
    "oldfieldtype": "Check", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Leave Without Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -133,6 +138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow Negative Balance", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -154,6 +160,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Include holidays within leaves as leaves", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -174,7 +181,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:55.903280", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.659028", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Type", 

diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json
index cd83d1e..f0000a4 100644
--- a/erpnext/hr/doctype/offer_letter/offer_letter.json
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Job Applicant", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Job Applicant", 
    "permlevel": 0, 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Applicant Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "job_applicant.applicant_name", 
    "permlevel": 0, 
@@ -66,6 +68,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -87,7 +90,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Awaiting Response\nAccepted\nRejected", 
    "permlevel": 0, 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Offer Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Designation", 
    "permlevel": 0, 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -179,6 +186,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Offer Letter Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Offer Letter Term", 
    "permlevel": 0, 
@@ -223,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -245,6 +255,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Select Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
@@ -268,6 +279,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -291,6 +303,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Offer Letter", 
    "permlevel": 0, 
@@ -310,7 +323,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:58.043259", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.746594", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Letter", 

diff --git a/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json b/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json
index ff98be8..b34eabc 100644
--- a/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json
+++ b/erpnext/hr/doctype/offer_letter_term/offer_letter_term.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Offer Term", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Offer Term", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Value / Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -82,7 +85,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:58.211366", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.811208", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Letter Term", 

diff --git a/erpnext/hr/doctype/offer_term/offer_term.json b/erpnext/hr/doctype/offer_term/offer_term.json
index ed6ad87..03e8ccc 100644
--- a/erpnext/hr/doctype/offer_term/offer_term.json
+++ b/erpnext/hr/doctype/offer_term/offer_term.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Offer Term", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -39,7 +40,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:58.280068", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.848215", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Term", 

diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index 3658e65..b6b76c9 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py

@@ -41,7 +41,7 @@
 
 
 	def get_joining_releiving_condition(self):
-		m = self.get_month_details(self.fiscal_year, self.month)
+		m = get_month_details(self.fiscal_year, self.month)
 		cond = """
 			and ifnull(t1.date_of_joining, '0000-00-00') <= '%(month_end_date)s'
 			and ifnull(t1.relieving_date, '2199-12-31') >= '%(month_start_date)s'
@@ -54,24 +54,6 @@
 			if not self.get(f):
 				frappe.throw(_("Please set {0}").format(f))
 
-	def get_month_details(self, year, month):
-		ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date")
-		if ysd:
-			from dateutil.relativedelta import relativedelta
-			import calendar, datetime
-			diff_mnt = cint(month)-cint(ysd.month)
-			if diff_mnt<0:
-				diff_mnt = 12-int(ysd.month)+cint(month)
-			msd = ysd + relativedelta(months=diff_mnt) # month start date
-			month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
-			med = datetime.date(msd.year, cint(month), month_days) # month end date
-			return {
-				'year': msd.year,
-				'month_start_date': msd,
-				'month_end_date': med,
-				'month_days': month_days
-			}
-
 	def create_sal_slip(self):
 		"""
 			Creates salary slip for selected employees if already not created
@@ -205,3 +187,22 @@
 		])
 
 		return journal_entry.as_dict()
+
+
+def get_month_details(year, month):
+	ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date")
+	if ysd:
+		from dateutil.relativedelta import relativedelta
+		import calendar, datetime
+		diff_mnt = cint(month)-cint(ysd.month)
+		if diff_mnt<0:
+			diff_mnt = 12-int(ysd.month)+cint(month)
+		msd = ysd + relativedelta(months=diff_mnt) # month start date
+		month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
+		med = datetime.date(msd.year, cint(month), month_days) # month end date
+		return frappe._dict({
+			'year': msd.year,
+			'month_start_date': msd,
+			'month_end_date': med,
+			'month_days': month_days
+		})
\ No newline at end of file

diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 3788df0..2680b52 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json

@@ -17,6 +17,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -40,6 +41,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
@@ -64,6 +66,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
@@ -87,6 +90,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Link", 
@@ -111,6 +115,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Link", 
@@ -135,6 +140,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Link", 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
@@ -181,6 +188,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -202,6 +210,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -224,7 +233,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Month",  
+   "label": "Month", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "month", 
    "oldfieldtype": "Select", 
@@ -250,6 +260,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Data", 
@@ -274,6 +285,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Working Days", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_days_in_month", 
    "oldfieldtype": "Int", 
@@ -297,6 +309,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Without Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "leave_without_pay", 
    "oldfieldtype": "Currency", 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payment Days", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "payment_days", 
    "oldfieldtype": "Float", 
@@ -343,6 +357,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bank Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bank_name", 
    "oldfieldtype": "Data", 
@@ -366,6 +381,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bank Account No.", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bank_account_no", 
    "oldfieldtype": "Data", 
@@ -389,6 +405,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "email_check", 
    "oldfieldtype": "Check", 
@@ -412,6 +429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -436,6 +454,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Earning & Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -458,6 +477,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Earning", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -480,6 +500,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "<label>Earnings</label>", 
    "permlevel": 0, 
@@ -502,6 +523,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Earnings", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "earning_details", 
    "oldfieldtype": "Table", 
@@ -526,6 +548,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -548,6 +571,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "<label>Deductions</label>", 
    "permlevel": 0, 
@@ -570,6 +594,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Deductions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "deduction_details", 
    "oldfieldtype": "Table", 
@@ -594,6 +619,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -615,6 +641,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -635,6 +662,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -656,6 +684,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Arrear Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "arrear_amount", 
    "oldfieldtype": "Currency", 
@@ -680,6 +709,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Leave Encashment Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "encashment_amount", 
    "oldfieldtype": "Currency", 
@@ -704,6 +734,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "gross_pay", 
    "oldfieldtype": "Currency", 
@@ -728,6 +759,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_deduction", 
    "oldfieldtype": "Currency", 
@@ -753,6 +785,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_pay", 
    "oldfieldtype": "Currency", 
@@ -777,6 +810,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -800,6 +834,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total in words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_pay_in_words", 
    "oldfieldtype": "Data", 
@@ -822,7 +857,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:08.187427", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.474041", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 

diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 12fdc20..818c95e 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py

@@ -4,12 +4,13 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import add_days, cint, cstr, flt, getdate, nowdate, rounded
+from frappe.utils import add_days, cint, cstr, flt, getdate, nowdate, rounded, date_diff
 from frappe.model.naming import make_autoname
 
 from frappe import msgprint, _
 from erpnext.setup.utils import get_company_currency
 from erpnext.hr.utils import set_employee_name
+from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
 
 from erpnext.utilities.transaction_base import TransactionBase
 
@@ -19,87 +20,108 @@
 
 	def get_emp_and_leave_details(self):
 		if self.employee:
-			self.get_leave_details()
-			struct = self.check_sal_struct()
+			joining_date, relieving_date = frappe.db.get_value("Employee", self.employee, 
+				["date_of_joining", "relieving_date"])
+				
+			self.get_leave_details(joining_date, relieving_date)
+			
+			struct = self.check_sal_struct(joining_date, relieving_date)
 			if struct:
+				self.set("earnings", [])
+				self.set("deduction", [])
 				self.pull_sal_struct(struct)
 
-	def check_sal_struct(self):
+	def check_sal_struct(self, joining_date, relieving_date):
+		m = get_month_details(self.fiscal_year, self.month)
+		
 		struct = frappe.db.sql("""select name from `tabSalary Structure`
-			where employee=%s and is_active = 'Yes'""", self.employee)
+			where employee=%s and is_active = 'Yes'
+			and (from_date <= %s or from_date <= %s) 
+			and (to_date is null or to_date >= %s or to_date >= %s)""",
+			(self.employee, m.month_start_date, joining_date, m.month_end_date, relieving_date))
+
 		if not struct:
-			msgprint(_("Please create Salary Structure for employee {0}").format(self.employee))
+			msgprint(_("No active Salary Structure found for employee {0} and the month")
+				.format(self.employee))
 			self.employee = None
+
 		return struct and struct[0][0] or ''
 
 	def pull_sal_struct(self, struct):
 		from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-		self.update(make_salary_slip(struct, self).as_dict())
+		make_salary_slip(struct, self)
 
 	def pull_emp_details(self):
-		emp = frappe.db.get_value("Employee", self.employee,
-			["bank_name", "bank_ac_no"], as_dict=1)
+		emp = frappe.db.get_value("Employee", self.employee, ["bank_name", "bank_ac_no"], as_dict=1)
 		if emp:
 			self.bank_name = emp.bank_name
 			self.bank_account_no = emp.bank_ac_no
 
-	def get_leave_details(self, lwp=None):
+	def get_leave_details(self, joining_date=None, relieving_date=None, lwp=None):
 		if not self.fiscal_year:
 			self.fiscal_year = frappe.db.get_default("fiscal_year")
 		if not self.month:
 			self.month = "%02d" % getdate(nowdate()).month
+			
+		if not joining_date:
+			joining_date, relieving_date = frappe.db.get_value("Employee", self.employee, 
+				["date_of_joining", "relieving_date"])
 
-		m = frappe.get_doc('Process Payroll').get_month_details(self.fiscal_year, self.month)
-		holidays = self.get_holidays_for_employee(m)
+		m = get_month_details(self.fiscal_year, self.month)
+		holidays = self.get_holidays_for_employee(m['month_start_date'], m['month_end_date'])
 
-		if not cint(frappe.db.get_value("HR Settings", "HR Settings",
-			"include_holidays_in_total_working_days")):
-				m["month_days"] -= len(holidays)
-				if m["month_days"] < 0:
-					frappe.throw(_("There are more holidays than working days this month."))
+		working_days = m["month_days"]
+		if not cint(frappe.db.get_value("HR Settings", None, "include_holidays_in_total_working_days")):
+			working_days -= len(holidays)
+			if working_days < 0:
+				frappe.throw(_("There are more holidays than working days this month."))
 
 		if not lwp:
 			lwp = self.calculate_lwp(holidays, m)
-		self.total_days_in_month = m['month_days']
+		self.total_days_in_month = working_days
 		self.leave_without_pay = lwp
-		payment_days = flt(self.get_payment_days(m)) - flt(lwp)
+		payment_days = flt(self.get_payment_days(m, joining_date, relieving_date)) - flt(lwp)
 		self.payment_days = payment_days > 0 and payment_days or 0
+		
+	def get_payment_days(self, month, joining_date, relieving_date):
+		start_date = month['month_start_date']
+		if joining_date:
+			if joining_date > month['month_start_date']:
+				start_date = joining_date
+			elif joining_date > month['month_end_date']:
+				return
+		
+		if relieving_date:
+			if relieving_date > start_date and relieving_date < month['month_end_date']:
+				end_date = relieving_date
+			elif relieving_date < month['month_start_date']:
+				frappe.throw(_("Employee relieved on {0} must be set as 'Left'").format(relieving_date))
+		else:
+			end_date = month['month_end_date']
+			
+		payment_days = date_diff(end_date, start_date) + 1
 
-
-	def get_payment_days(self, m):
-		payment_days = m['month_days']
-		emp = frappe.db.sql("select date_of_joining, relieving_date from `tabEmployee` \
-			where name = %s", self.employee, as_dict=1)[0]
-
-		if emp['relieving_date']:
-			if getdate(emp['relieving_date']) > m['month_start_date'] and \
-				getdate(emp['relieving_date']) < m['month_end_date']:
-					payment_days = getdate(emp['relieving_date']).day
-			elif getdate(emp['relieving_date']) < m['month_start_date']:
-				frappe.throw(_("Employee relieved on {0} must be set as 'Left'").format(emp["relieving_date"]))
-
-		if emp['date_of_joining']:
-			if getdate(emp['date_of_joining']) > m['month_start_date'] and \
-				getdate(emp['date_of_joining']) < m['month_end_date']:
-					payment_days = payment_days - getdate(emp['date_of_joining']).day + 1
-			elif getdate(emp['date_of_joining']) > m['month_end_date']:
-				payment_days = 0
+		if not cint(frappe.db.get_value("HR Settings", None, "include_holidays_in_total_working_days")):
+			holidays = self.get_holidays_for_employee(start_date, end_date)
+			payment_days -= len(holidays)
 
 		return payment_days
 
-	def get_holidays_for_employee(self, m):
+	def get_holidays_for_employee(self, start_date, end_date):
 		holidays = frappe.db.sql("""select t1.holiday_date
 			from `tabHoliday` t1, tabEmployee t2
 			where t1.parent = t2.holiday_list and t2.name = %s
 			and t1.holiday_date between %s and %s""",
-			(self.employee, m['month_start_date'], m['month_end_date']))
+			(self.employee, start_date, end_date))
+			
 		if not holidays:
 			holidays = frappe.db.sql("""select t1.holiday_date
 				from `tabHoliday` t1, `tabHoliday List` t2
-				where t1.parent = t2.name and ifnull(t2.is_default, 0) = 1
+				where t1.parent = t2.name and t2.is_default = 1
 				and t2.fiscal_year = %s
-				and t1.holiday_date between %s and %s""", (self.fiscal_year,
-					m['month_start_date'], m['month_end_date']))
+				and t1.holiday_date between %s and %s""", 
+				(self.fiscal_year, start_date, end_date))
+		
 		holidays = [cstr(i[0]) for i in holidays]
 		return holidays
 
@@ -112,7 +134,7 @@
 					select t1.name, t1.half_day
 					from `tabLeave Application` t1, `tabLeave Type` t2
 					where t2.name = t1.leave_type
-					and ifnull(t2.is_lwp, 0) = 1
+					and t2.is_lwp = 1
 					and t1.docstatus = 1
 					and t1.employee = %s
 					and %s between from_date and to_date
@@ -134,11 +156,10 @@
 		from frappe.utils import money_in_words
 		self.check_existing()
 
-		if not (len(self.get("earnings")) or
-			len(self.get("deductions"))):
-				self.get_emp_and_leave_details()
+		if not (len(self.get("earnings")) or len(self.get("deductions"))):
+			self.get_emp_and_leave_details()
 		else:
-			self.get_leave_details(self.leave_without_pay)
+			self.get_leave_details(lwp = self.leave_without_pay)
 
 		if not self.net_pay:
 			self.calculate_net_pay()

diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 2bb7f52..387c593 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py

@@ -7,11 +7,14 @@
 from frappe.utils import today
 from erpnext.hr.doctype.employee.employee import make_salary_structure
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
+from erpnext.hr.doctype.leave_application.test_leave_application import make_allocation_record
 
 class TestSalarySlip(unittest.TestCase):
 	def setUp(self):
-		frappe.db.sql("""delete from `tabLeave Application`""")
-		frappe.db.sql("""delete from `tabSalary Slip`""")
+		for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
+			frappe.db.sql("delete from `tab%s`" % dt)
+		
+		make_allocation_record(leave_type="_Test Leave Type LWP")
 		
 		frappe.db.set_value("Holiday List", "_Test Holiday List", "is_default", 1)
 		
@@ -22,11 +25,11 @@
 		la.submit()
 
 	def tearDown(self):
-		frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0)
+		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 0)
 		frappe.set_user("Administrator")
 
 	def test_salary_slip_with_holidays_included(self):
-		frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 1)
+		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 1)
 		ss = frappe.copy_doc(test_records[0])
 		ss.insert()
 		
@@ -40,18 +43,46 @@
 		self.assertEquals(ss.net_pay, 14867.74)
 
 	def test_salary_slip_with_holidays_excluded(self):
-		frappe.db.set_value("HR Settings", "HR Settings", "include_holidays_in_total_working_days", 0)
+		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 0)
 		ss = frappe.copy_doc(test_records[0])
 		ss.insert()
 		
-		self.assertEquals(ss.total_days_in_month, 30)
-		self.assertEquals(ss.payment_days, 29)
-		self.assertEquals(ss.earnings[0].e_modified_amount, 14500)
+		self.assertEquals(ss.total_days_in_month, 29)
+		self.assertEquals(ss.payment_days, 28)
+		self.assertEquals(ss.earnings[0].e_modified_amount, 14482.76)
 		self.assertEquals(ss.earnings[1].e_modified_amount, 500)
 		self.assertEquals(ss.deductions[0].d_modified_amount, 100)
-		self.assertEquals(ss.deductions[1].d_modified_amount, 48.33)
-		self.assertEquals(ss.gross_pay, 15000)
-		self.assertEquals(ss.net_pay, 14851.67)
+		self.assertEquals(ss.deductions[1].d_modified_amount, 48.28)
+		self.assertEquals(ss.gross_pay, 14982.76)
+		self.assertEquals(ss.net_pay, 14834.48)
+		
+	def test_payment_days(self):
+		# Holidays not included in working days
+		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 0)
+		
+		# set joinng date in the same month
+		frappe.db.set_value("Employee", "_T-Employee-0001", "date_of_joining", "2013-01-11")
+		
+		ss = frappe.copy_doc(test_records[0])
+		ss.insert()
+		
+		self.assertEquals(ss.total_days_in_month, 29)
+		self.assertEquals(ss.payment_days, 19)
+		
+		# set relieving date in the same month
+		frappe.db.set_value("Employee", "_T-Employee-0001", "relieving_date", "2013-01-28")
+		ss.save()
+		self.assertEquals(ss.total_days_in_month, 29)
+		self.assertEquals(ss.payment_days, 16)
+		
+		# Holidays included in working days
+		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 1)
+		ss.save()
+		self.assertEquals(ss.total_days_in_month, 31)
+		self.assertEquals(ss.payment_days, 17)
+		
+		frappe.db.set_value("Employee", "_T-Employee-0001", "date_of_joining", "2001-01-11")
+		frappe.db.set_value("Employee", "_T-Employee-0001", "relieving_date", None)
 
 	def test_employee_salary_slip_read_permission(self):
 		self.make_employee("test_employee@example.com")

diff --git a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
index 4f95197..a0e722e 100644
--- a/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json
+++ b/erpnext/hr/doctype/salary_slip_deduction/salary_slip_deduction.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "d_type", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "d_amount", 
    "oldfieldtype": "Currency", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends on Leave Without Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -109,7 +113,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:08.470369", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.610195", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip Deduction", 

diff --git a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
index 7e7eb0c..6d897b0 100644
--- a/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json
+++ b/erpnext/hr/doctype/salary_slip_earning/salary_slip_earning.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "e_type", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "e_amount", 
    "oldfieldtype": "Currency", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends on Leave Without Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -109,7 +113,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:08.554281", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.649418", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip Earning", 

diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index f1562d4..a8aab41 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json

@@ -17,6 +17,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -39,6 +40,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee", 
    "oldfieldtype": "Link", 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "employee_name", 
    "oldfieldtype": "Data", 
@@ -86,6 +89,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Branch", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "branch", 
    "oldfieldtype": "Select", 
@@ -110,6 +114,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Designation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "designation", 
    "oldfieldtype": "Select", 
@@ -134,6 +139,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Department", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "department", 
    "oldfieldtype": "Select", 
@@ -157,6 +163,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -179,7 +186,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Is Active",  
+   "label": "Is Active", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_active", 
    "oldfieldtype": "Select", 
@@ -204,6 +212,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "from_date", 
    "oldfieldtype": "Date", 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "to_date", 
    "oldfieldtype": "Date", 
@@ -250,6 +260,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -273,6 +284,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Monthly Earning & Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "earning_deduction", 
    "oldfieldtype": "Section Break", 
@@ -296,6 +308,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Earning", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "col_brk2", 
    "oldfieldtype": "Column Break", 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Earnings", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "earning_details", 
    "oldfieldtype": "Table", 
@@ -344,6 +358,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "col_brk3", 
    "oldfieldtype": "Column Break", 
@@ -368,6 +383,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Deductions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "deduction_details", 
    "oldfieldtype": "Table", 
@@ -391,6 +407,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -412,6 +429,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -434,6 +452,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Earning", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_earning", 
    "oldfieldtype": "Currency", 
@@ -458,6 +477,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Deduction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_deduction", 
    "oldfieldtype": "Currency", 
@@ -481,6 +501,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -503,6 +524,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Pay", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -524,7 +546,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:08.646657", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.695905", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 

diff --git a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json
index c9f4b0e..3a718aa 100644
--- a/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json
+++ b/erpnext/hr/doctype/salary_structure_deduction/salary_structure_deduction.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "d_type", 
    "oldfieldtype": "Select", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "d_modified_amt", 
    "oldfieldtype": "Currency", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reduce Deduction for Leave Without Pay (LWP)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "depend_on_lwp", 
    "oldfieldtype": "Check", 
@@ -89,7 +92,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:08.845127", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.793274", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Deduction", 

diff --git a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json
index fbad302..8dfcb0a 100644
--- a/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json
+++ b/erpnext/hr/doctype/salary_structure_earning/salary_structure_earning.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "e_type", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "modified_value", 
    "oldfieldtype": "Currency", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reduce Earning for Leave Without Pay (LWP)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "depend_on_lwp", 
    "oldfieldtype": "Check", 
@@ -89,7 +92,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:08.956826", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.830492", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Earning", 

diff --git a/erpnext/hr/print_format/offer_letter/offer_letter.json b/erpnext/hr/print_format/offer_letter/offer_letter.json
index d480159..5764863 100644
--- a/erpnext/hr/print_format/offer_letter/offer_letter.json
+++ b/erpnext/hr/print_format/offer_letter/offer_letter.json

@@ -5,8 +5,9 @@
  "doc_type": "Offer Letter", 
  "docstatus": 0, 
  "doctype": "Print Format", 
- "html": "{% if letter_head and not no_letterhead -%}\n    <div class=\"letter-head\">{{ letter_head }}</div>\n    <hr>\n{%- endif %}\n\n<div class=\"page-break\">\n<p>\n\n<!-- offer letter content starts here, <br> is used to create new lines -->\nDate: {{ doc.offer_date }}\n<br><br>\n\nDear {{ doc.applicant_name }}, \n\n<br><br>\n\nWe are pleased to appoint you in the services of {{ doc.company }} on the terms and conditions detailed in this letter.\n\n<br><br>\n\nYour designation shall be <b>{{ doc.designation }}</b>.\n\n<br><br>\n\n<!-- offer letter terms and description from the table -->\n\n{%- if doc.offer_terms -%}\n    {%- for row in doc.offer_terms -%}\n        <b>{{ row.offer_term }}:</b> {{ row.value }}\n\n        <br>\n    {%- endfor -%}\n{%- endif -%}\n\n<br>\n\n<!-- offer letter content continues -->\n\n\nPlease read the detailed terms as below. If you have any queries, feel free to get in touch with us.\nWe look forward to your long and fruitful career association with our organisation.\nIf you decide to join us, 'Welcome to {{ doc.company }} !'\n\n<br><br>\n\n<p class=\"strong\">\n\nYours truly,\n\n<br><br><br><br>\n\nAuthorized Signatory\n\n<br>\n\n{{ doc.company }}\n\n<!-- offer letter content ends here -->\n\n</p>\n</div>\n\n<!-- offer letter terms and conditions -->\n<div> {{ doc.terms }} </div>", 
- "modified": "2015-04-01 05:22:51.345050", 
+ "html": "{% set terms_exist = doc.terms and (doc.terms|striptags).strip() or \"\" %}\n\n{% if letter_head and not no_letterhead -%}\n    <div class=\"letter-head\">{{ letter_head }}</div>\n    <hr>\n{%- endif %}\n\n<div {% if terms_exist -%} class=\"page-break\" {%- endif %}>\n<p>\n\n<!-- offer letter content starts here, <br> is used to create new lines -->\nDate: {{ doc.offer_date }}\n<br><br>\n\nDear {{ doc.applicant_name }}, \n\n<br><br>\n\nWe are pleased to appoint you in the services of {{ doc.company }} on the terms and conditions detailed in this letter.\n\n<br><br>\n\nYour designation shall be <b>{{ doc.designation }}</b>.\n\n<br><br>\n\n<!-- offer letter terms and description from the table -->\n\n{%- if doc.offer_terms -%}\n    {%- for row in doc.offer_terms -%}\n        <b>{{ row.offer_term }}:</b> {{ row.value }}\n\n        <br>\n    {%- endfor -%}\n{%- endif -%}\n\n<br>\n\n<!-- offer letter content continues -->\n\n\nPlease read the detailed terms as below. If you have any queries, feel free to get in touch with us.\nWe look forward to your long and fruitful career association with our organisation.\nIf you decide to join us, 'Welcome to {{ doc.company }} !'\n\n<br><br>\n\n<p class=\"strong\">\n\nYours truly,\n\n<br><br><br><br>\n\nAuthorized Signatory\n\n<br>\n\n{{ doc.company }}\n\n<!-- offer letter content ends here -->\n\n</p>\n</div>\n\n<!-- offer letter terms and conditions -->\n{% if terms_exist %}\n<div> {{ doc.terms }} </div>\n{% endif %}", 
+ "idx": 0, 
+ "modified": "2015-12-04 11:46:28.897657", 
  "modified_by": "Administrator", 
  "name": "Offer Letter", 
  "owner": "Administrator", 

diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
index 41b1421..5df4554 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.js

@@ -7,12 +7,14 @@
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
+			"reqd": 1,
 			"default": frappe.datetime.year_start()
 		},
 		{
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
+			"reqd": 1,
 			"default": frappe.datetime.year_end()
 		},
 		{
@@ -20,6 +22,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
+			"reqd": 1,
 			"default": frappe.defaults.get_user_default("company")
 		}
 	]

diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
index 0aa88a8..7f1c442 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py

@@ -4,67 +4,54 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.desk.reportview import execute as runreport
+from erpnext.hr.doctype.leave_application.leave_application \
+	import get_leave_allocation_records, get_leave_balance_on, get_approved_leaves_for_period
+
 
 def execute(filters=None):
-	if not filters: filters = {}
-
-	employee_filters = {
-		"status": "Active"
-	}
+	leave_types = frappe.db.sql_list("select name from `tabLeave Type` order by name asc")
 	
-	if filters.get("company"):
-		filters["company"] = filters.company
-
-	employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"],
-		filters=employee_filters, limit_page_length=None)
-
-	if not employees:
-		frappe.throw(_("No employee found!"))
-
-	leave_types = frappe.db.sql_list("select name from `tabLeave Type`")
-
-	employee_names = [d.name for d in employees]
-
-	allocations = frappe.db.sql("""select employee, leave_type, sum(new_leaves_allocated) as leaves_allocated
-	 	from `tabLeave Allocation`
-		where docstatus=1 and employee in (%s) and from_date >= '%s' and to_date <= '%s'""" %
-		(','.join(['%s']*len(employee_names)), filters.get("from_date"),
-		 filters.get("to_date")), employee_names, as_dict=True)
-		
-	applications = frappe.db.sql("""select employee, leave_type,
-			SUM(total_leave_days) as leaves
-		from `tabLeave Application`
-		where status="Approved" and docstatus = 1 and employee in (%s)
-		and from_date >= '%s' and to_date <= '%s'
-		group by employee, leave_type""" %
-		(','.join(['%s']*len(employee_names)), filters.get("from_date"),
-		 filters.get("to_date")), employee_names, as_dict=True)
-
+	columns = get_columns(leave_types)
+	data = get_data(filters, leave_types)
+	
+	return columns, data
+	
+def get_columns(leave_types):
 	columns = [
-		_("Employee") + ":Link/Employee:150", _("Employee Name") + "::200", _("Department") +"::150"
+		_("Employee") + ":Link/Employee:150", 
+		_("Employee Name") + "::200", 
+		_("Department") +"::150"
 	]
 
 	for leave_type in leave_types:
-		columns.append(_(leave_type) + " " + _("Opening") + ":Float")
-		columns.append(_(leave_type) + " " + _("Taken") + ":Float")
-		columns.append(_(leave_type) + " " + _("Balance") + ":Float")
+		columns.append(_(leave_type) + " " + _("Taken") + ":Float:160")
+		columns.append(_(leave_type) + " " + _("Balance") + ":Float:160")
+	
+	return columns
+	
+def get_data(filters, leave_types):
 
-	data = {}
-	for d in allocations:
-		data.setdefault((d.employee,d.leave_type), frappe._dict()).allocation = d.leaves_allocated
+	allocation_records_based_on_to_date = get_leave_allocation_records(filters.to_date)
 
-	for d in applications:
-		data.setdefault((d.employee, d.leave_type), frappe._dict()).leaves = d.leaves
-
-	result = []
-	for employee in employees:
+	active_employees = frappe.get_all("Employee", 
+		filters = { "status": "Active", "company": filters.company}, 
+		fields = ["name", "employee_name", "department"])
+	
+	data = []
+	for employee in active_employees:
 		row = [employee.name, employee.employee_name, employee.department]
-		result.append(row)
-		for leave_type in leave_types:
-			tmp = data.get((employee.name, leave_type), frappe._dict())
-			row.append(tmp.allocation or 0)
-			row.append(tmp.leaves or 0)
-			row.append((tmp.allocation or 0) - (tmp.leaves or 0))
 
-	return columns, result
+		for leave_type in leave_types:	
+			# leaves taken
+			leaves_taken = get_approved_leaves_for_period(employee.name, leave_type, 
+				filters.from_date, filters.to_date)
+	
+			# closing balance
+			closing = get_leave_balance_on(employee.name, leave_type, filters.to_date, 
+				allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
+
+			row += [leaves_taken, closing]
+			
+		data.append(row)
+		
+	return data
\ No newline at end of file

diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
index 48fe3ae..8b02348 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
+++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py

@@ -43,11 +43,11 @@
 	]
 	
 	earning_types = frappe.db.sql_list("""select distinct e_type from `tabSalary Slip Earning`
-		where ifnull(e_modified_amount, 0) != 0 and parent in (%s)""" % 
+		where e_modified_amount != 0 and parent in (%s)""" % 
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]))
 		
 	ded_types = frappe.db.sql_list("""select distinct d_type from `tabSalary Slip Deduction`
-		where ifnull(d_modified_amount, 0) != 0 and parent in (%s)""" % 
+		where d_modified_amount != 0 and parent in (%s)""" % 
 		(', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]))
 		
 	columns = columns + [(e + ":Currency:120") for e in earning_types] + \

diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.py b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
index cf48381..8522650 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.py
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.py

@@ -78,7 +78,7 @@
 			if item.image:
 				item.image = expand_relative_urls(item.image)
 
-		item_list = frappe.db.sql_list("select name from tabItem where ifnull(publish_in_hub,0)=1")
+		item_list = frappe.db.sql_list("select name from tabItem where publish_in_hub=1")
 
 		if items:
 			response = requests.post(self.hub_url + "/api/method/hub.hub.api.sync", data={

diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 9883ba3..84f2175 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js

@@ -19,6 +19,14 @@
 				frappe.set_route("bom-browser", frm.doc.name);
 			});
 		}
+
+		if(frm.doc.docstatus==2) {
+			// show duplicate button when BOM is cancelled,
+			// its not very intuitive
+			frm.add_custom_button(__("Duplicate"), function() {
+				frm.copy_doc();
+			});
+		}
 	},
 	update_cost: function(frm) {
 		return frappe.call({

diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index e5abc07..bb74e1d 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json

@@ -20,6 +20,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate Of Materials Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Valuation Rate\nLast Purchase Rate\nPrice List", 
    "permlevel": 0, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
@@ -110,6 +114,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Is Active", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "is_active", 
    "oldfieldtype": "Select", 
@@ -156,6 +162,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Is Default", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "is_default", 
    "oldfieldtype": "Check", 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "With Operations", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operations", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -225,6 +234,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operations", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_operations", 
    "oldfieldtype": "Table", 
@@ -249,6 +259,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Materials", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -271,6 +282,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_materials", 
    "oldfieldtype": "Table", 
@@ -297,6 +309,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "quantity", 
    "oldfieldtype": "Currency", 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Costing", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -342,6 +356,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operating Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -364,6 +379,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Material Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -385,6 +401,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -406,6 +423,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -428,6 +446,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -449,6 +468,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -473,6 +493,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -496,6 +517,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "BOM", 
    "permlevel": 0, 
@@ -517,6 +539,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -538,6 +561,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -559,6 +583,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -581,6 +606,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Desription", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -601,6 +627,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -623,6 +650,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -645,6 +673,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -669,6 +698,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Materials Required (Exploded)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -690,6 +720,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exploded_items", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "flat_bom_details", 
    "oldfieldtype": "Table", 
@@ -713,7 +744,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-19 03:04:50.130520", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.637983", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 9a3d318..4b7f7f2 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py

@@ -124,22 +124,17 @@
 		if self.docstatus == 2:
 			return
 
-		items_rate = frappe._dict()
 		for d in self.get("items"):
 			rate = self.get_bom_material_detail({'item_code': d.item_code, 'bom_no': d.bom_no,
 				'qty': d.qty})["rate"]
 			if rate:
 				d.rate = rate
-				items_rate.setdefault(d.item_code, d.rate)
-
-		for e in self.get("exploded_items"):
-			if items_rate.get(e.item_code):
-				e.rate = items_rate.get(e.item_code)
 
 		if self.docstatus == 1:
 			self.flags.ignore_validate_update_after_submit = True
 			self.calculate_cost()
 		self.save()
+		self.update_exploded_items()
 
 		frappe.msgprint(_("Cost Updated"))
 
@@ -163,7 +158,7 @@
 		if valuation_rate <= 0:
 			last_valuation_rate = frappe.db.sql("""select valuation_rate
 				from `tabStock Ledger Entry`
-				where item_code = %s and ifnull(valuation_rate, 0) > 0
+				where item_code = %s and valuation_rate > 0
 				order by posting_date desc, posting_time desc, name desc limit 1""", args['item_code'])
 
 			valuation_rate = flt(last_valuation_rate[0][0]) if last_valuation_rate else 0
@@ -323,7 +318,7 @@
 		# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
 		child_fb_items = frappe.db.sql("""select bom_item.item_code, bom_item.item_name, bom_item.description,
 			bom_item.stock_uom, bom_item.qty, bom_item.rate,
-			ifnull(bom_item.qty, 0 ) / ifnull(bom.quantity, 1) as qty_consumed_per_unit
+			bom_item.qty / ifnull(bom.quantity, 1) as qty_consumed_per_unit
 			from `tabBOM Explosion Item` bom_item, tabBOM bom
 			where bom_item.parent = bom.name and bom.name = %s and bom.docstatus = 1""", bom_no, as_dict = 1)
 
@@ -371,7 +366,7 @@
 	query = """select
 				bom_item.item_code,
 				item.item_name,
-				sum(ifnull(bom_item.qty, 0)/ifnull(bom.quantity, 1)) * %(qty)s as qty,
+				sum(bom_item.qty/ifnull(bom.quantity, 1)) * %(qty)s as qty,
 				item.description,
 				item.image,
 				item.stock_uom,

diff --git a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
index f51bdfb..95fe205 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -86,6 +89,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -132,6 +137,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -154,6 +160,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -176,6 +183,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -198,6 +206,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -220,6 +229,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -243,6 +253,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "standard_rate", 
    "oldfieldtype": "Currency", 
@@ -267,6 +278,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty Consumed Per Unit", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -287,6 +299,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -309,6 +322,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Link", 
@@ -333,6 +347,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount_as_per_sr", 
    "oldfieldtype": "Currency", 
@@ -355,7 +370,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:51.159841", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.765051", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Explosion Item", 

diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index 89ba0da..f87b381 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json

@@ -18,6 +18,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,6 +65,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -85,6 +88,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "BOM No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_no", 
    "oldfieldtype": "Link", 
@@ -110,6 +114,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -156,6 +162,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -177,6 +184,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -199,6 +207,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -222,6 +231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -243,6 +253,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -267,6 +278,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -288,6 +300,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -309,6 +322,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -333,6 +347,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount_as_per_mar", 
    "oldfieldtype": "Currency", 
@@ -359,6 +374,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Scrap %", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "scrap", 
    "oldfieldtype": "Currency", 
@@ -382,6 +398,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty Consumed Per Unit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty_consumed_per_unit", 
    "oldfieldtype": "Float", 
@@ -403,7 +420,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:51.064785", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.842612", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Item", 

diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index fdeb319..0171c41 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "operation_no", 
    "oldfieldtype": "Data", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Workstation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "workstation", 
    "oldfieldtype": "Link", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "opn_description", 
    "oldfieldtype": "Text", 
@@ -88,6 +91,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Hour Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate", 
    "oldfieldtype": "Currency", 
@@ -133,6 +138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Time ", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "time_in_mins", 
    "oldfieldtype": "Currency", 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operating Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "operating_cost", 
    "oldfieldtype": "Currency", 
@@ -178,7 +185,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:40.479962", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.924201", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Operation", 

diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 9331e50..66d0bb6 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Workstation", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Workstation", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -84,7 +87,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:58.335483", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.879598", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Operation", 

diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index db1c5fd..ee39e04 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-gift", 
    "permlevel": 0, 
@@ -41,7 +42,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "PRO-", 
    "permlevel": 0, 
@@ -65,7 +67,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -90,6 +93,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item To Manufacture", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "production_item", 
    "oldfieldtype": "Link", 
@@ -116,6 +120,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "BOM No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_no", 
    "oldfieldtype": "Link", 
@@ -142,6 +147,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Use Multi-Level BOM", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -162,6 +168,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -186,6 +193,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty To Manufacture", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -212,6 +220,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Transferred for Manufacturing", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -237,6 +246,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Manufactured Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "produced_qty", 
    "oldfieldtype": "Currency", 
@@ -260,6 +270,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouses", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-building", 
    "permlevel": 0, 
@@ -282,6 +293,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Work-in-Progress Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -303,6 +315,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -326,6 +339,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -348,6 +362,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Time", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-time", 
    "permlevel": 0, 
@@ -372,6 +387,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected Delivery Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -394,6 +410,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -416,6 +433,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -437,6 +455,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -459,6 +478,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -481,6 +501,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -504,6 +525,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operations", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-wrench", 
    "permlevel": 0, 
@@ -528,6 +550,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operations", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Production Order Operation", 
    "permlevel": 0, 
@@ -552,6 +575,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -575,6 +599,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Operating Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -598,6 +623,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Operating Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -621,6 +647,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Operating Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -643,6 +670,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -665,6 +693,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Operating Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -688,6 +717,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-file-text", 
    "permlevel": 0, 
@@ -710,6 +740,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -732,6 +763,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -755,6 +787,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -777,6 +810,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -802,6 +836,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Order", 
    "permlevel": 0, 
@@ -824,6 +859,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -848,6 +884,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -871,7 +908,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:01.425871", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.334735", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 

diff --git a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
index 20e24cc..923e534 100644
--- a/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json
+++ b/erpnext/manufacturing/doctype/production_order_operation/production_order_operation.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "operation_no", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "opn_description", 
    "oldfieldtype": "Text", 
@@ -89,6 +92,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Completed Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -134,7 +139,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Pending\nWork in Progress\nCompleted", 
    "permlevel": 0, 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Workstation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "workstation", 
    "oldfieldtype": "Link", 
@@ -184,6 +191,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Show Time Logs", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -206,6 +214,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Estimated Time and Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -228,6 +237,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Start Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned End Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -271,6 +282,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -294,6 +306,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Operation Time", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "time_in_mins", 
    "oldfieldtype": "Currency", 
@@ -318,6 +331,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Hour Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate", 
    "oldfieldtype": "Currency", 
@@ -342,6 +356,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Operating Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -365,6 +380,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Time and Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -387,6 +403,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Start Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -410,6 +427,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual End Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -431,6 +449,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -454,6 +473,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Operation Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -477,6 +497,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Operating Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -501,6 +522,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Make Time Log", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -520,7 +542,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:01.792804", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.476364", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order Operation", 

diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index 69d09f8..49d31c9 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "BOM No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bom_no", 
    "oldfieldtype": "Link", 
@@ -71,6 +73,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Planned Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "planned_qty", 
    "oldfieldtype": "Currency", 
@@ -97,6 +100,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -119,6 +123,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source_docname", 
    "oldfieldtype": "Data", 
@@ -143,6 +148,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "SO Pending Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "prevdoc_reqd_qty", 
    "oldfieldtype": "Currency", 
@@ -169,6 +175,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -191,6 +198,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -217,6 +225,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -240,7 +249,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:01.982082", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.572122", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Item", 

diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
index c008e0b..d7fdea5 100644
--- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
+++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "SO Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "document_date", 
    "oldfieldtype": "Date", 
@@ -69,6 +71,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
@@ -115,6 +119,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -137,7 +142,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:02.081390", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.629618", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Plan Sales Order", 

diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index 254b5a5..c907339 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py

@@ -59,7 +59,7 @@
 			where so_item.parent = so.name
 				and so.docstatus = 1 and so.status != "Stopped"
 				and so.company = %(company)s
-				and ifnull(so_item.qty, 0) > ifnull(so_item.delivered_qty, 0) {0}
+				and so_item.qty > so_item.delivered_qty {0}
 				and (exists (select name from `tabItem` item where item.name=so_item.item_code
 					and (item.is_pro_applicable = 1 or item.is_sub_contracted_item = 1 {1}))
 					or exists (select name from `tabPacked Item` pi
@@ -108,9 +108,9 @@
 			item_condition = ' and so_item.item_code = "' + self.fg_item + '"'
 
 		items = frappe.db.sql("""select distinct parent, item_code, warehouse,
-			(qty - ifnull(delivered_qty, 0)) as pending_qty
+			(qty - delivered_qty) as pending_qty
 			from `tabSales Order Item` so_item
-			where parent in (%s) and docstatus = 1 and ifnull(qty, 0) > ifnull(delivered_qty, 0)
+			where parent in (%s) and docstatus = 1 and qty > delivered_qty
 			and exists (select * from `tabItem` item where item.name=so_item.item_code
 				and (item.is_pro_applicable = 1
 					or item.is_sub_contracted_item = 1)) %s""" % \
@@ -120,12 +120,12 @@
 			item_condition = ' and pi.item_code = "' + self.fg_item + '"'
 
 		packed_items = frappe.db.sql("""select distinct pi.parent, pi.item_code, pi.warehouse as warehouse,
-			(((so_item.qty - ifnull(so_item.delivered_qty, 0)) * pi.qty) / so_item.qty)
+			(((so_item.qty - so_item.delivered_qty) * pi.qty) / so_item.qty)
 				as pending_qty
 			from `tabSales Order Item` so_item, `tabPacked Item` pi
 			where so_item.parent = pi.parent and so_item.docstatus = 1
 			and pi.parent_item = so_item.item_code
-			and so_item.parent in (%s) and ifnull(so_item.qty, 0) > ifnull(so_item.delivered_qty, 0)
+			and so_item.parent in (%s) and so_item.qty > so_item.delivered_qty
 			and exists (select * from `tabItem` item where item.name=pi.item_code
 				and (item.is_pro_applicable = 1
 					or item.is_sub_contracted_item = 1)) %s""" % \
@@ -243,12 +243,12 @@
 				# get all raw materials with sub assembly childs
 				# Did not use qty_consumed_per_unit in the query, as it leads to rounding loss
 				for d in frappe.db.sql("""select fb.item_code,
-					ifnull(sum(ifnull(fb.qty, 0)/ifnull(bom.quantity, 1)), 0) as qty,
+					ifnull(sum(fb.qty/ifnull(bom.quantity, 1)), 0) as qty,
 					fb.description, fb.stock_uom, it.min_order_qty
 					from `tabBOM Explosion Item` fb, `tabBOM` bom, `tabItem` it
 					where bom.name = fb.parent and it.name = fb.item_code
-					and is_pro_applicable = 0
-					and is_sub_contracted_item = 0
+					and (is_pro_applicable = 0 or ifnull(default_bom, "")="")
+					and (is_sub_contracted_item = 0 or ifnull(default_bom, "")="")
 					and is_stock_item = 1
 					and fb.docstatus<2 and bom.name=%s
 					group by item_code, stock_uom""", bom, as_dict=1):
@@ -257,7 +257,7 @@
 				# Get all raw materials considering SA items as raw materials,
 				# so no childs of SA items
 				for d in frappe.db.sql("""select bom_item.item_code,
-					ifnull(sum(ifnull(bom_item.qty, 0)/ifnull(bom.quantity, 1)), 0) as qty,
+					ifnull(sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty,
 					bom_item.description, bom_item.stock_uom, item.min_order_qty
 					from `tabBOM Item` bom_item, `tabBOM` bom, tabItem item
 					where bom.name = bom_item.parent and bom.name = %s and bom_item.docstatus < 2

diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 60fcd85..93cc992 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Workstation Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "workstation_name", 
    "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -88,6 +91,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Holiday List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Holiday List", 
    "permlevel": 0, 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operating Costs", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Electricity Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate_electricity", 
    "oldfieldtype": "Currency", 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Consumable Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate_consumable", 
    "oldfieldtype": "Currency", 
@@ -203,6 +211,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -226,6 +235,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rent Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate_rent", 
    "oldfieldtype": "Currency", 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Wages", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate_labour", 
    "oldfieldtype": "Currency", 
@@ -274,6 +285,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Hour Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "hour_rate", 
    "oldfieldtype": "Currency", 
@@ -297,6 +309,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Working Hours", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -319,6 +332,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Working Hours", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Workstation Working Hour", 
    "permlevel": 0, 
@@ -341,7 +355,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:20.400900", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:30:01.041198", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Workstation", 

diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
index 51a14be..1a4c9ea 100644
--- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Start Time", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -40,6 +41,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -62,6 +64,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "End Time", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -83,6 +86,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -105,7 +109,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Enabled",  
+   "label": "Enabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -125,7 +130,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:20.706021", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:30:01.107577", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Workstation Working Hour", 

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3ad735a..ac5e5ca 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt

@@ -209,7 +209,6 @@
 erpnext.patches.v6_0.multi_currency
 erpnext.patches.v6_2.remove_newsletter_duplicates
 erpnext.patches.v6_2.fix_missing_default_taxes_and_lead
-erpnext.patches.v5_8.tax_rule
 erpnext.patches.v6_3.convert_applicable_territory
 erpnext.patches.v6_4.round_status_updater_percentages
 erpnext.patches.v6_4.repost_gle_for_journal_entries_where_reference_name_missing
@@ -231,3 +230,12 @@
 execute:frappe.delete_doc_if_exists("Report", "Item-wise Last Purchase Rate")
 erpnext.patches.v6_6.fix_website_image
 erpnext.patches.v6_6.remove_fiscal_year_from_leave_allocation
+execute:frappe.delete_doc_if_exists("DocType", "Stock UOM Replace Utility")
+erpnext.patches.v6_8.make_webform_standard #2015-11-23
+erpnext.patches.v6_8.move_drop_ship_to_po_items
+erpnext.patches.v6_10.fix_ordered_received_billed
+erpnext.patches.v6_10.fix_jv_total_amount #2015-11-30
+erpnext.patches.v6_10.email_digest_default_quote
+erpnext.patches.v6_10.fix_billed_amount_in_drop_ship_po
+erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item #2015-12-08
+erpnext.patches.v5_8.tax_rule #2015-12-08

diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py
index 1acd8de..126acfc 100644
--- a/erpnext/patches/v4_4/make_email_accounts.py
+++ b/erpnext/patches/v4_4/make_email_accounts.py

@@ -35,7 +35,7 @@
 			"enable_incoming": "sync_support_mails",
 			"email_id": "mail_login",
 			"password": "mail_password",
-			"pop3_server": "mail_server",
+			"email_server": "mail_server",
 			"use_ssl": "use_ssl",
 			"signature": "support_signature",
 			"enable_auto_reply": "send_autoreply",
@@ -59,7 +59,7 @@
 				"enable_incoming": "extract_emails",
 				"email_id": "username",
 				"password": "password",
-				"pop3_server": "host",
+				"email_server": "host",
 				"use_ssl": "use_ssl",
 			}
 

diff --git a/erpnext/patches/v5_8/tax_rule.py b/erpnext/patches/v5_8/tax_rule.py
index 80a2364..8da28ba 100644
--- a/erpnext/patches/v5_8/tax_rule.py
+++ b/erpnext/patches/v5_8/tax_rule.py

@@ -11,19 +11,21 @@
 		ifnull(default_taxes_and_charges, '') != '' """, as_dict=1)
 
 	for d in customers:
-		tr = frappe.new_doc("Tax Rule")
-		tr.tax_type = "Sales"
-		tr.customer = d.name
-		tr.sales_tax_template = d.default_taxes_and_charges
-		tr.save()
+		if not frappe.db.sql("select name from `tabTax Rule` where customer=%s", d.name):
+			tr = frappe.new_doc("Tax Rule")
+			tr.tax_type = "Sales"
+			tr.customer = d.name
+			tr.sales_tax_template = d.default_taxes_and_charges
+			tr.save()
 
 
 	suppliers = frappe.db.sql("""select name, default_taxes_and_charges from tabSupplier where
 		ifnull(default_taxes_and_charges, '') != '' """, as_dict=1)
 
 	for d in suppliers:
-		tr = frappe.new_doc("Tax Rule")
-		tr.tax_type = "Purchase"
-		tr.supplier = d.name
-		tr.purchase_tax_template = d.default_taxes_and_charges
-		tr.save()
+		if not frappe.db.sql("select name from `tabTax Rule` where supplier=%s", d.name):
+			tr = frappe.new_doc("Tax Rule")
+			tr.tax_type = "Purchase"
+			tr.supplier = d.name
+			tr.purchase_tax_template = d.default_taxes_and_charges
+			tr.save()
\ No newline at end of file

diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/__init__.py b/erpnext/patches/v6_10/__init__.py
similarity index 100%
rename from erpnext/stock/doctype/stock_uom_replace_utility/__init__.py
rename to erpnext/patches/v6_10/__init__.py


diff --git a/erpnext/patches/v6_10/email_digest_default_quote.py b/erpnext/patches/v6_10/email_digest_default_quote.py
new file mode 100644
index 0000000..003b317
--- /dev/null
+++ b/erpnext/patches/v6_10/email_digest_default_quote.py

@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Email Digest")
+	frappe.db.sql("update `tabEmail Digest` set add_quote = 1")

diff --git a/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py b/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py
new file mode 100644
index 0000000..4aecaa7
--- /dev/null
+++ b/erpnext/patches/v6_10/fix_billed_amount_in_drop_ship_po.py

@@ -0,0 +1,18 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.db.sql("""update `tabPurchase Order Item` set billed_amt = 0
+			where delivered_by_supplier=1 and docstatus=1""")
+			
+	drop_ship_pos = frappe.db.sql("""select distinct parent from `tabPurchase Order Item` 
+		where delivered_by_supplier=1 and docstatus=1""")
+		
+	for po in drop_ship_pos:
+		invoices = frappe.db.sql("""select distinct parent from `tabPurchase Invoice Item`
+			where purchase_order=%s and docstatus=1""", po[0])
+		if invoices:
+			for inv in invoices:
+				frappe.get_doc("Purchase Invoice", inv[0]).update_qty(change_modified=False)
+		else:
+			frappe.db.sql("""update `tabPurchase Order` set per_billed=0 where name=%s""", po[0])
\ No newline at end of file

diff --git a/erpnext/patches/v6_10/fix_delivery_status_of_drop_ship_item.py b/erpnext/patches/v6_10/fix_delivery_status_of_drop_ship_item.py
new file mode 100644
index 0000000..23de9d0
--- /dev/null
+++ b/erpnext/patches/v6_10/fix_delivery_status_of_drop_ship_item.py

@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	for so_name in frappe.db.sql("""select distinct parent from `tabSales Order Item`
+			where delivered_by_supplier=1 and docstatus=1"""):
+		so = frappe.get_doc("Sales Order", so_name[0])
+		so.update_delivery_status()
+		so.set_status(update=True, update_modified=False)
\ No newline at end of file

diff --git a/erpnext/patches/v6_10/fix_jv_total_amount.py b/erpnext/patches/v6_10/fix_jv_total_amount.py
new file mode 100644
index 0000000..3797ff4
--- /dev/null
+++ b/erpnext/patches/v6_10/fix_jv_total_amount.py

@@ -0,0 +1,13 @@
+import frappe
+
+# patch all for-print field (total amount) in Journal Entry in 2015
+def execute():
+	for je in frappe.get_all("Journal Entry", filters={"creation": (">", "2015-01-01")}):
+		je = frappe.get_doc("Journal Entry", je.name)
+		original = je.total_amount
+
+		je.set_print_format_fields()
+
+		if je.total_amount != original:
+			je.db_set("total_amount", je.total_amount, update_modified=False)
+			je.db_set("total_amount_in_words", je.total_amount_in_words, update_modified=False)

diff --git a/erpnext/patches/v6_10/fix_ordered_received_billed.py b/erpnext/patches/v6_10/fix_ordered_received_billed.py
new file mode 100644
index 0000000..ed4112e
--- /dev/null
+++ b/erpnext/patches/v6_10/fix_ordered_received_billed.py

@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	not_null_patch_date = frappe.db.sql("""select date(creation) from `tabPatch Log` where patch='frappe.patches.v6_9.int_float_not_null'""")
+	if not not_null_patch_date:
+		return
+
+	not_null_patch_date = not_null_patch_date[0][0]
+
+	for doctype in ("Purchase Invoice", "Sales Invoice", "Purchase Order", "Delivery Note", "Installation Note", "Delivery Note", "Purchase Receipt"):
+		for name in frappe.db.sql_list("""select name from `tab{doctype}`
+			where docstatus > 0 and (date(creation) >= %(patch_date)s or date(modified) >= %(patch_date)s)""".format(doctype=doctype),
+			{"patch_date": not_null_patch_date}):
+
+			doc = frappe.get_doc(doctype, name)
+			doc.update_qty(change_modified=False)

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/patches/v6_8/__init__.py
similarity index 100%
copy from erpnext/setup/page/setup_wizard/__init__.py
copy to erpnext/patches/v6_8/__init__.py


diff --git a/erpnext/patches/v6_8/make_webform_standard.py b/erpnext/patches/v6_8/make_webform_standard.py
new file mode 100644
index 0000000..d4e1484
--- /dev/null
+++ b/erpnext/patches/v6_8/make_webform_standard.py

@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Web Form")
+	frappe.delete_doc("Web Form", "Issues")
+	frappe.delete_doc("Web Form", "Addresses")
+
+	from erpnext.setup.install import add_web_forms
+	add_web_forms()

diff --git a/erpnext/patches/v6_8/move_drop_ship_to_po_items.py b/erpnext/patches/v6_8/move_drop_ship_to_po_items.py
new file mode 100644
index 0000000..06d158e
--- /dev/null
+++ b/erpnext/patches/v6_8/move_drop_ship_to_po_items.py

@@ -0,0 +1,42 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Purchase Order")
+	frappe.reload_doctype("Purchase Order Item")
+
+	if not frappe.db.has_column("Purchase Order", "delivered_by_supplier"):
+		return
+
+	for po in frappe.get_all("Purchase Order", filters={"delivered_by_supplier": 1}, fields=["name"]):
+		purchase_order = frappe.get_doc("Purchase Order", po)
+
+		for item in purchase_order.items:
+			if item.prevdoc_doctype == "Sales Order":
+				delivered_by_supplier = frappe.get_value("Sales Order Item", item.prevdoc_detail_docname,
+					"delivered_by_supplier")
+
+				if delivered_by_supplier:
+					frappe.db.sql("""update `tabPurchase Order Item`
+						set delivered_by_supplier=1, billed_amt=amount, received_qty=qty
+						where name=%s """, item.name)
+
+		update_per_received(purchase_order)
+		update_per_billed(purchase_order)
+
+def update_per_received(po):
+	frappe.db.sql(""" update `tabPurchase Order`
+				set per_received = round((select sum(if(qty > ifnull(received_qty, 0),
+					ifnull(received_qty, 0), qty)) / sum(qty) *100
+				from `tabPurchase Order Item`
+				where parent = %(name)s), 2)
+			where name = %(name)s """, {"name": po.name})
+
+def update_per_billed(po):
+	frappe.db.sql(""" update `tabPurchase Order`
+				set per_billed = round((select sum( if(amount > ifnull(billed_amt, 0),
+					ifnull(billed_amt, 0), amount)) / sum(amount) *100
+				from `tabPurchase Order Item`
+				where parent = %(name)s), 2)
+			where name = %(name)s """, {"name": po.name})
+
+

diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index daa73ae..00ca43f 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Activity Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Activity Type", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee", 
    "permlevel": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -109,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -133,6 +138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -154,6 +160,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -178,6 +185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Costing Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -200,6 +208,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -219,7 +228,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:37.693260", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.623039", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Cost", 

diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 3834efb..020b685 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Activity Type", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Costing Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -62,6 +64,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Billing Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -105,7 +109,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:37.799221", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.673241", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Activity Type", 

diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json
index 9f9eec8..6b660ca 100644
--- a/erpnext/projects/doctype/dependent_task/dependent_task.json
+++ b/erpnext/projects/doctype/dependent_task/dependent_task.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Task", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Task", 
    "permlevel": 0, 
@@ -39,7 +40,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:45.602997", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:45.201217", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Dependent Task", 

diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index e4540ec..f1e59a4 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Data", 
@@ -44,7 +45,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -68,7 +70,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Project Type",  
+   "label": "Project Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_type", 
    "oldfieldtype": "Data", 
@@ -92,6 +95,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -113,7 +117,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Is Active",  
+   "label": "Is Active", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_active", 
    "oldfieldtype": "Select", 
@@ -137,7 +142,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Priority",  
+   "label": "Priority", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "priority", 
    "oldfieldtype": "Select", 
@@ -161,6 +167,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -183,6 +190,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Expected Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_start_date", 
    "oldfieldtype": "Date", 
@@ -205,6 +213,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "completion_date", 
    "oldfieldtype": "Date", 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-user", 
@@ -273,6 +284,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -296,6 +308,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -318,6 +331,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Order", 
    "permlevel": 0, 
@@ -341,6 +355,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tasks", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-flag", 
@@ -364,6 +379,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tasks", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project Task", 
    "permlevel": 0, 
@@ -387,6 +403,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "% Tasks Completed", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -408,6 +425,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-list", 
@@ -431,6 +449,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notes", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "notes", 
    "oldfieldtype": "Text Editor", 
@@ -453,6 +472,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -475,6 +495,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -497,6 +518,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Time (in Hours)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -518,6 +540,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -540,6 +563,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "act_completion_date", 
    "oldfieldtype": "Date", 
@@ -562,6 +586,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -584,6 +609,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Estimated Costing", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_value", 
    "oldfieldtype": "Currency", 
@@ -607,6 +633,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -629,6 +656,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -651,6 +679,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -673,6 +702,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -697,6 +727,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Costing Amount (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -720,6 +751,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Expense Claim (via Expense Claims)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -741,6 +773,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -764,6 +797,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Billing Amount (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -786,6 +820,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Purchase Cost (via Purchase Invoice)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -808,6 +843,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -831,6 +867,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Margin", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "gross_margin_value", 
    "oldfieldtype": "Currency", 
@@ -854,6 +891,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -876,6 +914,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Margin %", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "per_gross_margin", 
    "oldfieldtype": "Currency", 
@@ -900,7 +939,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2015-10-02 07:39:02.200080", 
+ "modified": "2015-11-16 06:29:52.684371", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 

diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index bb43419..368c9d5 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py

@@ -90,15 +90,15 @@
 
 	def update_costing(self):
 		from_time_log = frappe.db.sql("""select
-			sum(ifnull(costing_amount, 0)) as costing_amount,
-			sum(ifnull(billing_amount, 0)) as billing_amount,
+			sum(costing_amount) as costing_amount,
+			sum(billing_amount) as billing_amount,
 			min(from_time) as start_date,
 			max(to_time) as end_date,
 			sum(hours) as time
 			from `tabTime Log` where project = %s and docstatus = 1""", self.name, as_dict=1)[0]
 
 		from_expense_claim = frappe.db.sql("""select
-			sum(ifnull(total_sanctioned_amount, 0)) as total_sanctioned_amount
+			sum(total_sanctioned_amount) as total_sanctioned_amount
 			from `tabExpense Claim` where project = %s and approval_status='Approved'
 			and docstatus = 1""",
 			self.name, as_dict=1)[0]
@@ -118,7 +118,7 @@
 			self.per_gross_margin = (self.gross_margin / flt(self.total_billing_amount)) *100
 
 	def update_purchase_costing(self):
-		total_purchase_cost = frappe.db.sql("""select sum(ifnull(base_net_amount, 0))
+		total_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
 			from `tabPurchase Invoice Item` where project_name = %s and docstatus=1""", self.name)
 
 		self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0

diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json
index 1aa401f..51a4662 100644
--- a/erpnext/projects/doctype/project_task/project_task.json
+++ b/erpnext/projects/doctype/project_task/project_task.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -41,7 +42,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Open\nWorking\nPending Review\nClosed\nCancelled", 
    "permlevel": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "View Task", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -87,6 +90,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -153,6 +159,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -175,6 +182,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -197,6 +205,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Task ID", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Task", 
    "permlevel": 0, 
@@ -217,7 +226,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-12 10:24:11.748792", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.824820", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project Task", 

diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 1d58af6..1dd2a5c 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json

@@ -20,6 +20,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Subject", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "subject", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Project", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project", 
    "oldfieldtype": "Link", 
@@ -66,6 +68,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -89,7 +92,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -113,7 +117,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Priority",  
+   "label": "Priority", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "priority", 
    "oldfieldtype": "Select", 
@@ -137,6 +142,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "Simple", 
@@ -160,6 +166,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text Editor", 
@@ -185,6 +192,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Depends On", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -207,6 +215,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "depends_on", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Task Depends On", 
    "permlevel": 0, 
@@ -229,6 +238,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -251,6 +261,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "exp_start_date", 
    "oldfieldtype": "Date", 
@@ -276,6 +287,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expected Time (in hours)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "exp_total_hrs", 
    "oldfieldtype": "Data", 
@@ -298,6 +310,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -320,6 +333,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Expected End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "exp_end_date", 
    "oldfieldtype": "Date", 
@@ -344,6 +358,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -368,6 +383,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Start Date (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "act_start_date", 
    "oldfieldtype": "Date", 
@@ -393,6 +409,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Time (in hours)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -415,6 +432,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -437,6 +455,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual End Date (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "act_end_date", 
    "oldfieldtype": "Date", 
@@ -459,6 +478,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -481,6 +501,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Costing Amount (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "actual_budget", 
    "oldfieldtype": "Currency", 
@@ -505,6 +526,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Expense Claim (via Expense Claim)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -527,6 +549,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -549,6 +572,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Billing Amount (via Time Logs)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -571,6 +595,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -593,6 +618,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Review Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "review_date", 
    "oldfieldtype": "Date", 
@@ -617,6 +643,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Closing Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "closing_date", 
    "oldfieldtype": "Date", 
@@ -639,6 +666,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -660,6 +688,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -682,7 +711,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
- "modified": "2015-10-02 07:39:16.010028", 
+ "modified": "2015-11-16 06:29:59.063379", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 

diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index e5b3355..cd0aabe 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py

@@ -53,7 +53,7 @@
 
 	def update_total_expense_claim(self):
 		self.total_expense_claim = frappe.db.sql("""select sum(total_sanctioned_amount) from `tabExpense Claim`
-			where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name))
+			where project = %s and task = %s and approval_status = "Approved" and docstatus=1""",(self.project, self.name))[0][0]
 
 	def update_time_and_costing(self):
 		tl = frappe.db.sql("""select min(from_time) as start_date, max(to_time) as end_date,

diff --git a/erpnext/projects/doctype/task_depends_on/task_depends_on.json b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
index 3d3914d..12782ea 100644
--- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json
+++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Task", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Task", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Subject", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -83,7 +86,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:16.216665", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.161882", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task Depends On", 

diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 5fce970..7b2faf9 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js

@@ -4,11 +4,13 @@
 frappe.provide("erpnext.projects");
 
 frappe.ui.form.on("Time Log", "onload", function(frm) {
-	if (frm.doc.for_manufacturing) {
-		frappe.ui.form.trigger("Time Log", "production_order");
-	}
-	if (frm.doc.from_time && frm.doc.to_time) {
-		frappe.ui.form.trigger("Time Log", "to_time");
+	if (frm.doc.__islocal) {
+		if (frm.doc.for_manufacturing) {
+			frappe.ui.form.trigger("Time Log", "production_order");
+		}
+		if (frm.doc.from_time && frm.doc.to_time) {
+			frappe.ui.form.trigger("Time Log", "to_time");
+		}
 	}
 });
 

diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index e4f57c5..4490f97 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json

@@ -20,7 +20,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "TL-", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,7 +65,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled", 
    "permlevel": 0, 
@@ -85,6 +88,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -107,6 +111,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Time", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Hours", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -150,6 +156,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Time", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -170,6 +177,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -193,6 +201,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Activity Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Activity Type", 
    "permlevel": 0, 
@@ -216,6 +225,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Project", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
@@ -239,6 +249,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Task", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Task", 
    "permlevel": 0, 
@@ -260,6 +271,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -282,6 +294,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "User", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "User", 
    "permlevel": 0, 
@@ -305,6 +318,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee", 
    "permlevel": 0, 
@@ -327,6 +341,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -348,6 +363,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "For Manufacturing", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -370,6 +386,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billable", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -391,6 +408,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -414,6 +432,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Production Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Production Order", 
    "permlevel": 0, 
@@ -438,6 +457,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Operation", 
    "permlevel": 0, 
@@ -462,6 +482,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Operation ID", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -484,6 +505,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -507,6 +529,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Workstation", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Workstation", 
    "permlevel": 0, 
@@ -532,6 +555,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Completed Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -553,6 +577,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -574,6 +599,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Note", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -595,6 +621,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -619,6 +646,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Costing Rate based on Activity Type (per hour)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -642,6 +670,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Costing Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -663,6 +692,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -687,6 +717,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Rate based on Activity Type (per hour)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -711,6 +742,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -732,6 +764,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -755,6 +788,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Time Log Batch", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Time Log Batch", 
    "permlevel": 0, 
@@ -778,6 +812,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -800,6 +835,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Time Log", 
    "permlevel": 1, 
@@ -822,6 +858,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -843,7 +880,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:16.759881", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.410559", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log", 

diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index cde733d..cd20036 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py

@@ -203,7 +203,7 @@
 	def get_time_log_summary(self):
 		"""Returns 'Actual Operating Time'. """
 		return frappe.db.sql("""select
-			sum(hours*60) as mins, sum(ifnull(completed_qty, 0)) as completed_qty
+			sum(hours*60) as mins, sum(completed_qty) as completed_qty
 			from `tabTime Log`
 			where production_order = %s and operation_id = %s and docstatus=1""",
 			(self.production_order, self.operation_id), as_dict=1)[0]

diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.json b/erpnext/projects/doctype/time_log_batch/time_log_batch.json
index 039190f..3ee6dee 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.json
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.json

@@ -20,7 +20,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "TLB-", 
    "permlevel": 0, 
@@ -43,7 +44,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Draft\nSubmitted\nBilled\nCancelled", 
    "permlevel": 0, 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -108,6 +112,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Time Logs", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Time Log Batch Detail", 
    "permlevel": 0, 
@@ -150,6 +156,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -174,6 +181,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Total Hours", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -194,6 +202,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -218,6 +227,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Billing Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -240,6 +250,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Time Log Batch", 
    "permlevel": 0, 
@@ -261,7 +272,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:17.042383", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.535984", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log Batch", 

diff --git a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
index fe97937..ad89b74 100644
--- a/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json
+++ b/erpnext/projects/doctype/time_log_batch_detail/time_log_batch_detail.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Time Log", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Time Log", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Hours", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,6 +64,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -84,6 +87,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Activity Type", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -105,6 +109,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Billing Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -115,27 +120,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  },
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "note", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Note", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -146,7 +130,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:17.158572", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.590738", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Time Log Batch Detail", 
@@ -154,4 +139,4 @@
  "permissions": [], 
  "read_only": 0, 
  "read_only_onload": 0
-}
+}
\ No newline at end of file

diff --git a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
index 5800156..559b02d 100644
--- a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py

@@ -64,8 +64,8 @@
 
 	si_items = frappe.db.sql("""select si.project_name, sum(si_item.base_net_amount) as amount
 		from `tabSales Invoice` si, `tabSales Invoice Item` si_item
-		where si.name = si_item.parent and si.docstatus = 1 and ifnull(si.update_stock, 0) = 1
-		and ifnull(si.is_pos, 0) = 1 and ifnull(si.project_name, '') != ''
+		where si.name = si_item.parent and si.docstatus = 1 and si.update_stock = 1
+		and si.is_pos = 1 and ifnull(si.project_name, '') != ''
 		group by si.project_name""", as_dict=1)
 
 

diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index fdd0b52..1f6e2b3 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py

@@ -13,12 +13,12 @@
 @frappe.whitelist()
 def query_task(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import build_match_conditions
-	
+
 	search_string = "%%%s%%" % txt
 	order_by_string = "%s%%" % txt
 	match_conditions = build_match_conditions("Task")
 	match_conditions = ("and" + match_conditions) if match_conditions else ""
-	
+
 	return frappe.db.sql("""select name, subject from `tabTask`
 		where (`%s` like %s or `subject` like %s) %s
 		order by
@@ -26,7 +26,7 @@
 			case when `%s` like %s then 0 else 1 end,
 			`%s`,
 			subject
-		limit %s, %s""" % 
-		(searchfield, "%s", "%s", match_conditions, "%s", 
-			searchfield, "%s", searchfield, "%s", "%s"),
-		(search_string, search_string, order_by_string, order_by_string, start, page_len))
\ No newline at end of file
+		limit %s, %s""" %
+		(frappe.db.escape(searchfield), "%s", "%s", match_conditions, "%s",
+			frappe.db.escape(searchfield), "%s", frappe.db.escape(searchfield), "%s", "%s"),
+		(search_string, search_string, order_by_string, order_by_string, start, page_len))

diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index f3bc58d..77ce04b 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css

@@ -29,7 +29,7 @@
   background-repeat: no-repeat;
   background-position: center top;
   border-radius: 0.5em;
-  border: 1px solid #ebeff2;
+  border: 1px solid #EBEFF2;
 }
 .product-image.missing-image {
   width: 100%;
@@ -39,7 +39,7 @@
   background-repeat: no-repeat;
   background-position: center top;
   border-radius: 0.5em;
-  border: 1px solid #ebeff2;
+  border: 1px solid #EBEFF2;
   border: 1px dashed #d1d8dd;
   position: relative;
 }

diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index b1b24cf..a8cdf83 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js

@@ -500,9 +500,13 @@
 		if(this.frm.doc.is_return || this.frm.doc.docstatus > 0) return;
 		
 		frappe.model.round_floats_in(this.frm.doc, ["grand_total", "total_advance", "write_off_amount"]);
-		
-		var total_amount_to_pay = flt((this.frm.doc.grand_total - this.frm.doc.total_advance 
-			- this.frm.doc.write_off_amount), precision("grand_total"));
+		if(this.frm.doc.party_account_currency == this.frm.doc.currency) {	
+			var total_amount_to_pay = flt((this.frm.doc.grand_total - this.frm.doc.total_advance 
+				- this.frm.doc.write_off_amount), precision("grand_total"));
+		} else {
+			var total_amount_to_pay = flt((this.frm.doc.base_grand_total - this.frm.doc.total_advance 
+				- this.frm.doc.base_write_off_amount), precision("base_grand_total"));
+		}
 		
 		if(this.frm.doc.doctype == "Sales Invoice") {
 			frappe.model.round_floats_in(this.frm.doc, ["paid_amount"]);
@@ -518,18 +522,15 @@
 			this.frm.refresh_field("paid_amount");
 			this.frm.refresh_field("base_paid_amount");
 			
-			var outstanding_amount =  flt(total_amount_to_pay - this.frm.doc.paid_amount, 
+			var paid_amount = (this.frm.doc.party_account_currency == this.frm.doc.currency) ? 
+				this.frm.doc.paid_amount : this.frm.doc.base_paid_amount;
+			
+			var outstanding_amount =  flt(total_amount_to_pay - flt(paid_amount), 
 				precision("outstanding_amount"));
 				
 		} else if(this.frm.doc.doctype == "Purchase Invoice") {
 			var outstanding_amount = flt(total_amount_to_pay, precision("outstanding_amount"));
-		}
-		
-		if(this.frm.doc.party_account_currency == this.frm.doc.currency) {	
-			this.frm.set_value("outstanding_amount", outstanding_amount);
-		} else {
-			this.frm.set_value("outstanding_amount", 
-				flt(outstanding_amount * this.frm.doc.conversion_rate, precision("outstanding_amount")));
-		}
+		}		
+		this.frm.set_value("outstanding_amount", outstanding_amount);
 	}
 })

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 87cc2f6..49f47e0 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js

@@ -76,7 +76,7 @@
 		if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
 			&& !(this.frm.doc.__onload ? this.frm.doc.__onload.load_after_mapping : false)) {
 				this.apply_default_taxes();
-		} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"] 
+		} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
 			&& !this.frm.doc.is_pos) {
 				me.calculate_taxes_and_totals();
 		}
@@ -507,7 +507,7 @@
 		}
 
 		if(this.frm.fields_dict["advances"]) {
-			setup_field_label_map(["advance_amount", "allocated_amount"], 
+			setup_field_label_map(["advance_amount", "allocated_amount"],
 				this.frm.doc.party_account_currency, "advances");
 		}
 
@@ -558,9 +558,15 @@
 
 	apply_pricing_rule: function(item, calculate_taxes_and_totals) {
 		var me = this;
+		var args = this._get_args(item);
+		if (!(args.item_list && args.item_list.length)) {
+			if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
+			return;
+		}
+
 		return this.frm.call({
 			method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule",
-			args: {	args: this._get_args(item) },
+			args: {	args: args },
 			callback: function(r) {
 				if (!r.exc && r.message) {
 					me._set_values_for_item_list(r.message);
@@ -648,6 +654,9 @@
 	apply_price_list: function(item) {
 		var me = this;
 		var args = this._get_args(item);
+		if (!((args.item_list && args.item_list.length) || args.price_list)) {
+			return;
+		}
 
 		return this.frm.call({
 			method: "erpnext.stock.get_item_details.apply_price_list",

diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
new file mode 100644
index 0000000..c139f8a
--- /dev/null
+++ b/erpnext/public/js/setup_wizard.js

@@ -0,0 +1,433 @@
+frappe.provide("erpnext.wiz");
+
+frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
+	if(sys_defaults.company) {
+		frappe.set_route("desk");
+		return;
+	}
+};
+
+function load_erpnext_slides() {
+	$.extend(erpnext.wiz, {
+		region: {
+			title: __("Region"),
+			icon: "icon-flag",
+			help: __("Select your Country, Time Zone and Currency"),
+			fields: [
+				{ fieldname: "country", label: __("Country"), reqd:1,
+					fieldtype: "Select" },
+				{ fieldname: "timezone", label: __("Time Zone"), reqd:1,
+					fieldtype: "Select" },
+				{ fieldname: "currency", label: __("Currency"), reqd:1,
+					fieldtype: "Select" },
+			],
+
+			onload: function(slide) {
+				frappe.call({
+					method:"frappe.geo.country_info.get_country_timezone_info",
+					callback: function(data) {
+						erpnext.wiz.region.data = data.message;
+						erpnext.wiz.region.setup_fields(slide);
+						erpnext.wiz.region.bind_events(slide);
+					}
+				});
+			},
+			css_class: "single-column",
+			setup_fields: function(slide) {
+				var data = erpnext.wiz.region.data;
+
+				slide.get_input("country").empty()
+					.add_options([""].concat(keys(data.country_info).sort()));
+
+				slide.get_input("currency").empty()
+					.add_options(frappe.utils.unique([""].concat($.map(data.country_info,
+						function(opts, country) { return opts.currency; }))).sort());
+
+				slide.get_input("timezone").empty()
+					.add_options([""].concat(data.all_timezones));
+
+				if (data.default_country) {
+					slide.set_input("country", data.default_country);
+				}
+			},
+
+			bind_events: function(slide) {
+				slide.get_input("country").on("change", function() {
+					var country = slide.get_input("country").val();
+					var $timezone = slide.get_input("timezone");
+					var data = erpnext.wiz.region.data;
+
+					$timezone.empty();
+
+					// add country specific timezones first
+					if(country) {
+						var timezone_list = data.country_info[country].timezones || [];
+						$timezone.add_options(timezone_list.sort());
+						slide.get_field("currency").set_input(data.country_info[country].currency);
+						slide.get_field("currency").$input.trigger("change");
+					}
+
+					// add all timezones at the end, so that user has the option to change it to any timezone
+					$timezone.add_options([""].concat(data.all_timezones));
+
+					slide.get_field("timezone").set_input($timezone.val());
+
+					// temporarily set date format
+					frappe.boot.sysdefaults.date_format = (data.country_info[country].date_format
+						|| "dd-mm-yyyy");
+				});
+
+				slide.get_input("currency").on("change", function() {
+					var currency = slide.get_input("currency").val();
+					if (!currency) return;
+					frappe.model.with_doc("Currency", currency, function() {
+						frappe.provide("locals.:Currency." + currency);
+						var currency_doc = frappe.model.get_doc("Currency", currency);
+						var number_format = currency_doc.number_format;
+						if (number_format==="#.###") {
+							number_format = "#.###,##";
+						} else if (number_format==="#,###") {
+							number_format = "#,###.##"
+						}
+
+						frappe.boot.sysdefaults.number_format = number_format;
+						locals[":Currency"][currency] = $.extend({}, currency_doc);
+					});
+				});
+			}
+		},
+
+		user: {
+			title: __("The First User: You"),
+			icon: "icon-user",
+			fields: [
+				{"fieldname": "first_name", "label": __("First Name"), "fieldtype": "Data",
+					reqd:1},
+				{"fieldname": "last_name", "label": __("Last Name"), "fieldtype": "Data"},
+				{"fieldname": "email", "label": __("Email Address"), "fieldtype": "Data",
+					reqd:1, "description": __("You will use it to Login"), "options":"Email"},
+				{"fieldname": "password", "label": __("Password"), "fieldtype": "Password",
+					reqd:1},
+				{fieldtype:"Attach Image", fieldname:"attach_user",
+					label: __("Attach Your Picture")},
+			],
+			help: __('The first user will become the System Manager (you can change this later).'),
+			onload: function(slide) {
+				if(user!=="Administrator") {
+					slide.form.fields_dict.password.$wrapper.toggle(false);
+					slide.form.fields_dict.email.$wrapper.toggle(false);
+					slide.form.fields_dict.first_name.set_input(frappe.boot.user.first_name);
+					slide.form.fields_dict.last_name.set_input(frappe.boot.user.last_name);
+
+					var user_image = frappe.get_cookie("user_image");
+					if(user_image) {
+						var $attach_user = slide.form.fields_dict.attach_user.$wrapper;
+						$attach_user.find(".missing-image").toggle(false);
+						$attach_user.find("img").attr("src", decodeURIComponent(user_image)).toggle(true);
+					}
+
+					delete slide.form.fields_dict.email;
+					delete slide.form.fields_dict.password;
+				}
+			},
+			css_class: "single-column"
+		},
+
+		org: {
+			title: __("The Organization"),
+			icon: "icon-building",
+			fields: [
+				{fieldname:'company_name', label: __('Company Name'), fieldtype:'Data', reqd:1,
+					placeholder: __('e.g. "My Company LLC"')},
+				{fieldname:'company_abbr', label: __('Company Abbreviation'), fieldtype:'Data',
+					description: __('Max 5 characters'), placeholder: __('e.g. "MC"'), reqd:1},
+				{fieldname:'company_tagline', label: __('What does it do?'), fieldtype:'Data',
+					placeholder:__('e.g. "Build tools for builders"'), reqd:1},
+				{fieldname:'bank_account', label: __('Bank Account'), fieldtype:'Data',
+					placeholder: __('e.g. "XYZ National Bank"'), reqd:1 },
+				{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
+					options: "", fieldtype: 'Select'},
+
+				// TODO remove this
+				{fieldtype: "Section Break"},
+				{fieldname:'fy_start_date', label:__('Financial Year Start Date'), fieldtype:'Date',
+					description: __('Your financial year begins on'), reqd:1},
+				{fieldname:'fy_end_date', label:__('Financial Year End Date'), fieldtype:'Date',
+					description: __('Your financial year ends on'), reqd:1},
+			],
+			help: __('The name of your company for which you are setting up this system.'),
+
+			onload: function(slide) {
+				erpnext.wiz.org.load_chart_of_accounts(slide);
+				erpnext.wiz.org.bind_events(slide);
+				erpnext.wiz.org.set_fy_dates(slide);
+			},
+
+			validate: function() {
+				// validate fiscal year start and end dates
+				if (this.values.fy_start_date=='Invalid date' || this.values.fy_end_date=='Invalid date') {
+					msgprint(__("Please enter valid Financial Year Start and End Dates"));
+					return false;
+				}
+
+				if ((this.values.company_name || "").toLowerCase() == "company") {
+					msgprint(__("Company Name cannot be Company"));
+					return false;
+				}
+
+				return true;
+			},
+
+			css_class: "single-column",
+
+			set_fy_dates: function(slide) {
+				var country = slide.wiz.get_values().country;
+
+				if(country) {
+					var fy = erpnext.wiz.fiscal_years[country];
+					var current_year = moment(new Date()).year();
+					var next_year = current_year + 1;
+					if(!fy) {
+						fy = ["01-01", "12-31"];
+						next_year = current_year;
+					}
+
+					slide.get_field("fy_start_date").set_input(current_year + "-" + fy[0]);
+					slide.get_field("fy_end_date").set_input(next_year + "-" + fy[1]);
+				}
+
+			},
+
+			load_chart_of_accounts: function(slide) {
+				var country = slide.wiz.get_values().country;
+
+				if(country) {
+					frappe.call({
+						method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
+						args: {"country": country},
+						callback: function(r) {
+							if(r.message) {
+								slide.get_input("chart_of_accounts").empty()
+									.add_options(r.message);
+
+								if (r.message.length===1) {
+									var field = slide.get_field("chart_of_accounts");
+									field.set_value(r.message[0]);
+									field.df.hidden = 1;
+									field.refresh();
+								}
+							}
+						}
+					})
+				}
+			},
+
+			bind_events: function(slide) {
+				slide.get_input("company_name").on("change", function() {
+					var parts = slide.get_input("company_name").val().split(" ");
+					var abbr = $.map(parts, function(p) { return p ? p.substr(0,1) : null }).join("");
+					slide.get_field("company_abbr").set_input(abbr.slice(0, 5).toUpperCase());
+				}).val(frappe.boot.sysdefaults.company_name || "").trigger("change");
+
+				slide.get_input("company_abbr").on("change", function() {
+					if(slide.get_input("company_abbr").val().length > 5) {
+						msgprint("Company Abbreviation cannot have more than 5 characters");
+						slide.get_field("company_abbr").set_input("");
+					}
+				});
+
+				// TODO remove this
+				slide.get_input("fy_start_date").on("change", function() {
+					var year_end_date =
+						frappe.datetime.add_days(frappe.datetime.add_months(
+							frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1);
+					slide.get_input("fy_end_date").val(frappe.datetime.obj_to_user(year_end_date));
+
+				});
+			}
+		},
+
+		branding: {
+			icon: "icon-bookmark",
+			title: __("The Brand"),
+			help: __('Upload your letter head and logo. (you can edit them later).'),
+			fields: [
+				{fieldtype:"Attach Image", fieldname:"attach_letterhead",
+					label: __("Attach Letterhead"),
+					description: __("Keep it web friendly 900px (w) by 100px (h)")
+				},
+				{fieldtype: "Column Break"},
+				{fieldtype:"Attach Image", fieldname:"attach_logo",
+					label:__("Attach Logo"),
+					description: __("100px by 100px")},
+			],
+
+			css_class: "two-column"
+		},
+
+		users: {
+			icon: "icon-money",
+			"title": __("Add Users"),
+			"help": __("Add users to your organization, other than yourself"),
+			"fields": [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<5; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break"},
+						{fieldtype:"Data", fieldname:"user_fullname_"+ i,
+							label:__("Full Name")},
+						{fieldtype:"Data", fieldname:"user_email_" + i,
+							label:__("Email ID"), placeholder:__("user@example.com"),
+							options: "Email"},
+						{fieldtype:"Column Break"},
+						{fieldtype: "Check", fieldname: "user_sales_" + i,
+							label:__("Sales"), default: 1},
+						{fieldtype: "Check", fieldname: "user_purchaser_" + i,
+							label:__("Purchaser"), default: 1},
+						{fieldtype: "Check", fieldname: "user_accountant_" + i,
+							label:__("Accountant"), default: 1},
+					]);
+				}
+			},
+			css_class: "two-column"
+		},
+
+		taxes: {
+			icon: "icon-money",
+			"title": __("Add Taxes"),
+			"help": __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
+			"fields": [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<4; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break"},
+						{fieldtype:"Data", fieldname:"tax_"+ i, label:__("Tax") + " " + i,
+							placeholder:__("e.g. VAT") + " " + i},
+						{fieldtype:"Column Break"},
+						{fieldtype:"Float", fieldname:"tax_rate_" + i, label:__("Rate (%)"), placeholder:__("e.g. 5")},
+					]);
+				}
+			},
+			css_class: "two-column"
+		},
+
+		customers: {
+			icon: "icon-group",
+			"title": __("Your Customers"),
+			"help": __("List a few of your customers. They could be organizations or individuals."),
+			"fields": [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<6; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break"},
+						{fieldtype:"Data", fieldname:"customer_" + i, label:__("Customer") + " " + i,
+							placeholder:__("Customer Name")},
+						{fieldtype:"Column Break"},
+						{fieldtype:"Data", fieldname:"customer_contact_" + i,
+							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")}
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "two-column"
+		},
+
+		suppliers: {
+			icon: "icon-group",
+			"title": __("Your Suppliers"),
+			"help": __("List a few of your suppliers. They could be organizations or individuals."),
+			"fields": [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<6; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break"},
+						{fieldtype:"Data", fieldname:"supplier_" + i, label:__("Supplier")+" " + i,
+							placeholder:__("Supplier Name")},
+						{fieldtype:"Column Break"},
+						{fieldtype:"Data", fieldname:"supplier_contact_" + i,
+							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")},
+					])
+				}
+				slide.fields[1].reqd = 1;
+			},
+			css_class: "two-column"
+		},
+
+		items: {
+			icon: "icon-barcode",
+			"title": __("Your Products or Services"),
+			"help": __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
+			"fields": [],
+			before_load: function(slide) {
+				slide.fields = [];
+				for(var i=1; i<6; i++) {
+					slide.fields = slide.fields.concat([
+						{fieldtype:"Section Break", show_section_border: true},
+						{fieldtype:"Data", fieldname:"item_" + i, label:__("Item") + " " + i,
+							placeholder:__("A Product or Service")},
+						{fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i,
+							options:[__("Products"), __("Services"),
+								__("Raw Material"), __("Consumable"), __("Sub Assemblies")],
+							"default": __("Products")},
+						{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
+							options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
+								__("Hour"), __("Minute")],
+							"default": __("Unit")},
+						{fieldtype: "Check", fieldname: "is_sales_item_" + i, label:__("We sell this Item"), default: 1},
+						{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
+						{fieldtype:"Column Break"},
+						{fieldtype:"Currency", fieldname:"item_price_" + i, label:__("Rate")},
+						{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image")},
+					])
+				}
+				slide.fields[1].reqd = 1;
+
+				// dummy data
+				slide.fields.push({fieldtype: "Section Break"});
+				slide.fields.push({fieldtype: "Check", fieldname: "add_sample_data",
+					label: __("Add a few sample records"), "default": 1});
+			},
+			css_class: "two-column"
+		},
+	});
+
+	// Source: https://en.wikipedia.org/wiki/Fiscal_year
+	// default 1st Jan - 31st Dec
+
+	erpnext.wiz.fiscal_years = {
+		"Afghanistan": ["12-20", "12-21"],
+		"Australia": ["07-01", "06-30"],
+		"Bangladesh": ["07-01", "06-30"],
+		"Canada": ["04-01", "03-31"],
+		"Costa Rica": ["10-01", "09-30"],
+		"Egypt": ["07-01", "06-30"],
+		"Hong Kong": ["04-01", "03-31"],
+		"India": ["04-01", "03-31"],
+		"Iran": ["06-23", "06-22"],
+		"Italy": ["07-01", "06-30"],
+		"Myanmar": ["04-01", "03-31"],
+		"New Zealand": ["04-01", "03-31"],
+		"Pakistan": ["07-01", "06-30"],
+		"Singapore": ["04-01", "03-31"],
+		"South Africa": ["03-01", "02-28"],
+		"Thailand": ["10-01", "09-30"],
+		"United Kingdom": ["04-01", "03-31"],
+	};
+};
+
+frappe.wiz.on("before_load", function() {
+	load_erpnext_slides();
+	frappe.wiz.add_slide(erpnext.wiz.user);
+	frappe.wiz.add_slide(erpnext.wiz.org);
+	frappe.wiz.add_slide(erpnext.wiz.branding);
+	frappe.wiz.add_slide(erpnext.wiz.users);
+	frappe.wiz.add_slide(erpnext.wiz.taxes);
+	frappe.wiz.add_slide(erpnext.wiz.customers);
+	frappe.wiz.add_slide(erpnext.wiz.suppliers);
+	frappe.wiz.add_slide(erpnext.wiz.items);
+	frappe.wiz.welcome_page = "#welcome-to-erpnext";
+});

diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 48f93e1..7283926 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign_name", 
    "oldfieldtype": "Data", 
@@ -65,7 +67,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Naming Series",  
+   "label": "Naming Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Campaign-.####", 
    "permlevel": 0, 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -111,7 +115,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:41.191975", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.265411", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Campaign", 

diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 7d6ad8f..f27fdbf 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json

@@ -21,11 +21,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -43,11 +45,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "CUST-", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -66,11 +70,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Full Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -88,13 +94,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_type", 
    "oldfieldtype": "Select", 
    "options": "\nCompany\nIndividual", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -113,12 +121,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "From Lead", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lead_name", 
    "oldfieldtype": "Link", 
    "options": "Lead", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -136,9 +146,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -159,12 +171,14 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_group", 
    "oldfieldtype": "Link", 
    "options": "Customer Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -184,12 +198,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "territory", 
    "oldfieldtype": "Link", 
    "options": "Territory", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -208,10 +224,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Tax ID", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -230,10 +248,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Frozen", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -252,10 +272,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -274,10 +296,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Currency", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -296,53 +320,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "default_taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Default Taxes and Charges", 
-   "no_copy": 0, 
-   "options": "Sales Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -362,10 +345,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address and Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-map-marker", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -384,9 +369,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -404,9 +391,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -426,10 +415,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact HTML", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -449,9 +440,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Receivable Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -472,10 +465,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Party Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -495,9 +490,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -516,12 +513,14 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Credit Days Based On",  
+   "label": "Credit Days Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nFixed Days\nLast Day of the Next Month", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -541,11 +540,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit_days", 
    "oldfieldtype": "Int", 
    "permlevel": 1, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -564,12 +565,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit_limit", 
    "oldfieldtype": "Currency", 
    "options": "", 
    "permlevel": 1, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -589,11 +592,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -613,11 +618,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_details", 
    "oldfieldtype": "Code", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -636,9 +643,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -658,11 +667,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner and Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -681,12 +692,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "default_sales_partner", 
    "oldfieldtype": "Link", 
    "options": "Sales Partner", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -705,11 +718,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "default_commission_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -729,10 +744,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -751,12 +768,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_team", 
    "oldfieldtype": "Table", 
    "options": "Sales Team", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -775,10 +794,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Communications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Communication", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -796,7 +817,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:43.465791", 
+ "max_attachments": 0, 
+ "modified": "2015-12-08 12:50:05.106006", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 01e4813..72ec1dc 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py

@@ -29,14 +29,14 @@
 				frappe.throw(_("Series is mandatory"), frappe.MandatoryError)
 
 			self.name = make_autoname(self.naming_series+'.#####')
-			
+
 	def get_customer_name(self):
 		if frappe.db.get_value("Customer", self.customer_name):
 			count = frappe.db.sql("""select ifnull(max(SUBSTRING_INDEX(name, ' ', -1)), 0) from tabCustomer
-				 where name like  '%{0} - %'""".format(self.customer_name), as_list=1)[0][0]
+				 where name like %s""", "%{0} - %".format(self.customer_name), as_list=1)[0][0]
 			count = cint(count) + 1
 			return "{0} - {1}".format(self.customer_name, cstr(count))
-		
+
 		return self.customer_name
 
 	def validate(self):
@@ -137,7 +137,7 @@
 			{"customer": customer, "docstatus": ["!=", 2] }, "count(*)")
 
 	billing_this_year = frappe.db.sql("""
-		select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))
+		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where voucher_type='Sales Invoice' and party_type = 'Customer'
 			and party=%s and fiscal_year = %s""",
@@ -189,17 +189,17 @@
 
 def get_customer_outstanding(customer, company):
 	# Outstanding based on GL Entries
-	outstanding_based_on_gle = frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))
+	outstanding_based_on_gle = frappe.db.sql("""select sum(debit) - sum(credit)
 		from `tabGL Entry` where party_type = 'Customer' and party = %s and company=%s""", (customer, company))
 
 	outstanding_based_on_gle = flt(outstanding_based_on_gle[0][0]) if outstanding_based_on_gle else 0
 
 	# Outstanding based on Sales Order
 	outstanding_based_on_so = frappe.db.sql("""
-		select sum(base_grand_total*(100 - ifnull(per_billed, 0))/100)
+		select sum(base_grand_total*(100 - per_billed)/100)
 		from `tabSales Order`
 		where customer=%s and docstatus = 1 and company=%s
-		and ifnull(per_billed, 0) < 100 and status != 'Stopped'""", (customer, company))
+		and per_billed < 100 and status != 'Stopped'""", (customer, company))
 
 	outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0
 
@@ -217,7 +217,7 @@
 	outstanding_based_on_dn = 0.0
 
 	for dn_item in unmarked_delivery_note_items:
-		si_amount = frappe.db.sql("""select sum(ifnull(amount, 0))
+		si_amount = frappe.db.sql("""select sum(amount)
 			from `tabSales Invoice Item`
 			where dn_detail = %s and docstatus = 1""", dn_item.name)[0][0]
 
@@ -234,4 +234,4 @@
 		credit_limit = frappe.db.get_value("Customer Group", customer_group, "credit_limit") or \
 			frappe.db.get_value("Company", company, "credit_limit")
 
-	return credit_limit
\ No newline at end of file
+	return credit_limit

diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 7ce9a87..6c592b5 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Industry", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "industry", 
    "oldfieldtype": "Data", 
@@ -42,7 +43,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:51.531817", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.569394", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Industry Type", 

diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 3dfd2ed..27b6ac4 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installation Note", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -40,6 +41,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -62,7 +64,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -223,6 +232,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -245,6 +255,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -268,6 +279,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -292,6 +304,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -313,6 +326,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -336,6 +350,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installation Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "inst_date", 
    "oldfieldtype": "Date", 
@@ -359,6 +374,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installation Time", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "inst_time", 
    "oldfieldtype": "Time", 
@@ -382,7 +398,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -408,6 +425,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Select", 
@@ -432,6 +450,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -456,6 +475,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -480,6 +500,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Small Text", 
@@ -503,6 +524,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "Simple", 
@@ -526,6 +548,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "installed_item_details", 
    "oldfieldtype": "Table", 
@@ -549,7 +572,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:51.611044", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.610773", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 

diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
index 3666517..758c47f 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Data", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Small Text", 
@@ -93,6 +96,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Document Detail No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
@@ -118,6 +122,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Document No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
@@ -143,6 +148,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Document Type", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -168,6 +174,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Installed Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -189,7 +196,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:51.804947", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.713471", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note Item", 

diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 30259ad..7ec3df8 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Item", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "new_item_code", 
    "oldfieldtype": "Data", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_bom_items", 
    "oldfieldtype": "Table", 
@@ -111,7 +115,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:01.166099", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.231105", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Product Bundle", 

diff --git a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
index f84ceec..fadf198 100644
--- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rate", 
    "oldfieldtype": "Currency", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -134,7 +139,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:01.323333", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.274925", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Product Bundle Item", 

diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 68b5c8d..a4ca4ff 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -85,7 +88,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -110,7 +114,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Quotation To",  
+   "label": "Quotation To", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "quotation_to", 
    "oldfieldtype": "Select", 
@@ -136,6 +141,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -161,6 +167,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Lead", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lead", 
    "oldfieldtype": "Link", 
@@ -185,6 +192,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer / Lead Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -206,6 +214,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_address", 
    "oldfieldtype": "Small Text", 
@@ -229,6 +238,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -271,6 +282,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -291,6 +303,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -314,6 +327,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -340,6 +354,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -366,6 +381,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -390,7 +406,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Order Type",  
+   "label": "Order Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "order_type", 
    "oldfieldtype": "Select", 
@@ -415,6 +432,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
@@ -437,6 +455,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
@@ -463,6 +482,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
@@ -487,6 +507,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -509,6 +530,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -534,6 +556,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -557,6 +580,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
@@ -579,6 +603,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
@@ -600,6 +625,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -623,6 +649,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "quotation_details", 
    "oldfieldtype": "Table", 
@@ -647,6 +674,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -668,6 +696,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -691,6 +720,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
@@ -715,6 +745,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -736,6 +767,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -759,6 +791,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -781,6 +814,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -804,6 +838,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge", 
    "oldfieldtype": "Link", 
@@ -827,6 +862,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -848,6 +884,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "Shipping Rule", 
@@ -870,6 +907,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -891,6 +929,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges", 
    "oldfieldtype": "Table", 
@@ -915,6 +954,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
@@ -936,6 +976,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -957,6 +998,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_total", 
    "oldfieldtype": "Currency", 
@@ -980,6 +1022,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1001,6 +1044,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1024,6 +1068,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1046,7 +1091,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Apply Additional Discount On",  
+   "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1069,6 +1115,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1091,6 +1138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1113,6 +1161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1136,6 +1185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -1159,6 +1209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
@@ -1184,6 +1235,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
@@ -1210,6 +1262,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
@@ -1233,6 +1286,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1256,6 +1310,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_export", 
    "oldfieldtype": "Currency", 
@@ -1281,6 +1336,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total_export", 
    "oldfieldtype": "Currency", 
@@ -1306,6 +1362,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
@@ -1331,6 +1388,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
@@ -1354,6 +1412,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
@@ -1378,6 +1437,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Term Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
@@ -1401,6 +1461,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -1424,6 +1485,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -1448,6 +1510,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_group", 
    "oldfieldtype": "Link", 
@@ -1472,6 +1535,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -1494,6 +1558,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1515,6 +1580,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1537,6 +1603,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -1560,6 +1627,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contact_person", 
    "oldfieldtype": "Link", 
@@ -1584,6 +1652,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1606,6 +1675,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
@@ -1630,6 +1700,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
@@ -1654,6 +1725,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -1677,6 +1749,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
@@ -1700,7 +1773,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Source",  
+   "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -1726,6 +1800,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quotation Lost Reason", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "order_lost_reason", 
    "oldfieldtype": "Small Text", 
@@ -1748,6 +1823,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1771,7 +1847,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -1796,6 +1873,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -1820,6 +1898,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opportunity Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "enq_det", 
    "oldfieldtype": "Text", 
@@ -1843,7 +1922,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-10-02 07:39:07.058085", 
+ "modified": "2015-11-16 06:29:54.958329", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 

diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 8af8e1c..b1d441c 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -86,6 +89,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -110,6 +114,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -156,6 +162,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -178,6 +185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -200,6 +208,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -223,6 +232,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -244,6 +254,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -269,6 +280,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ref_rate", 
    "oldfieldtype": "Currency", 
@@ -296,6 +308,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "adj_rate", 
    "oldfieldtype": "Float", 
@@ -320,6 +333,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -341,6 +355,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -367,6 +382,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "base_ref_rate", 
    "oldfieldtype": "Currency", 
@@ -392,6 +408,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -413,6 +430,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_rate", 
    "oldfieldtype": "Currency", 
@@ -439,6 +457,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -461,6 +480,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_amount", 
    "oldfieldtype": "Currency", 
@@ -487,6 +507,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -509,6 +530,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -530,6 +552,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "basic_rate", 
    "oldfieldtype": "Currency", 
@@ -556,6 +579,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -578,6 +602,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -604,6 +629,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -627,6 +653,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -649,6 +676,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -670,6 +698,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Doctype", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -696,6 +725,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Docname", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
@@ -722,6 +752,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -744,6 +775,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -765,6 +797,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -789,6 +822,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -813,6 +847,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -837,7 +872,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:51.443832", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.206667", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 

diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 5926b25..56c8da0 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js

@@ -56,13 +56,15 @@
 					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
 				}
 
-				// stop
-				if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
-						cur_frm.add_custom_button(__('Stop'), this.stop_sales_order)
-					}
+				if (this.frm.has_perm("submit")) {
+					// stop
+					if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
+							cur_frm.add_custom_button(__('Stop'), this.stop_sales_order)
+						}
 
 
-				cur_frm.add_custom_button(__('Close'), this.close_sales_order)
+					cur_frm.add_custom_button(__('Close'), this.close_sales_order)
+				}
 
 				// maintenance
 				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
@@ -82,8 +84,10 @@
 
 
 			} else {
-				// un-stop
-				cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order']);
+				if (this.frm.has_perm("submit")) {
+					// un-stop
+					cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Sales Order']);
+				}
 			}
 		}
 

diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index ed661f8..40337bf 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -111,6 +115,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -156,6 +162,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -177,6 +184,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -198,6 +206,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -219,6 +228,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -242,6 +252,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Order Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "order_type", 
    "oldfieldtype": "Select", 
@@ -265,6 +276,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -288,6 +300,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -314,6 +327,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -340,6 +354,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -365,6 +380,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "delivery_date", 
    "oldfieldtype": "Date", 
@@ -391,6 +407,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Purchase Order", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_no", 
    "oldfieldtype": "Data", 
@@ -417,6 +434,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Purchase Order Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_date", 
    "oldfieldtype": "Date", 
@@ -441,6 +459,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Shipping Address Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -463,6 +482,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -484,6 +504,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
@@ -506,6 +527,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
@@ -532,6 +554,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
@@ -556,6 +579,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -578,6 +602,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -603,6 +628,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -626,6 +652,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
@@ -648,6 +675,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
@@ -669,6 +697,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -692,6 +721,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_order_details", 
    "oldfieldtype": "Table", 
@@ -715,6 +745,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -735,6 +766,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -756,6 +788,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -779,6 +812,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
@@ -803,6 +837,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -824,6 +859,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -847,6 +883,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -869,6 +906,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -892,6 +930,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge", 
    "oldfieldtype": "Link", 
@@ -915,6 +954,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -936,6 +976,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "Shipping Rule", 
@@ -958,6 +999,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -979,6 +1021,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges", 
    "oldfieldtype": "Table", 
@@ -1003,6 +1046,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
@@ -1024,6 +1068,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1045,6 +1090,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_total", 
    "oldfieldtype": "Currency", 
@@ -1069,6 +1115,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1091,6 +1138,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1114,6 +1162,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1137,6 +1186,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1159,6 +1209,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1180,6 +1231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1202,6 +1254,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1225,6 +1278,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -1248,6 +1302,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
@@ -1273,6 +1328,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
@@ -1299,6 +1355,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
@@ -1322,6 +1379,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1345,6 +1403,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_export", 
    "oldfieldtype": "Currency", 
@@ -1370,6 +1429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total_export", 
    "oldfieldtype": "Currency", 
@@ -1395,6 +1455,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
@@ -1419,6 +1480,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Advance Paid", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1443,6 +1505,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packing List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-suitcase", 
@@ -1466,6 +1529,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packed Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "packing_details", 
    "oldfieldtype": "Table", 
@@ -1491,6 +1555,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
@@ -1514,6 +1579,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
@@ -1538,6 +1604,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
@@ -1562,6 +1629,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -1583,6 +1651,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1606,6 +1675,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -1629,6 +1699,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -1650,6 +1721,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1672,6 +1744,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -1694,6 +1767,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -1717,6 +1791,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -1741,6 +1816,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -1765,6 +1841,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -1789,6 +1866,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1811,6 +1889,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -1836,6 +1915,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
@@ -1860,6 +1940,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1882,6 +1963,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
@@ -1905,6 +1987,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1928,6 +2011,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
@@ -1952,6 +2036,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing and Delivery Status", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1976,6 +2061,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -2001,6 +2087,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable", 
    "permlevel": 0, 
@@ -2025,6 +2112,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "%  Delivered", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_delivered", 
    "oldfieldtype": "Currency", 
@@ -2048,6 +2136,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2071,6 +2160,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "% Amount Billed", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_billed", 
    "oldfieldtype": "Currency", 
@@ -2095,6 +2185,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Status", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Not Billed\nFully Billed\nPartly Billed\nClosed", 
    "permlevel": 0, 
@@ -2118,6 +2209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-group", 
@@ -2141,6 +2233,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_partner", 
    "oldfieldtype": "Link", 
@@ -2165,6 +2258,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2187,6 +2281,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "commission_rate", 
    "oldfieldtype": "Currency", 
@@ -2211,6 +2306,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_commission", 
    "oldfieldtype": "Currency", 
@@ -2236,6 +2332,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2257,6 +2354,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team1", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_team", 
    "oldfieldtype": "Table", 
@@ -2282,6 +2380,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-time", 
    "permlevel": 0, 
@@ -2306,6 +2405,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Recurring", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2329,6 +2429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", 
    "permlevel": 0, 
@@ -2353,6 +2454,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2376,6 +2478,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2399,6 +2502,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Repeat on Day of Month", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2422,6 +2526,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2443,6 +2548,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2466,6 +2572,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next Date", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2488,6 +2595,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Id", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2511,6 +2619,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Notification Email Address", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2533,6 +2642,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recurring Print Format", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Format", 
    "permlevel": 0, 
@@ -2555,7 +2665,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-22 16:32:34.339835", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.599677", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 

diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2f4884b..7712f5e 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py

@@ -66,12 +66,6 @@
 		for d in self.get('items'):
 			check_list.append(cstr(d.item_code))
 
-			if (frappe.db.get_value("Item", d.item_code, "is_stock_item")==1 or
-				(self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))) \
-				and not d.warehouse and not cint(d.delivered_by_supplier):
-				frappe.throw(_("Delivery warehouse required for stock item {0}").format(d.item_code),
-					WarehouseRequired)
-
 			# used for production plan
 			d.transaction_date = self.transaction_date
 
@@ -116,14 +110,15 @@
 				frappe.throw(_("Customer {0} does not belong to project {1}").format(self.customer, self.project_name))
 
 	def validate_warehouse(self):
-		from erpnext.stock.utils import validate_warehouse_company
-
-		warehouses = list(set([d.warehouse for d in
-			self.get("items") if d.warehouse]))
-
-		for w in warehouses:
-			validate_warehouse_company(w, self.company)
-
+		super(SalesOrder, self).validate_warehouse()
+		
+		for d in self.get("items"):
+			if (frappe.db.get_value("Item", d.item_code, "is_stock_item")==1 or
+				(self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))) \
+				and not d.warehouse and not cint(d.delivered_by_supplier):
+				frappe.throw(_("Delivery warehouse required for stock item {0}").format(d.item_code),
+					WarehouseRequired)
+			
 	def validate_with_previous_doc(self):
 		super(SalesOrder, self).validate_with_previous_doc({
 			"Quotation": {
@@ -236,13 +231,13 @@
 					item_wh_list.append([item_code, warehouse])
 
 		for d in self.get("items"):
-			if (not so_item_rows or d.name in so_item_rows):
-				_valid_for_reserve(d.item_code, d.warehouse)
-
+			if (not so_item_rows or d.name in so_item_rows) and not d.delivered_by_supplier:
 				if self.has_product_bundle(d.item_code):
 					for p in self.get("packed_items"):
 						if p.parent_detail_docname == d.name and p.parent_item == d.item_code:
 							_valid_for_reserve(p.item_code, p.warehouse)
+				else:
+					_valid_for_reserve(d.item_code, d.warehouse)
 
 		for item_code, warehouse in item_wh_list:
 			update_bin_qty(item_code, warehouse, {
@@ -270,27 +265,29 @@
 		if exc_list:
 			frappe.throw('\n'.join(exc_list))
 
-	def update_delivery_status(self, po_name):
+	def update_delivery_status(self):
 		"""Update delivery status from Purchase Order for drop shipping"""
 		tot_qty, delivered_qty = 0.0, 0.0
 
 		for item in self.items:
 			if item.delivered_by_supplier:
-				item_delivered_qty  = frappe.db.sql("""select qty
+				item_delivered_qty  = frappe.db.sql("""select sum(qty)
 					from `tabPurchase Order Item` poi, `tabPurchase Order` po
-					where poi.prevdoc_docname = %s
+					where poi.prevdoc_detail_docname = %s
 						and poi.prevdoc_doctype = 'Sales Order'
 						and poi.item_code = %s
 						and poi.parent = po.name
-						and po.status = 'Delivered'""", (self.name, item.item_code))
+						and po.docstatus = 1
+						and po.status = 'Delivered'""", (item.name, item.item_code))
 
 				item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0
-				item.db_set("delivered_qty", item_delivered_qty)
+				item.db_set("delivered_qty", flt(item_delivered_qty), update_modified=False)
 
 			delivered_qty += item.delivered_qty
 			tot_qty += item.qty
-
-		frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100)
+			
+		frappe.db.set_value("Sales Order", self.name, "per_delivered", flt(delivered_qty/tot_qty) * 100, 
+		update_modified=False)
 
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
@@ -389,7 +386,7 @@
 				"parent": "against_sales_order",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.delivered_qty < doc.qty and doc.delivered_by_supplier!=1
+			"condition": lambda doc: abs(doc.delivered_qty) < abs(doc.qty) and doc.delivered_by_supplier!=1
 		},
 		"Sales Taxes and Charges": {
 			"doctype": "Sales Taxes and Charges",
@@ -435,7 +432,7 @@
 				"parent": "sales_order",
 			},
 			"postprocess": update_item,
-			"condition": lambda doc: doc.qty and (doc.base_amount==0 or doc.billed_amt < doc.amount)
+			"condition": lambda doc: doc.qty and (doc.base_amount==0 or abs(doc.billed_amt) < abs(doc.amount))
 		},
 		"Sales Taxes and Charges": {
 			"doctype": "Sales Taxes and Charges",
@@ -536,8 +533,14 @@
 		default_price_list = frappe.get_value("Supplier", for_supplier, "default_price_list")
 		if default_price_list:
 			target.buying_price_list = default_price_list
+			
+		if source.shipping_address_name:
+			target.customer_address = source.shipping_address_name
+			target.customer_address_display = source.shipping_address
+		else:
+			target.customer_address = source.customer_address
+			target.customer_address_display = source.address_display
 
-		target.delivered_by_supplier = 1
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
@@ -549,9 +552,7 @@
 		"Sales Order": {
 			"doctype": "Purchase Order",
 			"field_map": {
-				"customer_address": "customer_address",
 				"contact_person": "customer_contact_person",
-				"address_display": "customer_address_display",
 				"contact_display": "customer_contact_display",
 				"contact_mobile": "customer_contact_mobile",
 				"contact_email": "customer_contact_email",
@@ -607,7 +608,7 @@
 			name, supplier_name
 		limit %(start)s, %(page_len)s """.format(**{
 			'field': fields,
-			'key': searchfield
+			'key': frappe.db.escape(searchfield)
 		}), {
 			'txt': "%%%s%%" % txt,
 			'_txt': txt.replace("%", ""),

diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 61ee110..3501f52 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py

@@ -355,10 +355,13 @@
 		self.assertEquals(dn.items[0].item_code, dn_item.item_code)
 
 		#test ordered_qty and reserved_qty
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
-			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
+		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
+			fields=["ordered_qty", "reserved_qty"])
 
-		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty + so_items[0]['qty'])
+		ordered_qty = bin[0].ordered_qty if bin else 0.0
+		reserved_qty = bin[0].reserved_qty if bin else 0.0
+
+		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
 
 		reserved_qty = frappe.db.get_value("Bin",
@@ -384,8 +387,11 @@
 		so.db_set('status', "Closed")
 		so.update_reserved_qty()
 
-		ordered_qty, reserved_qty = frappe.db.get_value("Bin",
-			{"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"}, ["ordered_qty", "reserved_qty"])
+		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
+			fields=["ordered_qty", "reserved_qty"])
+
+		ordered_qty = bin[0].ordered_qty if bin else 0.0
+		reserved_qty = bin[0].reserved_qty if bin else 0.0
 
 		self.assertEquals(abs(flt(ordered_qty)), existing_ordered_qty)
 		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
@@ -393,7 +399,7 @@
 		reserved_qty = frappe.db.get_value("Bin",
 			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
 
-		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty)
+		self.assertEquals(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
 
 	def test_reserved_qty_for_closing_so(self):
 		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 7f4e400..693863c 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json

@@ -1,1200 +1,1251 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "creation": "2013-03-07 11:42:58",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "creation": "2013-03-07 11:42:58", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Item Code",
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "150px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "150px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "customer_item_code",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Customer's Item Code",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "customer_item_code", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer's Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Item Name",
-   "no_copy": 0,
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "150",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "150", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "150"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Description",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Description",
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "300px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_7",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Image",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Image View",
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Quantity and Rate",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Quantity",
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "100px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Price List Rate",
-   "no_copy": 0,
-   "oldfieldname": "ref_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "70px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Price List Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "70px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "70px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "price_list_rate",
-   "fieldname": "discount_percentage",
-   "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Discount on Price List Rate (%)",
-   "no_copy": 0,
-   "oldfieldname": "adj_rate",
-   "oldfieldtype": "Float",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "70px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "price_list_rate", 
+   "fieldname": "discount_percentage", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "adj_rate", 
+   "oldfieldtype": "Float", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "70px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "70px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "UOM",
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Data",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "70px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "70px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "70px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_price_list_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Price List Rate (Company Currency)",
-   "no_copy": 0,
-   "oldfieldname": "base_ref_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "base_ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "section_break_simple1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_simple1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Rate",
-   "no_copy": 0,
-   "oldfieldname": "export_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "100px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "export_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Amount",
-   "no_copy": 0,
-   "oldfieldname": "export_amount",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "export_amount", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Basic Rate (Company Currency)",
-   "no_copy": 0,
-   "oldfieldname": "basic_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Basic Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "basic_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Amount (Company Currency)",
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "pricing_rule",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Pricing Rule",
-   "no_copy": 0,
-   "options": "Pricing Rule",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "pricing_rule", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Pricing Rule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Pricing Rule", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "section_break_24",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_24", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Rate",
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Amount",
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break_27",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_27", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_net_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Rate (Company Currency)",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_net_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Rate (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "base_net_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Net Amount (Company Currency)",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "base_net_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Net Amount (Company Currency)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier",
-   "fieldname": "drop_ship_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Drop Ship",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "eval:doc.delivered_by_supplier==1||doc.supplier", 
+   "fieldname": "drop_ship_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Drop Ship", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "delivered_by_supplier",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier delivers to Customer",
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivered_by_supplier", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier delivers to Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier",
-   "no_copy": 0,
-   "options": "Supplier",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "warehouse_and_reference",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Warehouse and Reference",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "warehouse_and_reference", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Warehouse and Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "eval:doc.delivered_by_supplier!=1",
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Delivery Warehouse",
-   "no_copy": 0,
-   "oldfieldname": "reserved_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "150px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.delivered_by_supplier!=1", 
+   "fieldname": "warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Delivery Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "reserved_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "150px", 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "150px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "eval:doc.delivered_by_supplier!=1",
-   "fieldname": "target_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Target Warehouse",
-   "no_copy": 0,
-   "options": "Warehouse",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "eval:doc.delivered_by_supplier!=1", 
+   "fieldname": "target_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "prevdoc_docname",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Quotation",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_docname",
-   "oldfieldtype": "Link",
-   "options": "Quotation",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "prevdoc_docname", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Quotation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "prevdoc_docname", 
+   "oldfieldtype": "Link", 
+   "options": "Quotation", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "brand",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Brand Name",
-   "no_copy": 0,
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "brand", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Brand Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "brand", 
+   "oldfieldtype": "Link", 
+   "options": "Brand", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "",
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 1,
-   "in_list_view": 0,
-   "label": "Item Group",
-   "no_copy": 0,
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "", 
+   "fieldname": "item_group", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 1, 
+   "in_list_view": 0, 
+   "label": "Item Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_group", 
+   "oldfieldtype": "Link", 
+   "options": "Item Group", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "page_break",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Page Break",
-   "no_copy": 0,
-   "oldfieldname": "page_break",
-   "oldfieldtype": "Check",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 0,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "page_break", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Page Break", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "page_break", 
+   "oldfieldtype": "Check", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "projected_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Projected Qty",
-   "no_copy": 1,
-   "oldfieldname": "projected_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "70px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "projected_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Projected Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "projected_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "70px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "70px"
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "actual_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Actual Qty",
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "70px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Actual Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "70px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "70px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "ordered_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Ordered Qty",
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "ordered_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Ordered Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "delivered_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Delivered Qty",
-   "no_copy": 1,
-   "oldfieldname": "delivered_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "delivered_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Delivered Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "delivered_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "100px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "returned_qty",
-   "fieldname": "returned_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Returned Qty",
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "returned_qty", 
+   "fieldname": "returned_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Returned Qty", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "billed_amt",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Billed Amt",
-   "no_copy": 1,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "billed_amt", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Billed Amt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "For Production",
-   "fieldname": "planned_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Planned Quantity",
-   "no_copy": 1,
-   "oldfieldname": "planned_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "50px",
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "For Production", 
+   "fieldname": "planned_qty", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Planned Quantity", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "planned_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "50px", 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "For Production",
-   "fieldname": "produced_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Produced Quantity",
-   "no_copy": 0,
-   "oldfieldname": "produced_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_width": "50px",
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "For Production", 
+   "fieldname": "produced_qty", 
+   "fieldtype": "Float", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Produced Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "produced_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_width": "50px", 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "item_tax_rate",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Item Tax Rate",
-   "no_copy": 0,
-   "oldfieldname": "item_tax_rate",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_tax_rate", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Item Tax Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_tax_rate", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "Used for Production Plan",
-   "fieldname": "transaction_date",
-   "fieldtype": "Date",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Sales Order Date",
-   "no_copy": 0,
-   "oldfieldname": "transaction_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Used for Production Plan", 
+   "fieldname": "transaction_date", 
+   "fieldtype": "Date", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Order Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "transaction_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "modified": "2015-11-04 11:29:57.645383",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Sales Order Item",
- "owner": "Administrator",
- "permissions": [],
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:56.933782", 
+ "modified_by": "Administrator", 
+ "module": "Selling", 
+ "name": "Sales Order Item", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}
\ No newline at end of file

diff --git a/erpnext/selling/doctype/sales_team/sales_team.json b/erpnext/selling/doctype/sales_team/sales_team.json
index b2e3719..d15ce08 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.json
+++ b/erpnext/selling/doctype/sales_team/sales_team.json

@@ -18,6 +18,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_person", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contact No.", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "contact_no", 
    "oldfieldtype": "Data", 
@@ -68,6 +70,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contribution (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "allocated_percentage", 
    "oldfieldtype": "Currency", 
@@ -114,6 +118,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Contribution to Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "allocated_amount", 
    "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Incentives", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "incentives", 
    "oldfieldtype": "Currency", 
@@ -164,6 +170,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Parenttype", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parenttype", 
    "oldfieldtype": "Data", 
@@ -185,7 +192,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:12.258972", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.395852", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Team", 

diff --git a/erpnext/selling/page/sales_browser/sales_browser.py b/erpnext/selling/page/sales_browser/sales_browser.py
index cfb283e..018ba3b 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.py
+++ b/erpnext/selling/page/sales_browser/sales_browser.py

@@ -8,16 +8,16 @@
 @frappe.whitelist()
 def get_children():
 	ctype = frappe.local.form_dict.get('ctype')
-	frappe.local.form_dict['parent_field'] = 'parent_' + ctype.lower().replace(' ', '_')
-	if not frappe.form_dict.get('parent'):
-		frappe.local.form_dict['parent'] = ''
+	parent_field = 'parent_' + ctype.lower().replace(' ', '_')
+	parent = frappe.form_dict.get("parent") or ""
 
 	return frappe.db.sql("""select name as value,
 		if(is_group='Yes', 1, 0) as expandable
-		from `tab%(ctype)s`
+		from `tab{ctype}`
 		where docstatus < 2
-		and ifnull(%(parent_field)s,'') = "%(parent)s"
-		order by name""" % frappe.local.form_dict, as_dict=1)
+		and ifnull(`{parent_field}`,'') = %s
+		order by name""".format(ctype=frappe.db.escape(ctype), parent_field=frappe.db.escape(parent_field)),
+		parent, as_dict=1)
 
 @frappe.whitelist()
 def add_node():

diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.js b/erpnext/setup/doctype/authorization_rule/authorization_rule.js
index 336e709..6b606e1 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.js
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.js

@@ -1,20 +1,59 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
+frappe.ui.form.on("Authorization Rule", {
+	refresh: function(frm) {
+		frm.events.set_master_type(frm);
+	},
+	set_master_type: function(frm) {
+		if(frm.doc.based_on==="Customerwise Discount") {
+			unhide_field("master_name");
+			frm.set_value("customer_or_item", "Customer");
+		} else if(frm.doc.based_on==="Itemwise Discount") {
+			unhide_field("master_name");
+			frm.set_value("customer_or_item", "Item");
+		} else {
+			frm.set_value("customer_or_item", "");
+			frm.set_value("master_name", "");
+			hide_field("master_name");
+		}
+	},
+	based_on: function(frm) {
+		frm.events.set_master_type(frm);
+		if (frm.doc.based_on === 'Not Applicable') {
+			frm.set_value("value", 0);
+			hide_field('value');
+		} else {
+			unhide_field('value');
+		}
+	},
+	transaction: function(frm) {
+		if (frm.doc.transaction == 'Appraisal') {
+			frm.set_value("based_on", "Not Applicable");
+			frm.set_value("master_name", "");
+			frm.set_value("system_role", "");
+			frm.set_value("system_user", "");
+			frm.set_value("value", 0);
+			hide_field(['based_on', 'system_role', 'system_user', 'value']);
+			unhide_field(['to_emp','to_designation']);
+		}
+		else {
+			unhide_field(['system_role', 'system_user','value', 'based_on']);
+			hide_field(['to_emp','to_designation']);
+		}
+	}
+})
+
+
 // Settings Module
 cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-	if (doc.based_on == 'Grand Total' || doc.based_on == 'Average Discount' || doc.based_on == 'Not Applicable')
-		hide_field('master_name');
-	else
-		unhide_field('master_name');
-
 	if (doc.based_on == 'Not Applicable')
 		hide_field('value');
 	else
 		unhide_field('value');
 
 	if (doc.transaction == 'Appraisal') {
-		hide_field(['master_name','system_role', 'system_user']);
+		hide_field(['system_role', 'system_user']);
 		unhide_field(['to_emp','to_designation']);
 
 		if (doc.transaction == 'Appraisal')
@@ -23,47 +62,11 @@
 			unhide_field('value');
 	}
 	else {
-		unhide_field(['master_name','system_role', 'system_user','value']);
+		unhide_field(['system_role', 'system_user','value']);
 		hide_field(['to_emp','to_designation']);
 	}
 }
 
-cur_frm.cscript.based_on = function(doc) {
-	if (doc.based_on == 'Grand Total' || doc.based_on == 'Average Discount' || doc.based_on == 'Not Applicable') {
-		doc.master_name = '';
-		refresh_field('master_name');
-		hide_field('master_name');
-	}
-	else
-		unhide_field('master_name');
-
-	if (doc.based_on == 'Not Applicable') {
-		doc.value =0;
-		refresh_field('value');
-		hide_field('value');
-	}
-	else
-		unhide_field('value');
-}
-
-cur_frm.cscript.transaction = function(doc, cdt, cdn){
-	if (doc.transaction == 'Appraisal') {
-		doc.based_on == 'Not Applicable';
-		doc.master_name = doc.system_role = doc.system_user = '';
-		refresh_many(['master_name','system_role', 'system_user', 'based_on']);
-		hide_field(['master_name','system_role', 'system_user']);
-		unhide_field(['to_emp','to_designation']);
-		doc.value = 0;
-		refresh_many('value');
-		hide_field('value');
-	}
-	else {
-		unhide_field(['master_name','system_role', 'system_user','value']);
-		hide_field(['to_emp','to_designation']);
-	}
-
-}
-
 cur_frm.fields_dict.system_user.get_query = function(doc, cdt, cdn) {
 	return { query:"frappe.core.doctype.user.user.user_query" }
 }

diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index f6a74ef..9b08398 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json

@@ -13,41 +13,18 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Company", 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "transaction", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Transaction",  
+   "label": "Transaction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction", 
    "oldfieldtype": "Select", 
-   "options": "\nDelivery Note\nPurchase Invoice\nPurchase Order\nPurchase Receipt\nQuotation\nSales Invoice\nSales Order\nAppraisal", 
+   "options": "\nSales Order\nPurchase Order\nQuotation\nDelivery Note\nSales Invoice\nPurchase Invoice\nPurchase Receipt\nAppraisal", 
    "permlevel": 0, 
    "print_hide": 0, 
    "read_only": 0, 
@@ -67,7 +44,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Based On",  
+   "label": "Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "based_on", 
    "oldfieldtype": "Select", 
@@ -85,17 +63,42 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "customer_or_item", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer or Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Customer\nItem", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "master_name", 
-   "fieldtype": "Link", 
+   "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer / Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "master_name", 
    "oldfieldtype": "Link", 
-   "options": "[Select]", 
+   "options": "customer_or_item", 
    "permlevel": 0, 
    "print_hide": 0, 
    "read_only": 0, 
@@ -109,6 +112,121 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "value", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Authorized Value", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "value", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "section_break_7", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "system_role", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -116,6 +234,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Applicable To (Role)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "system_role", 
    "oldfieldtype": "Link", 
@@ -133,6 +252,54 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "description": "", 
+   "fieldname": "to_emp", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Applicable To (Employee)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "to_emp", 
+   "oldfieldtype": "Link", 
+   "options": "Employee", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "system_user", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -140,6 +307,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Applicable To (User)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "system_user", 
    "oldfieldtype": "Link", 
@@ -157,18 +325,19 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "This will be used for setting rule in HR module", 
-   "fieldname": "to_emp", 
+   "description": "", 
+   "fieldname": "to_designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Applicable To (Employee)", 
+   "label": "Applicable To (Designation)", 
+   "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "to_emp", 
+   "oldfieldname": "to_designation", 
    "oldfieldtype": "Link", 
-   "options": "Employee", 
+   "options": "Designation", 
    "permlevel": 0, 
    "print_hide": 0, 
    "read_only": 0, 
@@ -182,19 +351,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "This will be used for setting rule in HR module", 
-   "fieldname": "to_designation", 
-   "fieldtype": "Link", 
+   "fieldname": "section_break_13", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Applicable To (Designation)", 
+   "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "to_designation", 
-   "oldfieldtype": "Link", 
-   "options": "Designation", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
@@ -213,7 +379,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Approving Role", 
+   "label": "Approving Role (above authorized value)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "approving_role", 
    "oldfieldtype": "Link", 
@@ -231,13 +398,36 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "fieldname": "column_break_15", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "fieldname": "approving_user", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Approving User", 
+   "label": "Approving User  (above authorized value)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "approving_user", 
    "oldfieldtype": "Link", 
@@ -250,29 +440,6 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "value", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Above Value", 
-   "no_copy": 0, 
-   "oldfieldname": "value", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -284,7 +451,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:38.997664", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.164233", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Authorization Rule", 

diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 117462e..e31dd9d 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -66,7 +68,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:40.649074", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.008609", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Brand", 

diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index bfa4bcc..4c9f53d 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company_name", 
    "oldfieldtype": "Data", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Abbr", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "abbr", 
    "oldfieldtype": "Data", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Change Abbreviation", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -111,6 +115,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -131,7 +136,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Domain",  
+   "label": "Domain", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Distribution\nManufacturing\nRetail\nServices", 
    "permlevel": 0, 
@@ -154,6 +160,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Values", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -175,6 +182,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
@@ -198,6 +206,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Holiday List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Holiday List", 
    "permlevel": 0, 
@@ -221,6 +230,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -242,6 +252,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -264,6 +275,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -286,6 +298,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Chart of Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -308,6 +321,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
@@ -331,6 +345,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -354,6 +369,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Bank Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "default_bank_account", 
    "oldfieldtype": "Link", 
@@ -379,6 +395,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Cash Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -402,6 +419,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Receivable Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "receivables_group", 
    "oldfieldtype": "Link", 
@@ -426,6 +444,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Round Off Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -448,6 +467,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -472,6 +492,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Payable Account", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "payables_group", 
    "oldfieldtype": "Link", 
@@ -497,6 +518,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Cost of Goods Sold Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -520,6 +542,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Income Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -542,6 +565,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Round Off Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -564,6 +588,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -587,6 +612,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -608,7 +634,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Credit Days Based On",  
+   "label": "Credit Days Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nFixed Days\nLast Day of the Next Month", 
    "permlevel": 0, 
@@ -633,6 +660,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit_days", 
    "oldfieldtype": "Int", 
@@ -657,6 +685,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "credit_limit", 
    "oldfieldtype": "Currency", 
@@ -680,6 +709,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -702,7 +732,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "If Yearly Budget Exceeded (for expense account)",  
+   "label": "If Yearly Budget Exceeded (for expense account)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "yearly_bgt_flag", 
    "oldfieldtype": "Select", 
@@ -727,7 +758,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "If Monthly Budget Exceeded (for expense account)",  
+   "label": "If Monthly Budget Exceeded (for expense account)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "monthly_bgt_flag", 
    "oldfieldtype": "Select", 
@@ -753,6 +785,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -774,6 +807,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Received But Not Billed", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -796,6 +830,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Adjustment Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -817,6 +852,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -839,6 +875,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expenses Included In Valuation", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -862,6 +899,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company Info", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -883,6 +921,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "address", 
    "oldfieldtype": "Small Text", 
@@ -905,6 +944,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -928,6 +968,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Phone No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "phone_no", 
    "oldfieldtype": "Data", 
@@ -952,6 +993,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Fax", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fax", 
    "oldfieldtype": "Data", 
@@ -976,6 +1018,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "email", 
    "oldfieldtype": "Data", 
@@ -1000,6 +1043,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "website", 
    "oldfieldtype": "Data", 
@@ -1024,6 +1068,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -1048,6 +1093,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Registration Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "registration_details", 
    "oldfieldtype": "Code", 
@@ -1071,6 +1117,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delete Company Transactions", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1092,7 +1139,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-13 09:15:29.028637", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.539356", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 

diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index f96eea7..ca0be3e 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
@@ -85,7 +88,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:42.981242", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:44.028262", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Currency Exchange", 

diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 6af2941..34d13bd 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Customer Group Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer_group_name", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_customer_group", 
    "oldfieldtype": "Link", 
@@ -68,7 +70,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node",  
+   "label": "Has Child Node", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
@@ -92,6 +95,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -113,6 +117,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
@@ -134,7 +139,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Credit Days Based On",  
+   "label": "Credit Days Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nFixed Days\nLast Day of the Next Month", 
    "permlevel": 0, 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 1, 
    "print_hide": 0, 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Limit", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 1, 
    "print_hide": 0, 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "lft", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lft", 
    "oldfieldtype": "Int", 
@@ -224,6 +233,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "rgt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rgt", 
    "oldfieldtype": "Int", 
@@ -248,6 +258,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
    "oldfieldtype": "Data", 
@@ -272,6 +283,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Receivable Account", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -295,6 +307,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Party Account", 
    "permlevel": 0, 
@@ -316,7 +329,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:43.817644", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:44.374615", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 

diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index ceec47a8..21371f1 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json

@@ -21,9 +21,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Digest Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,9 +43,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -62,9 +66,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Enabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -83,10 +89,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "For Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -104,11 +112,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "How frequently?",  
+   "label": "How frequently?", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Daily\nWeekly\nMonthly", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -128,9 +138,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Next email will be sent on:", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -148,9 +160,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -170,9 +184,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recipients", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -191,9 +207,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Add/Remove Recipients", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -212,9 +230,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -233,9 +253,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Income / Expense", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -255,9 +277,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Income", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -277,9 +301,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -299,9 +325,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bank Balance", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -320,9 +348,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Annual Income", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -341,10 +371,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Annual Expense", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -364,9 +396,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Receivables / Payables", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -386,9 +420,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Receivables", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -408,9 +444,59 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Payables", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "other", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Other", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "add_quote", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Add Quote", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -428,7 +514,9 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-12 07:38:48.323418", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-27 01:48:34.725037", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Email Digest", 

diff --git a/erpnext/setup/doctype/email_digest/quotes.py b/erpnext/setup/doctype/email_digest/quotes.py
index d56117a..4b996d9 100644
--- a/erpnext/setup/doctype/email_digest/quotes.py
+++ b/erpnext/setup/doctype/email_digest/quotes.py

@@ -27,6 +27,7 @@
 		("There is more to life than increasing its speed.", "Mahatma Gandhi"),
 		("A small body of determined spirits fired by an unquenchable faith in their mission can alter the course of history.", "Mahatma Gandhi"),
 		("If two wrongs don't make a right, try three.", "Laurence J. Peter"),
+		("Inspiration exists, but it has to find you working.", "Pablo Picasso"),
 	]
 
 	return random.choice(quotes)

diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index bd88baf..44c0490 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html

@@ -115,10 +115,11 @@
 
 {% endif %}
 
+{% if add_quote %}
 <div style="text-align: center; margin: 50px; line-height: 1.5">
     {{ quote.text }}<br><i>- {{ quote.author }}</i>
-    <br><br><br>
-    <span style="color: {{ text_muted }}; font-size: 12px;">Have an intersting thought, quote to share? Email it at hello@erpnext.com</span>
+    <br>
 </div>
+{% endif %}
 
 </div>

diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index d0677e0..a1ccee2 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "General Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group_name", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_item_group", 
    "oldfieldtype": "Link", 
@@ -90,7 +93,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node",  
+   "label": "Has Child Node", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
@@ -114,6 +118,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Income Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Expense Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -179,6 +186,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -223,6 +232,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Show in Website", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -245,6 +255,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -267,6 +278,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Website Route", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -291,6 +303,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Slideshow", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Website Slideshow", 
    "permlevel": 0, 
@@ -315,6 +328,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -337,6 +351,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Specifications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Website Specification", 
    "permlevel": 0, 
@@ -359,6 +374,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lft", 
    "oldfieldtype": "Int", 
@@ -382,6 +398,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rgt", 
    "oldfieldtype": "Int", 
@@ -406,6 +423,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
    "oldfieldtype": "Data", 
@@ -430,7 +448,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2015-10-02 07:38:53.048954", 
+ "modified": "2015-11-16 06:29:48.316308", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 

diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 9a4497b..ed7da9c 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py

@@ -111,7 +111,7 @@
 	item_group = frappe.get_doc("Item Group", item_group_name)
 	return frappe.db.sql("""select name, page_name from `tabItem Group`
 		where lft <= %s and rgt >= %s
-		and ifnull(show_in_website,0)=1
+		and show_in_website=1
 		order by lft asc""", (item_group.lft, item_group.rgt), as_dict=True)
 
 def invalidate_cache_for(doc, item_group=None):

diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index af88721..d9c01a1 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json

@@ -20,6 +20,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "print_heading", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -66,7 +68,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:01.094104", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:52.194195", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Print Heading", 

diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index c1df93d..eb7f044 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quotation Lost Reason", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "order_lost_reason", 
    "oldfieldtype": "Data", 
@@ -42,7 +43,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:07.868834", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:55.325868", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Quotation Lost Reason", 

diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index ec1cbd2..d6a49c5 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json

@@ -1,640 +1,664 @@
 {
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:partner_name", 
- "creation": "2013-04-12 15:34:06", 
- "custom": 0, 
- "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:partner_name",
+ "creation": "2013-04-12 15:34:06",
+ "custom": 0,
+ "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "partner_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "label": "Sales Partner Name", 
-   "no_copy": 0, 
-   "oldfieldname": "partner_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "partner_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 0,
+   "label": "Sales Partner Name",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "partner_name",
+   "oldfieldtype": "Data",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "partner_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "label": "Partner Type", 
-   "no_copy": 0, 
-   "oldfieldname": "partner_type", 
-   "oldfieldtype": "Select", 
-   "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "partner_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Partner Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "partner_type",
+   "oldfieldtype": "Select",
+   "options": "\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Territory", 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 1,
+   "label": "Territory",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Territory",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Column Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "unique": 0,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "commission_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Commission Rate", 
-   "no_copy": 0, 
-   "oldfieldname": "commission_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "commission_rate",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Commission Rate",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "commission_rate",
+   "oldfieldtype": "Currency",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_contacts", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address & Contacts", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "address_contacts",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address & Contacts",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.__islocal", 
-   "fieldname": "address_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address Desc", 
-   "no_copy": 0, 
-   "options": "<em>Addresses will appear only when you save the customer</em>", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.__islocal",
+   "fieldname": "address_desc",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address Desc",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "address_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Address HTML", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Address HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.__islocal", 
-   "fieldname": "contact_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact Desc", 
-   "no_copy": 0, 
-   "options": "<em>Contact Details will appear only when you save the customer</em>", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:doc.__islocal",
+   "fieldname": "contact_desc",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Contact Desc",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "contact_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Contact HTML", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Contact HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "partner_target_details_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Sales Partner Target", 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "partner_target_details_section_break",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Sales Partner Target",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "targets", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Targets", 
-   "no_copy": 0, 
-   "oldfieldname": "partner_target_details", 
-   "oldfieldtype": "Table", 
-   "options": "Target Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "targets",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Targets",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "partner_target_details",
+   "oldfieldtype": "Table",
+   "options": "Target Detail",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Select Monthly Distribution to unevenly distribute targets across months.", 
-   "fieldname": "distribution_id", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Target Distribution", 
-   "no_copy": 0, 
-   "oldfieldname": "distribution_id", 
-   "oldfieldtype": "Link", 
-   "options": "Monthly Distribution", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "description": "Select Monthly Distribution to unevenly distribute targets across months.",
+   "fieldname": "distribution_id",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Target Distribution",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "distribution_id",
+   "oldfieldtype": "Link",
+   "options": "Monthly Distribution",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "website", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Website", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "website",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Website",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "show_in_website", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Show In Website", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "show_in_website",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Show In Website",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:cint(doc.show_in_website)", 
-   "fieldname": "section_break_17", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:cint(doc.show_in_website)",
+   "fieldname": "section_break_17",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "logo", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Logo", 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "logo",
+   "fieldtype": "Attach",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Logo",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "partner_website", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Partner's Website", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "partner_website",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Partner's Website",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_20", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "column_break_20",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "page_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Page Name", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "page_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Page Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 1,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:cint(doc.show_in_website)", 
-   "fieldname": "section_break_22", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "depends_on": "eval:cint(doc.show_in_website)",
+   "fieldname": "section_break_22",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "introduction", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Introduction", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "introduction",
+   "fieldtype": "Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Introduction",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "partners", 
-   "fieldname": "parent_website_route", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Parent Website Route", 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "default": "partners",
+   "fieldname": "parent_website_route",
+   "fieldtype": "Read Only",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "in_filter": 0,
+   "in_list_view": 0,
+   "label": "Parent Website Route",
+   "length": 0,
+   "no_copy": 0,
+   "options": "",
+   "permlevel": 0,
+   "print_hide": 0,
+   "read_only": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
    "unique": 0
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-user", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "modified": "2015-10-19 03:04:48.999751", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Sales Partner", 
- "owner": "Administrator", 
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-user",
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2015-11-16 06:29:57.096980",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Sales Partner",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "apply_user_permissions": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Master Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "read_only": 0, 
+ ],
+ "read_only": 0,
  "read_only_onload": 0
-}
\ No newline at end of file
+}

diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 5b8e82e..adb4c67 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Name and Employee ID", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Person Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_person_name", 
    "oldfieldtype": "Data", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Sales Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_sales_person", 
    "oldfieldtype": "Link", 
@@ -90,7 +93,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node",  
+   "label": "Has Child Node", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
@@ -114,6 +118,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Employee", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Employee", 
    "permlevel": 0, 
@@ -157,6 +163,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lft", 
    "oldfieldtype": "Int", 
@@ -180,6 +187,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rgt", 
    "oldfieldtype": "Int", 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
    "oldfieldtype": "Data", 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Person Targets", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-bullseye", 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Targets", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "target_details", 
    "oldfieldtype": "Table", 
@@ -275,6 +286,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Distribution", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "distribution_id", 
    "oldfieldtype": "Link", 
@@ -299,6 +311,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Communications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Communication", 
    "permlevel": 0, 
@@ -320,7 +333,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:11.827879", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.194163", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 

diff --git a/erpnext/setup/doctype/sms_parameter/sms_parameter.json b/erpnext/setup/doctype/sms_parameter/sms_parameter.json
index bc948c7..2ccdf9a 100755
--- a/erpnext/setup/doctype/sms_parameter/sms_parameter.json
+++ b/erpnext/setup/doctype/sms_parameter/sms_parameter.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Value", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,7 +64,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:13.345489", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.845086", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "SMS Parameter", 

diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.py b/erpnext/setup/doctype/sms_settings/sms_settings.py
index 9099863..d0df33a 100644
--- a/erpnext/setup/doctype/sms_settings/sms_settings.py
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.py

@@ -42,7 +42,7 @@
 def get_contact_number(contact_name, value, key):
 	"returns mobile number of the contact"
 	number = frappe.db.sql("""select mobile_no, phone from tabContact where name=%s and %s=%s""" %
-		('%s', key, '%s'), (contact_name, value))
+		('%s', frappe.db.escape(key), '%s'), (contact_name, value))
 	return number and (number[0][0] or number[0][1]) or ''
 
 @frappe.whitelist()
@@ -94,7 +94,7 @@
 	headers = {}
 	headers['Accept'] = "text/plain, text/html, */*"
 	conn.request('GET', api_url + urllib.urlencode(args), headers = headers)    # send request
-	resp = conn.getresponse()     # get response		
+	resp = conn.getresponse()     # get response
 	return resp.status
 
 # Split gateway url to server and api url

diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index b04e9c7..c6849b7 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier_type", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Days", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 1, 
    "print_hide": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Payable Account", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Party Account", 
    "permlevel": 0, 
@@ -108,7 +112,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:15.811805", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.970888", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Supplier Type", 

diff --git a/erpnext/setup/doctype/target_detail/target_detail.json b/erpnext/setup/doctype/target_detail/target_detail.json
index db1bd79..0ad842d 100644
--- a/erpnext/setup/doctype/target_detail/target_detail.json
+++ b/erpnext/setup/doctype/target_detail/target_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -67,6 +69,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Target Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "target_qty", 
    "oldfieldtype": "Currency", 
@@ -90,6 +93,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Target  Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "target_amount", 
    "oldfieldtype": "Currency", 
@@ -111,7 +115,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:15.903411", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.015624", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Target Detail", 

diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index b126aa8..5fb635e 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json

@@ -21,6 +21,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "title", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
@@ -66,7 +68,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:16.489390", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.292943", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Terms and Conditions", 

diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index c5e4fff..4ce0fff 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Territory Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "territory_name", 
    "oldfieldtype": "Data", 
@@ -45,6 +46,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_territory", 
    "oldfieldtype": "Link", 
@@ -69,7 +71,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Has Child Node",  
+   "label": "Has Child Node", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_group", 
    "oldfieldtype": "Select", 
@@ -93,6 +96,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -115,6 +119,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Territory Manager", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "territory_manager", 
    "oldfieldtype": "Link", 
@@ -139,6 +144,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "lft", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lft", 
    "oldfieldtype": "Int", 
@@ -162,6 +168,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "rgt", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rgt", 
    "oldfieldtype": "Int", 
@@ -186,6 +193,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "old_parent", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "old_parent", 
    "oldfieldtype": "Data", 
@@ -211,6 +219,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Territory Targets", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -233,6 +242,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Targets", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "target_details", 
    "oldfieldtype": "Table", 
@@ -258,6 +268,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Target Distribution", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "distribution_id", 
    "oldfieldtype": "Link", 
@@ -281,7 +292,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:16.582674", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.337250", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 

diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index b879fc6..d3255d2 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom_name", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Must be Whole Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -64,7 +66,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:17.551613", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.741239", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "UOM", 

diff --git a/erpnext/setup/doctype/website_item_group/website_item_group.json b/erpnext/setup/doctype/website_item_group/website_item_group.json
index 132c351..b0af70c 100644
--- a/erpnext/setup/doctype/website_item_group/website_item_group.json
+++ b/erpnext/setup/doctype/website_item_group/website_item_group.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Group", 
    "permlevel": 0, 
@@ -41,7 +42,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:19.409021", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:30:00.586322", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Website Item Group", 

diff --git a/erpnext/setup/fixtures/web_form/addresses.json b/erpnext/setup/fixtures/web_form/addresses.json
index 8051c72..932337e 100644
--- a/erpnext/setup/fixtures/web_form/addresses.json
+++ b/erpnext/setup/fixtures/web_form/addresses.json

@@ -1,167 +1,168 @@
 [
  {
-  "allow_comments": 0, 
-  "allow_delete": 0, 
-  "allow_edit": 1, 
-  "allow_multiple": 1, 
-  "breadcrumbs": null, 
-  "doc_type": "Address", 
-  "docstatus": 0, 
-  "doctype": "Web Form", 
-  "introduction_text": null, 
-  "login_required": 1, 
-  "modified": "2015-06-01 06:53:43.699336", 
-  "name": "addresses", 
-  "page_name": "addresses", 
-  "published": 1, 
-  "success_message": null, 
-  "success_url": "/addresses", 
-  "title": "Addresses", 
+  "allow_comments": 0,
+  "allow_delete": 0,
+  "allow_edit": 1,
+  "allow_multiple": 1,
+  "breadcrumbs": null,
+  "doc_type": "Address",
+  "docstatus": 0,
+  "doctype": "Web Form",
+  "introduction_text": null,
+  "is_standard": 1,
+  "login_required": 1,
+  "modified": "2015-11-23 08:21:53.924318",
+  "name": "addresses",
+  "page_name": "addresses",
+  "published": 1,
+  "success_message": null,
+  "success_url": "/addresses",
+  "title": "Addresses",
   "web_form_fields": [
    {
-    "default": null, 
-    "description": "", 
-    "fieldname": "address_title", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Address Title", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": "",
+    "fieldname": "address_title",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Address Title",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "address_type", 
-    "fieldtype": "Select", 
-    "hidden": 0, 
-    "label": "Address Type", 
-    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "address_type",
+    "fieldtype": "Select",
+    "hidden": 0,
+    "label": "Address Type",
+    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "address_line1", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Address Line 1", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "address_line1",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Address Line 1",
+    "options": null,
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "address_line2", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Address Line 2", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "address_line2",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Address Line 2",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "city", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "City/Town", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "city",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "City/Town",
+    "options": null,
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "state", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "State", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "state",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "State",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "pincode", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Pincode", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "pincode",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Postal Code",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "country", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Country", 
-    "options": "Country", 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "country",
+    "fieldtype": "Link",
+    "hidden": 0,
+    "label": "Country",
+    "options": "Country",
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": null, 
-    "fieldtype": "Column Break", 
-    "hidden": null, 
-    "label": null, 
-    "options": null, 
-    "read_only": null, 
-    "reqd": null
-   }, 
-   {
-    "default": null, 
-    "description": null, 
-    "fieldname": "email_id", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Email Id", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": null,
+    "fieldtype": "Column Break",
+    "hidden": 0,
+    "label": null,
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "phone", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Phone", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "email_id",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Email Id",
+    "options": null,
+    "read_only": 0,
+    "reqd": 0
+   },
+   {
+    "default": null,
+    "description": null,
+    "fieldname": "phone",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Phone",
+    "options": null,
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": "0", 
-    "description": "", 
-    "fieldname": "is_primary_address", 
-    "fieldtype": "Check", 
-    "hidden": 0, 
-    "label": "Preferred Billing Address", 
-    "options": null, 
-    "read_only": 0, 
+    "default": "0",
+    "description": "",
+    "fieldname": "is_primary_address",
+    "fieldtype": "Check",
+    "hidden": 0,
+    "label": "Preferred Billing Address",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": "0", 
-    "description": "", 
-    "fieldname": "is_shipping_address", 
-    "fieldtype": "Check", 
-    "hidden": 0, 
-    "label": "Preferred Shipping Address", 
-    "options": null, 
-    "read_only": 0, 
+    "default": "0",
+    "description": "",
+    "fieldname": "is_shipping_address",
+    "fieldtype": "Check",
+    "hidden": 0,
+    "label": "Preferred Shipping Address",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
    }
-  ], 
+  ],
   "web_page_link_text": null
  }
-]
\ No newline at end of file
+]

diff --git a/erpnext/setup/fixtures/web_form/issues.json b/erpnext/setup/fixtures/web_form/issues.json
index 84ff1c2..b452aff 100644
--- a/erpnext/setup/fixtures/web_form/issues.json
+++ b/erpnext/setup/fixtures/web_form/issues.json

@@ -1,68 +1,69 @@
 [
  {
-  "allow_comments": 1, 
-  "allow_delete": 1, 
-  "allow_edit": 1, 
-  "allow_multiple": 1, 
-  "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]", 
-  "doc_type": "Issue", 
-  "docstatus": 0, 
-  "doctype": "Web Form", 
-  "introduction_text": null, 
-  "login_required": 1, 
-  "modified": "2015-06-01 08:14:26.350792", 
-  "name": "issues", 
-  "page_name": "issues", 
-  "published": 1, 
-  "success_message": "", 
-  "success_url": "/issues", 
-  "title": "Issues", 
+  "allow_comments": 1,
+  "allow_delete": 1,
+  "allow_edit": 1,
+  "allow_multiple": 1,
+  "breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]",
+  "doc_type": "Issue",
+  "docstatus": 0,
+  "doctype": "Web Form",
+  "is_standard": 1,
+  "introduction_text": null,
+  "login_required": 1,
+  "modified": "2015-06-01 08:14:26.350792",
+  "name": "issues",
+  "page_name": "issues",
+  "published": 1,
+  "success_message": "",
+  "success_url": "/issues",
+  "title": "Issues",
   "web_form_fields": [
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "subject", 
-    "fieldtype": "Data", 
-    "hidden": 0, 
-    "label": "Subject", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "subject",
+    "fieldtype": "Data",
+    "hidden": 0,
+    "label": "Subject",
+    "options": null,
+    "read_only": 0,
     "reqd": 1
-   }, 
+   },
    {
-    "default": "Open", 
-    "description": null, 
-    "fieldname": "status", 
-    "fieldtype": "Select", 
-    "hidden": null, 
-    "label": "Status", 
-    "options": "Open\nReplied\nHold\nClosed", 
-    "read_only": 1, 
+    "default": "Open",
+    "description": null,
+    "fieldname": "status",
+    "fieldtype": "Select",
+    "hidden": null,
+    "label": "Status",
+    "options": "Open\nReplied\nHold\nClosed",
+    "read_only": 1,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "description", 
-    "fieldtype": "Text", 
-    "hidden": 0, 
-    "label": "Description", 
-    "options": null, 
-    "read_only": 0, 
+    "default": null,
+    "description": null,
+    "fieldname": "description",
+    "fieldtype": "Text",
+    "hidden": 0,
+    "label": "Description",
+    "options": null,
+    "read_only": 0,
     "reqd": 0
-   }, 
+   },
    {
-    "default": null, 
-    "description": null, 
-    "fieldname": "attachment", 
-    "fieldtype": "Attach", 
-    "hidden": null, 
-    "label": "Attachment", 
-    "options": null, 
-    "read_only": null, 
+    "default": null,
+    "description": null,
+    "fieldname": "attachment",
+    "fieldtype": "Attach",
+    "hidden": null,
+    "label": "Attachment",
+    "options": null,
+    "read_only": null,
     "reqd": null
    }
-  ], 
+  ],
   "web_page_link_text": null
  }
-]
\ No newline at end of file
+]

diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index a1bcc16..dcb6eb3 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py

@@ -11,9 +11,8 @@
 def after_install():
 	frappe.get_doc({'doctype': "Role", "role_name": "Analytics"}).insert()
 	set_single_defaults()
-	frappe.db.set_default('desktop:home_page', 'setup-wizard');
 	feature_setup()
-	from erpnext.setup.page.setup_wizard.setup_wizard import add_all_roles_to
+	from erpnext.setup.setup_wizard.setup_wizard import add_all_roles_to
 	add_all_roles_to("Administrator")
 	add_web_forms()
 	frappe.db.commit()

diff --git a/erpnext/setup/page/setup_wizard/default_website.py b/erpnext/setup/page/setup_wizard/default_website.py
deleted file mode 100644
index dbe3540..0000000
--- a/erpnext/setup/page/setup_wizard/default_website.py
+++ /dev/null

@@ -1,92 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe import _
-from frappe.utils import nowdate
-
-class website_maker(object):
-	def __init__(self, company, tagline, user):
-		self.company = company
-		self.tagline = tagline
-		self.user = user
-		self.make_web_page()
-		self.make_website_settings()
-		self.make_blog()
-
-	def make_web_page(self):
-		# home page
-		self.webpage = frappe.get_doc({
-			"doctype": "Web Page",
-			"title": self.company,
-			"published": 1,
-			"header": "<div class='hero text-center'><h1>{0}</h1>".format(self.tagline or "Headline")+\
-				'<p>'+_("This is an example website auto-generated from ERPNext")+"</p>"+\
-				'<p><a class="btn btn-primary" href="/login">Login</a></p></div>',
-			"description": self.company + ":" + (self.tagline or ""),
-			"css": frappe.get_template("setup/page/setup_wizard/data/sample_home_page.css").render(),
-			"main_section": frappe.get_template("setup/page/setup_wizard/data/sample_home_page.html").render({
-				"company": self.company, "tagline": (self.tagline or "")
-			})
-		}).insert()
-
-	def make_website_settings(self):
-		# update in home page in settings
-		website_settings = frappe.get_doc("Website Settings", "Website Settings")
-		website_settings.home_page = self.webpage.name
-		website_settings.brand_html = self.company
-		website_settings.copyright = self.company
-		website_settings.top_bar_items = []
-		website_settings.append("top_bar_items", {
-			"doctype": "Top Bar Item",
-			"label":"Contact",
-			"url": "/contact"
-		})
-		website_settings.append("top_bar_items", {
-			"doctype": "Top Bar Item",
-			"label":"Blog",
-			"url": "/blog"
-		})
-		website_settings.append("top_bar_items", {
-			"doctype": "Top Bar Item",
-			"label": _("Products"),
-			"url": "/products"
-		})
-		website_settings.save()
-
-	def make_blog(self):
-		blogger = frappe.new_doc("Blogger")
-		user = frappe.get_doc("User", self.user)
-		blogger.user = self.user
-		blogger.full_name = user.first_name + (" " + user.last_name if user.last_name else "")
-		blogger.short_name = user.first_name.lower()
-		blogger.avatar = user.user_image
-		blogger.insert()
-
-		blog_category = frappe.get_doc({
-			"doctype": "Blog Category",
-			"category_name": "general",
-			"published": 1,
-			"title": _("General")
-		}).insert()
-
-		frappe.get_doc({
-			"doctype": "Blog Post",
-			"title": "Welcome",
-			"published": 1,
-			"published_on": nowdate(),
-			"blogger": blogger.name,
-			"blog_category": blog_category.name,
-			"blog_intro": "My First Blog",
-			"content": frappe.get_template("setup/page/setup_wizard/data/sample_blog_post.html").render(),
-		}).insert()
-
-def test():
-	frappe.delete_doc("Web Page", "test-company")
-	frappe.delete_doc("Blog Post", "welcome")
-	frappe.delete_doc("Blogger", "administrator")
-	frappe.delete_doc("Blog Category", "general")
-	website_maker("Test Company", "Better Tools for Everyone", "Administrator")
-	frappe.db.commit()

diff --git a/erpnext/setup/page/setup_wizard/fixtures/operations.py b/erpnext/setup/page/setup_wizard/fixtures/operations.py
deleted file mode 100644
index cbb3071..0000000
--- a/erpnext/setup/page/setup_wizard/fixtures/operations.py
+++ /dev/null

@@ -1,167 +0,0 @@
-# source: http://en.wikipedia.org/wiki/List_of_manufacturing_processes"
-
-from __future__ import unicode_literals
-from frappe import _
-
-def get_operations():
-	return [
-		_("Centrifugal casting"),
-		_("Continuous casting"),
-		_("Die casting"),
-		_("Evaporative-pattern casting"),
-		_("Full-mold casting"),
-		_("Lost-foam casting"),
-		_("Investment casting"),
-		_("Countergravity casting"),
-		_("Permanent mold casting"),
-		_("Resin casting"),
-		_("Sand casting"),
-		_("Shell molding"),
-		_("Spray forming"),
-		_("Vacuum molding"),
-		_("Molding"),
-		_("Compaction plus sintering"),
-		_("Hot isostatic pressing"),
-		_("Metal injection molding"),
-		_("Injection molding"),
-		_("Compression molding"),
-		_("Blow molding"),
-		_("Dip molding"),
-		_("Rotational molding"),
-		_("Thermoforming"),
-		_("Laminating"),
-		_("Shrink fitting"),
-		_("Shrink wrapping"),
-		_("End tube forming"),
-		_("Tube beading"),
-		_("Forging"),
-		_("Rolling"),
-		_("Cold rolling"),
-		_("Hot rolling"),
-		_("Cryorolling"),
-		_("Cross-rolling"),
-		_("Pressing"),
-		_("Embossing"),
-		_("Stretch forming"),
-		_("Blanking"),
-		_("Drawing"),
-		_("Bulging"),
-		_("Necking"),
-		_("Nosing"),
-		_("Deep drawing"),
-		_("Bending"),
-		_("Hemming"),
-		_("Shearing"),
-		_("Piercing"),
-		_("Trimming"),
-		_("Shaving"),
-		_("Notching"),
-		_("Perforating"),
-		_("Nibbling"),
-		_("Lancing"),
-		_("Cutting"),
-		_("Stamping"),
-		_("Coining"),
-		_("Straight shearing"),
-		_("Slitting"),
-		_("Redrawing"),
-		_("Ironing"),
-		_("Flattening"),
-		_("Swaging"),
-		_("Spinning"),
-		_("Peening"),
-		_("Explosive forming"),
-		_("Electroforming"),
-		_("Staking"),
-		_("Seaming"),
-		_("Flanging"),
-		_("Straightening"),
-		_("Decambering"),
-		_("Cold sizing"),
-		_("Hubbing"),
-		_("Hot metal gas forming"),
-		_("Curling"),
-		_("Hydroforming"),
-		_("Machining"),
-		_("Milling"),
-		_("Hammering"),
-		_("Smelting"),
-		_("Refining"),
-		_("Annealing"),
-		_("Pickling"),
-		_("Coating"),
-		_("Turning"),
-		_("Facing"),
-		_("Boring"),
-		_("Knurling"),
-		_("Hard turning"),
-		_("Drilling"),
-		_("Reaming"),
-		_("Countersinking"),
-		_("Tapping"),
-		_("Sawing"),
-		_("Filing"),
-		_("Broaching"),
-		_("Shaping"),
-		_("Planing"),
-		_("Double housing"),
-		_("Abrasive jet machining"),
-		_("Water jet cutting"),
-		_("Photochemical machining"),
-		_("Honing"),
-		_("Electro-chemical grinding"),
-		_("Finishing & industrial finishing"),
-		_("Abrasive blasting"),
-		_("Buffing"),
-		_("Burnishing"),
-		_("Electroplating"),
-		_("Electropolishing"),
-		_("Magnetic field-assisted finishing"),
-		_("Etching"),
-		_("Linishing"),
-		_("Mass finishing"),
-		_("Tumbling"),
-		_("Spindle finishing"),
-		_("Vibratory finishing"),
-		_("Plating"),
-		_("Polishing"),
-		_("Superfinishing"),
-		_("Wire brushing"),
-		_("Routing"),
-		_("Hobbing"),
-		_("Ultrasonic machining"),
-		_("Electron beam machining"),
-		_("Electrochemical machining"),
-		_("Laser cutting"),
-		_("Laser drilling"),
-		_("Grinding"),
-		_("Gashing"),
-		_("Biomachining"),
-		_("Joining"),
-		_("Welding"),
-		_("Brazing"),
-		_("Sintering"),
-		_("Adhesive bonding"),
-		_("Nailing"),
-		_("Screwing"),
-		_("Riveting"),
-		_("Clinching"),
-		_("Pinning"),
-		_("Stitching"),
-		_("Stapling"),
-		_("Press fitting"),
-		_("3D printing"),
-		_("Direct metal laser sintering"),
-		_("Fused deposition modeling"),
-		_("Laminated object manufacturing"),
-		_("Laser engineered net shaping"),
-		_("Selective laser sintering"),
-		_("Mining"),
-		_("Quarrying"),
-		_("Blasting"),
-		_("Woodworking"),
-		_("Lapping"),
-		_("Morticing"),
-		_("Crushing"),
-		_("Packaging and labeling")
-	]

diff --git a/erpnext/setup/page/setup_wizard/install_fixtures.py b/erpnext/setup/page/setup_wizard/install_fixtures.py
deleted file mode 100644
index ba48a29..0000000
--- a/erpnext/setup/page/setup_wizard/install_fixtures.py
+++ /dev/null

@@ -1,203 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-
-from frappe import _
-
-def install(country=None):
-	records = [
-
-		# address template
-		{'doctype':"Address Template", "country": country},
-
-		# item group
-		{'doctype': 'Item Group', 'item_group_name': _('All Item Groups'),
-			'is_group': 'Yes', 'parent_item_group': ''},
-		{'doctype': 'Item Group', 'item_group_name': _('Products'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups'), "show_in_website": 1 },
-		{'doctype': 'Item Group', 'item_group_name': _('Raw Material'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
-		{'doctype': 'Item Group', 'item_group_name': _('Services'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
-		{'doctype': 'Item Group', 'item_group_name': _('Sub Assemblies'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
-		{'doctype': 'Item Group', 'item_group_name': _('Consumable'),
-			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
-
-		# deduction type
-		{'doctype': 'Deduction Type', 'name': _('Income Tax'), 'description': _('Income Tax'), 'deduction_name': _('Income Tax')},
-
-		# earning type
-		{'doctype': 'Earning Type', 'name': _('Basic'), 'description': _('Basic'), 'earning_name': _('Basic'), 'taxable': 'Yes'},
-
-		# expense claim type
-		{'doctype': 'Expense Claim Type', 'name': _('Calls'), 'expense_type': _('Calls')},
-		{'doctype': 'Expense Claim Type', 'name': _('Food'), 'expense_type': _('Food')},
-		{'doctype': 'Expense Claim Type', 'name': _('Medical'), 'expense_type': _('Medical')},
-		{'doctype': 'Expense Claim Type', 'name': _('Others'), 'expense_type': _('Others')},
-		{'doctype': 'Expense Claim Type', 'name': _('Travel'), 'expense_type': _('Travel')},
-
-		# leave type
-		{'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'),
-			'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1},
-		{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
-		{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
-		{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'),
-			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
-		{'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'),
-			'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1, 'include_holiday': 1},
-
-		# Employment Type
-		{'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Part-time')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Probation')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Contract')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Commission')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Piecework')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Intern')},
-		{'doctype': 'Employment Type', 'employee_type_name': _('Apprentice')},
-
-		# Department
-		{'doctype': 'Department', 'department_name': _('Accounts')},
-		{'doctype': 'Department', 'department_name': _('Marketing')},
-		{'doctype': 'Department', 'department_name': _('Sales')},
-		{'doctype': 'Department', 'department_name': _('Purchase')},
-		{'doctype': 'Department', 'department_name': _('Operations')},
-		{'doctype': 'Department', 'department_name': _('Production')},
-		{'doctype': 'Department', 'department_name': _('Dispatch')},
-		{'doctype': 'Department', 'department_name': _('Customer Service')},
-		{'doctype': 'Department', 'department_name': _('Human Resources')},
-		{'doctype': 'Department', 'department_name': _('Management')},
-		{'doctype': 'Department', 'department_name': _('Quality Management')},
-		{'doctype': 'Department', 'department_name': _('Research & Development')},
-		{'doctype': 'Department', 'department_name': _('Legal')},
-
-		# Designation
-		{'doctype': 'Designation', 'designation_name': _('CEO')},
-		{'doctype': 'Designation', 'designation_name': _('Manager')},
-		{'doctype': 'Designation', 'designation_name': _('Analyst')},
-		{'doctype': 'Designation', 'designation_name': _('Engineer')},
-		{'doctype': 'Designation', 'designation_name': _('Accountant')},
-		{'doctype': 'Designation', 'designation_name': _('Secretary')},
-		{'doctype': 'Designation', 'designation_name': _('Associate')},
-		{'doctype': 'Designation', 'designation_name': _('Administrative Officer')},
-		{'doctype': 'Designation', 'designation_name': _('Business Development Manager')},
-		{'doctype': 'Designation', 'designation_name': _('HR Manager')},
-		{'doctype': 'Designation', 'designation_name': _('Project Manager')},
-		{'doctype': 'Designation', 'designation_name': _('Head of Marketing and Sales')},
-		{'doctype': 'Designation', 'designation_name': _('Software Developer')},
-		{'doctype': 'Designation', 'designation_name': _('Designer')},
-		{'doctype': 'Designation', 'designation_name': _('Researcher')},
-
-		# territory
-		{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
-
-		# customer group
-		{'doctype': 'Customer Group', 'customer_group_name': _('All Customer Groups'), 'is_group': 'Yes', 	'name': _('All Customer Groups'), 'parent_customer_group': ''},
-		{'doctype': 'Customer Group', 'customer_group_name': _('Individual'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
-		{'doctype': 'Customer Group', 'customer_group_name': _('Commercial'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
-		{'doctype': 'Customer Group', 'customer_group_name': _('Non Profit'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
-		{'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
-
-		# supplier type
-		{'doctype': 'Supplier Type', 'supplier_type': _('Services')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Local')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Raw Material')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Electrical')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Hardware')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Pharmaceutical')},
-		{'doctype': 'Supplier Type', 'supplier_type': _('Distributor')},
-
-		# Sales Person
-		{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': "Yes", "parent_sales_person": ""},
-
-		# UOM
-		{'uom_name': _('Unit'), 'doctype': 'UOM', 'name': _('Unit'), "must_be_whole_number": 1},
-		{'uom_name': _('Box'), 'doctype': 'UOM', 'name': _('Box'), "must_be_whole_number": 1},
-		{'uom_name': _('Kg'), 'doctype': 'UOM', 'name': _('Kg')},
-		{'uom_name': _('Nos'), 'doctype': 'UOM', 'name': _('Nos'), "must_be_whole_number": 1},
-		{'uom_name': _('Pair'), 'doctype': 'UOM', 'name': _('Pair'), "must_be_whole_number": 1},
-		{'uom_name': _('Set'), 'doctype': 'UOM', 'name': _('Set'), "must_be_whole_number": 1},
-		{'uom_name': _('Hour'), 'doctype': 'UOM', 'name': _('Hour')},
-		{'uom_name': _('Minute'), 'doctype': 'UOM', 'name': _('Minute')},
-
-		# Mode of Payment
-		{'doctype': 'Mode of Payment', 'mode_of_payment': 'Check' if country=="United States" else _('Cheque')},
-		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Cash')},
-		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Credit Card')},
-		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Wire Transfer')},
-		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Bank Draft')},
-
-		# Activity Type
-		{'doctype': 'Activity Type', 'activity_type': _('Planning')},
-		{'doctype': 'Activity Type', 'activity_type': _('Research')},
-		{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
-		{'doctype': 'Activity Type', 'activity_type': _('Execution')},
-		{'doctype': 'Activity Type', 'activity_type': _('Communication')},
-
-		{'doctype': "Item Attribute", "attribute_name": _("Size"), "item_attribute_values": [
-			{"attribute_value": _("Extra Small"), "abbr": "XS"},
-			{"attribute_value": _("Small"), "abbr": "S"},
-			{"attribute_value": _("Medium"), "abbr": "M"},
-			{"attribute_value": _("Large"), "abbr": "L"},
-			{"attribute_value": _("Extra Large"), "abbr": "XL"}
-		]},
-
-		{'doctype': "Item Attribute", "attribute_name": _("Colour"), "item_attribute_values": [
-			{"attribute_value": _("Red"), "abbr": "RED"},
-			{"attribute_value": _("Green"), "abbr": "GRE"},
-			{"attribute_value": _("Blue"), "abbr": "BLU"},
-			{"attribute_value": _("Black"), "abbr": "BLA"},
-			{"attribute_value": _("White"), "abbr": "WHI"}
-		]},
-
-		{'doctype': "Email Account", "email_id": "sales@example.com", "append_to": "Opportunity"},
-		{'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"},
-		{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"},
-
-		{"doctype": "Offer Term", "offer_term": _("Date of Joining")},
-		{"doctype": "Offer Term", "offer_term": _("Annual Salary")},
-		{"doctype": "Offer Term", "offer_term": _("Probationary Period")},
-		{"doctype": "Offer Term", "offer_term": _("Employee Benefits")},
-		{"doctype": "Offer Term", "offer_term": _("Working Hours")},
-		{"doctype": "Offer Term", "offer_term": _("Stock Options")},
-		{"doctype": "Offer Term", "offer_term": _("Department")},
-		{"doctype": "Offer Term", "offer_term": _("Job Description")},
-		{"doctype": "Offer Term", "offer_term": _("Responsibilities")},
-		{"doctype": "Offer Term", "offer_term": _("Leaves per Year")},
-		{"doctype": "Offer Term", "offer_term": _("Notice Period")},
-		{"doctype": "Offer Term", "offer_term": _("Incentives")},
-
-		{'doctype': "Print Heading", 'print_heading': _("Credit Note")},
-		{'doctype': "Print Heading", 'print_heading': _("Debit Note")}
-	]
-
-	from erpnext.setup.page.setup_wizard.fixtures.industry_type import get_industry_types
-	records += [{"doctype":"Industry Type", "industry": d} for d in get_industry_types()]
-	# records += [{"doctype":"Operation", "operation": d} for d in get_operations()]
-
-	from frappe.modules import scrub
-	for r in records:
-		doc = frappe.new_doc(r.get("doctype"))
-		doc.update(r)
-
-		# ignore mandatory for root
-		parent_link_field = ("parent_" + scrub(doc.doctype))
-		if doc.meta.get_field(parent_link_field) and not doc.get(parent_link_field):
-			doc.flags.ignore_mandatory = True
-
-		try:
-			doc.insert(ignore_permissions=True)
-		except frappe.DuplicateEntryError, e:
-			# pass DuplicateEntryError and continue
-			if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
-				# make sure DuplicateEntryError is for the exact same doc and not a related doc
-				pass
-			else:
-				raise
-

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.css b/erpnext/setup/page/setup_wizard/setup_wizard.css
deleted file mode 100644
index 41eef34..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.css
+++ /dev/null

@@ -1,70 +0,0 @@
-.setup-wizard-slide {
-	padding-left: 0px;
-	padding-right: 0px;
-}
-
-@media (min-width: 768px) {
-	.setup-wizard-slide.single-column {
-		max-width: 500px;
-	}
-
-	.setup-wizard-slide.two-column {
-		max-width: 768px;
-	}
-}
-
-.setup-wizard-slide .lead {
-	margin-bottom: 10px;
-}
-
-.setup-wizard-slide .form {
-	margin-top: 20px;
-	border: 1px solid #d1d8dd;
-	box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.1);
-}
-
-.setup-wizard-slide .footer {
-	margin: 20px auto;
-}
-
-.setup-wizard-progress {
-    border-bottom: 1px solid #d1d8dd;
-    padding-bottom: 15px;
-    margin: -20px auto 20px;
-}
-
-.setup-wizard-slide .icon-fixed-width {
-	vertical-align: middle;
-}
-
-.setup-wizard-slide .icon-circle-blank {
-	font-size: 7px;
-}
-
-.setup-wizard-slide .icon-circle {
-	font-size: 10px;
-}
-
-.setup-wizard-slide .frappe-control[data-fieldtype="Attach Image"] {
-	text-align: center;
-}
-
-.setup-wizard-slide .missing-image,
-.setup-wizard-slide .attach-image-display {
-	display: block;
-	position: relative;
-	left: 50%;
-	transform: translate(-50%, 0);
-	-webkit-transform: translate(-50%, 0);
-}
-
-.setup-wizard-slide .missing-image .octicon {
-	position: relative;
-	top: 50%;
-	transform: translate(0px, -50%);
-	-webkit-transform: translate(0px, -50%);
-}
-
-.setup-wizard-message-image {
-	margin: 15px auto;
-}

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
deleted file mode 100644
index 998131f..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ /dev/null

@@ -1,710 +0,0 @@
-frappe.provide("erpnext.wiz");
-
-frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
-	if(sys_defaults.company) {
-		frappe.set_route("desk-home");
-		return;
-	}
-	$(".navbar:first").toggle(false);
-	$("body").css({"padding-top":"30px"});
-
-	frappe.require("/assets/frappe/css/animate.min.css");
-
-	var wizard_settings = {
-		page_name: "setup-wizard",
-		parent: wrapper,
-		on_complete: function(wiz) {
-			erpnext.wiz.setup_account(wiz);
-		},
-		title: __("Welcome"),
-		working_html: erpnext.wiz.working_html,
-		complete_html: erpnext.wiz.complete_html,
-		slides: [
-			erpnext.wiz.welcome.slide,
-			erpnext.wiz.region.slide,
-			erpnext.wiz.user.slide,
-			erpnext.wiz.org.slide,
-			erpnext.wiz.branding.slide,
-			erpnext.wiz.users.slide,
-			erpnext.wiz.taxes.slide,
-			erpnext.wiz.customers.slide,
-			erpnext.wiz.suppliers.slide,
-			erpnext.wiz.items.slide
-		]
-	}
-
-
-	erpnext.wiz.wizard = new erpnext.wiz.Wizard(wizard_settings)
-}
-
-frappe.pages['setup-wizard'].on_page_show = function(wrapper) {
-	if(frappe.get_route()[1]) {
-		erpnext.wiz.wizard.show(frappe.get_route()[1]);
-	}
-
-}
-
-erpnext.wiz.Wizard = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-		this.make();
-		this.slides = this.slides;
-		this.slide_dict = {};
-		this.welcomed = true;
-		frappe.set_route("setup-wizard/0");
-	},
-	make: function() {
-		this.parent = $('<div class="setup-wizard-wrapper">').appendTo(this.parent);
-	},
-	get_message: function(html) {
-		return $(repl('<div data-state="setup-complete">\
-			<div style="padding: 40px;" class="text-center">%(html)s</div>\
-		</div>', {html:html}))
-	},
-	show_working: function() {
-		this.hide_current_slide();
-		frappe.set_route(this.page_name);
-		this.current_slide = {"$wrapper": this.get_message(this.working_html()).appendTo(this.parent)};
-	},
-	show_complete: function() {
-		this.hide_current_slide();
-		this.current_slide = {"$wrapper": this.get_message(this.complete_html()).appendTo(this.parent)};
-	},
-	show: function(id) {
-		if(!this.welcomed) {
-			frappe.set_route(this.page_name);
-			return;
-		}
-		id = cint(id);
-		if(this.current_slide && this.current_slide.id===id)
-			return;
-		if(!this.slide_dict[id]) {
-			this.slide_dict[id] = new erpnext.wiz.WizardSlide($.extend(this.slides[id], {wiz:this, id:id}));
-			this.slide_dict[id].make();
-		}
-
-		this.hide_current_slide();
-
-		this.current_slide = this.slide_dict[id];
-		this.current_slide.$wrapper.removeClass("hidden");
-	},
-	hide_current_slide: function() {
-		if(this.current_slide) {
-			this.current_slide.$wrapper.addClass("hidden");
-			this.current_slide = null;
-		}
-	},
-	get_values: function() {
-		var values = {};
-		$.each(this.slide_dict, function(id, slide) {
-			$.extend(values, slide.values)
-		})
-		return values;
-	}
-});
-
-erpnext.wiz.WizardSlide = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-		this.$wrapper = $('<div class="slide-wrapper hidden"></div>')
-			.appendTo(this.wiz.parent)
-			.attr("data-slide-id", this.id);
-	},
-	make: function() {
-		var me = this;
-		if(this.$body) this.$body.remove();
-
-		if(this.before_load) {
-			this.before_load(this);
-		}
-
-		this.$body = $(frappe.render_template("setup_wizard_page", {
-				help: __(this.help),
-				title:__(this.title),
-				main_title:__(this.wiz.title),
-				step: this.id + 1,
-				name: this.name,
-				css_class: this.css_class || "",
-				slides_count: this.wiz.slides.length
-			})).appendTo(this.$wrapper);
-
-		this.body = this.$body.find(".form")[0];
-
-		if(this.fields) {
-			this.form = new frappe.ui.FieldGroup({
-				fields: this.fields,
-				body: this.body,
-				no_submit_on_enter: true
-			});
-			this.form.make();
-		} else {
-			$(this.body).html(this.html);
-		}
-
-		if(this.id > 0) {
-			this.$prev = this.$body.find('.prev-btn').removeClass("hide")
-				.click(function() {
-					frappe.set_route(me.wiz.page_name, me.id-1 + "");
-				})
-				.css({"margin-right": "10px"});
-			}
-		if(this.id+1 < this.wiz.slides.length) {
-			this.$next = this.$body.find('.next-btn').removeClass("hide")
-				.click(function() {
-					me.values = me.form.get_values();
-					if(me.values===null)
-						return;
-					if(me.validate && !me.validate())
-						return;
-					frappe.set_route(me.wiz.page_name, me.id+1 + "");
-				})
-		} else {
-			this.$complete = this.$body.find('.complete-btn').removeClass("hide")
-				.click(function() {
-					me.values = me.form.get_values();
-					if(me.values===null)
-						return;
-					if(me.validate && !me.validate())
-						return;
-					me.wiz.on_complete(me.wiz);
-				})
-		}
-
-		if(this.onload) {
-			this.onload(this);
-		}
-
-	},
-	get_input: function(fn) {
-		return this.form.get_input(fn);
-	},
-	get_field: function(fn) {
-		return this.form.get_field(fn);
-	}
-});
-
-$.extend(erpnext.wiz, {
-	welcome: {
-		slide: {
-			name: "welcome",
-			title: __("Welcome to ERPNext"),
-			icon: "icon-world",
-			help: __("Let's prepare the system for first use."),
-
-			fields: [
-				{ fieldname: "language", label: __("Select Your Language"), reqd:1,
-					fieldtype: "Select" },
-			],
-
-			onload: function(slide) {
-				if (!erpnext.wiz.welcome.data) {
-					erpnext.wiz.welcome.load_languages(slide);
-				} else {
-					erpnext.wiz.welcome.setup_fields(slide);
-				}
-			},
-
-			css_class: "single-column"
-		},
-
-		load_languages: function(slide) {
-			frappe.call({
-				method: "erpnext.setup.page.setup_wizard.setup_wizard.load_languages",
-				callback: function(r) {
-					erpnext.wiz.welcome.data = r.message;
-					erpnext.wiz.welcome.setup_fields(slide);
-
-					slide.get_field("language")
-						.set_input(erpnext.wiz.welcome.data.default_language || "english");
-					moment.locale("en");
-				}
-			});
-		},
-
-		setup_fields: function(slide) {
-			var select = slide.get_field("language");
-			select.df.options = erpnext.wiz.welcome.data.languages;
-			select.refresh();
-			erpnext.wiz.welcome.bind_events(slide);
-		},
-
-		bind_events: function(slide) {
-			slide.get_input("language").unbind("change").on("change", function() {
-				var lang = $(this).val() || "english";
-				frappe._messages = {};
-				frappe.call({
-					method: "erpnext.setup.page.setup_wizard.setup_wizard.load_messages",
-					args: {
-						language: lang
-					},
-					callback: function(r) {
-						// TODO save values!
-
-						// re-render all slides
-						$.each(slide.wiz.slide_dict, function(key, s) {
-							s.make();
-						});
-
-						// select is re-made after language change
-						var select = slide.get_field("language");
-						select.set_input(lang);
-					}
-				})
-			});
-		},
-	},
-
-	region: {
-		slide: {
-			title: __("Region"),
-			icon: "icon-flag",
-			help: __("Select your Country, Time Zone and Currency"),
-			fields: [
-				{ fieldname: "country", label: __("Country"), reqd:1,
-					fieldtype: "Select" },
-				{ fieldname: "timezone", label: __("Time Zone"), reqd:1,
-					fieldtype: "Select" },
-				{ fieldname: "currency", label: __("Currency"), reqd:1,
-					fieldtype: "Select" },
-			],
-
-			onload: function(slide) {
-				frappe.call({
-					method:"frappe.geo.country_info.get_country_timezone_info",
-					callback: function(data) {
-						erpnext.wiz.region.data = data.message;
-						erpnext.wiz.region.setup_fields(slide);
-						erpnext.wiz.region.bind_events(slide);
-					}
-				});
-			},
-
-			css_class: "single-column"
-		},
-
-		setup_fields: function(slide) {
-			var data = erpnext.wiz.region.data;
-
-			slide.get_input("country").empty()
-				.add_options([""].concat(keys(data.country_info).sort()));
-
-			slide.get_input("currency").empty()
-				.add_options(frappe.utils.unique([""].concat($.map(data.country_info,
-					function(opts, country) { return opts.currency; }))).sort());
-
-			slide.get_input("timezone").empty()
-				.add_options([""].concat(data.all_timezones));
-
-			if (data.default_country) {
-				slide.set_input("country", data.default_country);
-			}
-		},
-
-		bind_events: function(slide) {
-			slide.get_input("country").on("change", function() {
-				var country = slide.get_input("country").val();
-				var $timezone = slide.get_input("timezone");
-				var data = erpnext.wiz.region.data;
-
-				$timezone.empty();
-
-				// add country specific timezones first
-				if(country) {
-					var timezone_list = data.country_info[country].timezones || [];
-					$timezone.add_options(timezone_list.sort());
-					slide.get_field("currency").set_input(data.country_info[country].currency);
-					slide.get_field("currency").$input.trigger("change");
-				}
-
-				// add all timezones at the end, so that user has the option to change it to any timezone
-				$timezone.add_options([""].concat(data.all_timezones));
-
-				slide.get_field("timezone").set_input($timezone.val());
-
-				// temporarily set date format
-				frappe.boot.sysdefaults.date_format = (data.country_info[country].date_format
-					|| "dd-mm-yyyy");
-			});
-
-			slide.get_input("currency").on("change", function() {
-				var currency = slide.get_input("currency").val();
-				if (!currency) return;
-				frappe.model.with_doc("Currency", currency, function() {
-					frappe.provide("locals.:Currency." + currency);
-					var currency_doc = frappe.model.get_doc("Currency", currency);
-					var number_format = currency_doc.number_format;
-					if (number_format==="#.###") {
-						number_format = "#.###,##";
-					} else if (number_format==="#,###") {
-						number_format = "#,###.##"
-					}
-
-					frappe.boot.sysdefaults.number_format = number_format;
-					locals[":Currency"][currency] = $.extend({}, currency_doc);
-				});
-			});
-		}
-	},
-
-	user: {
-		slide: {
-			title: __("The First User: You"),
-			icon: "icon-user",
-			fields: [
-				{"fieldname": "first_name", "label": __("First Name"), "fieldtype": "Data",
-					reqd:1},
-				{"fieldname": "last_name", "label": __("Last Name"), "fieldtype": "Data"},
-				{"fieldname": "email", "label": __("Email Address"), "fieldtype": "Data",
-					reqd:1, "description": __("You will use it to Login"), "options":"Email"},
-				{"fieldname": "password", "label": __("Password"), "fieldtype": "Password",
-					reqd:1},
-				{fieldtype:"Attach Image", fieldname:"attach_user",
-					label: __("Attach Your Picture")},
-			],
-			help: __('The first user will become the System Manager (you can change this later).'),
-			onload: function(slide) {
-				if(user!=="Administrator") {
-					slide.form.fields_dict.password.$wrapper.toggle(false);
-					slide.form.fields_dict.email.$wrapper.toggle(false);
-					slide.form.fields_dict.first_name.set_input(frappe.boot.user.first_name);
-					slide.form.fields_dict.last_name.set_input(frappe.boot.user.last_name);
-
-					var user_image = frappe.get_cookie("user_image");
-					if(user_image) {
-						var $attach_user = slide.form.fields_dict.attach_user.$wrapper;
-						$attach_user.find(".missing-image").toggle(false);
-						$attach_user.find("img").attr("src", decodeURIComponent(user_image)).toggle(true);
-					}
-
-					delete slide.form.fields_dict.email;
-					delete slide.form.fields_dict.password;
-				}
-			},
-			css_class: "single-column"
-		},
-	},
-
-	org: {
-		slide: {
-			title: __("The Organization"),
-			icon: "icon-building",
-			fields: [
-				{fieldname:'company_name', label: __('Company Name'), fieldtype:'Data', reqd:1,
-					placeholder: __('e.g. "My Company LLC"')},
-				{fieldname:'company_abbr', label: __('Company Abbreviation'), fieldtype:'Data',
-					description: __('Max 5 characters'), placeholder: __('e.g. "MC"'), reqd:1},
-				{fieldname:'company_tagline', label: __('What does it do?'), fieldtype:'Data',
-					placeholder:__('e.g. "Build tools for builders"'), reqd:1},
-				{fieldname:'bank_account', label: __('Bank Account'), fieldtype:'Data',
-					placeholder: __('e.g. "XYZ National Bank"'), reqd:1 },
-				{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
-					options: "", fieldtype: 'Select'},
-
-				// TODO remove this
-				{fieldtype: "Section Break"},
-				{fieldname:'fy_start_date', label:__('Financial Year Start Date'), fieldtype:'Date',
-					description: __('Your financial year begins on'), reqd:1},
-				{fieldname:'fy_end_date', label:__('Financial Year End Date'), fieldtype:'Date',
-					description: __('Your financial year ends on'), reqd:1},
-			],
-			help: __('The name of your company for which you are setting up this system.'),
-
-			onload: function(slide) {
-				erpnext.wiz.org.load_chart_of_accounts(slide);
-				erpnext.wiz.org.bind_events(slide);
-				erpnext.wiz.org.set_fy_dates(slide);
-			},
-
-			css_class: "single-column"
-		},
-
-		set_fy_dates: function(slide) {
-			var country = slide.wiz.get_values().country;
-
-			if(country) {
-				var fy = erpnext.wiz.fiscal_years[country];
-				var current_year = moment(new Date()).year();
-				var next_year = current_year + 1;
-				if(!fy) {
-					fy = ["01-01", "12-31"];
-					next_year = current_year;
-				}
-
-				slide.get_field("fy_start_date").set_input(current_year + "-" + fy[0]);
-				slide.get_field("fy_end_date").set_input(next_year + "-" + fy[1]);
-			}
-
-		},
-
-		load_chart_of_accounts: function(slide) {
-			var country = slide.wiz.get_values().country;
-
-			if(country) {
-				frappe.call({
-					method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.get_charts_for_country",
-					args: {"country": country},
-					callback: function(r) {
-						if(r.message) {
-							slide.get_input("chart_of_accounts").empty()
-								.add_options(r.message);
-
-							if (r.message.length===1) {
-								var field = slide.get_field("chart_of_accounts");
-								field.set_value(r.message[0]);
-								field.df.hidden = 1;
-								field.refresh();
-							}
-						}
-					}
-				})
-			}
-		},
-
-		bind_events: function(slide) {
-			slide.get_input("company_name").on("change", function() {
-				var parts = slide.get_input("company_name").val().split(" ");
-				var abbr = $.map(parts, function(p) { return p ? p.substr(0,1) : null }).join("");
-				slide.get_field("company_abbr").set_input(abbr.slice(0, 5).toUpperCase());
-			}).val(frappe.boot.sysdefaults.company_name || "").trigger("change");
-
-			slide.get_input("company_abbr").on("change", function() {
-				if(slide.get_input("company_abbr").val().length > 5) {
-					msgprint("Company Abbreviation cannot have more than 5 characters");
-					slide.get_field("company_abbr").set_input("");
-				}
-			});
-
-			// TODO remove this
-			slide.get_input("fy_start_date").on("change", function() {
-				var year_end_date =
-					frappe.datetime.add_days(frappe.datetime.add_months(
-						frappe.datetime.user_to_obj(slide.get_input("fy_start_date").val()), 12), -1);
-				slide.get_input("fy_end_date").val(frappe.datetime.obj_to_user(year_end_date));
-
-			});
-		}
-	},
-
-	branding: {
-		slide: {
-			icon: "icon-bookmark",
-			title: __("The Brand"),
-			help: __('Upload your letter head and logo. (you can edit them later).'),
-			fields: [
-				{fieldtype:"Attach Image", fieldname:"attach_letterhead",
-					label: __("Attach Letterhead"),
-					description: __("Keep it web friendly 900px (w) by 100px (h)")
-				},
-				{fieldtype: "Column Break"},
-				{fieldtype:"Attach Image", fieldname:"attach_logo",
-					label:__("Attach Logo"),
-					description: __("100px by 100px")},
-			],
-
-			css_class: "two-column"
-		},
-	},
-
-	users: {
-		slide: {
-			icon: "icon-money",
-			"title": __("Add Users"),
-			"help": __("Add users to your organization, other than yourself"),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<5; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"user_fullname_"+ i,
-							label:__("Full Name")},
-						{fieldtype:"Data", fieldname:"user_email_" + i,
-							label:__("Email ID"), placeholder:__("user@example.com"),
-							options: "Email"},
-						{fieldtype:"Column Break"},
-						{fieldtype: "Check", fieldname: "user_sales_" + i,
-							label:__("Sales"), default: 1},
-						{fieldtype: "Check", fieldname: "user_purchaser_" + i,
-							label:__("Purchaser"), default: 1},
-						{fieldtype: "Check", fieldname: "user_accountant_" + i,
-							label:__("Accountant"), default: 1},
-					]);
-				}
-			},
-			css_class: "two-column"
-		},
-	},
-
-	taxes: {
-		slide: {
-			icon: "icon-money",
-			"title": __("Add Taxes"),
-			"help": __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<4; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"tax_"+ i, label:__("Tax") + " " + i,
-							placeholder:__("e.g. VAT") + " " + i},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Float", fieldname:"tax_rate_" + i, label:__("Rate (%)"), placeholder:__("e.g. 5")},
-					]);
-				}
-			},
-			css_class: "two-column"
-		},
-	},
-
-	customers: {
-		slide: {
-			icon: "icon-group",
-			"title": __("Your Customers"),
-			"help": __("List a few of your customers. They could be organizations or individuals."),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"customer_" + i, label:__("Customer") + " " + i,
-							placeholder:__("Customer Name")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Data", fieldname:"customer_contact_" + i,
-							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")}
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "two-column"
-		},
-	},
-
-	suppliers: {
-		slide: {
-			icon: "icon-group",
-			"title": __("Your Suppliers"),
-			"help": __("List a few of your suppliers. They could be organizations or individuals."),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break"},
-						{fieldtype:"Data", fieldname:"supplier_" + i, label:__("Supplier")+" " + i,
-							placeholder:__("Supplier Name")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Data", fieldname:"supplier_contact_" + i,
-							label:__("Contact Name") + " " + i, placeholder:__("Contact Name")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-			},
-			css_class: "two-column"
-		},
-	},
-
-	items: {
-		slide: {
-			icon: "icon-barcode",
-			"title": __("Your Products or Services"),
-			"help": __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
-			"fields": [],
-			before_load: function(slide) {
-				slide.fields = [];
-				for(var i=1; i<6; i++) {
-					slide.fields = slide.fields.concat([
-						{fieldtype:"Section Break", show_section_border: true},
-						{fieldtype:"Data", fieldname:"item_" + i, label:__("Item") + " " + i,
-							placeholder:__("A Product or Service")},
-						{fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i,
-							options:[__("Products"), __("Services"),
-								__("Raw Material"), __("Consumable"), __("Sub Assemblies")],
-							"default": __("Products")},
-						{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
-							options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
-								__("Hour"), __("Minute")],
-							"default": __("Unit")},
-						{fieldtype: "Check", fieldname: "is_sales_item_" + i, label:__("We sell this Item"), default: 1},
-						{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
-						{fieldtype:"Column Break"},
-						{fieldtype:"Currency", fieldname:"item_price_" + i, label:__("Rate")},
-						{fieldtype:"Attach Image", fieldname:"item_img_" + i, label:__("Attach Image")},
-					])
-				}
-				slide.fields[1].reqd = 1;
-
-				// dummy data
-				slide.fields.push({fieldtype: "Section Break"});
-				slide.fields.push({fieldtype: "Check", fieldname: "add_sample_data",
-					label: __("Add a few sample records"), "default": 1});
-			},
-			css_class: "two-column"
-		},
-	},
-
-	working_html: function() {
-		var msg = $(frappe.render_template("setup_wizard_message", {
-			image: "/assets/frappe/images/ui/bubble-tea-smile.svg",
-			title: __("Setting Up"),
-			message: __('Sit tight while your system is being setup. This may take a few moments.')
-		}));
-		msg.find(".setup-wizard-message-image").addClass("animated infinite bounce");
-		return msg.html();
-	},
-
-	complete_html: function() {
-		return frappe.render_template("setup_wizard_message", {
-			image: "/assets/frappe/images/ui/bubble-tea-happy.svg",
-			title: __('Setup Complete'),
-			message: ""
-		});
-	},
-
-	setup_account: function(wiz) {
-		var values = wiz.get_values();
-		wiz.show_working();
-		return frappe.call({
-			method: "erpnext.setup.page.setup_wizard.setup_wizard.setup_account",
-			args: values,
-			callback: function(r) {
-				wiz.show_complete();
-				localStorage.setItem("session_last_route", "#welcome-to-erpnext");
-				setTimeout(function() {
-					window.location = "/desk";
-				}, 2000);
-			},
-			error: function(r) {
-
-				var d = msgprint(__("There were errors."));
-				d.custom_onhide = function() {
-					frappe.set_route(erpnext.wiz.wizard.page_name, erpnext.wiz.wizard.slides.length - 1);
-				};
-			}
-		});
-	},
-});
-
-// Source: https://en.wikipedia.org/wiki/Fiscal_year
-// default 1st Jan - 31st Dec
-
-erpnext.wiz.fiscal_years = {
-	"Afghanistan": ["12-20", "12-21"],
-	"Australia": ["07-01", "06-30"],
-	"Bangladesh": ["07-01", "06-30"],
-	"Canada": ["04-01", "03-31"],
-	"Costa Rica": ["10-01", "09-30"],
-	"Egypt": ["07-01", "06-30"],
-	"Hong Kong": ["04-01", "03-31"],
-	"India": ["04-01", "03-31"],
-	"Iran": ["06-23", "06-22"],
-	"Italy": ["07-01", "06-30"],
-	"Myanmar": ["04-01", "03-31"],
-	"New Zealand": ["04-01", "03-31"],
-	"Pakistan": ["07-01", "06-30"],
-	"Singapore": ["04-01", "03-31"],
-	"South Africa": ["03-01", "02-28"],
-	"Thailand": ["10-01", "09-30"],
-	"United Kingdom": ["04-01", "03-31"],
-}

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.json b/erpnext/setup/page/setup_wizard/setup_wizard.json
deleted file mode 100644
index e90c87c..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.json
+++ /dev/null

@@ -1,19 +0,0 @@
-{
- "creation": "2013-10-04 13:49:33.000000", 
- "docstatus": 0, 
- "doctype": "Page", 
- "idx": 1, 
- "modified": "2013-10-04 13:49:33.000000", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "setup-wizard", 
- "owner": "Administrator", 
- "page_name": "setup-wizard", 
- "roles": [
-  {
-   "role": "System Manager"
-  }
- ], 
- "standard": "Yes", 
- "title": "Setup Wizard"
-}
\ No newline at end of file

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
deleted file mode 100644
index 86c4625..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ /dev/null

@@ -1,600 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe, json, copy
-
-from frappe.utils import cstr, flt, getdate, strip
-from frappe import _
-from frappe.utils.file_manager import save_file
-from frappe.translate import (set_default_language, get_dict,
-	get_lang_dict, send_translations, get_language_from_code)
-from frappe.geo.country_info import get_country_info
-from frappe.utils.nestedset import get_root_of
-from .default_website import website_maker
-import install_fixtures
-from .sample_data import make_sample_data
-from erpnext.accounts.utils import FiscalYearError
-from erpnext.accounts.doctype.account.account import RootNotEditable
-
-@frappe.whitelist()
-def setup_account(args=None):
-	try:
-		if frappe.db.sql("select name from tabCompany"):
-			frappe.throw(_("Setup Already Complete!!"))
-
-		args = process_args(args)
-
-		if args.language and args.language != "english":
-			set_default_language(args.language)
-
-		frappe.clear_cache()
-
-		install_fixtures.install(args.get("country"))
-
-		update_user_name(args)
-		frappe.local.message_log = []
-
-		create_fiscal_year_and_company(args)
-		frappe.local.message_log = []
-
-		create_users(args)
-		frappe.local.message_log = []
-
-		set_defaults(args)
-		frappe.local.message_log = []
-
-		create_territories()
-		frappe.local.message_log = []
-
-		create_price_lists(args)
-		frappe.local.message_log = []
-
-		create_feed_and_todo()
-		frappe.local.message_log = []
-
-		create_email_digest()
-		frappe.local.message_log = []
-
-		create_letter_head(args)
-		frappe.local.message_log = []
-
-		create_taxes(args)
-		frappe.local.message_log = []
-
-		create_items(args)
-		frappe.local.message_log = []
-
-		create_customers(args)
-		frappe.local.message_log = []
-
-		create_suppliers(args)
-		frappe.local.message_log = []
-
-		frappe.db.set_default('desktop:home_page', 'desktop')
-
-		website_maker(args.company_name.strip(), args.company_tagline, args.name)
-		create_logo(args)
-
-		frappe.db.commit()
-
-		login_as_first_user(args)
-
-		frappe.db.commit()
-
-		frappe.clear_cache()
-
-		if args.get("add_sample_data"):
-			try:
-				make_sample_data()
-				frappe.clear_cache()
-			except FiscalYearError:
-				pass
-
-	except:
-		if args:
-			traceback = frappe.get_traceback()
-			for hook in frappe.get_hooks("setup_wizard_exception"):
-				frappe.get_attr(hook)(traceback, args)
-
-		raise
-
-	else:
-		for hook in frappe.get_hooks("setup_wizard_success"):
-			frappe.get_attr(hook)(args)
-
-
-def process_args(args):
-	if not args:
-		args = frappe.local.form_dict
-	if isinstance(args, basestring):
-		args = json.loads(args)
-
-	args = frappe._dict(args)
-
-	# strip the whitespace
-	for key, value in args.items():
-		if isinstance(value, basestring):
-			args[key] = strip(value)
-
-	return args
-
-def update_user_name(args):
-	if args.get("email"):
-		args['name'] = args.get("email")
-
-		_mute_emails, frappe.flags.mute_emails = frappe.flags.mute_emails, True
-		doc = frappe.get_doc({
-			"doctype":"User",
-			"email": args.get("email"),
-			"first_name": args.get("first_name"),
-			"last_name": args.get("last_name")
-		})
-		doc.flags.no_welcome_mail = True
-		doc.insert()
-		frappe.flags.mute_emails = _mute_emails
-		from frappe.auth import _update_password
-		_update_password(args.get("email"), args.get("password"))
-
-	else:
-		args['name'] = frappe.session.user
-
-		# Update User
-		if not args.get('last_name') or args.get('last_name')=='None':
-				args['last_name'] = None
-		frappe.db.sql("""update `tabUser` SET first_name=%(first_name)s,
-			last_name=%(last_name)s WHERE name=%(name)s""", args)
-
-	if args.get("attach_user"):
-		attach_user = args.get("attach_user").split(",")
-		if len(attach_user)==3:
-			filename, filetype, content = attach_user
-			fileurl = save_file(filename, content, "User", args.get("name"), decode=True).file_url
-			frappe.db.set_value("User", args.get("name"), "user_image", fileurl)
-
-	add_all_roles_to(args.get("name"))
-
-def create_fiscal_year_and_company(args):
-	curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date'))
-	frappe.get_doc({
-		"doctype":"Fiscal Year",
-		'year': curr_fiscal_year,
-		'year_start_date': args.get('fy_start_date'),
-		'year_end_date': args.get('fy_end_date'),
-	}).insert()
-
-	# Company
-	frappe.get_doc({
-		"doctype":"Company",
-		'domain': args.get("industry"),
-		'company_name':args.get('company_name').strip(),
-		'abbr':args.get('company_abbr'),
-		'default_currency':args.get('currency'),
-		'country': args.get('country'),
-		'chart_of_accounts': args.get(('chart_of_accounts')),
-	}).insert()
-
-	# Bank Account
-
-	args["curr_fiscal_year"] = curr_fiscal_year
-
-def create_price_lists(args):
-	for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
-		frappe.get_doc({
-			"doctype": "Price List",
-			"price_list_name": pl_name,
-			"enabled": 1,
-			"buying": 1 if pl_type == "Buying" else 0,
-			"selling": 1 if pl_type == "Selling" else 0,
-			"currency": args["currency"]
-		}).insert()
-
-def set_defaults(args):
-	# enable default currency
-	frappe.db.set_value("Currency", args.get("currency"), "enabled", 1)
-
-	global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
-	global_defaults.update({
-		'current_fiscal_year': args.curr_fiscal_year,
-		'default_currency': args.get('currency'),
-		'default_company':args.get('company_name').strip(),
-		"country": args.get("country"),
-	})
-
-	global_defaults.save()
-
-	number_format = get_country_info(args.get("country")).get("number_format", "#,###.##")
-
-	# replace these as float number formats, as they have 0 precision
-	# and are currency number formats and not for floats
-	if number_format=="#.###":
-		number_format = "#.###,##"
-	elif number_format=="#,###":
-		number_format = "#,###.##"
-
-	system_settings = frappe.get_doc("System Settings", "System Settings")
-	system_settings.update({
-		"language": args.get("language"),
-		"time_zone": args.get("timezone"),
-		"float_precision": 3,
-		"email_footer_address": args.get("company"),
-		'date_format': frappe.db.get_value("Country", args.get("country"), "date_format"),
-		'number_format': number_format,
-		'enable_scheduler': 1 if not frappe.flags.in_test else 0
-	})
-	system_settings.save()
-
-	accounts_settings = frappe.get_doc("Accounts Settings")
-	accounts_settings.auto_accounting_for_stock = 1
-	accounts_settings.save()
-
-	stock_settings = frappe.get_doc("Stock Settings")
-	stock_settings.item_naming_by = "Item Code"
-	stock_settings.valuation_method = "FIFO"
-	stock_settings.stock_uom = _("Nos")
-	stock_settings.auto_indent = 1
-	stock_settings.auto_insert_price_list_rate_if_missing = 1
-	stock_settings.automatically_set_serial_nos_based_on_fifo = 1
-	stock_settings.save()
-
-	selling_settings = frappe.get_doc("Selling Settings")
-	selling_settings.cust_master_name = "Customer Name"
-	selling_settings.so_required = "No"
-	selling_settings.dn_required = "No"
-	selling_settings.save()
-
-	buying_settings = frappe.get_doc("Buying Settings")
-	buying_settings.supp_master_name = "Supplier Name"
-	buying_settings.po_required = "No"
-	buying_settings.pr_required = "No"
-	buying_settings.maintain_same_rate = 1
-	buying_settings.save()
-
-	notification_control = frappe.get_doc("Notification Control")
-	notification_control.quotation = 1
-	notification_control.sales_invoice = 1
-	notification_control.purchase_order = 1
-	notification_control.save()
-
-	hr_settings = frappe.get_doc("HR Settings")
-	hr_settings.emp_created_by = "Naming Series"
-	hr_settings.save()
-
-def create_feed_and_todo():
-	"""update Activity feed and create todo for creation of item, customer, vendor"""
-	frappe.get_doc({
-		"doctype": "Feed",
-		"feed_type": "Comment",
-		"subject": "ERPNext Setup Complete!"
-	}).insert(ignore_permissions=True)
-
-def create_email_digest():
-	from frappe.utils.user import get_system_managers
-	system_managers = get_system_managers(only_name=True)
-	if not system_managers:
-		return
-
-	companies = frappe.db.sql_list("select name FROM `tabCompany`")
-	for company in companies:
-		if not frappe.db.exists("Email Digest", "Default Weekly Digest - " + company):
-			edigest = frappe.get_doc({
-				"doctype": "Email Digest",
-				"name": "Default Weekly Digest - " + company,
-				"company": company,
-				"frequency": "Weekly",
-				"recipient_list": "\n".join(system_managers)
-			})
-
-			for df in edigest.meta.get("fields", {"fieldtype": "Check"}):
-				if df.fieldname != "scheduler_errors":
-					edigest.set(df.fieldname, 1)
-
-			edigest.insert()
-
-	# scheduler errors digest
-	if companies:
-		edigest = frappe.new_doc("Email Digest")
-		edigest.update({
-			"name": "Scheduler Errors",
-			"company": companies[0],
-			"frequency": "Daily",
-			"recipient_list": "\n".join(system_managers),
-			"scheduler_errors": 1,
-			"enabled": 1
-		})
-		edigest.insert()
-
-def get_fy_details(fy_start_date, fy_end_date):
-	start_year = getdate(fy_start_date).year
-	if start_year == getdate(fy_end_date).year:
-		fy = cstr(start_year)
-	else:
-		fy = cstr(start_year) + '-' + cstr(start_year + 1)
-	return fy
-
-def create_taxes(args):
-
-	for i in xrange(1,6):
-		if args.get("tax_" + str(i)):
-			# replace % in case someone also enters the % symbol
-			tax_rate = (args.get("tax_rate_" + str(i)) or "").replace("%", "")
-
-			try:
-				tax_group = frappe.db.get_value("Account", {"company": args.get("company_name"),
-					"is_group": 1, "account_type": "Tax", "root_type": "Liability"})
-				if tax_group:
-					account = make_tax_head(args, i, tax_group, tax_rate)
-					make_sales_and_purchase_tax_templates(account)
-
-			except frappe.NameError, e:
-				if e.args[2][0]==1062:
-					pass
-				else:
-					raise
-			except RootNotEditable, e:
-				pass
-
-def make_tax_head(args, i, tax_group, tax_rate):
-	return frappe.get_doc({
-		"doctype":"Account",
-		"company": args.get("company_name").strip(),
-		"parent_account": tax_group,
-		"account_name": args.get("tax_" + str(i)),
-		"is_group": 0,
-		"report_type": "Balance Sheet",
-		"account_type": "Tax",
-		"tax_rate": flt(tax_rate) if tax_rate else None
-	}).insert(ignore_permissions=True)
-
-def make_sales_and_purchase_tax_templates(account):
-	doc = {
-		"doctype": "Sales Taxes and Charges Template",
-		"title": account.name,
-		"taxes": [{
-		    "category": "Valuation and Total",
-		    "charge_type": "On Net Total",
-			"account_head": account.name,
-			"description": "{0} @ {1}".format(account.account_name, account.tax_rate),
-			"rate": account.tax_rate
-		}]
-	}
-
-	# Sales
-	frappe.get_doc(copy.deepcopy(doc)).insert()
-
-	# Purchase
-	doc["doctype"] = "Purchase Taxes and Charges Template"
-	frappe.get_doc(copy.deepcopy(doc)).insert()
-
-def create_items(args):
-	for i in xrange(1,6):
-		item = args.get("item_" + str(i))
-		if item:
-			item_group = args.get("item_group_" + str(i))
-			is_sales_item = args.get("is_sales_item_" + str(i))
-			is_purchase_item = args.get("is_purchase_item_" + str(i))
-			is_stock_item = item_group!=_("Services")
-			is_pro_applicable = item_group!=_("Services")
-			default_warehouse = ""
-			if is_stock_item:
-				default_warehouse = frappe.db.get_value("Warehouse", filters={
-					"warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
-					"company": args.get("company_name").strip()
-				})
-
-			try:
-				frappe.get_doc({
-					"doctype":"Item",
-					"item_code": item,
-					"item_name": item,
-					"description": item,
-					"is_sales_item": 1 if is_sales_item else 0,
-					"is_purchase_item": 1 if is_purchase_item else 0,
-					"show_in_website": 1,
-					"is_stock_item": is_stock_item and 1 or 0,
-					"is_pro_applicable": is_pro_applicable and 1 or 0,
-					"item_group": item_group,
-					"stock_uom": args.get("item_uom_" + str(i)),
-					"default_warehouse": default_warehouse
-				}).insert()
-
-				if args.get("item_img_" + str(i)):
-					item_image = args.get("item_img_" + str(i)).split(",")
-					if len(item_image)==3:
-						filename, filetype, content = item_image
-						fileurl = save_file(filename, content, "Item", item, decode=True).file_url
-						frappe.db.set_value("Item", item, "image", fileurl)
-
-				if args.get("item_price_" + str(i)):
-					item_price = flt(args.get("item_price_" + str(i)))
-
-					if is_sales_item:
-						price_list_name = frappe.db.get_value("Price List", {"selling": 1})
-						make_item_price(item, price_list_name, item_price)
-
-					if is_purchase_item:
-						price_list_name = frappe.db.get_value("Price List", {"buying": 1})
-						make_item_price(item, price_list_name, item_price)
-
-			except frappe.NameError:
-				pass
-
-def make_item_price(item, price_list_name, item_price):
-	frappe.get_doc({
-		"doctype": "Item Price",
-		"price_list": price_list_name,
-		"item_code": item,
-		"price_list_rate": item_price
-	}).insert()
-
-
-def create_customers(args):
-	for i in xrange(1,6):
-		customer = args.get("customer_" + str(i))
-		if customer:
-			try:
-				frappe.get_doc({
-					"doctype":"Customer",
-					"customer_name": customer,
-					"customer_type": "Company",
-					"customer_group": _("Commercial"),
-					"territory": args.get("country"),
-					"company": args.get("company_name").strip()
-				}).insert()
-
-				if args.get("customer_contact_" + str(i)):
-					create_contact(args.get("customer_contact_" + str(i)),
-						"customer", customer)
-			except frappe.NameError:
-				pass
-
-def create_suppliers(args):
-	for i in xrange(1,6):
-		supplier = args.get("supplier_" + str(i))
-		if supplier:
-			try:
-				frappe.get_doc({
-					"doctype":"Supplier",
-					"supplier_name": supplier,
-					"supplier_type": _("Local"),
-					"company": args.get("company_name").strip()
-				}).insert()
-
-				if args.get("supplier_contact_" + str(i)):
-					create_contact(args.get("supplier_contact_" + str(i)),
-						"supplier", supplier)
-			except frappe.NameError:
-				pass
-
-def create_contact(contact, party_type, party):
-	"""Create contact based on given contact name"""
-	contact = contact.strip().split(" ")
-
-	frappe.get_doc({
-		"doctype":"Contact",
-		party_type: party,
-		"first_name":contact[0],
-		"last_name": len(contact) > 1 and contact[1] or ""
-	}).insert()
-
-def create_letter_head(args):
-	if args.get("attach_letterhead"):
-		frappe.get_doc({
-			"doctype":"Letter Head",
-			"letter_head_name": _("Standard"),
-			"is_default": 1
-		}).insert()
-
-		attach_letterhead = args.get("attach_letterhead").split(",")
-		if len(attach_letterhead)==3:
-			filename, filetype, content = attach_letterhead
-			fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url
-			frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl)
-
-def create_logo(args):
-	if args.get("attach_logo"):
-		attach_logo = args.get("attach_logo").split(",")
-		if len(attach_logo)==3:
-			filename, filetype, content = attach_logo
-			fileurl = save_file(filename, content, "Website Settings", "Website Settings",
-				decode=True).file_url
-			frappe.db.set_value("Website Settings", "Website Settings", "brand_html",
-				"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name").strip()))
-
-def add_all_roles_to(name):
-	user = frappe.get_doc("User", name)
-	for role in frappe.db.sql("""select name from tabRole"""):
-		if role[0] not in ["Administrator", "Guest", "All", "Customer", "Supplier", "Partner", "Employee"]:
-			d = user.append("user_roles")
-			d.role = role[0]
-	user.save()
-
-def create_territories():
-	"""create two default territories, one for home country and one named Rest of the World"""
-	from frappe.utils.nestedset import get_root_of
-	country = frappe.db.get_default("country")
-	root_territory = get_root_of("Territory")
-	for name in (country, _("Rest Of The World")):
-		if name and not frappe.db.exists("Territory", name):
-			frappe.get_doc({
-				"doctype": "Territory",
-				"territory_name": name.replace("'", ""),
-				"parent_territory": root_territory,
-				"is_group": "No"
-			}).insert()
-
-def login_as_first_user(args):
-	if args.get("email") and hasattr(frappe.local, "login_manager"):
-		frappe.local.login_manager.login_as(args.get("email"))
-
-def create_users(args):
-	# create employee for self
-	emp = frappe.get_doc({
-		"doctype": "Employee",
-		"full_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
-		"user_id": frappe.session.user,
-		"status": "Active",
-		"company": args.get("company_name")
-	})
-	emp.flags.ignore_mandatory = True
-	emp.insert(ignore_permissions = True)
-
-	for i in xrange(1,5):
-		email = args.get("user_email_" + str(i))
-		fullname = args.get("user_fullname_" + str(i))
-		if email:
-			if not fullname:
-				fullname = email.split("@")[0]
-
-			parts = fullname.split(" ", 1)
-
-			user = frappe.get_doc({
-				"doctype": "User",
-				"email": email,
-				"first_name": parts[0],
-				"last_name": parts[1] if len(parts) > 1 else "",
-				"enabled": 1,
-				"user_type": "System User"
-			})
-
-			# default roles
-			user.append_roles("Projects User", "Stock User", "Support Team")
-
-			if args.get("user_sales_" + str(i)):
-				user.append_roles("Sales User", "Sales Manager", "Accounts User")
-			if args.get("user_purchaser_" + str(i)):
-				user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
-			if args.get("user_accountant_" + str(i)):
-				user.append_roles("Accounts Manager", "Accounts User")
-
-			user.flags.delay_emails = True
-
-			if not frappe.db.get_value("User", email):
-				user.insert(ignore_permissions=True)
-
-				# create employee
-				emp = frappe.get_doc({
-					"doctype": "Employee",
-					"full_name": fullname,
-					"user_id": email,
-					"status": "Active",
-					"company": args.get("company_name")
-				})
-				emp.flags.ignore_mandatory = True
-				emp.insert(ignore_permissions = True)
-
-@frappe.whitelist()
-def load_messages(language):
-	frappe.clear_cache()
-	set_default_language(language)
-	m = get_dict("page", "setup-wizard")
-	m.update(get_dict("boot"))
-	send_translations(m)
-	return frappe.local.lang
-
-@frappe.whitelist()
-def load_languages():
-	return {
-		"default_language": get_language_from_code(frappe.local.lang),
-		"languages": sorted(get_lang_dict().keys())
-	}

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard_message.html b/erpnext/setup/page/setup_wizard/setup_wizard_message.html
deleted file mode 100644
index e2f6bbc..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard_message.html
+++ /dev/null

@@ -1,7 +0,0 @@
-<div class="container setup-wizard-slide">
-	<img class="img-responsive setup-wizard-message-image" src="{%= image %}">
-
-	<p class="text-center lead">{%= title %}</p>
-
-	<p class="text-center">{%= message %}</p>
-</div>

diff --git a/erpnext/setup/page/setup_wizard/setup_wizard_page.html b/erpnext/setup/page/setup_wizard/setup_wizard_page.html
deleted file mode 100644
index 0067317..0000000
--- a/erpnext/setup/page/setup_wizard/setup_wizard_page.html
+++ /dev/null

@@ -1,21 +0,0 @@
-<div class="container setup-wizard-slide {%= css_class %}" data-slide-name="{%= name %}">
-	<div class="text-center setup-wizard-progress text-extra-muted">
-		{% for (var i=0; i < slides_count; i++) { %}
-		<i class="icon-fixed-width {% if (i+1==step) { %} icon-circle {% } else { %} icon-circle-blank {% } %}"></i>
-		{% } %}
-	</div>
-    <p class="text-center lead">{%= title %}</p>
-	<div class="row">
-		<div class="col-sm-12">
-			{% if (help) { %} <p class="text-center">{%= help %}</p> {% } %}
-			<div class="form"></div>
-		</div>
-	</div>
-	<div class="footer text-center">
-		<div>
-            <a class="prev-btn hide grey small">{%= __("Previous") %}</a>
-			<a class="next-btn hide btn btn-primary btn-sm">{%= __("Next") %}</a>
-			<a class="complete-btn hide btn btn-primary btn-sm"><b>{%= __("Complete Setup") %}</b></a>
-		</div>
-	</div>
-</div>

diff --git a/erpnext/setup/page/setup_wizard/test_setup_wizard.py b/erpnext/setup/page/setup_wizard/test_setup_wizard.py
deleted file mode 100644
index acc2459..0000000
--- a/erpnext/setup/page/setup_wizard/test_setup_wizard.py
+++ /dev/null

@@ -1,15 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from erpnext.setup.page.setup_wizard.test_setup_data import args
-from erpnext.setup.page.setup_wizard.setup_wizard import setup_account
-import frappe.utils.scheduler
-
-if __name__=="__main__":
-	frappe.connect()
-	frappe.local.form_dict = frappe._dict(args)
-	setup_account()
-	frappe.utils.scheduler.disable_scheduler()

diff --git a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
index 032eab9..5fe7a14 100644
--- a/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html
+++ b/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html

@@ -18,7 +18,7 @@
 
 			<br>
 			<hr>
-			<h3>Next Steps</h3>
+			<h3>{%= __("Next Steps") %}</h3>
 			<ul class="list-unstyled">
 				<li><a class="text-muted" href="#">{%= __("Go to the Desktop and start using ERPNext") %}</a></li>
 				<li><a class="text-muted" href="#Module/Learn">{%= __("View a list of all the help videos") %}</a></li>

diff --git a/erpnext/setup/page/setup_wizard/__init__.py b/erpnext/setup/setup_wizard/__init__.py
similarity index 100%
rename from erpnext/setup/page/setup_wizard/__init__.py
rename to erpnext/setup/setup_wizard/__init__.py


diff --git a/erpnext/setup/page/setup_wizard/data/sample_blog_post.html b/erpnext/setup/setup_wizard/data/sample_blog_post.html
similarity index 100%
rename from erpnext/setup/page/setup_wizard/data/sample_blog_post.html
rename to erpnext/setup/setup_wizard/data/sample_blog_post.html


diff --git a/erpnext/setup/page/setup_wizard/data/sample_home_page.css b/erpnext/setup/setup_wizard/data/sample_home_page.css
similarity index 100%
rename from erpnext/setup/page/setup_wizard/data/sample_home_page.css
rename to erpnext/setup/setup_wizard/data/sample_home_page.css


diff --git a/erpnext/setup/page/setup_wizard/data/sample_home_page.html b/erpnext/setup/setup_wizard/data/sample_home_page.html
similarity index 100%
rename from erpnext/setup/page/setup_wizard/data/sample_home_page.html
rename to erpnext/setup/setup_wizard/data/sample_home_page.html


diff --git a/erpnext/setup/setup_wizard/default_website.py b/erpnext/setup/setup_wizard/default_website.py
new file mode 100644
index 0000000..e8d4eb43
--- /dev/null
+++ b/erpnext/setup/setup_wizard/default_website.py

@@ -0,0 +1,92 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+from frappe import _
+from frappe.utils import nowdate
+
+class website_maker(object):
+	def __init__(self, company, tagline, user):
+		self.company = company
+		self.tagline = tagline
+		self.user = user
+		self.make_web_page()
+		self.make_website_settings()
+		self.make_blog()
+
+	def make_web_page(self):
+		# home page
+		self.webpage = frappe.get_doc({
+			"doctype": "Web Page",
+			"title": self.company,
+			"published": 1,
+			"header": "<div class='hero text-center'><h1>{0}</h1>".format(self.tagline or "Headline")+\
+				'<p>'+_("This is an example website auto-generated from ERPNext")+"</p>"+\
+				'<p><a class="btn btn-primary" href="/login">Login</a></p></div>',
+			"description": self.company + ":" + (self.tagline or ""),
+			"css": frappe.get_template("setup/setup_wizard/data/sample_home_page.css").render(),
+			"main_section": frappe.get_template("setup/setup_wizard/data/sample_home_page.html").render({
+				"company": self.company, "tagline": (self.tagline or "")
+			})
+		}).insert()
+
+	def make_website_settings(self):
+		# update in home page in settings
+		website_settings = frappe.get_doc("Website Settings", "Website Settings")
+		website_settings.home_page = self.webpage.name
+		website_settings.brand_html = self.company
+		website_settings.copyright = self.company
+		website_settings.top_bar_items = []
+		website_settings.append("top_bar_items", {
+			"doctype": "Top Bar Item",
+			"label":"Contact",
+			"url": "/contact"
+		})
+		website_settings.append("top_bar_items", {
+			"doctype": "Top Bar Item",
+			"label":"Blog",
+			"url": "/blog"
+		})
+		website_settings.append("top_bar_items", {
+			"doctype": "Top Bar Item",
+			"label": _("Products"),
+			"url": "/products"
+		})
+		website_settings.save()
+
+	def make_blog(self):
+		blogger = frappe.new_doc("Blogger")
+		user = frappe.get_doc("User", self.user)
+		blogger.user = self.user
+		blogger.full_name = user.first_name + (" " + user.last_name if user.last_name else "")
+		blogger.short_name = user.first_name.lower()
+		blogger.avatar = user.user_image
+		blogger.insert()
+
+		blog_category = frappe.get_doc({
+			"doctype": "Blog Category",
+			"category_name": "general",
+			"published": 1,
+			"title": _("General")
+		}).insert()
+
+		frappe.get_doc({
+			"doctype": "Blog Post",
+			"title": "Welcome",
+			"published": 1,
+			"published_on": nowdate(),
+			"blogger": blogger.name,
+			"blog_category": blog_category.name,
+			"blog_intro": "My First Blog",
+			"content": frappe.get_template("setup/setup_wizard/data/sample_blog_post.html").render(),
+		}).insert()
+
+def test():
+	frappe.delete_doc("Web Page", "test-company")
+	frappe.delete_doc("Blog Post", "welcome")
+	frappe.delete_doc("Blogger", "administrator")
+	frappe.delete_doc("Blog Category", "general")
+	website_maker("Test Company", "Better Tools for Everyone", "Administrator")
+	frappe.db.commit()

diff --git a/erpnext/setup/page/setup_wizard/fixtures/industry_type.py b/erpnext/setup/setup_wizard/industry_type.py
similarity index 100%
rename from erpnext/setup/page/setup_wizard/fixtures/industry_type.py
rename to erpnext/setup/setup_wizard/industry_type.py


diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
new file mode 100644
index 0000000..d3d0cb4
--- /dev/null
+++ b/erpnext/setup/setup_wizard/install_fixtures.py

@@ -0,0 +1,203 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+from frappe import _
+
+def install(country=None):
+	records = [
+
+		# address template
+		{'doctype':"Address Template", "country": country},
+
+		# item group
+		{'doctype': 'Item Group', 'item_group_name': _('All Item Groups'),
+			'is_group': 'Yes', 'parent_item_group': ''},
+		{'doctype': 'Item Group', 'item_group_name': _('Products'),
+			'is_group': 'No', 'parent_item_group': _('All Item Groups'), "show_in_website": 1 },
+		{'doctype': 'Item Group', 'item_group_name': _('Raw Material'),
+			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+		{'doctype': 'Item Group', 'item_group_name': _('Services'),
+			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+		{'doctype': 'Item Group', 'item_group_name': _('Sub Assemblies'),
+			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+		{'doctype': 'Item Group', 'item_group_name': _('Consumable'),
+			'is_group': 'No', 'parent_item_group': _('All Item Groups') },
+
+		# deduction type
+		{'doctype': 'Deduction Type', 'name': _('Income Tax'), 'description': _('Income Tax'), 'deduction_name': _('Income Tax')},
+
+		# earning type
+		{'doctype': 'Earning Type', 'name': _('Basic'), 'description': _('Basic'), 'earning_name': _('Basic'), 'taxable': 'Yes'},
+
+		# expense claim type
+		{'doctype': 'Expense Claim Type', 'name': _('Calls'), 'expense_type': _('Calls')},
+		{'doctype': 'Expense Claim Type', 'name': _('Food'), 'expense_type': _('Food')},
+		{'doctype': 'Expense Claim Type', 'name': _('Medical'), 'expense_type': _('Medical')},
+		{'doctype': 'Expense Claim Type', 'name': _('Others'), 'expense_type': _('Others')},
+		{'doctype': 'Expense Claim Type', 'name': _('Travel'), 'expense_type': _('Travel')},
+
+		# leave type
+		{'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'),
+			'is_encash': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1},
+		{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
+			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+		{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'),
+			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+		{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'),
+			'is_encash': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+		{'doctype': 'Leave Type', 'leave_type_name': _('Leave Without Pay'), 'name': _('Leave Without Pay'),
+			'is_encash': 0, 'is_carry_forward': 0, 'is_lwp':1, 'include_holiday': 1},
+
+		# Employment Type
+		{'doctype': 'Employment Type', 'employee_type_name': _('Full-time')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Part-time')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Probation')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Contract')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Commission')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Piecework')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Intern')},
+		{'doctype': 'Employment Type', 'employee_type_name': _('Apprentice')},
+
+		# Department
+		{'doctype': 'Department', 'department_name': _('Accounts')},
+		{'doctype': 'Department', 'department_name': _('Marketing')},
+		{'doctype': 'Department', 'department_name': _('Sales')},
+		{'doctype': 'Department', 'department_name': _('Purchase')},
+		{'doctype': 'Department', 'department_name': _('Operations')},
+		{'doctype': 'Department', 'department_name': _('Production')},
+		{'doctype': 'Department', 'department_name': _('Dispatch')},
+		{'doctype': 'Department', 'department_name': _('Customer Service')},
+		{'doctype': 'Department', 'department_name': _('Human Resources')},
+		{'doctype': 'Department', 'department_name': _('Management')},
+		{'doctype': 'Department', 'department_name': _('Quality Management')},
+		{'doctype': 'Department', 'department_name': _('Research & Development')},
+		{'doctype': 'Department', 'department_name': _('Legal')},
+
+		# Designation
+		{'doctype': 'Designation', 'designation_name': _('CEO')},
+		{'doctype': 'Designation', 'designation_name': _('Manager')},
+		{'doctype': 'Designation', 'designation_name': _('Analyst')},
+		{'doctype': 'Designation', 'designation_name': _('Engineer')},
+		{'doctype': 'Designation', 'designation_name': _('Accountant')},
+		{'doctype': 'Designation', 'designation_name': _('Secretary')},
+		{'doctype': 'Designation', 'designation_name': _('Associate')},
+		{'doctype': 'Designation', 'designation_name': _('Administrative Officer')},
+		{'doctype': 'Designation', 'designation_name': _('Business Development Manager')},
+		{'doctype': 'Designation', 'designation_name': _('HR Manager')},
+		{'doctype': 'Designation', 'designation_name': _('Project Manager')},
+		{'doctype': 'Designation', 'designation_name': _('Head of Marketing and Sales')},
+		{'doctype': 'Designation', 'designation_name': _('Software Developer')},
+		{'doctype': 'Designation', 'designation_name': _('Designer')},
+		{'doctype': 'Designation', 'designation_name': _('Researcher')},
+
+		# territory
+		{'doctype': 'Territory', 'territory_name': _('All Territories'), 'is_group': 'Yes', 'name': _('All Territories'), 'parent_territory': ''},
+
+		# customer group
+		{'doctype': 'Customer Group', 'customer_group_name': _('All Customer Groups'), 'is_group': 'Yes', 	'name': _('All Customer Groups'), 'parent_customer_group': ''},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Individual'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Commercial'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Non Profit'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
+		{'doctype': 'Customer Group', 'customer_group_name': _('Government'), 'is_group': 'No', 'parent_customer_group': _('All Customer Groups')},
+
+		# supplier type
+		{'doctype': 'Supplier Type', 'supplier_type': _('Services')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Local')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Raw Material')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Electrical')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Hardware')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Pharmaceutical')},
+		{'doctype': 'Supplier Type', 'supplier_type': _('Distributor')},
+
+		# Sales Person
+		{'doctype': 'Sales Person', 'sales_person_name': _('Sales Team'), 'is_group': "Yes", "parent_sales_person": ""},
+
+		# UOM
+		{'uom_name': _('Unit'), 'doctype': 'UOM', 'name': _('Unit'), "must_be_whole_number": 1},
+		{'uom_name': _('Box'), 'doctype': 'UOM', 'name': _('Box'), "must_be_whole_number": 1},
+		{'uom_name': _('Kg'), 'doctype': 'UOM', 'name': _('Kg')},
+		{'uom_name': _('Nos'), 'doctype': 'UOM', 'name': _('Nos'), "must_be_whole_number": 1},
+		{'uom_name': _('Pair'), 'doctype': 'UOM', 'name': _('Pair'), "must_be_whole_number": 1},
+		{'uom_name': _('Set'), 'doctype': 'UOM', 'name': _('Set'), "must_be_whole_number": 1},
+		{'uom_name': _('Hour'), 'doctype': 'UOM', 'name': _('Hour')},
+		{'uom_name': _('Minute'), 'doctype': 'UOM', 'name': _('Minute')},
+
+		# Mode of Payment
+		{'doctype': 'Mode of Payment', 'mode_of_payment': 'Check' if country=="United States" else _('Cheque')},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Cash')},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Credit Card')},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Wire Transfer')},
+		{'doctype': 'Mode of Payment', 'mode_of_payment': _('Bank Draft')},
+
+		# Activity Type
+		{'doctype': 'Activity Type', 'activity_type': _('Planning')},
+		{'doctype': 'Activity Type', 'activity_type': _('Research')},
+		{'doctype': 'Activity Type', 'activity_type': _('Proposal Writing')},
+		{'doctype': 'Activity Type', 'activity_type': _('Execution')},
+		{'doctype': 'Activity Type', 'activity_type': _('Communication')},
+
+		{'doctype': "Item Attribute", "attribute_name": _("Size"), "item_attribute_values": [
+			{"attribute_value": _("Extra Small"), "abbr": "XS"},
+			{"attribute_value": _("Small"), "abbr": "S"},
+			{"attribute_value": _("Medium"), "abbr": "M"},
+			{"attribute_value": _("Large"), "abbr": "L"},
+			{"attribute_value": _("Extra Large"), "abbr": "XL"}
+		]},
+
+		{'doctype': "Item Attribute", "attribute_name": _("Colour"), "item_attribute_values": [
+			{"attribute_value": _("Red"), "abbr": "RED"},
+			{"attribute_value": _("Green"), "abbr": "GRE"},
+			{"attribute_value": _("Blue"), "abbr": "BLU"},
+			{"attribute_value": _("Black"), "abbr": "BLA"},
+			{"attribute_value": _("White"), "abbr": "WHI"}
+		]},
+
+		{'doctype': "Email Account", "email_id": "sales@example.com", "append_to": "Opportunity"},
+		{'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"},
+		{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"},
+
+		{"doctype": "Offer Term", "offer_term": _("Date of Joining")},
+		{"doctype": "Offer Term", "offer_term": _("Annual Salary")},
+		{"doctype": "Offer Term", "offer_term": _("Probationary Period")},
+		{"doctype": "Offer Term", "offer_term": _("Employee Benefits")},
+		{"doctype": "Offer Term", "offer_term": _("Working Hours")},
+		{"doctype": "Offer Term", "offer_term": _("Stock Options")},
+		{"doctype": "Offer Term", "offer_term": _("Department")},
+		{"doctype": "Offer Term", "offer_term": _("Job Description")},
+		{"doctype": "Offer Term", "offer_term": _("Responsibilities")},
+		{"doctype": "Offer Term", "offer_term": _("Leaves per Year")},
+		{"doctype": "Offer Term", "offer_term": _("Notice Period")},
+		{"doctype": "Offer Term", "offer_term": _("Incentives")},
+
+		{'doctype': "Print Heading", 'print_heading': _("Credit Note")},
+		{'doctype': "Print Heading", 'print_heading': _("Debit Note")}
+	]
+
+	from erpnext.setup.setup_wizard.industry_type import get_industry_types
+	records += [{"doctype":"Industry Type", "industry": d} for d in get_industry_types()]
+	# records += [{"doctype":"Operation", "operation": d} for d in get_operations()]
+
+	from frappe.modules import scrub
+	for r in records:
+		doc = frappe.new_doc(r.get("doctype"))
+		doc.update(r)
+
+		# ignore mandatory for root
+		parent_link_field = ("parent_" + scrub(doc.doctype))
+		if doc.meta.get_field(parent_link_field) and not doc.get(parent_link_field):
+			doc.flags.ignore_mandatory = True
+
+		try:
+			doc.insert(ignore_permissions=True)
+		except frappe.DuplicateEntryError, e:
+			# pass DuplicateEntryError and continue
+			if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
+				# make sure DuplicateEntryError is for the exact same doc and not a related doc
+				pass
+			else:
+				raise
+

diff --git a/erpnext/setup/page/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
similarity index 100%
rename from erpnext/setup/page/setup_wizard/sample_data.py
rename to erpnext/setup/setup_wizard/sample_data.py


diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
new file mode 100644
index 0000000..4d4cc6d
--- /dev/null
+++ b/erpnext/setup/setup_wizard/setup_wizard.py

@@ -0,0 +1,497 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe, copy
+
+from frappe.utils import cstr, flt, getdate
+from frappe import _
+from frappe.utils.file_manager import save_file
+from .default_website import website_maker
+import install_fixtures
+from .sample_data import make_sample_data
+from erpnext.accounts.utils import FiscalYearError
+from erpnext.accounts.doctype.account.account import RootNotEditable
+
+def setup_complete(args=None):
+	if frappe.db.sql("select name from tabCompany"):
+		frappe.throw(_("Setup Already Complete!!"))
+
+	install_fixtures.install(args.get("country"))
+
+	update_user_name(args)
+	create_fiscal_year_and_company(args)
+	create_users(args)
+	set_defaults(args)
+	create_territories()
+	create_price_lists(args)
+	create_feed_and_todo()
+	create_email_digest()
+	create_letter_head(args)
+	create_taxes(args)
+	create_items(args)
+	create_customers(args)
+	create_suppliers(args)
+	frappe.local.message_log = []
+
+	website_maker(args.company_name.strip(), args.company_tagline, args.name)
+	create_logo(args)
+
+	frappe.db.commit()
+	login_as_first_user(args)
+	frappe.db.commit()
+	frappe.clear_cache()
+
+	if args.get("add_sample_data"):
+		try:
+			make_sample_data()
+			frappe.clear_cache()
+		except FiscalYearError:
+			pass
+
+
+def update_user_name(args):
+	if args.get("email"):
+		args['name'] = args.get("email")
+
+		_mute_emails, frappe.flags.mute_emails = frappe.flags.mute_emails, True
+		doc = frappe.get_doc({
+			"doctype":"User",
+			"email": args.get("email"),
+			"first_name": args.get("first_name"),
+			"last_name": args.get("last_name")
+		})
+		doc.flags.no_welcome_mail = True
+		doc.insert()
+		frappe.flags.mute_emails = _mute_emails
+		from frappe.auth import _update_password
+		_update_password(args.get("email"), args.get("password"))
+
+	else:
+		args['name'] = frappe.session.user
+
+		# Update User
+		if not args.get('last_name') or args.get('last_name')=='None':
+				args['last_name'] = None
+		frappe.db.sql("""update `tabUser` SET first_name=%(first_name)s,
+			last_name=%(last_name)s WHERE name=%(name)s""", args)
+
+	if args.get("attach_user"):
+		attach_user = args.get("attach_user").split(",")
+		if len(attach_user)==3:
+			filename, filetype, content = attach_user
+			fileurl = save_file(filename, content, "User", args.get("name"), decode=True).file_url
+			frappe.db.set_value("User", args.get("name"), "user_image", fileurl)
+
+	add_all_roles_to(args.get("name"))
+
+def create_fiscal_year_and_company(args):
+	curr_fiscal_year = get_fy_details(args.get('fy_start_date'), args.get('fy_end_date'))
+	frappe.get_doc({
+		"doctype":"Fiscal Year",
+		'year': curr_fiscal_year,
+		'year_start_date': args.get('fy_start_date'),
+		'year_end_date': args.get('fy_end_date'),
+	}).insert()
+
+	# Company
+	frappe.get_doc({
+		"doctype":"Company",
+		'domain': args.get("industry"),
+		'company_name':args.get('company_name').strip(),
+		'abbr':args.get('company_abbr'),
+		'default_currency':args.get('currency'),
+		'country': args.get('country'),
+		'chart_of_accounts': args.get(('chart_of_accounts')),
+	}).insert()
+
+	# Bank Account
+
+	args["curr_fiscal_year"] = curr_fiscal_year
+
+def create_price_lists(args):
+	for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
+		frappe.get_doc({
+			"doctype": "Price List",
+			"price_list_name": pl_name,
+			"enabled": 1,
+			"buying": 1 if pl_type == "Buying" else 0,
+			"selling": 1 if pl_type == "Selling" else 0,
+			"currency": args["currency"]
+		}).insert()
+
+def set_defaults(args):
+	# enable default currency
+	frappe.db.set_value("Currency", args.get("currency"), "enabled", 1)
+
+	global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
+	global_defaults.update({
+		'current_fiscal_year': args.curr_fiscal_year,
+		'default_currency': args.get('currency'),
+		'default_company':args.get('company_name').strip(),
+		"country": args.get("country"),
+	})
+
+	global_defaults.save()
+
+	frappe.db.set_value("System Settings", None, "email_footer_address", args.get("company"))
+
+	accounts_settings = frappe.get_doc("Accounts Settings")
+	accounts_settings.auto_accounting_for_stock = 1
+	accounts_settings.save()
+
+	stock_settings = frappe.get_doc("Stock Settings")
+	stock_settings.item_naming_by = "Item Code"
+	stock_settings.valuation_method = "FIFO"
+	stock_settings.stock_uom = _("Nos")
+	stock_settings.auto_indent = 1
+	stock_settings.auto_insert_price_list_rate_if_missing = 1
+	stock_settings.automatically_set_serial_nos_based_on_fifo = 1
+	stock_settings.save()
+
+	selling_settings = frappe.get_doc("Selling Settings")
+	selling_settings.cust_master_name = "Customer Name"
+	selling_settings.so_required = "No"
+	selling_settings.dn_required = "No"
+	selling_settings.save()
+
+	buying_settings = frappe.get_doc("Buying Settings")
+	buying_settings.supp_master_name = "Supplier Name"
+	buying_settings.po_required = "No"
+	buying_settings.pr_required = "No"
+	buying_settings.maintain_same_rate = 1
+	buying_settings.save()
+
+	notification_control = frappe.get_doc("Notification Control")
+	notification_control.quotation = 1
+	notification_control.sales_invoice = 1
+	notification_control.purchase_order = 1
+	notification_control.save()
+
+	hr_settings = frappe.get_doc("HR Settings")
+	hr_settings.emp_created_by = "Naming Series"
+	hr_settings.save()
+
+def create_feed_and_todo():
+	"""update Activity feed and create todo for creation of item, customer, vendor"""
+	frappe.get_doc({
+		"doctype": "Feed",
+		"feed_type": "Comment",
+		"subject": "ERPNext Setup Complete!"
+	}).insert(ignore_permissions=True)
+
+def create_email_digest():
+	from frappe.utils.user import get_system_managers
+	system_managers = get_system_managers(only_name=True)
+	if not system_managers:
+		return
+
+	companies = frappe.db.sql_list("select name FROM `tabCompany`")
+	for company in companies:
+		if not frappe.db.exists("Email Digest", "Default Weekly Digest - " + company):
+			edigest = frappe.get_doc({
+				"doctype": "Email Digest",
+				"name": "Default Weekly Digest - " + company,
+				"company": company,
+				"frequency": "Weekly",
+				"recipient_list": "\n".join(system_managers)
+			})
+
+			for df in edigest.meta.get("fields", {"fieldtype": "Check"}):
+				if df.fieldname != "scheduler_errors":
+					edigest.set(df.fieldname, 1)
+
+			edigest.insert()
+
+	# scheduler errors digest
+	if companies:
+		edigest = frappe.new_doc("Email Digest")
+		edigest.update({
+			"name": "Scheduler Errors",
+			"company": companies[0],
+			"frequency": "Daily",
+			"recipient_list": "\n".join(system_managers),
+			"scheduler_errors": 1,
+			"enabled": 1
+		})
+		edigest.insert()
+
+def get_fy_details(fy_start_date, fy_end_date):
+	start_year = getdate(fy_start_date).year
+	if start_year == getdate(fy_end_date).year:
+		fy = cstr(start_year)
+	else:
+		fy = cstr(start_year) + '-' + cstr(start_year + 1)
+	return fy
+
+def create_taxes(args):
+
+	for i in xrange(1,6):
+		if args.get("tax_" + str(i)):
+			# replace % in case someone also enters the % symbol
+			tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
+
+			try:
+				tax_group = frappe.db.get_value("Account", {"company": args.get("company_name"),
+					"is_group": 1, "account_type": "Tax", "root_type": "Liability"})
+				if tax_group:
+					account = make_tax_head(args, i, tax_group, tax_rate)
+					make_sales_and_purchase_tax_templates(account)
+
+			except frappe.NameError, e:
+				if e.args[2][0]==1062:
+					pass
+				else:
+					raise
+			except RootNotEditable, e:
+				pass
+
+def make_tax_head(args, i, tax_group, tax_rate):
+	return frappe.get_doc({
+		"doctype":"Account",
+		"company": args.get("company_name").strip(),
+		"parent_account": tax_group,
+		"account_name": args.get("tax_" + str(i)),
+		"is_group": 0,
+		"report_type": "Balance Sheet",
+		"account_type": "Tax",
+		"tax_rate": flt(tax_rate) if tax_rate else None
+	}).insert(ignore_permissions=True)
+
+def make_sales_and_purchase_tax_templates(account):
+	doc = {
+		"doctype": "Sales Taxes and Charges Template",
+		"title": account.name,
+		"taxes": [{
+		    "category": "Valuation and Total",
+		    "charge_type": "On Net Total",
+			"account_head": account.name,
+			"description": "{0} @ {1}".format(account.account_name, account.tax_rate),
+			"rate": account.tax_rate
+		}]
+	}
+
+	# Sales
+	frappe.get_doc(copy.deepcopy(doc)).insert()
+
+	# Purchase
+	doc["doctype"] = "Purchase Taxes and Charges Template"
+	frappe.get_doc(copy.deepcopy(doc)).insert()
+
+def create_items(args):
+	for i in xrange(1,6):
+		item = args.get("item_" + str(i))
+		if item:
+			item_group = args.get("item_group_" + str(i))
+			is_sales_item = args.get("is_sales_item_" + str(i))
+			is_purchase_item = args.get("is_purchase_item_" + str(i))
+			is_stock_item = item_group!=_("Services")
+			is_pro_applicable = item_group!=_("Services")
+			default_warehouse = ""
+			if is_stock_item:
+				default_warehouse = frappe.db.get_value("Warehouse", filters={
+					"warehouse_name": _("Finished Goods") if is_sales_item else _("Stores"),
+					"company": args.get("company_name").strip()
+				})
+
+			try:
+				frappe.get_doc({
+					"doctype":"Item",
+					"item_code": item,
+					"item_name": item,
+					"description": item,
+					"is_sales_item": 1 if is_sales_item else 0,
+					"is_purchase_item": 1 if is_purchase_item else 0,
+					"show_in_website": 1,
+					"is_stock_item": is_stock_item and 1 or 0,
+					"is_pro_applicable": is_pro_applicable and 1 or 0,
+					"item_group": item_group,
+					"stock_uom": args.get("item_uom_" + str(i)),
+					"default_warehouse": default_warehouse
+				}).insert()
+
+				if args.get("item_img_" + str(i)):
+					item_image = args.get("item_img_" + str(i)).split(",")
+					if len(item_image)==3:
+						filename, filetype, content = item_image
+						fileurl = save_file(filename, content, "Item", item, decode=True).file_url
+						frappe.db.set_value("Item", item, "image", fileurl)
+
+				if args.get("item_price_" + str(i)):
+					item_price = flt(args.get("item_price_" + str(i)))
+
+					if is_sales_item:
+						price_list_name = frappe.db.get_value("Price List", {"selling": 1})
+						make_item_price(item, price_list_name, item_price)
+
+					if is_purchase_item:
+						price_list_name = frappe.db.get_value("Price List", {"buying": 1})
+						make_item_price(item, price_list_name, item_price)
+
+			except frappe.NameError:
+				pass
+
+def make_item_price(item, price_list_name, item_price):
+	frappe.get_doc({
+		"doctype": "Item Price",
+		"price_list": price_list_name,
+		"item_code": item,
+		"price_list_rate": item_price
+	}).insert()
+
+
+def create_customers(args):
+	for i in xrange(1,6):
+		customer = args.get("customer_" + str(i))
+		if customer:
+			try:
+				frappe.get_doc({
+					"doctype":"Customer",
+					"customer_name": customer,
+					"customer_type": "Company",
+					"customer_group": _("Commercial"),
+					"territory": args.get("country"),
+					"company": args.get("company_name").strip()
+				}).insert()
+
+				if args.get("customer_contact_" + str(i)):
+					create_contact(args.get("customer_contact_" + str(i)),
+						"customer", customer)
+			except frappe.NameError:
+				pass
+
+def create_suppliers(args):
+	for i in xrange(1,6):
+		supplier = args.get("supplier_" + str(i))
+		if supplier:
+			try:
+				frappe.get_doc({
+					"doctype":"Supplier",
+					"supplier_name": supplier,
+					"supplier_type": _("Local"),
+					"company": args.get("company_name").strip()
+				}).insert()
+
+				if args.get("supplier_contact_" + str(i)):
+					create_contact(args.get("supplier_contact_" + str(i)),
+						"supplier", supplier)
+			except frappe.NameError:
+				pass
+
+def create_contact(contact, party_type, party):
+	"""Create contact based on given contact name"""
+	contact = contact.strip().split(" ")
+
+	frappe.get_doc({
+		"doctype":"Contact",
+		party_type: party,
+		"first_name":contact[0],
+		"last_name": len(contact) > 1 and contact[1] or ""
+	}).insert()
+
+def create_letter_head(args):
+	if args.get("attach_letterhead"):
+		frappe.get_doc({
+			"doctype":"Letter Head",
+			"letter_head_name": _("Standard"),
+			"is_default": 1
+		}).insert()
+
+		attach_letterhead = args.get("attach_letterhead").split(",")
+		if len(attach_letterhead)==3:
+			filename, filetype, content = attach_letterhead
+			fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url
+			frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl)
+
+def create_logo(args):
+	if args.get("attach_logo"):
+		attach_logo = args.get("attach_logo").split(",")
+		if len(attach_logo)==3:
+			filename, filetype, content = attach_logo
+			fileurl = save_file(filename, content, "Website Settings", "Website Settings",
+				decode=True).file_url
+			frappe.db.set_value("Website Settings", "Website Settings", "brand_html",
+				"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name").strip()))
+
+def add_all_roles_to(name):
+	user = frappe.get_doc("User", name)
+	for role in frappe.db.sql("""select name from tabRole"""):
+		if role[0] not in ["Administrator", "Guest", "All", "Customer", "Supplier", "Partner", "Employee"]:
+			d = user.append("user_roles")
+			d.role = role[0]
+	user.save()
+
+def create_territories():
+	"""create two default territories, one for home country and one named Rest of the World"""
+	from frappe.utils.nestedset import get_root_of
+	country = frappe.db.get_default("country")
+	root_territory = get_root_of("Territory")
+	for name in (country, _("Rest Of The World")):
+		if name and not frappe.db.exists("Territory", name):
+			frappe.get_doc({
+				"doctype": "Territory",
+				"territory_name": name.replace("'", ""),
+				"parent_territory": root_territory,
+				"is_group": "No"
+			}).insert()
+
+def login_as_first_user(args):
+	if args.get("email") and hasattr(frappe.local, "login_manager"):
+		frappe.local.login_manager.login_as(args.get("email"))
+
+def create_users(args):
+	# create employee for self
+	emp = frappe.get_doc({
+		"doctype": "Employee",
+		"full_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
+		"user_id": frappe.session.user,
+		"status": "Active",
+		"company": args.get("company_name")
+	})
+	emp.flags.ignore_mandatory = True
+	emp.insert(ignore_permissions = True)
+
+	for i in xrange(1,5):
+		email = args.get("user_email_" + str(i))
+		fullname = args.get("user_fullname_" + str(i))
+		if email:
+			if not fullname:
+				fullname = email.split("@")[0]
+
+			parts = fullname.split(" ", 1)
+
+			user = frappe.get_doc({
+				"doctype": "User",
+				"email": email,
+				"first_name": parts[0],
+				"last_name": parts[1] if len(parts) > 1 else "",
+				"enabled": 1,
+				"user_type": "System User"
+			})
+
+			# default roles
+			user.append_roles("Projects User", "Stock User", "Support Team")
+
+			if args.get("user_sales_" + str(i)):
+				user.append_roles("Sales User", "Sales Manager", "Accounts User")
+			if args.get("user_purchaser_" + str(i)):
+				user.append_roles("Purchase User", "Purchase Manager", "Accounts User")
+			if args.get("user_accountant_" + str(i)):
+				user.append_roles("Accounts Manager", "Accounts User")
+
+			user.flags.delay_emails = True
+
+			if not frappe.db.get_value("User", email):
+				user.insert(ignore_permissions=True)
+
+				# create employee
+				emp = frappe.get_doc({
+					"doctype": "Employee",
+					"full_name": fullname,
+					"user_id": email,
+					"status": "Active",
+					"company": args.get("company_name")
+				})
+				emp.flags.ignore_mandatory = True
+				emp.insert(ignore_permissions = True)
+

diff --git a/erpnext/setup/page/setup_wizard/test_setup_data.py b/erpnext/setup/setup_wizard/test_setup_data.py
similarity index 100%
rename from erpnext/setup/page/setup_wizard/test_setup_data.py
rename to erpnext/setup/setup_wizard/test_setup_data.py


diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py
new file mode 100644
index 0000000..59bf8bf
--- /dev/null
+++ b/erpnext/setup/setup_wizard/test_setup_wizard.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+from erpnext.setup.setup_wizard.test_setup_data import args
+from frappe.desk.page.setup_wizard.setup_wizard import setup_complete
+import frappe.utils.scheduler
+
+if __name__=="__main__":
+	frappe.connect()
+	frappe.local.form_dict = frappe._dict(args)
+	setup_complete()
+	frappe.utils.scheduler.disable_scheduler()

diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index cb642f9..c3bd452 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py

@@ -32,9 +32,9 @@
 def before_tests():
 	frappe.clear_cache()
 	# complete setup if missing
-	from erpnext.setup.page.setup_wizard.setup_wizard import setup_account
+	from frappe.desk.page.setup_wizard.setup_wizard import setup_complete
 	if not frappe.get_list("Company"):
-		setup_account({
+		setup_complete({
 			"currency"			:"USD",
 			"first_name"		:"Test",
 			"last_name"			:"User",
@@ -63,6 +63,9 @@
 
 @frappe.whitelist()
 def get_exchange_rate(from_currency, to_currency):
+	if from_currency == to_currency:
+		return 1
+	
 	exchange = "%s-%s" % (from_currency, to_currency)
 	value = flt(frappe.db.get_value("Currency Exchange", exchange, "exchange_rate"))
 
@@ -72,21 +75,20 @@
 			key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
 			value = cache.get(key)
 
-			print value
-
 			if not value:
 				import requests
 				response = requests.get("http://api.fixer.io/latest", params={
 					"base": from_currency,
 					"symbols": to_currency
 				})
-				# expire in 24 hours
+				# expire in 6 hours
 				response.raise_for_status()
 				value = response.json()["rates"][to_currency]
-				cache.setex(key, value, 24 * 60 * 60)
+				cache.setex(key, value, 6 * 60 * 60)
+
 			return flt(value)
 		except:
-			frappe.msgprint(_("Unable to find exchange rate"))
+			frappe.msgprint(_("Unable to find exchange rate for {0} to {1}").format(from_currency, to_currency))
 			return 0.0
 	else:
 		return value

diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index c116bdc..561a50c 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py

@@ -280,6 +280,7 @@
 		user = frappe.session.user
 
 	customer = frappe.db.get_value("Contact", {"email_id": user}, "customer")
+
 	if customer:
 		return frappe.get_doc("Customer", customer)
 
@@ -320,6 +321,17 @@
 
 	return address_docs
 
+def set_customer_in_address(doc, method=None):
+	if doc.flags.linked:
+		return
+
+	doc.check_if_linked()
+
+	if not doc.flags.linked and (frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User"):
+		# creates a customer if one does not exist
+		get_customer()
+		doc.link_address()
+
 @frappe.whitelist()
 def apply_shipping_rule(shipping_rule):
 	quotation = _get_cart_quotation()

diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 474af2c..445c09d 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py

@@ -39,12 +39,12 @@
 		bootinfo.docs += [frappe.get_doc("Country", country)]
 
 	bootinfo.docs += frappe.db.sql("""select * from tabCurrency
-		where ifnull(enabled,0)=1""", as_dict=1, update={"doctype":":Currency"})
+		where enabled=1""", as_dict=1, update={"doctype":":Currency"})
 
 def get_letter_heads():
 	import frappe
 	ret = frappe.db.sql("""select name, content from `tabLetter Head`
-		where ifnull(disabled,0)=0""")
+		where disabled=0""")
 	return dict(ret)
 
 def update_page_info(bootinfo):

diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index b1b63b0..4b5de23 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py

@@ -15,7 +15,7 @@
 			"Opportunity": {"status": "Open"},
 			"Quotation": {"docstatus": 0},
 			"Sales Order": {
-				"status": ("not in", ("Stopped", "Completed")),
+				"status": ("not in", ("Stopped", "Completed", "Closed")),
 				"docstatus": ("<", 2)
 			},
 			"Journal Entry": {"docstatus": 0},
@@ -29,7 +29,7 @@
 			"Stock Entry": {"docstatus": 0},
 			"Material Request": {"docstatus": 0},
 			"Purchase Order": {
-				"status": ("not in", ("Stopped", "Completed")),
+				"status": ("not in", ("Stopped", "Completed", "Closed")),
 				"docstatus": ("<", 2)
 			},
 			"Production Order": { "status": "In Process" },

diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index b8653cd..7e209b6 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py

@@ -78,7 +78,7 @@
 	"Stock Ledger Entry": {
 		"columns": ["name", "posting_date", "posting_time", "item_code", "warehouse",
 			"actual_qty as qty", "voucher_type", "voucher_no", "project",
-			"ifnull(incoming_rate,0) as incoming_rate", "stock_uom", "serial_no",
+			"incoming_rate as incoming_rate", "stock_uom", "serial_no",
 			"qty_after_transaction", "valuation_rate"],
 		"order_by": "posting_date, posting_time, name",
 		"links": {
@@ -100,10 +100,10 @@
 	},
 	"Production Order": {
 		"columns": ["name", "production_item as item_code",
-			"(ifnull(qty, 0) - ifnull(produced_qty, 0)) as qty",
+			"(qty - produced_qty) as qty",
 			"fg_warehouse as warehouse"],
 		"conditions": ["docstatus=1", "status != 'Stopped'", "ifnull(fg_warehouse, '')!=''",
-			"ifnull(qty, 0) > ifnull(produced_qty, 0)"],
+			"qty > produced_qty"],
 		"links": {
 			"item_code": ["Item", "name"],
 			"warehouse": ["Warehouse", "name"]
@@ -111,10 +111,10 @@
 	},
 	"Material Request Item": {
 		"columns": ["item.name as name", "item_code", "warehouse",
-			"(ifnull(qty, 0) - ifnull(ordered_qty, 0)) as qty"],
+			"(qty - ordered_qty) as qty"],
 		"from": "`tabMaterial Request Item` item, `tabMaterial Request` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
-			"ifnull(warehouse, '')!=''", "ifnull(qty, 0) > ifnull(ordered_qty, 0)"],
+			"ifnull(warehouse, '')!=''", "qty > ordered_qty"],
 		"links": {
 			"item_code": ["Item", "name"],
 			"warehouse": ["Warehouse", "name"]
@@ -122,10 +122,10 @@
 	},
 	"Purchase Order Item": {
 		"columns": ["item.name as name", "item_code", "warehouse",
-			"(ifnull(qty, 0) - ifnull(received_qty, 0)) as qty"],
+			"(qty - received_qty) as qty"],
 		"from": "`tabPurchase Order Item` item, `tabPurchase Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
-			"ifnull(warehouse, '')!=''", "ifnull(qty, 0) > ifnull(received_qty, 0)"],
+			"ifnull(warehouse, '')!=''", "qty > received_qty"],
 		"links": {
 			"item_code": ["Item", "name"],
 			"warehouse": ["Warehouse", "name"]
@@ -133,10 +133,10 @@
 	},
 
 	"Sales Order Item": {
-		"columns": ["item.name as name", "item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty", "warehouse"],
+		"columns": ["item.name as name", "item_code", "(qty - delivered_qty) as qty", "warehouse"],
 		"from": "`tabSales Order Item` item, `tabSales Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
-			"ifnull(warehouse, '')!=''", "ifnull(qty, 0) > ifnull(delivered_qty, 0)"],
+			"ifnull(warehouse, '')!=''", "qty > delivered_qty"],
 		"links": {
 			"item_code": ["Item", "name"],
 			"warehouse": ["Warehouse", "name"]

diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 31ab1b0..1abe9b3 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch ID", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "batch_id", 
    "oldfieldtype": "Data", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item", 
    "oldfieldtype": "Link", 
@@ -66,6 +68,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expiry Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "expiry_date", 
    "oldfieldtype": "Date", 
@@ -110,6 +114,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -156,7 +162,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
- "modified": "2015-10-02 07:38:39.257122", 
+ "modified": "2015-11-16 06:29:42.315839", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Batch", 

diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 7231d75..37fe0a4 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -68,6 +70,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Reserved Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reserved_qty", 
    "oldfieldtype": "Currency", 
@@ -92,6 +95,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Actual Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -116,6 +120,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Ordered Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ordered_qty", 
    "oldfieldtype": "Currency", 
@@ -140,6 +145,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity Requested for Purchase", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "indented_qty", 
    "oldfieldtype": "Currency", 
@@ -163,6 +169,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Planned Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "planned_qty", 
    "oldfieldtype": "Currency", 
@@ -186,6 +193,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "projected_qty", 
    "oldfieldtype": "Currency", 
@@ -209,6 +217,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Moving Average Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ma_rate", 
    "oldfieldtype": "Currency", 
@@ -232,6 +241,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -256,6 +266,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "FCFS Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fcfs_rate", 
    "oldfieldtype": "Currency", 
@@ -279,6 +290,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "valuation_rate", 
    "oldfieldtype": "Currency", 
@@ -302,6 +314,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_value", 
    "oldfieldtype": "Currency", 
@@ -323,7 +336,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:39.346727", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:42.363502", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Bin", 

diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 9cd4936..4bef0d8 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js

@@ -46,13 +46,14 @@
 			if (cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 				this.show_general_ledger();
 			}
-
-			if(doc.status !== "Closed") {
-				cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
+			if (this.frm.has_perm("submit") && (doc.status !== "Closed") 
+				&& this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
+					cur_frm.add_custom_button(__("Close"), this.close_delivery_note)
 			}
 		}
 
-		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 && !doc.is_return && doc.status!="Closed") {
+		if(doc.__onload && !doc.__onload.billing_complete && doc.docstatus==1 
+				&& !doc.is_return && doc.status!="Closed") {
 			// show Make Invoice button only if Delivery Note is not created from Sales Invoice
 			var from_sales_invoice = false;
 			from_sales_invoice = cur_frm.doc.items.some(function(item) {
@@ -63,7 +64,7 @@
 				cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice).addClass("btn-primary");
 		}
 
-		if(doc.docstatus==1 && doc.status === "Closed") {
+		if(doc.docstatus==1 && doc.status === "Closed" && this.frm.has_perm("submit")) {
 			cur_frm.add_custom_button(__('Re-open'), this.reopen_delivery_note)
 		}
 		erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);

diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 16c1e6d..b776ee2 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery To", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -112,6 +116,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -137,6 +142,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -159,6 +165,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Billing Address Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Billing Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -202,6 +210,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -224,6 +233,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -245,6 +255,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -266,6 +277,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -287,6 +299,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -307,6 +320,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -329,6 +343,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -356,6 +371,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -383,6 +399,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -408,6 +425,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Purchase Order No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_no", 
    "oldfieldtype": "Data", 
@@ -434,6 +452,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Purchase Order Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "po_date", 
    "oldfieldtype": "Data", 
@@ -459,6 +478,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Return", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -482,6 +502,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Return Against Delivery Note", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Delivery Note", 
    "permlevel": 0, 
@@ -505,6 +526,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
@@ -527,6 +549,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
@@ -552,6 +575,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
@@ -575,6 +599,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -596,6 +621,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -620,6 +646,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -643,6 +670,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
@@ -665,6 +693,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
@@ -686,6 +715,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -709,6 +739,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "delivery_note_details", 
    "oldfieldtype": "Table", 
@@ -734,6 +765,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packing List", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-suitcase", 
@@ -757,6 +789,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Packed Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "packing_details", 
    "oldfieldtype": "Table", 
@@ -781,6 +814,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Product Bundle Help", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -801,6 +835,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -822,6 +857,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -845,6 +881,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
@@ -870,6 +907,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -891,6 +929,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -914,6 +953,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -936,6 +976,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -960,6 +1001,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "charge", 
    "oldfieldtype": "Link", 
@@ -983,6 +1025,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1004,6 +1047,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Shipping Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "Shipping Rule", 
@@ -1026,6 +1070,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1047,6 +1092,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges", 
    "oldfieldtype": "Table", 
@@ -1071,6 +1117,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
@@ -1092,6 +1139,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1113,6 +1161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_total", 
    "oldfieldtype": "Currency", 
@@ -1138,6 +1187,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1160,6 +1210,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1183,6 +1234,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1206,6 +1258,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
@@ -1228,6 +1281,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1249,6 +1303,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -1271,6 +1326,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1294,6 +1350,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
@@ -1317,6 +1374,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
@@ -1343,6 +1401,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
@@ -1370,6 +1429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
@@ -1394,6 +1454,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1416,6 +1477,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_export", 
    "oldfieldtype": "Currency", 
@@ -1442,6 +1504,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total_export", 
    "oldfieldtype": "Currency", 
@@ -1469,6 +1532,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_export", 
    "oldfieldtype": "Data", 
@@ -1495,6 +1559,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
@@ -1518,6 +1583,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
@@ -1542,6 +1608,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
@@ -1566,6 +1633,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Transporter Info", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-truck", 
    "permlevel": 0, 
@@ -1588,6 +1656,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Transporter Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transporter_name", 
    "oldfieldtype": "Data", 
@@ -1612,6 +1681,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1636,6 +1706,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Vehicle No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lr_no", 
    "oldfieldtype": "Data", 
@@ -1663,6 +1734,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Vehicle Dispatch Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lr_date", 
    "oldfieldtype": "Date", 
@@ -1689,6 +1761,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -1712,6 +1785,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -1735,6 +1809,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -1756,6 +1831,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1779,6 +1855,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -1801,6 +1878,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -1825,6 +1903,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -1850,6 +1929,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Campaign", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "campaign", 
    "oldfieldtype": "Link", 
@@ -1874,6 +1954,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Source", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "source", 
    "oldfieldtype": "Select", 
@@ -1897,6 +1978,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -1922,6 +2004,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_time", 
    "oldfieldtype": "Time", 
@@ -1947,6 +2030,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -1973,6 +2057,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1995,6 +2080,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Link", 
@@ -2019,6 +2105,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
@@ -2042,6 +2129,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -2064,6 +2152,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Without Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "print_without_amount", 
    "oldfieldtype": "Check", 
@@ -2087,6 +2176,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2109,6 +2199,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -2137,6 +2228,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "% Installed", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_installed", 
    "oldfieldtype": "Currency", 
@@ -2160,6 +2252,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installation Status", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2180,6 +2273,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -2202,6 +2296,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "to_warehouse", 
    "oldfieldtype": "Link", 
@@ -2226,6 +2321,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Excise Page Number", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "excise_page", 
    "oldfieldtype": "Data", 
@@ -2249,6 +2345,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Instructions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "instructions", 
    "oldfieldtype": "Text", 
@@ -2273,6 +2370,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-group", 
@@ -2296,6 +2394,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_partner", 
    "oldfieldtype": "Link", 
@@ -2321,6 +2420,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2344,6 +2444,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Commission Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "commission_rate", 
    "oldfieldtype": "Currency", 
@@ -2369,6 +2470,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Commission", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_commission", 
    "oldfieldtype": "Currency", 
@@ -2394,6 +2496,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -2415,6 +2518,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Team1", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "sales_team", 
    "oldfieldtype": "Table", 
@@ -2438,7 +2542,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-11-02 01:20:58.934509", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:44.673451", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 

diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 6346c63..c5fd34f 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py

@@ -37,7 +37,7 @@
 			'second_join_field': 'so_detail',
 			'overflow_type': 'delivery',
 			'second_source_extra_cond': """ and exists(select name from `tabSales Invoice`
-				where name=`tabSales Invoice Item`.parent and ifnull(update_stock, 0) = 1)"""
+				where name=`tabSales Invoice Item`.parent and update_stock = 1)"""
 		},
 		{
 			'source_dt': 'Delivery Note Item',
@@ -65,11 +65,14 @@
 		}]
 
 	def onload(self):
-		billed_qty = frappe.db.sql("""select sum(ifnull(qty, 0)) from `tabSales Invoice Item`
+		billed_qty = frappe.db.sql("""select sum(qty) from `tabSales Invoice Item`
 			where docstatus=1 and delivery_note=%s""", self.name)
 		if billed_qty:
 			total_qty = sum((item.qty for item in self.get("items")))
-			self.get("__onload").billing_complete = (billed_qty[0][0] == total_qty)
+			self.set_onload("billing_complete", (billed_qty[0][0] == total_qty))
+			
+		self.set_onload("has_return_entry", len(frappe.db.exists({"doctype": "Delivery Note", 
+			"is_return": 1, "return_against": self.name, "docstatus": 1})))
 
 	def before_print(self):
 		def toggle_print_hide(meta, fieldname):
@@ -167,6 +170,8 @@
 					chk_dupl_itm.append(f)
 
 	def validate_warehouse(self):
+		super(DeliveryNote, self).validate_warehouse()
+		
 		for d in self.get_item_list():
 			if frappe.db.get_value("Item", d['item_code'], "is_stock_item") == 1:
 				if not d['warehouse']:
@@ -327,7 +332,7 @@
 				"serial_no": "serial_no"
 			},
 			"postprocess": update_item,
-			"filter": lambda d: d.qty - invoiced_qty_map.get(d.name, 0)<=0
+			"filter": lambda d: abs(d.qty) - abs(invoiced_qty_map.get(d.name, 0))<=0
 		},
 		"Sales Taxes and Charges": {
 			"doctype": "Sales Taxes and Charges",

diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index c1d4591..2dbdd96 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -40,6 +41,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -90,6 +93,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer's Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -154,6 +160,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -178,6 +185,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -200,6 +208,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -222,6 +231,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -245,6 +255,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -266,6 +277,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -291,6 +303,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ref_rate", 
    "oldfieldtype": "Currency", 
@@ -318,6 +331,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "adj_rate", 
    "oldfieldtype": "Float", 
@@ -342,6 +356,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -363,6 +378,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -389,6 +405,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "base_ref_rate", 
    "oldfieldtype": "Currency", 
@@ -414,6 +431,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -435,6 +453,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_rate", 
    "oldfieldtype": "Currency", 
@@ -461,6 +480,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "export_amount", 
    "oldfieldtype": "Currency", 
@@ -486,6 +506,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -507,6 +528,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "basic_rate", 
    "oldfieldtype": "Currency", 
@@ -533,6 +555,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -559,6 +582,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -580,6 +604,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -602,6 +627,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -625,6 +651,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -647,6 +674,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -669,6 +697,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -692,6 +721,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -715,6 +745,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse and Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -736,6 +767,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -764,6 +796,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Warehouse (Optional)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -787,6 +820,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Text", 
@@ -810,6 +844,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "batch_no", 
    "oldfieldtype": "Link", 
@@ -834,6 +869,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Qty at From Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -860,6 +896,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Available Batch Qty at From Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -885,6 +922,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -909,6 +947,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -935,6 +974,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -957,6 +997,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -978,6 +1019,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Expense Account", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Account", 
    "permlevel": 0, 
@@ -1002,6 +1044,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -1025,6 +1068,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Against Sales Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Order", 
    "permlevel": 0, 
@@ -1047,6 +1091,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Sales Invoice", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -1069,6 +1114,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Sales Order Item", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
@@ -1094,6 +1140,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Sales Invoice Item", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -1116,6 +1163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Installed Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "installed_qty", 
    "oldfieldtype": "Currency", 
@@ -1141,6 +1189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -1162,7 +1211,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-28 12:41:53.738462", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:45.014492", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 

diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index feb0213..d712cc9 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js

@@ -14,12 +14,24 @@
 
 	refresh: function(frm) {
 		if(frm.doc.is_stock_item) {
-			frm.add_custom_button(__("Show Balance"), function() {
+			frm.add_custom_button(__("Balance"), function() {
 				frappe.route_options = {
 					"item_code": frm.doc.name
 				}
 				frappe.set_route("query-report", "Stock Balance");
 			});
+			frm.add_custom_button(__("Ledger"), function() {
+				frappe.route_options = {
+					"item_code": frm.doc.name
+				}
+				frappe.set_route("query-report", "Stock Ledger");
+			});
+			frm.add_custom_button(__("Projected"), function() {
+				frappe.route_options = {
+					"item_code": frm.doc.name
+				}
+				frappe.set_route("query-report", "Stock Projected Qty");
+			});
 		}
 
 		// make sensitive fields(has_serial_no, is_stock_item, valuation_method)
@@ -87,6 +99,8 @@
 
 	is_stock_item: function(frm) {
 		erpnext.item.toggle_reqd(frm);
+		if(frm.doc.is_pro_applicable && !frm.doc.is_stock_item)
+			frm.set_value("is_pro_applicable", 0);
 	},
 
 	has_variants: function(frm) {

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index c05170d..746929a 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json

@@ -22,11 +22,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-flag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -45,10 +47,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "ITEM-", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -68,11 +72,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -93,11 +99,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Variant Of", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -116,11 +124,13 @@
    "in_filter": 1, 
    "in_list_view": 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": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -140,12 +150,14 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
    "options": "Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -165,12 +177,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Unit of Measure", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Link", 
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -188,9 +202,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -211,12 +227,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Maintain Stock", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_stock_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -235,10 +253,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -257,11 +277,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -280,11 +302,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -303,10 +327,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -325,12 +351,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
    "options": "Brand", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -349,9 +377,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -370,11 +400,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -395,11 +427,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Inventory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-truck", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -420,12 +454,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "default_warehouse", 
    "oldfieldtype": "Link", 
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -446,11 +482,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "End of Life", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "end_of_life", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -471,12 +509,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Has Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "has_batch_no", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -498,12 +538,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Has Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "has_serial_no", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -524,9 +566,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial Number Series", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -548,12 +592,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Fixed Asset Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_asset_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -572,10 +618,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -597,11 +645,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow over delivery or receipt upto this percent", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tolerance", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -621,10 +671,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Method", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nFIFO\nMoving Average", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -644,11 +696,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warranty Period (in days)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warranty_period", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -669,9 +723,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Weight", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -691,10 +747,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Weight UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -715,10 +773,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Auto re-order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-rss", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -739,11 +799,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Re-order Level", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "re_order_level", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -763,9 +825,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Re-order Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -785,10 +849,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Warehouse-wise Reorder Level", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -809,9 +875,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reorder level based on Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -832,10 +900,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reorder level based on Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Reorder", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -856,10 +926,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Variants", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -881,11 +953,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Has Variants", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -905,11 +979,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Attributes", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Item Variant Attribute", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -928,11 +1004,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -953,12 +1031,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Purchase Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_purchase_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -980,11 +1060,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Minimum Order Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "min_order_qty", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1005,11 +1087,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead Time in days", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lead_time_days", 
    "oldfieldtype": "Int", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1030,12 +1114,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Buying Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "cost_center", 
    "oldfieldtype": "Link", 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1056,12 +1142,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Expense Account", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_account", 
    "oldfieldtype": "Link", 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1081,10 +1169,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Unit of Measure Conversion", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1105,12 +1195,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOMs", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "uom_conversion_details", 
    "oldfieldtype": "Table", 
    "options": "UOM Conversion Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1130,11 +1222,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Last Purchase Rate", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "last_purchase_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1154,10 +1248,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1177,10 +1273,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1199,10 +1297,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivered by Supplier (Drop Ship)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1222,9 +1322,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Manufacturer", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1244,9 +1346,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Manufacturer Part Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1266,10 +1370,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Code for Suppliers", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1290,10 +1396,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Items", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Supplier", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1312,11 +1420,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1337,12 +1447,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Is Sales Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_sales_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1364,12 +1476,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Is Service Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_service_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1390,10 +1504,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Publish in Hub", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1413,10 +1529,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Synced With Hub", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1436,10 +1554,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Income Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1459,10 +1579,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default Selling Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1482,10 +1604,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Item Codes", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1507,10 +1631,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Items", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Customer Detail", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1530,11 +1656,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Max Discount (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "max_discount", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1553,11 +1681,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1577,12 +1707,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax", 
    "oldfieldtype": "Table", 
    "options": "Item Tax", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1601,11 +1733,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Inspection Criteria", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-search", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1625,12 +1759,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Inspection Required", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "inspection_required", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1651,12 +1787,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quality Parameters", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_specification_details", 
    "oldfieldtype": "Table", 
    "options": "Item Quality Inspection Parameter", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1675,11 +1813,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Manufacturing", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-cogs", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1691,7 +1831,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "default": "1", 
+   "default": "", 
    "depends_on": "", 
    "description": "", 
    "fieldname": "is_pro_applicable", 
@@ -1701,12 +1841,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Allow Production Order", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_pro_applicable", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1727,12 +1869,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supply Raw Materials for Purchase", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_sub_contracted_item", 
    "oldfieldtype": "Select", 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1750,10 +1894,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1773,12 +1919,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Default BOM", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "default_bom", 
    "oldfieldtype": "Link", 
    "options": "BOM", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1797,9 +1945,11 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Code", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1818,10 +1968,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-globe", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1840,9 +1992,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Show in Website", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1863,9 +2017,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Name", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1886,9 +2042,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Weightage", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1909,10 +2067,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Slideshow", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Website Slideshow", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1933,10 +2093,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1955,10 +2117,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Thumbnail", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1976,9 +2140,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1999,10 +2165,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2023,10 +2191,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Item Groups", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Website Item Group", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2047,9 +2217,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Specifications", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2069,9 +2241,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Copy From Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2091,10 +2265,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Specifications", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Website Specification", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2114,9 +2290,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Website Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2135,10 +2313,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Website Route", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2157,7 +2337,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-11-04 04:50:02.051468", 
+ "modified": "2015-12-07 14:14:33.563149", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index a795de8..dfd281a 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py

@@ -105,7 +105,11 @@
 				frappe.local.message_log.pop()
 
 			except requests.exceptions.HTTPError:
-				frappe.msgprint(_("Warning: Invalid Attachment {0}").format(self.website_image))
+				frappe.msgprint(_("Warning: Invalid attachment {0}").format(self.website_image))
+				self.website_image = None
+
+			except requests.exceptions.SSLError:
+				frappe.msgprint(_("Warning: Invalid SSL certificate on attachment {0}").format(self.website_image))
 				self.website_image = None
 
 			# for CSV import
@@ -307,7 +311,7 @@
 
 	def validate_item_type(self):
 		if self.is_pro_applicable == 1 and self.is_stock_item==0:
-			frappe.throw(_("As Production Order can be made for this item, it must be a stock item."))
+			self.is_pro_applicable = 0
 
 		if self.has_serial_no == 1 and self.is_stock_item == 0:
 			msgprint(_("'Has Serial No' can not be 'Yes' for non-stock item"), raise_exception=1)
@@ -374,6 +378,13 @@
 			if not (self.is_purchase_item or self.is_pro_applicable):
 				frappe.throw(_("""To set reorder level, item must be a Purchase Item or Manufacturing Item"""))
 
+		if self.re_order_level and not self.re_order_qty:
+			frappe.throw(_("Please set reorder quantity"))
+		for d in self.get("reorder_levels"):
+			if d.warehouse_reorder_level and not d.warehouse_reorder_qty:
+				frappe.throw(_("Row #{0}: Please set reorder quantity").format(d.idx))
+					
+
 	def validate_warehouse_for_reorder(self):
 		warehouse = []
 		for i in self.get("reorder_levels"):
@@ -658,7 +669,5 @@
 			frappe.db.sql("""update tabBin set stock_uom=%s where item_code=%s""", (stock_uom, item))
 
 	if not matched:
-		frappe.throw(_("Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.").format(item))
+		frappe.throw(_("Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.").format(item))
 

diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 0440419..338a0bc 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Numeric Values", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -88,6 +91,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Range", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Increment", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -132,6 +137,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -155,6 +161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Range", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -177,6 +184,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -200,6 +208,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Attribute Values", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Attribute Value", 
    "permlevel": 0, 
@@ -221,7 +230,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:52.797977", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.198647", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Attribute", 

diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index 4ace69d..9aaab18 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute Value", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Abbreviation", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,7 +65,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:52.915941", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.249491", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Attribute Value", 

diff --git a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
index b81e29c..4e9e042 100644
--- a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
+++ b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json

@@ -20,6 +20,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -46,6 +47,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Ref Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ref_rate", 
    "oldfieldtype": "Currency", 
@@ -69,7 +71,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:52.972943", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.280253", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Customer Detail", 

diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 53f06dc..0dcf264 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tags", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Buying", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -86,6 +89,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Selling", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -107,6 +111,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Select", 
@@ -153,6 +159,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "ref_rate", 
    "oldfieldtype": "Currency", 
@@ -177,6 +184,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -198,6 +206,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -219,6 +228,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -240,6 +250,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -260,6 +271,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -282,6 +294,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bulk Import Help", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -303,7 +316,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:53.239250", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.400288", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 

diff --git a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
index 74df6ea..044a0dd 100644
--- a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parameter", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "specification", 
    "oldfieldtype": "Data", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Acceptance Criteria", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "value", 
    "oldfieldtype": "Data", 
@@ -65,7 +67,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.360347", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.461235", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Quality Inspection Parameter", 

diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index db30b74..fea8bf0 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Re-order Level", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,6 +64,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Re-order Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -82,7 +85,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Material Request Type",  
+   "label": "Material Request Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase\nTransfer", 
    "permlevel": 0, 
@@ -103,7 +107,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.419555", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.492627", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Reorder", 

diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json
index 3cd6349..5388481 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.json
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -40,6 +41,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier Part Number", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -61,7 +63,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.505057", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.527271", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Supplier", 

diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index f78d41e..c199ec0 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Tax", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tax_type", 
    "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tax_rate", 
    "oldfieldtype": "Currency", 
@@ -63,7 +65,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.564643", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.557063", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Tax", 

diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json
index 10b93b5..e51635a 100644
--- a/erpnext/stock/doctype/item_variant/item_variant.json
+++ b/erpnext/stock/doctype/item_variant/item_variant.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Attribute", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Attribute", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Attribute Value", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -64,7 +66,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.623476", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.592686", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant", 

diff --git a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
index 87899c8..740a514 100644
--- a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
+++ b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item Attribute", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -65,6 +67,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Attribute Value", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Numeric Values", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -111,6 +115,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Range", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -157,6 +163,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Increment", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -178,6 +185,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Range", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -221,7 +230,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.682190", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.641487", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Variant Attribute", 

diff --git a/erpnext/stock/doctype/item_website_specification/item_website_specification.json b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
index fdd5583..7fc83df 100644
--- a/erpnext/stock/doctype/item_website_specification/item_website_specification.json
+++ b/erpnext/stock/doctype/item_website_specification/item_website_specification.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Label", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,7 +65,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:53.782911", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:48.689782", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Website Specification", 

diff --git a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
index 24a57f6..9c1a74f 100644
--- a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+++ b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json

@@ -1,227 +1,237 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "creation": "2013-02-22 01:28:02",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "creation": "2013-02-22 01:28:02", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Item Code",
-   "no_copy": 0,
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "100px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Description",
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_width": "300px",
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "300px", 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "120px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "purchase_receipt",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Purchase Receipt",
-   "no_copy": 1,
-   "options": "Purchase Receipt",
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "purchase_receipt", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purchase Receipt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Purchase Receipt", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Qty",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Rate",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Amount",
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "applicable_charges",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Applicable Charges",
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "applicable_charges", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Applicable Charges", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "purchase_receipt_item",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Purchase Receipt Item",
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "purchase_receipt_item", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Purchase Receipt Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "modified": "2015-10-20 12:16:35.511560",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Landed Cost Item",
- "owner": "wasim@webnotestech.com",
- "permissions": [],
- "read_only": 0,
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.057949", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Landed Cost Item", 
+ "owner": "wasim@webnotestech.com", 
+ "permissions": [], 
+ "read_only": 0, 
  "read_only_onload": 0
-}
+}
\ No newline at end of file

diff --git a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
index 84e7045..165982f 100644
--- a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
+++ b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Purchase Receipt", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_receipt_no", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -127,7 +132,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:54.711750", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.106523", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Purchase Receipt", 

diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index 2149802..28b6e02 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -39,6 +40,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -61,6 +63,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -80,7 +83,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:54.789411", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.144789", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Taxes and Charges", 

diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index 3b84292..8f552bf 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipts", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Landed Cost Purchase Receipt", 
    "permlevel": 0, 
@@ -64,6 +66,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Items From Purchase Receipts", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -85,6 +88,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipt Items", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Landed Cost Item", 
    "permlevel": 0, 
@@ -107,6 +111,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Landed Cost Taxes and Charges", 
    "permlevel": 0, 
@@ -128,6 +133,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -151,6 +157,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -173,6 +180,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Landed Cost Voucher", 
    "permlevel": 0, 
@@ -194,6 +202,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -216,7 +225,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Distribute Charges Based On",  
+   "label": "Distribute Charges Based On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nQty\nAmount", 
    "permlevel": 0, 
@@ -239,6 +249,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -261,6 +272,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Landed Cost Help", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "", 
    "permlevel": 0, 
@@ -281,7 +293,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:54.866437", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.180775", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Voucher", 

diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 757d8a7..41b6672 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json

@@ -19,10 +19,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-pushpin", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -42,10 +44,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -63,11 +67,13 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Type",  
+   "label": "Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase\nMaterial Transfer\nMaterial Issue", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -85,9 +91,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -105,13 +113,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "MREQ-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -130,12 +140,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
    "options": "Material Request", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -157,12 +169,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -183,11 +197,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -206,12 +222,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "indent_details", 
    "oldfieldtype": "Table", 
    "options": "Material Request Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -230,11 +248,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -253,9 +273,11 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Requested For", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -274,11 +296,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Transaction Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -298,10 +322,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -321,13 +347,15 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
    "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -349,11 +377,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "% Ordered", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "per_ordered", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -372,10 +402,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -394,12 +426,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "letter_head", 
    "oldfieldtype": "Select", 
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -418,10 +452,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -441,11 +477,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -464,12 +502,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -488,11 +528,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions Content", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -510,7 +552,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:56.920451", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-01 00:49:28.148834", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 

diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index e65cc4b..fd82784 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py

@@ -40,13 +40,13 @@
 
 		for so_no in so_items.keys():
 			for item in so_items[so_no].keys():
-				already_indented = frappe.db.sql("""select sum(ifnull(qty, 0))
+				already_indented = frappe.db.sql("""select sum(qty)
 					from `tabMaterial Request Item`
 					where item_code = %s and sales_order_no = %s and
 					docstatus = 1 and parent != %s""", (item, so_no, self.name))
 				already_indented = already_indented and flt(already_indented[0][0]) or 0
 
-				actual_so_qty = frappe.db.sql("""select sum(ifnull(qty, 0)) from `tabSales Order Item`
+				actual_so_qty = frappe.db.sql("""select sum(qty) from `tabSales Order Item`
 					where parent = %s and item_code = %s and docstatus = 1""", (so_no, item))
 				actual_so_qty = actual_so_qty and flt(actual_so_qty[0][0]) or 0
 
@@ -250,7 +250,7 @@
 			where mr.name = mr_item.parent
 			and mr_item.item_code in (%s)
 			and mr.material_request_type = 'Purchase'
-			and ifnull(mr.per_ordered, 0) < 99.99
+			and mr.per_ordered < 99.99
 			and mr.docstatus = 1
 			and mr.status != 'Stopped'""" % ', '.join(['%s']*len(supplier_items)),
 			tuple(supplier_items))

diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 99815dd..5cd7de1 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py

@@ -106,7 +106,7 @@
 		mr.submit()
 
 		# check if per complete is None
-		self.assertEquals(mr.per_ordered, None)
+		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
 
@@ -152,9 +152,9 @@
 		po.cancel()
 		# check if per complete is as expected
 		mr.load_from_db()
-		self.assertEquals(mr.per_ordered, None)
-		self.assertEquals(mr.get("items")[0].ordered_qty, None)
-		self.assertEquals(mr.get("items")[1].ordered_qty, None)
+		self.assertEquals(mr.per_ordered, 0)
+		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
+		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
 
 		current_requested_qty_item1 = self._get_requested_qty("_Test Item Home Desktop 100", "_Test Warehouse - _TC")
 		current_requested_qty_item2 = self._get_requested_qty("_Test Item Home Desktop 200", "_Test Warehouse - _TC")
@@ -173,7 +173,7 @@
 		mr.submit()
 
 		# check if per complete is None
-		self.assertEquals(mr.per_ordered, None)
+		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
 
@@ -262,7 +262,7 @@
 		mr.submit()
 
 		# check if per complete is None
-		self.assertEquals(mr.per_ordered, None)
+		self.assertEquals(mr.per_ordered, 0)
 		self.assertEquals(mr.get("items")[0].ordered_qty, 0)
 		self.assertEquals(mr.get("items")[1].ordered_qty, 0)
 

diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index a90b35b..3e26065 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -44,6 +45,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -65,6 +67,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -90,6 +93,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -112,6 +116,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -136,6 +141,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -224,6 +233,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -249,6 +259,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -275,6 +286,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "For Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -300,6 +312,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -321,6 +334,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Required Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "schedule_date", 
    "oldfieldtype": "Date", 
@@ -346,6 +360,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -368,6 +383,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -392,6 +408,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -418,6 +435,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead Time Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lead_time_date", 
    "oldfieldtype": "Date", 
@@ -441,6 +459,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Order No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Order", 
    "permlevel": 0, 
@@ -462,6 +481,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -483,6 +503,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Min Order Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "min_order_qty", 
    "oldfieldtype": "Currency", 
@@ -508,6 +529,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "projected_qty", 
    "oldfieldtype": "Currency", 
@@ -533,6 +555,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Completed Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "ordered_qty", 
    "oldfieldtype": "Currency", 
@@ -556,6 +579,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -577,7 +601,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:50.737233", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.238167", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 

diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 88e11d7..b09765d 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json

@@ -18,6 +18,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Parent Item", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "parent_item", 
    "oldfieldtype": "Link", 
@@ -42,6 +43,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -66,6 +68,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -88,6 +91,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -110,6 +114,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -134,6 +139,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -156,6 +162,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -180,6 +187,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "To Warehouse (Optional)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
@@ -202,6 +210,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -224,6 +233,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -246,6 +256,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -268,6 +279,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -288,6 +300,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -310,6 +323,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Batch", 
    "permlevel": 0, 
@@ -331,6 +345,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -353,6 +368,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -376,6 +392,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Projected Qty", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "projected_qty", 
    "oldfieldtype": "Currency", 
@@ -398,6 +415,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -420,6 +438,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -444,6 +463,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -467,6 +487,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Prevdoc DocType", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -490,6 +511,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Detail docname", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "parent_detail_docname", 
    "oldfieldtype": "Data", 
@@ -511,7 +533,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-26 02:25:47.718911", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.130504", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packed Item", 

diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 4d0d7c5..0b69d31 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py

@@ -4,9 +4,9 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+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
 
@@ -89,3 +89,17 @@
 	for d in packed_items:
 		if d not in delete_list:
 			doc.append("packed_items", d)
+
+@frappe.whitelist()
+def get_items_from_product_bundle(args):
+	args = json.loads(args)
+	items = []
+	bundled_items = get_product_bundle_items(args["item_code"])
+	for item in bundled_items:
+		args.update({
+			"item_code": item.item_code,
+			"qty": flt(args["quantity"]) * flt(item.qty)
+		})
+		items.append(get_item_details(args))
+		
+	return items
\ No newline at end of file

diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index cacb036..5a59d94 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Delivery Note", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Delivery Note", 
    "permlevel": 0, 
@@ -84,6 +87,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -104,7 +108,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "PS-", 
    "permlevel": 0, 
@@ -126,6 +131,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -146,6 +152,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -168,6 +175,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "From Package No.", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -189,6 +197,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -211,6 +220,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "To Package No.", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -233,6 +243,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -254,6 +265,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Items", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -275,6 +287,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Packing Slip Item", 
    "permlevel": 0, 
@@ -297,6 +310,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Package Weight Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -319,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Weight", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -340,6 +355,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Weight UOM", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -361,6 +377,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -383,6 +400,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Weight", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -404,6 +422,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Gross Weight UOM", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -426,6 +445,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -448,6 +468,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
@@ -471,6 +492,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -492,6 +514,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Packing Slip", 
    "permlevel": 0, 
@@ -513,7 +536,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:59.079733", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.222925", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip", 

diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 70e143e..6a7b559 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py

@@ -91,8 +91,8 @@
 			condition = " and item_code in (%s)" % (", ".join(["%s"]*len(rows)))
 
 		# gets item code, qty per item code, latest packed qty per item code and stock uom
-		res = frappe.db.sql("""select item_code, ifnull(sum(qty), 0) as qty,
-			(select sum(ifnull(psi.qty, 0) * (abs(ps.to_case_no - ps.from_case_no) + 1))
+		res = frappe.db.sql("""select item_code, sum(qty) as qty,
+			(select sum(psi.qty * (abs(ps.to_case_no - ps.from_case_no) + 1))
 				from `tabPacking Slip` ps, `tabPacking Slip Item` psi
 				where ps.name = psi.parent and ps.docstatus = 1
 				and ps.delivery_note = dni.parent and psi.item_code=dni.item_code) as packed_qty,

diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
index 57aa2a4..be92998 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Batch", 
    "permlevel": 0, 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -111,6 +115,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -134,6 +139,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Net Weight", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -181,6 +188,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Weight UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "UOM", 
    "permlevel": 0, 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -226,6 +235,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "DN Detail", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -245,7 +255,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:59.283902", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.313759", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip Item", 

diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index f2e45a8..cc323fa 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json

@@ -22,6 +22,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Enabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "price_list_name", 
    "oldfieldtype": "Data", 
@@ -86,6 +89,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Buying", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Selling", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -149,6 +155,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -170,6 +177,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Applicable for Countries", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List Country", 
    "permlevel": 0, 
@@ -193,7 +201,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-10-02 07:39:00.425037", 
+ "modified": "2015-11-16 06:29:51.852676", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List", 

diff --git a/erpnext/stock/doctype/price_list_country/price_list_country.json b/erpnext/stock/doctype/price_list_country/price_list_country.json
index 47d2b44..ef13baf 100644
--- a/erpnext/stock/doctype/price_list_country/price_list_country.json
+++ b/erpnext/stock/doctype/price_list_country/price_list_country.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -39,7 +40,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:00.549005", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:51.913575", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List Country", 

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index acf6809..93f1b08 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js

@@ -57,14 +57,18 @@
 			if(this.frm.doc.docstatus == 1 && this.frm.doc.status!="Closed") {
 				cur_frm.add_custom_button(__('Return'), this.make_purchase_return);
 				if(this.frm.doc.__onload && !this.frm.doc.__onload.billing_complete) {
-					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice).addClass("btn-primary");
+					cur_frm.add_custom_button(__('Invoice'),
+						 this.make_purchase_invoice).addClass("btn-primary");
 				}
-				cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
+				if (this.frm.has_perm("submit") && 
+					this.frm.doc.__onload && this.frm.doc.__onload.has_return_entry) {
+						cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt)
+				}
 			}
 		}
 
 
-		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed") {
+		if(this.frm.doc.docstatus==1 && this.frm.doc.status === "Closed" && this.frm.has_perm("submit")) {
 			cur_frm.add_custom_button(__('Re-open'), this.reopen_purchase_receipt)
 		}
 
@@ -147,7 +151,7 @@
 cur_frm.cscript.update_status = function(status) {
 	frappe.ui.form.is_saving = true;
 	frappe.call({
-		method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_order_status",
+		method:"erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status",
 		args: {docname: cur_frm.doc.name, status: status},
 		callback: function(r){
 			if(!r.exc)

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index adb2761..1764ed9 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json

@@ -20,10 +20,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -41,10 +43,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -66,10 +70,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -89,12 +95,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
    "options": "PREC-\nPREC-RET-", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -113,12 +121,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "supplier", 
    "oldfieldtype": "Link", 
    "options": "Supplier", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -140,9 +150,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -161,9 +173,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -182,9 +196,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -203,9 +219,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -224,9 +242,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -244,10 +264,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -268,11 +290,13 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -294,11 +318,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_time", 
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -319,10 +345,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Is Return", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -342,11 +370,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Return Against Purchase Receipt", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase Receipt", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -365,10 +395,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency and Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-tag", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -387,12 +419,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "currency", 
    "oldfieldtype": "Select", 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -412,12 +446,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_rate", 
    "oldfieldtype": "Currency", 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -435,10 +471,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -459,10 +497,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Price List", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -482,10 +522,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Currency", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -505,10 +547,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Exchange Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "9", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -527,9 +571,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Ignore Pricing Rule", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 1, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -548,11 +594,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -571,12 +619,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_receipt_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Receipt Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -595,11 +645,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Current Stock", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "get_current_stock", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -617,10 +669,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -639,11 +693,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -662,12 +718,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -687,9 +745,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -708,11 +768,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -731,12 +793,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "net_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -756,11 +820,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -780,12 +846,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_other_charges", 
    "oldfieldtype": "Link", 
    "options": "Purchase Taxes and Charges Template", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -804,12 +872,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_tax_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Taxes and Charges", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -828,10 +898,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Calculation", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -851,11 +923,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-money", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -874,12 +948,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -898,12 +974,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -922,12 +1000,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "total_tax", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -945,9 +1025,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -968,12 +1050,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Added", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_added_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -992,12 +1076,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Taxes and Charges Deducted", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "other_charges_deducted_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1016,11 +1102,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Taxes and Charges", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1040,10 +1128,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1063,11 +1153,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Apply Additional Discount On", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nGrand Total\nNet Total", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1085,10 +1177,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1107,11 +1201,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1130,11 +1226,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1152,10 +1250,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1174,12 +1274,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Grand Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1199,11 +1301,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1222,12 +1326,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rounded Total (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rounded_total", 
    "oldfieldtype": "Currency", 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1245,10 +1351,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1267,12 +1375,14 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Grand Total", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "grand_total_import", 
    "oldfieldtype": "Currency", 
    "options": "currency", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1291,11 +1401,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "In Words", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "in_words_import", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1315,11 +1427,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-legal", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1338,12 +1452,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "tc_name", 
    "oldfieldtype": "Link", 
    "options": "Terms and Conditions", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1362,11 +1478,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Terms and Conditions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "terms", 
    "oldfieldtype": "Text Editor", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1386,10 +1504,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1408,10 +1528,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1429,9 +1551,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1450,10 +1574,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1474,11 +1600,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Materials Supplied", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-table", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1499,12 +1627,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Materials Supplied", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_subcontracted", 
    "oldfieldtype": "Select", 
    "options": "No\nYes", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1524,12 +1654,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "supplier_warehouse", 
    "oldfieldtype": "Link", 
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1550,12 +1682,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplied Items", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "pr_raw_material_details", 
    "oldfieldtype": "Table", 
    "options": "Purchase Receipt Item Supplied", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1574,11 +1708,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bill No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1597,11 +1733,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Bill Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bill_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1620,11 +1758,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1644,12 +1784,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
    "options": "\nDraft\nSubmitted\nCancelled\nClosed", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1671,12 +1813,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rejected Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rejected_warehouse", 
    "oldfieldtype": "Link", 
    "options": "Warehouse", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1695,12 +1839,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
    "options": "Purchase Receipt", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
    "report_hide": 0, 
@@ -1721,11 +1867,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Range", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "range", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1743,10 +1891,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1768,12 +1918,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1794,12 +1946,14 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1820,10 +1974,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1842,10 +1998,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1864,12 +2022,14 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
    "options": "Print Heading", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 1, 
    "reqd": 0, 
@@ -1888,11 +2048,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Other Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "HTML", 
    "options": "<div class='columnHeading'>Other Details</div>", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "30%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -1913,11 +2075,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Instructions", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "instructions", 
    "oldfieldtype": "Text", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1936,9 +2100,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1958,10 +2124,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Transporter Details", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-truck", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -1980,11 +2148,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Transporter Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transporter_name", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2002,9 +2172,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "50%", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2026,11 +2198,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Vehicle Number", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lr_no", 
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2052,11 +2226,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Vehicle Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "lr_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
    "report_hide": 0, 
@@ -2076,7 +2252,9 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-11-02 01:19:45.539793", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-12-01 00:48:26.728603", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index c1316f9..b20617e 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

@@ -47,11 +47,14 @@
 		}]
 
 	def onload(self):
-		billed_qty = frappe.db.sql("""select sum(ifnull(qty, 0)) from `tabPurchase Invoice Item`
+		billed_qty = frappe.db.sql("""select sum(qty) from `tabPurchase Invoice Item`
 			where purchase_receipt=%s and docstatus=1""", self.name)
 		if billed_qty:
 			total_qty = sum((item.qty for item in self.get("items")))
-			self.get("__onload").billing_complete = (billed_qty[0][0] == total_qty)
+			self.set_onload("billing_complete", (billed_qty[0][0] == total_qty))
+			
+		self.set_onload("has_return_entry", len(frappe.db.exists({"doctype": "Purchase Receipt", 
+			"is_return": 1, "return_against": self.name, "docstatus": 1})))
 
 	def validate(self):
 		super(PurchaseReceipt, self).validate()
@@ -79,7 +82,7 @@
 
 	def set_landed_cost_voucher_amount(self):
 		for d in self.get("items"):
-			lc_voucher_amount = frappe.db.sql("""select sum(ifnull(applicable_charges, 0))
+			lc_voucher_amount = frappe.db.sql("""select sum(applicable_charges)
 				from `tabLanded Cost Item`
 				where docstatus = 1 and purchase_receipt_item = %s""", d.name)
 			d.landed_cost_voucher_amount = lc_voucher_amount[0][0] if lc_voucher_amount else 0.0
@@ -466,7 +469,7 @@
 				"prevdoc_docname": "purchase_order",
 			},
 			"postprocess": update_item,
-			"filter": lambda d: d.qty - invoiced_qty_map.get(d.name, 0)<=0
+			"filter": lambda d: abs(d.qty) - abs(invoiced_qty_map.get(d.name, 0))<=0
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",

diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 4d7ecbd..0789071 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -40,6 +41,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -62,6 +64,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -87,6 +90,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -109,6 +113,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -132,6 +137,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -154,6 +160,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -178,6 +185,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -199,6 +207,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -221,6 +230,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -244,6 +254,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Received and Accepted", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -265,6 +276,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Recd Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "received_qty", 
    "oldfieldtype": "Currency", 
@@ -290,6 +302,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Accepted Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -315,6 +328,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rejected Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "rejected_qty", 
    "oldfieldtype": "Currency", 
@@ -339,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -360,6 +375,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -386,6 +402,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -412,6 +429,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
@@ -437,6 +455,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate and Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -458,6 +477,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -481,6 +501,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Discount on Price List Rate (%)", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -501,6 +522,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -522,6 +544,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Price List Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -543,6 +566,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -564,6 +588,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_rate", 
    "oldfieldtype": "Currency", 
@@ -590,6 +615,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "import_amount", 
    "oldfieldtype": "Currency", 
@@ -613,6 +639,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -634,6 +661,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purchase_rate", 
    "oldfieldtype": "Currency", 
@@ -660,6 +688,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -686,6 +715,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Pricing Rule", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Pricing Rule", 
    "permlevel": 0, 
@@ -707,6 +737,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -729,6 +760,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -752,6 +784,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "currency", 
    "permlevel": 0, 
@@ -774,6 +807,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -796,6 +830,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Rate (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -819,6 +854,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Net Amount (Company Currency)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -842,6 +878,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse and Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -863,6 +900,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Accepted Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -889,6 +927,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rejected Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rejected_warehouse", 
    "oldfieldtype": "Link", 
@@ -915,6 +954,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
@@ -939,6 +979,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -961,6 +1002,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quality Inspection", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "qa_no", 
    "oldfieldtype": "Link", 
@@ -985,6 +1027,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Required By", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "schedule_date", 
    "oldfieldtype": "Date", 
@@ -1008,6 +1051,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty as per Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_qty", 
    "oldfieldtype": "Currency", 
@@ -1033,6 +1077,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Prevdoc Doctype", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -1056,6 +1101,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Order", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Link", 
@@ -1082,6 +1128,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Purchase Order Item No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
@@ -1106,6 +1153,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1127,6 +1175,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "BOM", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "BOM", 
    "permlevel": 0, 
@@ -1150,6 +1199,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Text", 
@@ -1173,6 +1223,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Rejected Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1194,6 +1245,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "batch_no", 
    "oldfieldtype": "Link", 
@@ -1218,6 +1270,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -1243,6 +1296,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -1267,6 +1321,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raw Materials Supplied Cost", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "rm_supp_cost", 
    "oldfieldtype": "Currency", 
@@ -1293,6 +1348,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "item_tax_amount", 
    "oldfieldtype": "Currency", 
@@ -1319,6 +1375,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Landed Cost Voucher Amount", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -1340,6 +1397,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "valuation_rate", 
    "oldfieldtype": "Currency", 
@@ -1367,6 +1425,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Tax Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_tax_rate", 
    "oldfieldtype": "Small Text", 
@@ -1390,6 +1449,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Page Break", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "page_break", 
    "oldfieldtype": "Check", 
@@ -1411,7 +1471,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:50.503105", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:54.377742", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 

diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 97a634e..c177325 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json

@@ -21,6 +21,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Data", 
@@ -86,6 +89,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -111,6 +115,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -134,6 +139,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -155,6 +161,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -176,6 +183,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -201,6 +209,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Group", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_group", 
    "oldfieldtype": "Link", 
@@ -225,6 +234,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Brand", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "brand", 
    "oldfieldtype": "Link", 
@@ -249,6 +259,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase / Manufacture Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -269,6 +280,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -291,6 +303,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Creation Document Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "DocType", 
    "permlevel": 0, 
@@ -313,6 +326,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Creation Document No", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "purchase_document_type", 
    "permlevel": 0, 
@@ -335,6 +349,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Creation Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_date", 
    "oldfieldtype": "Date", 
@@ -358,6 +373,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Creation Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -379,6 +395,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Incoming Rate", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_rate", 
    "oldfieldtype": "Currency", 
@@ -402,6 +419,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -424,6 +442,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -446,6 +465,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -467,6 +487,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Details", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -488,7 +509,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Delivery Document Type",  
+   "label": "Delivery Document Type", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "\nDelivery Note\nSales Invoice\nStock Entry\nPurchase Receipt", 
    "permlevel": 0, 
@@ -511,6 +533,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Delivery Document No", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -532,6 +555,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "delivery_date", 
    "oldfieldtype": "Date", 
@@ -555,6 +579,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Time", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -575,7 +600,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Is Cancelled",  
+   "label": "Is Cancelled", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_cancelled", 
    "oldfieldtype": "Select", 
@@ -599,6 +625,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -621,6 +648,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -645,6 +673,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -668,6 +697,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warranty / AMC Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -688,6 +718,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -709,7 +740,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Maintenance Status",  
+   "label": "Maintenance Status", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "maintenance_status", 
    "oldfieldtype": "Select", 
@@ -735,6 +767,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warranty Period (Days)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warranty_period", 
    "oldfieldtype": "Int", 
@@ -758,6 +791,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -780,6 +814,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Warranty Expiry Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warranty_expiry_date", 
    "oldfieldtype": "Date", 
@@ -804,6 +839,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "AMC Expiry Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amc_expiry_date", 
    "oldfieldtype": "Date", 
@@ -828,6 +864,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -849,6 +886,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -870,6 +908,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -891,7 +930,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-12 07:39:12.447732", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.486475", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index e9fc134..3965417 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -148,11 +148,11 @@
 					$.each(["from_bom", "bom_no", "fg_completed_qty", "use_multi_level_bom"], function(i, field) {
 						me.frm.set_value(field, r.message[field]);
 					})
-					
+
 					if (me.frm.doc.purpose == "Material Transfer for Manufacture" && !me.frm.doc.to_warehouse)
 						me.frm.set_value("to_warehouse", r.message["wip_warehouse"]);
-					
-					
+
+
 					if (me.frm.doc.purpose == "Manufacture") {
 						if(r.message["additional_costs"].length) {
 							$.each(r.message["additional_costs"], function(i, row) {
@@ -160,7 +160,7 @@
 							})
 							refresh_field("additional_costs");
 						}
-						
+
 						if (!me.frm.doc.from_warehouse) me.frm.set_value("from_warehouse", r.message["wip_warehouse"]);
 						if (!me.frm.doc.to_warehouse) me.frm.set_value("to_warehouse", r.message["fg_warehouse"]);
 					}
@@ -171,7 +171,7 @@
 	},
 
 	toggle_enable_bom: function() {
-		this.frm.toggle_enable("bom_no", !in_list(["Manufacture", "Material Transfer for Manufacture"], this.frm.doc.purpose));
+		this.frm.toggle_enable("bom_no", !!!this.frm.doc.production_order);
 	},
 
 	add_excise_button: function() {
@@ -252,11 +252,11 @@
 	if(doc.purpose == "Material Receipt") {
 		cur_frm.set_value("from_bom", 0);
 	}
-	
+
 	// Addition costs based on purpose
-	cur_frm.toggle_display(["additional_costs", "total_additional_costs", "additional_costs_section"], 
+	cur_frm.toggle_display(["additional_costs", "total_additional_costs", "additional_costs_section"],
 		doc.purpose!='Material Issue');
-	
+
 	cur_frm.fields_dict["items"].grid.set_column_disp("additional_cost", doc.purpose!='Material Issue');
 }
 
@@ -405,4 +405,4 @@
 
 cur_frm.cscript.posting_date = function(doc, cdt, cdn){
 	erpnext.get_fiscal_year(doc.company, doc.posting_date);
-}
\ No newline at end of file
+}

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index f1961ce..ac60b77 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Title", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
@@ -63,7 +65,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -88,7 +91,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Purpose",  
+   "label": "Purpose", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "purpose", 
    "oldfieldtype": "Select", 
@@ -114,6 +118,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Production Order", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "production_order", 
    "oldfieldtype": "Link", 
@@ -139,6 +144,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Order", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Purchase Order", 
    "permlevel": 0, 
@@ -163,6 +169,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Delivery Note No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "delivery_note_no", 
    "oldfieldtype": "Link", 
@@ -188,6 +195,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Invoice No", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Sales Invoice", 
    "permlevel": 0, 
@@ -211,6 +219,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purchase Receipt No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "purchase_receipt_no", 
    "oldfieldtype": "Link", 
@@ -236,6 +245,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From BOM", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -257,6 +267,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -282,6 +293,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -305,6 +317,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "posting_time", 
    "oldfieldtype": "Time", 
@@ -329,6 +342,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -351,6 +365,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "BOM No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "BOM", 
    "permlevel": 0, 
@@ -375,6 +390,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "For Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fg_completed_qty", 
    "oldfieldtype": "Currency", 
@@ -397,6 +413,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -421,6 +438,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Use Multi-Level BOM", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -443,6 +461,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Get Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "permlevel": 0, 
@@ -464,6 +483,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -486,6 +506,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Source Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "from_warehouse", 
    "oldfieldtype": "Link", 
@@ -509,6 +530,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -530,6 +552,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Default Target Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "to_warehouse", 
    "oldfieldtype": "Link", 
@@ -553,6 +576,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -575,6 +599,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "mtn_details", 
    "oldfieldtype": "Table", 
@@ -600,6 +625,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Update Rate and Availability", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "options": "get_stock_and_rate", 
@@ -622,6 +648,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -644,6 +671,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Incoming Value", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -666,6 +694,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -688,6 +717,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Outgoing Value", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -711,6 +741,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Value Difference (Out - In)", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -735,6 +766,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -759,6 +791,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Costs", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -781,6 +814,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Costs", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Landed Cost Taxes and Charges", 
    "permlevel": 0, 
@@ -804,6 +838,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Additional Costs", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -828,6 +863,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer or Supplier Details", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -850,6 +886,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "supplier", 
    "oldfieldtype": "Link", 
@@ -875,6 +912,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "supplier_name", 
    "oldfieldtype": "Data", 
@@ -899,6 +937,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier Address", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "supplier_address", 
    "oldfieldtype": "Small Text", 
@@ -921,6 +960,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -944,6 +984,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -969,6 +1010,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -993,6 +1035,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "customer_address", 
    "oldfieldtype": "Small Text", 
@@ -1016,6 +1059,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Printing Settings", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -1038,6 +1082,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Print Heading", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "select_print_heading", 
    "oldfieldtype": "Link", 
@@ -1062,6 +1107,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Letter Head", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Letter Head", 
    "permlevel": 0, 
@@ -1085,6 +1131,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -1107,6 +1154,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Project Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "project_name", 
    "oldfieldtype": "Link", 
@@ -1131,6 +1179,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Remarks", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "remarks", 
    "oldfieldtype": "Text", 
@@ -1153,6 +1202,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -1176,6 +1226,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Total Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -1198,6 +1249,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -1222,6 +1274,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year", 
    "permlevel": 0, 
@@ -1244,6 +1297,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Link", 
@@ -1268,6 +1322,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Credit Note", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Journal Entry", 
    "permlevel": 0, 
@@ -1291,7 +1346,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-10-12 08:27:59.381894", 
+ "modified": "2015-11-16 06:29:57.928437", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 79cd8de..9702972 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py

@@ -170,10 +170,8 @@
 	def validate_production_order(self):
 		if self.purpose in ("Manufacture", "Material Transfer for Manufacture"):
 			# check if production order is entered
-			if not self.production_order:
-				frappe.throw(_("Production order number is mandatory for stock entry purpose manufacture"))
-			# check for double entry
-			if self.purpose=="Manufacture":
+
+			if self.purpose=="Manufacture" and self.production_order:
 				if not self.fg_completed_qty:
 					frappe.throw(_("For Quantity (Manufactured Qty) is mandatory"))
 				self.check_if_operations_completed()

diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 8a1f8c7..398a7c6 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py

@@ -74,11 +74,12 @@
 		from erpnext.stock.doctype.item.test_item import make_item_variant
 		make_item_variant()
 		self._test_auto_material_request("_Test Item")
+		self._test_auto_material_request("_Test Item", material_request_type="Transfer")
 
 	def test_auto_material_request_for_variant(self):
 		self._test_auto_material_request("_Test Variant Item-S")
 
-	def _test_auto_material_request(self, item_code):
+	def _test_auto_material_request(self, item_code, material_request_type="Purchase"):
 		item = frappe.get_doc("Item", item_code)
 
 		if item.variant_of:
@@ -101,6 +102,7 @@
 		# update re-level qty so that it is more than projected_qty
 		if projected_qty >= template.reorder_levels[0].warehouse_reorder_level:
 			template.reorder_levels[0].warehouse_reorder_level += projected_qty
+			template.reorder_levels[0].material_request_type = material_request_type
 			template.save()
 
 		from erpnext.stock.reorder_item import reorder_item

diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 7db21d6..dd680f3 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Barcode", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -40,6 +41,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -62,6 +64,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Source Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "s_warehouse", 
    "oldfieldtype": "Link", 
@@ -85,6 +88,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -106,6 +110,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Target Warehouse", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "t_warehouse", 
    "oldfieldtype": "Link", 
@@ -129,6 +134,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -150,6 +156,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -173,6 +180,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -194,6 +202,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -215,6 +224,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -237,6 +247,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Text", 
@@ -261,6 +272,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -283,6 +295,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -305,6 +318,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Image View", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "image", 
    "permlevel": 0, 
@@ -328,6 +342,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Quantity and Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -349,6 +364,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "qty", 
    "oldfieldtype": "Currency", 
@@ -372,6 +388,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Rate (as per Stock UOM)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "incoming_rate", 
    "oldfieldtype": "Currency", 
@@ -396,6 +413,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Basic Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -419,6 +437,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Additional Cost", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -442,6 +461,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "amount", 
    "oldfieldtype": "Currency", 
@@ -466,6 +486,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -488,6 +509,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -509,6 +531,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -533,6 +556,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Currency", 
@@ -556,6 +580,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Link", 
@@ -580,6 +605,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Qty as per Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transfer_qty", 
    "oldfieldtype": "Currency", 
@@ -603,6 +629,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No / Batch", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -624,6 +651,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Text", 
@@ -646,6 +674,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -667,6 +696,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "batch_no", 
    "oldfieldtype": "Link", 
@@ -691,6 +721,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Accounting", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -713,6 +744,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -734,6 +766,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -757,6 +790,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
@@ -779,6 +813,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -800,6 +835,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Qty (at source/target)", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Read Only", 
@@ -824,6 +860,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "BOM No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "BOM", 
    "permlevel": 0, 
@@ -845,6 +882,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -867,6 +905,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Request", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Material Request", 
    "permlevel": 0, 
@@ -889,6 +928,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Material Request Item", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Material Request Item", 
    "permlevel": 0, 
@@ -909,7 +949,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-19 03:04:50.303251", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.140173", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 

diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index 7feda6f..180f114 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json

@@ -20,6 +20,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -46,6 +47,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -69,6 +71,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Batch No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "batch_no", 
    "oldfieldtype": "Data", 
@@ -92,6 +95,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse", 
    "oldfieldtype": "Link", 
@@ -118,6 +122,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
@@ -143,6 +148,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "posting_time", 
    "oldfieldtype": "Time", 
@@ -168,6 +174,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_type", 
    "oldfieldtype": "Data", 
@@ -194,6 +201,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Voucher No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_no", 
    "oldfieldtype": "Data", 
@@ -220,6 +228,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Voucher Detail No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "voucher_detail_no", 
    "oldfieldtype": "Data", 
@@ -245,6 +254,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "actual_qty", 
    "oldfieldtype": "Currency", 
@@ -270,6 +280,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Incoming Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "incoming_rate", 
    "oldfieldtype": "Currency", 
@@ -294,6 +305,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Outgoing Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -317,6 +329,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_uom", 
    "oldfieldtype": "Data", 
@@ -343,6 +356,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Actual Qty After Transaction", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "bin_aqat", 
    "oldfieldtype": "Currency", 
@@ -368,6 +382,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "valuation_rate", 
    "oldfieldtype": "Currency", 
@@ -394,6 +409,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "stock_value", 
    "oldfieldtype": "Currency", 
@@ -418,6 +434,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Value Difference", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company:company:default_currency", 
    "permlevel": 0, 
@@ -440,6 +457,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Stock Queue (FIFO)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fcfs_stack", 
    "oldfieldtype": "Text", 
@@ -463,6 +481,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Project", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Project", 
    "permlevel": 0, 
@@ -485,6 +504,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Data", 
@@ -511,6 +531,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Data", 
@@ -535,7 +556,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Is Cancelled",  
+   "label": "Is Cancelled", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nNo\nYes", 
    "permlevel": 0, 
@@ -557,7 +579,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:14.297832", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:58.277731", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger Entry", 

diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 13e7e5b..535e397 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js

@@ -5,28 +5,89 @@
 frappe.require("assets/erpnext/js/utils.js");
 frappe.provide("erpnext.stock");
 
-frappe.ui.form.on("Stock Reconciliation", "get_items", function(frm) {
-	frappe.prompt({label:"Warehouse", fieldtype:"Link", options:"Warehouse", reqd: 1},
-		function(data) {
+frappe.ui.form.on("Stock Reconciliation", {
+	onload: function(frm) {
+		// end of life
+		frm.set_query("item_code", "items", function(doc, cdt, cdn) {
+			return {
+				filters:[
+					['Item', 'end_of_life', '>=', frappe.datetime.nowdate()]
+				]
+			}
+		});
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.docstatus < 1) {
+			frm.add_custom_button(__("Get Items"), function() {
+				frm.events.get_items(frm);
+			});
+		}
+	},
+
+	company: function(frm) {
+		erpnext.get_fiscal_year(frm.doc.company, frm.doc.posting_date);
+	},
+
+	posting_date: function(frm) {
+		erpnext.get_fiscal_year(frm.doc.company, frm.doc.posting_date);
+	},
+
+	get_items: function(frm) {
+		frappe.prompt({label:"Warehouse", fieldtype:"Link", options:"Warehouse", reqd: 1},
+			function(data) {
+				frappe.call({
+					method:"erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items",
+					args: {
+						warehouse: data.warehouse,
+						posting_date: frm.doc.posting_date,
+						posting_time: frm.doc.posting_time
+					},
+					callback: function(r) {
+						var items = [];
+						frm.clear_table("items");
+						for(var i=0; i< r.message.length; i++) {
+							var d = frm.add_child("items");
+							$.extend(d, r.message[i]);
+							if(!d.qty) d.qty = null;
+							if(!d.valuation_rate) d.valuation_rate = null;
+						}
+						frm.refresh_field("items");
+					}
+				});
+			}
+		, __("Get Items"), __("Update"));
+	},
+
+	set_valuation_rate_and_qty: function(frm, cdt, cdn) {
+		var d = frappe.model.get_doc(cdt, cdn);
+		if(d.item_code && d.warehouse) {
 			frappe.call({
-				method:"erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items",
+				method: "erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_stock_balance_for",
 				args: {
-					warehouse: data.warehouse,
+					item_code: d.item_code,
+					warehouse: d.warehouse,
 					posting_date: frm.doc.posting_date,
 					posting_time: frm.doc.posting_time
 				},
 				callback: function(r) {
-					var items = [];
-					frm.clear_table("items");
-					for(var i=0; i< r.message.length; i++) {
-						var d = frm.add_child("items");
-						$.extend(d, r.message[i]);
-					}
-					frm.refresh_field("items");
+					frappe.model.set_value(cdt, cdn, "qty", r.message.qty);
+					frappe.model.set_value(cdt, cdn, "valuation_rate", r.message.rate);
+					frappe.model.set_value(cdt, cdn, "current_qty", r.message.qty);
+					frappe.model.set_value(cdt, cdn, "current_valuation_rate", r.message.rate);
 				}
 			});
 		}
-	, __("Get Items"), __("Update"));
+	}
+});
+
+frappe.ui.form.on("Stock Reconciliation Item", {
+	warehouse: function(frm, cdt, cdn) {
+		frm.events.set_valuation_rate_and_qty(frm, cdt, cdn);
+	},
+	item_code: function(frm, cdt, cdn) {
+		frm.events.set_valuation_rate_and_qty(frm, cdt, cdn);
+	}
 });
 
 erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
@@ -93,19 +154,3 @@
 });
 
 cur_frm.cscript = new erpnext.stock.StockReconciliation({frm: cur_frm});
-
-cur_frm.cscript.company = function(doc, cdt, cdn) {
-	erpnext.get_fiscal_year(doc.company, doc.posting_date);
-}
-
-cur_frm.cscript.posting_date = function(doc, cdt, cdn){
-	erpnext.get_fiscal_year(doc.company, doc.posting_date);
-}
-
-cur_frm.fields_dict.items.grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
-	return {
-		filters:[
-			['Item', 'end_of_life', '>=', frappe.datetime.nowdate()]
-		]
-	}
-}
\ No newline at end of file

diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 1bb606c..2e9db86 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json

@@ -21,11 +21,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Posting Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reconciliation_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -44,11 +46,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Posting Time", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "reconciliation_time", 
    "oldfieldtype": "Time", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -66,9 +70,11 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -87,10 +93,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Stock Reconciliation", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -109,10 +117,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -130,10 +140,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -152,11 +164,13 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Stock Reconciliation Item", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -168,38 +182,18 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "get_items", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Get Items", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
    "fieldname": "section_break_9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -219,10 +213,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -242,10 +238,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Cost Center", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Cost Center", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -264,9 +262,11 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reconciliation JSON", 
+   "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -284,10 +284,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -306,10 +308,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Difference Amount", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -327,10 +331,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,10 +354,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -370,10 +378,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Fiscal Year", 
    "permlevel": 0, 
    "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -392,7 +402,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2015-10-02 07:39:14.503333", 
+ "menu_index": 0, 
+ "modified": "2015-11-30 02:35:31.373161", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation", 

diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index cff0041..b0aff01 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

@@ -45,6 +45,13 @@
 			if (item.qty==None or item.qty==qty) and (item.valuation_rate==None or item.valuation_rate==rate):
 				return False
 			else:
+				# set default as current rates
+				if item.qty==None:
+					item.qty = qty
+
+				if item.valuation_rate==None:
+					item.valuation_rate = rate
+
 				item.current_qty = qty
 				item.current_valuation_rate = rate
 				self.difference_amount += (flt(item.qty or qty) * flt(item.valuation_rate or rate) - (flt(qty) * flt(rate)))
@@ -242,15 +249,35 @@
 
 @frappe.whitelist()
 def get_items(warehouse, posting_date, posting_time):
-	items = frappe.get_list("Item", fields=["name"], filters=
-		{"is_stock_item": 1, "has_serial_no": 0, "has_batch_no": 0, "has_variants": 0})
-	for item in items:
-		item.item_code = item.name
-		item.warehouse = warehouse
-		item.qty, item.valuation_rate = get_stock_balance(item.name, warehouse,
-			posting_date, posting_time, with_valuation_rate=True)
-		item.current_qty = item.qty
-		item.current_valuation_rate = item.valuation_rate
-		del item["name"]
+	items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
+	
+	items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0, 
+		"has_batch_no": 0, "has_variants": 0, "default_warehouse": warehouse}, as_list=1)
+		
+	res = []
+	for item in set(items):
+		stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time, 
+			with_valuation_rate=True)
+		
+		res.append({
+			"item_code": item[0],
+			"warehouse": warehouse,
+			"qty": stock_bal[0],
+			"valuation_rate": stock_bal[1],
+			"current_qty": stock_bal[0],
+			"current_valuation_rate": stock_bal[1]
+		})
 
-	return items
+	return res
+
+@frappe.whitelist()
+def get_stock_balance_for(item_code, warehouse, posting_date, posting_time):
+	frappe.has_permission("Stock Reconciliation", "write", throw = True)
+
+	qty, rate = get_stock_balance(item_code, warehouse,
+		posting_date, posting_time, with_valuation_rate=True)
+
+	return {
+		'qty': qty,
+		'rate': rate
+	}

diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 3274994..ddc7087 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json

@@ -19,11 +19,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Item", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -42,11 +44,13 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Warehouse", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -64,10 +68,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -79,7 +85,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Leave blank if no change", 
+   "description": "", 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -87,10 +93,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Quantity", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -102,7 +110,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "Leave blank if no change", 
+   "description": "", 
    "fieldname": "valuation_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -110,10 +118,12 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Valuation Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -131,10 +141,12 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -154,10 +166,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Qty", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -177,10 +191,12 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Current Valuation Rate", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 1, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -191,12 +207,15 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
+ "idx": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:14.655703", 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2015-11-30 02:34:10.385030", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation Item", 

diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/README.md b/erpnext/stock/doctype/stock_uom_replace_utility/README.md
deleted file mode 100644
index 6db95a6..0000000
--- a/erpnext/stock/doctype/stock_uom_replace_utility/README.md
+++ /dev/null

@@ -1 +0,0 @@
-Tool to replace unit of measure (UoM) of an Item.
\ No newline at end of file

diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
deleted file mode 100644
index eb45ade..0000000
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.js
+++ /dev/null

@@ -1,19 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-$.extend(cur_frm.cscript, {
-	onload: function() {
-		cur_frm.set_query("item_code", function() {
-			return erpnext.queries.item({"is_stock_item": 1});
-		});
-	},
-
-	item_code: function() {
-		if(cur_frm.doc.item_code) {
-			return cur_frm.call({
-				method: "get_stock_uom",
-				args: { item_code: cur_frm.doc.item_code }
-			});
-		}
-	}
-});

diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
deleted file mode 100644
index 6cadd6a..0000000
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.json
+++ /dev/null

@@ -1,178 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2013-01-10 16:34:30", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Item", 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "current_stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Current Stock UOM", 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "new_stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "New Stock UOM", 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "conversion_factor", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Conversion Factor", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "update", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Update", 
-   "no_copy": 0, 
-   "options": "update_stock_uom", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-magic", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "modified": "2015-08-12 08:52:09.322664", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Stock UOM Replace Utility", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Item Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0
-}
\ No newline at end of file

diff --git a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py b/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
deleted file mode 100644
index 2676493..0000000
--- a/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
+++ /dev/null

@@ -1,116 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cstr, flt, cint
-from frappe import _
-
-
-from frappe.model.document import Document
-
-class StockUOMReplaceUtility(Document):
-	
-	# Update Stock UOM
-	def update_stock_uom(self):
-		self.validate_item()
-		self.validate_mandatory()
-		self.validate_uom_integer_type()
-		
-		update_stock_ledger_entry(self.item_code, self.new_stock_uom, self.conversion_factor)
-		update_bin(self.item_code, self.new_stock_uom, self.conversion_factor)
-		update_item_master(self.item_code, self.new_stock_uom, self.conversion_factor)
-		
-		#if item is template change UOM for all associated variants
-		if frappe.db.get_value("Item", self.item_code, "has_variants"):
-			for d in frappe.db.get_all("Item", filters= {"variant_of": self.item_code}):
-				update_stock_ledger_entry(d.name, self.new_stock_uom, self.conversion_factor)
-				update_bin(d.name, self.new_stock_uom, self.conversion_factor)
-				update_item_master(d.name, self.new_stock_uom, self.conversion_factor)
-		
-	def validate_item(self):
-		if frappe.db.get_value("Item", self.item_code, "variant_of"):
-			frappe.throw(_("You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template"))
-		
-	def validate_mandatory(self):
-		if not cstr(self.item_code):
-			frappe.throw(_("Item is required"))
-
-		if not cstr(self.new_stock_uom):
-			frappe.throw(_("New Stock UOM is required"))
-
-		if cstr(self.current_stock_uom) == cstr(self.new_stock_uom):
-			frappe.throw(_("New Stock UOM must be different from current stock UOM"))
-
-		# check conversion factor
-		if not flt(self.conversion_factor):
-			frappe.throw(_("Conversion Factor is required"))
-
-		stock_uom = frappe.db.get_value("Item", self.item_code, "stock_uom")
-		if cstr(self.new_stock_uom) == cstr(stock_uom):
-			frappe.throw(_("Item is updated"))
-		
-	def validate_uom_integer_type(self):
-		current_is_integer = frappe.db.get_value("UOM", self.current_stock_uom, "must_be_whole_number")
-		new_is_integer = frappe.db.get_value("UOM", self.new_stock_uom, "must_be_whole_number")
-
-		if not current_is_integer and new_is_integer:
-			frappe.throw(_("New UOM must NOT be of type Whole Number"))
-
-		if current_is_integer and new_is_integer and cint(self.conversion_factor)!=self.conversion_factor:
-			frappe.throw(_("Conversion factor cannot be in fractions"))
-
-def update_item_master(item_code, new_stock_uom, conversion_factor):
-	frappe.db.set_value("Item", item_code, "stock_uom", new_stock_uom)
-	frappe.msgprint(_("Stock UOM updated for Item {0}").format(item_code))
-
-def update_bin(item_code, new_stock_uom, conversion_factor):
-	# update bin
-	if flt(conversion_factor) != flt(1):
-		frappe.db.sql("""update `tabBin`
-			set stock_uom = %s,
-				indented_qty = ifnull(indented_qty,0) * %s,
-				ordered_qty = ifnull(ordered_qty,0) * %s,
-				reserved_qty = ifnull(reserved_qty,0) * %s,
-				planned_qty = ifnull(planned_qty,0) * %s,
-				projected_qty = actual_qty + ordered_qty + indented_qty +
-					planned_qty - reserved_qty
-			where item_code = %s""", (new_stock_uom, conversion_factor,
-				conversion_factor, conversion_factor,
-				conversion_factor, item_code))
-	else:
-		frappe.db.sql("update `tabBin` set stock_uom = %s where item_code = %s",
-			 (new_stock_uom, item_code) )
-
-def update_stock_ledger_entry(item_code, new_stock_uom, conversion_factor):
-	# update stock ledger entry
-	from erpnext.stock.stock_ledger import update_entries_after
-
-	if flt(conversion_factor) != flt(1):
-		frappe.db.sql("""update `tabStock Ledger Entry`
-			set 
-				stock_uom = %s, 
-				actual_qty = ifnull(actual_qty,0) * %s,
-				qty_after_transaction = ifnull(qty_after_transaction, 0) * %s
-			where item_code = %s""",
-			(new_stock_uom, conversion_factor, conversion_factor, item_code))
-	else:
-		frappe.db.sql("""update `tabStock Ledger Entry` set stock_uom=%s
-			where item_code=%s""", (new_stock_uom, item_code))
-
-	# acknowledge user
-	frappe.msgprint(_("Stock Ledger entries balances updated"))
-
-	# update item valuation
-	if flt(conversion_factor) != flt(1):
-		wh = frappe.db.sql("select name from `tabWarehouse`")
-		for w in wh:
-			update_entries_after({"item_code": item_code, "warehouse": w[0]})
-
-	# acknowledge user
-	frappe.msgprint(_("Item valuation updated"))
-
-@frappe.whitelist()
-def get_stock_uom(item_code):
-	return { 'current_stock_uom': cstr(frappe.db.get_value('Item', item_code, 'stock_uom')) }
-

diff --git a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
index 4f8ea41..97d4128 100644
--- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
+++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "UOM", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "uom", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Conversion Factor", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "conversion_factor", 
    "oldfieldtype": "Float", 
@@ -64,7 +66,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:39:17.637451", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:59.778053", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "UOM Conversion Detail", 

diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 68eca34..e2867eb 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Detail", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "warehouse_name", 
    "oldfieldtype": "Data", 
@@ -65,6 +67,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Parent Account", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
@@ -113,6 +117,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Disabled", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warehouse Contact Info", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -156,6 +162,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Id", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "email_id", 
    "oldfieldtype": "Data", 
@@ -179,6 +186,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Phone No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "phone_no", 
    "oldfieldtype": "Int", 
@@ -203,6 +211,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "mobile_no", 
    "oldfieldtype": "Int", 
@@ -226,6 +235,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -248,6 +258,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 1", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "address_line_1", 
    "oldfieldtype": "Data", 
@@ -271,6 +282,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 2", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "address_line_2", 
    "oldfieldtype": "Data", 
@@ -294,6 +306,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "City", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "city", 
    "oldfieldtype": "Data", 
@@ -317,6 +330,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "State", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "state", 
    "oldfieldtype": "Select", 
@@ -340,6 +354,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "PIN", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "pin", 
    "oldfieldtype": "Int", 
@@ -362,7 +377,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:18.315595", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:30:00.080548", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 

diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 6c6f84b..71bc64a 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py

@@ -69,7 +69,7 @@
 
 	if args.get("is_subcontracted") == "Yes":
 		out.bom = get_default_bom(args.item_code)
-		
+
 	return out
 
 def process_args(args):
@@ -427,6 +427,9 @@
 		return result.currency
 
 def get_price_list_currency_and_exchange_rate(args):
+	if not args.price_list:
+		return {}
+
 	price_list_currency = get_price_list_currency(args.price_list)
 	plc_conversion_rate = args.plc_conversion_rate
 

diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index bf06396..9b51bfd 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py

@@ -3,6 +3,7 @@
 
 import frappe
 from frappe.utils import flt, cstr, nowdate, add_days, cint
+from frappe import _
 
 def reorder_item():
 	""" Reorder item if stock reaches reorder level"""
@@ -48,7 +49,7 @@
 		# projected_qty will be 0 if Bin does not exist
 		projected_qty = flt(item_warehouse_projected_qty.get(item_code, {}).get(warehouse))
 
-		if reorder_level and projected_qty < reorder_level:
+		if reorder_level and projected_qty <= reorder_level:
 			deficiency = reorder_level - projected_qty
 			if deficiency > reorder_qty:
 				reorder_qty = deficiency
@@ -114,7 +115,7 @@
 				mr.update({
 					"company": company,
 					"transaction_date": nowdate(),
-					"material_request_type": request_type
+					"material_request_type": "Material Transfer" if request_type=="Transfer" else request_type
 				})
 
 				for d in items:
@@ -162,17 +163,12 @@
 		and r.role in ('Purchase Manager','Stock Manager')
 		and p.name not in ('Administrator', 'All', 'Guest')""")
 
-	msg="""<h3>Following Material Requests has been raised automatically \
-		based on item reorder level:</h3>"""
-	for mr in mr_list:
-		msg += "<p><b><u>" + mr.name + """</u></b></p><table class='table table-bordered'><tr>
-			<th>Item Code</th><th>Warehouse</th><th>Qty</th><th>UOM</th></tr>"""
-		for item in mr.get("items"):
-			msg += "<tr><td>" + item.item_code + "</td><td>" + item.warehouse + "</td><td>" + \
-				cstr(item.qty) + "</td><td>" + cstr(item.uom) + "</td></tr>"
-		msg += "</table>"
+	msg = frappe.render_template("templates/emails/reorder_item.html", {
+		"mr_list": mr_list
+	})
+
 	frappe.sendmail(recipients=email_list,
-		subject='Auto Material Request Generation Notification', message = msg)
+		subject=_('Auto Material Requests Generated'), message = msg)
 
 def notify_errors(exceptions_list):
 	subject = "[Important] [ERPNext] Auto Reorder Errors"

diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
index 1fb1cc1..eb202b1 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py

@@ -72,7 +72,7 @@
 	si_items = frappe.db.sql("""select si_item.item_name, sum(si_item.qty) as si_qty
 		from `tabSales Invoice` si, `tabSales Invoice Item` si_item
 		where si.name = si_item.parent and si.docstatus = 1 and
-		ifnull(si.update_stock, 0) = 1 and ifnull(si.is_pos, 0) = 1 %s
+		si.update_stock = 1 and si.is_pos = 1 %s
 		group by si_item.item_name""" % (condition), as_dict=1)
 
 	dn_item_map = {}

diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index 609c986..b9e3cd2 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py

@@ -76,10 +76,12 @@
 					(
 						select qty from `tabSales Order Item`
 						where name = dnpi.parent_detail_docname
+						and (delivered_by_supplier is null or delivered_by_supplier = 0)
 					) as so_item_qty,
 					(
-						select ifnull(delivered_qty, 0) from `tabSales Order Item`
+						select delivered_qty from `tabSales Order Item`
 						where name = dnpi.parent_detail_docname
+						and delivered_by_supplier = 0
 					) as so_item_delivered_qty,
 					parent, name
 				from
@@ -94,9 +96,10 @@
 				) dnpi)
 			union
 				(select qty as dnpi_qty, qty as so_item_qty,
-					ifnull(delivered_qty, 0) as so_item_delivered_qty, parent, name
+					delivered_qty as so_item_delivered_qty, parent, name
 				from `tabSales Order Item` so_item
 				where item_code = %s and warehouse = %s
+				and (so_item.delivered_by_supplier is null or so_item.delivered_by_supplier = 0)
 				and exists(select * from `tabSales Order` so
 					where so.name = so_item.parent and so.docstatus = 1
 					and so.status not in ('Stopped','Closed')))
@@ -108,29 +111,30 @@
 	return flt(reserved_qty[0][0]) if reserved_qty else 0
 
 def get_indented_qty(item_code, warehouse):
-	indented_qty = frappe.db.sql("""select sum(mr_item.qty - ifnull(mr_item.ordered_qty, 0))
+	indented_qty = frappe.db.sql("""select sum(mr_item.qty - mr_item.ordered_qty)
 		from `tabMaterial Request Item` mr_item, `tabMaterial Request` mr
 		where mr_item.item_code=%s and mr_item.warehouse=%s
-		and mr_item.qty > ifnull(mr_item.ordered_qty, 0) and mr_item.parent=mr.name
+		and mr_item.qty > mr_item.ordered_qty and mr_item.parent=mr.name
 		and mr.status!='Stopped' and mr.docstatus=1""", (item_code, warehouse))
 
 	return flt(indented_qty[0][0]) if indented_qty else 0
 
 def get_ordered_qty(item_code, warehouse):
 	ordered_qty = frappe.db.sql("""
-		select sum((po_item.qty - ifnull(po_item.received_qty, 0))*po_item.conversion_factor)
+		select sum((po_item.qty - po_item.received_qty)*po_item.conversion_factor)
 		from `tabPurchase Order Item` po_item, `tabPurchase Order` po
 		where po_item.item_code=%s and po_item.warehouse=%s
-		and po_item.qty > ifnull(po_item.received_qty, 0) and po_item.parent=po.name
-		and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1""", (item_code, warehouse))
+		and po_item.qty > po_item.received_qty and po_item.parent=po.name
+		and po.status not in ('Stopped', 'Closed', 'Delivered') and po.docstatus=1
+		and po_item.delivered_by_supplier = 0""", (item_code, warehouse))
 
 	return flt(ordered_qty[0][0]) if ordered_qty else 0
 
 def get_planned_qty(item_code, warehouse):
 	planned_qty = frappe.db.sql("""
-		select sum(ifnull(qty, 0) - ifnull(produced_qty, 0)) from `tabProduction Order`
+		select sum(qty - produced_qty) from `tabProduction Order`
 		where production_item = %s and fg_warehouse = %s and status != "Stopped"
-		and docstatus=1 and ifnull(qty, 0) > ifnull(produced_qty, 0)""", (item_code, warehouse))
+		and docstatus=1 and qty > produced_qty""", (item_code, warehouse))
 
 	return flt(planned_qty[0][0]) if planned_qty else 0
 

diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index ce5a0c9..4edf7a9 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py

@@ -214,7 +214,7 @@
 			if flt(sle.actual_qty) < 0:
 				# In case of delivery/stock issue, get average purchase rate
 				# of serial nos of current entry
-				incoming_rate = flt(frappe.db.sql("""select avg(ifnull(purchase_rate, 0))
+				incoming_rate = flt(frappe.db.sql("""select avg(purchase_rate)
 					from `tabSerial No` where name in (%s)""" % (", ".join(["%s"]*len(serial_no))),
 					tuple(serial_no))[0][0])
 
@@ -387,13 +387,13 @@
 	last_valuation_rate = frappe.db.sql("""select valuation_rate
 		from `tabStock Ledger Entry`
 		where item_code = %s and warehouse = %s
-		and ifnull(valuation_rate, 0) > 0
+		and valuation_rate > 0
 		order by posting_date desc, posting_time desc, name desc limit 1""", (item_code, warehouse))
 
 	if not last_valuation_rate:
 		last_valuation_rate = frappe.db.sql("""select valuation_rate
 			from `tabStock Ledger Entry`
-			where item_code = %s and ifnull(valuation_rate, 0) > 0
+			where item_code = %s and valuation_rate > 0
 			order by posting_date desc, posting_time desc, name desc limit 1""", item_code)
 
 	valuation_rate = flt(last_valuation_rate[0][0]) if last_valuation_rate else 0

diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index ee4303b..3f9de86 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py

@@ -88,9 +88,13 @@
 	else:
 		frappe.msgprint(_("Item {0} ignored since it is not a stock item").format(args.get("item_code")))
 
+@frappe.whitelist()
 def get_incoming_rate(args):
 	"""Get Incoming Rate based on valuation method"""
 	from erpnext.stock.stock_ledger import get_previous_sle
+	
+	if isinstance(args, basestring):
+		args = json.loads(args)
 
 	in_rate = 0
 	if (args.get("serial_no") or "").strip():
@@ -112,7 +116,7 @@
 	"""get average value of serial numbers"""
 
 	serial_nos = get_valid_serial_nos(serial_nos)
-	return flt(frappe.db.sql("""select avg(ifnull(purchase_rate, 0)) from `tabSerial No`
+	return flt(frappe.db.sql("""select avg(purchase_rate) from `tabSerial No`
 		where name in (%s)""" % ", ".join(["%s"] * len(serial_nos)),
 		tuple(serial_nos))[0][0])
 

diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index f7fcd51..229eccf 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Subject", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-flag", 
    "permlevel": 0, 
@@ -41,6 +42,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "ISS-", 
    "permlevel": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Subject", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -83,6 +86,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -105,6 +109,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -130,6 +135,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Raised By (Email)", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "raised_by", 
    "oldfieldtype": "Data", 
@@ -153,6 +159,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -173,6 +180,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -196,6 +204,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "problem_description", 
    "oldfieldtype": "Text", 
@@ -218,6 +227,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -241,6 +251,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "resolution_date", 
    "oldfieldtype": "Date", 
@@ -264,6 +275,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "First Responded On", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -285,6 +297,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-pushpin", 
    "permlevel": 0, 
@@ -307,6 +320,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Lead", 
    "permlevel": 0, 
@@ -329,6 +343,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -350,6 +365,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -372,6 +388,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -396,6 +413,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -418,6 +436,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -441,6 +460,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution Details", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "resolution_details", 
    "oldfieldtype": "Text", 
@@ -464,6 +484,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -487,6 +508,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opening Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "opening_date", 
    "oldfieldtype": "Date", 
@@ -510,6 +532,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Opening Time", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "opening_time", 
    "oldfieldtype": "Time", 
@@ -533,6 +556,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Company", 
    "permlevel": 0, 
@@ -555,6 +579,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Content Type", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -576,6 +601,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Attachment", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -597,7 +623,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-19 03:04:49.729321", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:47.774531", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 

diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
index 419e64c..61052e9 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-user", 
@@ -42,6 +43,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -65,6 +67,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -87,7 +90,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -112,6 +116,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Transaction Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "transaction_date", 
    "oldfieldtype": "Date", 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-shopping-cart", 
@@ -158,6 +164,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Items", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_maintenance_detail", 
    "oldfieldtype": "Table", 
@@ -182,6 +189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Schedule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-time", 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Generate Schedule", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Button", 
    "permlevel": 0, 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Schedules", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "schedules", 
    "oldfieldtype": "Table", 
@@ -251,6 +261,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Info", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -273,6 +284,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_name", 
    "oldfieldtype": "Data", 
@@ -297,6 +309,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -342,6 +356,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 1, 
@@ -363,6 +378,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -383,6 +399,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -405,6 +422,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -427,6 +445,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -450,6 +469,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "territory", 
    "oldfieldtype": "Link", 
@@ -476,6 +496,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -498,6 +519,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -522,6 +544,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "options": "Maintenance Schedule", 
    "permlevel": 0, 
@@ -543,7 +566,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:56.092101", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.752621", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Schedule", 

diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
index ef3af41..14cad8e 100644
--- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py

@@ -111,7 +111,7 @@
 				# check global holiday list
 				holiday_list = frappe.db.sql("""select h.holiday_date from
 					`tabHoliday` h, `tabHoliday List` hl
-					where h.parent=hl.name and ifnull(hl.is_default, 0) = 1
+					where h.parent=hl.name and hl.is_default = 1
 					and hl.fiscal_year=%s""", fy_details[0])
 
 			if not validated and holiday_list:

diff --git a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
index 7f9da32..af252c1 100644
--- a/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
+++ b/erpnext/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Scheduled Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "scheduled_date", 
    "oldfieldtype": "Date", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Actual Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "actual_date", 
    "oldfieldtype": "Date", 
@@ -112,6 +116,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Sales Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "incharge_name", 
    "oldfieldtype": "Link", 
@@ -136,6 +141,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Small Text", 
@@ -159,7 +165,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:56.307772", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.853613", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Schedule Detail", 

diff --git a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index 668927e..f20cccb 100644
--- a/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.json

@@ -19,6 +19,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Data", 
@@ -91,6 +94,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -112,6 +116,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Start Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "start_date", 
    "oldfieldtype": "Date", 
@@ -135,6 +140,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "End Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "end_date", 
    "oldfieldtype": "Date", 
@@ -157,7 +163,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Periodicity",  
+   "label": "Periodicity", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "periodicity", 
    "oldfieldtype": "Select", 
@@ -182,6 +189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "No of Visits", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "no_of_visits", 
    "oldfieldtype": "Int", 
@@ -205,6 +213,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Sales Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "incharge_name", 
    "oldfieldtype": "Link", 
@@ -229,6 +238,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Small Text", 
@@ -273,6 +284,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Against Docname", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
@@ -296,7 +308,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:56.419931", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.903875", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Schedule Item", 

diff --git a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
index d70b403..cb7967b 100644
--- a/erpnext/support/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/support/doctype/maintenance_visit/maintenance_visit.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-user", 
@@ -41,6 +42,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -63,6 +65,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -87,6 +90,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -108,6 +112,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -129,6 +134,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -150,6 +156,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -171,6 +178,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -191,6 +199,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -215,6 +224,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Maintenance Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "mntc_date", 
    "oldfieldtype": "Date", 
@@ -238,6 +248,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Maintenance Time", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "mntc_time", 
    "oldfieldtype": "Time", 
@@ -261,6 +272,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-wrench", 
@@ -283,7 +295,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Completion Status",  
+   "label": "Completion Status", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "completion_status", 
    "oldfieldtype": "Select", 
@@ -307,6 +320,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -328,7 +342,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Maintenance Type",  
+   "label": "Maintenance Type", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "maintenance_type", 
    "oldfieldtype": "Select", 
@@ -352,6 +367,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-wrench", 
@@ -375,6 +391,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Purposes", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "maintenance_visit_details", 
    "oldfieldtype": "Table", 
@@ -399,6 +416,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-file-text", 
@@ -422,6 +440,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Feedback", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer_feedback", 
    "oldfieldtype": "Small Text", 
@@ -444,6 +463,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -466,6 +486,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Data", 
@@ -490,6 +511,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -515,6 +537,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Select", 
@@ -539,6 +562,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -564,6 +588,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Info", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -586,6 +611,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -608,6 +634,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -629,6 +656,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -651,6 +679,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Territory", 
    "permlevel": 0, 
@@ -674,6 +703,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -695,7 +725,8 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:56.562419", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:49.976485", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Visit", 

diff --git a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
index 2351a78..c89453a 100644
--- a/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
+++ b/erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "serial_no", 
    "oldfieldtype": "Small Text", 
@@ -89,6 +92,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -114,6 +118,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -135,6 +140,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Sales Person", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "service_person", 
    "oldfieldtype": "Link", 
@@ -159,6 +165,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Work Done", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "work_done", 
    "oldfieldtype": "Small Text", 
@@ -182,6 +189,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Document Type", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_doctype", 
    "oldfieldtype": "Data", 
@@ -208,6 +216,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Document No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_docname", 
    "oldfieldtype": "Data", 
@@ -234,6 +243,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Against Document Detail No", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "prevdoc_detail_docname", 
    "oldfieldtype": "Data", 
@@ -257,7 +267,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
- "modified": "2015-10-02 07:38:56.794124", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:50.082976", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Maintenance Visit Purpose", 

diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 9e1c83e..e33f9b2 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js

@@ -50,8 +50,7 @@
 cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
 	var cond = [];
 	var filter = [
-		['Serial No', 'docstatus', '!=', 2],
-		['Serial No', 'warehouse', '=', ""]
+		['Serial No', 'docstatus', '!=', 2]
 	];
 	if(doc.item_code) {
 		cond = ['Serial No', 'item_code', '=', doc.item_code];

diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 9d3cdbd..b39f6c0 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-user", 
    "permlevel": 0, 
@@ -40,7 +41,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Series",  
+   "label": "Series", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "naming_series", 
    "oldfieldtype": "Select", 
@@ -65,7 +67,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 1, 
-   "label": "Status",  
+   "label": "Status", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
@@ -91,6 +94,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Issue Date", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "complaint_date", 
    "oldfieldtype": "Date", 
@@ -113,6 +117,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -137,6 +142,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Serial No", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Serial No", 
    "permlevel": 0, 
@@ -159,6 +165,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "customer", 
    "oldfieldtype": "Link", 
@@ -183,6 +190,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Address", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Address", 
    "permlevel": 0, 
@@ -205,6 +213,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Person", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Contact", 
    "permlevel": 0, 
@@ -227,6 +236,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-ticket", 
@@ -250,6 +260,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Issue", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "complaint", 
    "oldfieldtype": "Small Text", 
@@ -273,6 +284,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "Item Code", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_code", 
    "oldfieldtype": "Link", 
@@ -296,6 +308,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
    "permlevel": 0, 
@@ -320,6 +333,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Item Name", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "item_name", 
    "oldfieldtype": "Data", 
@@ -344,6 +358,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Description", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "description", 
    "oldfieldtype": "Small Text", 
@@ -367,7 +382,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 1, 
    "in_list_view": 0, 
-   "label": "Warranty / AMC Status",  
+   "label": "Warranty / AMC Status", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC", 
    "permlevel": 0, 
@@ -390,6 +406,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Warranty Expiry Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -411,6 +428,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "AMC Expiry Date", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -433,6 +451,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Section Break", 
    "options": "icon-thumbs-up", 
@@ -456,6 +475,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Resolution Date", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "resolution_date", 
    "oldfieldtype": "Date", 
@@ -479,6 +499,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Resolved By", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "resolved_by", 
    "oldfieldtype": "Link", 
@@ -503,6 +524,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Resolution Details", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "resolution_details", 
    "oldfieldtype": "Text", 
@@ -527,6 +549,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Info", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-bullhorn", 
    "permlevel": 0, 
@@ -548,6 +571,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -571,6 +595,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -594,6 +619,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer Group", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer Group", 
    "permlevel": 0, 
@@ -618,6 +644,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Territory", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "territory", 
    "oldfieldtype": "Link", 
@@ -643,6 +670,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -665,6 +693,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Mobile No", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -687,6 +716,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Contact Email", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -707,6 +737,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -731,6 +762,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Service Address", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "service_address", 
    "oldfieldtype": "Small Text", 
@@ -755,6 +787,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -776,6 +809,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "More Information", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-file-text", 
    "permlevel": 0, 
@@ -797,6 +831,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -819,6 +854,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "company", 
    "oldfieldtype": "Link", 
@@ -843,6 +879,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fiscal Year", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "fiscal_year", 
    "oldfieldtype": "Select", 
@@ -866,6 +903,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -888,6 +926,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Raised By", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "complaint_raised_by", 
    "oldfieldtype": "Data", 
@@ -911,6 +950,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "From Company", 
+   "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "from_company", 
    "oldfieldtype": "Data", 
@@ -934,6 +974,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Amended From", 
+   "length": 0, 
    "no_copy": 1, 
    "oldfieldname": "amended_from", 
    "oldfieldtype": "Data", 
@@ -958,7 +999,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:18.513337", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:30:00.174354", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim", 

diff --git a/erpnext/templates/emails/reorder_item.html b/erpnext/templates/emails/reorder_item.html
new file mode 100644
index 0000000..c4039e3
--- /dev/null
+++ b/erpnext/templates/emails/reorder_item.html

@@ -0,0 +1,29 @@
+<p>{{ _("Following Material Requests have been raised automatically based on Item's re-order level") + ":" }}<p>
+{% for mr in mr_list -%}
+<div style="margin-bottom: 30px;">
+	<h4 style="margin-bottom: 5px;">{{ frappe.utils.get_link_to_form("Material Request", mr.name) }}</h4>
+	<table style="width: 100%; border-spacing: 0; border-collapse: collapse;">
+		<thead>
+			<tr>
+				<th style="border: 1px solid #d1d8dd; width: 35%; text-align: left; padding: 5px;">{{ _("Item") }}</th>
+				<th style="border: 1px solid #d1d8dd; width: 35%; text-align: left; padding: 5px;">{{ _("Warehouse") }}</th>
+				<th style="border: 1px solid #d1d8dd; width: 20%; text-align: right; padding: 5px;">{{ _("Quantity") }}</th>
+				<th style="border: 1px solid #d1d8dd; width: 10%; text-align: left; padding: 5px;">{{ _("UOM") }}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for item in mr.get("items") -%}
+			<tr>
+				<td style="border: 1px solid #d1d8dd; text-align: left; padding: 5px;">
+					<b>{{ item.item_code }}</b>
+					{% if item.item_code != item.item_name -%} <br> {{ item.item_name }} {%- endif %}
+				</td>
+				<td style="border: 1px solid #d1d8dd; text-align: left; padding: 5px;">{{ item.warehouse }}</td>
+				<td style="border: 1px solid #d1d8dd; text-align: right; padding: 5px;">{{ item.qty }}</td>
+				<td style="border: 1px solid #d1d8dd; text-align: left; padding: 5px;">{{ item.uom }}</td>
+			</tr>
+			{%- endfor %}
+		</tbody>
+	</table>
+</div>
+{%- endfor %}

diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
index fd287ad..f6ec819 100644
--- a/erpnext/templates/includes/address_row.html
+++ b/erpnext/templates/includes/address_row.html

@@ -1,9 +1,8 @@
 <div class="web-list-item">
-    <a href="/addresses?name={{ doc.name }}" no-pjax class="no-decoration">
+    <a href="/addresses?name={{ doc.name | urlencode }}" no-pjax class="no-decoration">
         <h4 class="strong">{{ doc.address_title }}</h4>
         <p class="text-muted small">
             {{ frappe.get_doc(doc).get_display() }}
-        </div>
-    </div>
+        </p>
     </a>
 </div>

diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index cc32157..e413f0b 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js

@@ -66,7 +66,6 @@
 						$(".cart-items").html(r.message.items);
 						$(".cart-tax-items").html(r.message.taxes);
 					}
-					$(".tax-grand-total").temp_highlight();
 				},
 			});
 		});

diff --git a/erpnext/templates/pages/edit-profile.html b/erpnext/templates/pages/edit-profile.html
new file mode 100644
index 0000000..82ad6fa
--- /dev/null
+++ b/erpnext/templates/pages/edit-profile.html

@@ -0,0 +1,53 @@
+{% block title %} {{ "My Profile" }} {% endblock %}
+
+{% block header %}<h2>My Profile</h2>{% endblock %}
+
+{% block content %}
+<div class="user-content" style="max-width: 500px;">
+	<div class="alert alert-warning" id="message" style="display: none;"></div>
+	<form>
+		<fieldset>
+			<label>Full Name</label>
+			<input class="form-control" type="text" id="fullname" placeholder="Your Name">
+		</fieldset>
+		<fieldset>
+			<label>Company Name</label>
+			<input class="form-control" type="text" id="company_name" placeholder="Company Name" value="{{ company_name }}">
+		</fieldset>
+		<fieldset>
+			<label>Mobile No</label>
+			<input class="form-control" type="text" id="mobile_no" placeholder="Mobile No" value="{{ mobile_no }}">
+		</fieldset>
+		<fieldset>
+			<label>Phone</label>
+			<input class="form-control" type="text" id="phone" placeholder="Phone" value="{{ phone }}">
+		</fieldset>
+		<button id="update_user" type="submit" class="btn btn-default">Update</button>
+	</form>
+</div>
+<script>
+$(document).ready(function() {
+	$("#fullname").val(getCookie("full_name") || "");
+	$("#update_user").click(function() {
+		frappe.call({
+			method: "erpnext.templates.pages.edit_profile.update_user",
+			type: "POST",
+			args: {
+				fullname: $("#fullname").val(),
+				company_name: $("#company_name").val(),
+				mobile_no: $("#mobile_no").val(),
+				phone: $("#phone").val()
+			},
+			btn: this,
+			msg: $("#message"),
+			callback: function(r) {
+				if(!r.exc) $("#user-full-name").html($("#fullname").val());
+			}
+		});
+		return false;
+	})
+})
+</script>
+<!-- no-sidebar -->
+{% endblock %}
+

diff --git a/erpnext/templates/pages/user.py b/erpnext/templates/pages/edit_profile.py
similarity index 100%
rename from erpnext/templates/pages/user.py
rename to erpnext/templates/pages/edit_profile.py


diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 046e6f6..45f6af0 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html

@@ -46,15 +46,14 @@
             </div>
             <div class="col-sm-2 col-xs-3 text-right">
                 {{ d.qty }}
-                {% if d.delivered_qty != None %}
+                {% if d.delivered_qty is defined and d.delivered_qty != None %}
                 <p class="text-muted small">{{
                     _("Delivered: {0}").format(d.delivered_qty) }}</p>
                 {% endif %}
             </div>
             <div class="col-sm-2 col-xs-3 text-right">
                 {{ d.get_formatted("amount") }}
-				<!-- output of get_formatted("rate") is unicode, to replace unicode use 
-					_("text {0}").decode("utf8").format(val) -->
+				{# output of get_formatted("rate") is unicode, to replace unicode use _("text {0}").decode("utf8").format(val) #}
                 <p class="text-muted small">{{
                     _("Rate: {0}").decode("utf8").format(d.get_formatted("rate")) }}</p>
             </div>

diff --git a/erpnext/templates/pages/user.html b/erpnext/templates/pages/user.html
deleted file mode 100644
index e9f356d..0000000
--- a/erpnext/templates/pages/user.html
+++ /dev/null

@@ -1,57 +0,0 @@
-{% block title %} {{ "My Profile" }} {% endblock %}
-
-{% block header %}<h2>My Profile</h2>{% endblock %}
-
-{% block content %}
-<div class="user-content" style="max-width: 500px;">
-    <ul class="breadcrumb">
-    	<li><a href="/index">Home</a></li>
-    	<li class="active"><i class="icon-user icon-fixed-width"></i> My Profile</li>
-    </ul>
-	<div class="alert alert-warning" id="message" style="display: none;"></div>
-	<form>
-		<fieldset>
-			<label>Full Name</label>
-			<input class="form-control" type="text" id="fullname" placeholder="Your Name">
-		</fieldset>
-		<fieldset>
-			<label>Company Name</label>
-			<input class="form-control" type="text" id="company_name" placeholder="Company Name" value="{{ company_name }}">
-		</fieldset>
-		<fieldset>
-			<label>Mobile No</label>
-			<input class="form-control" type="text" id="mobile_no" placeholder="Mobile No" value="{{ mobile_no }}">
-		</fieldset>
-		<fieldset>
-			<label>Phone</label>
-			<input class="form-control" type="text" id="phone" placeholder="Phone" value="{{ phone }}">
-		</fieldset>
-		<button id="update_user" type="submit" class="btn btn-default">Update</button>
-	</form>
-</div>
-<script>
-$(document).ready(function() {
-	$("#fullname").val(getCookie("full_name") || "");
-	$("#update_user").click(function() {
-		frappe.call({
-			method: "erpnext.templates.pages.user.update_user",
-			type: "POST",
-			args: {
-				fullname: $("#fullname").val(),
-				company_name: $("#company_name").val(),
-				mobile_no: $("#mobile_no").val(),
-				phone: $("#phone").val()
-			},
-			btn: this,
-			msg: $("#message"),
-			callback: function(r) {
-				if(!r.exc) $("#user-full-name").html($("#fullname").val());
-			}
-		});
-		return false;
-	})
-})
-</script>
-<!-- no-sidebar -->
-{% endblock %}
-

diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index b5fb474..65b4c7c 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,وضع الراتب
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",تحديد التوزيع الشهري، إذا كنت تريد أن تتبع على أساس موسمية.
 DocType: Employee,Divorced,المطلقات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات: تحذير.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,البنود مزامنة بالفعل
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,تسمح البند التي يمكن ان تضاف عدة مرات في معاملة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء مادة زيارة موقع {0} قبل إلغاء هذه المطالبة الضمان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,الرجاء اختيار الحزب النوع الأول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,الصلب
 DocType: Item,Customer Items,عناصر العملاء
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب الرئيسي {1} لا يمكن أن يكون دفتر الأستاذ
 DocType: Item,Publish Item to hub.erpnext.com,نشر البند إلى hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,ترك الموافقون
 DocType: Sales Partner,Dealer,تاجر
 DocType: Employee,Rented,مؤجر
-DocType: About Us Settings,Website,الموقع
 DocType: POS Profile,Applicable for User,ينطبق على العضو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,الضغط بالإضافة إلى تلبد
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
 DocType: Purchase Order,Customer Contact,العملاء الاتصال
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,من المواد طلب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,من المواد طلب
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} شجرة
 DocType: Job Applicant,Job Applicant,طالب العمل
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,لا مزيد من النتائج.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,قانوني
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,قانوني
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},لا يمكن تضمين ضريبة نوع الفعلية في سعر الصنف في الصف {0}
 DocType: C-Form,Customer,زبون
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,ترك اسم نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,درز
 DocType: Pricing Rule,Apply On,تنطبق على
 DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
 ,Purchase Order Items To Be Received,أمر شراء الأصناف التي سترد
 DocType: SMS Center,All Supplier Contact,جميع الموردين بيانات الاتصال
 DocType: Quality Inspection Reading,Parameter,المعلمة
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,يتوقع نهاية التاريخ لا يمكن أن يكون أقل من تاريخ بدء المتوقعة
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,إجازة جديدة التطبيق
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: تقييم يجب أن يكون نفس {1} {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,إجازة جديدة التطبيق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,البنك مشروع
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. للحفاظ على العملاء رمز البند الحكيمة والبحث فيها لجعلها تقوم على التعليمات البرمجية الخاصة بهم استخدام هذا الخيار
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,مشاهدة المتغيرات
-DocType: Sales Invoice Item,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,اجتياز سنة
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,جعل الملف الجديد POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,الرعاية الصحية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
 DocType: Purchase Invoice,Monthly,شهريا
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),التأخير في الدفع (أيام)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,فاتورة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,عنوان البريد الإلكتروني
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,عنوان البريد الإلكتروني
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,ابر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,الصف # {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,الصف # {0}
 DocType: Delivery Note,Vehicle No,السيارة لا
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,الرجاء اختيار قائمة الأسعار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,النجارة
 DocType: Production Order Operation,Work In Progress,التقدم في العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,طباعة ثلاثية الأبعاد
 DocType: Employee,Holiday List,عطلة قائمة
 DocType: Time Log,Time Log,وقت دخول
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,محاسب
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,محاسب
 DocType: Cost Center,Stock User,الأسهم العضو
 DocType: Company,Phone No,رقم الهاتف
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",سجل الأنشطة التي يقوم بها المستخدمين من المهام التي يمكن استخدامها لتتبع الوقت، والفواتير.
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},الجديد {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},الجديد {0} # {1}
 ,Sales Partners Commission,مبيعات اللجنة الشركاء
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,الاختصار لا يمكن أن يكون أكثر من 5 أحرف
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",السمة القيمة {0} لا يمكن إزالتها من {1} والبند المتغيرات \ الوجود مع هذه السمة.
-DocType: Print Settings,Classic,كلاسيكي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,هذا هو حساب الجذر والتي لا يمكن تحريرها.
 DocType: BOM,Operations,عمليات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لا يمكن تعيين إذن على أساس الخصم ل {0}
 DocType: Bin,Quantity Requested for Purchase,مطلوب للشراء كمية
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",إرفاق ملف csv مع عمودين، واحدة للاسم القديم واحدة للاسم الجديد
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,كجم
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,كجم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,فتح عن وظيفة.
 DocType: Item Attribute,Increment,زيادة
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,حدد مستودع ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,إعلان
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,إعلان
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Employee,Married,متزوج
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث الأسهم ضد تسليم مذكرة {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,بقالة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,جعل الدخول البنك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق المعاشات التقاعدية
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,مستودع إلزامي إذا كان نوع الحساب هو مستودع
 DocType: SMS Center,All Sales Person,كل عملية بيع شخص
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",تحقق ما اذا كان النظام المتكررة، قم بإلغاء لوقف المتكررة أو وضع مناسب تاريخ الانتهاء
@@ -118,7 +113,7 @@
 DocType: Account,Credit,ائتمان
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,يرجى الموظف الإعداد نظام التسمية في الموارد البشرية&gt; إعدادات HR
 DocType: POS Profile,Write Off Cost Center,شطب مركز التكلفة
-DocType: Warehouse,Warehouse Detail, تفاصيل المستودع
+DocType: Warehouse,Warehouse Detail,تفاصيل المستودع
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
 DocType: Tax Rule,Tax Type,نوع الضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
 DocType: SMS Log,SMS Log,SMS دخول
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
-DocType: Blog Post,Guest,ضيف
 DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
 DocType: Lead,Interested,مهتم
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,فاتورة المواد
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},من {0} إلى {1}
 DocType: Item,Copy From Item Group,نسخة من المجموعة السلعة
 DocType: Journal Entry,Opening Entry,فتح دخول
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} إلزامي
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,حساب مع الصفقة الحالية لا يمكن تحويلها إلى المجموعة.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,حساب مع الصفقة الحالية لا يمكن تحويلها إلى المجموعة.
 DocType: Lead,Product Enquiry,المنتج استفسار
-DocType: Standard Reply,Owner,مالك
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,يرجى إدخال الشركة الأولى
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,يرجى تحديد الشركة أولا
 DocType: Employee Education,Under Graduate,تحت الدراسات العليا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,التوسيع
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,:سجل النشاط
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,عقارات
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,عقارات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,كشف حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,المستحضرات الصيدلانية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,المستحضرات الصيدلانية
 DocType: Expense Claim Detail,Claim Amount,المطالبة المبلغ
 DocType: Employee,Mr,السيد
-DocType: Custom Script,Client,عميل	
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,المورد نوع / المورد
 DocType: Naming Series,Prefix,بادئة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,الاستهلاكية
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,الاستهلاكية
 DocType: Upload Attendance,Import Log,استيراد دخول
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,إرسال
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل مزود
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,الراتب السنوي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,الراتب السنوي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,مصاريف الأسهم
 DocType: Newsletter,Email Sent?,البريد الإلكتروني المرسلة؟
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,عرض الوقت سجلات
 DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
 DocType: Delivery Note,Installation Status,تثبيت الحالة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,البند {0} يجب أن يكون شراء السلعة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  جميع التواريخ والموظف الجمع في الفترة المختارة سيأتي في القالب، مع سجلات الحضور القائمة"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,سيتم تحديث بعد تقديم فاتورة المبيعات.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,استقامة
 DocType: BOM Replace Tool,New BOM,BOM جديدة
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دفعة سجلات الوقت لإعداد الفواتير.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity الصب
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,وقد تم بالفعل أرسلت الرسالة الإخبارية
 DocType: Lead,Request Type,طلب نوع
 DocType: Leave Application,Reason,سبب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,إذاعة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,إعدام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,المستخدم الأول سوف تصبح مدير النظام (يمكنك تغيير هذا لاحقا).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,إذاعة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,إعدام
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,المستخدم الأول سوف تصبح مدير النظام (يمكنك تغيير هذا لاحقا).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,حملت تفاصيل العمليات بها.
 DocType: Serial No,Maintenance Status,حالة الصيانة
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,البنود والتسعير
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,البنود والتسعير
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},من التسجيل ينبغي أن يكون ضمن السنة المالية. على افتراض من التسجيل = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,حدد موظف الذين تقوم بإنشاء تقييم.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},مركز تكلف {0} لا تنتمي إلى شركة {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},تاريخ التثبيت لا يمكن أن يكون قبل تاريخ التسليم القطعة ل {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),خصم على قائمة الأسعار معدل (٪)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,بداية
-DocType: User,First Name,الاسم الأول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,كامل قالب الصب
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,الحساب المصرفي
 DocType: Leave Type,Allow Negative Balance,تسمح الرصيد السلبي
 DocType: Selling Settings,Default Territory,الافتراضي الإقليم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,تلفزيون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلفزيون
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} لا ينتمي إلى شركة {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,تلقى على
 DocType: Sales Partner,Reseller,بائع التجزئة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,يرجى إدخال الشركة
-DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات 
+DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الأوراق غير المستخدمة من المخصصات السابقة
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
 DocType: Newsletter List,Total Subscribers,إجمالي عدد المشتركين
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,اسم جهة الاتصال
+,Contact Name,اسم جهة الاتصال
 DocType: Production Plan Item,SO Pending Qty,وفي انتظار SO الكمية
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,طلب للشراء.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,الإسكان مزدوج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,يترك في السنة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,يترك في السنة
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,الرجاء تعيين تسمية Series لل{0} عبر إعداد&gt; إعدادات&gt; تسمية السلسلة
 DocType: Time Log,Will be updated when batched.,سيتم تحديث عندما دفعات.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"صف {0}: يرجى التحقق ""هل المسبق ضد حساب {1} إذا كان هذا هو إدخال مسبق."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},مستودع {0} لا تنتمي إلى شركة {1}
-DocType: Bulk Email,Message,رسالة
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
-DocType: Dropbox Backup,Dropbox Access Key,دروببوإكس مفتاح الوصول
 DocType: Payment Tool,Reference No,المرجع لا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,سنوي
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
 DocType: Material Request Item,Min Order Qty,دقيقة الكمية ترتيب
 DocType: Lead,Do Not Contact,عدم الاتصال
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,المعرف الفريد لتتبع جميع الفواتير المتكررة. يتم إنشاؤها على تقديم.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,البرنامج المطور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,البرنامج المطور
 DocType: Item,Minimum Order Qty,الحد الأدنى لطلب الكمية
 DocType: Pricing Rule,Supplier Type,المورد نوع
 DocType: Item,Publish in Hub,نشر في المحور
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,بالفرشاة السلك
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,أكد أوامر من العملاء.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,معالجة HTML
 DocType: Lead,Mobile No.,رقم الجوال
 DocType: Maintenance Schedule,Generate Schedule,توليد جدول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,رئيس حساب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,الرجاء اختيار نوع التهمة الأولى
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,5 أحرف كحد أقصى
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,اختر اللغة الخاصة بك
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 أحرف كحد أقصى
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",تعطيل إنشاء سجلات المرة ضد أوامر الإنتاج. لا يجوز تعقب عمليات ضد النظام الإنتاج
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,البديل من
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,البند {0} يجب أن تكون خدمة المدينة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"الانتهاء الكمية لا يمكن أن يكون أكبر من ""الكمية لتصنيع"""
-DocType: DocType,Administrator,مدير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,الحفر بالليزر
-DocType: Stock UOM Replace Utility,New Stock UOM,ألبوم جديد UOM
 DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
 DocType: Employee,External Work History,التاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطأ مرجع دائري
-DocType: Communication,Closed,مغلق
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم.
 DocType: Lead,Industry,صناعة
 DocType: Employee,Job Profile,الملف ظيفة
 DocType: Newsletter,Newsletter,النشرة الإخبارية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,معانقة
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,يتم تحديث البند
-DocType: Async Task,System Manager,إدارة نظام
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
 DocType: Sales Invoice Item,Delivery Note,ملاحظة التسليم
-DocType: Dropbox Backup,Allow Dropbox Access,تسمح قطاف الدخول
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,إنشاء الضرائب
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,الرجاء اختيار الشهر والسنة
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,شركة البريد الإلكتروني
 DocType: GL Entry,Debit Amount in Account Currency,مقدار الخصم في حساب العملات
 DocType: Shipping Rule,Valid for Countries,صالحة لمدة البلدان
-DocType: Workflow State,Refresh,تحديث
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",كلها المجالات ذات الصلة مثل استيراد العملة ، ومعدل التحويل، و اجمالى واردات والاستيراد الكبرى الخ مجموع المتاحة في إيصال الشراء ، مزود اقتباس، شراء الفاتورة ، أمر شراء الخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,إجمالي الطلب يعتبر
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,المعدل الذي يتم تحويل العملة إلى عملة الأساس العملاء العميل
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",المتاحة في BOM ، تسليم مذكرة ، شراء الفاتورة ، ترتيب الإنتاج، طلب شراء ، شراء استلام ، فاتورة المبيعات ، ترتيب المبيعات ، اسهم الدخول و الجدول الزمني
 DocType: Item Tax,Tax Rate,ضريبة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,اختر البند
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","البند: {0} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,يجب تقديم شراء إيصال
-DocType: Stock UOM Replace Utility,Current Stock UOM,الأسهم الحالية UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,قيمة الخصم
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,عنوان البريد الإلكتروني الخاص بك
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,يرجى الاطلاع على المرفقات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,يرجى الاطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,قطع المياه النفاثة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,الإعداد الكامل بالفعل !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,الإعداد الكامل بالفعل !
 ,Finished Goods,السلع تامة الصنع
 DocType: Delivery Note,Instructions,تعليمات
 DocType: Quality Inspection,Inspected By,تفتيش من قبل
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,يرجى عدم إنشاء حسابات العملاء والموردين. يتم إنشاؤها مباشرة من سادة العملاء / الموردين.
 DocType: Currency Exchange,Currency Exchange,تحويل العملات
 DocType: Purchase Invoice Item,Item Name,البند الاسم
+DocType: Authorization Rule,Approving User  (above authorized value),الموافقة العضو (أعلى قيمة أذن)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ميزان الائتمان
 DocType: Employee,Widowed,ارمل
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",البنود التي يطلب منها &quot;غير متاح&quot; النظر في جميع المخازن على أساس الكمية المتوقعة والحد الأدنى الكمية ترتيب
@@ -380,22 +348,21 @@
 ,Purchase Register,سجل شراء
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات) 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (إعتماد الإجازات)
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,طبي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,طبي
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,السبب لفقدان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,أنبوب الديكور
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 DocType: Employee,Single,وحيد
 DocType: Issue,Attachment,التعلق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,الميزانية لا يمكن تعيين لمركز التكلفة المجموعة
 DocType: Account,Cost of Goods Sold,تكلفة السلع المباعة
 DocType: Purchase Invoice,Yearly,سنويا
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,الرجاء إدخال مركز التكلفة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,الرجاء إدخال مركز التكلفة
 DocType: Journal Entry Account,Sales Order,ترتيب المبيعات
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,متوسط. بيع أسعار
 DocType: Purchase Order,Start date of current order's period,تاريخ الفترة الحالية أجل نبدأ
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},لا يمكن أن يكون كمية جزء في الصف {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},لا يمكن أن يكون كمية جزء في الصف {0}
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
 DocType: Delivery Note,% Installed,٪ تم تثبيت
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,غير المجموعة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تعيين تلقائيا المسلسل رقم استنادا FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,الاختيار فاتورة المورد عدد تفرد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,بالحرارة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,الحز
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','الى الحالة  رقم' لا يمكن أن يكون أقل من 'من الحالة رقم'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,غير الربح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,غير الربح
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,لم تبدأ
 DocType: Lead,Channel Partner,قناة الشريك
 DocType: Account,Old Parent,العمر الرئيسي
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,الإعدادات العمومية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتي
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,عطلة الرئيسي.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,صب قذيفة
 DocType: Material Request Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,الرجاء إدخال رمز المدينة .
 DocType: BOM,Costing,تكلف
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",إذا كانت محددة، سيتم النظر في مقدار ضريبة والمدرجة بالفعل في قيم طباعة / المبلغ طباعة
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,إجمالي الكمية
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,تتراوح
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,الأوراق المالية و الودائع
 DocType: Features Setup,Imports,واردات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,الربط اللصق
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,مجموع الأوراق المخصصة إلزامية
 DocType: Job Opening,Description of a Job Opening,وصف لافتتاح الوظيفة
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,الأنشطة في انتظار لهذا اليوم
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,سجل الحضور.
 DocType: Bank Reconciliation,Journal Entries,مجلة مقالات
 DocType: Sales Order Item,Used for Production Plan,تستخدم لخطة الإنتاج
-DocType: System Settings,Loading...,تحميل ...
-DocType: DocField,Password,كلمة السر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,تنصهر النمذجة ترسب
 DocType: Manufacturing Settings,Time Between Operations (in mins),الوقت بين العمليات (في دقيقة)
 DocType: Customer,Buyer of Goods and Services.,المشتري من السلع والخدمات.
 DocType: Journal Entry,Accounts Payable,ذمم دائنة
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,إضافة المشتركين
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" لا يوجد"
 DocType: Pricing Rule,Valid Upto,صالحة لغاية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,الدخل المباشر
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,موظف إداري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,موظف إداري
 DocType: Payment Tool,Received Or Paid,تلقى أو المدفوعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,يرجى تحديد الشركة
 DocType: Stock Entry,Difference Account,حساب الفرق
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,لا يمكن عمل أقرب لم يتم إغلاق المهمة التابعة لها {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,إضافية تكاليف التشغيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,مستحضرات التجميل
-DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
-DocType: Communication,Subject,موضوع
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 ,Serial No Warranty Expiry,المسلسل لا عودة انتهاء الاشتراك
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,بند
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,إدارة التعاقد من الباطن
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,يجب أن لا تكون جديدة UOM من النوع الجامع رقم
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,إدارة التعاقد من الباطن
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,الأثاث و تركيبات
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لشركة
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},حساب {0} لا تنتمي إلى الشركة: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,متطلبات المواد
 DocType: Company,Delete Company Transactions,حذف المعاملات الشركة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,البند {0} لم يتم شراء السلعة
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} هو عنوان بريد إلكتروني غير صالح في ""إعلام \
  عنوان البريد الإلكتروني"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,مجموع الفواتير هذه السنة:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,مجموع الفواتير هذه السنة:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",لا يمكن حذف الرقم التسلسلي {0}، كما يتم استخدامه في المعاملات الأسهم
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),إغلاق (الكروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),إغلاق (الكروم)
 DocType: Serial No,Warranty Period (Days),فترة الضمان (أيام)
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 ,Pending Qty,في انتظار الكمية
 DocType: Job Applicant,Thread HTML,الموضوع HTML
 DocType: Company,Ignore,تجاهل
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},أرسل SMS إلى الأرقام التالية: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
 DocType: Pricing Rule,Valid From,صالحة من
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك مبيعات
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** توزيع شهري ** يساعدك على توزيع ميزانيتك على مدى عدة شهور إذا كان لديك موسمية في عملك.
 
  لتوزيع الميزانية باستخدام هذا التوزيع، تعيين هذا التوزيع الشهري ** ** في ** ** مركز التكلفة"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",آسف ، المسلسل نص لا يمكن دمج
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
-DocType: About Us Settings,Website Manager,مدير الموقع
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,لا ينبغي أن تكون السنة المالية تاريخ بدء السنة المالية أكبر من تاريخ الانتهاء
 DocType: Warranty Claim,Resolution,قرار
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},تسليم: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,الفوترة والدفع الحالة
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تكرار العملاء
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,سابق
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,مبيعات العودة
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,حدد أوامر المبيعات التي تريد إنشاء أوامر الإنتاج.
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,الراتب المكونات.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات من العملاء المحتملين.
+DocType: Authorization Rule,Customer or Item,العملاء أو البند
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,العملاء قاعدة البيانات.
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,المتوسطة الدخل
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,تراجع
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,وحدة القياس الافتراضية للالبند {0} لا يمكن تغيير مباشرة لأنك قدمت بالفعل بعض المعاملات (s) مع UOM آخر. سوف تحتاج إلى إنشاء عنصر جديد لاستخدام افتراضي مختلف UOM.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 DocType: Purchase Order Item,Billed Amt,المنقار AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع المنطقي الذي ضد مصنوعة إدخالات الأسهم.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
-DocType: Event,Wednesday,الأربعاء
 DocType: Sales Invoice,Customer's Vendor,العميل البائع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,إنتاج النظام هو إجباري
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,الكتابة الاقتراح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,الكتابة الاقتراح
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,شخص آخر مبيعات {0} موجود مع نفس الرقم الوظيفي
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطأ الأسهم السلبية ( { } 6 ) القطعة ل {0} في {1} في معرض النماذج ثلاثية على {2} {3} {4} في {5}
 DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,افتراضي تكلف سعر
 DocType: Maintenance Schedule,Maintenance Schedule,صيانة جدول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيتها من قوانين التسعير على أساس العملاء، مجموعة العملاء، الأرض، مورد، مورد نوع، حملة، شريك المبيعات الخ
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,الرجاء تثبيت قطاف بيثون وحدة
 DocType: Employee,Passport Number,رقم جواز السفر
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,من إيصال الشراء
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدير
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,من إيصال الشراء
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
 DocType: SMS Settings,Receiver Parameter,استقبال معلمة
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
 DocType: Sales Person,Sales Person Targets,أهداف المبيعات شخص
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,إلى
-apps/frappe/frappe/templates/base.html +145,Please enter email address,يرجى إدخال عنوان البريد الإلكتروني
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,نهاية أنبوب تشكيل
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 DocType: Selling Settings,Customer Naming By,العملاء تسمية بواسطة
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,يوم الثابتة
 DocType: Sales Invoice,Packing List,قائمة التعبئة
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,أوامر الشراء نظرا للموردين.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,نشر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,نشر
 DocType: Activity Cost,Projects User,مشاريع العضو
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مستهلك
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفاتورة
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} غير موجود في جدول تفاصيل الفاتورة
 DocType: Company,Round Off Cost Center,جولة قبالة مركز التكلفة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,صيانة زيارة {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 DocType: Material Request,Material Transfer,لنقل المواد
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),افتتاح ( الدكتور )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},يجب أن يكون الطابع الزمني بالإرسال بعد {0}
-apps/frappe/frappe/config/setup.py +59,Settings,إعدادات
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,الضرائب التكلفة هبطت والرسوم
 DocType: Production Order Operation,Actual Start Time,الفعلي وقت البدء
 DocType: BOM Operation,Operation Time,عملية الوقت
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,أكثر
 DocType: Pricing Rule,Sales Manager,مدير المبيعات
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,إعادة تسمية
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,تقويس
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,تسمح للمستخدم
 DocType: Journal Entry,Bill No,رقم الفاتورة
 DocType: Purchase Invoice,Quarterly,فصلي
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم المطلوبة
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,يرجى إدخال تفاصيل البند
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
 DocType: Account,Accounts,حسابات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,تسويق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,مستقيم قص
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,تسويق
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,لتتبع البند في المبيعات وثائق الشراء على أساس غ من المسلسل. ويمكن أيضا استخدام هذه المعلومات لتعقب الضمان للمنتج.
 DocType: Purchase Receipt Item Supplied,Current Stock,الأسهم الحالية
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,مستودع رفض إلزامي ضد البند regected
 DocType: Account,Expenses Included In Valuation,وشملت النفقات في التقييم
 DocType: Employee,Provide email id registered in company,توفير معرف البريد الإلكتروني المسجلة في الشركة
 DocType: Hub Settings,Seller City,مدينة البائع
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,الأسهم القيمة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع الشجرة
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,الكمية والنماذج
 DocType: Sales Invoice,Commission Rate (%),اللجنة قيم (٪)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",ضد قسيمة النوع يجب أن يكون واحدا من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,تعذر العثور على سعر الصرف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,الفضاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ترحيب
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
 DocType: Journal Entry,Credit Card Entry,الدخول بطاقة الائتمان
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,مهمة موضوع
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,تلقى السلع من الموردين.
-DocType: Communication,Open,فتح
 DocType: Lead,Campaign Name,اسم الحملة
 ,Reserved,محجوز
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
@@ -644,30 +587,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,الموجودات المتداولة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ليس من نوع المخزون
 DocType: Mode of Payment Account,Default Account,الافتراضي حساب
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع 
-DocType: Contact Us Settings,Address Title,عنوان عنوان
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعية
 DocType: Production Order Operation,Planned End Time,تنظيم وقت الانتهاء
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
-DocType: Dropbox Backup,Daily,يوميا
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,حساب مع الصفقة الحالية لا يمكن تحويلها إلى دفتر الأستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,حساب مع الصفقة الحالية لا يمكن تحويلها إلى دفتر الأستاذ
 DocType: Delivery Note,Customer's Purchase Order No,الزبون أمر الشراء لا
 DocType: Employee,Cell Number,الخلية رقم
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,طلبات السيارات المواد المتولدة
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,مفقود
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"لا يمكنك إدخال قسيمة الحالي في ""ضد إدخال دفتر اليومية"" عمود"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,طاقة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بيان الراتب الشهري.
 DocType: Item Group,Website Specifications,موقع المواصفات
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,حساب جديد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} من {0} من نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,القيود المحاسبية ويمكن إجراء ضد العقد ورقة. لا يسمح مقالات ضد المجموعات.
-DocType: ToDo,High,ارتفاع
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
-DocType: User,Male,ذكر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},عدد الشراء استلام المطلوبة القطعة ل {0}
 DocType: Item Attribute Value,Item Attribute Value,البند قيمة السمة
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,حملات المبيعات
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,الشخصية
 DocType: Expense Claim Detail,Expense Claim Type,حساب المطالبة نوع
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,الإعدادات الافتراضية لسلة التسوق
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ويرتبط مجلة الدخول {0} ضد بالدفع {1}، والتحقق ما إذا كان ينبغي سحبها كما تقدم في هذه الفاتورة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,التكنولوجيا الحيوية
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",ويرتبط مجلة الدخول {0} ضد بالدفع {1}، والتحقق ما إذا كان ينبغي سحبها كما تقدم في هذه الفاتورة.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,التكنولوجيا الحيوية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,مصاريف صيانة المكاتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,هدب
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,الرجاء إدخال العنصر الأول
 DocType: Account,Liability,مسئولية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,المبلغ عقوبات لا يمكن أن يكون أكبر من مبلغ المطالبة في صف {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 DocType: Process Payroll,Send Email,إرسال البريد الإلكتروني
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,لا يوجد تصريح
 DocType: Company,Default Bank Account,الافتراضي الحساب المصرفي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;الأوراق المالية التحديث&quot; لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,غ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,غ
 DocType: Item,Items with higher weightage will be shown higher,وسيتم عرض البنود مع أعلى الترجيح العالي
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل تسوية البنك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,بلدي الفواتير
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,بلدي الفواتير
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,لا توجد موظف
 DocType: Purchase Order,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
@@ -750,37 +690,34 @@
 DocType: Email Digest,Email Digest Settings,البريد الإلكتروني إعدادات دايجست
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,دعم الاستفسارات من العملاء.
 DocType: Features Setup,"To enable ""Point of Sale"" features",لتمكين &quot;نقطة بيع&quot; ميزات
-DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
+DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
 DocType: Production Planning Tool,Select Items,حدد العناصر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
-DocType: Comment,Reference Name,مرجع اسم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: Sales Invoice Item,Target Warehouse,الهدف مستودع
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ ترتيب المبيعات
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,يؤلف تلقائيا رسالة على تقديم المعاملات.
 DocType: Production Order,Item To Manufacture,البند لتصنيع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,قالب الصب الدائم
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} الوضع هو {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,أمر الشراء إلى الدفع
 DocType: Sales Order Item,Projected Qty,الكمية المتوقع
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
 DocType: Newsletter,Newsletter Manager,مدير النشرة الإخبارية
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;فتح&#39;
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
 DocType: Expense Claim,Expenses,نفقات
 DocType: Item Variant Attribute,Item Variant Attribute,البند البديل سمة
 ,Purchase Receipt Trends,شراء اتجاهات الإيصال
 DocType: Appraisal,Select template from which you want to get the Goals,حدد قالب الذي تريد للحصول على الأهداف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,البحوث والتنمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,البحوث والتنمية
 ,Amount to Bill,تصل إلى بيل
 DocType: Company,Registration Details,تسجيل تفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,عمادا
 DocType: Item,Re-Order Qty,إعادة ترتيب الكميه
 DocType: Leave Block List Date,Leave Block List Date,ترك بلوك تاريخ قائمة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},من المقرر أن يرسل إلى {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,الأسهم تفاصيل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,المشروع القيمة
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,نقطة البيع
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},لا يمكن المضي قدما {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","رصيد حساب بالفعل في الائتمان، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'كما' الخصم '"
 DocType: Account,Balance must be,يجب أن يكون التوازن
 DocType: Hub Settings,Publish Pricing,نشر التسعير
 DocType: Notification Control,Expense Claim Rejected Message,المطالبة حساب رفض رسالة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,تسمير
 ,Available Qty,الكمية المتاحة
 DocType: Purchase Taxes and Charges,On Previous Row Total,على إجمالي الصف السابق
 DocType: Salary Slip,Working Days,أيام عمل إنجليزية
 DocType: Serial No,Incoming Rate,الواردة قيم
 DocType: Packing Slip,Gross Weight,الوزن الإجمالي
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.
 DocType: HR Settings,Include holidays in Total no. of Working Days,تشمل أيام العطل في المجموع لا. أيام العمل
 DocType: Job Applicant,Hold,عقد
 DocType: Employee,Date of Joining,تاريخ الانضمام
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,رأي المشتركين
 DocType: Purchase Invoice Item,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,الكشط
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} يجب أن تكون نشطة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الزيارات {0} قبل إلغاء هذه الصيانة زيارة
 DocType: Salary Slip,Leave Encashment Amount,ترك المبلغ التحصيل
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},المسلسل لا {0} لا ينتمي إلى البند {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب الكمية
 DocType: Bank Reconciliation,Total Amount,المبلغ الكلي لل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,نشر الإنترنت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,نشر الإنترنت
 DocType: Production Planning Tool,Production Orders,أوامر الإنتاج
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,توازن القيمة
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,قائمة مبيعات الأسعار
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,نشر لمزامنة العناصر
-DocType: GL Entry,Account Currency,عملة الحساب
+DocType: Bank Reconciliation,Account Currency,عملة الحساب
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,يرجى ذكر جولة معطلة حساب في الشركة
 DocType: Purchase Receipt,Range,نطاق
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Features Setup,Item Barcode,البند الباركود
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
 DocType: Address,Shop,تسوق
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,العلامة التجارية
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,العلامة التجارية
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,اتاحة لأكثر من {0} للصنف {1}
 DocType: Employee,Exit Interview Details,تفاصيل مقابلة الخروج
 DocType: Item,Is Purchase Item,هو شراء مادة
@@ -856,67 +790,62 @@
 DocType: Payment Tool,Paid,مدفوع
 DocType: Salary Slip,Total in words,وبعبارة مجموع
 DocType: Material Request Item,Lead Time Date,تاريخ و وقت مبادرة البيع
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لا يتم إنشاء سجل صرف العملات ل
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,إلزامي. ربما لم يتم انشاء سجل تحويل العملة ل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",وللسلع &quot;حزمة المنتج، مستودع، المسلسل لا دفعة ويتم النظر في أي من الجدول&quot; قائمة التعبئة &quot;. إذا مستودع ودفعة لا هي نفسها لجميع عناصر التعبئة لمادة أي &#39;حزمة المنتج، يمكن إدخال تلك القيم في الجدول الرئيسي عنصر، سيتم نسخ القيم إلى &quot;قائمة التعبئة&quot; الجدول.
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,الشحنات للعملاء.
 DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,الدخل غير المباشرة
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ضبط كمية الدفع = المبلغ المستحق
-DocType: Contact Us Settings,Address Line 1,العنوان سطر 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,فرق
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,اسم الشركة
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,فرق
+,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,اختر البند لنقل
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,عرض قائمة من جميع ملفات الفيديو مساعدة
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,حدد رئيس حساب في البنك حيث أودع الاختيار.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,تسمح للمستخدم لتحرير الأسعار قائمة قيم في المعاملات
 DocType: Pricing Rule,Max Qty,ماكس الكمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,مادة كيميائية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 DocType: Process Payroll,Select Payroll Year and Month,حدد الرواتب السنة والشهر
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",انتقل إلى المجموعة المناسبة (عادة طلب تمويل&gt; الأصول الحالية&gt; الحسابات المصرفية وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;البنك&quot;
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
 DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل الموظف عيد ميلاد تذكير
-DocType: Comment,Unsubscribed,إلغاء اشتراكك
 DocType: Opportunity,Walk In,عميل غير مسجل
 DocType: Item,Inspection Criteria,التفتيش معايير
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,شجرة مراكز التكلفة finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,نقلها
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,أبيض
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع الرصاص (فتح)
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,إرفاق صورتك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,جعل
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,إرفاق صورتك
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,جعل
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
-DocType: Workflow State,Stop,توقف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,سلتي
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},يجب أن يكون النظام نوع واحد من {0}
 DocType: Lead,Next Contact Date,تاريخ لاحق اتصل
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,فتح الكمية
 DocType: Holiday List,Holiday List Name,عطلة اسم قائمة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,خيارات الأسهم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,خيارات الأسهم
 DocType: Journal Entry Account,Expense Claim,حساب المطالبة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},الكمية ل{0}
 DocType: Leave Application,Leave Application,ترك التطبيق
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترك أداة تخصيص
 DocType: Leave Block List,Leave Block List Dates,ترك التواريخ قائمة الحظر
 DocType: Company,If Monthly Budget Exceeded (for expense account),إذا تجاوز الميزانية الشهرية (لحساب المصاريف)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,زركشة
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هبطت استلام تكلفة الشراء
 DocType: Company,Default Terms,شروط الافتراضية
 DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زلة
 DocType: POS Profile,Cash/Bank Account,النقد / البنك حساب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر المبيعات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,الايداع
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,خصم
 DocType: Features Setup,Purchase Discounts,شراء خصومات
 DocType: Workstation,Wages,أجور
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"كنت الموافق المصروفات لهذا السجل . يرجى تحديث ""الحالة"" و فروا"
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,حساب لا يتطابق مع الشركة
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,مستودع WIP
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},المسلسل لا {0} هو بموجب عقد صيانة لغاية {1}
 DocType: BOM Operation,Operation,عملية
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,الدولة الشحن
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,مصاريف المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,شراء القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,شراء القياسية
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,تنفيذ الشريك
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ترتيب المبيعات {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,جعل الأسهم مقالات
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,جعل الأسهم مقالات
 DocType: Packing Slip,Net Weight UOM,الوزن الصافي UOM
 DocType: Item,Default Supplier,مزود الافتراضي
 DocType: Manufacturing Settings,Over Production Allowance Percentage,أكثر من الإنتاج بدل النسبة المئوية
@@ -960,31 +890,29 @@
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},إلى {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,تحديث عن طريق سجلات الوقت
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
 DocType: Opportunity,Your sales person who will contact the customer in future,مبيعاتك الشخص الذي سوف اتصل العميل في المستقبل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,قائمة قليلة من الموردين الخاصة بك . يمكن أن تكون المنظمات أو الأفراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,قائمة قليلة من الموردين الخاصة بك . يمكن أن تكون المنظمات أو الأفراد.
 DocType: Company,Default Currency,العملة الافتراضية
 DocType: Contact,Enter designation of this Contact,أدخل تسمية هذا الاتصال
-DocType: Contact Us Settings,Address,عنوان
 DocType: Expense Claim,From Employee,من موظف
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,تحذير : سيقوم النظام لا تحقق بالمغالاة في الفواتير منذ مبلغ القطعة ل {0} في {1} هو صفر
 DocType: Journal Entry,Make Difference Entry,جعل دخول الفرق
 DocType: Upload Attendance,Attendance From Date,الحضور من تاريخ
 DocType: Appraisal Template Goal,Key Performance Area,مفتاح الأداء المنطقة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,نقل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,نقل
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,والسنة:
 DocType: Email Digest,Annual Expense,المصاريف السنوية
 DocType: SMS Center,Total Characters,مجموع أحرف
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail, تفاصيل الفاتورة نموذج - س 
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},يرجى تحديد BOM في الحقل BOM القطعة ل{0}
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,تفاصيل الفاتورة نموذج - س
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,دفع فاتورة المصالحة
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,المساهمة٪
 DocType: Item,website page link,الموقع رابط الصفحة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,دعونا نقوم بإعداد النظام للمرة الاولى.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,أرقام تسجيل الشركة للرجوع اليها. أرقام الضرائب الخ.
 DocType: Sales Partner,Distributor,موزع
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,التسوق شحن العربة القاعدة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,من المدى يجب أن يكون أقل من أن تتراوح
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,حدد وقت السجلات وتقديمها إلى إنشاء فاتورة مبيعات جديدة.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاتورة مبيعات المقدمة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,شيء أن تطلب
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,إدارة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,إدارة
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,أنواع الأنشطة لجداول زمنية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,الاستثمار الصب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},مطلوب إما الخصم أو الائتمان لل مبلغ {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,سوف تدفع صافي (في كلمة) تكون مرئية بمجرد حفظ زلة الراتب.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,نشط
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,أزرق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,أزرق
 DocType: Purchase Invoice,Is Return,هو العائد
 DocType: Price List Country,Price List Country,قائمة الأسعار البلد
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},الملف POS {0} خلقت بالفعل للمستخدم: {1} وشركة {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM تحويل عامل
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,تصنيع الكائن مغلفة
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,الميزانية العمومية
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,تمتد تشكيل
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,سيكون لديك مبيعات شخص الحصول على تذكرة في هذا التاريخ للاتصال العملاء
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,الضرائب والاقتطاعات من الراتب أخرى.
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
 DocType: Account,Warehouse,مستودع
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
 ,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
 DocType: Purchase Invoice Item,Purchase Invoice Item,شراء السلعة الفاتورة
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,البند 1
 DocType: Holiday,Holiday,عطلة
-DocType: Event,Saturday,السبت
 DocType: Leave Control Panel,Leave blank if considered for all branches,ترك فارغا إذا نظرت لجميع الفروع
 ,Daily Time Log Summary,الوقت الملخص اليومي دخول
-DocType: DocField,Label,ملصق
 DocType: Payment Reconciliation,Unreconciled Payment Details,لم تتم تسويتها تفاصيل الدفع
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
 DocType: Lead,Call,دعوة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
 ,Trial Balance,ميزان المراجعة
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,إعداد الموظفين
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","الشبكة """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,الرجاء اختيار البادئة الأولى
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,بحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,بحث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
 DocType: Contact,User ID,المستخدم ID
-DocType: Communication,Sent,أرسلت
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,عرض ليدجر
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
-DocType: Communication,Delivery Status,حالة التسليم
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 DocType: Production Order,Manufacture against Sales Order,تصنيع ضد ترتيب المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير الفرق الميزانية
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,وصف السلعة
 DocType: Payment Tool,Payment Mode,طريقة الدفع
 DocType: Purchase Invoice,Is Recurring,غير متكرر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,تلبد الليزر معدنية مباشرة
 DocType: Purchase Order,Supplied Items,الأصناف الموردة
 DocType: Production Order,Qty To Manufacture,الكمية للتصنيع
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس معدل طوال دورة الشراء
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح مؤقت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,الموظف اترك الرصيد
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
 DocType: Address,Address Type,نوع العنوان
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على الفواتير المستحقة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ترتيب المبيعات {0} غير صالح
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",آسف، و الشركات لا يمكن دمج
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,صغير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,صغير
 DocType: Employee,Employee Number,رقم الموظف
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},الحالة رقم ( ق ) قيد الاستخدام بالفعل. محاولة من القضية لا { 0 }
 ,Invoiced Amount (Exculsive Tax),المبلغ فواتير ( Exculsive الضرائب )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,البند 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,رئيس الاعتبار {0} خلق
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,أخضر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,أخضر
 DocType: Item,Auto re-order,السيارات إعادة ترتيب
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,الإجمالي المحقق
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,الإجمالي المحقق
 DocType: Employee,Place of Issue,مكان الإصدار
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,عقد
-DocType: Report,Disabled,معاق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,عقد
+DocType: Email Digest,Add Quote,إضافة اقتباس
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM اللازمة لUOM: {0} في المدينة: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,زراعة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,المنتجات أو الخدمات الخاصة بك
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
-DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع 
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,مطلوب اسم
+DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
 DocType: Purchase Invoice,Recurring Type,نوع المتكررة
 DocType: Address,City/Town,المدينة / البلدة
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,البند {0} يجب أن يكون عنصر التعاقد الفرعي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,معدات العاصمة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد الأسعار على أساس القاعدة الأولى 'تطبيق في' الميدان، التي يمكن أن تكون مادة، مادة أو مجموعة العلامة التجارية.
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,التسليم المتوقع التاريخ هو أقل من الموعد المقرر ابدأ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ل مزود
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,مجموع المنتهية ولايته
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","يمكن أن يكون هناك واحد فقط الشحن القاعدة الحالة مع 0 أو قيمة فارغة ل "" إلى القيمة """
 DocType: Authorization Rule,Transaction,صفقة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ملاحظة : هذا هو مركز التكلفة المجموعة . لا يمكن إجراء القيود المحاسبية ضد الجماعات .
-apps/frappe/frappe/config/desk.py +7,Tools,أدوات
 DocType: Item,Website Item Groups,مجموعات الأصناف للموقع
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,عدد أمر الإنتاج إلزامي لدخول الأسهم صناعة الغرض
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شركة العملات)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,إدخال دفتر اليومية
 DocType: Workstation,Workstation Name,اسم محطة العمل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,أرسل دايجست:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
 DocType: Sales Partner,Target Distribution,هدف التوزيع
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,تعليقات
 DocType: Salary Slip,Bank Account No.,رقم الحساب في البك
 DocType: Naming Series,This is the number of the last created transaction with this prefix,هذا هو عدد المعاملات التي تم إنشاؤها باستخدام مشاركة هذه البادئة
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},قيم التقييم المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},قيم التقييم المطلوبة القطعة ل {0}
 DocType: Quality Inspection Reading,Reading 8,قراءة 8
 DocType: Sales Partner,Agent,وكيل
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",مجموعه {0} لجميع المواد والصفر، قد يجب عليك تغيير &quot;توزيع التهم على أساس &#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,الضرائب والرسوم حساب
 DocType: BOM Operation,Workstation,محطة العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,خردوات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,خردوات
 DocType: Attendance,HR Manager,مدير الموارد البشرية
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,الرجاء اختيار الشركة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتياز الإجازة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,لا توجد بيانات
 DocType: Appraisal Template Goal,Appraisal Template Goal,تقييم قالب الهدف
 DocType: Salary Slip,Earning,كسب
 DocType: Payment Tool,Party Account Currency,حزب حساب العملات
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ضد مجلة الدخول {0} يتم ضبط بالفعل ضد بعض قسيمة أخرى
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع قيمة الطلب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,غذاء
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,غذاء
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,المدى شيخوخة 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,يمكنك جعل السجل الوقت فقط ضد نظام إنتاج المقدمة
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",النشرات الإخبارية إلى جهات الاتصال، ويؤدي.
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع النقاط لجميع الأهداف يجب أن يكون 100. ومن {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,لا يمكن ترك عمليات فارغا.
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
-DocType: DocField,Description,وصف
-DocType: Authorization Rule,Average Discount,متوسط الخصم
-DocType: Letter Head,Is Default,افتراضي
+DocType: Authorization Rule,Average Discount,متوسط الخصم
 DocType: Address,Utilities,خدمات
 DocType: Purchase Invoice Item,Accounting,المحاسبة
 DocType: Features Setup,Features Setup,ميزات الإعداد
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,مشاهدة خطاب العرض
-DocType: Communication,Communication,اتصالات
 DocType: Item,Is Service Item,هو البند خدمة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,فترة التطبيق لا يمكن أن يكون تخصيص فترة إجازة الخارجي
 DocType: Activity Cost,Projects,مشاريع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,الرجاء اختيار السنة المالية
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},من {0} | {1} {2}
@@ -1204,7 +1114,7 @@
 DocType: Item,Will also apply to variants,سوف تنطبق أيضا على متغيرات
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,لا يمكن تغيير السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء مرة واحدة يتم حفظ السنة المالية.
 DocType: Quotation,Shopping Cart,سلة التسوق
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,متوسط ديلي الصادرة
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,متوسط ديلي الصادرة
 DocType: Pricing Rule,Campaign,حملة
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',يجب الحالة موافقة ' وافق ' أو ' رفض '
 DocType: Purchase Invoice,Contact Person,اتصل شخص
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,الحفاظ على الأوراق المالية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مقالات الأسهم التي تم إنشاؤها بالفعل لترتيب الإنتاج
 DocType: Leave Control Panel,Leave blank if considered for all designations,ترك فارغا إذا نظرت لجميع التسميات
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,من التاريخ والوقت
 DocType: Email Digest,For Company,لشركة
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,تملكها
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
@@ -1234,36 +1144,33 @@
 DocType: Employee,Better Prospects,آفاق أفضل
 DocType: Appraisal,Goals,الأهداف
 DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة
-,Accounts Browser,متصفح الحسابات 
+,Accounts Browser,متصفح الحسابات
 DocType: GL Entry,GL Entry,GL الدخول
 DocType: HR Settings,Employee Settings,إعدادات موظف
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,قائمة المهام
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,لا يسمح السلبية الكمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,مبتدئ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,لا يسمح السلبية الكمية
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","التفاصيل الضرائب الجدول المنال من سيده البند كسلسلة وتخزينها في هذا المجال.
  المستخدمة للضرائب والرسوم"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,الوخز
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقريرا إلى نفسه.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا تم تجميد الحساب، ويسمح للمستخدمين إدخالات مقيدة.
 DocType: Email Digest,Bank Balance,الرصيد المصرفي
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} لا يمكن إلا أن يكون في العملة: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} لا يمكن إلا أن يكون في العملة: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,لا هيكل الراتب نشط تم العثور عليها ل موظف {0} والشهر
 DocType: Job Opening,"Job profile, qualifications required etc.",الملامح المهمة ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
 DocType: Rename Tool,Type of document to rename.,نوع الوثيقة إلى إعادة تسمية.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,نشتري هذه القطعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,نشتري هذه القطعة
 DocType: Address,Billing,الفواتير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,تشفيه
-DocType: Bulk Email,Not Sent,لا ترسل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,المتفجرات تشكيل
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع الضرائب والرسوم (عملة الشركة)
 DocType: Shipping Rule,Shipping Account,حساب الشحن
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,من المقرر أن يرسل إلى {0} المتلقين
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,الجمعيات الفرعية
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,الجمعيات الفرعية
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Supplier,Stock Manager,الأسهم مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,استيراد فشل !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,أي عنوان أضاف بعد.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,محلل
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,محلل
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ JV {2} الصف {0}
 DocType: Item,Inventory,جرد
 DocType: Features Setup,"To enable ""Point of Sale"" view",لتمكين &quot;نقطة البيع&quot; وجهة نظر
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,لا يمكن أن يتم السداد للسلة فارغة
 DocType: Item,Sales Details,تفاصيل المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,تعلق
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
 DocType: Notification Control,Expense Claim Rejected,المطالبة حساب مرفوض
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
 DocType: Item Attribute,Item Attribute,البند السمة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,حكومة
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,المتغيرات البند
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,حكومة
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
 DocType: Sales Invoice,Source,مصدر
 DocType: Leave Type,Is Leave Without Pay,وإجازة بدون راتب
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,لا توجد في جدول الدفع السجلات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,تاريخ بدء السنة المالية
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,لا توجد في جدول الدفع السجلات
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,تاريخ بدء السنة المالية
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,التوسيع
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,الشحن و التخليص الرسوم
 DocType: Material Request Item,Sales Order No,ترتيب المبيعات لا
 DocType: Item Group,Item Group Name,البند اسم المجموعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,مأخوذ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,المواد نقل لصناعة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,البحث التنفيذي
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",معدل شراء البند: {0} لم يتم العثور، وهو مطلوب لحجز دخول المحاسبة (النفقات). يرجى ذكر سعر البند ضد لائحة أسعار الشراء.
 DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),إضافي مقدار الخصم (العملة الشركة)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},الخطأ: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},الخطأ: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,يرجى إنشاء حساب جديد من الرسم البياني للحسابات .
 DocType: Maintenance Visit,Maintenance Visit,صيانة زيارة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,العملاء> مجموعة العملاء> إقليم
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,تتوفر الكمية دفعة في مستودع
 DocType: Time Log Batch Detail,Time Log Batch Detail,وقت دخول دفعة التفاصيل
-DocType: Workflow State,Tasks,المهام
 DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعدة
-DocType: Event,Tuesday,الثلاثاء
 DocType: Leave Block List,Block Holidays on important days.,عطلات كتلة في الأيام الهامة.
 ,Accounts Receivable Summary,حسابات المقبوضات ملخص
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},يترك لنوع {0} المخصصة أصلا لموظف {1} لفترة {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
 DocType: UOM,UOM Name,UOM اسم
-DocType: Top Bar Item,Target,الهدف
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,مبلغ المساهمة
 DocType: Sales Invoice,Shipping Address,عنوان الشحن
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,تساعدك هذه الأداة لتحديث أو تحديد الكمية وتقييم الأوراق المالية في النظام. وعادة ما يتم استخدامه لمزامنة قيم النظام وما هو موجود فعلا في المستودعات الخاصة بك.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,وبعبارة تكون مرئية بمجرد حفظ ملاحظة التسليم.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,العلامة التجارية الرئيسية.
-DocType: ToDo,Due Date,بسبب تاريخ
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,العلامة التجارية الرئيسية.
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,صندوق
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,منظمة
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,صندوق
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,منظمة
 DocType: Monthly Distribution,Monthly Distribution,التوزيع الشهري
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,مبيعات الشريك الهدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},القيد المحاسبي ل{0} لا يمكن إلا أن تكون في العملة: {1}
 DocType: Pricing Rule,Pricing Rule,التسعير القاعدة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,الإحراز
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,طلب المادي لأمر الشراء
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,الحسابات المصرفية
 ,Bank Reconciliation Statement,بيان تسوية البنك
 DocType: Address,Lead Name,اسم مبادرة البيع
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,فتح البورصة الميزان
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,فتح البورصة الميزان
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} يجب أن تظهر مرة واحدة فقط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},لا يسمح للإنتقال أكثر {0} من {1} ضد طلب شراء {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},الأوراق المخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,المبالغ لا ينعكس في البنك
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,المبالغ لا ينعكس في البنك
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,مطالبات لحساب الشركة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,صب الطرد المركزي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,المغناطيسي التشطيب بمساعدة ميدانية
 DocType: Company,Default Holiday List,افتراضي قائمة عطلة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,المطلوبات الأسهم
 DocType: Purchase Receipt,Supplier Warehouse,المورد مستودع
 DocType: Opportunity,Contact Mobile No,الاتصال المحمول لا
 DocType: Production Planning Tool,Select Sales Orders,حدد أوامر المبيعات
 ,Material Requests for which Supplier Quotations are not created,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (ق) الذي يتم تطبيق للحصول على إجازة وأيام العطل. لا تحتاج إلى تقديم طلب للحصول الإجازة.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,لتعقب العناصر باستخدام الباركود. سوف تكون قادرة على الدخول في بنود مذكرة التسليم والفاتورة المبيعات عن طريق مسح الباركود من العنصر.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,إجعلها تسليم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,إجعلها تسليم
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,جعل الاقتباس
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,توقف عيد ميلاد تذكير
 DocType: SMS Center,Receiver List,استقبال قائمة
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} مشاهدة
 DocType: Salary Structure Deduction,Salary Structure Deduction,هيكل المرتبات / الخصومات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,انتقائية تلبد الليزر
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,استيراد الناجحة !
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (أيام)
 DocType: Quotation Item,Quotation Item,عنصر تسعيرة
 DocType: Account,Account Name,اسم الحساب
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,من تاريخ لا يمكن أن يكون أكبر من إلى تاريخ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,من تاريخ لا يمكن أن يكون أكبر من إلى تاريخ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,المسلسل لا {0} كمية {1} لا يمكن أن يكون جزء
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,المورد الرئيسي نوع .
 DocType: Purchase Order Item,Supplier Part Number,المورد رقم الجزء
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,إضافة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,معدل التحويل لا يمكن أن يكون 0 أو 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} تم إلغاء أو توقف
 DocType: Accounts Settings,Credit Controller,المراقب الائتمان
 DocType: Delivery Note,Vehicle Dispatch Date,سيارة الإرسال التسجيل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
 DocType: Company,Default Payable Account,افتراضي الدائنة حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات الإنترنت عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,الإعداد كاملة
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} فوترت٪
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,الكمية المحجوزة
 DocType: Party Account,Party Account,حساب طرف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,العلوي الدخل
 DocType: Journal Entry Account,Debit in Company Currency,الخصم في الشركة العملات
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,قضايا بلدي
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,قيم افتراضية
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,صف {0} كمية الدفع لا يمكن أن يكون سلبيا
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,الصحافة المناسب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 DocType: Payment Reconciliation,Payments,المدفوعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,المتوازنة التضاغط الملحة الساخنة
-DocType: ToDo,Medium,متوسط
 DocType: Budget Detail,Budget Allocated,الميزانية المخصصة
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد العملاء
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,تحديث البنك دفع التواريخ مع المجلات.
 DocType: Quotation,Term Details,مصطلح تفاصيل
 DocType: Manufacturing Settings,Capacity Planning For (Days),القدرة على التخطيط لل(أيام)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 DocType: Warranty Claim,Warranty Claim,المطالبة الضمان
 ,Lead Details,تفاصيل مبادرة بيع
-DocType: Authorization Rule,Approving User,الموافقة العضو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,تزوير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,تصفيح
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
 DocType: Pricing Rule,Applicable For,قابل للتطبيق ل
 DocType: Bank Reconciliation,From Date,من تاريخ
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
 DocType: Purchase Invoice,Additional Discount,خصم إضافي
 DocType: Selling Settings,Selling Settings,بيع إعدادات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,مزادات على الانترنت
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزادات على الانترنت
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,يرجى تحديد الكمية أو التقييم إما قيم أو كليهما
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شركة والشهر و السنة المالية إلزامي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لجعل هذا المقال الاوراق المالية
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,واحد وحدة من عنصر.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',وقت دخول الدفعة {0} يجب ' نشره '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
 DocType: Leave Allocation,Total Leaves Allocated,أوراق الإجمالية المخصصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
 DocType: Employee,Date Of Retirement,تاريخ التقاعد
 DocType: Upload Attendance,Get Template,الحصول على قالب
 DocType: Address,Postal,بريدي
 DocType: Item,Weightage,الوزن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,تعدين
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,الراتنج صب
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء مع نفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية المجموعة العملاء
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,الرجاء اختيار {0} أولا.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},النص {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},النص {0}
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
 DocType: Stock Entry,Material Receipt,أستلام مواد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,المنتجات
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,المنتجات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ
 DocType: Lead,Next Contact By,لاحق اتصل بواسطة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},مستودع {0} لا يمكن حذف كما توجد كمية القطعة ل {1}
 DocType: Quotation,Order Type,نوع الطلب
 DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
 DocType: Payment Tool,Find Invoices to Match,البحث عن الفواتير لتطابق
 ,Item-wise Sales Register,مبيعات البند الحكيم سجل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","على سبيل المثال ""البنك الوطني XYZ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","على سبيل المثال ""البنك الوطني XYZ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,وهذه الضريبة متضمنة في سعر الأساسية؟
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,إجمالي المستهدف
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,إجمالي المستهدف
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,يتم تمكين سلة التسوق
 DocType: Job Applicant,Applicant for a Job,المتقدم للحصول على وظيفة
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,لا أوامر الإنتاج التي تم إنشاؤها
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,إيصال راتب الموظف تم إنشاؤها مسبقا لهذا الشهر 
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,إيصال راتب الموظف تم إنشاؤها مسبقا لهذا الشهر
 DocType: Stock Reconciliation,Reconciliation JSON,المصالحة JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Sales Invoice Item,Batch No,رقم دفعة
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح عدة أوامر البيع ضد طلب شراء العميل
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,رئيسي
-DocType: DocPerm,Delete,حذف
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,مختلف
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جديد {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,لا يمكن إلغاء النظام على توقف . نزع السدادة لإلغاء .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,ترك صرفها؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,جعل أمر الشراء
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,جعل أمر الشراء
 DocType: SMS Center,Send To,أرسل إلى
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
 DocType: Sales Team,Contribution to Net Total,المساهمة في صافي إجمالي
 DocType: Sales Invoice Item,Customer's Item Code,كود الصنف العميل
 DocType: Stock Reconciliation,Stock Reconciliation,الأسهم المصالحة
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,المتقدم للحصول على الوظيفة.
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
-DocType: Country,Country,بلد
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,عناوين
-DocType: Communication,Received,تلقى
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ضد مجلة الدخول {0} ليس لديه أي لا مثيل لها {1} دخول
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تكرار المسلسل لا دخل القطعة ل {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,وهناك شرط للحصول على الشحن القاعدة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,لا يسمح البند لأمر الإنتاج.
-DocType: DocField,Attach Image,إرفاق صورة
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن صافي من هذه الحزمة. (تحسب تلقائيا مجموع الوزن الصافي للسلعة)
-DocType: Stock Reconciliation Item,Leave blank if no change,اتركه فارغا اذا لم يكن التغيير
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: GL Entry,Credit Amount in Account Currency,مبلغ القرض في حساب العملات
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سجلات الوقت للتصنيع.
 DocType: Item,Apply Warehouse-wise Reorder Level,تطبيق مستودع الحكمة إعادة ترتيب مستوى
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} يجب أن تقدم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} يجب أن تقدم
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,وقت دخول للمهام.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,دفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,دفع
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
 DocType: Employee,Salutation,تحية
-DocType: Communication,Rejected,مرفوض
 DocType: Pricing Rule,Brand,علامة تجارية
 DocType: Item,Will also apply for variants,سوف تنطبق أيضا على متغيرات
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Sales Order Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
 DocType: Quality Inspection Reading,Reading 10,قراءة 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",قائمة المنتجات أو الخدمات التي تشتري أو تبيع الخاص بك.
 DocType: Hub Settings,Hub Node,المحور عقدة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,لقد دخلت عناصر مكررة . يرجى تصحيح و حاول مرة أخرى.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,قيمة {0} للسمة {1} غير موجود في قائمة صالحة قيم سمة العنصر
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,مساعد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,مساعد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,انتهى
 DocType: Packing Slip,To Package No.,لحزم رقم
-DocType: DocType,System,نظام
 DocType: Warranty Claim,Issue Date,تاريخ القضية
 DocType: Activity Cost,Activity Cost,النشاط التكلفة
 DocType: Purchase Receipt Item Supplied,Consumed Qty,تستهلك الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,الاتصالات السلكية واللاسلكية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,الاتصالات السلكية واللاسلكية
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
 DocType: Payment Tool,Make Payment Entry,جعل الدفع الاشتراك
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
 ,Sales Invoice Trends,اتجاهات فاتورة المبيعات
 DocType: Leave Application,Apply / Approve Leaves,تطبيق / الموافقة على أوراق
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"يمكن الرجوع صف فقط إذا كان نوع التهمة هي "" في السابق المبلغ صف 'أو' السابق صف إجمالي '"
 DocType: Sales Order Item,Delivery Warehouse,مستودع تسليم
 DocType: Stock Settings,Allowance Percent,بدل النسبة
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق البيع، إذا تم تحديد مطبق للك {0}
 DocType: Purchase Order Item,Supplier Quotation Item,المورد اقتباس الإغلاق
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,جعل هيكل الرواتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,قص
 DocType: Item,Has Variants,لديها المتغيرات
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,انقر على &#39;جعل مبيعات الفاتورة &quot;الزر لإنشاء فاتورة مبيعات جديدة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,التعبئة والتغليف ووضع العلامات
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
 DocType: Sales Person,Parent Sales Person,الأم المبيعات شخص
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,يرجى تحديد العملة الافتراضية في شركة ماستر وافتراضيات العالمية
-DocType: Dropbox Backup,Dropbox Access Secret,دروببوإكس الدخول السرية
 DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,إدارة المشاريع
 DocType: Supplier,Supplier of Goods or Services.,المورد من السلع أو الخدمات.
 DocType: Budget Detail,Fiscal Year,السنة المالية
 DocType: Cost Center,Budget,ميزانية
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",الميزانية لا يمكن المبينة قرين {0}، كما انها ليست حساب الإيرادات والمصروفات
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,حقق
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حقق
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,أراضي / العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,على سبيل المثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,على سبيل المثال 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
 DocType: Item,Is Sales Item,هو المبيعات الإغلاق
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,البند المجموعة شجرة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
 ,Amount to Deliver,المبلغ تسليم
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,منتج أو خدمة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,كانت هناك أخطاء .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,نقر
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,منتج أو خدمة
 DocType: Naming Series,Current Value,القيمة الحالية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} تم إنشاء
 DocType: Delivery Note Item,Against Sales Order,ضد ترتيب المبيعات
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
 DocType: Website Item Group,Website Item Group,مجموعة الأصناف للموقع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,الرسوم والضرائب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} إدخالات الدفع لا يمكن أن تتم تصفيته من قبل {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,الجدول القطعة لأنه سيظهر في الموقع
 DocType: Purchase Order Item Supplied,Supplied Qty,الموردة الكمية
 DocType: Material Request Item,Material Request Item,طلب المواد الإغلاق
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,شجرة المجموعات البند .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,شجرة المجموعات البند .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 ,Item-wise Purchase History,البند الحكيم تاريخ الشراء
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,أحمر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,أحمر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر مفتوحة الانتاج
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,الصف # {0} عملية {1} لم يكتمل ل{2} الكمية من السلع تامة الصنع في أمر الإنتاج # {3}. يرجى تحديث حالة عملية عن طريق سجلات الوقت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,تغيير UOM للعنصر.
 DocType: Quality Inspection Reading,Acceptance Criteria,معايير القبول
 DocType: Item Attribute,Attribute Name,السمة اسم
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},البند {0} يجب أن تكون المبيعات أو خدمة عنصر في {1}
 DocType: Item Group,Show In Website,تظهر في الموقع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,مجموعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,مجموعة
 DocType: Task,Expected Time (in hours),الوقت المتوقع (بالساعات)
 ,Qty to Order,الكمية للطلب
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",لتتبع اسم العلامة التجارية في الوثائق التالية تسليم مذكرة، فرصة، طلب المواد، البند، طلب شراء، شراء قسيمة، المشتري استلام، الاقتباس، فاتورة المبيعات، حزمة المنتج، ترتيب المبيعات، المسلسل لا
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,الجدول واضح
 DocType: Features Setup,Brands,العلامات التجارية
 DocType: C-Form Invoice Detail,Invoice No,الفاتورة لا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,من أمر الشراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,من أمر الشراء
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترك لا يمكن تطبيقها / إلغاء قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
 DocType: Activity Cost,Costing Rate,تكلف سعر
 ,Customer Addresses And Contacts,العناوين العملاء واتصالات
 DocType: Employee,Resignation Letter Date,استقالة تاريخ رسالة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,يتم تصفية قواعد التسعير على أساس كمية إضافية.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,غير محدد
-DocType: Communication,Date,تاريخ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,كرر الإيرادات العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"الرجاء الانتظار حتى يتم الانتهاء من اعداد النظام, قد يستغرق بضع دقائق."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (إعتماد النفقات)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,زوج
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,زوج
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 DocType: Maintenance Schedule Detail,Actual Date,التاريخ الفعلي
 DocType: Item,Has Batch No,ودفعة واحدة لا
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
 DocType: Employee,Personal Details,تفاصيل شخصية
 ,Maintenance Schedules,جداول الصيانة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,النقش
 ,Quotation Trends,اتجاهات الاقتباس
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",لأنه يمكن أن يتم اصدار أمر إنتاج لهذا الصنف، يجب أن يكون الصنف من نوع المخزون .
 DocType: Shipping Rule Condition,Shipping Amount,الشحن المبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,انضمام
-DocType: Authorization Rule,Above Value,فوق القيمة
 ,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
 DocType: Purchase Order,Delivered,تسليم
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),إعداد ملقم واردة عن وظائف البريد الإلكتروني معرف . (على سبيل المثال jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع الأوراق المخصصة {0} لا يمكن أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
 DocType: Journal Entry,Accounts Receivable,حسابات القبض
 ,Supplier-Wise Sales Analytics,المورد حكيم المبيعات تحليلات
 DocType: Address Template,This format is used if country specific format is not found,ويستخدم هذا الشكل إذا لم يتم العثور على صيغة محددة البلاد
-DocType: Custom Field,Custom,عرف
 DocType: Production Order,Use Multi-Level BOM,استخدام متعدد المستويات BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,حقن صب
 DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات التوفيق
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,شجرة حسابات finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ترك فارغا إذا نظرت لجميع أنواع موظف
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"حساب {0} يجب أن تكون من النوع ' الأصول الثابتة "" لأن الصنف {1} من ضمن الأصول"
 DocType: HR Settings,HR Settings,إعدادات HR
-apps/frappe/frappe/config/setup.py +130,Printing,طبع
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
 DocType: Purchase Invoice,Additional Discount Amount,إضافي مقدار الخصم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,اليوم ( ق ) التي كنت متقدما للحصول على إذن هي عطلة. لا تحتاج إلى تطبيق للحصول على إجازة .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترك قائمة الحظر السماح
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,ابر لا يمكن أن تكون فارغة أو الفضاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,الرياضة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,الإجمالي الفعلي
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,وحدة
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,الرجاء تعيين مفاتيح الوصول دروببوإكس في التكوين موقعك
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,وحدة
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,يرجى تحديد شركة
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,السنة المالية تنتهي في الخاص
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} الآن سنة مالية افتراضية،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,مطالبات حساب
 DocType: Issue,Support,دعم
-DocType: Authorization Rule,Approving Role,الموافقة على دور
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,يرجى تحديد العملة في الشركة
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},توازن الأسهم في الدفعة {0} ستصبح سلبية {1} القطعة ل{2} في {3} مستودع
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",إظهار / إخفاء ميزات مثل المسلسل نص ، POS الخ
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},حساب {0} غير صالح. يجب أن تكون عملة الحساب {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,وبناء على طلبات المواد أثيرت تلقائيا على أساس إعادة ترتيب مستوى العنصر
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},حساب {0} غير صالح. يجب أن تكون عملة الحساب {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},مطلوب عامل UOM التحويل في الصف {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},تاريخ التخليص لا يمكن أن يكون قبل تاريخ الاختيار في الصف {0}
 DocType: Salary Slip,Deduction,اقتطاع
 DocType: Address Template,Address Template,قالب عنوان
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من هذا الشخص المبيعات
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,تسعيرة
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 DocType: Quotation,Maintenance User,الصيانة العضو
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,تكلفة تحديث
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,تكلفة تحديث
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,البند {0} تم بالفعل عاد
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** السنة المالية ** يمثل السنة المالية. يتم تعقب كل القيود المحاسبية والمعاملات الرئيسية الأخرى مقابل السنة المالية ** **.
 DocType: Opportunity,Customer / Lead Address,العميل / الرصاص العنوان
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,المسمى الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,المسمى الوظيفي
 DocType: Purchase Order Item,Qty as per Stock UOM,حسب الكمية سهم UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,يرجى تحديد ملف CSV صالحة مع البيانات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,طلية
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار. 
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",تتبع الحملات المبيعات. تتبع يؤدي، الاقتباسات، ترتيب المبيعات الخ من الحملات لقياس العائد على الاستثمار.
 DocType: Expense Claim,Approver,الموافق
 ,SO Qty,SO الكمية
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",توجد إدخالات الاسهم ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديل مستودع
 DocType: Appraisal,Calculate Total Score,حساب النتيجة الإجمالية
 DocType: Supplier Quotation,Manufacturing Manager,مدير التصنيع
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},المسلسل لا {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
-apps/erpnext/erpnext/hooks.py +84,Shipments,شحنات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,تراجع صب
-DocType: Purchase Order,To be delivered to customer,ليتم تسليمها إلى العملاء
+apps/erpnext/erpnext/hooks.py +68,Shipments,شحنات
+DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,يجب تقديم الوقت سجل الحالة.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,المسلسل لا {0} لا تنتمي إلى أي مستودع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,إنشاء
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,الصف #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,الصف #
 DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
 DocType: Pricing Rule,Supplier,مزود
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,المصروفات المتنوعة
 DocType: Global Defaults,Default Company,افتراضي شركة
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة الأسهم الإجمالية
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
 DocType: Employee,Bank Name,اسم البنك
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-أعلى
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,المستخدم {0} تم تعطيل
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
-DocType: Journal Entry Account,Credit in Account Currency,الائتمان في عملة الحساب
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",أنواع العمل (دائمة أو عقد الخ متدربة ) .
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Currency Exchange,From Currency,من العملات
-DocType: DocField,Name,اسم
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,المبالغ لم تنعكس في نظام
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ترتيب المبيعات المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,المبالغ لم تنعكس في نظام
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,آخرون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,آخرون
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على مطابقة البند. الرجاء تحديد قيمة أخرى ل{0}.
 DocType: POS Profile,Taxes and Charges,الضرائب والرسوم
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",منتج أو الخدمة التي يتم شراؤها أو بيعها أو حملها في المخزون.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,الانتهاء
-DocType: Web Form,Select DocType,حدد DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,التطرق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,مصرفي
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مركز تكلفة جديدة
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,مركز تكلفة جديدة
 DocType: Bin,Ordered Quantity,أمرت الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","مثلاً: ""نبني أدوات البنائين"""
 DocType: Quality Inspection,In Process,في عملية
 DocType: Authorization Rule,Itemwise Discount,Itemwise الخصم
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع الوثيقة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
 DocType: Account,Fixed Asset,الأصول الثابتة
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,جرد المتسلسلة
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,جرد المتسلسلة
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
 DocType: Time Log Batch,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب المستحق
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ترتيب مبيعات لدفع
 DocType: Expense Claim Detail,Expense Claim Detail,حساب المطالبة التفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,الوقت سجلات خلق:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,يرجى تحديد الحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Employee,Blood Group,فصيلة الدم
 DocType: Purchase Invoice Item,Page Break,فاصل الصفحة
 DocType: Production Order Operation,Pending,ريثما
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,المستخدمين الذين يمكنهم الموافقة على الطلبات إجازة موظف معين ل
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,لا يمكنك تغيير UOM الافتراضي متغير. لتغيير UOM الافتراضي للخيار UOM تغيير الافتراضي للقالب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,أدوات المكتب
 DocType: Purchase Invoice Item,Qty,الكمية
 DocType: Fiscal Year,Companies,الشركات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,إلكترونيات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,إلكترونيات
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,رفع طلب المواد عند الأسهم تصل إلى مستوى إعادة الطلب
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,من جدول الصيانة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,بدوام كامل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,بدوام كامل
 DocType: Purchase Invoice,Contact Details,للإتصال
 DocType: C-Form,Received Date,تاريخ الاستلام
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",إذا قمت بإنشاء قالب قياسي في قالب الضرائب على المبيعات والرسوم، اختر واحدا وانقر على الزر أدناه.
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,افتتاح العمل
 DocType: Payment Reconciliation,Payment Reconciliation,دفع المصالحة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,تكنولوجيا
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
 DocType: Offer Letter,Offer Letter,خطاب عرض
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,إنشاء طلبات المواد (MRP) وأوامر الإنتاج.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,إجمالي الفاتورة آمت
 DocType: Time Log,To Time,إلى وقت
+DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",لإضافة العقد التابعة ، واستكشاف شجرة وانقر على العقدة التي بموجبها تريد إضافة المزيد من العقد .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,يجب أن يكون الائتمان لحساب حسابات المدفوعات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM العودية : {0} لا يمكن أن يكون الأم أو الطفل من {2}
 DocType: Production Order Operation,Completed Qty,الكمية الانتهاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,رموز العملاء البند
 DocType: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,خلق مقالات الدفع ضد أوامر أو الفواتير.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,لحام
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,مطلوب اسهم جديدة UOM
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',الرجاء تحديد صالح &#39;من القضية رقم&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
 DocType: Features Setup,Item Serial Nos,المسلسل ارقام البند
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين وأذونات
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,الكمية الفعلية
 DocType: Shipping Rule,example: Next Day Shipping,مثال: اليوم التالي شحن
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,صب صب
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,العملاء
 DocType: Leave Block List Date,Block Date,منع تاريخ
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
 ,Bank Clearance Summary,بنك ملخص التخليص
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",إنشاء وإدارة البريد الإلكتروني يوميا هضم وأسبوعية وشهرية .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,كود البند> مجموعة المدينة> العلامة التجارية
 DocType: Appraisal Goal,Appraisal Goal,تقييم الهدف
-DocType: Event,Friday,الجمعة
 DocType: Time Log,Costing Amount,تكلف مبلغ
 DocType: Process Payroll,Submit Salary Slip,يقدم زلة الراتب
 DocType: Salary Structure,Monthly Earning & Deduction,الدخل الشهري وخصم
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,استيراد بكميات كبيرة
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
 DocType: SMS Log,Sender Name,المرسل اسم
-DocType: Page,Title,لقب
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,تخصيص
 DocType: POS Profile,[Select],[اختر ]
 DocType: SMS Log,Sent To,يرسل الى
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,جعل فاتورة المبيعات
 DocType: Company,For Reference Only.,للاشارة فقط.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},باطلة {0} {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},باطلة {0} {1}
 DocType: Sales Invoice Advance,Advance Amount,المبلغ مقدما
 DocType: Manufacturing Settings,Capacity Planning,القدرة على التخطيط
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,من تاريخ (مطلوب)
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,من تاريخ (مطلوب)
 DocType: Journal Entry,Reference Number,الرقم المرجعي لل
 DocType: Employee,Employment Details,تفاصيل العمل
 DocType: Employee,New Workplace,مكان العمل الجديد
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,بناء على شيخوخة
 DocType: Item,End of Life,نهاية الحياة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,السماح للمستخدمين
 DocType: Purchase Order,Customer Mobile No,العميل رقم هاتفك الجوال
 DocType: Sales Invoice,Recurring,تواتري
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,تسمح الأسهم السلبية
 DocType: Installation Note,Installation Note,ملاحظة التثبيت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,إضافة الضرائب
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,إضافة الضرائب
 ,Financial Analytics,تحليلات مالية
 DocType: Quality Inspection,Verified By,التحقق من
 DocType: Address,Subsidiary,شركة فرعية
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
 DocType: Quality Inspection,Purchase Receipt No,لا شراء استلام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,العربون
-DocType: System Settings,In Hours,في ساعات
 DocType: Process Payroll,Create Salary Slip,إنشاء زلة الراتب
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,التوازن المتوقع حسب البنك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,التلميع
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,التوازن المتوقع حسب البنك
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),مصدر الأموال ( المطلوبات )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
 DocType: Appraisal,Employee,موظف
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,المجموعة بواسطة قسيمة
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,المطلوبة على
 DocType: Sales Invoice,Mass Mailing,الشامل البريدية
-DocType: Page,Standard,معيار
 DocType: Rename Tool,File to Rename,ملف إعادة تسمية
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,مشاهدة المدفوعات
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,حجم
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
 DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,الأدوية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,الأدوية
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
 DocType: Selling Settings,Sales Order Required,ترتيب المبيعات المطلوبة
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,خلق العملاء
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
 DocType: Supplier,Is Frozen,غير المجمدة
 DocType: Buying Settings,Buying Settings,إعدادات الشراء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,التشطيب الشامل
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,رقم BOM  للأصناف المنتجة
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),إعداد ملقم البريد الإلكتروني الوارد لل مبيعات الهوية. (على سبيل المثال sales@example.com )
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Tool,Payment Account,حساب الدفع
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,مسودة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,التعويضية
 DocType: Quality Inspection Reading,Accepted,مقبول
-DocType: User,Female,أنثى
-DocType: Journal Entry Account,Debit in Account Currency,الخصم في عملة الحساب
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
-DocType: Print Settings,Modern,حديث
-DocType: Communication,Replied,رد
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع غير صالح {0} {1}
 DocType: Payment Tool,Total Payment Amount,المبلغ الكلي للدفع
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
 DocType: Shipping Rule,Shipping Rule Label,الشحن تسمية القاعدة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 DocType: Newsletter,Test,اختبار
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",كما أن هناك معاملات الأوراق المالية الموجودة لهذا البند، \ لا يمكنك تغيير قيم &quot;ليس لديه المسلسل &#39;،&#39; لديه دفعة لا &#39;،&#39; هل البند الأسهم&quot; و &quot;أسلوب التقييم&quot;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,خيارات مجلة الدخول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير معدل إذا ذكر BOM agianst أي بند
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
 DocType: Stock Entry,For Quantity,لالكمية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,طلبات البنود.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سيتم إنشاء منفصلة أمر الإنتاج لمادة جيدة لكل النهائي.
 DocType: Purchase Invoice,Terms and Conditions1,حيث وConditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,الإعداد الكامل
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",قيد محاسبي المجمدة تصل إلى هذا التاريخ، لا أحد يمكن أن تفعل / تعديل إدخال باستثناء دور المحددة أدناه.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,الرجاء حفظ المستند قبل إنشاء جدول الصيانة
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),الاختيار هذه لكسور عدم السماح بها. (لNOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,النشرة الإخبارية القائمة البريدية
 DocType: Delivery Note,Transporter Name,نقل اسم
+DocType: Authorization Rule,Authorized Value,القيمة أذن
 DocType: Contact,Enter department to which this Contact belongs,أدخل الدائرة التي ينتمي هذا الاتصال
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,إجمالي غائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,وحدة القياس
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,وحدة القياس
 DocType: Fiscal Year,Year End Date,تاريخ نهاية العام
 DocType: Task Depends On,Task Depends On,المهمة يعتمد على
 DocType: Lead,Opportunity,فرصة
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),أسعار الأساسي (كما في الأوراق المالية UOM)
 DocType: SMS Log,No of Requested SMS,لا للSMS مطلوب
 DocType: Campaign,Campaign-.####,حملة # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ثاقب
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ الانتهاء العقد أكبر من تاريخ الالتحاق بالعمل
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,موزع طرف ثالث / تاجر / عمولة الوكيل / التابعة / التجزئة الذي يبيع منتجات شركة من أجل عمولة.
 DocType: Customer Group,Has Child Node,وعقدة الطفل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",أدخل المعلمات URL ثابت هنا (مثلا المرسل = ERPNext، اسم المستخدم = ERPNext، كلمة المرور = 1234 الخ)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} لا في أي سنة مالية نشطة. لمزيد من التفاصيل الاختيار {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,هذا مثال موقع ولدت لصناعة السيارات من ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,شيخوخة المدى 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,بالقطع الضوئي
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. أدخل الصف: إذا كان على أساس ""السابق صف إجمالي"" يمكنك تحديد عدد الصفوف التي سيتم اتخاذها كقاعدة لهذا الحساب (الافتراضي هو الصف السابق).
  9. النظر في ضريبة أو رسم ل: في هذا القسم يمكنك تحديد ما إذا كان الضرائب / الرسوم هو فقط للتقييم (وليس جزءا من الكل) أو فقط للمجموع (لا يضيف قيمة إلى العنصر) أو لكليهما.
  10. إضافة أو اقتطاع: إذا كنت ترغب في إضافة أو خصم الضرائب."
-DocType: Note,Note,لاحظ
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
-DocType: Email Account,Email Ids,البريد الإلكتروني معرفات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,لم يقدم الاسهم الدخول {0}
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 DocType: Tax Rule,Billing City,مدينة الفوترة
 DocType: Global Defaults,Hide Currency Symbol,إخفاء رمز العملة
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,ملاحظة الائتمان
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},الانتهاء الكمية لا يمكن أن يكون أكثر من {0} لتشغيل {1}
 DocType: Features Setup,Quality,جودة
-DocType: Contact Us Settings,Introduction,مقدمة
 DocType: Warranty Claim,Service Address,خدمة العنوان
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,ماكس 100 الصفوف للسهم المصالحة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,ماكس 100 الصفوف للسهم المصالحة.
 DocType: Stock Entry,Manufacture,صناعة
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,يرجى ملاحظة التسليم أولا
 DocType: Purchase Invoice,Currency and Price List,العملة وقائمة الأسعار
 DocType: Opportunity,Customer / Lead Name,العميل / اسم الرصاص
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,الإنتاج
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,الإنتاج
 DocType: Item,Allow Production Order,تسمح أمر الإنتاج
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
 DocType: Installation Note Item,Installed Qty,تثبيت الكمية
 DocType: Lead,Fax,فاكس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,المقدمة
 DocType: Salary Structure,Total Earning,إجمالي الدخل
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,بلدي العناوين
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,فرع المؤسسة الرئيسية .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,أو
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,أو
 DocType: Sales Order,Billing Status,الحالة الفواتير
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,مصاريف فائدة
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 وفوق
 DocType: Buying Settings,Default Buying Price List,الافتراضي شراء قائمة الأسعار
-,Download Backups,تحميل النسخ الاحتياطية
 DocType: Notification Control,Sales Order Message,ترتيب المبيعات رسالة
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تعيين القيم الافتراضية مثل شركة ، العملات، السنة المالية الحالية ، الخ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,الدفع نوع
 DocType: Process Payroll,Select Employees,حدد الموظفين
 DocType: Bank Reconciliation,To Date,حتى الان
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,تفاصيل
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع الضرائب والرسوم
 DocType: Employee,Emergency Contact,الاتصال في حالات الطوارئ
 DocType: Item,Quality Parameters,معايير الجودة
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,المسلسل لا / دفعة
 DocType: Product Bundle,Parent Item,الأم المدينة
 DocType: Account,Account Type,نوع الحساب
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,ترك نوع {0} لا يمكن إعادة توجيهها ترحيل
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لصف {0} في {1}. لتشمل {2} في سعر البند، {3} يجب أيضا أن يدرج الصفوف
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,نماذج التخصيص
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,قطع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تسطيح
 DocType: Account,Income Account,دخل الحساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,صب
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
 DocType: Appraisal Goal,Key Responsibility Area,مفتاح مسؤولية المنطقة
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: UOM معامل التحويل إلزامي
-apps/frappe/frappe/desk/moduleview.py +61,Documents,وثائق
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,المرجع
 DocType: Cost Center,Cost Center,مركز التكلفة
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,سند #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
 DocType: Notification Control,Purchase Order Message,رسالة طلب شراء
 DocType: Tax Rule,Shipping Country,النقل البحري القطرية
 DocType: Upload Attendance,Upload HTML,تحميل HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","إجمالي مقدما ({0}) ضد بالدفع {1} لا يمكن أن يكون أكبر \
  من المجموع الكلي ({2})"
 DocType: Employee,Relieving Date,تخفيف تاريخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",يتم تسعير المادة الكتابة قائمة الأسعار / تحديد نسبة الخصم، استنادا إلى بعض المعايير.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر دخول سوق الأسهم / التوصيل ملاحظة / شراء الإيصال
 DocType: Employee Education,Class / Percentage,فئة / النسبة المئوية
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئيس التسويق والمبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ضريبة الدخل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,الليزر هندسة صافي تشكيل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئيس التسويق والمبيعات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ضريبة الدخل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","إذا تم اختيار التسعير القاعدة ل 'الأسعار'، فإنه سيتم الكتابة فوق قائمة الأسعار. سعر التسعير القاعدة هو السعر النهائي، لذلك يجب تطبيق أي خصم آخر. وبالتالي، في المعاملات مثل ترتيب المبيعات، طلب شراء غيرها، وسيتم جلب في الحقل 'تقييم'، بدلا من حقل ""قائمة الأسعار أسعار""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات الأسهم
-DocType: User,Bio,نبذة
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,الجديد اسم مركز التكلفة
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,الجديد اسم مركز التكلفة
 DocType: Leave Control Panel,Leave Control Panel,ترك لوحة التحكم
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,لم يتم العثور على قالب العنوان الافتراضي. يرجى إنشاء واحدة جديدة من الإعداد> طباعة والعلامات التجارية> قالب العنوان.
 DocType: Appraisal,HR User,HR العضو
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
 ,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
 DocType: Supplier,Billing Currency,الفواتير العملات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,كبير جدا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,كبير جدا
 ,Profit and Loss Statement,الأرباح والخسائر
 DocType: Bank Reconciliation Detail,Cheque Number,عدد الشيكات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ملح
 DocType: Payment Tool Detail,Payment Tool Detail,دفع أداة التفاصيل
 ,Sales Browser,متصفح المبيعات
 DocType: Journal Entry,Total Credit,إجمالي الائتمان
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد دخول الأسهم {2}: تحذير
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,محلي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),القروض والسلفيات (الأصول )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,المدينين
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,كبير
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,أي موظف موجود!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,كبير
 DocType: C-Form Invoice Detail,Territory,إقليم
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Purchase Order,Customer Address Display,عنوان العميل العرض
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,تلميع
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",وحدة القياس الافتراضية للالبند {0} لا يمكن أن تتغير بشكل مباشر بسبب \ كنت قد قدمت بالفعل بعض المعاملات (s) مع UOM آخر. لتغيير UOM الافتراضي، \ استخدام &quot;UOM استبدال أداة&quot; أداة تحت وحدة المالية.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,تحديد سعر الصرف لتحويل عملة إلى أخرى
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,اقتباس {0} تم إلغاء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,إجمالي المبلغ المستحق
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} كان الموظف في إجازة في {1} . لا يمكن ان يمثل الحضور.
 DocType: Sales Partner,Targets,أهداف
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن الموسومة ضد ** عدة أشخاص المبيعات ** بحيث يمكنك تعيين ورصد الأهداف.
 ,S.O. No.,S.O. رقم
 DocType: Production Order Operation,Make Time Log,جعل وقت دخول
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,الرجاء ضبط كمية إعادة الطلب
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,أجهزة الكمبيوتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,الكهربائية والكيميائية طحن
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,إرضاء الإعداد مخططك من الحسابات قبل البدء مقالات المحاسبة
 DocType: Purchase Invoice,Ignore Pricing Rule,تجاهل التسعير القاعدة
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,إلغاء
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,من التسجيل في هيكل الراتب لا يمكن أن يكون أقل من الموظف تاريخ الالتحاق بالعمل.
 DocType: Employee Education,Graduate,تخريج
 DocType: Leave Block List,Block Days,كتلة أيام
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",اختر إذا الفاتورة متكررة. قم بإزالة الإختيار لأيقاف التكرار أو لوضع تاريخ إنتهاء
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,الحضور للموظف {0} تم وضع علامة بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,الحد الأقصى {0} الصفوف المسموح
 DocType: C-Form Invoice Detail,Net Total,مجموع صافي
 DocType: Bin,FCFS Rate,FCFS قيم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),الفواتير (الفاتورة المبيعات)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,أغراض
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,يجب إدخال أتلست عنصر واحد مع كمية السلبية في الوثيقة عودة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملية {0} أطول من أي ساعات العمل المتاحة في محطة {1}، وتحطيم العملية في عمليات متعددة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,الآلات الكهروكيميائية
 ,Requested,طلب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,لا ملاحظات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,متأخر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,تأخير
 DocType: Account,Stock Received But Not Billed,الأسهم المتلقى ولكن لا توصف
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,يجب أن يكون حساب الجذر مجموعة
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,إجمالي المبلغ المتأخر الدفع + + المبلغ التحصيل - خصم إجمالي
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Features Setup,Sales and Purchase,المبيعات والمشتريات
 DocType: Supplier Quotation Item,Material Request No,طلب مواد لا
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} لقد تم إلغاء اشتراكك بنجاح من هذه القائمة.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي معدل (شركة العملات)
-apps/frappe/frappe/templates/base.html +134,Added,وأضاف
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,إدارة شجرة الإقليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,لم يتم العثور السنة المالية {0}.
 DocType: Bank Reconciliation,Get Relevant Entries,الحصول على مقالات ذات صلة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,الدخول المحاسبة للسهم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,السك
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,العنوان العملاء
-apps/frappe/frappe/desk/query_report.py +136,Total,مجموع
 DocType: Purchase Invoice,Apply Additional Discount On,تطبيق خصم إضافي على
 DocType: Account,Root Type,نوع الجذر
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن إرجاع أكثر من {1} للالبند {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},مستودع الهدف هو إلزامية ل صف {0}
 DocType: Quality Inspection,Quality Inspection,فحص الجودة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,رش تشكيل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,اضافية الصغيرة
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : المواد المطلوبة الكمية هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} مجمد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL أو BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,الحد الأدنى مستوى المخزون
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,الصانع الجزء رقم
 DocType: Production Order Operation,Estimated Time and Cost,الوقت المقدر والتكلفة
 DocType: Bin,Bin,بن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,الإشتمام
 DocType: SMS Log,No of Sent SMS,لا للSMS المرسلة
 DocType: Account,Company,شركة
 DocType: Account,Expense Account,حساب حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,البرمجيات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,اللون
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,البرمجيات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,اللون
 DocType: Maintenance Visit,Scheduled,من المقرر
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",يرجى تحديد عنصر، حيث قال &quot;هل البند الأسهم&quot; هو &quot;لا&quot; و &quot;هل المبيعات البند&quot; هو &quot;نعم&quot; وليس هناك حزمة المنتجات الأخرى
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,تحديد التوزيع الشهري لتوزيع غير متساو أهداف على مدى عدة شهور.
 DocType: Purchase Invoice Item,Valuation Rate,تقييم قيم
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,قائمة أسعار العملات غير محددة
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"البند صف {0} إيصال الشراء {1} غير موجود في الجدول 'شراء إيصالات ""أعلاه"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,المشروع تاريخ البدء
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,حتى
 DocType: Rename Tool,Rename Log,إعادة تسمية الدخول
 DocType: Installation Note Item,Against Document No,ضد الوثيقة رقم
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,إدارة المبيعات الشركاء.
 DocType: Quality Inspection,Inspection Type,نوع التفتيش
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},الرجاء اختيار {0}
-DocType: C-Form,C-Form No,رقم النموذج - س 
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},الرجاء اختيار {0}
+DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,الباحث
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,تحديث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,الباحث
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,الرجاء حفظ النشرة قبل الإرسال
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,الاسم أو البريد الإلكتروني إلزامي
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,فحص الجودة واردة.
 DocType: Purchase Order Item,Returned Qty,عاد الكمية
 DocType: Employee,Exit,خروج
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,نوع الجذر إلزامي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,نوع الجذر إلزامي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,المسلسل لا {0} خلق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,التشطيب اهتزازي
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
 DocType: Sales Invoice,Advertisement,إعلان
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,فترة الاختبار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,فترة الاختبار
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,حساب الموافق
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,طحن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,يتقلص التفاف
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,الأنشطة المعلقة
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,مؤكد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,المورد> نوع مورد
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان عنوانها إلزامية.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,صحيفة الناشرين
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,تحديد السنة المالية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,صهر
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
 DocType: Attendance,Attendance Date,تاريخ الحضور
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تفكك الراتب على أساس الكسب وخصم.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,حساب مع العقد التابعة لا يمكن تحويلها إلى دفتر الأستاذ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,حساب مع العقد التابعة لا يمكن تحويلها إلى دفتر الأستاذ
 DocType: Address,Preferred Shipping Address,النقل البحري المفضل العنوان
 DocType: Purchase Receipt Item,Accepted Warehouse,قبلت مستودع
 DocType: Bank Reconciliation Detail,Posting Date,تاريخ النشر
 DocType: Item,Valuation Method,تقييم الطريقة
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},تعذر العثور على سعر الصرف ل{0} إلى {1}
 DocType: Sales Invoice,Sales Team,فريق المبيعات
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,تكرار دخول
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,تكرار دخول
 DocType: Serial No,Under Warranty,تحت الكفالة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[خطأ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,فينشر كابيتال
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,فينشر كابيتال
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),أوراق الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,المسلسل لا {0} غير موجود
 DocType: Pricing Rule,Discount Percentage,نسبة الخصم
 DocType: Payment Reconciliation Invoice,Invoice Number,رقم الفاتورة
-apps/erpnext/erpnext/hooks.py +70,Orders,أوامر
+apps/erpnext/erpnext/hooks.py +54,Orders,أوامر
 DocType: Leave Control Panel,Employee Type,نوع الموظف
 DocType: Employee Leave Approver,Leave Approver,ترك الموافق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,تطريق
 DocType: Manufacturing Settings,Material Transferred for Manufacture,المواد المنقولة لغرض صناعة
 DocType: Expense Claim,"A user with ""Expense Approver"" role","يمكن للمستخدم مع ""النفقات الموافق"" دور"
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,فترة غير صالحة
 DocType: Customer,Credit Limit,الحد الائتماني
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,حدد النوع من المعاملات
 DocType: GL Entry,Voucher No,رقم السند
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,عنوان والاتصال
 DocType: Customer,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Employee,Feedback,تعليقات
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,صيانة جدول
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,جلخ الآلات النفاثة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,صيانة جدول
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
-DocType: Website Settings,Website Settings,إعدادات الموقع
 DocType: Item,Reorder level based on Warehouse,مستوى إعادة الطلب بناء على مستودع
 DocType: Activity Cost,Billing Rate,أسعار الفواتير
 ,Qty to Deliver,الكمية للتسليم
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
 DocType: Delivery Note,Track this Delivery Note against any Project,تتبع هذه ملاحظة التوصيل ضد أي مشروع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,لا يمكن حذف حساب الجذر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,لا يمكن حذف حساب الجذر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,مشاهدة سهم مقالات
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,إدارة العناوين
 DocType: Pricing Rule,Item Code,البند الرمز
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
-DocType: Communication,Phone,هاتف
 DocType: Employee Internal Work History,Employee Internal Work History,التاريخ الموظف العمل الداخلية
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),إغلاق (الدكتور)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),إغلاق (الدكتور)
 DocType: Contact,Passive,سلبي
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,المسلسل لا {0} ليس في الأوراق المالية
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب الضريبية لبيع صفقة.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,مبلغ الفاتورة
 DocType: Bank Reconciliation,Bank Reconciliation,تسوية البنك
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,الحصول على التحديثات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,إضافة بعض السجلات عينة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاء أو توقف
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,إضافة بعض السجلات عينة
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترك الإدارة
-DocType: Event,Groups,مجموعات
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
 DocType: Lead,Lower Income,ذات الدخل المنخفض
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,مساعدة سريعة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
 DocType: Features Setup,Sales Extras,مبيعات إضافات
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ميزانية الحساب {1} مقابل مركز التكلفة {2} سيتجاوز التي كتبها {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 ,Stock Projected Qty,الأسهم المتوقعة الكمية
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},العملاء {0} لا تنتمي لمشروع {1}
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,القيمة أو الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,دقيقة
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,دقيقة
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
 ,Qty to Receive,الكمية للاستلام
 DocType: Leave Block List,Leave Block List Allowed,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,معامل التحويل لا يمكن أن يكون في الكسور
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ستستخدم هذا لتسجيل الدخول
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ستستخدم هذا لتسجيل الدخول
 DocType: Sales Partner,Retailer,متاجر التجزئة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,يجب أن يكون الائتمان لحساب حساب الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,جميع أنواع مزود
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,جعل زلة الراتب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,تصفح BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,القروض المضمونة
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,المنتجات رهيبة
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,المنتجات رهيبة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,افتتاح ميزان العدالة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,لا يمكن الموافقة على الإجازة كما لا يحق لك الموافقة على أوراق تواريخ كتلة
 DocType: Appraisal,Appraisal,تقييم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,صب فقدت رغوة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,رسم
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ويتكرر التاريخ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,المفوض بالتوقيع
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},يجب أن تكون واحدة من ترك الموافق {0}
 DocType: Hub Settings,Seller Email,البائع البريد الإلكتروني
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
 DocType: Workstation Working Hour,Start Time,بداية
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ (شركة العملات)
 DocType: BOM Operation,Hour Rate,ساعة قيم
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,من اقتباس
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,من اقتباس
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},دخول أخرى الفترة الإنتهاء {0} أحرز بعد {1}
 DocType: Production Order,Material Transferred for Manufacturing,المواد المنقولة لغرض التصنيع
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} لا يوجد
 DocType: Purchase Receipt Item,Purchase Order Item No,شراء السلعة طلب No
-DocType: System Settings,System Settings,إعدادات النظام
 DocType: Project,Project Type,نوع المشروع
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,تكلفة الأنشطة المختلفة
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
 DocType: Sales Order,Fully Billed,وصفت تماما
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,نقد في الصندوق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},مستودع تسليم المطلوب للبند الأوراق المالية {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
 DocType: Serial No,Is Cancelled,وألغي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,بلدي الشحنات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,بلدي الشحنات
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية القصوى، يتم تطبيق الأولويات الداخلية ثم التالية:
 DocType: Supplier,Supplier Details,تفاصيل المورد
-DocType: Communication,Recipients,المستلمين
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,الشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,التخريش
 DocType: Expense Claim,Approval Status,حالة القبول
 DocType: Hub Settings,Publish Items to Hub,نشر عناصر إلى المحور
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},من القيمة يجب أن يكون أقل من القيمة ل في الصف {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,حوالة مصرفية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,الرجاء اختيار حساب البنك
 DocType: Newsletter,Create and Send Newsletters,إنشاء وإرسال النشرات الإخبارية
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,يجب أن تكون من تاريخ إلى تاريخ قبل
 DocType: Sales Order,Recurring Order,ترتيب متكرر
 DocType: Company,Default Income Account,الافتراضي الدخل حساب
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,المجموعة العملاء / الزبائن
 DocType: Item Group,Check this if you want to show in website,التحقق من ذلك إذا كنت تريد أن تظهر في الموقع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,مرحبا بكم في ERPNext
+,Welcome to ERPNext,مرحبا بكم في ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,قسيمة رقم التفاصيل
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,تؤدي إلى الاقتباس
 DocType: Lead,From Customer,من العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,المكالمات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,المكالمات
 DocType: Project,Total Costing Amount (via Time Logs),المبلغ الكلي التكاليف (عبر الزمن سجلات)
 DocType: Purchase Order Item Supplied,Stock UOM,الأسهم UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
 ,Projected,المتوقع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},المسلسل لا {0} لا ينتمي إلى مستودع {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,تاريخ الفتح
 DocType: Journal Entry,Remark,كلام
 DocType: Purchase Receipt Item,Rate and Amount,معدل والمبلغ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ممل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,من طلب مبيعات
-DocType: Blog Category,Parent Website Route,الوالد موقع الطريق
 DocType: Sales Order,Not Billed,لا صفت
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,كلا مستودع يجب أن تنتمي إلى نفس الشركة
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,وأضافت أي اتصالات حتى الان.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,غير نشطة
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,التكلفة هبطت قيمة قسيمة
 DocType: Time Log,Batched for Billing,دفعات عن الفواتير
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,رفعت فواتير من قبل الموردين.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,خصم المبلغ
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,على سبيل المثال ضريبة
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,على سبيل المثال ضريبة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
 DocType: Shopping Cart Settings,Quotation Series,اقتباس السلسلة
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,الغاز المعدن الساخن تشكيل
 DocType: Sales Order Item,Sales Order Date,مبيعات الترتيب التاريخ
 DocType: Sales Invoice Item,Delivered Qty,تسليم الكمية
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",انتقل إلى المجموعة المناسبة (عادة مصدر الأموال&gt; المطلوبات المتداولة&gt; الضرائب والرسوم وإنشاء حساب جديد (بالنقر على إضافة الطفل) من نوع &quot;الضريبة&quot; والقيام نذكر معدل الضريبة.
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,القطع بالليزر
-DocType: Event,Monday,يوم الاثنين
 DocType: Journal Entry,Stock Entry,الأسهم الدخول
 DocType: Account,Payable,المستحقة
 DocType: Salary Slip,Arrear Amount,متأخرات المبلغ
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,معالجة التفاصيل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,يجب تحديد الاقل واحدة من بيع أو شراء
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
-DocType: Page,All,جميع
 DocType: Stock Entry Detail,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
 DocType: Employee,Confirmation Date,تأكيد التسجيل
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,مبيعات العضو
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,دقيقة الكمية لا يمكن أن يكون أكبر من الكمية ماكس
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,مجموعة
 DocType: Lead,Lead Owner,مسئول مبادرة البيع
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,مطلوب مستودع
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,مطلوب مستودع
 DocType: Employee,Marital Status,الحالة الإجتماعية
 DocType: Stock Settings,Auto Material Request,السيارات مادة طلب
 DocType: Time Log,Will be updated when billed.,سيتم تحديث عندما توصف.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,الأراضي الأهداف
 DocType: Delivery Note,Transporter Info,نقل معلومات
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون الشركة
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,رؤساء إلكتروني لقوالب الطباعة.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين لقوالب الطباعة على سبيل المثال فاتورة أولية.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
 DocType: POS Profile,Update Stock,تحديث الأسهم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM أسعار
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,يرجى سحب العناصر من التسليم ملاحظة
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",سجل جميع الاتصالات من نوع البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
 DocType: Purchase Invoice,Terms,حيث
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,خلق جديد
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,خلق جديد
 DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
 ,Item-wise Sales History,البند الحكيم تاريخ المبيعات
 DocType: Expense Claim,Total Sanctioned Amount,المبلغ الكلي للعقوبات
 ,Purchase Analytics,شراء تحليلات
 DocType: Sales Invoice Item,Delivery Note Item,ملاحظة تسليم السلعة
 DocType: Expense Claim,Task,مهمة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,حلق
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع صف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},رقم الباتش إلزامي للصنف{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
 ,Stock Ledger,الأسهم ليدجر
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},معدل: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},معدل: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,زلة الراتب خصم
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ملاحظات
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,حدد عقدة المجموعة أولا.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,تعبئة النموذج وحفظه
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,تحميل تقريرا يتضمن جميع المواد الخام مع وضعهم أحدث المخزون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,مواجهة
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,منتديات
 DocType: Leave Application,Leave Balance Before Application,ترك الرصيد قبل تطبيق
 DocType: SMS Center,Send SMS,إرسال SMS
 DocType: Company,Default Letter Head,افتراضي رسالة رئيس
 DocType: Time Log,Billable,فوترة
-DocType: Authorization Rule,This will be used for setting rule in HR module,وسوف تستخدم هذه القاعدة لإعداد وحدة في HR
 DocType: Account,Rate at which this tax is applied,المعدل الذي يتم تطبيق هذه الضريبة
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,إعادة ترتيب الكميه
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,فقدت فرصة
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",وسوف تكون متاحة الخصم الحقول في أمر الشراء، وتلقي الشراء، فاتورة الشراء
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للعملاء والموردين
-DocType: Report,Report Type,نوع التقرير
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,تحميل
 DocType: BOM Replace Tool,BOM Replace Tool,BOM استبدال أداة
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,قوالب بلد الحكمة العنوان الافتراضي
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,مشاهدة الضرائب تفكك
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',إذا كنت تنطوي في نشاط الصناعات التحويلية . تمكن السلعة ' يتم تصنيعها '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
 DocType: Serial No,Out of AMC,من AMC
 DocType: Purchase Order Item,Material Request Detail No,تفاصيل طلب المواد لا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,تحول الصعب
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,جعل صيانة زيارة
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
 DocType: Company,Default Cash Account,الحساب النقدي الافتراضي
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ملاحظة: إذا لم يتم الدفع ضد أي إشارة، وجعل الدخول مجلة يدويا.
 DocType: Item,Supplier Items,المورد الأصناف
 DocType: Opportunity,Opportunity Type,الفرصة نوع
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,نشر توافر
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
 ,Stock Ageing,الأسهم شيخوخة
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' معطل
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,إرسال رسائل البريد الإلكتروني التلقائي لاتصالات على المعاملات تقديم.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  المتاحة الكمية: {4}، نقل الكمية: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
-DocType: Event,Sunday,الأحد
 DocType: Sales Team,Contribution (%),مساهمة (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,المسؤوليات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,المسؤوليات
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ال
 DocType: Sales Person,Sales Person Name,مبيعات الشخص اسم
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,إضافة مستخدمين
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,إضافة مستخدمين
 DocType: Pricing Rule,Item Group,البند المجموعة
 DocType: Task,Actual Start Date (via Time Logs),تاريخ بدء الفعلي (عبر الزمن سجلات)
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
 DocType: Sales Order,Partly Billed,وصفت جزئيا
 DocType: Item,Default BOM,الافتراضي BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة آمت
 DocType: Time Log Batch,Total Hours,مجموع ساعات
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,السيارات
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مطلوب البند
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,المعادن حقن صب
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,من التسليم ملاحظة
 DocType: Time Log,From Time,من وقت
 DocType: Notification Control,Custom Message,رسالة مخصصة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,تخليل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,صب الرمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,طلاء بالكهرباء
 DocType: Purchase Invoice Item,Rate,معدل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,المتدرب
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,المتدرب
 DocType: Newsletter,A Lead with this email id should exist,وينبغي أن يكون هذا المعرف الرصاص مع البريد الإلكتروني موجود
 DocType: Stock Entry,From BOM,من BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,الأساسية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات الاسهم قبل {0}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,إلى التسجيل يجب أن يكون نفس التاريخ من ل إجازة نصف يوم
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل أكبر من تاريخ الميلاد
 DocType: Salary Structure,Salary Structure,هيكل المرتبات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","توجد عدة الأسعار القاعدة مع المعايير نفسها، يرجى حل \
  الصراع عن طريق تعيين الأولوية. قواعد السعر: {0}"
 DocType: Account,Bank,مصرف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,قضية المواد
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,عرض التسجيل
 DocType: Hub Settings,Access Token,رمز وصول
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,هي الأصول الثابتة الإغلاق
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك البنود عن المجالس الفرعية
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",إذا كان لديك طباعة الأشكال طويلة، يمكن استخدام هذه الميزة لتقسيم ليتم طباعة الصفحة على صفحات متعددة مع جميع الرؤوس والتذييلات على كل صفحة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,جميع الأقاليم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 DocType: Fiscal Year,Year Name,اسم العام
 DocType: Process Payroll,Process Payroll,عملية كشوف المرتبات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
 DocType: Product Bundle Item,Product Bundle Item,المنتج حزمة البند
 DocType: Sales Partner,Sales Partner Name,مبيعات الشريك الاسم
 DocType: Purchase Invoice Item,Image View,عرض الصورة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,تشطيب وتشطيب الصناعي
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية و البورصات السلعية
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ضربة صب
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
 DocType: Tax Rule,Shipping City,الشحن سيتي
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Account,Purchase User,شراء العضو
 DocType: Notification Control,Customize the Notification,تخصيص إعلام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,يدق
-DocType: Web Page,Slideshow,عرض الشرائح
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,لا يمكن حذف القالب الافتراضي العنوان
 DocType: Sales Invoice,Shipping Rule,الشحن القاعدة
 DocType: Journal Entry,Print Heading,طباعة عنوان
 DocType: Quotation,Maintenance Manager,مدير الصيانة
-DocType: Workflow State,Search,البحث
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,إجمالي لا يمكن أن يكون صفرا
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""عدد الأيام منذ آخر طلب "" يجب أن تكون أكبر من أو تساوي الصفر"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,مختلط
 DocType: C-Form,Amended From,عدل من
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,المواد الخام
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,المواد الخام
 DocType: Leave Application,Follow via Email,متابعة عبر البريد الإلكتروني
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,المبلغ الضريبي بعد الخصم المبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,إما الكمية المستهدفة أو المبلغ المستهدف إلزامي
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
 DocType: Leave Control Panel,Carry Forward,المضي قدما
@@ -2862,45 +2631,44 @@
 ,Produced,أنتجت
 DocType: Item,Item Code for Suppliers,البند رمز للموردين
 DocType: Issue,Raised By (Email),التي أثارها (بريد إلكتروني)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,عام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,نعلق رأسية
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,عام
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,نعلق رأسية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',لا يمكن أن تقتطع عند الفئة هو ل ' التقييم ' أو ' تقييم وتوتال '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",قائمة رؤساء الضريبية الخاصة بك (على سبيل المثال ضريبة القيمة المضافة والجمارك وما إلى ذلك؛ ينبغي أن يكون أسماء فريدة) ومعدلاتها القياسية. وهذا خلق نموذج موحد، والتي يمكنك تعديل وإضافة المزيد لاحقا.
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",قائمة رؤساء الضريبية الخاصة بك (على سبيل المثال ضريبة القيمة المضافة والجمارك وما إلى ذلك؛ ينبغي أن يكون أسماء فريدة) ومعدلاتها القياسية. وهذا خلق نموذج موحد، والتي يمكنك تعديل وإضافة المزيد لاحقا.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
 DocType: Journal Entry,Bank Entry,دخول الضفة
 DocType: Authorization Rule,Applicable To (Designation),تنطبق على (تعيين)
-DocType: Blog Post,Blog Post,بلوق وظيفة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,المجموعة حسب
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,تمكين / تعطيل العملات .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,المصروفات البريدية
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (آمت)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه وترفيهية
 DocType: Purchase Order,The date on which recurring order will be stop,التاريخ الذي سيتم تتوقف أجل متكرر
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} يجب تخفيض كتبها {1} أو يجب زيادة الفائض التسامح
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,إجمالي الحاضر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعة
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ساعة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,نقل المواد إلى المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,نقل المواد إلى المورد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,إنشاء اقتباس
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على أوراق تواريخ بلوك
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},يمكن أن يكون وافق عليها {0}
 DocType: Shipping Rule,Shipping Rule Conditions,الشحن شروط القاعدة
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
 DocType: Features Setup,Point of Sale,نقطة بيع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,متجعد
 DocType: Account,Tax,ضريبة
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},صف {0}: {1} ليست صالحة {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,تنقية
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},صف {0}: {1} ليست صالحة {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,من حزمة المنتج
 DocType: Production Planning Tool,Production Planning Tool,إنتاج أداة تخطيط المنزل
 DocType: Quality Inspection,Report Date,تقرير تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,التوجيه
 DocType: C-Form,Invoices,الفواتير
 DocType: Job Opening,Job Title,المسمى الوظيفي
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} المخصصة أصلا لموظف {1} لفترة {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} المستلمين
 DocType: Features Setup,Item Groups in Details,المجموعات في البند تفاصيل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,معدل التحديث والتوفر
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,النسبة المئوية يسمح لك لتلقي أو تقديم المزيد من ضد الكمية المطلوبة. على سبيل المثال: إذا كنت قد أمرت 100 وحدة. و10٪ ثم يسمح بدل الخاص بك لتلقي 110 وحدة.
 DocType: Pricing Rule,Customer Group,مجموعة العملاء
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
 DocType: Item,Website Description,وصف الموقع
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
 ,Sales Register,سجل مبيعات
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
 DocType: Address,Plant,مصنع
-DocType: DocType,Setup,الإعداد
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هناك شيء ل تحريره.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,المتداول الباردة
 DocType: Customer Group,Customer Group Name,العملاء اسم المجموعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,الرجاء تحديد مضي قدما إذا كنت تريد أيضا لتشمل التوازن العام المالي السابق يترك لهذه السنة المالية
 DocType: GL Entry,Against Voucher Type,ضد نوع قسيمة
 DocType: Item,Attributes,سمات
-DocType: Packing Slip,Get Items,الحصول على العناصر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,الرجاء إدخال شطب الحساب
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,الحصول على العناصر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,أمر آخر تاريخ
-DocType: DocField,Image,صورة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,جعل المكوس الفاتورة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},حساب {0} لا ينتمي إلى شركة {1}
-DocType: Communication,Other,آخر
 DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID العملية لم تحدد
 DocType: Production Order,Planned Start Date,المخطط لها تاريخ بدء
 DocType: Serial No,Creation Document Type,نوع الوثيقة إنشاء
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,صيانة زيارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,صيانة زيارة
 DocType: Leave Type,Is Encash,هو يحققوا ربحا
 DocType: Purchase Invoice,Mobile No,رقم الجوال
 DocType: Payment Tool,Make Journal Entry,جعل إدخال دفتر اليومية
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,بيانات المشروع من الحكمة ليست متاحة لل اقتباس
 DocType: Project,Expected End Date,تاريخ الإنتهاء المتوقع
 DocType: Appraisal Template,Appraisal Template Title,تقييم قالب عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاري
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,تجاري
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
 DocType: Cost Center,Distribution Id,توزيع رقم
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات رهيبة
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,جميع المنتجات أو الخدمات.
 DocType: Purchase Invoice,Supplier Address,العنوان المورد
-DocType: Contact Us Settings,Address Line 2,العنوان سطر 2
-DocType: ToDo,Reference,مرجع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,تثقيب
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,من الكمية
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,الترقيم المتسلسل إلزامي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,الخدمات المالية
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,الخدمات المالية
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3}
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,كر
 DocType: Customer,Default Receivable Accounts,افتراضي حسابات المقبوضات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,نشر
 DocType: Tax Rule,Billing State,الدولة الفواتير
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,الترقق
 DocType: Item Reorder,Transfer,نقل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,تلبد
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Supplier,Contact HTML,الاتصال HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,بيع بالتجزئة
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,العملاء {0} غير موجود
 DocType: Attendance,Absent,غائب
-DocType: Product Bundle,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,الساحق
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
 DocType: GL Entry,Remarks,تصريحات
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,شطب بناء على
 DocType: Features Setup,POS View,عرض نقطة مبيعات
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,الصب المستمر
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,الرجاء تحديد
 DocType: Offer Letter,Awaiting Response,في انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,فوق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,التحجيم البارد
 DocType: Salary Slip,Earning & Deduction,وكسب الخصم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} لا يمكن أن يكون مجموعة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقة
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",ل، 2012 على سبيل المثال 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),الربح المؤقت / الخسارة (الائتمان)
 DocType: Sales Invoice,Return Against Sales Invoice,العودة ضد فاتورة المبيعات
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,البند 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},الرجاء تعيين القيمة الافتراضية {0} في شركة {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},الرجاء تعيين القيمة الافتراضية {0} في شركة {1}
 DocType: Serial No,Creation Time,إنشاء الموضوع
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,إجمالي الإيرادات
 DocType: Sales Invoice,Product Bundle Help,المنتج حزمة مساعدة
 ,Monthly Attendance Sheet,ورقة الحضور الشهرية
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,العثور على أي سجل
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,الحصول على عناصر من حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,حساب {0} غير نشط
 DocType: GL Entry,Is Advance,هو المقدمة
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,الحضور من التسجيل والحضور إلى تاريخ إلزامي
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"يرجى إدخال "" التعاقد من الباطن "" كما نعم أو لا"
 DocType: Sales Team,Contact No.,الاتصال رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,نوع حساب الأرباح و الخسائر {0} غير مسموح به في الأرصدة الافتتاحية
-DocType: Workflow State,Time,مرة
 DocType: Features Setup,Sales Discounts,مبيعات خصومات
 DocType: Hub Settings,Seller Country,البائع البلد
 DocType: Authorization Rule,Authorization Rule,إذن القاعدة
 DocType: Sales Invoice,Terms and Conditions Details,شروط وتفاصيل الشروط
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,الضرائب على المبيعات والرسوم قالب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,عدد بالدفع
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بانر التي سوف تظهر في الجزء العلوي من قائمة المنتجات.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,تحديد شروط لحساب كمية الشحن
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,إضافة الطفل
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,دور السماح للتعيين الحسابات المجمدة وتحرير مقالات المجمدة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,لا يمكن تحويل مركز التكلفة إلى دفتر الأستاذ كما فعلت العقد التابعة
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,مطلوب معامل التحويل
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,المسلسل #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,عمولة على المبيعات
 DocType: Offer Letter Term,Value / Description,قيمة / الوصف
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,الزبائن لا يشترون منذ وقت طويل
 DocType: Production Order,Expected Delivery Date,يتوقع تسليم تاريخ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,الخصم والائتمان لا يساوي ل{0} # {1}. الفرق هو {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,منتفخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,التبخر نمط الصب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,مصاريف الترفيه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاتورة المبيعات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاتورة المبيعات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,عمر
 DocType: Time Log,Billing Amount,قيمة الفواتير
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,كمية غير صالحة المحدد لمادة {0} . يجب أن تكون كمية أكبر من 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,طلبات الحصول على إجازة.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,حساب مع الصفقة الحالية لا يمكن حذف
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,حساب مع الصفقة الحالية لا يمكن حذف
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,المصاريف القانونية
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء ترتيب السيارات سبيل المثال 05، 28 الخ
 DocType: Sales Invoice,Posting Time,نشر التوقيت
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جديد إيرادات العملاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,مصاريف السفر
 DocType: Maintenance Visit,Breakdown,انهيار
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختيارها
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,الحساب: {0} مع العملة: {1} لا يمكن اختيارها
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب الرئيسي {1} لا تنتمي إلى الشركة: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,جلخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,امتحان
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
-DocType: Feed,Full Name,الاسم الكامل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,حسمه
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,امتحان
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,مستودع الافتراضي هو إلزامي بالنسبة لمخزون السلعة .
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},دفع المرتبات لشهر {0} و السنة {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج السيارات أسعار قائمة الأسعار إذا مفقود
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,إجمالي المبلغ المدفوع
 ,Transferred Qty,نقل الكمية
 apps/erpnext/erpnext/config/learn.py +11,Navigating,التنقل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,تخطيط
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,تخطيط
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,جعل وقت دخول الدفعة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,نشر
 DocType: Project,Total Billing Amount (via Time Logs),المبلغ الكلي الفواتير (عبر الزمن سجلات)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,نبيع هذه القطعة
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,نبيع هذه القطعة
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,المورد رقم
 DocType: Journal Entry,Cash Entry,الدخول النقدية
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,مدير البند
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,إضافة صفوف لوضع الميزانيات السنوية على الحسابات.
 DocType: Buying Settings,Default Supplier Type,الافتراضي مزود نوع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,المحاجر
 DocType: Production Order,Total Operating Cost,إجمالي تكاليف التشغيل
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ملاحظة : البند {0} دخلت عدة مرات
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,جميع جهات الاتصال.
 DocType: Newsletter,Test Email Id,اختبار البريد الإلكتروني معرف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,اختصار الشركة
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,اختصار الشركة
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,إذا كنت تتبع فحص الجودة . تمكن البند QA المطلوبة وضمان الجودة لا في إيصال الشراء
 DocType: GL Entry,Party Type,نوع الحزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,المواد الخام لا يمكن أن يكون نفس البند الرئيسي
 DocType: Item Attribute Value,Abbreviation,الاختصار
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,لا أوثرويزيد منذ {0} يتجاوز حدود
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,صب التناوب
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,قالب الراتب الرئيسي.
 DocType: Leave Type,Max Days Leave Allowed,اترك أيام كحد أقصى مسموح
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,مجموعة القاعدة الضريبية لعربة التسوق
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
 ,Territory Target Variance Item Group-Wise,الأراضي المستهدفة الفرق البند المجموعة الحكيم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,جميع المجموعات العملاء
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} إلزامي. ربما لا يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,قالب الضرائب إلزامي.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب الرئيسي {1} غير موجود
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),قائمة الأسعار معدل (عملة الشركة)
 DocType: Account,Temporary,مؤقت
 DocType: Address,Preferred Billing Address,يفضل عنوان الفواتير
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,أمين
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,أمين
 DocType: Serial No,Distinct unit of an Item,وحدة متميزة من عنصر
 DocType: Pricing Rule,Buying,شراء
 DocType: HR Settings,Employee Records to be created by,سجلات الموظفين المراد إنشاؤها من قبل
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,البند الحكيمة قائمة الأسعار قيم
 DocType: Purchase Order Item,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,الكي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} لم يتوقف
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,الأحداث القادمة
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مطلوب العملاء
-DocType: Letter Head,Letter Head,رسالة رئيس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,دخول سريع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} غير إلزامية من أجل العودة
 DocType: Purchase Order,To Receive,تلقي
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,يتقلص المناسب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,الدخل / المصاريف
 DocType: Employee,Personal Email,البريد الالكتروني الشخصية
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,مجموع الفروق
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,مجموع الفروق
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",إذا مكن، سيقوم النظام إضافة القيود المحاسبية للمخزون تلقائيا.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,سمسرة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,سمسرة
 DocType: Address,Postal Code,الرمز البريدي
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","في دقائق 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,أوامر الإفراج عن الإنتاج.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Hub Settings,Name Token,اسم رمز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,التخطيط
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,البيع القياسية
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,البيع القياسية
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,واحدة على الاقل مستودع إلزامي
 DocType: Serial No,Out of Warranty,لا تغطيه الضمان
 DocType: BOM Replace Tool,Replace,استبدل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,الرجاء إدخال حدة القياس الافتراضية
 DocType: Purchase Invoice Item,Project Name,اسم المشروع
 DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
-DocType: Workflow State,Edit,تحرير
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Features Setup,Item Batch Nos,ارقام البند دفعة
 DocType: Stock Ledger Entry,Stock Value Difference,قيمة الأسهم الفرق
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,دفع المصالحة الدفع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,الأصول الضريبية
 DocType: BOM Item,BOM No,لا BOM
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
-DocType: Item,Moving Average,المتوسط المتحرك
+DocType: Item,Moving Average,المتوسط المتحرك
 DocType: BOM Replace Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,يجب أن تكون جديدة اسهم UOM مختلفة من UOM الأسهم الحالية
 DocType: Account,Debit,مدين
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,يجب تخصيص الأوراق في مضاعفات 0.5
 DocType: Production Order,Operation Cost,التكلفة العملية
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,تحميل الحضور من ملف CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,آمت المتميز
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,افتراضي مركز التكلفة
 DocType: Purchase Invoice,End Date,نهاية التاريخ
 DocType: Employee,Internal Work History,التاريخ العمل الداخلي
-DocType: DocField,Column Break,العمود استراحة
-DocType: Event,Thursday,الخميس
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,الأسهم الخاصة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,خراطة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
 DocType: Maintenance Visit,Customer Feedback,ملاحظات العملاء
 DocType: Account,Expense,نفقة
 DocType: Sales Invoice,Exhibition,معرض
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,عقدت في
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,إنتاج البند
 ,Employee Information,معلومات الموظف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),معدل ( ٪ )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),معدل ( ٪ )
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,تاريخ نهاية السنة المالية
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,جعل مورد اقتباس
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,جعل مورد اقتباس
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),خفض عائد لإجازة بدون أجر (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,عارضة اترك
 DocType: Batch,Batch ID,دفعة ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ملاحظة : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ملخص هذا الأسبوع
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} يجب أن يكون الصنف مشترى أو متعاقد من الباطن في الصف {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
 DocType: GL Entry,Party,الطرف
 DocType: Sales Order,Delivery Date,تاريخ التسليم
-DocType: DocField,Currency,عملة
 DocType: Opportunity,Opportunity Date,تاريخ الفرصة
 DocType: Purchase Receipt,Return Against Purchase Receipt,العودة ضد شراء إيصال
 DocType: Purchase Order,To Bill,لبيل
 DocType: Material Request,% Ordered,٪ أمرت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
 DocType: Employee,History In Company,وفي تاريخ الشركة
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,لمناقشة
 DocType: SMS Settings,SMS Settings,SMS إعدادات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حسابات مؤقتة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,أسود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,BOM  Explosion Item
 DocType: Account,Auditor,مدقق حسابات
 DocType: Purchase Order,End date of current order's period,تاريخ انتهاء الفترة لكي الحالي
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,تقديم عرض رسالة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,عودة
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
-DocType: DocField,Fold,طية
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,يجب أن تكون وحدة القياس الافتراضية للخيار نفس قالب
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
 DocType: Project Task,Pending Review,في انتظار المراجعة
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,يرجى تحديد
 DocType: Task,Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,معرف العملاء
-DocType: Page,Page Name,اسم الصفحة
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,إلى الوقت يجب أن تكون أكبر من من الوقت
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,ترتيب المبيعات {0} لم تقدم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,تشطيب المغزل
 DocType: BOM,Last Purchase Rate,أخر سعر توريد
 DocType: Account,Asset,الأصول
 DocType: Project Task,Task ID,ID مهمة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","على سبيل المثال "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","على سبيل المثال "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,الأوراق المالية لا يمكن أن توجد القطعة ل{0} منذ ديه المتغيرات
 ,Sales Person-wise Transaction Summary,الشخص الحكيم مبيعات ملخص عملية
-DocType: System Settings,Time Zone,منطقة زمنية
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,مستودع {0} غير موجود
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,سجل للحصول على ERPNext المحور
 DocType: Monthly Distribution,Monthly Distribution Percentages,النسب المئوية لتوزيع الشهرية
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة  سلمت من أمر التوصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,التدبيس
 DocType: Customer,Customer Details,تفاصيل العملاء
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,تشكيل
 DocType: Employee,Reports to,تقارير إلى
 DocType: SMS Settings,Enter url parameter for receiver nos,أدخل عنوان URL لمعلمة NOS استقبال
 DocType: Sales Invoice,Paid Amount,المبلغ المدفوع
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',إغلاق الحساب {0} يجب أن تكون من النوع ' المسؤولية '
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","رصيد حساب بالفعل في الخصم، لا يسمح لك تعيين ""الرصيد يجب أن يكون 'ك' الائتمان '"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,إدارة الجودة
 DocType: Production Planning Tool,Filter based on customer,تصفية على أساس العملاء
 DocType: Payment Tool Detail,Against Voucher No,ضد قسيمة لا
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,التوازن الكمية
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,التوازن الكمية
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ل {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراكز التكلفة
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,المستودعات.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,المستودعات.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة المورد قاعدة الشركة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},الصف # {0} الصراعات مواقيت مع صف واحد {1}
 DocType: Opportunity,Next Contact,التالي اتصل بنا
 DocType: Employee,Employment Type,مجال العمل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,الموجودات الثابتة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,فترة التطبيق لا يمكن أن يكون عبر اثنين من السجلات alocation
 DocType: Item Group,Default Expense Account,الافتراضي نفقات الحساب
 DocType: Employee,Notice (days),إشعار (أيام )
-DocType: Page,Yes,نعم
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
 DocType: Employee,Encashment Date,تاريخ التحصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,الكهربائية وتشكيل
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ضد قسيمة النوع يجب أن يكون واحدا من طلب شراء، شراء الفاتورة أو إدخال دفتر اليومية
 DocType: Account,Stock Adjustment,الأسهم التكيف
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},موجود آخر الافتراضي التكلفة لنوع النشاط - {0}
 DocType: Production Order,Planned Operating Cost,المخطط تكاليف التشغيل
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,الجديد {0} اسم
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},تجدون طيه {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},تجدون طيه {0} # {1}
 DocType: Job Applicant,Applicant Name,اسم مقدم الطلب
 DocType: Authorization Rule,Customer / Item Name,العميل / البند الاسم
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},لا المسلسل إلزامي القطعة ل {0}
 DocType: Item Variant Attribute,Attribute,سمة
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,يرجى تحديد من / أن يتراوح
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,التي أنشأتها
 DocType: Serial No,Under AMC,تحت AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,يتم حساب معدل تقييم البند النظر هبطت تكلفة مبلغ قسيمة
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,الإعدادات الافتراضية لبيع صفقة.
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,الحد الأدنى المبلغ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,تحديث السلع منتهية
 DocType: Workstation,per hour,كل ساعة
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},الترقيم المتسلسل {0} مستخدم بالفعل في {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,سيتم إنشاء حساب المستودع ( الجرد الدائم ) في إطار هذا الحساب.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,المبلغ المدفوع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدير المشروع
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,إيفاد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ماكس الخصم المسموح به لمادة: {0} {1}٪
 DocType: Customer,Default Taxes and Charges,الضرائب والرسوم الافتراضية
 DocType: Account,Receivable,القبض
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
 DocType: Sales Invoice,Supplier Reference,مرجع المورد
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",إذا كانت محددة، سينظر BOM لبنود فرعية الجمعية للحصول على المواد الخام. خلاف ذلك، سيتم معاملة جميع البنود الفرعية الجمعية كمادة خام.
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,البائع الوصف
 DocType: Employee Education,Qualification,المؤهل
 DocType: Item Price,Item Price,البند السعر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,الحركة صور والفيديو
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,الصابون والمنظفات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,الحركة صور والفيديو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,أمر
 DocType: Warehouse,Warehouse Name,مستودع اسم
 DocType: Naming Series,Select Transaction,حدد المعاملات
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,معدل المواد التي تقوم على
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,الأسهم أداة استبدال UOM
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",هنا يمكنك الحفاظ على الطول والوزن، والحساسية، الخ المخاوف الطبية
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,للإنتاج
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,يرجى إدخال أمر المبيعات في الجدول أعلاه
 DocType: Project Task,View Task,عرض العمل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,تبدأ السنة المالية الخاصة بك على
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,تبدأ السنة المالية الخاصة بك على
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,من فضلك ادخل شراء إيصالات
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المتلقاة
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),إعداد ملقم واردة ل دعم البريد الإلكتروني معرف . (على سبيل المثال support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Salary Slip,Salary Slip,إيصال الراتب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,الصقل
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' إلى تاريخ ' مطلوب
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",توليد التعبئة زلات لحزم ليتم تسليمها. تستخدم لإعلام عدد حزمة، حزمة المحتويات وزنه.
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,يوم الدفع
 DocType: BOM,Manage cost of operations,إدارة تكلفة العمليات
 DocType: Features Setup,Item Advanced,البند المتقدم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,الساخنة المتداول
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",عند &quot;المقدمة&quot; أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى &quot;الاتصال&quot; المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,إعدادات العالمية
 DocType: Employee Education,Employee Education,موظف التعليم
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
 DocType: Salary Slip,Net Pay,صافي الراتب
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,المسلسل لا {0} وقد وردت بالفعل
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,تفاصيل فريق المبيعات
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,فرص محتملة للبيع.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,الإجازات المرضية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},باطلة {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,الإجازات المرضية
 DocType: Email Digest,Email Digest,البريد الإلكتروني دايجست
 DocType: Delivery Note,Billing Address Name,الفواتير اسم العنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,المتاجر
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,توازن النظام
-DocType: Workflow,Is Active,نشط
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,المتاجر
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,توازن النظام
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,حفظ المستند أولا.
 DocType: Account,Chargeable,تحمل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,تغيير اختصار
-DocType: Workflow State,Primary,أساسي
 DocType: Expense Claim Detail,Expense Date,حساب تاريخ
 DocType: Item,Max Discount (%),ماكس الخصم (٪)
-DocType: Communication,More Information,المزيد من المعلومات
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,أمر آخر كمية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,نسف
 DocType: Company,Warn,حذر
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,التقييم البند تحديث
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، جهد يذكر أن يجب أن تذهب في السجلات.
 DocType: BOM,Manufacturing User,التصنيع العضو
 DocType: Purchase Order,Raw Materials Supplied,المواد الخام الموردة
 DocType: Purchase Invoice,Recurring Print Format,تنسيق طباعة متكرر
-DocType: Communication,Series,سلسلة ترقيم الوثيقة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,التسليم المتوقع التاريخ لا يمكن أن يكون قبل تاريخ طلب شراء
 DocType: Appraisal,Appraisal Template,تقييم قالب
-DocType: Communication,Email,البريد الإلكتروني
 DocType: Item Group,Item Classification,تصنيف البند
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,مدير تطوير الأعمال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,مدير تطوير الأعمال
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,صيانة زيارة الغرض
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,فترة
 ,General Ledger,دفتر الأستاذ العام
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,الرجاء اختيار {0} الأولى
 DocType: Features Setup,To get Item Group in details table,للحصول على تفاصيل المجموعة في الجدول تفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,إعادة رسم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,خرط
 DocType: Sales Invoice,Commission,عمولة
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3203,7 @@
  {٪ إذا٪ email_id} البريد الإلكتروني: {{email_id}} العلامة & lt؛ BR & GT ؛ {٪ ENDIF -٪} 
  </ الرمز> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,المبلغ الافتراضي
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,ملخص هذا الشهر
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
@@ -3510,71 +3222,58 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
 DocType: Supplier,Address and Contacts,عنوان واتصالات
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تحويل التفاصيل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,يتم تحديث الرسوم في شراء استلام ضد كل بند
 DocType: Payment Tool,Get Outstanding Vouchers,الحصول على قسائم المعلقة
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Appraisal,Start Date,تاريخ البدء
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,قيمة
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,تخصيص يترك لفترة .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,انقر هنا للتحقق من
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: لا يمكنك تعيين نفسه كحساب الأم
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",تظهر &quot;في سوق الأسهم&quot; أو &quot;ليس في الأوراق المالية&quot; على أساس الأسهم المتاحة في هذا المخزن.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),مشروع القانون المواد (BOM)
-DocType: Item,Average time taken by the supplier to deliver,متوسط الوقت المستغرق من قبل المورد لتسليم
+DocType: Item,Average time taken by the supplier to deliver,متوسط الوقت المستغرق من قبل المورد لتسليم
 DocType: Time Log,Hours,ساعات
 DocType: Project,Expected Start Date,يتوقع البدء تاريخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,المتداول
-DocType: ToDo,Priority,أفضلية
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
-DocType: Dropbox Backup,Dropbox Access Allowed,دروببوإكس الدخول الأليفة
-DocType: Dropbox Backup,Weekly,الأسبوعية
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,على سبيل المثال. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,تسلم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,تسلم
 DocType: Maintenance Visit,Fully Completed,يكتمل
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ مكتمل
 DocType: Employee,Educational Qualification,المؤهلات العلمية
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Employee Leave Approver,Employee Leave Approver,الموظف إجازة الموافق
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} تمت إضافة بنجاح إلى قائمة النشرة الإخبارية لدينا.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,الإلكترون شعاع بالقطع
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير ماستر شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,الرئيسية تقارير
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,الأسهم ليدجر إدخالات أرصدة تحديث
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,الرئيسية تقارير
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,إضافة / تحرير الأسعار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,بيانيا من مراكز التكلفة
 ,Requested Items To Be Ordered,البنود المطلوبة إلى أن يؤمر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,بلدي أوامر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,بلدي أوامر
 DocType: Price List,Price List Name,قائمة الأسعار اسم
 DocType: Time Log,For Manufacturing,لصناعة
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,المجاميع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,المجاميع
 DocType: BOM,Manufacturing,تصنيع
 ,Ordered Items To Be Delivered,أمرت عناصر ليتم تسليمها
 DocType: Account,Income,دخل
-,Setup Wizard,معالج الإعداد
 DocType: Industry Type,Industry Type,صناعة نوع
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,حدث خطأ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاريخ الانتهاء
 DocType: Purchase Invoice Item,Amount (Company Currency),المبلغ (عملة الشركة)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,يموت الصب
-DocType: Email Alert,Reference Date,المرجع تاريخ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,وحدة المؤسسة ( قسم) الرئيسي.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,الرجاء إدخال غ المحمول صالحة
 DocType: Budget Detail,Budget Detail,تفاصيل الميزانية
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,من فضلك ادخل الرسالة قبل إرسالها
-DocType: Async Task,Status,حالة
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},الأسهم UOM تحديث القطعة ل{0}
-DocType: Company History,Year,عام
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطة من بيع الشخصي
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,يرجى تحديث إعدادات SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,الوقت سجل {0} صفت بالفعل
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,مسلسل العقد لا انتهاء الاشتراك خدمة
 DocType: Item,Unit of Measure Conversion,وحدة القياس التحويل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,لا يمكن تغيير موظف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},اتاحة لأكثر من {0} للصنف {1}
 DocType: Address,Name of person or organization that this address belongs to.,اسم الشخص أو المنظمة التي ينتمي إلى هذا العنوان.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,لديك موردون
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,لديك موردون
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"آخر هيكل الراتب {0} نشط للموظف {1}. يرجى التأكد مكانتها ""غير فعال"" للمتابعة."
 DocType: Purchase Invoice,Contact,اتصل
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,مستلم من
 DocType: Features Setup,Exports,صادرات
 DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,ورقم المسلسل
 DocType: Employee,Date of Issue,تاريخ الإصدار
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} من {0} ب {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
 DocType: Issue,Content Type,نوع المحتوى
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,الكمبيوتر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,الكمبيوتر
 DocType: Item,List this Item in multiple groups on the website.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,البند: {0} غير موجود في النظام
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مقالات لم تتم تسويتها
 DocType: Cost Center,Budgets,الميزانيات
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,تحديث
 DocType: Employee,Emergency Contact Details,تفاصيل الاتصال في حالات الطوارئ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,مجال عمل الشركة؟
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,مجال عمل الشركة؟
 DocType: Delivery Note,To Warehouse,لمستودع
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},تم إدخال حساب {0} أكثر من مرة للعام المالي {1}
-,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,""" لا يحوي رقم متسلسل""  لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
+,Average Commission Rate,متوسط العمولة
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,""" لا يحوي رقم متسلسل""  لا يمكن أن يكون "" نعم "" للأصناف الغير مخزنة"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات التسعير القاعدة
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,كهربائي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,كهربائي
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},هوية المستخدم لم يتم تعيين موظف ل {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,الرصاص Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,من المطالبة الضمان
 DocType: Stock Entry,Default Source Warehouse,المصدر الافتراضي مستودع
 DocType: Item,Customer Code,قانون العملاء
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,اللف
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,منذ أيام طلب آخر
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,منذ أيام طلب آخر
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية السلسلة
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
-DocType: User,Enabled,تمكين
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,الموجودات الأسهم
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},هل تريد حقا لتقديم كل زلة الرواتب ل شهر {0} و السنة {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,المشتركون استيراد
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,تقديم
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تسليم مذكرة {0} يجب ألا المقدمة
 DocType: Notification Control,Sales Invoice Message,فاتورة مبيعات رسالة
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,إغلاق حساب {0} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
 DocType: Authorization Rule,Based On,وبناء على
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,الأسهم المجمدة لغاية
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,مشروع النشاط / المهمة.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,توليد قسائم راتب
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} بريد إلكتروني غير صحيح
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
-DocType: ToDo,Low,منخفض
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,الغزل
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,مطلوب اسم حملة
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Receipt Item,Rejected Serial No,رقم المسلسل رفض
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,السحب العميق
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,النشرة الإخبارية جديدة
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,مشاهدة الميزان
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,المدى شيخوخة 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,كمية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,التثبيت
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
 ,Sales Analytics,مبيعات تحليلات
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
@@ -3700,36 +3393,32 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,اسم الحساب الجديد
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,المواد الخام الموردة التكلفة
 DocType: Selling Settings,Settings for Selling Module,إعدادات لبيع وحدة
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,خدمة العملاء
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,خدمة العملاء
 DocType: Item,Thumbnail,المصغرات
 DocType: Item Customer Detail,Item Customer Detail,البند تفاصيل العملاء
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,تأكيد البريد الإلكتروني الخاص بك
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,عرض المرشح على وظيفة.
 DocType: Notification Control,Prompt for Email on Submission of,المطالبة البريد الالكتروني على تقديم
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,مجموع الأوراق المخصصة هي أكثر من أيام في الفترة
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,افتراضي العمل في مستودع التقدم
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,الإعدادات الافتراضية ل معاملات المحاسبية.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} مطلوب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,فراغ الصب
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
-DocType: Contact Us Settings,City,مدينة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,بالموجات فوق الصوتية بالقطع
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطأ: لا بطاقة هوية صالحة؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,البند {0} يجب أن يكون عنصر المبيعات
 DocType: Naming Series,Update Series Number,تحديث الرقم المتسلسل
 DocType: Account,Equity,إنصاف
 DocType: Sales Order,Printing Details,تفاصيل الطباعة
 DocType: Task,Closing Date,تاريخ الإنتهاء
 DocType: Sales Order Item,Produced Quantity,أنتجت الكمية
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,مهندس
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,جمعيات البحث الفرعية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
 DocType: Sales Partner,Partner Type,نوع الشريك
 DocType: Purchase Taxes and Charges,Actual,فعلي
 DocType: Authorization Rule,Customerwise Discount,Customerwise الخصم
 DocType: Purchase Invoice,Against Expense Account,ضد حساب المصاريف
 DocType: Production Order,Production Order,الإنتاج ترتيب
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,تركيب ملاحظة {0} وقد تم بالفعل قدمت
 DocType: Quotation Item,Against Docname,ضد Docname
 DocType: SMS Center,All Employee (Active),جميع الموظفين (فعالة)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,عرض الآن
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,المواد الخام التكلفة
 DocType: Item,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,مخطط جانت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,جزئي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,تم تحديث الرقم المتسلسل
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,تقرير نوع إلزامي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,تقرير نوع إلزامي
 DocType: Item,Serial Number Series,المسلسل عدد سلسلة
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},مستودع إلزامي للسهم المدينة {0} في {1} الصف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,تجارة التجزئة و الجملة
 DocType: Issue,First Responded On,أجاب أولا على
 DocType: Website Item Group,Cross Listing of Item in multiple groups,قائمة صليب البند في مجموعات متعددة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,المستخدم أولا : أنت
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,المستخدم أولا : أنت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},يتم تعيين السنة المالية وتاريخ بدء السنة المالية تاريخ الانتهاء بالفعل في السنة المالية {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,التوفيق بنجاح
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,التوفيق بنجاح
 DocType: Production Order,Planned End Date,المخطط لها تاريخ الانتهاء
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,حيث يتم تخزين العناصر.
 DocType: Tax Rule,Validity,صحة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مبلغ بفاتورة
 DocType: Attendance,Attendance,الحضور
-DocType: Page,No,لا
 DocType: BOM,Materials,المواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",إن لم يكن تم، سيكون لديك قائمة تضاف إلى كل قسم حيث أنه لا بد من تطبيقها.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,تاريخ نشرها ونشر الوقت إلزامي
@@ -3764,55 +3451,46 @@
 ,Item Prices,البند الأسعار
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
 DocType: Period Closing Voucher,Period Closing Voucher,فترة الإغلاق قسيمة
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,قائمة الأسعار الرئيسية.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,قائمة الأسعار الرئيسية.
 DocType: Task,Review Date,مراجعة تاريخ
 DocType: Purchase Invoice,Advance Payments,دفعات مقدمة
-DocType: DocPerm,Level,مستوى
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,مستودع الهدف في الصف {0} يجب أن يكون نفس ترتيب الإنتاج
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,طحن
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,لا إذن لاستخدام أداة الدفع
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى
 DocType: Company,Round Off Account,جولة قبالة حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,القضم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,المصاريف الإدارية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,الاستشارات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,الاستشارات
 DocType: Customer Group,Parent Customer Group,الأم العملاء مجموعة
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","على سبيل المثال ""شركتي ذ.م.م. """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,فترة إشعار
 DocType: Bank Reconciliation Detail,Voucher ID,قسيمة ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,هذا هو الجذر الأرض والتي لا يمكن تحريرها.
 DocType: Packing Slip,Gross Weight UOM,الوزن الإجمالي UOM
 DocType: Email Digest,Receivables / Payables,الذمم المدينة / الدائنة
 DocType: Delivery Note Item,Against Sales Invoice,ضد فاتورة المبيعات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ختم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,إظهار القيم الصفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
-DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات 
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+DocType: Delivery Note Item,Against Sales Order Item,مقابل المبيعات
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 DocType: Task,Actual End Date (via Time Logs),الفعلي تاريخ الانتهاء (عبر الزمن سجلات)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},الميزانية لا يمكن تعيين ضد المجموعة حساب {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
 DocType: Delivery Note,Print Without Amount,طباعة دون المبلغ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
-DocType: User,Last Name,اسم العائلة
-DocType: Web Page,Left,ترك
-DocType: Event,All Day,كل يوم
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
 DocType: Issue,Support Team,فريق الدعم
 DocType: Appraisal,Total Score (Out of 5),مجموع نقاط (من 5)
-DocType: Contact Us Settings,State,دولة
 DocType: Batch,Batch,دفعة
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,توازن
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,توازن
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع المطالبة المصاريف (عبر مطالبات النفقات)
-DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,ملاحظة الخصم
 DocType: Stock Entry,As per Stock UOM,وفقا للأوراق UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,لا انتهى
@@ -3826,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,إنشاء قواعد لتقييد المعاملات على أساس القيم.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",إذا تم، المشاركات لا. من أيام عمل وسوف تشمل أيام العطل، وهذا سوف يقلل من قيمة الراتب لكل يوم
 DocType: Purchase Invoice,Total Advance,إجمالي المقدمة
-DocType: Workflow State,User,مستخدم
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,تجهيز كشوف المرتبات
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ الائتمان
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,على النحو المفقودة
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,إيصال دفع ملاحظة
 DocType: Customer,Credit Days Based On,يوم الائتمان بناء على
 DocType: Tax Rule,Tax Rule,القاعدة الضريبية
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,الحفاظ على نفس المعدل خلال دورة المبيعات
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات العمل محطة العمل.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} قد تم بالفعل تأكيده
 ,Items To Be Requested,البنود يمكن طلبه
-DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Time Log,Billing Rate based on Activity Type (per hour),أسعار الفواتير على أساس نوع النشاط (في الساعة)
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,الاغلاق
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",شركة البريد الإلكتروني معرف لم يتم العثور على ، وبالتالي لم ترسل البريد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 DocType: Production Planning Tool,Filter based on item,تصفية استنادا إلى البند
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب الخصم
 DocType: Fiscal Year,Year Start Date,تاريخ بدء العام
 DocType: Attendance,Employee Name,اسم الموظف
 DocType: Sales Invoice,Rounded Total (Company Currency),المشاركات تقريب (العملة الشركة)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
 DocType: Purchase Common,Purchase Common,شراء المشتركة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من إجراء تطبيقات على إجازة الأيام التالية.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,من الفرص
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,تقطيع
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} غير موجود
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,رفعت فواتير للعملاء.
-DocType: DocField,Default,الافتراضي
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}  مشتركين تم اضافتهم
 DocType: Maintenance Schedule,Schedule,جدول
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تحديد الميزانية لهذا مركز التكلفة. لمجموعة العمل الميزانية، انظر &quot;قائمة الشركات&quot;
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Expense Claim,Approved,وافق
 DocType: Pricing Rule,Price,السعر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",واختيار &quot;نعم&quot; يعطي هوية فريدة من نوعها لكل كيان في هذا البند والتي يمكن عرضها في المسلسل الرئيسية.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,تقييم {0} لخلق موظف {1} في نطاق تاريخ معين
 DocType: Employee,Education,تعليم
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",اختياري. يحدد العملة الافتراضية الشركة، إذا لم يكن محددا.
 DocType: Address,Office,مكتب
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,تقارير قياسية
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,المحاسبة إدخالات دفتر اليومية.
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,لإنشاء حساب الضرائب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,الرجاء إدخال حساب المصاريف
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
 DocType: Employee,Current Address,العنوان الحالي
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,دفعة الجرد
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,دفعة الجرد
 DocType: Employee,Contract End Date,تاريخ نهاية العقد
 DocType: Sales Order,Track this Sales Order against any Project,تتبع هذا الأمر ضد أي مشروع المبيعات
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سحب أوامر البيع (في انتظار لتسليم) بناء على المعايير المذكورة أعلاه
-DocType: DocShare,Document Type,نوع الوثيقة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,من مزود اقتباس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,من مزود اقتباس
 DocType: Deduction Type,Deduction Type,خصم نوع
 DocType: Attendance,Half Day,نصف يوم
 DocType: Pricing Rule,Min Qty,دقيقة الكمية
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",لتعقب العناصر في المبيعات وثائق شراء مع غ دفعة واحدة. &quot;الصناعة المفضلة: كيماويات&quot;
 DocType: GL Entry,Transaction Date,تاريخ المعاملة
 DocType: Production Plan Item,Planned Qty,المخطط الكمية
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,مجموع الضرائب
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مجموع الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع الأوراق المخصصة لأكثر من فترة
 DocType: Production Order,Actual Start Date,تاريخ البدء الفعلي
 DocType: Sales Order,% of materials delivered against this Sales Order,٪ من المواد الموردة أوصلت مقابل أمر المبيعات
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,تسجيل حركة البند.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,قائمة النشرة المشترك
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,خدمة
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,وقد أجريت بالفعل القيود المحاسبية بالعملة {0} لشركة {1}. يرجى تحديد حساب المستحق أو تدفع بالعملة {0}.
 ,Monthly Salary Register,سجل الراتب الشهري
-apps/frappe/frappe/website/template.py +140,Next,التالي
 DocType: Warranty Claim,If different than customer address,إذا كان مختلفا عن عنوان العميل
 DocType: BOM Operation,BOM Operation,BOM عملية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,بالكهرباء
 DocType: Purchase Taxes and Charges,On Previous Row Amount,على المبلغ الصف السابق
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,الرجاء إدخال مبلغ الدفع في أتلست صف واحد
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,الرجاء إدخال مبلغ الدفع في أتلست صف واحد
 DocType: POS Profile,POS Profile,POS الملف الشخصي
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,صف {0}: دفع مبلغ لا يمكن أن يكون أكبر من المبلغ المستحق
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,عدد غير مدفوع
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,عدد غير مدفوع
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,دخول الوقت ليس للفوترة
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,مشتر
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,مشتر
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,صافي الأجور لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,الرجاء إدخال ضد قسائم يدويا
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,الرجاء إدخال ضد قسائم يدويا
 DocType: SMS Settings,Static Parameters,ثابت معلمات
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,إرسال SMS الشامل لجهات الاتصال الخاصة بك
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,النظر في ضريبة أو رسم ل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,عبر المتداول
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,بطاقة إئتمان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,بطاقة إئتمان
 DocType: BOM,Item to be manufactured or repacked,لتصنيعه أو إعادة تعبئتها البند
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,الإعدادات الافتراضية ل معاملات الأوراق المالية .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,الإعدادات الافتراضية ل معاملات الأوراق المالية .
 DocType: Purchase Invoice,Next Date,تاريخ القادمة
 DocType: Employee Education,Major/Optional Subjects,الرئيسية / اختياري الموضوعات
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,من فضلك ادخل الضرائب والرسوم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,بالقطع
 DocType: Sales Invoice Item,Drop Ship,هبوط السفينة
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",هنا يمكنك الحفاظ على تفاصيل مثل اسم العائلة واحتلال الزوج، الوالدين والأطفال
 DocType: Hub Settings,Seller Name,البائع اسم
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,أعد حزم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,يجب حفظ النموذج قبل الشروع
 DocType: Item Attribute,Numeric Values,قيم رقمية
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 DocType: Customer,Commission Rate,اللجنة قيم
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,جعل البديل
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,منع مغادرة الطلبات المقدمة من الإدارة.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,السلة فارغة
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,لا يمكن تحرير الجذر.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,يمكن المبلغ المخصص لا يزيد المبلغ unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,لا يمكن تحرير الجذر.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,يمكن المبلغ المخصص لا يزيد المبلغ unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
 DocType: Sales Order,Customer's Purchase Order Date,طلب شراء الزبون التسجيل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,أسهم رأس المال
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,يرجى تحديد ملف CSV
-DocType: Dropbox Backup,Send Backups to Dropbox,إرسال النسخ الاحتياطية لدروببوإكس
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,مصمم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,مصمم
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,الشروط والأحكام قالب
 DocType: Serial No,Delivery Details,الدفع تفاصيل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,إنشاء المواد طلب تلقائيا إذا وقعت كمية أقل من هذا المستوى
 ,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",لضبط مستوى إعادة الطلب، يجب أن يكون البند لشراء السلعة أو التصنيع البند
 ,Supplier Addresses and Contacts,العناوين المورد و اتصالات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,الرجاء اختيار الفئة الأولى
 apps/erpnext/erpnext/config/projects.py +18,Project master.,المشروع الرئيسي.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,الحصول على عناصر من BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,الحصول على عناصر من BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,فاتورة المواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
-DocType: Dropbox Backup,Send Notifications To,إرسال إشعارات إلى
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,المرجع التسجيل
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,المرجع التسجيل
 DocType: Employee,Reason for Leaving,سبب ترك العمل
 DocType: Expense Claim Detail,Sanctioned Amount,يعاقب المبلغ
 DocType: GL Entry,Is Opening,وفتح
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,حساب {0} غير موجود
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,نبذة عن سيرة حياة لموقع الويب وغيرها من المطبوعات.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},يرجى إنشاء هيكل الرواتب ل موظف {0}

diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 5d24ea5..39366a1 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode Заплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете месец Distribution, ако искате да проследите различните сезони."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: една и съща позиция е въведен няколко пъти.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Внимание: една и съща позиция е въведен няколко пъти.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Предмети вече синхронизирани
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Оставя т да бъдат добавени няколко пъти в една сделка
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Отмени Материал посещение {0}, преди да анулира този гаранционен иск"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Потребителски продукти
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребителски продукти
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Моля изберете страна Type първи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Каляване
 DocType: Item,Customer Items,Предмети на клиенти
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Родителска сметка {1} не може да бъде Главна счетоводна книга
 DocType: Item,Publish Item to hub.erpnext.com,Публикуване т да hub.erpnext.com
@@ -17,19 +16,17 @@
 DocType: Employee,Leave Approvers,Оставете Одобряване
 DocType: Sales Partner,Dealer,Търговец
 DocType: Employee,Rented,Отдаден
-DocType: About Us Settings,Website,Уебсайт
 DocType: POS Profile,Applicable for User,Приложимо за User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплътняване плюс синтероване
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Се изисква валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
 DocType: Purchase Order,Customer Contact,Клиента Контакти
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,От Материал Искане
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,От Материал Искане
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дървовидно
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Не повече резултати.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Actual type tax cannot be included in Item rate in row {0} 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Actual type tax cannot be included in Item rate in row {0}
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Изисквани от
 DocType: Delivery Note,Return Against Delivery Note,Върнете Срещу Бележка за доставка
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Оставете Тип Име
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series успешно обновени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Етикетиране
 DocType: Pricing Rule,Apply On,Нанася се върху
 DocType: Item Price,Multiple Item prices.,Множество цени елемент.
 ,Purchase Order Items To Be Received,Покупка Поръчка артикули да бъдат получени
 DocType: SMS Center,All Supplier Contact,All доставчика Свържи се с
 DocType: Quality Inspection Reading,Parameter,Параметър
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Оставете Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option 
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Оставете Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Проект
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. To maintain the customer wise item code and to make them searchable based on their code use this option
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Покажи Варианти
-DocType: Sales Invoice Item,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Потребителят {0} вече е назначен служител {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направете нов POS профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Грижа за здравето
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
 DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Забавяне на плащане (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Имейл Адрес
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Отбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Имейл Адрес
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
 DocType: Company,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Превозно средство не
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Моля изберете Ценоразпис
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дървообработване
 DocType: Production Order Operation,Work In Progress,Незавършено производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печат
 DocType: Employee,Holiday List,Holiday Списък
 DocType: Time Log,Time Log,Време Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Счетоводител
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Счетоводител
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Company,Phone No,Телефон No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Вход на дейности, извършени от потребители срещу задачи, които могат да се използват за проследяване на времето, за фактуриране."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Търговски партньори на Комисията
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Съкращение не може да има повече от 5 символа
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Умение Value {0} не може да бъде отстранен от {1} като т Варианти \ съществува с този атрибут.
-DocType: Print Settings,Classic,Класически
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Това е корен сметка и не може да се редактира.
 DocType: BOM,Operations,Operations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не можете да зададете разрешение въз основа на Отстъпка за {0}
 DocType: Bin,Quantity Requested for Purchase,Поискани количества за покупка
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепете .csv файл с две колони, по един за старото име и един за новото име"
 DocType: Packed Item,Parent Detail docname,Родител Подробности docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Откриване на работа.
 DocType: Item Attribute,Increment,Увеличение
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Employee,Married,Омъжена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се разрешава {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Хранителни стоки
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направи Bank Влизане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионни фондове
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse е задължително, ако типа на профила е Warehouse"
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверете дали повтарящи цел, махнете отметката, за да спре повтарящи се или пуснати правилното Крайна дата"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Разходите за доставени изделия
-DocType: Blog Post,Guest,Гост
 DocType: Quality Inspection,Get Specification Details,Вземи Specification Детайли
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на Материал
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отвор
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отвор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},"От {0}, за да {1}"
 DocType: Item,Copy From Item Group,Copy от позиция Group
 DocType: Journal Entry,Opening Entry,Откриване Влизане
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} е задължително
 DocType: Stock Entry,Additional Costs,Допълнителни разходи
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
 DocType: Lead,Product Enquiry,Каталог Запитване
-DocType: Standard Reply,Owner,Собственик
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Моля, въведете първата компания"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Моля изберете Company първа
 DocType: Employee Education,Under Graduate,Под Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Райбероване
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activity Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижим имот
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижим имот
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Извлечение от сметка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Изискайте Сума
 DocType: Employee,Mr,Господин
-DocType: Custom Script,Client,Клиент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Доставчик Type / Доставчик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Консумативи
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Консумативи
 DocType: Upload Attendance,Import Log,Внос Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Изпращам
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна заплата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна заплата
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Сток Разходи
 DocType: Newsletter,Email Sent?,Email изпратени?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Покажи Час Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit през Company валути
 DocType: Delivery Note,Installation Status,Монтаж Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
 DocType: Item,Supply Raw Materials for Purchase,Доставка на суровини за пазаруване
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} трябва да бъде покупка Точка
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ще бъде актуализиран след фактурата за продажба е подадено.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да включват курортна такса в ред {0} в скоростта на т, данъци в редове {1} трябва да се включат и"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Изправяне
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Час Logs за фактуриране.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity леене
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter вече е било изпратено
 DocType: Lead,Request Type,Заявка Type
 DocType: Leave Application,Reason,Причина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Радиопредаване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Изпълнение
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Първият потребителят ще стане мениджър System (можете да промените това по-късно).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радиопредаване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Изпълнение
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Първият потребителят ще стане мениджър System (можете да промените това по-късно).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Подробности за извършените операции.
 DocType: Serial No,Maintenance Status,Поддръжка Status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Артикули и ценообразуване
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Артикули и ценообразуване
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от датата = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изберете служителя за когото вие създавате при оценките.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Разходен център {0} не принадлежи към Company {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Цена списък трябва да бъде приложимо за покупка или продажба
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата на монтаж не може да бъде преди датата на доставка за позиция {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Отстъпка за Ценоразпис Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начало
-DocType: User,First Name,Първо Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Леене в пълен мухъл
 DocType: Offer Letter,Select Terms and Conditions,Изберете Общи условия
 DocType: Production Planning Tool,Sales Orders,Продажби Поръчки
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Банкова Сметка
 DocType: Leave Type,Allow Negative Balance,Оставя отрицателен баланс
 DocType: Selling Settings,Default Territory,Default Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевизия
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизия
 DocType: Production Order Operation,Updated via 'Time Log',Updated чрез &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Сметка {0} не принадлежи към Фирма {1}
 DocType: Naming Series,Series List for this Transaction,Series Списък за тази транзакция
 DocType: Sales Invoice,Is Opening Entry,Се отваря Влизане
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Споменете, ако нестандартно вземане предвид приложимо"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,За Warehouse се изисква преди Подайте
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Получен на
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Моля, въведете Company"
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
 DocType: Newsletter List,Total Subscribers,Общо Абонати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име За Контакт
+,Contact Name,Име За Контакт
 DocType: Production Plan Item,SO Pending Qty,"Така, докато се Количество"
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Създава заплата приплъзване за посочените по-горе критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Заявка за покупка.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двойна жилища
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листата на година
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листата на година
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Моля, задайте именуване Series за {0} чрез Setup&gt; Settings&gt; именуване Series"
 DocType: Time Log,Will be updated when batched.,"Ще бъде актуализиран, когато дозирани."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете &quot;е Advance&quot; срещу Account {1}, ако това е предварително влизане."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
-DocType: Bulk Email,Message,Съобщение
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Референтен номер по
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
 DocType: Material Request Item,Min Order Qty,Min Поръчка Количество
 DocType: Lead,Do Not Contact,Не допирайте
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникалния идентификационен код за проследяване на всички повтарящи се фактури. Той се генерира на представи.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик На Софтуер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик На Софтуер
 DocType: Item,Minimum Order Qty,Минимална поръчка Количество
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Item,Publish in Hub,Публикувай в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Телена четка
 DocType: Employee,Relation,Връзка
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Доставка
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Генериране Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Моля изберете Charge Type първи
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 символа
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Изберете вашия език
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 символа
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Забранява създаването на времеви трупи срещу производствени поръчки. Операциите не се проследяват срещу производството Поръчка
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Вариант на
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,"Точка {0} трябва да е услуга, т"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
-DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерно сондиране
-DocType: Stock UOM Replace Utility,New Stock UOM,New фондова мерна единица
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Референтен Error
-DocType: Communication,Closed,Затворен
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,По думите (износ) ще бъде видим след като запазите бележката за доставката.
 DocType: Lead,Industry,Промишленост
 DocType: Employee,Job Profile,Job профил
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Хидроформинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Милувки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматична Материал Искане
 DocType: Journal Entry,Multi Currency,Multi валути
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Точка се актуализира
-DocType: Async Task,System Manager,Система на мениджъра
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип Invoice
 DocType: Sales Invoice Item,Delivery Note,Фактура
-DocType: Dropbox Backup,Allow Dropbox Access,Оставя Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Създаване Данъци
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Моля, изберете месец и година"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Фирма Email
 DocType: GL Entry,Debit Amount in Account Currency,Debit Сума в Account валути
 DocType: Shipping Rule,Valid for Countries,Важи за Държави
-DocType: Workflow State,Refresh,Обновяване
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Всички свързаните с тях области внос като валута, обменен курс, общият внос, внос сбор и т.н. са на разположение в Покупка разписка, доставчик цитата, фактурата за покупка, поръчка и т.н."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Общо Поръчка Смятан
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Предлага се в BOM, известието за доставка, фактурата за покупка, производство поръчка за покупка, покупка разписка, фактурата за продажба, продажба Поръчка, Фондова вписване, график"
 DocType: Item Tax,Tax Rate,Данъчна Ставка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Изберете Точка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Изберете Точка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиция: {0} успя партиди, не може да се примири с помощта \ фондова помирение, вместо това използвайте фондова Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Конвертиране в не-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка разписка трябва да бъде представено
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Stock мерна единица
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (много) на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Debit Сума
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Не може да има само един акаунт на тази фирма и в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашата електронна поща
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Моля, вижте прикачения файл"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Рязане с водна струя
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Вече Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Вече Complete !!
 ,Finished Goods,Готова продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Инспектирани от
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Моля, не създават сметки на клиенти и доставчици. Те са създадени директно от майсторите на клиента / доставчика."
 DocType: Currency Exchange,Currency Exchange,Обмяна На Валута
 DocType: Purchase Invoice Item,Item Name,Име на артикул
+DocType: Authorization Rule,Approving User  (above authorized value),Одобряване на потребителя (над разрешено стойност)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Овдовял
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Предмети да бъдат поискани, които са &quot;на склад&quot; за това, всички складове на базата на прогнозни Количество и минимална Количество поръчка"
@@ -378,22 +346,21 @@
 ,Purchase Register,Покупка Регистрация
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
 DocType: Workstation,Consumable Cost,Консумативи Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицински
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицински
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за загубата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube форма на пръчки
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
 DocType: Employee,Single,Единичен
 DocType: Issue,Attachment,Привързаност
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджетът не може да се настрои за Cost Center Group
 DocType: Account,Cost of Goods Sold,Себестойност на продадените стоки
 DocType: Purchase Invoice,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Моля, въведете Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Моля, въведете Cost Center"
 DocType: Journal Entry Account,Sales Order,Поръчка За Продажба
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Ср. Курс продава
 DocType: Purchase Order,Start date of current order's period,Начална дата на периода на текущата поръчката
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Количество не може да бъде една малка част в ред {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Количество не може да бъде една малка част в ред {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
 DocType: Delivery Note,% Installed,% Инсталиран
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Моля, въведете име на компанията първа"
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично Определете серийни номера на базата на FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете доставчик Invoice Брой Уникалност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформоване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Разрязване
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;За да Case No.&quot; не може да бъде по-малко от &quot;От Case No.&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не е започнал
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Old-майка
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday майстор.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell корнизи
 DocType: Material Request Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Моля, въведете Код."
 DocType: BOM,Costing,Остойностяване
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Гамата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценни книжа и депозити
 DocType: Features Setup,Imports,Вносът
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепенето
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Общо листа разпределени е задължително
 DocType: Job Opening,Description of a Job Opening,Описание на Откриване на работа
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Предстоящите дейности за днес
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Присъствие запис.
 DocType: Bank Reconciliation,Journal Entries,Холни влизания
 DocType: Sales Order Item,Used for Production Plan,Използвани за производство на План
-DocType: System Settings,Loading...,Зарежда се ...
-DocType: DocField,Password,Парола
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Разтопен моделиране отлагане
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време между операциите (в минути)
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Задължения
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добави Абонати
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не съществува
 DocType: Pricing Rule,Valid Upto,Валиден Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Списък някои от вашите клиенти. Те могат да бъдат организации или лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Списък някои от вашите клиенти. Те могат да бъдат организации или лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct подоходно
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по Account, ако групирани по профил"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административният директор
 DocType: Payment Tool,Received Or Paid,Получени или заплатени
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Моля изберете Company
 DocType: Stock Entry,Difference Account,Разлика Акаунт
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Не може да се близо задача, тъй като си зависим задача {0} не е затворен."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
 DocType: Production Order,Additional Operating Cost,Допълнителна експлоатационни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
-DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
-DocType: Communication,Subject,Предмет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 ,Serial No Warranty Expiry,Пореден № Warranty Изтичане
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Артикул
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходите и разходите
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление Подизпълнители
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нова мерна единица не трябва да се от тип цяло число
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управление Подизпълнители
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебели и фиксиране
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Скоростта, с която Ценоразпис валута се превръща в основна валута на компанията"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Материал Изискване
 DocType: Company,Delete Company Transactions,Изтриване на фирма Сделки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Точка {0} не е Закупете Точка
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} е невалиден имейл адрес в ""Уведомление \ Имейл адрес"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Общо Billing Тази година:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Общо Billing Тази година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик Invoice Не
 DocType: Territory,For reference,За справка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не може да се изтрие Пореден № {0}, тъй като се използва в сделки с акции"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриване (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закриване (Cr)
 DocType: Serial No,Warranty Period (Days),Гаранционен период (дни)
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 ,Pending Qty,Отложена Количество
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорирам
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS изпратен на следните номера: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
 DocType: Pricing Rule,Valid From,Валидна от
 DocType: Sales Invoice,Total Commission,Общо Комисия
 DocType: Pricing Rule,Sales Partner,Продажбите Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Разпределение ** ви помага да разпространявате бюджета си през месеца, ако имате сезонност в бизнеса си. За разпределяне на бюджета, използвайки тази дистрибуция, задайте тази ** Месечен Разпределение ** в ** разходен център на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не са намерени в таблицата с Invoice записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Общо
-DocType: About Us Settings,Website Manager,Сайт на мениджъра
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Началната дата не трябва да бъде по-голяма от фискална година Крайна дата
 DocType: Warranty Claim,Resolution,Резолюция
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Доставени: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Billing и Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
 DocType: Leave Control Panel,Allocate,Разпределяйте
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предишен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбите Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продажби Поръчки от която искате да създадете производствени поръчки.
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Компоненти заплата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данни за потенциални клиенти.
+DocType: Authorization Rule,Customer or Item,Customer или т
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиентска база данни.
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default мерната единица за т {0} не може да се променя директно, защото вече сте направили някаква сделка (и) с друга мерна единица. Вие ще трябва да се създаде нова т да използвате различен Default мерна единица."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за които са направени стоковите разписки."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
-DocType: Event,Wednesday,Сряда
 DocType: Sales Invoice,Customer's Vendor,Търговец на клиента
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство на поръчката е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение за писане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение за писане
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Съществува друга продажбите Person {0} със същия Employee ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative фондова Error ({6}) за позиция {0} в Warehouse {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Company
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Default Остойностяване Курсове
 DocType: Maintenance Schedule,Maintenance Schedule,График за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Моля инсталирайте Dropbox Пайтън модул
 DocType: Employee,Passport Number,Номер на паспорт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Мениджър
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,От Покупка Разписка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Мениджър
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,От Покупка Разписка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
 DocType: SMS Settings,Receiver Parameter,Приемник на параметъра
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Въз основа на"" и ""Групиране По"" не може да бъде един и същ"
 DocType: Sales Person,Sales Person Targets,Търговец Цели
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Към
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Моля, въведете имейл адреса си"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,"Край тръба, образуваща"
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Конвертиране в Група
 DocType: Activity Cost,Activity Type,Вид Дейност
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Фиксирани Days
 DocType: Sales Invoice,Packing List,Опаковъчен Лист
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Поръчки дадени доставчици.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Издаване
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Издаване
 DocType: Activity Cost,Projects User,Проекти на потребителя
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Консумирана
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} не е намерен в Таблица Фактури
 DocType: Company,Round Off Cost Center,Завършете Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Поддръжка посещение {0} трябва да се отмени преди анулирането този Продажби Поръчка
 DocType: Material Request,Material Transfer,Материал Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Откриване (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Публикуване клеймо трябва да е след {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Settings
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Приземи Разходни данъци и такси
 DocType: Production Order Operation,Actual Start Time,Действително Начално Време
 DocType: BOM Operation,Operation Time,Операция на времето
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Още
 DocType: Pricing Rule,Sales Manager,Мениджър Продажби
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувам
 DocType: Journal Entry,Write Off Amount,Отпишат Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Огъване
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Позволи на потребителя
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Purchase Invoice,Quarterly,Тримесечно
 DocType: Selling Settings,Delivery Note Required,Бележка за доставка Задължително
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Моля, въведете данните т"
 DocType: Purchase Receipt,Other Details,Други детайли
 DocType: Account,Accounts,Профили
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прав срязване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,За да проследите позиция в продажбите и закупуване на документи въз основа на техните серийни номера. Това е също може да се използва за проследяване на информацията за гаранцията на продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отхвърлени Warehouse е задължително срещу regected т
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 DocType: Employee,Provide email id registered in company,Осигуряване на имейл ID регистриран в компания
 DocType: Hub Settings,Seller City,Продавач City
 DocType: Email Digest,Next email will be sent on:,Следваща ще бъде изпратен имейл на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта Писмо Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Точка има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Точка има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерен
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Количество и Warehouse
 DocType: Sales Invoice,Commission Rate (%),Курсове на Комисията (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Срещу Ваучер тип трябва да е един от продажби Поръчка, продажба на фактура или вестник Влизане"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Не може да се намери на валутния курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Космически
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добре дошъл
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Космически
 DocType: Journal Entry,Credit Card Entry,Credit Card Влизане
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Относно
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Получените стоки от доставчици.
-DocType: Communication,Open,Отворено
 DocType: Lead,Campaign Name,Име на кампанията
 ,Reserved,Резервирано
 DocType: Purchase Order,Supply Raw Materials,Доставка суровини
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} не е в наличност
 DocType: Mode of Payment Account,Default Account,Default Account
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
-DocType: Contact Us Settings,Address Title,Адрес Заглавие
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Production Order Operation,Planned End Time,Планирания край на времето
 ,Sales Person Target Variance Item Group-Wise,Продажбите Person Target Вариацията т Group-Wise
-DocType: Dropbox Backup,Daily,Ежедневно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
 DocType: Delivery Note,Customer's Purchase Order No,Клиента поръчка Не
 DocType: Employee,Cell Number,Броя на клетките
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Материал Исканията Генерирани
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергия
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечно извлечение заплата.
 DocType: Item Group,Website Specifications,Сайт Спецификации
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: От {0} от вид {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed. 
-DocType: ToDo,High,Високо
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
 DocType: Opportunity,Maintenance,Поддръжка
-DocType: User,Male,Мъжки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибута Value
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Продажби кампании.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Персонален
 DocType: Expense Claim Detail,Expense Claim Type,Expense претенция Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройките по подразбиране за количката
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Вестник Влизане {0} е свързан срещу Заповед {1}, проверете дали това трябва да се изтегли като предварително по тази фактура."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnology
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Вестник Влизане {0} е свързан срещу Заповед {1}, проверете дали това трябва да се изтегли като предварително по тази фактура."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office Поддръжка Разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хеминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Account,Liability,Отговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Process Payroll,Send Email,Изпрати е-мейл
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,Default Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обнови Наличност"" не може да е маркирана, защото артикулите, не са доставени чрез {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,"Банково извлечение, Подробности"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моят Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Моят Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Няма намерен служител
 DocType: Purchase Order,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",За да се даде възможност на &quot;точка на продажба&quot; функции
 DocType: Bin,Moving Average Rate,Moving Average Курсове
 DocType: Production Planning Tool,Select Items,Изберете артикули
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
-DocType: Comment,Reference Name,Референтен номер Име
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
 DocType: Maintenance Visit,Completion Status,Завършване Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Очаквана дата на доставка не може да бъде преди Продажби Поръчка Дата
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
-DocType: Process Payroll,Activity Log,Activity Log 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всички стокови групи
+DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
 DocType: Production Order,Item To Manufacture,Точка за производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянен леярска форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статут е {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Поръчка за покупка на плащане
 DocType: Sales Order Item,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
 DocType: Newsletter,Newsletter Manager,Newsletter мениджъра
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Начален балнс"""
 DocType: Notification Control,Delivery Note Message,Бележка за доставка на ЛС
 DocType: Expense Claim,Expenses,Разходи
 DocType: Item Variant Attribute,Item Variant Attribute,Позиция Variant Умение
 ,Purchase Receipt Trends,Покупка Квитанция Trends
 DocType: Appraisal,Select template from which you want to get the Goals,"Изберете шаблон, от който искате да получите най-Целите"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Research &amp; развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research &amp; развитие
 ,Amount to Bill,Сума за Bill
 DocType: Company,Registration Details,Регистрация Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Залагане
 DocType: Item,Re-Order Qty,Re-Поръчка Количество
 DocType: Leave Block List Date,Leave Block List Date,Оставете Block List Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планирана да изпрати на {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Фондова Детайли
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проект Стойност
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Точка на продажба
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да се пренесе {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit' "
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 DocType: Account,Balance must be,Баланс трябва да бъде
 DocType: Hub Settings,Publish Pricing,Публикуване на ценообразуване
 DocType: Notification Control,Expense Claim Rejected Message,Expense искането се отхвърля Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Превъзходен
 ,Available Qty,В наличност Количество
 DocType: Purchase Taxes and Charges,On Previous Row Total,На предишния ред Total
 DocType: Salary Slip,Working Days,Работни дни
 DocType: Serial No,Incoming Rate,Постъпили Курсове
 DocType: Packing Slip,Gross Weight,Брутно Тегло
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включи празници общо на не. на работните дни
 DocType: Job Applicant,Hold,Държа
 DocType: Employee,Date of Joining,Дата на Присъединяване
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Вижте Абонати
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които се таксуват"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrasive blasting
 DocType: Employee,Ms,Госпожица
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на валутния курс майстор.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} трябва да бъде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} трябва да бъде активен
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди анулира тази поддръжка посещение
 DocType: Salary Slip,Leave Encashment Amount,Оставете Инкасо Сума
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Пореден № {0} не принадлежи на т {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Необходим Количество
 DocType: Bank Reconciliation,Total Amount,Обща Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Производствени поръчки
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Балансова стойност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажби Ценоразпис
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Публикуване, за да синхронизирате елементи"
-DocType: GL Entry,Account Currency,Сметка на валути
+DocType: Bank Reconciliation,Account Currency,Сметка на валути
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Моля, посочете закръглят Account в Company"
 DocType: Purchase Receipt,Range,Диапазон
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Features Setup,Item Barcode,Позиция Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Address,Shop,Магазин
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Cash сметка ще се актуализира автоматично в POS Invoice, когато е избран този режим."
 DocType: Employee,Permanent Address Is,Постоянен адрес е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция попълва за колко готова продукция?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марката
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Марката
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Помощи за свръх {0} прекоси за позиция {1}.
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Поръчка за покупка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Непряко подоходно
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Определете сумата на плащането = непогасения размер
-DocType: Contact Us Settings,Address Line 1,Адрес Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Вариране
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име На Фирмата
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Вариране
+,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Изберете точката за прехвърляне
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Вижте списък на всички помощни видеоклипове
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Позволи на потребителя да редактира Ценоразпис Курсове по сделки
 DocType: Pricing Rule,Max Qty,Max Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химически
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химически
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Payroll година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Отидете на подходящата група (обикновено Прилагане на фондове&gt; Текущи активи&gt; Банкови сметки и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Ток Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте Employee напомняне за рождени дни
-DocType: Comment,Unsubscribed,Отписахте
 DocType: Opportunity,Walk In,Влизам
 DocType: Item,Inspection Criteria,Критериите за инспекция
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дърво на finanial разходни центрове.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Прехвърлят
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бял
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепете вашата снимка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правя
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепете вашата снимка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Правя
 DocType: Journal Entry,Total Amount in Words,Обща сума в Думи
-DocType: Workflow State,Stop,Спри
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Моята количка
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Поръчка тип трябва да е един от {0}
 DocType: Lead,Next Contact Date,Следваща Свържи Дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Откриване Количество
 DocType: Holiday List,Holiday List Name,Holiday Списък име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Сток Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Сток Options
 DocType: Journal Entry Account,Expense Claim,Expense претенция
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количество за {0}
 DocType: Leave Application,Leave Application,Оставете Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставете Tool Разпределение
 DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако Месечен Бюджет Превишена (за сметка сметка)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Подстригване
 DocType: Workstation,Net Hour Rate,Net Hour Курсове
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Кацнал на разхода за закупуване Разписка
 DocType: Company,Default Terms,По подразбиране Условия
 DocType: Packing Slip Item,Packing Slip Item,"Приемо-предавателен протокол, т"
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да бъде отрицателна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Регистриране
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Отстъпка
 DocType: Features Setup,Purchase Discounts,Изкупните Отстъпки
 DocType: Workstation,Wages,Заплати
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте &quot;Състояние&quot; и спести
 DocType: Serial No,Creation Document No,Създаване документ №
 DocType: Issue,Issue,Проблем
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Сметка не съвпада с фирма
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Пореден № {0} е по силата на договор за техническо обслужване до запълването {1}
 DocType: BOM Operation,Operation,Операция
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Доставка членка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Т трябва да се добавят с помощта на &quot;получават от покупка Приходи&quot; бутона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажби Разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Изкупуването
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Изкупуването
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажбите Поръчка {0} е {1}
 DocType: Opportunity,Contact Info,Информация За Контакт
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Осъществяване на склад влизания
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Осъществяване на склад влизания
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
 DocType: Item,Default Supplier,Default доставчик
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над Производство Allowance Процент
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,актуализиран чрез Час Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
 DocType: Opportunity,Your sales person who will contact the customer in future,"Продажбите си човек, който ще се свърже с клиента в бъдеще"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Списък някои от вашите доставчици. Те могат да бъдат организации или лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Списък някои от вашите доставчици. Те могат да бъдат организации или лица.
 DocType: Company,Default Currency,Default валути
 DocType: Contact,Enter designation of this Contact,Въведете наименование за този контакт
-DocType: Contact Us Settings,Address,Адрес
 DocType: Expense Claim,From Employee,От Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да се покажат некоректно, тъй като сума за позиция {0} в {1} е нула"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Внимание: Системата няма да се покажат некоректно, тъй като сума за позиция {0} в {1} е нула"
 DocType: Journal Entry,Make Difference Entry,Направи Разлика Влизане
 DocType: Upload Attendance,Attendance From Date,Присъствие От дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключова област на ефективността
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
 DocType: Email Digest,Annual Expense,Годишен Expense
 DocType: SMS Center,Total Characters,Общо Герои
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Подробности C-Form Invoice
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Заплащане помирение Invoice
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Принос%
 DocType: Item,website page link,Сайт Страница връзка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Нека да се подготви системата за първа употреба.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Регистрационен номер на дружеството, за ваше сведение. Данъчни номера и т.н."
 DocType: Sales Partner,Distributor,Разпределител
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка Доставка Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
 ,Ordered Items To Be Billed,"Поръчаните артикули, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,От Range трябва да бъде по-малко от гамата
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Час Logs и подадем да създадете нов фактурата за продажба.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Няма за какво да поиска
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде по-голяма от ""Актуалната Крайна дата"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Управление
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Видове дейности за времето Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Леене на инвестициите
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Или сума дебитна или кредитна се изисква за {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Син
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Син
 DocType: Purchase Invoice,Is Return,Дали Return
 DocType: Price List Country,Price List Country,Ценоразпис Country
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Допълнителни възли могат да се създават само при тип възли &quot;група&quot;
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Профил {0} вече създаден за потребителя: {1} и компания {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Мерна единица реализациите Factor
 DocType: Stock Settings,Default Item Group,По подразбиране Елемент Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламиниран производствения обект
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Доставчик на база данни.
 DocType: Account,Balance Sheet,Баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch формиране
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Вашият търговец ще получите напомняне на тази дата, за да се свърже с клиента"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Данъчни и други облекчения за заплати.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Задължения
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Фактурата за покупка, т"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Леджър Вписванията и GL Записите са изказани за избраните покупка Приходите
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Позиция 1
 DocType: Holiday,Holiday,Празник
-DocType: Event,Saturday,Събота
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставете празно, ако считат за всички отрасли"
 ,Daily Time Log Summary,Daily Time Log Резюме
-DocType: DocField,Label,Етикет
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неизравнени данни за плащане
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
 DocType: Lead,Call,Повикване
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Създаване Служители
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Моля изберете префикс първа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Проучване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Проучване
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Contact,User ID,User ID
-DocType: Communication,Sent,Изпратено
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Виж Ledger
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
-DocType: Communication,Delivery Status,Delivery Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 DocType: Production Order,Manufacture against Sales Order,Производство срещу Продажби Поръчка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Останалата част от света
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
 ,Budget Variance Report,Бюджет Вариацията Доклад
 DocType: Salary Slip,Gross Pay,Брутно възнаграждение
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Елемент Описание
 DocType: Payment Tool,Payment Mode,Режимът на плащане
 DocType: Purchase Invoice,Is Recurring,Дали повтарящо
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direct метал лазерно синтероване
 DocType: Purchase Order,Supplied Items,Аксесоарита
 DocType: Production Order,Qty To Manufacture,Количество за производство
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Поддържане на същия процент в цялата покупка цикъл
 DocType: Opportunity Item,Opportunity Item,Елемент възможност
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Временно Откриване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Служител Оставете Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
 DocType: Address,Address Type,Вид Адрес
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажбите Поръчка {0} не е валидна
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Малък
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Малък
 DocType: Employee,Employee Number,Брой на служителите
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Дело Номер (а) вече са в употреба. Опитайте от Case Не {0}
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (Изключителен Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Позиция 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Главна Сметка {0} е създадена
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелен
 DocType: Item,Auto re-order,Авто повторна поръчка
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Общо Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Общо Постигнати
 DocType: Employee,Place of Issue,Място на издаване
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
-DocType: Report,Disabled,За хора с увреждания
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
+DocType: Email Digest,Add Quote,Добави цитат
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земеделие
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Вашите продукти или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
 DocType: Journal Entry Account,Purchase Order,Поръчка
 DocType: Warehouse,Warehouse Contact Info,Склад Информация за контакт
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Необходимо е име
 DocType: Purchase Invoice,Recurring Type,Повтарящо Type
 DocType: Address,City/Town,City / Town
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} трябва да бъде подизпълнители Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капиталови УРЕДИ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Гол
 DocType: Sales Invoice Item,Edit Description,Edit Описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очаквана дата на доставка е по-малка от планираното Начална дата.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Общо Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Не може да има само една доставка Правило Състояние с 0 или празно стойност за &quot;да цени&quot;
 DocType: Authorization Rule,Transaction,Транзакция
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Забележка: Тази Cost Center е група. Не може да се направи счетоводни записи срещу групи.
-apps/frappe/frappe/config/desk.py +7,Tools,Инструменти
 DocType: Item,Website Item Groups,Website стокови групи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производство пореден номер е задължително за производство влизане фондова цел
 DocType: Purchase Invoice,Total (Company Currency),Общо (Company валути)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Вестник Влизане
 DocType: Workstation,Workstation Name,Workstation Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},"Курсове на оценка, необходима за т {0}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},"Курсове на оценка, необходима за т {0}"
 DocType: Quality Inspection Reading,Reading 8,Четене 8
 DocType: Sales Partner,Agent,Агент
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да трябва да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Данъци и такси Изчисление
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Железария
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Железария
 DocType: Attendance,HR Manager,HR мениджъра
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Моля изберете Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Трябва да се даде възможност на количката
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Няма Данни
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка Template Goal
 DocType: Salary Slip,Earning,Приходи
 DocType: Payment Tool,Party Account Currency,Party Account валути
@@ -1151,28 +1064,25 @@
 DocType: Purchase Taxes and Charges,Add or Deduct,Добави или Приспадни
 DocType: Company,If Yearly Budget Exceeded (for expense account),Ако годишен бюджет Превишена (за сметка сметка)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Припокриване условия намерени между:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher 
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Обща стойност на поръчката
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Застаряването на населението Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Можете да направите дневник време само срещу представена производствена поръчка
 DocType: Maintenance Schedule Item,No of Visits,Не на Посещения
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюлетини за контакти, води."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операциите не може да бъде оставено празно.
 ,Delivered Items To Be Billed,"Доставени изделия, които се таксуват"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse не може да се променя за Serial No.
-DocType: DocField,Description,Описание
 DocType: Authorization Rule,Average Discount,Средна отстъпка
-DocType: Letter Head,Is Default,Дали Default
 DocType: Address,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Счетоводство
 DocType: Features Setup,Features Setup,Удобства Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Вижте предложението Letter
-DocType: Communication,Communication,Общуване
 DocType: Item,Is Service Item,Дали Service Точка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Моля изберете фискална година
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},От {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Поддържайте Фондова
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставете празно, ако считат за всички наименования"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,От за дата
 DocType: Email Digest,For Company,За Company
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Условия Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1210,35 +1120,32 @@
 DocType: Employee,Better Prospects,По-добри перспективи
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гаранция / AMC Status
-,Accounts Browser, Accounts Browser 
+,Accounts Browser,Accounts Browser
 DocType: GL Entry,GL Entry,GL Влизане
 DocType: HR Settings,Employee Settings,Настройки на наети
 ,Batch-Wise Balance History,Партиди Balance История
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,За да се направи списък
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицателна величина не е позволено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Отрицателна величина не е позволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Данъчна подробно маса, извлечен от т майстор като низ и се съхранява в тази област. Използва се за данъци и такси"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводство Entry за {0}: {1} може да се направи само в валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводство Entry за {0}: {1} може да се направи само в валута: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Няма активен Структура Заплата намерено за служител {0} и месеца
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на Job, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Данъчна Правило за сделки.
 DocType: Rename Tool,Type of document to rename.,Вид на документа за преименуване.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ние купуваме този артикул
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Ние купуваме този артикул
 DocType: Address,Billing,Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Фланец
-DocType: Bulk Email,Not Sent,Не е изпратено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosive формиране
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Общо данъци и такси (фирма валута)
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планирана да изпрати на {0} получатели
 DocType: Quality Inspection,Readings,Четения
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Възложени Изпълнения
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Възложени Изпълнения
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Supplier,Stock Manager,Склад за мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Внос Неуспех!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Не адрес добавя още.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation работен час
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на JV количество {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",За да се даде възможност на &quot;точка на продажба&quot; изглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плащането не може да се направи за празна количката
 DocType: Item,Sales Details,Продажби Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикова
 DocType: Opportunity,With Items,С артикули
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Количество
 DocType: Notification Control,Expense Claim Rejected,Expense искането се отхвърля
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
 DocType: Item Attribute,Item Attribute,Позиция атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правителство
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Елемент Варианти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правителство
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Общо ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Общо ({0})
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
 DocType: Sales Invoice,Source,Източник
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не са намерени в таблицата за плащане записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансова година Начална дата
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не са намерени в таблицата за плащане записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансова година Начална дата
 DocType: Employee External Work History,Total Experience,Общо Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкероване
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Material Request Item,Sales Order No,Продажбите Заповед №
 DocType: Item Group,Item Group Name,Име на артикул Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взети
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взети
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Прехвърляне Материали за Производство
 DocType: Pricing Rule,For Price List,За Ценовата листа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Ставка за покупка за покупка: {0} не е намерен, която се изисква, за да резервират счетоводство (разходи). Моля, посочете т цена срещу купуването ценоразпис."
 DocType: Maintenance Schedule,Schedules,Списъци
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Подробности Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Допълнителна отстъпка сума (във Валута на Фирмата)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Моля да създадете нов акаунт от сметкоплан.
 DocType: Maintenance Visit,Maintenance Visit,Поддръжка посещение
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Customer Group&gt; Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Свободно Batch Количество в склада
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Log Batch Подробности
-DocType: Workflow State,Tasks,Задачи
 DocType: Landed Cost Voucher,Landed Cost Help,Поземлен Cost Помощ
-DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Holidays по важни дни.
 ,Accounts Receivable Summary,Вземания Резюме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Листата за вид {0} вече разпределена за Employee {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
 DocType: UOM,UOM Name,Мерна единица Име
-DocType: Top Bar Item,Target,Мишена
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Принос Сума
 DocType: Sales Invoice,Shipping Address,Адрес За Доставка
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Този инструмент ви помага да се актуализира, или да определи количеството и остойностяването на склад в системата. Той обикновено се използва за синхронизиране на ценностите на системата и какво всъщност съществува във вашите складове."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,По думите ще бъде видим след като запазите бележката за доставката.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand майстор.
-DocType: ToDo,Due Date,Поради Дата
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand майстор.
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Transporter Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Кутия
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организацията
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Кутия
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организацията
 DocType: Monthly Distribution,Monthly Distribution,Месечен Разпределение
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Списък Receiver е празна. Моля, създайте Списък Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство планира продажбите Поръчка
 DocType: Sales Partner,Sales Partner Target,Продажбите Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Счетоводство Entry за {0} може да се направи само в валута: {1}
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Назъбване
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкови сметки
 ,Bank Reconciliation Statement,Bank помирение резюме
 DocType: Address,Lead Name,Водещ име
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Откриване фондова Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Откриване фондова Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} трябва да се появи само веднъж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е позволено да прехвърляйте повече {0} от {1} срещу Поръчката {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листата Разпределен успешно в продължение на {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Няма елементи, да се опаковат"
 DocType: Shipping Rule Condition,From Value,От Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Количество е задължително
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не постъпят по банковата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суми не постъпят по банковата
 DocType: Quality Inspection Reading,Reading 4,Четене 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Искове за сметка на фирмата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центробежно леене
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнитно поле с помощта на довършителни
 DocType: Company,Default Holiday List,По подразбиране Holiday Списък
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Сток Задължения
 DocType: Purchase Receipt,Supplier Warehouse,Доставчик Warehouse
 DocType: Opportunity,Contact Mobile No,Свържи Mobile Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продажби Поръчки
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са празници. Не е нужно да кандидатствате за отпуск."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,За да проследите предмети с помощта на баркод. Вие ще бъдете в състояние да влезе елементи в Бележка за доставка и фактурата за продажба чрез сканиране на баркод на артикул.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Маркирай като Доставени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Маркирай като Доставени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи оферта
 DocType: Dependent Task,Dependent Task,Зависим Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 DocType: SMS Center,Receiver List,Списък Receiver
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Изглед
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура Заплата Приспадане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно лазерно синтероване
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Внос Успешно!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за Издадена артикули
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Възраст (дни)
 DocType: Quotation Item,Quotation Item,Цитат Позиция
 DocType: Account,Account Name,Име на Сметка
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото към днешна дата"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"От дата не може да бъде по-голяма, отколкото към днешна дата"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Пореден № {0} количество {1} не може да бъде една малка част
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Доставчик Type майстор.
 DocType: Purchase Order Item,Supplier Part Number,Доставчик Номер
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Добави
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Обменен курс не може да бъде 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е отменен или спрян
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Камион Dispatch Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Покупка Квитанция {0} не е подадена
 DocType: Company,Default Payable Account,Default Платим Акаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки за онлайн пазарска количка като правилата за корабоплаване, Ценоразпис т.н."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Начислен
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Количество
 DocType: Party Account,Party Account,Party Акаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Човешки Ресурси
 DocType: Lead,Upper Income,Upper подоходно
 DocType: Journal Entry Account,Debit in Company Currency,Debit в Company валути
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моите въпроси
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Стойности по подразбиране
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Сума за плащане не може да бъде отрицателна
 DocType: Expense Claim,Total Amount Reimbursed,Общия размер на възстановените
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Натиснете монтаж
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Default Ценоразпис
 DocType: Payment Reconciliation,Payments,Плащания
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Горещо изостатично пресоване
-DocType: ToDo,Medium,Среда
 DocType: Budget Detail,Budget Allocated,"Бюджетът, отпуснат"
 DocType: Journal Entry,Entry Type,Влизане Type
 ,Customer Credit Balance,Customer кредитно салдо
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
 DocType: Quotation,Term Details,Срочни Детайли
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планиране на капацитет за (дни)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
 DocType: Warranty Claim,Warranty Claim,Гаранционен иск
 ,Lead Details,Олово Детайли
-DocType: Authorization Rule,Approving User,Одобряване на потребителя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Коване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлатяване
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
 DocType: Pricing Rule,Applicable For,ТАКИВА
 DocType: Bank Reconciliation,From Date,От Дата
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платената сума (Company валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продаваме Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлайн Търгове
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлайн Търгове
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Моля, посочете или Количество или остойностяване цена, или и двете"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Фирма, Месец и фискална година е задължително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материал Заявка използва за направата на този запас Влизане
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Единична единица на дадена позиция.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Време Log Партида {0} трябва да бъде &quot;Изпратен&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направи счетоводен запис за всеки склад Movement
 DocType: Leave Allocation,Total Leaves Allocated,Общо Leaves Отпуснати
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse изисква най Row Не {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Моля, въведете валиден Финансова година Начални и крайни дати"
 DocType: Employee,Date Of Retirement,Дата на пенсиониране
 DocType: Upload Attendance,Get Template,Вземи Template
 DocType: Address,Postal,Пощенски
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Минен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Леене смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Група Клиенти съществува със същото име моля, променете името на Клиента или преименувайте Група Клиенти"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Моля изберете {0} на първо място.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
 DocType: Stock Entry,Material Receipt,Материал Разписка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукти
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Продукти
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Тип и страна се изисква за получаване / плащане сметка {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако този елемент има варианти, то не може да бъде избран в поръчки за продажба и т.н."
 DocType: Lead,Next Contact By,Следваща Контакт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} не може да се заличи, тъй като съществува количество за т {1}"
 DocType: Quotation,Order Type,Поръчка Type
 DocType: Purchase Invoice,Notification Email Address,Уведомление имейл адрес
 DocType: Payment Tool,Find Invoices to Match,Намерете Фактури несравними
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",например &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",например &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Това ли е данък, включен в основната ставка?"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Общо Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Общо Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Количка е активиран
 DocType: Job Applicant,Applicant for a Job,Заявител на Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Не производствени поръчки, създадени"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Заплата поднасяне на служител {0} вече създаден за този месец
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Заплата поднасяне на служител {0} вече създаден за този месец
 DocType: Stock Reconciliation,Reconciliation JSON,Равнение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 DocType: Sales Invoice Item,Batch No,Партиден №
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Основен
-DocType: DocPerm,Delete,Изтривам
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Спряно за да не могат да бъдат отменени. Отпуши, за да отмените."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
 DocType: Sales Team,Contribution to Net Total,Принос към Net Общо
 DocType: Sales Invoice Item,Customer's Item Code,Клиента Код
 DocType: Stock Reconciliation,Stock Reconciliation,Склад за помирение
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Заявител на Йов.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
-DocType: Country,Country,Страна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-DocType: Communication,Received,Приет
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry 
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дублиране Пореден № влезе за позиция {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условие за Правило за Доставка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Артикул не е позволено да има производствена поръчка.
-DocType: DocField,Attach Image,Прикрепете Изображение
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нетното тегло на този пакет. (Изчислява автоматично като сума от нетно тегло статии)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Оставете празно, ако няма промяна"
-DocType: Sales Order,To Deliver and Bill,Да се доставят и Bill
+DocType: Sales Order,To Deliver and Bill,Да се доставят и Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Сума в Account валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Час Logs за производство.
 DocType: Item,Apply Warehouse-wise Reorder Level,Нанесете Warehouse-мъдър Пренареждане Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} трябва да бъде представено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Вход за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Плащане
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плащане
 DocType: Production Order Operation,Actual Time and Cost,Действителното време и разходи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Искане на максимална {0} може да се направи за позиция {1} срещу Продажби Поръчка {2}
 DocType: Employee,Salutation,Поздрав
-DocType: Communication,Rejected,Отхвърлени
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
 DocType: Sales Order Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
 DocType: Quality Inspection Reading,Reading 10,Четене 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Списък на вашите продукти или услуги, които купуват или продават. Уверете се, че за да се провери стокова група, мерна единица и други свойства, когато започнете."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Списък на вашите продукти или услуги, които купуват или продават. Уверете се, че за да се провери стокова група, мерна единица и други свойства, когато започнете."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Въвели сте дублиращи се елементи. Моля, поправи и опитайте отново."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,"Value {0} за Умение {1}, не съществува в списъка с валиден т Умение Ценности"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Сътрудник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е сериализирани Точка
 DocType: SMS Center,Create Receiver List,Създайте Списък Receiver
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Изтекъл
 DocType: Packing Slip,To Package No.,С пакета No.
-DocType: DocType,System,Система
 DocType: Warranty Claim,Issue Date,Дата На Издаване
 DocType: Activity Cost,Activity Cost,Разходи за дейността
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Консумирана Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 DocType: Payment Tool,Make Payment Entry,Извършване на плащане Влизане
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
 ,Sales Invoice Trends,Тенденциите в продажбите на Фактура
 DocType: Leave Application,Apply / Approve Leaves,Нанесете / Одобряване Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,За
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се отнася ред само ако типът такса е &quot;На предишния ред Сума&quot; или &quot;Предишна Row Общо&quot;
 DocType: Sales Order Item,Delivery Warehouse,Доставка Warehouse
 DocType: Stock Settings,Allowance Percent,Помощи Percent
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажба трябва да се провери, ако има такива се избира като {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Доставчик оферта Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Направи структурата на заплатите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Срязване
 DocType: Item,Has Variants,Има варианти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Щракнете върху бутона &quot;Направи фактурата за продажба&quot;, за да създадете нов фактурата за продажба."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Опаковка и етикетиране
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Моля, посочете Default валути в Company магистър и глобални Defaults"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Повтарящо Invoice
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управление на Проекти
 DocType: Supplier,Supplier of Goods or Services.,Доставчик на стоки или услуги.
 DocType: Budget Detail,Fiscal Year,Фискална Година
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнато
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнато
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територия / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,например 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По думите ще бъде видим след като спаси фактурата за продажба.
 DocType: Item,Is Sales Item,Е-продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Позиция Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Точка {0} не е настройка за серийни номера. Проверете опция майстор
 DocType: Maintenance Visit,Maintenance Time,Поддръжка на времето
 ,Amount to Deliver,Сума за Избави
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или Услуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Почукване
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Продукт или Услуга
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} е създадена
 DocType: Delivery Note Item,Against Sales Order,Срещу поръчка за продажба
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
 DocType: Website Item Group,Website Item Group,Website т Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита и такси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Моля, въведете Референтна дата"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Моля, въведете Референтна дата"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}  записи на плажания не може да се филтрира по  {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица за елемент, който ще бъде показан в Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Приложен Количество
 DocType: Material Request Item,Material Request Item,Материал Заявка Точка
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дърво на стокови групи.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Дърво на стокови групи.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 ,Item-wise Purchase History,Точка-мъдър История на покупките
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Червен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзнал
 ,Open Production Orders,Отворените нареждания за производство
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Операция {1} не е завършен за {2} Количество на готовата продукция в производствена поръчка # {3}. Моля Статусът на работа чрез Час Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Променете мерна единица за един артикул.
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерии За Приемане
 DocType: Item Attribute,Attribute Name,Име на атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},"Точка {0} трябва да е продажба или услуга, елемент от {1}"
 DocType: Item Group,Show In Website,Покажи В Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Група
 DocType: Task,Expected Time (in hours),Очаквано време (в часове)
 ,Qty to Order,Количество да поръчам
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","За да проследите марка в следните документи Бележка за доставка, възможност Материал Искането, т, Поръчката, Покупка ваучер Purchaser разписка, цитата, продажба на фактура, Каталог Bundle, продажба Поръчка, сериен номер"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Clear Таблица
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Фактура Не
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От поръчка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,От поръчка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Остави, не може да се прилага / отмени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
 DocType: Activity Cost,Costing Rate,Остойностяване Курсове
 ,Customer Addresses And Contacts,Адреси на клиенти и контакти
 DocType: Employee,Resignation Letter Date,Оставка Letter Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е зададен
-DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Стойте там, докато вашата система е настройка. Това може да отнеме няколко минути."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Двойка
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Двойка
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
 DocType: Maintenance Schedule Detail,Actual Date,Действителна дата
 DocType: Item,Has Batch No,Разполага с партиден №
 DocType: Delivery Note,Excise Page Number,Акцизите Page Number
 DocType: Employee,Personal Details,Лични Данни
 ,Maintenance Schedules,Графици за поддръжка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Щампа
 ,Quotation Trends,Цитати Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е вземане под внимание
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Като производствена поръчка може да се направи за тази позиция, той трябва да бъде елемент от склад."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Свързване
-DocType: Authorization Rule,Above Value,Над Стойност
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Превръщане Factor
 DocType: Purchase Order,Delivered,Доставени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup входящия сървър за работни места имейл ID. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Номер на возилото
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите фактура ще се спре"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Общо отпуснати листа {0} не могат да бъдат по-малки от вече одобрените листа {1} за периода
 DocType: Journal Entry,Accounts Receivable,Вземания
 ,Supplier-Wise Sales Analytics,Доставчик мъдър анализ на продажбите
 DocType: Address Template,This format is used if country specific format is not found,"Този формат се използва, ако не се намери специфичен формат за държавата"
-DocType: Custom Field,Custom,Обичай
 DocType: Production Order,Use Multi-Level BOM,Използвайте Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Шприцване
 DocType: Bank Reconciliation,Include Reconciled Entries,Включи примирени влизания
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дърво на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставете празно, ако считат за всички видове наети лица"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели такси на базата на
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} трябва да е от тип ""Дълготраен Актив"" като елемент {1} е Актив,"
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
-apps/frappe/frappe/config/setup.py +130,Printing,Печатане
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са почивка. Не е нужно да подава молба за отпуск."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортен
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общо Край
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Моля, задайте Dropbox клавишите за достъп в сайта си довереник"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Моля, посочете Company"
 ,Customer Acquisition and Loyalty,Customer Acquisition и лоялност
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, в която сте се поддържа запас от отхвърлените елементи"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Вашият финансовата година приключва на
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Вашият финансовата година приключва на
 DocType: POS Profile,Price List,Ценова Листа
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Разходните Вземания
 DocType: Issue,Support,Подкрепа
-DocType: Authorization Rule,Approving Role,Приемане Role
 ,BOM Search,BOM Търсене
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриване (откриване + Общо)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Моля, посочете валута през Company"
 DocType: Workstation,Wages per hour,Заплатите на час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Покажи / скрий функции, като серийни номера, POS и т.н."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},"Account {0} е невалиден. Сметка на валути, трябва да {1}"
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},"Account {0} е невалиден. Сметка на валути, трябва да {1}"
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор мерна единица реализациите се изисква в ред {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата Клирънсът не може да бъде преди датата проверка в ред {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата Клирънсът не може да бъде преди датата проверка в ред {0}
 DocType: Salary Slip,Deduction,Дедукция
 DocType: Address Template,Address Template,Адрес Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 DocType: Quotation,Maintenance User,Поддържане на потребителя
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Разходите Обновено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Разходите Обновено
 DocType: Employee,Date of Birth,Дата на раждане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} вече е върнал
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискална година ** представлява финансова година. Всички счетоводни записвания и други големи сделки се проследяват срещу ** Фискална година **.
 DocType: Opportunity,Customer / Lead Address,Клиент / Lead Адрес
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описание На Работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описание На Работа
 DocType: Purchase Order Item,Qty as per Stock UOM,Количество по Фондова мерна единица
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Моля, изберете валиден CSV файл с данни"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Слой
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете Продажби кампании. Следете Leads, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
 DocType: Expense Claim,Approver,Одобряващ
 ,SO Qty,SO Количество
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Стоковите постъпления съществуват срещу складови {0}, затова не можете да ре-зададете или модифицирате Warehouse"
 DocType: Appraisal,Calculate Total Score,Изчислете Общ резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство на мениджъра
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Пореден № {0} е в гаранция до запълването {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Превозите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip корнизи
-DocType: Purchase Order,To be delivered to customer,За да бъде доставен на клиент
+apps/erpnext/erpnext/hooks.py +68,Shipments,Превозите
+DocType: Purchase Order Item,To be delivered to customer,За да бъде доставен на клиент
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Log Status трябва да бъдат изпратени.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройване
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),По думите (Company валути)
 DocType: Pricing Rule,Supplier,Доставчик
 DocType: C-Form,Quarter,Тримесечие
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Други разходи
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
 DocType: Employee,Bank Name,Име на банката
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-По-горе
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Потребителят {0} е деактивиран
 DocType: Leave Application,Total Leave Days,Общо Оставете Days
-DocType: Journal Entry Account,Credit in Account Currency,Credit в профила на валути
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забележка: Email няма да бъдат изпратени на ползвателите с увреждания
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изберете Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако считат за всички ведомства"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} е задължително за {1}
 DocType: Currency Exchange,From Currency,От Валута
-DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Сумите, които не е отразено в системата"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажбите на поръчката изисква за т {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Сумите, които не е отразено в системата"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Други
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Други
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не можете да намерите съвпадение на т. Моля изберете някоя друга стойност за {0}.
 DocType: POS Profile,Taxes and Charges,Данъци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или Услуга, която се купува, продава, или се съхраняват на склад."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завършен
-DocType: Web Form,Select DocType,Изберете DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Грил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банково дело
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банково дело
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Cost Center
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,New Cost Center
 DocType: Bin,Ordered Quantity,Поръчаното количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",например &quot;Билд инструменти за строители&quot;
 DocType: Quality Inspection,In Process,В Процес
 DocType: Authorization Rule,Itemwise Discount,Itemwise Отстъпка
 DocType: Purchase Order Item,Reference Document Type,Референтен Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
 DocType: Account,Fixed Asset,Дълготраен актив
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Сериализирани Инвентаризация
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Сериализирани Инвентаризация
 DocType: Activity Type,Default Billing Rate,Default Billing Курсове
 DocType: Time Log Batch,Total Billing Amount,Общо Billing Сума
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Вземания Акаунт
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажбите Поръчка за плащане
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време Logs създаден:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,В очакване на
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Потребителите, които могат да одобряват заявленията за отпуск специфичен служителя"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Не можете да промените по подразбиране мерна единица на вариант. За да промените по подразбиране мерна единица за Variant промяна подразбиране мерна единица на шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Офис оборудване
 DocType: Purchase Invoice Item,Qty,Количество
 DocType: Fiscal Year,Companies,Фирми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроника
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Повдигнете Материал Заявка когато фондова достигне ниво повторна поръчка
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,От График за поддръжка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Пълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Пълен работен ден
 DocType: Purchase Invoice,Contact Details,Данни за контакт
 DocType: C-Form,Received Date,Дата на получаване
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ако сте създали стандартен формуляр в продажбите данъци и такси Template, изберете един и кликнете върху бутона по-долу."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Откриване на работа
 DocType: Payment Reconciliation,Payment Reconciliation,Заплащане помирение
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Моля изберете име Incharge Лице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технология
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 DocType: Offer Letter,Offer Letter,Оферта Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Генериране Материал Исканията (MRP) и производствени поръчки.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Общо фактурирани Amt
 DocType: Time Log,To Time,На време
+DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","За да добавите деца възли, опознаването на дърво и кликнете върху възела, при които искате да добавите повече възли."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завършен Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценоразпис {0} е деактивиран
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Customer Елемент кодове
 DocType: Opportunity,Lost Reason,Загубил Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Създаване на плащане влизания срещу заповеди или фактури.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваряване
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New фондова мерна единица се изисква
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всички елементи вече са фактурирани
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Моля, посочете валиден &quot;От Case No.&quot;"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
 DocType: Features Setup,Item Serial Nos,Позиция серийни номера
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и разрешения
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Действителното количество
 DocType: Shipping Rule,example: Next Day Shipping,Например: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Пореден № {0} не е намерен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Формоване чрез пресоване
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Вашите клиенти
 DocType: Leave Block List Date,Block Date,Block Дата
 DocType: Sales Order,Not Delivered,Не е представил
 ,Bank Clearance Summary,Bank Клирънсът Резюме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Създаване и управление на дневни, седмични и месечни имейл Фурнаджиев."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Код&gt; Точка Group&gt; Brand
 DocType: Appraisal Goal,Appraisal Goal,Оценка Goal
-DocType: Event,Friday,Петък
 DocType: Time Log,Costing Amount,Остойностяване Сума
 DocType: Process Payroll,Submit Salary Slip,Знаете Заплата Slip
 DocType: Salary Structure,Monthly Earning & Deduction,Месечен Приходи &amp; Приспадане
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Внос в наливно състояние
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
 DocType: SMS Log,Sender Name,Подател Име
-DocType: Page,Title,Заглавие
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Персонализирайте
 DocType: POS Profile,[Select],[Избор]
 DocType: SMS Log,Sent To,Изпратени На
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи фактурата за продажба
 DocType: Company,For Reference Only.,Само за справка.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невалиден {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Авансова сума
 DocType: Manufacturing Settings,Capacity Planning,Планиране на капацитета
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;От дата&quot; се изисква
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;От дата&quot; се изисква
 DocType: Journal Entry,Reference Number,Референтен Номер
 DocType: Employee,Employment Details,Детайли по заетостта
 DocType: Employee,New Workplace,New Workplace
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
 DocType: Item,End of Life,Края на живота
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Пътуване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Пътуване
 DocType: Leave Block List,Allow Users,Позволяват на потребителите
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Не
 DocType: Sales Invoice,Recurring,Повтарящ се
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Актуализация Cost
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да изберете
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
 DocType: Installation Note,Installation Note,Монтаж Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Добави Данъци
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Добави Данъци
 ,Financial Analytics,Финансови Analytics
 DocType: Quality Inspection,Verified By,Проверени от
 DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи сделки. Сделките трябва да бъдат отменени, за да промените валута по подразбиране."
 DocType: Quality Inspection,Purchase Receipt No,Покупка Квитанция Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задатък
-DocType: System Settings,In Hours,В Часа
 DocType: Process Payroll,Create Salary Slip,Създайте Заплата Slip
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Очаквания баланс, като в една банка"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полировъчен
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Очаквания баланс, като в една банка"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Източник на средства (пасиви)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
 DocType: Appraisal,Employee,Employee
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група от Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Sales Invoice,Mass Mailing,Масовото изпращане
-DocType: Page,Standard,Стандарт
 DocType: Rename Tool,File to Rename,Файл за Преименуване
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Покажи Плащания
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График за поддръжка {0} трябва да се отмени преди анулира тази поръчка за продажба
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Лекарствена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Лекарствена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Разходите за закупени артикули
 DocType: Selling Settings,Sales Order Required,Продажбите Поръчка Задължително
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Създаване на клиенти
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Четене 9
 DocType: Supplier,Is Frozen,Е замразен
 DocType: Buying Settings,Buying Settings,Настройки Изкупуването
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass довършителни
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. За завършената Good Точка
 DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup входящия сървър за продажби имейл ID. (Например sales@example.com)
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Tool,Payment Account,Разплащателна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаторни Off
 DocType: Quality Inspection Reading,Accepted,Приет
-DocType: User,Female,Женски
-DocType: Journal Entry Account,Debit in Account Currency,Debit в профила на валути
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
-DocType: Print Settings,Modern,Модерен
-DocType: Communication,Replied,Отговорено
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалиден позоваване {0} {1}
 DocType: Payment Tool,Total Payment Amount,Общо сумата за плащане
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да бъде по-голямо от планирано количество ({2}) в производствена поръчка {3}
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Тъй като има съществуващи сделки борсови за тази позиция, \ не можете да промените стойностите на &#39;има сериен номер &quot;,&quot; Има Batch Не &quot;,&quot; Трябва ли Фондова т &quot;и&quot; Метод на оценка &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick вестник Влизане
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
 DocType: Employee,Previous Work Experience,Предишен трудов опит
 DocType: Stock Entry,For Quantity,За Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Искания за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отделно производство цел ще бъде създаден за всеки завършен добра позиция.
 DocType: Purchase Invoice,Terms and Conditions1,Условия и Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Пълна Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Счетоводен запис, замразени до тази дата, никой не може да направи / промяна на записите с изключение на ролята посочена по-долу."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Вижте това да забраниш фракции. (За NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter мейлинг лист
 DocType: Delivery Note,Transporter Name,Превозвач Име
+DocType: Authorization Rule,Authorized Value,Оторизиран Value
 DocType: Contact,Enter department to which this Contact belongs,"Въведете отдела, в който се свържете с нас принадлежи"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Общо Отсъства
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Мерна единица
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Мерна единица
 DocType: Fiscal Year,Year End Date,Година Крайна дата
 DocType: Task Depends On,Task Depends On,Task зависи от
 DocType: Lead,Opportunity,Opportunity
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (по Фондова мерна единица)
 DocType: SMS Log,No of Requested SMS,Не на запитаната SMS
 DocType: Campaign,Campaign-.####,Кампания -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронизителен
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Трето лице дистрибутор / дилър / комисионер / филиал / търговец, който продава на фирми продукти срещу комисионна."
 DocType: Customer Group,Has Child Node,Има Node Child
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} срещу Поръчка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} срещу Поръчка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Въведете статични параметри на URL тук (Напр. Подател = ERPNext, потребителско име = ERPNext, парола = 1234 и т.н.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не е в никоя активна фискална година. За повече информация провери {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Това е пример за сайт автоматично генерирано от ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Застаряването на населението Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохимичен машинна
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard данък шаблон, който може да се прилага за всички сделки по закупуване. Този шаблон може да съдържа списък на данъчните глави, а също и други разходни глави като &quot;доставка&quot;, &quot;Застраховане&quot;, &quot;Работа&quot; и др #### Забележка Данъчната ставка определяте тук ще бъде стандартната данъчна ставка за всички ** т * *. Ако има ** артикули **, които имат различни цени, те трябва да се добавят в ** т Данъчно ** маса в ** т ** капитана. #### Описание на Колони 1. изчисляване на типа: - Това може да бъде по ** Net Общо ** (която е сума от основна сума). - ** На предишния ред Общо / Сума ** (за кумулативни данъци и такси). Ако изберете тази опция, данъкът ще бъде приложен като процент от предходния ред (в данъчната таблицата) сума, или общо. - ** Жилищна ** (както е посочено). 2. Сметка Head: книга сметката по която този данък ще бъде резервирана 3. Cost Center: Ако данъчната / таксата е доход (като корабоплаването) или разходи тя трябва да бъде резервирана срещу разходен център. 4. Описание: Описание на данъка (който ще бъде отпечатан в фактури / кавичките). 5. Оценка: Данъчна ставка. 6. Размер: Сума на таксата. 7. Общо: натрупаното общо до този момент. 8. Въведете Row: Ако въз основа на &quot;Previous Row Total&quot; можете да изберете номера на реда, които ще бъдат взети като база за изчислението (по подразбиране е предходния ред). 9. Помислете данък или такса за: В този раздел можете да посочите, ако данъчната / таксата е само за остойностяване (не е част от общия брой), или само за общата (не добавя стойност към елемента) или и за двете. 10. Добавяне или Приспада: Независимо дали искате да добавите или приспадане на данъка."
-DocType: Note,Note,Забележка
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
-DocType: Email Account,Email Ids,Email документи за самоличност
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече Точка {0} от продажби Поръчка количество {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
 DocType: Tax Rule,Billing City,Billing City
 DocType: Global Defaults,Hide Currency Symbol,Скриване на валути Symbol
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Кредитно Известие
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Завършен Количество не може да бъде повече от {0} за работа {1}
 DocType: Features Setup,Quality,Качество
-DocType: Contact Us Settings,Introduction,Въведение
 DocType: Warranty Claim,Service Address,Service Адрес
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 реда за наличност помирение.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 реда за наличност помирение.
 DocType: Stock Entry,Manufacture,Производство
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Моля Бележка за доставка първа
 DocType: Purchase Invoice,Currency and Price List,Валута и ценова листа
 DocType: Opportunity,Customer / Lead Name,Клиент / Lead Име
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клирънсът Дата които не са споменати
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Клирънсът Дата които не са споменати
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Оставя производствена поръчка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (Количество)
 DocType: Installation Note Item,Installed Qty,Инсталирана Количество
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Изпратено
 DocType: Salary Structure,Total Earning,Общо Приходи
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моите адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Браншова организация майстор.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,или
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални Разходи
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90 - 
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90 -
 DocType: Buying Settings,Default Buying Price List,Default Изкупуването Ценоразпис
-,Download Backups,Изтегляне на резервни копия
 DocType: Notification Control,Sales Order Message,Продажбите Поръчка Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Вид на плащане
 DocType: Process Payroll,Select Employees,Изберете Служители
 DocType: Bank Reconciliation,To Date,Към Днешна Дата
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детайли
 DocType: Purchase Invoice,Total Taxes and Charges,Общо данъци и такси
 DocType: Employee,Emergency Contact,Контактите При Аварийни Случаи
 DocType: Item,Quality Parameters,Параметри за качество
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Сметка Тип
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Оставете Type {0} не може да се извърши-препрати
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да Произвежда
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За поредна {0} в {1}. За да {2} включат в курс т, редове {3} трябва да се включат и"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Включено Количество
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка Квитанция артикули
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализиране Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Рязане
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплескване
 DocType: Account,Income Account,Дохода
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Формоване
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Current Количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
 DocType: Appraisal Goal,Key Responsibility Area,Key Отговорност Area
 DocType: Item Reorder,Material Request Type,Материал Заявка Type
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Поръчка за покупка на ЛС
 DocType: Tax Rule,Shipping Country,Доставка Country
 DocType: Upload Attendance,Upload HTML,Качи HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Общо предварително ({0}) срещу Заповед {1} не може да бъде по-голям \ от общия сбор ({2})
 DocType: Employee,Relieving Date,Облекчаване Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse може да се променя само чрез фондова Entry / Бележка за доставка / Покупка Разписка
 DocType: Employee Education,Class / Percentage,Клас / Процент
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Данък общ доход
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser инженерство нетна оформяне
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Данък общ доход
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако избран ценообразуване правило се прави за &quot;Цена&quot;, той ще замени ценовата листа. Ценообразуване Правило цена е крайната цена, така че не се колебайте отстъпка трябва да се прилага. Следователно, при сделки, като продажби поръчка за покупка и т.н., то ще бъдат изведени в поле &quot;Оцени&quot;, а не поле &quot;Ценоразпис Курсове&quot;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Изводи от Industry Type.
 DocType: Item Supplier,Item Supplier,Позиция доставчик
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New Cost Center Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,New Cost Center Име
 DocType: Leave Control Panel,Leave Control Panel,Оставете Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес Template."
 DocType: Appraisal,HR User,HR потребителя
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
 ,Pending SO Items For Purchase Request,До SO артикули за покупка Искане
 DocType: Supplier,Billing Currency,Billing валути
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Много Голям
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Много Голям
 ,Profit and Loss Statement,На печалбите и загубите
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Натискане
 DocType: Payment Tool Detail,Payment Tool Detail,Заплащане Tool Подробности
 ,Sales Browser,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Местен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредитите и авансите (активи)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Длъжници
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Голям
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Никой служител е открит!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Голям
 DocType: C-Form Invoice Detail,Territory,Територия
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Purchase Order,Customer Address Display,Customer Адрес Display
 DocType: Stock Settings,Default Valuation Method,Метод на оценка Default
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полиране
 DocType: Production Order Operation,Planned Start Time,Планиран Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Default мерната единица за т {0} не може да се променя директно, защото \ вас вече са направили някаква сделка (и) с друга мерна единица. За да промените по подразбиране мерна единица, \ употреба &quot;мерна единица Сменете Utility&quot; инструмент по Фондова модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Посочете Валутен курс за конвертиране на една валута в друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е отменен
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитат {0} е отменен
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общият размер
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Служител {0} е бил в отпуск по {1}. Не може да се маркира и обслужване.
 DocType: Sales Partner,Targets,Цели
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Направи Time Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Моля, задайте повторна поръчка количество"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компютри
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-химична смилане
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Моля, настройка на вашия сметкоплан, преди да започнете счетоводни записвания"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнориране на ценообразуване Правило
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отменен
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,От дата в структурата на заплатите не може да бъде по-малка от Employee Присъединявайки Дата.
 DocType: Employee Education,Graduate,Завършвам
 DocType: Leave Block List,Block Days,Блок Days
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Проверете дали повтарящи фактура, махнете отметката, за да спре повтарящи се или пуснати правилното Крайна дата"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Позволената максимална {0} редове
 DocType: C-Form Invoice Detail,Net Total,Net Общо
 DocType: Bin,FCFS Rate,FCFS Курсове
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (фактурата за продажба)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Цел
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} по-дълго от всички налични работни часа в работно {1}, съборят операцията в множество операции"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохимична обработка
 ,Requested,Заявени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Без забележки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просрочен
 DocType: Account,Stock Received But Not Billed,Фондова Получени Но Не Обявен
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root профил трябва да бъде група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Брутно възнаграждение + просрочия сума + Инкасо сума - Total Приспадане
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Features Setup,Sales and Purchase,Продажба и покупка
 DocType: Supplier Quotation Item,Material Request No,Материал Заявка Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скоростта, с която на клиента валута се превръща в основна валута на компанията"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} е бил отписан успешно от този списък.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company валути)
-apps/frappe/frappe/templates/base.html +134,Added,Добавен
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Party Balance
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е намерен.
 DocType: Bank Reconciliation,Get Relevant Entries,Вземете съответните вписвания
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Счетоводен запис за Складова аличност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Печели доста
 DocType: Sales Invoice,Sales Team1,Продажбите Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Customer Адрес
-apps/frappe/frappe/desk/query_report.py +136,Total,Общо
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
@@ -2265,60 +2084,56 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Данъчен сума след Сума Discount (Company валути)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target склад е задължително за поредна {0}
 DocType: Quality Inspection,Quality Inspection,Проверка на качеството
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формиране
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Мога само да направи плащане срещу нетаксувано {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентаризация Level
 DocType: Stock Entry,Subcontract,Подизпълнение
 apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Моля, въведете {0} първа"
 DocType: Production Planning Tool,Get Items From Sales Orders,Вземи артикули от продажби Поръчки
-DocType: Production Order Operation,Actual End Time,Actual End Time 
+DocType: Production Order Operation,Actual End Time,Actual End Time
 DocType: Production Planning Tool,Download Materials Required,Свали Необходими материали
 DocType: Item,Manufacturer Part Number,Производител Номер
 DocType: Production Order Operation,Estimated Time and Cost,Очаквано време и разходи
 DocType: Bin,Bin,Хамбар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Ръб на стъпало
 DocType: SMS Log,No of Sent SMS,Не на изпратените SMS
 DocType: Account,Company,Компания
 DocType: Account,Expense Account,Expense Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Цвят
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Цвят
 DocType: Maintenance Visit,Scheduled,Планиран
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Моля изберете позиция, където &quot;е Фондова Позиция&quot; е &quot;Не&quot; и &quot;Е-продажба точка&quot; е &quot;Да&quot; и няма друг Bundle продукта"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете месец Distribution да неравномерно разпределяне цели през месеца.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ценоразпис на валута не е избрана
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Позиция Row {0}: Покупка Квитанция {1} не съществува в таблицата по-горе &quot;Покупка Приходи&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Проект Начална дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименуване Log
 DocType: Installation Note Item,Against Document No,Срещу документ №
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Управление на дистрибутори.
 DocType: Quality Inspection,Inspection Type,Тип Инспекция
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Моля изберете {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,C-Form Не
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Изследовател
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Актуализация
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Изследовател
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Моля, запишете бюлетина, преди да изпратите"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Име или имейл е задължително
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Постъпили проверка на качеството.
 DocType: Purchase Order Item,Returned Qty,Върнати Количество
 DocType: Employee,Exit,Изход
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type е задължително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type е задължително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Пореден № {0} е създадена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационна окончателна обработка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка Notes"
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Изпитателен Срок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Изпитателен Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листните възли са позволени в сделка
 DocType: Expense Claim,Expense Approver,Expense одобряващ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Стържещ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Свиване опаковане
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Предстоящите дейности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потвърден
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Доставчик&gt; Доставчик Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Издателите на вестници
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Издателите на вестници
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискална година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топене
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Attendance,Attendance Date,Присъствие Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Заплата раздялата въз основа на доходите и приспадане.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Сметка с подсметки не може да бъде превърнати в Главна счетоводна книга
 DocType: Address,Preferred Shipping Address,Предпочитана Адрес за доставка
 DocType: Purchase Receipt Item,Accepted Warehouse,Приет Склад
 DocType: Bank Reconciliation Detail,Posting Date,Публикуване Дата
 DocType: Item,Valuation Method,Метод на оценка
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},"Не може да се намери на валутния курс за {0} {1}, за да"
 DocType: Sales Invoice,Sales Team,Търговски отдел
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate влизане
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate влизане
 DocType: Serial No,Under Warranty,В гаранция
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По думите ще бъде видим след като спаси поръчка за продажба.
 ,Employee Birthday,Служител Birthday
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Пореден № {0} не съществува
 DocType: Pricing Rule,Discount Percentage,Отстъпка Процент
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер на фактура
-apps/erpnext/erpnext/hooks.py +70,Orders,Заповеди
+apps/erpnext/erpnext/hooks.py +54,Orders,Заповеди
 DocType: Leave Control Panel,Employee Type,Тип Employee
 DocType: Employee Leave Approver,Leave Approver,Оставете одобряващ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Земни работи
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материал Прехвърлен за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Потребител с роля "" Одобряващ разходи"""
 ,Issued Items Against Production Order,Издадени артикули срещу производството Поръчка
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center със съществуващите операции не могат да бъдат превърнати в група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невалиден период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип сделка
 DocType: GL Entry,Voucher No,Отрязък №
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Адрес и контакти
 DocType: Customer,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Employee,Feedback,Обратна връзка
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отпуск не могат да бъдат разпределени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Мейнт. Разписание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивно струйно обработване
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Мейнт. Разписание
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
-DocType: Website Settings,Website Settings,Настройки Сайт
 DocType: Item,Reorder level based on Warehouse,Пренареждане равнище въз основа на Warehouse
 DocType: Activity Cost,Billing Rate,Billing Курсове
 ,Qty to Deliver,Количество да Избави
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Поискана за
 DocType: Quotation Item,Against Doctype,Срещу Вид Документ
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root сметка не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root сметка не може да бъде изтрита
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показване на вписване в запасите
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление на адреси
 DocType: Pricing Rule,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
 DocType: Journal Entry,User Remark,Потребителят Забележка
 DocType: Lead,Market Segment,Пазарен сегмент
-DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен Work История
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриване (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закриване (Dr)
 DocType: Contact,Passive,Пасивен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Пореден № {0} не е в наличност
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данъчна шаблон за продажба сделки.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Обявен Сума
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получаване на актуализации
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавяне на няколко примерни записи
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Заявка {0} е отменен или спрян
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Добавяне на няколко примерни записи
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставете Management
-DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групата от Профил
 DocType: Sales Order,Fully Delivered,Напълно Доставени
 DocType: Lead,Lower Income,По-ниски доходи
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Помощ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Източник и целева склада не могат да бъдат едни и същи за ред {0}
 DocType: Features Setup,Sales Extras,Продажби Екстри
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за Смтка {1} срещу Разходен Център {2} ще превишава с {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за Смтка {1} срещу Разходен Център {2} ще превишава с {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;От дата&quot; трябва да е след &quot;Към днешна дата&quot;
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} не принадлежи на проекта {1}
 DocType: Sales Order,Customer's Purchase Order,Поръчката на Клиента
 DocType: Warranty Claim,From Company,От Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Стойност или Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
 ,Qty to Receive,Количество за да получат за
 DocType: Leave Block List,Leave Block List Allowed,Оставете Block List любимци
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коефициент на преобразуване не може да бъде по фракции
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вие ще го използвате за вход
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ще го използвате за вход
 DocType: Sales Partner,Retailer,Търговец на дребно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всички Видове Доставчик
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не от типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитат {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване Точка
 DocType: Sales Order,%  Delivered,% Доставени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Овърдрафт Акаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направи Заплата Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обезпечени кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Яки Продукти
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Яки Продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Началното салдо Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не може да одобри отпуск, тъй като не са получили разрешение да одобрява листа на Блок Дати"
 DocType: Appraisal,Appraisal,Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Леене Загубил-пяна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Чертеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата се повтаря
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Оторизиран подписалите
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Оставете одобряващ трябва да бъде един от {0}
 DocType: Hub Settings,Seller Email,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Workstation Working Hour,Start Time,Начален Час
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (Company валути)
 DocType: BOM Operation,Hour Rate,Час Курсове
 DocType: Stock Settings,Item Naming By,"Позиция наименуването им,"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,От цитата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,От цитата
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Друг период Закриване Влизане {0} е направено след {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Материал, прехвърлен за производство"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Сметка {0} не съществува
 DocType: Purchase Receipt Item,Purchase Order Item No,Поръчка за покупка Позиция №
-DocType: System Settings,System Settings,Системни настройки
 DocType: Project,Project Type,Тип на проекта
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или целта Количество или целева сума е задължително.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Разходите за различни дейности
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
 DocType: Sales Order,Fully Billed,Напълно Обявен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства в брой
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Доставка склад изисква за склад т {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
 DocType: Serial No,Is Cancelled,Дали Отменен
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моите пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моите пратки
 DocType: Journal Entry,Bill Date,Бил Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
 DocType: Supplier,Supplier Details,Доставчик Детайли
-DocType: Communication,Recipients,Получатели
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Завинтване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Набраздяване
 DocType: Expense Claim,Approval Status,Одобрение Status
 DocType: Hub Settings,Publish Items to Hub,Публикуване продукти в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От стойност трябва да е по-малко, отколкото на стойност в ред {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банков Превод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Моля изберете Bank Account
 DocType: Newsletter,Create and Send Newsletters,Създаване и изпращане Бюлетини
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,От дата трябва да е преди Към днешна дата
 DocType: Sales Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Account Default подоходно
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Проверете това, ако искате да се показват в сайт"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добре дошли в ERPNext
+,Welcome to ERPNext,Добре дошли в ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Подробности Номер
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Доведе до цитата
 DocType: Lead,From Customer,От Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Призовава
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Призовава
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна единица
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
 ,Projected,Проектиран
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Пореден № {0} не принадлежи на Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Забележка: Системата няма да се покажат над-доставка и свръх-резервации за позиция {0} като количество или стойност е 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Откриване Дата
 DocType: Journal Entry,Remark,Забележка
 DocType: Purchase Receipt Item,Rate and Amount,Процент и размер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Пробиване
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От продажби Поръчка
-DocType: Blog Category,Parent Website Route,Родител Website Route
 DocType: Sales Order,Not Billed,Не Обявен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,И двете Warehouse трябва да принадлежи към една и съща фирма
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,"Не са добавени контакти, все още."
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не е активна
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Поземлен Cost Ваучер Сума
 DocType: Time Log,Batched for Billing,Дозирани за фактуриране
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, повдигнати от доставчици."
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Отстъпка Сума
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например ДДС
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,например ДДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Позиция 4
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитат Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формиране Hot метална газ
 DocType: Sales Order Item,Sales Order Date,Продажбите Поръчка Дата
 DocType: Sales Invoice Item,Delivered Qty,Доставени Количество
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Отидете на подходящата група (обикновено източник на средства&gt; Текущи задължения&gt; данъци и мита и да създадете нов акаунт (като кликнете върху Добавяне на детето) от тип &quot;данък&quot; и се споменава Данъчната ставка.
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Липсва обмен на валута цени за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерно рязане
-DocType: Event,Monday,Понеделник
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Account,Payable,Платим
 DocType: Salary Slip,Arrear Amount,Просрочия Сума
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Адрес Описание
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Поне една от продажба или закупуване трябва да бъдат избрани
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Когато се извършват производствени операции.
-DocType: Page,All,Всички
 DocType: Stock Entry Detail,Source Warehouse,Източник Warehouse
 DocType: Installation Note,Installation Date,Дата на инсталация
 DocType: Employee,Confirmation Date,Потвърждение Дата
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Продажбите на потребителя
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Количество не може да бъде по-голяма от Max Количество
 DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик Детайли
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Определете
 DocType: Lead,Lead Owner,Lead Собственик
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Се изисква Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Се изисква Warehouse
 DocType: Employee,Marital Status,Семейно Положение
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Time Log,Will be updated when billed.,"Ще бъде актуализиран, когато таксувани."
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Поръчка за покупка приложените аксесоари
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Фирма не може да бъде Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за шаблони за печат.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Заглавия за шаблони за печат, например проформа фактура."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Фондова
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Свръхзаглаждането
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курсове
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запис на всички съобщения от тип имейл, телефон, чат, посещение и т.н."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Моля, посочете закръглят Cost Center в Company"
 DocType: Purchase Invoice,Terms,Условия
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Създаване на нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Създаване на нова
 DocType: Buying Settings,Purchase Order Required,Поръчка за покупка Задължително
 ,Item-wise Sales History,Точка-мъдър Продажби История
 DocType: Expense Claim,Total Sanctioned Amount,Общо санкционирани Сума
 ,Purchase Analytics,Изкупните Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Бележка за доставка Позиция
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бръснене
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Номер на партидата е задължително за т {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Това е човек, корен на продажбите и не може да се редактира."
 ,Stock Ledger,Фондова Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Оценка: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оценка: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Заплата Slip Приспадане
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Бележки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изберете група възел на първо място.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цел трябва да бъде един от {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попълнете формата и да го запишете
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Свали доклад, съдържащ всички суровини с най-новите си статус инвентара"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовка
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Оставете Balance Преди Application
 DocType: SMS Center,Send SMS,Изпратете SMS
 DocType: Company,Default Letter Head,По подразбиране Letter Head
 DocType: Time Log,Billable,Подлежащи на таксуване
-DocType: Authorization Rule,This will be used for setting rule in HR module,Това ще бъде използвано за създаване правило в HR модул
 DocType: Account,Rate at which this tax is applied,"Скоростта, с която се прилага този данък"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количество
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Пропусната възможност
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Отстъпка Fields ще се предлага в Поръчката, Покупка разписка, фактурата за покупка"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на нов профил. Забележка: Моля, не създават сметки за клиенти и доставчици"
-DocType: Report,Report Type,Тип на отчета
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Товарене
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Сменете Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Държава мъдър адрес по подразбиране Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Покажи данък разпадането
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Внос и експорт на данни
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ако включат в производствената активност. Активира т &quot;се произвежда&quot;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равна на 100%
 DocType: Serial No,Out of AMC,Няма AMC
 DocType: Purchase Order Item,Material Request Detail No,Материал Заявка Подробности Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard повратна
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Направи поддръжка посещение
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
 DocType: Company,Default Cash Account,Default Cash Акаунт
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Забележка: Ако плащането не е извършено срещу всяко позоваване, направи вестник Влизане ръчно."
 DocType: Item,Supplier Items,Доставчик артикули
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Изпрати автоматични имейли в Контакти при подаването на сделки.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Кол не Свободно в склада {1} на {2} {3}. В наличност Количество: {4}, трансфер Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
 DocType: Purchase Order,Customer Contact Email,Customer Контакт Email
-DocType: Event,Sunday,Неделя
 DocType: Sales Team,Contribution (%),Принос (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Отговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажби лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Моля, въведете поне една фактура в таблицата"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добави Потребители
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Добави Потребители
 DocType: Pricing Rule,Item Group,Позиция Group
 DocType: Task,Actual Start Date (via Time Logs),Действителна Начална дата (чрез Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Преди помирение
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси Добавен (Company валути)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично Обявен
 DocType: Item,Default BOM,Default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
 DocType: Time Log Batch,Total Hours,Общо Часа
 DocType: Journal Entry,Printing Settings,Настройки за печат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е необходим елемент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални шприцоване
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,От Бележка за доставка
 DocType: Time Log,From Time,От време
 DocType: Notification Control,Custom Message,Персонализирано съобщение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно банкиране
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изберете вашата държава, Time Zone и валути"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно банкиране
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Мариноване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Пясък леене
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Галванопластика
 DocType: Purchase Invoice Item,Rate,Скорост
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Интерниран
-DocType: Newsletter,A Lead with this email id should exist,A Lead with this email id should exist 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Интерниран
+DocType: Newsletter,A Lead with this email id should exist,A Lead with this email id should exist
 DocType: Stock Entry,From BOM,От BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Към днешна дата трябва да бъде една и съща от датата, за половин ден отпуск"
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","напр кг, Unit, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","напр кг, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
 DocType: Salary Structure,Salary Structure,Структура Заплата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Цена правило съществува с едни и същи критерии, моля решаване \ конфликт чрез възлагане приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Issue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
 DocType: Hub Settings,Access Token,Access Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Е фиксирана позиция в актива
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако имате дълги формати за печат, тази функция може да се използва за разделяне на страницата, за да бъдат отпечатани на няколко страници с всички горни и долни колонтитули на всяка страница"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Всички територии
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Предмети
 DocType: Fiscal Year,Year Name,Година Име
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Продажбите Partner Име
 DocType: Purchase Invoice Item,Image View,Вижте изображението
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Довършителни и промишлена обработка
 DocType: Issue,Opening Time,Откриване на времето
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и до датите, изисквани"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценни книжа и стоковите борси
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Пробиване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Бластване
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
 DocType: Tax Rule,Shipping City,Доставка City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Тази позиция е вариант на {0} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
 DocType: Account,Purchase User,Покупка на потребителя
 DocType: Notification Control,Customize the Notification,Персонализиране на Notification
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Чукане
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
 DocType: Journal Entry,Print Heading,Print Heading
 DocType: Quotation,Maintenance Manager,Поддръжка на мениджъра
-DocType: Workflow State,Search,Търсене
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Общо не може да е нула
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дни след Последна Поръчка"" трябва да бъдат по-големи или равни на нула"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Твърда заварка
 DocType: C-Form,Amended From,Изменен От
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суров Материал
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Суров Материал
 DocType: Leave Application,Follow via Email,Следвайте по имейл
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Данъчен сума след Сума Отстъпка
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или целта Количество или целева сума е задължителна
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Моля изберете Публикуване Дата първа
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
 DocType: Leave Control Panel,Carry Forward,Пренасяне
@@ -2801,44 +2570,43 @@
 ,Produced,Продуциран
 DocType: Item,Item Code for Suppliers,Код на доставчици
 DocType: Issue,Raised By (Email),Повдигнат от (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Общ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепете бланки
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Общ
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Прикрепете бланки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Списък на вашите данъчни глави (например ДДС, митнически и други; те трябва да имат уникални имена) и стандартните си цени. Това ще създаде стандартен формуляр, който можете да редактирате и да добавите още по-късно."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Списък на вашите данъчни глави (например ДДС, митнически и други; те трябва да имат уникални имена) и стандартните си цени. Това ще създаде стандартен формуляр, който можете да редактирате и да добавите още по-късно."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
 DocType: Journal Entry,Bank Entry,Bank Влизане
 DocType: Authorization Rule,Applicable To (Designation),Приложими по отношение на (наименование)
-DocType: Blog Post,Blog Post,Blog Post
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група С
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включване / Изключване на валути.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Пощенски разходи
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Датата, на която повтарящ цел ще бъде да спре"
 DocType: Quality Inspection,Item Serial No,Позиция Пореден №
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване 
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} трябва да се намали с {1} или е необходимо да се увеличи толерантност на препълване
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Общо Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Трансфер Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Трансфер Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Създаване на цитата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Всички тези елементи вече са били фактурирани
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да бъде одобрен от {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Правило Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новият BOM след подмяна
 DocType: Features Setup,Point of Sale,Точка на продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Кърлинг
 DocType: Account,Tax,Данък
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} не е валиден {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,От Каталог Bundle
 DocType: Production Planning Tool,Production Planning Tool,Tool Производствено планиране
 DocType: Quality Inspection,Report Date,Доклад Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Длъжност
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} вече разпределена за Employee {1} за период {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Елемент групи Детайли
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Актуализация Курсове и Наличност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Процент ви е позволено да получи или достави повече от поръчаното количество. Например: Ако сте поръчали 100 единици. и си Allowance е 10% след което се оставя да се получи 110 единици.
 DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: Item,Website Description,Website Описание
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
 ,Sales Register,Продажбите Регистрация
 DocType: Quotation,Quotation Lost Reason,Цитат Загубени Причина
 DocType: Address,Plant,Растение
-DocType: DocType,Setup,Настройвам
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Студено валцуване
 DocType: Customer Group,Customer Group Name,Customer Group Име
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
 DocType: GL Entry,Against Voucher Type,Срещу ваучер Вид
 DocType: Item,Attributes,Атрибутите
-DocType: Packing Slip,Get Items,Вземи артикули
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последна Поръчка Дата
-DocType: DocField,Image,Изображение
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направи акцизите Invoice
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
-DocType: Communication,Other,Друг
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операция ID не е зададено
 DocType: Production Order,Planned Start Date,Планирана начална дата
 DocType: Serial No,Creation Document Type,Създаване Type Document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Мейнт. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Мейнт. Посещение
 DocType: Leave Type,Is Encash,Дали инкасира
 DocType: Purchase Invoice,Mobile No,Mobile Не
 DocType: Payment Tool,Make Journal Entry,Направи вестник Влизане
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Търговски
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Търговски
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител т {0} не трябва да бъде фондова Точка
 DocType: Cost Center,Distribution Id,Id Разпределение
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Яки Услуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Всички продукти или услуги.
 DocType: Purchase Invoice,Supplier Address,Доставчик Адрес
-DocType: Contact Us Settings,Address Line 2,Адрес Line 2
-DocType: ToDo,Reference,Препратка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорация
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Количество
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансови Услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},"Цена Умение {0} трябва да бъде в границите от {1} {2}, за да в инкрементите {3}"
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основен размер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По подразбиране вземания Accounts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Нарязване
 DocType: Tax Rule,Billing State,Billing членка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Прехвърляне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Дата е задължително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтероване
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Свържи се с HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,На дребно
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
-DocType: Product Bundle,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Смачкване
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
 DocType: GL Entry,Remarks,Забележки
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Монтаж рекорд за Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрекъснато леене
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Моля, посочете"
 DocType: Offer Letter,Awaiting Response,Очаква Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold оразмеряване
 DocType: Salary Slip,Earning & Deduction,Приходи &amp; Приспадане
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Сметка {0} не може да бъде Група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Област
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
 DocType: Holiday List,Weekly Off,Седмичен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Защото например 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Временна печалба / загуба (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Върнете Срещу фактурата за продажба
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Позиция 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Моля, задайте стойност по подразбиране {0} в Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Моля, задайте стойност по подразбиране {0} в Company {1}"
 DocType: Serial No,Creation Time,Създаване на времето
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Общо приходите
 DocType: Sales Invoice,Product Bundle Help,Каталог Bundle Помощ
 ,Monthly Attendance Sheet,Месечен зрители Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не са намерени записи
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Получават от продукта Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Сметка {0} е неактивна
 DocType: GL Entry,Is Advance,Дали Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Присъствие От Дата и зрители към днешна дата е задължително
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Моля, въведете &quot;преотстъпват&quot; като Да или Не"
 DocType: Sales Team,Contact No.,Свържи No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Сметка вид ""Печалби и загуби"" {0} не е позволена при Начален Баланс"
-DocType: Workflow State,Time,Време
 DocType: Features Setup,Sales Discounts,Продажби Отстъпки
 DocType: Hub Settings,Seller Country,Продавач Country
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия за ползване Детайли
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажби данъци и такси в шаблона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Брой на Поръчка
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / банер, който ще се появи на върха на списъка с продукти."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Посочете условия, за да изчисли размера на корабоплаването"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Добави Поделемент
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роля позволено да определят замразени сметки &amp; Редактиране на замразени влизания
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Не може да конвертирате Cost Center да Леджър, тъй като има дете възли"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Се изисква Factor реализациите
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комисията за покупко-продажба
 DocType: Offer Letter Term,Value / Description,Стойност / Описание
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Клиентите не купуват от дълго време
 DocType: Production Order,Expected Delivery Date,Очаквана дата на доставка
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Леене Evaporative-модел
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представителни Разходи
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Фактурата за продажба {0} трябва да се отмени преди анулирането този Продажби Поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Фактурата за продажба {0} трябва да се отмени преди анулирането този Продажби Поръчка
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Възраст
 DocType: Time Log,Billing Amount,Billing Сума
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Невалиден количество, определено за т {0}. Количество трябва да бъде по-голяма от 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявленията за отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни разноски
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматично, за да се генерира например 05, 28 и т.н."
 DocType: Sales Invoice,Posting Time,Публикуване на времето
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer приходите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Пътни Разходи
 DocType: Maintenance Visit,Breakdown,Авария
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Сметка: {0} с валута: не може да бъде избран {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно заличава всички транзакции, свързани с тази компания!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Доизкусурващи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Изпитание
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
-DocType: Feed,Full Name,Пълно Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Изпитание
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,"Default Warehouse е задължително за склад, т."
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Изплащането на заплатите за месец {0} и година {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
 ,Transferred Qty,Прехвърлени Количество
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планиране
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планиране
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Направи Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издаден
 DocType: Project,Total Billing Amount (via Time Logs),Общо Billing сума (чрез Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ние продаваме този артикул
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Ние продаваме този артикул
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id доставчик
 DocType: Journal Entry,Cash Entry,Cash Влизане
 DocType: Sales Partner,Contact Desc,Свържи Описание
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Точка на мениджъра
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавете редове, за да зададете годишни бюджети по сметки."
 DocType: Buying Settings,Default Supplier Type,Default доставчик Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Добиване
 DocType: Production Order,Total Operating Cost,Общо оперативни разходи
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забележка: Точка {0} влезе няколко пъти
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всички контакти.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Фирма Съкращение
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Фирма Съкращение
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ако следвате качествения контрол. Активира Позиция QA Задължителни и QA Не на изкупните Разписка
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Суровини не може да бъде същата като основен елемент
 DocType: Item Attribute Value,Abbreviation,Абревиатура
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized тъй {0} надхвърля границите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротационното отливане
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Заплата шаблон майстор.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Оставете любимци
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Определете Tax Правило за количка
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
 ,Territory Target Variance Item Group-Wise,Територия Target Вариацията т Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всички групи клиенти
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задължително. Може би запис за обменни курсове на валута не е създаден за {1} {2} да.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Данъчна Template е задължително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Родителска сметка {1} не съществува
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценоразпис Rate (Company валути)
 DocType: Account,Temporary,Временен
 DocType: Address,Preferred Billing Address,Предпочитана Billing Адрес
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Обособена единица на артикул
 DocType: Pricing Rule,Buying,Купуване
 DocType: HR Settings,Employee Records to be created by,Архивите на служителите да бъдат създадени от
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
 DocType: Purchase Order Item,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,По думите ще бъде видим след като спаси цитата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Гладене
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е спрян
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящи събития
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се изисква Customer
-DocType: Letter Head,Letter Head,Писмо Head
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Бързо Влизане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задължително за Връщане
 DocType: Purchase Order,To Receive,Получавам
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Свиване монтаж
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Приходи / разходи
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Общото разсейване
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Общото разсейване
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е активирана, системата ще публикуваме счетоводни записвания за инвентара автоматично."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокераж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокераж
 DocType: Address,Postal Code,пощенски код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",в протокола Updated чрез &quot;Time Log&quot;
 DocType: Customer,From Lead,От Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Поръчки пуснати за производство.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Hub Settings,Name Token,Име Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Рендосване
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Поне един склад е задължително
 DocType: Serial No,Out of Warranty,Извън гаранция
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Моля, въведете подразбиране Мерна единица"
 DocType: Purchase Invoice Item,Project Name,Име на проекта
 DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
-DocType: Workflow State,Edit,Редактирам
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Features Setup,Item Batch Nos,Позиция Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Заплащане помирение плащане
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Данъчни активи
 DocType: BOM Item,BOM No,BOM Не
-DocType: Contact Us Settings,Pincode,На пощенския код
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM който ще бъде заменен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New фондова мерна единица трябва да бъде различен от сегашния състав мерна единица
 DocType: Account,Debit,Дебит
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листата трябва да бъдат разпределени в кратни на 0,5"
 DocType: Production Order,Operation Cost,Операция Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Качване на посещаемостта от .csv файл
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изключително Amt
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Default Cost Center
 DocType: Purchase Invoice,End Date,Крайна Дата
 DocType: Employee,Internal Work History,Вътрешен Work История
-DocType: DocField,Column Break,Колона Break
-DocType: Event,Thursday,Четвъртък
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Обръщане
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка с клиент
 DocType: Account,Expense,Разход
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Проведена На
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
 ,Employee Information,Информация Employee
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансова година Крайна дата
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако групирани по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направи Доставчик оферта
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (разглобен)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),"Намаляване Приходи за да напуснат, без Pay (LWP)"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual отпуск
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забележка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Тази Седмица Резюме
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} трябва да бъде Закупен или Подизпълнителен в ред {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
 DocType: GL Entry,Party,Парти
 DocType: Sales Order,Delivery Date,Дата На Доставка
-DocType: DocField,Currency,Валута
 DocType: Opportunity,Opportunity Date,Opportunity Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Върнете Срещу Покупка Разписка
 DocType: Purchase Order,To Bill,За да Bill
 DocType: Material Request,% Ordered,Поръчано%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Работа заплащана на парче
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Работа заплащана на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Да Обсъдим
 DocType: SMS Settings,SMS Settings,SMS Settings
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временни сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Черен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Точка
 DocType: Account,Auditor,Одитор
 DocType: Purchase Order,End date of current order's period,Крайна дата на периода на текущата поръчката
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направи оферта Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Връщане
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
-DocType: DocField,Fold,Гънка
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Default мерната единица за Variant трябва да е същото като Template
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка Operation
 DocType: Pricing Rule,Disable,Правя неспособен
 DocType: Project Task,Pending Review,До Review
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Моля, посочете"
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Customer
-DocType: Page,Page Name,Page Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"На време трябва да бъде по-голяма, отколкото от време"
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: майка сметка {1} не Bolong на дружеството {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндела довършителни
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
 DocType: Account,Asset,Придобивка
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",например &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",например &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фондова не може да съществува за позиция {0}, тъй като има варианти"
 ,Sales Person-wise Transaction Summary,Продажбите Person-мъдър Transaction Резюме
-DocType: System Settings,Time Zone,Часова Зона
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} не съществува
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирайте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Процентите за дистрибуция
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Избраният елемент не може да има Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% от материали доставени по тази Бележка за доставка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Подшиване
 DocType: Customer,Customer Details,Данни за клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Оформяне
 DocType: Employee,Reports to,Доклади до
 DocType: SMS Settings,Enter url parameter for receiver nos,Въведете URL параметър за приемник с номера
 DocType: Sales Invoice,Paid Amount,Платената сума
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Закриване на профила {0} трябва да е от тип &quot;Отговорност&quot;
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Позиция Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit' "
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление на качеството
 DocType: Production Planning Tool,Filter based on customer,Филтър на базата на клиент
 DocType: Payment Tool Detail,Against Voucher No,Срещу ваучър №
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 DocType: Tax Rule,Purchase,Покупка
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Количество
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Количество
 DocType: Item Group,Parent Item Group,Родител т Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Разходни центрове
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Складове.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Складове.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Скоростта, с която доставчик валута се превръща в основна валута на компанията"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: тайминги конфликти с ред {1}
 DocType: Opportunity,Next Contact,Следваща Контакт
 DocType: Employee,Employment Type,Тип заетост
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Дълготрайни активи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Срок за кандидатстване не може да бъде в два alocation записи
 DocType: Item Group,Default Expense Account,Default Expense Account
 DocType: Employee,Notice (days),Известие (дни)
-DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
 DocType: Employee,Encashment Date,Инкасо Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Срещу Ваучер тип трябва да е един от поръчка, фактурата за покупка или вестник Влизане"
 DocType: Account,Stock Adjustment,Склад за приспособяване
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Съществува Cost Default активност за вид дейност - {0}
 DocType: Production Order,Planned Operating Cost,Планиран експлоатационни разходи
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Име
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Приложено Ви изпращаме {0} # {1}
 DocType: Job Applicant,Applicant Name,Заявител Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Име на артикул
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Пореден № е задължително за т {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Моля, посочете от / до варира"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Създадено От
 DocType: Serial No,Under AMC,Под AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,"Позиция процент за оценка се преизчислява за това, се приземи ваучер сума на разходите"
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройките по подразбиране за продажба на сделки.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,"Минималната сума,"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Актуализиране на готова продукция
 DocType: Workstation,per hour,на час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} вече се използва в {1}
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account. 
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,"Сума, платена"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Ръководител На Проект
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max отстъпка разрешено за покупка: {0} е {1}%
 DocType: Customer,Default Taxes and Charges,По подразбиране данъци и такси
 DocType: Account,Receivable,За получаване
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
 DocType: Sales Invoice,Supplier Reference,Доставчик Референтен
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако е избрано, BOM за скрепление позиции ще се счита за получаване на суровини. В противен случай, всички елементи скрепление ще бъдат третирани като суровина."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Продавач Описание
 DocType: Employee Education,Qualification,Квалификация
 DocType: Item Price,Item Price,Елемент Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; почистващи препарати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; почистващи препарати
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
 DocType: Warehouse,Warehouse Name,Warehouse Име
 DocType: Naming Series,Select Transaction,Изберете Transaction
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддръжка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Фирма липсва в складовете {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Склад за мерна единица Сменете Utility
 DocType: POS Profile,Terms and Conditions,Правила и условия
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Към днешна дата трябва да бъде в рамките на фискалната година. Ако приемем, че към днешна дата = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тук можете да се поддържа височина, тегло, алергии, медицински опасения и т.н."
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,За производство
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Моля, въведете продажбите ред в таблицата по-горе"
 DocType: Project Task,View Task,Виж Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Вашият финансова година започва на
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Вашият финансова година започва на
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Моля, въведете покупка Приходи"
 DocType: Sales Invoice,Get Advances Received,Вземи Получени аванси
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup входящия сървър за подкрепа имейл ID. (Например support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Salary Slip,Salary Slip,Заплата Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировъчен
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Към днешна дата&quot; се изисква
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Към днешна дата&quot; се изисква
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генериране на товарителници за пакети трябва да бъдат доставени. Използва се за уведомяване на пакетите номер, съдържание на пакети и теглото му."
 DocType: Sales Invoice Item,Sales Order Item,Продажбите Поръчка Точка
 DocType: Salary Slip,Payment Days,Плащане Days
 DocType: BOM,Manage cost of operations,Управление на разходите за дейността
 DocType: Features Setup,Item Advanced,Позиция Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло валцоване
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когато някоя от проверени сделките се &quot;Изпратен&quot;, имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с &quot;контакт&quot; в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Служител Образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Пореден № {0} вече е получил
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Продажбите Данни за отбора
 DocType: Expense Claim,Total Claimed Amount,Общо заявените Сума
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенциалните възможности за продажби.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск По Болест
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Невалиден {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск По Болест
 DocType: Email Digest,Email Digest,Email бюлетин
 DocType: Delivery Note,Billing Address Name,Адрес за име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Универсални Магазини
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Е активен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универсални Магазини
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Не са счетоводни записвания за следните складове
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Промени Съкращение
-DocType: Workflow State,Primary,Първичен
 DocType: Expense Claim Detail,Expense Date,Expense Дата
 DocType: Item,Max Discount (%),Max Отстъпка (%)
-DocType: Communication,More Information,Повече информация
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Последна Поръчка Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Взривен
 DocType: Company,Warn,Предупреждавам
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Позиция остойностяване актуализиран
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
 DocType: BOM,Manufacturing User,Производство на потребителя
 DocType: Purchase Order,Raw Materials Supplied,"Сурови материали, доставени"
 DocType: Purchase Invoice,Recurring Print Format,Повтарящо Print Format
-DocType: Communication,Series,Серия
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Очаквана дата на доставка не може да бъде преди поръчка Дата
 DocType: Appraisal,Appraisal Template,Оценка Template
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Позиция Класификация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Мениджър Бизнес развитие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Мениджър Бизнес развитие
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Поддръжка посещение Предназначение
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период
 ,General Ledger,Главна книга
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Моля изберете {0} първия
 DocType: Features Setup,To get Item Group in details table,За да получите т Group в детайли маса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прекрояване
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Партида {0} на т {1} е изтекъл.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Офорт
 DocType: Sales Invoice,Commission,Комисионна
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,14 +3129,14 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Default Template </h4><p> Използва <a href=""http://jinja.pocoo.org/docs/templates/"">Джинджа темплейт</a> и във всички сфери на адрес (включително Потребителски полета, ако има такъв) ще бъде на разположение </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Default Сума
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse не е открит в системата
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse не е открит в системата
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Резюме този месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Проверка на качеството Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази Запаси по-стари от` трябва да бъде по-малък от % D дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
 ,Project wise Stock Tracking,Проект мъдър фондова Tracking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Съществува план за поддръжка {0} срещу {0}
-DocType: Stock Entry Detail,Actual Qty (at source/target),Действително Количество (at source/target) 
+DocType: Stock Entry Detail,Actual Qty (at source/target),Действително Количество (at source/target)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,Записи на служителите.
 DocType: HR Settings,Payroll Settings,Настройки ТРЗ
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
 DocType: Supplier,Address and Contacts,Адрес и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Подробности мерна единица на реализациите
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Дръжте го уеб приятелски 900px (w) от 100px (з)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Дръжте го уеб приятелски 900px (w) от 100px (з)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока
 DocType: Payment Tool,Get Outstanding Vouchers,Получи изключително Ваучери
 DocType: Warranty Claim,Resolved By,Разрешен от
 DocType: Appraisal,Start Date,Начална Дата
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Стойност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Разпределяне на листа за период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Кликнете тук, за да се провери"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Сметка {0}: Може да се назначи себе си за родителска сметка
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Средното време взети от доставчика да достави
 DocType: Time Log,Hours,Часове
 DocType: Project,Expected Start Date,Очаквана начална дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Подвижният
-DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
-DocType: Dropbox Backup,Dropbox Access Allowed,Позволени Dropbox Access
-DocType: Dropbox Backup,Weekly,Седмично
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Напр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получавам
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Получавам
 DocType: Maintenance Visit,Fully Completed,Завършен до ключ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Завършен
 DocType: Employee,Educational Qualification,Образователно-квалификационна
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Employee Leave Approver,Employee Leave Approver,Служител Оставете одобряващ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно добавен в нашия Бюлетин.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларира като изгубена, защото цитата е направено."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-лъчево обработване
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за т {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основните доклади
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фондова Ledger вписвания салда обновяват
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основните доклади
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Добавяне / Редактиране на цените
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Графика на Разходни центрове
 ,Requested Items To Be Ordered,Желани продукти за да се поръча
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Моите поръчки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Моите поръчки
 DocType: Price List,Price List Name,Ценоразпис Име
 DocType: Time Log,For Manufacturing,За производство
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Общо
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Общо
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Поръчаните артикули да бъдат доставени
 DocType: Account,Income,Доход
-,Setup Wizard,Wizard Setup
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нещо се обърка!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата На Завършване
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
-DocType: Email Alert,Reference Date,Референтен Дата
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Организация единица (отдел) майстор.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Моля въведете валидни мобилни номера
 DocType: Budget Detail,Budget Detail,Бюджет Подробности
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Моля, въведете съобщение, преди да изпратите"
-DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Склад за мерна единица актуализиран за позиция {0}
-DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка на продажба на профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Моля, актуализирайте SMS Settings"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време Log {0} вече таксува
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Пореден № Договор за услуги Изтичане
 DocType: Item,Unit of Measure Conversion,Мерна единица на реализациите
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникът или служителят не може да се променя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
 DocType: Naming Series,Help HTML,Помощ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Помощи за свръх {0} прекоси за позиция {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Име на лицето или организацията, че този адрес принадлежи."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите доставчици
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Вашите доставчици
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като губи като поръчка за продажба е направена.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Друг заплата структура {0} е активен за служител {1}. Моля, направете своя статут &quot;неактивни&quot;, за да продължите."
 DocType: Purchase Invoice,Contact,Контакт
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Получени от
 DocType: Features Setup,Exports,Износът
 DocType: Lead,Converted,Покръстен
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: От {0} за {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компютър
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Позиция: {0} не съществува в системата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
 DocType: Cost Center,Budgets,Бюджети
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Обновено
 DocType: Employee,Emergency Contact Details,Аварийни контактни Детайли
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Какво прави?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Какво прави?
 DocType: Delivery Note,To Warehouse,За да Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"Сметка {0} е вписана повече от веднъж за фискалната година, {1}"
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"'Има сериен номер' не може да бъде 'Да' за стока, която не на склад"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрически
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрически
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика Value (Out - В)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От гаранционен иск
 DocType: Stock Entry,Default Source Warehouse,Default Източник Warehouse
 DocType: Item,Customer Code,Код Customer
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Плиска
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дни след Last Поръчка
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дни след Last Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
-DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Сток Активи
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Наистина ли искате да представи всички Заплата Slip за месец {0} и година {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Вносни Абонати
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Настояще
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Бележка за доставка {0} не трябва да бъде представено
 DocType: Notification Control,Sales Invoice Message,Съобщението фактурата за продажба
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриване на профила {0} трябва да е от тип Отговорност / Equity
 DocType: Authorization Rule,Based On,Базиран На
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Период От и периода, за датите задължителни за повтарящи {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Дейността на проект / задача.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генериране на заплатите фишове
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не е валиден имейл ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Изкупуването трябва да се провери, ако има такива се избира като {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Отстъпка трябва да е по-малко от 100
-DocType: ToDo,Low,Нисък
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Напиши Off Сума (Company валути)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Предене
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Се изисква Име на кампанията
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Отхвърлени Пореден №
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Дълбоко изтегляне
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Покажи Balance
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Размер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Занитване
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменя
 ,Sales Analytics,Продажби Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки производство
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини Доставя Cost
 DocType: Selling Settings,Settings for Selling Module,Настройки за продажба на Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслужване На Клиенти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслужване На Клиенти
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Елемент Подробности Customer
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Потвърдете Вашият Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Оферта кандидат за работа.
 DocType: Notification Control,Prompt for Email on Submission of,Пита за Email при представяне на
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Общо отпуснати листа са повече от дните през периода
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Точка {0} трябва да бъде в наличност Позиция
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Work В Warehouse Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} е необходим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуум формоване
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
-DocType: Contact Us Settings,City,Град
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвукова обработка
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валиден документ за самоличност?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} трябва да бъде Продажби Точка
 DocType: Naming Series,Update Series Number,Актуализация Series Number
 DocType: Account,Equity,Справедливост
 DocType: Sales Order,Printing Details,Printing Детайли
 DocType: Task,Closing Date,Крайна дата
 DocType: Sales Order Item,Produced Quantity,Произведено количество
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Търсене под Изпълнения
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код изисква най Row Не {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Отстъпка
 DocType: Purchase Invoice,Against Expense Account,Срещу Разходна Сметка
 DocType: Production Order,Production Order,Производство Поръчка
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Монтаж Забележка {0} вече е била подадена
 DocType: Quotation Item,Against Docname,Срещу Документ
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Вижте сега
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Разходи за суровини
 DocType: Item,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Обновено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на отчета е задължително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
 DocType: Issue,First Responded On,Първо Отговорили On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Първият потребител: Вие
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Първият потребител: Вие
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успешно Съгласувани
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Съгласувани
 DocType: Production Order,Planned End Date,Планиран Крайна дата
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Когато елементите са съхранени.
 DocType: Tax Rule,Validity,Валидност
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сума по фактура
 DocType: Attendance,Attendance,Посещаемост
-DocType: Page,No,Не
 DocType: BOM,Materials,Материали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не се проверява, списъкът ще трябва да бъдат добавени към всеки отдел, където тя трябва да се приложи."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
@@ -3689,55 +3376,46 @@
 ,Item Prices,Елемент Цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По думите ще бъде видим след като спаси Поръчката.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Закриване Ваучер
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ценоразпис майстор.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ценоразпис майстор.
 DocType: Task,Review Date,Преглед Дата
 DocType: Purchase Invoice,Advance Payments,Авансови плащания
-DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи % S"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезоване
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Няма разрешение за ползване Плащане Tool
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи % S"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валутна не може да се промени, след като записи с помощта на някои друга валута"
 DocType: Company,Round Off Account,Завършете Акаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Залъгва
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни разходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консултативен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консултативен
 DocType: Customer Group,Parent Customer Group,Родител Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",например &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок На Предизвестие
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Това е корен територия и не може да се редактира.
 DocType: Packing Slip,Gross Weight UOM,Бруто тегло мерна единица
 DocType: Email Digest,Receivables / Payables,Вземания / Задължения
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактура за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Щампосване
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
 DocType: Task,Actual End Date (via Time Logs),Действителна Крайна дата (чрез Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Моля, въведете разходен център майка"
 DocType: Delivery Note,Print Without Amount,Печат Без Сума
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
-DocType: User,Last Name,Фамилия
-DocType: Web Page,Left,Наляво
-DocType: Event,All Day,Цял Ден
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Общ резултат (от 5)
-DocType: Contact Us Settings,State,Състояние
 DocType: Batch,Batch,Партида
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Общо разход претенция (чрез разход Вземания)
-DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебитно известие
 DocType: Stock Entry,As per Stock UOM,По фондова мерна единица
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не е изтекъл
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Създаване на правила за ограничаване на сделки, основани на ценности."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е избрано, Total не. на работните дни ще включва празници, а това ще доведе до намаляване на стойността на Заплата на ден"
 DocType: Purchase Invoice,Total Advance,Общо Advance
-DocType: Workflow State,User,Потребител
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обработка на заплати
 DocType: Opportunity Item,Basic Rate,Basic Курсове
 DocType: GL Entry,Credit Amount,Credit Сума
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Задай като Загубени
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Заплащане Получаване Забележка
 DocType: Customer,Credit Days Based On,Кредитните Days въз основа на
 DocType: Tax Rule,Tax Rule,Данъчна Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддържане и съща ставка През Продажби Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирайте времето трупи извън Workstation работно време.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вече е била подадена
 ,Items To Be Requested,Предмети трябва да бъдат поискани
-DocType: Purchase Order,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing процент въз основа на Type активност (на час)
 DocType: Company,Company Info,Информация за фирмата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Фалцуване
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Фирма Email ID не е намерен, следователно не съобщение, изпратено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 DocType: Production Planning Tool,Filter based on item,Филтър на базата на т
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Акаунт
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Общо (Company валути)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
 DocType: Purchase Common,Purchase Common,Покупка Чести
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} е променен. Моля, опреснете."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Спрете потребители от извършване Оставете Заявленията за следните дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,От Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Глуха
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведен Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, повдигнати на клиентите."
-DocType: DocField,Default,Неустойка
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Добавени {0} абонати
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Определете бюджета за тази Cost Center. За да зададете бюджет действия, вижте &quot;Company List&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Expense Claim,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Изборът на &quot;Yes&quot; ще даде уникална идентичност на всеки субект на този елемент, който може да бъде разгледана в Пореден № капитана."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Current адрес е
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
 DocType: Address,Office,Офис
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартни отчети
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Счетоводни вписвания в дневник.
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Моля изберете Record Employee първия.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,За създаване на данъчна сметка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Моля, въведете Expense Account"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Инвентаризация
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Инвентаризация
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Поръчки за продажба Pull (висящите да достави), основано на горните критерии"
-DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,От Доставчик оферта
 DocType: Deduction Type,Deduction Type,Приспадане Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Количество
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",За да проследите позиции в продажбите и закупуване на документи с партидни номера. &quot;Предпочитана Индустрия: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transaction Дата
 DocType: Production Plan Item,Planned Qty,Планиран Количество
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Общо Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Общо Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количество (Произведен Количество) е задължително
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
 DocType: Notification Control,Purchase Receipt Message,Покупка получено съобщение
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Общо отпуснати листа са повече от период
 DocType: Production Order,Actual Start Date,Действителна Начална дата
 DocType: Sales Order,% of materials delivered against this Sales Order,% от материали доставени по тази Поръчка за Продажба
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запишете движение т.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Списък Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дълбаене
-DocType: Email Account,Service,Обслужване
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,С Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 ,Monthly Salary Register,Месечна заплата Регистрация
-apps/frappe/frappe/website/template.py +140,Next,До
 DocType: Warranty Claim,If different than customer address,Ако е различен от адреса на клиента
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предишния ред Сума
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Моля, въведете сумата за плащане в поне един ред"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Моля, въведете сумата за плащане в поне един ред"
 DocType: POS Profile,POS Profile,POS профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Начин на плащане сума не може да бъде по-голяма от дължимата сума
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Общата сума на неплатените
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Общата сума на неплатените
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време Влезте не е таксувана
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купувач
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Купувач
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net заплащането не може да бъде отрицателна
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Моля, въведете с документите, ръчно"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Моля, въведете с документите, ръчно"
 DocType: SMS Settings,Static Parameters,Статични параметри
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция Tax
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Изпратете маса SMS към вашите контакти
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Помислете данък или такса за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-подвижен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна Карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна Карта
 DocType: BOM,Item to be manufactured or repacked,Т да се произвеждат или преопаковани
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Настройките по подразбиране за борсови сделки.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Настройките по подразбиране за борсови сделки.
 DocType: Purchase Invoice,Next Date,Следващата дата
 DocType: Employee Education,Major/Optional Subjects,Основни / избираеми предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Моля, въведете данъци и такси"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Механична обработка
 DocType: Sales Invoice Item,Drop Ship,Капка Корабно
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
 DocType: Hub Settings,Seller Name,Продавач Име
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Опаковайте
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вие трябва да спаси формата, преди да продължите"
 DocType: Item Attribute,Numeric Values,Числови стойности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепете Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Прикрепете Logo
 DocType: Customer,Commission Rate,Комисията Курсове
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Направи Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Заявленията за отпуск блок на отдел.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Количката е празна
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root не може да се редактира.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Разпределен сума може да не по-голяма от unadusted сума
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root не може да се редактира.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Разпределен сума може да не по-голяма от unadusted сума
 DocType: Manufacturing Settings,Allow Production on Holidays,Допусне производство на празници
 DocType: Sales Order,Customer's Purchase Order Date,Клиента поръчка Дата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Пакет Тегло Детайли
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Моля изберете файл CSV
-DocType: Dropbox Backup,Send Backups to Dropbox,Изпрати на резервни копия на Dropbox
 DocType: Purchase Order,To Receive and Bill,За получаване и Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматично създаване Материал искане, ако количеството падне под това ниво"
 ,Item-wise Purchase Register,Точка-мъдър Покупка Регистрация
 DocType: Batch,Expiry Date,Срок На Годност
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","За да зададете ниво на повторна поръчка, т трябва да бъде покупка или производство Точка Точка"
 ,Supplier Addresses and Contacts,Доставчик Адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстор Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва всеки символ като $ и т.н. до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Получават от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
-DocType: Dropbox Backup,Send Notifications To,Изпращайте известия до
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Дата
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Сметка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Сметка {0} не съществува
 DocType: Account,Cash,Пари в брой
 DocType: Employee,Short biography for website and other publications.,Кратка биография на уебсайт и други публикации.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Моля, създайте Заплата структура за служител {0}"

diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index cc96c74..a88639f 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,বেতন মোড
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","আপনি ঋতু উপর ভিত্তি করে ট্র্যাক করতে চান তাহলে, মাসিক ডিস্ট্রিবিউশন নির্বাচন."
 DocType: Employee,Divorced,তালাকপ্রাপ্ত
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,সতর্কতা: একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,সতর্কতা: একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,আইটেম ইতিমধ্যে সিঙ্ক
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,আইটেম একটি লেনদেনের মধ্যে একাধিক বার যুক্ত করা সম্ভব
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,উপাদান যান {0} এই পাটা দাবি বাতিল আগে বাতিল
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ভোগ্যপণ্য
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,প্রথম পক্ষের ধরন নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,পাইন
 DocType: Item,Customer Items,গ্রাহক চলছে
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট তথ্য {1} একটি খতিয়ান হতে পারবেন না
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com আইটেমটি প্রকাশ করুন
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Approvers ত্যাগ
 DocType: Sales Partner,Dealer,ব্যাপারী
 DocType: Employee,Rented,ভাড়াটে
-DocType: About Us Settings,Website,ওয়েবসাইট
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,সংকুচন প্লাস sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,উপাদান অনুরোধ থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,উপাদান অনুরোধ থেকে
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} বৃক্ষ
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,কোন ফলাফল.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,আইনগত
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,আইনগত
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},প্রকৃত টাইপ ট্যাক্স সারিতে আইটেম রেট অন্তর্ভুক্ত করা যাবে না {0}
 DocType: C-Form,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,সেলাই
 DocType: Pricing Rule,Apply On,উপর প্রয়োগ
 DocType: Item Price,Multiple Item prices.,একাধিক আইটেম মূল্য.
 ,Purchase Order Items To Be Received,ক্রয় আদেশ আইটেম গ্রহন করা
 DocType: SMS Center,All Supplier Contact,সমস্ত সরবরাহকারী যোগাযোগ
 DocType: Quality Inspection Reading,Parameter,স্থিতিমাপ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,নিউ ছুটি আবেদন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার হিসাবে একই হতে হবে {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,নিউ ছুটি আবেদন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ব্যাংক খসড়া
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. গ্রাহক জ্ঞানী আইটেমটি কোড বজায় রাখা এবং তাদের কোড ব্যবহার করা এই অপশনটি স্থান উপর ভিত্তি করে এদের অনুসন্ধানযোগ্য করে
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,দেখান রুপভেদ
-DocType: Sales Invoice Item,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,নতুন পিওএস প্রোফাইল তৈরি করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 DocType: Purchase Invoice,Monthly,মাসিক
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ইমেল ঠিকানা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,প্রতিরক্ষা
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ইমেল ঠিকানা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
 DocType: Company,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,সারি # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,সারি # {0}:
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,মূল্য তালিকা নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,কাঠের
 DocType: Production Order Operation,Work In Progress,কাজ চলছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D মুদ্রন
 DocType: Employee,Holiday List,ছুটির তালিকা
 DocType: Time Log,Time Log,টাইম ইন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,হিসাবরক্ষক
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,হিসাবরক্ষক
 DocType: Cost Center,Stock User,স্টক ইউজার
 DocType: Company,Phone No,ফোন নম্বর
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ক্রিয়াকলাপ এর লগ, বিলিং সময় ট্র্যাকিং জন্য ব্যবহার করা যেতে পারে যে কার্য বিরুদ্ধে ব্যবহারকারীদের দ্বারা সঞ্চালিত."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},নতুন {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},নতুন {0}: # {1}
 ,Sales Partners Commission,সেলস পার্টনার্স কমিশন
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,অধিক 5 অক্ষর থাকতে পারে না সমাহার
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",মূল্য {0} {1} আইটেম হিসাবে রুপভেদ \ থেকে মুছে ফেলা যাবে না গুন এই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান.
-DocType: Print Settings,Classic,সর্বোত্তম
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,এটি একটি root অ্যাকাউন্ট এবং সম্পাদনা করা যাবে না.
 DocType: BOM,Operations,অপারেশনস
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},জন্য ছাড়ের ভিত্তিতে অনুমোদন সেট করা যায় না {0}
 DocType: Bin,Quantity Requested for Purchase,পরিমাণ ক্রয় জন্য অনুরোধ করা
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","দুই কলাম, পুরাতন নাম জন্য এক এবং নতুন নামের জন্য এক সঙ্গে CSV ফাইল সংযুক্ত"
 DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,কেজি
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,কেজি
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,একটি কাজের জন্য খোলা.
 DocType: Item Attribute,Increment,বৃদ্ধি
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,বিজ্ঞাপন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,বিজ্ঞাপন
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Employee,Married,বিবাহিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,মুদিখানা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ব্যাংক এন্ট্রি করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,অ্যাকাউন্টের ধরণ ওয়্যারহাউস যদি ওয়্যারহাউস বাধ্যতামূলক
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","চেক অর্ডার আবৃত্ত তাহলে, আবৃত্ত বা থামাতে সঠিক শেষ তারিখ করা টিক চিহ্ন তুলে দেয়া"
@@ -124,44 +119,39 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: Item,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / 60) * প্রকৃত অপারেশন টাইম
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
-DocType: Blog Post,Guest,অতিথি
 DocType: Quality Inspection,Get Specification Details,স্পেসিফিকেশন বিবরণ পান
 DocType: Lead,Interested,আগ্রহী
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,উপাদান বিল
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,উদ্বোধন
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,উদ্বোধন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},থেকে {0} থেকে {1}
 DocType: Item,Copy From Item Group,আইটেম গ্রুপ থেকে কপি
 DocType: Journal Entry,Opening Entry,প্রারম্ভিক ভুক্তি
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} বাধ্যতামূলক
 DocType: Stock Entry,Additional Costs,অতিরিক্ত খরচ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
-DocType: Standard Reply,Owner,মালিক
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
 DocType: Employee Education,Under Graduate,গ্রাজুয়েট অধীনে
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,টার্গেটের
 DocType: BOM,Total Cost,মোট খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,কার্য বিবরণ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,আবাসন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,আবাসন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,অ্যাকাউন্ট বিবৃতি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
 DocType: Expense Claim Detail,Claim Amount,দাবি পরিমাণ
 DocType: Employee,Mr,জনাব
-DocType: Custom Script,Client,মক্কেল
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
 DocType: Naming Series,Prefix,উপসর্গ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumable
 DocType: Upload Attendance,Import Log,আমদানি লগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,পাঠান
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,বার্ষিক বেতন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,বার্ষিক বেতন
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,স্টক খরচ
 DocType: Newsletter,Email Sent?,ইমেইল পাঠানো?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,সময় দেখান লগ
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,আইটেম {0} একটি ক্রয় আইটেমটি হতে হবে
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", টেমপ্লেট ডাউনলোড উপযুক্ত তথ্য পূরণ করুন এবং পরিবর্তিত ফাইল সংযুক্ত. আপনার নির্বাচিত সময়ের মধ্যে সব তারিখগুলি এবং কর্মচারী সমন্বয় বিদ্যমান উপস্থিতি রেকর্ড সঙ্গে, টেমপ্লেট আসবে"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,বিক্রয় চালান জমা হয় পরে আপডেট করা হবে.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","আইটেম রেট সারি {0} মধ্যে ট্যাক্স সহ, সারি করের {1} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,সোজা
 DocType: BOM Replace Tool,New BOM,নতুন BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ব্যাচ বিলিং জন্য সময় লগসমূহ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ঢালাই
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,নিউজলেটার ইতিমধ্যে পাঠানো হয়েছে
 DocType: Lead,Request Type,অনুরোধ টাইপ
 DocType: Leave Application,Reason,কারণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,সম্প্রচার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,সম্পাদন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,সিস্টেম ম্যানেজার হয়ে যাবে প্রথম ব্যবহারকারী (আপনি পরে তা পরিবর্তন করতে পারবেন).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,সম্প্রচার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,সম্পাদন
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,সিস্টেম ম্যানেজার হয়ে যাবে প্রথম ব্যবহারকারী (আপনি পরে তা পরিবর্তন করতে পারবেন).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
 DocType: Serial No,Maintenance Status,রক্ষণাবেক্ষণ অবস্থা
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,চলছে এবং প্রাইসিং
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,চলছে এবং প্রাইসিং
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},জন্ম থেকে অর্থবছরের মধ্যে হওয়া উচিত. জন্ম থেকে Assuming = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"আপনি মূল্যায়ন তৈরি করা হয়, যাদের জন্য কর্মী নির্বাচন."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},কেন্দ্র {0} কোম্পানি অন্তর্গত নয় উড়ানের তালিকাটি {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,মূল্যতালিকা কেনা বা বিক্রি জন্য প্রযোজ্য হতে হবে
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},ইনস্টলেশনের তারিখ আইটেমের জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),মূল্য তালিকা রেট বাট্টা (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,শুরু
-DocType: User,First Name,প্রথম নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,সম্পূর্ণ ছাঁচ কাস্টিং
 DocType: Offer Letter,Select Terms and Conditions,নির্বাচন শর্তাবলী
 DocType: Production Planning Tool,Sales Orders,বিক্রয় আদেশ
 DocType: Purchase Taxes and Charges,Valuation,মাননির্ণয়
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,ব্যাংক হিসাব
 DocType: Leave Type,Allow Negative Balance,ঋণাত্মক ব্যালান্স মঞ্জুরি
 DocType: Selling Settings,Default Territory,ডিফল্ট টেরিটরি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,টিভি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,টিভি
 DocType: Production Order Operation,Updated via 'Time Log',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},অ্যাকাউন্ট {0} কোম্পানি অন্তর্গত নয় {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
 DocType: Customer Group,Mention if non-standard receivable account applicable,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য যদি প্রযোজ্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,গুদাম জন্য জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,পেয়েছি
 DocType: Sales Partner,Reseller,রিসেলার
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,কোম্পানী লিখুন দয়া করে
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
 DocType: Newsletter List,Total Subscribers,মোট গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,যোগাযোগের নাম
+,Contact Name,যোগাযোগের নাম
 DocType: Production Plan Item,SO Pending Qty,মুলতুবি Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,কেনার জন্য অনুরোধ জানান.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ডাবল হাউজিং
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,প্রতি বছর পত্রাদি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,প্রতি বছর পত্রাদি
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 DocType: Time Log,Will be updated when batched.,Batched যখন আপডেট করা হবে.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
-DocType: Bulk Email,Message,বার্তা
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
-DocType: Dropbox Backup,Dropbox Access Key,ড্রপবক্স অ্যাক্সেস কী
 DocType: Payment Tool,Reference No,রেফারেন্স কোন
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,বার্ষিক
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
 DocType: Material Request Item,Min Order Qty,ন্যূনতম আদেশ Qty
 DocType: Lead,Do Not Contact,যোগাযোগ না
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,সব আবর্তক চালান ট্র্যাকিং জন্য অনন্য আইডি. এটি জমা দিতে হবে নির্মাণ করা হয়.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,সফ্টওয়্যার ডেভেলপার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ Qty
 DocType: Pricing Rule,Supplier Type,সরবরাহকারী ধরন
 DocType: Item,Publish in Hub,হাব প্রকাশ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ওয়্যার মার্জন
 DocType: Employee,Relation,সম্পর্ক
 DocType: Shipping Rule,Worldwide Shipping,বিশ্বব্যাপী শিপিং
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,গ্রাহকরা থেকে নিশ্চিত আদেশ.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 DocType: Maintenance Schedule,Generate Schedule,সূচি নির্মাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ব্যয় হেড
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,প্রথম অভিযোগ টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,সর্বশেষ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,আপনার ভাষা নির্বাচন করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,সর্বোচ্চ 5 টি অক্ষর
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",উত্পাদনের অবাধ্য সময় লগ সৃষ্টি নিষ্ক্রিয় করা হয়. অপারেশনস উত্পাদনের আদেশের বিরুদ্ধে ট্র্যাক করা হবে না
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,মধ্যে variant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,আইটেম {0} পরিষেবা আইটেম হতে হবে
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
-DocType: DocType,Administrator,প্রশাসক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,লেজার তুরপুন
-DocType: Stock UOM Replace Utility,New Stock UOM,নতুন শেয়ার UOM
 DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি
 DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
-DocType: Communication,Closed,বন্ধ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে.
 DocType: Lead,Industry,শিল্প
 DocType: Employee,Job Profile,চাকরি বৃত্তান্ত
 DocType: Newsletter,Newsletter,নিউজলেটার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,স্তম্ভগ্রীবা
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,আইটেম আপডেট করা হয়
-DocType: Async Task,System Manager,সিস্টেম ম্যানেজার
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
 DocType: Sales Invoice Item,Delivery Note,চালান পত্র
-DocType: Dropbox Backup,Allow Dropbox Access,ড্রপবক্স ব্যবহারের অনুমতি
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,করের আপ সেট
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Workstation,Rent Cost,ভাড়া খরচ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,মাস এবং বছর নির্বাচন করুন
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,কোম্পানি ইমেইল
 DocType: GL Entry,Debit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা ডেবিট পরিমাণ
 DocType: Shipping Rule,Valid for Countries,দেশ সমূহ জন্য বৈধ
-DocType: Workflow State,Refresh,সতেজ করা
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","মুদ্রা একক, রূপান্তর হার, আমদানি মোট আমদানি সর্বোমোট ইত্যাদি সকল আমদানি সম্পর্কিত ক্ষেত্র কেনার রসিদ, সরবরাহকারী উদ্ধৃতি, ক্রয় চালান, ক্রয় আদেশ ইত্যাদি পাওয়া যায়"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,বিবেচিত মোট আদেশ
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, আদেয়ক, ক্রয় চালান, উত্পাদনের আদেশ, ক্রয় আদেশ, কেনার রসিদ, বিক্রয় চালান, বিক্রয় আদেশ, শেয়ার এন্ট্রি, শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড পাওয়া যায়"
 DocType: Item Tax,Tax Rate,করের হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,পছন্দ করো
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,পছন্দ করো
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","আইটেম: {0} ব্যাচ প্রজ্ঞাময়, পরিবর্তে ব্যবহার স্টক এণ্ট্রি \ শেয়ার রিকনসিলিয়েশন ব্যবহার মিলন করা যাবে না পরিচালিত"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,কেনার রসিদ দাখিল করতে হবে
-DocType: Stock UOM Replace Utility,Current Stock UOM,বর্তমান স্টক UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,আপনার ইমেইল ঠিকানা
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ওয়াটার জেট কাটিং
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
 ,Finished Goods,সমাপ্ত পণ্য
 DocType: Delivery Note,Instructions,নির্দেশনা
 DocType: Quality Inspection,Inspected By,পরিদর্শন
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে. তারা গ্রাহকের / সরবরাহকারী কর্তা থেকে সরাসরি তৈরি করা হয়.
 DocType: Currency Exchange,Currency Exchange,টাকা অদলবদল
 DocType: Purchase Invoice Item,Item Name,আইটেম নাম
+DocType: Authorization Rule,Approving User  (above authorized value),(কঠিন মূল্য উপরে) ব্যবহারকারী অনুমোদন
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ক্রেডিট ব্যালেন্স
 DocType: Employee,Widowed,পতিহীনা
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",চলছে অভিক্ষিপ্ত Qty এবং সর্বনিম্ন ক্রম Qty উপর ভিত্তি করে সব গুদাম বিবেচনা যা &quot;স্টক আউট&quot; হয় অনুরোধ করা
@@ -378,24 +346,23 @@
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
 DocType: Workstation,Consumable Cost,Consumable খরচ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,মেডিকেল
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,হারানোর জন্য কারণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,টিউব beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 DocType: Employee,Single,একক
 DocType: Issue,Attachment,ক্রোক
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,বাজেট গ্রুপ খরচ কেন্দ্র স্থাপন করা যাবে না
 DocType: Account,Cost of Goods Sold,বিক্রি সামগ্রীর খরচ
 DocType: Purchase Invoice,Yearly,বাত্সরিক
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
 DocType: Journal Entry Account,Sales Order,বিক্রয় আদেশ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,গড়. হার বিক্রী
 DocType: Purchase Order,Start date of current order's period,বর্তমান অর্ডারের সময়সীমার তারিখ শুরু
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},পরিমাণ সারিতে একটি ভগ্নাংশ হতে পারবেন না {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},পরিমাণ সারিতে একটি ভগ্নাংশ হতে পারবেন না {0}
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
-DocType: Delivery Note,% Installed,% ইনস্টল
+DocType: Delivery Note,% Installed,% ইনস্টল করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: BOM,Item Desription,আইটেম Desription
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,দলটির
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,স্বয়ংক্রিয়ভাবে FIFO উপর ভিত্তি করে আমরা সিরিয়াল সেট
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,চেক সরবরাহকারী চালান নম্বর স্বতন্ত্রতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,অতীত
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;কেস নং&#39; &#39;কেস নং থেকে&#39; কম হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,মুনাফা বিহীন
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','কেস নংপর্যন্ত' কখনই 'কেস নং থেকে' এর চেয়ে কম হতে পারে না
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,মুনাফা বিহীন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,শুরু না
 DocType: Lead,Channel Partner,চ্যানেল পার্টনার
 DocType: Account,Old Parent,প্রাচীন মূল
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,হলিডে মাস্টার.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,শেল ঢালাই
 DocType: Material Request Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
 DocType: BOM,Costing,খোয়াতে
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,মোট Qty
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,পরিসীমা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,সিকিউরিটিজ এবং আমানত
 DocType: Features Setup,Imports,আমদানি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,আঠালো bonding
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Job Opening,Description of a Job Opening,একটি কাজের খোলার বর্ণনা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,উপস্থিতি দলিল.
 DocType: Bank Reconciliation,Journal Entries,জার্নাল এন্ট্রি
 DocType: Sales Order Item,Used for Production Plan,উৎপাদন পরিকল্পনা জন্য ব্যবহৃত
-DocType: System Settings,Loading...,লোড হচ্ছে ...
-DocType: DocField,Password,পাসওয়ার্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,নিলীন এজাহার মডেলিং
 DocType: Manufacturing Settings,Time Between Operations (in mins),(মিনিট) অপারেশনস মধ্যে সময়
 DocType: Customer,Buyer of Goods and Services.,পণ্য ও সার্ভিসেস ক্রেতা.
 DocType: Journal Entry,Accounts Payable,পরিশোধযোগ্য হিসাব
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,গ্রাহক
-apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;বিদ্যমান না
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" বিদ্যমান না"
 DocType: Pricing Rule,Valid Upto,বৈধ পর্যন্ত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,আপনার গ্রাহকদের কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,সরাসরি আয়
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,প্রশাসনিক কর্মকর্তা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,প্রশাসনিক কর্মকর্তা
 DocType: Payment Tool,Received Or Paid,গৃহীত বা প্রদত্ত
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Stock Entry,Difference Account,পার্থক্য অ্যাকাউন্ট
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,অঙ্গরাগ
-DocType: DocField,Type,শ্রেণী
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
-DocType: Communication,Subject,বিষয়
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 ,Serial No Warranty Expiry,সিরিয়াল কোন পাটা মেয়াদ উত্তীর্ন
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,আইটেম
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ম্যানেজিং প্রণীত
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,নতুন UOM টাইপ পূর্ণ সংখ্যা অন্তর্ভুক্ত হবেন না হবে
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ম্যানেজিং প্রণীত
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,আসবাবপত্র ও দ্রব্যাদি
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,হারে যা মূল্যতালিকা মুদ্রার এ কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,উপাদান প্রয়োজন
 DocType: Company,Delete Company Transactions,কোম্পানি লেনদেন মুছে
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,আইটেম {0} ক্রয় করা হয় না আইটেম
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;বিজ্ঞপ্তি \ ইমেল ঠিকানা&#39; একটি অবৈধ ইমেল ঠিকানা
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,মোট বিলিং এই বছর:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,মোট বিলিং এই বছর:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","মুছে ফেলা যায় না সিরিয়াল কোন {0}, এটা শেয়ার লেনদেনের ক্ষেত্রে ব্যবহার করা হয় যেমন"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),বন্ধ (যোগাযোগ Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),বন্ধ (যোগাযোগ Cr)
 DocType: Serial No,Warranty Period (Days),পাটা কাল (দিন)
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 ,Pending Qty,মুলতুবি Qty
 DocType: Job Applicant,Thread HTML,থ্রেড এইচটিএমএল
 DocType: Company,Ignore,উপেক্ষা করা
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},এসএমএস নিম্নলিখিত সংখ্যা পাঠানো: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
 DocType: Pricing Rule,Valid From,বৈধ হবে
 DocType: Sales Invoice,Total Commission,মোট কমিশন
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** মাসিক বন্টন ** আপনার ব্যবসা যদি আপনি ঋতু আছে, যদি আপনি মাস জুড়ে আপনার বাজেটের বিতরণ করতে সাহায্য করে. ** এই ডিস্ট্রিবিউশন ব্যবহার একটি বাজেট বিতরণ ** কস্ট সেন্টারে ** এই ** মাসিক বন্টন সেট করুন"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
-DocType: About Us Settings,Website Manager,ওয়েবসাইট ম্যানেজার
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,অর্থবছরের শুরুর তারিখ অর্থবছরের শেষ তারিখ তার চেয়ে অনেক বেশী করা উচিত হবে না
 DocType: Warranty Claim,Resolution,সমাধান
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},বিতরণ: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,বিলিং এবং বিলি অবস্থা
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,পূর্ববর্তী
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,সেলস প্রত্যাবর্তন
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,আপনি উত্পাদনের আদেশ তৈরি করতে চান যা থেকে বিক্রয় আদেশ নির্বাচন.
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,বেতন উপাদান.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,সম্ভাব্য গ্রাহকদের ডাটাবেস.
+DocType: Authorization Rule,Customer or Item,গ্রাহক বা আইটেম
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,গ্রাহক ডাটাবেস.
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,গড়াগড়ি
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. আপনি একটি ভিন্ন ডিফল্ট UOM ব্যবহার করার জন্য একটি নতুন আইটেম তৈরি করতে হবে.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
-DocType: Event,Wednesday,বুধবার
 DocType: Sales Invoice,Customer's Vendor,গ্রাহকের বিক্রেতার
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,উৎপাদন অর্ডার বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,প্রস্তাবনা লিখন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,প্রস্তাবনা লিখন
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,অন্য বিক্রয় ব্যক্তি {0} একই কর্মচারী আইডি দিয়ে বিদ্যমান
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},নেতিবাচক শেয়ার ত্রুটি ({6}) আইটেম জন্য {0} গুদাম {1} উপর {2} {3} মধ্যে {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,অর্থবছরের কোম্পানি
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,ডিফল্ট খোয়াতে হার
 DocType: Maintenance Schedule,Maintenance Schedule,রক্ষণাবেক্ষণ সময়সূচী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ড্রপবক্স পাইথন মডিউল ইনস্টল করুন
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,কেনার রসিদ থেকে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ম্যানেজার
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,কেনার রসিদ থেকে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
 DocType: SMS Settings,Receiver Parameter,রিসিভার পরামিতি
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,এবং &#39;গ্রুপ দ্বারা&#39; &#39;উপর ভিত্তি করে&#39; একই হতে পারে না
 DocType: Sales Person,Sales Person Targets,সেলস পারসন লক্ষ্যমাত্রা
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,থেকে
-apps/frappe/frappe/templates/base.html +145,Please enter email address,ইমেল ঠিকানা লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,গঠন শেষ টিউব
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,গ্রুপ রূপান্তর
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,স্থায়ী দিন
 DocType: Sales Invoice,Packing List,প্যাকিং তালিকা
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ক্রয় আদেশ সরবরাহকারীদের দেওয়া.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,প্রকাশক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,প্রকাশক
 DocType: Activity Cost,Projects User,প্রকল্পের ব্যবহারকারীর
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ক্ষয়প্রাপ্ত
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} চালান বিবরণ টেবিল মধ্যে পাওয়া যায়নি
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} চালান বিবরণ টেবিল মধ্যে পাওয়া যায়নি
 DocType: Company,Round Off Cost Center,খরচ কেন্দ্র সুসম্পন্ন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ যান {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 DocType: Material Request,Material Transfer,উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),খোলা (ড)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},পোস্ট টাইমস্ট্যাম্প পরে হবে {0}
-apps/frappe/frappe/config/setup.py +59,Settings,সেটিংস
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ল্যান্ড খরচ কর ও শুল্ক
 DocType: Production Order Operation,Actual Start Time,প্রকৃত আরম্ভের সময়
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,অধিক
 DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,পুনঃনামকরণ
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,নমন
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,অনুমতি
 DocType: Journal Entry,Bill No,বিল কোন
 DocType: Purchase Invoice,Quarterly,ত্রৈমাসিক
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
 DocType: Account,Accounts,অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,মার্কেটিং
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,স্ট্রেইট গা থেকে লোম ছাঁটা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,মার্কেটিং
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,তাদের সিরিয়াল টি উপর ভিত্তি করে বিক্রয় ও ক্রয় নথিতে আইটেম ট্র্যাক করতে. এই প্রোডাক্ট ওয়ারেন্টি বিবরণ ট্র্যাক ব্যবহার করতে পারেন.
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,পরিত্যক্ত গুদাম regected আইটেমটি বিরুদ্ধে বাধ্যতামূলক
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 DocType: Employee,Provide email id registered in company,কোম্পানি নিবন্ধিত ইমেইল আইডি প্রদান
 DocType: Hub Settings,Seller City,বিক্রেতা সিটি
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,বৃক্ষ ধরন
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,পরিমাণ এবং ওয়্যারহাউস
 DocType: Sales Invoice,Commission Rate (%),কমিশন হার (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ভাউচার বিরুদ্ধে প্রকার বিক্রয় আদেশ এক, বিক্রয় চালান বা জার্নাল এন্ট্রিতে হতে হবে"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,বিনিময় হার খুঁজে পেতে অসমর্থ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,বিমান উড্ডয়ন এলাকা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,স্বাগত
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,বিমান উড্ডয়ন এলাকা
 DocType: Journal Entry,Credit Card Entry,ক্রেডিট কার্ড এন্ট্রি
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,টাস্ক বিষয়
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,পণ্য সরবরাহকারী থেকে প্রাপ্ত.
-DocType: Communication,Open,খোলা
 DocType: Lead,Campaign Name,প্রচারাভিযান নাম
 ,Reserved,সংরক্ষিত
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} একটি স্টক আইটেম নয়
 DocType: Mode of Payment Account,Default Account,ডিফল্ট একাউন্ট
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
-DocType: Contact Us Settings,Address Title,ঠিকানা শিরোনাম
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
 ,Sales Person Target Variance Item Group-Wise,সেলস পারসন উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-DocType: Dropbox Backup,Daily,দৈনিক
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Delivery Note,Customer's Purchase Order No,গ্রাহকের ক্রয় আদেশ কোন
 DocType: Employee,Cell Number,মোবাইল নম্বর
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,অটো উপাদান অনুরোধ উত্পন্ন
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,নষ্ট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,শক্তি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,মাসিক বেতন বিবৃতি.
 DocType: Item Group,Website Specifications,ওয়েবসাইট উল্লেখ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,নতুন একাউন্ট
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: থেকে {0} টাইপ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,হিসাব থেকে পাতার নোড বিরুদ্ধে তৈরি করা যেতে পারে. দলের বিরুদ্ধে সাজপোশাকটি অনুমতি দেওয়া হয় না.
-DocType: ToDo,High,উচ্চ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
-DocType: User,Male,পুরুষ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},আইটেম জন্য প্রয়োজন কেনার রসিদ নম্বর {0}
 DocType: Item Attribute Value,Item Attribute Value,আইটেম মান গুন
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,সেলস প্রচারণা.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -684,17 +624,16 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","সমস্ত বিক্রয় লেনদেন প্রয়োগ করা যেতে পারে যে স্ট্যান্ডার্ড ট্যাক্স টেমপ্লেট. এই টেমপ্লেটটি ইত্যাদি #### আপনি সমস্ত জন্য স্ট্যান্ডার্ড ট্যাক্স হার হবে এখানে নির্ধারণ করহার দ্রষ্টব্য &quot;হ্যান্ডলিং&quot;, ট্যাক্স মাথা এবং &quot;কোটি টাকার&quot;, &quot;বীমা&quot; মত অন্যান্য ব্যয় / আয় মাথা তালিকায় থাকতে পারে ** চলছে **. বিভিন্ন হারে আছে ** যে ** আইটেম আছে, তাহলে তারা ** আইটেম ট্যাক্স যোগ করা হবে ** ** ** আইটেম মাস্টার টেবিল. #### কলাম বর্ণনা 1. গণনা টাইপ: - এই (যে মৌলিক পরিমাণ যোগফল) ** একুন ** উপর হতে পারে. - ** পূর্ববর্তী সারি মোট / পরিমাণ ** উপর (ক্রমসঞ্চিত করের বা চার্জের জন্য). যদি আপনি এই অপশনটি নির্বাচন করা হলে, ট্যাক্স পরিমাণ অথবা মোট (ট্যাক্স টেবিলে) পূর্ববর্তী সারির শতকরা হিসেবে প্রয়োগ করা হবে. - ** ** প্রকৃত (হিসাবে উল্লেখ করেছে). 2. অ্যাকাউন্ট প্রধানঃ এই ট্যাক্স 3. খরচ কেন্দ্র বুকিং করা হবে যার অধীনে অ্যাকাউন্ট খতিয়ান: ট্যাক্স / চার্জ (শিপিং মত) একটি আয় হয় বা ব্যয় যদি এটি একটি খরচ কেন্দ্র বিরুদ্ধে বুক করা প্রয়োজন. 4. বিবরণ: ট্যাক্স বর্ণনা (যে চালানে / কোট ছাপা হবে). 5. রেট: ট্যাক্স হার. 6. পরিমাণ: ট্যাক্স পরিমাণ. 7. মোট: এই বিন্দু ক্রমপুঞ্জিত মোট. 8. সারি প্রবেশ করান: উপর ভিত্তি করে যদি &quot;পূর্ববর্তী সারি মোট&quot; আপনি এই গণনা জন্য একটি বেস (ডিফল্ট পূর্ববর্তী সারির হয়) হিসাবে গ্রহণ করা হবে, যা সারি সংখ্যা নির্বাচন করতে পারবেন. 9. মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা ?: আপনি এই পরীক্ষা, এটা এই ট্যাক্স আইটেমটি টেবিলের নীচে দেখানো হবে না, কিন্তু আপনার প্রধান আইটেমটি টেবিলে মৌলিক হার মধ্যে অন্তর্ভুক্ত করা হবে. আপনি গ্রাহকদের একটি ফ্ল্যাট (সব করের সমেত) মূল্য মূল্য দিতে চান যেখানে এই দরকারী."
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","সমস্ত বিক্রয় লেনদেন প্রয়োগ করা যেতে পারে যে স্ট্যান্ডার্ড ট্যাক্স টেমপ্লেট. এই টেমপ্লেটটি ইত্যাদি #### আপনি সমস্ত জন্য স্ট্যান্ডার্ড ট্যাক্স হার হবে এখানে নির্ধারণ করহার দ্রষ্টব্য &quot;হ্যান্ডলিং&quot;, ট্যাক্স মাথা এবং &quot;কোটি টাকার&quot;, &quot;বীমা&quot; মত অন্যান্য ব্যয় / আয় মাথা তালিকায় থাকতে পারে ** চলছে **. বিভিন্ন হারে আছে ** যে ** আইটেম আছে, তাহলে তারা ** আইটেম ট্যাক্স যোগ করা হবে ** ** ** আইটেম মাস্টার টেবিল. #### কলাম বর্ণনা 1. গণনা টাইপ: - এই (যে মৌলিক পরিমাণ যোগফল) ** একুন ** উপর হতে পারে. - ** পূর্ববর্তী সারি মোট / পরিমাণ ** উপর (ক্রমসঞ্চিত করের বা চার্জের জন্য). যদি আপনি এই অপশনটি নির্বাচন করা হলে, ট্যাক্স পরিমাণ অথবা মোট (ট্যাক্স টেবিলে) পূর্ববর্তী সারির শতকরা হিসেবে প্রয়োগ করা হবে. - ** ** প্রকৃত (হিসাবে উল্লেখ করেছে). 2. অ্যাকাউন্ট প্রধানঃ এই ট্যাক্স 3. খরচ কেন্দ্র বুকিং করা হবে যার অধীনে অ্যাকাউন্ট খতিয়ান: ট্যাক্স / চার্জ (শিপিং মত) একটি আয় হয় বা ব্যয় যদি এটি একটি খরচ কেন্দ্র বিরুদ্ধে বুক করা প্রয়োজন. 4. বিবরণ: ট্যাক্স বর্ণনা (যে চালানে / কোট ছাপা হবে). 5. রেট: ট্যাক্স হার. 6. পরিমাণ: ট্যাক্স পরিমাণ. 7. মোট: এই বিন্দু ক্রমপুঞ্জিত মোট. 8. সারি প্রবেশ করান: উপর ভিত্তি করে যদি &quot;পূর্ববর্তী সারি মোট&quot; আপনি এই গণনা জন্য একটি বেস (ডিফল্ট পূর্ববর্তী সারির হয়) হিসাবে গ্রহণ করা হবে, যা সারি সংখ্যা নির্বাচন করতে পারবেন. 9. মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা ?: আপনি এই পরীক্ষা, এটা এই ট্যাক্স আইটেমটি টেবিলের নীচে দেখানো হবে না, কিন্তু আপনার প্রধান আইটেমটি টেবিলে মৌলিক হার মধ্যে অন্তর্ভুক্ত করা হবে. আপনি গ্রাহকদের একটি ফ্ল্যাট (সব করের সমেত) মূল্য মূল্য দিতে চান যেখানে এই দরকারী."
 DocType: Employee,Bank A/C No.,ব্যাংক / সি নং
 DocType: Expense Claim,Project,প্রকল্প
 DocType: Quality Inspection Reading,Reading 7,7 পঠন
 DocType: Address,Personal,ব্যক্তিগত
 DocType: Expense Claim Detail,Expense Claim Type,ব্যয় দাবি প্রকার
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,শপিং কার্ট জন্য ডিফল্ট সেটিংস
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","জার্নাল এন্ট্রি {0} এটা এই চালান আগাম টানা উচিত যদি {1}, পরীক্ষা আদেশের বিরুদ্ধে সংযুক্ত করা হয়."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,বায়োটেকনোলজি
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","জার্নাল এন্ট্রি {0} এটা এই চালান আগাম টানা উচিত যদি {1}, পরীক্ষা আদেশের বিরুদ্ধে সংযুক্ত করা হয়."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,বায়োটেকনোলজি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,অফিস রক্ষণাবেক্ষণ খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Account,Liability,দায়
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Process Payroll,Send Email,বার্তা পাঠাও
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,অনুমতি নেই
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"আইটেম মাধ্যমে বিতরণ করা হয় না, কারণ &#39;আপডেট স্টক চেক করা যাবে না {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,আমরা
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,আমরা
 DocType: Item,Items with higher weightage will be shown higher,উচ্চ গুরুত্ব দিয়ে চলছে উচ্চ দেখানো হবে
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ব্যাংক পুনর্মিলন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,আমার চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,আমার চালান
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,কোন কর্মচারী পাওয়া
 DocType: Purchase Order,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;বিক্রয় বিন্দু&quot; বৈশিষ্ট্য সক্রিয় করুন
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
-DocType: Comment,Reference Name,রেফারেন্স নাম
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: Sales Invoice Item,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ বিক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
 DocType: Production Order,Item To Manufacture,আইটেম উত্পাদনপ্রণালী
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,স্থায়ী ছাঁচ কাস্টিং
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} অবস্থা {2} হয়
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 DocType: Sales Order Item,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
 DocType: Newsletter,Newsletter Manager,নিউজলেটার ম্যানেজার
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;খোলা&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',' শুরু'
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
 DocType: Expense Claim,Expenses,খরচ
 DocType: Item Variant Attribute,Item Variant Attribute,আইটেম ভেরিয়েন্ট গুন
 ,Purchase Receipt Trends,কেনার রসিদ প্রবণতা
 DocType: Appraisal,Select template from which you want to get the Goals,আপনি গোল পেতে চান যা থেকে টেম্পলেট নির্বাচন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,গবেষণা ও উন্নয়ন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,গবেষণা ও উন্নয়ন
 ,Amount to Bill,বিল পরিমাণ
 DocType: Company,Registration Details,রেজিস্ট্রেশন বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ধর্মঘট
 DocType: Item,Re-Order Qty,পুনরায় আদেশ Qty
 DocType: Leave Block List Date,Leave Block List Date,ব্লক তালিকা তারিখ ত্যাগ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},পাঠাতে তফসিলি {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,বিক্রয় বিন্দু
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},এগিয়ে বহন করা যাবে না {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 DocType: Account,Balance must be,ব্যালেন্স থাকতে হবে
 DocType: Hub Settings,Publish Pricing,প্রাইসিং প্রকাশ
 DocType: Notification Control,Expense Claim Rejected Message,ব্যয় দাবি প্রত্যাখ্যান পাঠান
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,উত্কৃষ্ট
 ,Available Qty,প্রাপ্তিসাধ্য Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,পূর্ববর্তী সারি মোট উপর
 DocType: Salary Slip,Working Days,কর্মদিবস
 DocType: Serial No,Incoming Rate,ইনকামিং হার
 DocType: Packing Slip,Gross Weight,মোট ওজন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: HR Settings,Include holidays in Total no. of Working Days,কোন মোট মধ্যে ছুটির অন্তর্ভুক্ত. কার্যদিবসের
 DocType: Job Applicant,Hold,রাখা
 DocType: Employee,Date of Joining,যোগদান তারিখ
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,দেখুন সদস্যবৃন্দ
 DocType: Purchase Invoice Item,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ঘষিয়া তুলিয়া ফেলিতে সক্ষম লোকসান
 DocType: Employee,Ms,শ্রীমতি
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
 DocType: Salary Slip,Leave Encashment Amount,নগদীকরণ পরিমাণ ত্যাগ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,প্রয়োজনীয় Qty
 DocType: Bank Reconciliation,Total Amount,মোট পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ইন্টারনেট প্রকাশনা
 DocType: Production Planning Tool,Production Orders,উত্পাদনের আদেশ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ব্যালেন্স মূল্য
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,বিক্রয় মূল্য তালিকা
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,আইটেম সিঙ্ক প্রকাশ করুন
-DocType: GL Entry,Account Currency,অ্যাকাউন্ট মুদ্রা
+DocType: Bank Reconciliation,Account Currency,অ্যাকাউন্ট মুদ্রা
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,কোম্পানি এ সুসম্পন্ন অ্যাকাউন্ট উল্লেখ করতে হবে
 DocType: Purchase Receipt,Range,পরিসর
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Features Setup,Item Barcode,আইটেম বারকোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Address,Shop,দোকান
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
 DocType: Employee,Permanent Address Is,স্থায়ী ঠিকানা
 DocType: Production Order Operation,Operation completed for how many finished goods?,অপারেশন কতগুলি সমাপ্ত পণ্য জন্য সম্পন্ন?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ব্র্যান্ড
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ব্র্যান্ড
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}.
 DocType: Employee,Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
@@ -832,67 +766,62 @@
 DocType: Payment Tool,Paid,প্রদত্ত
 DocType: Salary Slip,Total in words,কথায় মোট
 DocType: Material Request Item,Lead Time Date,সময় লিড তারিখ
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ডের জন্য তৈরি করা হয় না
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,আবশ্যক. হয়তো মুদ্রা বিনিময় রেকর্ড এজন্য তৈরি করা হয়নি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;পণ্য সমষ্টি&#39; আইটেম, গুদাম, সিরিয়াল না এবং ব্যাচ জন্য কোন &#39;প্যাকিং তালিকা টেবিল থেকে বিবেচনা করা হবে. ওয়ারহাউস ও ব্যাচ কোন কোন &#39;পণ্য সমষ্টি&#39; আইটেমের জন্য সব প্যাকিং আইটেম জন্য একই থাকে, যারা মান প্রধান আইটেম টেবিলে সন্নিবেশ করানো যাবে, মান মেজ বোঁচকা তালিকা &#39;থেকে কপি করা হবে."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,গ্রাহকদের চালানে.
 DocType: Purchase Invoice Item,Purchase Order Item,আদেশ আইটেম ক্রয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,পরোক্ষ আয়
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,সেট প্রদান পরিমাণ = বকেয়া পরিমাণ
-DocType: Contact Us Settings,Address Line 1,ঠিকানা লাইন 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,অনৈক্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,কোমপানির নাম
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,অনৈক্য
+,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,সব সাহায্য ভিডিওর একটি তালিকা দেখুন
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ব্যবহারকারী লেনদেনের মূল্য তালিকা হার সম্পাদন করার অনুমতি প্রদান
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,রাসায়নিক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,রাসায়নিক
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 DocType: Process Payroll,Select Payroll Year and Month,বেতনের বছর এবং মাস নির্বাচন করুন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",উপযুক্ত গ্রুপ (সাধারণত তহবিলের আবেদন&gt; চলতি সম্পদ&gt; ব্যাংক অ্যাকাউন্ট থেকে যান এবং টাইপ) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করুন &quot;ব্যাংক&quot;
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
-DocType: Comment,Unsubscribed,সদস্যতামুক্তি
 DocType: Opportunity,Walk In,প্রবেশ
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial খরচ কেন্দ্র বৃক্ষ.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,স্থানান্তরিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,সাদা
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,সাদা
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,তোমার ছবি সংযুক্ত
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,করা
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,তোমার ছবি সংযুক্ত
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,করা
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
-DocType: Workflow State,Stop,থামুন
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,আমার ট্রলি
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},যাতে টাইপ এক হতে হবে {0}
 DocType: Lead,Next Contact Date,পরের যোগাযোগ তারিখ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty খোলা
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,বিকল্প তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,বিকল্প তহবিল
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},জন্য Qty {0}
 DocType: Leave Application,Leave Application,আবেদন কর
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
 DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
 DocType: Company,If Monthly Budget Exceeded (for expense account),মাসিক বাজেট (ব্যয় অ্যাকাউন্টের জন্য) অতিক্রম করেছে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ছাঁটাই
 DocType: Workstation,Net Hour Rate,নিট ঘন্টা হার
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ল্যান্ড খরচ কেনার রসিদ
 DocType: Company,Default Terms,ডিফল্ট শর্তাবলী
 DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লিপ আইটেম
 DocType: POS Profile,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ফাইলিং
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ডিসকাউন্ট
 DocType: Features Setup,Purchase Discounts,ক্রয় ডিসকাউন্ট
 DocType: Workstation,Wages,মজুরি
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- &#39;status&#39; এবং সংরক্ষণ আপডেট করুন
 DocType: Serial No,Creation Document No,ক্রিয়েশন ডকুমেন্ট
 DocType: Issue,Issue,ইস্যু
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","আইটেম রূপের জন্য আরোপ করা. যেমন, আকার, রঙ ইত্যাদি"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,অ্যাকাউন্ট কোম্পানি সঙ্গে মেলে না
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","আইটেম রূপের জন্য আরোপ করা. যেমন, আকার, রঙ ইত্যাদি"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ওয়্যারহাউস
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
 DocType: BOM Operation,Operation,অপারেশন
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,সেলস খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,স্ট্যান্ডার্ড রাজধানীতে
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,শেয়ার দাখিলা তৈরীর
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
 DocType: Item,Default Supplier,ডিফল্ট সরবরাহকারী
 DocType: Manufacturing Settings,Over Production Allowance Percentage,উত্পাদনের ভাতা শতকরা ওভার
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,সময় লগসমূহ মাধ্যমে আপডেট
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,গড় বয়স
 DocType: Opportunity,Your sales person who will contact the customer in future,ভবিষ্যতে গ্রাহকের পরিচিতি হবে যারা আপনার বিক্রয় ব্যক্তির
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 DocType: Company,Default Currency,ডিফল্ট মুদ্রা
 DocType: Contact,Enter designation of this Contact,এই যোগাযোগ উপাধি লিখুন
-DocType: Contact Us Settings,Address,ঠিকানা
 DocType: Expense Claim,From Employee,কর্মী থেকে
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
 DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ট্রি করতে
 DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি
 DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,পরিবহন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,পরিবহন
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,এবং বছর:
 DocType: Email Digest,Annual Expense,বার্ষিক ব্যয়
 DocType: SMS Center,Total Characters,মোট অক্ষর
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,সি-ফরম চালান বিস্তারিত
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,পেমেন্ট রিকনসিলিয়েশন চালান
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,অবদান%
 DocType: Item,website page link,ওয়েবসাইট পৃষ্ঠার লিঙ্ক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,প্রথম ব্যবহারের জন্য সিস্টেম প্রস্তুত করা যাক.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,আপনার অবগতির জন্য কোম্পানি রেজিস্ট্রেশন নম্বর. ট্যাক্স নম্বর ইত্যাদি
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,সময় লগসমূহ নির্বাচন করুন এবং একটি নতুন বিক্রয় চালান তৈরি জমা দিন.
@@ -979,15 +907,13 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
 DocType: Sales Invoice Advance,Sales Invoice Advance,বিক্রয় চালান অগ্রিম
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,কিছুই অনুরোধ করতে
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;প্রকৃত আরম্ভের তারিখ&#39; &#39;প্রকৃত শেষ তারিখ&#39; বেশি হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ম্যানেজমেন্ট
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ম্যানেজমেন্ট
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,সময় শীট জন্য প্রকারভেদ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,আপনি উত্তর দিবেন না আপনি উত্তর দিবেন না
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},উভয় ক্ষেত্রেই ডেবিট বা ক্রেডিট পরিমাণ জন্য প্রয়োজন বোধ করা হয় {0}
-DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,সক্রিয়
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,নীল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,নীল
 DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
 DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,আরও নোড শুধুমাত্র &#39;গ্রুপ&#39; টাইপ নোড অধীনে তৈরি করা যেতে পারে
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},পিওএস প্রোফাইল {0} ইতিমধ্যে ব্যবহারকারীর জন্য তৈরি: {1} এবং কোম্পানি {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,পরতী বস্তুর উত্পাদন
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,সরবরাহকারী ডাটাবেস.
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,গঠন করুন
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,আপনার বিক্রয় ব্যক্তির গ্রাহকের পরিচিতি এই তারিখে একটি অনুস্মারক পাবেন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ট্যাক্স ও অন্যান্য বেতন কর্তন.
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,গুদাম
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
 ,Purchase Order Items To Be Billed,ক্রয় আদেশ আইটেম বিল তৈরি করা
 DocType: Purchase Invoice Item,Net Rate,নিট হার
 DocType: Purchase Invoice Item,Purchase Invoice Item,চালান আইটেম ক্রয়
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,স্টক লেজার দাখিলা এবং GL সাজপোশাকটি নির্বাচিত ক্রয় রসিদ জন্য রিপোস্ট হয়
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,আইটেম 1
 DocType: Holiday,Holiday,ছুটির দিন
-DocType: Event,Saturday,শনিবার
 DocType: Leave Control Panel,Leave blank if considered for all branches,সব শাখার জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 ,Daily Time Log Summary,দৈনন্দিন সময় লগ সারাংশ
-DocType: DocField,Label,লেবেল
 DocType: Payment Reconciliation,Unreconciled Payment Details,অসমর্পিত পেমেন্ট বিবরণ
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
 DocType: Lead,Call,কল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,এমপ্লয়িজ স্থাপনের
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,গ্রিড &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,গবেষণা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,গবেষণা
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Contact,User ID,ব্যবহারকারী আইডি
-DocType: Communication,Sent,প্রেরিত
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,দেখুন লেজার
-DocType: File,Lft,এলএফটি
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
-DocType: Communication,Delivery Status,ডেলিভারি স্থিতি
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 DocType: Production Order,Manufacture against Sales Order,সেলস আদেশের বিরুদ্ধে প্রস্তুত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,পন্নের বর্ণনা
 DocType: Payment Tool,Payment Mode,পরিশোধের মাধ্যম
 DocType: Purchase Invoice,Is Recurring,পুনরাবৃত্ত হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,ডাইরেক্ট ধাতু লেজারের sintering
 DocType: Purchase Order,Supplied Items,সরবরাহকৃত চলছে
 DocType: Production Order,Qty To Manufacture,উত্পাদনপ্রণালী Qty
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,কেনার চক্র সারা একই হার বজায় রাখা
 DocType: Opportunity Item,Opportunity Item,সুযোগ আইটেম
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,অস্থায়ী খোলা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,কর্মচারী ছুটি ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
 DocType: Address,Address Type,ঠিকানা টাইপ করুন
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ছোট
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ছোট
 DocType: Employee,Employee Number,চাকুরিজীবী সংখ্যা
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},মামলা নং (গুলি) ইতিমধ্যে ব্যবহারে রয়েছে. মামলা নং থেকে কর {0}
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,সবুজ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,সবুজ
 DocType: Item,Auto re-order,অটো পুনরায় আদেশ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,মোট অর্জন
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,মোট অর্জন
 DocType: Employee,Place of Issue,ঘটনার কেন্দ্রবিন্দু
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
-DocType: Report,Disabled,অক্ষম
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,চুক্তি
+DocType: Email Digest,Add Quote,উক্তি করো
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,কৃষি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,আপনার পণ্য বা সেবা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 DocType: Journal Entry Account,Purchase Order,ক্রয় আদেশ
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,নাম প্রয়োজন বোধ করা হয়
 DocType: Purchase Invoice,Recurring Type,আবর্তক ধরন
 DocType: Address,City/Town,শহর / টাউন
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,আইটেম {0} একটি সাব-সংকুচিত আইটেম হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ক্যাপিটাল উপকরণ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,প্রত্যাশিত প্রসবের তারিখ পরিকল্পনা শুরুর তারিখ তুলনায় কম হয়.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,মোট আউটগোয়িং
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",শুধুমাত্র &quot;মান&quot; 0 বা জন্য ফাঁকা মান সঙ্গে এক কোটি টাকার রুল শর্ত হতে পারে
 DocType: Authorization Rule,Transaction,লেনদেন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,উল্লেখ্য: এই খরচ কেন্দ্র একটি গ্রুপ. গ্রুপ বিরুদ্ধে অ্যাকাউন্টিং এন্ট্রি করতে পারবেন না.
-apps/frappe/frappe/config/desk.py +7,Tools,সরঞ্জাম
 DocType: Item,Website Item Groups,ওয়েবসাইট আইটেম গ্রুপ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,উৎপাদন অর্ডার নম্বর স্টক এন্ট্রি উদ্দেশ্যে প্রস্তুত জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Total (Company Currency),মোট (কোম্পানি একক)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,জার্নাল এন্ট্রি
 DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন নাম
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
 DocType: Sales Partner,Target Distribution,উদ্দিষ্ট ডিস্ট্রিবিউশনের
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,মন্তব্য
 DocType: Salary Slip,Bank Account No.,ব্যাংক একাউন্ট নং
 DocType: Naming Series,This is the number of the last created transaction with this prefix,এই উপসর্গবিশিষ্ট সর্বশেষ নির্মিত লেনদেনের সংখ্যা
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},আইটেম জন্য প্রয়োজন মূল্যনির্ধারণ রেট দিন {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},আইটেম জন্য প্রয়োজন মূল্যনির্ধারণ রেট দিন {0}
 DocType: Quality Inspection Reading,Reading 8,8 পড়া
 DocType: Sales Partner,Agent,প্রতিনিধি
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত পারে, শূন্য"
 DocType: Purchase Invoice,Taxes and Charges Calculation,কর ও শুল্ক ক্যালকুলেশন
 DocType: BOM Operation,Workstation,ওয়ার্কস্টেশন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,হার্ডওয়্যারের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,হার্ডওয়্যারের
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,একটি কোম্পানি নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,সুবিধা বাতিল ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,কোন ডেটা
 DocType: Appraisal Template Goal,Appraisal Template Goal,মূল্যায়ন টেমপ্লেট গোল
 DocType: Salary Slip,Earning,রোজগার
 DocType: Payment Tool,Party Account Currency,পক্ষের অ্যাকাউন্টে একক
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,মধ্যে পাওয়া ওভারল্যাপিং শর্ত:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,মোট আদেশ মান
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,খাদ্য
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,খাদ্য
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,বুড়ো রেঞ্জ 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,আপনি শুধুমাত্র একটি পেশ প্রকাশনা আদেশের বিরুদ্ধে একটি সময় লগ করা যাবে
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","যোগাযোগ নিউজলেটার, বাড়ে."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,অপারেশনস ফাঁকা রাখা যাবে না.
 ,Delivered Items To Be Billed,বিতরণ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
-DocType: DocField,Description,বিবরণ
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
-DocType: Letter Head,Is Default,ডিফল্ট মান হল
 DocType: Address,Utilities,ইউটিলিটি
 DocType: Purchase Invoice Item,Accounting,হিসাবরক্ষণ
 DocType: Features Setup,Features Setup,বৈশিষ্ট্য সেটআপ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,দেখুন অফার লেটার
-DocType: Communication,Communication,যোগাযোগ
 DocType: Item,Is Service Item,পরিষেবা আইটেম
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
 DocType: Activity Cost,Projects,প্রকল্প
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন করুন
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},থেকে {0} | {1} {2}
@@ -1184,14 +1094,14 @@
 DocType: Pricing Rule,Campaign,প্রচারাভিযান
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
 DocType: Purchase Invoice,Contact Person,ব্যক্তি যোগাযোগ
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&#39;প্রত্যাশিত স্টার্ট জন্ম&#39; এর চেয়ে বড় &#39;প্রত্যাশিত শেষ তারিখ&#39; হতে পারে না
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
 DocType: Holiday List,Holidays,ছুটির
 DocType: Sales Order Item,Planned Quantity,পরিকল্পনা পরিমাণ
 DocType: Purchase Invoice Item,Item Tax Amount,আইটেমটি ট্যাক্স পরিমাণ
 DocType: Item,Maintain Stock,শেয়ার বজায়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 DocType: Leave Control Panel,Leave blank if considered for all designations,সব প্রশিক্ষণে জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,কি কি করতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,শিক্ষানবিস
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,শিক্ষানবিস
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,নেতিবাচক পরিমাণ অনুমোদিত নয়
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",পংক্তিরূপে উল্লিখিত হয় আইটেমটি মাস্টার থেকে সংগৃহীত এবং এই ক্ষেত্রের মধ্যে সংরক্ষিত ট্যাক্স বিস্তারিত টেবিল. কর ও চার্জের জন্য ব্যবহৃত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্ট নিথর হয় তাহলে, এন্ট্রি সীমিত ব্যবহারকারীদের অনুমতি দেওয়া হয়."
 DocType: Email Digest,Bank Balance,অধিকোষস্থিতি
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,কর্মচারী {0} এবং মাসের জন্য পাওয়া কোন সক্রিয় বেতন কাঠামো
 DocType: Job Opening,"Job profile, qualifications required etc.","পেশা প্রফাইল, যোগ্যতা প্রয়োজন ইত্যাদি"
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
 DocType: Rename Tool,Type of document to rename.,নথির ধরন নামান্তর.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,আমরা এই আইটেম কিনতে
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,আমরা এই আইটেম কিনতে
 DocType: Address,Billing,বিলিং
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,পাঠাই নি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,বিরচন বিস্ফোরক
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),মোট কর ও শুল্ক (কোম্পানি একক)
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} প্রাপকদের পাঠাতে তফসিলি
 DocType: Quality Inspection,Readings,রিডিং
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,উপ সমাহারগুলি
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,উপ সমাহারগুলি
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Supplier,Stock Manager,স্টক ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,কোনো ঠিকানা এখনো যোগ.
 DocType: Workstation Working Hour,Workstation Working Hour,ওয়ার্কস্টেশন কাজ ঘন্টা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,বিশ্লেষক
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা জেভি পরিমাণ সমান নয় {2}
 DocType: Item,Inventory,জায়
 DocType: Features Setup,"To enable ""Point of Sale"" view",দেখুন &quot;বিক্রয় বিন্দু&quot; সচল করুন
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,পেমেন্ট খালি ট্রলি জন্য তৈরি করা যাবে না
 DocType: Item,Sales Details,বিক্রয় বিবরণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,পিন
 DocType: Opportunity,With Items,জানানোর সঙ্গে
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ইন
 DocType: Notification Control,Expense Claim Rejected,ব্যয় দাবি প্রত্যাখ্যান
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
 DocType: Item Attribute,Item Attribute,আইটেম বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,সরকার
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,আইটেম রুপভেদ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,সরকার
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,আইটেম রুপভেদ
 DocType: Company,Services,সেবা
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),মোট ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),মোট ({0})
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
 DocType: Sales Invoice,Source,উত্স
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,আর্থিক বছরের শুরু তারিখ
 DocType: Employee External Work History,Total Experience,মোট অভিজ্ঞতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,মাল ও ফরোয়ার্ডিং চার্জ
 DocType: Material Request Item,Sales Order No,বিক্রয় আদেশ কোন
 DocType: Item Group,Item Group Name,আইটেমটি গ্রুপ নাম
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ধরা
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ধরা
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,প্রস্তুত জন্য স্থানান্তর সামগ্রী
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","আইটেম জন্য ক্রয় হার: {0} পাওয়া যায়নি, অ্যাকাউন্টিং এন্ট্রি (ব্যয়) বই প্রয়োজন বোধ করা হয় যা. একটি ক্রয় মূল্য তালিকা বিরুদ্ধে আইটেমের মূল্য উল্লেখ করুন."
 DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),অতিরিক্ত মূল্য ছাড়ের পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ত্রুটি: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,অ্যাকাউন্ট চার্ট থেকে নতুন একাউন্ট তৈরি করুন.
 DocType: Maintenance Visit,Maintenance Visit,রক্ষণাবেক্ষণ পরিদর্শন
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; টেরিটরি
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ ব্যাচ Qty
 DocType: Time Log Batch Detail,Time Log Batch Detail,টাইম ইন ব্যাচ বিস্তারিত
-DocType: Workflow State,Tasks,কার্য
 DocType: Landed Cost Voucher,Landed Cost Help,ল্যান্ড খরচ সাহায্য
-DocType: Event,Tuesday,মঙ্গলবার
 DocType: Leave Block List,Block Holidays on important days.,গুরুত্বপূর্ণ দিন অবরোধ ছুটির দিন.
 ,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ইতিমধ্যে সময়ের জন্য কর্মচারী {1} জন্য বরাদ্দ টাইপ {0} পাতার জন্য {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
 DocType: UOM,UOM Name,UOM নাম
-DocType: Top Bar Item,Target,লক্ষ্য
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,অথর্
 DocType: Sales Invoice,Shipping Address,প্রেরণের ঠিকানা
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,এই সরঞ্জামের সাহায্যে আপনি আপডেট বা সিস্টেমের মধ্যে স্টক পরিমাণ এবং মূল্যনির্ধারণ ঠিক করতে সাহায্য করে. এটা সাধারণত সিস্টেম মান এবং কি আসলে আপনার গুদাম বিদ্যমান সুসংগত করতে ব্যবহার করা হয়.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ব্র্যান্ড মাস্টার.
-DocType: ToDo,Due Date,নির্দিষ্ট তারিখ
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ব্র্যান্ড মাস্টার.
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,বক্স
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,প্রতিষ্ঠান
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,বক্স
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,প্রতিষ্ঠান
 DocType: Monthly Distribution,Monthly Distribution,মাসিক বন্টন
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
 DocType: Production Plan Sales Order,Production Plan Sales Order,উৎপাদন পরিকল্পনা বিক্রয় আদেশ
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} জন্য অ্যাকাউন্টিং কেবল প্রবেশ মুদ্রা তৈরি করা যাবে: {1}
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,খাঁজ
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ব্যাংক হিসাব
 ,Bank Reconciliation Statement,ব্যাংক পুনর্মিলন বিবৃতি
 DocType: Address,Lead Name,লিড নাম
 ,POS,পিওএস
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,খোলা স্টক ব্যালেন্স
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} শুধুমাত্র একবার প্রদর্শিত হবে
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,খোলা স্টক ব্যালেন্স
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} শুধুমাত্র একবার প্রদর্শিত হতে হবে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ব্যাংক প্রতিফলিত না পরিমাণে
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ব্যাংক প্রতিফলিত না পরিমাণে
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,কেন্দ্রাতিগ ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,চৌম্বক ক্ষেত্রের সহায়তায় সমাপ্তি
 DocType: Company,Default Holiday List,হলিডে তালিকা ডিফল্ট
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,শেয়ার দায়
 DocType: Purchase Receipt,Supplier Warehouse,সরবরাহকারী ওয়্যারহাউস
 DocType: Opportunity,Contact Mobile No,যোগাযোগ মোবাইল নম্বর
 DocType: Production Planning Tool,Select Sales Orders,বিক্রয় আদেশ নির্বাচন
 ,Material Requests for which Supplier Quotations are not created,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,বারকোড ব্যবহার আইটেম ট্র্যাক. আপনি আইটেম এর বারকোড স্ক্যানিং দ্বারা হুণ্ডি এবং বিক্রয় চালান মধ্যে আইটেম প্রবেশ করতে সক্ষম হবে.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,মার্ক হিসাবে বিতরণ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,মার্ক হিসাবে বিতরণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,উদ্ধৃতি করা
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} দেখুন
 DocType: Salary Structure Deduction,Salary Structure Deduction,বেতন কাঠামো সিদ্ধান্তগ্রহণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,সিলেক্টিভ লেজার sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,আমদানি সফল!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),বয়স (দিন)
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
 DocType: Account,Account Name,অ্যাকাউন্ট নাম
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,জন্ম তারিখ এর চেয়ে বড় হতে পারে না
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,সিরিয়াল কোন {0} পরিমাণ {1} একটি ভগ্নাংশ হতে পারবেন না
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,সরবরাহকারী প্রকার মাস্টার.
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,যোগ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা হয়
 DocType: Accounts Settings,Credit Controller,ক্রেডিট কন্ট্রোলার
 DocType: Delivery Note,Vehicle Dispatch Date,যানবাহন ডিসপ্যাচ তারিখ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,সম্পূর্ণ সেটআপ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% দেখানো হয়েছিল
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,মানব সম্পদ
 DocType: Lead,Upper Income,আপার আয়
 DocType: Journal Entry Account,Debit in Company Currency,কোম্পানি মুদ্রা ডেবিট
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,আমার সমস্যা
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,ডিফল্ট মান
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,সারি {0}: পেমেন্ট পরিমাণ নেতিবাচক হতে পারে না
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,প্রেস ফিটিং
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 DocType: Payment Reconciliation,Payments,পেমেন্টস্
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,টিপে গরম isostatic
-DocType: ToDo,Medium,মাঝারি
 DocType: Budget Detail,Budget Allocated,বাজেট বরাদ্দ
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
 DocType: Quotation,Term Details,টার্ম বিস্তারিত
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
 DocType: Warranty Claim,Warranty Claim,পাটা দাবি
 ,Lead Details,সীসা বিবরণ
-DocType: Authorization Rule,Approving User,অনুমোদন নিচে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,কলাই
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
 DocType: Pricing Rule,Applicable For,জন্য প্রযোজ্য
 DocType: Bank Reconciliation,From Date,তারিখ থেকে
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,অনলাইন নিলাম
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,অনলাইন নিলাম
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,পরিমাণ বা মূল্যনির্ধারণ হার বা উভয়ই উল্লেখ করুন
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","কোম্পানি, মাস এবং ফিস্ক্যাল বছর বাধ্যতামূলক"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,উপাদানের জন্য অনুরোধ এই স্টক এন্ট্রি করতে ব্যবহৃত
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,একটি আইটেম এর একক.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',টাইম ইন ব্যাচ {0} &#39;লগইন&#39; হতে হবে
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,প্রতি স্টক আন্দোলনের জন্য অ্যাকাউন্টিং এন্ট্রি করতে
 DocType: Leave Allocation,Total Leaves Allocated,মোট পাতার বরাদ্দ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},সারি কোন সময়ে প্রয়োজনীয় গুদাম {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,বৈধ আর্থিক বছরের শুরু এবং শেষ তারিখগুলি লিখুন দয়া করে
 DocType: Employee,Date Of Retirement,অবসর তারিখ
 DocType: Upload Attendance,Get Template,টেমপ্লেট করুন
 DocType: Address,Postal,ঠিকানা
 DocType: Item,Weightage,গুরুত্ব
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,খনন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,রজন
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} প্রথম নির্বাচন করুন.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},টেক্সট {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},টেক্সট {0}
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
 DocType: Stock Entry,Material Receipt,উপাদান রশিদ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,পণ্য
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,পণ্য
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","এই আইটেমটি ভিন্নতা আছে, তাহলে এটি বিক্রয় আদেশ ইত্যাদি নির্বাচন করা যাবে না"
 DocType: Lead,Next Contact By,পরবর্তী যোগাযোগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},পরিমাণ আইটেমটি জন্য বিদ্যমান হিসাবে ওয়্যারহাউস {0} মোছা যাবে না {1}
 DocType: Quotation,Order Type,যাতে টাইপ
 DocType: Purchase Invoice,Notification Email Address,বিজ্ঞপ্তি ইমেল ঠিকানা
 DocType: Payment Tool,Find Invoices to Match,ম্যাচ চালান খুঁজুন
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",যেমন &quot;xyz ন্যাশনাল ব্যাংক&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",যেমন &quot;xyz ন্যাশনাল ব্যাংক&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,মোট লক্ষ্যমাত্রা
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,মোট লক্ষ্যমাত্রা
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,শপিং কার্ট সক্রিয় করা হয়
 DocType: Job Applicant,Applicant for a Job,একটি কাজের জন্য আবেদনকারী
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,নির্মিত কোন উৎপাদন আদেশ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,তাঁরা বেতন স্লিপ {0} ইতিমধ্যে এই মাসের জন্য নির্মিত
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,তাঁরা বেতন স্লিপ {0} ইতিমধ্যে এই মাসের জন্য নির্মিত
 DocType: Stock Reconciliation,Reconciliation JSON,রিকনসিলিয়েশন JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Sales Invoice Item,Batch No,ব্যাচ নাম্বার
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,প্রধান
-DocType: DocPerm,Delete,মুছে
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,বৈকল্পিক
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},নতুন {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,থামানো অর্ডার বাতিল করা যাবে না. বাতিল করতে দুর.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
 DocType: Sales Team,Contribution to Net Total,একুন অবদান
 DocType: Sales Invoice Item,Customer's Item Code,গ্রাহকের আইটেম কোড
 DocType: Stock Reconciliation,Stock Reconciliation,শেয়ার রিকনসিলিয়েশন
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,একটি কাজের জন্য আবেদনকারী.
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
-DocType: Country,Country,দেশ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ঠিকানা
-DocType: Communication,Received,গৃহীত
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},সিরিয়াল কোন আইটেম জন্য প্রবেশ সদৃশ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,একটি শিপিং শাসনের জন্য একটি শর্ত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,আইটেম উৎপাদন অর্ডার আছে অনুমোদিত নয়.
-DocType: DocField,Attach Image,চিত্র সংযুক্ত
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),এই প্যাকেজের নিট ওজন. (আইটেম নিট ওজন যোগফল আকারে স্বয়ংক্রিয়ভাবে হিসাব)
-DocType: Stock Reconciliation Item,Leave blank if no change,কোন পরিবর্তন যদি ফাঁকা ছেড়ে দিন
 DocType: Sales Order,To Deliver and Bill,রক্ষা কর এবং বিল থেকে
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,উত্পাদন জন্য সময় লগসমূহ.
 DocType: Item,Apply Warehouse-wise Reorder Level,ওয়ারহাউস অনুসার রেকর্ডার শ্রেনী প্রয়োগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,কাজগুলো জন্য টাইম ইন.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,প্রদান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,প্রদান
 DocType: Production Order Operation,Actual Time and Cost,প্রকৃত সময় এবং খরচ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},সর্বাধিক {0} এর উপাদানের জন্য অনুরোধ {1} সেলস আদেশের বিরুদ্ধে আইটেম জন্য তৈরি করা যেতে পারে {2}
 DocType: Employee,Salutation,অভিবাদন
-DocType: Communication,Rejected,প্রত্যাখ্যাত
 DocType: Pricing Rule,Brand,ব্র্যান্ড
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
 DocType: Sales Order Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
 DocType: Quality Inspection Reading,Reading 10,10 পঠন
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","আপনি কিনতে বা বিক্রি করে যে আপনার পণ্য বা সেবা তালিকা. যখন আপনি শুরু মেজার এবং অন্যান্য বৈশিষ্ট্য আইটেমটি গ্রুপ, ইউনিট চেক করতে ভুলবেন না."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","আপনি কিনতে বা বিক্রি করে যে আপনার পণ্য বা সেবা তালিকা. যখন আপনি শুরু মেজার এবং অন্যান্য বৈশিষ্ট্য আইটেমটি গ্রুপ, ইউনিট চেক করতে ভুলবেন না."
 DocType: Hub Settings,Hub Node,হাব নোড
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,আপনি ডুপ্লিকেট জিনিস প্রবেশ করে. ত্রুটিমুক্ত এবং আবার চেষ্টা করুন.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,মূল্য {0} অ্যাট্রিবিউট জন্য {1} বৈধ আইটেম এর তালিকার মধ্যে উপস্থিত না মান বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,সহযোগী
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,সহযোগী
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,মেয়াদউত্তীর্ণ
 DocType: Packing Slip,To Package No.,নং প্যাকেজে
-DocType: DocType,System,পদ্ধতি
 DocType: Warranty Claim,Issue Date,প্রদানের তারিখ
 DocType: Activity Cost,Activity Cost,কার্যকলাপ খরচ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ক্ষয়প্রাপ্ত Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,টেলিযোগাযোগ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 DocType: Payment Tool,Make Payment Entry,পেমেন্ট এন্ট্রি করতে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
 ,Sales Invoice Trends,বিক্রয় চালান প্রবণতা
 DocType: Leave Application,Apply / Approve Leaves,পাতার অনুমোদন / প্রয়োগ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,জন্য
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',বা &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; চার্জ টাইপ শুধুমাত্র যদি সারিতে পাঠাতে পারেন
 DocType: Sales Order Item,Delivery Warehouse,ডেলিভারি ওয়্যারহাউস
 DocType: Stock Settings,Allowance Percent,ভাতা শতাংশ
@@ -1552,35 +1433,30 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয়, তাহলে বিক্রি, চেক করা আবশ্যক {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,সরবরাহকারী উদ্ধৃতি আইটেম
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,বেতন কাঠামো করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,গা থেকে লোম ছাঁটা
 DocType: Item,Has Variants,ধরন আছে
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,একটি নতুন বিক্রয় চালান তৈরি করতে &#39;বিক্রয় চালান করুন&#39; বাটনে ক্লিক করুন.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,প্যাকেজিং এবং লেবেল
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,কোম্পানি মাস্টার এবং গ্লোবাল ডিফল্ট মান ডিফল্ট মুদ্রা উল্লেখ করুন
-DocType: Dropbox Backup,Dropbox Access Secret,ড্রপবক্স অ্যাক্সেস গোপন
 DocType: Purchase Invoice,Recurring Invoice,পুনরাবৃত্ত চালান
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,প্রকল্প পরিচালনার
 DocType: Supplier,Supplier of Goods or Services.,পণ্য বা সেবার সরবরাহকারী.
 DocType: Budget Detail,Fiscal Year,অর্থবছর
 DocType: Cost Center,Budget,বাজেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,অর্জন
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,অর্জন
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,টেরিটরি / গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,যেমন 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা বকেয়া পরিমাণ চালান সমান নয় {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,যেমন 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা বকেয়া পরিমাণ চালান সমান নয় {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,আপনি বিক্রয় চালান সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 DocType: Item,Is Sales Item,সেলস আইটেম
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,আইটেমটি গ্রুপ বৃক্ষ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. আইটেম মাস্টার চেক
 DocType: Maintenance Visit,Maintenance Time,রক্ষণাবেক্ষণ সময়
 ,Amount to Deliver,পরিমাণ প্রদান করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,একটি পণ্য বা পরিষেবা
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,ত্রুটি রয়েছে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,লঘুপাত
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,একটি পণ্য বা পরিষেবা
 DocType: Naming Series,Current Value,বর্তমান মূল্য
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} সৃষ্টি
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} তৈরি হয়েছে
 DocType: Delivery Note Item,Against Sales Order,সেলস আদেশের বিরুদ্ধে
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,আইটেম টেবিল ফাঁকা থাকতে পারে না
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
 DocType: Website Item Group,Website Item Group,ওয়েবসাইট আইটেমটি গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,কর্তব্য এবং কর
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ওয়েব সাইট এ দেখানো হবে যে আইটেমটি জন্য ছক
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
 DocType: Material Request Item,Material Request Item,উপাদানের জন্য অনুরোধ আইটেম
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,আইটেম গ্রুপ বৃক্ষ.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,আইটেম গ্রুপ বৃক্ষ.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
 ,Item-wise Purchase History,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,লাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,লাল
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,সারি # {0}: অপারেশন {1} উত্পাদনের মধ্যে সমাপ্ত পণ্য {2} Qty জন্য সম্পন্ন করা হয় না আদেশ # {3}. সময় লগসমূহ মাধ্যমে অপারেশন অবস্থা আপডেট করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,একটি আইটেম জন্য UOM পরিবর্তন করুন.
 DocType: Quality Inspection Reading,Acceptance Criteria,গ্রহণযোগ্য বৈশিষ্ট্য
 DocType: Item Attribute,Attribute Name,নাম গুন
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},আইটেম {0} এ সেলস বা পরিষেবা আইটেম হতে হবে {1}
 DocType: Item Group,Show In Website,ওয়েবসাইট দেখান
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,গ্রুপ
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,গ্রুপ
 DocType: Task,Expected Time (in hours),(ঘণ্টায়) প্রত্যাশিত সময়
 ,Qty to Order,অর্ডার Qty
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","নিম্নলিখিত কাগজপত্র হুণ্ডি, সুযোগ, উপাদান অনুরোধ, আইটেম, ক্রয় আদেশ, ক্রয় ভাউচার, ক্রেতা রশিদ, উদ্ধৃতি, বিক্রয় চালান, পণ্য সমষ্টি, বিক্রয় আদেশ, সিরিয়াল কোন ব্র্যান্ড নাম ট্র্যাক"
@@ -1624,159 +1499,140 @@
 DocType: Holiday List,Clear Table,সাফ ছক
 DocType: Features Setup,Brands,ব্র্যান্ড
 DocType: C-Form Invoice Detail,Invoice No,চালান নং
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ক্রয় অর্ডার থেকে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ক্রয় অর্ডার থেকে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে, আগে {0} বাতিল / প্রয়োগ করা যাবে না ছেড়ে {1}"
 DocType: Activity Cost,Costing Rate,খোয়াতে হার
 ,Customer Addresses And Contacts,গ্রাহক ঠিকানা এবং পরিচিতি
 DocType: Employee,Resignation Letter Date,পদত্যাগ পত্র তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,সেট না
-DocType: Communication,Date,তারিখ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,পুনরাবৃত্ত গ্রাহক রাজস্ব
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"আপনার সিস্টেম সেটআপ করা হচ্ছে, যখন শক্ত হয়ে বসুন. এটি কয়েক মিনিট সময় নিতে পারে."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,জুড়ি
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,জুড়ি
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
 DocType: Delivery Note,Excise Page Number,আবগারি পৃষ্ঠা সংখ্যা
 DocType: Employee,Personal Details,ব্যক্তিগত বিবরণ
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,এমবসিং
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","উৎপাদন অর্ডার এই আইটেমটি জন্য করা যেতে পারে, এটি একটি স্টক আইটেমটি হতে হবে."
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,যোগদান
-DocType: Authorization Rule,Above Value,মান উপরে
 ,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
 DocType: Purchase Order,Delivered,নিষ্কৃত
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),কাজ ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,সর্বমোট পাতার {0} কম হতে পারে না সময়ের জন্য ইতিমধ্যেই অনুমোদন পাতার {1} চেয়ে
 DocType: Journal Entry,Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট
 ,Supplier-Wise Sales Analytics,সরবরাহকারী প্রজ্ঞাময় বিক্রয় বিশ্লেষণ
 DocType: Address Template,This format is used if country specific format is not found,দেশ নির্দিষ্ট ফরম্যাটে পাওয়া না গেলে এই বিন্যাস ব্যবহার করা হয়েছে
-DocType: Custom Field,Custom,প্রথা
 DocType: Production Order,Use Multi-Level BOM,মাল্টি লেভেল BOM ব্যবহার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ইনজেকশন ছাঁচনির্মাণ
 DocType: Bank Reconciliation,Include Reconciled Entries,মীমাংসা দাখিলা অন্তর্ভুক্ত
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial অ্যাকাউন্টের বৃক্ষ.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,সব কর্মচারী ধরনের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভিযোগে নির্ভরশীল
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,আইটেম {1} একটি অ্যাসেট আইটেম হিসাবে অ্যাকাউন্ট {0} &#39;স্থায়ী সম্পদ&#39; ধরনের হতে হবে
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
-apps/frappe/frappe/config/setup.py +130,Printing,মুদ্রণ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) হলিডে হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,এবং
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,স্পোর্টস
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,প্রকৃত মোট
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,একক
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,আপনার সাইটে কনফিগ ড্রপবক্স এক্সেস কী সেট করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,একক
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,কোম্পানি উল্লেখ করুন
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,অগ্রাহ্য আইটেম শেয়ার রয়েছে সেখানে ওয়্যারহাউস
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,তোমার আর্থিক বছরের শেষ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,তোমার আর্থিক বছরের শেষ
 DocType: POS Profile,Price List,মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
-DocType: Authorization Rule,Approving Role,ভূমিকা অনুমোদন
 ,BOM Search,খোঁজো
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
 DocType: Workstation,Wages per hour,প্রতি ঘন্টায় মজুরী
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ব্যাচ স্টক ব্যালেন্স {0} হয়ে যাবে ঋণাত্মক {1} ওয়্যারহাউস এ আইটেম {2} জন্য {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","ইত্যাদি সিরিয়াল টি, পিওএস মত প্রদর্শন করুন / আড়াল বৈশিষ্ট্য"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,উপাদান অনুরোধ নিম্নলিখিত আইটেম এর পুনরায় আদেশ স্তরের উপর ভিত্তি করে স্বয়ংক্রিয়ভাবে উত্থাপিত হয়েছে
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},পরিস্কারের তারিখ সারিতে চেক তারিখের আগে হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},পরিস্কারের তারিখ সারিতে চেক তারিখের আগে হতে পারে না {0}
 DocType: Salary Slip,Deduction,সিদ্ধান্তগ্রহণ
 DocType: Address Template,Address Template,ঠিকানা টেমপ্লেট
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
-DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন
+DocType: Project,% Tasks Completed,% কাজগুলো সম্পন্ন  হয়েছে
 DocType: Project,Gross Margin,গ্রস মার্জিন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,প্রতিবন্ধী ব্যবহারকারী
 DocType: Opportunity,Quotation,উদ্ধৃতি
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 DocType: Quotation,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,খরচ আপডেট
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,খরচ আপডেট
 DocType: Employee,Date of Birth,জন্ম তারিখ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,আইটেম {0} ইতিমধ্যে ফেরত দেয়া হয়েছে
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** অর্থবছরের ** একটি অর্থবছরে প্রতিনিধিত্ব করে. সব হিসাব ভুক্তি এবং অন্যান্য প্রধান লেনদেন ** ** অর্থবছরের বিরুদ্ধে ট্র্যাক করা হয়.
 DocType: Opportunity,Customer / Lead Address,গ্রাহক / লিড ঠিকানা
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,কাজের বর্ণনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,কাজের বর্ণনা
 DocType: Purchase Order Item,Qty as per Stock UOM,স্টক Qty UOM অনুযায়ী
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,তথ্য দিয়ে একটি বৈধ CSV ফাইল নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,লেপ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
 DocType: Expense Claim,Approver,রাজসাক্ষী
 ,SO Qty,তাই Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","শেয়ার এন্ট্রি গুদাম বিরুদ্ধে বিদ্যমান {0}, অত: পর আপনি পুনরায় ধার্য বা গুদাম পরিবর্তন করতে পারেন না"
 DocType: Appraisal,Calculate Total Score,মোট স্কোর গণনা করা
 DocType: Supplier Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
-apps/erpnext/erpnext/hooks.py +84,Shipments,চালানে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,চোবান ছাঁচনির্মাণ
-DocType: Purchase Order,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
+apps/erpnext/erpnext/hooks.py +68,Shipments,চালানে
+DocType: Purchase Order Item,To be delivered to customer,গ্রাহকের মধ্যে বিতরণ করা হবে
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,টাইম ইন স্থিতি জমা িদেত হেব.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,সিরিয়াল কোন {0} কোনো গুদাম অন্তর্গত নয়
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ঠিককরা
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,সারি #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,সারি #
 DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক)
 DocType: Pricing Rule,Supplier,সরবরাহকারী
 DocType: C-Form,Quarter,সিকি
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,বিবিধ খরচ
 DocType: Global Defaults,Default Company,ডিফল্ট কোম্পানি
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
 DocType: Employee,Bank Name,ব্যাংকের নাম
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-সর্বোপরি
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ব্যবহারকারী {0} নিষ্ক্রিয় করা হয়
 DocType: Leave Application,Total Leave Days,মোট ছুটি দিন
-DocType: Journal Entry Account,Credit in Account Currency,অ্যাকাউন্টের মুদ্রা ঋণ
 DocType: Email Digest,Note: Email will not be sent to disabled users,উল্লেখ্য: এটি ইমেল প্রতিবন্ধী ব্যবহারকারীদের পাঠানো হবে না
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} আইটেম জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
-DocType: DocField,Name,নাম
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,সিস্টেম প্রতিফলিত না পরিমাণে
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},আইটেম জন্য প্রয়োজন বিক্রয় আদেশ {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,সিস্টেম প্রতিফলিত না পরিমাণে
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,অন্যরা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,অন্যরা
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.
 DocType: POS Profile,Taxes and Charges,কর ও শুল্ক
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","একটি পণ্য বা, কেনা বিক্রি বা মজুত রাখা হয় যে একটি সেবা."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,সম্পন্ন
-DocType: Web Form,Select DocType,নির্বাচন DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ব্যাংকিং
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ব্যাংকিং
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,নতুন খরচ কেন্দ্র
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,নতুন খরচ কেন্দ্র
 DocType: Bin,Ordered Quantity,আদেশ পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
 DocType: Quality Inspection,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 DocType: Purchase Order Item,Reference Document Type,রেফারেন্স ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Activity Type,Default Billing Rate,ডিফল্ট বিলিং রেট
 DocType: Time Log Batch,Total Billing Amount,মোট বিলিং পরিমাণ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,গ্রহনযোগ্য অ্যাকাউন্ট
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,সময় লগসমূহ নির্মিত:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Employee,Blood Group,রক্তের গ্রুপ
 DocType: Purchase Invoice Item,Page Break,পৃষ্ঠা বিরতি
 DocType: Production Order Operation,Pending,বিচারাধীন
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,একটি নির্দিষ্ট কর্মচারী হুকুমে অ্যাপ্লিকেশন অনুমোদন করতে পারেন ব্যবহারকারীরা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,আপনি বৈকল্পিক ডিফল্ট UOM পরিবর্তন করতে পারবেন না. টেমপ্লেট মধ্যে variant পরিবর্তনের ডিফল্ট UOM জন্য ডিফল্ট UOM পরিবর্তন করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,অফিস সরঞ্জাম
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,কোম্পানি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,যন্ত্রপাতির
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,যন্ত্রপাতির
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,শেয়ার পুনরায় আদেশ পর্যায়ে পৌঁছে যখন উপাদান অনুরোধ বাড়াতে
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,রক্ষণাবেক্ষণ সূচি থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ফুল টাইম
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ফুল টাইম
 DocType: Purchase Invoice,Contact Details,যোগাযোগের ঠিকানা
 DocType: C-Form,Received Date,জন্ম গ্রহণ
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","আপনি বিক্রয় করের এবং চার্জ টেমপ্লেট একটি স্ট্যান্ডার্ড টেমপ্লেট নির্মাণ করা হলে, একটি নির্বাচন করুন এবং নিচের বাটনে ক্লিক করুন."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,কর্মখালির
 DocType: Payment Reconciliation,Payment Reconciliation,পেমেন্ট রিকনসিলিয়েশন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,প্রযুক্তি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
 DocType: Offer Letter,Offer Letter,প্রস্তাবপত্র
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,উপাদান অনুরোধ (এমআরপি) অ্যান্ড প্রোডাকশন আদেশ নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,মোট চালানে মাসিক
 DocType: Time Log,To Time,সময়
+DocType: Authorization Rule,Approving Role (above authorized value),(কঠিন মূল্য উপরে) ভূমিকা অনুমোদন
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","সন্তানের যোগ নোড, বৃক্ষ এবং এক্সপ্লোর আপনি আরো নোড যোগ করতে চান যার অধীনে নোডে ক্লিক করুন."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,গ্রাহক আইটেম সঙ্কেত
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,আদেশ বা চালানে বিরুদ্ধে পেমেন্ট থেকে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ঢালাই
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,নতুন শেয়ার UOM প্রয়োজন বোধ করা হয়
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;কেস নং থেকে&#39; একটি বৈধ উল্লেখ করুন
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
 DocType: Features Setup,Item Serial Nos,আইটেম সিরিয়াল আমরা
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ
 DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,তোমার গ্রাহকরা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,কম্প্রেশন ঢালাই
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,তোমার গ্রাহকরা
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
 DocType: Sales Order,Not Delivered,বিতরিত হয় নি
 ,Bank Clearance Summary,ব্যাংক পরিস্কারের সংক্ষিপ্ত
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,আইটেম কোড&gt; আইটেমটি গ্রুপ&gt; ব্র্যান্ড
 DocType: Appraisal Goal,Appraisal Goal,মূল্যায়ন গোল
-DocType: Event,Friday,শুক্রবার
 DocType: Time Log,Costing Amount,খোয়াতে পরিমাণ
 DocType: Process Payroll,Submit Salary Slip,বেতন স্লিপ জমা
 DocType: Salary Structure,Monthly Earning & Deduction,মাসিক আয় ও সিদ্ধান্তগ্রহণ
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,বাল্ক মধ্যে আমদানি
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
 DocType: SMS Log,Sender Name,প্রেরকের নাম
-DocType: Page,Title,খেতাব
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,কাস্টমাইজ করুন
 DocType: POS Profile,[Select],[নির্বাচন]
 DocType: SMS Log,Sent To,প্রেরিত
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,বিক্রয় চালান করুন
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},অকার্যকর {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},অকার্যকর {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,অগ্রিম পরিমাণ
 DocType: Manufacturing Settings,Capacity Planning,ক্ষমতা পরিকল্পনা
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,প্রয়োজন বোধ করা হয় &#39;জন্ম থেকে&#39;
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'শুরুর তারিখ' প্রয়োজন
 DocType: Journal Entry,Reference Number,পরিচিত সংখ্যা
 DocType: Employee,Employment Details,চাকুরীর বিস্তারিত তথ্য
 DocType: Employee,New Workplace,নতুন কর্মক্ষেত্রে
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
 DocType: Item,End of Life,জীবনের শেষে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ভ্রমণ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ভ্রমণ
 DocType: Leave Block List,Allow Users,ব্যবহারকারীদের মঞ্জুরি
 DocType: Purchase Order,Customer Mobile No,গ্রাহক মোবাইল কোন
 DocType: Sales Invoice,Recurring,আবৃত্ত
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
 DocType: Installation Note,Installation Note,ইনস্টলেশন উল্লেখ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,করের যোগ
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,করের যোগ
 ,Financial Analytics,আর্থিক বিশ্লেষণ
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 DocType: Address,Subsidiary,সহায়ক
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
 DocType: Quality Inspection,Purchase Receipt No,কেনার রসিদ কোন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,অগ্রিক
-DocType: System Settings,In Hours,ঘন্টা ইন
 DocType: Process Payroll,Create Salary Slip,বেতন স্লিপ তৈরি
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ব্যাংক হিসাবে প্রত্যাশিত ভারসাম্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,একযোগে
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ব্যাংক হিসাবে প্রত্যাশিত ভারসাম্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Appraisal,Employee,কর্মচারী
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ভাউচার দ্বারা গ্রুপ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Sales Invoice,Mass Mailing,ভর মেইলিং
-DocType: Page,Standard,মান
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,দেখান পেমেন্টস্
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,আয়তন
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,রক্ষণাবেক্ষণ সূচি {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ফার্মাসিউটিক্যাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,ফার্মাসিউটিক্যাল
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ক্রয় আইটেম খরচ
 DocType: Selling Settings,Sales Order Required,সেলস আদেশ প্রয়োজন
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,গ্রাহক তৈরি
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 পঠন
 DocType: Supplier,Is Frozen,জমাটবাধা
 DocType: Buying Settings,Buying Settings,রাজধানীতে সেটিংস
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ভর সমাপ্তি
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,একটি সমাপ্ত ভাল আইটেম জন্য BOM নং
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),বিক্রয় ইমেইল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন sales@example.com)
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Tool,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,খসড়া
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,পূরক অফ
 DocType: Quality Inspection Reading,Accepted,গৃহীত
-DocType: User,Female,মহিলা
-DocType: Journal Entry Account,Debit in Account Currency,অ্যাকাউন্টের মুদ্রা ডেবিট
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
-DocType: Print Settings,Modern,আধুনিক
-DocType: Communication,Replied,জবাব দেওয়া
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
 DocType: Payment Tool,Total Payment Amount,পেমেন্ট মোট পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) পরিকল্পনা quanitity তার চেয়ে অনেক বেশী হতে পারে না ({2}) উত্পাদন আদেশ {3}
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
 DocType: Newsletter,Test,পরীক্ষা
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","বিদ্যমান শেয়ার লেনদেন আপনাকে মান পরিবর্তন করতে পারবেন না \ এই আইটেমটি জন্য আছে &#39;সিরিয়াল কোন হয়েছে&#39;, &#39;ব্যাচ করিয়াছেন&#39;, &#39;স্টক আইটেম&#39; এবং &#39;মূল্যনির্ধারণ পদ্ধতি&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
 DocType: Stock Entry,For Quantity,পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,সম্পূর্ণ সেটআপ
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","এই ডেট নিথর অ্যাকাউন্টিং এন্ট্রি, কেউ / না নিম্নোল্লিখিত শর্ত ভূমিকা ছাড়া এন্ট্রি পরিবর্তন করতে পারেন."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,প্রোজেক্ট অবস্থা
 DocType: UOM,Check this to disallow fractions. (for Nos),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,নিউজলেটার মেইলিং তালিকা
 DocType: Delivery Note,Transporter Name,স্থানান্তরকারী নাম
+DocType: Authorization Rule,Authorized Value,কঠিন মূল্য
 DocType: Contact,Enter department to which this Contact belongs,এই যোগাযোগ জন্যে যা করার ডিপার্টমেন্ট লিখুন
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,মোট অনুপস্থিত
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,পরিমাপের একক
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,পরিমাপের একক
 DocType: Fiscal Year,Year End Date,বছর শেষ তারিখ
 DocType: Task Depends On,Task Depends On,কাজের উপর নির্ভর করে
 DocType: Lead,Opportunity,সুযোগ
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),মৌলিক হার (স্টক UOM অনুযায়ী)
 DocType: SMS Log,No of Requested SMS,অনুরোধ করা এসএমএস এর কোন
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,তীক্ষ্ন
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
 DocType: Customer Group,Has Child Node,সন্তানের নোড আছে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","এখানে স্ট্যাটিক URL পরামিতি লিখুন (যেমন. প্রেরকের = ERPNext, ব্যবহারকারীর নাম = ERPNext, পাসওয়ার্ড = 1234 ইত্যাদি)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} না কোনো সক্রিয় অর্থবছরে. আরো বিস্তারিত জানার জন্য পরীক্ষা {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,বুড়ো বিন্যাস 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,আলোক যন্ত্র
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2027,12 +1868,10 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","সমস্ত ক্রয় লেনদেন প্রয়োগ করা যেতে পারে যে স্ট্যান্ডার্ড ট্যাক্স টেমপ্লেট. এই টেমপ্লেটটি ইত্যাদি #### আপনি সব ** জানানোর জন্য স্ট্যান্ডার্ড ট্যাক্স হার হবে এখানে নির্ধারণ করহার দ্রষ্টব্য &quot;হ্যান্ডলিং&quot;, ট্যাক্স মাথা এবং &quot;কোটি টাকার&quot;, &quot;বীমা&quot; মত অন্যান্য ব্যয় মাথা তালিকায় থাকতে পারে * *. বিভিন্ন হারে আছে ** যে ** আইটেম আছে, তাহলে তারা ** আইটেম ট্যাক্স যোগ করা হবে ** ** ** আইটেম মাস্টার টেবিল. #### কলাম বর্ণনা 1. গণনা টাইপ: - এই (যে মৌলিক পরিমাণ যোগফল) ** একুন ** উপর হতে পারে. - ** পূর্ববর্তী সারি মোট / পরিমাণ ** উপর (ক্রমসঞ্চিত করের বা চার্জের জন্য). যদি আপনি এই অপশনটি নির্বাচন করা হলে, ট্যাক্স পরিমাণ অথবা মোট (ট্যাক্স টেবিলে) পূর্ববর্তী সারির শতকরা হিসেবে প্রয়োগ করা হবে. - ** ** প্রকৃত (হিসাবে উল্লেখ করেছে). 2. অ্যাকাউন্ট প্রধানঃ এই ট্যাক্স 3. খরচ কেন্দ্র বুকিং করা হবে যার অধীনে অ্যাকাউন্ট খতিয়ান: ট্যাক্স / চার্জ (শিপিং মত) একটি আয় হয় বা ব্যয় যদি এটি একটি খরচ কেন্দ্র বিরুদ্ধে বুক করা প্রয়োজন. 4. বিবরণ: ট্যাক্স বর্ণনা (যে চালানে / কোট ছাপা হবে). 5. রেট: ট্যাক্স হার. 6. পরিমাণ: ট্যাক্স পরিমাণ. 7. মোট: এই বিন্দু ক্রমপুঞ্জিত মোট. 8. সারি প্রবেশ করান: উপর ভিত্তি করে যদি &quot;পূর্ববর্তী সারি মোট&quot; আপনি এই গণনা জন্য একটি বেস (ডিফল্ট পূর্ববর্তী সারির হয়) হিসাবে গ্রহণ করা হবে, যা সারি সংখ্যা নির্বাচন করতে পারবেন. 9. জন্য ট্যাক্স বা চার্জ ধরে নেবেন: ট্যাক্স / চার্জ মূল্যনির্ধারণ জন্য শুধুমাত্র (মোট না একটি অংশ) বা শুধুমাত্র (আইটেমটি মান যোগ না) মোট জন্য অথবা উভয়ের জন্য তাহলে এই অংশে আপনি নির্ধারণ করতে পারবেন. 10. করো অথবা বিয়োগ: আপনি যোগ করতে অথবা ট্যাক্স কেটে করতে চান কিনা."
-DocType: Note,Note,বিঃদ্রঃ
+10. Add or Deduct: Whether you want to add or deduct the tax.","সমস্ত ক্রয় লেনদেন প্রয়োগ করা যেতে পারে যে স্ট্যান্ডার্ড ট্যাক্স টেমপ্লেট. এই টেমপ্লেটটি ইত্যাদি #### আপনি সব ** জানানোর জন্য স্ট্যান্ডার্ড ট্যাক্স হার হবে এখানে নির্ধারণ করহার দ্রষ্টব্য &quot;হ্যান্ডলিং&quot;, ট্যাক্স মাথা এবং &quot;কোটি টাকার&quot;, &quot;বীমা&quot; মত অন্যান্য ব্যয় মাথা তালিকায় থাকতে পারে * *. বিভিন্ন হারে আছে ** যে ** আইটেম আছে, তাহলে তারা ** আইটেম ট্যাক্স যোগ করা হবে ** ** ** আইটেম মাস্টার টেবিল. #### কলাম বর্ণনা 1. গণনা টাইপ: - এই (যে মৌলিক পরিমাণ যোগফল) ** একুন ** উপর হতে পারে. - ** পূর্ববর্তী সারি মোট / পরিমাণ ** উপর (ক্রমসঞ্চিত করের বা চার্জের জন্য). যদি আপনি এই অপশনটি নির্বাচন করা হলে, ট্যাক্স পরিমাণ অথবা মোট (ট্যাক্স টেবিলে) পূর্ববর্তী সারির শতকরা হিসেবে প্রয়োগ করা হবে. - ** ** প্রকৃত (হিসাবে উল্লেখ করেছে). 2. অ্যাকাউন্ট প্রধানঃ এই ট্যাক্স 3. খরচ কেন্দ্র বুকিং করা হবে যার অধীনে অ্যাকাউন্ট খতিয়ান: ট্যাক্স / চার্জ (শিপিং মত) একটি আয় হয় বা ব্যয় যদি এটি একটি খরচ কেন্দ্র বিরুদ্ধে বুক করা প্রয়োজন. 4. বিবরণ: ট্যাক্স বর্ণনা (যে চালানে / কোট ছাপা হবে). 5. রেট: ট্যাক্স হার. 6. পরিমাণ: ট্যাক্স পরিমাণ. 7. মোট: এই বিন্দু ক্রমপুঞ্জিত মোট. 8. সারি প্রবেশ করান: উপর ভিত্তি করে যদি &quot;পূর্ববর্তী সারি মোট&quot; আপনি এই গণনা জন্য একটি বেস (ডিফল্ট পূর্ববর্তী সারির হয়) হিসাবে গ্রহণ করা হবে, যা সারি সংখ্যা নির্বাচন করতে পারবেন. 9. জন্য ট্যাক্স বা চার্জ ধরে নেবেন: ট্যাক্স / চার্জ মূল্যনির্ধারণ জন্য শুধুমাত্র (মোট না একটি অংশ) বা শুধুমাত্র (আইটেমটি মান যোগ না) মোট জন্য অথবা উভয়ের জন্য তাহলে এই অংশে আপনি নির্ধারণ করতে পারবেন. 10. করো অথবা বিয়োগ: আপনি যোগ করতে অথবা ট্যাক্স কেটে করতে চান কিনা."
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
-DocType: Email Account,Email Ids,ইমেল আইডি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 DocType: Tax Rule,Billing City,বিলিং সিটি
 DocType: Global Defaults,Hide Currency Symbol,মুদ্রা প্রতীক লুকান
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,ক্রেডিট নোট
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},সমাপ্ত Qty বেশী হতে পারে না {0} অপারেশন জন্য {1}
 DocType: Features Setup,Quality,গুণ
-DocType: Contact Us Settings,Introduction,ভূমিকা
 DocType: Warranty Claim,Service Address,সেবা ঠিকানা
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,শেয়ার পুনর্মিলনের সর্বোচ্চ 100 সারি.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,শেয়ার পুনর্মিলনের সর্বোচ্চ 100 সারি.
 DocType: Stock Entry,Manufacture,উত্পাদন
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,দয়া হুণ্ডি প্রথম
 DocType: Purchase Invoice,Currency and Price List,মুদ্রা ও মূল্যতালিকা
 DocType: Opportunity,Customer / Lead Name,গ্রাহক / লিড নাম
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,উত্পাদনের
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,উত্পাদনের
 DocType: Item,Allow Production Order,মঞ্জুরি উৎপাদন অর্ডার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
 DocType: Lead,Fax,ফ্যাক্স
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,উপস্থাপিত
 DocType: Salary Structure,Total Earning,মোট আয়
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,আমার ঠিকানা
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,সংস্থার শাখা মাস্টার.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,বা
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ইউটিলিটি খরচ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-উপরে
 DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
-,Download Backups,ডাউনলোড ব্যাকআপ
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,শোধের ধরণ
 DocType: Process Payroll,Select Employees,নির্বাচন এমপ্লয়িজ
 DocType: Bank Reconciliation,To Date,এখন পর্যন্ত
 DocType: Opportunity,Potential Sales Deal,সম্ভাব্য বিক্রয় ডীল
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,বিবরণ
 DocType: Purchase Invoice,Total Taxes and Charges,মোট কর ও শুল্ক
 DocType: Employee,Emergency Contact,জরুরি ভিত্তিতে যোগাযোগ করা
 DocType: Item,Quality Parameters,মানের পরামিতি
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,সিরিয়াল কোন / ব্যাচ
 DocType: Product Bundle,Parent Item,মূল আইটেমটি
 DocType: Account,Account Type,হিসাবের ধরণ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} বহন-ফরওয়ার্ড করা যাবে না প্রকার ত্যাগ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
 DocType: Landed Cost Voucher,Purchase Receipt Items,কেনার রসিদ চলছে
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,কাস্টমাইজ ফরম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,কাটা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,সমরূপতার
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ছাঁচনির্মাণ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
-apps/frappe/frappe/desk/moduleview.py +61,Documents,কাগজপত্র
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,সুত্র
 DocType: Cost Center,Cost Center,খরচ কেন্দ্র
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ভাউচার #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ভাউচার #
 DocType: Notification Control,Purchase Order Message,আদেশ বার্তাতে ক্রয়
 DocType: Tax Rule,Shipping Country,শিপিং দেশ
 DocType: Upload Attendance,Upload HTML,আপলোড এইচটিএমএল
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",মোট অগ্রিম ({0}) আদেশের বিরুদ্ধে {1} \ বৃহত্তর হতে পারে না সর্বমোট তুলনায় ({2})
 DocType: Employee,Relieving Date,মুক্তিদান তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি এর মাধ্যমে পরিবর্তন করা যাবে / হুণ্ডি / কেনার রসিদ
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,আয়কর
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,লেজার নেট রুপায়ণ engineered
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,আয়কর
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","নির্বাচিত প্রাইসিং রুল &#39;মূল্য&#39; জন্য তৈরি করা হয় তাহলে, এটি মূল্য তালিকা মুছে ফেলা হবে. প্রাইসিং রুল মূল্য চূড়ান্ত দাম, তাই কোন অতিরিক্ত ছাড় প্রয়োগ করতে হবে. অত: পর, ইত্যাদি বিক্রয় আদেশ, ক্রয় আদেশ মত লেনদেন, এটা বরং &#39;মূল্য তালিকা হার&#39; ক্ষেত্র ছাড়া, &#39;হার&#39; ক্ষেত্র সংগৃহীত হবে."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
-DocType: User,Bio,বায়ো
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,কোন ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া যায় নি. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,অতি বৃহদাকার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,অতি বৃহদাকার
 ,Profit and Loss Statement,লাভ এবং লোকসান বিবরণী
 DocType: Bank Reconciliation Detail,Cheque Number,চেক সংখ্যা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,টিপলে
 DocType: Payment Tool Detail,Payment Tool Detail,পেমেন্ট টুল বিস্তারিত
 ,Sales Browser,সেলস ব্রাউজার
 DocType: Journal Entry,Total Credit,মোট ক্রেডিট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,স্থানীয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ঋণ ও অগ্রিমের (সম্পদ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ঋণ গ্রহিতা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,বড়
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,কোন কর্মচারী পাওয়া!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,বড়
 DocType: C-Form Invoice Detail,Territory,এলাকা
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Purchase Order,Customer Address Display,গ্রাহকের ঠিকানা প্রদর্শন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,মসৃণতা
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","আপনি ইতিমধ্যে অন্য UOM সঙ্গে কিছু লেনদেন (গুলি) করেছেন \ কারণ আইটেম জন্য মেজার ডিফল্ট ইউনিট {0} সরাসরি পরিবর্তন করা যাবে না. ডিফল্ট UOM পরিবর্তন করার জন্য, ব্যবহারের \ শেয়ার মডিউল অধীনে টুল &#39;UOM ইউটিলিটি র পরিবর্তে&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,বিনিময় হার অন্য মধ্যে এক মুদ্রা রূপান্তর উল্লেখ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,উদ্ধৃতি {0} বাতিল করা হয়
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,মোট বকেয়া পরিমাণ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} কর্মচারী ছুটি ছিল {1}. উপস্থিতির চিহ্নিত করতে পারবেন না.
 DocType: Sales Partner,Targets,লক্ষ্যমাত্রা
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
 DocType: Production Order Operation,Make Time Log,টাইম ইন করুন
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,পুনর্বিন্যাস পরিমাণ সেট করুন
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,কম্পিউটার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,তড়িৎ রাসায়নিক হয়রান
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,অ্যাকাউন্টের আপনার চার্ট সেটআপ আপনি হিসাব থেকে শুরু দয়া করে আগে
 DocType: Purchase Invoice,Ignore Pricing Rule,প্রাইসিং বিধি উপেক্ষা
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,বাতিল হয়েছে
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,বেতন কাঠামো এ জন্ম থেকে কর্মচারী যোগদান তারিখ তুলনায় কম হতে পারে না.
 DocType: Employee Education,Graduate,স্নাতক
 DocType: Leave Block List,Block Days,ব্লক দিন
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","চেক চালান আবর্তক তাহলে, আবৃত্ত বা থামাতে সঠিক শেষ তারিখ করা টিক চিহ্ন তুলে দেয়া"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,সর্বাধিক {0} সারি অনুমতি
 DocType: C-Form Invoice Detail,Net Total,সর্বমোট
 DocType: Bin,FCFS Rate,FCFs হার
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),বিলিং (বিক্রয় চালান)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,উদ্দেশ্যসমূহ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","অপারেশন {0} ওয়ার্কস্টেশন কোনো উপলব্ধ কাজের সময় চেয়ে দীর্ঘতর {1}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,তাড়িত যন্ত্র
 ,Requested,অনুরোধ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,কোন মন্তব্য
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,পরিশোধসময়াতীত
 DocType: Account,Stock Received But Not Billed,শেয়ার পেয়েছি কিন্তু বিল না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,গ্রস পে &#39;বকেয়া পরিমাণ + নগদীকরণ পরিমাণ - মোট সিদ্ধান্তগ্রহণ
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Features Setup,Sales and Purchase,ক্রয় এবং বিক্রয়
 DocType: Supplier Quotation Item,Material Request No,উপাদানের জন্য অনুরোধ কোন
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,যা গ্রাহকের কারেন্সি হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} এই তালিকা থেকে সফলভাবে রদ করা হয়েছে.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}  সফলভাবে এই তালিকা থেকে রদ করেছেন.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),নিট হার (কোম্পানি একক)
-apps/frappe/frappe/templates/base.html +134,Added,যোগ করা
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
 DocType: Journal Entry Account,Sales Invoice,বিক্রয় চালান
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,অর্থবছরের {0} পাওয়া যায়নি.
 DocType: Bank Reconciliation,Get Relevant Entries,প্রাসঙ্গিক এন্ট্রি পেতে
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
-apps/frappe/frappe/desk/query_report.py +136,Total,মোট
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
 DocType: Account,Root Type,Root- র ধরন
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},সারি # {0}: বেশী ফিরে যাবে না {1} আইটেম জন্য {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Quality Inspection,Quality Inspection,উচ্চমানের তদন্ত
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,বিরচন স্প্রে
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,অতিরিক্ত ছোট
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,পিএল বা বঙ্গাব্দের
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,নূন্যতম পরিসংখ্যা শ্রেনী
 DocType: Stock Entry,Subcontract,ঠিকা
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,প্রস্তুতকর্তা পার্ট সংখ্যা
 DocType: Production Order Operation,Estimated Time and Cost,আনুমানিক সময় এবং খরচ
 DocType: Bin,Bin,বিন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,এসএমএস পাঠানোর কোন
 DocType: Account,Company,কোম্পানি
 DocType: Account,Expense Account,দামী হিসাব
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,সফটওয়্যার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,রঙিন
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,সফটওয়্যার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,রঙিন
 DocType: Maintenance Visit,Scheduled,তালিকাভুক্ত
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;না&quot; এবং &quot;বিক্রয় আইটেম&quot; &quot;শেয়ার আইটেম&quot; যেখানে &quot;হ্যাঁ&quot; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,অসমান মাস জুড়ে লক্ষ্যমাত্রা বিতরণ মাসিক ডিস্ট্রিবিউশন নির্বাচন.
 DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধারণ হার
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,আইটেম সারি {0}: {1} উপরোক্ত &#39;ক্রয় রসিদের&#39; টেবিলের অস্তিত্ব নেই কেনার রসিদ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,প্রজেক্ট আরম্ভের তারিখ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,পর্যন্ত
 DocType: Rename Tool,Rename Log,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
 DocType: Installation Note Item,Against Document No,ডকুমেন্ট কোন বিরুদ্ধে
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,সেলস পার্টনার্স সেকেন্ড.
 DocType: Quality Inspection,Inspection Type,ইন্সপেকশন ধরন
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},দয়া করে নির্বাচন করুন {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,গবেষক
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,আপডেট
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,গবেষক
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,পাঠানোর আগে নিউজলেটার সংরক্ষণ করুন
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,নাম বা ইমেল বাধ্যতামূলক
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ইনকামিং মান পরিদর্শন.
 DocType: Purchase Order Item,Returned Qty,ফিরে Qty
 DocType: Employee,Exit,প্রস্থান
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root- র ধরন বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root- র ধরন বাধ্যতামূলক
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} নির্মিত সিরিয়াল কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,ঝাঁকি সমাপ্তি
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","গ্রাহকদের সুবিধার জন্য, এই কোড চালান এবং বিলি নোট মত মুদ্রণ বিন্যাস ব্যবহার করা যেতে পারে"
 DocType: Employee,You can enter any date manually,আপনি নিজে কোনো তারিখ লিখতে পারেন
 DocType: Sales Invoice,Advertisement,বিজ্ঞাপন
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,অবেক্ষাধীন সময়ের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,অবেক্ষাধীন সময়ের
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধু পাতার নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Expense Claim,Expense Approver,ব্যয় রাজসাক্ষী
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,হয়রান
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,মোড়কে সঙ্কুচিত
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,মুলতুবি কার্যক্রম
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,নিশ্চিতকৃত
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,সরবরাহকারী&gt; সরবরাহকারী ধরন
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ধাতু বিগলন
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,আদায় এবং সিদ্ধান্তগ্রহণ উপর ভিত্তি করে বেতন ছুটি.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট লেজার রূপান্তরিত করা যাবে না
 DocType: Address,Preferred Shipping Address,পছন্দের শিপিং ঠিকানা
 DocType: Purchase Receipt Item,Accepted Warehouse,গৃহীত ওয়্যারহাউস
 DocType: Bank Reconciliation Detail,Posting Date,পোস্টিং তারিখ
 DocType: Item,Valuation Method,মূল্যনির্ধারণ পদ্ধতি
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} করার জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {1}
 DocType: Sales Invoice,Sales Team,বিক্রয় দল
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,ডুপ্লিকেট এন্ট্রি
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ডুপ্লিকেট এন্ট্রি
 DocType: Serial No,Under Warranty,ওয়ারেন্টিযুক্ত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ত্রুটি]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 ,Employee Birthday,কর্মচারী জন্মদিনের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
 DocType: Pricing Rule,Discount Percentage,ডিসকাউন্ট শতাংশ
 DocType: Payment Reconciliation Invoice,Invoice Number,চালান নম্বর
-apps/erpnext/erpnext/hooks.py +70,Orders,আদেশ
+apps/erpnext/erpnext/hooks.py +54,Orders,আদেশ
 DocType: Leave Control Panel,Employee Type,কর্মচারী ধরন
 DocType: Employee Leave Approver,Leave Approver,রাজসাক্ষী ত্যাগ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,উপাদান প্রস্তুত জন্য বদলিকৃত
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;ব্যয় রাজসাক্ষী&quot; ভূমিকা সাথে একজন ব্যবহারকারী
 ,Issued Items Against Production Order,উৎপাদন অর্ডার বিরুদ্ধে জারি চলছে
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,অকার্যকর সময়ের
 DocType: Customer,Credit Limit,ক্রেডিট সীমা
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,লেনদেনের ধরন নির্বাচন করুন
 DocType: GL Entry,Voucher No,ভাউচার কোন
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,ঠিকানা ও যোগাযোগ
 DocType: Customer,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Employee,Feedback,প্রতিক্রিয়া
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","আগে বরাদ্দ করা না যাবে ছেড়ে {0}, ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. সময়সূচি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ঘষিয়া তুলিয়া ফেলিতে সক্ষম জেট যন্ত্র
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. সময়সূচি
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
-DocType: Website Settings,Website Settings,ওয়েবসাইট সেটিংস
 DocType: Item,Reorder level based on Warehouse,গুদাম উপর ভিত্তি রেকর্ডার স্তর
 DocType: Activity Cost,Billing Rate,বিলিং রেট
 ,Qty to Deliver,বিতরণ Qty
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root অ্যাকাউন্টের মোছা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,দেখান স্টক সাজপোশাকটি
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Pricing Rule,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
-DocType: Communication,Phone,ফোন
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),বন্ধ (ড)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),বন্ধ (ড)
 DocType: Contact,Passive,নিষ্ক্রিয়
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,লেনদেন বিক্রি জন্য ট্যাক্স টেমপ্লেট.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,বিলের পরিমাণ
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,আপডেট পান
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,উপাদানের জন্য অনুরোধ {0} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ম্যানেজমেন্ট ত্যাগ
-DocType: Event,Groups,গ্রুপ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
 DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
 DocType: Lead,Lower Income,নিম্ন আয়
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,দ্রুত সাহায্য
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
 DocType: Features Setup,Sales Extras,সেলস অতিরিক্ত
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} খরচ কেন্দ্র বিরুদ্ধে একাউন্ট {1} জন্য {0} বাজেট অতিক্রম করবে {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;তারিখ থেকে&#39; পরে &#39;টু&#39; হতে হবে
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} খরচ কেন্দ্র বিরুদ্ধে একাউন্ট {1} জন্য {0} বাজেট অতিক্রম করবে {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,মূল্য বা স্টক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,মিনিট
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,মিনিট
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 ,Qty to Receive,জখন Qty
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,রূপান্তর ফ্যাক্টর ভগ্নাংশ হতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,আপনাকে অবশ্যই লগইন করতে এটি ব্যবহার করা হবে
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,আপনাকে অবশ্যই লগইন করতে এটি ব্যবহার করা হবে
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
-DocType: Sales Order,%  Delivered,% বিতরণ
+DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,বেতন স্লিপ করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,নিরাপদ ঋণ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ভয়ঙ্কর পণ্য
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ভয়ঙ্কর পণ্য
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই ছুটি অনুমোদন করা যায়নি
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,লস্ট-ফেনা ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,অঙ্কন
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},এক হতে হবে রাজসাক্ষী ত্যাগ {0}
 DocType: Hub Settings,Seller Email,বিক্রেতা ইমেইল
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
 DocType: Workstation Working Hour,Start Time,সময় শুরু
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
 DocType: BOM Operation,Hour Rate,ঘন্টা হার
 DocType: Stock Settings,Item Naming By,দফে নামকরণ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,উদ্ধৃতি থেকে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,উদ্ধৃতি থেকে
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},অন্য সময়ের সমাপ্তি এন্ট্রি {0} পরে তৈরি করা হয়েছে {1}
 DocType: Production Order,Material Transferred for Manufacturing,উপাদান উৎপাদন জন্য বদলিকৃত
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,অ্যাকাউন্ট {0} না বিদ্যমান
 DocType: Purchase Receipt Item,Purchase Order Item No,অর্ডার আইটেমটি কোন ক্রয়
-DocType: System Settings,System Settings,পদ্ধতি নির্ধারণ
 DocType: Project,Project Type,প্রকল্প ধরন
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,বিভিন্ন কার্যক্রম খরচ
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,হাতে নগদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
 DocType: Serial No,Is Cancelled,বাতিল করা হয়
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,আমার চালানে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,আমার চালানে
 DocType: Journal Entry,Bill Date,বিল তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
 DocType: Supplier,Supplier Details,সরবরাহকারী
-DocType: Communication,Recipients,প্রাপক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,অনুমোদন অবস্থা
 DocType: Hub Settings,Publish Items to Hub,হাব আইটেম প্রকাশ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},মূল্য সারিতে মান কম হতে হবে থেকে {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ওয়্যার ট্রান্সফার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ব্যাংক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Newsletter,Create and Send Newsletters,তৈরি করুন এবং পাঠান লেটার
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,জন্ম তারিখ থেকে আগে হওয়া আবশ্যক
 DocType: Sales Order,Recurring Order,আবর্তক অর্ডার
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
 DocType: Item Group,Check this if you want to show in website,আপনি ওয়েবসাইট প্রদর্শন করতে চান তাহলে এই পরীক্ষা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext স্বাগতম
+,Welcome to ERPNext,ERPNext স্বাগতম
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ভাউচার বিস্তারিত সংখ্যা
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,উদ্ধৃতি লিড
 DocType: Lead,From Customer,গ্রাহকের কাছ থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,কল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,কল
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
 ,Projected,অভিক্ষিপ্ত
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},সিরিয়াল কোন {0} ওয়্যারহাউস অন্তর্গত নয় {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,উল্লেখ্য: {0} পরিমাণ বা পরিমাণ 0 হিসাবে বিতরণ-বহুবার-বুকিং আইটেম জন্য সিস্টেম পরীক্ষা করা হবে না
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,খোলার তারিখ
 DocType: Journal Entry,Remark,মন্তব্য
 DocType: Purchase Receipt Item,Rate and Amount,হার এবং পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,বিরক্তিকর
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,সেলস অর্ডার থেকে
-DocType: Blog Category,Parent Website Route,মূল ওয়েবসাইট রুট
 DocType: Sales Order,Not Billed,বিল না
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,উভয় ওয়্যারহাউস একই কোম্পানির অন্তর্গত নয়
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,কোনো পরিচিতি এখনো যোগ.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,সক্রিয় নয়
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ল্যান্ড কস্ট ভাউচার পরিমাণ
 DocType: Time Log,Batched for Billing,বিলিং জন্য শ্রেণীবদ্ধ
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,প্রস্তাব উত্থাপিত বিল.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,যেমন ভ্যাট
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,যেমন ভ্যাট
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,আইটেম 4
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,গঠন গরম ধাতু গ্যাস
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
 DocType: Sales Invoice Item,Delivered Qty,বিতরিত Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ওয়ারহাউস {0}: কোম্পানি বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",ট্যাক্স হার উল্লেখ করা উপযুক্ত গ্রুপ (ফান্ডস&gt; চলতি দায়&gt; ট্যাক্সসমূহ ও দায়িত্ব সাধারণত উত্স থেকে যান এবং টাইপ &quot;ট্যাক্স&quot; এর) শিশু যোগ উপর ক্লিক করে (একটি নতুন অ্যাকাউন্ট তৈরি করা এবং না.
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,লেজারের কাটিং
-DocType: Event,Monday,সোমবার
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Account,Payable,প্রদেয়
 DocType: Salary Slip,Arrear Amount,বকেয়া পরিমাণ
@@ -2574,11 +2368,10 @@
 DocType: Appraisal Goal,Weightage (%),গুরুত্ব (%)
 DocType: Bank Reconciliation Detail,Clearance Date,পরিস্কারের তারিখ
 DocType: Newsletter,Newsletter List,নিউজলেটার তালিকা
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,আপনি বেতন স্লিপ জমা দেওয়ার সময় প্রতিটি কর্মচারী মেইল বেতন স্লিপ পাঠাতে চান কিনা পরীক্ষা করুন
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,আপনি বেতন স্লিপ জমা দেওয়ার সময় প্রতিটি কর্মচারী মেইল বেতন স্লিপ পাঠাতে চান কিনা পরীক্ষা করুন
 DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,উত্পাদন অপারেশন কোথায় সম্পন্ন হয়.
-DocType: Page,All,সব
 DocType: Stock Entry Detail,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
 DocType: Employee,Confirmation Date,নিশ্চিতকরণ তারিখ
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,সেলস ব্যবহারকারী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,ন্যূনতম Qty সর্বোচ্চ Qty তার চেয়ে অনেক বেশী হতে পারে না
 DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,সেট
 DocType: Lead,Lead Owner,লিড মালিক
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,গুদাম প্রয়োজন বোধ করা হয়
 DocType: Employee,Marital Status,বৈবাহিক অবস্থা
 DocType: Stock Settings,Auto Material Request,অটো উপাদানের জন্য অনুরোধ
 DocType: Time Log,Will be updated when billed.,বিল যখন আপডেট করা হবে.
@@ -2596,67 +2388,61 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,বর্তমান BOM এবং নতুন BOM একই হতে পারে না
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,অবসর তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% বিতরণ
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% বিতরণ করা হয়েছে
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,আইটেম {0}: আদেশ Qty {1} সর্বনিম্ন ক্রম Qty {2} (আইটেমটি সংজ্ঞায়িত) কম হতে পারে না.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,অর্ডার আইটেমটি সরবরাহ ক্রয়
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,কোম্পানির নাম কোম্পানি হতে পারে না
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,মুদ্রণ টেমপ্লেট শিরোনাম চালানকল্প যেমন.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
 DocType: POS Profile,Update Stock,আপডেট শেয়ার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,আইটেম জন্য বিভিন্ন UOM ভুল (মোট) নিট ওজন মান হতে হবে. প্রতিটি আইটেমের নিট ওজন একই UOM হয় তা নিশ্চিত করুন.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM হার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","টাইপ ইমেইল, ফোন, চ্যাট, দর্শন, ইত্যাদি সব যোগাযোগের রেকর্ড"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,কোম্পানি এ সুসম্পন্ন খরচ কেন্দ্র উল্লেখ করুন
 DocType: Purchase Invoice,Terms,শর্তাবলী
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,নতুন তৈরি
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,নতুন তৈরি
 DocType: Buying Settings,Purchase Order Required,আদেশ প্রয়োজন ক্রয়
 ,Item-wise Sales History,আইটেম-জ্ঞানী বিক্রয় ইতিহাস
 DocType: Expense Claim,Total Sanctioned Amount,মোট অনুমোদিত পরিমাণ
 ,Purchase Analytics,ক্রয় অ্যানালিটিক্স
 DocType: Sales Invoice Item,Delivery Note Item,হুণ্ডি আইটেম
 DocType: Expense Claim,Task,কার্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,খেউরি
 DocType: Purchase Taxes and Charges,Reference Row #,রেফারেন্স সারি #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ব্যাচ নম্বর আইটেম জন্য বাধ্যতামূলক {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,এটি একটি root বিক্রয় ব্যক্তি এবং সম্পাদনা করা যাবে না.
 ,Stock Ledger,স্টক লেজার
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},রেট: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},রেট: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,বেতন স্লিপ সিদ্ধান্তগ্রহণ
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,নোট
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,প্রথমে একটি গ্রুপ নোড নির্বাচন.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,তাদের সর্বশেষ জায় অবস্থা সব কাঁচামাল সম্বলিত একটি প্রতিবেদন ডাউনলোড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,সম্মুখ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,কমিউনিটি ফোরাম
 DocType: Leave Application,Leave Balance Before Application,আবেদন করার আগে ব্যালান্স ত্যাগ
 DocType: SMS Center,Send SMS,এসএমএস পাঠান
 DocType: Company,Default Letter Head,চিঠি মাথা ডিফল্ট
 DocType: Time Log,Billable,বিলযোগ্য
-DocType: Authorization Rule,This will be used for setting rule in HR module,এই এইচআর মডিউলে নিয়ম সেট করার জন্য ব্যবহার করা হবে
 DocType: Account,Rate at which this tax is applied,"এই ট্যাক্স প্রয়োগ করা হয়, যা এ হার"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,রেকর্ডার Qty
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
 DocType: Journal Entry,Write Off,খরচ লেখা
 DocType: Time Log,Operation ID,অপারেশন আইডি
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","সিস্টেম ব্যবহারকারী (লগইন) আইডি. সেট, এটি সব এইচআর ফরম জন্য ডিফল্ট হয়ে যাবে."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: থেকে {1}
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} থেকে
 DocType: Task,depends_on,নির্ভর করে
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,সুযোগ হারিয়েছে
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ছাড়ের ক্ষেত্র ক্রয় আদেশ, কেনার রসিদ, ক্রয় চালান মধ্যে উপলব্ধ করা হবে"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন একাউন্টের নাম. উল্লেখ্য: গ্রাহকদের এবং সরবরাহকারী জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
-DocType: Report,Report Type,প্রতিবেদনের প্রকার
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,লোড হচ্ছে
 DocType: BOM Replace Tool,BOM Replace Tool,BOM টুল প্রতিস্থাপন
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,দেশ অনুযায়ী ডিফল্ট ঠিকানা টেমপ্লেট
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ডেটা আমদানি ও রপ্তানি
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',আপনি উত্পাদন ক্রিয়াকলাপে জড়িত করে. সক্ষম করে আইটেম &#39;নির্মিত হয়&#39;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
 DocType: Serial No,Out of AMC,এএমসি আউট
 DocType: Purchase Order Item,Material Request Detail No,উপাদানের জন্য অনুরোধ বিস্তারিত কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,হার্ড বাঁক
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
 DocType: Company,Default Cash Account,ডিফল্ট নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","উল্লেখ্য: পেমেন্ট কোনো রেফারেন্স বিরুদ্ধে প্রণীত না হয়, তাহলে নিজে জার্নাল এন্ট্রি করতে."
 DocType: Item,Supplier Items,সরবরাহকারী চলছে
 DocType: Opportunity,Opportunity Type,সুযোগ ধরন
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
 ,Stock Ageing,শেয়ার বুড়ো
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,জমা লেনদেনের পরিচিতিতে স্বয়ংক্রিয় ইমেল পাঠান.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","সারি {0}: স্টক গুদাম আসা না {1} উপর {2} {3}. প্রাপ্তিসাধ্য Qty: {4}, qty স্থানান্তর: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
-DocType: Event,Sunday,রবিবার
 DocType: Sales Team,Contribution (%),অবদান (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,দায়িত্ব
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,টেবিলের অন্তত 1 চালান লিখুন দয়া করে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ব্যবহারকারী যুক্ত করুন
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,ব্যবহারকারী যুক্ত করুন
 DocType: Pricing Rule,Item Group,আইটেমটি গ্রুপ
 DocType: Task,Actual Start Date (via Time Logs),প্রকৃত আরম্ভের তারিখ (সময় লগসমূহ মাধ্যমে)
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},করুন {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
 DocType: Item,Default BOM,ডিফল্ট BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
 DocType: Time Log Batch,Total Hours,মোট ঘণ্টা
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,স্বয়ংচালিত
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,আইটেম প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,মেটাল ইনজেকশন ছাঁচনির্মাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Time Log,From Time,সময় থেকে
 DocType: Notification Control,Custom Message,নিজস্ব বার্তা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","আপনার দেশ, সময় মন্ডল ও মুদ্রা নির্বাচন"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,বিনিয়োগ ব্যাংকিং
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,বালি ঢালাই
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,তাড়িতলেপন
 DocType: Purchase Invoice Item,Rate,হার
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,অন্তরীণ করা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,অন্তরীণ করা
 DocType: Newsletter,A Lead with this email id should exist,এই ইমেইল আইডি দিয়ে লিড বিদ্যমান উচিত
 DocType: Stock Entry,From BOM,BOM থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,জন্ম অর্ধদিবস ছুটি তারিখ থেকে একই হতে হবে
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
 DocType: Salary Structure,Salary Structure,বেতন কাঠামো
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","একাধিক মূল্য রুল একই মানদণ্ডের সঙ্গে বিদ্যমান, অগ্রাধিকার বরাদ্দ দ্বারা \ দ্বন্দ্ব সমাধান করুন. দাম বিধি: {0}"
 DocType: Account,Bank,ব্যাংক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 DocType: Hub Settings,Access Token,অ্যাক্সেস টোকেন
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,পরিসম্পদ আইটেম
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","আপনি দীর্ঘ মুদ্রণ বিন্যাস আছে, এই বৈশিষ্ট্য প্রতিটি পেজে সব শিরোলেখ এবং পাদলেখ সঙ্গে একাধিক পাতায় ছাপা হবে পাতা বিভক্ত করতে ব্যবহার করা যেতে পারে"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,সমস্ত অঞ্চল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 DocType: Fiscal Year,Year Name,সাল নাম
 DocType: Process Payroll,Process Payroll,প্রক্রিয়া বেতনের
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
 DocType: Product Bundle Item,Product Bundle Item,পণ্য সমষ্টি আইটেম
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
 DocType: Purchase Invoice Item,Image View,চিত্র দেখুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,সমাপ্তি ও শিল্প সমাপ্তি
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,সিকিউরিটিজ ও পণ্য বিনিময়ের
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,তুরপুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ঘা ঢালাই
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
 DocType: Tax Rule,Shipping City,শিপিং সিটি
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
 DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
 DocType: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,বিধ্বস্ত
-DocType: Web Page,Slideshow,ছবি
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ডিফল্ট ঠিকানা টেমপ্লেট মোছা যাবে না
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
 DocType: Journal Entry,Print Heading,প্রিন্ট শীর্ষক
 DocType: Quotation,Maintenance Manager,রক্ষণাবেক্ষণ ব্যাবস্থাপক
-DocType: Workflow State,Search,অনুসন্ধান
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,মোট শূন্য হতে পারে না
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;শেষ আদেশ থেকে দিনের&#39; শূন্য এর চেয়ে বড় বা সমান হতে হবে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'সর্বশেষ অর্ডার থেকে এখন পর্যন্ত হওয়া দিনের সংখ্যা' শূন্য এর চেয়ে বড় বা সমান হতে হবে
 DocType: C-Form,Amended From,সংশোধিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,কাঁচামাল
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,কাঁচামাল
 DocType: Leave Application,Follow via Email,ইমেইলের মাধ্যমে অনুসরণ করুন
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,শিশু অ্যাকাউন্ট এই অ্যাকাউন্টের জন্য বিদ্যমান. আপনি এই অ্যাকাউন্ট মুছে ফেলতে পারবেন না.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
 DocType: Leave Control Panel,Carry Forward,সামনে আগাও
@@ -2801,44 +2570,43 @@
 ,Produced,উত্পাদিত
 DocType: Item,Item Code for Suppliers,সরবরাহকারীদের জন্য আইটেম কোড
 DocType: Issue,Raised By (Email),দ্বারা উত্থাপিত (ইমেইল)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,সাধারণ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,লেটারহেড সংযুক্ত
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,সাধারণ
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,লেটারহেড সংযুক্ত
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","আপনার ট্যাক্স মাথা তালিকা (উদাহরণ ভ্যাট, কাস্টমস ইত্যাদি; তারা অনন্য নাম থাকা উচিত) এবং তাদের মান হার. এই কমান্ডের সাহায্যে আপনি সম্পাদনা করতে এবং আরো পরে যোগ করতে পারেন, যা একটি আদর্শ টেমপ্লেট তৈরি করতে হবে."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","আপনার ট্যাক্স মাথা তালিকা (উদাহরণ ভ্যাট, কাস্টমস ইত্যাদি; তারা অনন্য নাম থাকা উচিত) এবং তাদের মান হার. এই কমান্ডের সাহায্যে আপনি সম্পাদনা করতে এবং আরো পরে যোগ করতে পারেন, যা একটি আদর্শ টেমপ্লেট তৈরি করতে হবে."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
 DocType: Journal Entry,Bank Entry,ব্যাংক এণ্ট্রি
 DocType: Authorization Rule,Applicable To (Designation),প্রযোজ্য (পদবী)
-DocType: Blog Post,Blog Post,ব্লগ পোস্ট
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,গ্রুপ দ্বারা
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ নিষ্ক্রিয় মুদ্রা সক্রিয় করুন.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ঠিকানা খরচ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Purchase Order,The date on which recurring order will be stop,আবর্তক অর্ডার বন্ধ করা হবে কোন তারিখে
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} অথবা আপনি বৃদ্ধি করা উচিত ওভারফ্লো সহনশীলতা হ্রাস করা হবে
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,মোট বর্তমান
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ঘন্টা
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ঘন্টা
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,উদ্ধৃতি তৈরি
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},দ্বারা অনুমোদিত হতে পারে {0}
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
 DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
 DocType: Features Setup,Point of Sale,বিক্রয় বিন্দু
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,কুঁচিতকরণ
 DocType: Account,Tax,কর
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},সারি {0}: {1} একটি বৈধ নয় {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,বিশোধক
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},সারি {0}: {1} একটি বৈধ নয় {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,পণ্য বান্ডিল থেকে
 DocType: Production Planning Tool,Production Planning Tool,উৎপাদন পরিকল্পনা টুল
 DocType: Quality Inspection,Report Date,প্রতিবেদন তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,রাউটিং
 DocType: C-Form,Invoices,চালান
 DocType: Job Opening,Job Title,কাজের শিরোনাম
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ইতিমধ্যে সময়ের জন্য কর্মচারী {1} জন্য বরাদ্দ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} প্রাপক
 DocType: Features Setup,Item Groups in Details,বিবরণ আইটেম গ্রুপ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,হালনাগাদ হার এবং প্রাপ্যতা
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,শতকরা আপনি পাবেন বা আদেশ পরিমাণ বিরুদ্ধে আরো বিলি করার অনুমতি দেওয়া হয়. উদাহরণস্বরূপ: আপনি 100 ইউনিট আদেশ আছে. এবং আপনার ভাতা তারপর আপনি 110 ইউনিট গ্রহণ করার অনুমতি দেওয়া হয় 10% হয়.
 DocType: Pricing Rule,Customer Group,গ্রাহক গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: Item,Website Description,ওয়েবসাইট বর্ণনা
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
 ,Sales Register,সেলস নিবন্ধন
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
 DocType: Address,Plant,উদ্ভিদ
-DocType: DocType,Setup,সেটআপ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,কোল্ড রোলিং
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
 DocType: GL Entry,Against Voucher Type,ভাউচার টাইপ বিরুদ্ধে
 DocType: Item,Attributes,আরোপ করা
-DocType: Packing Slip,Get Items,জানানোর পান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,শেষ আদেশ তারিখ
-DocType: DocField,Image,ভাবমূর্তি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,আবগারি চালান করুন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
-DocType: Communication,Other,অন্যান্য
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,অপারেশন আইডি সেট না
 DocType: Production Order,Planned Start Date,পরিকল্পনা শুরুর তারিখ
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. দর্শন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. দর্শন
 DocType: Leave Type,Is Encash,ভাঙ্গান হয়
 DocType: Purchase Invoice,Mobile No,মোবাইল নাম্বার
 DocType: Payment Tool,Make Journal Entry,জার্নাল এন্ট্রি করতে
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,প্রকল্প-ভিত্তিক তথ্য উদ্ধৃতি জন্য উপলব্ধ নয়
 DocType: Project,Expected End Date,সমাপ্তি প্রত্যাশিত তারিখ
 DocType: Appraisal Template,Appraisal Template Title,মূল্যায়ন টেমপ্লেট শিরোনাম
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ব্যবসায়িক
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,মূল আইটেমটি {0} একটি স্টক আইটেম হবে না
 DocType: Cost Center,Distribution Id,বন্টন আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,জট্টিল সেবা
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,সব পণ্য বা সেবা.
 DocType: Purchase Invoice,Supplier Address,সরবরাহকারী ঠিকানা
-DocType: Contact Us Settings,Address Line 2,ঠিকানা লাইন ২
-DocType: ToDo,Reference,উল্লেখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,বেধক
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty আউট
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,সিরিজ বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} অ্যাট্রিবিউট জন্য মূল্য পরিসীমা মধ্যে হতে হবে {1} করার {2} এর মধ্যে বাড়তি {3}
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,গ্রহনযোগ্য অ্যাকাউন্ট ডিফল্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ল্যামিনেট
 DocType: Item Reorder,Transfer,হস্তান্তর
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
 DocType: Supplier,Contact HTML,যোগাযোগ এইচটিএমএল
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,খুচরা
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
-DocType: Product Bundle,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,নিষ্পেষণ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
 DocType: GL Entry,Remarks,মন্তব্য
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
 DocType: Features Setup,POS View,পিওএস দেখুন
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,একটানা ভোটদান
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,একটি নির্দিষ্ট করুন
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,উপরে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,কোল্ড নির্ধারন
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,অ্যাকাউন্ট {0} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,এলাকা
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
 DocType: Holiday List,Weekly Off,সাপ্তাহিক ছুটি
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","যেমন 2012, 2012-13 জন্য"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),প্রোভিশনাল লাভ / ক্ষতি (ক্রেডিট)
 DocType: Sales Invoice,Return Against Sales Invoice,বিরুদ্ধে বিক্রয় চালান আসতে
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,আইটেম 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},কোম্পানি এ ডিফল্ট মান {0} সেট করুন {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},কোম্পানি এ ডিফল্ট মান {0} সেট করুন {1}
 DocType: Serial No,Creation Time,লেখার সময়
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,মোট রাজস্ব
 DocType: Sales Invoice,Product Bundle Help,পণ্য সমষ্টি সাহায্য
 ,Monthly Attendance Sheet,মাসিক উপস্থিতি পত্রক
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,পাওয়া কোন রেকর্ড
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,অ্যাকাউন্ট {0} নিষ্ক্রীয়
 DocType: GL Entry,Is Advance,অগ্রিম
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,জন্ম তারিখ এবং উপস্থিত এ্যাটেনডেন্স বাধ্যতামূলক
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,হ্যাঁ অথবা না হিসাবে &#39;আউটসোর্স থাকলে&#39; দয়া করে প্রবেশ করুন
 DocType: Sales Team,Contact No.,যোগাযোগের নম্বর.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,এন্ট্রি খোলা অনুমোদিত নয় &#39;লাভ ও ক্ষতি&#39; টাইপ অ্যাকাউন্ট {0}
-DocType: Workflow State,Time,সময়
 DocType: Features Setup,Sales Discounts,সেলস রহমান
 DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
 DocType: Sales Invoice,Terms and Conditions Details,শর্তাবলী বিস্তারিত
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,বিক্রয় করের এবং চার্জ টেমপ্লেট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,পোশাক ও আনুষাঙ্গিক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,পোশাক ও আনুষাঙ্গিক
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,অর্ডার সংখ্যা
 DocType: Item Group,HTML / Banner that will show on the top of product list.,পণ্য তালিকার শীর্ষে প্রদর্শন করবে এইচটিএমএল / ব্যানার.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,শিপিং পরিমাণ নিরূপণ শর্ত নির্দিষ্ট
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,শিশু করো
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ভূমিকা হিমায়িত একাউন্টস ও সম্পাদনা হিমায়িত সাজপোশাকটি সেট করার মঞ্জুরি
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,এটা সন্তানের নোড আছে খতিয়ান করার খরচ কেন্দ্র রূপান্তর করতে পারবেন না
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,রূপান্তর ফ্যাক্টর প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,সিরিয়াল #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,বিক্রয় কমিশনের
 DocType: Offer Letter Term,Value / Description,মূল্য / বিবরণ:
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,গ্রাহকদের দীর্ঘ সময় থেকে কেনা হয় না
 DocType: Production Order,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,স্ফীত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,বাষ্পীভবনের-প্যাটার্ন ঢালাই
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,আমোদ - প্রমোদ খরচ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,এই সেলস অর্ডার বাতিলের আগে চালান {0} বাতিল করতে হবে বিক্রয়
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,এই সেলস অর্ডার বাতিলের আগে চালান {0} বাতিল করতে হবে বিক্রয়
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,বয়স
 DocType: Time Log,Billing Amount,বিলিং পরিমাণ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,আইটেম জন্য নির্দিষ্ট অকার্যকর পরিমাণ {0}. পরিমাণ 0 তুলনায় বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ছুটি জন্য অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,বিদ্যমান লেনদেনের সঙ্গে অ্যাকাউন্ট মুছে ফেলা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,আইনি খরচ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","অটো ক্রম 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Sales Invoice,Posting Time,পোস্টিং সময়
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,নতুন গ্রাহক রাজস্ব
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ভ্রমণ খরচ
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,অ্যাকাউন্ট: {0} একক সঙ্গে: {1} নির্বাচন করা যাবে না
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
-DocType: Feed,Full Name,পুরো নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,সমর্থন
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,পরীক্ষাকাল
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ডিফল্ট গুদাম স্টক আইটেম জন্য বাধ্যতামূলক.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},মাসের জন্য বেতন পরিশোধ {0} এবং বছরের {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 ,Transferred Qty,স্থানান্তর করা Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,সমুদ্রপথে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,পরিকল্পনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,পরিকল্পনা
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,টাইম ইন ব্যাচ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,জারি
 DocType: Project,Total Billing Amount (via Time Logs),মোট বিলিং পরিমাণ (সময় লগসমূহ মাধ্যমে)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,আমরা এই আইটেম বিক্রয়
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,আমরা এই আইটেম বিক্রয়
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,সরবরাহকারী আইডি
 DocType: Journal Entry,Cash Entry,ক্যাশ এণ্ট্রি
 DocType: Sales Partner,Contact Desc,যোগাযোগ নিম্নক্রমে
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,আইটেম ম্যানেজার
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,হিসাব বার্ষিক বাজেটের সেট সারি করো.
 DocType: Buying Settings,Default Supplier Type,ডিফল্ট সরবরাহকারী ধরন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,মোট অপারেটিং খরচ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,উল্লেখ্য: আইটেম {0} একাধিক বার প্রবেশ
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,সকল যোগাযোগ.
 DocType: Newsletter,Test Email Id,টেস্ট ইমেইল আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,কোম্পানি সমাহার
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,কোম্পানি সমাহার
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,দ্বারা বিষয় কঠোর মান পরিদর্শন অনুসরণ করে. কেনার রসিদ মধ্যে কোন আইটেম কিউএ প্রয়োজনীয় এবং QA সক্ষম করে
 DocType: GL Entry,Party Type,পার্টি শ্রেণী
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,কাচামাল প্রধান আইটেম হিসাবে একই হতে পারে না
 DocType: Item Attribute Value,Abbreviation,সংক্ষেপ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} সীমা অতিক্রম করে, যেহেতু authroized না"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,আবর্তনশীল ছাঁচনির্মাণ
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,বেতন টেমপ্লেট মাস্টার.
 DocType: Leave Type,Max Days Leave Allowed,সর্বাধিক দিন ছেড়ে প্রেজেন্টেশন
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,শপিং কার্ট জন্য সেট করের রুল
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,সকল গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} বাধ্যতামূলক. হয়তো মুদ্রা বিনিময় রেকর্ড {1} {2} করার জন্য তৈরি করা হয় না.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ট্যাক্স টেমপ্লেট বাধ্যতামূলক.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} অস্তিত্ব নেই
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),মূল্যতালিকা হার (কোম্পানি একক)
 DocType: Account,Temporary,অস্থায়ী
 DocType: Address,Preferred Billing Address,পছন্দের বিলিং ঠিকানা
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,সম্পাদক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,সম্পাদক
 DocType: Serial No,Distinct unit of an Item,একটি আইটেম এর স্বতন্ত্র ইউনিট
 DocType: Pricing Rule,Buying,ক্রয়
 DocType: HR Settings,Employee Records to be created by,কর্মচারী রেকর্ড করে তৈরি করা
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
 DocType: Purchase Order Item,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ironing
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} থামানো হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,আসন্ন ঘটনাবলী
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
-DocType: Letter Head,Letter Head,চিঠি মাথা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,দ্রুত এন্ট্রি
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরুন বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ফিরার জন্য বাধ্যতামূলক
 DocType: Purchase Order,To Receive,গ্রহণ করতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ফিটিং সঙ্কুচিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,আয় / ব্যয়
 DocType: Employee,Personal Email,ব্যক্তিগত ইমেইল
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,মোট ভেদাংক
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,মোট ভেদাংক
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","সক্রিয় করা হলে, সিস্টেম স্বয়ংক্রিয়ভাবে পরিসংখ্যা জন্য অ্যাকাউন্টিং এন্ট্রি পোস্ট করতে হবে."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,দালালি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,দালালি
 DocType: Address,Postal Code,পোস্ট অফিসের নাম্বার
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",মিনিটের মধ্যে &#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Hub Settings,Name Token,নাম টোকেন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,স্ট্যান্ডার্ড বিক্রি
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,স্ট্যান্ডার্ড বিক্রি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,মেজার ডিফল্ট ইউনিট লিখুন দয়া করে
 DocType: Purchase Invoice Item,Project Name,প্রকল্পের নাম
 DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
-DocType: Workflow State,Edit,সম্পাদন করা
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Features Setup,Item Batch Nos,আইটেম ব্যাচ আমরা
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,পেমেন্ট পুনর্মিলন পরিশোধের
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ট্যাক্স সম্পদ
 DocType: BOM Item,BOM No,BOM কোন
-DocType: Contact Us Settings,Pincode,পিনকোড
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Replace Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,নতুন শেয়ার UOM বর্তমান স্টক UOM থেকে আলাদা হতে হবে
 DocType: Account,Debit,ডেবিট
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,পাতার 0.5 এর গুণিতক বরাদ্দ করা আবশ্যক
 DocType: Production Order,Operation Cost,অপারেশন খরচ
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,একটি CSV ফাইল থেকে উপস্থিতি আপলোড
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,বিশিষ্ট মাসিক
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,ডিফল্ট খরচের কেন্দ্র
 DocType: Purchase Invoice,End Date,শেষ তারিখ
 DocType: Employee,Internal Work History,অভ্যন্তরীণ কাজের ইতিহাস
-DocType: DocField,Column Break,কলাম বিরতি
-DocType: Event,Thursday,বৃহস্পতিবার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,বাঁক
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
 DocType: Sales Invoice,Exhibition,প্রদর্শনী
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,অনুষ্ঠিত
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,উত্পাদনের আইটেম
 ,Employee Information,কর্মচারী তথ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),হার (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),হার (%)
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),বিনা বেতনে ছুটি জন্য আদায় হ্রাস (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},উল্লেখ্য: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} সারিতে একটি ক্রয় বা উপ-সংকুচিত আইটেম হতে হবে {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
 DocType: GL Entry,Party,পার্টি
 DocType: Sales Order,Delivery Date,প্রসবের তারিখ
-DocType: DocField,Currency,মুদ্রা
 DocType: Opportunity,Opportunity Date,সুযোগ তারিখ
 DocType: Purchase Receipt,Return Against Purchase Receipt,কেনার রসিদ বিরুদ্ধে ফিরে
 DocType: Purchase Order,To Bill,বিল
 DocType: Material Request,% Ordered,% আদেশ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ফুরণ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ফুরণ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,গড়. রাজধানীতে হার
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,আলোচনা করতে
 DocType: SMS Settings,SMS Settings,এসএমএস সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,অস্থায়ী অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,কালো
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,কালো
 DocType: BOM Explosion Item,BOM Explosion Item,BOM বিস্ফোরণ আইটেম
 DocType: Account,Auditor,নিরীক্ষক
 DocType: Purchase Order,End date of current order's period,বর্তমান অর্ডারের সময়ের শেষ তারিখ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,অফার লেটার করুন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,প্রত্যাবর্তন
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
-DocType: DocField,Fold,ভাঁজ
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট টেমপ্লেট হিসাবে একই হতে হবে
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,অনুগ্রহ করে নির্দিষ্ট করুন
 DocType: Task,Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,কাস্টমার আইডি
-DocType: Page,Page Name,পৃষ্ঠার নাম
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,সময় সময় থেকে তার চেয়ে অনেক বেশী করা আবশ্যক
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ওয়ারহাউস {0}: মূল অ্যাকাউন্ট {1} কোম্পানী bolong না {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,টাকু সমাপ্তি
 DocType: BOM,Last Purchase Rate,শেষ কেনার হার
 DocType: Account,Asset,সম্পদ
 DocType: Project Task,Task ID,টাস্ক আইডি
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",যেমন &quot;এমসি&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",যেমন &quot;এমসি&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,আইটেম জন্য উপস্থিত হতে পারে না শেয়ার {0} থেকে ভিন্নতা আছে
 ,Sales Person-wise Transaction Summary,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
-DocType: System Settings,Time Zone,সময় অঞ্চল
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext হাব জন্য নিবন্ধন
 DocType: Monthly Distribution,Monthly Distribution Percentages,মাসিক বন্টন শতকরা
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
 DocType: Delivery Note,% of materials delivered against this Delivery Note,উপকরণ% এই হুণ্ডি বিরুদ্ধে বিতরণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,কাস্টমার বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,রুপায়ণ
 DocType: Employee,Reports to,রিপোর্ট হতে
 DocType: SMS Settings,Enter url parameter for receiver nos,রিসিভার আমরা জন্য URL প্যারামিটার লিখুন
 DocType: Sales Invoice,Paid Amount,দেওয়া পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',অ্যাকাউন্ট {0} সমাপ্তি টাইপ &#39;দায়&#39; হওয়া আবশ্যক
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,গুনমান ব্যবস্থাপনা
 DocType: Production Planning Tool,Filter based on customer,ফিল্টার গ্রাহক উপর ভিত্তি করে
 DocType: Payment Tool Detail,Against Voucher No,ভাউচার কোন বিরুদ্ধে
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 DocType: Tax Rule,Purchase,ক্রয়
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ব্যালেন্স Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ব্যালেন্স Qty
 DocType: Item Group,Parent Item Group,মূল আইটেমটি গ্রুপ
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} জন্য {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{1} এর জন্য {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,খরচ কেন্দ্র
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ওয়ারহাউস.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ওয়ারহাউস.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,যা সরবরাহকারী মুদ্রার হারে কোম্পানির বেস কারেন্সি রূপান্তরিত হয়
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},সারি # {0}: সারিতে সঙ্গে উপস্থাপনার দ্বন্দ্ব {1}
 DocType: Opportunity,Next Contact,পরবর্তী যোগাযোগ
 DocType: Employee,Employment Type,কর্মসংস্থান প্রকার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,নির্দিষ্ট পরিমান সম্পত্তি
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,আবেদনের সময় দুই alocation রেকর্ড জুড়ে হতে পারে না
 DocType: Item Group,Default Expense Account,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
 DocType: Employee,Notice (days),নোটিশ (দিন)
-DocType: Page,Yes,হাঁ
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ভাউচার বিরুদ্ধে প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রিতে হতে হবে"
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ডিফল্ট কার্যকলাপ খরচ কার্যকলাপ টাইপ জন্য বিদ্যমান - {0}
 DocType: Production Order,Planned Operating Cost,পরিকল্পনা অপারেটিং খরচ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,নতুন {0} নাম
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},এটি সংযুক্ত {0} # {1}
 DocType: Job Applicant,Applicant Name,আবেদনকারীর নাম
 DocType: Authorization Rule,Customer / Item Name,গ্রাহক / আইটেম নাম
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},সিরিয়াল কোন আইটেম জন্য বাধ্যতামূলক {0}
 DocType: Item Variant Attribute,Attribute,গুণ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,পরিসীমা থেকে / উল্লেখ করুন
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,দ্বারা নির্মিত
 DocType: Serial No,Under AMC,এএমসি অধীনে
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,আইটেম মূল্যনির্ধারণ হার অবতরণ খরচ ভাউচার পরিমাণ বিবেচনা পুনঃগণনা করা হয়
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,লেনদেন বিক্রয় জন্য ডিফল্ট সেটিংস.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,ন্যূনতম পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,আপডেট সমাপ্ত পণ্য
 DocType: Workstation,per hour,প্রতি ঘণ্টা
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ইতিমধ্যে ব্যবহৃত সিরিজ {0} {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,গুদাম (চিরস্থায়ী পরিসংখ্যা) জন্য অ্যাকাউন্ট এই অ্যাকাউন্টের অধীনে তৈরি করা হবে.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,পরিমাণ অর্থ প্রদান করা
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,প্রকল্প ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
 DocType: Customer,Default Taxes and Charges,ডিফল্ট কর ও শুল্ক
 DocType: Account,Receivable,প্রাপ্য
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
 DocType: Sales Invoice,Supplier Reference,সরবরাহকারী রেফারেন্স
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","চেক করা থাকলে, উপ-সমাবেশ আইটেম জন্য BOM কাঁচামাল পাওয়ার জন্য বিবেচনা করা হবে. অন্যথা, সব সাব-সমাবেশ জিনিস কাঁচামাল হিসেবে গণ্য করা হবে."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
 DocType: Employee Education,Qualification,যোগ্যতা
 DocType: Item Price,Item Price,আইটেমের মূল্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,সাবান ও ডিটারজেন্ট
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,মোশন পিকচার ও ভিডিও
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,সাপোর্ট Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},কোম্পানি গুদাম অনুপস্থিত {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,শেয়ার UOM উপযোগীতা প্রতিস্থাপন
 DocType: POS Profile,Terms and Conditions,শর্তাবলী
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম Assuming {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","এখানে আপনি ইত্যাদি উচ্চতা, ওজন, এলার্জি, ঔষধ উদ্বেগ স্থাপন করতে পারে"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,উত্পাদনের জন্য
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,উপরে টেবিল বিক্রয় আদেশ লিখুন দয়া করে
 DocType: Project Task,View Task,দেখুন টাস্ক
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,তোমার আর্থিক বছরের শুরু
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,তোমার আর্থিক বছরের শুরু
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ক্রয় রসিদ লিখুন দয়া করে
 DocType: Sales Invoice,Get Advances Received,উন্নতির গৃহীত করুন
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),সমর্থন ইমেল আইডি জন্য সেটআপ ইনকামিং সার্ভার. (যেমন support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;তারিখ&#39; প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'তারিখ পর্যন্ত' প্রয়োজন
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
 DocType: Sales Invoice Item,Sales Order Item,সেলস অর্ডার আইটেমটি
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
 DocType: BOM,Manage cost of operations,অপারেশনের খরচ পরিচালনা
 DocType: Features Setup,Item Advanced,আইটেম উন্নত
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,হট ঢালাই
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","চেক লেনদেনের কোনো &quot;জমা&quot; করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত &quot;যোগাযোগ&quot; একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,গ্লোবাল সেটিংস
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
 DocType: Salary Slip,Net Pay,নেট বেতন
 DocType: Account,Account,হিসাব
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,সিরিয়াল কোন {0} ইতিমধ্যে গৃহীত হয়েছে
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,সেলস টিম বিবরণ
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,অসুস্থতাজনিত ছুটি
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},অকার্যকর {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,অসুস্থতাজনিত ছুটি
 DocType: Email Digest,Email Digest,ইমেইল ডাইজেস্ট
 DocType: Delivery Note,Billing Address Name,বিলিং ঠিকানা নাম
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,সিস্টেম ব্যালেন্স
-DocType: Workflow,Is Active,সক্রিয়
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,সিস্টেম ব্যালেন্স
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,প্রথম নথি সংরক্ষণ করুন.
 DocType: Account,Chargeable,প্রদেয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,পরিবর্তন সমাহার
-DocType: Workflow State,Primary,প্রাথমিক
 DocType: Expense Claim Detail,Expense Date,ব্যয় তারিখ
 DocType: Item,Max Discount (%),সর্বোচ্চ ছাড় (%)
-DocType: Communication,More Information,অধিক তথ্য
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,শেষ আদেশ পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,লোকসান
 DocType: Company,Warn,সতর্ক করো
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,আইটেম মূল্যনির্ধারণ আপডেট
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
 DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Order,Raw Materials Supplied,কাঁচামালের সরবরাহ
 DocType: Purchase Invoice,Recurring Print Format,পুনরাবৃত্ত মুদ্রণ বিন্যাস
-DocType: Communication,Series,সিরিজ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
-DocType: Communication,Email,ইমেইল
 DocType: Item Group,Item Classification,আইটেম সাইট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ব্যবসা উন্নয়ন ব্যবস্থাপক
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,রক্ষণাবেক্ষণ যান উদ্দেশ্য
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,কাল
 ,General Ledger,জেনারেল লেজার
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 DocType: Features Setup,To get Item Group in details table,বিবরণ টেবিলে আইটেম গ্রুপ পেতে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,নকশাকাটা
 DocType: Sales Invoice,Commission,কমিশন
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> ডিফল্ট টেমপ্লেট </h4><p> ব্যবহার <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja টেমপ্লেট</a> এবং উপলব্ধ করা হবে (যদি থাকে কাস্টম ক্ষেত্র সহ) ঠিকানা সব ক্ষেত্র </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,ডিফল্ট পরিমাণ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,এই মাস এর সংক্ষিপ্ত
 DocType: Quality Inspection Reading,Quality Inspection Reading,গুণ পরিদর্শন ফাইন্যান্স
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
 DocType: Payment Tool,Get Outstanding Vouchers,বিশিষ্ট ভাউচার পেতে
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
 DocType: Appraisal,Start Date,শুরুর তারিখ
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,মূল্য
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,একটি নির্দিষ্ট সময়ের জন্য পাতার বরাদ্দ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,যাচাই করার জন্য এখানে ক্লিক করুন
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,সরবরাহকারী কর্তৃক গৃহীত মাঝামাঝি সময় বিলি
 DocType: Time Log,Hours,ঘন্টা
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ঘূর্ণায়মান
-DocType: ToDo,Priority,অগ্রাধিকার
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
-DocType: Dropbox Backup,Dropbox Access Allowed,ড্রপবক্স অ্যাক্সেস অনুমতি
-DocType: Dropbox Backup,Weekly,সাপ্তাহিক
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,যেমন. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,গ্রহণ করা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,গ্রহণ করা
 DocType: Maintenance Visit,Fully Completed,সম্পূর্ণরূপে সম্পন্ন
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% সমাপ্তি
 DocType: Employee,Educational Qualification,শিক্ষাগত যোগ্যতা
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} সফলভাবে আমাদের নিউজলেটার তালিকায় যুক্ত হয়েছে.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ইলেক্ট্রন মরীচি যন্ত্র
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,প্রধান প্রতিবেদন
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,স্টক লেজার আপডেট ব্যালেন্স এন্ট্রি
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,প্রধান প্রতিবেদন
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
 ,Requested Items To Be Ordered,অনুরোধ করা চলছে আদেশ করা
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,আমার আদেশ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,আমার আদেশ
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
 DocType: Time Log,For Manufacturing,উৎপাদনের জন্য
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,সমগ্র
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,সমগ্র
 DocType: BOM,Manufacturing,উৎপাদন
 ,Ordered Items To Be Delivered,আদেশ আইটেম বিতরণ করা
 DocType: Account,Income,আয়
-,Setup Wizard,ঐন্দ্রজালি সংযুক্ত করা
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,কিছু ভুল হয়েছে!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,সমাপ্তির তারিখ
 DocType: Purchase Invoice Item,Amount (Company Currency),পরিমাণ (কোম্পানি একক)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,মরা ঢালাই
-DocType: Email Alert,Reference Date,রেফারেন্স তারিখ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,বৈধ মোবাইল টি লিখুন দয়া করে
 DocType: Budget Detail,Budget Detail,বাজেট বিস্তারিত
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,পাঠানোর আগে বার্তা লিখতে
-DocType: Async Task,Status,অবস্থা
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},শেয়ার UOM আইটেম জন্য আপডেট {0}
-DocType: Company History,Year,বছর
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,এসএমএস সেটিংস আপডেট করুন
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ইতিমধ্যে বিল টাইম ইন {0}
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,সিরিয়াল কোন সার্ভিস চুক্তি মেয়াদ উত্তীর্ন
 DocType: Item,Unit of Measure Conversion,পরিমাপ রূপান্তর ইউনিট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,কর্মচারী পরিবর্তন করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
 DocType: Naming Series,Help HTML,হেল্প এইচটিএমএল
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} আইটেম জন্য পার ওভার জন্য ভাতা {1}
 DocType: Address,Name of person or organization that this address belongs to.,এই অঙ্ক জন্যে যে ব্যক্তি বা প্রতিষ্ঠানের নাম.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,আপনার সরবরাহকারীদের
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,আপনার সরবরাহকারীদের
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,আরেকটি বেতন কাঠামো {0} কর্মচারীর জন্য সক্রিয় {1}. তার অবস্থা &#39;নিষ্ক্রিয়&#39; এগিয়ে যাওয়ার জন্য দয়া করে নিশ্চিত করুন.
 DocType: Purchase Invoice,Contact,যোগাযোগ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,থেকে পেয়েছি
 DocType: Features Setup,Exports,রপ্তানি
 DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: থেকে {0} জন্য {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 DocType: Issue,Content Type,কোন ধরনের
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,কম্পিউটার
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,আইটেম: {0} সিস্টেমের মধ্যে উপস্থিত না
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Cost Center,Budgets,বাজেট
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,আপডেট করা হয়েছে
 DocType: Employee,Emergency Contact Details,জরুরী যোগাযোগের তথ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,এটার কাজ কি?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,এটার কাজ কি?
 DocType: Delivery Note,To Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},অ্যাকাউন্ট {0} অর্থবছরের জন্য একবারের বেশি প্রবেশ করা হয়েছে {1}
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&#39;হ্যাঁ&#39; হতে অ স্টক আইটেম জন্য না পারেন &#39;সিরিয়াল কোন হয়েছে&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,বৈদ্যুতিক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,বৈদ্যুতিক
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ইউজার আইডি কর্মচারী জন্য নির্ধারণ করে না {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,পাটা দাবি
 DocType: Stock Entry,Default Source Warehouse,ডিফল্ট সোর্স ওয়্যারহাউস
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,চাপান
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,শেষ আদেশ থেকে দিনের
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
-DocType: User,Enabled,সক্রিয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,স্টক সম্পদ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},আপনি কি সত্যিই মাস {0} এবং বছরের জন্য সমস্ত বেতন স্লিপ জমা দিতে চান {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,আমদানি সদস্যবৃন্দ
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,বর্তমান
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,হুণ্ডি {0} সম্পন্ন করা সম্ভব নয়
 DocType: Notification Control,Sales Invoice Message,বিক্রয় চালান পাঠান
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,অ্যাকাউন্ট {0} সমাপ্তি ধরনের দায় / ইক্যুইটি হওয়া আবশ্যক
 DocType: Authorization Rule,Based On,উপর ভিত্তি করে
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,বেতন Slips নির্মাণ
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} একটি বৈধ ইমেইল আইডি নয়
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","প্রযোজ্য হিসাবে নির্বাচিত করা হয় তাহলে কেনার, চেক করা আবশ্যক {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,বাট্টা কম 100 হতে হবে
-DocType: ToDo,Low,কম
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,কাটনা
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
@@ -3593,7 +3288,7 @@
 DocType: Employee External Work History,Salary,বেতন
 DocType: Serial No,Delivery Document Type,ডেলিভারি ডকুমেন্ট টাইপ
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য সব বেতন স্লিপ জমা
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} চলছে সিঙ্ক
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} জিনিসসমূহ সিঙ্ক করা হয়েছে
 DocType: Sales Order,Partly Delivered,আংশিক বিতরণ
 DocType: Sales Invoice,Existing Customer,অবশিষ্ট ক্রেতা
 DocType: Email Digest,Receivables,সম্ভাব্য
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,প্রচারাভিযান নাম প্রয়োজন বোধ করা হয়
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Receipt Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ডিপ অঙ্কন
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,নতুন নিউজলেটার
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,দেখান ব্যালেন্স
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,বুড়ো বিন্যাস 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
 ,Sales Analytics,বিক্রয় বিশ্লেষণ
 DocType: Manufacturing Settings,Manufacturing Settings,উৎপাদন সেটিংস
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,নতুন অ্যাকাউন্ট নাম
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,কাঁচামালের সরবরাহ খরচ
 DocType: Selling Settings,Settings for Selling Module,মডিউল বিক্রী জন্য সেটিংস
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,গ্রাহক সেবা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,গ্রাহক সেবা
 DocType: Item,Thumbnail,ছোট
 DocType: Item Customer Detail,Item Customer Detail,আইটেম গ্রাহক বিস্তারিত
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,আপনার ইমেইল নিশ্চিত করুন
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,অপরাধ প্রার্থী একটি কাজের.
 DocType: Notification Control,Prompt for Email on Submission of,জমা ইমেইল জন্য অনুরোধ করা
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,সর্বমোট পাতার সময়ের মধ্যে দিনের বেশী হয়
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,প্রগতি গুদাম ডিফল্ট কাজ
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ভ্যাকুয়াম ছাঁচনির্মাণ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
-DocType: Contact Us Settings,City,শহর
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,শ্রুতির যন্ত্র
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ত্রুটি: একটি বৈধ আইডি?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,আইটেম {0} একটি সেলস পেইজ হতে হবে
 DocType: Naming Series,Update Series Number,আপডেট সিরিজ সংখ্যা
 DocType: Account,Equity,ন্যায়
 DocType: Sales Order,Printing Details,মুদ্রণ বিস্তারিত
 DocType: Task,Closing Date,বন্ধের তারিখ
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ইঞ্জিনিয়ার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ইঞ্জিনিয়ার
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,অনুসন্ধান সাব সমাহারগুলি
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
 DocType: Sales Partner,Partner Type,সাথি ধরন
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise ছাড়
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্টের বিরুদ্ধে
 DocType: Production Order,Production Order,উৎপাদন অর্ডার
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ইনস্টলেশন উল্লেখ্য {0} ইতিমধ্যেই জমা দেওয়া হয়েছে
 DocType: Quotation Item,Against Docname,Docname বিরুদ্ধে
 DocType: SMS Center,All Employee (Active),সকল কর্মচারী (অনলাইনে)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,এখন দেখুন
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,কাঁচামাল খরচ
 DocType: Item,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt চার্ট
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,সিরিজ আপডেট
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,প্রতিবেদন প্রকার বাধ্যতামূলক
 DocType: Item,Serial Number Series,ক্রমিক সংখ্যা সিরিজ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ওয়্যারহাউস সারিতে স্টক আইটেম {0} জন্য বাধ্যতামূলক {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,খুচরা পাইকারি
 DocType: Issue,First Responded On,প্রথম প্রতিক্রিয়া
 DocType: Website Item Group,Cross Listing of Item in multiple groups,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,প্রথম ব্যবহারকারী: আপনি
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,প্রথম ব্যবহারকারী: আপনি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,সফলভাবে মীমাংসা
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,সফলভাবে মীমাংসা
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
 DocType: Tax Rule,Validity,বৈধতা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced পরিমাণ
 DocType: Attendance,Attendance,উপস্থিতি
-DocType: Page,No,না
 DocType: BOM,Materials,উপকরণ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","সংযত না হলে, তালিকা থেকে এটি প্রয়োগ করা হয়েছে যেখানে প্রতিটি ডিপার্টমেন্ট যোগ করা হবে."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,তারিখ পোস্টিং এবং সময় পোস্ট বাধ্যতামূলক
@@ -3689,55 +3376,46 @@
 ,Item Prices,আইটেমটি মূল্য
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 DocType: Period Closing Voucher,Period Closing Voucher,সময়কাল সমাপ্তি ভাউচার
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,মূল্য তালিকা মাস্টার.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,মূল্য তালিকা মাস্টার.
 DocType: Task,Review Date,পর্যালোচনা তারিখ
 DocType: Purchase Invoice,Advance Payments,অগ্রিম প্রদান
-DocType: DocPerm,Level,শ্রেনী
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} সারিতে উদ্দিষ্ট গুদাম উৎপাদন অর্ডার হিসাবে একই হতে হবে
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,মিল
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,কোন অনুমতি পেমেন্ট টুল ব্যবহার
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
 DocType: Company,Round Off Account,অ্যাকাউন্ট বন্ধ বৃত্তাকার
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,ঠোকর
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,প্রশাসনিক খরচ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,পরামর্শকারী
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,পরামর্শকারী
 DocType: Customer Group,Parent Customer Group,মূল ক্রেতা গ্রুপ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",যেমন &quot;আমার কোম্পানি এলএলসি&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,বিজ্ঞপ্তি সময়কাল
 DocType: Bank Reconciliation Detail,Voucher ID,ভাউচার আইডি
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,এটি একটি root অঞ্চল এবং সম্পাদনা করা যাবে না.
 DocType: Packing Slip,Gross Weight UOM,গ্রস ওজন UOM
 DocType: Email Digest,Receivables / Payables,সম্ভাব্য / Payables
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,মুদ্রাঙ্কন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 DocType: Task,Actual End Date (via Time Logs),প্রকৃত শেষ তারিখ (সময় লগসমূহ মাধ্যমে)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,ঊর্ধ্বতন খরচ কেন্দ্র লিখুন দয়া করে
 DocType: Delivery Note,Print Without Amount,পরিমাণ ব্যতীত প্রিন্ট
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
-DocType: User,Last Name,নামের শেষাংশ
-DocType: Web Page,Left,বাম
-DocType: Event,All Day,সারাদিন
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
 DocType: Issue,Support Team,দলকে সমর্থন
 DocType: Appraisal,Total Score (Out of 5),(5 এর মধ্যে) মোট স্কোর
-DocType: Contact Us Settings,State,রাষ্ট্র
 DocType: Batch,Batch,ব্যাচ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ভারসাম্য
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ভারসাম্য
 DocType: Project,Total Expense Claim (via Expense Claims),মোট ব্যয় দাবি (ব্যয় দাবি মাধ্যমে)
-DocType: User,Gender,লিঙ্গ
 DocType: Journal Entry,Debit Note,ডেবিট নোট
 DocType: Stock Entry,As per Stock UOM,শেয়ার UOM অনুযায়ী
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,মেয়াদ শেষ না
@@ -3751,45 +3429,41 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,মান উপর ভিত্তি করে লেনদেনের সীমিত করার নিয়ম তৈরি করুন.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","চেক করা থাকলে, মোট কোন. কার্যদিবসের ছুটির অন্তর্ভুক্ত করা হবে, এবং এই বেতন প্রতি দিন মূল্য কমাতে হবে"
 DocType: Purchase Invoice,Total Advance,মোট অগ্রিম
-DocType: Workflow State,User,ব্যবহারকারী
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,প্রসেসিং বেতনের
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,লস্ট হিসেবে সেট
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,পরিশোধের রশিদের উল্লেখ্য
 DocType: Customer,Credit Days Based On,ক্রেডিট দিনের উপর ভিত্তি করে
 DocType: Tax Rule,Tax Rule,ট্যাক্স রুল
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,বিক্রয় চক্র সর্বত্র একই হার বজায় রাখা
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ওয়ার্কস্টেশন ওয়ার্কিং সময়ের বাইরে সময় লগ পরিকল্পনা করুন.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ইতিমধ্যেই জমা দেওয়া হয়েছে
 ,Items To Be Requested,চলছে অনুরোধ করা
-DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Time Log,Billing Rate based on Activity Type (per hour),কার্যকলাপ টাইপ উপর ভিত্তি করে বিলিং হার (প্রতি ঘন্টায়)
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","কোম্পানি ইমেইল আইডি পাওয়া যায়নি, তাই পাঠানো না mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 DocType: Production Planning Tool,Filter based on item,ফিল্টার আইটেম উপর ভিত্তি করে
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
 DocType: Purchase Common,Purchase Common,ক্রয় প্রচলিত
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} নথীটি পরিবর্তিত হয়েছে. রিফ্রেশ করুন.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,নিম্নলিখিত দিন ছুটি অ্যাপ্লিকেশন তৈরি করা থেকে ব্যবহারকারীদের বিরত থাকুন.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,সুযোগ থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} না বিদ্যমান
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
-DocType: DocField,Default,ডিফল্ট
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} গ্রাহকদের যোগ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} গ্রাহকদের যোগ করা হয়েছে
 DocType: Maintenance Schedule,Schedule,সময়সূচি
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","এই খরচ কেন্দ্র বাজেট নির্ধারণ করুন. বাজেটের কর্ম নির্ধারণ করার জন্য, দেখুন &quot;কোম্পানি তালিকা&quot;"
 DocType: Account,Parent Account,মূল অ্যাকাউন্ট
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Expense Claim,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",নির্বাচন &quot;হ্যাঁ&quot; সিরিয়াল কোন মাস্টার দেখা যাবে যা এই আইটেমটি প্রতিটি সত্তা একটি অনন্য পরিচয় দিতে হবে.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
 DocType: Address,Office,অফিস
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,স্ট্যান্ডার্ড প্রতিবেদন
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,একটি ট্যাক্স অ্যাকাউন্ট তৈরি করতে
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
 DocType: Employee,Current Address,বর্তমান ঠিকানা
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,ব্যাচ পরিসংখ্যা
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,ব্যাচ পরিসংখ্যা
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
 DocType: Sales Order,Track this Sales Order against any Project,কোন প্রকল্পের বিরুদ্ধে এই বিক্রয় আদেশ ট্র্যাক
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,টানুন বিক্রয় আদেশ উপরে মাপকাঠির ভিত্তিতে (বিলি মুলতুবি)
-DocType: DocShare,Document Type,নথিপত্র ধরণ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,সরবরাহকারী উদ্ধৃতি থেকে
 DocType: Deduction Type,Deduction Type,সিদ্ধান্তগ্রহণ ধরন
 DocType: Attendance,Half Day,অর্ধদিবস
 DocType: Pricing Rule,Min Qty,ন্যূনতম Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ব্যাচ আমরা বিক্রয় এবং ক্রয় নথিতে আইটেম ট্র্যাক. &quot;পছন্দের শিল্প: কেমিক্যাল&quot;
 DocType: GL Entry,Transaction Date,লেনদেন তারিখ
 DocType: Production Plan Item,Planned Qty,পরিকল্পিত Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,মোট ট্যাক্স
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,মোট ট্যাক্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,পরিমাণ (Qty শিল্পজাত) বাধ্যতামূলক
 DocType: Stock Entry,Default Target Warehouse,ডিফল্ট উদ্দিষ্ট ওয়্যারহাউস
 DocType: Purchase Invoice,Net Total (Company Currency),একুন (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
 DocType: Notification Control,Purchase Receipt Message,কেনার রসিদ পাঠান
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,সর্বমোট পাতার সময়ের চেয়ে বেশি হয়
 DocType: Production Order,Actual Start Date,প্রকৃত আরম্ভের তারিখ
 DocType: Sales Order,% of materials delivered against this Sales Order,উপকরণ% এই বিক্রয় আদেশের বিরুদ্ধে বিতরণ
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,রেকর্ড আইটেমটি আন্দোলন.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,নিউজলেটার তালিকা গ্রাহক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,সেবা
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 ,Monthly Salary Register,মাসিক বেতন নিবন্ধন
-apps/frappe/frappe/website/template.py +140,Next,পরবর্তী
 DocType: Warranty Claim,If different than customer address,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
 DocType: BOM Operation,BOM Operation,BOM অপারেশন
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,পূর্ববর্তী সারি পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,অন্তত একটি সারিতে প্রদেয় টাকার পরিমাণ লিখতে অনুগ্রহ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,অন্তত একটি সারিতে প্রদেয় টাকার পরিমাণ লিখতে অনুগ্রহ
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,সারি {0}: পেমেন্ট পরিমাণ বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,অবৈতনিক মোট
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,অবৈতনিক মোট
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,টাইম ইন বিলযোগ্য নয়
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ক্রেতা
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,ক্রেতা
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,নেট বেতন নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,নিজে বিরুদ্ধে ভাউচার লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,নিজে বিরুদ্ধে ভাউচার লিখুন দয়া করে
 DocType: SMS Settings,Static Parameters,স্ট্যাটিক পরামিতি
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ভর এসএমএস আপনার পরিচিতি পাঠান
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,জন্য ট্যাক্স বা চার্জ ধরে নেবেন
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ক্রস-রোলিং
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,ক্রেডিট কার্ড
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা repacked করা
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,শেয়ার লেনদেনের জন্য ডিফল্ট সেটিংস.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,শেয়ার লেনদেনের জন্য ডিফল্ট সেটিংস.
 DocType: Purchase Invoice,Next Date,পরবর্তী তারিখ
 DocType: Employee Education,Major/Optional Subjects,মেজর / ঐচ্ছিক বিষয়াবলী
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,কর ও চার্জ লিখুন দয়া করে
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,যন্ত্র
 DocType: Sales Invoice Item,Drop Ship,ড্রপ জাহাজ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","এখানে আপনি নামের এবং পিতা বা মাতা, স্ত্রী ও সন্তানদের বৃত্তি মত পরিবার বিবরণ স্থাপন করতে পারে"
 DocType: Hub Settings,Seller Name,বিক্রেতা নাম
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,অগ্রসর হবার আগে ফর্ম সংরক্ষণ করতে হবে
 DocType: Item Attribute,Numeric Values,সাংখ্যিক মান
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,লোগো সংযুক্ত
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,লোগো সংযুক্ত
 DocType: Customer,Commission Rate,কমিশন হার
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,কার্ট খালি হয়
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,রুট সম্পাদনা করা যাবে না.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,বরাদ্দ পরিমাণ unadusted পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,রুট সম্পাদনা করা যাবে না.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,বরাদ্দ পরিমাণ unadusted পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন
 DocType: Manufacturing Settings,Allow Production on Holidays,ছুটির উৎপাদন মঞ্জুরি
 DocType: Sales Order,Customer's Purchase Order Date,গ্রাহকের ক্রয় আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,মূলধন
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,একটি CSV ফাইল নির্বাচন করুন
-DocType: Dropbox Backup,Send Backups to Dropbox,ড্রপবক্স ব্যাকআপ পাঠান
 DocType: Purchase Order,To Receive and Bill,জখন এবং বিল থেকে
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ডিজাইনার
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
 DocType: Serial No,Delivery Details,প্রসবের বিবরণ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,পরিমাণ এই সীমার নিচে পড়ে তাহলে স্বয়ংক্রিয়ভাবে উপাদান অনুরোধ করুন
 ,Item-wise Purchase Register,আইটেম-বিজ্ঞ ক্রয় নিবন্ধন
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","পুনর্বিন্যাস স্তর সেট করতে, আইটেমটি একটি ক্রয় আইটেম বা উৎপাদন আইটেম হতে হবে"
 ,Supplier Addresses and Contacts,সরবরাহকারী ঠিকানা এবং পরিচিতি
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +18,Project master.,প্রকল্প মাস্টার.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,উপকরণ বিল
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
-DocType: Dropbox Backup,Send Notifications To,বিজ্ঞপ্তি পাঠান
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,সুত্র তারিখ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,সুত্র তারিখ
 DocType: Employee,Reason for Leaving,ত্যাগ করার জন্য কারণ
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,অ্যাকাউন্ট {0} অস্তিত্ব নেই
 DocType: Account,Cash,নগদ
 DocType: Employee,Short biography for website and other publications.,ওয়েবসাইট ও অন্যান্য প্রকাশনা সংক্ষিপ্ত জীবনী.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},কর্মচারীর জন্য বেতন কাঠামো তৈরি করুন {0}

diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 28ccdc4..c8f1692 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite Mjesečna distribucija, ako želite pratiti na osnovu sezonski."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozorenje: Ista stavka je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Predmeti već sinhronizovani
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Molimo prvo odaberite Party Tip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Prekaljivanje
 DocType: Item,Customer Items,Customer Predmeti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite stavku da hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Ostavite odobravateljima
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljuje
-DocType: About Us Settings,Website,Web stranica
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanja plus sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Hoće li biti izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Stvarni tip porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: C-Form,Customer,Kupci
 DocType: Purchase Receipt Item,Required By,Potrebna Do
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Updated uspješno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivanje
 DocType: Pricing Rule,Apply On,Primjeni na
 DocType: Item Price,Multiple Item prices.,Više cijene stavke.
 ,Purchase Order Items To Be Received,Narudžbenica Proizvodi treba primiti
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Varijante
-DocType: Sales Invoice Item,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,U Stock
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Zdravstvena zaštita
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obradu
 DocType: Production Order Operation,Work In Progress,Radovi u toku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
 DocType: Employee,Holiday List,Lista odmora
 DocType: Time Log,Time Log,Vrijeme Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Računovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Računovođa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Company,Phone No,Telefonski broj
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log aktivnosti obavljaju korisnike od zadataka koji se mogu koristiti za praćenje vremena, billing."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: {1} #
 ,Sales Partners Commission,Prodaja Partneri komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Skraćeni naziv ne može imati više od 5 znakova
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Vrijednost atributa {0} se ne može ukloniti iz {1} kao Stavka Varijante \ postoje sa ovim atributom.
-DocType: Print Settings,Classic,Klasik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
 DocType: Bin,Quantity Requested for Purchase,Količina Traženi za kupnju
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Priložiti .csv datoteku s dvije kolone, jedan za stari naziv i jedna za novo ime"
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Prirast
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista firma je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dozvoljeno za {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,mirovinskim fondovima
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,mirovinskim fondovima
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je tip naloga Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba Ime
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Provjerite da li se ponavlja kako, uklonite oznaku da se zaustavi ponavljaju ili da pravilno Završni datum"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Puna vrijeme rada
 DocType: SMS Log,SMS Log,SMS log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih Predmeti
-DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje unos
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je obavezno
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
 DocType: Lead,Product Enquiry,Na upit
-DocType: Standard Reply,Owner,vlasnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Molimo najprije odaberite Company
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Razvrtanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nekretnine
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lijekovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lijekovi
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G-din
-DocType: Custom Script,Client,Klijent
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja zarada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja zarada
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show time Dnevnici
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply sirovine za kupovinu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Svi datumi i zaposlenog kombinacija u odabranom periodu doći će u predlošku, sa postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ispravljanje
 DocType: BOM Replace Tool,New BOM,Novi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Dnevnici za naplatu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter je već poslana
 DocType: Lead,Request Type,Zahtjev Tip
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,radiodifuzija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,izvršenje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (to možete promijeniti kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifuzija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,izvršenje
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (to možete promijeniti kasnije).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalji o poslovanju obavlja.
 DocType: Serial No,Maintenance Status,Održavanje statusa
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Stavke i cijene
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na cijenu List stopa (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
-DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-kalupa casting
 DocType: Offer Letter,Select Terms and Conditions,Odaberite uvjeti
 DocType: Production Planning Tool,Sales Orders,Sales Orders
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
 DocType: Selling Settings,Default Territory,Zadani teritorij
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} ne pripada preduzeću {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenite ako nestandardnih potraživanja računa važećim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primljen
 DocType: Sales Partner,Reseller,Prodavač
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
+,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double stanovanje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja per Godina
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja per Godina
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo podesite Imenovanje serije za {0} preko Podešavanje&gt; Settings&gt; Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
-DocType: Bulk Email,Message,Poruka
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Poziv na broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
 DocType: Material Request Item,Min Order Qty,Min Red Kol
 DocType: Lead,Do Not Contact,Ne kontaktirati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavite u Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &#39;sirovine Isporučuje&#39; sto u narudžbenice {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire četkanje
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostavom diljem svijeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe od kupaca.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Rashodi voditelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Odaberite Naknada za prvi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znakova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Odaberite jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakova
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogućava stvaranje vremena trupaca protiv naloga za proizvodnju. Operacije neće biti bager protiv Proizvodnja Order
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Stavka {0} mora biti usluga Stavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser bušenja
-DocType: Stock UOM Replace Utility,New Stock UOM,Novi kataloški UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski History Work
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružna Reference Error
-DocType: Communication,Closed,Zatvoreno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,posao Profile
 DocType: Newsletter,Newsletter,Bilten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Ljubakanje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
 DocType: Journal Entry,Multi Currency,Multi valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Artikl je ažuriran
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
-DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Plaćanje Entry je izmijenjena nakon što ste ga izvukao. Molimo vas da se ponovo povucite.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Zvanični e-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debit Iznos u računu valuta
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-DocType: Workflow State,Refresh,Osvježi
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Svi uvoz srodnih područja poput valute , stopa pretvorbe , uvoz ukupno , uvoz sveukupnom itd su dostupni u Račun kupnje , dobavljač kotaciju , prilikom kupnje proizvoda, narudžbenice i sl."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Ukupno Order Smatran
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Odaberite Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Detaljnije: {0} uspio batch-mudar, ne može se pomiriti koristeći \
  Stock pomirenje, umjesto koristi Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupovina Prijem mora biti dostavljena
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Pozicija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Rezanje vodenim mlazom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Podešavanja je već okončano!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Podešavanja je već okončano!!
 ,Finished Goods,gotovih proizvoda
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Provjereno od strane
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Molimo vas da ne stvaraju računi za kupcima i dobavljačima. Oni su stvorili direktno od kupca / dobavljača majstora.
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv artikla
+DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Udovički
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Proizvodi se traži što su &quot;Out of Stock&quot; s obzirom na sve skladišta na temelju projicirane Qty i minimalne narudžbe Kol
@@ -380,22 +348,21 @@
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Mjerodavno Optužbe
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Vozilo Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,liječnički
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za gubljenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube izvlačenja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžet se ne može postaviti za grupu troškova Center
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
 DocType: Journal Entry Account,Sales Order,Narudžbe kupca
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Prosj. Prodaja Rate
 DocType: Purchase Order,Start date of current order's period,Početak datum perioda trenutne Reda
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Količina ne može bitidio u redu {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Količina ne može bitidio u redu {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,Instalirani%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Unesite ime tvrtke prvi
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski se postavlja rednim brojevima na osnovu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Za Predmet br&#39; ne može biti manja od &#39;Od Predmet br&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nije počela
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stari Roditelj
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
+DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lajsne
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 DocType: Features Setup,Imports,Uvozi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Aktivnostima na čekanju za danas
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Gledatelja rekord.
 DocType: Bank Reconciliation,Journal Entries,Časopis upisi
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
-DocType: System Settings,Loading...,Učitavanje ...
-DocType: DocField,Password,Zaporka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused modeliranje taloženja
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativa konta
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direktni prihodi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primi ili isplati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Molimo odaberite Company
 DocType: Stock Entry,Difference Account,Konto razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
-DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
-DocType: Communication,Subject,Predmet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 ,Serial No Warranty Expiry,Serijski Nema jamstva isteka
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Artikl
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti tipa cijeli broj
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje Subcontracting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Materijal Zahtjev
 DocType: Company,Delete Company Transactions,Izbrišite Company Transakcije
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Stavka {0} nije Kupnja predmeta
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je nevažeća e-mail adresu u ""Obavijest \
  E-mail adresa '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Ukupno Billing Ove godine:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ukupno Billing Ove godine:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati serijski broj {0}, koji se koristi u prodaji transakcije"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U očekivanju Količina
 DocType: Job Applicant,Thread HTML,Temu HTML
 DocType: Company,Ignore,Ignorirati
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
 DocType: Pricing Rule,Valid From,Vrijedi od
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ** Mjesečni Distribucija će Vam pomoći distribuirati svoj proračun kroz mjesece ako imate sezonski u vašem poslu.
 
  Distribuirati budžet koristeći ovu distribucije, postavite ovu ** Mjesečna distribucija ** u ** Troškovi Centru **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Projektnog zadatka
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-DocType: About Us Settings,Website Manager,Web Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
 DocType: Warranty Claim,Resolution,Rezolucija
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Isporučuje se: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Obračun i Status isporuke
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Plaća komponente.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
+DocType: Authorization Rule,Customer or Item,Customer ili Stavka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Šifarnik kupaca
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Uobičajeno mjerna jedinica za artikl {0} ne može se mijenjati izravno, jer ste već napravili neke transakcije (e) sa drugim UOM. Morat ćete stvoriti nove stavke koristiti drugačiji Uobičajeno UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
-DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja Order je obavezna
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna osoba Sales {0} postoji s istim ID zaposlenih
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativna Stock Error ( {6} ) za točke {0} u skladište {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Uobičajeno Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Održavanje Raspored
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Molimo instalirajte Dropbox piton modul
 DocType: Employee,Passport Number,Putovnica Broj
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,menadžer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Račun kupnje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Istu stavku je ušao više puta.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,menadžer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Račun kupnje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Istu stavku je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' Temelji se na' i 'Grupiranje po ' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,u
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi formiranje
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Fiksni Dani
 DocType: Sales Invoice,Packing List,Popis pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,objavljivanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti korisnika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružimo troškova Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Materijal transfera
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje ( DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Podešavanja
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Sleteo Troškovi poreza i naknada
 DocType: Production Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Više
 DocType: Pricing Rule,Sales Manager,Sales Manager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,preimenovati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Račun br
 DocType: Purchase Invoice,Quarterly,Kvartalno
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Konta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight smicanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač City
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Protiv vaučera Tip mora biti jedan od naloga prodaje, prodaje fakture ili Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ne mogu da nađu kursu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Zračno-kosmički prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
-DocType: Communication,Open,Otvoreno
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nijestock Stavka
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
-DocType: Contact Us Settings,Address Title,Naziv adrese
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
-DocType: Dropbox Backup,Daily,Svakodnevno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Računovodstva unosi može biti pokrenuta protiv lista čvorova. Nisu dozvoljeni stavke protiv Grupe.
-DocType: ToDo,High,Visok
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Opportunity,Maintenance,Održavanje
-DocType: User,Male,Muški
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -699,7 +639,7 @@
 
  1. Obračun Tip: 
  - To može biti na ** Neto Ukupno ** (to je zbroj osnovnog iznosa).
- - ** Na Prethodna Row Ukupan / Iznos ** (za kumulativni poreza ili naknada). Ako odaberete ovu opciju, porez će se primjenjivati kao postotak prethodnog reda (u tabeli poreza) iznos ili ukupno.
+ - ** Na Prethodna Row Ukupan / Iznos ** (za kumulativni poreza ili naknada). Ako odaberete ovu opciju, porez će se primjenjivati kao postotak prethodnog reda (u tabeli poreza) iznos ili ukupno.
  - ** Stvarna ** (kao što je spomenuto).
  2. Račun Head: The račun knjigu pod kojima porez će biti kažnjen 
  3. Trošak Center: Ako porez / zadužen je prihod (kao što je shipping) ili rashod treba da se rezervirati protiv troška.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Osobno
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Početne postavke za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezana protiv Order {1}, provjerite da li treba biti povučen kao napredak u ovom računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezana protiv Order {1}, provjerite da li treba biti povučen kao napredak u ovom računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Troškovi održavanja ureda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-mail
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Bez dozvole
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Stock &quot;ne može provjeriti jer se predmeti nisu dostavljene putem {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moj Fakture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moj Fakture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Niti jedan zaposlenik pronađena
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;Point of Sale&quot; karakteristika
 DocType: Bin,Moving Average Rate,Premještanje prosječna stopa
 DocType: Production Planning Tool,Select Items,Odaberite artikle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
-DocType: Comment,Reference Name,Referenca Ime
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} {1} protiv Bill od {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
 DocType: Production Order,Item To Manufacture,Artikal za proizvodnju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa casting
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} status
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Purchase Order na isplatu
 DocType: Sales Order Item,Projected Qty,Predviđen Kol
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Otvaranje&#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Variant Atributi
 ,Purchase Receipt Trends,Račun kupnje trendovi
 DocType: Appraisal,Select template from which you want to get the Goals,Odaberite predložak s kojeg želite dobiti ciljeva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznos za naplatu
 DocType: Company,Registration Details,Registracija Brodu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-order Količina
 DocType: Leave Block List Date,Leave Block List Date,Ostavite Date Popis Block
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Vrijednost
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-prodaju
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne mogu prenositi {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilans mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Zakucavanje
 ,Available Qty,Dostupno Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prethodni redak Ukupno
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
 DocType: Employee,Ms,G-đa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktivna
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 DocType: Salary Slip,Leave Encashment Amount,Ostavite Encashment Iznos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet izdavaštvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite za sinhronizaciju stavke
-DocType: GL Entry,Account Currency,Valuta račun
+DocType: Bank Reconciliation,Account Currency,Valuta račun
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Navedite zaokružimo računa u Company
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod artikla
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Prodavnica
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,The Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set iznos uplate = preostali iznos
-DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Naziv preduzeća
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varijacija
+,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Izaberite Stavka za transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pogledaj listu svih snimke Pomoć
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Max kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Plaćanje protiv Prodaja / narudžbenice treba uvijek biti označeni kao unaprijed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Hemijski
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Hemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite plata i godina Mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajuću grupu (obično Primjena sredstava&gt; Kratkotrajna imovina&gt; bankovnih računa i stvoriti novi račun (klikom na Dodaj djeteta) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
-DocType: Comment,Unsubscribed,Pretplatu
 DocType: Opportunity,Walk In,Ulaz u
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drvo finanial troška .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bijel
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijel
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svoju sliku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
-DocType: Workflow State,Stop,zaustaviti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Moja košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeća Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Opcije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Opcije
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Ostavite aplikaciju
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ostavite raspodjele alat
 DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ako Mjesečni budžet prekoračena (za trošak računa)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Podrezivanje
 DocType: Workstation,Net Hour Rate,Neto Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Sletio Trošak Kupnja Potvrda
 DocType: Company,Default Terms,Uobičajeno Uvjeti
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plata
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara poduzeća
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 DocType: BOM Operation,Operation,Operacija
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,State dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izrada Stock unosi
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Izrada Stock unosi
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjom Ispravka Procenat
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,ažurirani preko Time Dnevnici
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
-DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Područje djelovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,promet
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
 DocType: Email Digest,Annual Expense,Godišnji trošak
 DocType: SMS Center,Total Characters,Ukupno Likovi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Obrazac Račun Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Doprinos%
 DocType: Item,website page link,web stranica vode
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Idemo pripremiti sustav za prve upotrebe.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Shipping pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja Red {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa se zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnih datuma završetka """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,upravljanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,upravljanje
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investment casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Plava boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Plava boja
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Cijena Lista država
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Daljnje čvorovi mogu se samo stvorio pod ""Grupa"" tipa čvorova"
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} već kreirali za korisnika: {1} {2} i kompanija
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminirano proizvodnih objekata
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Šifarnik dobavljača
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formiranje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i drugih isplata plaća.
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger unosi i GL unosi se ponovo postavila za odabrane Kupovina Primici
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavku 1
 DocType: Holiday,Holiday,Odmor
-DocType: Event,Saturday,Subota
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako smatra za sve grane
 ,Daily Time Log Summary,Dnevno vrijeme Log Profila
-DocType: DocField,Label,Oznaka
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje Zaposleni
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Molimo navedite barem jedan atribut atribute tabeli
 DocType: Contact,User ID,Korisnički ID
-DocType: Communication,Sent,Poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
-DocType: Communication,Delivery Status,Status isporuke
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Opis artikla
 DocType: Payment Tool,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Is Recurring,Je li se ponavlja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direktan metala laserom sinteriranje
 DocType: Purchase Order,Supplied Items,Isporučenog pribora
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavanje istu stopu tijekom kupnje ciklusa
 DocType: Opportunity Item,Opportunity Item,Prilika artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Zaposlenik Broj
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavku 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Zaglavlje konta {0} je kreirano
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelenilo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelenilo
 DocType: Item,Auto re-order,Autorefiniš reda
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Ukupno Ostvareni
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareni
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
-DocType: Report,Disabled,Ugašeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
+DocType: Email Digest,Add Quote,Dodaj Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ime je potrebno
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
 DocType: Address,City/Town,Grad / Mjesto
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa artikla
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani datum isporuke je manje nego što je planirano Ozljede Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno Odlazni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troška jegrupa . Ne mogu napraviti računovodstvenih unosa protiv skupine .
-apps/frappe/frappe/config/desk.py +7,Tools,Alati
 DocType: Item,Website Item Groups,Website Stavka Grupe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Broj Proizvodnja kako je obavezna za unos zaliha svrhu proizvodnje
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,Časopis Stupanje
 DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentari
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Vrednovanje stopa potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Vrednovanje stopa potrebna za točke {0}
 DocType: Quality Inspection Reading,Reading 8,Čitanje 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda bi trebalo promijeniti &quot;Podijelite Optužbe na osnovu &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,Šef ljudskih resursa
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Molimo odaberite poduzeća
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebate omogućiti Košarica
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
 DocType: Salary Slip,Earning,Zarada
 DocType: Payment Tool,Party Account Currency,Party računa valuta
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost Order
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Možete napraviti vremena dnevnik samo protiv podnosi proizvodnju kako bi
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Brošure za kontakte, vodi."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbir bodova za sve ciljeve bi trebao biti 100. To je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
-DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Prosječni popust
-DocType: Letter Head,Is Default,Je podrazumjevani
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značajke konfiguracija
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Pogledaj Ponuda Pismo
-DocType: Communication,Communication,Komunikacija
 DocType: Item,Is Service Item,Je usluga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Šifarnik konta
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porez detalj stol učitani iz stavka master kao string i pohranjeni u ovoj oblasti.
  Koristi se za poreza i naknada"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposleni ne može prijaviti za sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Nema aktivnih struktura plata nađeni za zaposlenog {0} i mjesec
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Porez pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupili smo ovaj artikal
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kupili smo ovaj artikal
 DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Hitas
-DocType: Bulk Email,Not Sent,Ne šalje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivna formiranje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 DocType: Shipping Rule,Shipping Account,Konto transporta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planirano za slanje na {0} primaoca
 DocType: Quality Inspection,Readings,Očitavanja
 DocType: Stock Entry,Total Additional Costs,Ukupno dodatnih troškova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No adresu dodao još.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak JV iznos {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Prikačuju
 DocType: Opportunity,With Items,Sa stavkama
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka Atributi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Roditelj troška
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina Start Date
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina Start Date
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Narudžba kupca br
 DocType: Item Group,Item Group Name,Naziv grupe artikla
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materijali za Proizvodnja
 DocType: Pricing Rule,For Price List,Za Cjeniku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Stopa Kupovina za stavku: {0} nije pronađena, koja je potrebna za rezervaciju računovodstvo unos (rashodi). Navedite stavke cijenu protiv otkupna cijena liste."
 DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Korisnička Group> Regija
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na Skladište
 DocType: Time Log Batch Detail,Time Log Batch Detail,Vrijeme Log Batch Detalj
-DocType: Workflow State,Tasks,zadataka
 DocType: Landed Cost Voucher,Landed Cost Help,Sleteo Cost Pomoć
-DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays o važnim dana.
 ,Accounts Receivable Summary,Potraživanja Pregled
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za tip {0} već izdvojeno za zaposlenog {1} {2} za razdoblje - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
 DocType: UOM,UOM Name,UOM Ime
-DocType: Top Bar Item,Target,Meta
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Doprinos Iznos
 DocType: Sales Invoice,Shipping Address,Adresa isporuke
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ovaj alat pomaže vam da ažurirate ili popraviti količinu i vrednovanje zaliha u sistemu. To se obično koristi za usklađivanje vrijednosti sistema i ono što zaista postoji u skladištima.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Riječima će biti vidljivo nakon što spremite otpremnicu.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Šifarnik brendova
-DocType: ToDo,Due Date,Datum dospijeća
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Šifarnik brendova
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kutija
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mjesečni Distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: knjiženju za {0} može se vršiti samo u valuti
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Zaseka
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
 DocType: Address,Lead Name,Ime potencijalnog kupca
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvaranje Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dozvoljeno da se više tranfer {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema stavki za omot
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi ne ogleda u banci
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Iznosi ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalne casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetno polje uz pomoć Završeno
 DocType: Company,Default Holiday List,Uobičajeno Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kao Isporučena
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark kao Isporučena
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make ponudu
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti više od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Artikl iz ponude
 DocType: Account,Account Name,Naziv konta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Dodaj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Uobičajeno računa se plaća
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online kupovinu košaricu poput shipping pravila, cjenik i sl"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Podešavanje je okončano
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturisana
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
 DocType: Journal Entry Account,Debit in Company Currency,Debit u Company valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja pitanja
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Default vrijednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: iznos plaćanja ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press montažu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot izostatska pritiskom
-DocType: ToDo,Medium,Srednji
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Entry Tip
 ,Customer Credit Balance,Customer Credit Balance
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 DocType: Quotation,Term Details,Oročeni Detalji
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet planiranje (Dana)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
 DocType: Warranty Claim,Warranty Claim,Jamstvo potraživanje
 ,Lead Details,Detalji potenciajalnog kupca
-DocType: Authorization Rule,Approving User,Odobravanje korisnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pozlaćivanje
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladište potrebno na red No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladište potrebno na red No {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Molimo vas da unesete važeću finansijsku godinu datume početka i završetka
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa kupaca sa istim nazivom već postoji. Promijenite naziv kupca ili promijenite naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Materijal Potvrda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Proizvodi
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Proizvodi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potreban za potraživanja / računa plaćaju {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda ne može biti izabran u prodaji naloge itd"
 DocType: Lead,Next Contact By,Sljedeća Kontakt Do
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,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: Quotation,Order Type,Vrsta narudžbe
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 DocType: Payment Tool,Find Invoices to Match,Pronađite Fakture da odgovara
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","npr ""XYZ Narodne banke """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","npr ""XYZ Narodne banke """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Ukupna ciljna
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Ukupna ciljna
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica je omogućeno
 DocType: Job Applicant,Applicant for a Job,Kandidat za posao
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nema Radni nalozi stvoreni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
-DocType: DocPerm,Delete,Izbrisati
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Od polje je obavezno
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Izdvojena iznosu
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i upute
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
-DocType: Country,Country,Zemlja
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-DocType: Communication,Received,primljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj je unešen za artikl {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A uvjet za Shipping Pravilo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka nije dozvoljeno da ima proizvodni Order.
-DocType: DocField,Attach Image,Priložiti slike
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
-DocType: Stock Reconciliation Item,Leave blank if no change,Ostavite prazno ako nema promjene
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Dnevnici vremena za proizvodnju.
 DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite Skladište-mudar Ponovno red Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Plaćanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plaćanje
 DocType: Production Order Operation,Actual Time and Cost,Stvarno vrijeme i troškovi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materijal Zahtjev maksimalno {0} može biti za točku {1} od prodajnog naloga {2}
 DocType: Employee,Salutation,Pozdrav
-DocType: Communication,Rejected,Odbijen
 DocType: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrijednost {0} za Atributi {1} ne postoji u listu važećih Stavka Atributi vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
 DocType: Packing Slip,To Package No.,Za Paket br
-DocType: DocType,System,Sustav
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,telekomunikacija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telekomunikacija
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Payment Tool,Make Payment Entry,Napravite unos Plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 DocType: Stock Settings,Allowance Percent,Dodatak posto
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodaje se mora provjeriti, ako je primjenjivo za odabrano kao {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Provjerite Plaća Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Ima Varijante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Kliknite na &quot;Make prodaje Račun &#39;gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox tajni pristup
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžet se ne može dodijeliti protiv {0}, jer to nije prihod ili rashod račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Ostvareni
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,na primjer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je artikl namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupe artikala
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Održavanje Vrijeme
 ,Amount to Deliver,Iznose Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Kuckanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Proizvod ili usluga
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Web stranica artikla Grupa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa isplate ne može biti filtrirani po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Sto za stavku koja će se prikazati u Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
 DocType: Material Request Item,Material Request Item,Materijal Zahtjev artikla
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree stavke skupina .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Tree stavke skupina .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crven
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: {1} Operacija nije završen za {2} Količina gotovih proizvoda u proizvodnji Order # {3}. Molimo vas da ažurirate rad status via Time Dnevnici
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Promjena UOM za predmet.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
 DocType: Item Attribute,Attribute Name,Atributi Ime
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Stavka {0} mora biti Prodaja ili usluga artikla u {1}
 DocType: Item Group,Show In Website,Pokaži Na web stranice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupa
 DocType: Task,Expected Time (in hours),Očekivano trajanje (u satima)
 ,Qty to Order,Količina za narudžbu
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Pratiti brendom u sljedećim dokumentima otpremnica, Prilika, Industrijska Zahtjev, tačka, narudžbenica, Kupovina vaučer, Kupac prijem, citat, prodaje fakture, proizvoda Bundle, naloga prodaje, serijski broj"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Poništi tabelu
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kupac adrese i kontakti
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ne Set
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati ulogu 'Rashodi Approver'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 DocType: Employee,Personal Details,Osobni podaci
 ,Maintenance Schedules,Održavanje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Utiskivanje
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit na račun mora biti potraživanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
-DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavljanje dolazni poslužitelj za poslove e-ID . ( npr. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno izdvojene lišće {0} ne može biti manja od već odobrenih lišće {1} za period
 DocType: Journal Entry,Accounts Receivable,Konto potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
-DocType: Custom Field,Custom,Običaj
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Brizganje
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako smatra za sve tipove zaposlenika
 DocType: Landed Cost Voucher,Distribute Charges Based On,Podijelite Optužbe na osnovu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} mora biti tipa 'Nepokretne imovine' jer je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
-apps/frappe/frappe/config/setup.py +130,Printing,Štampanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,jedinica
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Molimo postaviti Dropbox pristupnih tipki u vašem web config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,jedinica
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Skladište gdje ste održavanju zaliha odbijenih stavki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaša financijska godina završava
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sadazadana Fiskalna godina . Osvježite svoj preglednik za promjene stupiti na snagu.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
-DocType: Authorization Rule,Approving Role,Odobravanje ulogu
 ,BOM Search,BOM pretraga
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valuta u Company
 DocType: Workstation,Wages per hour,Plaće po satu
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide značajke kao što su serijski brojevima , POS i sl."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,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 +254,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
 DocType: Address Template,Address Template,Predložak adrese
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Unesite zaposlenih Id ove prodaje osoba
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,Ponude
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Održavanje korisnika
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Troškova Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Troškova Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis posla
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po burzi UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Odaberite valjanu CSV datoteku s podacima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premazivanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne akcije. Pratite Leads, Citati, naloga prodaje itd iz Kampanje procijeniti povrat investicije. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne akcije. Pratite Leads, Citati, naloga prodaje itd iz Kampanje procijeniti povrat investicije."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovo dodijeliti ili mijenjati Skladište"
 DocType: Appraisal,Calculate Total Score,Izračunaj ukupan rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lajsne
-DocType: Purchase Order,To be delivered to customer,Dostaviti kupcu
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Pricing Rule,Supplier,Dobavljači
 DocType: C-Form,Quarter,Četvrtina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne mogu overbill za Stavka {0} {1} u redu više od {2}. Da bi se omogućilo overbilling, molimo vas postaviti u Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne mogu overbill za Stavka {0} {1} u redu više od {2}. Da bi se omogućilo overbilling, molimo vas postaviti u Stock Settings"
 DocType: Employee,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,Iznad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Korisnik {0} je onemogućen
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
-DocType: Journal Entry Account,Credit in Account Currency,Kredit na računu valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan invalide
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Odaberite preduzeće...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
-DocType: DocField,Name,Ime
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi ne ogleda u sustav
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Molimo odaberite Izdvojena količina, vrsta fakture i fakture Broj u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Iznosi ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodati ili držati u čoporu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dovršen
-DocType: Web Form,Select DocType,Odaberite DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referentni dokument Tip
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijalizovanoj zaliha
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serijalizovanoj zaliha
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Ukupan iznos naplate
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Potraživanja račun
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Naloga prodaje na isplatu
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time logova:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Molimo odaberite ispravan račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Čekanju
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti odsustvo aplikacije određenu zaposlenog
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ne možete promijeniti zadani UOM varijante. Za promjenu default UOM za varijantu promjenu default UOM od Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,uredske opreme
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Companies
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od održavanje rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
 DocType: Purchase Invoice,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste kreirali standardni obrazac u prodaji poreza i naknada Template, odaberite jednu i kliknite na dugme ispod."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 DocType: Offer Letter,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Ukupno Fakturisana Amt
 DocType: Time Log,To Time,Za vrijeme
+DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,Customer Stavka Codes
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Kreirajte plaćanja unosi protiv naloga ili faktura.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi artikli su već fakturisani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Project,External,Vanjski
 DocType: Features Setup,Item Serial Nos,Serijski br artikla
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nije pronađena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Compression lajsne
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Vaši klijenti
 DocType: Leave Block List Date,Block Date,Blok Datum
 DocType: Sales Order,Not Delivered,Ne Isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Šifra artikla > Grupa artikla > Brend
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
-DocType: Event,Friday,Petak
 DocType: Time Log,Costing Amount,Costing Iznos
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
 DocType: Salary Structure,Monthly Earning & Deduction,Mjesečna zarada &amp; Odbitak
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rinfuzi
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Ime / Naziv pošiljaoca
-DocType: Page,Title,Naslov
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagodite
 DocType: POS Profile,[Select],[ Select ]
 DocType: SMS Log,Sent To,Poslati
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Ostvariti prodaju fakturu
 DocType: Company,For Reference Only.,Za referencu samo.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},{1}: Invalid {0}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},{1}: Invalid {0}
 DocType: Sales Invoice Advance,Advance Amount,Iznos avansa
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' Od datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,' Od datuma ' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novi radnom mjestu
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Customer mobilnom Ne
 DocType: Sales Invoice,Recurring,Ponavlja
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Dodaj poreze
 ,Financial Analytics,Financijski Analytics
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
 DocType: Quality Inspection,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
-DocType: System Settings,In Hours,U sati
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekivani Stanje po banci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polirajuća
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekivani Stanje po banci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Misa mailing
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,File da biste preimenovali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj novog kupca
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je zamrznut
 DocType: Buying Settings,Buying Settings,Podešavanja nabavke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass završna obrada
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavljanje dolazni poslužitelj za id prodaja e-mail . ( npr. sales@example.com )
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Plaćanje računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
-DocType: User,Female,Ženski
-DocType: Journal Entry Account,Debit in Account Currency,Debit u računu valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo Vas da proverite da li ste zaista želite izbrisati sve transakcije za ovu kompaniju. Tvoj gospodar podaci će ostati kao što je to. Ova akcija se ne može poništiti.
-DocType: Print Settings,Modern,Moderna
-DocType: Communication,Replied,Odgovorio
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Invalid referentni {0} {1}
 DocType: Payment Tool,Total Payment Amount,Ukupan iznos za plaćanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirano quanitity ({2}) u proizvodnji Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što postoje postojećih zaliha transakcije za ovu stavku, \ ne možete promijeniti vrijednosti &#39;Ima Serial Ne&#39;, &#39;Ima serijski br&#39;, &#39;Je li Stock Stavka&#39; i &#39;Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzi unos u dnevniku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
+DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jedinica mjere
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
 DocType: Lead,Opportunity,Prilika
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (kao po akciji UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
 DocType: Campaign,Campaign-.####,Kampanja-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prodoran
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A treće strane distributera / trgovca / komisije agent / affiliate / prodavače koji prodaje kompanije proizvoda za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} protiv narudžbenicu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni na koji aktivno fiskalne godine. Za više detalja provjerite {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotohemijskog mašinsku obradu
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2063,7 +1904,7 @@
 
  1. Obračun Tip: 
  - To može biti na ** Neto Ukupno ** (to je zbroj osnovnog iznosa).
- - ** Na Prethodna Row Ukupan / Iznos ** (za kumulativni poreza ili naknada). Ako odaberete ovu opciju, porez će se primjenjivati kao postotak prethodnog reda (u tabeli poreza) iznos ili ukupno.
+ - ** Na Prethodna Row Ukupan / Iznos ** (za kumulativni poreza ili naknada). Ako odaberete ovu opciju, porez će se primjenjivati kao postotak prethodnog reda (u tabeli poreza) iznos ili ukupno.
  - ** Stvarna ** (kao što je spomenuto).
  2. Račun Head: The račun knjigu pod kojima porez će biti kažnjen 
  3. Trošak Center: Ako porez / zadužen je prihod (kao što je shipping) ili rashod treba da se rezervirati protiv troška.
@@ -2074,11 +1915,9 @@
  8. Unesite Row: Ako na osnovu ""Prethodna Row Ukupno"" možete odabrati broj reda koji se mogu uzeti kao osnova za ovaj proračun (default je prethodnog reda).
  9. Razmislite poreza ili naknada za: U ovom dijelu možete odrediti ako poreski / zadužen je samo za vrednovanje (nije dio od ukupnog broja), ili samo za ukupno (ne dodaje vrijednost u stavku) ili oboje.
  10. Dodavanje ili Oduzeti: Bilo da želite dodati ili oduzeti porez."
-DocType: Note,Note,Primijetiti
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
-DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Billing Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Završen Qty ne može biti više od {0} {1} za rad
 DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Uvod
 DocType: Warranty Claim,Service Address,Usluga Adresa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 redova za Stock pomirenje.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 redova za Stock pomirenje.
 DocType: Stock Entry,Manufacture,Proizvodnja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Molimo da Isporuka Note prvi
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,proizvodnja
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Razmak Datum nije spomenuo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Potvrđeno
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moj Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
-,Download Backups,Download Backup
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Zadane vrijednosti kao što su tvrtke , valute , tekuće fiskalne godine , itd."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Vrsta plaćanja
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
 DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalji
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
 DocType: Employee,Emergency Contact,Hitni kontakt
 DocType: Item,Quality Parameters,Parametara kvaliteta
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Roditelj artikla
 DocType: Account,Account Type,Vrsta konta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} se ne može nositi-proslijeđen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje Obrasci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Konto prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Country
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Ukupno unaprijed ({0}) protiv Order {1} ne može biti veći od Grand \
  Ukupno ({2})"
 DocType: Employee,Relieving Date,Rasterećenje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Stock Stupanje / Dostavnica / kupiti primitka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered net oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako je odabrano cijene Pravilo je napravljen za 'Cijena', to će prepisati cijenu s liste. Pravilnik o cenama cijena konačnu cijenu, tako da nema daljnje popust treba primijeniti. Stoga, u transakcijama poput naloga prodaje, narudžbenice itd, to će biti učitani u 'Rate' na terenu, nego 'Cijena List Rate ""na terenu."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trag vodi prema tip industrije .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje grupi kupaca stablo .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novi troška Naziv
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ne zadana adresa Predložak pronađena. Molimo stvoriti novu s Setup> Tisak i Branding> adresu predložak.
 DocType: Appraisal,HR User,HR korisnika
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
 DocType: Supplier,Billing Currency,Billing valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra veliki
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Broj čeka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritiskom
 DocType: Payment Tool Detail,Payment Tool Detail,Alat plaćanja Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Niti jedan zaposlenik našao !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Uobičajeno mjerna jedinica za artikl {0} se ne može mijenjati, jer direktno \ ste već napravili neke transakcije (e) sa drugim UOM. Da biste promijenili zadani UOM, \ upotreba &#39;UOM Zamijenite Utility &quot;alata pod Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Odredite Exchange Rate pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupno preostali iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Mete
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,S.O. Ne.
 DocType: Production Order Operation,Make Time Log,Make Time Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Molimo podesite Ponovno redj količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kemijske brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Otkazano
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dana u strukturi zarada ne može biti manja od zaposlenih Spajanje Registracija.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Blok Dani
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Provjerite je li ponavljajući fakture, poništite zaustaviti ponavljajući ili staviti odgovarajući datum završetka"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimalne {0} redovi dopušteno
 DocType: C-Form Invoice Detail,Net Total,Osnovica
 DocType: Bin,FCFS Rate,FCFS Stopa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Faktura)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Namjene
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast jednu stavku treba upisati s negativnim količine za uzvrat dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više od bilo koje dostupne radnog vremena u radnu stanicu {1}, razbijaju rad u više operacija"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemijske mašinsku obradu
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No Napomene
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Istekao
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root račun mora biti grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaja i nabavka
 DocType: Supplier Quotation Item,Material Request No,Materijal Zahtjev Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} uspješno je odjavljen sa ove liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Company valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Upravljanje teritorij stablo .
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
 DocType: Journal Entry Account,Party Balance,Party Balance
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Entry za Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: ne mogu vratiti više od {1} {2} za tačka
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Iznos PDV-a Nakon Popust Iznos (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formiranje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventar Level
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,Proizvođač Broj dijela
 DocType: Production Order Operation,Estimated Time and Cost,Procijenjena vremena i troškova
 DocType: Bin,Bin,Kanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Ne poslanih SMS
 DocType: Account,Company,Preduzeće
 DocType: Account,Expense Account,Rashodi račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Boja
 DocType: Maintenance Visit,Scheduled,Planirano
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite Stavka u kojoj &quot;Je Stock Stavka&quot; je &quot;ne&quot; i &quot;Da li je prodaja Stavka&quot; je &quot;Da&quot;, a nema drugog Bundle proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite Mjesečni Distribucija nejednako distribuirati mete širom mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Stavka Row {0}: {1} Kupovina Prijem ne postoji u gore 'Kupovina Primici' stol
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt datum početka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
 DocType: Installation Note Item,Against Document No,Protiv dokumentu nema
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Upravljanje prodajnih partnera.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Odaberite {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,istraživač
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ažurirati
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,istraživač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Molimo spremite Newsletter prije slanja
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ili e-obavezno
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeni Količina
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory Završeno
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
 DocType: Sales Invoice,Advertisement,Oglas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probni rad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni rad
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink umotavanja
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnostima na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,novinski izdavači
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Topljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Attendance,Attendance Date,Gledatelja Datum
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
 DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Objavljivanje Datum
 DocType: Item,Valuation Method,Vrednovanje metoda
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaja HNB {0} do {1}
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dupli unos
 DocType: Serial No,Under Warranty,Pod jamstvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Zaposlenik Rođendan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak rabata
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +70,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Ostavite odobravatelju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Savijanje
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal za Preneseni Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik sa ""Rashodi Approver"" ulogu"
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Invalid period
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite vrstu transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,Adresa i kontakt
 DocType: Customer,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Employee,Feedback,Povratna veza
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivne jet mašinsku obradu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Raspored
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
-DocType: Website Settings,Website Settings,Website Postavke
 DocType: Item,Reorder level based on Warehouse,Nivo Ponovno red zasnovan na Skladište
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Količina za dovođenje
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Stock unosi
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje Adrese
 DocType: Pricing Rule,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenik Unutarnji Rad Povijest
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zatvaranje (Dr)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
@@ -2487,10 +2296,9 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodati nekoliko uzorku zapisa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Dodati nekoliko uzorku zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite Management
-DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Donja Prihodi
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Brza pomoć
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
 DocType: Features Setup,Sales Extras,Prodajni dodaci
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' To Date """
 ,Stock Projected Qty,Stock Projekcija Kol
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili kol"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Ostavite Block List dopuštenih
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor pretvorbe ne može biti u frakcijama
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Vi ćete ga koristiti za prijavu
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vi ćete ga koristiti za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Održavanje Raspored predmeta
 DocType: Sales Order,%  Delivered,Isporučena%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Nevjerovatni proizvodi
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Nevjerovatni proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Početno stanje Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Ne može odobriti dopust kako niste ovlašteni za odobravanje lišće o skupnom datume
 DocType: Appraisal,Appraisal,Procjena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pjene casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Artikal imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,od kotaciju
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Prebačen za izradu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
 DocType: Purchase Receipt Item,Purchase Order Item No,Narudžbenica Br.
-DocType: System Settings,System Settings,Postavke sustava
 DocType: Project,Project Type,Vrsta projekta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Troškova različitih aktivnosti
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moj Pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moj Pošiljke
 DocType: Journal Entry,Bill Date,Datum računa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
-DocType: Communication,Recipients,Primatelji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Jebe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavite Stavke za Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiranje i slanje newsletter
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
 DocType: Sales Order,Recurring Order,Ponavljajući Order
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kupac Group / kupaca
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite pokazati u web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli na ERPNext
+,Welcome to ERPNext,Dobrodošli na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detalj broj
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dovesti do ponudu
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Pozivi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupan iznos Costing (putem Time Dnevnici)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,projektiran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,Otvaranje Datum
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
-DocType: Blog Category,Parent Website Route,Roditelj Web Route
 DocType: Sales Order,Not Billed,Ne Naplaćeno
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nema kontakata dodao još.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ne aktivna
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Sleteo Cost vaučera Iznos
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos rabata
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plina oblikovanje
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idi na odgovarajuću grupu (obično izvor sredstava&gt; Trenutno Obaveze&gt; poreza i carina i stvoriti novi nalog (klikom na Dodaj djeteta) tipa &quot;porez&quot; i raditi spomenuti Stopa poreza.
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta Tečaj za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersko rezanje
-DocType: Event,Monday,Ponedjeljak
 DocType: Journal Entry,Stock Entry,Kataloški Stupanje
 DocType: Account,Payable,Plativ
 DocType: Salary Slip,Arrear Amount,Iznos unatrag
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Gdje se obavljaju proizvodne operacije.
-DocType: Page,All,Sve
 DocType: Stock Entry Detail,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
 DocType: Employee,Confirmation Date,potvrda Datum
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,Sales korisnika
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Kol ne može biti veći od Max Kol
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebno skladište
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Je potrebno skladište
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Time Log,Will be updated when billed.,Hoće li biti promjena kada je naplaćeno.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Kompanija Ime ne može biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Naslovi za ispis predložaka pr Predračuna.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Plazmom
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Navedite zaokružimo troškova centar u Company
 DocType: Purchase Invoice,Terms,Uvjeti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Stvori novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Stvori novo
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 ,Item-wise Sales History,Stavka-mudar Prodaja Povijest
 DocType: Expense Claim,Total Sanctioned Amount,Ukupno kažnjeni Iznos
 ,Purchase Analytics,Kupnja Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Stavka otpremnice
 DocType: Expense Claim,Task,Zadatak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Brijanje
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Stopa: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Stopa: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Bilješke
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Odaberite grupu čvora prvi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedan od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ostavite Balance Prije primjene
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Uobičajeno Letter Head
 DocType: Time Log,Billable,Naplativo
-DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ponovno red Qty
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Prilika Izgubili
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust polja će biti dostupna u narudžbenici, primci i računu kupnje"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Ime novog računa. Napomena: Molimo vas da ne stvaraju račune za kupcima i dobavljačima
-DocType: Report,Report Type,Prijavi Vid
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Utovar
 DocType: BOM Replace Tool,BOM Replace Tool,BOM zamijeni alat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Pokaži porez break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Podataka uvoz i izvoz
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ako uključiti u proizvodnom djelatnošću . Omogućuje stavci je proizveden '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Materijal Zahtjev Detalj Ne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard okretanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Napomena: Ako se plaćanje ne vrši protiv bilo koje reference, ručno napraviti Journal Entry."
 DocType: Item,Supplier Items,Dobavljač Predmeti
 DocType: Opportunity,Opportunity Type,Prilika Tip
@@ -2746,66 +2531,58 @@
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
 ,Stock Ageing,Kataloški Starenje
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' je onemogućena
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je onemogućena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski da Kontakti na podnošenje transakcija.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Red {0}: Količina nije avalable u skladištu {1} {2} na {3}. Dostupno Količina: {4}, transfera Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact mail
-DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj Korisnici
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Dodaj Korisnici
 DocType: Pricing Rule,Item Group,Grupa artikla
 DocType: Task,Actual Start Date (via Time Logs),Stvarni datum Start (putem Time Dnevnici)
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
 DocType: Item,Default BOM,Zadani BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Molimo vas da ponovno tipa naziv firme za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikal je potreban
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izaberite svoju zemlju, vremensku zonu i valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Stavljanje u turšiju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizacija
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
 DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati
 DocType: Stock Entry,From BOM,Iz BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena pravilo postoji sa istim kriterijima, molimo Vas da riješe sukob \
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdanje materijala
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Izdanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 DocType: Hub Settings,Access Token,Access Token
@@ -2814,45 +2591,37 @@
 DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ako ste dugo ispis formata, ova značajka može se koristiti za podijeliti stranicu na koju se ispisuje više stranica sa svim zaglavljima i podnožjima na svakoj stranici"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod Bundle Stavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Ime partnera
 DocType: Purchase Invoice Item,Image View,Prikaz slike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Završeno &amp; industrijske Završeno
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Duvanjem
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava City
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
 DocType: Account,Purchase User,Kupovina korisnika
 DocType: Notification Control,Customize the Notification,Prilagodite Obavijest
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Zakucavanje
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
 DocType: Journal Entry,Print Heading,Ispis Naslov
 DocType: Quotation,Maintenance Manager,Održavanje Manager
-DocType: Workflow State,Search,Pretraga
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,' Dani od posljednjeg reda ' mora biti veći ili jednak nuli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lemljenje
 DocType: C-Form,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
 DocType: Leave Control Panel,Carry Forward,Prenijeti
@@ -2861,45 +2630,44 @@
 ,Produced,Proizvedeno
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Opšti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Priložiti zaglavlje
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Opšti
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Priložiti zaglavlje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List poreza glave (npr PDV-a, carina itd, oni treba da imaju jedinstvena imena), a njihov standard stope. Ovo će stvoriti standardni obrazac koji možete uređivati i dodati još kasnije."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List poreza glave (npr PDV-a, carina itd, oni treba da imaju jedinstvena imena), a njihov standard stope. Ovo će stvoriti standardni obrazac koji možete uređivati i dodati još kasnije."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
-DocType: Blog Post,Blog Post,Blog članak
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će se zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Sat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfera Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfera Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,stvaranje citata
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi artikli su već fakturisani
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kovrđžast
 DocType: Account,Tax,Porez
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nije važeći {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle proizvoda
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakture
 DocType: Job Opening,Job Title,Titula
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe artikala u detaljima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
@@ -2908,33 +2676,29 @@
 DocType: Stock Entry,Update Rate and Availability,Ažuriranje Rate i raspoloživost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: Pricing Rule,Customer Group,Kupac Grupa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Web stranica Opis
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 DocType: Address,Plant,Biljka
-DocType: DocType,Setup,Podešavanje
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Kupac Grupa Ime
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Atributi
-DocType: Packing Slip,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Datum
-DocType: DocField,Image,Slika
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
-DocType: Communication,Other,Drugi
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjeti
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Posjeti
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel Nema
 DocType: Payment Tool,Make Journal Entry,Make Journal Entry
@@ -2942,35 +2706,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 DocType: Cost Center,Distribution Id,ID distribucije
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Nevjerovatne usluge
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Svi proizvodi i usluge.
 DocType: Purchase Invoice,Supplier Address,Dobavljač Adresa
-DocType: Contact Us Settings,Address Line 2,Adresa - linija 2
-DocType: ToDo,Reference,Upućivanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,financijske usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Atributi {0} mora biti u rasponu od {1} {2} da u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Uobičajeno Potraživanja Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testerisanje
 DocType: Tax Rule,Billing State,State billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Kaširanje
 DocType: Item Reorder,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteriranje
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2981,9 +2739,8 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-DocType: Product Bundle,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2991,48 +2748,44 @@
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,POS Pogledaj
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold Sizing
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} ne može biti grupa konta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Vratiti Protiv Sales fakture
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Stavka 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Molimo postavite default vrijednost {0} {1} u Društvo
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Molimo postavite default vrijednost {0} {1} u Društvo
 DocType: Serial No,Creation Time,vrijeme kreiranja
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ukupan prihod
 DocType: Sales Invoice,Product Bundle Help,Proizvod Bundle Pomoć
 ,Monthly Attendance Sheet,Mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ne rekord naći
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: troška je obvezno za točku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} nije aktivan
 DocType: GL Entry,Is Advance,Je avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledatelja Od datuma i posjećenost do sada je obvezno
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' Račun dobiti i gubitka ' vrsta računa {0} nije dopuštena u otvor za
-DocType: Workflow State,Time,Vrijeme
 DocType: Features Setup,Sales Discounts,Prodajni popusti
 DocType: Hub Settings,Seller Country,Prodavač Država
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja poreza i naknada Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj Order
-DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
+DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Odredite uvjete za izračunavanje iznosa shipping
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj podređenu stavku
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga Dozvoljena Set Frozen Accounts & Frozen Edit unosi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor pretvorbe je potrebno
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -3040,15 +2793,13 @@
 ,Customers Not Buying Since Long Time,Kupci ne kupuju jer dugo vremena
 DocType: Production Order,Expected Delivery Date,Očekivani rok isporuke
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativni-obrazac casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Billing Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odsustvo.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto kako će biti generiran npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -3062,26 +2813,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer prihoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
-DocType: Feed,Full Name,Ime i prezime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Vrstog
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 ,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigacija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planiranje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Nađite vremena Prijavite Hrpa
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdao
 DocType: Project,Total Billing Amount (via Time Logs),Ukupan iznos naplate (putem Time Dnevnici)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodajemo ovaj artikal
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Prodajemo ovaj artikal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavljač Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
@@ -3090,18 +2838,16 @@
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Skraćeni naziv preduzeća
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Skraćeni naziv preduzeća
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ako slijedite kvalitete . Omogućuje predmet QA potrebno i QA Ne u Račun kupnje
 DocType: GL Entry,Party Type,Party Tip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotacije lajsne
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set poreza Pravilo za košarica
@@ -3115,15 +2861,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Template je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretarica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretarica
 DocType: Serial No,Distinct unit of an Item,Različite jedinice strane jedinice
 DocType: Pricing Rule,Buying,Nabavka
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -3136,24 +2882,21 @@
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Peglanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Najave događaja
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
-DocType: Letter Head,Letter Head,Zaglavlje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzo uvođenje
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obavezno za povratak
 DocType: Purchase Order,To Receive,Da Primite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montažu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodi / rashodi
 DocType: Employee,Personal Email,Osobni e
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ukupno Varijansa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ukupno Varijansa
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,posredništvo
 DocType: Address,Postal Code,Poštanski broj
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","u minutama 
@@ -3161,18 +2904,16 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
-DocType: Workflow State,Edit,Uredi
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije artikla
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3180,13 +2921,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
-DocType: Contact Us Settings,Pincode,Poštanski broj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi Stock UOM mora biti različita od trenutne zalihe UOM
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listovi moraju biti dodijeljeno u COMBI 0,5"
 DocType: Production Order,Operation Cost,Operacija Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3202,10 +2941,7 @@
 DocType: Project,Default Cost Center,Standard Cost Center
 DocType: Purchase Invoice,End Date,Datum završetka
 DocType: Employee,Internal Work History,Interni History Work
-DocType: DocField,Column Break,Kolona Break
-DocType: Event,Thursday,Četvrtak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Skretanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
 DocType: Sales Invoice,Exhibition,Izložba
@@ -3218,31 +2954,30 @@
 DocType: Employee,Held On,Održanoj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Item
 ,Employee Information,Zaposlenik informacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Stopa ( % )
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovonedeljnom Pregled
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Datum prilike
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vratiti protiv Kupovina prijem
 DocType: Purchase Order,To Bill,To Bill
 DocType: Material Request,% Ordered,% Sređene
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,rad plaćen na akord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,rad plaćen na akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3259,77 +2994,68 @@
 DocType: Opportunity,To Discuss,Za Raspravljajte
 DocType: SMS Settings,SMS Settings,Podešavanja SMS-a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Crn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Crn
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka perioda trenutne Reda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Make Ponuda Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
-DocType: DocField,Fold,Saviti
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Uobičajeno mjerna jedinica za varijantu mora biti isti kao predložak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Navedite
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
-DocType: Page,Page Name,Ime stranice
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Vrijeme da mora biti veći od s vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vretena Završeno
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","na primjer ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati za Stavka {0} od ima varijante
 ,Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracije ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni Distribucija Procenat
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materijala dostavljenih protiv ove otpremnici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Strojna
 DocType: Customer,Customer Details,Korisnički podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,upravljanja kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filter temelji se na kupca
 DocType: Payment Tool Detail,Against Voucher No,Protiv vaučera Nema
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilans kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilans kol
 DocType: Item Group,Parent Item Group,Roditelj artikla Grupa
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} za
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Troška
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Skladišta.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Skladišta.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings sukobi s redom {1}
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajna imovina
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani )
-DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
 DocType: Employee,Encashment Date,Encashment Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanizacije
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Protiv vaučera Tip mora biti jedan od narudžbenice, fakturi ili Journal Entry"
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Uobičajeno aktivnosti Troškovi postoji aktivnost Tip - {0}
 DocType: Production Order,Planned Operating Cost,Planirani operativnih troškova
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Ime
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},U prilogu {0} {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},U prilogu {0} {1} #
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Molimo navedite iz / u rasponu
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Stvorio
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stavka stopa vrednovanja izračunava se razmatra sletio troškova voucher iznosu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
@@ -3354,17 +3079,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} već koristi u {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Uobičajeno Porezi i naknadama
 DocType: Account,Receivable,potraživanja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3372,8 +3096,8 @@
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena artikla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -3382,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Kataloški UOM Zamjena Utility
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
@@ -3394,7 +3117,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Unesite prodajnog naloga u gornjoj tablici
 DocType: Project Task,View Task,Pogledaj Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaša financijska godina počinje
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaša financijska godina počinje
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupovina Primici
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
@@ -3402,20 +3125,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavljanje dolazni poslužitelj za podršku e-mail ID . ( npr. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Satiniranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
 DocType: Sales Invoice Item,Sales Order Item,Stavka narudžbe kupca
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: BOM,Manage cost of operations,Upravljanje troškove poslovanja
 DocType: Features Setup,Item Advanced,Artikal - napredna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Vruće valjanje
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Zaposlenik Obrazovanje
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3424,35 +3145,28 @@
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencijalni mogućnosti za prodaju.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Robne kuće
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Je aktivan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
-DocType: Workflow State,Primary,Osnovni
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Max rabat (%)
-DocType: Communication,More Information,Više informacija
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranja
 DocType: Company,Warn,Upozoriti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vrednovanje artikla je izmijenjeno
 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: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
 DocType: Purchase Invoice,Recurring Print Format,Ponavlja Format
-DocType: Communication,Series,serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Stavka Klasifikacija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Period
 ,General Ledger,Glavna knjiga
@@ -3462,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Odaberite {0} Prvi
 DocType: Features Setup,To get Item Group in details table,Da biste dobili predmeta Group u tablici pojedinosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekrajanje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura
 DocType: Sales Invoice,Commission,Provizija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3490,7 +3202,7 @@
  {% ako email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Zadani iznos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Skladište nije pronađeno u sistemu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ovaj mjesec je sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvaliteta Inspekcija čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
@@ -3509,13 +3221,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vaučeri
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Appraisal,Start Date,Datum početka
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrijednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeli odsustva za period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje za provjeru
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
@@ -3525,55 +3236,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme koje je dobavljač isporuči
 DocType: Time Log,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklonite stavku ako naknada nije primjenjiv na tu stavku
-DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
-DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primiti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primiti
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodan u newsletter listu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron obradni zrak
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavni izvještaji
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock unose u knjigu salda ažurirane
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavni izvještaji
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za proizvodnju
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
-,Setup Wizard,Čarobnjak za postavljanje
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto nije bilo u redu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta preduzeća)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
-DocType: Email Alert,Reference Date,Referentni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
 DocType: Budget Detail,Budget Detail,Proračun Detalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM ažurirati za Stavka {0}
-DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} već naplaćuju
@@ -3586,54 +3285,51 @@
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
 DocType: Item,Unit of Measure Conversion,Jedinica mjere pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposleni se ne može mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Drugi strukture plata {0} je aktivna zaposlenika {1}. Molimo vas da svoj status 'Inactive' za nastavak.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Dobili od
 DocType: Features Setup,Exports,Izvoz
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} {1} za
 DocType: Issue,Content Type,Vrsta sadržaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Cost Center,Budgets,Budžeti
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Obnovljeno
 DocType: Employee,Emergency Contact Details,Hitna Kontaktni podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} je upisan više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,' Je rednim brojem ' ne može biti ' Da ' za ne - stock stavke
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update dodatne troškove za izračun troškova spustio stavki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Utiskivanje
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od garantnom roku
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zapljuskuje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dana od posljednje narudžbe
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
-DocType: User,Enabled,Omogućeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvoz Pretplatnici
@@ -3641,19 +3337,18 @@
 DocType: Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
 DocType: Authorization Rule,Based On,Na osnovu
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generiranje plaće gaćice
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nije ispravan id e-mail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba provjeriti, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
-DocType: ToDo,Low,Nisko
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Predenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3675,7 +3370,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Potreban je naziv kampanje
 DocType: Maintenance Visit,Maintenance Date,Održavanje Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Odbijen Serijski br
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Duboko uzdisanje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3686,7 +3380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodnja Settings
@@ -3698,28 +3391,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdi Vaš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuda kandidata posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Ukupno izdvojene Listovi su više od nekoliko dana u razdoblju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum lajsne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
-DocType: Contact Us Settings,City,Grad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno mašinsku obradu
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Greška: Ne važeći id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
 DocType: Sales Order,Printing Details,Printing Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupština
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Partner Tip
@@ -3727,7 +3416,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodnja Red
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposleni (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pregled Sada
@@ -3735,26 +3424,24 @@
 DocType: BOM,Raw Material Cost,Troškovi sirovina
 DocType: Item,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part - time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part - time
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prvo Korisnik : Vi
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani Završni datum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Punovažnost
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturisanog
 DocType: Attendance,Attendance,Pohađanje
-DocType: Page,No,Ne
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
@@ -3762,55 +3449,46 @@
 ,Item Prices,Cijene artikala
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
 DocType: Period Closing Voucher,Period Closing Voucher,Razdoblje Zatvaranje bon
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Cjenik majstor .
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Cjenik majstor .
 DocType: Task,Review Date,Recenzija Datum
 DocType: Purchase Invoice,Advance Payments,Avansna plaćanja
-DocType: DocPerm,Level,Nivo
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije specificirano ponavljaju% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Glodanje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No dozvolu za korištenje alat za plaćanje
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije specificirano ponavljaju% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gricka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Roditelj Kupac Grupa
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkazni rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Otkazni rok
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To jekorijen teritorij i ne može se mijenjati .
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokazati nultu vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina predmeta dobije nakon proizvodnju / pakiranje od navedenih količina sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Account plaćaju
 DocType: Delivery Note Item,Against Sales Order Item,Protiv naloga prodaje Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni Završni datum (via vrijeme Dnevnici)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Unesite roditelj troška
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
-DocType: User,Last Name,Prezime
-DocType: Web Page,Left,Lijevo
-DocType: Event,All Day,Cijeli dan
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: Issue,Support Team,Tim za podršku
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
-DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja)
-DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
 DocType: Stock Entry,As per Stock UOM,Kao po burzi UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nije istekao
@@ -3824,44 +3502,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Stvaranje pravila za ograničavanje prometa na temelju vrijednosti .
 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"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-DocType: Workflow State,User,Korisnik
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Obrada Payroll
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje potvrda o primitku
 DocType: Customer,Credit Days Based On,Credit Dani Na osnovu
 DocType: Tax Rule,Tax Rule,Porez pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavati ista stopa Tijekom cijele prodajni ciklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan Workstation Radno vrijeme.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani artikli
-DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing brzine na osnovu aktivnosti Tip (po satu)
 DocType: Company,Company Info,Podaci o preduzeću
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","E-mail nije poslan, preduzeće nema definisan e-mail"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtrirati na temelju točki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Zaposlenik Ime
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
-DocType: DocField,Default,Podrazumjevano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pretplatnika dodao
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirati budžeta za ovu troškova Centra. Za postavljanje budžet akciju, pogledajte &quot;Lista preduzeća&quot;"
@@ -3872,70 +3546,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
 DocType: Address,Office,Ured
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardni Izvješća
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
 DocType: Employee,Current Address,Trenutna adresa
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch zaliha
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch zaliha
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
-DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za praćenje predmeta prodaje i otkupa dokumente serije br. &quot;Željena Industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Ukupno porez
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Qty) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno izdvojene Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materijala dostavljenih od ovog prodajnog naloga
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista pretplatnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dubljenje
-DocType: Email Account,Service,Usluga
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +140,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektromaterijal
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Unesite plaćanja Iznos u atleast jednom redu
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Unesite plaćanja Iznos u atleast jednom redu
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Plaćanje iznosu koji ne može biti veći od preostali iznos
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Ukupno Neplaćeni
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ukupno Neplaćeni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Vrijeme Log nije naplatnih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupac
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupac
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plaća ne može biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Molimo vas da unesete ručno protiv vaučera
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Molimo vas da unesete ručno protiv vaučera
 DocType: SMS Settings,Static Parameters,Statički parametri
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Porez artikla
@@ -3944,14 +3611,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošalji masovne SMS poruke svojim kontaktima
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Artikal će biti proizveden ili prepakiran
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i naknada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna obrada
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Ime Prodavač
@@ -3961,47 +3626,44 @@
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Priložiti logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Priložiti logo
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Korijen ne može se mijenjati .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite Production o praznicima
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapitala
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Odaberite CSV datoteku
-DocType: Dropbox Backup,Send Backups to Dropbox,Pošalji Backup na Dropbox
 DocType: Purchase Order,To Receive and Bill,Da primi i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatski kreirati Materijal Zahtjev ako količina padne ispod tog nivoa
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Da biste postavili Ponovno redj nivo, stavka mora biti kupovine stavke ili Proizvodnja artikla"
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
-DocType: Dropbox Backup,Send Notifications To,Pošalji obavještenje na adresu
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref: Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref: Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i druge publikacije.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}

diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 835658b..208c7fb 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Salary Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccioneu Distribució mensual, si voleu fer un seguiment basat en l'estacionalitat."
 DocType: Employee,Divorced,Divorciat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertència: El mateix article s&#39;ha introduït diverses vegades.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productes ja sincronitzen
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productes de Consum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleccioneu Partit Tipus primer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recuit
 DocType: Item,Customer Items,Articles de clients
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Aprovadors d'absències
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Llogat
-DocType: About Us Settings,Website,Lloc web
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactació més sinterització
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Sol·licituds de materials
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,De Sol·licituds de materials
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Job Applicant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hi ha més resultats.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Impost de tipus real no pot ser inclòs en el preu de l&#39;article a la fila {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sèrie actualitzat correctament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntades
 DocType: Pricing Rule,Apply On,Aplicar a
 DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
 ,Purchase Order Items To Be Received,Articles a rebre de l'ordre de compra
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
 DocType: Quality Inspection Reading,Parameter,Paràmetre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nova aplicació Deixar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nova aplicació Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Lletra bancària
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utilitza aquesta opció per mantenir el codi de l'article del client i incloure'l en les cerques en base al seu codi
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra variants
-DocType: Sales Invoice Item,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantitat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En estoc
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Fes el teu nou perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sanitari
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard en el pagament (dies)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adreça de correu electrònic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}: 
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle n
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleccionla llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tractament de la fusta
 DocType: Production Order Operation,Work In Progress,Treball en curs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,La impressió 3D
 DocType: Employee,Holiday List,Llista de vacances
 DocType: Time Log,Time Log,Hora de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Accountant
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Company,Phone No,Telèfon No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bloc d'activitats realitzades pels usuaris durant les feines que es poden utilitzar per al seguiment del temps, facturació."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nova {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissió dels revenedors
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no pot tenir més de 5 caràcters
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribut Valor {0} no es pot treure de {1} com Article Variants \ existeixen amb aquest atribut.
-DocType: Print Settings,Classic,Clàssic
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Es tracta d'un compte principal i no es pot editar.
 DocType: BOM,Operations,Operacions
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No es pot establir l'autorització sobre la base de Descompte per {0}
 DocType: Bin,Quantity Requested for Purchase,Quantitat sol·licitada per a la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjunta el fitxer .csv amb dues columnes, una per al nom antic i un altre per al nou nom"
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,L'obertura per a una ocupació.
 DocType: Item Attribute,Increment,Increment
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccioneu Magatzem ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitat
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company s&#39;introdueix més d&#39;una vegada
 DocType: Employee,Married,Casat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No està permès per {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Botiga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Feu entrada del banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fons de Pensions
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fons de Pensions
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse és obligatori si el tipus de compte és Magatzem
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marca-ho si és una ordre recurrent, desmarca per aturar recurrents o posa la data final"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l&#39;Operació
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
-DocType: Blog Post,Guest,Convidat
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 DocType: Lead,Interested,Interessat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Llista de materials (BOM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Obertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} és obligatori
 DocType: Stock Entry,Additional Costs,Despeses addicionals
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
 DocType: Lead,Product Enquiry,Consulta de producte
-DocType: Standard Reply,Owner,Propietari
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Si us plau ingressi empresa primer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Si us plau seleccioneu l'empresa primer
 DocType: Employee Education,Under Graduate,Baix de Postgrau
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Cost total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrinatge
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registre d'activitat:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estat de compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacèutics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
-DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importa registre
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salari Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Despeses d'estoc
 DocType: Newsletter,Email Sent?,Email Sent?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registres Temps
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'Article {0} ha de ser un article de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,S'actualitzarà després de la presentació de la factura de venda.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redreçar
 DocType: BOM Replace Tool,New BOM,Nova llista de materials
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lot Registres de temps per a la facturació.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Colada per contra
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El Newsletter ja s'ha enviat
 DocType: Lead,Request Type,Tipus de sol·licitud
 DocType: Leave Application,Reason,Raó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radiodifusió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Execució
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Execució
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuari es convertirà en l'Administrador del sistema (que pot canviar això més endavant).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Els detalls de les operacions realitzades.
 DocType: Serial No,Maintenance Status,Estat de manteniment
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articles i preus
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articles i preus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccioneu l'empleat per al qual està creant l'Avaluació.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El Centre de cost {0} no pertany a l'empresa {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descompte Preu de llista Taxa (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Començar
-DocType: User,First Name,Nom De Pila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fosa de motlle complet
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Termes i Condicions
 DocType: Production Planning Tool,Sales Orders,Ordres de venda
 DocType: Purchase Taxes and Charges,Valuation,Valoració
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Compte Bancari
 DocType: Leave Type,Allow Negative Balance,Permetre balanç negatiu
 DocType: Selling Settings,Default Territory,Territori per defecte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisió
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisió
 DocType: Production Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},El compte {0} no pertany a l'empresa {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Rebuda el
 DocType: Sales Partner,Reseller,Revenedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Si us plau entra l'Empresa
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
 DocType: Lead,Address & Contact,Direcció i Contacte
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Newsletter List,Total Subscribers,Els subscriptors totals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nom de Contacte
+,Contact Name,Nom de Contacte
 DocType: Production Plan Item,SO Pending Qty,SO Pendent Quantitat
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Sol·licitud de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Habitatge Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Deixa per any
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Si us plau, estableix Naming Sèries per {0} a través de Configuració&gt; Configuració&gt; Sèrie Naming"
 DocType: Time Log,Will be updated when batched.,Will be updated when batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
-DocType: Bulk Email,Message,Missatge
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referència número
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
 DocType: Material Request Item,Min Order Qty,Quantitat de comanda mínima
 DocType: Lead,Do Not Contact,No entri en contacte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identificador únic per al seguiment de totes les factures recurrents. Es genera a enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
 DocType: Item,Purchase Details,Informació de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Raspall de filferro
 DocType: Employee,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comandes en ferm dels clients.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cap de despeses
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Seleccioneu Tipus de Càrrec primer
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caràcters
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecciona el teu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caràcters
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creació de registres de temps en contra de les ordres de fabricació. Les operacions no seran objecte de seguiment contra l&#39;Ordre de Producció
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Variant de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Article {0} ha de ser Servei d'articles
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
-DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforació per làser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM d'existències
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referència Circular Error
-DocType: Communication,Closed,Tancat
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament.
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Petoneig
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
 DocType: Journal Entry,Multi Currency,Multi moneda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,L'article s'ha actualitzat
-DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
 DocType: Sales Invoice Item,Delivery Note,Nota de lliurament
-DocType: Dropbox Backup,Allow Dropbox Access,Allow Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuració d&#39;Impostos
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagament ha estat modificat després es va tirar d'ell. Si us plau, tiri d'ella de nou."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Workstation,Rent Cost,Cost de lloguer
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecciona el mes i l'any
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Email de l'empresa
 DocType: GL Entry,Debit Amount in Account Currency,Suma Dèbit en Compte moneda
 DocType: Shipping Rule,Valid for Countries,Vàlid per als Països
-DocType: Workflow State,Refresh,refrescar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tots els camps relacionats amb la importació com la divisa, taxa de conversió, el total de l'import, els imports acumulats, etc estan disponibles en el rebut de compra, oferta de compra, factura de compra, ordres de compra, etc."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total de la comanda Considerat
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Si us plau, introdueixi 'Repetiu el Dia del Mes' valor del camp"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Si us plau, introdueixi 'Repetiu el Dia del Mes' valor del camp"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible a la llista de materials, nota de lliurament, factura de compra, ordre de producció, ordres de compra, rebut de compra, factura de venda, ordres de venda, entrada d'estoc, fulla d'hores"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccioneu Producte
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Rebut de compra s'ha de presentar
-DocType: Stock UOM Replace Utility,Current Stock UOM,Estoc actual UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,La seva adreça de correu electrònic
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Tall per raig d&#39;aigua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuració acabada !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuració acabada !!
 ,Finished Goods,Béns Acabats
 DocType: Delivery Note,Instructions,Instruccions
 DocType: Quality Inspection,Inspected By,Inspeccionat per
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Si us plau, no crear comptes de clients i proveïdors. Es creen directament dels mestres al client / proveïdor."
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
 DocType: Purchase Invoice Item,Item Name,Nom de l'article
+DocType: Authorization Rule,Approving User  (above authorized value),L&#39;aprovació de l&#39;usuari (per sobre del valor autoritzat)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo creditor
 DocType: Employee,Widowed,Vidu
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Els productes que es sol·licitaran i que estan ""Esgotat"", considerant tots els magatzems basat en Quantitat projectada i quantitat mínima de comanda"
@@ -380,22 +348,21 @@
 ,Purchase Register,Compra de Registre
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
 DocType: Workstation,Consumable Cost,Cost de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir paper 'Deixar aprovador'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Metge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Metge
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiu de pèrdua
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abaloris Tub
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 DocType: Employee,Single,Solter
 DocType: Issue,Attachment,Accessori
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Pressupost no es pot establir de centres de cost Grup
 DocType: Account,Cost of Goods Sold,Cost de Vendes
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Si us plau entra el centre de cost
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Si us plau entra el centre de cost
 DocType: Journal Entry Account,Sales Order,Ordre de Venda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. La venda de Tarifa
 DocType: Purchase Order,Start date of current order's period,Data inicial del període de l'ordre actual
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La quantitat no pot ser una fracció a la fila {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},La quantitat no pot ser una fracció a la fila {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
 DocType: Delivery Note,% Installed,% Instal·lat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,És el Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automàticament els números de sèrie basat en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De tall longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Per al cas núm ' no pot ser inferior a 'De Cas No.'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sense ànim de lucre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sense començar
 DocType: Lead,Channel Partner,Partner de Canal
 DocType: Account,Old Parent,Antic Pare
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
+DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre de vacances.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Emmotllament Shell
 DocType: Material Request Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Per Abast
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
 DocType: Features Setup,Imports,Importacions
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,La unió adhesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activitats pendents per avui
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registre d'assistència.
 DocType: Bank Reconciliation,Journal Entries,Entrades de diari
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
-DocType: System Settings,Loading...,Carregant ...
-DocType: DocField,Password,Contrasenya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelat per deposició fosa
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Afegir Subscriptors
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existeix"
 DocType: Pricing Rule,Valid Upto,Vàlid Fins
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingrés Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administratiu
 DocType: Payment Tool,Received Or Paid,Rebut o pagat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry,Difference Account,Compte de diferències
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productes cosmètics
-DocType: DocField,Type,Tipus
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
-DocType: Communication,Subject,Subjecte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 ,Serial No Warranty Expiry,Venciment de la garantia del número de sèrie
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Article
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Subcontractació Gestió
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nova UDM no pot ser de tipus Número sencer
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Subcontractació Gestió
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobles
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Valor pel qual la divisa de la llista de preus es converteix a la moneda base de la companyia
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Requirement de Material
 DocType: Company,Delete Company Transactions,Eliminar Transaccions Empresa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Article {0} no és article de Compra
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} és una adreça de correu electrònic vàlida en el '\
  Notificació Adreça de correu electrònic'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Facturació total aquest any: 
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturació total aquest any:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No es pot eliminar de sèrie n {0}, ja que s&#39;utilitza en les transaccions de valors"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Tancament (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Tancament (Cr)
 DocType: Serial No,Warranty Period (Days),Període de garantia (Dies)
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 ,Pending Qty,Pendent Quantitat
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
 DocType: Pricing Rule,Valid From,Vàlid des
 DocType: Sales Invoice,Total Commission,Total Comissió
 DocType: Pricing Rule,Sales Partner,Soci de vendes
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribució Mensual ** l'ajuda a distribuir el seu pressupost a través de mesos si té l'estacionalitat del seu negoci.
 
  Per distribuir un pressupost utilitzant aquesta distribució, establir aquesta distribució mensual ** ** ** al centre de costos **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No es troben en la taula de registres de factures
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ho sentim, els números de sèrie no es poden combinar"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
-DocType: About Us Settings,Website Manager,Gestor de la Pàgina web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiscal Any Data d'inici no ha de ser major que l'any fiscal Data de finalització
 DocType: Warranty Claim,Resolution,Resolució
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Lliurat: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devolucions de vendes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccioneu ordres de venda a partir del qual vol crear ordres de producció.
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Components salarials.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dades de clients potencials.
+DocType: Authorization Rule,Customer or Item,Client o article
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de dades de clients.
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Suma assignat no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè ja ha realitzat alguna transacció (s) amb una altra UOM. Vostè haurà de crear un nou element a utilitzar un UOM predeterminat diferent.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
-DocType: Event,Wednesday,Dimecres
 DocType: Sales Invoice,Customer's Vendor,Venedor del Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de Producció és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacció de propostes
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatiu Stock Error ({6}) per al punt {0} a Magatzem {1} a {2} {3} a {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Si us plau, instal leu el mòdul python dropbox"
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Des rebut de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerent
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Des rebut de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
 DocType: SMS Settings,Receiver Parameter,Paràmetre de Receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basat En' i 'Agrupar Per' no pot ser el mateix
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,A
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduïu l'adreça de correu electrònic
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fi tub formant
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Dies Fixos
 DocType: Sales Invoice,Packing List,Llista De Embalatge
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordres de compra donades a Proveïdors.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicant
 DocType: Activity Cost,Projects User,Usuari de Projectes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumit
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no es troba a Detalls de la factura taula
 DocType: Company,Round Off Cost Center,Completen centres de cost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manteniment Visita {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Material Request,Material Transfer,Transferència de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Obertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Ajustos
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Més
 DocType: Pricing Rule,Sales Manager,Gerent De Vendes
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Canviar el nom
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblegat
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permetre a l'usuari
 DocType: Journal Entry,Bill No,Factura Número
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Entra els detalls de l'article
 DocType: Purchase Receipt,Other Details,Altres detalls
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Recta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Màrqueting
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per realitzar el seguiment de l'article en vendes i documents de compra en base als seus números de sèrie. Aquest és també pugui utilitzat per rastrejar informació sobre la garantia del producte.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Cal indicar el magatzem de no conformitats per la partida rebutjada
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,L&#39;article té variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} no trobat
 DocType: Bin,Stock Value,Estoc Valor
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipus Arbre
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra val Type ha de ser un comandes de venda, factura de venda o entrada de diari"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No es pot trobar el tipus de canvi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Benvinguda
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Introducció d'una targeta de crèdit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tasca Assumpte
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productes rebuts de proveïdors.
-DocType: Communication,Open,Obert
 DocType: Lead,Campaign Name,Nom de la campanya
 ,Reserved,Reservat
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no és un article d'estoc
 DocType: Mode of Payment Account,Default Account,Compte predeterminat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
-DocType: Contact Us Settings,Address Title,Direcció Títol
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
-DocType: Dropbox Backup,Daily,Diari
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Employee,Cell Number,Número de cel·la
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nòmina mensual.
 DocType: Item Group,Website Specifications,Especificacions del lloc web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nou Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entrades de Comptabilitat es poden fer en contra de nodes fulla. No es permeten els comentaris en contra dels grups.
-DocType: ToDo,High,Alt
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Opportunity,Maintenance,Manteniment
-DocType: User,Male,Home
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanyes de venda.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Expense Claim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustos predeterminats del Carro de Compres
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Seient {0} està enllaçat amb l'Ordre {1}, comproveu si ha de tirar com avançament en aquesta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despeses de manteniment d'oficines
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Si us plau entra primer l'article
 DocType: Account,Liability,Responsabilitat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Process Payroll,Send Email,Enviar per correu electrònic
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,No permission
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;Actualització de la &#39;no es pot comprovar perquè els articles no es lliuren a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Ens
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Ens
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Els meus Factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Els meus Factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,No s'ha trobat cap empeat
 DocType: Purchase Order,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
@@ -743,7 +683,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ara
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Lloc Web del magatzem
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc. "
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registres C-Form
 apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clients i Proveïdors
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per habilitar les característiques de &quot;Punt de Venda&quot;
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Seleccionar elements
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
-DocType: Comment,Reference Name,Referència Nom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Bill {1} {2} de data
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: Sales Invoice Item,Target Warehouse,Magatzem destí
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista de lliurament no pot ser abans de la data de l'ordres de venda
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
 DocType: Production Order,Item To Manufacture,Article a fabricar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fosa de motlle permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estat és {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordre de compra de Pagament
 DocType: Sales Order Item,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
 DocType: Newsletter,Newsletter Manager,Butlletí Administrador
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Obertura&#39;
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
 DocType: Expense Claim,Expenses,Despeses
 DocType: Item Variant Attribute,Item Variant Attribute,Article Variant Atribut
 ,Purchase Receipt Trends,Purchase Receipt Trends
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccioneu la plantilla de la qual vol aconseguir els Objectius de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigació i Desenvolupament
 ,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteig
 DocType: Item,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat per enviar a {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punt de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No es pot tirar endavant {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
 DocType: Notification Control,Expense Claim Rejected Message,Missatge de rebuig de petició de despeses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavat
 ,Available Qty,Disponible Quantitat
 DocType: Purchase Taxes and Charges,On Previous Row Total,Total fila anterior
 DocType: Salary Slip,Working Days,Dies feiners
 DocType: Serial No,Incoming Rate,Incoming Rate
 DocType: Packing Slip,Gross Weight,Pes Brut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclou vacances en el número total de dies laborables
 DocType: Job Applicant,Hold,Mantenir
 DocType: Employee,Date of Joining,Data d'ingrés
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Veure Subscriptors
 DocType: Purchase Invoice Item,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sorrejat abrasiu
 DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tipus de canvi principal.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} ha d'estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} ha d'estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
 DocType: Salary Slip,Leave Encashment Amount,Deixa Cobrament Monto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
 DocType: Bank Reconciliation,Total Amount,Quantitat total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicant a Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronitzar articles
-DocType: GL Entry,Account Currency,Compte moneda
+DocType: Bank Reconciliation,Account Currency,Compte moneda
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Si us plau, Compte Off rodona a l&#39;empresa"
 DocType: Purchase Receipt,Range,Abast
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Features Setup,Item Barcode,Codi de barres d'article
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Botiga
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisió per superar {0} creuat per Punt {1}.
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 DocType: Item,Is Purchase Item,És Compra d'articles
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ordre de compra d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingressos Indirectes
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establir Import Pagament = Suma Pendent
-DocType: Contact Us Settings,Address Line 1,Adreça Línia 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Desacord
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'Empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Desacord
+,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Seleccionar element de Transferència
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veure una llista de tots els vídeos d&#39;ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccioneu cap compte del banc on xec va ser dipositat.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permetre a l'usuari editar la Llista de Preus de Tarifa en transaccions
 DocType: Pricing Rule,Max Qty,Quantitat màxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pagament contra Vendes / Ordre de Compra sempre ha d'estar marcat com a pagamet anticipat (bestreta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tots els articles ja han estat transferits per aquesta ordre de producció.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccioneu nòmina Any i Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Anar al grup apropiat (generalment Aplicació de Fons&gt; Actiu Circulant&gt; Comptes Bancàries i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;Banc&quot;
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
-DocType: Comment,Unsubscribed,No subscriure
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Arbre de Centres de Cost finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanc
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunta la teva imatge
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fer 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunta la teva imatge
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fer
 DocType: Journal Entry,Total Amount in Words,Suma total en Paraules
-DocType: Workflow State,Stop,Aturi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"S'ha produït un error. Una raó probable podria ser que no ha guardat el formulari. Si us plau, poseu-vos en contacte amb support@erpnext.com si el problema persisteix."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Carro de la compra
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipus d'ordre ha de ser un de {0}
 DocType: Lead,Next Contact Date,Data del següent contacte
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantitat d'obertura
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Deixa Eina d'Assignació
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Pressupost Mensual excedit (per compte de despeses)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnició
 DocType: Workstation,Net Hour Rate,Hora taxa neta
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost rebut de compra
 DocType: Company,Default Terms,Termes predeterminats
 DocType: Packing Slip Item,Packing Slip Item,Albarà d'article
 DocType: POS Profile,Cash/Bank Account,Compte de Caixa / Banc
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentació
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descompte
 DocType: Features Setup,Purchase Discounts,Compra Descomptes
 DocType: Workstation,Wages,Salari
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Issue,Issue,Incidència
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte no coincideix amb la Companyia
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magatzem
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
 DocType: BOM Operation,Operation,Operació
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article ha de ser afegit usant 'Obtenir elements de rebuts de compra' botó
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despeses de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra Standard
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fer comentaris Imatges
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
 DocType: Item,Default Supplier,Per defecte Proveïdor
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Sobre Producció Assignació Percentatge
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,actualitzada a través dels registres de temps
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 DocType: Opportunity,Your sales person who will contact the customer in future,La seva persona de vendes que es comunicarà amb el client en el futur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
 DocType: Company,Default Currency,Moneda per defecte
 DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
-DocType: Contact Us Settings,Address,Adreça
 DocType: Expense Claim,From Employee,D'Empleat
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
 DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència
 DocType: Upload Attendance,Attendance From Date,Assistència des de data
 DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transports
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any: 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transports
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i l'any:
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Personatges totals
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Invoice Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de Pagament de Reconciliació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribució%
 DocType: Item,website page link,website page link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Anem a preparar el sistema per al primer ús.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Els números de registre de l'empresa per la seva referència. Nombres d'impostos, etc."
 DocType: Sales Partner,Distributor,Distribuïdor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regles d'enviament de la cistella de lacompra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordre de Producció {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 ,Ordered Items To Be Billed,Els articles comandes a facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecciona Registres de temps i Presenta per a crear una nova factura de venda.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Res per sol·licitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Administració
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipus d'activitats per a les fitxes de Temps
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fosa de precisió
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Es requereix ja sigui quantitat de dèbit o crèdit per {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actiu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,És la tornada
 DocType: Price List Country,Price List Country,Preu de llista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Només es poden crear més nodes amb el tipus 'Grup'
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Perfil {0} ja creat per a l&#39;usuari: {1} i companyia {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM factor de conversió
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricació d&#39;objectes laminat
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formant Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,La seva persona de vendes es posarà un avís en aquesta data per posar-se en contacte amb el client
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos i altres deduccions salarials.
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Account,Warehouse,Magatzem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Les entrades d'ajust d'estocs i les entrades de GL estan inserits en els rebuts de compra seleccionats
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
 DocType: Holiday,Holiday,Festiu
-DocType: Event,Saturday,Dissabte
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixar en blanc si es considera per a totes les branques
 ,Daily Time Log Summary,Resum diari del registre de temps
-DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalls de Pagaments Sense conciliar
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
 DocType: Lead,Call,Truca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entrades' no pot estar buit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuració d&#39;Empleats
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Seleccioneu el prefix primer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Recerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Contact,User ID,ID d'usuari
-DocType: Communication,Sent,Enviat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Veure Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
-DocType: Communication,Delivery Status,Estat de l'enviament
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 DocType: Production Order,Manufacture against Sales Order,Fabricació contra ordre de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resta del món
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resta del món
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Descripció de l'Article
 DocType: Payment Tool,Payment Mode,Mètode de pagament
 DocType: Purchase Invoice,Is Recurring,És recurrent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metall sinteritzat per làser directe
 DocType: Purchase Order,Supplied Items,Articles subministrats
 DocType: Production Order,Qty To Manufacture,Quantitat a fabricar
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenir mateix ritme durant tot el cicle de compra
 DocType: Opportunity Item,Opportunity Item,Opportunity Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Obertura Temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balanç d'absències d'empleat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
 DocType: Address,Address Type,Tipus d'adreça
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Rep les factures pendents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Compte cap {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verd
 DocType: Item,Auto re-order,Acte reordenar
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Aconseguit
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Aconseguit
 DocType: Employee,Place of Issue,Lloc de la incidència
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contracte
-DocType: Report,Disabled,Deshabilitat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contracte
+DocType: Email Digest,Add Quote,Afegir Cita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Els Productes o Serveis de la teva companyia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Els Productes o Serveis de la teva companyia
 DocType: Mode of Payment,Mode of Payment,Forma de pagament
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nom és necessari
 DocType: Purchase Invoice,Recurring Type,Tipus Recurrent
 DocType: Address,City/Town,Ciutat / Poble
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Article {0} ha de ser un subcontractada article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
@@ -1135,39 +1051,36 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista de lliurament és menor que la data d&#39;inici prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Per Proveïdor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Configurar el Tipus de compte ajuda en la selecció d'aquest compte en les transaccions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (En la moneda de la companyia)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortint total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Només pot haver-hi una Enviament Condició de regla amb 0 o valor en blanc de ""valor"""
 DocType: Authorization Rule,Transaction,Transacció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: aquest centre de costos és un Grup. No es poden fer anotacions en compte als grups.
-apps/frappe/frappe/config/desk.py +7,Tools,Instruments
 DocType: Item,Website Item Groups,Grups d'article del Web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El Número d'ordre de producció és obligatori per a les entrades d'estoc de fabricació
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
 DocType: Journal Entry,Journal Entry,Entrada de diari
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Digest: 
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Digest:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentaris
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Es necessita tarifa de valoració per l'article {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Es necessita tarifa de valoració per l'article {0}
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar &#39;Distribuir els càrrecs basats en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos i Càrrecs Càlcul
 DocType: BOM Operation,Workstation,Lloc de treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Maquinari
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hi ha dades
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Plantilla Appraisal
 DocType: Salary Slip,Earning,Guany
 DocType: Payment Tool,Party Account Currency,Compte Partit moneda
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,La superposició de les condicions trobades entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total de la comanda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Menjar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vostè pot fer un registre de temps només contra una ordre de producció presentat
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters a contactes, clients potencials."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Les operacions no es poden deixar en blanc.
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
-DocType: DocField,Description,Descripció
 DocType: Authorization Rule,Average Discount,Descompte Mig
-DocType: Letter Head,Is Default,És per defecte
 DocType: Address,Utilities,Utilitats
 DocType: Purchase Invoice Item,Accounting,Comptabilitat
 DocType: Features Setup,Features Setup,Característiques del programa d'instal·lació
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Veure oferta Carta
-DocType: Communication,Communication,Comunicació
 DocType: Item,Is Service Item,És un servei
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Seleccioneu l'any fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Des {0} | {1} {2}
@@ -1213,9 +1123,9 @@
 DocType: Sales Order Item,Planned Quantity,Quantitat planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Suma d'impostos d'articles
 DocType: Item,Maintain Stock,Mantenir Stock
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció 
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Pla General de Comptabilitat
 DocType: Material Request,Terms and Conditions Content,Contingut de Termes i Condicions
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depèn de la llicència sense sou
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Per fer la llista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No s'admenten quantitats negatives
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprenent
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impost taula de detalls descarregui de mestre d'articles com una cadena i emmagatzemada en aquest camp.
  S'utilitza per a les taxes i càrrecs"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,No Estructura Salarial actiu que es troba per a l&#39;empleat {0} i el mes
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla fiscal per a les transaccions.
 DocType: Rename Tool,Type of document to rename.,Tipus de document per canviar el nom.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Comprem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Comprem aquest article
 DocType: Address,Billing,Facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,No Enviat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosiu formació
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programat per enviar a {0} destinataris
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Supplier,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magatzem d'origen obligatori per a la fila {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a l'import JV {2}
 DocType: Item,Inventory,Inventari
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per habilitar &quot;Punt de Venda&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,El pagament no es pot fer per al carro buit
 DocType: Item,Sales Details,Detalls de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixació
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La data en què es generarà propera factura. Es genera en enviar.
 DocType: Item Attribute,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Govern
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variants de l&#39;article
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Govern
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variants de l&#39;article
 DocType: Company,Services,Serveis
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
 DocType: Sales Invoice,Source,Font
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No hi ha registres a la taula de Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No hi ha registres a la taula de Pagaments
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data d'Inici de l'Exercici fiscal
 DocType: Employee External Work History,Total Experience,Experiència total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Material Request Item,Sales Order No,Ordre de Venda No
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pres
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materials de transferència per Fabricació
 DocType: Pricing Rule,For Price List,Per Preu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cerca d'Executius
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cerca d'Executius
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
 DocType: Maintenance Schedule,Schedules,Horaris
 DocType: Purchase Invoice Item,Net Amount,Import Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detall del BOM No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Grup de Clients> Territori
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lot Quantitat en magatzem
 DocType: Time Log Batch Detail,Time Log Batch Detail,Detall del registre de temps
-DocType: Workflow State,Tasks,Tasques
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
-DocType: Event,Tuesday,Dimarts
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
 ,Accounts Receivable Summary,Comptes per Cobrar Resum
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Fulles per al tipus {0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
-DocType: Top Bar Item,Target,Objectiu
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Quantitat aportada
 DocType: Sales Invoice,Shipping Address,Adreça d'nviament
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Aquesta eina us ajuda a actualitzar o corregir la quantitat i la valoració dels estocs en el sistema. Normalment s'utilitza per sincronitzar els valors del sistema i el que realment hi ha en els magatzems.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En paraules seran visibles un cop que es guarda l'albarà de lliurament.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Mestre Marca.
-DocType: ToDo,Due Date,Data De Venciment
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Mestre Marca.
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,L'Organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,L'Organització
 DocType: Monthly Distribution,Monthly Distribution,Distribució Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La llista de receptors és buida. Si us plau, crea la Llista de receptors"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pla de Producció d'ordres de venda
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada de Comptabilitat per a {0} només es pot fer en moneda: {1}
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Osques
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
 ,Bank Reconciliation Statement,Declaració de Conciliació Bancària
 DocType: Address,Lead Name,Nom Plom
 ,POS,TPV
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Obertura de la balança
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Obertura de la balança
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ha d'aparèixer només una vegada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l&#39;Ordre de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Les quantitats no es reflecteixen en el banc
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,La fosa centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabat assistida per camp magnètic
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Liabilities
 DocType: Purchase Receipt,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 DocType: Production Planning Tool,Select Sales Orders,Seleccionar comandes de client
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per realitzar un seguiment d'elements mitjançant codi de barres. Vostè serà capaç d'entrar en els elements de la nota de lliurament i la factura de venda mitjançant l'escaneig de codi de barres de l'article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar com Lliurat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar com Lliurat
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Fer Cita
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 DocType: SMS Center,Receiver List,Llista de receptors
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Veure
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salary Structure Deduction
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterització selectiva per làser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importació correcta!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edat (dies)
 DocType: Quotation Item,Quotation Item,Cita d'article
 DocType: Account,Account Name,Nom del Compte
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data no pot ser més gran que A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de sèrie {0} quantitat {1} no pot ser una fracció
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Taula mestre de tipus de proveïdor
 DocType: Purchase Order Item,Supplier Part Number,PartNumber del proveïdor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Afegir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La taxa de conversió no pot ser 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} és cancel·lat o detingut
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Dispatch Date
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,El rebut de compra {0} no està presentat
 DocType: Company,Default Payable Account,Compte per Pagar per defecte
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustaments per a la compra en línia, com les normes d'enviament, llista de preus, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instal·lació completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Anunciat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Els meus Qüestions
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Valors Predeterminats
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Quantitat de pagament no pot ser negatiu
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 DocType: Payment Reconciliation,Payments,Pagaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Premsat isostàtic en calent
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Pressupost assignat
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 ,Customer Credit Balance,Saldo de crèdit al Client
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
 DocType: Quotation,Term Details,Detalls termini
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
 DocType: Warranty Claim,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
-DocType: Authorization Rule,Approving User,Usuari aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
 DocType: Pricing Rule,Applicable For,Aplicable per
 DocType: Bank Reconciliation,From Date,Des de la data
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subhastes en línia
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subhastes en línia
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Si us plau especificar Quantitat o valoració de tipus o ambdós
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, mes i de l'any fiscal és obligatòri"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitat individual d'un article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',S'ha de 'Presentar' el registre de temps {0}
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Feu Entrada Comptabilitat Per Cada moviment d'estoc
 DocType: Leave Allocation,Total Leaves Allocated,Absències totals assignades
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magatzem requerit a la fila n {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Hi ha un grup de clients amb el mateix nom, si us plau canvia el nom del client o el nom del Grup de Clients"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Seleccioneu {0} primer.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepció de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productes
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Productes
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partit Tipus i Partit es requereix per al compte per cobrar / pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si aquest article té variants, llavors no pot ser seleccionada en les comandes de venda, etc."
 DocType: Lead,Next Contact By,Següent Contactar Per
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,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: Quotation,Order Type,Tipus d'ordre
 DocType: Purchase Invoice,Notification Email Address,Dir Adreça de correu electrònic per notificacions
 DocType: Payment Tool,Find Invoices to Match,Troba factures perquè coincideixi
 ,Item-wise Sales Register,Tema-savi Vendes Registre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","per exemple ""XYZ Banc Nacional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totals de l'objectiu
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totals de l'objectiu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Cistella de la compra està habilitat
 DocType: Job Applicant,Applicant for a Job,Sol·licitant d'ocupació
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No hi ha ordres de fabricació creades
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Nòmina d'empleat {0} ja creat per a aquest mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Sales Invoice Item,Batch No,Lot número
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Inici
-DocType: DocPerm,Delete,Esborrar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Detingut ordre no es pot cancel·lar. Unstop per cancel·lar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
 DocType: Sales Team,Contribution to Net Total,Contribució neta total
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Sol·licitant d'ocupació.
 DocType: Purchase Order Item,Warehouse and Reference,Magatzem i Referència
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el Proveïdor
-DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direccions
-DocType: Communication,Received,Rebut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Número de sèrie duplicat per l'article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condició per a una regla d'enviament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L&#39;article no se li permet tenir ordre de producció.
-DocType: DocField,Attach Image,Adjuntar imatge
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El pes net d'aquest paquet. (Calculats automàticament com la suma del pes net d'articles)
-DocType: Stock Reconciliation Item,Leave blank if no change,Deixar en blanc si no hi ha canvi
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registres de temps per a la seva fabricació.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-savi Nivell de Reabastament
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registre de temps per a les tasques.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pagament
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagament
 DocType: Production Order Operation,Actual Time and Cost,Temps real i Cost
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Per l'article {1} es poden fer un màxim de {0} sol·licituds de materials destinats a l'ordre de venda {2}
 DocType: Employee,Salutation,Salutació
-DocType: Communication,Rejected,Rebutjat
 DocType: Pricing Rule,Brand,Marca comercial
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
 DocType: Sales Order Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} per a l&#39;atribut {1} no existeix a la llista d&#39;article vàlida Atribut Valors
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Caducat
 DocType: Packing Slip,To Package No.,Al paquet No.
-DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Data De Assumpte
 DocType: Activity Cost,Activity Cost,Cost Activitat
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat utilitzada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicacions
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicacions
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 DocType: Payment Tool,Make Payment Entry,Feu Entrada Pagament
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
 ,Sales Invoice Trends,Tendències de Factures de Vendes
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Fulles
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
 DocType: Stock Settings,Allowance Percent,Percentatge de Subsidi
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda de comprovar, si es selecciona aplicable Perquè {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Oferta del proveïdor d'article
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Feu Estructura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cisallament
 DocType: Item,Has Variants,Té variants
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Feu clic al botó 'Make factura de venda ""per crear una nova factura de venda."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Envasament i etiquetatge
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Si us plau, especifiqui Moneda per defecte a l'empresa Mestre i predeterminats globals"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestió de Projectes
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
 DocType: Budget Detail,Fiscal Year,Any Fiscal
 DocType: Cost Center,Budget,Pressupost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Aconseguit
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localitat / Client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,per exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,per exemple 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En paraules seran visibles un cop que guardi la factura de venda.
 DocType: Item,Is Sales Item,És article de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Arbre de grups d'article
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un producte o servei
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hi han hagut errors.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un producte o servei
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Contra l'Ordre de Venda
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
 DocType: Website Item Group,Website Item Group,Lloc web Grup d'articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Si us plau, introduïu la data de referència"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
 DocType: Material Request Item,Material Request Item,Material Request Item
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre dels grups d'articles.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Arbre dels grups d'articles.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
 ,Item-wise Purchase History,Historial de compres d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermell
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermell
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operació {1} no s'ha completat per {2} Quantitat de productes acabats en ordre de producció # {3}. Si us plau, actualitzi l'estat de funcionament a través dels registres de temps"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Canviar la UDM d'un article
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteris d'acceptació
 DocType: Item Attribute,Attribute Name,Nom del Atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Article {0} ha de ser Vendes o Servei d'articles en {1}
 DocType: Item Group,Show In Website,Mostra en el lloc web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
 DocType: Task,Expected Time (in hours),Temps esperat (en hores)
 ,Qty to Order,Quantitat de comanda
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Per fer el seguiment de marca en el següent documentació Nota de lliurament, Oportunitat, sol·licitud de materials, d&#39;articles, d&#39;ordres de compra, compra val, Rebut comprador, la cita, la factura de venda, producte Bundle, ordres de venda, de sèrie"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Taula en blanc
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,De l'Ordre de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 ,Customer Addresses And Contacts,Adreces de clients i contactes
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Configurat
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Si us plau, espera mentre el sistema està essent configurat. Aquest procés pot trigar una estona."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Parell
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Parell
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
 DocType: Delivery Note,Excise Page Number,Excise Page Number
 DocType: Employee,Personal Details,Dades Personals
 ,Maintenance Schedules,Programes de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Repujat
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Dèbit al compte ha de ser un compte per cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",Per a poder fer aquest article Ordre de Producció cal designar-lo com a article d'estoc
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unió
-DocType: Authorization Rule,Above Value,Per sobre de Valor
 ,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup incoming server for jobs email id. (e.g. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
 DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar
 ,Supplier-Wise Sales Analytics,Proveïdor-Wise Vendes Analytics
 DocType: Address Template,This format is used if country specific format is not found,Aquest format s'utilitza si no hi ha el format específic de cada país
-DocType: Custom Field,Custom,A mida
 DocType: Production Order,Use Multi-Level BOM,Utilitzeu Multi-Nivell BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injecció de plàstics
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arbre dels comptes financers
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixar en blanc si es considera per a tot tipus d'empleats
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs en base a
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,El compte {0} ha de ser del tipus 'd'actius fixos' perquè l'article {1} és un element d'actiu
 DocType: HR Settings,HR Settings,Configuració de recursos humans
-apps/frappe/frappe/config/setup.py +130,Printing,Impressió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El compte de despeses està pendent d'aprovació. Només l'aprovador de despeses pot actualitzar l'estat.
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El dia (s) en el qual està sol·licitant el permís són vacances. Vostè no necessita sol·licitar l'excedència.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Esports
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Actual total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unitat
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Please set Dropbox access keys in your site config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unitat
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,El seu exercici acaba el
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,El seu exercici acaba el
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprovar Rol
 ,BOM Search,BOM Cercar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Tancament (Obertura + totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostra / Amaga característiques com Nº de Sèrie, TPV etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,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 +254,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},La data de liquidació no pot ser anterior a la data de verificació a la fila {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},La data de liquidació no pot ser anterior a la data de verificació a la fila {0}
 DocType: Salary Slip,Deduction,Deducció
 DocType: Address Template,Address Template,Plantilla de Direcció
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,Oferta
 DocType: Salary Slip,Total Deduction,Deducció total
 DocType: Quotation,Maintenance User,Usuari de Manteniment
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost Actualitzat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Cost Actualitzat
 DocType: Employee,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Article {0} ja s'ha tornat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Any Fiscal ** representa un exercici financer. Els assentaments comptables i altres transaccions importants es segueixen contra ** Any Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Direcció Plom
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripció del Treball
 DocType: Purchase Order Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Seleccioneu un arxiu csv vàlids amb dades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestiment
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Hi entrades Imatges contra magatzem de {0}, per tant, no es pot tornar a assignar o modificar Magatzem"
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
 DocType: Supplier Quotation,Manufacturing Manager,Gerent de Fàbrica
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Els enviaments
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Emmotllament per immersió
-DocType: Purchase Order,To be delivered to customer,Per ser lliurat al client
+apps/erpnext/erpnext/hooks.py +68,Shipments,Els enviaments
+DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Hora de registre d'estat ha de ser presentada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuració
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila # 
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Fila #
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
 DocType: Pricing Rule,Supplier,Proveïdor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
 DocType: Employee,Bank Name,Nom del banc
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sobre
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,L'usuari {0} està deshabilitat
 DocType: Leave Application,Total Leave Days,Dies totals d'absències
-DocType: Journal Entry Account,Credit in Account Currency,Crèdit en Compte moneda
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correu electrònic no serà enviat als usuaris amb discapacitat
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleccioneu l'empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Currency Exchange,From Currency,De la divisa
-DocType: DocField,Name,Nom
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleccioneu suma assignat, Tipus factura i número de factura en almenys una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordres de venda requerides per l'article {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Les quantitats no es reflecteix en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altres
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altres
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Acabat
-DocType: Web Form,Select DocType,Seleccioneu doctype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotxatge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nou Centre de Cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nou Centre de Cost
 DocType: Bin,Ordered Quantity,Quantitat demanada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
 DocType: Quality Inspection,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 DocType: Purchase Order Item,Reference Document Type,Referència Tipus de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventari serialitzat
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventari serialitzat
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Time Log Batch,Total Billing Amount,Suma total de facturació
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte per Cobrar
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordres de venda al Pagament
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Registres de temps de creació:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Seleccioneu el compte correcte
 DocType: Item,Weight UOM,UDM del pes
 DocType: Employee,Blood Group,Grup sanguini
 DocType: Purchase Invoice Item,Page Break,Salt de pàgina
 DocType: Production Order Operation,Pending,Pendent
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Els usuaris que poden aprovar les sol·licituds de llicència d'un empleat específic
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,No es pot canviar UOM per defecte de Variant. Per canviar UOM predeterminat per a la variant UOM canvi predeterminat de la plantilla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Material d'oficina
 DocType: Purchase Invoice Item,Qty,Quantitat
 DocType: Fiscal Year,Companies,Empreses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrònica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrònica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Llevant Sol·licitud de material quan l'acció arriba al nivell de re-ordre
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Des Programa de manteniment
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Temps complet
 DocType: Purchase Invoice,Contact Details,Detalls de contacte
 DocType: C-Form,Received Date,Data de recepció
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creat una plantilla estàndard de les taxes i càrrecs de venda de plantilla, escollir un i feu clic al botó de sota."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Obertura de treball
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturat Amt
 DocType: Time Log,To Time,Per Temps
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Per afegir nodes secundaris, explora arbre i feu clic al node en el qual voleu afegir més nodes."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 DocType: Production Order Operation,Completed Qty,Quantitat completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La llista de preus {0} està deshabilitada
@@ -1851,30 +1708,26 @@
 DocType: Item,Customer Item Codes,Codis dels clients
 DocType: Opportunity,Lost Reason,Raó Perdut
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entrades de pagament contra ordres o factures.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Es requereix nou Stock UOM
 DocType: Quality Inspection,Sample Size,Mida de la mostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,S'han facturat tots els articles
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Si us plau, especifica un 'Des del Cas Número' vàlid"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Article Nº de Sèrie
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
 DocType: Branch,Branch,Branca
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No nòmina trobats pel mes: 
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No nòmina trobats pel mes:
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Els teus Clients
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,El modelo per compressió
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Els teus Clients
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 DocType: Sales Order,Not Delivered,No Lliurat
 ,Bank Clearance Summary,Resum Liquidació del Banc
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Codi de l'article> Grup Element> Marca
 DocType: Appraisal Goal,Appraisal Goal,Avaluació Meta
-DocType: Event,Friday,Divendres
 DocType: Time Log,Costing Amount,Pago Monto
 DocType: Process Payroll,Submit Salary Slip,Presentar nòmina
 DocType: Salary Structure,Monthly Earning & Deduction,Ingressos mensuals i Deducció
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importació a granel
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
 DocType: SMS Log,Sender Name,Nom del remitent
-DocType: Page,Title,Títol
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalitza
 DocType: POS Profile,[Select],[Select]
 DocType: SMS Log,Sent To,Enviat A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Fer Factura Vendes
 DocType: Company,For Reference Only.,Només de referència.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No vàlida {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantitat Anticipada
 DocType: Manufacturing Settings,Capacity Planning,Planificació de la capacitat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Des de la data' és obligatori
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Des de la data' és obligatori
 DocType: Journal Entry,Reference Number,Número de referència
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viatges
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viatges
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
 DocType: Sales Invoice,Recurring,Periódico
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferir material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifiqueu les operacions, el cost d'operació i dona una número d'operació únic a les operacions."
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
 DocType: Installation Note,Installation Note,Nota d'instal·lació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Afegir Impostos
 ,Financial Analytics,Comptabilitat analítica
 DocType: Quality Inspection,Verified By,Verified Per
 DocType: Address,Subsidiary,Filial
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
 DocType: Quality Inspection,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
-DocType: System Settings,In Hours,En Hores
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Import pendent de rebre com per banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polit
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Import pendent de rebre com per banc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Font dels fons (Passius)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
 DocType: Appraisal,Employee,Empleat
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupa per comprovants
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Estàndard
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagaments
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Mida
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacèutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear Client
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Està Congelat
 DocType: Buying Settings,Buying Settings,Ajustaments de compra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabat en massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. de producte acabat d'article
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuració del servidor d'entrada de correu electrònic d'identificació de les vendes. (Per exemple sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de Pagament
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Esborrany
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatori
 DocType: Quality Inspection Reading,Accepted,Acceptat
-DocType: User,Female,Dona
-DocType: Journal Entry Account,Debit in Account Currency,Dèbit en Compte moneda
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Si us plau, assegureu-vos que realment voleu esborrar totes les transaccions d&#39;aquesta empresa. Les seves dades mestres romandran tal com és. Aquesta acció no es pot desfer."
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Respost
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Invàlid referència {0} {1}
 DocType: Payment Tool,Total Payment Amount,Suma total de Pagament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Com que hi ha transaccions d&#39;accions existents per aquest concepte, \ no pot canviar els valors de &#39;no té de sèrie&#39;, &#39;Té lot n&#39;, &#39;És de la Element &quot;i&quot; Mètode de valoració&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Seient Ràpida
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,No es pot canviar la tarifa si el BOM va cap a un article
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Sol·licituds d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instal·lació completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Butlletí de la llista de correu
 DocType: Delivery Note,Transporter Name,Nom Transportista
+DocType: Authorization Rule,Authorized Value,Valor Autoritzat
 DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitat de mesura
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
 DocType: Lead,Opportunity,Oportunitat
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
 DocType: Campaign,Campaign-.####,Campanya-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforació
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
 DocType: Customer Group,Has Child Node,Té Node Nen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en qualsevol any fiscal activa. Per a més detalls de verificació {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rang Envelliment 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanitzat fotoquímic
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. Introdueixi Row: Si es basa en ""Anterior Fila Total"" es pot seleccionar el nombre de la fila que serà pres com a base per a aquest càlcul (per defecte és la fila anterior).
  Setembre. Penseu impost o càrrec per: En aquesta secció es pot especificar si l'impost / càrrega és només per a la valoració (no una part del total) o només per al total (no afegeix valor a l'element) o per tots dos.
  10. Afegir o deduir: Si vostè vol afegir o deduir l'impost."
-DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
-DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No es pot produir més Article {0} que en la quantitat de comandes de client {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Global Defaults,Hide Currency Symbol,Amaga Símbol de moneda
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Nota de Crèdit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Completat Quantitat no pot contenir més de {0} per a l&#39;operació {1}
 DocType: Features Setup,Quality,Qualitat
-DocType: Contact Us Settings,Introduction,Introducció
 DocType: Warranty Claim,Service Address,Adreça de Servei
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Capacitat màxima de 100 files de Stock Reconciliació.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Capacitat màxima de 100 files de Stock Reconciliació.
 DocType: Stock Entry,Manufacture,Manufactura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Si us plau, nota de lliurament primer"
 DocType: Purchase Invoice,Currency and Price List,Moneda i Preus
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,No s'esmenta l'espai de dates
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producció
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,No s'esmenta l'espai de dates
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producció
 DocType: Item,Allow Production Order,Permetre Ordre de Producció
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviat
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Els meus Direccions
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organization branch master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,o
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despeses de serveis públics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Per sobre de 90-
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
-,Download Backups,Descàrrega Backups
 DocType: Notification Control,Sales Order Message,Sol·licitar Sales Missatge
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establir valors predeterminats com a Empresa, vigència actual any fiscal, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipus de Pagament
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
 DocType: Bank Reconciliation,To Date,Fins La Data
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalls
 DocType: Purchase Invoice,Total Taxes and Charges,Total d'impostos i càrrecs
 DocType: Employee,Emergency Contact,Contacte d'Emergència
 DocType: Item,Quality Parameters,Paràmetres de Qualitat
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixar tipus {0} no es poden enviar-portar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Quantitat reservades
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Tall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aixafament
 DocType: Account,Income Account,Compte d'ingressos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Motllura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documents
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Àrbitre
 DocType: Cost Center,Cost Center,Centre de Cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprovant #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovant #
 DocType: Notification Control,Purchase Order Message,Missatge de les Ordres de Compra
 DocType: Tax Rule,Shipping Country,País d&#39;enviament
 DocType: Upload Attendance,Upload HTML,Pujar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avanç total ({0}) en contra de l'ordre {1} no pot ser major \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Data Alleujar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magatzem només es pot canviar a través d'entrada d'estoc / Nota de lliurament / recepció de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Làser dissenyat conformació neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Màrqueting i Vendes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impost sobre els guanys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si Regla preus seleccionada està fet per a 'Preu', sobreescriurà Llista de Preus. Regla preu El preu és el preu final, així que no hi ha descompte addicional s'ha d'aplicar. Per tant, en les transaccions com comandes de venda, ordres de compra, etc, es va anar a buscar al camp ""Rate"", en lloc de camp 'Preu de llista Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar grup Client arbre.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nou nom de centres de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No hi ha adreça predeterminada. Si us plau, crea'n una de nova a Configuració> Premsa i Branding> plantilla d'adreça."
 DocType: Appraisal,HR User,HR User
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 DocType: Supplier,Billing Currency,Facturació moneda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra gran
 ,Profit and Loss Statement,Guanys i Pèrdues
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premsat
 DocType: Payment Tool Detail,Payment Tool Detail,Detall mitjà de Pagament
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Gran
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,No s'ha trobat cap empleat!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Gran
 DocType: C-Form Invoice Detail,Territory,Territori
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Purchase Order,Customer Address Display,Direcció del client Pantalla
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polit
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unitat de mesura per defecte per a l&#39;article {0} no es pot canviar directament perquè \ ja ha realitzat alguna transacció (s) amb una altra UOM. Per canviar UOM defecte, \ ús &#39;UOM Substituir Utilitat&#39; eina de baix mòdul d&#39;Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendent
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleat {0} estava de llicència a {1}. No es pot marcar l'assistència.
 DocType: Sales Partner,Targets,Blancs
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Feu l'hora de registre
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Si us plau ajust la quantitat de comanda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinadors
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de mòlta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Si us plau, configura el teu pla de comptes abans de començar els assentaments comptables"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar Regla preus
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancel·lat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir de la data en l&#39;estructura salarial no pot ser menor que l&#39;empleat Data Unir-se.
 DocType: Employee Education,Graduate,Graduat
 DocType: Leave Block List,Block Days,Bloc de Dies
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Comproveu si la factura recurrent, desmarqueu per aturar recurrents o posar fi propi Data"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Màxim {0} files permeses
 DocType: C-Form Invoice Detail,Net Total,Total Net
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturació (factura de venda)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Almenys un element ha de introduir-se amb quantitat negativa en el document de devolució
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanitzat electroquímic
 ,Requested,Comanda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Sense Observacions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Endarrerit
 DocType: Account,Stock Received But Not Billed,Estoc Rebudes però no facturats
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Compte arrel ha de ser un grup
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salari brut + arriar Quantitat + Cobrament Suma - Deducció total
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Compra i Venda
 DocType: Supplier Quotation Item,Material Request No,Número de sol·licitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rati a la qual es converteix la divisa del client es converteix en la moneda base de la companyia
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ha estat èxit de baixa d&#39;aquesta llista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa neta (Companyia moneda)
-apps/frappe/frappe/templates/base.html +134,Added,Afegit
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Any fiscal {0} no es troba.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenir assentaments corresponents
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada Comptabilitat de Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Encunyant
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
 DocType: Account,Root Type,Escrigui root
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No es pot tornar més de {1} per a l&#39;article {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma d&#39;impostos Després Quantitat de Descompte (Companyia moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magatzem destí obligatori per a la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ruixeu la formació
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Petit
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivell d'inventari mínim
 DocType: Stock Entry,Subcontract,Subcontracte
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,PartNumber del fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Temps estimat i cost
 DocType: Bin,Bin,Paperera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Sospita
 DocType: SMS Log,No of Sent SMS,No d'SMS enviats
 DocType: Account,Company,Empresa
 DocType: Account,Expense Account,Compte de Despeses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programat
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Seleccioneu l&#39;ítem on &quot;És de la Element&quot; és &quot;No&quot; i &quot;És d&#39;articles de venda&quot; és &quot;Sí&quot;, i no hi ha un altre paquet de producte"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccioneu Distribució Mensual de distribuir de manera desigual a través d'objectius mesos.
 DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Article Fila {0}: Compra de Recepció {1} no existeix a la taulat 'Rebuts de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
 DocType: Installation Note Item,Against Document No,Contra el document n
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrar Punts de vendes.
 DocType: Quality Inspection,Inspection Type,Tipus d'Inspecció
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Seleccioneu {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualització
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Si us plau, guardi el butlletí abans d'enviar-"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom o Email és obligatori
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspecció de qualitat entrant.
 DocType: Purchase Order Item,Returned Qty,Tornat Quantitat
 DocType: Employee,Exit,Sortida
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type is mandatory
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type is mandatory
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabat vibratori
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Sales Invoice,Advertisement,Anunci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Període De Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mòlta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activitats pendents
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveïdor > Tipus Proveïdor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Títol d'adreça obligatori.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccioneu l'any fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fosa
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Attendance,Attendance Date,Assistència Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Address,Preferred Shipping Address,Adreça d'enviament preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Magatzem Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Data de publicació
 DocType: Item,Valuation Method,Mètode de Valoració
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},No es pot trobar el tipus de canvi per a {0} a {1}
 DocType: Sales Invoice,Sales Team,Equip de vendes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada duplicada
 DocType: Serial No,Under Warranty,Sota Garantia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules seran visibles un cop que es guarda la comanda de vendes.
 ,Employee Birthday,Aniversari d'Empleat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de sèrie {0} no existeix
 DocType: Pricing Rule,Discount Percentage,%Descompte
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordres
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordres
 DocType: Leave Control Panel,Employee Type,Tipus d'ocupació
 DocType: Employee Leave Approver,Leave Approver,Aprovador d'absències
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcat
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferit per a la Fabricació
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuari amb rol de ""Aprovador de despeses"""
 ,Issued Items Against Production Order,Articles emesa contra ordre de producció
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Període invàlid
 DocType: Customer,Credit Limit,Límit de Crèdit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccioneu el tipus de transacció
 DocType: GL Entry,Voucher No,Número de comprovant
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,Direcció i Contacte
 DocType: Customer,Last Day of the Next Month,Últim dia del mes
 DocType: Employee,Feedback,Resposta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Horari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mecanitzat per raig abrasiu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Horari
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
-DocType: Website Settings,Website Settings,Configuració del lloc web
 DocType: Item,Reorder level based on Warehouse,Nivell de comanda basat en Magatzem
 DocType: Activity Cost,Billing Rate,Taxa de facturació
 ,Qty to Deliver,Quantitat a lliurar
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Compte root no es pot esborrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Compte root no es pot esborrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Imatges d'entrades
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar Direccions
 DocType: Pricing Rule,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
-DocType: Communication,Phone,Telèfon
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Tancament (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Tancament (Dr)
 DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,Quantitat facturada
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtenir actualitzacions
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Afegir uns registres d&#39;exemple
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Afegir uns registres d&#39;exemple
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixa Gestió
-DocType: Event,Groups,Grups
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
 DocType: Lead,Lower Income,Lower Income
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajuda Ràpida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
 DocType: Features Setup,Sales Extras,Extres de venda
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} pressupost per al compte {1} contra Centre de Cost {2} superarà per {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 ,Qty to Receive,Quantitat a Rebre
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversió no pot estar en fraccions
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,El utilitzarà per iniciar sessió
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,El utilitzarà per iniciar sessió
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tots els tipus de proveïdors
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cita {0} no del tipus {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Overdraft Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Feu nòmina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstecs Garantits
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productes impressionants
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo inicial Equitat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,No es pot aprovar l'absència perquè no estàs autoritzat per aprovar-les en dates bloquejades
 DocType: Appraisal,Appraisal,Avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fosa a l&#39;escuma perduda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibuix
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora d'inici
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Article Naming Per
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Des de l'oferta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Des de l'oferta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Una altra entrada Període de Tancament {0} s'ha fet després de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferit per a la Fabricació
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,{0} no existeix Compte
 DocType: Purchase Receipt Item,Purchase Order Item No,Ordre de Compra No. l'article
-DocType: System Settings,System Settings,Configuració del sistema
 DocType: Project,Project Type,Tipus de Projecte
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Tan quantitat destí com Quantitat són obligatoris.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Cost de diverses activitats
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectiu disponible
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Els meus enviaments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Els meus enviaments
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
 DocType: Supplier,Supplier Details,Detalls del proveïdor
-DocType: Communication,Recipients,Destinataris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Cargolar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleccioneu el compte bancari
 DocType: Newsletter,Create and Send Newsletters,Crear i enviar butlletins de notícies
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir de la data ha de ser abans Per Data
 DocType: Sales Order,Recurring Order,Ordre Recurrent
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
 DocType: Item Group,Check this if you want to show in website,Seleccioneu aquesta opció si voleu que aparegui en el lloc web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Benvingut a ERPNext
+,Welcome to ERPNext,Benvingut a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,El plom a la Petició
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Trucades
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Trucades
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
 ,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,Data d'obertura
 DocType: Journal Entry,Remark,Observació
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Avorrit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,A partir d'ordres de venda
-DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,No Anunciat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Encara no hi ha contactes.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No actiu
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 DocType: Time Log,Batched for Billing,Agrupat per a la Facturació
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Quantitat de Descompte
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"per exemple, l'IVA"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formant gas de metall calent
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Anar al grup apropiat (en general Font dels fons&gt; Passius Corrents&gt; Impostos i drets i crear un nou compte (fent clic a Afegeix nen) de tipus &quot;impostos&quot; i fer parlar de la taxa d&#39;impostos.
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Tall per làser
-DocType: Event,Monday,Dilluns
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Account,Payable,Pagador
 DocType: Salary Slip,Arrear Amount,Arrear Amount
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,Descripció de direcció
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
-DocType: Page,All,Tots
 DocType: Stock Entry Detail,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
 DocType: Employee,Confirmation Date,Data de confirmació
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,Usuari de vendes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Quantitat mínima no pot ser major que Quantitat màxima
 DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Setembre
 DocType: Lead,Lead Owner,Responsable del client potencial
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Es requereix Magatzem
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Es requereix Magatzem
 DocType: Employee,Marital Status,Estat Civil
 DocType: Stock Settings,Auto Material Request,Sol·licitud de material automàtica
 DocType: Time Log,Will be updated when billed.,S'actualitzarà quan es facturi.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article de l'ordre de compra Subministrat
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Caps de lletres per a les plantilles d'impressió.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registre de totes les comunicacions de tipus de correu electrònic, telèfon, xat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Si us plau, Ronda Off de centres de cost en l&#39;empresa"
 DocType: Purchase Invoice,Terms,Condicions
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Crear nou
 DocType: Buying Settings,Purchase Order Required,Ordre de Compra Obligatori
 ,Item-wise Sales History,Història Sales Item-savi
 DocType: Expense Claim,Total Sanctioned Amount,Suma total Sancionat
 ,Purchase Analytics,Anàlisi de Compres
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
 DocType: Expense Claim,Task,Tasca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitat
 DocType: Purchase Taxes and Charges,Reference Row #,Referència Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Es tracta d'una persona de les vendes de l'arrel i no es pot editar.
 ,Stock Ledger,Ledger Stock
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Qualificació: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Qualificació: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducció de la fulla de nòmina
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccioneu un node de grup primer.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propòsit ha de ser un de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ompliu el formulari i deseu
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descarrega un informe amb totes les matèries primeres amb el seu estat últim inventari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Davant
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fòrum de la comunitat
 DocType: Leave Application,Leave Balance Before Application,Leave Balance Before Application
 DocType: SMS Center,Send SMS,Enviar SMS
 DocType: Company,Default Letter Head,Per defecte Cap de la lletra
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Això s'utilitza per ajustar la regla en el mòdul HR
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Quantitat per a generar comanda
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunitat perduda
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Els camps de descompte estaran disponible a l'ordre de compra, rebut de compra, factura de compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom del nou compte. Nota: Si us plau no crear comptes de clients i proveïdors
-DocType: Report,Report Type,Tipus d'informe
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregant
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,País savi defecte Plantilles de direcció
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mostrar impostos ruptura
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d&#39;importació i exportació
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Si s'involucra en alguna fabricació. Activa 'es fabrica'
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
 DocType: Serial No,Out of AMC,Fora d'AMC
 DocType: Purchase Order Item,Material Request Detail No,Número de detall de petició de material
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tornejat dur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Feu Manteniment Visita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pagament no es fa en contra de qualsevol referència, fer entrada de diari manualment."
 DocType: Item,Supplier Items,Articles Proveïdor
 DocType: Opportunity,Opportunity Type,Tipus d'Oportunitats
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' es desactiva
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correus electrònics automàtics als Contactes al Presentar les transaccions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,60 +2539,52 @@
  Disponible Quantitat: {4}, Transfer Quantitat: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
 DocType: Purchase Order,Customer Contact Email,Client de correu electrònic de contacte
-DocType: Event,Sunday,Diumenge
 DocType: Sales Team,Contribution (%),Contribució (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: L'entrada de pagament no es crearà perquè no s'ha especificat 'Caixa o compte bancari"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitats
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Afegir usuaris
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Afegir usuaris
 DocType: Pricing Rule,Item Group,Grup d'articles
 DocType: Task,Actual Start Date (via Time Logs),Data d&#39;inici real (a través dels registres de temps)
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
 DocType: Item,Default BOM,BOM predeterminat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Si us plau, torneu a escriure nom de l&#39;empresa per confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Viu total Amt
 DocType: Time Log Batch,Total Hours,Total d'hores
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automòbil
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Es requereix un article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Emmotllament per injecció de metall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de lliurament
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Missatge personalitzat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca d'Inversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fosa de sorra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplàstia
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Hauria d'haver-hi un client potencial amb aquest correu electrònic
 DocType: Stock Entry,From BOM,A partir de la llista de materials
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Bàsic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
 DocType: Salary Structure,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Múltiple Preu Regla existeix amb els mateixos criteris, si us plau resoldre \
  conflicte mitjançant l'assignació de prioritat. Regles Preu: {0}"
 DocType: Account,Bank,Banc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Per Magatzem
 DocType: Employee,Offer Date,Data d'Oferta
 DocType: Hub Settings,Access Token,Token d'accés
@@ -2816,45 +2593,37 @@
 DocType: Item,Is Fixed Asset Item,És la partida de l'actiu fix
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si vostè té formats d'impressió llargs, aquesta característica pot ser utilitzada per dividir la pàgina que s'imprimirà en diverses pàgines amb tots els encapçalaments i peus de pàgina en cada pàgina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Any
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
 DocType: Product Bundle Item,Product Bundle Item,Producte Bundle article
 DocType: Sales Partner,Sales Partner Name,Nom del revenedor
 DocType: Purchase Invoice Item,Image View,Veure imatges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabat i acabat industrial
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Des i Fins a la data sol·licitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,L&#39;emmotllament per bufat
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
 DocType: Tax Rule,Shipping City,Enviaments City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
 DocType: Account,Purchase User,Usuari de compres
 DocType: Notification Control,Customize the Notification,Personalitza la Notificació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martelleig
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
 DocType: Quotation,Maintenance Manager,Gerent de Manteniment
-DocType: Workflow State,Search,cerca
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,El total no pot ser zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dies Des de la Darrera Comanda' ha de ser més gran que o igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificada Des de
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matèria Primera
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cal la Quantitat destí i la origen
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Seleccioneu Data de comptabilització primer
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
 DocType: Leave Control Panel,Carry Forward,Portar endavant
@@ -2863,45 +2632,44 @@
 ,Produced,Produït
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Afegir capçalera de carta
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Afegir capçalera de carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 DocType: Journal Entry,Bank Entry,Entrada Banc
 DocType: Authorization Rule,Applicable To (Designation),Aplicable a (Designació)
-DocType: Blog Post,Blog Post,Post Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar per
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activar / desactivar les divises.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despeses postals
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Purchase Order,The date on which recurring order will be stop,La data en què s'aturarà la comanda recurrent
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} ha de ser reduït per {1} o s'ha d'augmentar la tolerància de desbordament
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Present total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferència de material a proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferència de material a proveïdor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotització
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tots aquests elements ja s'han facturat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions d'enviament
 DocType: BOM Replace Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 DocType: Features Setup,Point of Sale,Punt de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impost
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinació
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},La fila {0}: {1} no és vàlida per {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Producte
 DocType: Production Planning Tool,Production Planning Tool,Eina de Planificació de la producció
 DocType: Quality Inspection,Report Date,Data de l'informe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminament
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ja assignat per Empleat {1} per al període {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinataris
 DocType: Features Setup,Item Groups in Details,Els grups d'articles en detalls
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
@@ -2910,33 +2678,29 @@
 DocType: Stock Entry,Update Rate and Availability,Actualització de tarifes i disponibilitat
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentatge que se li permet rebre o lliurar més en contra de la quantitat demanada. Per exemple: Si vostè ha demanat 100 unitats. i el subsidi és de 10%, llavors se li permet rebre 110 unitats."
 DocType: Pricing Rule,Customer Group,Grup de Clients
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: Item,Website Description,Descripció del lloc web
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
 ,Sales Register,Registre de vendes
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
 DocType: Address,Plant,Planta
-DocType: DocType,Setup,Ajustos
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resum per a aquest mes i activitats pendents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminació en fred
 DocType: Customer Group,Customer Group Name,Nom del grup al Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Item,Attributes,Atributs
-DocType: Packing Slip,Get Items,Obtenir elements
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Si us plau indica el Compte d'annotació
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Darrera Data de comanda
-DocType: DocField,Image,Imatge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Feu Factura impostos especials
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
-DocType: Communication,Other,Un altre
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operació no estableix
 DocType: Production Order,Planned Start Date,Data d'inici prevista
 DocType: Serial No,Creation Document Type,Creació de tipus de document
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,És convertirà en efectiu
 DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Payment Tool,Make Journal Entry,Feu entrada de diari
@@ -2944,35 +2708,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 DocType: Cost Center,Distribution Id,ID de Distribució
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serveis impressionants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tots els Productes o Serveis.
 DocType: Purchase Invoice,Supplier Address,Adreça del Proveïdor
-DocType: Contact Us Settings,Address Line 2,Adreça Línia 2
-DocType: ToDo,Reference,referència
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforat
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sèries és obligatori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serveis Financers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3}
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
 DocType: Leave Allocation,Unused leaves,Fulles no utilitzades
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Per defecte Comptes per cobrar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estat de facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminació
 DocType: Item Reorder,Transfer,Transferència
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterització
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Supplier,Contact HTML,Contacte HTML
@@ -2983,9 +2741,8 @@
 DocType: Company,Retail,Venda al detall
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
-DocType: Product Bundle,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aclaparadora
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
 DocType: GL Entry,Remarks,Observacions
@@ -2993,48 +2750,44 @@
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 DocType: Features Setup,POS View,POS Veure
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,La colada contínua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Si us plau, especifiqueu un"
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Per sobre de
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionament Freda
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,El Compte {0} no pot ser un grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regió
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
 DocType: Holiday List,Weekly Off,Setmanal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Compte de guanys / pèrdues provisional (Crèdit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorn Contra Vendes Factura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Tema 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Si us plau, estableix el valor per defecte {0} a l'empresa {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Si us plau, estableix el valor per defecte {0} a l'empresa {1}"
 DocType: Serial No,Creation Time,Hora de creació
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingressos totals
 DocType: Sales Invoice,Product Bundle Help,Producte Bundle Ajuda
 ,Monthly Attendance Sheet,Full d'Assistència Mensual
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No s'ha trobat registre
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtenir elements del paquet del producte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Compte {0} està inactiu
 DocType: GL Entry,Is Advance,És Avanç
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Assistència Des de la data i Assistència a la data és obligatori
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Si us plau, introdueixi 'subcontractació' com Sí o No"
 DocType: Sales Team,Contact No.,Número de Contacte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pèrdues i Guanys"" tipus de compte {0} no es permet l'entrada amb obertura"
-DocType: Workflow State,Time,temps
 DocType: Features Setup,Sales Discounts,Descomptes de venda
 DocType: Hub Settings,Seller Country,Venedor País
 DocType: Authorization Rule,Authorization Rule,Regla d'Autorització
 DocType: Sales Invoice,Terms and Conditions Details,Termes i Condicions Detalls
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número d'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que apareixerà a la part superior de la llista de productes.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especifica les condicions d'enviament per calcular l'import del transport
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Afegir Nen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Paper deixa forjar congelats Comptes i editar les entrades congelades
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No es pot convertir de centres de cost per al llibre major, ja que té nodes secundaris"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Es requereix el factor de conversió
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissió de Vendes
 DocType: Offer Letter Term,Value / Description,Valor / Descripció
@@ -3042,17 +2795,15 @@
 ,Customers Not Buying Since Long Time,Els clients no comprar des de fa molt temps
 DocType: Production Order,Expected Delivery Date,Data de lliurament esperada
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Voluminós
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatiu-model de fosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Despeses d'Entreteniment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edat
 DocType: Time Log,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Despeses legals
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El dia del mes en el qual l'ordre automàtic es generarà per exemple 05, 28, etc. "
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El dia del mes en el qual l'ordre automàtic es generarà per exemple 05, 28, etc."
 DocType: Sales Invoice,Posting Time,Temps d'enviament
 DocType: Sales Order,% Amount Billed,% Import Facturat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Despeses telefòniques
@@ -3064,26 +2815,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nous ingressos al Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despeses de viatge
 DocType: Maintenance Visit,Breakdown,Breakdown
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Com en la data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Esmolant
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
-DocType: Feed,Full Name,Nom complet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Reblat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probation
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,El magatzem predeterminat és obligatòria pels articles d'estoc
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},El pagament del salari corresponent al mes {0} i {1} anys
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
 ,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificació
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Fer un registre de temps
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emès
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Venem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Identificador de Proveïdor
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
@@ -3092,18 +2840,16 @@
 DocType: Brand,Item Manager,Administració d&#39;elements
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Afegir files per establir els pressupostos anuals de Comptes.
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracció
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tots els contactes.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de l'empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de l'empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vostè segueix la inspecció de qualitat. Permet article QA Obligatori i QA No en rebut de compra
 DocType: GL Entry,Party Type,Tipus Partit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El modelo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Salary template master.
 DocType: Leave Type,Max Days Leave Allowed,Màxim de dies d'absència permesos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Estableixi la regla fiscal de carret de la compra
@@ -3117,15 +2863,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretari
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registres d'empleats a ser creats per
@@ -3138,24 +2884,21 @@
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
 DocType: Purchase Order Item,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planxat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} està aturat
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
 DocType: Lead,Add to calendar on this date,Afegir al calendari en aquesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pròxims esdeveniments
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Es requereix client
-DocType: Letter Head,Letter Head,Capçalera de la carta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada ràpida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per a la Tornada
 DocType: Purchase Order,To Receive,Rebre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingressos / despeses
 DocType: Employee,Personal Email,Email Personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variància total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variància total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si està activat, el sistema comptabilitza els assentaments comptables per a l'inventari automàticament."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Corretatge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretatge
 DocType: Address,Postal Code,Codi Postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
@@ -3163,18 +2906,16 @@
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comandes llançades per a la producció.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Hub Settings,Name Token,Nom Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Raspallat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Si us plau ingressi Unitat de mesura per defecte
 DocType: Purchase Invoice Item,Project Name,Nom del projecte
 DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
-DocType: Workflow State,Edit,Edita
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
 DocType: Features Setup,Item Batch Nos,Números de Lot d'articles
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
@@ -3182,13 +2923,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Actius per impostos
 DocType: BOM Item,BOM No,No BOM
-DocType: Contact Us Settings,Pincode,Codi PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nou Stock UOM ha de ser diferent de l'actual de les accions UOM
 DocType: Account,Debit,Dèbit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les fulles han de ser assignats en múltiples de 0,5"
 DocType: Production Order,Operation Cost,Cost d'operació
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Puja l'assistència d'un arxiu .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Excel·lent Amt
@@ -3204,10 +2943,7 @@
 DocType: Project,Default Cost Center,Centre de cost predeterminat
 DocType: Purchase Invoice,End Date,Data de finalització
 DocType: Employee,Internal Work History,Historial de treball intern
-DocType: DocField,Column Break,Salt de columna
-DocType: Event,Thursday,Dijous
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tornejat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
 DocType: Sales Invoice,Exhibition,Exposició
@@ -3220,31 +2956,30 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Element Producció
 ,Employee Information,Informació de l'empleat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarifa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Tarifa (%)
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de finalització de l'exercici fiscal
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Can not filter based on Voucher No, if grouped by Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduir el guany per absències sense sou (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,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/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resum de la setmana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ha de ser un article de compra o de subcontractació a la fila {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
 DocType: GL Entry,Party,Party
 DocType: Sales Order,Delivery Date,Data De Lliurament
-DocType: DocField,Currency,Moneda
 DocType: Opportunity,Opportunity Date,Data oportunitat
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorn Contra Compra Rebut
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Treball a preu fet
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
@@ -3261,77 +2996,68 @@
 DocType: Opportunity,To Discuss,Per Discutir
 DocType: SMS Settings,SMS Settings,Ajustaments de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de finalització del període de l'ordre actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Fer una Oferta Carta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorn
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
-DocType: DocField,Fold,fold
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unitat de mesura per defecte per a la variant ha de ser la mateixa que la plantilla
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
 DocType: Project Task,Pending Review,Pendent de Revisió
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Si us plau, especifiqui"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del client
-DocType: Page,Page Name,Nom de pàgina
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per Temps ha de ser més gran que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabat cargol
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","per exemple ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","per exemple ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
-DocType: System Settings,Time Zone,Fus horari
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,El magatzem {0} no existeix
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapat
 DocType: Customer,Customer Details,Dades del client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introdueix els paràmetres URL per als receptors
 DocType: Sales Invoice,Paid Amount,Quantitat pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',El Compte de tancament {0} ha de ser del tipus 'responsabilitat'
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestió de la Qualitat
 DocType: Production Planning Tool,Filter based on customer,Filtre basat en el client
 DocType: Payment Tool Detail,Against Voucher No,Contra el comprovant número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Saldo Quantitat
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Saldo Quantitat
 DocType: Item Group,Parent Item Group,Grup d'articles pare
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centres de costos
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Magatzems.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Magatzems.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Equivalència a la qual la divisa del proveïdor es converteixen a la moneda base de la companyia
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictes Timings amb fila {1}
 DocType: Opportunity,Next Contact,Següent Contacte
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
 DocType: Employee,Notice (days),Avís (dies)
-DocType: Page,Yes,Sí
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
 DocType: Employee,Encashment Date,Data Cobrament
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra val Type ha de ser un ordre de compra, factura de compra o entrada de diari"
 DocType: Account,Stock Adjustment,Ajust d'estoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Hi Cost per defecte per al tipus d&#39;activitat Activitat - {0}
 DocType: Production Order,Planned Operating Cost,Planejat Cost de funcionament
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nou {0} Nom
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Troba adjunt {0} #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Troba adjunt {0} #{1}
 DocType: Job Applicant,Applicant Name,Nom del sol·licitant
 DocType: Authorization Rule,Customer / Item Name,Client / Nom de l'article
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3344,7 +3070,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Nombre de sèrie és obligatòria per Punt {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Si us plau, especifiqui des de / fins oscil·lar"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creat per
 DocType: Serial No,Under AMC,Sota AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La taxa de valorització de l'article es torna a calcular tenint en compte landed cost voucher amount
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Ajustos predeterminats per a les transaccions de venda
@@ -3356,17 +3081,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Quantitat mínima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualitzar Productes Acabats
 DocType: Workstation,per hour,per hores
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},La sèrie {0} ja s'utilitza a {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Quantitat pagada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 DocType: Customer,Default Taxes and Charges,Impostos i Càrrecs per defecte
 DocType: Account,Receivable,Compte per cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
 DocType: Sales Invoice,Supplier Reference,Referència Proveïdor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material."
@@ -3374,8 +3098,8 @@
 DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabó i Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
@@ -3384,7 +3108,6 @@
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta Empresa als magatzems {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitat de susbtitució de les UDM de l'estoc
 DocType: POS Profile,Terms and Conditions,Condicions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Per a la data ha d'estar dins de l'any fiscal. Suposant Per Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí pot actualitzar l'alçada, el pes, al·lèrgies, problemes mèdics, etc."
@@ -3396,7 +3119,7 @@
 DocType: Sales Order Item,For Production,Per Producció
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Introduïu l'ordre de venda a la taula anterior
 DocType: Project Task,View Task,Vista de tasques
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El seu exercici comença el
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,El seu exercici comença el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Si us plau ingressi rebuts de compra
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
@@ -3404,20 +3127,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuració del servidor d'entrada per l'id de suport per correu electrònic. (Per exemple support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Salary Slip,Salary Slip,Slip Salari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunyit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Per Dóna't' es requereix
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Per Dóna't' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
 DocType: Sales Invoice Item,Sales Order Item,Sol·licitar Sales Item
 DocType: Salary Slip,Payment Days,Dies de pagament
 DocType: BOM,Manage cost of operations,Administrar cost de les operacions
 DocType: Features Setup,Item Advanced,Article Avançat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminació en calent
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
 DocType: Employee Education,Employee Education,Formació Empleat
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -3426,35 +3147,28 @@
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Els possibles oportunitats de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},No vàlida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Baixa per malaltia
 DocType: Email Digest,Email Digest,Butlletí per correu electrònic
 DocType: Delivery Note,Billing Address Name,Nom de l'adressa de facturació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grans Magatzems
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balanç de Sistema
-DocType: Workflow,Is Active,Està actiu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Balanç de Sistema
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbatge
 DocType: Company,Change Abbreviation,Canvi Abreviatura
-DocType: Workflow State,Primary,Primari
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
 DocType: Item,Max Discount (%),Descompte màxim (%)
-DocType: Communication,More Information,Més informació
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Darrera Quantitat de l'ordre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoració Article actualitzat
 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: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Order,Raw Materials Supplied,Matèries primeres subministrades
 DocType: Purchase Invoice,Recurring Print Format,Recurrent Format d&#39;impressió
-DocType: Communication,Series,Sèrie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data prevista de lliurament no pot ser anterior a l'Ordre de Compra
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
-DocType: Communication,Email,Correu electrònic
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Període
 ,General Ledger,Comptabilitat General
@@ -3464,9 +3178,7 @@
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Seleccioneu {0} primer
 DocType: Features Setup,To get Item Group in details table,Per obtenir Grup d'articles a la taula detalls
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibuixar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Aiguafort
 DocType: Sales Invoice,Commission,Comissió
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3492,7 +3204,7 @@
  {% if email_ID%} email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Default Amount
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Magatzem no trobat al sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magatzem no trobat al sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resum d&#39;aquest Mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
@@ -3511,13 +3223,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Payment Tool,Get Outstanding Vouchers,Get Outstanding Vouchers
 DocType: Warranty Claim,Resolved By,Resolta Per
 DocType: Appraisal,Start Date,Data De Inici
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Fes clic aquí per verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
@@ -3527,55 +3238,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
 DocType: Time Log,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodant
-DocType: ToDo,Priority,Prioritat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Allowed
-DocType: Dropbox Backup,Weekly,Setmanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Rebre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Rebre
 DocType: Maintenance Visit,Fully Completed,Totalment Acabat
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complet
 DocType: Employee,Educational Qualification,Capacitació per a l'Educació
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha estat afegit amb èxit al llistat de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanitzat per feix d&#39;electrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes principals
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldos d'entrades de moviments d'estocs actualitzats
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes principals
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Afegeix / Edita Preus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Gràfic de centres de cost
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Les meves comandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Les meves comandes
 DocType: Price List,Price List Name,nom de la llista de preus
 DocType: Time Log,For Manufacturing,Per Manufactura
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Fabricació
 ,Ordered Items To Be Delivered,Els articles demanats per ser lliurats
 DocType: Account,Income,Ingressos
-,Setup Wizard,Assistent de configuració
 DocType: Industry Type,Industry Type,Tipus d'Indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelcom ha fallat!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fosa a pressió
-DocType: Email Alert,Reference Date,Data de Referència
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entra números de mòbil vàlids
 DocType: Budget Detail,Budget Detail,Detall del Pressupost
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Si us plau, escriviu el missatge abans d'enviar-"
-DocType: Async Task,Status,Estat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Estoc UOM actualitza per al punt {0}
-DocType: Company History,Year,Any
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punt de Venda Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Actualitza Ajustaments SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Hora de registre {0} ja facturat
@@ -3588,55 +3287,52 @@
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
 DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleat no es pot canviar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Permissió de superació {0} superat per l'article {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Els seus Proveïdors
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Els seus Proveïdors
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Una altra estructura salarial {0} està activa per l'empleat {1}. Si us plau, passeu el seu estat a 'inactiu' per seguir."
 DocType: Purchase Invoice,Contact,Contacte
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Rebut des
 DocType: Features Setup,Exports,Exportacions
 DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Des {0} de {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 DocType: Issue,Content Type,Tipus de Contingut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ordinador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Aconsegueix entrades no reconciliades
 DocType: Cost Center,Budgets,Pressupostos
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualitzat
 DocType: Employee,Emergency Contact Details,Detalls de Contacte d'Emergència
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Què fa?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Què fa?
 DocType: Delivery Note,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Compte {0} s'ha introduït més d'una vegada per a l'any fiscal {1}
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualització dels costos addicionals per al càlcul del preu al desembarcament d'articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elèctric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID d'usuari no entrat per l'Empleat {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclam de garantia
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatori d'aniversari per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Polit
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dies des de l'última comanda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dies des de l'última comanda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
-DocType: User,Enabled,Activat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Realment vols presentar totes les nòmines del mes {0} i any {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Els subscriptors d&#39;importació
@@ -3644,19 +3340,18 @@
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
 DocType: Authorization Rule,Based On,Basat en
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Període Des i Període Per dates obligatòries per als recurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitat del projecte / tasca.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar Salari Slips
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no és un correu electrònicvàlid
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
-DocType: ToDo,Low,Sota
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filat
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
@@ -3678,7 +3373,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Cal un nom de Campanya
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Receipt Item,Rejected Serial No,Número de sèrie Rebutjat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embotició profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nou Butlletí
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostra Equilibri
@@ -3689,7 +3383,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Reblat
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
 ,Sales Analytics,Analytics de venda
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustaments de Manufactura
@@ -3701,28 +3394,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nou Nom de compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servei Al Client
 DocType: Item,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirma teu email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Demana el correu electrònic al Presentar
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de fulles assignats més de dia en el període
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions comptables.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} és necessari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Emmotllament per buit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista no pot ser anterior material Data de sol·licitud
-DocType: Contact Us Settings,City,Ciutat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanitzat per ultrasons
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No és un document d&#39;identitat vàlid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'Article {0} ha de ser un article de Vendes
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
 DocType: Account,Equity,Equitat
 DocType: Sales Order,Printing Details,Impressió Detalls
 DocType: Task,Closing Date,Data de tancament
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Enginyer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
 DocType: Sales Partner,Partner Type,Tipus de Partner
@@ -3730,7 +3419,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descompte
 DocType: Purchase Invoice,Against Expense Account,Contra el Compte de Despeses
 DocType: Production Order,Production Order,Ordre de Producció
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La Nota d'Instal·lació {0} ja s'ha presentat
 DocType: Quotation Item,Against Docname,Contra DocName
 DocType: SMS Center,All Employee (Active),Tot Empleat (Actiu)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Veure ara
@@ -3738,26 +3427,24 @@
 DocType: BOM,Raw Material Cost,Matèria primera Cost
 DocType: Item,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sèries Actualitzat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipus d'informe és obligatori
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,La Primera Usuari:
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,La Primera Usuari:
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliats amb èxit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliats amb èxit
 DocType: Production Order,Planned End Date,Planejat Data de finalització
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Tax Rule,Validity,Validesa
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Quantitat facturada
 DocType: Attendance,Attendance,Assistència
-DocType: Page,No,No
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
@@ -3765,55 +3452,46 @@
 ,Item Prices,Preus de l'article
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En paraules seran visibles un cop que es guardi l'ordre de compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Comprovant de tancament de període
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Màster Llista de Preus.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Màster Llista de Preus.
 DocType: Task,Review Date,Data de revisió
 DocType: Purchase Invoice,Advance Payments,Pagaments avançats
-DocType: DocPerm,Level,Nivell
 DocType: Purchase Taxes and Charges,On Net Total,En total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mòlta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No té permís per utilitzar l'eina de Pagament
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
 DocType: Company,Round Off Account,Per arrodonir el compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Rosegant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despeses d'Administració
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Pares Grup de Clients
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","per exemple ""El meu Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Període de Notificació
 DocType: Bank Reconciliation Detail,Voucher ID,Val ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 DocType: Packing Slip,Gross Weight UOM,Pes brut UDM
 DocType: Email Digest,Receivables / Payables,Cobrar / pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valors zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantitat de punt obtingut després de la fabricació / reempaque de determinades quantitats de matèries primeres
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte de cobrament / pagament
 DocType: Delivery Note Item,Against Sales Order Item,Contra l'Ordre de Venda d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 DocType: Task,Actual End Date (via Time Logs),Actual Data de finalització (a través dels registres de temps)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares"
 DocType: Delivery Note,Print Without Amount,Imprimir Sense Monto
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
-DocType: User,Last Name,Cognoms
-DocType: Web Page,Left,Esquerra
-DocType: Event,All Day,Tot el dia
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
 DocType: Issue,Support Team,Equip de suport
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
-DocType: Contact Us Settings,State,Estat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilibri
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilibri
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
-DocType: User,Gender,Gènere
 DocType: Journal Entry,Debit Note,Nota de Dèbit
 DocType: Stock Entry,As per Stock UOM,Segons Stock UDM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirat
@@ -3827,44 +3505,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear regles per restringir les transaccions basades en valors.
 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"
 DocType: Purchase Invoice,Total Advance,Avanç total
-DocType: Workflow State,User,Usuari
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processament de Nòmina
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establir com a Perdut
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagament de rebuts Nota
 DocType: Customer,Credit Days Based On,Dies crèdit basat en
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenir la mateixa tarifa durant tot el cicle de vendes
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planegi registres de temps fora de les hores de treball Estació de treball.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ja s'ha presentat
 ,Items To Be Requested,Articles que s'han de demanar
-DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturació Tarifa basada en Tipus d&#39;activitat (per hora)
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","ID de correu electrònic de l'empresa no trobat, per tant, no s'ha enviat el correu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 DocType: Production Planning Tool,Filter based on item,Filtre basada en l'apartat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte Dèbit
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
 DocType: Purchase Common,Purchase Common,Purchase Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Oportunitat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supressió
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficis als empleats
 DocType: Sales Invoice,Is POS,És TPV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures enviades als clients.
-DocType: DocField,Default,Defecte
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificació del projecte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonats afegir
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir Pressupost per a aquest centre de cost. Per configurar l&#39;acció de pressupost, vegeu &quot;Llista de l&#39;Empresa&quot;"
@@ -3875,70 +3549,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Expense Claim,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","En seleccionar ""Sí"" li donarà una identitat única a cada entitat d'aquest article que es pot veure a la taula mestre de Números de sèrie"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
 DocType: Employee,Education,Educació
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
 DocType: Address,Office,Oficina
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes estàndard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Seleccioneu Employee Record primer.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per crear un compte d'impostos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Si us plau ingressi Compte de Despeses
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventari de lots
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventari de lots
 DocType: Employee,Contract End Date,Data de finalització de contracte
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Ordres de venda i halar (pendent d'entregar) basat en els criteris anteriors
-DocType: DocShare,Document Type,Tipus de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Oferta de Proveïdor
 DocType: Deduction Type,Deduction Type,Tipus Deducció
 DocType: Attendance,Half Day,Medi Dia
 DocType: Pricing Rule,Min Qty,Quantitat mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Per realitzar un seguiment d&#39;articles en vendes i documents de compra amb els números de lot. &quot;Indústria Preferida: Químics&quot;
 DocType: GL Entry,Transaction Date,Data de Transacció
 DocType: Production Plan Item,Planned Qty,Planificada Quantitat
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impost Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impost Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per Quantitat (Fabricat Quantitat) és obligatori
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de fulles assignats més de període
 DocType: Production Order,Actual Start Date,Data d'inici real
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materials lliurats d'aquesta Ordre de Venda
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Desa el Moviment d'article
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Llista de subscriptors al butlletí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
-DocType: Email Account,Service,Servei
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 ,Monthly Salary Register,Registre de Salari mensual
-apps/frappe/frappe/website/template.py +140,Next,Següent
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
 DocType: BOM Operation,BOM Operation,BOM Operació
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropolit
 DocType: Purchase Taxes and Charges,On Previous Row Amount,A limport de la fila anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Si us plau, introduïu la suma del pagament en almenys una fila"
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Quantitat de pagament no pot ser superior a quantitat lliurada
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total no pagat
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagat
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registre d'hores no facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salari net no pot ser negatiu
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Introduïu manualment la partida dels comprovants
 DocType: SMS Settings,Static Parameters,Paràmetres estàtics
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
@@ -3947,14 +3614,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceig
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
 DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Entra les taxes i càrrecs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Conreu
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
 DocType: Hub Settings,Seller Name,Nom del venedor
@@ -3964,47 +3629,44 @@
 DocType: Stock Entry,Repack,Torneu a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Has de desar el formulari abans de continuar
 DocType: Item Attribute,Numeric Values,Els valors numèrics
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Adjuntar Logo
 DocType: Customer,Commission Rate,Percentatge de comissió
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,El carret està buit
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root no es pot editar.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Suma assignat no pot superar l'import a unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root no es pot editar.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Suma assignat no pot superar l'import a unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Permetre Producció en Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Data de l'ordre de compra del client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Seleccioneu un arxiu csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Enviar còpies de seguretat de Dropbox
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dissenyador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creació automàtica de sol·licitud de materials si la quantitat és inferior a aquest nivell
 ,Item-wise Purchase Register,Registre de compra d'articles
 DocType: Batch,Expiry Date,Data De Caducitat
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per establir el nivell de comanda, article ha de ser un article de compra o fabricació d&#39;articles"
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projecte mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Llista de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificacions a
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: Expense Claim Detail,Sanctioned Amount,Sanctioned Amount
 DocType: GL Entry,Is Opening,Està obrint
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,El compte {0} no existeix
 DocType: Account,Cash,Efectiu
 DocType: Employee,Short biography for website and other publications.,Breu biografia de la pàgina web i altres publicacions.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Si us plau, creu Estructura salarial per als empleats {0}"

diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 419cb24..976485a 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv

@@ -1,34 +1,31 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozornění: Stejné položky byl zadán vícekrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Spotřební zboží
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party první"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žíhání
 DocType: Item,Customer Items,Zákazník položky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mailová upozornění
 DocType: Item,Default Unit of Measure,Výchozí Měrná jednotka
 DocType: SMS Center,All Sales Partner Contact,Všechny Partneři Kontakt
-DocType: Employee,Leave Approvers,Nechte schvalovatelů
+DocType: Employee,Leave Approvers,Schvalovatelé dovolených
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
-DocType: About Us Settings,Website,Stránky
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňování a spékání
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Právní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Aktuální typ daň nemůže být zahrnutý v ceně Položka v řádku {0}
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šití
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobrazit Varianty
-DocType: Sales Invoice Item,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Proveďte nové POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zpoždění s platbou (dny)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek č. {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek č. {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Zpracování dřeva
 DocType: Production Order Operation,Work In Progress,Work in Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tisk
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Účetní
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Účetní
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Company,Phone No,Telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribut Hodnota {0} nemůže být odstraněn z {1} jako položka Varianty \ existovat tohoto atributu.
-DocType: Print Settings,Classic,Klasické
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
 DocType: Bin,Quantity Requested for Purchase,Požadovaného množství na nákup
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Přírůstek
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Není dovoleno {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
@@ -124,44 +119,39 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,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: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutečná Provozní doba
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodinová sazba / 60) * Skutečná doba aktivity
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
-DocType: Blog Post,Guest,Host
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je povinné
 DocType: Stock Entry,Additional Costs,Dodatečné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
-DocType: Standard Reply,Owner,Majitel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Vystružování
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nemovitost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roční Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Roční Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnací
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lití
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána
 DocType: Lead,Request Type,Typ požadavku
 DocType: Leave Application,Reason,Důvod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Provedení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Provedení
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Položky a Ceny
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sleva na Ceník Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Křestní jméno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Lití Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmínky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankovní účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
 DocType: Selling Settings,Default Territory,Výchozí Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozsekne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelná
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Přijaté On
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Prosím, zadejte společnost"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkem Odběratelé
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Jméno
+,Contact Name,Kontakt Jméno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bydlení
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Dovolených za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Naming Série
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
-DocType: Bulk Email,Message,Zpráva
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Lead,Do Not Contact,Nekontaktujte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v &quot;suroviny dodané&quot; tabulky v objednávce {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire kartáčování
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvětově doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Náklady Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znaků
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zvolit jazyk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Zakáže vytváření časových protokolů proti výrobní zakázky. Operace nesmějí být sledována proti výrobní zakázky
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Položka {0} musí být Service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
-DocType: DocType,Administrator,Správce
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserové vrtání
-DocType: Stock UOM Replace Utility,New Stock UOM,Nových akcií UOM
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenční Chyba
-DocType: Communication,Closed,Zavřeno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Zúžení
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Více měn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Položka je aktualizována
-DocType: Async Task,System Manager,Správce systému
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dodací list
-DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavení Daně
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -330,40 +300,37 @@
 DocType: Employee,Company Email,Společnost E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debetní Částka v měně účtu
 DocType: Shipping Rule,Valid for Countries,"Platí pro země,"
-DocType: Workflow State,Refresh,Obnovit
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Všech souvisejících oblastech, jako je dovozní měně, přepočítací koeficient, dovoz celkem, dovoz celkovém součtu etc jsou k dispozici v dokladu o koupi, dodavatelů nabídky, faktury, objednávky apod"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Tax Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Current Reklamní UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Řezání vodním paprskem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
-DocType: Leave Application,Leave Approver Name,Jméno schvalovatele absence
+DocType: Leave Application,Leave Approver Name,Jméno schvalovatele dovolené
 ,Schedule Date,Plán Datum
 DocType: Packed Item,Packed Item,Zabalená položka
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosím, ne vytvářet účty pro zákazníky a dodavateli. Jsou vytvořeny přímo od zákazníka / dodavatele mistrů."
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Authorization Rule,Approving User  (above authorized value),Schválení uživatele (nad oprávněné hodnoty)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
@@ -380,22 +348,21 @@
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Datum Vehicle
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube navlékání korálků
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Příloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nelze nastavit pro skupinu nákladového střediska
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
 DocType: Purchase Invoice,Yearly,Ročně
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Journal Entry Account,Sales Order,Prodejní objednávky
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodej Rate
 DocType: Purchase Order,Start date of current order's period,Datum období současného objednávky Začátek
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
 DocType: Delivery Note,% Installed,% Instalováno
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastavit sériových čísel na základě FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Tvarování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Kotoučová
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č ' nesmí být menší než ""Od Případu č '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č.' nesmí být menší než ""Od Případu č.'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nezahájeno
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
+DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell lití
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 DocType: Features Setup,Imports,Importy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepení
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Nevyřízené aktivity pro dnešek
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Účast rekord.
 DocType: Bank Reconciliation,Journal Entries,Zápisy do Deníku
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
-DocType: System Settings,Loading...,Nahrávám...
-DocType: DocField,Password,Heslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Nánosový modelování depozice
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Přidat předplatitelé
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
-DocType: Communication,Subject,Předmět
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -469,10 +429,9 @@
 DocType: Purchase Invoice Item,Item,Položka
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM NESMÍ být typu celé číslo
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Správa Subdodávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu společnosti "
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu společnosti"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Položka {0} není Nákup položky
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je neplatná e-mailová adresa v ""Oznámení \
  E-mailová adresa"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Celkem Billing Tento rok:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Celkem Billing Tento rok:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nelze odstranit Pořadové číslo {0}, který se používá na skladě transakcích"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čekající Množství
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorovat
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
 DocType: Pricing Rule,Valid From,Platnost od
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
 
  Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-DocType: About Us Settings,Website Manager,Správce webu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
 DocType: Warranty Claim,Resolution,Řešení
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dodává: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturace a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Předchozí
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
 DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
+DocType: Authorization Rule,Customer or Item,Zákazník nebo položka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Přidělená částka nemůže být záporná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože jste už nějaké transakce (y) s jiným nerozpuštěných. Budete muset vytvořit novou položku použít jiný výchozí UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
-DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Další prodeje osoba {0} existuje se stejným id zaměstnance
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Výchozí kalkulace Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z příjemky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z příjemky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno Na"" a ""Seskupeno Podle"", nemůže být stejné"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno na"" a ""Seskupeno podle"", nemůže být stejné"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec trubice tvořící
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Pevné Dny
 DocType: Sales Invoice,Packing List,Balení Seznam
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publikování
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
 DocType: Company,Round Off Cost Center,Zaokrouhlovací nákladové středisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Nastavení
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Více
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbání
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Purchase Receipt,Other Details,Další podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight stříhání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nepodařilo se najít kurz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
-DocType: Communication,Open,Otevřít
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} není skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
-DocType: Contact Us Settings,Address Title,Označení adresy
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
-DocType: Dropbox Backup,Daily,Denně
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účetní Přihlášky lze proti koncové uzly. Záznamy proti skupinám nejsou povoleny.
-DocType: ToDo,High,Vysoké
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
-DocType: User,Male,Muž
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -689,7 +629,7 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardní daň šablona, která může být použita pro všechny prodejních transakcí. Tato šablona může obsahovat seznam daňových hlav a také další náklady / příjmy hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardní daň šablona, která může být použita pro všechny prodejních transakcí. Tato šablona může obsahovat seznam daňových hlav a také další náklady / příjmy hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
 
  #### Poznámka: 
 
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Osobní
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Náklady Office údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Aktualizace Sklad &#39;nelze zkontrolovat, protože položky nejsou dodány přes {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovat sklad' nemůže být zaškrtnuto, protože položky nejsou dodány přes {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Chcete-li povolit &quot;Point of Sale&quot; představuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
-DocType: Comment,Reference Name,Název reference
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / ztráta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlévání forem
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platební
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažer
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otevření&quot;
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Položka Variant Atribut
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Sázet
 DocType: Item,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Místě prodeje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Báječný
 ,Available Qty,Množství k dispozici
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řady Celkem
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobrazit Odběratelé
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivní tryskání
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musí být aktivní
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
-DocType: Salary Slip,Leave Encashment Amount,Nechte inkasa Částka
+DocType: Salary Slip,Leave Encashment Amount,Částka proplacené dovolené
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 DocType: Bank Reconciliation,Total Amount,Celková částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
-DocType: GL Entry,Account Currency,Měna účtu
+DocType: Bank Reconciliation,Account Currency,Měna účtu
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
@@ -856,67 +790,62 @@
 DocType: Payment Tool,Paid,Placený
 DocType: Salary Slip,Total in words,Celkem slovy
 DocType: Material Request Item,Lead Time Date,Datum a čas Leadu
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,"je povinné. Možná, Směnárna záznam není vytvořena pro"
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,je povinné. Možná chybí záznam směnného kurzu pro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pro &quot;produktem Bundle předměty, sklad, sériové číslo a dávkové No bude považována ze&quot; Balení seznam &#39;tabulky. Pokud Warehouse a Batch No jsou stejné pro všechny balení položky pro jakoukoli &quot;Výrobek balík&quot; položky, tyto hodnoty mohou být zapsány do hlavní tabulky položky, budou hodnoty zkopírovány do &quot;Balení seznam&quot; tabulku."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Zásilky zákazníkům.
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Částka platby = dlužné částky
-DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Odchylka
+,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vybrat položku pro převod
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobrazit seznam všech nápovědy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a měsíc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Přejděte na příslušné skupiny (obvykle využití finančních prostředků&gt; oběžných aktiv&gt; bankovních účtů a vytvořit nový účet (kliknutím na Přidat dítě) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
-DocType: Comment,Unsubscribed,Odhlášen z odběru
 DocType: Opportunity,Walk In,Vejít
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Převedené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bílá
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bílá
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Připojit svůj obrázek
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Připojit svůj obrázek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Dělat
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
-DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Můj košík
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Požadavek na absenci
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nechte přidělení nástroj
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nástroj pro přidělování dovolených
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
 DocType: Company,If Monthly Budget Exceeded (for expense account),Pokud Měsíční rozpočet překročen (pro výdajového účtu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Ořezávání
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Výchozí podmínky
 DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podání
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Company
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 DocType: BOM Operation,Operation,Operace
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Přepravní State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Tvorba přírůstků zásob
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Tvorba přírůstků zásob
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Procento příspěvcích
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,aktualizovat přes čas Záznamy
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
 DocType: Company,Default Currency,Výchozí měna
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
-DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok:
 DocType: Email Digest,Annual Expense,Roční Expense
 DocType: SMS Center,Total Characters,Celkový počet znaků
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Příspěvek%
 DocType: Item,website page link,webové stránky odkaz na stránku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1003,15 +931,13 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otevření účetnictví Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Aktuální datum ukončení"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Řízení
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Řízení
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typy činností pro Time listy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investiční lití
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivní
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modrý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Ceník Země
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} již vytvořili pro uživatele: {1} a společnost {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Vrstvené objektu výrobní
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch tváření
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
 DocType: Holiday,Holiday,Dovolená
-DocType: Event,Saturday,Sobota
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
 ,Daily Time Log Summary,Denní doba prihlásenia - súhrn
-DocType: DocField,Label,Popisek
 DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Položky"" nemůžou být prázdné"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavení Zaměstnanci
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Uveďte prosím alespoň jeden atribut v tabulce atributy
 DocType: Contact,User ID,User ID
-DocType: Communication,Sent,Odesláno
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
-DocType: Communication,Delivery Status,Delivery Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Přímý plechu laserem spékání
 DocType: Purchase Order,Supplied Items,Dodávané položky
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otevření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelená
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Celkem Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
-DocType: Report,Disabled,Vypnuto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
+DocType: Email Digest,Add Quote,Přidat nabídku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaše Produkty nebo Služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Jméno je vyžadováno
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
 DocType: Address,City/Town,Město / Město
 DocType: Email Digest,Annual Income,Roční příjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekávané datum dodání je menší než plánované datum zahájení.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/frappe/frappe/config/desk.py +7,Tools,Nástroje
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby
 DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,Zápis do deníku
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentáře
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
 DocType: Quality Inspection Reading,Reading 8,Čtení 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, můžete měli změnit &quot;Distribuovat poplatků na základě&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,pracovna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte společnost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
 DocType: Salary Slip,Earning,Získávání
 DocType: Payment Tool,Party Account Currency,Party Měna účtu
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Zpravodaje ke kontaktům, vede."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Měna závěrečného účtu, musí být {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
-DocType: DocField,Description,Popis
 DocType: Authorization Rule,Average Discount,Průměrná sleva
-DocType: Letter Head,Is Default,Je Výchozí
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účetnictví
 DocType: Features Setup,Features Setup,Nastavení Funkcí
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,View Nabídka Dopis
-DocType: Communication,Communication,Komunikace
 DocType: Item,Is Service Item,Je Service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1208,14 +1118,14 @@
 DocType: Pricing Rule,Campaign,Kampaň
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Purchase Invoice,Contact Person,Kontaktní osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávaný Datum Začátku"" nemůže být větší než ""Očekávanou Datum Konce"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávané datum započetí"" nemůže být větší než ""Očekávané datum ukončení"""
 DocType: Holiday List,Holidays,Prázdniny
 DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržovat Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativní množství není dovoleno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativní množství není dovoleno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Žádný aktivní Struktura Plat nalezených pro zaměstnance {0} a měsíc
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vykupujeme tuto položku
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vykupujeme tuto položku
 DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Obrubování
-DocType: Bulk Email,Not Sent,Neodesláno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Výbušné tváření
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkem Dodatečné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Chcete-li povolit &quot;Point of Sale&quot; pohledu
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Připne
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Položka Varianty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Položka Varianty
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlubování
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá částka
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozici šarže Množství ve skladu
 DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,úkoly
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
-DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listy typu {0} již přidělené pro zaměstnance {1} na dobu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
-DocType: Top Bar Item,Target,Cíl
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Výše příspěvku
 DocType: Sales Invoice,Shipping Address,Shipping Address
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Master Značky
-DocType: ToDo,Due Date,Datum splatnosti
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Master Značky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Krabice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizace
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Krabice
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizace
 DocType: Monthly Distribution,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účetní záznam pro {0} lze provádět pouze v měně: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystřihování
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovní účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
 DocType: Address,Lead Name,Jméno leadu
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otevření Sklad Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otevření Sklad Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Dovolená úspěšně přidělena {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Výrobní množství je povinné
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odstředivé lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetické pole-assisted dokončování
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označit jako Dodává
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označit jako Dodává
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Vytvořit nabídku
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobrazit
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivní laserové spékání
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Stáří (dny)
 DocType: Quotation Item,Quotation Item,Položka Nabídky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Přidat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je zrušena nebo zastavena
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Účtovaný
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 DocType: Journal Entry Account,Debit in Company Currency,Debetní ve společnosti Měna
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Výchozí hodnoty
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tisková kování
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatické lisování
-DocType: ToDo,Medium,Střední
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 DocType: Quotation,Term Details,Termín Podrobnosti
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
 DocType: Warranty Claim,Warranty Claim,Záruční reklamace
 ,Lead Details,Detaily leadu
-DocType: Authorization Rule,Approving User,Schvalování Uživatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pokovování
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
 DocType: Bank Reconciliation,From Date,Od data
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplacená částka (Company měny)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vyžadováno při Row No {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Zadejte prosím platnou finanční rok datum zahájení a ukončení
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Hornictví
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin lití
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Výrobky
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Výrobky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Pokud je tato položka má varianty, pak to nemůže být vybrána v prodejních objednávek atd"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,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: Quotation,Order Type,Typ objednávky
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 DocType: Payment Tool,Find Invoices to Match,Najít faktury zápas
 ,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","např ""XYZ Národní Banka"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Celkem Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Nákupní košík je povoleno
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Žádné výrobní zakázky vytvořené
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Sales Invoice Item,Batch No,Č. šarže
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavní
-DocType: DocPerm,Delete,Smazat
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
-DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
+DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
-DocType: Country,Country,Země
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-DocType: Communication,Received,Přijato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmí mít výrobní zakázky.
-DocType: DocField,Attach Image,Připojit obrázek
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Ponechte prázdné, pokud žádná změna"
 DocType: Sales Order,To Deliver and Bill,Dodat a Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pro výrobu.
 DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Splátka
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
-DocType: Communication,Rejected,Zamítnuto
 DocType: Pricing Rule,Brand,Značka
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Hodnota {0} pro atribut {1} neexistuje v seznamu platného bodu Hodnoty atributů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
 DocType: Packing Slip,To Package No.,Balit No.
-DocType: DocType,System,Systém
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikace
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Payment Tool,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pro
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 DocType: Stock Settings,Allowance Percent,Allowance Procento
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dodavatel Nabídka Položka
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Stříhání
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balení a označování
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Správa projektů
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nelze přiřadit proti {0}, protože to není výnos nebo náklad účet"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,např. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,např. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Částka, která má dodávat"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Výčepní
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Produkt nebo Služba
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvořil
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky mohou není možné filtrovat {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
 DocType: Material Request Item,Material Request Item,Materiál Žádost o bod
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny položek.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Strom skupiny položek.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Změna UOM za položku.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
 DocType: Item Attribute,Attribute Name,Název atributu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
 DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Skupina
 DocType: Task,Expected Time (in hours),Předpokládaná doba (v hodinách)
 ,Qty to Order,Množství k objednávce
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Chcete-li sledovat značku v následujících dokumentech dodacím listě Opportunity, materiál Request, položka, objednávce, kupní poukazu, nakupují stvrzenka, cenovou nabídku, prodejní faktury, Product Bundle, prodejní objednávky, pořadové číslo"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktura č
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulace Rate
 ,Customer Addresses And Contacts,Adresy zákazníků a kontakty
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Drž se, když váš systém je nastavení. To může trvat několik okamžiků."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 DocType: Employee,Personal Details,Osobní data
 ,Maintenance Schedules,Plány údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ražba
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spojování
-DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavení příchozí server pro úlohy e-mailovou id. (Např jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové přidělené listy {0} nemůže být nižší než již schválených listy {1} pro období
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
-DocType: Custom Field,Custom,Zvyk
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vstřikování
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
-apps/frappe/frappe/config/setup.py +130,Printing,Tisk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Jednotka
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Jednotka
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Váš finanční rok končí
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Schvalování roli
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavření (Otevření + součty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Měna účtu musí být {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,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 +254,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Měna účtu musí být {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
 DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Prosím, zadejte ID zaměstnance z tohoto prodeje osoby"
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,Nabídka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Náklady Aktualizováno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Náklady Aktualizováno
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Lead Address
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Popis Práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Popis Práce
 DocType: Purchase Order Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Nátěr
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zásilky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip lití
-DocType: Purchase Order,To be delivered to customer,Chcete-li být doručeno zákazníkovi
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zásilky
+DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavení
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Řádek č.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Řádek č.
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Pricing Rule,Supplier,Dodavatel
 DocType: C-Form,Quarter,Čtvrtletí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Employee,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uživatel {0} je zakázána
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
-DocType: Journal Entry Account,Credit in Account Currency,Úvěr v měně účtu
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Currency Exchange,From Currency,Od Měny
-DocType: DocField,Name,Jméno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dokončeno
-DocType: Web Form,Select DocType,Zvolte DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Protahování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenční Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
 DocType: Time Log Batch,Total Billing Amount,Celková částka fakturace
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Účet pohledávky
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodejní objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Item,Weight UOM,Hmotnostní jedn.
 DocType: Employee,Blood Group,Krevní Skupina
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemůžete změnit výchozí UOM variantních. Chcete-li změnit výchozí UOM pro Variant změna výchozí nerozpuštěných šablony
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Z plánu údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
 DocType: Purchase Invoice,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu v prodeji daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Nabídka Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Time Log,To Time,Chcete-li čas
+DocType: Authorization Rule,Approving Role (above authorized value),Schválení role (nad oprávněné hodnoty)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
@@ -1849,32 +1706,28 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuální ocenění Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
-DocType: Opportunity,Lost Reason,Ztracené Důvod
+DocType: Opportunity,Lost Reason,Důvod ztráty
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svařování
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je zapotřebí nové Reklamní UOM
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 DocType: Project,External,Externí
 DocType: Features Setup,Item Serial Nos,Položka sériových čísel
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Branch,Branch,Větev
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc: 
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc:
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Lisování
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Vaši Zákazníci
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kód položky> Položka Group> Brand
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
-DocType: Event,Friday,Pátek
 DocType: Time Log,Costing Amount,Kalkulace Částka
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
 DocType: Salary Structure,Monthly Earning & Deduction,Měsíčního výdělku a dedukce
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnou
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
-DocType: Page,Title,Titulek
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Přizpůsobit
 DocType: POS Profile,[Select],[Vybrat]
 DocType: SMS Log,Sent To,Odeslána
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
 DocType: Company,For Reference Only.,Pouze orientační.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
 DocType: Manufacturing Settings,Capacity Planning,Plánování kapacit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Datum od"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Datum od"" je povinné"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
 DocType: Sales Invoice,Recurring,Opakující se
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Přidejte daně
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
 DocType: Quality Inspection,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: System Settings,In Hours,V hodinách
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekávaný zůstatek podle banky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Leštění
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekávaný zůstatek podle banky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Soubor přejmenovat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobrazit Platby
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Nákup Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass dokončovací
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 DocType: Upload Attendance,Attendance To Date,Účast na data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavení příchozí server pro prodej e-mailovou id. (Např sales@example.com)
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
-DocType: User,Female,Žena
-DocType: Journal Entry Account,Debit in Account Currency,Debetní v měně účtu
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Ujistěte se, že opravdu chcete vymazat všechny transakce pro tuto společnost. Vaše kmenová data zůstanou, jak to je. Tuto akci nelze vrátit zpět."
-DocType: Print Settings,Modern,Moderní
-DocType: Communication,Replied,Odpovězeno
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neplatná reference {0} {1}
 DocType: Payment Tool,Total Payment Amount,Celková Částka platby
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než Plánované Množství ({2}), ve Výrobní Objednávce {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než plánované množství ({2}), ve výrobní objednávce {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak tam jsou stávající skladové transakce pro tuto položku, \ nemůžete změnit hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Ne&quot;, &quot;Je skladem&quot; a &quot;ocenění Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rychlý vstup Journal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pro Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kompletní nastavení
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adresář
 DocType: Delivery Note,Transporter Name,Přepravce Název
+DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Měrná jednotka
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
 DocType: Lead,Opportunity,Příležitost
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základní sazba (dle Stock nerozpuštěných)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pronikavý
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskální rok. Pro zjistit více informací {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskálním roce. Pro více informací zkontrolujte {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemický obrábění
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2053,7 +1894,7 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standardní daň šablona, která může být použita pro všechny nákupních transakcí. Tato šablona může obsahovat seznam daňových hlav a také ostatní náklady hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standardní daň šablona, která může být použita pro všechny nákupních transakcí. Tato šablona může obsahovat seznam daňových hlav a také ostatní náklady hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
 
  #### Poznámka: 
 
@@ -2074,11 +1915,9 @@
  8. Zadejte Row: Je-li na základě ""předchozí řady Total"" můžete zvolit číslo řádku, která bude přijata jako základ pro tento výpočet (výchozí je předchozí řádek).
  9. Zvažte daň či poplatek za: V této části můžete nastavit, zda daň / poplatek je pouze pro ocenění (není součástí celkem), nebo pouze pro celkem (není přidanou hodnotu do položky), nebo pro obojí.
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
-DocType: Note,Note,Poznámka
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
-DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Sklad Entry {0} není předložena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Dokončené množství nemůže být více než {0} pro provoz {1}
 DocType: Features Setup,Quality,Kvalita
-DocType: Contact Us Settings,Introduction,Úvod
 DocType: Warranty Claim,Service Address,Servisní adresy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
 DocType: Stock Entry,Manufacture,Výroba
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Dodávka Vezměte prosím na vědomí první
 DocType: Purchase Invoice,Currency and Price List,Měna a ceník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Výprodej Datum není uvedeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Vloženo
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,nebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
-,Download Backups,Ke stažení Zálohy
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ platby
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Item,Quality Parameters,Parametry kvality
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Nechte typ {0} nelze provádět předávány
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Přizpůsobení Formuláře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Výstřižek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Zploštění
 DocType: Account,Income Account,Účet příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lití
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
 DocType: Tax Rule,Shipping Country,Přepravní Země
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
  celkovém součtu ({2})"
 DocType: Employee,Relieving Date,Uvolnění Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser technicky čisté tvarování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
@@ -2175,11 +2006,10 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
-DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jméno Nového Nákladového Střediska
-DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Jméno Nového Nákladového Střediska
+DocType: Leave Control Panel,Leave Control Panel,Ovládací panel dovolených
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 DocType: Supplier,Billing Currency,Fakturace Měna
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Velké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Velké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Stisknutí
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velký
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velký
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštění
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Výchozí měrná jednotka bodu {0} nemůže být změněna přímo, protože \ jste již nějaké transakce (y) s jiným nerozpuštěných. Chcete-li změnit výchozí UOM, \ používání &quot;UOM Nahraďte Utility&quot; nástroj pod Stock modulu."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Nabídka {0} je zrušena
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Nabídka {0} je zrušena
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
 DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Prosím nastavte množství objednací
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chemické broušení
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Zrušeno
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datum ve platovou strukturu nemůže být menší než zaměstnanců Spojování Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se faktury, zrušte zaškrtnutí zastavit opakované nebo dát správné datum ukončení"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maximálně {0} řádků povoleno
 DocType: C-Form Invoice Detail,Net Total,Net Total
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fakturace (Prodejní Faktura)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by měla být zadána s negativním množství ve vratném dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemické obrábění
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root účet musí být skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu společnosti"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} byl úspěšně odhlášen z tohoto seznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company měny)
-apps/frappe/frappe/templates/base.html +134,Added,Přidáno
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ražení
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
-apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Řádek # {0}: Nelze vrátit více než {1} pro bodu {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Částka daně po slevě Částka (Company měny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tváření
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,Typové označení
 DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
 DocType: Bin,Bin,Popelnice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Zaoblená hrana
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Company,Společnost
 DocType: Account,Expense Account,Účtet nákladů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Barevné
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Barevné
 DocType: Maintenance Visit,Scheduled,Plánované
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladem,&quot; je &quot;Ne&quot; a &quot;je Sales Item&quot; &quot;Ano&quot; a není tam žádný jiný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
 DocType: Installation Note Item,Against Document No,Proti dokumentu č
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosím, vyberte {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Uložte Newsletter před odesláním
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Jméno nebo e-mail je povinné
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrácené Množství
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrační dokončovací
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Zkušební doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Zkušební doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
@@ -2385,69 +2200,64 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broušení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšit balení
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevyřízené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrzeno
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavba rudy
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
 DocType: Item,Valuation Method,Ocenění Method
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nepodařilo se najít kurz pro {0} do {1}
 DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicitní záznam
 DocType: Serial No,Under Warranty,V rámci záruky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktury
-apps/erpnext/erpnext/hooks.py +70,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Schvalovatel absenece
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Zužování
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Převádí jaderný materiál pro Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
 DocType: Pricing Rule,Purchase Manager,Vedoucí nákupu
 DocType: Payment Tool,Payment Tool,Platebního nástroje
 DocType: Target Detail,Target Detail,Target Detail
-DocType: Sales Order,% of materials billed against this Sales Order,% Materiálů fakturovaných proti tomuto odběrateli
+DocType: Sales Order,% of materials billed against this Sales Order,% materiálů fakturovaných proti této prodejní obědnávce
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné období
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
-DocType: Leave Allocation,Leave Allocation,Nechte Allocation
+DocType: Leave Allocation,Leave Allocation,Přidelení dovolené
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiál Žádosti {0} vytvořené
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Employee,Feedback,Zpětná vazba
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolená nemůže být přiděleny před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusné jet obrábění
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Časový plán
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
-DocType: Website Settings,Website Settings,Nastavení www stránky
 DocType: Item,Reorder level based on Warehouse,Úroveň Změna pořadí na základě Warehouse
 DocType: Activity Cost,Billing Rate,Fakturace Rate
 ,Qty to Deliver,Množství k dodání
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adres
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získat aktualizace
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Přidat několik ukázkových záznamů
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Přidat několik ukázkových záznamů
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Správa absencí
-DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Rychlá pomoc
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
 DocType: Features Setup,Sales Extras,Prodejní Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočet na účet {1} proti nákladovému středisku {2} bude překročen o {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Budete ho používat k přihlášení
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Nabídka {0} není typu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Vytvořit výplatní pásku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Procházet BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Počáteční stav Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny
 DocType: Appraisal,Appraisal,Ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pěna lití
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z nabídky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z nabídky
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Přenesená pro výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
 DocType: Purchase Receipt Item,Purchase Order Item No,Číslo položky vydané objednávky
-DocType: System Settings,System Settings,Nastavení systému
 DocType: Project,Project Type,Typ projektu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Náklady na různých aktivit
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je Zrušeno
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
-DocType: Communication,Recipients,Příjemci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Šroubování
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Vroubkování
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
 DocType: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vítejte na ERPNext
+,Welcome to ERPNext,Vítejte na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Lead na nabídku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Cena a částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
-DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Neaktivní
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,např. DPH
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tváření Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Přejděte na příslušné skupiny (obvykle zdrojem finančních prostředků&gt; krátkodobých závazků&gt; daní a poplatků a vytvořit nový účet (kliknutím na Přidat dítě) typu &quot;daně&quot; a to nemluvím o daňovou sazbu.
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserové řezání
-DocType: Event,Monday,Pondělí
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
 DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
-DocType: Page,All,Vše
 DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 DocType: Employee,Confirmation Date,Potvrzení Datum
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,Uživatel prodeje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Nastavit
 DocType: Lead,Lead Owner,Majitel leadu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Sklad je vyžadován
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Sklad je vyžadován
 DocType: Employee,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Time Log,Will be updated when billed.,Bude aktualizována při účtovány.
@@ -2655,50 +2447,46 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% vyhlášeno
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dodávno
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množství {1} nemůže být nižší než minimální Objednané množství {2} (definované v bodu).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Název společnosti nemůže být Company
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Hlavičkové listy pro tisk šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinišování
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všech sdělení typu e-mail, telefon, chat, návštěvy, atd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrouhlit nákladové středisko ve společnosti"
 DocType: Purchase Invoice,Terms,Podmínky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Vytvořit nový
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 ,Item-wise Sales History,Item-moudrý Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Celková částka potrestána
 ,Purchase Analytics,Nákup Analytika
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Holení
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rychlost: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rychlost: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Poznámky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obložení
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Stav absencí před požadavkem
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
-DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Příležitost Ztracena
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Název nového účtu. Poznámka: Prosím, vytvářet účty pro zákazníky a dodavateli"
-DocType: Report,Report Type,Typ výpisu
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nahrávám
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Nahradit Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Show daň break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dat a export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiál Poptávka Detail No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard soustružení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,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}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
 ,Stock Ageing,Reklamní Stárnutí
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled, {0} '{1}' je zakázána
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktní e-mail
-DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odpovědnost
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Přidat uživatele
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Přidat uživatele
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Task,Actual Start Date (via Time Logs),Skutečné datum Start (přes Time Záznamy)
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ název společnosti na potvrzení
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstřikování
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Moření
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Lití do písku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
 DocType: Newsletter,A Lead with this email id should exist,Lead s touto e-mailovou id by měla již existovat
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Nabídka Date
 DocType: Hub Settings,Access Token,Přístupový Token
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Odvalovací
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 DocType: Fiscal Year,Year Name,Jméno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Povrchová úprava a průmyslového zpracování
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtání
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukování
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Přepravní City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Vyklepání
-DocType: Web Page,Slideshow,Promítání obrázků
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
 DocType: Journal Entry,Print Heading,Tisk záhlaví
 DocType: Quotation,Maintenance Manager,Správce údržby
-DocType: Workflow State,Search,Hledat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dny od posledního Objednávky"" musí být větší nebo rovny nule"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Pájení
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dnů od poslední objednávky"" musí být větší nebo rovno nule"
 DocType: C-Form,Amended From,Platném znění
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
 DocType: Leave Control Panel,Carry Forward,Převádět
@@ -2862,45 +2631,44 @@
 ,Produced,Produkoval
 DocType: Item,Item Code for Suppliers,Položka Kód pro dodavatele
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Obecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Připojit Hlavičkový
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Obecný
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Připojit Hlavičkový
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam vaše daňové hlavy (např DPH, cel atd, by měli mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou můžete upravit a přidat další později."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam vaše daňové hlavy (např DPH, cel atd, by měli mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou můžete upravit a přidat další později."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
-DocType: Blog Post,Blog Post,Příspěvek blogu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hodina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Přeneste materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Přeneste materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Typ leadu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvořit Citace
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Metaná
 DocType: Account,Tax,Daň
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinace
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle zboží
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Směrování
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Název pozice
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} již přidělené pro zaměstnance {1} na dobu {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,Obnovovací rychlost a dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
 DocType: Pricing Rule,Customer Group,Zákazník Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
 DocType: Address,Plant,Rostlina
-DocType: DocType,Setup,Nastavení
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Válcování za studena
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atributy
-DocType: Packing Slip,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Poslední Datum objednávky
-DocType: DocField,Image,Obrázek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} není patří společnosti {1}
-DocType: Communication,Other,Ostatní
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Provoz ID není nastaveno
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návštěva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Návštěva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 DocType: Cost Center,Distribution Id,Distribuce Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Purchase Invoice,Supplier Address,Dodavatel Address
-DocType: Contact Us Settings,Address Line 2,Adresní řádek 2
-DocType: ToDo,Reference,reference
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforující
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanční služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Poměr atribut {0} musí být v rozmezí od {1} až {2} v krocích po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Řezání
 DocType: Tax Rule,Billing State,Fakturace State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminování
 DocType: Item Reorder,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spékání
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-DocType: Product Bundle,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrcující
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuální lití
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Výše
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold velikosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Návrat proti prodejní faktuře
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Bod 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
 DocType: Serial No,Creation Time,Čas vytvoření
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Celkový příjem
 DocType: Sales Invoice,Product Bundle Help,Product Bundle Help
 ,Monthly Attendance Sheet,Měsíční Účast Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinná k položce {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Získat předměty z Bundle Product
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
-DocType: Workflow State,Time,Čas
 DocType: Features Setup,Sales Discounts,Prodejní Slevy
 DocType: Hub Settings,Seller Country,Prodejce Country
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je nutná konverzní faktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu
 DocType: Production Order,Expected Delivery Date,Očekávané datum dodání
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vyboulený
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Lití Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturace Částka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspěšně vypouští všechny transakce související s tímto společnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Stejně jako u Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
-DocType: Feed,Full Name,Celé jméno/název
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 ,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plánování
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Vydáno
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nabízíme k prodeji tuto položku
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Nabízíme k prodeji tuto položku
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,Manažer Položka
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Těžba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotační tváření
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pro nákupního košíku
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablona je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
 DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlení
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Připravované akce
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
-DocType: Letter Head,Letter Head,Záhlaví
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rychlý vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pro návrat
 DocType: Purchase Order,To Receive,Obdržet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšit kování
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Výnosy / náklady
 DocType: Employee,Personal Email,Osobní e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Celkový rozptyl
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Makléřská
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
 DocType: Address,Postal Code,PSČ
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hoblování
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
-DocType: Workflow State,Edit,Upravit
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
-DocType: Contact Us Settings,Pincode,PSČ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Sklad UOM musí být odlišný od běžného akciové nerozpuštěných
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Dovolené musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,Výchozí Center Náklady
 DocType: Purchase Invoice,End Date,Datum ukončení
 DocType: Employee,Internal Work History,Vnitřní práce History
-DocType: DocField,Column Break,Zalomení sloupce
-DocType: Event,Thursday,Čtvrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
 DocType: Sales Invoice,Exhibition,Výstava
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,Které se konalo dne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týden Shrnutí
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
-DocType: DocField,Currency,Měna
 DocType: Opportunity,Opportunity Date,Příležitost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o koupi
 DocType: Purchase Order,To Bill,Billa
-DocType: Material Request,% Ordered,Objednané%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
+DocType: Material Request,% Ordered,% objednáno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,K projednání
 DocType: SMS Settings,SMS Settings,Nastavení SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Černá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Černá
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvořte nabídku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zpáteční
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
-DocType: DocField,Fold,Fold
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Výchozí měrná jednotka varianty musí být stejné jako šablonu
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Prosím specifikujte
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Zákazník Id
-DocType: Page,Page Name,Název stránky
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Chcete-li čas musí být větší než From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Úprava vřetena
-DocType: BOM,Last Purchase Rate,Last Cena při platbě
+DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","např ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","např ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
-DocType: System Settings,Time Zone,Časové pásmo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Sešívání
 DocType: Customer,Customer Details,Podrobnosti zákazníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Tvarování
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
 DocType: Item Group,Parent Item Group,Parent Item Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} na {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pro {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Nákladové středisko
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Sklady.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Sklady.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Opportunity,Next Contact,Následující Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
-DocType: Page,Yes,Ano
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
 DocType: Employee,Encashment Date,Inkaso Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Account,Stock Adjustment,Reklamní Nastavení
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Výchozí aktivity pro Typ aktivity - {0}
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nový {0} Název
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte prosím z / do rozmezí
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Vytvořeno (kým)
 DocType: Serial No,Under AMC,Podle AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} jsou již použity v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Výchozí Daně a poplatky
 DocType: Account,Receivable,Pohledávky
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Sklad UOM Nahradit Utility
 DocType: POS Profile,Terms and Conditions,Podmínky
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,Pro Výrobu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
 DocType: Project Task,View Task,Zobrazit Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Váš finanční rok začíná
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Váš finanční rok začíná
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavení příchozí server pro podporu e-mailovou id. (Např support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Salary Slip,Salary Slip,Plat Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštění
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Features Setup,Item Advanced,Položka Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Válcování
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Obchodní domy
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Je Aktivní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Změna Zkratky
-DocType: Workflow State,Primary,Primární
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
-DocType: Communication,More Information,Víc informací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Poslední částka objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Odstřel
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Částka poslední objednávky
 DocType: Company,Warn,Varovat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ocenění Item aktualizováno
 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: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
 DocType: Purchase Invoice,Recurring Print Format,Opakující Print Format
-DocType: Communication,Series,Série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
 ,General Ledger,Hlavní Účetní Kniha
@@ -3461,11 +3175,9 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0} "
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0}"
 DocType: Features Setup,To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Překreslení
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršela.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Lept
 DocType: Sales Invoice,Commission,Provize
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,10 +3203,10 @@
  {%, pokud email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Výchozí částka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Sklad nebyl nalezen v systému
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Tento měsíc je shrnutí
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit Zásoby Starší Vic jak` by měla být menší než %d dnů.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
 ,Project wise Stock Tracking,Sledování zboží dle projektu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Provozní doba musí být větší než 0 pro provoz {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Appraisal,Start Date,Datum zahájení
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Hodnota
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikněte zde pro ověření
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Průměrná doba pořízena dodavatelem dodat
 DocType: Time Log,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Priorita
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
-DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Příjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} byl úspěšně přidán do našeho seznamu novinek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Paprsek obrábění Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavní zprávy
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hlavní zprávy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pro výrobu
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Součty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Součty
 DocType: BOM,Manufacturing,Výroba
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
-,Setup Wizard,Průvodce nastavením
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die lití
-DocType: Email Alert,Reference Date,Referenční datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
 DocType: Budget Detail,Budget Detail,Detail Rozpočtu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
-DocType: Async Task,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Sklad UOM aktualizovaný k bodu {0}
-DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} již účtoval
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka míry konverze
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodavatelé
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Vaši Dodavatelé
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Přijaté Od
 DocType: Features Setup,Exports,Vývoz
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 DocType: Issue,Content Type,Typ obsahu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Cost Center,Budgets,Rozpočty
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
 DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Co to dělá?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to dělá?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zabrušovací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Počet dnů od poslední objednávky
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
-DocType: User,Enabled,Zapnuto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importovat Odběratelé
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Závěrečný účet {0} musí být typu odpovědnosti / Equity
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Období od a období, k datům povinné pro opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generování výplatních páskách
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} není platné id emailu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
-DocType: ToDo,Low,Nízké
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je zapotřebí Název kampaně
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Receipt Item,Rejected Serial No,Odmítnuté sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Hluboké tažení
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nýtování
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Výrobní nastavení
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdit Váš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Nabídka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Celkové přidělené listy jsou více než dnů v období
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je vyžadováno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuové tváření
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
-DocType: Contact Us Settings,City,Město
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábění
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Není platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
 DocType: Sales Order,Printing Details,Tisk detailů
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhledávání Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,První Uživatel: Vy
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Doba platnosti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná částka
 DocType: Attendance,Attendance,Účast
-DocType: Page,No,Ne
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum a čas zadání je povinný
@@ -3764,55 +3451,46 @@
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
 DocType: Period Closing Voucher,Period Closing Voucher,Období Uzávěrka Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ceník master.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ceník master.
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
-DocType: DocPerm,Level,Úroveň
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro Oznámení"", které nejsou uvedeny na opakující se %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frézování
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro oznámení"" nejsou uvedeny pro opakující se %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
 DocType: Company,Round Off Account,Zaokrouhlovací účet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Okusování
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","např ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovědní Lhůta
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","např ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Výpovědní Lhůta
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnost UOM
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisování
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutečné Datum ukončení (přes Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
-DocType: User,Last Name,Příjmení
-DocType: Web Page,Left,Vlevo
-DocType: Event,All Day,Celý den
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
 DocType: Issue,Support Team,Tým podpory
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
-DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
-DocType: User,Gender,Pohlaví
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Podle Stock nerozpuštěných
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Neuplynula
@@ -3826,45 +3504,41 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 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"
 DocType: Purchase Invoice,Total Advance,Total Advance
-DocType: Workflow State,User,Uživatel
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Zpracování mezd
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplacení Note
 DocType: Customer,Credit Days Based On,Úvěrové Dny Based On
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovních hodin.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} již byla odeslána
 ,Items To Be Requested,Položky se budou vyžadovat
-DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sazba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Sešívání
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetní účet
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Celkem zaokrouhleno (měna solečnosti)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonění
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaměstnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
-DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odběratelé z přidané
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odběratelé přidáni
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovat rozpočtu pro tento nákladového střediska. Chcete-li nastavit rozpočet akce, viz &quot;Seznam firem&quot;"
 DocType: Account,Parent Account,Nadřazený účet
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Volitelné. Nastaví výchozí měně společnosti, není-li uvedeno."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Volitelné. Nastaví výchozí měně společnosti, není-li uvedeno."
 DocType: Address,Office,Kancelář
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozici Množství na Od Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Zásoby
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z nabídky dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Z nabídky dodavatele
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Chcete-li sledovat položky v oblasti prodeje a nákupních dokladech s čísly šarží. &quot;Výhodné Průmysl: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pro Množství (Vyrobeno ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkem přidělené listy jsou více než období
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
-DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
+DocType: Sales Order,% of materials delivered against this Sales Order,% materiálů doručeno proti této prodejní objednávce
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter seznamu účastníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
-DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +140,Next,Další
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Celkem Neplacené
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Celkem Neplacené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log není zúčtovatelné
-apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net plat nemůže být záporný
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
 DocType: SMS Settings,Static Parameters,Statické parametry
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-válcování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábění
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Připojit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Připojit Logo
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košík je prázdný
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root nelze upravovat.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Základní kapitál
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vyberte soubor csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Poslat zálohy na Dropbox
 DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvoření Materiál žádosti, pokud množství klesne pod tuto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Chcete-li nastavit úroveň objednací, položka musí být Nákup položka nebo výrobní položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
-DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}

diff --git a/erpnext/translations/da-DK.csv b/erpnext/translations/da-DK.csv
index 2597498..87190da 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv

@@ -1,77 +1,564 @@
-apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
-,Schedule Date,Tidsplan Dato
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Skabelon til præstationsvurderinger.
-DocType: Hub Settings,Hub Settings,Hub Indstillinger
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
-DocType: Features Setup,Quality,Kvalitet
-DocType: Pricing Rule,Sales Partner,Salg Partner
-DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
-DocType: Journal Entry,Total Credit,Total Credit
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
-DocType: Sales Invoice,Source,Kilde
-apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
-DocType: Sales Order,Recurring Order,Tilbagevendende Order
-DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
-DocType: Production Order Operation,Planned End Time,Planned Sluttid
-DocType: Upload Attendance,Get Template,Få skabelon
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
-,Available Qty,Tilgængelig Antal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
-DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
-DocType: Serial No,Delivery Time,Leveringstid
-DocType: Mode of Payment Account,Default Account,Standard-konto
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
-DocType: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
-DocType: Bin,Actual Quantity,Faktiske Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-DocType: Stock Entry,Subcontract,Underleverance
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
-DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
-DocType: Purchase Taxes and Charges,Account Head,Konto hoved
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
+DocType: Employee,Salary Mode,Løn-tilstand
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
+DocType: Employee,Divorced,Skilt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
-DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
+DocType: Item,Customer Items,Kunde Varer
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
+DocType: Item,Default Unit of Measure,Standard Måleenhed
+DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
+DocType: Employee,Leave Approvers,Lad godkendere
+DocType: Sales Partner,Dealer,Forhandler
+DocType: Employee,Rented,Lejet
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
+DocType: Job Applicant,Job Applicant,Job Ansøger
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
+DocType: C-Form,Customer,Kunde
+DocType: Purchase Receipt Item,Required By,Kræves By
+DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
+DocType: Department,Department,Afdeling
+DocType: Purchase Order,% Billed,% Billed
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Customer Name
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
+DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
+DocType: Leave Type,Leave Type Name,Lad Type Navn
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
+DocType: Pricing Rule,Apply On,Påfør On
+DocType: Item Price,Multiple Item prices.,Flere Item priser.
+,Purchase Order Items To Be Received,"Købsordre, der modtages"
+DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
+DocType: Quality Inspection Reading,Parameter,Parameter
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
+DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
+DocType: Employee Education,Year of Passing,År for Passing
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
+DocType: Designation,Designation,Betegnelse
+DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
+DocType: Purchase Invoice,Monthly,Månedlig
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
+DocType: Maintenance Schedule Item,Periodicity,Hyppighed
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
+DocType: Company,Abbr,Fork
+DocType: Appraisal Goal,Score (0-5),Score (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+DocType: Delivery Note,Vehicle No,Vehicle Ingen
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
+DocType: Production Order Operation,Work In Progress,Work In Progress
+DocType: Employee,Holiday List,Holiday List
+DocType: Time Log,Time Log,Time Log
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Revisor
+DocType: Cost Center,Stock User,Stock Bruger
+DocType: Company,Phone No,Telefon Nej
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Ny {0}: # {1}
+,Sales Partners Commission,Salg Partners Kommissionen
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
+DocType: BOM,Operations,Operationer
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
+DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
+DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
+DocType: Employee,Married,Gift
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+DocType: Payment Reconciliation,Reconcile,Forene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
+DocType: Quality Inspection Reading,Reading 1,Læsning 1
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+DocType: SMS Center,All Sales Person,Alle Sales Person
+DocType: Lead,Person Name,Person Name
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
+DocType: Account,Credit,Credit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR-indstillinger
+DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
+DocType: Warehouse,Warehouse Detail,Warehouse Detail
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
+DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
+DocType: SMS Log,SMS Log,SMS Log
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
+DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
+DocType: Lead,Interested,Interesseret
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
+DocType: Item,Copy From Item Group,Kopier fra Item Group
+DocType: Journal Entry,Opening Entry,Åbning indtastning
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+DocType: Lead,Product Enquiry,Produkt Forespørgsel
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
+DocType: Employee Education,Under Graduate,Under Graduate
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
+DocType: BOM,Total Cost,Total Cost
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
+DocType: Expense Claim Detail,Claim Amount,Krav Beløb
+DocType: Employee,Mr,Hr
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+DocType: Naming Series,Prefix,Præfiks
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Forbrugsmaterialer
+DocType: Upload Attendance,Import Log,Import Log
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
+DocType: SMS Center,All Contact,Alle Kontakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
+DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
+DocType: Newsletter,Email Sent?,E-mail Sendt?
+DocType: Journal Entry,Contra Entry,Contra indtastning
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
+DocType: Delivery Note,Installation Status,Installation status
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
+DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
+DocType: SMS Center,SMS Center,SMS-center
+DocType: BOM Replace Tool,New BOM,Ny BOM
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
+DocType: Lead,Request Type,Anmodning Type
+DocType: Leave Application,Reason,Årsag
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
+DocType: Serial No,Maintenance Status,Vedligeholdelse status
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Varer og Priser
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
+DocType: Customer,Individual,Individuel
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
+DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
+DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
+DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
+DocType: Production Planning Tool,Sales Orders,Salgsordrer
+DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
+,Purchase Order Trends,Indkøbsordre Trends
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
+DocType: Earning Type,Earning Type,Optjening Type
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
+DocType: Bank Reconciliation,Bank Account,Bankkonto
+DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
+DocType: Selling Settings,Default Territory,Standard Territory
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
+DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
-DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
+DocType: Sales Invoice,Is Opening Entry,Åbner post
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+DocType: Sales Partner,Reseller,Forhandler
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
+DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
+,Production Orders in Progress,Produktionsordrer i Progress
+DocType: Lead,Address & Contact,Adresse og kontakt
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+DocType: Newsletter List,Total Subscribers,Total Abonnenter
+,Contact Name,Kontakt Navn
+DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
+DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
+DocType: Item Website Specification,Item Website Specification,Item Website Specification
+DocType: Payment Tool,Reference No,Referencenummer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
+DocType: Stock Entry,Sales Invoice No,Salg faktura nr
+DocType: Material Request Item,Min Order Qty,Min prisen evt
+DocType: Lead,Do Not Contact,Må ikke komme i kontakt
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+DocType: Item,Minimum Order Qty,Minimum Antal
+DocType: Pricing Rule,Supplier Type,Leverandør Type
+DocType: Item,Publish in Hub,Offentliggør i Hub
+,Terretory,Terretory
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
+DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
+DocType: Item,Purchase Details,Køb Detaljer
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
+DocType: Employee,Relation,Relation
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
+DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
+DocType: SMS Settings,SMS Sender Name,SMS Sender Name
+DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
+DocType: Notification Control,Notification Control,Meddelelse Kontrol
+DocType: Lead,Suggestions,Forslag
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
+DocType: Supplier,Address HTML,Adresse HTML
+DocType: Lead,Mobile No.,Mobil No.
+DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
+DocType: Purchase Invoice Item,Expense Head,Expense Hoved
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tegn
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
+DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
+DocType: Item,Synced With Hub,Synkroniseret med Hub
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
+DocType: Item,Variant Of,Variant af
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
+DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
+DocType: Employee,External Work History,Ekstern Work History
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
+DocType: Lead,Industry,Industri
+DocType: Employee,Job Profile,Job profil
+DocType: Newsletter,Newsletter,Nyhedsbrev
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
+DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
+DocType: Sales Invoice Item,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+DocType: Workstation,Rent Cost,Leje Omkostninger
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
+DocType: Employee,Company Email,Firma Email
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
+DocType: Item Tax,Tax Rate,Skat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Vælg Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
+DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Se venligst vedhæftede
+DocType: Purchase Order,% Received,% Modtaget
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Opsætning Allerede Complete !!
+,Finished Goods,Færdigvarer
+DocType: Delivery Note,Instructions,Instruktioner
+DocType: Quality Inspection,Inspected By,Inspiceres af
+DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
+,Schedule Date,Tidsplan Dato
+DocType: Packed Item,Packed Item,Pakket Vare
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
+DocType: Currency Exchange,Currency Exchange,Valutaveksling
+DocType: Purchase Invoice Item,Item Name,Item Name
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
+DocType: Employee,Widowed,Enke
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
+DocType: Workstation,Working Hours,Arbejdstider
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
+,Purchase Register,Indkøb Register
+DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
+DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
+DocType: Employee,Single,Enkeltværelse
+DocType: Issue,Attachment,Attachment
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
+DocType: Account,Cost of Goods Sold,Vareforbrug
+DocType: Purchase Invoice,Yearly,Årlig
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Indtast Cost center
+DocType: Journal Entry Account,Sales Order,Sales Order
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
+DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
+DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
+DocType: Delivery Note,% Installed,% Installeret
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
+DocType: BOM,Item Desription,Item desription
+DocType: Purchase Invoice,Supplier Name,Leverandør Navn
+DocType: Account,Is Group,Is Group
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
+DocType: Lead,Channel Partner,Channel Partner
+DocType: Account,Old Parent,Gammel Parent
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
+DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
+DocType: SMS Log,Sent On,Sendt On
+DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
+DocType: Sales Order,Not Applicable,Gælder ikke
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
+DocType: Material Request Item,Required Date,Nødvendig Dato
+DocType: Delivery Note,Billing Address,Faktureringsadresse
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
+DocType: BOM,Costing,Koster
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
+DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
+DocType: Packing Slip,From Package No.,Fra pakken No.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
+DocType: Features Setup,Imports,Import
+DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
+DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
+DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
+DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
+DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
+DocType: Journal Entry,Accounts Payable,Kreditor
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
+DocType: Pricing Rule,Valid Upto,Gyldig Op
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
+DocType: Stock Entry,Difference Account,Forskel konto
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
+DocType: Shipping Rule,Net Weight,Vægt
+DocType: Employee,Emergency Phone,Emergency Phone
+,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
+DocType: Sales Order,To Deliver,Til at levere
+DocType: Purchase Invoice Item,Item,Vare
+DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
+DocType: Account,Profit and Loss,Resultatopgørelse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
+DocType: Selling Settings,Default Customer Group,Standard Customer Group
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
+DocType: BOM,Operating Cost,Driftsomkostninger
+,Gross Profit,Gross Profit
+DocType: Production Planning Tool,Material Requirement,Material Requirement
+DocType: Company,Delete Company Transactions,Slet Company Transaktioner
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
+					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
+DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
+DocType: Territory,For reference,For reference
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Lukning (Cr)
+DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
+DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
+DocType: Job Applicant,Thread HTML,Tråd HTML
+DocType: Company,Ignore,Ignorer
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+DocType: Pricing Rule,Valid From,Gyldig fra
+DocType: Sales Invoice,Total Commission,Samlet Kommissionen
+DocType: Pricing Rule,Sales Partner,Salg Partner
+DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Make kundeordre
+DocType: Project Task,Project Task,Project Task
+,Lead Id,Bly Id
+DocType: C-Form Invoice Detail,Grand Total,Grand Total
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
+DocType: Warranty Claim,Resolution,Opløsning
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
+DocType: Leave Control Panel,Allocate,Tildele
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
+DocType: Quotation,Quotation To,Citat Til
+DocType: Lead,Middle Income,Midterste indkomst
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
+DocType: Purchase Order Item,Billed Amt,Billed Amt
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
+DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
+DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
+DocType: Packing Slip Item,DN Detail,DN Detail
+DocType: Time Log,Billed,Billed
+DocType: Batch,Batch Description,Batch Beskrivelse
+DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
+DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
+DocType: Employee,Organization Profile,Organisation profil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
+DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Skabelon til præstationsvurderinger.
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
+DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
+DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
+DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
+DocType: Employee,Passport Number,Passport Number
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+DocType: SMS Settings,Receiver Parameter,Modtager Parameter
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
+DocType: Sales Person,Sales Person Targets,Salg person Mål
+DocType: Production Order Operation,In minutes,I minutter
+DocType: Issue,Resolution Date,Opløsning Dato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
+DocType: Activity Cost,Activity Type,Aktivitet Type
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
+DocType: Customer,Fixed Days,Faste dage
+DocType: Sales Invoice,Packing List,Pakning List
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
+DocType: Activity Cost,Projects User,Projekter Bruger
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+DocType: Company,Round Off Cost Center,Afrunde Cost center
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Material Request,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
-DocType: Account,Accounts User,Regnskab Bruger
-DocType: Rename Tool,Rename Tool,Omdøb Tool
-DocType: Delivery Note,Print Without Amount,Print uden Beløb
-DocType: C-Form,Invoices,Fakturaer
-DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
-DocType: Deduction Type,Deduction Type,Fradrag Type
-DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-DocType: Stock Settings,Item Naming By,Item Navngivning By
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
+DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
+DocType: BOM Operation,Operation Time,Operation Time
+DocType: Pricing Rule,Sales Manager,Salgschef
+DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
+DocType: Journal Entry,Bill No,Bill Ingen
+DocType: Purchase Invoice,Quarterly,Kvartalsvis
+DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
+DocType: Purchase Receipt,Other Details,Andre detaljer
+DocType: Account,Accounts,Konti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
+DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
+DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
+DocType: Hub Settings,Seller City,Sælger By
+DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
+DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
+DocType: Bin,Stock Value,Stock Value
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
+DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
+DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
+DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af kundeordre, Salg Faktura eller Kassekladde"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
+DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
+DocType: Lead,Campaign Name,Kampagne Navn
+,Reserved,Reserveret
+DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
+DocType: Mode of Payment Account,Default Account,Standard-konto
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
+DocType: Production Order Operation,Planned End Time,Planned Sluttid
+,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
+DocType: Employee,Cell Number,Cell Antal
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
+DocType: Opportunity,Opportunity From,Mulighed Fra
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
+DocType: Item Group,Website Specifications,Website Specifikationer
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+DocType: Opportunity,Maintenance,Vedligeholdelse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -91,3470 +578,1138 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
-apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
-DocType: Material Request Item,Required Date,Nødvendig Dato
-apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
-,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
-,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
-DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt &#39;
-DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
-DocType: Hub Settings,Hub Node,Hub Node
-DocType: Communication,Rejected,Afvist
-DocType: Employee,Personal Details,Personlige oplysninger
-DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
-DocType: Purchase Invoice,Total Advance,Samlet Advance
-DocType: Production Order,Actual Start Date,Faktiske startdato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
-DocType: Employee,Place of Issue,Sted for Issue
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
-DocType: Appraisal,For Employee,For Medarbejder
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
-DocType: Job Applicant,Applicant Name,Ansøger Navn
-DocType: Quality Inspection,Readings,Aflæsninger
-DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
-apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
-DocType: Features Setup,POS View,POS View
-DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-DocType: Sales Partner,Sales Partner Target,Salg Partner Target
-DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
-DocType: Account,Accounts Manager,Accounts Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-DocType: Issue,Resolution Date,Opløsning Dato
-DocType: Maintenance Schedule Item,No of Visits,Ingen af besøg
-DocType: Employee,Ms,Ms
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
-DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-DocType: Sales Order Item,Sales Order Date,Sales Order Date
-DocType: Production Order Operation,In minutes,I minutter
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
-DocType: Supplier,Default Payable Accounts,Standard betales Konti
-DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Communication,Delivery Status,Levering status
-DocType: Event,Wednesday,Onsdag
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
-DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
-apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
-DocType: Notification Control,Notification Control,Meddelelse Kontrol
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
-DocType: Employee,Salary Mode,Løn-tilstand
-,Sales Analytics,Salg Analytics
-apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
-DocType: Supplier,Communications,Kommunikation
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
-DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
-DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
-DocType: Serial No,Out of Warranty,Ud af garanti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
-apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mail-meddelelser
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
-DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
-DocType: Employee,Offer Date,Offer Dato
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
-DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: Sales Order,Billing Status,Fakturering status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
-DocType: C-Form Invoice Detail,Grand Total,Grand Total
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
-DocType: System Settings,In Hours,I Hours
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
-DocType: Customer,From Lead,Fra Lead
-DocType: Supplier,Credit Days,Credit Dage
-DocType: Operation,Default Workstation,Standard Workstation
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
-DocType: Supplier,Contact HTML,Kontakt HTML
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
-DocType: Purchase Taxes and Charges,Actual,Faktiske
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
-DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
-DocType: Customer,Credit Days Based On,Credit Dage Baseret på
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
-DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
-DocType: Company,Abbr,Fork
-apps/frappe/frappe/website/template.py +140,Next,Næste
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Indstil som standard
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
-DocType: Supplier,Is Frozen,Er Frozen
-DocType: Employee External Work History,Total Experience,Total Experience
-,Amount to Bill,Beløb til Bill
-,Item-wise Price List Rate,Item-wise Prisliste Rate
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
-,Pending Amount,Afventer Beløb
-DocType: Newsletter,Test Email Id,Test Email Id
-DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
-DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
-DocType: SMS Center,All Sales Partner Contact,Alle Sales Partner Kontakt
-DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-,Produced,Produceret
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
-DocType: Quality Inspection Reading,Reading 8,Reading 8
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
-,Customer Credit Balance,Customer Credit Balance
-DocType: Journal Entry,Stock Entry,Stock indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-DocType: GL Entry,Against Voucher Type,Mod Voucher Type
-DocType: Journal Entry Account,Party Balance,Party Balance
-DocType: Authorization Control,Authorization Control,Authorization Kontrol
-apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
-DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
-DocType: Lead,Campaign Name,Kampagne Navn
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
-DocType: Activity Cost,Billing Rate,Fakturering Rate
-DocType: Account,Chargeable,Gebyr
-DocType: Lead,Request for Information,Anmodning om information
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
-DocType: Buying Settings,Naming Series,Navngivning Series
-DocType: Account,Cost of Goods Sold,Vareforbrug
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
-DocType: Journal Entry,Accounts Payable,Kreditor
-DocType: Sales Partner,Dealer,Forhandler
-DocType: Purchase Invoice,Monthly,Månedlig
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
-DocType: Global Defaults,Global Defaults,Globale standarder
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
-DocType: Purchase Invoice,Items,Varer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
-DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
-apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
-DocType: Appraisal Goal,Goal,Goal
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
-DocType: Pricing Rule,Price or Discount,Pris eller rabat
-DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
-DocType: Pricing Rule,Valid Upto,Gyldig Op
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
-DocType: Sales Invoice,Commission,Kommissionen
-DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
-DocType: Workflow State,Stop,Stands
-DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
-DocType: Pricing Rule,Supplier,Leverandør
-DocType: DocField,Password,Adgangskode
-DocType: Account,Expense,Expense
-DocType: Journal Entry,Remark,Bemærkning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
-DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
-DocType: Lead,Fax,Fax
-,Profit and Loss Statement,Resultatopgørelse
-DocType: Lead,Lead,Bly
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
-apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-DocType: Leave Block List,Leave Block List Name,Lad Block List Name
-DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
-DocType: Purchase Order,Ref SQ,Ref SQ
-DocType: SMS Settings,Receiver Parameter,Modtager Parameter
-DocType: C-Form,Customer,Kunde
-DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
-DocType: SMS Center,SMS Center,SMS-center
-DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
-DocType: Quality Inspection Reading,Reading 9,Reading 9
-DocType: Event,Sunday,Søndag
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
-DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
-DocType: Pricing Rule,Price,Pris
-DocType: Naming Series,Update Series,Opdatering Series
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
-DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
-DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
-DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
-DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
-DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
-DocType: Employee,Owned,Ejet
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
-DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
-apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
-DocType: POS Profile,[Select],[Vælg]
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
-DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
-DocType: Leave Application,Total Leave Days,Total feriedage
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
-DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
-DocType: Time Log,Operation ID,Operation ID
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
-DocType: Production Order,Operation Cost,Operation Cost
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
-DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
-DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
-DocType: Communication,Closed,Lukket
-DocType: Quotation,Term Details,Term Detaljer
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Alle eksport relaterede områder som valuta, konverteringsfrekvens, eksport i alt, eksport grand total etc er tilgængelige i Delivery Note, POS, Citat, Sales Invoice, Sales Order etc."
-DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-DocType: Packing Slip,Gross Weight,Bruttovægt
-DocType: Communication,Email,Email
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
-DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: Hub Settings,Seller City,Sælger By
-DocType: Material Request,Material Issue,Materiale Issue
-,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
-DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
-DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Ulønnet
-DocType: DocField,Fold,Fold
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
-DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
-DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
-DocType: Selling Settings,Default Customer Group,Standard Customer Group
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
-DocType: Shipping Rule,Calculate Based On,Beregn baseret på
-apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
-DocType: BOM,Costing,Koster
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-DocType: Bin,Ordered Quantity,Bestilt Mængde
-,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
-DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
-DocType: SMS Center,All Sales Person,Alle Sales Person
-DocType: Account,Auditor,Revisor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
-DocType: Item,Valuation Method,Værdiansættelsesmetode
-DocType: BOM Item,BOM Item,BOM Item
-DocType: Sales Invoice,Mass Mailing,Mass Mailing
-,Bank Reconciliation Statement,Bank Saldoopgørelsen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
-DocType: Custom Field,Custom,Brugerdefineret
-DocType: Opportunity,Maintenance,Vedligeholdelse
-DocType: Item,Customer Items,Kunde Varer
-DocType: Lead,Industry,Industri
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
-DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
-DocType: Company,For Reference Only.,Kun til reference.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
-DocType: Lead,Middle Income,Midterste indkomst
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
-DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
-DocType: Production Order Operation,Work In Progress,Work In Progress
-DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
-DocType: Sales Order Item,For Production,For Produktion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
-,Billed Amount,Faktureret beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
-DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
-DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
-DocType: Email Account,Service,Service
-DocType: Purchase Taxes and Charges,Deduct,Fratrække
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
-,Financial Analytics,Finansielle Analytics
-DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}&gt; {1}
-DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
-DocType: Page,All,Alle
-DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
-DocType: Company,Retail,Retail
-DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
-DocType: Shipping Rule Condition,From Value,Fra Value
-DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-,Qty to Order,Antal til ordre
-DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
-DocType: Stock Settings,Default Item Group,Standard Punkt Group
-DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianter {0} opdateret
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
-DocType: Time Log,Projects Manager,Projekter manager
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
-DocType: Item Supplier,Item Supplier,Vare Leverandør
-DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
-DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
-DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
-DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
-DocType: Employee External Work History,Salary,Løn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
-DocType: Employee,Bank Name,Bank navn
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
-DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
-DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
-DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
-DocType: File,old_parent,old_parent
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
-DocType: Web Page,Left,Venstre
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
-DocType: DocField,Image,Billede
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
-DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
-DocType: Purchase Invoice,Half-yearly,Halvårligt
-DocType: Lead,Interested,Interesseret
-DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
-DocType: Project,Expected End Date,Forventet Slutdato
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
-DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
-DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-DocType: Event,Saturday,Lørdag
-DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
-DocType: Item,Manufacturer,Producent
-DocType: Budget Detail,Fiscal Year,Regnskabsår
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
-,Qty to Receive,Antal til Modtag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
-DocType: HR Settings,Payroll Settings,Payroll Indstillinger
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
-DocType: Appraisal,Appraisal,Vurdering
-DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
-DocType: Item,Is Service Item,Er service Item
-DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
-DocType: Production Plan Sales Order,SO Date,SO Dato
-DocType: Authorization Rule,Transaction,Transaktion
-,Finished Goods,Færdigvarer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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;"
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
-DocType: Pricing Rule,Brand,Brand
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
-DocType: Maintenance Schedule,Schedules,Tidsplaner
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
-DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
-,Budget Variance Report,Budget Variance Report
-DocType: Monthly Distribution,Distribution Name,Distribution Name
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
-DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
-DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
-DocType: Purchase Invoice Item,Image View,Billede View
-DocType: Naming Series,Prefix,Præfiks
-DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
-DocType: Sales Invoice,Rounded Total,Afrundet alt
-apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
-DocType: Sales Team,Contact No.,Kontakt No.
-DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
-DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
-,Purchase Order Trends,Indkøbsordre Trends
-DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
-DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
-DocType: Serial No,Creation Date,Oprettelsesdato
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
-DocType: Workflow State,Edit,Edit
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
-,Bank Clearance Summary,Bank Clearance Summary
-DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
-DocType: Employee,Leave Encashed?,Efterlad indkasseres?
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
-DocType: Time Log,Time Log,Time Log
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
-DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
-DocType: Lead,Organization Name,Organisationens navn
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
-DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
-DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-DocType: Appraisal,Start Date,Startdato
-DocType: Bin,Stock Value,Stock Value
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
-DocType: Employee,Holiday List,Holiday List
-DocType: SMS Log,Requested Numbers,Anmodet Numbers
-DocType: Expense Claim,Approver,Godkender
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
-DocType: Opportunity,Contact Info,Kontakt Info
-DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
-DocType: Holiday List,Holidays,Helligdage
-DocType: Workflow State,Tasks,Opgaver
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
-DocType: Item Attribute Value,Attribute Value,Attribut Værdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
-DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af selskabet
-DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
-DocType: User,Gender,Køn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
-DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
-DocType: Upload Attendance,Download Template,Hent skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
-DocType: POS Profile,Write Off Cost Center,Skriv Off Cost center
-DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
-DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
-,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
-DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
-DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
-DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
-DocType: Purchase Order,Delivered,Leveret
-DocType: Serial No,Out of AMC,Ud af AMC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
-DocType: Project,Internal,Intern
-DocType: Authorization Rule,Based On,Baseret på
-DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
-apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
-DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
-DocType: Item,Is Sales Item,Er Sales Item
-DocType: Warranty Claim,Raised By,Rejst af
-DocType: Sales Order,% Amount Billed,% Beløb Billed
-DocType: Account,Expense Account,Udgiftskonto
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
-apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
-DocType: Leave Type,Is Carry Forward,Er Carry Forward
-DocType: Employee,History In Company,Historie I Company
-,Received Items To Be Billed,Modtagne varer skal faktureres
-DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
-DocType: Features Setup,Sales Extras,Salg Extras
-DocType: Sales Invoice,Supplier Reference,Leverandør reference
-DocType: Item,Has Variants,Har Varianter
-DocType: Material Request Item,Lead Time Date,Leveringstid Dato
-DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
-DocType: BOM,Manufacturing,Produktion
-DocType: Note,Note,Bemærk
-DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
-DocType: Account,Is Group,Is Group
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
-DocType: Expense Claim,Project,Projekt
-DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
-,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
-DocType: Leave Block List Date,Block Date,Block Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
-DocType: Leave Block List,Block Days,Bloker dage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
-DocType: Purchase Invoice Item,PR Detail,PR Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
 DocType: Employee,Bank A/C No.,Bank A / C No.
-DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
-DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
-DocType: Territory,Territory Manager,Territory manager
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
-apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
-DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
-DocType: Event,All Day,All Day
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
-DocType: Task,Urgent,Urgent
-DocType: ToDo,Priority,Prioritet
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
-DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
-,Qty to Transfer,Antal til Transfer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
-DocType: Item,Quality Parameters,Kvalitetsparametre
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
-DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
-DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-DocType: Sales Invoice,Existing Customer,Eksisterende kunde
-DocType: Item Customer Detail,Ref Code,Ref Code
-DocType: Quality Inspection Reading,Parameter,Parameter
-DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
-DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
-DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
-DocType: Target Detail,Target Qty,Target Antal
-DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
-DocType: Leave Block List,Applies to Company,Gælder for Company
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
-DocType: Contact,Passive,Passiv
-DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
-DocType: Sales Partner,Targets,Mål
-DocType: Contact Us Settings,State,Stat
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
-DocType: Employee,Relation,Relation
-DocType: Workstation,Operating Costs,Drifts- omkostninger
-DocType: Item,Manufacturer Part Number,Producentens varenummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
-DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-DocType: Warranty Claim,Issue Date,Udstedelsesdagen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
-DocType: Sales Partner,Implementation Partner,Implementering Partner
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: Event,Thursday,Torsdag
-DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
-DocType: Item,Publish in Hub,Offentliggør i Hub
-DocType: Territory,Parent Territory,Parent Territory
-DocType: Item,Sales Details,Salg Detaljer
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
-DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
-DocType: Purchase Invoice,Contact Person,Kontakt Person
-DocType: Communication,Other,Andre
-DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
-DocType: Email Alert,Reference Date,Henvisning Dato
-DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: DocField,Label,Label
-DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
-DocType: Upload Attendance,Upload HTML,Upload HTML
-DocType: Project Task,Pending Review,Afventer anmeldelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
-apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
-DocType: Quality Inspection Reading,Reading 5,Reading 5
-DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
-DocType: Lead,Person Name,Person Name
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
-DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
-DocType: Purchase Receipt Item,Required By,Kræves By
-DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
-DocType: Time Log,From Time,Fra Time
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
-DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
-DocType: Journal Entry,Credit Note,Kreditnota
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
-DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
-apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
-DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
-DocType: Address,Plant,Plant
-DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
-DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
-DocType: Newsletter List,Total Subscribers,Total Abonnenter
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
-DocType: Purchase Order,% Billed,% Billed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-DocType: Event,Groups,Grupper
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
-,Lead Id,Bly Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
-DocType: Lead,From Customer,Fra kunde
-DocType: Sales Partner,Partner Type,Partner Type
-DocType: Employee Education,Year of Passing,År for Passing
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
-DocType: Customer,Customer Details,Kunde Detaljer
-DocType: Address,Utilities,Forsyningsvirksomheder
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
-DocType: Company,Default Bank Account,Standard bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
-DocType: Address,Shipping,Forsendelse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
-DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
-,Accounts Browser,Konti Browser
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-DocType: Item,Max Discount (%),Max Rabat (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
-DocType: Sales Order,Not Billed,Ikke Billed
-DocType: Account,Company,Firma
-DocType: Lead,Blog Subscriber,Blog Subscriber
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
-DocType: Item Variant,Item Variant,Item Variant
-DocType: Holiday List,Weekly Off,Ugentlig Off
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
-DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-DocType: Account,Payable,Betales
-DocType: Serial No,Delivery Document Type,Levering Dokumenttype
-DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-DocType: Page,No,Ingen
-apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
-DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
-DocType: Packed Item,Packed Item,Pakket Vare
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
-DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
-,Serial No Status,Løbenummer status
-DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
-DocType: Item,Weight UOM,Vægt UOM
-DocType: Purchase Invoice,Contact,Kontakt
-DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
-DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
-DocType: Leave Type,Is Encash,Er indløse
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
-DocType: Lead,Mobile No.,Mobil No.
-DocType: Employee,Date Of Retirement,Dato for pensionering
-DocType: Batch,Batch Description,Batch Beskrivelse
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
-DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
-apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
-DocType: Purchase Order Item,Received Qty,Modtaget Antal
-DocType: SMS Center,Receiver List,Modtager liste
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
-DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
-,Purchase Register,Indkøb Register
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-DocType: Pricing Rule,Supplier Type,Leverandør Type
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
-DocType: BOM Item,BOM No,BOM Ingen
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
-DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
-DocType: Item,Synced With Hub,Synkroniseret med Hub
-DocType: Employee,Applicable Holiday List,Gældende Holiday List
-DocType: Dependent Task,Dependent Task,Afhængig Opgave
-DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
-DocType: Cost Center,Budgets,Budgetter
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
-DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
-DocType: Journal Entry,Cash Entry,Cash indtastning
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
-DocType: Account,Stock,Lager
-DocType: Sales Invoice Item,Serial No,Løbenummer
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
-DocType: Production Order,Warehouses,Pakhuse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-DocType: Quality Inspection,Verified By,Verified by
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
-DocType: Global Defaults,Default Company,Standard Company
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
-DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-DocType: Department,Department,Afdeling
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
-DocType: Project,Default Cost Center,Standard Cost center
-DocType: BOM,Item UOM,Item UOM
-DocType: Sales Person,Parent Sales Person,Parent Sales Person
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
-DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
-DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
-DocType: Sales Partner,Target Distribution,Target Distribution
-DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
-apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
-DocType: Production Plan Item,Planned Qty,Planned Antal
-DocType: Company,Default Letter Head,Standard Letter hoved
-DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
-DocType: Leave Application,Follow via Email,Følg via e-mail
-DocType: Employee,Contract End Date,Kontrakt Slutdato
-DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
-DocType: Price List,Price List Name,Pris List Name
-DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
-DocType: Shipping Rule Condition,To Value,Til Value
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
-DocType: Sales Invoice Item,Brand Name,Brandnavn
-DocType: Company,Registration Details,Registrering Detaljer
-DocType: BOM Operation,Hour Rate,Hour Rate
-DocType: Job Applicant,Job Applicant,Job Ansøger
-DocType: Features Setup,Purchase Discounts,Køb Rabatter
-apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
-DocType: Journal Entry,Accounting Entries,Bogføring
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
-DocType: Bank Reconciliation,Total Amount,Samlet beløb
-DocType: Journal Entry,Bank Entry,Bank indtastning
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
-apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
-DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
-,Sales Funnel,Salg Tragt
-DocType: Newsletter,Test,Prøve
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
-DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
-DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-DocType: Activity Cost,Costing Rate,Costing Rate
-DocType: Blog Post,Blog Post,Blog-indlæg
-DocType: Employee,Rented,Lejet
-DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
-DocType: Leave Type,Leave Type Name,Lad Type Navn
-DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
-DocType: Job Applicant,Thread HTML,Tråd HTML
-DocType: Letter Head,Is Default,Er Standard
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element har varianter.
-DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
-DocType: Issue,Opening Time,Åbning tid
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Upload Attendance,Import Log,Import Log
-DocType: Purchase Invoice,In Words,I Words
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidsregistrering
-DocType: Project Task,View Task,View Opgave
-DocType: GL Entry,Against Voucher,Mod Voucher
-DocType: Purchase Receipt,Other Details,Andre detaljer
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
-DocType: C-Form,Quarter,Kvarter
-DocType: Holiday List,Holiday List Name,Holiday listenavn
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
-DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
-DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
-DocType: Item Price,Item Price,Item Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
-apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
-DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
-DocType: SMS Parameter,SMS Parameter,SMS Parameter
-DocType: Account,Frozen,Frosne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
-DocType: Holiday List,Clear Table,Klar Table
-DocType: Lead,Upper Income,Upper Indkomst
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
-DocType: SMS Log,No of Sent SMS,Ingen af Sent SMS
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
-,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-DocType: Communication,Received,Modtaget
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
-DocType: DocType,Administrator,Administrator
-DocType: POS Profile,POS Profile,POS profil
-DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
-DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
-DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
-,To Produce,At producere
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
-,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
-DocType: Sales Order,Not Applicable,Gælder ikke
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
-DocType: Employee,Leave Approvers,Lad godkendere
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Sales Invoice,Posting Time,Udstationering Time
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
-DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
-DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code&gt; Vare Gruppe&gt; Brand
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
-DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
-DocType: Item Attribute Value,Abbreviation,Forkortelse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
-DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
-DocType: Quality Inspection Reading,Accepted,Accepteret
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
-DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
-DocType: Account,Root Type,Root Type
-DocType: User,Male,Mand
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
-DocType: Employee,Exit,Udgang
-DocType: Bulk Email,Not Sent,Ikke Sent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
-DocType: Website Settings,Website Settings,Website Settings
-DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
-DocType: Item Price,Multiple Item prices.,Flere Item priser.
-DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
-DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
-DocType: Employee,Date of Birth,Fødselsdato
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
-DocType: Lead,Next Contact Date,Næste Kontakt Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
-DocType: Features Setup,Sales Discounts,Salg Rabatter
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
-DocType: Cost Center,Parent Cost Center,Parent Cost center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
-DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
-DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
-,Batch-Wise Balance History,Batch-Wise Balance History
-DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
-DocType: Brand,Item Manager,Item manager
-DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
-DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
-DocType: Sales Order Item,Projected Qty,Projiceret Antal
-DocType: SMS Log,SMS Log,SMS Log
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling &amp; industriel efterbehandling
-DocType: Customer,Commission Rate,Kommissionens Rate
-DocType: C-Form Invoice Detail,Net Total,Net Total
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
-,Sales Register,Salg Register
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
-DocType: Company,Stock Settings,Stock Indstillinger
-DocType: Company,Company Info,Firma Info
-DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-DocType: Item,Item Code for Suppliers,Item Code for leverandører
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
-DocType: Salary Slip,Bank Account No.,Bankkonto No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
-DocType: Cost Center,Cost Center Name,Cost center Navn
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
-,Gross Profit,Gross Profit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
-DocType: Account,Accounts,Konti
-DocType: Payment Tool,Against Vouchers,Mod Vouchers
-DocType: Account,Parent Account,Parent Konto
-apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
-DocType: Workflow State,Refresh,Opdater
-DocType: Expense Claim Detail,Claim Amount,Krav Beløb
-DocType: Item,UOMs,UOMs
-DocType: Journal Entry,Bill Date,Bill Dato
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
-apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
-DocType: Production Planning Tool,Material Requirement,Material Requirement
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
-DocType: DocPerm,Level,Level
-DocType: Naming Series,Update Series Number,Opdatering Series Number
-DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
-					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
-,Quotation Trends,Citat Trends
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
-DocType: Employee,Health Details,Sundhed Detaljer
-apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
-,Production Orders in Progress,Produktionsordrer i Progress
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Denne tidslog konflikter med {0} for {1} {2}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
-DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
-DocType: Attendance,Attendance,Fremmøde
-DocType: Features Setup,Item Serial Nos,Vare Serial Nos
-DocType: Employee,Organization Profile,Organisation profil
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
-DocType: Item,website page link,webside link
-DocType: Lead,Lower Income,Lavere indkomst
-DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning &amp; Fradrag
-DocType: BOM Operation,Operation Time,Operation Time
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
-DocType: Salary Slip,Arrear Amount,Bagud Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
-,Qty to Deliver,Antal til Deliver
-apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
-DocType: BOM,Operating Cost,Driftsomkostninger
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-DocType: Naming Series,User must always select,Brugeren skal altid vælge
-DocType: Project,Gross Margin %,Gross Margin%
-DocType: Attendance,Attendance Date,Fremmøde Dato
-DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
-DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
-DocType: Packing Slip,Get Items,Få Varer
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-DocType: Task Depends On,Task Depends On,Task Afhænger On
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
-DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
-DocType: Issue,Support,Support
-DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af kundeordre, Salg Faktura eller Kassekladde"
-DocType: Authorization Rule,Approving Role,Godkendelse Rolle
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
-DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
-DocType: Quotation,Shopping Cart,Indkøbskurv
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
-,Download Backups,Hent Backups
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-DocType: Email Digest,Income / Expense,Indtægter / Expense
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
-DocType: Designation,Designation,Betegnelse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
-apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
-DocType: Appraisal,Employee,Medarbejder
-DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
-DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
-DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
-DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
-DocType: Activity Cost,Projects User,Projekter Bruger
-,Stock Analytics,Stock Analytics
-DocType: Pricing Rule,Max Qty,Max Antal
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
-DocType: Serial No,Under Warranty,Under Garanti
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
-DocType: Email Digest,Receivables,Tilgodehavender
-DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
-DocType: Time Log,Hours,Timer
-,Purchase Order Items To Be Received,"Købsordre, der modtages"
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Leveres Beløb
-DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
-DocType: Employee,Permanent Address Is,Faste adresse
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-DocType: GL Entry,Against,Imod
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
-DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
-DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
-DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
-DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
-DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
-,Ordered Items To Be Billed,Bestilte varer at blive faktureret
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
-DocType: Communication,Phone,Telefon
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
-DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
-DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
-DocType: Print Settings,Classic,Klassisk
-DocType: Employee,Encashment Date,Indløsning Dato
-DocType: SMS Settings,SMS Settings,SMS-indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
-,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
-DocType: Salary Slip,Total Deduction,Samlet Fradrag
-apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
-DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
-DocType: SMS Log,Sent To,Sendt Til
-DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
-DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
-DocType: Payment Tool,Payment Account,Betaling konto
-DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
-DocType: Quotation,Order Type,Bestil Type
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
-DocType: GL Entry,Transaction Date,Transaktion Dato
-DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
-DocType: Selling Settings,Selling Settings,Salg af indstillinger
-DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
-DocType: Purchase Invoice,Next Date,Næste dato
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
-DocType: Email Digest,Email Digest,Email Digest
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
-,POS,POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
-DocType: Salary Structure,Total Earning,Samlet Earning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
-DocType: Sales Invoice,Sales Team1,Salg TEAM1
-DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
-DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
-DocType: Employee,Notice (days),Varsel (dage)
-DocType: Cost Center,Budget,Budget
-DocType: Maintenance Visit,Scheduled,Planlagt
-DocType: Bank Reconciliation Detail,Against Account,Mod konto
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
-DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
-apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
-DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-,S.O. No.,SÅ No.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
-DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
-DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod Serial No.
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-,Reserved,Reserveret
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
-DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
-DocType: Journal Entry,Reference Number,Referencenummer
-apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
-DocType: Account,Profit and Loss,Resultatopgørelse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
-DocType: Delivery Note,Billing Address,Faktureringsadresse
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen &quot;Tildel&quot; i indholdsoversigten.
-DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
-DocType: Company,Round Off Account,Afrunde konto
-DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
-DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-DocType: Employee,Blood Group,Blood Group
-apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
-DocType: Account,Temporary,Midlertidig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
-DocType: Serial No,Creation Time,Creation Time
-DocType: Contact Us Settings,Address Line 1,Adresse Line 1
-DocType: Page,Yes,Ja
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
-DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-DocType: Purchase Invoice,Quarterly,Kvartalsvis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
-DocType: Lead,Address & Contact,Adresse og kontakt
-DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
-,Employee Birthday,Medarbejder Fødselsdag
-DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
-DocType: Packing Slip Item,DN Detail,DN Detail
-,Terretory,Terretory
-DocType: Workstation,Working Hours,Arbejdstider
-,Stock Ageing,Stock Ageing
-DocType: Employee Education,Graduate,Graduate
-DocType: Features Setup,After Sale Installations,Efter salg Installationer
-DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
-DocType: System Settings,Loading...,Indlæser ...
-DocType: Lead,Consultant,Konsulent
-DocType: Stock Entry,Repack,Pakke
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
-,Setup Wizard,Setup Wizard
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
-DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
-DocType: Sales Invoice,Paid Amount,Betalt Beløb
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
-DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
-DocType: Maintenance Visit,Customer Feedback,Kundefeedback
-DocType: Fiscal Year,Year Name,År Navn
-,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
-DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
-DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
-DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
-DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;Til dato&#39; er nødvendig
-DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
-
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
-DocType: SMS Center,Create Receiver List,Opret Modtager liste
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
-DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
-DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
-DocType: Holiday,Holiday,Holiday
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
-DocType: Item,Default Selling Cost Center,Standard Selling Cost center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-DocType: Expense Claim Detail,Expense Date,Expense Dato
-DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
-DocType: Leave Control Panel,Employee Type,Medarbejder Type
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
-DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-DocType: Time Log,Billing Amount,Fakturering Beløb
-DocType: GL Entry,GL Entry,GL indtastning
-DocType: Project Task,Working,Working
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
-DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-DocType: Contact Us Settings,Introduction,Introduktion
-,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
-DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
-DocType: Stock Entry,Manufacture,Fremstilling
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
-DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
-DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
-DocType: Address,Shop,Butik
-DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
-DocType: Features Setup,Exports,Eksport
-DocType: C-Form,C-Form,C-Form
-DocType: Web Form,Select DocType,Vælg DocType
-DocType: Item,Taxes,Skatter
-DocType: Leave Control Panel,Allocate,Tildele
-DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
-DocType: Employee,Exit Interview Details,Exit Interview Detaljer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
-,Employee Leave Balance,Medarbejder Leave Balance
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
-DocType: Campaign,Campaign-.####,Kampagne -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
-DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
-DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
-DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
-DocType: Time Log,Costing Amount,Koster Beløb
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
-DocType: Stock Settings,Auto Material Request,Auto Materiale Request
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
-DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
-DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
-DocType: Warranty Claim,Resolved By,Løst Af
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
-apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
-DocType: Communication,Communication,Kommunikation
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
-DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
-DocType: Item Group,Parent Item Group,Moderselskab Item Group
-DocType: Quality Inspection,In Process,I Process
-DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
-DocType: Naming Series,Current Value,Aktuel værdi
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
-DocType: Lead,Product Enquiry,Produkt Forespørgsel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
-DocType: Employee,Employment Type,Beskæftigelse type
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx &quot;MC&quot;
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
-DocType: Serial No,Creation Document Type,Creation Dokumenttype
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
-DocType: Naming Series,Select Transaction,Vælg Transaktion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
-DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
-DocType: Employee,Job Profile,Job profil
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 Grand Total
-DocType: Purchase Order,Advance Paid,Advance Betalt
-DocType: Sales Partner,Logo,Logo
-,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
-DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
-DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
-DocType: Account,Income,Indkomst
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
-DocType: Account,Sales User,Salg Bruger
-DocType: Item Reorder,Transfer,Transfer
-,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
-apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
-apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
-DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
-DocType: Material Request,Requested For,Anmodet om
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
-DocType: Payment Tool,Paid,Betalt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-DocType: Contact Us Settings,Address,Adresse
-apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
-,Accounts Payable Summary,Kreditorer Resumé
-DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
-DocType: Issue,Attachment,Attachment
-,Purchase Receipt Trends,Kvittering Tendenser
-DocType: Opportunity,Walk In,Walk In
-DocType: Sales Invoice,Sales Team,Salgsteam
-DocType: Hub Settings,Seller Name,Sælger Navn
-DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
-DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
-DocType: Installation Note Item,Against Document No,Mod dokument nr
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
-DocType: Pricing Rule,Selling,Selling
-DocType: Pricing Rule,Disable,Deaktiver
-DocType: Salary Slip,Salary Slip,Lønseddel
-DocType: Purchase Invoice Item,Expense Head,Expense Hoved
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
-DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
-DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
-DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
-DocType: Purchase Invoice,Supplier Name,Leverandør Navn
-DocType: UOM,Must be Whole Number,Skal være hele tal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
-DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
-DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
-DocType: Appraisal,Calculate Total Score,Beregn Total Score
-DocType: Purchase Order,Supplied Items,Medfølgende varer
-DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
-DocType: Pricing Rule,Sales Manager,Salgschef
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
-DocType: Item,Re-Order Level,Re-Order Level
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
-DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
-DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-DocType: Quality Inspection,Report Date,Report Date
-DocType: Salary Slip,Payment Days,Betalings Dage
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
-DocType: Maintenance Schedule,Schedule,Køreplan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
-DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
-apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
-DocType: Territory,Territory Name,Territory Navn
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
-DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-DocType: Attendance,Employee Name,Medarbejder Navn
-DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
-DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
-DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
-DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
-DocType: Leave Application,Reason,Årsag
-DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-DocType: BOM Operation,Operation,Operation
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
-DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
-DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
-DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
-DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
-DocType: Item Group,General Settings,Generelle indstillinger
-DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
-DocType: Employee,Divorced,Skilt
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
-DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
-DocType: Account,Account Type,Kontotype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
-DocType: Fiscal Year,Companies,Virksomheder
-DocType: Time Log,Billed,Billed
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
-DocType: Serial No,Is Cancelled,Er Annulleret
-DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
-DocType: Warranty Claim,Warranty Claim,Garanti krav
-DocType: Employee,Confirmation Date,Bekræftelse Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
-DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
-DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
-DocType: Hub Settings,Access Token,Access Token
-DocType: Project,Estimated Costing,Anslået Costing
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
-DocType: Company,Default Holiday List,Standard Holiday List
-DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-DocType: ToDo,Reference,Henvisning
-DocType: Process Payroll,Activity Log,Activity Log
-DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
-apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
-DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
-DocType: Quality Inspection,Quality Inspection,Quality Inspection
-DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-DocType: Journal Entry,Total Debit,Samlet Debit
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
-DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
-
-Examples:
-
-1. Validity of the offer.
-1. Payment Terms (In Advance, On Credit, part advance etc).
-1. What is extra (or payable by the Customer).
-1. Safety / usage warning.
-1. Warranty if any.
-1. Returns Policy.
-1. Terms of shipping, if applicable.
-1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
-DocType: Salary Slip,Gross Pay,Gross Pay
-DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
-DocType: Purchase Invoice,Advances,Forskud
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-DocType: Item,Supplier Items,Leverandør Varer
-DocType: Purchase Invoice Item,Item,Vare
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
-DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
-DocType: Purchase Invoice Item,Accounting,Regnskab
-,Sales Invoice Trends,Salgsfaktura Trends
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
-DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-DocType: Production Planning Tool,Sales Orders,Salgsordrer
-DocType: Notification Control,Customize the Notification,Tilpas Underretning
-DocType: Event,Monday,Mandag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
-DocType: Sales Order Item,Actual Qty,Faktiske Antal
-DocType: Communication,Subject,Emne
-DocType: Employee,Permanent Address,Permanent adresse
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
-DocType: Packing Slip,To Package No.,At pakke No.
-DocType: Employee,Single,Enkeltværelse
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
-,Projected,Projiceret
-DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-DocType: User,Female,Kvinde
-DocType: UOM,UOM Name,UOM Navn
-DocType: Employee,Personal Email,Personlig Email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
-DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
-DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
-DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
-DocType: Material Request Item,Min Order Qty,Min prisen evt
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
-DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
-DocType: Sales Partner,Agent,Agent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
-DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-DocType: Sales Partner,Reseller,Forhandler
-apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
-					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-DocType: Employee,Cheque,Cheque
-DocType: Authorization Rule,Approving User,Godkendelse Bruger
-DocType: Stock Entry,Material Receipt,Materiale Kvittering
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
-DocType: Stock Entry,Difference Account,Forskel konto
-DocType: Company,Ignore,Ignorer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
-DocType: Fiscal Year,Year End Date,År Slutdato
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
-DocType: Workstation,Wages,Løn
-DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
-DocType: Pricing Rule,Purchase Manager,Indkøb manager
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
-DocType: Employee,New Workplace,Ny Arbejdsplads
-DocType: Bank Reconciliation,Bank Account,Bankkonto
-DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
-DocType: GL Entry,Party,Selskab
-DocType: Account,Fixed Asset,Fast Asset
-DocType: BOM,Operations,Operationer
-DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
-DocType: Employee,Employee Number,Medarbejder nummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
-DocType: Bank Reconciliation,From Date,Fra dato
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
-DocType: Notification Control,Delivery Note Message,Levering Note Message
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-DocType: Employee Education,Qualification,Kvalifikation
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
-DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
-DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
-DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
-DocType: Item,Customer Code,Customer Kode
-DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
-DocType: Item Website Specification,Item Website Specification,Item Website Specification
-DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
-DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
-DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Samlet fakturering Dette år:
-DocType: Opportunity,Opportunity Type,Opportunity Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
-DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
-DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
-DocType: Employee,Reports to,Rapporter til
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
-DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
-DocType: Expense Claim,Approval Status,Godkendelsesstatus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
-DocType: Maintenance Visit,Unscheduled,Uplanlagt
-DocType: Workstation Working Hour,End Time,End Time
-DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
-DocType: Purchase Order Item,Billed Amt,Billed Amt
-DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
-DocType: Employee Education,Under Graduate,Under Graduate
-DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
-DocType: Sales Order,%  Delivered,% Leveres
-apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
-DocType: Item,End of Life,End of Life
-DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
-DocType: Workflow,Is Active,Er Aktiv
-DocType: Purchase Invoice Item,Net Amount,Nettobeløb
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
-DocType: Contact Us Settings,Pincode,Pinkode
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-DocType: Workflow State,Time,Tid
-DocType: Sales Invoice,Cold Calling,Telefonsalg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
-DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
-DocType: Opportunity,To Discuss,Til Diskuter
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
-DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
-,Maintenance Schedules,Vedligeholdelsesplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
-DocType: Lead,Lead Owner,Bly Owner
-DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
-,Requested Qty,Anmodet Antal
-DocType: Employee Education,Post Graduate,Post Graduate
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
-DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
-DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
-DocType: Blog Post,Guest,Gæst
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
-DocType: Communication,Recipients,Modtagere
-DocType: Customer,Credit Limit,Kreditgrænse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
-DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
-DocType: Territory,Territory Targets,Territory Mål
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
-DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
-DocType: Sales Order,Fully Billed,Fuldt Billed
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
-DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
-DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
-DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
-DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
-DocType: Opportunity,Quotation,Citat
-DocType: Item,Has Batch No,Har Batch Nej
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
-DocType: Job Applicant,Applicant for a Job,Ansøger om et job
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
-DocType: Employee,Date of Issue,Udstedelsesdato
-DocType: Offer Letter Term,Offer Term,Offer Term
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af {0}
-DocType: Top Bar Item,Target,Target
-DocType: ToDo,Due Date,Due Date
-DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
-DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
-DocType: Item Group,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
-DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
-DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-DocType: Item,Inventory,Inventory
-DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
-DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
-DocType: Workstation,Rent Cost,Leje Omkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
-DocType: Sales Partner,Contact Desc,Kontakt Desc
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
-DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
-DocType: Supplier Quotation,Is Subcontracted,Underentreprise
-DocType: Employee,Current Address,Nuværende adresse
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
-DocType: Issue,Opening Date,Åbning Dato
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
-DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-DocType: Workflow State,User,Bruger
-DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
-DocType: Supplier,Address HTML,Adresse HTML
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-DocType: Sales Person,Sales Person Targets,Salg person Mål
-DocType: Installation Note,Installation Time,Installation Time
-apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
-DocType: Salary Slip Deduction,Default Amount,Standard Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
-DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
-DocType: DocType,Setup,Opsætning
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
-DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
-apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
-DocType: Features Setup,Item Advanced,Item Avanceret
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
-DocType: BOM Replace Tool,New BOM,Ny BOM
-DocType: Sales Invoice,Advertisement,Annonce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
-DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
-DocType: Hub Settings,Seller Website,Sælger Website
-DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
-DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
-DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
-DocType: GL Entry,Is Advance,Er Advance
-DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
-DocType: Sales Order Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
-DocType: C-Form,Received Date,Modtaget Dato
-DocType: Address,Address Type,Adressetype
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
-DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
-DocType: Serial No,Under AMC,Under AMC
-apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Adresse skabelon.
-DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
-DocType: Purchase Invoice Item,Net Rate,Net Rate
-DocType: Features Setup,Sales and Purchase,Salg og Indkøb
-DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
-apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
-DocType: DocPerm,Delete,Slet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
-,General Ledger,General Ledger
-DocType: Notification Control,Sales Order Message,Sales Order Message
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-DocType: Address,Postal,Postal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
-DocType: Purchase Invoice,Get Advances Paid,Få forskud
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
-DocType: Sales Order,Fully Delivered,Fuldt Leveres
-apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
-DocType: Expense Claim,Expenses,Udgifter
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
-DocType: Item Group,Item Group Name,Item Group Name
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
-DocType: Employee,Cell Number,Cell Antal
-DocType: Company,Default Payable Account,Standard Betales konto
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
-DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
-DocType: Project,% Tasks Completed,% Opgaver Afsluttet
-DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
-DocType: Sales Partner,Partner's Website,Partner s hjemmeside
-,Support Analytics,Support Analytics
-DocType: Item,Is Purchase Item,Er Indkøb Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
-DocType: Salary Slip,Deductions,Fradrag
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
-DocType: Account,Purchase User,Køb Bruger
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
-DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
-DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
-DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
-DocType: Notification Control,Quotation Message,Citat Message
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
-apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
-DocType: Project,Expected Start Date,Forventet startdato
-,Transferred Qty,Overført Antal
-DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
-DocType: GL Entry,Remarks,Bemærkninger
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
-DocType: Issue,Issue,Issue
-DocType: Communication,Sent,Sent
-DocType: Customer,Individual,Individuel
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
-DocType: Item,Purchase Details,Køb Detaljer
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
-DocType: Purchase Invoice Item,Page Break,Side Break
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
-,Sales Browser,Salg Browser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
-DocType: Journal Entry Account,Sales Invoice,Salg Faktura
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
-DocType: Web Page,Slideshow,Slideshow
-DocType: Item,Will also apply to variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
-DocType: Payment Tool,Payment Mode,Betaling tilstand
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
-DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
-DocType: Event,Friday,Fredag
-,Accounts Receivable Summary,Debitor Resumé
-,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
-DocType: Journal Entry,Excise Entry,Excise indtastning
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
-DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
-DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
-DocType: Sales Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
-DocType: Salary Slip,Earning,Optjening
-apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
-DocType: Employee,Company Email,Firma Email
-DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
-DocType: Production Order,Manufactured Qty,Fremstillet Antal
-DocType: Quality Inspection Reading,Reading 3,Reading 3
-DocType: Party Account,Party Account,Party Account
-DocType: Company,Warn,Advar
-DocType: Journal Entry,Journal Entry,Kassekladde
-DocType: Installation Note,Installation Date,Installation Dato
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
-DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
-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/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
-DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
-DocType: Stock Entry,Sales Invoice No,Salg faktura nr
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
-DocType: Installation Note,Installation Note,Installation Bemærk
-DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-DocType: Item,Default Unit of Measure,Standard Måleenhed
-DocType: Purchase Invoice Item,Item Name,Item Name
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
-DocType: BOM Replace Tool,Replace,Udskifte
-DocType: Item,Inspection Criteria,Inspektion Kriterier
-DocType: Offer Letter Term,Value / Description,/ Beskrivelse
-DocType: Stock Entry,Purpose,Formål
-DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
-DocType: Opportunity Item,Opportunity Item,Opportunity Vare
-DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
-DocType: Employee,Relieving Date,Lindre Dato
-DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
-DocType: C-Form,C-Form No,C-Form Ingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
-DocType: Communication,Open,Åbent
-DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
-DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
-DocType: Activity Cost,Projects,Projekter
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
-DocType: Sales Invoice,Exhibition,Udstilling
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
-,BOM Search,BOM Søg
-DocType: Notification Control,Purchase Receipt Message,Kvittering Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
-DocType: ToDo,High,Høj
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
-DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
-DocType: Quotation Item,Quotation Item,Citat Vare
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
-DocType: Item,Serial Number Series,Serial Number Series
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-DocType: Authorization Rule,Authorization Rule,Autorisation Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
-apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
-DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
-DocType: Page,Page Name,Side Navn
-DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
-DocType: Expense Claim,Task,Opgave
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
-DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
-DocType: Sales Invoice,Payment Due Date,Betaling Due Date
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
-DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-DocType: Purchase Invoice,Is Return,Er Return
-DocType: Opportunity,Lost Reason,Tabt Årsag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
-DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
-DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
-DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
-DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
-DocType: Pricing Rule,Apply On,Påfør On
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
-
-The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
-
-For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
-
-Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have &quot;Er Stock Item&quot; som &quot;Nej&quot; og &quot;Er Sales Item&quot; som &quot;Ja&quot;. For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
-DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Company,Default Terms,Standard Vilkår
-DocType: Company,Default Income Account,Standard Indkomst konto
-,Sales Partners Commission,Salg Partners Kommissionen
-DocType: Item Variant Attribute,Attribute,Attribut
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
-DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
-DocType: Workstation,per hour,per time
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
-DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
-DocType: Purchase Invoice Item,Project Name,Projektnavn
-DocType: Opportunity,Opportunity From,Mulighed Fra
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
-DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total Ulønnet
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
-DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-DocType: Notification Control,Custom Message,Tilpasset Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
-DocType: C-Form Invoice Detail,Territory,Territory
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
-DocType: Newsletter,Email Sent?,E-mail Sendt?
-DocType: Budget Detail,Budget Allocated,Budgettet
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
-DocType: Task,Closing Date,Closing Dato
-DocType: Sales Order,Not Delivered,Ikke leveret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
-DocType: Attendance,Present,Present
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
-DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af verden
-DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
-DocType: Features Setup,Item Barcode,Item Barcode
-DocType: Communication,Date,Dato
-DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
-,Purchase Analytics,Køb Analytics
-DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
-apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
-DocType: BOM,Total Cost,Total Cost
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
-DocType: SMS Center,All Lead (Open),Alle Bly (Open)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} eksisterer ikke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
-DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-DocType: Quality Inspection,Inspected By,Inspiceres af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
-DocType: Lead,Do Not Contact,Må ikke komme i kontakt
-DocType: GL Entry,Voucher Type,Voucher Type
-DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
-DocType: BOM Replace Tool,Current BOM,Aktuel BOM
-DocType: Sales Invoice,Is Opening Entry,Åbner post
-DocType: Payment Tool,Make Journal Entry,Make Kassekladde
-DocType: SMS Center,Total Message(s),Total Besked (r)
-DocType: Employee,Salutation,Salutation
-DocType: Feed,Full Name,Fulde navn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
-DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
-DocType: Item,Variant Of,Variant af
-DocType: Bin,FCFS Rate,FCFS Rate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
-DocType: Print Settings,Modern,Moderne
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
-DocType: Item,Default Supplier,Standard Leverandør
-DocType: BOM,Item Desription,Item desription
-DocType: Employee Education,Class / Percentage,Klasse / Procent
-DocType: Sales Invoice,Debit To,Betalingskort Til
-DocType: Bank Reconciliation,To Date,Til dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
-DocType: Sales Partner,Retailer,Forhandler
-DocType: Comment,Reference Name,Henvisning Navn
-DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
-DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
-DocType: Expense Claim,Approved,Godkendt
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: Account,Equity,Egenkapital
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
-DocType: Pricing Rule,Buying,Køb
-DocType: Territory,For reference,For reference
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
-DocType: Features Setup,Point of Sale,Point of Sale
-DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
-DocType: Quality Inspection Reading,Reading 6,Læsning 6
-DocType: Currency Exchange,From Currency,Fra Valuta
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
-DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
-DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
-DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
-DocType: Pricing Rule,Min Qty,Min Antal
-,Sales Order Trends,Salg Order Trends
-DocType: Delivery Note,Instructions,Instruktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
-DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
-DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
-DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
-DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
-DocType: Expense Claim,From Employee,Fra Medarbejder
-DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
-DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
-DocType: Branch,Branch,Branch
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
-,Item Shortage Report,Item Mangel Rapport
-DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-DocType: Leave Control Panel,Carry Forward,Carry Forward
-DocType: Item,Moving Average,Glidende gennemsnit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
-DocType: Price List,Price List Master,Prisliste Master
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
-DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
-DocType: Pricing Rule,Item Group,Item Group
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
-DocType: Item Group,Default Expense Account,Standard udgiftskonto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
-DocType: BOM Operation,Workstation,Arbejdsstation
-DocType: Newsletter,Newsletter List,Nyhedsbrev List
-DocType: Features Setup,Brands,Mærker
-DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
-DocType: Fiscal Year,Year Start Date,År Startdato
-DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
-DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
-DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-DocType: Company,Round Off Cost Center,Afrunde Cost center
-DocType: Purchase Invoice,End Date,Slutdato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
-DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
-DocType: Bulk Email,Message,Besked
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
-DocType: Sales Invoice,Customer Address,Kunde Adresse
-DocType: Custom Script,Client,Klient
-DocType: Task,Review Date,Anmeldelse Dato
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
-DocType: Item,Variants,Varianter
-DocType: Quotation Item,Against Docname,Mod Docname
-DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
-DocType: Journal Entry Account,Expense Claim,Expense krav
-DocType: Workflow State,Search,Søg
-apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
-DocType: Journal Entry,Accounts Receivable,Tilgodehavender
-DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
-DocType: Employee,Married,Gift
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
-DocType: Product Bundle,Product Bundle,Produkt Bundle
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
-DocType: Features Setup,Miscelleneous,Miscelleneous
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
-DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
-DocType: Account,Cash,Kontanter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
-DocType: Journal Entry,Opening Entry,Åbning indtastning
-DocType: Appraisal,Appraisal Template,Vurdering skabelon
-DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
-DocType: POS Profile,Write Off Account,Skriv Off konto
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
-DocType: DocType,System,System
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-DocType: Pricing Rule,Campaign,Kampagne
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
-DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
-DocType: Lead,Request Type,Anmodning Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
-DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
-						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
-apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
-DocType: Stock Entry,For Quantity,For Mængde
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Betales konto
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
-DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
-DocType: Production Order,Item To Manufacture,Item Til Fremstilling
-DocType: Purchase Invoice,Price List Currency,Pris List Valuta
-DocType: Address,Subsidiary,Datterselskab
-DocType: Contact Us Settings,Address Title,Adresse Titel
-DocType: Purchase Invoice Item,Qty,Antal
-apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
-DocType: Company History,Year,År
-DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
-DocType: Journal Entry,Write Off,Skriv Off
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
-DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
-apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
-DocType: BOM,Materials,Materialer
-DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Indtast venligst kvittering først
-DocType: Sales Partner,Distributor,Distributør
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
-DocType: Standard Reply,Owner,Ejer
-DocType: Task,Expected Time (in hours),Forventet tid (i timer)
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
-DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
-DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
-DocType: Employee,Family Background,Familie Baggrund
-DocType: Sales Order,Partly Billed,Delvist Billed
-DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
-DocType: About Us Settings,Website,Websted
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
-DocType: Email Digest,How frequently?,Hvor ofte?
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Purchase Order,% Received,% Modtaget
-DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: SMS Center,Send SMS,Send SMS
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
-DocType: Item,Default BOM,Standard BOM
-DocType: Sales Order,To Deliver and Bill,At levere og Bill
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
-DocType: Warehouse,Warehouse Name,Warehouse Navn
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
-DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
-DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
-apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
-DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: File,Lft,LFT
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
-DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
-DocType: Quality Inspection,Quality Manager,Kvalitetschef
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
-,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
-DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
-DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
-DocType: Salary Slip,Deduction,Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
-DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
-DocType: Employee,Held On,Held On
+DocType: Expense Claim,Project,Projekt
+DocType: Quality Inspection Reading,Reading 7,Reading 7
 DocType: Address,Personal,Personlig
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Forkert Adgangskode
-DocType: Payment Reconciliation,Reconcile,Forene
-DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
-,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
-apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
-DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
-DocType: Async Task,System Manager,System Manager
-DocType: Maintenance Visit,Completion Status,Afslutning status
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden eksisterer med samme navn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
-DocType: Project,Project Type,Projekt type
-DocType: Communication,Series,Series
-DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
-DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
-DocType: Offer Letter,Offer Letter,Tilbyd Letter
-DocType: Project,External,Ekstern
-DocType: Workstation,Workstation Name,Workstation Navn
-DocType: Employee,Emergency Phone,Emergency Phone
-DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
-DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
-DocType: DocField,Name,Navn
-DocType: Workstation Working Hour,Start Time,Start Time
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
-DocType: Item Reorder,Material Request Type,Materiale Request Type
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
-DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
-DocType: Sales Invoice,Packed Items,Pakket Varer
-DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
-DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
-apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
-DocType: Stock Entry,From BOM,Fra BOM
-DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-DocType: Hub Settings,Seller Country,Sælger Land
-DocType: Account,Old Parent,Gammel Parent
-DocType: Purchase Order,Stopped,Stoppet
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
-DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
-DocType: Packing Slip,From Package No.,Fra pakken No.
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
-DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
-DocType: Account,Warehouse,Warehouse
-DocType: Pricing Rule,Valid From,Gyldig fra
-DocType: Comment,Unsubscribed,Afmeldt
-DocType: Pricing Rule,Discount Percentage,Discount Procent
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
-DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
-DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
-DocType: Sales Invoice,Total Commission,Samlet Kommissionen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-DocType: ToDo,Medium,Medium
-apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
-DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
-DocType: Quality Inspection Reading,Reading 2,Reading 2
-,Lead Details,Bly Detaljer
-DocType: Company,Domain,Domæne
-DocType: Employee,Internal Work History,Intern Arbejde Historie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
-DocType: Serial No,Incoming Rate,Indgående Rate
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
-DocType: Lead,Address Desc,Adresse Desc
-DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
-DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
-DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
-DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
-DocType: Company,Default Cash Account,Standard Kontant konto
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
-DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
-DocType: Time Log,Billable,Faktureres
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
-DocType: Issue,First Responded On,Først svarede den
-apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
-DocType: Job Applicant,Job Opening,Job Åbning
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
-DocType: Appraisal,Goals,Mål
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
-DocType: POS Profile,Terms and Conditions,Betingelser
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-DocType: Item,Has Serial No,Har Løbenummer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
-DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-DocType: Company,Services,Tjenester
-DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
-DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
-DocType: Address,City/Town,By / Town
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
-DocType: Material Request Item,Material Request Item,Materiale Request Vare
-DocType: Material Request,Material Transfer,Materiale Transfer
-,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
-DocType: Item,Re-Order Qty,Re-prisen evt
-DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
-,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
-DocType: Account,Round Off,Afrunde
-DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
-DocType: Account,Credit,Credit
-DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
-DocType: Item,Customer Item Codes,Kunde Item Koder
-DocType: Project Task,Project Task,Project Task
-apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
-DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
-DocType: Purchase Invoice,Mobile No,Mobile Ingen
-DocType: Account,Debit,Betalingskort
-DocType: BOM Item,Scrap %,Skrot%
-DocType: Payment Tool,Payment Tool,Betaling Tool
-DocType: Event,Tuesday,Tirsdag
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
-,Stock Projected Qty,Stock Forventet Antal
-DocType: Supplier,Stock Manager,Stock manager
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
-			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
-DocType: BOM,Manufacturing User,Manufacturing Bruger
-DocType: Production Planning Tool,Production Orders,Produktionsordrer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
-DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
-DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
-DocType: Sales Invoice,Customer Name,Customer Name
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
-DocType: BOM Operation,Operation Description,Operation Beskrivelse
-DocType: Sales Person,Sales Person Name,Salg Person Name
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
-DocType: Process Payroll,Select Employees,Vælg Medarbejdere
-,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
-DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
-,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
-DocType: Features Setup,Item Batch Nos,Item Batch nr
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
+DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
-DocType: Journal Entry,Bill No,Bill Ingen
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
-DocType: BOM,Exploded_items,Exploded_items
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
-DocType: Workstation,Wages per hour,Lønningerne i timen
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
-DocType: Time Log Batch,Total Hours,Total Hours
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
-DocType: Account,Balance must be,Balance skal være
-DocType: Issue,Raised By (Email),Rejst af (E-mail)
-DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
-DocType: Cost Center,Cost Center,Cost center
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
-DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
-DocType: Item,Default Warehouse,Standard Warehouse
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
-,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
-DocType: Opportunity,With Items,Med Varer
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
-DocType: DocField,Currency,Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
-DocType: Employee,Emergency Contact,Emergency Kontakt
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
-DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
-DocType: Industry Type,Industry Type,Industri Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
-DocType: DocField,Description,Beskrivelse
-DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Account,Stock Adjustment,Stock Justering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
-DocType: Lead,Suggestions,Forslag
-DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-DocType: ToDo,Low,Lav
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
-DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
-,Delivery Note Trends,Følgeseddel Tendenser
-apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
-DocType: Purchase Receipt,Range,Range
-DocType: Account,Receivable,Tilgodehavende
-DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
-apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
-DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
-DocType: Lead,Channel Partner,Channel Partner
-DocType: Communication,Replied,Svarede
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
-DocType: Item,Lead Time in days,Lead Time i dage
-DocType: Journal Entry,Debit Note,Debetnota
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
-DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
-apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
-DocType: Appraisal,For Employee Name,For Medarbejder Navn
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
-DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
-DocType: Journal Entry,User Remark,Bruger Bemærkning
-DocType: Sales Order,Partly Delivered,Delvist Delivered
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
-DocType: Purchase Invoice,Credit To,Credit Til
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
-DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
-DocType: Naming Series,Setup Series,Opsætning Series
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
-DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
-DocType: Sales Invoice,Get Advances Received,Få forskud
-DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
-DocType: Company,Phone No,Telefon Nej
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
-DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-DocType: Purchase Invoice,Terms,Betingelser
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
+DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
+DocType: Employee,Family Background,Familie Baggrund
 DocType: Process Payroll,Send Email,Send Email
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item &#39;Er Fremstillet&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
-DocType: Contact Us Settings,City,By
-DocType: Hub Settings,Seller Description,Sælger Beskrivelse
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
-DocType: Tax Rule,Sales,Salg
-DocType: Salary Structure,Salary Structure,Løn Struktur
-DocType: BOM Operation,BOM Operation,BOM Operation
-DocType: Warranty Claim,Resolution,Opløsning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
-,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
-DocType: Purchase Invoice,Contact Email,Kontakt E-mail
-DocType: SMS Settings,Message Parameter,Besked Parameter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
-DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
-DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
-DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
-DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
-DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
-DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
-DocType: POS Profile,Update Stock,Opdatering Stock
-DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
-Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
-DocType: Serial No,Delivery Details,Levering Detaljer
-DocType: Hub Settings,Sync Now,Synkroniser nu
-DocType: Dropbox Backup,Daily,Daglig
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
-,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
-DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
-DocType: Mode of Payment,Mode of Payment,Mode Betaling
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
-DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
-DocType: Item,Item Tax,Item Skat
-DocType: Leave Block List,Allow Users,Tillad brugere
-DocType: Cost Center,Stock User,Stock Bruger
-DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
-DocType: Delivery Note,Transporter Name,Transporter Navn
-DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-DocType: Company,Distribution,Distribution
-DocType: Pricing Rule,Applicable For,Gældende For
-DocType: Account,Account,Konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
-DocType: Workstation,Net Hour Rate,Net Hour Rate
-apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
-DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
-DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
-DocType: Country,Country,Land
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
-,Amount to Deliver,"Beløb, Deliver"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
-DocType: Lead,Opportunity,Mulighed
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-DocType: Appraisal,HR User,HR Bruger
-DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-DocType: Quotation Item,Against Doctype,Mod DOCTYPE
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
-DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
-DocType: Item,Auto re-order,Auto re-ordre
-DocType: GL Entry,Voucher No,Blad nr
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
-DocType: Warranty Claim,Service Address,Tjeneste Adresse
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
-DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
-apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
-DocType: Employee,External Work History,Ekstern Work History
-DocType: Production Order,Planned Start Date,Planlagt startdato
-DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
-DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
-DocType: Employee,Mr,Hr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
-,Hub,Hub
-DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
-DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-DocType: Journal Entry Account,Purchase Order,Indkøbsordre
-DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
-apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
-DocType: Employee,Salary Information,Løn Information
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
-DocType: Item,Allow Production Order,Tillad produktionsordre
-DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
-DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
-DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
-DocType: Job Applicant,Hold,Hold
-DocType: Letter Head,Letter Head,Brev hoved
-DocType: Item,Website Description,Website Beskrivelse
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
-DocType: Newsletter,Newsletter,Nyhedsbrev
-DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
+DocType: Company,Default Bank Account,Standard bankkonto
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
+DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
+DocType: Purchase Order,Stopped,Stoppet
+DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Vælg BOM at starte
+DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Upload lager balance via csv.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
+,Support Analytics,Support Analytics
 DocType: Item,Website Warehouse,Website Warehouse
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
-DocType: Features Setup,Features Setup,Features Setup
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
-DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
-DocType: Report,Report Type,Rapporttype
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
-DocType: Installation Note Item,Installed Qty,Antal installeret
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
-DocType: Website Item Group,Website Item Group,Website Item Group
-DocType: BOM Item,Item Description,Punkt Beskrivelse
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
-DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
-DocType: Employee,Education,Uddannelse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
-DocType: User,Bio,Bio
-DocType: Address,Lead Name,Bly navn
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
-DocType: Bin,Reserved Quantity,Reserveret Mængde
-DocType: Attendance,Half Day,Half Day
-DocType: Email Digest,For Company,For Company
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Felt fås i Delivery Note, Citat, Sales Invoice, Sales Order"
-,Open Production Orders,Åbne produktionsordrer
-DocType: Account,Bank,Bank
-DocType: Monthly Distribution Percentage,Month,Måned
-DocType: Project Task,Task ID,Opgave-id
-DocType: About Us Settings,Website Manager,Website manager
-DocType: SMS Settings,Static Parameters,Statiske parametre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
-,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
-DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
-DocType: Item Attribute,Attribute Name,Attribut Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-DocType: Contact,User ID,Bruger-id
-DocType: User,Last Name,Efternavn
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
-DocType: Salary Slip,Net Pay,Nettoløn
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
-DocType: Customer,Fixed Days,Faste dage
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
-DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-DocType: Rename Tool,Rename Log,Omdøbe Log
-DocType: Quality Inspection,Outgoing,Udgående
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Form optegnelser
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde og leverandør
+DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support forespørgsler fra kunder.
+DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
+DocType: Production Planning Tool,Select Items,Vælg emner
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
+DocType: Maintenance Visit,Completion Status,Afslutning status
+DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
+DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
+DocType: Upload Attendance,Import Attendance,Import Fremmøde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+DocType: Process Payroll,Activity Log,Activity Log
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
+DocType: Production Order,Item To Manufacture,Item Til Fremstilling
+DocType: Sales Order Item,Projected Qty,Projiceret Antal
+DocType: Sales Invoice,Payment Due Date,Betaling Due Date
+DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
+DocType: Notification Control,Delivery Note Message,Levering Note Message
+DocType: Expense Claim,Expenses,Udgifter
+,Purchase Receipt Trends,Kvittering Tendenser
+DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
+,Amount to Bill,Beløb til Bill
+DocType: Company,Registration Details,Registrering Detaljer
+DocType: Item,Re-Order Qty,Re-prisen evt
+DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
+DocType: Pricing Rule,Price or Discount,Pris eller rabat
+DocType: Sales Team,Incentives,Incitamenter
+DocType: SMS Log,Requested Numbers,Anmodet Numbers
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Præstationsvurdering.
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+DocType: Account,Balance must be,Balance skal være
+DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
+DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
+,Available Qty,Tilgængelig Antal
+DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
+DocType: Salary Slip,Working Days,Arbejdsdage
+DocType: Serial No,Incoming Rate,Indgående Rate
+DocType: Packing Slip,Gross Weight,Bruttovægt
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
+DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
+DocType: Job Applicant,Hold,Hold
+DocType: Employee,Date of Joining,Dato for Sammenføjning
+DocType: Naming Series,Update Series,Opdatering Series
+DocType: Supplier Quotation,Is Subcontracted,Underentreprise
+DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
+DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
+,Received Items To Be Billed,Modtagne varer skal faktureres
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
+DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
+DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
+DocType: Bank Reconciliation,Total Amount,Samlet beløb
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
+DocType: Production Planning Tool,Production Orders,Produktionsordrer
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
+DocType: Purchase Receipt,Range,Range
+DocType: Supplier,Default Payable Accounts,Standard betales Konti
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
+DocType: Features Setup,Item Barcode,Item Barcode
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Item Varianter {0} opdateret
+DocType: Quality Inspection Reading,Reading 6,Læsning 6
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
+DocType: Address,Shop,Butik
+DocType: Hub Settings,Sync Now,Synkroniser nu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
+DocType: Employee,Permanent Address Is,Faste adresse
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
+DocType: Employee,Exit Interview Details,Exit Interview Detaljer
+DocType: Item,Is Purchase Item,Er Indkøb Item
+DocType: Journal Entry Account,Purchase Invoice,Indkøb Faktura
+DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
+DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
+DocType: Lead,Request for Information,Anmodning om information
+DocType: Payment Tool,Paid,Betalt
+DocType: Salary Slip,Total in words,I alt i ord
+DocType: Material Request Item,Lead Time Date,Leveringstid Dato
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Angiv Serial Nej for Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","For &#39;Product Bundle&#39; elementer, Warehouse, Serial No og Batch Ingen vil blive betragtet fra &quot;Packing List &#39;bord. Hvis Warehouse og Batch Ingen er ens for alle emballage poster for enhver &quot;Product Bundle &#39;post, kan indtastes disse værdier i de vigtigste element tabellen, vil værdierne blive kopieret til&quot; Packing List&#39; bord."
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
+DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Firmaets navn
+DocType: SMS Center,Total Message(s),Total Besked (r)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
+DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-DocType: Hub Settings,Seller Email,Sælger Email
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
-DocType: Workflow State,Primary,Primær
-DocType: Employee,Marital Status,Civilstand
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-DocType: C-Form,Amended From,Ændret Fra
-DocType: Pricing Rule,For Price List,For prisliste
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
-DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
-DocType: Product Bundle,Parent Item,Parent Item
-,Item-wise Sales History,Vare-wise Sales History
-DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af denne Kontakt
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
-DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
-DocType: Cost Center,Distribution Id,Distribution Id
-DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
-DocType: Issue,Resolution Details,Opløsning Detaljer
-,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
+DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
+DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
+DocType: Opportunity,Walk In,Walk In
+DocType: Item,Inspection Criteria,Inspektion Kriterier
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
+DocType: SMS Center,All Lead (Open),Alle Bly (Open)
+DocType: Purchase Invoice,Get Advances Paid,Få forskud
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
+DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
+DocType: Lead,Next Contact Date,Næste Kontakt Dato
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
+DocType: Holiday List,Holiday List Name,Holiday listenavn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
+DocType: Journal Entry Account,Expense Claim,Expense krav
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
+DocType: Leave Application,Leave Application,Forlad Application
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
+DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
+DocType: Workstation,Net Hour Rate,Net Hour Rate
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
+DocType: Company,Default Terms,Standard Vilkår
+DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
+DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+DocType: Delivery Note,Delivery To,Levering Til
+DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
+DocType: Features Setup,Purchase Discounts,Køb Rabatter
+DocType: Workstation,Wages,Løn
+DocType: Time Log,Will be updated only if Time Log is 'Billable',"Vil kun blive opdateret, hvis Time Log er &quot;faktureres&quot;"
+DocType: Project,Internal,Intern
+DocType: Task,Urgent,Urgent
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
+DocType: Item,Manufacturer,Producent
+DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
+DocType: Serial No,Creation Document No,Creation dokument nr
+DocType: Issue,Issue,Issue
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+DocType: BOM Operation,Operation,Operation
+DocType: Lead,Organization Name,Organisationens navn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Buying
+DocType: GL Entry,Against,Imod
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+DocType: Sales Partner,Implementation Partner,Implementering Partner
+DocType: Opportunity,Contact Info,Kontakt Info
+DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
+DocType: Item,Default Supplier,Standard Leverandør
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
+DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelse Rule Betingelse
+DocType: Features Setup,Miscelleneous,Miscelleneous
+DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
+DocType: Sales Person,Select company name first.,Vælg firmanavn først.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Citater modtaget fra leverandører.
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Til {0} | {1} {2}
+DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
+DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+DocType: Company,Default Currency,Standard Valuta
+DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af denne Kontakt
+DocType: Expense Claim,From Employee,Fra Medarbejder
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
+DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
+DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
+DocType: SMS Center,Total Characters,Total tegn
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
+DocType: Item,website page link,webside link
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
+DocType: Sales Partner,Distributor,Distributør
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+,Ordered Items To Be Billed,Bestilte varer at blive faktureret
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
+DocType: Global Defaults,Global Defaults,Globale standarder
+DocType: Salary Slip,Deductions,Fradrag
+DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,This Time Log Batch er blevet faktureret.
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
 DocType: Salary Slip,Leave Without Pay,Lad uden løn
-DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
-DocType: System Settings,System Settings,Systemindstillinger
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
-DocType: Address Template,Address Template,Adresse Skabelon
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
-DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
-DocType: Customer,Default Price List,Standard prisliste
+DocType: Supplier,Communications,Kommunikation
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Capacity Planning Fejl
+DocType: Lead,Consultant,Konsulent
+DocType: Salary Slip,Earnings,Indtjening
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Åbning Regnskab Balance
+DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
+DocType: Purchase Invoice,Is Return,Er Return
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
+DocType: Item,UOMs,UOMs
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} gyldige løbenr for Item {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
+DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
+DocType: Stock Settings,Default Item Group,Standard Punkt Group
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
+DocType: Account,Balance Sheet,Balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
+DocType: Lead,Lead,Bly
+DocType: Email Digest,Payables,Gæld
+DocType: Account,Warehouse,Warehouse
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
+DocType: Purchase Invoice Item,Net Rate,Net Rate
+DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+DocType: Holiday,Holiday,Holiday
+DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
+,Daily Time Log Summary,Daglig Time Log Summary
+DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
+DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
+DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
+DocType: Lead,Call,Opkald
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+,Trial Balance,Trial Balance
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
+DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
+DocType: Contact,User ID,Bruger-id
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+,Budget Variance Report,Budget Variance Report
+DocType: Salary Slip,Gross Pay,Gross Pay
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Betalt udbytte
+DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Overført overskud
+DocType: BOM Item,Item Description,Punkt Beskrivelse
+DocType: Payment Tool,Payment Mode,Betaling tilstand
+DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
+DocType: Purchase Order,Supplied Items,Medfølgende varer
+DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
+DocType: Opportunity Item,Opportunity Item,Opportunity Vare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
+,Employee Leave Balance,Medarbejder Leave Balance
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
+DocType: Address,Address Type,Adressetype
+DocType: Purchase Receipt,Rejected Warehouse,Afvist Warehouse
+DocType: GL Entry,Against Voucher,Mod Voucher
+DocType: Item,Default Buying Cost Center,Standard købsomkostninger center
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
+DocType: Item,Lead Time in days,Lead Time i dage
+,Accounts Payable Summary,Kreditorer Resumé
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere frosne konto {0}
+DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
+DocType: Employee,Employee Number,Medarbejder nummer
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
+,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grøn
+DocType: Item,Auto re-order,Auto re-ordre
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
+DocType: Employee,Place of Issue,Sted for Issue
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Dine produkter eller tjenester
+DocType: Mode of Payment,Mode of Payment,Mode Betaling
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
+DocType: Journal Entry Account,Purchase Order,Indkøbsordre
+DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
+DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
+DocType: Address,City/Town,By / Town
+DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
+DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
+DocType: Hub Settings,Seller Website,Sælger Website
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Produktionsordre status er {0}
+DocType: Appraisal Goal,Goal,Goal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
+DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
+DocType: Authorization Rule,Transaction,Transaktion
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
+DocType: Item,Website Item Groups,Website varegrupper
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
+DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
+apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
+DocType: Journal Entry,Journal Entry,Kassekladde
+DocType: Workstation,Workstation Name,Workstation Navn
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+DocType: Sales Partner,Target Distribution,Target Distribution
+DocType: Salary Slip,Bank Account No.,Bankkonto No.
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
+DocType: Quality Inspection Reading,Reading 8,Reading 8
+DocType: Sales Partner,Agent,Agent
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
+DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
+DocType: BOM Operation,Workstation,Arbejdsstation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+DocType: Attendance,HR Manager,HR Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
+DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
+DocType: Salary Slip,Earning,Optjening
+,BOM Browser,BOM Browser
+DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
+DocType: Maintenance Schedule Item,No of Visits,Ingen af besøg
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operationer kan ikke være tomt.
+,Delivered Items To Be Billed,Leverede varer at blive faktureret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
+DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
+DocType: Address,Utilities,Forsyningsvirksomheder
+DocType: Purchase Invoice Item,Accounting,Regnskab
+DocType: Features Setup,Features Setup,Features Setup
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
+DocType: Item,Is Service Item,Er service Item
+DocType: Activity Cost,Projects,Projekter
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
+DocType: BOM Operation,Operation Description,Operation Beskrivelse
+DocType: Item,Will also apply to variants,Vil også gælde for varianter
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan ikke ændre regnskabsår Start Dato og Skatteårsafslutning Dato når regnskabsår er gemt.
+DocType: Quotation,Shopping Cart,Indkøbskurv
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
+DocType: Pricing Rule,Campaign,Kampagne
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
+DocType: Purchase Invoice,Contact Person,Kontakt Person
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
+DocType: Holiday List,Holidays,Helligdage
+DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
+DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
+DocType: Item,Maintain Stock,Vedligehold Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
+DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
+DocType: Email Digest,For Company,For Company
+apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikation log.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Køb Beløb
+DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
+DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+DocType: Maintenance Visit,Unscheduled,Uplanlagt
+DocType: Employee,Owned,Ejet
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
+DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
+,Purchase Invoice Trends,Købsfaktura Trends
+DocType: Employee,Better Prospects,Bedre udsigter
+DocType: Appraisal,Goals,Mål
+DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
+,Accounts Browser,Konti Browser
+DocType: GL Entry,GL Entry,GL indtastning
+DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
+,Batch-Wise Balance History,Batch-Wise Balance History
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR-indstillinger
-DocType: Employee,Employment Details,Beskæftigelse Detaljer
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
-DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
-DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
-DocType: Process Payroll,Create Salary Slip,Opret lønseddel
-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: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
-DocType: Naming Series,Help HTML,Hjælp HTML
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
-DocType: Authorization Rule,Above Value,Over værdi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
-DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
-DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-DocType: Production Order,Actual End Date,Faktiske Slutdato
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
-DocType: Quality Inspection,Incoming,Indgående
-DocType: Department,Leave Block List,Lad Block List
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
-DocType: Salary Slip,Working Days,Arbejdsdage
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
-DocType: Employee,Current Address Is,Nuværende adresse er
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
-DocType: Item,Website Item Groups,Website varegrupper
-DocType: Page,Standard,Standard
-DocType: Target Detail,Target Detail,Target Detail
-DocType: Quotation,Quotation To,Citat Til
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
-DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
-DocType: Serial No,Delivery Document No,Levering dokument nr
-DocType: Purchase Common,Purchase Common,Indkøb Common
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
-DocType: Employee Education,School/University,Skole / Universitet
-DocType: Purchase Order,To Bill,Til Bill
-DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Send nu
-DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
-DocType: Delivery Note,Excise Page Number,Excise Sidetal
-DocType: Delivery Note,To Warehouse,Til Warehouse
-DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
-,Requested,Anmodet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
-DocType: Lead,Market Segment,Market Segment
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
-DocType: HR Settings,HR Settings,HR-indstillinger
-DocType: Sales Team,Incentives,Incitamenter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
-DocType: Leave Application,Leave Application,Forlad Application
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tilføj / rediger Priser
-DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
-DocType: Employee,Widowed,Enke
-DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
-DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-DocType: Employee,Reason for Leaving,Årsag til Leaving
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
-DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
-DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
-apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
-DocType: Item,Minimum Order Qty,Minimum Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
-DocType: Target Detail,Target  Amount,Målbeløbet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
-DocType: Company,Stock Adjustment Account,Stock Justering konto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
-DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
-DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
-DocType: GL Entry,Party Type,Party Type
-DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
-DocType: Sales Invoice,Packing List,Pakning List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
-DocType: Shipping Rule,Net Weight,Vægt
-DocType: Issue,Support Team,Support Team
-DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-DocType: Item,Attributes,Attributter
-DocType: Account,Tax,Skat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
-apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
-DocType: Company,Change Abbreviation,Skift Forkortelse
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
-DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
-DocType: Delivery Note,% Installed,% Installeret
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
+DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
+DocType: Journal Entry Account,Account Balance,Kontosaldo
+DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vi køber denne vare
+DocType: Address,Billing,Fakturering
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
-DocType: Email Account,Email Ids,Email Ids
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
-DocType: Budget Detail,Budget Detail,Budget Detail
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
-DocType: Production Order Operation,Make Time Log,Make Time Log
-DocType: Item,Will also apply for variants,Vil også gælde for varianter
-DocType: Email Digest,Payables,Gæld
-DocType: Pricing Rule,Customer Group,Customer Group
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
-DocType: User,First Name,Fornavn
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Indtast venligst forælder konto gruppe for lager {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
-DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
-DocType: Time Log,To Time,Til Time
-DocType: Pricing Rule,Item Code,Item Code
-DocType: Sales Invoice,Recurring,Tilbagevendende
-,BOM Browser,BOM Browser
-,Completed Production Orders,Afsluttede produktionsordrer
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
-DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
-DocType: Offer Letter,Awaiting Response,Afventer svar
-,Stock Ledger,Stock Ledger
-DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
-DocType: Employee Leave Approver,Leave Approver,Lad Godkender
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Forsendelser til kunderne.
-DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
-DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
-DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
-DocType: Employee,Date of Joining,Dato for Sammenføjning
-DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
-DocType: System Settings,Time Zone,Time Zone
-DocType: Item,Inspection Required,Inspection Nødvendig
-DocType: Company,Default Currency,Standard Valuta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
-,Daily Time Log Summary,Daglig Time Log Summary
-DocType: POS Profile,Price List,Pris List
-DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
-DocType: Time Log,Batched for Billing,Batched for fakturering
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-DocType: Blog Category,Parent Website Route,Parent Website Route
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
-DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
-DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
-DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
-,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
-,SO Qty,SO Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
-DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
-apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
-DocType: DocField,Column Break,Kolonne Break
-DocType: Project,Gross Margin,Gross Margin
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
+DocType: Quality Inspection,Readings,Aflæsninger
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub forsamlinger
+DocType: Shipping Rule Condition,To Value,Til Value
+DocType: Supplier,Stock Manager,Stock manager
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packing Slip
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Kontorleje
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
+DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+DocType: Item,Inventory,Inventory
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
+DocType: Item,Sales Details,Salg Detaljer
+DocType: Opportunity,With Items,Med Varer
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
+DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
+DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
+","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+DocType: Item Attribute,Item Attribute,Item Attribut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianter
+DocType: Company,Services,Tjenester
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),I alt ({0})
+DocType: Cost Center,Parent Cost Center,Parent Cost center
+DocType: Sales Invoice,Source,Kilde
+DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
+DocType: Employee External Work History,Total Experience,Total Experience
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
+DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
+DocType: Item Group,Item Group Name,Item Group Name
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
+DocType: Pricing Rule,For Price List,For prisliste
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+DocType: Maintenance Schedule,Schedules,Tidsplaner
+DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
-DocType: Attendance,HR Manager,HR Manager
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-DocType: DocField,Attach Image,Vedhæft billede
-,Delivered Items To Be Billed,Leverede varer at blive faktureret
-,Item-wise Sales Register,Vare-wise Sales Register
-DocType: Warranty Claim,From Company,Fra Company
-DocType: SMS Center,Total Characters,Total tegn
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
-DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-DocType: Expense Claim,Expense Approver,Expense Godkender
-DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
-DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
-DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
-DocType: Employee,Better Prospects,Bedre udsigter
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
-DocType: Quality Inspection,Delivery Note No,Levering Note Nej
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
-DocType: Report,Disabled,Handicappet
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
-DocType: GL Entry,Is Opening,Er Åbning
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
-DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
-DocType: Quality Inspection Reading,Reading 1,Læsning 1
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-DocType: Journal Entry,Contra Entry,Contra indtastning
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
-DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
-DocType: Leave Allocation,Leave Allocation,Lad Tildeling
-DocType: Tax Rule,Purchase,Købe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-DocType: Account,Income Account,Indkomst konto
-DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
-DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
-DocType: Serial No,Creation Document No,Creation dokument nr
-DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
-DocType: Earning Type,Earning Type,Optjening Type
-DocType: Production Order Operation,Pending,Afventer
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
+DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
+DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
+DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
+DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
+,Accounts Receivable Summary,Debitor Resumé
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
+DocType: UOM,UOM Name,UOM Navn
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
+DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
+DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand mester.
+DocType: Sales Invoice Item,Brand Name,Brandnavn
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kasse
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
+DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
+DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
+DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-DocType: Customer,Sales Team Details,Salg Team Detaljer
-DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
+,Bank Reconciliation Statement,Bank Saldoopgørelsen
+DocType: Address,Lead Name,Bly navn
+,POS,POS
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
+DocType: Shipping Rule Condition,From Value,Fra Value
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
+DocType: Quality Inspection Reading,Reading 4,Reading 4
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
+DocType: Company,Default Holiday List,Standard Holiday List
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
+DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
+DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
+DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
+,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
+DocType: Dependent Task,Dependent Task,Afhængig Opgave
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
+DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
+DocType: SMS Center,Receiver List,Modtager liste
+DocType: Payment Tool Detail,Payment Amount,Betaling Beløb
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
+DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
+DocType: Quotation Item,Quotation Item,Citat Vare
+DocType: Account,Account Name,Kontonavn
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
+DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
+DocType: Accounts Settings,Credit Controller,Credit Controller
+DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+DocType: Company,Default Payable Account,Standard Betales konto
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
+DocType: Party Account,Party Account,Party Account
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+DocType: Lead,Upper Income,Upper Indkomst
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
+DocType: BOM Item,BOM Item,BOM Item
+DocType: Appraisal,For Employee,For Medarbejder
+DocType: Company,Default Values,Standardværdier
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
+DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
+DocType: Customer,Default Price List,Standard prisliste
+DocType: Payment Reconciliation,Payments,Betalinger
+DocType: Budget Detail,Budget Allocated,Budgettet
+,Customer Credit Balance,Customer Credit Balance
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Skal du bekræfte din e-mail-id
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
+DocType: Quotation,Term Details,Term Detaljer
+DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
+DocType: Warranty Claim,Warranty Claim,Garanti krav
+,Lead Details,Bly Detaljer
+DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
+DocType: Pricing Rule,Applicable For,Gældende For
+DocType: Bank Reconciliation,From Date,Fra dato
+DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
+DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage inden blade som blade
+DocType: Sales Invoice,Packed Items,Pakket Varer
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
+DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
+DocType: Employee,Permanent Address,Permanent adresse
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Vare {0} skal være en service Item.
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg emne kode
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducer Fradrag for Leave uden løn (LWP)
+DocType: Territory,Territory Manager,Territory manager
+DocType: Selling Settings,Selling Settings,Salg af indstillinger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
+,Item Shortage Report,Item Mangel Rapport
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
+DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+DocType: Employee,Date Of Retirement,Dato for pensionering
+DocType: Upload Attendance,Get Template,Få skabelon
+DocType: Address,Postal,Postal
+DocType: Item,Weightage,Weightage
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
+DocType: Territory,Parent Territory,Parent Territory
+DocType: Quality Inspection Reading,Reading 2,Reading 2
+DocType: Stock Entry,Material Receipt,Materiale Kvittering
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkter
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
+DocType: Lead,Next Contact By,Næste Kontakt By
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
+DocType: Quotation,Order Type,Bestil Type
+DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
+DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
+,Item-wise Sales Register,Vare-wise Sales Register
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Samlet Target
+DocType: Job Applicant,Applicant for a Job,Ansøger om et job
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
+DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
+DocType: Sales Invoice Item,Batch No,Batch Nej
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
+DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+DocType: Employee,Leave Encashed?,Efterlad indkasseres?
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
+DocType: Item,Variants,Varianter
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
+DocType: SMS Center,Send To,Send til
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
+DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
+DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
+DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
+DocType: Territory,Territory Name,Territory Navn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
+DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
+DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
+DocType: Sales Order,To Deliver and Bill,At levere og Bill
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
+DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} skal indsendes
+DocType: Authorization Control,Authorization Control,Authorization Kontrol
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
+DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
+DocType: Employee,Salutation,Salutation
+DocType: Pricing Rule,Brand,Brand
+DocType: Item,Will also apply for variants,Vil også gælde for varianter
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
+DocType: Sales Order Item,Actual Qty,Faktiske Antal
+DocType: Quality Inspection Reading,Reading 10,Reading 10
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+DocType: Hub Settings,Hub Node,Hub Node
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+DocType: SMS Center,Create Receiver List,Opret Modtager liste
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
+DocType: Packing Slip,To Package No.,At pakke No.
+DocType: Warranty Claim,Issue Date,Udstedelsesdagen
+DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
+DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
+,Sales Invoice Trends,Salgsfaktura Trends
+DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
+DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
+DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
+DocType: SMS Settings,Message Parameter,Besked Parameter
+DocType: Serial No,Delivery Document No,Levering dokument nr
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
+DocType: Serial No,Creation Date,Oprettelsesdato
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
+DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
+DocType: Item,Has Variants,Har Varianter
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
+DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
+DocType: Sales Person,Parent Sales Person,Parent Sales Person
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
+DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
+DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
+DocType: Budget Detail,Fiscal Year,Regnskabsår
+DocType: Cost Center,Budget,Budget
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,f.eks 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
+DocType: Item,Is Sales Item,Er Sales Item
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
+DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
+,Amount to Deliver,"Beløb, Deliver"
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,En vare eller tjenesteydelse
+DocType: Naming Series,Current Value,Aktuel værdi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
+DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
+,Serial No Status,Løbenummer status
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Item tabel kan ikke være tom
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
+DocType: Pricing Rule,Selling,Selling
+DocType: Employee,Salary Information,Løn Information
+DocType: Sales Person,Name and Employee ID,Navn og Medarbejder ID
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+DocType: Website Item Group,Website Item Group,Website Item Group
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
+DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
+DocType: Material Request Item,Material Request Item,Materiale Request Vare
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Tree of varegrupper.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
+,Item-wise Purchase History,Vare-wise Købshistorik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+DocType: Account,Frozen,Frosne
+,Open Production Orders,Åbne produktionsordrer
+DocType: Installation Note,Installation Time,Installation Time
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
+DocType: Issue,Resolution Details,Opløsning Detaljer
+DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
+DocType: Item Attribute,Attribute Name,Attribut Navn
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
+DocType: Item Group,Show In Website,Vis I Website
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Gruppe
+DocType: Task,Expected Time (in hours),Forventet tid (i timer)
+,Qty to Order,Antal til ordre
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
+DocType: Appraisal,For Employee Name,For Medarbejder Navn
+DocType: Holiday List,Clear Table,Klar Table
+DocType: Features Setup,Brands,Mærker
+DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+DocType: Activity Cost,Costing Rate,Costing Rate
+DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
+DocType: Bank Reconciliation Detail,Against Account,Mod konto
+DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
+DocType: Item,Has Batch No,Har Batch Nej
+DocType: Delivery Note,Excise Page Number,Excise Sidetal
+DocType: Employee,Personal Details,Personlige oplysninger
+,Maintenance Schedules,Vedligeholdelsesplaner
+,Quotation Trends,Citat Trends
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
+,Pending Amount,Afventer Beløb
+DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
+DocType: Purchase Order,Delivered,Leveret
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
+DocType: Journal Entry,Accounts Receivable,Tilgodehavender
+,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
+DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
+DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
+DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
+DocType: HR Settings,HR Settings,HR-indstillinger
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
+DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
+DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Enhed
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
+,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskabsår slutter den
+DocType: POS Profile,Price List,Pris List
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
+DocType: Issue,Support,Support
+,BOM Search,BOM Søg
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
+DocType: Workstation,Wages per hour,Lønningerne i timen
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
+DocType: Salary Slip,Deduction,Fradrag
+DocType: Address Template,Address Template,Adresse Skabelon
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
+DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
+DocType: Project,% Tasks Completed,% Opgaver Afsluttet
+DocType: Project,Gross Margin,Gross Margin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Indtast venligst Produktion Vare først
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
+DocType: Opportunity,Quotation,Citat
+DocType: Salary Slip,Total Deduction,Samlet Fradrag
+DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Omkostninger Opdateret
+DocType: Employee,Date of Birth,Fødselsdato
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
+DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
+DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
+DocType: Purchase Taxes and Charges,Deduct,Fratrække
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
+DocType: Expense Claim,Approver,Godkender
+,SO Qty,SO Antal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+DocType: Appraisal,Calculate Total Score,Beregn Total Score
+DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
+DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
+DocType: Pricing Rule,Supplier,Leverandør
+DocType: C-Form,Quarter,Kvarter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
+DocType: Global Defaults,Default Company,Standard Company
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
+DocType: Employee,Bank Name,Bank navn
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
+DocType: Leave Application,Total Leave Days,Total feriedage
+DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
+DocType: Currency Exchange,From Currency,Fra Valuta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
+DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
+DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Ny Cost center
+DocType: Bin,Ordered Quantity,Bestilt Mængde
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
+DocType: Quality Inspection,In Process,I Process
+DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
+DocType: Account,Fixed Asset,Fast Asset
+DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
 ,Stock Balance,Stock Balance
-DocType: Lead,Converted,Konverteret
-DocType: Supplier,Supplier Details,Leverandør Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
+DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
+DocType: Item,Weight UOM,Vægt UOM
+DocType: Employee,Blood Group,Blood Group
+DocType: Purchase Invoice Item,Page Break,Side Break
+DocType: Production Order Operation,Pending,Afventer
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
+DocType: Purchase Invoice Item,Qty,Antal
+DocType: Fiscal Year,Companies,Virksomheder
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
+DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
+DocType: C-Form,Received Date,Modtaget Dato
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
+DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøb prisliste
+DocType: Offer Letter Term,Offer Term,Offer Term
+DocType: Quality Inspection,Quality Manager,Kvalitetschef
+DocType: Job Applicant,Job Opening,Job Åbning
+DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
+DocType: Offer Letter,Offer Letter,Tilbyd Letter
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
+DocType: Time Log,To Time,Til Time
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+DocType: Production Order Operation,Completed Qty,Afsluttet Antal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
+DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
+DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
+DocType: Item,Customer Item Codes,Kunde Item Koder
+DocType: Opportunity,Lost Reason,Tabt Årsag
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
+DocType: Quality Inspection,Sample Size,Sample Size
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
+DocType: Project,External,Ekstern
+DocType: Features Setup,Item Serial Nos,Vare Serial Nos
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
+DocType: Branch,Branch,Branch
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Ingen lønseddel fundet for måned:
+DocType: Bin,Actual Quantity,Faktiske Mængde
+DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Dine kunder
+DocType: Leave Block List Date,Block Date,Block Dato
+DocType: Sales Order,Not Delivered,Ikke leveret
+,Bank Clearance Summary,Bank Clearance Summary
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code&gt; Vare Gruppe&gt; Brand
+DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
+DocType: Time Log,Costing Amount,Koster Beløb
+DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
+DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning &amp; Fradrag
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
+DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
+DocType: SMS Log,Sender Name,Sender Name
+DocType: POS Profile,[Select],[Vælg]
+DocType: SMS Log,Sent To,Sendt Til
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
+DocType: Company,For Reference Only.,Kun til reference.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
+DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
+DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Fra dato' er nødvendig
+DocType: Journal Entry,Reference Number,Referencenummer
+DocType: Employee,Employment Details,Beskæftigelse Detaljer
+DocType: Employee,New Workplace,Ny Arbejdsplads
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
+DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
+DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
+DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
+DocType: Time Log,Projects Manager,Projekter manager
+DocType: Serial No,Delivery Time,Leveringstid
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
+DocType: Item,End of Life,End of Life
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Rejser
+DocType: Leave Block List,Allow Users,Tillad brugere
+DocType: Sales Invoice,Recurring,Tilbagevendende
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
+DocType: Rename Tool,Rename Tool,Omdøb Tool
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
+DocType: Item Reorder,Item Reorder,Item Genbestil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
+DocType: Purchase Invoice,Price List Currency,Pris List Valuta
+DocType: Naming Series,User must always select,Brugeren skal altid vælge
+DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
+DocType: Installation Note,Installation Note,Installation Bemærk
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Tilføj Skatter
+,Financial Analytics,Finansielle Analytics
+DocType: Quality Inspection,Verified By,Verified by
+DocType: Address,Subsidiary,Datterselskab
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
+DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
+DocType: Process Payroll,Create Salary Slip,Opret lønseddel
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balance pr bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
+DocType: Appraisal,Employee,Medarbejder
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Email Fra
+DocType: Features Setup,After Sale Installations,Efter salg Installationer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+DocType: Workstation Working Hour,End Time,End Time
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
+DocType: Sales Invoice,Mass Mailing,Mass Mailing
+DocType: Rename Tool,File to Rename,Fil til Omdøb
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
+DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
+DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
+DocType: Purchase Invoice,Credit To,Credit Til
+DocType: Employee Education,Post Graduate,Post Graduate
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
+DocType: Quality Inspection Reading,Reading 9,Reading 9
+DocType: Supplier,Is Frozen,Er Frozen
+DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
+DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
+DocType: Warranty Claim,Raised By,Rejst af
+DocType: Payment Tool,Payment Account,Betaling konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+DocType: Quality Inspection Reading,Accepted,Accepteret
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
+DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
+DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+DocType: Newsletter,Test,Prøve
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
+DocType: Stock Entry,For Quantity,For Mængde
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
+DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
+DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
+DocType: Delivery Note,Transporter Name,Transporter Navn
+DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhed
+DocType: Fiscal Year,Year End Date,År Slutdato
+DocType: Task Depends On,Task Depends On,Task Afhænger On
+DocType: Lead,Opportunity,Mulighed
+DocType: Salary Structure Earning,Salary Structure Earning,Løn Struktur Earning
+,Completed Production Orders,Afsluttede produktionsordrer
+DocType: Operation,Default Workstation,Standard Workstation
+DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
+DocType: Email Digest,How frequently?,Hvor ofte?
+DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree of Bill of Materials
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+DocType: Production Order,Actual End Date,Faktiske Slutdato
+DocType: Authorization Rule,Applicable To (Role),Gælder for (Rolle)
+DocType: Stock Entry,Purpose,Formål
+DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
+DocType: Purchase Invoice,Advances,Forskud
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
+DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
+DocType: Campaign,Campaign-.####,Kampagne -. ####
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
+DocType: Customer Group,Has Child Node,Har Child Node
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -3575,110 +1730,1585 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
-DocType: Currency Exchange,To Currency,Til Valuta
-DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
-DocType: Material Request Item,For Warehouse,For Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er påkrævet
-DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen &#39;ansvar&#39;
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
-DocType: BOM,Raw Material Cost,Raw Material Omkostninger
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Opret Opportunity
-DocType: DocField,Default,Standard
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
-DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
-DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
-DocType: Journal Entry Account,Account Balance,Kontosaldo
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
-DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
-DocType: Page,Title,Titel
-DocType: Company,Default Values,Standardværdier
-DocType: Opportunity,Opportunity Date,Opportunity Dato
-,Item Prices,Item Priser
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
-,Purchase Invoice Trends,Købsfaktura Trends
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
-DocType: Item,Copy From Item Group,Kopier fra Item Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
-DocType: SMS Log,Sender Name,Sender Name
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
+DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
+DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","fx Bank, Kontant, Kreditkort"
+DocType: Journal Entry,Credit Note,Kreditnota
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
+DocType: Features Setup,Quality,Kvalitet
+DocType: Warranty Claim,Service Address,Tjeneste Adresse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
+DocType: Stock Entry,Manufacture,Fremstilling
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
+DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Clearance Dato ikke nævnt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
+DocType: Item,Allow Production Order,Tillad produktionsordre
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
+DocType: Installation Note Item,Installed Qty,Antal installeret
+DocType: Lead,Fax,Fax
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+DocType: Salary Structure,Total Earning,Samlet Earning
+DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
+DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
+DocType: Sales Order,Billing Status,Fakturering status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
+DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
+DocType: Notification Control,Sales Order Message,Sales Order Message
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
+DocType: Process Payroll,Select Employees,Vælg Medarbejdere
+DocType: Bank Reconciliation,To Date,Til dato
+DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
+DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
+DocType: Employee,Emergency Contact,Emergency Kontakt
+DocType: Item,Quality Parameters,Kvalitetsparametre
+DocType: Target Detail,Target  Amount,Målbeløbet
+DocType: Shopping Cart Settings,Shopping Cart Settings,Indkøbskurv Indstillinger
+DocType: Journal Entry,Accounting Entries,Bogføring
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
+DocType: Purchase Order,Ref SQ,Ref SQ
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
+DocType: Purchase Order Item,Received Qty,Modtaget Antal
+DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
+DocType: Product Bundle,Parent Item,Parent Item
+DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
+,To Produce,At producere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
+DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
+DocType: Bin,Reserved Quantity,Reserveret Mængde
+DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
+DocType: Account,Income Account,Indkomst konto
+DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
+DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+DocType: Item Reorder,Material Request Type,Materiale Request Type
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: Cost Center,Cost Center,Cost center
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
+DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
+DocType: Upload Attendance,Upload HTML,Upload HTML
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
+DocType: Employee,Relieving Date,Lindre Dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
+DocType: Employee Education,Class / Percentage,Klasse / Procent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
+DocType: Item Supplier,Item Supplier,Vare Leverandør
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
+DocType: Company,Stock Settings,Stock Indstillinger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Ny Cost center navn
+DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Adresse skabelon.
+DocType: Appraisal,HR User,HR Bruger
+DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
+DocType: Sales Invoice,Debit To,Betalingskort Til
+DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
+,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+,Profit and Loss Statement,Resultatopgørelse
+DocType: Bank Reconciliation Detail,Cheque Number,Check Number
+DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
+,Sales Browser,Salg Browser
+DocType: Journal Entry,Total Credit,Total Credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
+DocType: C-Form Invoice Detail,Territory,Territory
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
+DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
+DocType: Sales Partner,Targets,Mål
+DocType: Price List,Price List Master,Prisliste Master
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
+,S.O. No.,SÅ No.
+DocType: Production Order Operation,Make Time Log,Make Time Log
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
-DocType: Sales Order,To Deliver,Til at levere
-DocType: Sales Invoice Item,Quantity,Mængde
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
-DocType: Employee Education,Employee Education,Medarbejder Uddannelse
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-,Items To Be Requested,Varer skal ansøges
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
-DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
-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: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
-DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
-DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
-,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-DocType: Activity Cost,Activity Type,Aktivitet Type
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Afsætte blade for året.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
-DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Vare {0} skal være Sales Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
-DocType: Journal Entry,Print Heading,Print Overskrift
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
-DocType: Serial No,Maintenance Status,Vedligeholdelse status
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
-DocType: Dropbox Backup,Weekly,Ugentlig
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
-DocType: Item,Maintain Stock,Vedligehold Stock
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
-DocType: Account,Asset,Asset
-DocType: Salary Slip,Earnings,Indtjening
-DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
-DocType: Selling Settings,Default Territory,Standard Territory
-DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,handicappet bruger
-DocType: Maintenance Visit,Purposes,Formål
-DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
-DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
-DocType: Address,Office,Kontor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
+DocType: Employee Education,Graduate,Graduate
+DocType: Leave Block List,Block Days,Bloker dage
+DocType: Journal Entry,Excise Entry,Excise indtastning
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
 DocType: Attendance,Leave Type,Forlad Type
-DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
+apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
+DocType: Account,Accounts User,Regnskab Bruger
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
+DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
+DocType: C-Form Invoice Detail,Net Total,Net Total
+DocType: Bin,FCFS Rate,FCFS Rate
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
+DocType: Project Task,Working,Working
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vælg Time Logs.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
+DocType: Account,Round Off,Afrunde
+,Requested Qty,Anmodet Antal
+DocType: BOM Item,Scrap %,Skrot%
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
+DocType: Maintenance Visit,Purposes,Formål
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
+,Requested,Anmodet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
+DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
+DocType: Monthly Distribution,Distribution Name,Distribution Name
+DocType: Features Setup,Sales and Purchase,Salg og Indkøb
+DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
+DocType: Journal Entry Account,Sales Invoice,Salg Faktura
+DocType: Journal Entry Account,Party Balance,Party Balance
+DocType: Sales Invoice Item,Time Log Batch,Time Log Batch
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Vælg Anvend Rabat på
+DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
+DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
+DocType: Purchase Invoice,Half-yearly,Halvårligt
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
+DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
+DocType: Sales Invoice,Sales Team1,Salg TEAM1
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Element {0} eksisterer ikke
+DocType: Sales Invoice,Customer Address,Kunde Adresse
+DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
+DocType: Account,Root Type,Root Type
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
+DocType: Item Group,Show this slideshow at the top of the page,Vis denne slideshow øverst på siden
+DocType: BOM,Item UOM,Item UOM
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
+DocType: Quality Inspection,Quality Inspection,Quality Inspection
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
+DocType: Stock Entry,Subcontract,Underleverance
+DocType: Production Planning Tool,Get Items From Sales Orders,Få elementer fra salgsordrer
+DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
+DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
+DocType: Item,Manufacturer Part Number,Producentens varenummer
+DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
+DocType: Bin,Bin,Bin
+DocType: SMS Log,No of Sent SMS,Ingen af Sent SMS
+DocType: Account,Company,Firma
+DocType: Account,Expense Account,Udgiftskonto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farve
+DocType: Maintenance Visit,Scheduled,Planlagt
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
+DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
+DocType: Rename Tool,Rename Log,Omdøbe Log
+DocType: Installation Note Item,Against Document No,Mod dokument nr
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
+DocType: Quality Inspection,Inspection Type,Inspektion Type
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Vælg {0}
+DocType: C-Form,C-Form No,C-Form Ingen
+DocType: BOM,Exploded_items,Exploded_items
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
+DocType: Employee,Exit,Udgang
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
+DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
+DocType: Sales Invoice,Advertisement,Annonce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
+DocType: Expense Claim,Expense Approver,Expense Godkender
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betale
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
+DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblades
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
+DocType: Attendance,Attendance Date,Fremmøde Dato
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
+DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
+DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
+DocType: Item,Valuation Method,Værdiansættelsesmetode
+DocType: Sales Invoice,Sales Team,Salgsteam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
+DocType: Serial No,Under Warranty,Under Garanti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
+,Employee Birthday,Medarbejder Fødselsdag
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
+DocType: UOM,Must be Whole Number,Skal være hele tal
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+DocType: Pricing Rule,Discount Percentage,Discount Procent
+DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
+DocType: Leave Control Panel,Employee Type,Medarbejder Type
+DocType: Employee Leave Approver,Leave Approver,Lad Godkender
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
+,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
+DocType: Pricing Rule,Purchase Manager,Indkøb manager
+DocType: Payment Tool,Payment Tool,Betaling Tool
+DocType: Target Detail,Target Detail,Target Detail
+DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periode Lukning indtastning
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
+DocType: Customer,Credit Limit,Kreditgrænse
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
+DocType: GL Entry,Voucher No,Blad nr
+DocType: Leave Allocation,Leave Allocation,Lad Tildeling
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materiale Anmodning {0} skabt
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
+DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
+DocType: Employee,Feedback,Feedback
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
+DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
+DocType: Activity Cost,Billing Rate,Fakturering Rate
+,Qty to Deliver,Antal til Deliver
+DocType: Monthly Distribution Percentage,Month,Måned
+,Stock Analytics,Stock Analytics
+DocType: Installation Note Item,Against Document Detail No,Imod Dokument Detail Nej
+DocType: Quality Inspection,Outgoing,Udgående
+DocType: Material Request,Requested For,Anmodet om
+DocType: Quotation Item,Against Doctype,Mod DOCTYPE
+DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
+DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+DocType: Pricing Rule,Item Code,Item Code
+DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
+DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
+DocType: Journal Entry,User Remark,Bruger Bemærkning
+DocType: Lead,Market Segment,Market Segment
+DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukning (dr)
+DocType: Contact,Passive,Passiv
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Kontroller, om du har brug for automatiske tilbagevendende fakturaer. Når du har indsendt nogen faktura, vil Tilbagevendende sektion være synlige."
+DocType: Account,Accounts Manager,Accounts Manager
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Time Log {0} skal være »Tilmeldt &#39;
+DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
+DocType: Production Planning Tool,Create Material Requests,Opret Materiale Anmodning
+DocType: Employee Education,School/University,Skole / Universitet
+DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
+,Billed Amount,Faktureret beløb
+DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
+DocType: Sales Order,Fully Delivered,Fuldt Leveres
+DocType: Lead,Lower Income,Lavere indkomst
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Kontoen hoved under ansvar, hvor gevinst / tab vil være reserveret"
+DocType: Payment Tool,Against Vouchers,Mod Vouchers
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
+DocType: Features Setup,Sales Extras,Salg Extras
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
+,Stock Projected Qty,Stock Forventet Antal
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+DocType: Warranty Claim,From Company,Fra Company
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minut
+DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
+,Qty to Receive,Antal til Modtag
+DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
+DocType: Sales Partner,Retailer,Forhandler
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
+DocType: Sales Order,%  Delivered,% Leveres
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
+DocType: Appraisal,Appraisal,Vurdering
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lad godkender skal være en af {0}
+DocType: Hub Settings,Seller Email,Sælger Email
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
+DocType: Workstation Working Hour,Start Time,Start Time
+DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Vælg antal
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Besked sendt
+DocType: Production Plan Sales Order,SO Date,SO Dato
+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 (Company Valuta)
+DocType: BOM Operation,Hour Rate,Hour Rate
+DocType: Stock Settings,Item Naming By,Item Navngivning By
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra tilbudsgivning
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
+DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
+DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
+DocType: Project,Project Type,Projekt type
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til at opdatere lagertransaktioner ældre end {0}
+DocType: Item,Inspection Required,Inspection Nødvendig
+DocType: Purchase Invoice Item,PR Detail,PR Detail
+DocType: Sales Order,Fully Billed,Fuldt Billed
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
+DocType: Serial No,Is Cancelled,Er Annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
+DocType: Journal Entry,Bill Date,Bill Dato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
+DocType: Supplier,Supplier Details,Leverandør Detaljer
+DocType: Expense Claim,Approval Status,Godkendelsesstatus
+DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
+DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
+DocType: Sales Order,Recurring Order,Tilbagevendende Order
+DocType: Company,Default Income Account,Standard Indkomst konto
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
+DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
+,Welcome to ERPNext,Velkommen til ERPNext
+DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
+DocType: Lead,From Customer,Fra kunde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
+DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
+DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+,Projected,Projiceret
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+DocType: Notification Control,Quotation Message,Citat Message
+DocType: Issue,Opening Date,Åbning Dato
+DocType: Journal Entry,Remark,Bemærkning
+DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
+DocType: Sales Order,Not Billed,Ikke Billed
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
+DocType: Time Log,Batched for Billing,Batched for fakturering
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
+DocType: POS Profile,Write Off Account,Skriv Off konto
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
+DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
+DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,fx moms
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
+DocType: Shopping Cart Settings,Quotation Series,Citat Series
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
+DocType: Sales Order Item,Sales Order Date,Sales Order Date
+DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
+,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
+DocType: Journal Entry,Stock Entry,Stock indtastning
+DocType: Account,Payable,Betales
+DocType: Salary Slip,Arrear Amount,Bagud Beløb
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Gross Profit%
+DocType: Appraisal Goal,Weightage (%),Weightage (%)
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
+DocType: Newsletter,Newsletter List,Nyhedsbrev List
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
+DocType: Lead,Address Desc,Adresse Desc
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
+DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
+DocType: Installation Note,Installation Date,Installation Dato
+DocType: Employee,Confirmation Date,Bekræftelse Dato
+DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
+DocType: Account,Sales User,Salg Bruger
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
+DocType: Lead,Lead Owner,Bly Owner
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Warehouse kræves
+DocType: Employee,Marital Status,Civilstand
+DocType: Stock Settings,Auto Material Request,Auto Materiale Request
+DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
+DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Vare {0}: Bestilte qty {1} kan ikke være mindre end minimum ordreantal {2} (defineret i punkt).
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
+DocType: Territory,Territory Targets,Territory Mål
+DocType: Delivery Note,Transporter Info,Transporter Info
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
+DocType: POS Profile,Update Stock,Opdatering Stock
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
+DocType: Purchase Invoice,Terms,Betingelser
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Opret ny
+DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
+,Item-wise Sales History,Vare-wise Sales History
+DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
+,Purchase Analytics,Køb Analytics
+DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
+DocType: Expense Claim,Task,Opgave
+DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
+,Stock Ledger,Stock Ledger
+DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
+DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
+DocType: SMS Center,Send SMS,Send SMS
+DocType: Company,Default Letter Head,Standard Letter hoved
+DocType: Time Log,Billable,Faktureres
+DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
+DocType: Company,Stock Adjustment Account,Stock Justering konto
+DocType: Journal Entry,Write Off,Skriv Off
+DocType: Time Log,Operation ID,Operation ID
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
+DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item &#39;Er Fremstillet&#39;
+DocType: Sales Invoice,Rounded Total,Afrundet alt
+DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
+DocType: Serial No,Out of AMC,Ud af AMC
+DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+DocType: Company,Default Cash Account,Standard Kontant konto
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 Grand Total
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
+DocType: Item,Supplier Items,Leverandør Varer
+DocType: Opportunity,Opportunity Type,Opportunity Type
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af selskabet
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
+DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
+,Stock Ageing,Stock Ageing
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+DocType: Sales Team,Contribution (%),Bidrag (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
+DocType: Sales Person,Sales Person Name,Salg Person Name
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Tilføj Brugere
+DocType: Pricing Rule,Item Group,Item Group
+DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
+DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+DocType: Sales Order,Partly Billed,Delvist Billed
+DocType: Item,Default BOM,Standard BOM
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
+DocType: Time Log Batch,Total Hours,Total Hours
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
+DocType: Time Log,From Time,Fra Time
+DocType: Notification Control,Custom Message,Tilpasset Message
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
+DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
+DocType: Purchase Invoice Item,Rate,Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
+DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
+DocType: Stock Entry,From BOM,Fra BOM
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
+DocType: Salary Structure,Salary Structure,Løn Struktur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
+DocType: Account,Bank,Bank
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Issue Materiale
+DocType: Material Request Item,For Warehouse,For Warehouse
+DocType: Employee,Offer Date,Offer Dato
+DocType: Hub Settings,Access Token,Access Token
+DocType: Sales Invoice Item,Serial No,Løbenummer
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
+DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
+DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+DocType: Purchase Invoice,Items,Varer
+DocType: Fiscal Year,Year Name,År Navn
+DocType: Process Payroll,Process Payroll,Proces Payroll
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
+DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
+DocType: Purchase Invoice Item,Image View,Billede View
+DocType: Issue,Opening Time,Åbning tid
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
+DocType: Shipping Rule,Calculate Based On,Beregn baseret på
+DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
+DocType: Account,Purchase User,Køb Bruger
+DocType: Notification Control,Customize the Notification,Tilpas Underretning
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
+DocType: Journal Entry,Print Heading,Print Overskrift
+DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
+DocType: C-Form,Amended From,Ændret Fra
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Raw Material
+DocType: Leave Application,Follow via Email,Følg via e-mail
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+DocType: Leave Control Panel,Carry Forward,Carry Forward
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
+DocType: Department,Days for which Holidays are blocked for this department.,"Dage, som Holidays er blokeret for denne afdeling."
+,Produced,Produceret
+DocType: Item,Item Code for Suppliers,Item Code for leverandører
+DocType: Issue,Raised By (Email),Rejst af (E-mail)
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Vedhæft Brevpapir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
+DocType: Journal Entry,Bank Entry,Bank indtastning
+DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
+DocType: Quality Inspection,Item Serial No,Vare Løbenummer
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
+DocType: Lead,Lead Type,Lead Type
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
+DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
+DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
+DocType: Features Setup,Point of Sale,Point of Sale
+DocType: Account,Tax,Skat
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
+DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
+DocType: Quality Inspection,Report Date,Report Date
+DocType: C-Form,Invoices,Fakturaer
+DocType: Job Opening,Job Title,Jobtitel
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
+DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
+DocType: Pricing Rule,Customer Group,Customer Group
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+DocType: Item,Website Description,Website Beskrivelse
+DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
+,Sales Register,Salg Register
+DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
+DocType: Address,Plant,Plant
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
+DocType: Customer Group,Customer Group Name,Customer Group Name
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
+DocType: GL Entry,Against Voucher Type,Mod Voucher Type
+DocType: Item,Attributes,Attributter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+DocType: C-Form,C-Form,C-Form
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
+DocType: Production Order,Planned Start Date,Planlagt startdato
+DocType: Serial No,Creation Document Type,Creation Dokumenttype
+DocType: Leave Type,Is Encash,Er indløse
+DocType: Purchase Invoice,Mobile No,Mobile Ingen
+DocType: Payment Tool,Make Journal Entry,Make Kassekladde
+DocType: Leave Allocation,New Leaves Allocated,Nye Blade Allokeret
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+DocType: Project,Expected End Date,Forventet Slutdato
+DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommerciel
+DocType: Cost Center,Distribution Id,Distribution Id
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
+DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
+DocType: Tax Rule,Sales,Salg
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
+DocType: Item Reorder,Transfer,Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
+DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
+DocType: Naming Series,Setup Series,Opsætning Series
+DocType: Supplier,Contact HTML,Kontakt HTML
+DocType: Landed Cost Voucher,Purchase Receipts,Køb Kvitteringer
+DocType: Payment Reconciliation,Maximum Amount,Maksimumbeløb
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Prisfastsættelse Regel anvendes?
+DocType: Quality Inspection,Delivery Note No,Levering Note Nej
+DocType: Company,Retail,Retail
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
+DocType: Attendance,Absent,Fraværende
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
+DocType: Upload Attendance,Download Template,Hent skabelon
+DocType: GL Entry,Remarks,Bemærkninger
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
+DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
+DocType: Features Setup,POS View,POS View
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
+DocType: Offer Letter,Awaiting Response,Afventer svar
+DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+DocType: Holiday List,Weekly Off,Ugentlig Off
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
+DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
+DocType: Serial No,Creation Time,Creation Time
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
+DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
+,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
+DocType: GL Entry,Is Advance,Er Advance
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+DocType: Sales Team,Contact No.,Kontakt No.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
+DocType: Features Setup,Sales Discounts,Salg Rabatter
+DocType: Hub Settings,Seller Country,Sælger Land
+DocType: Authorization Rule,Authorization Rule,Autorisation Rule
+DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
+DocType: Offer Letter Term,Value / Description,/ Beskrivelse
+,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
+DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
+DocType: Time Log,Billing Amount,Fakturering Beløb
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
+DocType: Sales Invoice,Posting Time,Udstationering Time
+DocType: Sales Order,% Amount Billed,% Beløb Billed
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefon Udgifter
+DocType: Sales Partner,Logo,Logo
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte udgifter
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
+DocType: Maintenance Visit,Breakdown,Sammenbrud
+DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
+,Transferred Qty,Overført Antal
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
+DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
+DocType: Journal Entry,Cash Entry,Cash indtastning
+DocType: Sales Partner,Contact Desc,Kontakt Desc
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
+DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
+DocType: Brand,Item Manager,Item manager
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
+DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
+DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
+DocType: Newsletter,Test Email Id,Test Email Id
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
+DocType: GL Entry,Party Type,Party Type
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+DocType: Item Attribute Value,Abbreviation,Forkortelse
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
+DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
+DocType: Payment Tool,Set Matching Amounts,Set matchende Beløb
+DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
+,Sales Funnel,Salg Tragt
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Kurv
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Tak for din interesse i at abonnere på vores opdateringer
+,Qty to Transfer,Antal til Transfer
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
+DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
+,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
+DocType: Account,Temporary,Midlertidig
+DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
+DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
+DocType: Pricing Rule,Buying,Køb
+DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,This Time Log Batch er blevet annulleret.
+DocType: Salary Slip Earning,Salary Slip Earning,Lønseddel Earning
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Kreditorer
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+,Item-wise Price List Rate,Item-wise Prisliste Rate
+DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
+DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
+DocType: Purchase Order,To Receive,At Modtage
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
+DocType: Email Digest,Income / Expense,Indtægter / Expense
+DocType: Employee,Personal Email,Personlig Email
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Samlet Varians
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
+DocType: Customer,From Lead,Fra Lead
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+DocType: Hub Settings,Name Token,Navn Token
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
+DocType: Serial No,Out of Warranty,Ud af garanti
+DocType: BOM Replace Tool,Replace,Udskifte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
+DocType: Purchase Invoice Item,Project Name,Projektnavn
+DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
+DocType: Features Setup,Item Batch Nos,Item Batch nr
+DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Menneskelige Ressourcer
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
+DocType: BOM Item,BOM No,BOM Ingen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
+DocType: Item,Moving Average,Glidende gennemsnit
+DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
+DocType: Account,Debit,Betalingskort
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+DocType: Production Order,Operation Cost,Operation Cost
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",For at tildele problemet ved at bruge knappen &quot;Tildel&quot; i indholdsoversigten.
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
+DocType: Currency Exchange,To Currency,Til Valuta
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Typer af Expense krav.
+DocType: Item,Taxes,Skatter
+DocType: Project,Default Cost Center,Standard Cost center
+DocType: Purchase Invoice,End Date,Slutdato
+DocType: Employee,Internal Work History,Intern Arbejde Historie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
+DocType: Maintenance Visit,Customer Feedback,Kundefeedback
+DocType: Account,Expense,Expense
+DocType: Sales Invoice,Exhibition,Udstilling
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
+DocType: Company,Domain,Domæne
+,Sales Order Trends,Salg Order Trends
+DocType: Employee,Held On,Held On
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
+,Employee Information,Medarbejder Information
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Sats (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
+DocType: Quality Inspection,Incoming,Indgående
+DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+DocType: Batch,Batch ID,Batch-id
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
+,Delivery Note Trends,Følgeseddel Tendenser
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
+DocType: GL Entry,Party,Selskab
+DocType: Sales Order,Delivery Date,Leveringsdato
+DocType: Opportunity,Opportunity Date,Opportunity Dato
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+DocType: Purchase Order,To Bill,Til Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
+DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
+DocType: Employee,History In Company,Historie I Company
+DocType: Address,Shipping,Forsendelse
+DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
+DocType: Department,Leave Block List,Lad Block List
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
+DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlæg og maskiner
+DocType: Sales Partner,Partner's Website,Partner s hjemmeside
+DocType: Opportunity,To Discuss,Til Diskuter
+DocType: SMS Settings,SMS Settings,SMS-indstillinger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Sort
+DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
+DocType: Account,Auditor,Revisor
+DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
+DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
+DocType: Pricing Rule,Disable,Deaktiver
+DocType: Project Task,Pending Review,Afventer anmeldelse
+DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
+DocType: Journal Entry Account,Exchange Rate,Exchange Rate
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
+DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
+DocType: Account,Asset,Asset
+DocType: Project Task,Task ID,Opgave-id
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",fx &quot;MC&quot;
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
+,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
+DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
+DocType: Customer,Customer Details,Kunde Detaljer
+DocType: Employee,Reports to,Rapporter til
+DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
+DocType: Sales Invoice,Paid Amount,Betalt Beløb
+,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
+DocType: Item Variant,Item Variant,Item Variant
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
+DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
+DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
+DocType: Tax Rule,Purchase,Købe
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
+DocType: Item Group,Parent Item Group,Moderselskab Item Group
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Pakhuse.
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
+DocType: Employee,Employment Type,Beskæftigelse type
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+DocType: Item Group,Default Expense Account,Standard udgiftskonto
+DocType: Employee,Notice (days),Varsel (dage)
+DocType: Employee,Encashment Date,Indløsning Dato
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
+DocType: Account,Stock Adjustment,Stock Justering
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
+DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Vedlagt {0} # {1}
+DocType: Job Applicant,Applicant Name,Ansøger Navn
+DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** Item **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** Item **. Pakken ** Item ** vil have &quot;Er Stock Item&quot; som &quot;Nej&quot; og &quot;Er Sales Item&quot; som &quot;Ja&quot;. For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
+DocType: Item Variant Attribute,Attribute,Attribut
+DocType: Serial No,Under AMC,Under AMC
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+DocType: BOM Replace Tool,Current BOM,Aktuel BOM
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tilføj Løbenummer
+DocType: Production Order,Warehouses,Pakhuse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Print og Stationær
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Gruppe Node
+DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
+DocType: Workstation,per hour,per time
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
+DocType: Company,Distribution,Distribution
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
+DocType: Account,Receivable,Tilgodehavende
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
+DocType: Sales Invoice,Supplier Reference,Leverandør reference
+DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
+DocType: Material Request,Material Issue,Materiale Issue
+DocType: Hub Settings,Seller Description,Sælger Beskrivelse
+DocType: Employee Education,Qualification,Kvalifikation
+DocType: Item Price,Item Price,Item Pris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
+DocType: Warehouse,Warehouse Name,Warehouse Navn
+DocType: Naming Series,Select Transaction,Vælg Transaktion
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
+DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
+DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
+DocType: POS Profile,Terms and Conditions,Betingelser
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
+DocType: Leave Block List,Applies to Company,Gælder for Company
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+DocType: Purchase Invoice,In Words,I Words
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
+DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
+DocType: Sales Order Item,For Production,For Produktion
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
+DocType: Project Task,View Task,View Opgave
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
+DocType: Sales Invoice,Get Advances Received,Få forskud
+DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
+DocType: Salary Slip,Salary Slip,Lønseddel
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
+DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
+DocType: Salary Slip,Payment Days,Betalings Dage
+DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
+DocType: Features Setup,Item Advanced,Item Avanceret
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
+DocType: Employee Education,Employee Education,Medarbejder Uddannelse
+DocType: Salary Slip,Net Pay,Nettoløn
+DocType: Account,Account,Konto
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
+,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
+DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
+DocType: Customer,Sales Team Details,Salg Team Detaljer
+DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
+DocType: Email Digest,Email Digest,Email Digest
+DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
+DocType: Account,Chargeable,Gebyr
+DocType: Company,Change Abbreviation,Skift Forkortelse
+DocType: Expense Claim Detail,Expense Date,Expense Dato
+DocType: Item,Max Discount (%),Max Rabat (%)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
+DocType: Company,Warn,Advar
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
+DocType: BOM,Manufacturing User,Manufacturing Bruger
+DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
+DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
+DocType: Appraisal,Appraisal Template,Vurdering skabelon
+DocType: Item Group,Item Classification,Item Klassifikation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
+,General Ledger,General Ledger
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
+DocType: Item Attribute Value,Attribute Value,Attribut Værdi
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
+,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
+DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
+DocType: Sales Invoice,Commission,Kommissionen
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+DocType: Salary Slip Deduction,Default Amount,Standard Mængde
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse ikke fundet i systemet
+DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
+,Project wise Stock Tracking,Projekt klogt Stock Tracking
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
+DocType: Item Customer Detail,Ref Code,Ref Code
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Medarbejder Records.
+DocType: HR Settings,Payroll Settings,Payroll Indstillinger
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
+DocType: Sales Invoice,C-Form Applicable,C-anvendelig
+DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
+DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
+DocType: Warranty Claim,Resolved By,Løst Af
+DocType: Appraisal,Start Date,Startdato
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Vis &quot;På lager&quot; eller &quot;Ikke på lager&quot; baseret på lager til rådighed i dette lager.
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Bill of Materials (BOM)
+DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
+DocType: Time Log,Hours,Timer
+DocType: Project,Expected Start Date,Forventet startdato
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
+DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
+DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
+DocType: Workstation,Operating Costs,Drifts- omkostninger
+DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
+,Requested Items To Be Ordered,Anmodet Varer skal bestilles
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine ordrer
+DocType: Price List,Price List Name,Pris List Name
+DocType: Time Log,For Manufacturing,For Manufacturing
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaler
+DocType: BOM,Manufacturing,Produktion
+,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
+DocType: Account,Income,Indkomst
+DocType: Industry Type,Industry Type,Industri Type
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
+DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
+DocType: Budget Detail,Budget Detail,Budget Detail
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Usikrede lån
+DocType: Cost Center,Cost Center Name,Cost center Navn
+DocType: Maintenance Schedule Detail,Scheduled Date,Planlagt dato
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
+DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
+,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+DocType: Naming Series,Help HTML,Hjælp HTML
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
+DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
+DocType: Purchase Invoice,Contact,Kontakt
+DocType: Features Setup,Exports,Eksport
+DocType: Lead,Converted,Konverteret
+DocType: Item,Has Serial No,Har Løbenummer
+DocType: Employee,Date of Issue,Udstedelsesdato
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
 DocType: Issue,Content Type,Indholdstype
-DocType: Salary Slip,Total in words,I alt i ord
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
+DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
+DocType: Cost Center,Budgets,Budgetter
+DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
+DocType: Delivery Note,To Warehouse,Til Warehouse
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
+,Average Commission Rate,Gennemsnitlig Kommissionens Rate
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
+DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
+DocType: Purchase Taxes and Charges,Account Head,Konto hoved
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
+DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
+DocType: Item,Customer Code,Customer Kode
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dage siden sidste ordre
+DocType: Buying Settings,Naming Series,Navngivning Series
+DocType: Leave Block List,Leave Block List Name,Lad Block List Name
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
+DocType: Target Detail,Target Qty,Target Antal
+DocType: Attendance,Present,Present
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
+DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
+DocType: Authorization Rule,Based On,Baseret på
+DocType: Sales Order Item,Ordered Qty,Bestilt Antal
+DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
+DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
+DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
+DocType: Employee,Health Details,Sundhed Detaljer
+DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
+DocType: Features Setup,To track any installation or commissioning related work after sales,At spore enhver installation eller idriftsættelse relateret arbejde eftersalgsservice
+DocType: Project,Estimated Costing,Anslået Costing
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Kassekladde Detail Nej
+DocType: Employee External Work History,Salary,Løn
+DocType: Serial No,Delivery Document Type,Levering Dokumenttype
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Indsend alle lønsedler for de ovenfor valgte kriterier
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} Varer
+DocType: Sales Order,Partly Delivered,Delvist Delivered
+DocType: Sales Invoice,Existing Customer,Eksisterende kunde
+DocType: Email Digest,Receivables,Tilgodehavender
+DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil ordren blive sendt automatisk på bestemt dato"
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
-DocType: User,Enabled,Aktiveret
-DocType: Warehouse,Warehouse Detail,Warehouse Detail
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
+DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
+DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
+DocType: Item,"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
+DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
+,Sales Analytics,Salg Analytics
+DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Indtast standard valuta i Company Master
+DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
+DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
+DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
+DocType: Naming Series,Update Series Number,Opdatering Series Number
+DocType: Account,Equity,Egenkapital
+DocType: Task,Closing Date,Closing Dato
+DocType: Sales Order Item,Produced Quantity,Produceret Mængde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
+DocType: Sales Partner,Partner Type,Partner Type
+DocType: Purchase Taxes and Charges,Actual,Faktiske
+DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
+DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
+DocType: Production Order,Production Order,Produktionsordre
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+DocType: Quotation Item,Against Docname,Mod Docname
+DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vælg den periode, hvor fakturaen vil blive genereret automatisk"
+DocType: BOM,Raw Material Cost,Raw Material Omkostninger
+DocType: Item,Re-Order Level,Re-Order Level
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+DocType: Employee,Applicable Holiday List,Gældende Holiday List
+DocType: Employee,Cheque,Cheque
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttype er obligatorisk
+DocType: Item,Serial Number Series,Serial Number Series
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
+DocType: Issue,First Responded On,Først svarede den
+DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
+DocType: Production Order,Planned End Date,Planlagt Slutdato
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
+DocType: Attendance,Attendance,Fremmøde
+DocType: BOM,Materials,Materialer
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
+,Item Prices,Item Priser
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
+DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Pris List mester.
+DocType: Task,Review Date,Anmeldelse Dato
+DocType: Purchase Taxes and Charges,On Net Total,On Net Total
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: Company,Round Off Account,Afrunde konto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
+DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
+DocType: Purchase Invoice,Contact Email,Kontakt E-mail
+DocType: Appraisal Goal,Score Earned,Score tjent
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
+DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
+DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
+DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
+DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
+DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
+DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
+DocType: Item,Default Warehouse,Standard Warehouse
+DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
+DocType: Delivery Note,Print Without Amount,Print uden Beløb
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
+DocType: Issue,Support Team,Support Team
+DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
+DocType: Batch,Batch,Batch
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
+DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
+DocType: Journal Entry,Debit Note,Debetnota
+DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
+DocType: Journal Entry,Total Debit,Samlet Debit
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Salg Person
+DocType: Sales Invoice,Cold Calling,Telefonsalg
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
+DocType: Lead,Blog Subscriber,Blog Subscriber
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
+DocType: Purchase Invoice,Total Advance,Samlet Advance
+DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
+DocType: Customer,Credit Days Based On,Credit Dage Baseret på
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
+,Items To Be Requested,Varer skal ansøges
+DocType: Company,Company Info,Firma Info
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
+DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
+DocType: Fiscal Year,Year Start Date,År Startdato
+DocType: Attendance,Employee Name,Medarbejder Navn
+DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+DocType: Purchase Common,Purchase Common,Indkøb Common
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+DocType: Sales Invoice,Is POS,Er POS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+DocType: Production Order,Manufactured Qty,Fremstillet Antal
+DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
+DocType: Maintenance Schedule,Schedule,Køreplan
+DocType: Account,Parent Account,Parent Konto
+DocType: Quality Inspection Reading,Reading 3,Reading 3
+,Hub,Hub
+DocType: GL Entry,Voucher Type,Voucher Type
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
+DocType: Expense Claim,Approved,Godkendt
+DocType: Pricing Rule,Price,Pris
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
+DocType: Employee,Education,Uddannelse
+DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
+DocType: Employee,Current Address Is,Nuværende adresse er
+DocType: Address,Office,Kontor
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Indtast venligst udgiftskonto
+DocType: Account,Stock,Lager
+DocType: Employee,Current Address,Nuværende adresse
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
+DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
+DocType: Employee,Contract End Date,Kontrakt Slutdato
+DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
+DocType: Deduction Type,Deduction Type,Fradrag Type
+DocType: Attendance,Half Day,Half Day
+DocType: Pricing Rule,Min Qty,Min Antal
+DocType: GL Entry,Transaction Date,Transaktion Dato
+DocType: Production Plan Item,Planned Qty,Planned Antal
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
+DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
+DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
+DocType: Notification Control,Purchase Receipt Message,Kvittering Message
+DocType: Production Order,Actual Start Date,Faktiske startdato
+DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
+DocType: Hub Settings,Hub Settings,Hub Indstillinger
+DocType: Project,Gross Margin %,Gross Margin%
+DocType: BOM,With Operations,Med Operations
+,Monthly Salary Register,Månedlig Løn Tilmeld
+DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
+DocType: BOM Operation,BOM Operation,BOM Operation
+DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
+DocType: POS Profile,POS Profile,POS profil
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ulønnet
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Køber
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+DocType: SMS Settings,Static Parameters,Statiske parametre
+DocType: Purchase Order,Advance Paid,Advance Betalt
+DocType: Item,Item Tax,Item Skat
+DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Kortfristede forpligtelser
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+DocType: Purchase Invoice,Next Date,Næste dato
+DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
+DocType: Hub Settings,Seller Name,Sælger Navn
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
+DocType: Item Group,General Settings,Generelle indstillinger
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
+DocType: Stock Entry,Repack,Pakke
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Vedhæft Logo
+DocType: Customer,Commission Rate,Kommissionens Rate
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
+DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
+DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
+DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
+DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
+DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
+DocType: Serial No,Delivery Details,Levering Detaljer
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
+,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
+DocType: Batch,Expiry Date,Udløbsdato
+,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv dag)
+DocType: Supplier,Credit Days,Credit Dage
+DocType: Leave Type,Is Carry Forward,Er Carry Forward
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Dato
+DocType: Employee,Reason for Leaving,Årsag til Leaving
+DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
+DocType: GL Entry,Is Opening,Er Åbning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} findes ikke
+DocType: Account,Cash,Kontanter
+DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.

diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 7c306d3..1b008ac 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Løn-tilstand
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vælg Månedlig Distribution, hvis du ønsker at spore baseret på sæsonudsving."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er indtastet flere gange.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Varer allerede synkroniseret
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad Vare der skal tilføjes flere gange i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrugerprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Kunde Varer
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Lad godkendere
 DocType: Sales Partner,Dealer,Forhandler
 DocType: Employee,Rented,Lejet
-DocType: About Us Settings,Website,Websted
 DocType: POS Profile,Applicable for User,Gældende for Bruger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Komprimering plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Ansøger
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i Item sats i række {0}"
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Lad Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series opdateret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Syning
 DocType: Pricing Rule,Apply On,Påfør On
 DocType: Item Price,Multiple Item prices.,Flere Item priser.
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For at bevare kunden kloge post kode og gøre dem søgbare baseret på deres kode brug denne mulighed
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis varianter
-DocType: Sales Invoice Item,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mængde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Foretag ny POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvar
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail-adresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Company,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vælg venligst prislisten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Træbearbejdning
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-print
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Revisor
 DocType: Cost Center,Stock User,Stock Bruger
 DocType: Company,Phone No,Telefon Nej
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log af aktiviteter udført af brugere mod Opgaver, der kan bruges til sporing af tid, fakturering."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Salg Partners Kommissionen
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Attribut Værdi {0} kan ikke fjernes fra {1} som Item Varianter \ eksisterer med denne attribut.
-DocType: Print Settings,Classic,Klassisk
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
 DocType: BOM,Operations,Operationer
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
 DocType: Bin,Quantity Requested for Purchase,"Mængde, der ansøges for Indkøb"
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åbning for et job.
 DocType: Item Attribute,Increment,Tilvækst
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vælg Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklame
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme Company indtastes mere end én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tilladt for {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Købmand
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse er obligatorisk, hvis kontotype er Warehouse"
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Person Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende orden, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
-DocType: Blog Post,Guest,Gæst
 DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
 DocType: Lead,Interested,Interesseret
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åbning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åbning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
 DocType: Stock Entry,Additional Costs,Yderligere omkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
-DocType: Standard Reply,Owner,Ejer
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Indtast venligst selskab først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vælg venligst Company først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rivning
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitet Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Lægemidler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
 DocType: Expense Claim Detail,Claim Amount,Krav Beløb
 DocType: Employee,Mr,Hr
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Præfiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Forbrugsmaterialer
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Forbrugsmaterialer
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årsløn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Udgifter
 DocType: Newsletter,Email Sent?,E-mail Sendt?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Vis Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i Company Valuta
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Vare {0} skal være et køb Vare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil blive opdateret efter Sales Invoice er indgivet.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Opretning
 DocType: BOM Replace Tool,New BOM,Ny BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity støbning
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhedsbrev er allerede blevet sendt
 DocType: Lead,Request Type,Anmodning Type
 DocType: Leave Application,Reason,Årsag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Udførelse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Udførelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første bruger bliver System Manager (du kan ændre dette senere).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
 DocType: Serial No,Maintenance Status,Vedligeholdelse status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Varer og Priser
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Varer og Priser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vælg Medarbejder, for hvem du opretter Vurdering."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Omkostningssted {0} ikke tilhører selskabet {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabat på prisliste Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fuld formstøbning
 DocType: Offer Letter,Select Terms and Conditions,Vælg Betingelser
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Værdiansættelse
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fjernsyn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
 DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke virksomheden {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 DocType: Sales Invoice,Is Opening Entry,Åbner post
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Modtaget On
 DocType: Sales Partner,Reseller,Forhandler
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Indtast Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice Item
 ,Production Orders in Progress,Produktionsordrer i Progress
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Næste Tilbagevendende {0} vil blive oprettet på {1}
 DocType: Newsletter List,Total Subscribers,Total Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
+,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Afventer Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Anmodning om køb.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dobbelt hus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Blade pr år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Du indstille Navngivning Series for {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 DocType: Time Log,Will be updated when batched.,"Vil blive opdateret, når batched."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke hører til virksomheden {1}
-DocType: Bulk Email,Message,Besked
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox adgangsnøgle
 DocType: Payment Tool,Reference No,Referencenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årligt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salg faktura nr
 DocType: Material Request Item,Min Order Qty,Min prisen evt
 DocType: Lead,Do Not Contact,Må ikke komme i kontakt
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Offentliggør i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Køb Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Vare {0} ikke fundet i &quot;Raw Materials Leveres &#39;bord i Indkøbsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålbørstning
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
@@ -283,15 +264,13 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
 DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Sænksmedning
 DocType: Purchase Invoice Item,Expense Head,Expense Hoved
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vælg Charge Type først
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Vælg dit sprog
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tegn
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
-Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
+Operations shall not be tracked against Production Order",Deaktiverer oprettelsen af tid logs mod produktionsordrer. Operationer må ikke spores mod produktionsordre
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for konti
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrer Sales Person Tree.
 DocType: Item,Synced With Hub,Synkroniseret med Hub
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Variant af
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Vare {0} skal være service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkulær reference Fejl
-DocType: Communication,Closed,Lukket
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Job profil
 DocType: Newsletter,Newsletter,Nyhedsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Element er opdateret
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura type
 DocType: Sales Invoice Item,Delivery Note,Følgeseddel
-DocType: Dropbox Backup,Allow Dropbox Access,Tillad Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Opsætning Skatter
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Betaling indtastning er blevet ændret, efter at du trak det. Venligst trække det igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vælg måned og år
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Firma Email
 DocType: GL Entry,Debit Amount in Account Currency,Debet Beløb i Konto Valuta
 DocType: Shipping Rule,Valid for Countries,Gælder for lande
-DocType: Workflow State,Refresh,Opdater
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import- relaterede områder som valuta, konverteringsfrekvens, samlede import, import grand total etc er tilgængelige i købskvittering, leverandør Citat, købsfaktura, Indkøbsordre etc."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Samlet Order Anses
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag i måneden »felt værdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Fås i BOM, følgeseddel, købsfaktura, produktionsordre, Indkøbsordre, kvittering, Sales Invoice, Sales Order, Stock indtastning, Timesheet"
 DocType: Item Tax,Tax Rate,Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Vælg Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvittering skal indsendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuel Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) af et element.
 DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
 DocType: GL Entry,Debit Amount,Debit Beløb
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se venligst vedhæftede
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vandstråleskæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Opsætning Allerede Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspiceres af
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Tøv ikke oprette konti for kunder og leverandører. De er skabt direkte fra kunden / Leverandør mestre.
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Item Name
+DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Varer der skal ansøges som er &quot;på lager&quot; i betragtning af alle lagre baseret på forventede qty og mindste bestilling qty
@@ -378,22 +346,21 @@
 ,Purchase Register,Indkøb Register
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
 DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 DocType: Purchase Receipt,Vehicle Date,Køretøj Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
 DocType: Employee,Single,Enkeltværelse
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan ikke indstilles for gruppe Cost center
 DocType: Account,Cost of Goods Sold,Vareforbrug
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Indtast Cost center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Indtast Cost center
 DocType: Journal Entry Account,Sales Order,Sales Order
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gns. Salgskurs
 DocType: Purchase Order,Start date of current order's period,Startdato for nuværende ordres periode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
 DocType: Delivery Note,% Installed,% Installeret
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Indtast venligst firmanavn først
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Langskæring
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,Gælder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ferie mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalstøbning
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal Total
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,At Rækkevidde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
 DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total blade tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af et job Åbning
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ventende aktiviteter for dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Fremmøde rekord.
 DocType: Bank Reconciliation,Journal Entries,Journaloptegnelser
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
-DocType: System Settings,Loading...,Indlæser ...
-DocType: DocField,Password,Adgangskode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused deposition modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tilføj Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",' findes ikke
 DocType: Pricing Rule,Valid Upto,Gyldig Op
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Indkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Kontorfuldmægtig
 DocType: Payment Tool,Received Or Paid,Modtaget eller betalt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vælg Firma
 DocType: Stock Entry,Difference Account,Forskel konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke opgave som sin afhængige opgave {0} ikke er lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
-DocType: Communication,Subject,Emne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Seriel Ingen garanti Udløb
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Vare
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Håndtering af underleverancer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM må IKKE være af typen heltal
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Håndtering af underleverancer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slet Company Transaktioner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Vare {0} er ikke Indkøb Vare
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} er en ugyldig e-mail-adresse i ""Notification \ e-mail adresse'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Samlet fakturering Dette år:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Samlet fakturering Dette år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør faktura nr
 DocType: Territory,For reference,For reference
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Løbenummer {0}, som det bruges på lager transaktioner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukning (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Lukning (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 ,Pending Qty,Afventer Antal
 DocType: Job Applicant,Thread HTML,Tråd HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
 DocType: Pricing Rule,Valid From,Gyldig fra
 DocType: Sales Invoice,Total Commission,Samlet Kommissionen
 DocType: Pricing Rule,Sales Partner,Salg Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjælper du distribuerer dit budget tværs måneder, hvis du har sæsonudsving i din virksomhed. At distribuere et budget ved hjælp af denne fordeling, skal du indstille dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen resultater i Invoice tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen resultater i Invoice tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, kan Serial Nos ikke blive slået sammen"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Bly Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskabsår Startdato må ikke være større end Skatteårsafslutning Dato
 DocType: Warranty Claim,Resolution,Opløsning
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Leveret: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag Kunder
 DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Salg Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vælg salgsordrer, som du ønsker at skabe produktionsordrer."
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Løn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database over potentielle kunder.
+DocType: Authorization Rule,Customer or Item,Kunden eller emne
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Citat Til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard måleenhed for Item {0} kan ikke ændres direkte, fordi du allerede har gjort nogle transaktion (er) med en anden UOM. Du bliver nødt til at oprette en ny konto for at bruge en anden Standard UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager hvor lagerændringer foretages.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsordre er Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslag Skrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden Sales Person {0} eksisterer med samme Medarbejder id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativ Stock Error ({6}) for Item {0} i Warehouse {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Standard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Du installere dropbox python-modul
 DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leder
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra kvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leder
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra kvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme element er indtastet flere gange.
 DocType: SMS Settings,Receiver Parameter,Modtager Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseret på' og 'Grupper efter' ikke kan være samme
 DocType: Sales Person,Sales Person Targets,Salg person Mål
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Indtast e-mail-adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ende rør danner
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 DocType: Selling Settings,Customer Naming By,Customer Navngivning Af
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til Group
 DocType: Activity Cost,Activity Type,Aktivitet Type
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Faste dage
 DocType: Sales Invoice,Packing List,Pakning List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projekter Bruger
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrugt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
 DocType: Company,Round Off Cost Center,Afrunde Cost center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelse Besøg {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Material Request,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åbning (dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Indstillinger
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
 DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
 DocType: BOM Operation,Operation Time,Operation Time
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mere
 DocType: Pricing Rule,Sales Manager,Salgschef
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Omdøb
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøjning
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillad Bruger
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Purchase Invoice,Quarterly,Kvartalsvis
 DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst item detaljer
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Lige klipning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,At spore post i salgs- og købsdokumenter baseret på deres løbenr. Dette er også bruges til at spore garantiforpligtelser detaljer af produktet.
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afvist Warehouse er obligatorisk mod regected post
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Element har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -623,15 +570,11 @@
 DocType: Serial No,Warranty Expiry Date,Garanti Udløbsdato
 DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af kundeordre, Salg Faktura eller Kassekladde"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Kan ikke finde valutakurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Imod Voucher type skal være en af kundeordre, Salg Faktura eller Kassekladde"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Emne
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varer modtaget fra leverandører.
-DocType: Communication,Open,Åbent
 DocType: Lead,Campaign Name,Kampagne Navn
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke et lager Vare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
-DocType: Contact Us Settings,Address Title,Adresse Titel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vælg ugentlige off dag
 DocType: Production Order Operation,Planned End Time,Planned Sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-DocType: Dropbox Backup,Daily,Daglig
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
 DocType: Delivery Note,Customer's Purchase Order No,Kundens Indkøbsordre Nej
 DocType: Employee,Cell Number,Cell Antal
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiale Anmodning Genereret
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedlige lønseddel.
 DocType: Item Group,Website Specifications,Website Specifikationer
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bogføring kan foretages mod blad noder. Poster mod grupper er ikke tilladt.
-DocType: ToDo,High,Høj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
-DocType: User,Male,Mand
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampagner.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -684,17 +624,16 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard skat skabelon, der kan anvendes på alle salgstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre udgifter / indtægter hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer **. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Er det Tax inkluderet i Basic Rate ?: Hvis du markerer dette, betyder det, at denne skat ikke vil blive vist under elementet bordet, men vil indgå i Basic Rate i din vigtigste punkt bordet. Dette er nyttigt, når du ønsker at give en flad pris (inklusive alle afgifter) pris til kunderne."
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Expense Claim,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Reading 7
 DocType: Address,Personal,Personlig
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kassekladde {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office vedligeholdelsesudgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Indtast Vare først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familie Baggrund
 DocType: Process Payroll,Send Email,Send Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen Tilladelse
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med højere weightage vises højere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Afstemning Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen medarbejder fundet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For at aktivere &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
-DocType: Comment,Reference Name,Henvisning Navn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Forventet leveringsdato kan ikke være, før Sales Order Date"
 DocType: Upload Attendance,Import Attendance,Import Fremmøde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Resultat / Loss
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Production Order,Item To Manufacture,Item Til Fremstilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formstøbning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Indkøbsordre til betaling
 DocType: Sales Order Item,Projected Qty,Projiceret Antal
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Nyhedsbrev manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Expense Claim,Expenses,Udgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribut
 ,Purchase Receipt Trends,Kvittering Tendenser
 DocType: Appraisal,Select template from which you want to get the Goals,"Vælg skabelon, hvorfra du ønsker at få de mål"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Udvikling
 ,Amount to Bill,Beløb til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Satsningen
 DocType: Item,Re-Order Qty,Re-prisen evt
 DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt at sende til {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke fortsætte {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Sømning
 ,Available Qty,Tilgængelig Antal
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Salary Slip,Working Days,Arbejdsdage
 DocType: Serial No,Incoming Rate,Indgående Rate
 DocType: Packing Slip,Gross Weight,Bruttovægt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Navnet på din virksomhed, som du oprette dette system."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i alt nej. Arbejdsdage
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Dato for Sammenføjning
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
 DocType: Purchase Invoice Item,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblæsning
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} skal være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} skal være aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
 DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsordrer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
-DocType: GL Entry,Account Currency,Konto Valuta
+DocType: Bank Reconciliation,Account Currency,Konto Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Address,Shop,Butik
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krydsede for Item {1}.
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Indkøbsordre Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Indkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Beløb = udestående beløb
-DocType: Contact Us Settings,Address Line 1,Adresse Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmaets navn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vælg Item for Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere Prisliste Rate i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Række {0}: Betaling mod Salg / Indkøbsordre bør altid blive markeret som forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Vælg Payroll År og Måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den relevante gruppe (som regel Anvendelse af fondene&gt; Omsætningsaktiver&gt; bankkonti og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
-DocType: Comment,Unsubscribed,Afmeldt
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Inspektion Kriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Cost Centers.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvid
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle Bly (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Vedhæft dit billede
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Lave
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Vedhæft dit billede
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Lave
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
-DocType: Workflow State,Stop,Stands
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Indkøbskurv
-apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestil type skal være en af {0}
 DocType: Lead,Next Contact Date,Næste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
 DocType: Holiday List,Holiday List Name,Holiday listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Forlad Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lad Tildeling Tool
 DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
 DocType: Company,If Monthly Budget Exceeded (for expense account),Hvis Månedligt budget overskredet (for udgiftskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimning
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 DocType: Company,Default Terms,Standard Vilkår
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attributtabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabat
 DocType: Features Setup,Purchase Discounts,Køb Rabatter
 DocType: Workstation,Wages,Løn
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
 DocType: Serial No,Creation Document No,Creation dokument nr
 DocType: Issue,Issue,Issue
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto stemmer ikke overens med Firma
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for Item Varianter. f.eks størrelse, farve etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
 DocType: BOM Operation,Operation,Operation
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Forsendelse stat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Buying
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Buying
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard Selling Cost center
 DocType: Sales Partner,Implementation Partner,Implementering Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} er {1}
 DocType: Opportunity,Contact Info,Kontakt Info
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Angivelser
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,opdateret via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
 DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
 DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af denne Kontakt
-DocType: Contact Us Settings,Address,Adresse
+DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af denne Kontakt
 DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
 DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
 DocType: Email Digest,Annual Expense,Årlig Udgift
 DocType: SMS Center,Total Characters,Total tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Afstemning Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,webside link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lad os forberede systemet til første brug.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firma registreringsnumre til din reference. Skat numre etc.
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,"Produktionsordre {0} skal annulleres, før den annullerer denne Sales Order"
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vælg Time Logs og Send for at oprette en ny Sales Invoice.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Intet at anmode
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer af aktiviteter for Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringer støbning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten kredit- eller beløb er påkrævet for {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den variant, vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Yderligere noder kan kun oprettes under &#39;koncernens typen noder
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Standard Punkt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamineret objekt fremstillingsvirksomhed
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch danner
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skat og andre løn fradrag.
 DocType: Lead,Lead,Bly
 DocType: Email Digest,Payables,Gæld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Købsordre Varer at blive faktureret
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
 DocType: Holiday,Holiday,Holiday
-DocType: Event,Saturday,Lørdag
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
 ,Daily Time Log Summary,Daglig Time Log Summary
-DocType: DocField,Label,Label
 DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Lead,Call,Opkald
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Opsætning af Medarbejdere
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vælg venligst præfiks først
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Angiv mindst én attribut i Attributter tabellen
 DocType: Contact,User ID,Bruger-id
-DocType: Communication,Sent,Sent
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
-DocType: Communication,Delivery Status,Levering status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 DocType: Production Order,Manufacture against Sales Order,Fremstilling mod kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten af verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Punkt Beskrivelse
 DocType: Payment Tool,Payment Mode,Betaling tilstand
 DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metal lasersintring
 DocType: Purchase Order,Supplied Items,Medfølgende varer
 DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
 DocType: Opportunity Item,Opportunity Item,Opportunity Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Medarbejder Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
 DocType: Address,Address Type,Adressetype
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Lille
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Lille
 DocType: Employee,Employee Number,Medarbejder nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grøn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grøn
 DocType: Item,Auto re-order,Auto re-ordre
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Opnået
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Opnået
 DocType: Employee,Place of Issue,Sted for Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-DocType: Report,Disabled,Handicappet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+DocType: Email Digest,Add Quote,Tilføj Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Mode Betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rod varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
 DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrævet
 DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
 DocType: Address,City/Town,By / Town
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Vare {0} skal være en underentreprise Vare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Udstyr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelse Regel først valgt baseret på &quot;Apply On &#39;felt, som kan være Item, punkt Group eller Brand."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet leveringsdato er mindre end planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Samlet Udgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke gøre regnskabsposter mod grupper.
-apps/frappe/frappe/config/desk.py +7,Tools,Værktøj
 DocType: Item,Website Item Groups,Website varegrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktion ordrenummer er obligatorisk for lager post fremstilling formål
 DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Kassekladde
 DocType: Workstation,Workstation Name,Workstation Navn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Værdiansættelse Rate kræves for Item {0}
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
 DocType: BOM Operation,Workstation,Arbejdsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vælg Firma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Faktura Dato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vurdering Template Goal
 DocType: Salary Slip,Earning,Optjening
 DocType: Payment Tool,Party Account Currency,Party Account Valuta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lave en tid log kun mod en indsendt produktionsordre
-DocType: Maintenance Schedule Item,No of Visits,Ingen af besøg
-DocType: File,old_parent,old_parent
+DocType: Maintenance Schedule Item,No of Visits,Ingen af besøg
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhedsbreve til kontakter, fører."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operationer kan ikke være tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operationer kan ikke være tomt.
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke ændres for Serial No.
-DocType: DocField,Description,Beskrivelse
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: Letter Head,Is Default,Er Standard
 DocType: Address,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Features Setup,Features Setup,Features Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Se tilbud Letter
-DocType: Communication,Communication,Kommunikation
 DocType: Item,Is Service Item,Er service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Projekter
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vælg venligst regnskabsår
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Vedligehold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra datotid
 DocType: Email Digest,For Company,For Company
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Vilkår og betingelser Indhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ingen aktive Løn Struktur fundet for medarbejder {0} og måned
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobprofil, kvalifikationer kræves etc."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skat Regel for transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi køber denne vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vi køber denne vare
 DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,Ikke Sent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv danner
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt at sende til {0} modtagere
 DocType: Quality Inspection,Readings,Aflæsninger
 DocType: Stock Entry,Total Additional Costs,Total Yderligere omkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub forsamlinger
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub forsamlinger
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rækken {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med JV beløb {2}
 DocType: Item,Inventory,Inventory
 DocType: Features Setup,"To enable ""Point of Sale"" view",For at aktivere &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke ske for tomme vogn
 DocType: Item,Sales Details,Salg Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Med Varer
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
 DocType: Notification Control,Expense Claim Rejected,Expense krav Afvist
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
 DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),I alt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),I alt ({0})
 DocType: Cost Center,Parent Cost Center,Parent Cost center
 DocType: Sales Invoice,Source,Kilde
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen resultater i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskabsår Startdato
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen resultater i Payment tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskabsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Undersænkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (r) annulleret
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (r) annulleret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Material Request Item,Sales Order No,Salg bekendtgørelse nr
 DocType: Item Group,Item Group Name,Item Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taget
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Overfør Materialer til Fremstilling
 DocType: Pricing Rule,For Price List,For prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
 DocType: Maintenance Schedule,Schedules,Tidsplaner
 DocType: Purchase Invoice Item,Net Amount,Nettobeløb
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nej
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Yderligere Discount Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fejl: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fejl: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Customer Group&gt; Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,Opgaver
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
-DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
 ,Accounts Receivable Summary,Debitor Resumé
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Blade for type {0} allerede afsat til Medarbejder {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
 DocType: UOM,UOM Name,UOM Navn
-DocType: Top Bar Item,Target,Target
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløb
 DocType: Sales Invoice,Shipping Address,Forsendelse Adresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
-DocType: ToDo,Due Date,Due Date
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand mester.
 DocType: Sales Invoice Item,Brand Name,Brandnavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kasse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kasse
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
 DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
 DocType: Sales Partner,Sales Partner Target,Salg Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskab Punktet om {0} kan kun foretages i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Udhugning
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
 DocType: Address,Lead Name,Bly navn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åbning Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må kun optræde én gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til at overdragelsessteder mere {0} end {1} mod indkøbsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produktion Mængde er obligatorisk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Beløb, der ikke afspejles i bank"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assisteret efterbehandling
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Passiver
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile Ingen
 DocType: Production Planning Tool,Select Sales Orders,Vælg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Anmodning om hvilke Leverandør Citater ikke er skabt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,At spore elementer ved hjælp af stregkode. Du vil være i stand til at indtaste poster i følgeseddel og salgsfaktura ved at scanne stregkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markér som Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markér som Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Make Citat
 DocType: Dependent Task,Dependent Task,Afhængig Opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 DocType: SMS Center,Receiver List,Modtager liste
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Løn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Mængde må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dage)
 DocType: Quotation Item,Quotation Item,Citat Vare
 DocType: Account,Account Name,Kontonavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større end til dato
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Løbenummer {0} mængde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tilføje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} er aflyst eller stoppet
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Køretøj Dispatch Dato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvittering {0} er ikke indsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom skibsfart regler, prisliste mv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserveret Antal
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Upper Indkomst
 DocType: Journal Entry Account,Debit in Company Currency,Betalingskort i Company Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Standardværdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Række {0}: Betaling beløb kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tryk fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standard prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk presning
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budgettet
 DocType: Journal Entry,Entry Type,Posttype
 ,Customer Credit Balance,Customer Credit Balance
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
 DocType: Quotation,Term Details,Term Detaljer
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
 DocType: Warranty Claim,Warranty Claim,Garanti krav
 ,Lead Details,Bly Detaljer
-DocType: Authorization Rule,Approving User,Godkendelse Bruger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smedning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
 DocType: Pricing Rule,Applicable For,Gældende For
 DocType: Bank Reconciliation,From Date,Fra dato
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betalt beløb (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra Rabat
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Angiv venligst enten mængde eller Værdiansættelse Rate eller begge
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskabsår er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiale Request bruges til at gøre dette Stock indtastning
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhed af et element.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Time Log Batch {0} skal være »Tilmeldt &#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kræves på Row Nej {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Indtast venligst gyldigt Regnskabsår start- og slutdatoer
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minedrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Harpiks støbning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe med samme navn findes. Ret Kundens navn eller omdøb kundegruppen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vælg {0} først.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type og parti er nødvendig for Tilgodehavende / Betales konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
 DocType: Lead,Next Contact By,Næste Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} kan ikke slettes, da mængden findes for Item {1}"
 DocType: Quotation,Order Type,Bestil Type
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
 DocType: Payment Tool,Find Invoices to Match,Find fakturaer til Match
 ,Item-wise Sales Register,Vare-wise Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",fx &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Samlet Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Samlet Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Indkøbskurv er aktiveret
 DocType: Job Applicant,Applicant for a Job,Ansøger om et job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produktionsordrer oprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Løn Slip af medarbejder {0} allerede skabt for denne måned
 DocType: Stock Reconciliation,Reconciliation JSON,Afstemning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alt for mange kolonner. Eksportere rapporten og udskrive det ved hjælp af en regnearksprogram.
 DocType: Sales Invoice Item,Batch No,Batch Nej
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod Kundens Indkøbsordre
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
-DocType: DocPerm,Delete,Slet
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet ordre kan ikke annulleres. Unstop at annullere.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Ansøger om et job.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-DocType: Communication,Received,Modtaget
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke tilladt at have produktionsordre.
-DocType: DocField,Attach Image,Vedhæft billede
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Efterlad tom, hvis ingen ændring"
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs til produktion.
 DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-wise Omarranger Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log til opgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Aktuel leveringstid og omkostninger
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiale Request af maksimum {0} kan gøres for Item {1} mod Sales Order {2}
 DocType: Employee,Salutation,Salutation
-DocType: Communication,Rejected,Afvist
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Sales Order Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Værdi {0} til Attribut {1} findes ikke i listen over gyldige Item Attribut Værdier
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Udløbet
 DocType: Packing Slip,To Package No.,At pakke No.
-DocType: DocType,System,System
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun Udkast)"
 DocType: Payment Tool,Make Payment Entry,Foretag indbetaling indtastning
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Mængde for Item {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
 DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend Blade
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,For
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør Citat Vare
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Foretag Løn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik på &#39;Make Salg Faktura&#39; knappen for at oprette en ny Sales Invoice.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og etikettering
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Håndtering af Projekter
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
 DocType: Budget Detail,Fiscal Year,Regnskabsår
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan ikke tildeles mod {0}, da det ikke er en indtægt eller omkostning konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Opnået
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,f.eks 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Række {0}: Allokeret mængde {1} skal være mindre end eller lig med at fakturere udestående beløb {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"I Ord vil være synlig, når du gemmer salgsfakturaen."
 DocType: Item,Is Sales Item,Er Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
 DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
 ,Amount to Deliver,"Beløb, Deliver"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Der var fejl.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Aflytning
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,En vare eller tjenesteydelse
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Indtast Referencedato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
 DocType: Material Request Item,Material Request Item,Materiale Request Vare
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Tree of varegrupper.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 ,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke afsluttet for {2} qty af færdigvarer i produktionsordre # {3}. Du opdatere driftsstatus via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Opløsning Detaljer
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Skift UOM for et element.
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptkriterier
 DocType: Item Attribute,Attribute Name,Attribut Navn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Vare {0} skal være Salg eller service Item i {1}
 DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Gruppe
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 ,Qty to Order,Antal til ordre
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","At spore mærke i følgende dokumenter Delivery Note, Opportunity, Material Request, punkt, Indkøbsordre, Indkøb Gavekort, køber Modtagelse, Citat, Sales Faktura, Produkt Bundle, salgsordre, Løbenummer"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Klar Table
 DocType: Features Setup,Brands,Mærker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra indkøbsordre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lad ikke kan anvendes / annulleres, før {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Priser Regler er yderligere filtreret baseret på mængde.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke Sæt
-DocType: Communication,Date,Dato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sidde stramt, mens dit system bliver setup. Dette kan tage et øjeblik."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 DocType: Maintenance Schedule Detail,Actual Date,Faktiske dato
 DocType: Item,Has Batch No,Har Batch Nej
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 DocType: Employee,Personal Details,Personlige oplysninger
 ,Maintenance Schedules,Vedligeholdelsesplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prægning
 ,Quotation Trends,Citat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som kan Produktionsordre gøres for denne post, skal det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Vær med
-DocType: Authorization Rule,Above Value,Over værdi
 ,Pending Amount,Afventer Beløb
 DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
 DocType: Purchase Order,Delivered,Leveret
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Opsætning indgående server for job email id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Tilgodehavender
 ,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
-DocType: Custom Field,Custom,Brugerdefineret
 DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Sprøjtestøbning
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial konti.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} skal være af typen 'Anlægskonto' da enheden {1} er et aktiv
 DocType: HR Settings,HR Settings,HR-indstillinger
-apps/frappe/frappe/config/setup.py +130,Printing,Udskrivning
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den dag (e), hvor du ansøger om orlov er ferie. Du har brug for ikke søge om orlov."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Samlede faktiske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhed
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Venligst sæt Dropbox genvejstaster i dit site config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Enhed
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Angiv venligst Company
 ,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste emner"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskabsår slutter den
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskabsår slutter den
 DocType: POS Profile,Price List,Pris List
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Expense Krav
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkendelse Rolle
 ,BOM Search,BOM Søg
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukning (Åbning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Angiv venligst valuta i selskabet
 DocType: Workstation,Wages per hour,Lønningerne i timen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / Skjul funktioner som Serial Nos, POS mv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materiale anmodninger er blevet rejst automatisk baseret på Item fornyede bestilling niveau
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Clearance dato kan ikke være før check dato i række {0}
 DocType: Salary Slip,Deduction,Fradrag
 DocType: Address Template,Address Template,Adresse Skabelon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
 DocType: Quotation,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Omkostninger Opdateret
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Omkostninger Opdateret
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
 DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratrække
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Jobbeskrivelse
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vælg en gyldig csv fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Belægning
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold styr på salgskampagner. Hold styr på Leads, Citater, Sales Order osv fra kampagner til at måle Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Lagertilgang eksisterer mod lageret {0}, og derfor kan du ikke re-tildele eller ændre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dyppestøbning
-DocType: Purchase Order,To be delivered to customer,Der skal leveres til kunden
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log status skal indsendes.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Løbenummer {0} tilhører ikke nogen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opsætning
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Pricing Rule,Supplier,Leverandør
 DocType: C-Form,Quarter,Kvarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse udgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
 DocType: Employee,Bank Name,Bank navn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruger {0} er deaktiveret
 DocType: Leave Application,Total Leave Days,Total feriedage
-DocType: Journal Entry Account,Credit in Account Currency,Kredit i Konto Valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til handicappede brugere
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vælg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Item {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
-DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order kræves for Item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vælg tildelte beløb, Faktura Type og Fakturanummer i mindst én række"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order kræves for Item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Beløb, der ikke afspejles i systemet"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andre
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Afsluttet
-DocType: Web Form,Select DocType,Vælg DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Ny Cost center
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Ny Cost center
 DocType: Bin,Ordered Quantity,Bestilt Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
 DocType: Quality Inspection,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referencedokument type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Føljeton Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Føljeton Inventory
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Samlet Billing Beløb
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tilgodehavende konto
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order til Betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs oprettet:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægt UOM
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Side Break
 DocType: Production Order Operation,Pending,Afventer
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan ikke ændre standard UOM af Variant. Hvis du vil ændre standard UOM for Variant ændre standard UOM af skabelon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor udstyr
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Virksomheder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedligeholdelsesplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fuld tid
 DocType: Purchase Invoice,Contact Details,Kontaktoplysninger
 DocType: C-Form,Received Date,Modtaget Dato
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Job Åbning
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Tilbyd Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
 DocType: Time Log,To Time,Til Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hvis du vil tilføje barn noder, udforske træet og klik på noden, hvorunder du ønsker at tilføje flere noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktiveret
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Kunde Item Koder
 DocType: Opportunity,Lost Reason,Tabt Årsag
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Opret Betaling Entries mod ordrer eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svejsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM kræves
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 DocType: Project,External,Ekstern
 DocType: Features Setup,Item Serial Nos,Vare Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompressionsstøbning
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Dine kunder
 DocType: Leave Block List Date,Block Date,Block Dato
 DocType: Sales Order,Not Delivered,Ikke leveret
 ,Bank Clearance Summary,Bank Clearance Summary
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code&gt; Vare Gruppe&gt; Brand
 DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
-DocType: Event,Friday,Fredag
 DocType: Time Log,Costing Amount,Koster Beløb
 DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
 DocType: Salary Structure,Monthly Earning & Deduction,Månedlige Earning &amp; Fradrag
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
 DocType: SMS Log,Sender Name,Sender Name
-DocType: Page,Title,Titel
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpas
 DocType: POS Profile,[Select],[Vælg]
 DocType: SMS Log,Sent To,Sendt Til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Make Sales Invoice
 DocType: Company,For Reference Only.,Kun til reference.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Fra dato' er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Fra dato' er nødvendig
 DocType: Journal Entry,Reference Number,Referencenummer
 DocType: Employee,Employment Details,Beskæftigelse Detaljer
 DocType: Employee,New Workplace,Ny Arbejdsplads
@@ -1873,14 +1724,14 @@
 apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ingen Vare med Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Hvis du har salgsteam og salg Partners (Channel Partners) de kan mærkes og vedligeholde deres bidrag i salget aktivitet
-DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
+DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
 DocType: Item,"Allow in Sales Order of type ""Service""",Tillad i kundeordre af typen &quot;Service&quot;
 apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Butikker
 DocType: Time Log,Projects Manager,Projekter manager
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Rejser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Rejser
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile Ingen
 DocType: Sales Invoice,Recurring,Tilbagevendende
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Opdatering Omkostninger
 DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiale
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Angiv operationer, driftsomkostninger og giver en unik Operation nej til dine operationer."
 DocType: Purchase Invoice,Price List Currency,Pris List Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
 DocType: Installation Note,Installation Note,Installation Bemærk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tilføj Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Tilføj Skatter
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskab
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi der er eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
 DocType: Quality Inspection,Purchase Receipt No,Kvittering Nej
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: System Settings,In Hours,I Hours
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balance pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polering
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balance pr bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Finansieringskilde (Passiver)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
 DocType: Appraisal,Employee,Medarbejder
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fil til Omdøb
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiske
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opret kunde
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Reading 9
 DocType: Supplier,Is Frozen,Er Frozen
 DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Masse efterbehandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdig god Item
 DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Opsætning indgående server til salg email id. (F.eks sales@example.com)
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Udkast
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Accepteret
-DocType: User,Female,Kvinde
-DocType: Journal Entry Account,Debit in Account Currency,Debet i Konto Valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
-DocType: Print Settings,Modern,Moderne
-DocType: Communication,Replied,Svarede
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ugyldig henvisning {0} {1}
 DocType: Payment Tool,Total Payment Amount,Samlet Betaling Beløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 DocType: Newsletter,Test,Prøve
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da der er eksisterende lagertransaktioner til denne vare, \ du ikke kan ændre værdierne af &quot;Har Serial Nej &#39;,&#39; Har Batch Nej &#39;,&#39; Er Stock Item&quot; og &quot;værdiansættelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Kassekladde
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
 DocType: Employee,Previous Work Experience,Tidligere erhvervserfaring
 DocType: Stock Entry,For Quantity,For Mængde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplet opsætning
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhedsbrev Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Navn
+DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhed
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
 DocType: Lead,Opportunity,Mulighed
@@ -1995,18 +1837,17 @@
 DocType: Purchase Invoice,Advances,Forskud
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende Rate (som pr Stock UOM)
-DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
+DocType: SMS Log,No of Requested SMS,Ingen af Anmodet SMS
 DocType: Campaign,Campaign-.####,Kampagne -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En tredjepart, distributør/forhandler/sælger/affiliate/butik der, der sælger selskabernes varer/tjenesteydelser mod provision."
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbejdning
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2027,12 +1868,10 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
-DocType: Note,Note,Bemærk
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skat skabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som &quot;Shipping&quot;, &quot;forsikring&quot;, &quot;Håndtering&quot; osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på &quot;Forrige Row alt&quot; kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
-DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke producere mere Item {0} end Sales Order mængde {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjul Valuta Symbol
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afsluttet Antal kan ikke være mere end {0} til drift {1}
 DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Introduktion
 DocType: Warranty Claim,Service Address,Tjeneste Adresse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rækker for Stock Afstemning.
 DocType: Stock Entry,Manufacture,Fremstilling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Clearance Dato ikke nævnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Clearance Dato ikke nævnt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Tillad produktionsordre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (Antal)
 DocType: Installation Note Item,Installed Qty,Antal installeret
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Indsendt
 DocType: Salary Structure,Total Earning,Samlet Earning
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine Adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Udgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
-,Download Backups,Hent Backups
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
 DocType: Bank Reconciliation,To Date,Til dato
 DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
 DocType: Employee,Emergency Contact,Emergency Kontakt
 DocType: Item,Quality Parameters,Kvalitetsparametre
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lad type {0} kan ikke bære-videresendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
 ,To Produce,At producere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Reserveret Mængde
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering Varer
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skæring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Udfladning
 DocType: Account,Income Account,Indkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
 DocType: Item Reorder,Material Request Type,Materiale Request Type
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Cost center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Indkøbsordre Message
 DocType: Tax Rule,Shipping Country,Forsendelse Land
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Total forhånd ({0}) mod Order {1} kan ikke være større \ end Grand Total ({2})
 DocType: Employee,Relieving Date,Lindre Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse kan kun ændres via Stock indtastning / følgeseddel / kvittering
 DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser manipuleret netto formgivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Indkomstskat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor fører af Industry Type.
 DocType: Item Supplier,Item Supplier,Vare Leverandør
@@ -2128,46 +1959,39 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenlægning er kun muligt, hvis følgende egenskaber er ens i begge poster. Er koncernens, Root Type, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrer Customer Group Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Ny Cost center navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Lad Kontrolpanel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Adresse skabelon.
 DocType: Appraisal,HR User,HR Bruger
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
 apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Spørgsmål
-apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
 DocType: Sales Invoice,Debit To,Betalingskort Til
 DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
 ,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
 DocType: Supplier,Billing Currency,Fakturering Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Resultatopgørelse
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Ved at trykke
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Udlån (aktiver)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Large
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen medarbejder fundet!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Large
 DocType: C-Form Invoice Detail,Territory,Territory
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
 DocType: Purchase Order,Customer Address Display,Kunden Adresse Display
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standard måleenhed for Item {0} kan ikke ændres direkte, fordi \ du allerede har gjort nogle transaktion (er) med en anden UOM. Hvis du vil ændre standard UOM, \ brug «UOM Erstat Utility &#39;værktøj under Lager modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} er aflyst
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} er aflyst
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
 DocType: Sales Partner,Targets,Mål
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
 ,S.O. No.,SÅ No.
 DocType: Production Order Operation,Make Time Log,Make Time Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Venligst sæt genbestille mængde
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opret Kunden fra Lead {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slibning
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Venligst opsætning din kontoplan, før du starter bogføring"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulleret
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
 DocType: Employee Education,Graduate,Graduate
 DocType: Leave Block List,Block Days,Bloker dage
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontroller, om tilbagevendende faktura, skal du fjerne markeringen for at stoppe tilbagevendende eller sætte ordentlig Slutdato"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til print)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rækker tilladt
 DocType: C-Form Invoice Detail,Net Total,Net Total
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (Sales Invoice)
@@ -2222,22 +2044,21 @@
 DocType: BOM Item,Scrap %,Skrot%
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
 DocType: Maintenance Visit,Purposes,Formål
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindst ét element skal indtastes med negativt mængde gengæld dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemisk bearbejdning
 ,Requested,Anmodet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ingen Bemærkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfaldne
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Der skal være en gruppe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Features Setup,Sales and Purchase,Salg og Indkøb
 DocType: Supplier Quotation Item,Material Request No,Materiale Request Nej
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} er blevet afmeldt fra denne liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Tilføjet
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Party Balance
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskabsår {0} ikke fundet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få relevante oplysninger
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskab Punktet om Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Opfandt
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rækken {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray danner
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum Inventory Level
 DocType: Stock Entry,Subcontract,Underleverance
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Producentens varenummer
 DocType: Production Order Operation,Estimated Time and Cost,Estimeret tid og omkostninger
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Forkant
-DocType: SMS Log,No of Sent SMS,Ingen af Sent SMS
+DocType: SMS Log,No of Sent SMS,Ingen af Sent SMS
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Udgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farve
 DocType: Maintenance Visit,Scheduled,Planlagt
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelse Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Pris List Valuta ikke valgt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: kvittering {1} findes ikke i ovenstående &#39;Køb Kvitteringer&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøbe Log
 DocType: Installation Note Item,Against Document No,Mod dokument nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Sales Partners.
 DocType: Quality Inspection,Inspection Type,Inspektion Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vælg {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Opdatering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Gem nyhedsbrevet før afsendelse
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-mail er obligatorisk
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektion indkommende kvalitet.
 DocType: Purchase Order Item,Returned Qty,Returneret Antal
 DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Typen er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerende efterbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For nemheds af kunder, kan disse koder bruges i trykte formater som fakturaer og følgesedler"
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
 DocType: Sales Invoice,Advertisement,Annonce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Expense Claim,Expense Approver,Expense Godkender
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slibning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink indpakning
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekræftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Titel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Dagblades
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblades
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smeltning
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Attendance,Attendance Date,Fremmøde Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Accepteret varelager
 DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
 DocType: Item,Valuation Method,Værdiansættelsesmetode
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Kan ikke finde valutakurs for {0} til {1}
 DocType: Sales Invoice,Sales Team,Salgsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
 DocType: Serial No,Under Warranty,Under Garanti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fejl]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
 ,Employee Birthday,Medarbejder Fødselsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye blade Tildelte (i dage)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordrer
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordrer
 DocType: Leave Control Panel,Employee Type,Medarbejder Type
 DocType: Employee Leave Approver,Leave Approver,Lad Godkender
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Sænksmedning
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udgifter' rolle
 ,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kreditgrænse
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vælg type transaktion
 DocType: GL Entry,Voucher No,Blad nr
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Adresse og kontakt
 DocType: Customer,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Employee,Feedback,Feedback
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Efterlad ikke kan fordeles inden {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: På grund / reference Date overstiger tilladte kunde kredit dage efter {0} dag (e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Sandblæsnings udstyr
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidsplan
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Website Settings,Website Settings,Website Settings
 DocType: Item,Reorder level based on Warehouse,Genbestil niveau baseret på Warehouse
 DocType: Activity Cost,Billing Rate,Fakturering Rate
 ,Qty to Deliver,Antal til Deliver
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-konto kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-konto kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Stock Entries
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Henvisning # {0} dateret {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruger Bemærkning
 DocType: Lead,Market Segment,Market Segment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukning (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukning (dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Faktureret beløb
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hent opdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tilføj et par prøve optegnelser
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lad Management
-DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
 DocType: Sales Order,Fully Delivered,Fuldt Leveres
 DocType: Lead,Lower Income,Lavere indkomst
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtig hjælp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
 DocType: Features Setup,Sales Extras,Salg Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget for konto {1} mod udgiftsområde {2} vil blive overskredet med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Værdi eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
 ,Qty to Receive,Antal til Modtag
 DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruge det til login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruge det til login
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Notering {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank kassekredit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Foretag lønseddel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Gennemse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikrede lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Products
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åbning Balance Egenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Kan ikke godkende orlov, som du ikke har tilladelse til at godkende blade på Block Datoer"
 DocType: Appraisal,Appraisal,Vurdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum støbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gentages
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lad godkender skal være en af {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Tegningsberettiget
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lad godkender skal være en af {0}
 DocType: Hub Settings,Seller Email,Sælger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Company Valuta)
 DocType: BOM Operation,Hour Rate,Hour Rate
 DocType: Stock Settings,Item Naming By,Item Navngivning By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra tilbudsgivning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra tilbudsgivning
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} findes ikke
 DocType: Purchase Receipt Item,Purchase Order Item No,Indkøbsordre Konto nr
-DocType: System Settings,System Settings,Systemindstillinger
 DocType: Project,Project Type,Projekt type
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Omkostninger ved forskellige aktiviteter
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Fuldt Billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagemateriale vægt. (Til print)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
-DocType: Communication,Recipients,Modtagere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rifling
 DocType: Expense Claim,Approval Status,Godkendelsesstatus
 DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vælg Bankkonto
 DocType: Newsletter,Create and Send Newsletters,Opret og send nyhedsbreve
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato skal være før til dato
 DocType: Sales Order,Recurring Order,Tilbagevendende Order
 DocType: Company,Default Income Account,Standard Indkomst konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / kunde
 DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
+,Welcome to ERPNext,Velkommen til ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til Citat
 DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Opkald
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Opkald
 DocType: Project,Total Costing Amount (via Time Logs),Total Costing Beløb (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
 ,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Åbning Dato
 DocType: Journal Entry,Remark,Bemærkning
 DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra kundeordre
-DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Billed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
 DocType: Time Log,Batched for Billing,Batched for fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger rejst af leverandører.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabat Beløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,fx moms
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,fx moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas danner
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskabet er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den relevante gruppe (som regel finansieringskilde&gt; Aktuelle Passiver&gt; Skatter og Afgifter og oprette en ny konto (ved at klikke på Tilføj barn) af typen &quot;Skat&quot; og gøre nævne Skatteprocent.
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskæring
-DocType: Event,Monday,Mandag
 DocType: Journal Entry,Stock Entry,Stock indtastning
 DocType: Account,Payable,Betales
 DocType: Salary Slip,Arrear Amount,Bagud Beløb
@@ -2576,9 +2370,8 @@
 DocType: Newsletter,Newsletter List,Nyhedsbrev List
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Kontroller, om du vil sende lønseddel i e-mail til den enkelte medarbejder, samtidig indsende lønseddel"
 DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
-DocType: Page,All,Alle
 DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installation Dato
 DocType: Employee,Confirmation Date,Bekræftelse Dato
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Salg Bruger
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Sæt
 DocType: Lead,Lead Owner,Bly Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse kræves
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Warehouse kræves
 DocType: Employee,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Auto Materiale Request
 DocType: Time Log,Will be updated when billed.,"Vil blive opdateret, når faktureret."
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Firmaets navn kan ikke være Firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler til print skabeloner f.eks Proforma Invoice.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrering af al kommunikation af type e-mail, telefon, chat, besøg osv"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
 DocType: Purchase Invoice,Terms,Betingelser
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opret ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Opret ny
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
 ,Item-wise Sales History,Vare-wise Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
 ,Purchase Analytics,Køb Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
 DocType: Expense Claim,Task,Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
 DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Pris: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Pris: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønseddel Fradrag
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Noter
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vælg en gruppe node først.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Formålet skal være en af {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
 DocType: Leave Application,Leave Balance Before Application,Lad Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Letter hoved
 DocType: Time Log,Billable,Faktureres
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil blive brugt til at indstille regel i HR-modulet
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Genbestil Antal
 DocType: Company,Stock Adjustment Account,Stock Justering konto
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Discount Fields vil være tilgængelig i Indkøbsordre, kvittering, købsfaktura"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Bemærk: Du må ikke oprette konti for kunder og leverandører
-DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstat Værktøj
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Land klogt standardadresse Skabeloner
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Vis skat break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du inddrage i fremstillingsindustrien aktivitet. Aktiverer Item &#39;Er Fremstillet&#39;
@@ -2666,86 +2452,77 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
 DocType: Serial No,Out of AMC,Ud af AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiale Request Detail Nej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hård drejning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Make Vedligeholdelse Besøg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
 DocType: Company,Default Cash Account,Standard Kontant konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok orlov balance for Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Bemærk: Hvis betaling ikke sker mod nogen reference, gør Kassekladde manuelt."
 DocType: Item,Supplier Items,Leverandør Varer
 DocType: Opportunity,Opportunity Type,Opportunity Type
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Ny Company
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Cost center er nødvendig for &quot;Resultatopgørelsen&quot; konto {0}
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af selskabet
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transaktioner kan kun slettes af skaberen af selskabet
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal finansposter fundet. Du har muligvis valgt et forkert konto i transaktionen.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,For at oprette en bankkonto
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Række {0}: Antal ikke avalable i lageret {1} på {2} {3}. Tilgængelig Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Purchase Order,Customer Contact Email,Kundeservice Kontakt E-mail
-DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Bemærk: Betaling indtastning vil ikke blive oprettet siden &#39;Kontant eller bank konto&#39; er ikke angivet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tilføj Brugere
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Tilføj Brugere
 DocType: Pricing Rule,Item Group,Item Group
 DocType: Task,Actual Start Date (via Time Logs),Faktiske startdato (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prøv venligst igen typen firmanavn for at bekræfte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Enestående Amt
 DocType: Time Log Batch,Total Hours,Total Hours
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Element er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøjtestøbning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Tilpasset Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto er obligatorisk for betalingen post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Bejdsning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandstøbning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Et emne med dette e-mail-id skal være oprettet.
 DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundlæggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
 DocType: Salary Structure,Salary Structure,Løn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriterier, skal du løse \ konflikten ved at tildele prioritet. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Materiale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
 DocType: Hub Settings,Access Token,Access Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Er Fast aktivpost
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange trykte formater, kan denne funktion bruges til at opdele side, der skal udskrives på flere sider med alle sidehoveder og sidefødder på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle områder
 DocType: Purchase Invoice,Items,Varer
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
 DocType: Purchase Invoice Item,Image View,Billede View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Efterbehandling &amp; industriel efterbehandling
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kræves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Værdipapirer og Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blæsestøbning
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
 DocType: Tax Rule,Shipping City,Forsendelse By
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
 DocType: Account,Purchase User,Køb Bruger
 DocType: Notification Control,Customize the Notification,Tilpas Underretning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hamring
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
 DocType: Journal Entry,Print Heading,Print Overskrift
 DocType: Quotation,Maintenance Manager,Vedligeholdelse manager
-DocType: Workflow State,Search,Søg
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodning
 DocType: C-Form,Amended From,Ændret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten target qty eller målbeløbet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vælg Bogføringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2801,44 +2570,43 @@
 ,Produced,Produceret
 DocType: Item,Item Code for Suppliers,Item Code for leverandører
 DocType: Issue,Raised By (Email),Rejst af (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Vedhæft Brevpapir
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Vedhæft Brevpapir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriel Nos Nødvendig for Serialized Item {0}
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
-DocType: Blog Post,Blog Post,Blog-indlæg
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppér efter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postale Udgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Den dato, hvor tilbagevendende ordre vil blive stoppe"
 DocType: Quality Inspection,Item Serial No,Vare Løbenummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} skal reduceres med {1}, eller du bør øge overflow tolerance"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Samlet Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ny Løbenummer kan ikke have Warehouse. Warehouse skal indstilles af Stock indtastning eller kvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Opret Citat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende blade på Block Datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skat
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Række {0}: {1} er ikke en gyldig {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Fra produktpakke
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægning Tool
 DocType: Quality Inspection,Report Date,Report Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} allerede afsat til Medarbejder {1} for perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Modtagere
 DocType: Features Setup,Item Groups in Details,Varegrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Opdatering Vurder og tilgængelighed
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentdel, du får lov til at modtage eller levere mere mod den bestilte mængde. For eksempel: Hvis du har bestilt 100 enheder. og din Allowance er 10%, så du får lov til at modtage 110 enheder."
 DocType: Pricing Rule,Customer Group,Customer Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: Item,Website Description,Website Beskrivelse
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Citat Lost Årsag
 DocType: Address,Plant,Plant
-DocType: DocType,Setup,Opsætning
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koldvalsning
 DocType: Customer Group,Customer Group Name,Customer Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-DocType: Packing Slip,Get Items,Få Varer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Indtast venligst Skriv Off konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Indtast venligst Skriv Off konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sidste Ordredato
-DocType: DocField,Image,Billede
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Make Excise Faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
-DocType: Communication,Other,Andre
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ikke indstillet
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation Dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøg
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besøg
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Purchase Invoice,Mobile No,Mobile Ingen
 DocType: Payment Tool,Make Journal Entry,Make Kassekladde
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommerciel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommerciel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenesteydelser.
 DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
-DocType: Contact Us Settings,Address Line 2,Adresse Linje 2
-DocType: ToDo,Reference,Henvisning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financial Services
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Værdi for Egenskab {0} skal være inden for området af {1} til {2} i intervaller på {3}
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse kræves for lager Vare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard kan modtages Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Savning
 DocType: Tax Rule,Billing State,Fakturering stat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminering
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-DocType: Product Bundle,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
 DocType: GL Entry,Remarks,Bemærkninger
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installation rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig støbning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Frem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kolde dimensionering
 DocType: Salary Slip,Earning & Deduction,Earning &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Værdiansættelse Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Indstil standard værdi {0} i Company {1}
 DocType: Serial No,Creation Time,Creation Time
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
 DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få elementer fra Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Fremmøde Fra Dato og fremmøde til dato er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Indtast &quot;underentreprise&quot; som Ja eller Nej
 DocType: Sales Team,Contact No.,Kontakt No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Resultatopgørelsen' konto {0} ikke tilladt i 'Åbning balance'
-DocType: Workflow State,Time,Tid
 DocType: Features Setup,Sales Discounts,Salg Rabatter
 DocType: Hub Settings,Seller Country,Sælger Land
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Order
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tilføj Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Konvertering Factor er nødvendig
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision på salg
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Kunder Ikke købe siden lang tid
 DocType: Production Order,Expected Delivery Date,Forventet leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordampningsemissioner-mønster støbning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Fakturering Beløb
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig mængde angivet for element {0}. Mængde bør være større end 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiske Udgifter
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto ordre vil blive genereret f.eks 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Udstationering Time
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Rejser Udgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
-DocType: Feed,Full Name,Fulde navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lager Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Udbetaling af løn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
 ,Transferred Qty,Overført Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlægning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlægning
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Udstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi sælger denne Vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vi sælger denne Vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør id
 DocType: Journal Entry,Cash Entry,Cash indtastning
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Item manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tilføj rækker til at fastsætte årlige budgetter på Konti.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Stenbrud
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Bemærk: Konto {0} indtastet flere gange
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger kvalitetskontrol. Aktiverer Item QA Nødvendig og QA Ingen i kvittering
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsstøbning
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Løn skabelon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dage Leave tilladt
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sæt Skat Regel for indkøbskurv
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citater til Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
 DocType: Pricing Rule,Buying,Køb
 DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
 DocType: Purchase Order Item,Supplier Quotation,Leverandør Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strygning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i Item {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende begivenheder
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
-DocType: Letter Head,Letter Head,Brev hoved
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig indtastning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Indtægter / Expense
 DocType: Employee,Personal Email,Personlig Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Samlet Varians
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Samlet Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,postnummer
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordrer frigives til produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Indtast venligst standard Måleenhed
 DocType: Purchase Invoice Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
-DocType: Workflow State,Edit,Edit
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Features Setup,Item Batch Nos,Item Batch nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,BOM Ingen
-DocType: Contact Us Settings,Pincode,Pinkode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM skal være forskellig fra nuværende bestand UOM
 DocType: Account,Debit,Betalingskort
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Standard Cost center
 DocType: Purchase Invoice,End Date,Slutdato
 DocType: Employee,Internal Work History,Intern Arbejde Historie
-DocType: DocField,Column Break,Kolonne Break
-DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drejning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Udstilling
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
 ,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sats (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Sats (%)
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskabsår Slutdato
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere baseret på blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Foretag Leverandør Citat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Foretag Leverandør Citat
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reducer Optjening for Leave uden løn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne uges Summary
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} skal være en Købt eller underentreprise element i række {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Opportunity Dato
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbejde
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Til Diskuter
 DocType: SMS Settings,SMS Settings,SMS-indstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Sort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Sort
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Slutdato for aktuelle ordres periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Kom med et tilbud Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retur
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
-DocType: DocField,Fold,Fold
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standard måleenhed for Variant skal være samme som skabelon
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Afventer anmeldelse
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Angiv venligst
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-id
-DocType: Page,Page Name,Side Navn
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Til Time skal være større end From Time
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Opgave-id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",fx &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",fx &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
 ,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Oplag {0} eksisterer ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af materialer leveret mod denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Hæftning
 DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
 DocType: Sales Invoice,Paid Amount,Betalt Beløb
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukning Konto {0} skal være af typen &#39;ansvar&#39;
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filter baseret på kundernes
 DocType: Payment Tool Detail,Against Voucher No,Mod blad nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Købe
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
 DocType: Item Group,Parent Item Group,Moderselskab Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Omkostninger Centers
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Pakhuse.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Pakhuse.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
 DocType: Opportunity,Next Contact,Næste Kontakt
 DocType: Employee,Employment Type,Beskæftigelse type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
 DocType: Item Group,Default Expense Account,Standard udgiftskonto
 DocType: Employee,Notice (days),Varsel (dage)
-DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Sales Tax Skabelon
 DocType: Employee,Encashment Date,Indløsning Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Imod Voucher type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Activity Omkostninger findes for Activity Type - {0}
 DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Navn
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Vedlagt {0} # {1}
 DocType: Job Applicant,Applicant Name,Ansøger Navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Item Name
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Angiv fra / til spænder
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Lavet af
 DocType: Serial No,Under AMC,Under AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Opdater færdigvarer
 DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede anvendes i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual Inventory) vil blive oprettet under denne konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse kan ikke slettes, da der eksisterer lager hovedbog post for dette lager."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløb betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og Afgifter
 DocType: Account,Receivable,Tilgodehavende
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
 DocType: Sales Invoice,Supplier Reference,Leverandør reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis markeret, vil BOM for sub-montage elementer overvejes for at få råvarer. Ellers vil alle sub-montage poster behandles som et råstof."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Sælger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Item Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Warehouse,Warehouse Name,Warehouse Navn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Udskift Utility
 DocType: POS Profile,Terms and Conditions,Betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Til dato bør være inden regnskabsåret. Antages Til dato = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du vedligeholde højde, vægt, allergier, medicinske problemer osv"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,For Produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Indtast salgsordre i ovenstående tabel
 DocType: Project Task,View Task,View Opgave
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskabsår begynder på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskabsår begynder på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Indtast venligst Køb Kvitteringer
 DocType: Sales Invoice,Get Advances Received,Få forskud
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Opsætning indgående server til support email id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Salary Slip,Salary Slip,Lønseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;Til dato&#39; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
 DocType: Salary Slip,Payment Days,Betalings Dage
 DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
 DocType: Features Setup,Item Advanced,Item Avanceret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
 DocType: Salary Slip,Net Pay,Nettoløn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Salg Team Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentielle muligheder for at sælge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sygefravær
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehuse
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Er Aktiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Gem dokumentet først.
 DocType: Account,Chargeable,Gebyr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Skift Forkortelse
-DocType: Workflow State,Primary,Primær
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabat (%)
-DocType: Communication,More Information,Mere information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sidste ordrebeløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprængning
 DocType: Company,Warn,Advar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item værdiansættelse opdateret
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: BOM,Manufacturing User,Manufacturing Bruger
 DocType: Purchase Order,Raw Materials Supplied,Raw Materials Leveres
 DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: Communication,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Item Klassifikation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,General Ledger
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vælg {0} først
 DocType: Features Setup,To get Item Group in details table,At få Item Group i detaljer tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Gentegning
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} af Item {1} er udløbet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ætsning
 DocType: Sales Invoice,Commission,Kommissionen
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Standard Mængde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke fundet i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse ikke fundet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Denne måneds Summary
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
 DocType: Payment Tool,Get Outstanding Vouchers,Få Udestående Vouchers
 DocType: Warranty Claim,Resolved By,Løst Af
 DocType: Appraisal,Start Date,Startdato
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Value
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik her for at verificere
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
 DocType: Time Log,Hours,Timer
 DocType: Project,Expected Start Date,Forventet startdato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Adgang tilladt
-DocType: Dropbox Backup,Weekly,Ugentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,F.eks. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Modtag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Modtag
 DocType: Maintenance Visit,Fully Completed,Fuldt Afsluttet
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Pædagogisk Kvalifikation
 DocType: Workstation,Operating Costs,Drifts- omkostninger
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} er blevet føjet til vores nyhedsliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære så tabt, fordi Citat er blevet gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbejdning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Vigtigste Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger poster saldi opdateret
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Vigtigste Reports
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tilføj / rediger Priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram af Cost Centers
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine ordrer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine ordrer
 DocType: Price List,Price List Name,Pris List Name
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaler
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaler
 DocType: BOM,Manufacturing,Produktion
 ,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
 DocType: Account,Income,Indkomst
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industri Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Trykstøbning
-DocType: Email Alert,Reference Date,Henvisning Dato
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhed (departement) herre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
 DocType: Budget Detail,Budget Detail,Budget Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM opdateret for Item {0}
-DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} allerede faktureret
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
 DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Medarbejder kan ikke ændres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krydsede for Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller organisation, der denne adresse tilhører."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En anden Løn Struktur {0} er aktiv for medarbejder {1}. Venligst gøre sin status &quot;Inaktiv&quot; for at fortsætte.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Modtaget fra
 DocType: Features Setup,Exports,Eksport
 DocType: Lead,Converted,Konverteret
 DocType: Item,Has Serial No,Har Løbenummer
 DocType: Employee,Date of Issue,Udstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 DocType: Issue,Content Type,Indholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få ikke-afstemte Entries
 DocType: Cost Center,Budgets,Budgetter
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Opdateret
 DocType: Employee,Emergency Contact Details,Emergency Kontaktoplysning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hvad gør det?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hvad gør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} er indtastet mere end en gang for regnskabsåret {1}
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Opdater yderligere omkostninger til at beregne landede udgifter til poster
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruger-id ikke indstillet til Medarbejder {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garanti krav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Customer Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dage siden sidste ordre
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dage siden sidste ordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Betalingskort Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivning Series
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
-DocType: User,Enabled,Aktiveret
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vil du virkelig ønsker at indsende alle lønseddel for måned {0} og år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
 DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baseret på
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode fra og periode datoer obligatorisk for tilbagevendende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivitet / opgave.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generer lønsedler
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-mail-id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-DocType: ToDo,Low,Lav
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Indstil {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagne navn er påkrævet
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
 DocType: Purchase Receipt Item,Rejected Serial No,Afvist Løbenummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dybtrækning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhedsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salg Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Manufacturing Indstillinger
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Ny Kontonavn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekræft din e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer kandidat et job.
 DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Samlede fordelte blade er mere end dage i perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er påkrævet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum støbning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
-DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic bearbejdning
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Vare {0} skal være en Sales Item
 DocType: Naming Series,Update Series Number,Opdatering Series Number
 DocType: Account,Equity,Egenkapital
 DocType: Sales Order,Printing Details,Udskrivning Detaljer
 DocType: Task,Closing Date,Closing Dato
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Mod udgiftskonto
 DocType: Production Order,Production Order,Produktionsordre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation Bemærk {0} er allerede blevet indsendt
 DocType: Quotation Item,Against Docname,Mod Docname
 DocType: SMS Center,All Employee (Active),Alle Medarbejder (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Se nu
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Raw Material Omkostninger
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttype er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Vare {0} i række {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første bruger: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første bruger: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesfuld Afstemt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesfuld Afstemt
 DocType: Production Order,Planned End Date,Planlagt Slutdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor emner er gemt.
 DocType: Tax Rule,Validity,Gyldighed
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
 DocType: Attendance,Attendance,Fremmøde
-DocType: Page,No,Ingen
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
@@ -3689,55 +3376,46 @@
 ,Item Prices,Item Priser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
 DocType: Period Closing Voucher,Period Closing Voucher,Periode Lukning Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Pris List mester.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Pris List mester.
 DocType: Task,Review Date,Anmeldelse Dato
 DocType: Purchase Invoice,Advance Payments,Forudbetalinger
-DocType: DocPerm,Level,Level
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tilladelse til at bruge Betaling Tool
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
 DocType: Company,Round Off Account,Afrunde konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gnave
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrationsomkostninger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Rådgivning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Rådgivning
 DocType: Customer Group,Parent Customer Group,Overordnet kunde Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",fx &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opsigelsesperiode
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
 DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
 DocType: Email Digest,Receivables / Payables,Tilgodehavender / Gæld
 DocType: Delivery Note Item,Against Sales Invoice,Mod Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nul værdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mængde post opnået efter fremstilling / ompakning fra givne mængde råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Tilgodehavende / Betales konto
 DocType: Delivery Note Item,Against Sales Order Item,Mod Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Faktiske Slutdato (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Indtast forælder omkostningssted
 DocType: Delivery Note,Print Without Amount,Print uden Beløb
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
-DocType: User,Last Name,Efternavn
-DocType: Web Page,Left,Venstre
-DocType: Event,All Day,All Day
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Total Score (ud af 5)
-DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Expense krav)
-DocType: User,Gender,Køn
 DocType: Journal Entry,Debit Note,Debetnota
 DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke er udløbet
@@ -3749,46 +3427,42 @@
 DocType: Maintenance Schedule Item,Half Yearly,Halvdelen Årlig
 DocType: Lead,Blog Subscriber,Blog Subscriber
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
 DocType: Purchase Invoice,Total Advance,Samlet Advance
-DocType: Workflow State,User,Bruger
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Behandling Payroll
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Credit Beløb
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sæt som Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Kvittering Bemærk
 DocType: Customer,Credit Days Based On,Credit Dage Baseret på
 DocType: Tax Rule,Tax Rule,Skatteregel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Oprethold Samme Rate Gennem Sales Cycle
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} er allerede indsendt
 ,Items To Be Requested,Varer skal ansøges
-DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fakturering Pris baseret på Activity type (i timen)
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Firma Email ID ikke fundet, dermed mail ikke sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
 DocType: Production Planning Tool,Filter based on item,Filter baseret på emne
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejder Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 DocType: Purchase Common,Purchase Common,Indkøb Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger rejst til kunder.
-DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tilføjet
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer budget for denne Cost Center. For at indstille budgettet handling, se &quot;Company List&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke fundet eller handicappede
 DocType: Expense Claim,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
 DocType: Employee,Education,Uddannelse
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
 DocType: Address,Office,Kontor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standard rapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vælg Medarbejder Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vælg Medarbejder Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Række {0}: Party / Konto matcher ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Sådan opretter du en Tax-konto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Køb / Fremstilling Detaljer
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Kontrakt Slutdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (afventer at levere) baseret på ovenstående kriterier
-DocType: DocShare,Document Type,Dokumenttype
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør Citat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",For at spore elementer i salgs- og købsdokumenter med batch nr. &quot;Foretrukne Branche: Kemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaktion Dato
 DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,I alt Skat
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,I alt Skat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mængde (Fremstillet Antal) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net alt (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
 DocType: Notification Control,Purchase Receipt Message,Kvittering Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Samlede fordelte blade er mere end periode
 DocType: Production Order,Actual Start Date,Faktiske startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Af materialer leveret mod denne Sales Order
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Optag element bevægelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhedsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Stemmemaskiner
-DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Løn Tilmeld
-apps/frappe/frappe/website/template.py +140,Next,Næste
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolering
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Indtast Betaling Beløb i mindst én række
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Række {0}: Betaling Beløb kan ikke være større end udestående beløb
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total Ulønnet
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ulønnet
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log ikke fakturerbare
-apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Køber
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Køber
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoløn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Indtast Against Vouchers manuelt
 DocType: SMS Settings,Static Parameters,Statiske parametre
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Item Skat
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Send masse SMS til dine kontakter
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rulning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
 DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbejdning
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
 DocType: Hub Settings,Seller Name,Sælger Navn
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Pakke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
 DocType: Item Attribute,Numeric Values,Numeriske værdier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Vedhæft Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Vedhæft Logo
 DocType: Customer,Commission Rate,Kommissionens Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Er tom Indkøbskurv
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tildelte beløb kan ikke er større end unadusted beløb
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vælg en CSV-fil
-DocType: Dropbox Backup,Send Backups to Dropbox,Send Backups til Dropbox
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk oprette Materiale Request hvis mængde falder under dette niveau
 ,Item-wise Purchase Register,Vare-wise Purchase Tilmeld
 DocType: Batch,Expiry Date,Udløbsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","For at indstille genbestille niveau, skal post være et køb Item eller Manufacturing Vare"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vælg Kategori først
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Række {0}: Party Type og part er nødvendig for Tilgodehavende / Betales konto {1}
-DocType: Dropbox Backup,Send Notifications To,Send meddelelser til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktioneret Beløb
 DocType: GL Entry,Is Opening,Er Åbning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} findes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmesiden og andre publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opret Løn Struktur for medarbejder {0}

diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 7b7acc2..3899018 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv

@@ -1,34 +1,31 @@
 DocType: Employee,Salary Mode,Gehaltsmodus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Bitte ""Monatsweise Verteilung"" wählen, wenn saisonbedingt aufgezeichnet werden soll."
 DocType: Employee,Divorced,Geschieden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Warnung: Gleicher Artikel wurde mehrfach eingegeben.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikel sind bereits synchronisiert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Verbrauchsgüter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbrauchsgüter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Bitte zuerst Gruppentyp auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Glühen
 DocType: Item,Customer Items,Kunden-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
 DocType: Item,Publish Item to hub.erpnext.com,Artikel über hub.erpnext.com veröffentlichen
-apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-Mail- Benachrichtigungen
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-Mail-Benachrichtigungen
 DocType: Item,Default Unit of Measure,Standardmaßeinheit
 DocType: SMS Center,All Sales Partner Contact,Alle Vertriebspartnerkontakte
 DocType: Employee,Leave Approvers,Urlaubsgenehmiger
 DocType: Sales Partner,Dealer,Händler
 DocType: Employee,Rented,Gemietet
-DocType: About Us Settings,Website,Webseite
-DocType: POS Profile,Applicable for User,Anwendbar für Benutzer
+DocType: POS Profile,Applicable for User,Anwenden für Benutzer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichtung und Sintern
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
-DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Von Materialanforderung
+DocType: Purchase Order,Customer Contact,Kundenkontakt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Von Materialanfrage
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Baumstruktur
 DocType: Job Applicant,Job Applicant,Bewerber
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Keine weiteren Ergebnisse.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Rechtswesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rechtswesen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Benötigt von
@@ -43,74 +40,72 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie erfolgreich aktualisiert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Nähverfahren
 DocType: Pricing Rule,Apply On,Anwenden auf
-DocType: Item Price,Multiple Item prices.,Mehrfach-Artikelpreise.
+DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
 ,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Neuer Urlaubsantrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Neuer Urlaubsantrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankwechsel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"Diese Option wird verwendet, um die kundenspezifische Artikelnummer zu erhalten und den Artikel aufgrund der Artikelnummer auffindbar zu machen"
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Varianten anzeigen
-DocType: Sales Invoice Item,Quantity,Menge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredite (Passiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
 DocType: Employee Education,Year of Passing,Jahr des Abgangs
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
 DocType: Designation,Designation,Bezeichnung
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen 
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Neues POS-Profil erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gesundheitswesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 DocType: Purchase Invoice,Monthly,Monatlich
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zahlungsverzug (Tage)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Mail-Addresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Verteidigung
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Mail-Addresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
 DocType: Company,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Zeile # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Zeile # {0}:
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitt eine Preisliste auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Holzbearbeitung
-DocType: Production Order Operation,Work In Progress,Fertigung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-Druck
-DocType: Employee,Holiday List,Ferienplaner
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Bitte eine Preisliste auswählen
+DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
+DocType: Employee,Holiday List,Urlaubsübersicht
 DocType: Time Log,Time Log,Zeitprotokoll
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Buchhalter
-DocType: Cost Center,Stock User,Lager-Benutzer
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Buchhalter
+DocType: Cost Center,Stock User,Benutzer Lager
 DocType: Company,Phone No,Telefonnummer
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Protokoll der von Benutzern durchgeführten Aktivitäten bei Aufgaben, die zum Protokollieren von Zeit und zur Rechnungslegung verwendet werden."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Neu {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Neu {0}: #{1}
 ,Sales Partners Commission,Vertriebspartner-Provision
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abkürzung darf nicht länger als 5 Zeichen sein
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.","Attributwert {0} kann nicht von {1} entfernt werden, da es Artikelvarianten mit diesem Attribut gibt."
-DocType: Print Settings,Classic,Klassisch
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dies ist ein Root-Konto und kann nicht bearbeitet werden.
 DocType: BOM,Operations,Arbeitsvorbereitung
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden
 DocType: Bin,Quantity Requested for Purchase,Für eine Bestellung angefragte Menge
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",".csv-Datei mit zwei Zeilen, eine für den alten und eine für den neuen Namen, anhängen"
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung.
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Stellenausschreibung
 DocType: Item Attribute,Increment,Schrittweite
-apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wählen Sie Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Werbung
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Lager auswählen ...
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Werbung
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Gleiche Firma wurde mehr als einmal eingegeben
 DocType: Employee,Married,Verheiratet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nicht für zulässig {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 DocType: Payment Reconciliation,Reconcile,Abgleichen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Lebensmittelgeschäft
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesung 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bankbuchung erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonds
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Angabe des Lagers ist zwingend erforderlich, wenn der Kontotyp ""Lager"" ist"
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Aktivieren, wenn es sich um eine wiederkehrende Bestellung handelt. Deaktivieren um die Wiederholungen anzuhalten oder ein entsprechendes Ende-Datum angeben"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
 DocType: SMS Log,SMS Log,SMS-Protokoll
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Aufwendungen für gelieferte Artikel
-DocType: Blog Post,Guest,Gast
 DocType: Quality Inspection,Get Specification Details,Spezifikationsdetails aufrufen
 DocType: Lead,Interested,Interessiert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stückliste
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Eröffnung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Eröffnung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Von {0} bis {1}
 DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} ist zwingend erforderlich
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 DocType: Lead,Product Enquiry,Produktanfrage
-DocType: Standard Reply,Owner,Eigentümer
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Bitte zuerst die Firma angeben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Bitte zuerst Firma auswählen
 DocType: Employee Education,Under Graduate,Schulabgänger
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Gewindeschneiden
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitätsprotokoll:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobilien
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilien
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoauszug
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
 DocType: Expense Claim Detail,Claim Amount,Betrag einfordern
 DocType: Employee,Mr,Hr.
-DocType: Custom Script,Client,Kunde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Lieferantentyp / Lieferant
 DocType: Naming Series,Prefix,Präfix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbrauchsgut
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Verbrauchsgut
 DocType: Upload Attendance,Import Log,Importprotokoll
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Absenden
-DocType: Sales Invoice Item,Delivered By Supplier,Zugestellt von Lieferanten
+DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jahresgehalt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Jahresgehalt
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Lagerkosten
 DocType: Newsletter,Email Sent?,Wurde die E-Mail abgesendet?
@@ -169,109 +159,99 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Zeitprotokolle anzeigen
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 DocType: Item,Supply Raw Materials for Purchase,Rohmaterial für Einkauf bereitstellen
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} muss ein Kaufartikel sein
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen.
- Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung versendet wurde."
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,"Wird aktualisiert, wenn die Ausgangsrechnung übertragen wurde."
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Begradigung
 DocType: BOM Replace Tool,New BOM,Neue Stückliste
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Zeitprotokolle für die Abrechnung bündeln.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Gegengravitationsgussverfahren
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Zeitprotokolle für die Abrechnung bündeln
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter wurde bereits gesendet
 DocType: Lead,Request Type,Anfragetyp
 DocType: Leave Application,Reason,Grund
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Rundfunk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ausführung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Der erste Benutzer wird zum System-Manager (kann später noch geändert werden).
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rundfunk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ausführung
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Der erste Benutzer wird zum System-Manager (kann später noch geändert werden).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
 DocType: Serial No,Maintenance Status,Wartungsstatus
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikel und Preise
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikel und Preise
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, Von-Datum = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Mitarbeiter auswählen, für den die Bewertung erstellt werden soll."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostenstelle {0} gehört nicht zu Firma {1}
 DocType: Customer,Individual,Einzelperson
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: SMS Settings,Enter url parameter for message,URL-Parameter für Nachricht eingeben
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten.
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Dieses Zeitprotokoll steht im Widerspruch mit {0} für {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt auf die Preisliste (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Vorname
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Vollformguß
 DocType: Offer Letter,Select Terms and Conditions,Bitte Geschäftsbedingungen auswählen
 DocType: Production Planning Tool,Sales Orders,Kundenaufträge
 DocType: Purchase Taxes and Charges,Valuation,Bewertung
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Als Standard festlegen
 ,Purchase Order Trends,Entwicklung Lieferantenaufträge
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen.
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen
 DocType: Earning Type,Earning Type,Einkommensart
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapazitätsplanung und Zeiterfassung deaktivieren
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Negativen Saldo zulassen
 DocType: Selling Settings,Default Territory,Standardregion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Fernsehen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Schnitt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fernsehen
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} gehört nicht zu Firma {1}
 DocType: Naming Series,Series List for this Transaction,Serienliste für diese Transaktion
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
-DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto zutreffend ist"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Abschicken benötigt"
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Eingegangen am
 DocType: Sales Partner,Reseller,Wiederverkäufer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
 DocType: Lead,Address & Contact,Adresse & Kontakt
-DocType: Leave Allocation,Add unused leaves from previous allocations,In unbenutzten Blätter aus früheren Vergaben
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
+DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
 DocType: Newsletter List,Total Subscribers,Gesamtanzahl der Abonnenten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Ansprechpartner
-DocType: Production Plan Item,SO Pending Qty,SO Ausstehende Menge
+,Contact Name,Ansprechpartner
+DocType: Production Plan Item,SO Pending Qty,Ausstehende Menge des Auftrags
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Einkaufsanfrage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Doppelgehäuse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen versenden
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Entlassungsdatum muss nach dem Einstandsdatum liegen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Abwesenheiten pro Jahr
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Lieferantenanfrage
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Abwesenheiten pro Jahr
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Bitte die Serienbezeichnung für {0} über Setup > Einstellungen > Serien benamen eingeben
 DocType: Time Log,Will be updated when batched.,"Wird aktualisiert, wenn Stapel erstellt werden."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
-DocType: Bulk Email,Message,Mitteilung
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox-Zugangsschlüssel
 DocType: Payment Tool,Reference No,Referenznr.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Jährlich
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
 DocType: Material Request Item,Min Order Qty,Mindestbestellmenge
 DocType: Lead,Do Not Contact,Nicht Kontakt aufnehmen
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Versand erstellt.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software-Entwickler
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Übertragen erstellt.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialanforderung
-DocType: Bank Reconciliation,Update Clearance Date,Tilgungsdatum aktualisieren
-DocType: Item,Purchase Details,Kaufinformationen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" der Einkaufsbestellung {1} nicht gefunden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drahtbürsten
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialanfrage
+DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
+DocType: Item,Purchase Details,Einkaufsdetails
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
 DocType: Employee,Relation,Beziehung
 DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden.
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden
 DocType: Purchase Receipt Item,Rejected Quantity,Ausschuss-Menge
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Feld ist in Lieferschein, Angebot, Ausgangsrechnung, Kundenauftrag verfügbar"
 DocType: SMS Settings,SMS Sender Name,SMS-Absendername
@@ -284,45 +264,34 @@
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Ausgabenbezeichnung
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Bitte zuerst Chargentyp auswählen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 Zeichen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Bitte Sprache auswählen
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 Zeichen
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Deaktiviert die Erstellung von Zeitprotokollen für Fertigungsaufträge. Arbeitsgänge sollen nicht für den Fertigungsauftrag mitverfolgt werden.
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebspersonen verwalten.
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Baumstruktur der Vertriebsmitarbeiter verwalten
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Artikel {0} muss ein Dienstleistungsartikel sein
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserbohren
-DocType: Stock UOM Replace Utility,New Stock UOM,Neue Lagermaßeinheit
 DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos
 DocType: Employee,External Work History,Externe Arbeits-Historie
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Zirkelschluss-Fehler
-DocType: Communication,Closed,Geschlossen
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern."
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Stellenbeschreibung
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Querschnittsverminderung
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanforderung per E-Mail benachrichtigen
-DocType: Journal Entry,Multi Currency,Mehrfachwährung
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Artikel wird aktualisiert
-DocType: Async Task,System Manager,System-Verantwortlicher
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
+DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
 DocType: Sales Invoice Item,Delivery Note,Lieferschein
-DocType: Dropbox Backup,Allow Dropbox Access,Dropbox-Zugang zulassen
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Steuern einrichten
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben 
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Workstation,Rent Cost,Mietkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Bitte Monat und Jahr auswählen
@@ -330,32 +299,29 @@
 DocType: Employee,Company Email,Email-Adresse der Firma
 DocType: GL Entry,Debit Amount in Account Currency,Soll-Betrag in Kontowährung
 DocType: Shipping Rule,Valid for Countries,Gültig für folgende Länder
-DocType: Workflow State,Refresh,Aktualisieren
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle mit dem Import verknüpften Felder (wie z. B. Währung, Wechselkurs, Summe Import, Gesamtsumme Import usw.) sind in Kaufbeleg, Lieferantenangebot, Eingangsrechnung, Auftrag usw. verfügbar"
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle mit dem Import verknüpften Felder (wie z. B. Währung, Wechselkurs, Summe Import, Gesamtsumme Import usw.) sind in Kaufbeleg, Lieferantenangebot, Eingangsrechnung, Lieferantenauftrag usw. verfügbar"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Einkaufsauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verfügbar in Stückliste, Lieferschein, Eingangsrechnung, Fertigungsauftrag, Lieferantenauftrag, Kaufbeleg, Ausgangsrechnung, Kundenauftrag, Lagerbuchung, Zeiterfassung"
 DocType: Item Tax,Tax Rate,Steuersatz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Artikel auswählen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Artikel auswählen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",Der chargenweise verwaltete Artikel: {0} kann nicht mit dem Lager abgeglichen werden. Stattdessen Lagerbuchung verwenden
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} ist bereits versendet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,In nicht-Gruppe umwandeln
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss versendet werden
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuelle Lagermaßeinheit
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Charge (Los) eines Artikels.
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kaufbeleg muss übertragen werden
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Charge (Los) eines Artikels
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ihre E-Mail-Adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Bitte Anhang beachten
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Wasserstrahlschneideverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
 ,Finished Goods,Fertigerzeugnisse
 DocType: Delivery Note,Instructions,Anweisungen
 DocType: Quality Inspection,Inspected By,Geprüft von
@@ -365,11 +331,12 @@
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
 ,Schedule Date,Geplantes Datum
 DocType: Packed Item,Packed Item,Verpackter Artikel
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Handlungskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitätskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Bitte KEINE Konten für Kunden und Lieferanten erstellen. Diese werden direkt aus dem Kunden-/Lieferantenstamm erstellt.
 DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung
 DocType: Purchase Invoice Item,Item Name,Artikelname
+DocType: Authorization Rule,Approving User  (above authorized value),Genehmigender Benutzer (über dem autorisierten Wert)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Guthabenüberschuss
 DocType: Employee,Widowed,Verwitwet
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Anzufragende Artikel, die in keinem Lager vorrätig sind, ermittelt auf Basis der prognostizierten und der Mindestbestellmenge"
@@ -379,89 +346,80 @@
 ,Purchase Register,Übersicht über Einkäufe
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
 DocType: Workstation,Consumable Cost,Verbrauchskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
 DocType: Purchase Receipt,Vehicle Date,Fahrzeug-Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medizinisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grund für das Verlieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Rohrbiegen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 DocType: Employee,Single,Einzeln
 DocType: Issue,Attachment,Anhang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kann nicht für Gruppenkostenstelle eingestellt werden
 DocType: Account,Cost of Goods Sold,Selbstkosten
 DocType: Purchase Invoice,Yearly,Jährlich
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Bitte die Kostenstelle eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Bitte die Kostenstelle eingeben
 DocType: Journal Entry Account,Sales Order,Kundenauftrag
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
 DocType: Purchase Order,Start date of current order's period,Startdatum der aktuellen Bestellperiode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Menge kann kein Bruchteil sein in Zeile {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Menge kann kein Bruchteil sein in Zeile {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
 DocType: Delivery Note,% Installed,% installiert
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Bitte zuerst den Firmennamen angeben
 DocType: BOM,Item Desription,Artikelbeschreibung
 DocType: Purchase Invoice,Supplier Name,Lieferantenname
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lesen Sie das Handbuch ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lesen Sie das ERPNext-Handbuch
 DocType: Account,Is Group,Ist Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch Seriennummern auf Basis FIFO einstellen
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoformverfahren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Längstreffverfahren (Schlitzen)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Bis Fall Nr."" kann nicht kleiner als ""Von Fall Nr."" sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Gemeinnützig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Gemeinnützig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nicht begonnen
 DocType: Lead,Channel Partner,Vertriebspartner
 DocType: Account,Old Parent,Alte übergeordnetes Element
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Einleitenden Text anpassen, der zu dieser E-Mail gehört. Jede Transaktion hat einen eigenen Einleitungstext."
 DocType: Sales Taxes and Charges Template,Sales Master Manager,Hauptvertriebsleiter
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse.
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
-DocType: Sales Order,Not Applicable,Nicht anwendbar
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Maskenformverfahren
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
+DocType: Sales Order,Not Applicable,Nicht anwenden
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Stammdaten zum Urlaub
 DocType: Material Request Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
 DocType: Employee,Health Concerns,Gesundheitsfragen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Unbezahlt
-DocType: Packing Slip,From Package No.,Von Paket-Nr.
+DocType: Packing Slip,From Package No.,Von Paket Nr.
 DocType: Item Attribute,To Range,Bis-Bereich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
 DocType: Features Setup,Imports,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Kleben
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
 DocType: Job Opening,Description of a Job Opening,Beschreibung eines Stellenangebot
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ausstehende Aktivitäten für heute
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Anwesenheitsnachweis
-DocType: Bank Reconciliation,Journal Entries,Journalbuchungen
+DocType: Bank Reconciliation,Journal Entries,Buchungssätze
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
-DocType: System Settings,Loading...,Wird geladen ...
-DocType: DocField,Password,Passwort
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Schmelzschichtung
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
 DocType: Customer,Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 DocType: Journal Entry,Accounts Payable,Verbindlichkeiten
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnenten hinzufügen
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Existiert nicht"
 DocType: Pricing Rule,Valid Upto,Gültig bis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Erträge
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,"Administrativer Benutzer
-"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativer Benutzer
 DocType: Payment Tool,Received Or Paid,Erhalten oder bezahlt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Bitte Firma auswählen
 DocType: Stock Entry,Difference Account,Differenzkonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
-DocType: Communication,Subject,Betreff
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 ,Serial No Warranty Expiry,Ablaufdatum der Garantie zu Seriennummer
@@ -469,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Artikel
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Unterbeauftragung verwalten
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Neue Maßeinheit darf NICHT vom Typ ganze Zahl sein
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Unterbeauftragung verwalten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbel und Anbauteile
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
@@ -482,22 +439,22 @@
 DocType: Production Planning Tool,Material Requirement,Materialbedarf
 DocType: Company,Delete Company Transactions,Löschen der Transaktionen dieser Firma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Artikel {0} ist kein Kaufartikel
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} ist keine gültige E-Mail Adresse in ""Benachrichtigung \
  Email-Adresse"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Gesamte Abrechnungssumme dieses Jahr:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Gesamtumsatz dieses Jahr:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Schlußstand (Haben)
-DocType: Serial No,Warranty Period (Days),Gewährleistungsfrist (Tage)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Schlußstand (Haben)
+DocType: Serial No,Warranty Period (Days),Garantiefrist (Tage)
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 ,Pending Qty,Ausstehend Menge
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorieren
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0} 
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern versendet: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
 DocType: Pricing Rule,Valid From,Gültig ab
 DocType: Sales Invoice,Total Commission,Gesamtprovision
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
@@ -506,7 +463,7 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","""Monatsweise Verteilung"" hilft dabei das Budget über Monate zu verteilen, wenn es im Unternehmen saisonale Einflüsse gibt.
 Um ein Budget auf diese Art zu verteilen, ""monatsweise Verteilung"" bei ""Kostenstelle"" einstellen"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Verzeihung! Seriennummern können nicht zusammengeführt werden,"
@@ -514,33 +471,31 @@
 DocType: Project Task,Project Task,Projektaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
-DocType: About Us Settings,Website Manager,Webseiten-Administrator
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Das Startdatum des Geschäftsjahres sollte nicht nach dem Enddatum des Gschäftsjahres liegen
-DocType: Warranty Claim,Resolution,Auflösung
+DocType: Warranty Claim,Resolution,Beschluss
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Geliefert: {0}
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Verbindlichkeiten-Konto
 DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Kunden wiederholen
 DocType: Leave Control Panel,Allocate,Zuweisen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Vorhergehende
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Umsatzrendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Kundenaufträge auswählen, aus denen Fertigungsaufträge erstellt werden sollen."
-DocType: Item,Delivered by Supplier (Drop Ship),Vom Lieferanten gelieferten (Tropfen-Schiff)
+DocType: Item,Delivered by Supplier (Drop Ship),Geliefert von Lieferant (Direktlieferung)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Gehaltskomponenten
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank von potentiellen Kunden
+DocType: Authorization Rule,Customer or Item,Kunde oder Artikel
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundendatenbank
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Stürzen
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standard-Maßeinheit für Artikel {0} kann nicht direkt, weil Sie bereits eine Transaktion (en) mit einem anderen UOM gemacht haben geändert werden. Sie benötigen, um ein neues Element, eine andere Default ME verwenden können."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
-DocType: Event,Wednesday,Mittwoch
 DocType: Sales Invoice,Customer's Vendor,Kundenlieferant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Fertigungsauftrag ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Verfassen von Angeboten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Verfassen von Angeboten
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Fehler aufgrund negativen Lagerbestands ({6}) für Artikel {0} im Lager {1} auf {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
@@ -552,7 +507,7 @@
 DocType: Employee,Organization Profile,Firmenprofil
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Bitte Seriennummerierung für Anwesenheiten über Setup > Seriennummerierung einstellen
 DocType: Employee,Reason for Resignation,Kündigungsgrund
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen.
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} ' {1}' nicht im Geschäftsjahr {2}
 DocType: Buying Settings,Settings for Buying Module,Einstellungen für Einkaufsmodul
@@ -561,46 +516,37 @@
 DocType: Activity Type,Default Costing Rate,Standardkosten
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Bitte das Dropbox-Python-Modul installieren
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Leiter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Von Kaufbeleg
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Leiter
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Von Kaufbeleg
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
 DocType: SMS Settings,Receiver Parameter,Empfängerparameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""basierend auf"" und ""guppiert nach"" können nicht gleich sein"
 DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,An
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Bitte eine E-Mail-Adresse angeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Abschliessende Rohrbearbeitung
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Beschluss-Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,In Gruppe umwandeln
 DocType: Activity Cost,Activity Type,Aktivitätsart
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Gelieferte Menge
 DocType: Customer,Fixed Days,Stichtage
 DocType: Sales Invoice,Packing List,Packliste
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,An Lieferanten weitergegebene Lieferantenaufträge.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Veröffentlichung
-DocType: Activity Cost,Projects User,Projektanwender
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,An Lieferanten erteilte Lieferantenaufträge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Veröffentlichung
+DocType: Activity Cost,Projects User,Nutzer Projekt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Verbraucht
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nicht in der Rechnungs-Details-Tabelle gefunden
 DocType: Company,Round Off Cost Center,Abschluss-Kostenstelle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wartungsbesuch {0} muss vor Stornierung dieses Kundenauftrages abgebrochen werden
 DocType: Material Request,Material Transfer,Materialübertrag
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Anfangsstand (Soll)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Buchungszeitstempel muss nach {0} liegen
-apps/frappe/frappe/config/setup.py +59,Settings,Einstellungen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren
 DocType: Production Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Weiter
 DocType: Pricing Rule,Sales Manager,Vertriebsleiter
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Umbenennen
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Beugung
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Benutzer zulassen
 DocType: Journal Entry,Bill No,Rechnungsnr.
 DocType: Purchase Invoice,Quarterly,Quartalsweise
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
@@ -609,17 +555,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Bitte Artikel-Details angeben
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
 DocType: Account,Accounts,Rechnungswesen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Direktscheren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Wird verwendet, um einen Artikel in Einkaufs-und Verkaufsdokumenten auf der Grundlage ihrer Seriennummern nachzuverfolgen. Diese Funktion kann auch verwendet werden, um die Einzelheiten zum Garantiefall des Produktes mit zu protokollieren."
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Ausschusslager ist zwingend erfoderlich für Ausschuss-Artikel
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 DocType: Employee,Provide email id registered in company,Geben Sie die in der Firma registrierte E-Mail-ID an
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
 DocType: Email Digest,Next email will be sent on:,Nächste E-Mail wird gesendet am:
 DocType: Offer Letter Term,Offer Letter Term,Gültigkeit des Angebotsschreibens
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Artikel hat Varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} nicht gefunden
 DocType: Bin,Stock Value,Lagerwert
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Struktur-Typ
@@ -627,48 +572,41 @@
 DocType: Serial No,Warranty Expiry Date,Garantieablaufdatum
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","""Gegenbeleg"" muss entweder ein Kundenauftrag, eine Einkaufsrechnung oder eine Journalbuchung sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biologische Bearbeitung
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nicht in der Lage Wechselkurs finden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Luft- und Raumfahrt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Willkommen
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","""Gegenbeleg"" muss entweder ein Kundenauftrag, eine Eingangsrechnung oder eine Journalbuchung sein"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Luft- und Raumfahrt
 DocType: Journal Entry,Credit Card Entry,Kreditkarten-Buchung
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Aufgaben-Betreff
-apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Von Lieferanten erhaltene Ware.
-DocType: Communication,Open,Öffnen
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Von Lieferanten erhaltene Ware
 DocType: Lead,Campaign Name,Kampagnenname
 ,Reserved,Reserviert
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Umlaufvermögen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ist kein Lagerartikel
 DocType: Mode of Payment Account,Default Account,Standardkonto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
-DocType: Contact Us Settings,Address Title,Adressen-Bezeichnung
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
 ,Sales Person Target Variance Item Group-Wise,Zielabweichung des Vertriebsmitarbeiters artikelgruppenbezogen
-DocType: Dropbox Backup,Daily,Täglich
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftrags-Nr
 DocType: Employee,Cell Number,Mobiltelefonnummer
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto-Material Requests generiert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Journalbuchung"" eingegeben werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity von
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Monatliche Gehaltsabrechnung
 DocType: Item Group,Website Specifications,Webseiten-Spezifikationen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Neues Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Buchungen können zu Unterknoten erfolgen. Buchungen zu Gruppen sind nicht erlaubt.
-DocType: ToDo,High,Hoch
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Opportunity,Maintenance,Wartung
-DocType: User,Male,Männlich
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen.
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Vertriebskampagnen
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -712,27 +650,27 @@
 DocType: Expense Claim,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Ablesung 7
 DocType: Address,Personal,Persönlich
-DocType: Expense Claim Detail,Expense Claim Type,Art der Spesenabrechnung
+DocType: Expense Claim Detail,Expense Claim Type,Art der Aufwandsabrechnung
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalbuchung {0} ist mit Bestellung {1} verknüpft. Bitte prüfen, ob in dieser Rechnung ""Vorkasse"" angedruckt werden soll."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Buchungssatz {0} ist mit Bestellung {1} verknüpft. Bitte prüfen, ob in dieser Rechnung ""Vorkasse"" angedruckt werden soll."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Büro-Wartungskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Säumen
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Bitte zuerst den Artikel angeben
-DocType: Account,Liability,Haftung
+DocType: Account,Liability,Verbindlichkeit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Process Payroll,Send Email,E-Mail absenden
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Keine Berechtigung
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Lager aktualisieren"" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Stk
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Stk
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Meine Rechnungen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Meine Rechnungen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Kein Mitarbeiter gefunden
 DocType: Purchase Order,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
@@ -742,44 +680,41 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Jetzt senden
 ,Support Analytics,Support-Analyse
 DocType: Item,Website Warehouse,Webseiten-Lager
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an welchem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Kontakt-Formular Datensätze
 apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Kunde und Lieferant
 DocType: Email Digest,Email Digest Settings,Einstellungen zum täglichen E-Mail-Bericht
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support-Anfragen von Kunden.
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support-Anfragen von Kunden
 DocType: Features Setup,"To enable ""Point of Sale"" features","Um ""Point of Sale""-Funktionen zu aktivieren"
 DocType: Bin,Moving Average Rate,Wert für den Gleitenden Durchschnitt
 DocType: Production Planning Tool,Select Items,Artikel auswählen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
-DocType: Comment,Reference Name,Referenzname
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: Sales Invoice Item,Target Warehouse,Eingangslager
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Kundenauftrags liegen
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettogewinn/-verlust
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Versand von Transaktionen Mitteilung verfassen.
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kokillengussverfahren
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status {2}
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestellung an Zahlungs
-DocType: Sales Order Item,Projected Qty,Voraussichtliche Menge
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status ist {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Lieferantenauftrag zu Zahlung
+DocType: Sales Order Item,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
 DocType: Newsletter,Newsletter Manager,Newsletter-Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Eröffnung"""
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
 ,Purchase Receipt Trends,Trandanalyse Kaufbelege
 DocType: Appraisal,Select template from which you want to get the Goals,"Vorlage auswählen, von der Sie die Ziele abrufen möchten"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forschung & Entwicklung
 ,Amount to Bill,Rechnungsbetrag
 DocType: Company,Registration Details,Details zur Registrierung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Absteckung
 DocType: Item,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Geplant zum Versand an {0}
@@ -790,18 +725,16 @@
 DocType: Sales Invoice Item,Stock Details,Lagerinformationen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkaufsstelle
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} kann nicht fortgeschrieben werden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
 DocType: Account,Balance must be,Saldo muss sein
 DocType: Hub Settings,Publish Pricing,Preise veröffentlichen
-DocType: Notification Control,Expense Claim Rejected Message,Benachrichtigung über abgelehnte Spesenabrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Nagelung
+DocType: Notification Control,Expense Claim Rejected Message,Benachrichtigung über abgelehnte Aufwandsabrechnung
 ,Available Qty,Verfügbare Menge
 DocType: Purchase Taxes and Charges,On Previous Row Total,Auf vorherige Zeilensumme
 DocType: Salary Slip,Working Days,Arbeitstage
 DocType: Serial No,Incoming Rate,Eingangsbewertung
 DocType: Packing Slip,Gross Weight,Bruttogewicht
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Name der Firma, für die dieses System eingerichtet wird."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Urlaub in die Gesamtzahl der Arbeitstage mit einbeziehen
 DocType: Job Applicant,Hold,Anhalten
 DocType: Employee,Date of Joining,Eintrittsdatum
@@ -811,30 +744,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Abonnenten anzeigen
 DocType: Purchase Invoice Item,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Empfangene Artikel, die in Rechnung gestellt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Schleifstrahlen
 DocType: Employee,Ms,Fr.
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung.
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Stückliste {0} muss aktiv sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Stückliste {0} muss aktiv sein
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
 DocType: Salary Slip,Leave Encashment Amount,Urlaubsgeld
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Erforderliche Anzahl
 DocType: Bank Reconciliation,Total Amount,Gesamtsumme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
 DocType: Production Planning Tool,Production Orders,Fertigungsaufträge
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilanzwert
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Veröffentlichen, um Elemente zu synchronisieren"
-DocType: GL Entry,Account Currency,Währung
+DocType: Bank Reconciliation,Account Currency,Währung
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
 DocType: Purchase Receipt,Range,Bandbreite
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
-DocType: Features Setup,Item Barcode,Artikelstrichcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+DocType: Features Setup,Item Barcode,Artikelbarcode
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesung 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Eingangsrechnung Vorkasse
 DocType: Address,Shop,Laden
@@ -843,79 +775,74 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank-/Geldkonto wird automatisch in Kassenbon aktualisiert, wenn dieser Modus ausgewählt ist."
 DocType: Employee,Permanent Address Is,Feste Adresse ist
 DocType: Production Order Operation,Operation completed for how many finished goods?,Für wie viele fertige Erzeugnisse wurde der Arbeitsgang abgeschlossen?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Die Marke
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Die Marke
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zustimmung für Artikel {1} bei Überschreitung von {0}.
-DocType: Employee,Exit Interview Details,Befragungs-Details verlassen
+DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Journal Entry Account,Purchase Invoice,Eingangsrechnung
 DocType: Stock Ledger Entry,Voucher Detail No,Belegdetail-Nr.
 DocType: Stock Entry,Total Outgoing Value,Gesamtwert Auslieferungen
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollte im gleichen Geschäftsjahr sein
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollten im gleichen Geschäftsjahr sein
 DocType: Lead,Request for Information,Informationsanfrage
 DocType: Payment Tool,Paid,Bezahlt
 DocType: Salary Slip,Total in words,Summe in Worten
 DocType: Material Request Item,Lead Time Date,Lieferzeit und -datum
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ist obligatorisch. Vielleicht Devisenwechsel Datensatz nicht für erstellt
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,ist zwingend erforderlich. Vielleicht wurde kein Datensatz für den Geldwechsel erstellt für
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Für Artikel aus ""Produkt-Bundles"" werden Lager, Seriennummer und Chargennummer aus der Tabelle ""Packliste"" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle ""Hauptpositionen"" eingetragen werden, Die Werte werden in die Tabelle ""Packliste"" kopiert."
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lieferungen an Kunden.
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Lieferungen an Kunden
 DocType: Purchase Invoice Item,Purchase Order Item,Lieferantenauftrags-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte Erträge
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,"""Zahlungsbetrag = Ausstehender Betrag"" setzen"
-DocType: Contact Us Settings,Address Line 1,Adresse Zeile 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Abweichung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firmenname
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Abweichung
+,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Artikel für Übertrag auswählen
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie sich eine Liste aller Hilfe-Videos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Sehen Sie eine Liste aller Hilfe-Videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Bezeichnung des Kontos bei der Bank, bei der der Scheck eingereicht wurde, auswählen."
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste zu Transaktionen zu bearbeiten"
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Benutzer erlauben, die Preisliste in Transaktionen zu bearbeiten"
 DocType: Pricing Rule,Max Qty,Max Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Verkaufs-/Einkaufs-Bestellung"" sollte immer als ""Vorkasse"" eingestellt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemische Industrie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Zeile {0}: ""Zahlung zu Kunden-/Lieferantenauftrag"" sollte immer als ""Vorkasse"" eingestellt werden"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemische Industrie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 DocType: Process Payroll,Select Payroll Year and Month,Jahr und Monat der Gehaltsabrechnung auswählen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Zur entsprechenden Gruppe gehen (normalerweise ""Mittelverwendung"" > ""Umlaufvermögen""  > ""Bankkonten"") und durck Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Bank"" erstellen"
 DocType: Workstation,Electricity Cost,Stromkosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
-DocType: Comment,Unsubscribed,Abgemeldet
 DocType: Opportunity,Walk In,Laufkundschaft
 DocType: Item,Inspection Criteria,Prüfkriterien
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanz-Kostenstellen-Struktur
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Übergeben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Weiß
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Weiß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Eigenes Bild anhängen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Erstellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Eigenes Bild anhängen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Erstellen
 DocType: Journal Entry,Total Amount in Words,Gesamtsumme in Worten
-DocType: Workflow State,Stop,Anhalten
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Es ist ein Fehler aufgetreten. Ein möglicher Grund könnte sein, dass Sie das Formular nicht gespeichert haben. Bitte kontaktieren Sie support@erpnext.com wenn das Problem weiterhin besteht."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mein Warenkorb
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Bestelltyp muss aus {0} sein
 DocType: Lead,Next Contact Date,Nächstes Kontaktdatum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Anfangsmenge
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Lager-Optionen
-DocType: Journal Entry Account,Expense Claim,Spesenabrechnung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Lager-Optionen
+DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Menge für {0}
-DocType: Leave Application,Leave Application,Abwesenheitsantrag
+DocType: Leave Application,Leave Application,Urlaubsantrag
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
 DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
 DocType: Company,If Monthly Budget Exceeded (for expense account),Wenn das monatliche Budget überschritten ist (für Aufwandskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zuschnitt
 DocType: Workstation,Net Hour Rate,Nettostundensatz
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
-DocType: Company,Default Terms,Standardbedingungen
+DocType: Company,Default Terms,Allgemeine Geschäftsbedingungen
 DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
 DocType: POS Profile,Cash/Bank Account,Kassen-/Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Feilen
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Einkaufsrabatte
 DocType: Workstation,Wages,Lohn
@@ -923,7 +850,7 @@
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gehen Sie auf die Desktop-und starten Sie mit ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gehen Sie zum Desktop und starten Sie ERPNext
 DocType: Item,Manufacturer,Hersteller
 DocType: Landed Cost Item,Purchase Receipt Item,Kaufbeleg-Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
@@ -932,7 +859,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Issue,Issue,Anfrage
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto passt nicht zu Unternehmen
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Fertigungslager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
 DocType: BOM Operation,Operation,Arbeitsgang
@@ -940,13 +868,13 @@
 DocType: Tax Rule,Shipping State,Versandstatus
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Artikel müssen über die Schaltfläche ""Artikel von Kaufbeleg übernehmen"" hinzugefügt werden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Vertriebskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard-Kauf
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard-Kauf
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} ist {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Lagerbuchungen erstellen
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Lagerbuchungen erstellen
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
 DocType: Item,Default Supplier,Standardlieferant
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Prozensatz erlaubter Überproduktion
@@ -961,32 +889,30 @@
 DocType: Time Log Batch,updated via Time Logs,Aktualisiert über Zeitprotokolle
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ihr Vertriebsmitarbeiter, der den Kunden in Zukunft kontaktiert"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
 DocType: Company,Default Currency,Standardwährung
 DocType: Contact,Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
-DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,Von Mitarbeiter
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
 DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
 DocType: Appraisal Template Goal,Key Performance Area,Wichtigster Leistungsbereich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,und Jahr:
 DocType: Email Digest,Annual Expense,Jährliche Kosten
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Kontakt-Formular Rechnungsdetail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rechnung zum Zahlungsabgleich
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Beitrag in %
 DocType: Item,website page link,Webseiten-Verknüpfung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Lassen Sie uns das System für die erste Nutzung vorbereiten.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Meldenummern des Unternehmens für Ihre Unterlagen. Steuernummern usw.
 DocType: Sales Partner,Distributor,Lieferant
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Warenkorb-Versandregel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Fertigungsauftrag {0} muss vor Stornierung dieses Kundenauftages abgebrochen werden
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und versenden, um eine neue Ausgangsrechnung zu erstellen."
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Bitte Zeitprotokolle auswählen und übertragen, um eine neue Ausgangsrechnung zu erstellen."
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
@@ -1003,14 +929,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nichts anzufragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Verwaltung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Verwaltung
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Arten der Aktivitäten für Tätigkeitsnachweise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Feinguss
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Für {0} ist entweder ein Haben- oder Sollbetrag erforderlich
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blau
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 DocType: Price List Country,Price List Country,Preisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Weitere Knoten können nur unter Knoten vom Typ ""Gruppe"" erstellt werden"
@@ -1020,50 +944,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Verkaufsstellen-Profil {0} bereits für Benutzer: {1} und Firma {2} angelegt
 DocType: Purchase Order Item,UOM Conversion Factor,Maßeinheit-Umrechnungsfaktor
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminated Object Manufacturing-Verfahren
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Streckziehen
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ihr Vertriebsmitarbeiter erhält an diesem Datum eine Erinnerung, den Kunden zu kontaktieren"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Steuer und sonstige Gehaltsabzüge
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 ,Purchase Order Items To Be Billed,Abzurechnende Lieferantenauftrags-Artikel
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Kaufbelege umgebucht
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artikel 1
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Position 1
 DocType: Holiday,Holiday,Urlaub
-DocType: Event,Saturday,Samstag
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Freilassen, wenn für alle Filialen gültig"
 ,Daily Time Log Summary,Tägliche Zeitprotokollzusammenfassung
-DocType: DocField,Label,Bezeichnung
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nicht abgeglichene Zahlungen
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Global Defaults,Disable Rounded Total,Gerundete Gesamtsumme deaktivieren
 DocType: Lead,Call,Anruf
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mitarbeiter einrichten
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Verzeichnis """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Bitte zuerstPräfix auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forschung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Contact,User ID,Benutzer-ID
-DocType: Communication,Sent,Verschickt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Hauptbuch anzeigen
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
-DocType: Communication,Delivery Status,Lieferstatus
-DocType: Production Order,Manufacture against Sales Order,Herstellung laut Kundenauftrag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
+DocType: Production Order,Manufacture against Sales Order,Auftragsfertigung
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest der Welt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
@@ -1074,20 +991,18 @@
 DocType: BOM Item,Item Description,Artikelbeschreibung
 DocType: Payment Tool,Payment Mode,Zahlungsweise
 DocType: Purchase Invoice,Is Recurring,ist wiederkehrend
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direktes Metall-Lasersintern
 DocType: Purchase Order,Supplied Items,Gelieferte Artikel
 DocType: Production Order,Qty To Manufacture,Herzustellende Menge
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Gleiche Preise während des gesamten Einkaufszyklus beibehalten
 DocType: Opportunity Item,Opportunity Item,Opportunity-Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Temporäre Eröffnungskonten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryogenwalzen
 ,Employee Leave Balance,Mitarbeiter-Urlaubskonto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
 DocType: Address,Address Type,Adresstyp
 DocType: Purchase Receipt,Rejected Warehouse,Ausschusslager
 DocType: GL Entry,Against Voucher,Gegenbeleg
 DocType: Item,Default Buying Cost Center,Standard-Einkaufskostenstelle
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Um das Beste aus ERPNext zu bekommen, empfehlen wir Ihnen, einige Zeit dauern, und beobachten Sie diese Hilfe-Videos."
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Um ERPNext bestmöglich zu nutzen, empfehlen wir Ihnen, sich die Zeit zu nehmen diese Hilfevideos anzusehen."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Artikel {0} muss ein Verkaufsartikel sein
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,nach
 DocType: Item,Lead Time in days,Lieferzeit in Tagen
@@ -1096,35 +1011,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Ausstehende Rechnungen aufrufen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Mitarbeiternummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Artikel 2
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Position 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kontobezeichnung {0} erstellt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grün
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grün
 DocType: Item,Auto re-order,Automatische Nachbestellung
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Gesamtsumme erreicht
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gesamtsumme erreicht
 DocType: Employee,Place of Issue,Ausstellungsort
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Vertrag
-DocType: Report,Disabled,Deaktiviert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Vertrag
+DocType: Email Digest,Add Quote,Zitat hinzufügen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landwirtschaft
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ihre Produkte oder Dienstleistungen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Name ist erforderlich
-DocType: Purchase Invoice,Recurring Type,Wiederkehrender Typ
+DocType: Purchase Invoice,Recurring Type,Wiederholungstyp
 DocType: Address,City/Town,Stadt/Ort
 DocType: Email Digest,Annual Income,Jährliches Einkommen
 DocType: Serial No,Serial No Details,Details zur Seriennummer
 DocType: Purchase Invoice Item,Item Tax Rate,Artikelsteuersatz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Lieferschein {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} muss ein unterbeauftragter Artikel sein
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Betriebsvermögen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
@@ -1134,39 +1048,36 @@
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Voraussichtlicher Liefertermin liegt vor dem geplanten Starttermin.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Summe Auslieferungen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Es kann nur eine Versandbedingung mit dem Wert ""0"" oder ""leer"" für ""Bis-Wert"" geben"
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden.
-apps/frappe/frappe/config/desk.py +7,Tools,Werkzeuge
 DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Eine Fertigungsauftragsnummer ist für Lagerbuchungen zu Einlagerungen aus der Fertigung zwingend erforderlich
 DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
-DocType: Journal Entry,Journal Entry,Journalbuchung
+DocType: Journal Entry,Journal Entry,Buchungssatz
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-Mail-Zusammenfassung:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Täglicher E-Mail-Bericht:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
 DocType: Sales Partner,Target Distribution,Aufteilung der Zielvorgaben
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentare
 DocType: Salary Slip,Bank Account No.,Bankkonto-Nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Wertansatz für Artikel {0} benötigt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Wertansatz für Artikel {0} benötigt
 DocType: Quality Inspection Reading,Reading 8,Ablesung 8
 DocType: Sales Partner,Agent,Beauftragter
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Gesamtsumme {0} für alle Positionen ist Null. Vielleicht sollte ""Verteilen der  Gebühren auf Grundlage von"" geändert werden."
 DocType: Purchase Invoice,Taxes and Charges Calculation,Berechnung der Steuern und Gebühren
 DocType: BOM Operation,Workstation,Arbeitsplatz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
-DocType: Attendance,HR Manager,Personalleiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+DocType: Attendance,HR Manager,Leiter der Personalabteilung
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte wählen Sie ein Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Keine Daten
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bewertungsvorlage zur Zielorientierung
 DocType: Salary Slip,Earning,Einkommen
 DocType: Payment Tool,Party Account Currency,Gruppenkonten-Währung
@@ -1174,28 +1085,25 @@
 DocType: Purchase Taxes and Charges,Add or Deduct,Addieren/Subtrahieren
 DocType: Company,If Yearly Budget Exceeded (for expense account),Wenn das jährliche Budget überschritten ist (für Aufwandskonto)
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Journalbuchung"" {0} ist bereits mit einem anderen Beleg abgeglichen"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Buchungssatz"" {0} ist bereits mit einem anderen Beleg abgeglichen"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Gesamtbestellwert
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Lebensmittel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem versendeten Fertigungsauftrag erstellt werden
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ein Zeitprotokoll kann nur zu einem übertragenen Fertigungsauftrag erstellt werden
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
-DocType: File,old_parent,Altes übergeordnetes Element
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads.
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Währung des Closing Konto muss {0}
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter an Kontakte und Leads
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Die Währung des Abschlusskontos muss {0} sein
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"""Arbeitsvorbereitung"" kann nicht leer sein."
 ,Delivered Items To Be Billed,Gelieferte Artikel zur Abrechnung
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
-DocType: DocField,Description,Beschreibung
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
-DocType: Letter Head,Is Default,Ist Standard
 DocType: Address,Utilities,Dienstprogramme
 DocType: Purchase Invoice Item,Accounting,Buchhaltung
-DocType: Features Setup,Features Setup,Funktionskonfiguration
+DocType: Features Setup,Features Setup,Funktionen einstellen
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Angebotsschreiben anzeigen
-DocType: Communication,Communication,Informationsfluss
 DocType: Item,Is Service Item,Ist Dienstleistung
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Bitte Geschäftsjahr auswählen
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Von {0} | {1} {2}
@@ -1214,9 +1122,9 @@
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Von Datetime
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Von Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Kommunikationsprotokoll
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Einkaufsbetrag
@@ -1224,7 +1132,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontenplan
 DocType: Material Request,Terms and Conditions Content,Allgemeine Geschäftsbedingungen Inhalt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
@@ -1238,32 +1146,29 @@
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Stapelweise Kontostands-Historie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Aufgabenliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Auszubildende(r)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Auszubildende(r)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Die Tabelle Steuerdetails wird aus dem Artikelstamm als Zeichenfolge entnommen und in diesem Feld gespeichert. Wird verwendet für Steuern und Abgaben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Aufstechen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Keine aktive Gehaltsstruktur gefunden für Mitarbeiter {0} und Monat
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand
-apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Steuerregel für Transaktionen.
-DocType: Rename Tool,Type of document to rename.,Typ des Dokuments umbenennen.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Wir kaufen diesen Artikel
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Steuerregel für Transaktionen
+DocType: Rename Tool,Type of document to rename.,"Dokumententyp, der umbenannt werden soll."
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Wir kaufen diesen Artikel
 DocType: Address,Billing,Abrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Bördelung
-DocType: Bulk Email,Not Sent,Nicht versendet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivumformen
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Gesamte Steuern und Gebühren (Firmenwährung)
 DocType: Shipping Rule,Shipping Account,Versandkonto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Geplant zum Versand an {0} Empfänger
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Unterbaugruppen
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Unterbaugruppen
 DocType: Shipping Rule Condition,To Value,Bis-Wert
-DocType: Supplier,Stock Manager,Cheflagerist
+DocType: Supplier,Stock Manager,Leitung Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Ausgangslager ist für Zeile {0} zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Büromiete
@@ -1271,106 +1176,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich zu JV Menge {2} sein
 DocType: Item,Inventory,Lagerbestand
 DocType: Features Setup,"To enable ""Point of Sale"" view","Um die ""Point of Sale""-Ansicht zu aktivieren"
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Für einen leeren Einkaufswagen kann keine Zahlung getätigt werden
 DocType: Item,Sales Details,Verkaufsdetails
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning-Verfahren
 DocType: Opportunity,With Items,Mit Artikeln
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Menge
-DocType: Notification Control,Expense Claim Rejected,Spesenabrechnung abgelehnt
+DocType: Notification Control,Expense Claim Rejected,Aufwandsabrechnung abgelehnt
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-","Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Versand."
+","Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen"
 DocType: Item Attribute,Item Attribute,Artikelattribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regierung
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikelvarianten
-DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Gesamtsumme ({0})
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regierung
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Artikelvarianten
+DocType: Company,Services,Dienstleistungen
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Gesamtsumme ({0})
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
 DocType: Sales Invoice,Source,Quelle
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Startdatum des Geschäftsjahres
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Startdatum des Geschäftsjahres
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Senken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packzettel storniert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packzettel storniert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Material Request Item,Sales Order No,Kundenauftrags-Nr.
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Vorgenommen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Vorgenommen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Material der Fertigung übergeben
 DocType: Pricing Rule,For Price List,Für Preisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Direktsuche
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Es wurde kein Einkaufspreis für Artikel: {0} gefunden. Er ist jedoch zwingend erforderlich, um Buchungssätze (Aufwendungen) zu buchen. Bitte Artikelpreis in einer Einkaufspreisliste hinterlegen."
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fehler: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fehler: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde > Kundengruppe > Region
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Verfügbare Losgröße im Lager
 DocType: Time Log Batch Detail,Time Log Batch Detail,Zeitprotokollstapel-Detail
-DocType: Workflow State,Tasks,Aufgaben
 DocType: Landed Cost Voucher,Landed Cost Help,Hilfe zum Einstandpreis
-DocType: Event,Tuesday,Dienstag
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren.
 ,Accounts Receivable Summary,Übersicht der Forderungen
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Blätter für Typ {0} für die Periode bereits für Employee {1} {2} zugeordnet - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
 DocType: UOM,UOM Name,Maßeinheit-Name
-DocType: Top Bar Item,Target,Ziel
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Beitragshöhe
 DocType: Sales Invoice,Shipping Address,Versandadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Werkzeug hilft Ihnen dabei, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Es wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Lager zu synchronisieren."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""In Worten"" wird sichtbar, sobald Sie den Lieferschein speichern."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Stammdaten zur Marke
-DocType: ToDo,Due Date,Fälligkeitsdatum
-DocType: Sales Invoice Item,Brand Name,Bezeichnung der (Handels-)Marke
-DocType: Purchase Receipt,Transporter Details,Transporter-Details
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kiste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Die Firma
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Stammdaten zur Marke
+DocType: Sales Invoice Item,Brand Name,Bezeichnung der Marke
+DocType: Purchase Receipt,Transporter Details,Informationen zum Transporteur
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kiste
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Die Firma
 DocType: Monthly Distribution,Monthly Distribution,Monatsbezogene Verteilung
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Empfängerliste ist leer. Bitte eine Empfängerliste erstellen
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan Kundenauftrag
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Eine Buchung für {0} kann nur in der Währung: {1} vorgenommen werden
 DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kerbung
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialanforderung für Kaufauftrag
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialanfrage für Lieferantenauftrag
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonten
 ,Bank Reconciliation Statement,Kontoauszug zum Kontenabgleich
 DocType: Address,Lead Name,Name des Leads
 ,POS,Verkaufsstelle
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Anfangslagerbestand
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Anfangslagerbestand
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} darf nur einmal vorkommen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Übertragung von mehr {0} als {1} mit Einkaufsbestellung {2} nicht erlaubt
-"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} mit Lieferantenauftrag {2} nicht erlaubt
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken
 DocType: Shipping Rule Condition,From Value,Von-Wert
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bei der Bank nicht berücksichtigte Beträge
 DocType: Quality Inspection Reading,Reading 4,Ablesung 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Schleuderguss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfeld-unterstützte Verarbeitung
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
 DocType: Company,Default Holiday List,Standard-Urlaubsliste
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Receipt,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 DocType: Production Planning Tool,Select Sales Orders,Kundenaufträge auswählen
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Wird verwendet, um Artikel über den Barcode nachzuverfolgen. Durch das Scannen des Artikel-Barcodes können Artikel in einen Lieferschein und eine Ausgangsrechnung eingegeben werden."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Als Lieferung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Als geliefert kennzeichnen
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Angebot erstellen
 DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 DocType: SMS Center,Receiver List,Empfängerliste
@@ -1378,31 +1273,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Anzeigen
 DocType: Salary Structure Deduction,Salary Structure Deduction,Gehaltsstruktur-Abzug
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektives Lasersintern
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importvorgang erfolgreich!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Account,Account Name,Kontenname
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Von-Datum kann später liegen als Bis-Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seriennummer {0} mit Menge {1} kann nicht eine Teilmenge sein
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp.
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Stammdaten zum Lieferantentyp
 DocType: Purchase Order Item,Supplier Part Number,Artikelnummer Lieferant
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Hinzufügen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Umrechnungskurs kann nicht 0 oder 1 sein
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} wird abgebrochen oder gestoppt
 DocType: Accounts Settings,Credit Controller,Kredit-Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Datum des Versands mit dem Fahrzeug
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kaufbeleg {0} wurde nicht übertragen
 DocType: Company,Default Payable Account,Standard-Verbindlichkeitenkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Einstellungen für Online-Warenkorb, wie Versandregeln, Preisliste usw."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Einrichtung abgeschlossen
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% berechnet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meine Fragen
@@ -1411,28 +1302,22 @@
 DocType: Company,Default Values,Standardwerte
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Zeile {0}: Zahlungsbetrag kann nicht negativ sein
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Einpressen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
 DocType: Payment Reconciliation,Payments,Zahlungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Isostatisches Heißpressen
-DocType: ToDo,Medium,Mittel
 DocType: Budget Detail,Budget Allocated,Zugewiesenes Budget
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinie
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Bitte E-Mail-ID überprüfen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren.
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
 DocType: Warranty Claim,Warranty Claim,Garantieantrag
 ,Lead Details,Einzelheiten zum Lead
-DocType: Authorization Rule,Approving User,Genehmigender Benutzer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Schmiedearbeit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Überzug
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
-DocType: Pricing Rule,Applicable For,Anwendbar für
+DocType: Pricing Rule,Applicable For,Anwenden für
 DocType: Bank Reconciliation,From Date,Von-Datum
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
 DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
@@ -1448,124 +1333,117 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Bitte Artikelnummer auswählen
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Abzug für unbezahlten Urlaub (LWP) vermindern
 DocType: Territory,Territory Manager,Gebietsleiter
-DocType: Delivery Note Item,To Warehouse (Optional),Um Warehouse (Optional)
+DocType: Delivery Note Item,To Warehouse (Optional),Eingangslager (Optional)
 DocType: Sales Invoice,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online-Auktionen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online-Auktionen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Bitte entweder die Menge oder den Wertansatz oder beides eingeben
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Firma, Monat und Geschäftsjahr sind zwingend erforderlich"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanforderung wurde für die Erstellung dieser Lagerbuchung verwendet
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Einzelnes Element eines Artikels.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""versendet"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Einzelnes Element eines Artikels
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Zeitprotokollstapel {0} muss ""übertragen"" sein"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Eine Buchung für jede Lagerbewegung erstellen
 DocType: Leave Allocation,Total Leaves Allocated,Insgesamt zugewiesene Urlaubstage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Angabe des Lagers ist in Zeile {0} erforderlich
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an.
 DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
 DocType: Address,Postal,Post
 DocType: Item,Weightage,Gewichtung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bergbau
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gießharzverfahren
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Bitte zuerst {0} auswählen.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesung 2
 DocType: Stock Entry,Material Receipt,Materialannahme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkte
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"""Gruppen-Typ"" und die ""Gruppe"" werden für das Konto ""Forderungen / Verbindlichkeiten"" {0} gebraucht"
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Kundenaufträgen, etc. nicht ausgewählt werden"
 DocType: Lead,Next Contact By,Nächster Kontakt durch
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
 DocType: Quotation,Order Type,Bestellart
 DocType: Purchase Invoice,Notification Email Address,Benachrichtigungs-E-Mail-Adresse
 DocType: Payment Tool,Find Invoices to Match,Passende Rechnungen finden
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","z. B. ""XYZ Nationalbank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","z. B. ""XYZ Nationalbank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Summe Vorgabe
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Summe Vorgabe
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Warenkorb aktiviert
 DocType: Job Applicant,Applicant for a Job,Bewerber für einen Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Keine Fertigungsaufträge erstellt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Gehaltsabrechnung für Mitarbeiter {0} wurde bereits für diesen Monat erstellt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Gehaltsabrechnung für Mitarbeiter {0} wurde bereits für diesen Monat erstellt
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Sales Invoice Item,Batch No,Chargennummer
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Können mehrere Kundenaufträge gegenüber einer Kundenbestellung
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Mehrere verschiedene Kundenaufträge zu einer Kundenbestellung zulassen
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Haupt
-DocType: DocPerm,Delete,Löschen
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Neu {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Angehaltener Auftrag kann nicht abgebrochen werden. Bitte zuerst fortsetzen, um dann abzubrechen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Opportunity von"" ist zwingend erforderlich"
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Einkaufsbestellung erstellen
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
 DocType: Sales Team,Contribution to Net Total,Beitrag zum Gesamtnetto
 DocType: Sales Invoice Item,Customer's Item Code,Kunden-Artikel-Nr
 DocType: Stock Reconciliation,Stock Reconciliation,Bestandsabgleich
 DocType: Territory,Territory Name,Name der Region
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Lager für unfertige Erzeugnisse wird vor dem Versand benötigt
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Bewerber für einen Job.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Bewerber für einen Job
 DocType: Purchase Order Item,Warehouse and Reference,Lager und Referenz
 DocType: Supplier,Statutory info and other general information about your Supplier,Rechtlich notwendige und andere allgemeine Informationen über Ihren Lieferanten
-DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
-DocType: Communication,Received,Erhalten
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Journalbuchung"" {0} hat nur abgeglichene {1} Buchungen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte Seriennummer für Posten {0} eingegeben
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Bedingung für eine Versandregel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Artikel darf keinen Fertigungsauftrag haben.
-DocType: DocField,Attach Image,Bild anhängen
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Freilassen, wenn es keine Änderung gibt"
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung.
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Zeitprotokolle für die Fertigung
 DocType: Item,Apply Warehouse-wise Reorder Level,Anwenden des lagerbezogenen Meldebestands
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Stückliste {0} muss versendet werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Bezahlung
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Zeitprotokoll für Aufgaben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Bezahlung
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
 DocType: Employee,Salutation,Anrede
-DocType: Communication,Rejected,Abgelehnt
-DocType: Pricing Rule,Brand,(Handels-)Marke
+DocType: Pricing Rule,Brand,Marke
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs zusammenfassen.
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Sales Order Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
 DocType: Quality Inspection Reading,Reading 10,Ablesung 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
 DocType: Hub Settings,Hub Node,Hub-Knoten
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wert {0} für Attribut {1} gibt es nicht in der Liste der gültigen Artikel-Attributwerte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Mitarbeiterin
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verfallen
 DocType: Packing Slip,To Package No.,Bis Paket Nr.
-DocType: DocType,System,System
 DocType: Warranty Claim,Issue Date,Ausstellungsdatum
-DocType: Activity Cost,Activity Cost,Handlungskosten
+DocType: Activity Cost,Activity Cost,Aktivitätskosten
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbrauchte Anzahl
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 DocType: Payment Tool,Make Payment Entry,Zahlungsbuchung erstellen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
-,Sales Invoice Trends,Trendanalyse Ausgangsrechnungen
+,Sales Invoice Trends,Ausgangsrechnungstrends
 DocType: Leave Application,Apply / Approve Leaves,Urlaub eintragen/genehmigen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf Betrag der vorherigen Zeile"" oder ""auf Gesamtbetrag der vorherigen Zeilen"" ist"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Für
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist"
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
 DocType: Stock Settings,Allowance Percent,Zugelassener Prozentsatz
 DocType: SMS Settings,Message Parameter,Mitteilungsparameter
@@ -1573,36 +1451,31 @@
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Artikel vom Kaufbeleg übernehmen
 DocType: Serial No,Creation Date,Erstellungsdatum
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Artikel {0} erscheint mehrfach in Preisliste {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwendbar auf"" ausgewählt ist bei {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Angebotsposition Lieferant
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vertrieb muss aktiviert werden, wenn ""Anwenden auf"" ausgewählt ist bei {0}"
+DocType: Purchase Order Item,Supplier Quotation Item,Lieferantenangebotsposition
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gehaltsübersicht erstellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Scherverfahren
 DocType: Item,Has Variants,Hat Varianten
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Auf ""Ausgangsrechnung erstellen"" klicken, um eine neue Ausgangsrechnung zu erstellen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpackung und Kennzeichnung
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
-DocType: Sales Person,Parent Sales Person,Übergeordneter Verkäufer
+DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Bitte Standardwährung in den Unternehmensstammdaten und den allgemeinen Voreinstellungen angeben
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox-Zugangsdaten
 DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Verwalten von Projekten
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Projekten verwalten
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
 DocType: Budget Detail,Fiscal Year,Geschäftsjahr
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Erreicht
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Region / Kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,z. B. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,z. B. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""In Worten"" wird sichtbar, sobald Sie die Ausgangsrechnung speichern."
 DocType: Item,Is Sales Item,Ist Verkaufsartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikelgruppenstruktur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 DocType: Maintenance Visit,Maintenance Time,Wartungszeit
 ,Amount to Deliver,Menge zu liefern
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ein Produkt oder eine Dienstleistung
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Es sind Fehler aufgetreten.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Gewindebohren
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Ein Produkt oder eine Dienstleistung
 DocType: Naming Series,Current Value,Aktueller Wert
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
@@ -1612,117 +1485,105 @@
 						must be greater than or equal to {2}","Zeile {0}: Um Periodizität {1} zu setzen, muss die Differenz aus Von-Datum und Bis-Datum größer oder gleich {2} sein"
 DocType: Pricing Rule,Selling,Vertrieb
 DocType: Employee,Salary Information,Gehaltsinformationen
-DocType: Sales Person,Name and Employee ID,Name und Personalkennung
+DocType: Sales Person,Name and Employee ID,Name und Mitarbeiter-ID
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
 DocType: Website Item Group,Website Item Group,Webseiten-Artikelgruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Zölle und Steuern
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Bitte den Stichtag eingeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Bitte den Stichtag eingeben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabelle für Artikel, der auf der Webseite angezeigt wird"
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
 DocType: Material Request Item,Material Request Item,Materialanfrageartikel
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Artikelgruppenstruktur
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Artikelgruppenstruktur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rot
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
 DocType: Account,Frozen,Gesperrt
-,Open Production Orders,Fertigungsaufträge öffnen
+,Open Production Orders,Offene Fertigungsaufträge
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Zeile #{0}: Arbeitsgang {1} ist für {2} die Menge an Fertigerzeugnissen im Produktionsauftrag # {3} abgeschlossen. Bitte den Status des Arbeitsgangs über die Zeitprotokolle aktualisieren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investitionen
 DocType: Issue,Resolution Details,Beschluss-Details
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Maßeinheit für einen Artikel ändern.
 DocType: Quality Inspection Reading,Acceptance Criteria,Akzeptanzkriterien
 DocType: Item Attribute,Attribute Name,Attributname
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Artikel {0} muss ein Verkaufs- oder Dienstleistungsartikel sein in {1}
 DocType: Item Group,Show In Website,Auf der Webseite anzeigen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Gruppe
 DocType: Task,Expected Time (in hours),Voraussichtliche Zeit (in Stunden)
 ,Qty to Order,Zu bestellende Menge
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Wird verwendet, um Markennamen in den folgenden Dokumenten nachzuverfolgen: Lieferschein, Opportunity, Materialanforderung, Artikel, Bestellung, Kaufbeleg, Kaufquittung, Angebot, Ausgangsrechnung, Produkt-Bundle, Kundenauftrag, Seriennummer"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben.
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Um Markennamen in den folgenden Dokumenten nachzuverfolgen: Lieferschein, Opportunity, Materialanfrage, Artikel, Lieferantenauftrag, Kaufbeleg, Kaufquittung, Angebot, Ausgangsrechnung, Produkt-Bundle, Kundenauftrag, Seriennummer"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-Diagramm aller Aufgaben
 DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
 DocType: Holiday List,Clear Table,Tabelle leeren
-DocType: Features Setup,Brands,(Handels-)Marken
+DocType: Features Setup,Brands,Marken
 DocType: C-Form Invoice Detail,Invoice No,Rechnungs-Nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Von Lieferantenauftrag
-DocType: Activity Cost,Costing Rate,Kalkulationssatz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Von Lieferantenauftrag
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} genehmigt/abgelehnt werden."
+DocType: Activity Cost,Costing Rate,Kalkulationsbetrag
 ,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nicht festgelegt
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Kundenumsatz wiederholen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Bitte warten Sie, während Ihr System eingerichtet wird. Dies kann einige Zeit dauern."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Paar
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Paar
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
-DocType: Item,Has Batch No,Hat Chargen-Nr.
+DocType: Item,Has Batch No,Hat Chargennummer
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
 DocType: Employee,Personal Details,Persönliche Daten
 ,Maintenance Schedules,Wartungspläne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prägung
-,Quotation Trends,Angebotsentwicklung
+,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Da ein Fertigungsauftrag für diesen Artikel gemacht werden kann, muss es sich um einen Lagerartikel handeln."
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Eintritt
-DocType: Authorization Rule,Above Value,Über Wert
 ,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
 DocType: Purchase Order,Delivered,Geliefert
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"Posteingangsserver für E-Mail-ID ""Stellen"" einrichten. (z.B. jobs@example.com)"
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),E-Mail-Adresse für Bewerbungen einrichten. (z.B. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Die Gesamtmenge des beantragten Urlaubs {0} kann nicht kleiner sein als die bereits genehmigten Urlaube {1} für den Zeitraum
 DocType: Journal Entry,Accounts Receivable,Forderungen
 ,Supplier-Wise Sales Analytics,Analyse lieferantenbezogener Verkäufe
 DocType: Address Template,This format is used if country specific format is not found,"Dieses Format wird verwendet, wenn ein länderspezifischens Format nicht gefunden werden kann"
-DocType: Custom Field,Custom,Benutzerdefiniert
 DocType: Production Order,Use Multi-Level BOM,Mehrstufige Stückliste verwenden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Spritzguß
 DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanzkontenstruktur
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Freilassen, wenn für alle Mitarbeitertypen gültig"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konto {0} muss vom Typ ""Anlagegut"" sein, weil der Artikel {1} ein Anlagegut ist"
-DocType: HR Settings,HR Settings,Personaleinstellungen
-apps/frappe/frappe/config/setup.py +130,Printing,Druck
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Spesenabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
+DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Der/Die Tag(e), für den/die Urlaub beantragt wird, sind Feiertage. Hierfür muss kein Urlaub beantragen werden."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,und
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Summe Tatsächlich
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Einheit
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Bitte Dropbox-Zugriffsdaten in den Einstellungen der Seite setzen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Einheit
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Bitte Firma angeben
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ihr Geschäftsjahr endet am
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ihr Geschäftsjahr endet am
 DocType: POS Profile,Price List,Preisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Spesenabrechnungen
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Genehmigende Rolle
 ,BOM Search,Stücklisten-Suche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Bitte die Firmenwährung angeben
 DocType: Workstation,Wages per hour,Lohn pro Stunde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Funktionen wie Seriennummern, POS, etc. anzeigen / ausblenden"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Währung muss {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Folgende wesentliche Anforderungen wurden automatisch auf der Grundlage des Artikels Nachbestellung Niveau angehoben
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Währung muss {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Einlösungsdatum kann nicht vor dem Ausstellungsdatum in Zeile {0} liegen
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Abwicklungsdatum kann nicht vor dem Prüfdatum in Zeile {0} liegen
 DocType: Salary Slip,Deduction,Abzug
 DocType: Address Template,Address Template,Adressvorlage
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Verkäufer angeben
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben
 DocType: Territory,Classification of Customers by region,Einteilung der Kunden nach Region
 DocType: Project,% Tasks Completed,% der Aufgaben fertiggestellt
 DocType: Project,Gross Margin,Handelsspanne
@@ -1730,97 +1591,89 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,deaktivierter Benutzer
 DocType: Opportunity,Quotation,Angebot
 DocType: Salary Slip,Total Deduction,Gesamtabzug
-DocType: Quotation,Maintenance User,Mitarbeiter für die Wartung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosten aktualisiert
+DocType: Quotation,Maintenance User,Nutzer Instandhaltung
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} wurde bereits zurück gegeben
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"""Geschäftsjahr"" steht für ein Finazgeschäftsjahr. Alle Buchungen und anderen größeren Transaktionen werden mit dem ""Geschäftsjahr"" verglichen."
 DocType: Opportunity,Customer / Lead Address,Kunden/Lead-Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 DocType: Production Order Operation,Actual Operation Time,Tatsächliche Betriebszeit
-DocType: Authorization Rule,Applicable To (User),Anwendbar auf (Benutzer)
+DocType: Authorization Rule,Applicable To (User),Anwenden auf (Benutzer)
 DocType: Purchase Taxes and Charges,Deduct,Abziehen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Tätigkeitsbeschreibung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Tätigkeitsbeschreibung
 DocType: Purchase Order Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Bitte eine gültige CSV-Datei mit Daten auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Beschichtung
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufsaktionen unter Beobachtung halten. Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Verzinsung des eingesetzten Kapitals zu messen."
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufskampagne verfolgen. Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen."
 DocType: Expense Claim,Approver,Genehmigender
-,SO Qty,SO Menge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
+,SO Qty,Kd.-Auftr.-Menge
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Es gibt Lagerbuchungen zum Lager {0}, daher kann das Lager nicht umbenannt oder verändert werden"
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Supplier Quotation,Manufacturing Manager,Fertigungsleiter
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist unter Garantie bis {1}
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Lieferungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Tauchformverfahren
-DocType: Purchase Order,To be delivered to customer,Um zum Kunden geliefert werden
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""versendet"" sein"
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
+apps/erpnext/erpnext/hooks.py +68,Shipments,Lieferungen
+DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,"Status des Zeitprotokolls muss ""übertragen"" sein"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Einrichten
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Zeile #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Zeile #
 DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung)
 DocType: Pricing Rule,Supplier,Lieferant
 DocType: C-Form,Quarter,Quartal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Sonstige Aufwendungen
 DocType: Global Defaults,Default Company,Standardfirma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen auf den gesamten Lagerwert hat"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Artikel {0} in Zeile {1} kann nicht mehr überberechnet werden als {2}. Um Überberechnung zu erlauben, bitte entsprechend in den Lagereinstellungen einstellen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Artikel {0} in Zeile {1} kann nicht mehr überberechnet werden als {2}. Um Überberechnung zu erlauben, bitte entsprechend in den Lagereinstellungen einstellen"
 DocType: Employee,Bank Name,Name der Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Über
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Benutzer {0} ist deaktiviert
 DocType: Leave Application,Total Leave Days,Urlaubstage insgesamt
-DocType: Journal Entry Account,Credit in Account Currency,(Gut)Haben in Kontowährung
 DocType: Email Digest,Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Firma auswählen...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)."
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Currency Exchange,From Currency,Von Währung
-DocType: DocField,Name,Name
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Im System nicht berücksichtigte Beträge
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Im System nicht berücksichtigte Beträge
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Andere
-apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Kann nicht finden, einen passenden Artikel. Bitte wählen Sie einen anderen Wert für {0}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Andere
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.
 DocType: POS Profile,Taxes and Charges,Steuern und Gebühren
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt oder Dienstleistung, die gekauft, verkauft oder auf Lager gehalten wird."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Abgeschlossen
-DocType: Web Form,Select DocType,Dokumenttyp auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Anstich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankwesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Neue Kostenstelle
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Neue Kostenstelle
 DocType: Bin,Ordered Quantity,Bestellte Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
 DocType: Quality Inspection,In Process,In Bearbeitung
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
-DocType: Purchase Order Item,Reference Document Type,Reference Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
+DocType: Purchase Order Item,Reference Document Type,Referenz-Dokumententyp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
 DocType: Account,Fixed Asset,Anlagevermögen
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serienbestand
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialisierter Lagerbestand
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
 DocType: Time Log Batch,Total Billing Amount,Gesamtrechnungsbetrag
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Forderungskonto
 ,Stock Balance,Lagerbestand
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Kundenauftrag zur Zahlung
-DocType: Expense Claim Detail,Expense Claim Detail,Spesenabrechnungsdetail
+DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zeitprotokolle erstellt:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Bitte wählen Sie richtige Konto
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
 DocType: Employee,Blood Group,Blutgruppe
 DocType: Purchase Invoice Item,Page Break,Seitenumbruch
 DocType: Production Order Operation,Pending,Ausstehend
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Benutzer, die die Urlaubsanträge eines bestimmten Mitarbeiters genehmigen können"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"Sie können die Standard-Maßeinheit der Variante nicht direkt ändern. Um die Standard-Maßeinheit für die Variante zu ändern, ändern Sie die Standard-Maßeinheit der Vorlage"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Büroausstattung
 DocType: Purchase Invoice Item,Qty,Menge
 DocType: Fiscal Year,Companies,Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Materialanfrage erstellen, wenn der Lagerbestand unter einen Wert sinkt"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Vom Wartungsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Vollzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Vollzeit
 DocType: Purchase Invoice,Contact Details,Kontakt-Details
 DocType: C-Form,Received Date,Empfangsdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Wenn eine Standardvorlage unter den Vorlagen ""Steuern und Abgaben beim Verkauf"" erstellt wurde, bitte eine Vorlage auswählen und auf die Schaltfläche unten klicken."
@@ -1828,18 +1681,19 @@
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
-DocType: Quality Inspection,Quality Manager,Qualitätsbeauftragter
+DocType: Quality Inspection,Quality Manager,Qualitätsmanager
 DocType: Job Applicant,Job Opening,Offene Stellen
 DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Angebotsschreiben
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Materialanforderungen (MAF) und Fertigungsaufträge generieren.
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Gesamtrechnungsbetrag
 DocType: Time Log,To Time,Bis-Zeit
+DocType: Authorization Rule,Approving Role (above authorized value),Genehmigende Rolle (über dem autorisierten Wert)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Um Unterknoten hinzuzufügen, klicken Sie in der Baumstruktur auf den Knoten, unter dem Sie weitere Knoten hinzufügen möchten."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
 DocType: Production Order Operation,Completed Qty,gefertigte Menge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preisliste {0} ist deaktiviert
@@ -1848,13 +1702,11 @@
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktueller Wertansatz
 DocType: Item,Customer Item Codes,Kundenartikelnummern
 DocType: Opportunity,Lost Reason,Verlustgrund
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Schweißen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Neue Lagermaßeinheit ist erforderlich
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Neue Zahlungsbuchungen zu Aufträgen oder Rechnungen erstellen
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Artikel-Seriennummern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen
@@ -1864,32 +1716,28 @@
 DocType: Bin,Actual Quantity,Tatsächlicher Bestand
 DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ihre Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formpressen
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Ihre Kunden
 DocType: Leave Block List Date,Block Date,Datum sperren
 DocType: Sales Order,Not Delivered,Nicht geliefert
 ,Bank Clearance Summary,Zusammenfassung Bankabwicklungen
-apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten."
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Artikelnummer > Artikelgruppe > Marke
 DocType: Appraisal Goal,Appraisal Goal,Bewertungsziel
-DocType: Event,Friday,Freitag
 DocType: Time Log,Costing Amount,Kalkulationsbetrag
-DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung absenden
+DocType: Process Payroll,Submit Salary Slip,Gehaltsabrechnung übertragen
 DocType: Salary Structure,Monthly Earning & Deduction,Monatliches Einkommen & Abzüge
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Maximaler Rabatt für Artikel {0} beträgt {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Mengenimport
 DocType: Sales Partner,Address & Contacts,Adresse & Kontakte
 DocType: SMS Log,Sender Name,Absendername
-DocType: Page,Title,Bezeichnung
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Anpassen
 DocType: POS Profile,[Select],[Select ]
 DocType: SMS Log,Sent To,Gesendet An
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Verkaufsrechnung erstellen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Vorauskasse
 DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Von-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich,"
 DocType: Journal Entry,Reference Number,Referenznummer
 DocType: Employee,Employment Details,Beschäftigungsdetails
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
@@ -1898,38 +1746,36 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Fall Nr. kann nicht 0 sein
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,"Wenn es ein Vertriebsteam und Handelspartner (Partner für Vertriebswege) gibt, können diese in der Übersicht der Vertriebsaktivitäten markiert und ihr Anteil an den Vertriebsaktivitäten eingepflegt werden"
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
-DocType: Item,"Allow in Sales Order of type ""Service""","Kundenbestellungen des Typs ""Dienstleistung"" zulassen"
+DocType: Item,"Allow in Sales Order of type ""Service""","Kundenaufträge des Typs ""Dienstleistung"" zulassen"
 apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Lagerräume
 DocType: Time Log,Projects Manager,Projektleiter
 DocType: Serial No,Delivery Time,Lieferzeit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Alter basierend auf
 DocType: Item,End of Life,Lebensdauer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Benutzer zulassen
-DocType: Purchase Order,Customer Mobile No,Kundenmobil Nein
+DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
 DocType: Sales Invoice,Recurring,Wiederkehrend
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Einnahmen und Ausgaben für Produktbereiche oder Abteilungen separat verfolgen.
 DocType: Rename Tool,Rename Tool,Werkzeug zum Umbenennen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material übergeben
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Arbeitsgänge und Betriebskosten angeben und eine eindeutige Arbeitsgang-Nr. für diesen Arbeitsgang angeben.
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
 DocType: Installation Note,Installation Note,Installationshinweis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Steuern hinzufügen
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Steuern hinzufügen
 ,Financial Analytics,Finanzanalyse
 DocType: Quality Inspection,Verified By,Geprüft durch
 DocType: Address,Subsidiary,Tochtergesellschaft
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Die Standardwährung der Firma kann nicht geändern werden, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
 DocType: Quality Inspection,Purchase Receipt No,Kaufbeleg Nr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
-DocType: System Settings,In Hours,In Stunden
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Voraussichtlicher Kontostand laut Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polieren
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Mittelherkunft ( Passiva)
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Voraussichtlicher Kontostand laut Bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Mittelherkunft (Verbindlichkeiten)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
 DocType: Appraisal,Employee,Mitarbeiter
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import von E-Mails aus
@@ -1937,19 +1783,17 @@
 DocType: Features Setup,After Sale Installations,After Sale-Installationen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 DocType: Workstation Working Hour,End Time,Endzeit
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Allgemeine Vertragsbedingungen für den Verkauf und Einkauf.
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Allgemeine Vertragsbedingungen für den Verkauf und Einkauf
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppieren nach Beleg
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Sales Invoice,Mass Mailing,Massen-E-Mail-Versand
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
-apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zahlung anzeigen
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Größe
-DocType: Notification Control,Expense Claim Approved,Spesenabrechnung zugelassen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Arzneimittel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zahlungen anzeigen
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
+DocType: Notification Control,Expense Claim Approved,Aufwandsabrechnung genehmigt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Arzneimittel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Neuen Kunden erstellen
@@ -1959,78 +1803,72 @@
 DocType: Quality Inspection Reading,Reading 9,Ablesung 9
 DocType: Supplier,Is Frozen,Ist gesperrt
 DocType: Buying Settings,Buying Settings,Einkaufs-Einstellungen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Massenverarbeitung
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Posteingangsserver für E-Mail-ID Vertrieb einrichten. (z. B. sales@example.com)
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),E-Mail-Adresse für den Vertrieb einrichten. (z. B. sales@example.com)
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Tool,Payment Account,Zahlungskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Entwurf
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Ausgleich für
 DocType: Quality Inspection Reading,Accepted,Genehmigt
-DocType: User,Female,Weiblich
-DocType: Journal Entry Account,Debit in Account Currency,Soll in Kontowährung
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Bitte sicher stellen, dass wirklich alle Transaktionen für diese Firma gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Beantwortet
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ungültige Referenz {0} {1}
 DocType: Payment Tool,Total Payment Amount,Summe Zahlungen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kann nicht größer sein als die geplante Menge ({2}) im Fertigungsauftrag {3}
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Da es bestehende Lagertransaktionen für diesen Artikel gibt, können die Werte von ""Hat Seriennummer"", ""Hat Losnummer"", ""Ist Lagerartikel"" und ""Bewertungsmethode"" nicht geändert werden"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Schnell Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Schnellbuchung
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Sie können den Preis nicht ändern, wenn eine Stückliste für einen Artikel aufgeführt ist"
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelanfragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt.
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Einrichtung abschliessen
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen. (für Nr.)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter-Versandliste
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
+DocType: Authorization Rule,Authorized Value,Autorisierter Wert
 DocType: Contact,Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Summe Abwesenheit
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Reihe {0} stimmen nicht mit Materialanforderung überein
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mengeneinheit
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel oder Lager in Zeile {0} stimmen nicht mit Materialanfrage überein
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Maßeinheit
 DocType: Fiscal Year,Year End Date,Enddatum des Geschäftsjahres
 DocType: Task Depends On,Task Depends On,Aufgabe hängt davon ab
 DocType: Lead,Opportunity,Opportunity
 DocType: Salary Structure Earning,Salary Structure Earning,Gehaltsstruktur-Verdienst
 ,Completed Production Orders,Abgeschlossene Fertigungsaufträge
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
-DocType: Notification Control,Expense Claim Approved Message,Benachrichtigung über zugelassene Spesenabrechnung
+DocType: Notification Control,Expense Claim Approved Message,Benachrichtigung über genehmigte Aufwandsabrechnung
 DocType: Email Digest,How frequently?,Wie häufig?
 DocType: Purchase Receipt,Get Current Stock,Aktuellen Lagerbestand aufrufen
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Stücklistenstruktur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 DocType: Production Order,Actual End Date,Tatsächliches Enddatum
-DocType: Authorization Rule,Applicable To (Role),Anwendbar auf (Rolle)
+DocType: Authorization Rule,Applicable To (Role),Anwenden auf (Rolle)
 DocType: Stock Entry,Purpose,Zweck
 DocType: Item,Will also apply for variants unless overrridden,"Gilt auch für Varianten, sofern nicht außer Kraft gesetzt"
 DocType: Purchase Invoice,Advances,Vorschüsse
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Genehmigender Benutzer kann nicht derselbe Benutzer sein wie derjenige mit der Regel ""ist anwendbar auf"""
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundbetrag (nach Lager-Maßeinheit)
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Genehmigender Benutzer kann nicht derselbe Benutzer sein wie derjenige, auf den die Regel anzuwenden ist"
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundbetrag (nach Lagermaßeinheit)
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
 DocType: Campaign,Campaign-.####,Kampagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Stechverfahren
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
 DocType: Customer Group,Has Child Node,Unterknoten vorhanden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} zu Bestellung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Alter Bereich 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemische Bearbeitung
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2072,11 +1910,9 @@
 8. Zeile eingeben: Wenn ""Basierend auf Vorherige Zeile"" eingestellt wurde, kann hier die Zeilennummer ausgewählt werden, die als Basis für diese Berechnung (voreingestellt ist die vorherige Zeile) herangezogen wird.
 9. Steuern oder Gebühren berücksichtigen: In diesem Abschnitt kann festgelegt werden, ob die Steuer/Gebühr nur für die Bewertung (kein Teil der Gesamtsumme) oder nur für die Gesamtsumme (vermehrt nicht den Wert des Artikels) oder für beides verwendet wird.
 10. Hinzufügen oder abziehen: Gibt an, ob die Steuer/Abgabe hinzugefügt oder abgezogen wird."
-DocType: Note,Note,Anmerkung
-DocType: Purchase Receipt Item,Recd Quantity,Zurückgegebene Menge
-DocType: Email Account,Email Ids,E-Mail-IDs
+DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
 DocType: Global Defaults,Hide Currency Symbol,Währungssymbol ausblenden
@@ -2084,40 +1920,36 @@
 DocType: Journal Entry,Credit Note,Gutschrift
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Gefertigte Menge kann für den Arbeitsablauf {1} nicht mehr als {0} sein
 DocType: Features Setup,Quality,Qualität
-DocType: Contact Us Settings,Introduction,Vorstellung
 DocType: Warranty Claim,Service Address,Serviceadresse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 Zeilen für Lagerabgleich.
-DocType: Stock Entry,Manufacture,Herstellung
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 Zeilen für Lagerabgleich.
+DocType: Stock Entry,Manufacture,Fertigung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Bitte Lieferschein zuerst
 DocType: Purchase Invoice,Currency and Price List,Währungs- und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden/Lead-Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Einlösungsdatum nicht benannt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Fertigungsauftrag zulassen
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Startdatum muss vor dem Enddatum liegen
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
 DocType: Lead,Fax,Telefax
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Versendet
 DocType: Salary Structure,Total Earning,Gesamteinnahmen
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Meine Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Stammdaten zu Unternehmensfilialen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oder
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Stammdaten zu Unternehmensfilialen
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Über 90
 DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
-,Download Backups,Datensicherungen herunterladen
 DocType: Notification Control,Sales Order Message,Benachrichtigung über Kundenauftrag
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Standardwerte wie Firma, Währung, aktuelles Geschäftsjahr usw. festlegen"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Zahlungsart
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Bank Reconciliation,To Date,Bis-Datum
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Details
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
 DocType: Item,Quality Parameters,Qualitätsparameter
@@ -2128,10 +1960,11 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Allgemeines POS-Profil {0} bereits für Firma {1} angelegt
 DocType: Purchase Order,Ref SQ,Ref-SQ
 apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Artikel/Stückliste in allen Stücklisten ersetzen
-DocType: Purchase Order Item,Received Qty,Empfangene Menge
+DocType: Purchase Order Item,Received Qty,Erhaltene Menge
 DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge
 DocType: Product Bundle,Parent Item,Übergeordneter Artikel
 DocType: Account,Account Type,Kontentyp
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Urlaubstyp {0} kann nicht in die Zukunft übertragen werden
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 ,To Produce,Zu produzieren
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
@@ -2139,99 +1972,86 @@
 DocType: Bin,Reserved Quantity,Reservierte Menge
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Zuschnitt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Abflachung
 DocType: Account,Income Account,Ertragskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Guss
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
 DocType: Appraisal Goal,Key Responsibility Area,Wichtigster Verantwortungsbereich
-DocType: Item Reorder,Material Request Type,Materialanforderungstyp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Umrechnungsfaktor ist obligatorisch
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumente
+DocType: Item Reorder,Material Request Type,Materialanfragetyp
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Kostenstelle
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Beleg #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Beleg #
 DocType: Notification Control,Purchase Order Message,Lieferantenauftrags-Nachricht
 DocType: Tax Rule,Shipping Country,Zielland der Lieferung
 DocType: Upload Attendance,Upload HTML,HTML hochladen
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Summe der Anzahlungen ({0}) zu Bestellung {1} kann nicht größer sein  als die Gesamtsumme ({2})
-DocType: Employee,Relieving Date,Entlassungsdatum
+DocType: Employee,Relieving Date,Freistellungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Employee Education,Class / Percentage,Klasse / Anteil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Leiter Marketing und Vertrieb
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Lasertechnikbasierende Netzformung
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Bestellung etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Leads nachverfolgen nach Branchentyp.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Leiter Marketing und Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Einkommensteuer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Lieferantenauftrag etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen.
-DocType: Company,Stock Settings,Lager-Voreinstellungen
-DocType: User,Bio,Lebenslauf
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Neuer Kostenstellenname
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle Adressen
+DocType: Company,Stock Settings,Lager-Einstellungen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Keine Standard-Adressvorlage gefunden. Bitte eine neue unter Setup > Druck und Branding > Adressvorlage erstellen.
-DocType: Appraisal,HR User,Personalbenutzer
+DocType: Appraisal,HR User,Nutzer Personalabteilung
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Fragen
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Fälle
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein
 DocType: Sales Invoice,Debit To,Lastschrift für
 DocType: Delivery Note,Required only for sample item.,Nur erforderlich für Probeartikel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
-,Pending SO Items For Purchase Request,Ausstehende SO-Artikel für Einkaufsanfrage
+,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
 DocType: Supplier,Billing Currency,Abrechnungswährung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Besonders groß
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Besonders groß
 ,Profit and Loss Statement,Gewinn- und Verlustrechnung
 DocType: Bank Reconciliation Detail,Cheque Number,Schecknummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Drücken
-DocType: Payment Tool Detail,Payment Tool Detail,Zahlungsabgleichs-Werkzeug-Details
+DocType: Payment Tool Detail,Payment Tool Detail,Zahlungswerkzeug-Details
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groß
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Kein Mitarbeiter gefunden!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groß
 DocType: C-Form Invoice Detail,Territory,Region
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
-DocType: Purchase Order,Customer Address Display,Kundenadresse anzeigen
+DocType: Purchase Order,Customer Address Display,Anzeige der Kundenadresse
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polieren
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil bereits einige Transaktion(en) mit einer anderen Standard-Maßeinheit gemacht wurden. Bitte das Maßeinheit-Ersetzungswerkzeug im Lagermodul verwenden."
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Angebot {0} wird storniert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Angebot {0} wird storniert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war am {1} im Urlaub. Er kann nicht auf ""anwesend"" gesetzt werden."
 DocType: Sales Partner,Targets,Ziele
-DocType: Price List,Price List Master,Preislisten-Stammdaten
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
+DocType: Price List,Price List Master,Preislisten-Vorlagen
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Lieferantenbestellung Nr.
 DocType: Production Order Operation,Make Time Log,Zeitprotokoll erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Bitte setzen Neuordnungs Menge
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
-DocType: Price List,Applicable for Countries,Anwendbar für Länder
+DocType: Price List,Applicable for Countries,Anwenden für Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Rechner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrochemisches Schleifen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Bitte zunächst Kontenplan einrichten, bevor Buchungen vorgenommen werden"
 DocType: Purchase Invoice,Ignore Pricing Rule,Preisregel ignorieren
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Abgebrochen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Von-Datum in der Gehaltsstruktur kann nicht vor dem Eintrittsdatum des Mitarbeiters liegen.
 DocType: Employee Education,Graduate,Akademiker
 DocType: Leave Block List,Block Days,Tage sperren
 DocType: Journal Entry,Excise Entry,Eintrag/Buchung entfernen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Kundenauftrag {0} gegen Kunden Bestellung bereits vorhanden {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Warnung: Kundenauftrag {0} zu Kunden-Bestellung bereits vorhanden {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2263,38 +2083,36 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Aktivieren, wenn dies eine wiederkehrende Rechnung ist, deaktivieren, damit es keine wiederkehrende Rechnung mehr ist, oder ein gültiges Enddatum angeben."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
 DocType: Packing Slip,If more than one package of the same type (for print),Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maximum von {0} Zeilen erlaubt
 DocType: C-Form Invoice Detail,Net Total,Nettosumme
 DocType: Bin,FCFS Rate,"""Wer-zuerst-kommt-mahlt-zuerst""-Anteil (Windhundverfahren)"
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Abrechnung (Ausgangsrechnung)
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Ausstehender Betrag
 DocType: Project Task,Working,In Bearbeitung
-DocType: Stock Ledger Entry,Stock Queue (FIFO),Bestands-Warteschlange (FIFO)
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Lagerverfahren (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Bitte Zeitprotokolle auswählen.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} gehört nicht zu Firma {1}
 DocType: Account,Round Off,Abschliessen
 ,Requested Qty,Angeforderte Menge
 DocType: Tax Rule,Use for Shopping Cart,Für den Einkaufswagen verwenden
 DocType: BOM Item,Scrap %,Ausschuss %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Die Kosten werden anteilig verteilt auf Teil Stück oder Menge basieren, wie pro Ihre Wahl"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis
 DocType: Maintenance Visit,Purposes,Zweck
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Mindestens ein Artikel sollte mit negativer Menge in das Rückgabedokument eingegeben werden
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemische Bearbeitung
 ,Requested,Angefordert
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Keine Anmerkungen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Überfällig
 DocType: Account,Stock Received But Not Billed,"Empfangener, aber nicht berechneter Lagerbestand"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,"Root-Konto muss eine Gruppe sein,"
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolohn +  ausstehender Betrag +   Inkassobetrag - Summe aller Abzüge
-DocType: Monthly Distribution,Distribution Name,Bezeichnung des Großhandels
+DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
 DocType: Features Setup,Sales and Purchase,Vertrieb und Einkauf
 DocType: Supplier Quotation Item,Material Request No,Materialanfragenr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} wurde erfolgreich aus dieser Liste ausgetragen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettopreis (Firmenwährung)
-apps/frappe/frappe/templates/base.html +134,Added,Hinzugefügt
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Baumstruktur der Region verwalten.
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Baumstruktur der Region verwalten
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
 DocType: Sales Invoice Item,Time Log Batch,Zeitprotokollstapel
@@ -2307,146 +2125,135 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Geschäftsjahr {0} nicht gefunden.
 DocType: Bank Reconciliation,Get Relevant Entries,Zutreffende Buchungen aufrufen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lagerbuchung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägung
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
-apps/frappe/frappe/desk/query_report.py +136,Total,Summe
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
 DocType: Account,Root Type,Root-Typ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Zeile # {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Grundstück
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Linie
 DocType: Item Group,Show this slideshow at the top of the page,Diese Diaschau oben auf der Seite anzeigen
 DocType: BOM,Item UOM,Artikelmaßeinheit
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Steuerbetrag nach Abzug von Rabatt (Firmenwährung)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Eingangslager ist für Zeile {0} zwingend erforderlich
 DocType: Quality Inspection,Quality Inspection,Qualitätsprüfung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprühformverfahren
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Gewünschte Materialmenge ist geringer als die Mindestbestellmenge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Besonders klein
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL oder BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kann nur gegen Bezahlung zu machen noch nicht abgerechneten {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Mindestbestandshöhe
 DocType: Stock Entry,Subcontract,Zulieferer
-apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Bitte geben Sie {0} zuerst
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Bitte geben Sie zuerst {0} ein
 DocType: Production Planning Tool,Get Items From Sales Orders,Artikel aus Kundenaufträgen abrufen
 DocType: Production Order Operation,Actual End Time,Tatsächliche Endzeit
 DocType: Production Planning Tool,Download Materials Required,Erforderliche Materialien herunterladen
 DocType: Item,Manufacturer Part Number,Hersteller-Teilenummer
 DocType: Production Order Operation,Estimated Time and Cost,Geschätzte Zeit und Kosten
 DocType: Bin,Bin,Lagerfach
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Anzahl abgesendeter SMS
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Aufwandskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farbe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farbe
 DocType: Maintenance Visit,Scheduled,Geplant
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Bitte einen Artikel auswählen, bei dem ""Ist Lagerartikel"" mit ""Nein"" und ""Ist Verkaufsartikel"" mit ""Ja"" bezeichnet ist, und es kein anderes Produkt-Bundle gibt"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Bitte ""Monatsweise Verteilung"" wählen, um Ziele ungleichmäßig über Monate zu verteilen."
 DocType: Purchase Invoice Item,Valuation Rate,Wertansatz
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Preislistenwährung nicht ausgewählt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Artikel Zeile {0}: Kaufbeleg {1} existiert nicht in der obigen Tabelle ""Eingangslieferscheine"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projektstartdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
 DocType: Installation Note Item,Against Document No,Zu Dokument Nr.
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Vertriebspartner verwalten.
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Vertriebspartner verwalten
 DocType: Quality Inspection,Inspection Type,Art der Prüfung
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Bitte {0} auswählen
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Wissenschaftler
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualisieren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Wissenschaftler
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Bitte den Newsletter vor dem Senden speichern
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Name oder E-Mail-Adresse ist zwingend erforderlich
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Wareneingangs-Qualitätsprüfung.
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Wareneingangs-Qualitätsprüfung
 DocType: Purchase Order Item,Returned Qty,Zurückgegebene Menge
 DocType: Employee,Exit,Beenden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root-Typ ist zwingend erforderlich
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root-Typ ist zwingend erforderlich
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seriennummer {0} erstellt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Gleitschleifen
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
 DocType: Sales Invoice,Advertisement,Werbung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probezeit
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
 apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Zahlen
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Um Datetime
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Bis Datum und Uhrzeit
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Schliff
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Einschweißtechnik
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ausstehende Aktivitäten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bestätigt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Lieferant > Lieferantentyp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Entlassungsdatum eingeben.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Menge
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können versendet werden"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können übertragen werden"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adressbezeichnung muss zwingend angegeben werden.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Namen der Kampagne eingeben, wenn der Ursprung der Anfrage eine Kampagne ist"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Geschäftsjahr auswählen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Verhüttung
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Address,Preferred Shipping Address,Bevorzugte Lieferadresse
-DocType: Purchase Receipt Item,Accepted Warehouse,Akzeptiertes Lager
+DocType: Purchase Receipt Item,Accepted Warehouse,Annahmelager
 DocType: Bank Reconciliation Detail,Posting Date,Buchungsdatum
 DocType: Item,Valuation Method,Bewertungsmethode
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nicht in der Lage Wechselkurs für {0} zu finden {1}
 DocType: Sales Invoice,Sales Team,Verkaufsteam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Doppelter Eintrag/doppelte Buchung
-DocType: Serial No,Under Warranty,Unter Garantie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Doppelter Eintrag/doppelte Buchung
+DocType: Serial No,Under Warranty,Innerhalb der Garantie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fehler]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Kundenauftrag speichern."
 ,Employee Birthday,Mitarbeiter-Geburtstag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Risikokapital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Risikokapital
 DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seriennummer {0} existiert nicht
 DocType: Pricing Rule,Discount Percentage,Rabatt in Prozent
 DocType: Payment Reconciliation Invoice,Invoice Number,Rechnungsnummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestellungen
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestellungen
 DocType: Leave Control Panel,Employee Type,Mitarbeitertyp
 DocType: Employee Leave Approver,Leave Approver,Urlaubsgenehmiger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Gesenkschmieden
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material zur Herstellung übertragen
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Ein Benutzer mit der Rolle ""Ausgabengenehmiger"""
 ,Issued Items Against Production Order,Zu Fertigungsauftrag ausgegebene Artikel
 DocType: Pricing Rule,Purchase Manager,Einkaufsleiter
-DocType: Payment Tool,Payment Tool,Zahlungsabgleichs-Werkzeug
+DocType: Payment Tool,Payment Tool,Zahlungswerkzeug
 DocType: Target Detail,Target Detail,Zieldetail
 DocType: Sales Order,% of materials billed against this Sales Order,% der für diesen Kundenauftrag in Rechnung gestellten Materialien
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Periodenabschlussbuchung
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ungültige Zeitraum
 DocType: Customer,Credit Limit,Kreditlimit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Bitte Transaktionstyp auswählen
 DocType: GL Entry,Voucher No,Belegnr.
 DocType: Leave Allocation,Leave Allocation,Urlaubszuordnung
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materialanforderungen {0} erstellt
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Materialanfrage {0} erstellt
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
 DocType: Customer,Address and Contact,Adresse und Kontakt
 DocType: Customer,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Employee,Feedback,Rückmeldung
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} zugeteilt werden."
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Servicezeitplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schleifmittelstrahlbearbeitung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Wartungsplan
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
-DocType: Website Settings,Website Settings,Webseiten-Einstellungen
-DocType: Item,Reorder level based on Warehouse,Meldebestand auf Basis von Warehouse
-DocType: Activity Cost,Billing Rate,Abrechnungssatz
+DocType: Item,Reorder level based on Warehouse,Meldebestand auf Basis des Lagers
+DocType: Activity Cost,Billing Rate,Abrechnungsbetrag
 ,Qty to Deliver,Zu liefernde Menge
 DocType: Monthly Distribution Percentage,Month,Monat
 ,Stock Analytics,Bestandsanalyse
@@ -2455,39 +2262,37 @@
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-Konto kann nicht gelöscht werden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Lagerbuchungen anzeigen
 ,Is Primary Address,Ist Hauptadresse
-DocType: Production Order,Work-in-Progress Warehouse,Lager für unfertige Erzeugnisse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenz #{0} vom {1}
+DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adressen verwalten
 DocType: Pricing Rule,Item Code,Artikelnummer
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Schlußstand (Soll)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Schlußstand (Soll)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen.
-DocType: Sales Invoice,Write Off Outstanding Amount,Abschreibung auf offene Forderungen
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Absenden einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Steuer-Vorlage für Verkaufstransaktionen
+DocType: Sales Invoice,Write Off Outstanding Amount,Offenen Betrag ausbuchen
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Aktivieren, wenn Sie automatisch wiederkehrende Ausgangsrechnungen benötigen. Nach dem Übertragen einer Ausgangsrechnung wird der Bereich für wiederkehrende Ausgangsrechnungen angezeigt."
 DocType: Account,Accounts Manager,Kontenmanager
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""versendet"" sein"
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',"Zeitprotokoll {0} muss ""übertragen"" sein"
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
-DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulationspreis basierend auf Aktivitätsart (pro Stunde)
+DocType: Time Log,Costing Rate based on Activity Type (per hour),Kalkulationsbetrag basierend auf Aktivitätsart (pro Stunde)
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
 ,Billed Amount,Rechnungsbetrag
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates abholen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
-apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lassen Verwaltung
-DocType: Event,Groups,Gruppen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Urlaubsverwaltung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto
 DocType: Sales Order,Fully Delivered,Komplett geliefert
 DocType: Lead,Lower Income,Niedrigeres Einkommen
@@ -2496,59 +2301,55 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Schnellhilfe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
 DocType: Features Setup,Sales Extras,Vertriebsextras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} zu Kostenstelle {2} wird um {3} überschritten
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budget für Konto {1} zu Kostenstelle {2} wird um {3} überschritten
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
-,Stock Projected Qty,Geplanter Lagerbestand
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+,Stock Projected Qty,Projizierter Lagerbestand
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Kunden-Bestellung
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wert oder Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minute
-DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -gebühren
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minute
+DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -abgaben
 ,Qty to Receive,Anzunehmende Menge
 DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelassen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Umrechnungsfaktor kann nicht ein Bruchteil sein
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Sie brauchen das, um sich anzumelden."
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Sie brauchen das, um sich anzumelden."
 DocType: Sales Partner,Retailer,Einzelhändler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposition
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposten
 DocType: Sales Order,%  Delivered,%  geliefert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorrentkredit Konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gehaltsabrechnung erstellen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Gedeckte Kredite
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Beeindruckende Produkte
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Beeindruckende Produkte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Anfangsstand Eigenkapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Diese Abwesenheit kann nicht genehmigt werden, da Sie nicht über die Berechtigung zur Genehmigung von Block-Abwesenheiten verfügen."
 DocType: Appraisal,Appraisal,Bewertung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Schaumstoffguß
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zeichnung
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ereignis wiederholen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
 DocType: Workstation Working Hour,Start Time,Startzeit
 DocType: Item Price,Bulk Import Help,Massen-Import Hilfe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Menge wählen
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige mit der Regel ""Ist anwendbar auf"""
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige, auf die die Regel anzuwenden ist"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Digest
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mitteilung gesendet
-DocType: Production Plan Sales Order,SO Date,SO-Datum
+DocType: Production Plan Sales Order,SO Date,Auftragsdatum
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
 DocType: BOM Operation,Hour Rate,Stundensatz
 DocType: Stock Settings,Item Naming By,Artikelbezeichnung nach
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Von Angebot
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Von Angebot
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Eine weitere Periodenabschlussbuchung {0} wurde nach {1} erstellt
 DocType: Production Order,Material Transferred for Manufacturing,Material zur Herstellung übertragen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existiert nicht
 DocType: Purchase Receipt Item,Purchase Order Item No,Lieferantenauftrags-Artikel-Nr.
-DocType: System Settings,System Settings,Systemeinstellungen
 DocType: Project,Project Type,Projekttyp
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Aufwendungen für verschiedene Tätigkeiten
@@ -2557,98 +2358,86 @@
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
 DocType: Sales Order,Fully Billed,Voll berechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Barmittel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Gewicht des Verpackungsmaterials (Für den Ausdruck)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 DocType: Serial No,Is Cancelled,Ist storniert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Meine Lieferungen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Meine Lieferungen
 DocType: Journal Entry,Bill Date,Rechnungsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Wenn es mehrere Preisregeln mit der höchsten Priorität gibt, werden folgende interne Prioritäten angewandt:"
 DocType: Supplier,Supplier Details,Lieferantendetails
-DocType: Communication,Recipients,Empfänger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Verschraubung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Rändelung
 DocType: Expense Claim,Approval Status,Genehmigungsstatus
 DocType: Hub Settings,Publish Items to Hub,Artikel über den Hub veröffentlichen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Von-Wert muss weniger sein als Bis-Wert in Zeile {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Überweisung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Überweisung
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Bitte ein Bankkonto auswählen
 DocType: Newsletter,Create and Send Newsletters,Newsletter erstellen und senden
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Von-Datum muss vor dem Bis-Datum liegen
 DocType: Sales Order,Recurring Order,Wiederkehrende Bestellung
 DocType: Company,Default Income Account,Standard-Ertragskonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundengruppe / Kunde
 DocType: Item Group,Check this if you want to show in website,"Aktivieren, wenn der Inhalt auf der Webseite angezeigt werden soll"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Willkommen bei ERPNext
+,Welcome to ERPNext,Willkommen bei ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Belegdetail-Nummer
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Führt zu Angebot
 DocType: Lead,From Customer,Von Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Anrufe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Anrufe
 DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
-DocType: Purchase Order Item Supplied,Stock UOM,Bestandsmaßeinheit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Bestellung {0} wurde nicht versendet
-,Projected,projektiert
+DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
+,Projected,Geplant
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
 DocType: Issue,Opening Date,Eröffnungsdatum
 DocType: Journal Entry,Remark,Bemerkung
 DocType: Purchase Receipt Item,Rate and Amount,Preis und Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Langweilig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Aus Kundenauftrag
-DocType: Blog Category,Parent Website Route,Pfad zur übergeordneten Webseite
 DocType: Sales Order,Not Billed,Nicht abgerechnet
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Noch keine Kontakte hinzugefügt.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nicht aktiv
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Einstandskosten
 DocType: Time Log,Batched for Billing,Für Abrechnung gebündelt
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbetrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
-DocType: Item,Warranty Period (in days),Gewährleistungsfrist (in Tagen)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,z. B. Mehrwertsteuer
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+DocType: Item,Warranty Period (in days),Garantiefrist (in Tagen)
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,z. B. Mehrwertsteuer
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Position 4
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
-DocType: Shopping Cart Settings,Quotation Series,Serienbezeichnung der Angebote
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0} ). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Bleigasformen
+DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Lager {0}: Firma ist zwingend erforderlich
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Zur entsprechende Gruppe gehen (normalerweise ""Mittelherkunft"" > ""Kurzfristige Verbindlichkeiten"" > ""Zölle und Steuern"" und durch Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Steuern"" erstellen"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Zur entsprechenden Gruppe gehen (normalerweise ""Mittelherkunft"" > ""Kurzfristige Verbindlichkeiten"" > ""Zölle und Steuern"" und durch Klicken auf ""Unterpunkt hinzufügen"" ein neues Konto vom Typ ""Steuern"" erstellen"
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserschneiden
-DocType: Event,Monday,Montag
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Account,Payable,Zahlbar
 DocType: Salary Slip,Arrear Amount,Ausstehender Betrag
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Rohgewinn %
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Einlösungsdatum
+DocType: Bank Reconciliation Detail,Clearance Date,Abwicklungsdatum
 DocType: Newsletter,Newsletter List,Newsletter-Empfängerliste
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per Post an jeden Mitarbeiter senden möchten."
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Aktivieren, wenn Sie die Gehaltsabrechnung per E-Mail an jeden Mitarbeiter senden möchten während Sie sie übertragen."
 DocType: Lead,Address Desc,Adresszusatz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ort an dem Arbeitsgänge der Fertigung ablaufen.
-DocType: Page,All,Alle
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ort an dem Arbeitsgänge der Fertigung ablaufen
 DocType: Stock Entry Detail,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
-DocType: Account,Sales User,Verkaufsmitarbeiter
+DocType: Account,Sales User,Nutzer Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Einstellen
 DocType: Lead,Lead Owner,Eigentümer des Leads
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Angabe des Lagers wird benötigt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Angabe des Lagers wird benötigt
 DocType: Employee,Marital Status,Familienstand
-DocType: Stock Settings,Auto Material Request,Automatische Materialanforderung
+DocType: Stock Settings,Auto Material Request,Automatische Materialanfrage
 DocType: Time Log,Will be updated when billed.,"Wird aktualisiert, wenn abgerechnet ist."
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Erhältlich Batch Menge an von LAGER
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Verfügbare Chargenmenge im Ausgangslager
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
@@ -2658,44 +2447,40 @@
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen.
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung."
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Firmenname kann keine Firma sein
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Feinstbearbeitung
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journalbuchungen {0} sind entknüpft
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung aller Kommunikations vom Typ Email, Telefon, Chat, Besuch usw."
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Buchungssätze {0} sind nicht verknüpft
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung jeglicher Kommunikation vom Typ Email, Telefon, Chat, Besuch usw."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
 DocType: Purchase Invoice,Terms,Geschäftsbedingungen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Neuen Eintrag erstellen
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Neuen Eintrag erstellen
 DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich
 ,Item-wise Sales History,Artikelbezogene Verkaufshistorie
 DocType: Expense Claim,Total Sanctioned Amount,Summe genehmigter Beträge
 ,Purchase Analytics,Einkaufsanalyse
 DocType: Sales Invoice Item,Delivery Note Item,Lieferschein-Artikel
 DocType: Expense Claim,Task,Aufgabe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasieren
-DocType: Purchase Taxes and Charges,Reference Row #,Referenz-Spalte #
+DocType: Purchase Taxes and Charges,Reference Row #,Referenz-Zeile #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dies ist ein Root-Verkäufer und kann nicht bearbeitet werden.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dies ist ein Root-Vertriebsmitarbeiter und kann nicht bearbeitet werden.
 ,Stock Ledger,Lagerbuch
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Bewerten: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Preis: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Abzug auf der Gehaltsabrechnung
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Hinweise
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Zuerst einen Gruppenknoten wählen.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formular ausfüllen und speichern
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Einen Bericht herunterladen, der das gesamte Rohmaterial mit seinem neuesten Bestandsstatus angibt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Zugewandt
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
-DocType: Leave Application,Leave Balance Before Application,Urlaubskonto vor Anwendung
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community-Forum
+DocType: Leave Application,Leave Balance Before Application,Urlaubstage vor Antrag
 DocType: SMS Center,Send SMS,SMS senden
 DocType: Company,Default Letter Head,Standardbriefkopf
 DocType: Time Log,Billable,Abrechenbar
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dies wird für die Festlegung der Regel im Personal-Modul verwendet
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Nachbestellmenge
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
@@ -2707,32 +2492,29 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity verloren
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabattfelder stehen in  Lieferantenauftrag, Kaufbeleg und in der Eingangsrechnung zur Verfügung"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen
-DocType: Report,Report Type,Berichtstyp
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ladevorgang läuft
 DocType: BOM Replace Tool,BOM Replace Tool,Stücklisten-Austauschwerkzeug
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landesspezifische Standard-Adressvorlagen
-DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert nach Kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Steuern anzeigen Break-up
+DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Steuerverteilung anzeigen
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den  Fertigungshandlungen, ""Eigenfertigung"" aktivieren."
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Bei eigener Beteiligung an den  Fertigungsaktivitäten, ""Eigenfertigung"" aktivieren."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Rechnungsbuchungsdatum
 DocType: Sales Invoice,Rounded Total,Gerundete Gesamtsumme
 DocType: Product Bundle,List items that form the package.,"Die Artikel auflisten, die das Paket bilden."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 DocType: Purchase Order Item,Material Request Detail No,Detailnr. der Materialanfrage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hartdrehen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Wartungsbesuch erstellen
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
 DocType: Company,Default Cash Account,Standardkassenkonto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + Abschreibungsbetrag kann nicht größer als Gesamtsumme sein
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag kann nicht größer als Gesamtsumme sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Hinweis: Wenn die Zahlung nicht mit einer Referenz abgeglichen werden kann, bitte Journalbuchung manuell erstellen."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Hinweis: Wenn die Zahlung nicht mit einer Referenz abgeglichen werden kann, bitte Buchungssatz manuell erstellen."
 DocType: Item,Supplier Items,Lieferantenartikel
 DocType: Opportunity,Opportunity Type,Opportunity-Typ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Neue Firma
@@ -2743,65 +2525,57 @@
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Versenden von Transaktionen automatisch E-Mails an Kontakte senden.
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Beim Übertragen von Transaktionen automatisch E-Mails an Kontakte senden.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Zeile {0}: Menge nicht im Lager {1} auf {2} {3} verfügbar. Verfügbare Menge: {4}, Übertragsmenge: {5}"
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Artikel 3
-DocType: Purchase Order,Customer Contact Email,Kundenservice Kontakt per E-Mail
-DocType: Event,Sunday,Sonntag
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Position 3
+DocType: Purchase Order,Customer Contact Email,Kontakt-E-Mail des Kunden
 DocType: Sales Team,Contribution (%),Beitrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Hinweis: Zahlungsbuchung wird nicht erstellt, da kein ""Kassen- oder Bankkonto"" angegeben wurde"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwortung
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Bitte mindestens eine Rechnung in die Tabelle eingeben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Benutzer hinzufügen
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Benutzer hinzufügen
 DocType: Pricing Rule,Item Group,Artikelgruppe
 DocType: Task,Actual Start Date (via Time Logs),Tatsächliches Start-Datum (über Zeitprotokoll)
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
 DocType: Item,Default BOM,Standardstückliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambern
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Time Log Batch,Total Hours,Summe der Stunden
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fahrzeugbau
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metallspritzguss
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fahrzeugbau
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Von Lieferschein
-DocType: Time Log,From Time,Von Zeit
+DocType: Time Log,From Time,Von-Zeit
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment-Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Bitte Land, Zeitzone und Währung auswählen"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Beizen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandguss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisierung
-DocType: Purchase Invoice Item,Rate,Satz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Praktikant
+DocType: Purchase Invoice Item,Rate,Preis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Praktikant
 DocType: Newsletter,A Lead with this email id should exist,Ein Lead mit dieser E-Mail-Kennung sollte existieren
 DocType: Stock Entry,From BOM,Von Stückliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Für halbe Urlaubstage sollten Von-Datum und Bis-Datum gleich sein
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
 DocType: Salary Structure,Salary Structure,Gehaltsstruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",Es existieren mehrere Preisregeln mit denselben Kriterien. Bitte diesen Konflikt durch Vergabe von Vorrangregelungen lösen. Preisregeln: {0}
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Ausgabe-Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material ausgeben
 DocType: Material Request Item,For Warehouse,Für Lager
 DocType: Employee,Offer Date,Angebotsdatum
 DocType: Hub Settings,Access Token,Zugriffstoken
@@ -2810,162 +2584,143 @@
 DocType: Item,Is Fixed Asset Item,Ist Posten des Anlagevermögens
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Wenn lange Druckformate auftreten, kann diese Funktion verwendet werden, um die Seite so aufzuteilen, dass sie auf mehreren Seiten mit jeweils allen Kopf- und Fußzeilen ausgedruckt wird"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Wälzfräsen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle Regionen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle Regionen
 DocType: Purchase Invoice,Items,Artikel
 DocType: Fiscal Year,Year Name,Name des Jahrs
 DocType: Process Payroll,Process Payroll,Gehaltsabrechnung bearbeiten
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
 DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle-Artikel
 DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners
 DocType: Purchase Invoice Item,Image View,Bildansicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Endbearbeitung & industrielle Veredelung
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Von- und Bis-Daten erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Wertpapier- & Rohstoffbörsen
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bohrung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blasformen
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
 DocType: Tax Rule,Shipping City,Zielstadt der Lieferung
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
-DocType: Account,Purchase User,Einkaufs-Benutzer
+DocType: Account,Purchase User,Nutzer Einkauf
 DocType: Notification Control,Customize the Notification,Mitteilungstext anpassen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hämmern
-DocType: Web Page,Slideshow,Diaschau
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
 DocType: Sales Invoice,Shipping Rule,Versandregel
-DocType: Journal Entry,Print Heading,Briefkopf drucken
-DocType: Quotation,Maintenance Manager,Wartungsleiter
-DocType: Workflow State,Search,Suchen
+DocType: Journal Entry,Print Heading,Druckkopf
+DocType: Quotation,Maintenance Manager,Leiter der Instandhaltung
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Summe kann nicht Null sein
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Tage seit dem letzten Auftrag"" muss größer oder gleich Null sein"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Löten
 DocType: C-Form,Amended From,Abgeändert von
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Rohmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entweder Zielstückzahl oder Zielmenge ist zwingend erforderlich
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Bitte wählen Sie zuerst Buchungsdatum
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum sein
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
 ,Produced,Produziert
 DocType: Item,Item Code for Suppliers,Artikelnummer für Lieferanten
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Allgemein
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Briefkopf anhängen
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Allgemein
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Briefkopf anhängen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Bewertung"" oder ""Bewertung und Summe"" ist"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Steuern (z. B. Mehrwertsteuer, Zoll, usw.; bitte möglichst eindeutige Bezeichnungen vergeben) und die zugehörigen Steuersätze auflisten. Dies erstellt eine Standardvorlage, die bearbeitet und später erweitert werden kann."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Steuern (z. B. Mehrwertsteuer, Zoll, usw.; bitte möglichst eindeutige Bezeichnungen vergeben) und die zugehörigen Steuersätze auflisten. Dies erstellt eine Standardvorlage, die bearbeitet und später erweitert werden kann."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 DocType: Journal Entry,Bank Entry,Bankbuchung
-DocType: Authorization Rule,Applicable To (Designation),Anwendbar auf (Bestimmung)
-DocType: Blog Post,Blog Post,Blog-Eintrag
+DocType: Authorization Rule,Applicable To (Designation),Anwenden auf (Bezeichnung)
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppieren nach
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen.
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivieren / Deaktivieren der Währungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portoaufwendungen
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Summe (Betrag)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Purchase Order,The date on which recurring order will be stop,Das Datum an dem die sich wiederholende Bestellung endet
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} muss um {1} reduziert werden, oder die Überlauftoleranz sollte erhöht werden"
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Gegenwartswerte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Summe Anwesend
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Stunde
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Material dem Lieferanten übergeben
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Material dem Lieferanten übergeben
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Typ des Leads
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Angebot erstellen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
 DocType: Features Setup,Point of Sale,Verkaufsstelle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Einrollen
 DocType: Account,Tax,Steuer
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Veredelung
-DocType: Production Planning Tool,Production Planning Tool,Planungswerkzeug zur Fertigung
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Zeile {0}: {1} ist keine gültige {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Von Produkt-Bundle
+DocType: Production Planning Tool,Production Planning Tool,Werkzeug zur Fertigungsplanung
 DocType: Quality Inspection,Report Date,Berichtsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Rechnungen
 DocType: Job Opening,Job Title,Stellenbezeichnung
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} bereits für Employee {1} für Zeitraum zugeteilt {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Empfänger
 DocType: Features Setup,Item Groups in Details,Detaillierte Artikelgruppen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Point-of-Sale (POS) starten
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag.
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag
 DocType: Stock Entry,Update Rate and Availability,Preis und Verfügbarkeit aktualisieren
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zur bestellten Menge zusätzlich zulässiger Prozentsatz, der angenommen oder geliefert werden kann. Beispiel: Wenn 100 Einheiten bestellt wurden, und die erlaubte Spanne 10 % beträgt, dann können 110 Einheiten angenommen werden."
 DocType: Pricing Rule,Customer Group,Kundengruppe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: Item,Website Description,Webseiten-Beschreibung
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
 ,Sales Register,Übersicht über den Umsatz
 DocType: Quotation,Quotation Lost Reason,Grund des verlorenen Angebotes
 DocType: Address,Plant,Fabrik
-DocType: DocType,Setup,Einstellungen
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zusammenfassung für diesen Monat und anstehende Aktivitäten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kaltwalzen
 DocType: Customer Group,Customer Group Name,Kundengruppenname
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertrag"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Item,Attributes,Attribute
-DocType: Packing Slip,Get Items,Artikel aufrufen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Letztes Bestelldatum
-DocType: DocField,Image,Bild
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Verbrauchssteuerrechnung erstellen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
-DocType: Communication,Other,Sonstige(s)
 DocType: C-Form,C-Form,Kontakt-Formular
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Arbeitsgang-ID nicht gesetzt
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Serviceeinsatz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Wartungsbesuch
 DocType: Leave Type,Is Encash,Ist Inkasso
 DocType: Purchase Invoice,Mobile No,Mobilfunknummer
-DocType: Payment Tool,Make Journal Entry,Journalbuchung erstellen
+DocType: Payment Tool,Make Journal Entry,Buchungssatz erstellen
 DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Werbung
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Werbung
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 DocType: Cost Center,Distribution Id,Verteilungs-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen.
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Beeindruckende Dienstleistungen
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Purchase Invoice,Supplier Address,Lieferantenadresse
-DocType: Contact Us Settings,Address Line 2,Adresse Zeile 2
-DocType: ToDo,Reference,Referenz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforieren
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ausgabe-Menge
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanzdienstleistungen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wert des Attributs {0} muss innerhalb des Bereichs von {1} bis {2} mit Schrittweite {3} liegen
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
-DocType: Leave Allocation,Unused leaves,Unbenutzte Blättern
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+DocType: Leave Allocation,Unused leaves,Ungenutzter Urlaub
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard-Forderungskonten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sägearbeiten
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminieren
 DocType: Item Reorder,Transfer,Übertragung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
-DocType: Authorization Rule,Applicable To (Employee),Anwendbar auf (Mitarbeiter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterverfahren
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Supplier,Contact HTML,Kontakt-HTML
@@ -2976,74 +2731,67 @@
 DocType: Company,Retail,Einzelhandel
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunden {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
-DocType: Product Bundle,Product Bundle,Produkt-Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Ungültige Referenz {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zerkleinerung
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -gebühren
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vorlage für Einkaufssteuern und -abgaben
 DocType: Upload Attendance,Download Template,Vorlage herunterladen
 DocType: GL Entry,Remarks,Bemerkungen
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 DocType: Features Setup,POS View,Verkaufsstellen-Ansicht
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Strangguss
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Bitte angeben
 DocType: Offer Letter,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Über
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kaltschlicht-Verfahren
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kann keine Gruppe sein
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
 DocType: Holiday List,Weekly Off,Wöchentlich frei
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für z. B. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Vorläufiger Gewinn / Verlust (Haben)
 DocType: Sales Invoice,Return Against Sales Invoice,Zurück zur Kundenrechnung
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Artikel 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Bitte Standardwert {0} in Firma {1} setzen
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Position 5
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Bitte Standardwert {0} in Firma {1} setzen
 DocType: Serial No,Creation Time,Erstellungszeit
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Gesamtumsatz
 DocType: Sales Invoice,Product Bundle Help,Produkt-Bundle-Hilfe
 ,Monthly Attendance Sheet,Monatliche Anwesenheitsliste
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kein Datensatz gefunden
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} ist inaktiv
 DocType: GL Entry,Is Advance,Ist Vorkasse
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Anwesenheit ab Datum"" und ""Anwesenheit bis Datum"" sind zwingend"
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Bitte bei ""Untervergeben"" JA oder NEIN eingeben"
 DocType: Sales Team,Contact No.,Kontakt-Nr.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Konto vom Typ ""Gewinn und Verlust"" {0} ist in einer Eröffnungsbuchung nicht erlaubt"
-DocType: Workflow State,Time,Zeit
 DocType: Features Setup,Sales Discounts,Verkaufsrabatte
 DocType: Hub Settings,Seller Country,Land des Verkäufers
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel
 DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -gebühren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -abgaben
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nummer der Bestellung
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML/Banner, das oben auf der Produktliste angezeigt wird."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Bedingungen zur Berechnung der Versandkosten angeben
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Unterpunkt hinzufügen
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle darf Konten sperren und gesperrte Buchungen bearbeiten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Umrechnungsfaktor wird benötigt
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serien #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provision auf den Umsatz
 DocType: Offer Letter Term,Value / Description,Wert / Beschreibung
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
 ,Customers Not Buying Since Long Time,"Kunden, die seit langer Zeit nichts gekauft haben"
-DocType: Production Order,Expected Delivery Date,Voraussichtlicher Liefertermin
+DocType: Production Order,Expected Delivery Date,Geplanter Liefertermin
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Prall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Vollformgießen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Bewirtungskosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alter
 DocType: Time Log,Billing Amount,Rechnungsbetrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Urlaubsanträge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rechtskosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Der Tag des Monats, an dem eine automatische Bestellung erzeugt wird, z. B. 05, 28 usw."
 DocType: Sales Invoice,Posting Time,Buchungszeit
@@ -3056,27 +2804,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Direkte Aufwendungen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Neuer Kundenumsatz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reisekosten
-DocType: Maintenance Visit,Breakdown,Übersicht
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
+DocType: Maintenance Visit,Breakdown,Ausfall
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Zum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ziehschleifen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probezeit
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
-DocType: Feed,Full Name,Vollständiger Name
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Falzen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probezeit
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard-Lager ist für Lagerartikel zwingend notwendig.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Zahlung des Gehalts für Monat {0} und Jahre {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 ,Transferred Qty,Übergebene Menge
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigieren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planung
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Zeitprotokollstapel erstellen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Ausgestellt
-DocType: Project,Total Billing Amount (via Time Logs),Gesamtrechnungsbetrag (über Zeitprotokolle)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Wir verkaufen diesen Artikel
+DocType: Project,Total Billing Amount (via Time Logs),Gesamtumsatz (über Zeitprotokolle)
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Wir verkaufen diesen Artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Lieferanten-ID
 DocType: Journal Entry,Cash Entry,Kassenbuchung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
@@ -3085,19 +2830,17 @@
 DocType: Brand,Item Manager,Artikel-Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Zeilen hinzufügen um Jahresbudgets in Konten festzulegen.
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Abbau
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle Kontakte
 DocType: Newsletter,Test Email Id,E-Mail-ID testen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firmenkürzel
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firmenkürzel
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Wenn eine Qualitätskontrolle durchgeführt werden soll, werden im Kaufbeleg die Punkte ""Qualitätssicherung benötigt"" und ""Qualitätssicherung Nr."" aktiviert"
 DocType: GL Entry,Party Type,Gruppen-Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
 DocType: Item Attribute Value,Abbreviation,Abkürzung
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsformverfahren
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Stammdaten zur Gehaltsvorlage.
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Steuerregel für Einkaufswagen
 DocType: Payment Tool,Set Matching Amounts,Passende Beträge einstellen
@@ -3107,18 +2850,18 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Wagen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Vielen Dank für Ihr Interesse an einem Abonnement unserer Aktualisierungen
 ,Qty to Transfer,Zu versendende Menge
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Angebote an Leads oder Kunden.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Eltern-Konto {1} existiert nicht
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
 DocType: Account,Temporary,Temporär
 DocType: Address,Preferred Billing Address,Bevorzugte Rechnungsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretärin
 DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels
 DocType: Pricing Rule,Buying,Einkauf
 DocType: HR Settings,Employee Records to be created by,Mitarbeiter-Datensätze werden erstellt nach
@@ -3126,117 +2869,106 @@
 ,Reqd By Date,Benötigt nach Datum
 DocType: Salary Slip Earning,Salary Slip Earning,Verdienst laut Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Gläubiger
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Seriennummer ist obligatorisch
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-Details
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
 DocType: Purchase Order Item,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bügeln
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ist beendet
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
 DocType: Lead,Add to calendar on this date,Zu diesem Datum in Kalender einfügen
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten.
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende Veranstaltungen
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet
-DocType: Letter Head,Letter Head,Briefkopf
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Schnelleingabe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,"{0} ist zwingend für ""Zurück"""
 DocType: Purchase Order,To Receive,Um zu empfangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Schrumpftechnik
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Einnahmen/Ausgaben
 DocType: Employee,Personal Email,Persönliche E-Mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Gesamtabweichung
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Gesamtabweichung
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, bucht das System Bestandsbuchungen automatisch."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Maklerprovision
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Maklerprovision
 DocType: Address,Postal Code,Postleitzahl
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
 DocType: Customer,From Lead,Von Lead
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen.
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Für die Produktion freigegebene Bestellungen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Hub Settings,Name Token,Kürzel benennen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hobeln
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard-Vertrieb
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard-Vertrieb
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Mindestens ein Lager ist zwingend erforderlich
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Replace Tool,Replace,Ersetzen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Bitte die Standardmaßeinheit eingeben
 DocType: Purchase Invoice Item,Project Name,Projektname
 DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
-DocType: Workflow State,Edit,Bearbeiten
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
 DocType: Features Setup,Item Batch Nos,Artikel-Chargennummern
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
 apps/erpnext/erpnext/config/learn.py +204,Human Resource,Personal
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Zahlung zum Zahlungsabgleich
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Steueransprüche
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Steuerguthaben
 DocType: BOM Item,BOM No,Stücklisten-Nr.
-DocType: Contact Us Settings,Pincode,Postleitzahl (PLZ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalbuchung {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Neue Lagermaßeinheit muss sich von aktueller Lagermaßeinheit unterscheiden
 DocType: Account,Debit,Soll
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Abwesenheiten müssen ein Vielfaches von 0,5 sein"
 DocType: Production Order,Operation Cost,Kosten eines Arbeitsgangs
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Anwesenheiten aus einer CSV-Datei hochladen
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Offener Betrag
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen.
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diese Anfrage zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden."
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Um diesen Fall zuzuweisen, bitte die Schaltfläche ""Zuweisen"" auf der Seitenleiste verwenden."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht
 DocType: Currency Exchange,To Currency,In Währung
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können."
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Art der Spesenabrechnung
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Arten der Aufwandsabrechnung
 DocType: Item,Taxes,Steuern
 DocType: Project,Default Cost Center,Standardkostenstelle
 DocType: Purchase Invoice,End Date,Enddatum
 DocType: Employee,Internal Work History,Interne Arbeits-Historie
-DocType: DocField,Column Break,Spaltenumbruch
-DocType: Event,Thursday,Donnerstag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Drehen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
-DocType: Account,Expense,Ausgabe
+DocType: Account,Expense,Kosten
 DocType: Sales Invoice,Exhibition,Messe
 DocType: Item Attribute,From Range,Von-Bereich
 apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,"Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung absenden.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Diesen Fertigungsauftrag für die weitere Verarbeitung übertragen.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Preisregeln in einer bestimmten Transaktion nicht zu verwenden, sollten alle geltenden Preisregeln deaktiviert sein."
 DocType: Company,Domain,Domäne
-,Sales Order Trends,Trendanalyse Kundenaufträge
+,Sales Order Trends,Kundenauftragstrends
 DocType: Employee,Held On,Festgehalten am
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions-Artikel
 ,Employee Information,Mitarbeiterinformationen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Satz (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Preis (%)
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Enddatum des Geschäftsjahres
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verdienst für unbezahlten Urlaub (LWP) vermindern
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Seriennummer {1} nicht mit übereinstimmen {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Ungeplante Abwesenheit
 DocType: Batch,Batch ID,Chargen-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Hinweis: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Zusammenfassung dieser Woche
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} muss ein gekaufter oder unterbeauftragter Artikel in Zeile {1} sein
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
 DocType: GL Entry,Party,Gruppe
 DocType: Sales Order,Delivery Date,Liefertermin
-DocType: DocField,Currency,Währung
 DocType: Opportunity,Opportunity Date,Datum der Opportunity
 DocType: Purchase Receipt,Return Against Purchase Receipt,Zurück zum Kaufbeleg
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% Bestellt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkordarbeit
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
@@ -3250,80 +2982,71 @@
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Anlagen und Maschinen
 DocType: Sales Partner,Partner's Website,Webseite des Partners
-DocType: Opportunity,To Discuss,Zur Diskussion
+DocType: Opportunity,To Discuss,Infos zur Diskussion
 DocType: SMS Settings,SMS Settings,SMS-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Temporäre Konten
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Schwarz
-DocType: BOM Explosion Item,BOM Explosion Item,Position der Stücklistenauflösung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Schwarz
+DocType: BOM Explosion Item,BOM Explosion Item,Position der aufgelösten Stückliste
 DocType: Account,Auditor,Prüfer
 DocType: Purchase Order,End date of current order's period,Schlußdatum der laufenden Bestellperiode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Angebotsschreiben erstellen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Zurück
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
-DocType: DocField,Fold,Falz
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standard-Maßeinheit muss für eine Variante die gleiche wie für eine Vorlage sein
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Bitte angeben
-DocType: Task,Total Expense Claim (via Expense Claim),Gesamtforderungen auf Spesen (über Spesenabrechnung)
+DocType: Task,Total Expense Claim (via Expense Claim),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnung)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunden-ID
-DocType: Page,Page Name,Seitenname
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Bis-Zeit muss nach Von-Zeit liegen
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht versendet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindelverarbeitung
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert
 DocType: Project Task,Task ID,Aufgaben-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","z. B. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","z. B. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Für Artikel {0} kann es kein Lager geben, da es Varianten gibt"
 ,Sales Person-wise Transaction Summary,Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen
-DocType: System Settings,Time Zone,Zeitzone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Lager {0} existiert nicht
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Für ERPNext Hub anmelden
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% der für diesen Lieferschein gelieferten Materialien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Heften
 DocType: Customer,Customer Details,Kundendaten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Gestaltung
 DocType: Employee,Reports to,Berichte an
 DocType: SMS Settings,Enter url parameter for receiver nos,URL-Parameter für Empfängernummern eingeben
 DocType: Sales Invoice,Paid Amount,Gezahlter Betrag
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Abschlusskonto {0} muss vom Typ ""Verbindlichkeit"" sein"
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Qualitätsmanagement
 DocType: Production Planning Tool,Filter based on customer,Filtern nach Kunden
 DocType: Payment Tool Detail,Against Voucher No,Gegenbeleg-Nr.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
 DocType: Tax Rule,Purchase,Einkauf
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanzmenge
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanzmenge
 DocType: Item Group,Parent Item Group,Übergeordnete Artikelgruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} für {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostenstellen
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Lager.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Lager
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1}
 DocType: Opportunity,Next Contact,Nächster Kontakt
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Beantragter Zeitraum kann sich nicht über zwei Antragsdatensätze erstrecken
 DocType: Item Group,Default Expense Account,Standardaufwandskonto
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
-DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
 DocType: Employee,Encashment Date,Inkassodatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanotechnik
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","""Gegenbeleg"" muss entweder eine Bestellung, eine Einkaufsrechnung oder eine Journalbuchung sein"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","""Gegenbeleg"" muss entweder ein Lieferantenauftrag, eine Eingangsrechnung oder eine Journalbuchung sein"
 DocType: Account,Stock Adjustment,Bestandskorrektur
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Es gibt Standard-Aktivitätskosten für Aktivitätsart - {0}
 DocType: Production Order,Planned Operating Cost,Geplante Betriebskosten
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Neuer {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Bitte Anhang beachten {0} #{1}
 DocType: Job Applicant,Applicant Name,Bewerbername
 DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3336,10 +3059,9 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Seriennummer ist für Artikel {0} zwingend erforderlich
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Erstellt von
-DocType: Serial No,Under AMC,Unter jährlichem Wartungsvertrag
+DocType: Serial No,Under AMC,Innerhalb des jährlichen Wartungsvertrags
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen.
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen
 DocType: BOM Replace Tool,Current BOM,Aktuelle Stückliste
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Seriennummer hinzufügen
 DocType: Production Order,Warehouses,Lager
@@ -3348,26 +3070,25 @@
 DocType: Payment Reconciliation,Minimum Amount,Mindestbetrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Fertigwaren aktualisieren
 DocType: Workstation,per hour,pro stunde
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} bereits verwendet in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zahlbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Versand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektleiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
 DocType: Customer,Default Taxes and Charges,Standard-Steuern und -Abgaben
 DocType: Account,Receivable,Forderung
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nicht erlaubt den Lieferanten zu wechseln, wie Bestellung bereits vorhanden"
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, die Zahlungen, die das gesetzte Kreditlimit überschreiten, durchführen darf."
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist"
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
 DocType: Sales Invoice,Supplier Reference,Referenznummer des Lieferanten
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Wenn aktiviert, wird die Stückliste für Unterbaugruppen-Artikel berücksichtigt, um Rohmaterialien zu bekommen. Andernfalls werden alle Unterbaugruppen-Artikel als Rohmaterial behandelt."
 DocType: Material Request,Material Issue,Materialentnahme
 DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
 DocType: Employee Education,Qualification,Qualifikation
 DocType: Item Price,Item Price,Artikelpreis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Reinigungsmittel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Reinigungsmittel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
@@ -3376,40 +3097,37 @@
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support-Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Firma fehlt in Lägern {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Werkzeug zum Ersetzen der Bestandsmaßeinheit
 DocType: POS Profile,Terms and Conditions,Allgemeine Geschäftsbedingungen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Bis-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, dass Bis-Datum = {0} ist"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 DocType: Leave Block List,Applies to Company,Gilt für Firma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil versandte Lagerbuchung {0} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
 DocType: Purchase Invoice,In Words,In Worten
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialanfrage für Lager
 DocType: Sales Order Item,For Production,Für die Produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Bitte den Kundenauftrag in die obige Tabelle eingeben
 DocType: Project Task,View Task,Aufgabe anzeigen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ihr Geschäftsjahr beginnt am
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ihr Geschäftsjahr beginnt am
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Bitte Kaufbelege eingeben
 DocType: Sales Invoice,Get Advances Received,Erhaltene Anzahlungen aufrufen
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Posteingangsserver für E-Mail-ID Support einrichten. (z. B. support@example.com)
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),E-Mail-Adresse für den Support einrichten. (z. B. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polieren
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
 DocType: Sales Invoice Item,Sales Order Item,Kundenauftrags-Artikel
 DocType: Salary Slip,Payment Days,Zahlungsziel
 DocType: BOM,Manage cost of operations,Arbeitsgangkosten verwalten
 DocType: Features Setup,Item Advanced,Erweiterter Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Warmwalzen
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der ausgewählten Transaktionen den Status ""versendet"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der ausgewählten Transaktionen den Status ""übertragen"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Allgemeine Einstellungen
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Es ist notwendig, um zu holen Item Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
 DocType: Salary Slip,Net Pay,Nettolohn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
@@ -3417,36 +3135,29 @@
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
 DocType: Expense Claim,Total Claimed Amount,Summe des geforderten Betrags
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunities für den Vertrieb.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mögliche Opportunities für den Vertrieb
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ungültige(r) {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Krankheitsbedingte Abwesenheit
 DocType: Email Digest,Email Digest,Täglicher E-Mail-Bericht
 DocType: Delivery Note,Billing Address Name,Name der Rechnungsadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Kaufhäuser
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System-Bilanz
-DocType: Workflow,Is Active,Ist aktiv(iert)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaufhäuser
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System-Bilanz
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Verschleifen
 DocType: Company,Change Abbreviation,Abkürzung ändern
-DocType: Workflow State,Primary,Primär
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
 DocType: Item,Max Discount (%),Maximaler Rabatt (%)
-DocType: Communication,More Information,Mehr Informationen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Letzter Bestellbetrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Abstrahlen
 DocType: Company,Warn,Warnen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Artikelbewertung aktualisiert
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
-DocType: BOM,Manufacturing User,Fertigungs-Benutzer
+DocType: BOM,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Order,Raw Materials Supplied,Gelieferte Rohmaterialien
 DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
-DocType: Communication,Series,Serie
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum der Bestellung liegen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Lieferantenauftrags liegen
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
-DocType: Communication,Email,E-Mail
 DocType: Item Group,Item Classification,Artikeleinteilung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Leiter der kaufmännischen Abteilung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Leiter der kaufmännischen Abteilung
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Zweck des Wartungsbesuchs
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,Hauptbuch
@@ -3456,9 +3167,7 @@
 ,Itemwise Recommended Reorder Level,Vorgeschlagener artikelbezogener Meldebestand
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Bitte zuerst {0} auswählen
 DocType: Features Setup,To get Item Group in details table,Wird verwendet um eine detaillierte Tabelle der Artikelgruppe zu erhalten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Neuzeichnen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ätztechnik
 DocType: Sales Invoice,Commission,Provision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3484,7 +3193,7 @@
  {% if email_id%} E-Mail: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Standard-Betrag
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Lager im System nicht gefunden
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Lager im System nicht gefunden
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Zusammenfassung dieses Monats
 DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
@@ -3492,25 +3201,24 @@
 ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel)
-DocType: Item Customer Detail,Ref Code,Ref-Kode
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Mitarbeiterdatensätze.
+DocType: Item Customer Detail,Ref Code,Ref-Code
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Mitarbeiterdatensätze
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen.
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Bestellung aufgeben
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Root kann keine übergeordnete Kostenstelle haben
 apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Marke auswählen ...
-DocType: Sales Invoice,C-Form Applicable,Kontakt-Formular geeignet
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss größer als 0 für die Operation {0}
+DocType: Sales Invoice,C-Form Applicable,Anwenden auf Kontakt-Formular
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg mit jedem Artikel abgeglichen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert
 DocType: Payment Tool,Get Outstanding Vouchers,Offene Posten aufrufen
-DocType: Warranty Claim,Resolved By,Gelöst von
+DocType: Warranty Claim,Resolved By,Beschlossen von
 DocType: Appraisal,Start Date,Startdatum
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Wert
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen.
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Hier klicken um die Richtigkeit zu bestätigen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
 DocType: Purchase Invoice Item,Price List Rate,Preisliste
@@ -3519,55 +3227,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Durchschnittliche Lieferzeit des Lieferanten
 DocType: Time Log,Hours,Stunden
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Walzen
-DocType: ToDo,Priority,Priorität
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechtet werden können"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox-Zugang erlaubt
-DocType: Dropbox Backup,Weekly,Wöchentlich
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Erhalten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Empfangen
 DocType: Maintenance Visit,Fully Completed,Vollständig abgeschlossen
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% abgeschlossen
 DocType: Employee,Educational Qualification,Schulische Qualifikation
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} wurde erfolgreich zu unserer Newsletter-Liste hinzugefügt.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenstrahlbearbeitung
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Fertigungsauftrag {0} muss versendet werden
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hauptberichte
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Buchungen auf Konten des Lagerbuchs wurden aktualisiert
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hauptberichte
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Preise hinzufügen / bearbeiten
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Übersicht der Kostenstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kostenstellenplan
 ,Requested Items To Be Ordered,"Angeforderte Artikel, die bestellt werden sollen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meine Bestellungen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meine Bestellungen
 DocType: Price List,Price List Name,Preislistenname
 DocType: Time Log,For Manufacturing,Für die Herstellung
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Summen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Summen
 DocType: BOM,Manufacturing,Fertigung
 ,Ordered Items To Be Delivered,"Bestellte Artikel, die geliefert werden müssen"
 DocType: Account,Income,Einkommen
-,Setup Wizard,Setup-Assistent
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Etwas ist schiefgelaufen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits versendet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fertigstellungstermin
 DocType: Purchase Invoice Item,Amount (Company Currency),Betrag (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Druckguss
-DocType: Email Alert,Reference Date,Referenzdatum
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung).
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Bitte gültige Mobilnummern eingeben
 DocType: Budget Detail,Budget Detail,Budget-Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Bitte eine Nachricht vor dem Versenden eingeben
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Lagermaßeinheit für Artikel {0} aktualisiert
-DocType: Company History,Year,Jahr
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Zeitprotokoll {0} bereits abgerechnet
@@ -3576,90 +3272,86 @@
 DocType: Maintenance Schedule Detail,Scheduled Date,Geplantes Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Summe gezahlte Beträge
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt
-DocType: Purchase Receipt Item,Received and Accepted,Erhalten und akzeptiert
+DocType: Purchase Receipt Item,Received and Accepted,Erhalten und bestätigt
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zur Seriennummer
 DocType: Item,Unit of Measure Conversion,Maßeinheit-Konvertierung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Mitarbeiter kann nicht verändert werden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
 DocType: Naming Series,Help HTML,HTML-Hilfe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zustimmung für Artikel {1} bei Überschreitung von {0}
 DocType: Address,Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ihre Lieferanten
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Ihre Lieferanten
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Eine andere Gehaltsstruktur {0} ist für diesen Mitarbeiter {1} aktiv. Bitte setzen Sie dessen Status auf ""inaktiv"" um fortzufahren."
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Erhalten von
 DocType: Features Setup,Exports,Exporte
 DocType: Lead,Converted,umgewandelt
-DocType: Item,Has Serial No,Seriennummer vorhanden
+DocType: Item,Has Serial No,Hat Seriennummer
 DocType: Employee,Date of Issue,Ausstellungsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Von {0} für {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Stellen Lieferant für Artikel {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
 DocType: Issue,Content Type,Inhaltstyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Rechner
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Bitte die Option Mehrfachwährung aktivieren um Konten mit anderen Währungen zu erlauben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Bitte die Option ""Unterschiedliche Währungen"" aktivieren um Konten mit anderen Währungen zu erlauben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nicht zugeordnete Buchungen aufrufen
 DocType: Cost Center,Budgets,Budgets
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualisiert
 DocType: Employee,Emergency Contact Details,Notfallkontaktdaten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Unternehmenszweck
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Unternehmenszweck
 DocType: Delivery Note,To Warehouse,An Lager
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} wurde mehr als einmal für das Geschäftsjahr {1} erfasst
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zusatzkosten aktualisieren um die Einstandskosten des Artikels zu kalkulieren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektro
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Wechselkurs ist obligatorisch
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Strahlverfahren
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Von Garantieantrag
-DocType: Stock Entry,Default Source Warehouse,Standard-Ursprungslager
+DocType: Stock Entry,Default Source Warehouse,Standard-Ausgangslager
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Geburtstagserinnerung für {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Läppen
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Tage seit dem letzten Auftrag
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Urlaubssperrenliste Name
-DocType: User,Enabled,Aktiviert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} versenden
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wollen Sie wirklich alle Gehaltsabrechnungen für den Monat {0} im Jahr {1} übertragen
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import-Abonnenten
 DocType: Target Detail,Target Qty,Zielmenge
-DocType: Attendance,Present,Gegenwart
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht versendet werden
+DocType: Attendance,Present,Anwesend
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht übertragen werden
 DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechnung
-DocType: Authorization Rule,Based On,Beruht auf
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Abschlußkonto {0} muss vom Typ Verbindlichkeiten/Eigenkapital sein
+DocType: Authorization Rule,Based On,Basiert auf
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Zeitraum ab Periode auf Daten obligatorisch für wiederkehrende {0}
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekthandlung/Aufgabe
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Ab-Zeitraum und Bis-Zeitraum sind zwingend erforderlich für wiederkehrende {0}
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektaktivität/Aufgabe
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gehaltsabrechnungen generieren
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ist keine gültige E-Mail-Kennung
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss überprüft werden, wenn ""Anwendbar auf"" auf {0} gesetzt wurde"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
-DocType: ToDo,Low,Niedrig
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinnverfahren
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Bitte stellen Sie Neuordnungs Menge
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Bitte {0} setzen
-DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen am Tag des Monats
+DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
 DocType: Employee,Health Details,Gesundheitsdaten
 DocType: Offer Letter,Offer Letter Terms,Gültigkeit des Angebotsschreibens
 DocType: Features Setup,To track any installation or commissioning related work after sales,"Wird verwendet, um eine Installation oder eine mit Kommissionierung verbundene Arbeit nach dem Verkauf nachzuverfolgen"
 DocType: Project,Estimated Costing,Geschätzte Kosten
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Journalbuchungsdetail-Nr.
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Buchungssatz-Detail-Nr.
 DocType: Employee External Work History,Salary,Gehalt
 DocType: Serial No,Delivery Document Type,Lieferbelegtyp
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien absenden
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Alle Gehaltsabrechnungen für die oben gewählten Kriterien übertragen
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Artikel synchronisiert
 DocType: Sales Order,Partly Delivered,Teilweise geliefert
 DocType: Sales Invoice,Existing Customer,Bestehender Kunde
@@ -3670,7 +3362,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampagnenname ist erforderlich
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
 DocType: Purchase Receipt Item,Rejected Serial No,Abgelehnte Seriennummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Tiefziehverfahren
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Neuer Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Saldo anzeigen
@@ -3681,10 +3372,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Betrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nieten
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
 ,Sales Analytics,Vertriebsanalyse
-DocType: Manufacturing Settings,Manufacturing Settings,Produktionseinstellungen
+DocType: Manufacturing Settings,Manufacturing Settings,Fertigungseinstellungen
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,E-Mail einrichten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Bitte die Standardwährung in die Firmenstammdaten eingeben
 DocType: Stock Entry Detail,Stock Entry Detail,Lagerbuchungsdetail
@@ -3693,28 +3383,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Neuer Kontoname
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien
 DocType: Selling Settings,Settings for Selling Module,Einstellungen für das Vertriebsmodul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundenservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Email-Adresse bestätigen
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Einem Bewerber einen Arbeitsplatz anbieten.
-DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen beim Versand von
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Einem Bewerber einen Arbeitsplatz anbieten
+DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen bei der Übertragung von
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Die Gesamtmenge des beantragten Urlaubs übersteigt die Tage in der Periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ist erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumformen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanforderung liegen
-DocType: Contact Us Settings,City,Stadt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraschallbearbeitung
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fehler: Keine gültige ID?
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanfrage liegen
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} muss ein Verkaufsartikel sein
 DocType: Naming Series,Update Series Number,Seriennummer aktualisieren
 DocType: Account,Equity,Eigenkapital
 DocType: Sales Order,Printing Details,Druckdetails
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Unterbaugruppen suchen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
 DocType: Sales Partner,Partner Type,Partnertyp
@@ -3722,7 +3408,7 @@
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits versendet
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
 DocType: Quotation Item,Against Docname,Zu Dokumentenname
 DocType: SMS Center,All Employee (Active),Alle Mitarbeiter (Aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Jetzt ansehen
@@ -3730,133 +3416,118 @@
 DocType: BOM,Raw Material Cost,Rohmaterialkosten
 DocType: Item,Re-Order Level,Meldebestand
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Diagramm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Teilzeit
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie aktualisiert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Der erste Benutzer: Sie selbst!
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Der erste Benutzer: Sie selbst!
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Erfolgreich abgestimmt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Production Order,Planned End Date,Geplantes Enddatum
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ort an dem Artikel gelagert werden.
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ort an dem Artikel gelagert werden
 DocType: Tax Rule,Validity,Gültigkeit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rechnungsbetrag
 DocType: Attendance,Attendance,Anwesenheit
-DocType: Page,No,Nein
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen.
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Steuer-Vorlage für Einkaufstransaktionen
 ,Item Prices,Artikelpreise
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
 DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Preislisten-Stammdaten.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Preislisten-Vorlagen
 DocType: Task,Review Date,Überprüfungsdatum
 DocType: Purchase Invoice,Advance Payments,Anzahlungen
-DocType: DocPerm,Level,Ebene
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungsabgleichs-Werkzeug zu benutzen"
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mahlen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,"Keine Berechtigung, das Zahlungswerkzeug zu benutzen"
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
 DocType: Company,Round Off Account,Abschlusskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Verwaltungskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Beratung
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Beratung
 DocType: Customer Group,Parent Customer Group,Übergeordnete Kundengruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","z. B. ""Meine Firma GmbH"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Mitteilungsfrist
 DocType: Bank Reconciliation Detail,Voucher ID,Beleg-ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dies ist ein Root-Gebiet und kann nicht bearbeitet werden.
 DocType: Packing Slip,Gross Weight UOM,Bruttogewicht-Maßeinheit
 DocType: Email Digest,Receivables / Payables,Forderungen/Verbindlichkeiten
 DocType: Delivery Note Item,Against Sales Invoice,Zu Ausgangsrechnung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempeln
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Bankkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Nullwerte anzeigen
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Menge eines Artikels nach der Herstellung/dem Umpacken auf Basis vorgegebener Mengen von Rohmaterial
 DocType: Payment Reconciliation,Receivable / Payable Account,Forderungen-/Verbindlichkeiten-Konto
 DocType: Delivery Note Item,Against Sales Order Item,Zu Kundenauftrags-Position
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 DocType: Task,Actual End Date (via Time Logs),Tatsächliches Enddatum (über Zeitprotokoll)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Bitte übergeordnete Kostenstelle eingeben
 DocType: Delivery Note,Print Without Amount,Drucken ohne Betrag
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Wertberichtigung"" oder ""Wertberichtigung und Gesamtsumme"" sein, da keiner der Artikel ein Lagerartikel ist"
-DocType: User,Last Name,Familienname
-DocType: Web Page,Left,Links
-DocType: Event,All Day,Ganzer Tag
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Steuerkategorie kann nicht ""Wertberichtigung"" oder ""Wertberichtigung und Gesamtsumme"" sein, da keiner der Artikel ein Lagerartikel ist"
 DocType: Issue,Support Team,Support-Team
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
-DocType: Contact Us Settings,State,Bundesland/Kanton
 DocType: Batch,Batch,Charge
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
-DocType: Project,Total Expense Claim (via Expense Claims),Gesamtforderungen auf Spesen (über Spesenabrechnungen)
-DocType: User,Gender,Geschlecht
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Saldo
+DocType: Project,Total Expense Claim (via Expense Claims),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnungen)
 DocType: Journal Entry,Debit Note,Lastschrift
 DocType: Stock Entry,As per Stock UOM,Gemäß Lagermaßeinheit
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nicht ausgelaufen
 DocType: Journal Entry,Total Debit,Gesamt-Soll
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard-Fertigwarenlager
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Verkäufer
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Vertriebsmitarbeiter
 DocType: Sales Invoice,Cold Calling,Kaltakquise
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 DocType: Maintenance Schedule Item,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
-apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken.
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Urlaubstage und dies reduziert den Wert des Gehalts pro Tag."
 DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen
-DocType: Workflow State,User,Benutzer
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Gehaltsabrechnung verarbeiten
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,"Als ""verloren"" markieren"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Zahlungsnachweis
 DocType: Customer,Credit Days Based On,Zahlungsziel basierend auf
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits gesendet
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} wurde bereits übertragen
 ,Items To Be Requested,Anzufragende Artikel
-DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
-DocType: Time Log,Billing Rate based on Activity Type (per hour),Preis basierend auf Aktivitätsart (pro Stunde)
+DocType: Time Log,Billing Rate based on Activity Type (per hour),Rechnungsbetrag basierend auf Aktivitätsart (pro Stunde)
 DocType: Company,Company Info,Informationen über das Unternehmen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Nähverfahren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","ID der Firmen-E-Mail-Adresse wurde nicht gefunden, deshalb wird die E-Mail nicht gesendet"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 DocType: Production Planning Tool,Filter based on item,Filtern nach Artikeln
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Sollkonto
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
 DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 DocType: Purchase Common,Purchase Common,Einkauf Allgemein
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage zu machen."
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage einzureichen."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Von Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Stanzen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Vergünstigungen an Mitarbeiter
 DocType: Sales Invoice,Is POS,Ist POS (Point of Sales)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Hergestellte Menge
-DocType: Purchase Receipt Item,Accepted Quantity,Akzeptierte Menge
+DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rechnungen an Kunden
-DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Forderung {1} sein. Ausstehender Betrag ist {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} Empfänger hinzugefügt
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Budget für diese Kostenstelle definieren. Um das Budget wirksam werden zu lassen, bitte Unternehmensliste anschauen"
@@ -3867,70 +3538,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Expense Claim,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Instanz dieses Artikels eine eindeutige Identität zugeteilt, die in den Stammdaten der Seriennummern eingesehen werden kann."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
-DocType: Selling Settings,Campaign Naming By,Kampagne benannt durch
+DocType: Selling Settings,Campaign Naming By,Benennung der Kampagnen nach
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optional. Setzt Standardwährung des Unternehmens, falls nicht angegeben."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Optional. Stellt die Standardwährung des Unternehmens ein, falls nichts angegeben ist."
 DocType: Address,Office,Büro
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardberichte
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journalbuchungen
-DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl an ab Lager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Konto nicht mit übereinstimmen {1} / {2} in {3} {4}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto erstellen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Bitte das Aufwandskonto angeben
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Buchungssätze
+DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Um ein Steuerkonto zu erstellen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Chargenbestand
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Chargenbestand
 DocType: Employee,Contract End Date,Vertragsende
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Aufträge (deren Lieferung aussteht) entsprechend der oben genannten Kriterien abrufen
-DocType: DocShare,Document Type,Dokumententyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Von Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Von Lieferantenangebot
 DocType: Deduction Type,Deduction Type,Abzugsart
 DocType: Attendance,Half Day,Halbtags
 DocType: Pricing Rule,Min Qty,Mindestmenge
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Um Artikel in Verkaufs- und Einkaufsdokumenten mit Chargennummern zu verfolgen. ""Bevorzugte Branche: Chemische Produkte"""
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Geplante Menge
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Summe Steuern
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Summe Steuern
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Für Menge (hergestellte Menge) ist zwingend erforderlich
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anwendbar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anzuwenden
 DocType: Notification Control,Purchase Receipt Message,Kaufbeleg-Nachricht
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Aufteilbaren Gesamt Blätter sind mehr als Periode
 DocType: Production Order,Actual Start Date,Tatsächliches Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% der für diesen Kundenauftrag gelieferten Materialien
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lagerbewegung aufzeichnen.
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lagerbewegung aufzeichnen
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter-Abonnentenliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Einstemmen
-DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 ,Monthly Salary Register,Übersicht monatliche Gehälter
-apps/frappe/frappe/website/template.py +140,Next,Weiter
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolieren
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Auf vorherigen Zeilenbetrag
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Bitte in mindestens eine Zeile einen Zahlungsbetrag eingeben
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Bitte in mindestens eine Zeile einen Zahlungsbetrag eingeben
 DocType: POS Profile,POS Profile,Verkaufsstellen-Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Zeile {0}: Zahlungsbetrag kann nicht größer als Ausstehender Betrag sein
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Summe unbezahlt
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Summe Offene Beträge
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Zeitprotokoll ist nicht abrechenbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Käufer
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Käufer
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolohn kann nicht negativ sein
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Bitte die Gegenbelege manuell eingeben
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Bitte die Gegenbelege manuell eingeben
 DocType: SMS Settings,Static Parameters,Statische Parameter
 DocType: Purchase Order,Advance Paid,Voraus bezahlt
 DocType: Item,Item Tax,Artikelsteuer
@@ -3939,64 +3603,59 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Steuern oder Gebühren berücksichtigen für
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Schrägwalz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkarte
 DocType: BOM,Item to be manufactured or repacked,Zu fertigender oder umzupackender Artikel
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen
 DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Bitte Steuern und Gebühren eingeben
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maschinelle Bearbeitung
-DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Sales Invoice Item,Drop Ship,Direktlieferung
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
 DocType: Hub Settings,Seller Name,Name des Verkäufers
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Firmenwährung)
 DocType: Item Group,General Settings,Grundeinstellungen
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Von-Währung und Bis-Währung können nicht gleich sein
 DocType: Stock Entry,Repack,Umpacken
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren 
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren
 DocType: Item Attribute,Numeric Values,Numerische Werte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo anhängen
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Logo anhängen
 DocType: Customer,Commission Rate,Provisionssatz
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variante erstellen
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren.
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Der Warenkorb ist leer
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kann nicht bearbeitet werden.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Zugewiesene Menge kann nicht größer sein als unbereinigte Menge
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kann nicht bearbeitet werden.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Zugewiesene Menge kann nicht größer sein als unbereinigte Menge
 DocType: Manufacturing Settings,Allow Production on Holidays,Fertigung im Urlaub zulassen
 DocType: Sales Order,Customer's Purchase Order Date,Kundenauftragsdatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Gezeichnetes Kapital
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Bitte eine CSV-Datei auswählen.
-DocType: Dropbox Backup,Send Backups to Dropbox,Datensicherungen zur Dropbox senden
 DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Konstrukteur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
-DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialanforderung erstellen, wenn die Menge unter diesen Wert fällt"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
+DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatisch Materialfrage erstellen, wenn die Menge unter diesen Wert fällt"
 ,Item-wise Purchase Register,Artikelbezogene Übersicht der Einkäufe
 DocType: Batch,Expiry Date,Verfalldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Um den Meldebestand festzulegen, muss der Artikel ein Einkaufsartikel oder ein Fertigungsartiel sein"
 ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt-Stammdaten
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Stückliste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
-DocType: Dropbox Backup,Send Notifications To,Benachrichtigungen senden an
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref-Datum
-DocType: Employee,Reason for Leaving,Grund für das Verlassen
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref-Datum
+DocType: Employee,Reason for Leaving,Grund für den Austritt
 DocType: Expense Claim Detail,Sanctioned Amount,Genehmigter Betrag
-DocType: GL Entry,Is Opening,Ist Eröffnung
+DocType: GL Entry,Is Opening,Ist Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} existiert nicht
 DocType: Account,Cash,Bargeld
 DocType: Employee,Short biography for website and other publications.,Kurzbiographie für die Webseite und andere Publikationen.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Bitte Gehaltsstruktur für Mitarbeiter {0} erstellen

diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 40edbc9..da09c09 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Λειτουργία Μισθός
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Επιλέξτε μηνιαίας κατανομή, αν θέλετε να παρακολουθείτε με βάση την εποχικότητα."
 DocType: Employee,Divorced,Διαζευγμένος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Προσοχή: Το ίδιο το στοιχείο έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Προσοχή: Το ίδιο το στοιχείο έχει εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,είδη που έχουν ήδη συγχρονιστεί
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Επιτρέψτε στοιχείου να προστεθούν πολλές φορές σε μια συναλλαγή
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Ακύρωση επίσκεψης {0} πριν από την ακύρωση αυτής της αίτησης εγγύησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Καταναλωτικά προϊόντα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Επιλέξτε Τύπος Πάρτυ πρώτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Ανόπτηση
 DocType: Item,Customer Items,Είδη πελάτη
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν μπορεί να είναι καθολικός
 DocType: Item,Publish Item to hub.erpnext.com,Δημοσίευση είδους στο hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Υπεύθυνοι έγκρισης άδειας
 DocType: Sales Partner,Dealer,Έμπορος
 DocType: Employee,Rented,Νοικιασμένο
-DocType: About Us Settings,Website,Δικτυακός τόπος
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Συμπίεση συν συσσωμάτωσης
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Από αίτηση υλικού
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Από αίτηση υλικού
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Δέντρο
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Δεν υπάρχουν άλλα αποτελέσματα.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Νομικός
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Νομικός
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Πραγματική φορολογική του τύπου δεν μπορεί να περιλαμβάνεται στην τιμή Θέση στη γραμμή {0}
 DocType: C-Form,Customer,Πελάτης
 DocType: Purchase Receipt Item,Required By,Απαιτείται από
@@ -41,22 +38,21 @@
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Κύριες εγγραφές (ή ομάδες) κατά τις οποίες δημιουργούνται λογιστικές εγγραφές διατηρούνται υπόλοιπα.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
-DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας 
+DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Ράψιμο
 DocType: Pricing Rule,Apply On,Εφάρμοσε σε
 DocType: Item Price,Multiple Item prices.,Πολλαπλές τιμές είδους.
 ,Purchase Order Items To Be Received,Είδη παραγγελίας αγοράς για παραλαβή
 DocType: SMS Center,All Supplier Contact,Όλες οι επαφές προμηθευτή
 DocType: Quality Inspection Reading,Parameter,Παράμετρος
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Νέα αίτηση άδειας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Βαθμολογία πρέπει να είναι ίδιο με το {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Νέα αίτηση άδειας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Τραπεζική επιταγή
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Για να διατηρήσετε τον πελατοκεντρικό κωδικό είδους και να καταστούν προσβάσιμα με βάση τον κωδικό τους, χρησιμοποιήστε αυτή την επιλογή"
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Προβολή παραλλαγών
-DocType: Sales Invoice Item,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Ποσότητα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Κάνε νέα POS Προφίλ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 DocType: Purchase Invoice,Monthly,Μηνιαίος
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Άμυνα
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
 DocType: Company,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Γραμμή # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Γραμμή # {0}:
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Παρακαλώ επιλέξτε τιμοκατάλογο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ξυλουργική
 DocType: Production Order Operation,Work In Progress,Εργασία σε εξέλιξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D εκτύπωση
 DocType: Employee,Holiday List,Λίστα αργιών
 DocType: Time Log,Time Log,Αρχείο καταγραφής χρονολογίου
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Λογιστής
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Λογιστής
 DocType: Cost Center,Stock User,Χρηματιστήριο χρήστη
 DocType: Company,Phone No,Αρ. Τηλεφώνου
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Αρχείο καταγραφής των δραστηριοτήτων που εκτελούνται από τους χρήστες που μπορούν να χρησιμοποιηθούν για την παρακολούθηση χρόνου και την τιμολόγηση
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Νέο {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Νέο {0}: # {1}
 ,Sales Partners Commission,Προμήθεια συνεργάτη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Μια συντομογραφία δεν μπορεί να έχει περισσότερους από 5 χαρακτήρες
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Χαρακτηριστικό Αξία {0} δεν μπορεί να αφαιρεθεί από {1} ως Στοιχείο Παραλλαγές \ υπάρχουν με αυτό το χαρακτηριστικό.
-DocType: Print Settings,Classic,Κλασικό
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Αυτό είναι ένας κύριος λογαριασμός και δεν μπορεί να επεξεργαστεί.
 DocType: BOM,Operations,Λειτουργίες
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Δεν είναι δυνατός ο ορισμός της άδειας με βάση την έκπτωση για {0}
 DocType: Bin,Quantity Requested for Purchase,Αιτούμενη ποσότητα για αγορά
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Επισυνάψτε αρχείο .csv με δύο στήλες, μία για το παλιό όνομα και μία για το νέο όνομα"
-DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Άνοιγμα θέσης εργασίας.
 DocType: Item Attribute,Increment,Προσαύξηση
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Επιλέξτε Αποθήκη ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Διαφήμιση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Διαφήμιση
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Employee,Married,Παντρεμένος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Παντοπωλείο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Η αποθήκη είναι απαραίτητη αν ο τύπος του λογαριασμού είναι 'Αποθήκη'
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Επιλέξτε αν είναι επαναλαμβανόμενη παραγγελία, καταργήστε την επιλογή για να σταματήσει η επανάληψη ή θέστε σωστή ημερομηνία λήξης"
@@ -125,43 +120,38 @@
 DocType: Item,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Υπάρχει πελάτης με το ίδιο όνομα
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
-DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS 
+DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Κόστος των προϊόντων που έχουν παραδοθεί
-DocType: Blog Post,Guest,Επισκέπτης
 DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
 DocType: Lead,Interested,Ενδιαφερόμενος
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Λίστα υλικών
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Άνοιγμα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Άνοιγμα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Από {0} έως {1}
 DocType: Item,Copy From Item Group,Αντιγραφή από ομάδα ειδών
 DocType: Journal Entry,Opening Entry,Αρχική καταχώρηση
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} Είναι υποχρεωτικά
 DocType: Stock Entry,Additional Costs,Πρόσθετα έξοδα
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
-DocType: Lead,Product Enquiry,Ερώτηση για προϊόν 
-DocType: Standard Reply,Owner,Ιδιοκτήτης
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία 
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
+DocType: Lead,Product Enquiry,Ερώτηση για προϊόν
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Επιλέξτε την εταιρεία πρώτα
 DocType: Employee Education,Under Graduate,Τελειόφοιτος
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Στόχος στις
 DocType: BOM,Total Cost,Συνολικό κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Εκγλυφάνσεως
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Ακίνητα
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ακίνητα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Κατάσταση λογαριασμού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
 DocType: Expense Claim Detail,Claim Amount,Ποσό απαίτησης
 DocType: Employee,Mr,Κ
-DocType: Custom Script,Client,Πελάτης
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
 DocType: Naming Series,Prefix,Πρόθεμα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Αναλώσιμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Αναλώσιμα
 DocType: Upload Attendance,Import Log,Αρχείο καταγραφής εισαγωγής
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Αποστολή
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ετήσιος Μισθός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Ετήσιος Μισθός
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Έξοδα αποθέματος
 DocType: Newsletter,Email Sent?,Εστάλη μήνυμα email;
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Εμφάνιση χρόνος Καταγράφει
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
 DocType: Item,Supply Raw Materials for Purchase,Παροχή Πρώτων Υλών για Αγορά
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Το είδος {0} πρέπει να είναι ένα είδος αγοράς
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Θα ενημερωθεί μετά τήν έκδοση του τιμολογίου πωλήσεων.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Για να περιληφθούν οι φόροι στη γραμμή {0} της τιμής είδους, οι φόροι στις γραμμές {1} πρέπει επίσης να συμπεριληφθούν"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
-DocType: SMS Center,SMS Center,Κέντρο SMS 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ίσιωμα
+DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: BOM Replace Tool,New BOM,Νέα Λ.Υ.
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Ημερολόγια Παρτίδας για την τιμολόγηση.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity χύτευσης
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Το ενημερωτικό δελτίο έχει ήδη αποσταλεί
 DocType: Lead,Request Type,Τύπος αίτησης
 DocType: Leave Application,Reason,Αιτιολογία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Εκπομπή
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Εκτέλεση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Ο πρώτος χρήστης θα γίνει ο διαχειριστής του συστήματος ( μπορείτε να το αλλάξετε αυτό αργότερα ).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Εκπομπή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Εκτέλεση
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Ο πρώτος χρήστης θα γίνει ο διαχειριστής του συστήματος ( μπορείτε να το αλλάξετε αυτό αργότερα ).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
 DocType: Serial No,Maintenance Status,Κατάσταση συντήρησης
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Προϊόντα και Τιμολόγηση
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Προϊόντα και Τιμολόγηση
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Το πεδίο από ημερομηνία πρέπει να είναι εντός της χρήσης. Υποθέτοντας από ημερομηνία = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Επιλέξτε τον υπάλληλο για τον οποίο δημιουργείται η εκτίμηση.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Το κέντρο κόστους {0} δεν ανήκει στην εταιρεία {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ο τιμοκατάλογος πρέπει να ισχύει για την αγορά ή πώληση
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Η ημερομηνία εγκατάστασης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παράδοσης για το είδος {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Έκπτωση στις Τιμοκατάλογος Ποσοστό (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Αρχή
-DocType: User,First Name,Όνομα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Πλήρη φόρμα χύτευση
 DocType: Offer Letter,Select Terms and Conditions,Επιλέξτε Όροι και Προϋποθέσεις
 DocType: Production Planning Tool,Sales Orders,Παραγγελίες πωλήσεων
 DocType: Purchase Taxes and Charges,Valuation,Αποτίμηση
@@ -217,63 +202,59 @@
 DocType: Bank Reconciliation,Bank Account,Τραπεζικός λογαριασμό
 DocType: Leave Type,Allow Negative Balance,Επίτρεψε αρνητικό ισοζύγιο
 DocType: Selling Settings,Default Territory,Προεπιλεγμένη περιοχή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Τηλεόραση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Εκβιάζουμε
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Τηλεόραση
 DocType: Production Order Operation,Updated via 'Time Log',Ενημέρωση μέσω 'αρχείου καταγραφής χρονολογίου'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Ο λογαριασμός {0} δεν ανήκει στη εταιρεία {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
 DocType: Sales Invoice,Is Opening Entry,Είναι αρχική καταχώρηση
 DocType: Customer Group,Mention if non-standard receivable account applicable,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμό εφαρμόζεται
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Tο πεδίο για αποθήκη απαιτείται πριν την υποβολή
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Που ελήφθη στις
 DocType: Sales Partner,Reseller,Μεταπωλητής
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Παρακαλώ εισάγετε εταιρεία
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
 DocType: Newsletter List,Total Subscribers,Σύνολο Συνδρομητές
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Όνομα επαφής
+,Contact Name,Όνομα επαφής
 DocType: Production Plan Item,SO Pending Qty,Εκκρεμής ποσότητα παρ. πώλησης
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Αίτηση αγοράς.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Διπλό περίβλημα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Αφήνει ανά έτος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Αφήνει ανά έτος
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Παρακαλώ ορίστε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονομασία σειράς
 DocType: Time Log,Will be updated when batched.,Θα ενημερωθεί με την παρτίδα.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Γραμμή {0}: παρακαλώ επιλέξτε το «είναι προκαταβολή» έναντι του λογαριασμού {1} αν αυτό είναι μια καταχώρηση προκαταβολής.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Η αποθήκη {0} δεν ανήκει στην εταιρεία {1}
-DocType: Bulk Email,Message,Μήνυμα
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox access key
 DocType: Payment Tool,Reference No,Αριθμός αναφοράς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Ετήσιος
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
 DocType: Material Request Item,Min Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Lead,Do Not Contact,Μην επικοινωνείτε
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Το μοναδικό αναγνωριστικό για την παρακολούθηση όλων των επαναλαμβανόμενων τιμολογίων. Παράγεται με την υποβολή.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Προγραμματιστής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Προγραμματιστής
 DocType: Item,Minimum Order Qty,Ελάχιστη ποσότητα παραγγελίας
 DocType: Pricing Rule,Supplier Type,Τύπος προμηθευτή
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Συρματόβουρτσας
 DocType: Employee,Relation,Σχέση
 DocType: Shipping Rule,Worldwide Shipping,Παγκόσμια ναυτιλία
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
 DocType: Purchase Receipt Item,Rejected Quantity,Ποσότητα που απορρίφθηκε
 DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Πεδίο διαθέσιμο σε δελτίο αποστολής, προσφορές, τιμολόγιο πωλήσεων, παραγγελίες πώλησης"
-DocType: SMS Settings,SMS Sender Name,Αποστολέας SMS 
+DocType: SMS Settings,SMS Sender Name,Αποστολέας SMS
 DocType: Contact,Is Primary Contact,Είναι η κύρια επαφή
 DocType: Notification Control,Notification Control,Έλεγχος ενημερώσεων
 DocType: Lead,Suggestions,Προτάσεις
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 DocType: Maintenance Schedule,Generate Schedule,Δημιούργησε πρόγραμμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Εμβύθιση
 DocType: Purchase Invoice Item,Expense Head,Κύρια εγγραφή δαπανών
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Παρακαλώ επιλέξτε πρώτα τύπο επιβάρυνσης
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Το πιο πρόσφατο
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Μέγιστο 5 χαρακτήρες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Επιλέξτε τη γλώσσα σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Μέγιστο 5 χαρακτήρες
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Απενεργοποιεί τη δημιουργία του χρόνου κορμών κατά Εντολές Παραγωγής. Οι πράξεις δεν θα πρέπει να παρακολουθούνται κατά την παραγωγή διαταγής
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Παραλλαγή του
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Το είδος {0} πρέπει να είναι υπηρεσία
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
-DocType: DocType,Administrator,Διαχειριστής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Διάτρηση με λέιζερ
-DocType: Stock UOM Replace Utility,New Stock UOM,Νέα Μ.Μ.Αποθέματος
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Κυκλικού λάθους Αναφορά
-DocType: Communication,Closed,Κλειστό
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
 DocType: Lead,Industry,Βιομηχανία
 DocType: Employee,Job Profile,Προφίλ εργασίας
 DocType: Newsletter,Newsletter,Ενημερωτικό δελτίο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Υδρομορφοποίηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Το είδος ενημερώθηκε.
-DocType: Async Task,System Manager,Διαχειριστής συστήματος
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
 DocType: Sales Invoice Item,Delivery Note,Δελτίο αποστολής
-DocType: Dropbox Backup,Allow Dropbox Access,Επίτρεψε πρόσβαση στο dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ρύθμιση Φόροι
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Email εταιρείας
 DocType: GL Entry,Debit Amount in Account Currency,Χρεωστικό ποσό στο λογαριασμό Νόμισμα
 DocType: Shipping Rule,Valid for Countries,Ισχύει για χώρες
-DocType: Workflow State,Refresh,Ανανέωση
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Όλα τα πεδία εισαγωγής που σχετίζονται με τομείς όπως το νόμισμα, συντελεστή μετατροπής, οι συνολικές εισαγωγές, γενικό σύνολο εισαγωγής κλπ είναι διαθέσιμα σε αποδεικτικό αποδεικτικό παραλαβής αγοράς, προσφορά προμηθευτή, τιμολόγιο αγοράς, παραγγελία αγοράς κλπ."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα' 
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα'
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Διαθέσιμο σε Λ.Υ., Δελτίο αποστολής, τιμολόγιο αγοράς, αίτηση παραγωγής, παραγγελία αγοράς, αποδεικτικό παραλαβής αγοράς, τιμολόγιο πωλήσεων, παραγγελίες πώλησης, καταχώρηση αποθέματος, φύλλο κατανομής χρόνου"
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Επιλέξτε Προϊόν
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Το είδος: {0} όσον αφορά παρτίδες, δεν μπορεί να συμφωνηθεί με τη χρήση \ συμφωνιών αποθέματος, χρησιμοποιήστε καταχωρήσεις αποθέματος"""
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Το αποδεικτικό παραλαβής αγοράς πρέπει να υποβληθεί
-DocType: Stock UOM Replace Utility,Current Stock UOM,Τρέχουσα Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 DocType: C-Form Invoice Detail,Invoice Date,Ημερομηνία τιμολογίου
 DocType: GL Entry,Debit Amount,Χρεωστικό ποσό
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Η διεύθυνση email σας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Παρακαλώ δείτε συνημμένο
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Υδροκοπη
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
 ,Finished Goods,Έτοιμα προϊόντα
 DocType: Delivery Note,Instructions,Οδηγίες
 DocType: Quality Inspection,Inspected By,Επιθεωρήθηκε από
@@ -363,12 +330,13 @@
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Παράμετρος ελέγχου ποιότητας είδους
 DocType: Leave Application,Leave Approver Name,Όνομα υπευθύνου έγκρισης άδειας
 ,Schedule Date,Ημερομηνία χρονοδιαγράμματος
-DocType: Packed Item,Packed Item,Συσκευασμένο είδος 
+DocType: Packed Item,Packed Item,Συσκευασμένο είδος
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αγοράς.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Υπάρχει δραστηριότητα Κόστος υπάλληλου {0} ενάντια Τύπος δραστηριότητας - {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και τους προμηθευτές. Έχουν δημιουργηθεί απευθείας από τους πλοιάρχους πελατών / προμηθευτών.
 DocType: Currency Exchange,Currency Exchange,Ανταλλαγή συναλλάγματος
 DocType: Purchase Invoice Item,Item Name,Όνομα είδους
+DocType: Authorization Rule,Approving User  (above authorized value),Έγκριση Χρήστη (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Υπόλοιπο πίστωσης
 DocType: Employee,Widowed,Χήρος
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Είδη που θα ζητηθούν τα οποία είναι εκτός αποθέματος εξετάζοντας όλες τις αποθήκες με βάση την προβλεπόμενη ποσότητα και την ελάχιστη ποσότητα παραγγελιών
@@ -378,22 +346,21 @@
 ,Purchase Register,Ταμείο αγορών
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 DocType: Workstation,Consumable Cost,Κόστος αναλώσιμων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Ιατρικός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Αιτιολογία απώλειας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 DocType: Employee,Single,Μονό
 DocType: Issue,Attachment,Κατάσχεση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ο προϋπολογισμός δεν μπορεί να ρυθμιστεί για την Ομάδα Κέντρου Κόστους
 DocType: Account,Cost of Goods Sold,Κόστος πωληθέντων
 DocType: Purchase Invoice,Yearly,Ετήσια
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
 DocType: Journal Entry Account,Sales Order,Παραγγελία πώλησης
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Μέση τιμή πώλησης
 DocType: Purchase Order,Start date of current order's period,Ημερομηνία έναρξης της περιόδου τρέχουσας παραγγελίας
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Η ποσότητα δεν μπορεί να είναι ένα κλάσμα στη γραμμή {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Η ποσότητα δεν μπορεί να είναι ένα κλάσμα στη γραμμή {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
 DocType: Delivery Note,% Installed,% Εγκατεστημένο
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Είναι η ομάδα
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Αυτόματη Ρύθμιση αύξοντες αριθμούς με βάση FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ελέγξτε Προμηθευτής Αριθμός Τιμολογίου Μοναδικότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Θερμοδιαμορφωτικές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Κοπής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',Το πεδίο έως αριθμό υπόθεσης δεν μπορεί να είναι μικρότερο του πεδίου από αριθμό υπόθεσης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Μη κερδοσκοπικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Μη κερδοσκοπικός
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Δεν έχει ξεκινήσει
 DocType: Lead,Channel Partner,Συνεργάτης καναλιού
 DocType: Account,Old Parent,Παλαιός γονέας
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Κύρια εγγραφή αργιών.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Χύτευση κέλυφος
 DocType: Material Request Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
 DocType: BOM,Costing,Κοστολόγηση
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Συνολική ποσότητα
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Να Σειρά
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Κινητές αξίες και καταθέσεις
 DocType: Features Setup,Imports,Εισαγωγές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Συγκολλήσεις
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Job Opening,Description of a Job Opening,Περιγραφή μιας ανοιχτής θέσης εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Καταχωρήσεις προσέλευσης.
 DocType: Bank Reconciliation,Journal Entries,Λογιστική εγγραφή
 DocType: Sales Order Item,Used for Production Plan,Χρησιμοποιείται για το σχέδιο παραγωγής
-DocType: System Settings,Loading...,Φόρτωση...
-DocType: DocField,Password,Κωδικός
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Συντηγμένο μοντελοποίηση εναπόθεσης
 DocType: Manufacturing Settings,Time Between Operations (in mins),Χρόνου μεταξύ των λειτουργιών (σε λεπτά)
 DocType: Customer,Buyer of Goods and Services.,Αγοραστής αγαθών και υπηρεσιών.
-DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί 
+DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Προσθήκη Συνδρομητές
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Δεν υπάρχει"
 DocType: Pricing Rule,Valid Upto,Ισχύει μέχρι
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Άμεσα έσοδα
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Διοικητικός λειτουργός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Διοικητικός λειτουργός
 DocType: Payment Tool,Received Or Paid,Παραληφθέντα ή πληρωθέντα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Επιλέξτε Εταιρεία
 DocType: Stock Entry,Difference Account,Λογαριασμός διαφορών
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Καλλυντικά
-DocType: DocField,Type,Τύπος
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
-DocType: Communication,Subject,Θέμα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 ,Serial No Warranty Expiry,Ημερομηνία λήξης της εγγύησης του σειριακού αριθμού
@@ -467,12 +427,11 @@
 DocType: Purchase Invoice Item,Item,Είδος
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Διαχείριση της υπεργολαβίας
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Η νέα Μ.Μ. δεν πρέπει να είναι του τύπου ακέραιος αριθμός
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Διαχείριση της υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Έπιπλα και λοιπός εξοπλισμός
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα της εταιρείας
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
-DocType: Selling Settings,Default Customer Group,Προεπιλεγμένη ομάδα πελατών 
+DocType: Selling Settings,Default Customer Group,Προεπιλεγμένη ομάδα πελατών
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Αν είναι απενεργοποιημένο, το πεδίο στρογγυλοποιημένο σύνολο δεν θα είναι ορατό σε καμμία συναλλαγή"
 DocType: BOM,Operating Cost,Λειτουργικό κόστος
 ,Gross Profit,Μικτό κέρδος
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Απαίτηση υλικού
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Το είδος {0} δεν είναι είδος αγοράς
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",Η {0} είναι μια μη έγκυρη διεύθυνση email στην ηλεκτρονική διεύθυνση κοινοποίησης
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Συνολική τιμολόγηση αυτό το έτος:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Συνολική τιμολόγηση αυτό το έτος:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Δεν μπορείτε να διαγράψετε Αύξων αριθμός {0}, όπως χρησιμοποιείται στις συναλλαγές μετοχών"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Κλείσιμο (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Κλείσιμο (cr)
 DocType: Serial No,Warranty Period (Days),Περίοδος εγγύησης (ημέρες)
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 ,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Job Applicant,Thread HTML,Νήμα HTML
 DocType: Company,Ignore,Αγνοήστε
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
 DocType: Pricing Rule,Valid From,Ισχύει από
 DocType: Sales Invoice,Total Commission,Συνολική προμήθεια
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
@@ -504,15 +463,14 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Η μηνιαία κατανομή ** σας βοηθά να διανείμετε τον προϋπολογισμό σας σε μήνες, αν έχετε εποχικότητα στην επιχείρησή σας.
 
  Για να κατανέμετε τον προϋπολογισμό χρησιμοποιώντας αυτή την κατανομή ορίστε αυτή την ** μηνιαία κατανομή ** στο ** κέντρο κόστους **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου 
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Δημιούργησε παραγγελία πώλησης
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
-DocType: About Us Settings,Website Manager,Διαχειριστής ιστοσελίδας
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Η ημερομηνία έναρξης για τη χρήση δεν πρέπει να είναι μεταγενέστερη της ημερομηνία λήξης
 DocType: Warranty Claim,Resolution,Επίλυση
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Δημοσιεύθηκε: {0}
@@ -520,25 +478,24 @@
 DocType: Sales Order,Billing and Delivery Status,Χρέωση και Παράδοσης Κατάσταση
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Προηγούμενο
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Επιστροφή πωλήσεων
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Επιλέξτε παραγγελίες πώλησης από τις οποίες θέλετε να δημιουργήσετε εντολές παραγωγής.
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Συνιστώσες του μισθού.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Βάση δεδομένων των δυνητικών πελατών.
+DocType: Authorization Rule,Customer or Item,Πελάτη ή Είδους
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Βάση δεδομένων των πελατών.
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Η ανατροπή
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, επειδή έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Θα χρειαστεί να δημιουργήσετε ένα νέο σημείο για να χρησιμοποιήσετε ένα διαφορετικό Προεπιλογή UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
-DocType: Event,Wednesday,Τετάρτη
 DocType: Sales Invoice,Customer's Vendor,Πωλητής πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Η εντολή παραγωγής είναι υποχρεωτική
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Συγγραφή πρότασης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Συγγραφή πρότασης
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ένα άλλο πρόσωπο Πωλήσεις {0} υπάρχει με την ίδια ταυτότητα υπαλλήλου
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Σφάλμα αρνητικού αποθέματος ({6}) για το είδος {0} στην αποθήκη {1} στο {2} {3} σε {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία χρήσης
@@ -551,7 +508,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Παρακαλώ ρυθμίστε τη σειρά αρίθμησης για συμμετοχές μέσω του μενού ρυθμίσεις > σειρές αρίθμησης
 DocType: Employee,Reason for Resignation,Αιτία παραίτησης
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Πρότυπο για την αξιολόγηση της απόδοσης.
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Λεπτομέρειες καταχώρησης τιμολογίου / λογιστικού βιβλίου 
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Λεπτομέρειες καταχώρησης τιμολογίου / λογιστικού βιβλίου
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' Δεν είναι ση χρήση {2}
 DocType: Buying Settings,Settings for Buying Module,Ρυθμίσεις για τη λειτουργική μονάδα αγορών
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Παρακαλώ εισάγετε πρώτα αποδεικτικό παραλαβής αγοράς
@@ -559,20 +516,16 @@
 DocType: Activity Type,Default Costing Rate,Προεπιλογή Κοστολόγηση Τιμή
 DocType: Maintenance Schedule,Maintenance Schedule,Χρονοδιάγραμμα συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Παρακαλώ εγκαταστήστε το dropbox module της python 
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Προϊστάμενος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Από το αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
 DocType: SMS Settings,Receiver Parameter,Παράμετρος παραλήπτη
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
 DocType: Sales Person,Sales Person Targets,Στόχοι πωλητή
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Έως
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Παρακαλώ εισάγετε τη διεύθυνση email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Άκρο του σωλήνα που σχηματίζουν
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Μετατροπή σε ομάδα
 DocType: Activity Cost,Activity Type,Τύπος δραστηριότητας
@@ -580,25 +533,20 @@
 DocType: Customer,Fixed Days,Σταθερή Ημέρες
 DocType: Sales Invoice,Packing List,Λίστα συσκευασίας
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Παραγγελίες αγοράς που δόθηκαν σε προμηθευτές.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Δημοσίευση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Δημοσίευση
 DocType: Activity Cost,Projects User,Χρήστης έργων
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Καταναλώθηκε
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Δεν βρέθηκε στον πίνακα στοιχείων τιμολογίου
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Δεν βρέθηκε στον πίνακα στοιχείων τιμολογίου
 DocType: Company,Round Off Cost Center,Στρογγυλεύουν Κέντρο Κόστους
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Η επίσκεψη συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 DocType: Material Request,Material Transfer,Μεταφορά υλικού
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Άνοιγμα ( dr )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Η χρονοσήμανση αποστολής πρέπει να είναι μεταγενέστερη της {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Ρυθμίσεις
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Φόροι και εβπιβαρύνσεις κόστους αποστολής εμπορευμάτων
 DocType: Production Order Operation,Actual Start Time,Πραγματική ώρα έναρξης
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Περισσότερο
 DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Μετονομασία
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Κάμψη
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Επίτρεψε χρήστη
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
 DocType: Purchase Invoice,Quarterly,Τριμηνιαίος
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
@@ -607,17 +555,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
 DocType: Account,Accounts,Λογαριασμοί
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ευθεία διάτμηση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Για να παρακολουθήσετε το είδος στα παραστατικά πωλήσεων και αγοράς με βάση τους σειριακούς τους αριθμούς. Μπορεί επίσης να χρησιμοποιηθεί για να παρακολουθείτε τις λεπτομέρειες της εγγύησης του προϊόντος.
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Η αποθήκη απορριφθέντων είναι απαραίτητη για το είδος που απορρίφθηκε
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 DocType: Employee,Provide email id registered in company,Παρέχετε ένα email ID εγγεγραμμένο στην εταιρεία
 DocType: Hub Settings,Seller City,Πόλη πωλητή
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Τύπος δέντρου
@@ -625,15 +572,11 @@
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης εγγύησης
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία πώλησης, τιμολόγιο πώλησης ή ημερολογιακή εγγραφή "
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ανίκανος να βρει συναλλαγματική ισοτιμία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Αεροδιάστημα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Καλωσόρισμα
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία πώλησης, τιμολόγιο πώλησης ή ημερολογιακή εγγραφή"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Αεροδιάστημα
 DocType: Journal Entry,Credit Card Entry,Καταχώηρση πιστωτικής κάρτας
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Θέμα εργασίας
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Τα εμπορεύματα παραλήφθηκαν από τους προμηθευτές.
-DocType: Communication,Open,Ανοιχτό
 DocType: Lead,Campaign Name,Όνομα εκστρατείας
 ,Reserved,Δεσμευμένη
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
@@ -642,29 +585,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,Το {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Mode of Payment Account,Default Account,Προεπιλεγμένος λογαριασμός
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Η επαφή πρέπει να οριστεί αν η ευκαιρία προέρχεται από επαφή
-DocType: Contact Us Settings,Address Title,Τίτλος διεύθυνσης
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
 ,Sales Person Target Variance Item Group-Wise,Εύρος στόχου πωλητή ανά ομάδα είδους
-DocType: Dropbox Backup,Daily,Καθημερινά
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
-DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη 
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε καθολικό
+DocType: Delivery Note,Customer's Purchase Order No,Αρ. παραγγελίας αγοράς πελάτη
 DocType: Employee,Cell Number,Αριθμός κινητού
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Αυτόματη Υλικό αιτήσεις που δημιουργούνται
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Απολεσθέν
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Ενέργεια
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
 DocType: Item Group,Website Specifications,Προδιαγραφές δικτυακού τόπου
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Νέος λογαριασμός
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Οι λογιστικές εγγραφές μπορούν να γίνουν με την κόμβους. Ενδείξεις κατά ομάδες δεν επιτρέπονται.
-DocType: ToDo,High,Υψηλός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
-DocType: User,Male,Άντρας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ο αριθμός αποδεικτικού παραλαβής αγοράς για το είδος {0} είναι απαραίτητος
 DocType: Item Attribute Value,Item Attribute Value,Τιμή χαρακτηριστικού είδους
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Εκστρατείες πωλήσεων.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -705,18 +645,16 @@
  6. Ποσό: ποσό φόρου.
  7. Σύνολο: το συσσωρευμένο σύνολο έως αυτό το σημείο.
  8. Εισάγετε σειρά: αν βασίζεται στο """"σύνολο προηγούμενης σειράς"""", μπορείτε να επιλέξετε τον αριθμό της γραμμής που θα πρέπει να ληφθεί ως βάση για τον υπολογισμό αυτό (η προεπιλογή είναι η προηγούμενη σειρά).
- 9. Είναι αυτός φόρος που περιλαμβάνεται στη βασική τιμή;: εάν επιλέξετε αυτό, αυτό σημαίνει ότι ο φόρος αυτός δεν θα εμφανίζεται κάτω από τον πίνακα ειδών, αλλά θα πρέπει να περιλαμβάνεται στη βασική τιμή στον κύριο πίνακα των ειδών. Αυτό είναι χρήσιμο όταν θέλετε να δώσετε μια επίπεδη τιμή (συμπεριλαμβανομένων όλων των φόρων) στους πελάτες.""
-"
+ 9. Είναι αυτός φόρος που περιλαμβάνεται στη βασική τιμή;: εάν επιλέξετε αυτό, αυτό σημαίνει ότι ο φόρος αυτός δεν θα εμφανίζεται κάτω από τον πίνακα ειδών, αλλά θα πρέπει να περιλαμβάνεται στη βασική τιμή στον κύριο πίνακα των ειδών. Αυτό είναι χρήσιμο όταν θέλετε να δώσετε μια επίπεδη τιμή (συμπεριλαμβανομένων όλων των φόρων) στους πελάτες."""
 DocType: Employee,Bank A/C No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Expense Claim,Project,Έργο
 DocType: Quality Inspection Reading,Reading 7,Μέτρηση 7
 DocType: Address,Personal,Προσωπικός
 DocType: Expense Claim Detail,Expense Claim Type,Τύπος αξίωσης δαπανών
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Προεπιλεγμένες ρυθμίσεις για το καλάθι αγορών
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Η λογιστική εγγραφή {0} έχει συνδεθεί με την παραγγελία {1}, ελέγξτε αν πρέπει να ληφθεί ως προκαταβολή σε αυτό το τιμολόγιο."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Βιοτεχνολογία
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Η λογιστική εγγραφή {0} έχει συνδεθεί με την παραγγελία {1}, ελέγξτε αν πρέπει να ληφθεί ως προκαταβολή σε αυτό το τιμολόγιο."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Βιοτεχνολογία
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Δαπάνες συντήρησης γραφείου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Στρήφωμα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Account,Liability,Υποχρέωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
@@ -724,14 +662,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Process Payroll,Send Email,Αποστολή email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί, διότι τα στοιχεία δεν παραδίδονται μέσω {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Αριθμοί
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Αριθμοί
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Τιμολόγια μου
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Τιμολόγια μου
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Purchase Order,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
@@ -750,37 +689,34 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; χαρακτηριστικά
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
-DocType: Comment,Reference Name,Όνομα αναφοράς
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: Sales Invoice Item,Target Warehouse,Αποθήκη προορισμού
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας πωλήσεων
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
 DocType: Production Order,Item To Manufacture,Είδος προς κατασκευή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Μόνιμη καλούπι
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} κατάσταση είναι {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 DocType: Sales Order Item,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
 DocType: Newsletter,Newsletter Manager,Ενημερωτικό Δελτίο Διευθυντής
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',«Άνοιγμα»
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
 DocType: Expense Claim,Expenses,Δαπάνες
 DocType: Item Variant Attribute,Item Variant Attribute,Παραλλαγή Στοιχείο Χαρακτηριστικό
 ,Purchase Receipt Trends,Τάσεις αποδεικτικού παραλαβής αγοράς
 DocType: Appraisal,Select template from which you want to get the Goals,Επιλέξτε το πρότυπο από το οποίο θέλετε να πάρετε τους στόχους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Έρευνα & ανάπτυξη
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Έρευνα & ανάπτυξη
 ,Amount to Bill,Ποσό χρέωσης
 DocType: Company,Registration Details,Στοιχεία εγγραφής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Χάραξη
 DocType: Item,Re-Order Qty,Ποσότητα επαναπαραγγελίας
-DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας 
+DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Προγραμματισμένη για να αποσταλεί σε {0}
 DocType: Pricing Rule,Price or Discount,Τιμή ή έκπτωση
 DocType: Sales Team,Incentives,Κίνητρα
@@ -789,18 +725,16 @@
 DocType: Sales Invoice Item,Stock Details,Χρηματιστήριο Λεπτομέρειες
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Αξία έργου
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Δεν είναι δυνατή η μεταφορά προς τα εμπρός {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι χρεωστικό"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Το υπόλοιπο του λογαριασμού είναι ήδη πιστωτικό, δεν επιτρέπεται να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι χρεωστικό"
 DocType: Account,Balance must be,Το υπόλοιπο πρέπει να
 DocType: Hub Settings,Publish Pricing,Δημοσιεύστε τιμολόγηση
 DocType: Notification Control,Expense Claim Rejected Message,Μήνυμα απόρριψης αξίωσης δαπανών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Κάρφωμα
 ,Available Qty,Διαθέσιμη ποσότητα
 DocType: Purchase Taxes and Charges,On Previous Row Total,Στο σύνολο της προηγούμενης γραμμής
 DocType: Salary Slip,Working Days,Εργάσιμες ημέρες
 DocType: Serial No,Incoming Rate,Ρυθμός εισερχομένων
 DocType: Packing Slip,Gross Weight,Μικτό βάρος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Συμπεριέλαβε αργίες στον συνολικό αριθμό των εργάσιμων ημερών
 DocType: Job Applicant,Hold,Αναμονή
 DocType: Employee,Date of Joining,Ημερομηνία πρόσληψης
@@ -810,41 +744,40 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Προβολή Συνδρομητές
 DocType: Purchase Invoice Item,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Λειαντικά ανατινάξεις
 DocType: Employee,Ms,Κα
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
 DocType: Salary Slip,Leave Encashment Amount,Ποσό εξαργύρωσης άδειας
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Ο σειριακός αριθμός {0} δεν ανήκει στο είδος {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Απαιτούμενη ποσότητα
 DocType: Bank Reconciliation,Total Amount,Συνολικό ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Δημοσίευση στο διαδίκτυο
 DocType: Production Planning Tool,Production Orders,Εντολές παραγωγής
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Αξία ισολογισμού
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Τιμοκατάλογος πωλήσεων
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Δημοσιεύστε για να συγχρονίσετε τα είδη
-DocType: GL Entry,Account Currency,Ο λογαριασμός Νόμισμα
+DocType: Bank Reconciliation,Account Currency,Ο λογαριασμός Νόμισμα
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Λογαριασμό Εταιρεία
 DocType: Purchase Receipt,Range,Εύρος
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Features Setup,Item Barcode,Barcode είδους
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς 
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 DocType: Address,Shop,Κατάστημα
 DocType: Hub Settings,Sync Now,Συγχρονισμός τώρα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Ο προεπιλεγμένος λογαριασμός τραπέζης / μετρητών θα ενημερώνεται αυτόματα στην έκδοση τιμολογίου POS, όταν επιλέγεται αυτός ο τρόπος."
 DocType: Employee,Permanent Address Is,Η μόνιμη διεύθυνση είναι
 DocType: Production Order Operation,Operation completed for how many finished goods?,Για πόσα τελικά προϊόντα ολοκληρώθηκε η λειτουργία;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Το εμπορικό σήμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Το εμπορικό σήμα
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}.
-DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου 
+DocType: Employee,Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Journal Entry Account,Purchase Invoice,Τιμολόγιο αγοράς
 DocType: Stock Ledger Entry,Voucher Detail No,Αρ. λεπτομερειών αποδεικτικού
@@ -858,63 +791,58 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Για τα στοιχεία «Προϊόν Bundle», Αποθήκη, Αύξων αριθμός παρτίδας και Δεν θα θεωρηθεί από την «Packing List» πίνακα. Αν Αποθήκης και Μαζική Δεν είναι ίδιες για όλα τα είδη συσκευασίας για τη θέση του κάθε «Πακέτο Προϊόντων», οι αξίες αυτές μπορούν να εγγραφούν στον κύριο πίνακα Στοιχείο, οι τιμές θα αντιγραφούν στο «Packing List» πίνακα."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Αποστολές προς τους πελάτες.
-DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς 
+DocType: Purchase Invoice Item,Purchase Order Item,Είδος παραγγελίας αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Έμμεσα έσοδα
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Καθορίστε το ποσό πληρωμής = οφειλόμενο ποσό
-DocType: Contact Us Settings,Address Line 1,Γραμμή διεύθυνσης 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Διακύμανση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Όνομα εταιρείας
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Διακύμανση
+,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Δείτε μια λίστα με όλα τα βίντεο βοήθειας
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Επίτρεψε στο χρήστη να επεξεργάζεται τιμές τιμοκατάλογου στις συναλλαγές
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Χημικό
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Χημικό
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 DocType: Process Payroll,Select Payroll Year and Month,Επιλέξτε Μισθοδοσίας Έτος και Μήνας
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Εφαρμογή των Ταμείων&gt; Κυκλοφορούν Ενεργητικό&gt; τραπεζικούς λογαριασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου &quot;Τράπεζα&quot;
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
-DocType: Comment,Unsubscribed,Χωρίς συνδρομή
 DocType: Opportunity,Walk In,Προχωρήστε
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Δέντρο οικονομικών κεντρών κόστους.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Μεταφέρονται
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Λευκό
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Λευκό
 DocType: SMS Center,All Lead (Open),Όλες οι επαφές (ανοιχτές)
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Επισύναψη της εικόνα σας
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Δημιούργησε
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Επισύναψη της εικόνα σας
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Δημιούργησε
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
-DocType: Workflow State,Stop,Διακοπή
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Το Καλάθι μου
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Ο τύπος παραγγελίας πρέπει να είναι ένα από τα {0}
 DocType: Lead,Next Contact Date,Ημερομηνία επόμενης επικοινωνίας
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Αρχική ποσότητα
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Δικαιώματα Προαίρεσης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Ποσότητα για {0}
 DocType: Leave Application,Leave Application,Αίτηση άδειας
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Εργαλείο κατανομής αδειών
 DocType: Leave Block List,Leave Block List Dates,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
 DocType: Company,If Monthly Budget Exceeded (for expense account),Αν Μηνιαίος Προϋπολογισμός Υπέρβαση (για λογαριασμό εξόδων)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Κοπή
 DocType: Workstation,Net Hour Rate,Καθαρή τιμή ώρας
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Αποδεικτικό αγοράς κόστους αποστολής εμπορευμάτων
 DocType: Company,Default Terms,Προεπιλογή Όροι
 DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκευασίας
 DocType: POS Profile,Cash/Bank Account,Λογαριασμός μετρητών/τραπέζης
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Υποβολή
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Έκπτωση
 DocType: Features Setup,Purchase Discounts,Εκπτώσεις αγοράς
 DocType: Workstation,Wages,Μισθοί
@@ -924,28 +852,29 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Παρακαλείστε να προσδιορίσετε μια έγκυρη ταυτότητα Σειρά για τη σειρά {0} στο τραπέζι {1}
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Μετάβαση στην επιφάνεια εργασίας και να αρχίσετε να χρησιμοποιείτε ERPNext
 DocType: Item,Manufacturer,Κατασκευαστής
-DocType: Landed Cost Item,Purchase Receipt Item,Είδος αποδεικτικού παραλαβής αγοράς 
+DocType: Landed Cost Item,Purchase Receipt Item,Είδος αποδεικτικού παραλαβής αγοράς
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Ποσό πώλησης
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Αρχεία καταγραφής χρονολογίου
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
-DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας 
+DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας
 DocType: Issue,Issue,Έκδοση
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Ο λογαριασμός δεν ταιριάζει με την εταιρεία
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Αποθήκη εργασιών σε εξέλιξη
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
 DocType: BOM Operation,Operation,Λειτουργία
 DocType: Lead,Organization Name,Όνομα οργανισμού
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής' 
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Έξοδα πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Πρότυπες αγορές
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Πρότυπες αγορές
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
 DocType: Item,Default Supplier,Προεπιλεγμένος προμηθευτής
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Πάνω Παραγωγής Επίδομα Ποσοστό
@@ -960,29 +889,27 @@
 DocType: Time Log Batch,updated via Time Logs,ενημερώνεται μέσω χρόνος Καταγράφει
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Μέσος όρος ηλικίας
 DocType: Opportunity,Your sales person who will contact the customer in future,Ο πωλητής σας που θα επικοινωνήσει με τον πελάτη στο μέλλον
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 DocType: Company,Default Currency,Προεπιλεγμένο νόμισμα
 DocType: Contact,Enter designation of this Contact,Εισάγετε ονομασία αυτής της επαφής
-DocType: Contact Us Settings,Address,Διεύθυνση
 DocType: Expense Claim,From Employee,Από υπάλληλο
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Προσοχή : το σύστημα δεν θα ελέγξει για υπερτιμολογήσεις εφόσον το ποσό για το είδος {0} {1} είναι μηδέν
 DocType: Journal Entry,Make Difference Entry,Δημιούργησε καταχώηρηση διαφοράς
 DocType: Upload Attendance,Attendance From Date,Συμμετοχή από ημερομηνία
 DocType: Appraisal Template Goal,Key Performance Area,Βασικός τομέας επιδόσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Μεταφορά
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Μεταφορά
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,και το έτος:
 DocType: Email Digest,Annual Expense,Ετήσια Δαπάνη
 DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,Λεπτομέρειες τιμολογίου C-form 
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Τιμολόγιο συμφωνίας πληρωμής 
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,Λεπτομέρειες τιμολογίου C-form
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Τιμολόγιο συμφωνίας πληρωμής
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Συμβολή (%)
 DocType: Item,website page link,Σύνδεσμος ιστοσελίδας
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ας προετοιμαστεί το σύστημα για την πρώτη χρήση.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Αριθμοί μητρώου των επιχειρήσεων για την αναφορά σας. Αριθμοί φόρου κ.λ.π.
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Επιλέξτε αρχεία καταγραφής χρονολογίου και πατήστε υποβολή για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης
@@ -1001,68 +928,59 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
 DocType: Sales Invoice Advance,Sales Invoice Advance,Προκαταβολή τιμολογίου πώλησης
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Τίποτα να ζητηθεί
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Διαχείριση
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Διαχείριση
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Τύποι δραστηριοτήτων για ωριαία φύλλα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Χύτευση των επενδύσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Το ποσό χρέωσης ή πίστωσης είναι απαραίτητο για {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ενεργός
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Μπλε
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Μπλε
 DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
 DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Περαιτέρω κόμβοι μπορούν να δημιουργηθούν μόνο σε κόμβους τύπου ομάδα 
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Περαιτέρω κόμβοι μπορούν να δημιουργηθούν μόνο σε κόμβους τύπου ομάδα
 DocType: Item,UOMs,Μ.Μ.
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} Έγκυροι σειριακοί αριθμοί για το είδος {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ο κωδικός είδους δεν μπορεί να αλλάξει για τον σειριακό αριθμό
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Προφίλ {0} έχει ήδη δημιουργηθεί για το χρήστη: {1} και την παρέα {2}
-DocType: Purchase Order Item,UOM Conversion Factor,Συντελεστής μετατροπής Μ.Μ. 
+DocType: Purchase Order Item,UOM Conversion Factor,Συντελεστής μετατροπής Μ.Μ.
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Απανωτές στρώσεις κατασκευής αντικείμενο
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Βάση δεδομένων προμηθευτών.
 DocType: Account,Balance Sheet,Ισολογισμός
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Τεντώστε το σχηματισμό
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ο πωλητής σας θα λάβει μια υπενθύμιση την ημερομηνία αυτή για να επικοινωνήσει με τον πελάτη
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Φορολογικές και άλλες κρατήσεις μισθών.
 DocType: Lead,Lead,Επαφή
 DocType: Email Digest,Payables,Υποχρεώσεις
 DocType: Account,Warehouse,Αποθήκη
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
 ,Purchase Order Items To Be Billed,Είδη παραγγελίας αγοράς προς χρέωση
 DocType: Purchase Invoice Item,Net Rate,Καθαρή Τιμή
-DocType: Purchase Invoice Item,Purchase Invoice Item,Είδος τιμολογίου αγοράς 
+DocType: Purchase Invoice Item,Purchase Invoice Item,Είδος τιμολογίου αγοράς
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Οι καταχωρήσεις του καθολικού αποθέματος και οι καταχωρήσεις GL θα επαναδημοσιευτούν για τα επιλεγμένα αποδεικτικά παραλαβής αγορών
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Στοιχείο 1
 DocType: Holiday,Holiday,Αργία
-DocType: Event,Saturday,Σάββατο
 DocType: Leave Control Panel,Leave blank if considered for all branches,Άφησε το κενό αν ισχύει για όλους τους κλάδους
 ,Daily Time Log Summary,Καθημερινή σύνοψη καταγραφής χρόνου
-DocType: DocField,Label,Ετικέτα
 DocType: Payment Reconciliation,Unreconciled Payment Details,Μη συμφωνημένες λεπτομέρειες πληρωμής
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
 DocType: Lead,Call,Κλήση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ρύθμιση εργαζόμενοι
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Πλέγμα '
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Έρευνα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Έρευνα
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Contact,User ID,ID χρήστη
-DocType: Communication,Sent,Εστάλη
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Προβολή καθολικού
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
-DocType: Communication,Delivery Status,Κατάσταση παράδοσης
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 DocType: Production Order,Manufacture against Sales Order,Παραγωγή κατά παραγγελία πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
@@ -1073,13 +991,11 @@
 DocType: BOM Item,Item Description,Περιγραφή είδους
 DocType: Payment Tool,Payment Mode,Τρόπος πληρωμής
 DocType: Purchase Invoice,Is Recurring,Είναι επαναλαμβανόμενo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Άμεση μέταλλο πυροσυσσωμάτωσης με λέιζερ
 DocType: Purchase Order,Supplied Items,Προμηθευόμενα είδη
 DocType: Production Order,Qty To Manufacture,Ποσότητα για κατασκευή
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο αγορών
 DocType: Opportunity Item,Opportunity Item,Είδος ευκαιρίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Προσωρινό άνοιγμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
 DocType: Address,Address Type,Τύπος διεύθυνσης
@@ -1095,36 +1011,35 @@
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Μικρό
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Μικρό
 DocType: Employee,Employee Number,Αριθμός υπαλλήλων
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ο αρ. υπόθεσης χρησιμοποιείται ήδη. Δοκιμάστε από τον αρ. υπόθεσης {0}
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Στοιχείο 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Η κύρια εγγραφή λογαριασμού {0} δημιουργήθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Πράσινος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Πράσινος
 DocType: Item,Auto re-order,Αυτόματη εκ νέου προκειμένου
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Σύνολο που επιτεύχθηκε
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Σύνολο που επιτεύχθηκε
 DocType: Employee,Place of Issue,Τόπος έκδοσης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
-DocType: Report,Disabled,Απενεργοποιημένο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Συμβόλαιο
+DocType: Email Digest,Add Quote,Προσθήκη Παράθεση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Γεωργία
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
 DocType: Journal Entry Account,Purchase Order,Παραγγελία αγοράς
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Το όνομα είναι απαραίτητο
 DocType: Purchase Invoice,Recurring Type,Τύπος επαναλαμβανόμενου
 DocType: Address,City/Town,Πόλη / χωριό
 DocType: Email Digest,Annual Income,ΕΤΗΣΙΟ εισοδημα
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
-DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους 
+DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
-apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας 
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Το είδος {0} πρέπει να είναι είδος υπεργολαβίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Κεφάλαιο εξοπλισμών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
 DocType: Hub Settings,Seller Website,Ιστοσελίδα πωλητή
@@ -1133,14 +1048,13 @@
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Αναμενόμενη ημερομηνία τοκετού είναι μικρότερο από το προβλεπόμενο Ημερομηνία Έναρξης.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Συνολική εξερχόμενη
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Μπορεί να υπάρχει μόνο μία συνθήκη κανόνα αποστολής με 0 ή κενή τιμή για το πεδίο 'εώς αξία'
 DocType: Authorization Rule,Transaction,Συναλλαγή
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Σημείωση : αυτό το κέντρο κόστους είναι μια ομάδα. Δεν μπορούν να γίνουν λογιστικές εγγραφές σε ομάδες.
-apps/frappe/frappe/config/desk.py +7,Tools,Εργαλεία
 DocType: Item,Website Item Groups,Ομάδες ειδών δικτυακού τόπου
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Ο Αριθμός εντολής παραγωγής είναι υποχρεωτικός για την καταχώρηση αποθέματος
 DocType: Purchase Invoice,Total (Company Currency),Σύνολο (Εταιρεία νομίσματος)
@@ -1148,24 +1062,22 @@
 DocType: Journal Entry,Journal Entry,Λογιστική εγγραφή
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Σχόλια
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Η τιμή αποτίμησης είναι απαραίτητη για το είδος {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Η τιμή αποτίμησης είναι απαραίτητη για το είδος {0}
 DocType: Quality Inspection Reading,Reading 8,Μέτρηση 8
 DocType: Sales Partner,Agent,Πράκτορας
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών βάσει του»"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Υπολογισμός φόρων και επιβαρύνσεων
 DocType: BOM Operation,Workstation,Σταθμός εργασίας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Άδεια μετ' αποδοχών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Δεν υπάρχουν δεδομένα
 DocType: Appraisal Template Goal,Appraisal Template Goal,Στόχος προτύπου αξιολόγησης
 DocType: Salary Slip,Earning,Κέρδος
 DocType: Payment Tool,Party Account Currency,Κόμμα Λογαριασμού Νόμισμα
@@ -1175,26 +1087,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Βρέθηκαν συνθήκες που επικαλύπτονται μεταξύ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Συνολική αξία της παραγγελίας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Τροφή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Τροφή
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Eύρος γήρανσης 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Μπορείτε να δημιουργήσετε ένα αρχείο καταγραφής χρονολογίου μόνο για μια εντολή παραγωγής που έχει υποβληθεί
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
-DocType: File,old_parent,Παλαιός γονέας
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Ενημερωτικά δελτία για επαφές
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Οι λειτουργίες δεν μπορεί να είναι κενές.
 ,Delivered Items To Be Billed,Είδη για χρέωση που έχουν παραδοθεί
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
-DocType: DocField,Description,Περιγραφή
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
-DocType: Letter Head,Is Default,Είναι προεπιλογή
 DocType: Address,Utilities,Επιχειρήσεις κοινής ωφέλειας
 DocType: Purchase Invoice Item,Accounting,Λογιστική
 DocType: Features Setup,Features Setup,Χαρακτηριστικά διαμόρφωσης
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Προβολή επιστολή προσφοράς
-DocType: Communication,Communication,Επικοινωνία
 DocType: Item,Is Service Item,Είναι υπηρεσία
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
 DocType: Activity Cost,Projects,Έργα
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Παρακαλώ επιλέξτε χρήση
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Από {0} | {1} {2}
@@ -1204,16 +1113,16 @@
 DocType: Quotation,Shopping Cart,Καλάθι αγορών
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Μέσος όρος ημερησίως εξερχομένων
 DocType: Pricing Rule,Campaign,Εκστρατεία
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε 
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
 DocType: Purchase Invoice,Contact Person,Κύρια εγγραφή επικοινωνίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',Η αναμενόμενη ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη από την αναμενόμενη ημερομηνία λήξης
 DocType: Holiday List,Holidays,Διακοπές
 DocType: Sales Order Item,Planned Quantity,Προγραμματισμένη ποσότητα
-DocType: Purchase Invoice Item,Item Tax Amount,Ποσό φόρου είδους 
+DocType: Purchase Invoice Item,Item Tax Amount,Ποσό φόρου είδους
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 DocType: Leave Control Panel,Leave blank if considered for all designations,Άφησε το κενό αν ισχύει για όλες τις ονομασίες
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Από ημερομηνία και ώρα
 DocType: Email Digest,For Company,Για την εταιρεία
@@ -1223,44 +1132,41 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
 DocType: Pricing Rule,"Higher the number, higher the priority","Όσο μεγαλύτερος είναι ο αριθμός, τόσο μεγαλύτερη είναι η προτεραιότητα"
-,Purchase Invoice Trends,Τάσεις τιμολογίου αγοράς 
+,Purchase Invoice Trends,Τάσεις τιμολογίου αγοράς
 DocType: Employee,Better Prospects,Καλύτερες προοπτικές
 DocType: Appraisal,Goals,Στόχοι
 DocType: Warranty Claim,Warranty / AMC Status,Κατάσταση εγγύησης / Ε.Σ.Υ.
 ,Accounts Browser,Περιηγητής λογαριασμων
-DocType: GL Entry,GL Entry,Καταχώρηση gl 
+DocType: GL Entry,GL Entry,Καταχώρηση gl
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Λίστα εκκρεμών εργασιών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Μαθητευόμενος
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Μαθητευόμενος
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Δεν επιτρέπεται αρνητική ποσότητα
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Ο πίνακας λεπτομερειών φόρου υπολογίζεται από την κύρια εγγραφή του είδους σαν αλφαριθμητικό και αποθηκεύεται σε αυτό το πεδίο. Χρησιμοποιείται για φόρους και τέλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Ανοίγοντας με μαχαίρι
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός έχει παγώσει, οι καταχωρήσεις επιτρέπονται σε ορισμένους χρήστες."
 DocType: Email Digest,Bank Balance,Τράπεζα Υπόλοιπο
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Καμία ενεργός μισθολογίου αποτελέσματα για εργαζόμενο {0} και τον μήνα
 DocType: Job Opening,"Job profile, qualifications required etc.","Επαγγελματικό προφίλ, τα προσόντα που απαιτούνται κ.λ.π."
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
 DocType: Rename Tool,Type of document to rename.,Τύπος του εγγράφου για να μετονομάσετε.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Αγοράζουμε αυτό το είδος
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Αγοράζουμε αυτό το είδος
 DocType: Address,Billing,Χρέωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Δεν απεστάλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Εκρηκτικές σχηματίζουν
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Σύνολο φόρων και επιβαρύνσεων (στο νόμισμα της εταιρείας)
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Προγραμματισμένη για να αποσταλεί σε {0} αποδέκτες
 DocType: Quality Inspection,Readings,Μετρήσεις
 DocType: Stock Entry,Total Additional Costs,Συνολικό πρόσθετο κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Υποσυστήματα
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Υποσυστήματα
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Supplier,Stock Manager,Διευθυντής Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
@@ -1270,105 +1176,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Δεν δημιουργήθηκαν διευθύνσεις
 DocType: Workstation Working Hour,Workstation Working Hour,Ώρες εργαασίας σταθμού εργασίας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Αναλυτής
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το ποσό κε {2}
 DocType: Item,Inventory,Απογραφή
 DocType: Features Setup,"To enable ""Point of Sale"" view",Για να ενεργοποιήσετε το &quot;Point of Sale&quot; προβολή
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Η πληρωμή δεν μπορεί να γίνει για άδειο καλάθι
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Καρφίτσωμα
 DocType: Opportunity,With Items,Με Αντικείμενα
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Στην ποσότητα
 DocType: Notification Control,Expense Claim Rejected,Η αξίωσης δαπανών απορρίφθηκε
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Παράγεται σε υποβάλει.
 DocType: Item Attribute,Item Attribute,Χαρακτηριστικό είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Παραλλαγές του Είδους
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Κυβέρνηση
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Παραλλαγές του Είδους
 DocType: Company,Services,Υπηρεσίες
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Σύνολο ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Σύνολο ({0})
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
 DocType: Sales Invoice,Source,Πηγή
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση 
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Ημερομηνία έναρξης για τη χρήση
 DocType: Employee External Work History,Total Experience,Συνολική εμπειρία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Εκβάθυνσης
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
-DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης 
+DocType: Material Request Item,Sales Order No,Αρ. παραγγελίας πώλησης
 DocType: Item Group,Item Group Name,Όνομα ομάδας ειδών
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Πάρθηκε
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Πάρθηκε
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Μεταφορά υλικών για μεταποίηση
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Η τιμή αγοράς για το είδος: {0} δεν βρέθηκε, η οποία είναι απαραίτητη για την λογιστική εγγραφή (δαπάνη). Παρακαλώ να αναφέρετε την τιμή του είδους με βάση κάποιο τιμοκατάλογο αγοράς."
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
-DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ. 
+DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Πρόσθετες ποσό έκπτωσης (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Σφάλμα: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Σφάλμα: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Παρακαλώ να δημιουργήσετε νέο λογαριασμό από το λογιστικό σχέδιο.
 DocType: Maintenance Visit,Maintenance Visit,Επίσκεψη συντήρησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Πελάτης> ομάδα πελατών > περιοχή
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Διαθέσιμο παρτίδας Ποσότητα σε αποθήκη
 DocType: Time Log Batch Detail,Time Log Batch Detail,Λεπτομέρεια παρτίδας αρχείων καταγραφής χρονολογίου
-DocType: Workflow State,Tasks,Εργασίες
 DocType: Landed Cost Voucher,Landed Cost Help,Βοήθεια κόστους αποστολής εμπορευμάτων
-DocType: Event,Tuesday,Τρίτη
 DocType: Leave Block List,Block Holidays on important days.,Αποκλεισμός αδειών στις σημαντικές ημέρες.
-,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών 
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Φύλλα για τον τύπο {0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} - {3}
+,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
 DocType: UOM,UOM Name,Όνομα Μ.Μ.
-DocType: Top Bar Item,Target,Στόχος
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Ποσό συνεισφοράς
 DocType: Sales Invoice,Shipping Address,Διεύθυνση αποστολής
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Αυτό το εργαλείο σας βοηθά να ενημερώσετε ή να διορθώσετε την ποσότητα και την αποτίμηση των αποθεμάτων στο σύστημα. Συνήθως χρησιμοποιείται για να συγχρονίσει τις τιμές του συστήματος και του τι πραγματικά υπάρχει στις αποθήκες σας.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Κύρια εγγραφή εμπορικού σήματος
-DocType: ToDo,Due Date,Ημερομηνία λήξης προθεσμίας
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Κύρια εγγραφή εμπορικού σήματος
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Κουτί
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Ο οργανισμός
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Κουτί
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Ο οργανισμός
 DocType: Monthly Distribution,Monthly Distribution,Μηνιαία διανομή
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
 DocType: Production Plan Sales Order,Production Plan Sales Order,Παραγγελία πώλησης σχεδίου παραγωγής
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Λογιστική καταχώριση για {0} μπορεί να γίνει μόνο στο νόμισμα: {1}
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Σκάλισμα
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Σειρά # {0}: επιστρεφόμενο στοιχείο {1} δεν υπάρχει σε {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Τραπεζικοί λογαριασμοί
 ,Bank Reconciliation Statement,Δήλωση συμφωνίας τραπεζικού λογαριασμού
 DocType: Address,Lead Name,Όνομα επαφής
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Άνοιγμα Χρηματιστήριο Υπόλοιπο
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Άνοιγμα Χρηματιστήριο Υπόλοιπο
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} Πρέπει να εμφανίζεται μόνο μία φορά
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Δεν επιτρέπεται να μεταφέρουμε περισσότερο {0} από {1} εναντίον παραγγελίας {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Οι άδειες κατανεμήθηκαν επιτυχώς για {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Δεν βρέθηκαν είδη για συσκευασία
 DocType: Shipping Rule Condition,From Value,Από τιμή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Τα ποσά που δεν αντικατοπτρίζονται στην τράπεζα
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Τα ποσά που δεν αντικατοπτρίζονται στην τράπεζα
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Φυγοκεντρική χύτευση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Το μαγνητικό πεδίο με τη βοήθεια φινίρισμα
 DocType: Company,Default Holiday List,Προεπιλεγμένη λίστα διακοπών
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Υποχρεώσεις αποθέματος
 DocType: Purchase Receipt,Supplier Warehouse,Αποθήκη προμηθευτή
 DocType: Opportunity,Contact Mobile No,Αριθμός κινητού επαφής
 DocType: Production Planning Tool,Select Sales Orders,Επιλέξτε παραγγελίες πώλησης
 ,Material Requests for which Supplier Quotations are not created,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Παρακολούθηση ειδών με barcode. Είναι δυνατή η εισαγωγή ειδών στο δελτίο αποστολής και στο τιμολόγιο πώλησης με σάρωση του barcode των ειδών.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Επισήμανση ως Δημοσιεύθηκε
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Κάντε Προσφορά
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
@@ -1376,31 +1273,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Προβολή
 DocType: Salary Structure Deduction,Salary Structure Deduction,Παρακρατήσεις στο μισθολόγιο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Επιλεκτική πυροσυσσωμάτωση λέιζερ
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Εισαγωγή επιτυχής!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ηλικία (ημέρες)
 DocType: Quotation Item,Quotation Item,Είδος προσφοράς
 DocType: Account,Account Name,Όνομα λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Από την ημερομηνία αυτή δεν μπορεί να είναι μεταγενέστερη από την έως ημερομηνία
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Ο σειριακός αριθμός {0} ποσότητα {1} δεν μπορεί να είναι ένα κλάσμα
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Κύρια εγγραφή τύπου προμηθευτή.
 DocType: Purchase Order Item,Supplier Part Number,Αριθμός εξαρτήματος του προμηθευτή
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Προσθήκη
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Το ποσοστό μετατροπής δεν μπορεί να είναι 0 ή 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ακυρωθεί ή σταματήσει
 DocType: Accounts Settings,Credit Controller,Ελεγκτής πίστωσης
 DocType: Delivery Note,Vehicle Dispatch Date,Ημερομηνία κίνησης οχήματος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Το αποδεικτικό παραλαβής αγοράς {0} δεν έχει υποβληθεί
 DocType: Company,Default Payable Account,Προεπιλεγμένος λογαριασμός πληρωτέων
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ρυθμίσεις για το online καλάθι αγορών, όπως οι κανόνες αποστολής, ο τιμοκατάλογος κλπ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Η εγκατάσταση ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Χρεώθηκαν
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Δεσμευμένη ποσότητα 
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Δεσμευμένη ποσότητα
 DocType: Party Account,Party Account,Λογαριασμός συμβαλλόμενου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ανθρώπινοι πόροι
 DocType: Lead,Upper Income,Άνω εισοδήματος
 DocType: Journal Entry Account,Debit in Company Currency,Χρεωστικές στην Εταιρεία Νόμισμα
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Θέματα Μου
@@ -1409,12 +1302,9 @@
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι αρνητικό
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Πατήστε τοποθέτηση
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 DocType: Payment Reconciliation,Payments,Πληρωμές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot ισοστατική συμπίεση
-DocType: ToDo,Medium,Μέσο
 DocType: Budget Detail,Budget Allocated,Προϋπολογισμός που διατέθηκε
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
@@ -1423,12 +1313,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
 DocType: Quotation,Term Details,Λεπτομέρειες όρων
 DocType: Manufacturing Settings,Capacity Planning For (Days),Ο προγραμματισμός της δυναμικότητας Για (Ημέρες)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
 DocType: Warranty Claim,Warranty Claim,Αξίωση εγγύησης
 ,Lead Details,Λεπτομέρειες επαφής
-DocType: Authorization Rule,Approving User,Εγκρίνων χρήστης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Σφυρηλάτηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Επιμετάλλωση
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Pricing Rule,Applicable For,Εφαρμοστέο για
 DocType: Bank Reconciliation,From Date,Από ημερομηνία
@@ -1450,64 +1337,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online δημοπρασίες
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online δημοπρασίες
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Παρακαλώ ορίστε είτε ποσότητα ή τιμή αποτίμησης ή και τα δύο
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Η εταιρεία, ο μήνας και η χρήση είναι απαραίτητα"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Δαπάνες marketing
-,Item Shortage Report,Αναφορά έλλειψης είδους 
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+,Item Shortage Report,Αναφορά έλλειψης είδους
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Μία μονάδα ενός είδους
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Η παρτίδα αρχείων καταγραφής χρονολογίου {0} πρέπει να 'υποβληθεί'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Δημιούργησε λογιστική καταχώρηση για κάθε κίνηση αποθέματος
 DocType: Leave Allocation,Total Leaves Allocated,Σύνολο αδειών που διατέθηκε
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Αποθήκη απαιτείται κατά Row Όχι {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Παρακαλώ εισάγετε ένα έγκυρο οικονομικό έτος ημερομηνίες έναρξης και λήξης
 DocType: Employee,Date Of Retirement,Ημερομηνία συνταξιοδότησης
 DocType: Upload Attendance,Get Template,Βρες πρότυπο
 DocType: Address,Postal,Ταχυδρομικός
 DocType: Item,Weightage,Ζύγισμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Εξόρυξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Ρητίνη χύτευσης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών 
-apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα 
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},κειμένου {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},κειμένου {0}
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
 DocType: Stock Entry,Material Receipt,Παραλαβή υλικού
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Προϊόντα
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Προϊόντα
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Ο τύπος συμβαλλομένου και ο συμβαλλόμενος είναι απαραίτητα για τον λογαριασμό εισπρακτέων / πληρωτέων {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Εάν αυτό το στοιχείο έχει παραλλαγές, τότε δεν μπορεί να επιλεγεί σε εντολές πώλησης κ.λπ."
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Η αποθήκη {0} δεν μπορεί να διαγραφεί, γιατί υπάρχει ποσότητα για το είδος {1}"
 DocType: Quotation,Order Type,Τύπος παραγγελίας
 DocType: Purchase Invoice,Notification Email Address,Διεύθυνση email ενημερώσεων
 DocType: Payment Tool,Find Invoices to Match,Βρείτε τιμολόγια Match
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","Π.Χ. ""Xyz εθνική τράπεζα """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","Π.Χ. ""Xyz εθνική τράπεζα """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ο φόρος αυτός περιλαμβάνεται στη βασική τιμή;
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Σύνολο στόχου
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Σύνολο στόχου
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Καλάθι Αγορών είναι ενεργοποιημένη
 DocType: Job Applicant,Applicant for a Job,Αιτών εργασία
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Δεν δημιουργήθηκαν εντολές παραγωγής
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Η βεβαίωση αποδοχών του υπαλλήλου {0} έχει ήδη δημιουργηθεί για αυτό το μήνα
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Η βεβαίωση αποδοχών του υπαλλήλου {0} έχει ήδη δημιουργηθεί για αυτό το μήνα
 DocType: Stock Reconciliation,Reconciliation JSON,Συμφωνία json
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Sales Invoice Item,Batch No,Αρ. Παρτίδας
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Κύριο
-DocType: DocPerm,Delete,Διαγραφή
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Παραλλαγή
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Νέο {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Μια σταματημένη παραγγελία δεν μπορεί να ακυρωθεί. Συνεχίστε την προκειμένου να την ακυρώσετε.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
 DocType: Sales Team,Contribution to Net Total,Συμβολή στο καθαρό σύνολο
 DocType: Sales Invoice Item,Customer's Item Code,Κωδικός είδους πελάτη
 DocType: Stock Reconciliation,Stock Reconciliation,Συμφωνία αποθέματος
@@ -1516,53 +1401,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Αιτών εργασία
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
-DocType: Country,Country,Χώρα
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Διευθύνσεις
-DocType: Communication,Received,Λήψη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Διπλότυπος σειριακός αριθμός για το είδος {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Μια συνθήκη για έναν κανόνα αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Το στοιχείο δεν επιτρέπεται να έχει εντολή παραγωγής.
-DocType: DocField,Attach Image,Επισύναψη εικόνας
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Το καθαρό βάρος της εν λόγω συσκευασίας. (Υπολογίζεται αυτόματα ως το άθροισμα του καθαρού βάρους των ειδών)
-DocType: Stock Reconciliation Item,Leave blank if no change,Αφήστε κενό αν δεν υπάρχει αλλαγή
 DocType: Sales Order,To Deliver and Bill,Για να παρέχουν και να τιμολογούν
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Χρόνος Καταγράφει για την κατασκευή.
 DocType: Item,Apply Warehouse-wise Reorder Level,Εφάρμοσε το επίπεδο αναδιάρθρωσης σε όλη την αποθήκη
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Αρχείο καταγραφής χρονολογίου για εργασίες.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Πληρωμή
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Πληρωμή
 DocType: Production Order Operation,Actual Time and Cost,Πραγματικός χρόνος και κόστος
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Αίτηση υλικού με μέγιστο {0} μπορεί να γίνει για το είδος {1} κατά την παραγγελία πώλησης {2}
 DocType: Employee,Salutation,Χαιρετισμός
-DocType: Communication,Rejected,Απορρίφθηκε
 DocType: Pricing Rule,Brand,Εμπορικό σήμα
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
 DocType: Sales Order Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
 DocType: Quality Inspection Reading,Reading 10,Μέτρηση 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Απαριθμήστε προϊόντα ή υπηρεσίες που αγοράζετε ή πουλάτε. Σιγουρέψτε πως έχει επιλεγεί η ομάδα εϊδους, η μονάδα μέτρησης και οι άλλες ιδιότητες όταν ξεκινάτε. "
-DocType: Hub Settings,Hub Node,Κόμβος Hub 
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Απαριθμήστε προϊόντα ή υπηρεσίες που αγοράζετε ή πουλάτε. Σιγουρέψτε πως έχει επιλεγεί η ομάδα εϊδους, η μονάδα μέτρησης και οι άλλες ιδιότητες όταν ξεκινάτε."
+DocType: Hub Settings,Hub Node,Κόμβος Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Αξία {0} για Χαρακτηριστικό {1} δεν υπάρχει στη λίστα των έγκυρων τιμές παραμέτρων στοιχείου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Συνεργάτης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Συνεργάτης
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Έληξε
 DocType: Packing Slip,To Package No.,Για τον αρ. συσκευασίας
-DocType: DocType,System,Σύστημα
 DocType: Warranty Claim,Issue Date,Ημερομηνία έκδοσης
 DocType: Activity Cost,Activity Cost,Δραστηριότητα Κόστους
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Ποσότητα που καταναλώθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Τηλεπικοινωνίες
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Τηλεπικοινωνίες
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 DocType: Payment Tool,Make Payment Entry,Δημιούργησε καταχώηρση πληρωμής
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
 ,Sales Invoice Trends,Τάσεις τιμολογίου πώλησης
 DocType: Leave Application,Apply / Approve Leaves,Εφαρμογή / έγκριση αδειών
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Για
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Μπορεί να παραπέμψει σε γραμμή μόνο εφόσον ο τύπος χρέωσης είναι ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής
 DocType: Sales Order Item,Delivery Warehouse,Αποθήκη Παράδοση
 DocType: Stock Settings,Allowance Percent,Ποσοστό επίδοματος
@@ -1574,33 +1454,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Η πώληση πρέπει να επιλεγεί, αν είναι το πεδίο 'εφαρμοστέα για' έχει οριστεί ως {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Είδος της προσφοράς του προμηθευτή
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Δημιούργησε μισθολόγιο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Κουρά
 DocType: Item,Has Variants,Έχει παραλλαγές
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Κάντε κλικ στο δημιούργησε τιμολόγιο πώλησης για να δημιουργηθεί ένα νέο τιμολόγιο πώλησης.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Συσκευασία και επισήμανση
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Παρακαλώ ορίστε προεπιλεγμένο νόμισμα στην κύρια εγγραφή εταιρείας και τις γενικές προεπιλογές
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox access secret
 DocType: Purchase Invoice,Recurring Invoice,Επαναλαμβανόμενο τιμολόγιο
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Διαχείριση έργων
 DocType: Supplier,Supplier of Goods or Services.,Προμηθευτής αγαθών ή υπηρεσιών.
 DocType: Budget Detail,Fiscal Year,Χρήση
 DocType: Cost Center,Budget,Προϋπολογισμός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Επιτεύχθηκε
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Επιτεύχθηκε
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Περιοχή / πελάτης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,Π.Χ. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το οφειλόμενο ποσό του τιμολογίου {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,Π.Χ. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το οφειλόμενο ποσό του τιμολογίου {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το τιμολόγιο πώλησης.
 DocType: Item,Is Sales Item,Είναι είδος πώλησης
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Δέντρο ομάδων ειδών
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Ελέγξτε την κύρια εγγραφή είδους
 DocType: Maintenance Visit,Maintenance Time,Ώρα συντήρησης
 ,Amount to Deliver,Ποσό Παράδοση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ένα προϊόν ή υπηρεσία
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Υπήρχαν σφάλματα.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Τρύπημα
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Ένα προϊόν ή υπηρεσία
 DocType: Naming Series,Current Value,Τρέχουσα αξία
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} Δημιουργήθηκε
 DocType: Delivery Note Item,Against Sales Order,Κατά την παραγγελία πώλησης
@@ -1612,17 +1487,17 @@
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
-DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου 
+DocType: Website Item Group,Website Item Group,Ομάδα ειδών δικτυακού τόπου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Δασμοί και φόροι
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} εγγραφές πληρωμών δεν μπορεί να φιλτράρεται από {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Πίνακας για το είδος που θα εμφανιστεί στην ιστοσελίδα
 DocType: Purchase Order Item Supplied,Supplied Qty,Παρεχόμενα Ποσότητα
 DocType: Material Request Item,Material Request Item,Είδος αίτησης υλικού
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Δέντρο ομάδων ειδών.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Δέντρο ομάδων ειδών.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
-,Item-wise Purchase History,Ιστορικό αγορών ανά είδος 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Κόκκινος
+,Item-wise Purchase History,Ιστορικό αγορών ανά είδος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Κόκκινος
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
@@ -1632,12 +1507,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Γραμμή #{0}:Η λειτουργία {1} δεν έχει ολοκληρωθεί για τη {2} ποσότητα των τελικών προϊόντων στην εντολή παραγωγής # {3}. Σας Παρακαλώ να ενημερώσετε την κατάσταση λειτουργίας μέσω των χρονικών αρχείων καταγραφής
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Αλλαγή Μ.Μ. Για ένα είδος
 DocType: Quality Inspection Reading,Acceptance Criteria,Κριτήρια αποδοχής
 DocType: Item Attribute,Attribute Name,Χαρακτηριστικό όνομα
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Το είδος {0} πρέπει να είναι είδος πώλησης ή υπηρεσία στο {1}
 DocType: Item Group,Show In Website,Εμφάνιση στην ιστοσελίδα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Ομάδα
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Ομάδα
 DocType: Task,Expected Time (in hours),Αναμενόμενη διάρκεια (σε ώρες)
 ,Qty to Order,Ποσότητα για παραγγελία
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Για να παρακολουθήσετε brand name στην παρακάτω έγγραφα Δελτίου Αποστολής, το Opportunity, Αίτηση Υλικού, σημείο, παραγγελίας, αγοράς δελτίων, Αγοραστή Παραλαβή, Προσφορά, Τιμολόγιο Πώλησης, προϊόντων Bundle, Πωλήσεις Τάξης, Αύξων αριθμός"
@@ -1646,78 +1520,67 @@
 DocType: Holiday List,Clear Table,Καθαρισμός πίνακα
 DocType: Features Setup,Brands,Εμπορικά σήματα
 DocType: C-Form Invoice Detail,Invoice No,Αρ. Τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Από παραγγελία αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Από παραγγελία αγοράς
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Αφήστε που δεν μπορούν να εφαρμοστούν / ακυρωθεί πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
 DocType: Activity Cost,Costing Rate,Κοστολόγηση Τιμή
 ,Customer Addresses And Contacts,Διευθύνσεις πελατών και των επαφών
 DocType: Employee,Resignation Letter Date,Ημερομηνία επιστολής παραίτησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Δεν έχει οριστεί
-DocType: Communication,Date,Ημερομηνία
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Έσοδα επαναλαμβανόμενων πελατών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Καθίστε ήρεμα, ενώ το σύστημά σας εγκαθίσταται. Αυτό μπορεί να διαρκέσει μερικά λεπτά."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Ζεύγος
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Ζεύγος
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 DocType: Maintenance Schedule Detail,Actual Date,Πραγματική ημερομηνία
 DocType: Item,Has Batch No,Έχει αρ. Παρτίδας
-DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας 
+DocType: Delivery Note,Excise Page Number,Αριθμός σελίδας έμμεσης εσωτερικής φορολογίας
 DocType: Employee,Personal Details,Προσωπικά στοιχεία
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ανάγλυφη
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Εφόσον μπορεί να γίνει παραγωγής παραγγελίας για το συγκεκριμένο προϊόν, θα πρέπει να είναι ένα είδος αποθέματος."
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Συμμετοχή
-DocType: Authorization Rule,Above Value,Παραπάνω Αξία 
 ,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
 DocType: Purchase Order,Delivered,Παραδόθηκε
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID θέσης εργασίας. ( Π.Χ. Jobs@example.Com )
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Σύνολο των κατανεμημένων φύλλα {0} δεν μπορεί να είναι μικρότερη από ό, τι έχει ήδη εγκριθεί φύλλα {1} για την περίοδο"
 DocType: Journal Entry,Accounts Receivable,Εισπρακτέοι λογαριασμοί
 ,Supplier-Wise Sales Analytics,Αναφορές πωλήσεων ανά προμηθευτή
 DocType: Address Template,This format is used if country specific format is not found,Αυτή η μορφοποίηση χρησιμοποιείται εάν δεν βρεθεί ειδική μορφοποίηση χώρας
-DocType: Custom Field,Custom,Προσαρμοσμένο
 DocType: Production Order,Use Multi-Level BOM,Χρησιμοποιήστε Λ.Υ. πολλαπλών επιπέδων.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Έγχυση πλαστικού
 DocType: Bank Reconciliation,Include Reconciled Entries,Συμπεριέλαβε συμφωνημένες καταχωρήσεις
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Δέντρο οικονομικών λογαριασμών.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Άφησε το κενό αν ισχύει για όλους τους τύπους των υπαλλήλων
 DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα κόστη μεταφοράς σε όλα τα είδη.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Ο λογαριασμός {0} πρέπει να είναι του τύπου 'παγίων' καθώς το είδος {1} είναι ένα περιουσιακό στοιχείο
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
-apps/frappe/frappe/config/setup.py +130,Printing,Εκτύπωση
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Η μέρα ( ες) για την οποία(ες) υποβάλλεται αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να υποβληθεί αίτηση για άδεια.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Και
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Αθλητισμός
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Πραγματικό σύνολο
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Μονάδα
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Παρακαλώ ορίστε τα κλειδιά πρόσβασης dropbox στις ρυθμίσεις του site σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Μονάδα
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Παρακαλώ ορίστε εταιρεία
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Αποθήκη όπου θα γίνεται διατήρηση αποθέματος για απορριφθέντα στοιχεία
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
 DocType: POS Profile,Price List,Τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Απαιτήσεις Εξόδων
 DocType: Issue,Support,Υποστήριξη
-DocType: Authorization Rule,Approving Role,Εγκρίνων ρόλος
 ,BOM Search,BOM Αναζήτηση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
 DocType: Workstation,Wages per hour,Μισθοί ανά ώρα
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Το ισοζύγιο αποθεμάτων στην παρτίδα {0} θα γίνει αρνητικό {1} για το είδος {2} στην αποθήκη {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Εμφάνιση / απόκρυψη χαρακτηριστικών, όπως σειριακοί αρ., POS κ.λ.π."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Η ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία ελέγχου στη γραμμή {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Η ημερομηνία εκκαθάρισης δεν μπορεί να είναι πριν από την ημερομηνία ελέγχου στη γραμμή {0}
 DocType: Salary Slip,Deduction,Κρατήση
 DocType: Address Template,Address Template,Πρότυπο διεύθυνσης
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
@@ -1729,76 +1592,68 @@
 DocType: Opportunity,Quotation,Προσφορά
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 DocType: Quotation,Maintenance User,Χρήστης συντήρησης
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Κόστος Ενημερώθηκε
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Το είδος {0} έχει ήδη επιστραφεί
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Η χρήση ** αντιπροσωπεύει ένα οικονομικό έτος. Όλες οι λογιστικές εγγραφές και άλλες σημαντικές συναλλαγές παρακολουθούνται ανά ** χρήση **.
 DocType: Opportunity,Customer / Lead Address,Πελάτης / διεύθυνση επαφής
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Περιγραφή Δουλειάς
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Περιγραφή Δουλειάς
 DocType: Purchase Order Item,Qty as per Stock UOM,Ποσότητα σύμφωνα με τη Μ.Μ. Αποθέματος
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Παρακαλώ επιλέξτε ένα έγκυρο αρχείο csv με τα δεδομένα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Επένδυση
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε επαφές, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Παρακολουθήστε εκστρατείες προώθησης των πωλήσεων. Παρακολουθήστε επαφές, προσφορές, παραγγελίες πωλήσεων κλπ από τις εκστρατείες στις οποίες πρέπει να γίνει μέτρηση της απόδοσης των επενδύσεων."
 DocType: Expense Claim,Approver,Ο εγκρίνων
 ,SO Qty,Ποσότητα παρ. πώλησης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Υπάρχουν καταχωρήσεις αποθέματος στην αποθήκη {0}, ως εκ τούτου δεν μπορείτε να εκχωρήσετε ξανά ή να τροποποιήσετε την αποθήκη"
 DocType: Appraisal,Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας
 DocType: Supplier Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Αποστολές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Βουτιά χύτευση
-DocType: Purchase Order,To be delivered to customer,Να παραδοθεί στον πελάτη
+apps/erpnext/erpnext/hooks.py +68,Shipments,Αποστολές
+DocType: Purchase Order Item,To be delivered to customer,Να παραδοθεί στον πελάτη
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Η κατάσταση του αρχείου καταγραφής χρονολογίου πρέπει να υποβληθεί.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Αύξων αριθμός {0} δεν ανήκουν σε καμία αποθήκη
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Ρύθμιση...
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Γραμμή #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Γραμμή #
 DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας)
 DocType: Pricing Rule,Supplier,Προμηθευτής
 DocType: C-Form,Quarter,Τρίμηνο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Διάφορες δαπάνες
 DocType: Global Defaults,Default Company,Προεπιλεγμένη εταιρεία
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
 DocType: Employee,Bank Name,Όνομα τράπεζας
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Παραπάνω
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Ο χρήστης {0} είναι απενεργοποιημένος
 DocType: Leave Application,Total Leave Days,Σύνολο ημερών άδειας
-DocType: Journal Entry Account,Credit in Account Currency,Πίστωση στο λογαριασμό Νόμισμα
 DocType: Email Digest,Note: Email will not be sent to disabled users,Σημείωση: το email δε θα σταλεί σε απενεργοποιημένους χρήστες
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Currency Exchange,From Currency,Από το νόμισμα
-DocType: DocField,Name,Όνομα
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Τα ποσά που δεν αντικατοπτρίζονται στο σύστημα
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Η παραγγελία πώλησης για το είδος {0} είναι απαραίτητη
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Τα ποσά που δεν αντικατοπτρίζονται στο σύστημα
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Άλλα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Άλλα
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.
 DocType: POS Profile,Taxes and Charges,Φόροι και επιβαρύνσεις
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Ένα προϊόν ή μια υπηρεσία που αγοράζεται, πωλείται ή διατηρείται σε απόθεμα."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Ολοκληρώθηκε
-DocType: Web Form,Select DocType,Επιλέξτε τύπο εγγράφου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Διάνοιξη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Κατάθεση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Κατάθεση
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Νέο κέντρο κόστους
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Νέο κέντρο κόστους
 DocType: Bin,Ordered Quantity,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
 DocType: Quality Inspection,In Process,Σε επεξεργασία
 DocType: Authorization Rule,Itemwise Discount,Έκπτωση ανά είδος
 DocType: Purchase Order Item,Reference Document Type,Αναφορά Τύπος εγγράφου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
 DocType: Account,Fixed Asset,Πάγιο
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Απογραφή συνέχειες
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Απογραφή συνέχειες
 DocType: Activity Type,Default Billing Rate,Επιτόκιο Υπερημερίας Τιμολόγησης
 DocType: Time Log Batch,Total Billing Amount,Συνολικό Ποσό Χρέωσης
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Εισπρακτέα λογαριασμού
@@ -1806,19 +1661,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Τα αρχεία καταγραφής χρονολογίου δημιουργήθηκαν:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Employee,Blood Group,Ομάδα αίματος
 DocType: Purchase Invoice Item,Page Break,Αλλαγή σελίδας
 DocType: Production Order Operation,Pending,Εκκρεμής
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Χρήστες που μπορούν να εγκρίνουν αιτήσεις για έναν συγκεκριμένο εργαζόμενο
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Δεν μπορείτε να αλλάξετε το προεπιλεγμένο UOM της παραλλαγής. Για να αλλάξετε τις προεπιλεγμένες UOM για την παραλλαγή προεπιλογή αλλαγή UOM του προτύπου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Εξοπλισμός γραφείου
 DocType: Purchase Invoice Item,Qty,Ποσότητα
 DocType: Fiscal Year,Companies,Εταιρείες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Ηλεκτρονικά 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Ηλεκτρονικά
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Δημιουργία αιτήματος υλικού όταν το απόθεμα φτάνει το επίπεδο για επαναπαραγγελία
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Από το πρόγραμμα συντήρησης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Πλήρης απασχόληση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Πλήρης απασχόληση
 DocType: Purchase Invoice,Contact Details,Στοιχεία επικοινωνίας επαφής
 DocType: C-Form,Received Date,Ημερομηνία παραλαβής
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Αν έχετε δημιουργήσει ένα πρότυπο πρότυπο στη φόροι επί των πωλήσεων και επιβαρύνσεις Πρότυπο, επιλέξτε ένα και κάντε κλικ στο κουμπί παρακάτω."
@@ -1830,14 +1685,15 @@
 DocType: Job Applicant,Job Opening,Άνοιγμα θέσης εργασίας
 DocType: Payment Reconciliation,Payment Reconciliation,Συμφωνία πληρωμής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Τεχνολογία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
 DocType: Offer Letter,Offer Letter,Επιστολή Προσφοράς
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Δημιουργία αιτήσεων υλικών (mrp) και εντολών παραγωγής.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Συνολικό ποσό που τιμολογήθηκε
 DocType: Time Log,To Time,Έως ώρα
+DocType: Authorization Rule,Approving Role (above authorized value),Έγκριση Ρόλος (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Για να προσθέσετε θυγατρικούς κόμβους, εξερευνήστε το δέντρο και κάντε κλικ στο κόμβο κάτω από τον οποίο θέλετε να προσθέσετε περισσότερους κόμβους."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
 DocType: Production Order Operation,Completed Qty,Ολοκληρωμένη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
@@ -1847,12 +1703,10 @@
 DocType: Item,Customer Item Codes,Θέση Πελάτη Κώδικες
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Δημιουργήστε καταχωρήσεις πληρωμή κατά παραγγελίες ή τιμολόγια.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Συγκόλλησης
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Απαιτείται νέα Μ.Μ.Αποθέματος 
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης' 
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Καθορίστε μια έγκυρη τιμή στο πεδίο 'από τον αρ. Υπόθεσης'
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
 DocType: Features Setup,Item Serial Nos,Σειριακοί αριθμοί είδους
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα
@@ -1862,15 +1716,13 @@
 DocType: Bin,Actual Quantity,Πραγματική ποσότητα
 DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Οι πελάτες σας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Χύτευση με συμπίεση
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Οι πελάτες σας
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
 DocType: Sales Order,Not Delivered,Δεν έχει παραδοθεί
 ,Bank Clearance Summary,Περίληψη εκκαθάρισης τράπεζας
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Κωδικός είδους> ομάδα ειδών > εμπορικό σήμα
 DocType: Appraisal Goal,Appraisal Goal,Στόχος αξιολόγησης
-DocType: Event,Friday,Παρασκευή
 DocType: Time Log,Costing Amount,Κοστολόγηση Ποσό
 DocType: Process Payroll,Submit Salary Slip,Υποβολή βεβαίωσης αποδοχών
 DocType: Salary Structure,Monthly Earning & Deduction,Μηνιαίες απολαβές και κρατήσεις
@@ -1878,16 +1730,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Εισαγωγή χύδην
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
 DocType: SMS Log,Sender Name,Όνομα αποστολέα
-DocType: Page,Title,Τίτλος
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Προσαρμογή
 DocType: POS Profile,[Select],[ Επιλέξτε ]
 DocType: SMS Log,Sent To,Αποστέλλονται
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Άκυρη {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Άκυρη {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Ποσό προκαταβολής
 DocType: Manufacturing Settings,Capacity Planning,Σχεδιασμός Χωρητικότητα
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
 DocType: Journal Entry,Reference Number,Αριθμός αναφοράς
 DocType: Employee,Employment Details,Λεπτομέρειες απασχόλησης
 DocType: Employee,New Workplace,Νέος χώρος εργασίας
@@ -1902,7 +1752,7 @@
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
 DocType: Item,End of Life,Τέλος της ζωής
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ταξίδι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Ταξίδι
 DocType: Leave Block List,Allow Users,Επίστρεψε χρήστες
 DocType: Purchase Order,Customer Mobile No,Κινητό αριθ Πελατών
 DocType: Sales Invoice,Recurring,Επαναλαμβανόμενες
@@ -1910,23 +1760,21 @@
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
 DocType: Installation Note,Installation Note,Σημείωση εγκατάστασης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Προσθήκη φόρων
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Προσθήκη φόρων
 ,Financial Analytics,Χρηματοοικονομικές αναφορές
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 DocType: Address,Subsidiary,Θυγατρική
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
-DocType: Quality Inspection,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς 
+DocType: Quality Inspection,Purchase Receipt No,Αρ. αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Κερδιζμένα χρήματα
-DocType: System Settings,In Hours,Σε ώρες
 DocType: Process Payroll,Create Salary Slip,Δημιουργία βεβαίωσης αποδοχών
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Αναμενόμενο υπόλοιπο κατά τράπεζα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Αναμενόμενο υπόλοιπο κατά τράπεζα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Πηγή χρηματοδότησης ( παθητικού )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
 DocType: Appraisal,Employee,Υπάλληλος
@@ -1939,15 +1787,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Ομαδοποίηση κατά αποδεικτικό
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Sales Invoice,Mass Mailing,Μαζική αλληλογραφία
-DocType: Page,Standard,Πρότυπο
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Ο αριθμός παραγγελίας αγοράς για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Εμφάνιση Πληρωμές
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Μέγεθος
-DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Φαρμακευτικός
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Το χρονοδιάγραμμα συντήρησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Φαρμακευτικός
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Το κόστος των αγορασθέντων ειδών
 DocType: Selling Settings,Sales Order Required,Η παραγγελία πώλησης είναι απαραίτητη
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Δημιουργία πελάτη
@@ -1957,30 +1803,25 @@
 DocType: Quality Inspection Reading,Reading 9,Μέτρηση 9
 DocType: Supplier,Is Frozen,Είναι Κατεψυγμένα
 DocType: Buying Settings,Buying Settings,Ρυθμίσεις αγοράς
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Μαζικού τελειώματος
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Αρ. Λ.Υ. Για ένα τελικό καλό είδος
 DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID πωλήσεων. ( Π.Χ. Sales@example.Com )
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Tool,Payment Account,Λογαριασμός πληρωμών
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Προσχέδιο
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Quality Inspection Reading,Accepted,Αποδεκτό
-DocType: User,Female,Γυναίκα
-DocType: Journal Entry Account,Debit in Account Currency,Χρέωση του λογαριασμού Νόμισμα
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
-DocType: Print Settings,Modern,Σύγχρονος
-DocType: Communication,Replied,Απαντήθηκε
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
 DocType: Payment Tool,Total Payment Amount,Συνολικό ποσό πληρωμής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) Δεν μπορεί να είναι μεγαλύτερο από το προβλεπόμενο ποσότητα ({2}) στην εντολή παραγωγή  {3}
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
 DocType: Newsletter,Test,Δοκιμή
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Δεδομένου ότι υπάρχουν χρηματιστηριακές συναλλαγές για αυτό το προϊόν, \ δεν μπορείτε να αλλάξετε τις τιμές των «Έχει Αύξων αριθμός», «Έχει Παρτίδα No», «Είναι αναντικατάστατο» και «Μέθοδος αποτίμησης»"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
@@ -1988,17 +1829,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Αιτήσεις για είδη
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Μια ξεχωριστή εντολή παραγωγής θα δημιουργηθεί για κάθε τελικό καλό είδος.
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Ολοκλήρωση της εγκατάστασης
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Η λογιστική εγγραφή έχει παγώσει μέχρι την ημερομηνία αυτή, κανείς δεν μπορεί να κάνει / τροποποιήσει καταχωρήσεις, εκτός από τον ρόλο που καθορίζεται παρακάτω."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Κατάσταση έργου
 DocType: UOM,Check this to disallow fractions. (for Nos),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Κατάλογος διευθύνσεων ενημερωτικών δελτίων
 DocType: Delivery Note,Transporter Name,Όνομα μεταφορέα
+DocType: Authorization Rule,Authorized Value,Εξουσιοδοτημένος Αξία
 DocType: Contact,Enter department to which this Contact belongs,Εισάγετε το τμήμαστο οποίο ανήκει αυτή η επαφή
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Σύνολο απόντων
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Μονάδα μέτρησης
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Μονάδα μέτρησης
 DocType: Fiscal Year,Year End Date,Ημερομηνία λήξης έτους
 DocType: Task Depends On,Task Depends On,Εργασία Εξαρτάται από
 DocType: Lead,Opportunity,Ευκαιρία
@@ -2019,16 +1860,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Βασική Τιμή (σύμφωνα Χρηματιστήριο UOM)
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Διάτρηση
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
 DocType: Customer Group,Has Child Node,Έχει θυγατρικό κόμβο
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Εισάγετε στατικές παραμέτρους url εδώ (π.Χ. Αποστολέα = erpnext, όνομα = erpnext, password = 1234 κλπ.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} δεν είναι σε καμία ενεργή χρήση. Για περισσότερες πληροφορίες δείτε {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Αυτό είναι ένα παράδειγμα ιστοσελίδας που δημιουργείται αυτόματα από το erpnext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Eύρος γήρανσης 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Φωτοχημική κατεργασία
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2070,11 +1910,9 @@
  8. Εισάγετε σειρά: αν βασίζεται στο """"σύνολο προηγούμενης σειράς"""", μπορείτε να επιλέξετε τον αριθμό της γραμμής που θα πρέπει να ληφθεί ως βάση για τον υπολογισμό αυτό (η προεπιλογή είναι η προηγούμενη σειρά).
  9. Υπολογισμός φόρου ή επιβάρυνσης για: Σε αυτόν τον τομέα μπορείτε να ορίσετε αν ο φόρος/επιβάρυνση είναι μόνο για αποτίμηση (δεν είναι μέρος του συνόλου) ή μόνο για το σύνολο (δεν προσθέτει αξία στο είδος) ή και για τα δύο.
 10. Πρόσθεση ή Έκπτωση: Αν θέλετε να προσθέσετε ή να αφαιρέσετε τον φόρο."
-DocType: Note,Note,Σημείωση
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
-DocType: Email Account,Email Ids,Email ταυτότητες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Global Defaults,Hide Currency Symbol,Απόκρυψη συμβόλου νομίσματος
@@ -2082,40 +1920,36 @@
 DocType: Journal Entry,Credit Note,Πιστωτικό σημείωμα
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {0} για τη λειτουργία {1}
 DocType: Features Setup,Quality,Ποιότητα
-DocType: Contact Us Settings,Introduction,Εισαγωγή
 DocType: Warranty Claim,Service Address,Διεύθυνση υπηρεσίας
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Μέγιστο 100 σειρές για συμφωνία αποθέματος.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Μέγιστο 100 σειρές για συμφωνία αποθέματος.
 DocType: Stock Entry,Manufacture,Παραγωγή
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Παρακαλώ πρώτα το δελτίο αποστολής
 DocType: Purchase Invoice,Currency and Price List,Νόμισμα και τιμοκατάλογος
 DocType: Opportunity,Customer / Lead Name,Πελάτης / όνομα επαφής
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Παραγωγή
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Παραγωγή
 DocType: Item,Allow Production Order,Επίτρεψε εντολής παραγωγής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
 DocType: Lead,Fax,Φαξ
 DocType: Purchase Taxes and Charges,Parenttype,Γονικός τύπος
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Υποβλήθηκε
 DocType: Salary Structure,Total Earning,Σύνολο κέρδους
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Διευθύνσεις μου
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ή
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Έξοδα κοινής ωφέλειας
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Παραπάνω
 DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
-,Download Backups,Λήψη αντιγράφων ασφαλείας
-DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης 
+DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Τύπος πληρωμής
 DocType: Process Payroll,Select Employees,Επιλέξτε εργαζόμενοι
 DocType: Bank Reconciliation,To Date,Έως ημερομηνία
 DocType: Opportunity,Potential Sales Deal,Πιθανή συμφωνία πώλησης
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Λεπτομέρειες
 DocType: Purchase Invoice,Total Taxes and Charges,Σύνολο φόρων και επιβαρύνσεων
 DocType: Employee,Emergency Contact,Επείγουσα επικοινωνία
 DocType: Item,Quality Parameters,Παράμετροι ποιότητας
@@ -2130,40 +1964,36 @@
 DocType: Stock Entry Detail,Serial No / Batch,Σειριακός αριθμός / παρτίδα
 DocType: Product Bundle,Parent Item,Γονικό είδος
 DocType: Account,Account Type,Τύπος λογαριασμού
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Αφήστε Τύπος {0} δεν μπορεί να μεταφέρει, διαβιβάζεται"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
-DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα 
+DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα
 DocType: Landed Cost Voucher,Purchase Receipt Items,Είδη αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Έντυπα Προσαρμογή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Κοπή
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,Λογαριασμός εσόδων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Καλούπι
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Έγγραφα
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Αναφορά
 DocType: Cost Center,Cost Center,Κέντρο κόστους
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Αποδεικτικό #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Αποδεικτικό #
 DocType: Notification Control,Purchase Order Message,Μήνυμα παραγγελίας αγοράς
 DocType: Tax Rule,Shipping Country,Αποστολές Χώρα
 DocType: Upload Attendance,Upload HTML,Ανεβάστε ΗΤΜΛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Το σύνολο προκαταβολών ({0}) για την παραγγελία {1} δεν μπορεί να είναι μεγαλύτερο \
  από το γενικό σύνολο ({2})"
 DocType: Employee,Relieving Date,Ημερομηνία απαλλαγής
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω καταχώρησης αποθέματος / σημειώματος παράδοσης / αποδεικτικού παραλαβής αγοράς
 DocType: Employee Education,Class / Percentage,Κλάση / ποσοστό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Φόρος εισοδήματος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Λέιζερ μηχανικής καθαρή διαμόρφωση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Φόρος εισοδήματος
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Εάν ο κανόνας τιμολόγησης δημιουργήθηκε για την τιμή τότε θα αντικαταστήσει τον τιμοκατάλογο. Η τιμή του κανόνα τιμολόγησης είναι η τελική τιμή, οπότε δε θα πρέπει να εφαρμόζεται καμία επιπλέον έκπτωση. Ως εκ τούτου, στις συναλλαγές, όπως παραγγελίες πώλησης, παραγγελία αγοράς κλπ, θα εμφανίζεται στο πεδίο τιμή, παρά στο πεδίο τιμή τιμοκαταλόγου."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
@@ -2171,10 +2001,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
-DocType: User,Bio,Βιογραφικό
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Νέο όνομα κέντρου κόστους 
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Δεν βρέθηκε προεπιλεγμένο πρότυπο διεύθυνσης. Παρακαλώ να δημιουργήσετε ένα νέο από το μενού εγκατάσταση > εκτύπωση και σηματοποίηση > πρότυπο διεύθυνσης
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
@@ -2186,31 +2015,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Πολύ Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Πολύ Μεγάλο
 ,Profit and Loss Statement,Έκθεση αποτελέσματος χρήσης
 DocType: Bank Reconciliation Detail,Cheque Number,Αριθμός επιταγής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Πατώντας
-DocType: Payment Tool Detail,Payment Tool Detail,Λεπτομέρειες εργαλείου πληρωμής 
+DocType: Payment Tool Detail,Payment Tool Detail,Λεπτομέρειες εργαλείου πληρωμής
 ,Sales Browser,Περιηγητής πωλήσεων
 DocType: Journal Entry,Total Credit,Συνολική πίστωση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Τοπικός
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Δάνεια και προκαταβολές ( ενεργητικό )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Χρεώστες
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Δεν βρέθηκε υπάλληλος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Μεγάλο
 DocType: C-Form Invoice Detail,Territory,Περιοχή
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Purchase Order,Customer Address Display,Διεύθυνση Πελατών Οθόνη
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Στίλβωσης
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Προεπιλεγμένη μονάδα μέτρησης για τη θέση {0} δεν μπορεί να αλλάξει άμεσα, διότι \ έχετε ήδη κάνει κάποια συναλλαγή (ες) με μια άλλη UOM. Για να αλλάξετε την προεπιλεγμένη UOM, \ χρήση »UOM αντικατάστασης χρησιμότητα» εργαλείο στο πλαίσιο της μονάδας Χρηματιστήριο."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Καθορίστε την ισοτιμία να μετατραπεί ένα νόμισμα σε ένα άλλο
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Η προσφορά {0} είναι ακυρωμένη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Συνολικού ανεξόφλητου υπολοίπου
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ο υπάλληλος {0} ήταν σε άδεια στις {1}. Δεν γίνεται να σημειωθεί παρουσία.
 DocType: Sales Partner,Targets,Στόχοι
@@ -2218,14 +2041,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
 DocType: Production Order Operation,Make Time Log,Δημιούργησε αρχείο καταγραφής χρόνου
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Παρακαλούμε να ορίσετε την ποσότητα αναπαραγγελίας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Υπολογιστές
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Ηλεκτρο-χημική λείανση
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Παρακαλώ ρυθμίστε το λογιστικό σχέδιο πριν ξεκινήσετε λογιστικές εγγραφές
 DocType: Purchase Invoice,Ignore Pricing Rule,Αγνοήστε τον κανόνα τιμολόγησης
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Ακυρώθηκε
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Από Ημερομηνία Δομή μισθός δεν μπορεί να είναι μικρότερο από ό, τι Υπάλληλος Ημερομηνία Ενώνουμε."
 DocType: Employee Education,Graduate,Πτυχιούχος
 DocType: Leave Block List,Block Days,Αποκλεισμός ημερών
@@ -2254,7 +2076,7 @@
  5. Εγγύηση αν υπάρχει.
  6. Πολιτική επιστροφών.
  7. Όροι αποστολής αν είναι εφαρμοστέοι.
- 8. Τρόποι αντιμετώπισης των διαφορών, αποζημίωση, ευθύνη, κλπ ||| 
+ 8. Τρόποι αντιμετώπισης των διαφορών, αποζημίωση, ευθύνη, κλπ ||| 
  9. Διεύθυνση και στοιχεία επικοινωνίας της εταιρείας σας."
 DocType: Attendance,Leave Type,Τύπος άδειας
 apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
@@ -2262,7 +2084,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Επιλέξτε αν είναι επαναλαμβανόμενο τιμολόγιο, καταργήστε την επιλογή για να σταματήσει η επανάληψη ή θέστε σωστή ημερομηνία λήξης"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Επιτρέπονται μέγιστο {0} σειρές
 DocType: C-Form Invoice Detail,Net Total,Καθαρό σύνολο
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Χρέωση (τιμολόγιο πώλησης)
@@ -2279,20 +2100,19 @@
 DocType: Maintenance Visit,Purposes,Σκοποί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Ηλεκτροχημική κατεργασία
 ,Requested,Ζητήθηκαν
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Δεν βρέθηκαν παρατηρήσεις
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Εκπρόθεσμες
 DocType: Account,Stock Received But Not Billed,Το απόθεμα παρελήφθηκε αλλά δεν χρεώθηκε
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Μικτές αποδοχές + ληξιπρόθεσμο ποσό + ποσό εξαργύρωσης - συνολική μείωση
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Features Setup,Sales and Purchase,Πωλήσεις και αγορές
 DocType: Supplier Quotation Item,Material Request No,Αρ. Αίτησης υλικού
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα του πελάτη μετατρέπεται στο βασικό νόμισμα της εταιρείας
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} έχει διαγραφεί επιτυχώς από αυτή τη λίστα.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Καθαρό ποσοστό (Εταιρεία νομίσματος)
-apps/frappe/frappe/templates/base.html +134,Added,Προστέθηκε
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Διαχειριστείτε το δέντρο περιοχών.
 DocType: Journal Entry Account,Sales Invoice,Τιμολόγιο πώλησης
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
@@ -2306,11 +2126,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Η χρήση {0} δεν βρέθηκε.
 DocType: Bank Reconciliation,Get Relevant Entries,Βρες σχετικές καταχωρήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Νομισματοκοπίας
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
-apps/frappe/frappe/desk/query_report.py +136,Total,Σύνολο
 DocType: Purchase Invoice,Apply Additional Discount On,Εφαρμόστε επιπλέον έκπτωση On
 DocType: Account,Root Type,Τύπος ρίζας
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Σειρά # {0}: Δεν μπορεί να επιστρέψει πάνω από {1} για τη θέση {2}
@@ -2320,14 +2138,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Ποσό Φόρου Μετά Ποσό έκπτωσης (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Η αποθήκη προορισμού είναι απαραίτητη για τη γραμμή {0}
 DocType: Quality Inspection,Quality Inspection,Επιθεώρηση ποιότητας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Ψεκάστε σχηματίζοντας
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL or BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Ελάχιστη ποσότητα
 DocType: Stock Entry,Subcontract,Υπεργολαβία
@@ -2338,42 +2155,39 @@
 DocType: Item,Manufacturer Part Number,Αριθμός είδους κατασκευαστή
 DocType: Production Order Operation,Estimated Time and Cost,Εκτιμώμενος χρόνος και κόστος
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Αρ. Απεσταλμένων SMS
 DocType: Account,Company,Εταιρεία
 DocType: Account,Expense Account,Λογαριασμός δαπανών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Λογισμικό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Χρώμα
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Λογισμικό
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Χρώμα
 DocType: Maintenance Visit,Scheduled,Προγραμματισμένη
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο&quot; είναι &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; είναι &quot;ναι&quot; και δεν υπάρχει άλλος Bundle Προϊόν
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Επιλέξτε μηνιαία κατανομή για την άνιση κατανομή στόχων στους μήνες.
 DocType: Purchase Invoice Item,Valuation Rate,Ποσοστό αποτίμησης
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Γραμμή είδους {0}: Η απόδειξη παραλαβής {1} δεν υπάρχει στον παραπάνω πίνακα με τα «αποδεικτικά παραλαβής»
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Ημερομηνία έναρξης του έργου
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Μέχρι
 DocType: Rename Tool,Rename Log,Αρχείο καταγραφής μετονομασίας
 DocType: Installation Note Item,Against Document No,Ενάντια έγγραφο αριθ.
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Διαχειριστείτε συνεργάτες πωλήσεων.
 DocType: Quality Inspection,Inspection Type,Τύπος ελέγχου
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Παρακαλώ επιλέξτε {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Ερευνητής
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ενημέρωση
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Ερευνητής
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Παρακαλώ αποθηκεύστε το ενημερωτικό δελτίο πριν από την αποστολή
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Όνομα ή Email είναι υποχρεωτικό
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Έλεγχος ποιότητας εισερχομένων
 DocType: Purchase Order Item,Returned Qty,Επέστρεψε Ποσότητα
 DocType: Employee,Exit,Έξοδος
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Ο τύπος ρίζας είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Ο τύπος ρίζας είναι υποχρεωτικός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Ο σειριακός αριθμός {0} δημιουργήθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Δονητικές φινιρίσματος
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Για την εξυπηρέτηση των πελατών, οι κωδικοί αυτοί μπορούν να χρησιμοποιηθούν σε μορφές εκτύπωσης, όπως τιμολόγια και δελτία παράδοσης"
 DocType: Employee,You can enter any date manually,Μπορείτε να εισάγετε οποιαδήποτε ημερομηνία με το χέρι
 DocType: Sales Invoice,Advertisement,Διαφήμιση
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Δοκιμαστική περίοδος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Δοκιμαστική περίοδος
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι-φύλλα επιτρέπονται σε μία συναλλαγή
 DocType: Expense Claim,Expense Approver,Υπεύθυνος έγκρισης δαπανών
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
@@ -2381,45 +2195,42 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Άλεση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Συρρίκνωση περιτυλίγματος
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Εν αναμονή Δραστηριότητες
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Επιβεβαιώθηκε
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Προμηθευτής> Τύπος προμηθευτή
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Ποσό
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Επιλέξτε οικονομικό έτος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Ανάλυση μισθού με βάση τις αποδοχές και τις παρακρατήσεις.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Ένας λογαριασμός με κόμβους παιδί δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Address,Preferred Shipping Address,Προτιμώμενη διεύθυνση αποστολής
 DocType: Purchase Receipt Item,Accepted Warehouse,Έγκυρη Αποθήκη
 DocType: Bank Reconciliation Detail,Posting Date,Ημερομηνία αποστολής
 DocType: Item,Valuation Method,Μέθοδος αποτίμησης
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1}
 DocType: Sales Invoice,Sales Team,Ομάδα πωλήσεων
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Διπλότυπη καταχώρηση. 
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Διπλότυπη καταχώρηση.
 DocType: Serial No,Under Warranty,Στα πλαίσια της εγγύησης
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Σφάλμα]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία πώλησης.
 ,Employee Birthday,Γενέθλια υπαλλήλων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
 DocType: Pricing Rule,Discount Percentage,Ποσοστό έκπτωσης
 DocType: Payment Reconciliation Invoice,Invoice Number,Αριθμός τιμολογίου
-apps/erpnext/erpnext/hooks.py +70,Orders,Παραγγελίες
+apps/erpnext/erpnext/hooks.py +54,Orders,Παραγγελίες
 DocType: Leave Control Panel,Employee Type,Τύπος υπαλλήλου
 DocType: Employee Leave Approver,Leave Approver,Υπεύθυνος έγκρισης άδειας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Αποτύπωσης
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Υλικό το οποίο μεταφέρεται για την Κατασκευή
-DocType: Expense Claim,"A user with ""Expense Approver"" role",Ένας χρήστης με ρόλο «υπεύθυνος έγκρισης δαπανών» 
+DocType: Expense Claim,"A user with ""Expense Approver"" role",Ένας χρήστης με ρόλο «υπεύθυνος έγκρισης δαπανών»
 ,Issued Items Against Production Order,Είδη που εκδόθηκαν κατά την εντολή παραγωγής
 DocType: Pricing Rule,Purchase Manager,¥πεύθυνος αγορών
 DocType: Payment Tool,Payment Tool,Εργαλείο πληρωμής
@@ -2429,7 +2240,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Άκυρη περίοδο
 DocType: Customer,Credit Limit,Πιστωτικό όριο
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Επιλέξτε τον τύπο της συναλλαγής
 DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
@@ -2439,11 +2249,10 @@
 DocType: Customer,Address and Contact,Διεύθυνση και Επικοινωνία
 DocType: Customer,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Employee,Feedback,Ανατροφοδότηση
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Η άδεια δεν μπορεί να χορηγείται πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Συντήρηση. Πρόγραμμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Μηχανική κατεργασία Λειαντικά jet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Συντήρηση. Πρόγραμμα
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
-DocType: Website Settings,Website Settings,Ρυθμίσεις δικτυακού τόπου
 DocType: Item,Reorder level based on Warehouse,Αναδιάταξη επίπεδο με βάση Αποθήκης
 DocType: Activity Cost,Billing Rate,Χρέωση Τιμή
 ,Qty to Deliver,Ποσότητα για παράδοση
@@ -2454,20 +2263,19 @@
 DocType: Material Request,Requested For,Ζητήθηκαν για
 DocType: Quotation Item,Against Doctype,Κατά τύπο εγγράφου
 DocType: Delivery Note,Track this Delivery Note against any Project,Παρακολουθήστε αυτό το δελτίο αποστολής σε οποιουδήποτε έργο
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Ο λογαριασμός ρίζας δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Προβολή καταχωρήσεων αποθέματος
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Αναφορά # {0} της {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Pricing Rule,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
-DocType: Communication,Phone,Τηλέφωνο
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Κλείσιμο (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Κλείσιμο (dr)
 DocType: Contact,Passive,Αδρανής
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Φορολογικό πρότυπο για συναλλαγές πώλησης.
@@ -2483,10 +2291,9 @@
 ,Billed Amount,Χρεωμένο ποσό
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Λήψη ενημερώσεων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Αφήστε Διαχείρισης
-DocType: Event,Groups,Ομάδες
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Ομαδοποίηση κατά λογαριασμό
 DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
 DocType: Lead,Lower Income,Χαμηλότερο εισόδημα
@@ -2495,40 +2302,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Γρήγορη βοήθεια
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
 DocType: Features Setup,Sales Extras,Πρόσθετα πωλήσεων
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Ο προϋπολογισμός για τον λογαριασμό {1} για το κέντρο κόστους {2} θα ξεφύγει κατά {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Ο προϋπολογισμός για τον λογαριασμό {1} για το κέντρο κόστους {2} θα ξεφύγει κατά {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""από ημερομηνία"" πρέπει να είναι μεταγενέστερο του πεδίο ""έως ημερομηνία"""
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Αξία ή ποσ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Λεπτό
-DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς 
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Λεπτό
+DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
 ,Qty to Receive,Ποσότητα για παραλαβή
 DocType: Leave Block List,Leave Block List Allowed,Η λίστα αποκλεισμού ημερών άδειας επετράπη
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Ο συντελεστής μετατροπής δεν μπορεί να είναι κλάσμα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Θα το χρησιμοποιήσετε για να συνδεθείτε
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Θα το χρησιμοποιήσετε για να συνδεθείτε
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Όλοι οι τύποι προμηθευτή
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Δημιούργησε βεβαίωση αποδοχών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Εξασφαλισμένα δάνεια
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Εκπληκτικά προϊόντα
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Εκπληκτικά προϊόντα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Δεν μπορείτε να εγκρίνετε την άδεια, καθώς δεν έχετε το δικαίωμα έγκρισης αδειών σε αποκλεισμένες ημερομηνίες"
 DocType: Appraisal,Appraisal,Εκτίμηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-χύτευση αφρό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Σχέδιο
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Η ημερομηνία επαναλαμβάνεται
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ο υπεύθυνος έγκρισης άδειας πρέπει να είναι ένας από {0}
 DocType: Hub Settings,Seller Email,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Workstation Working Hour,Start Time,Ώρα έναρξης
@@ -2542,50 +2346,45 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
 DocType: BOM Operation,Hour Rate,Χρέωση ανά ώρα
 DocType: Stock Settings,Item Naming By,Ονομασία είδους κατά
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Από την προσφορά
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Από την προσφορά
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Μια ακόμη καταχώρηση κλεισίματος περιόδου {0} έχει γίνει μετά από {1}
 DocType: Production Order,Material Transferred for Manufacturing,Υλικό το οποίο μεταφέρεται για Βιομηχανία
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Purchase Receipt Item,Purchase Order Item No,Αριθμός είδους παραγγελίας αγοράς
-DocType: System Settings,System Settings,Ρυθμίσεις συστήματος
 DocType: Project,Project Type,Τύπος έργου
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα. 
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Το κόστος των διαφόρων δραστηριοτήτων
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
 DocType: Item,Inspection Required,Απαιτείται έλεγχος
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Μετρητά στο χέρι
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
 DocType: Serial No,Is Cancelled,Είναι ακυρωμένο
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Αποστολές μου
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Αποστολές μου
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
-DocType: Communication,Recipients,Παραλήπτες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Βίδωμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Ρίκνωση
 DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 DocType: Hub Settings,Publish Items to Hub,Δημοσιεύστε είδη στο hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Η ΄από τιμή' πρέπει να είναι μικρότερη από την 'έως τιμή' στη γραμμή {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Τραπεζικό έμβασμα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Παρακαλώ επιλέξτε τραπεζικό λογαριασμό
 DocType: Newsletter,Create and Send Newsletters,Δημιουργήστε και στείλτε τα ενημερωτικά δελτία
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Το πεδίο Από την ημερομηνία πρέπει να είναι προγενέστερο του έως ημερομηνία
 DocType: Sales Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Ομάδα πελατών / πελάτης
 DocType: Item Group,Check this if you want to show in website,"Ελέγξτε αυτό, αν θέλετε να εμφανίζεται στην ιστοσελίδα"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Καλώς ήλθατε στο erpnext
+,Welcome to ERPNext,Καλώς ήλθατε στο erpnext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Αριθμός λεπτομερειών αποδεικτικού
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Να οδηγήσει σε εισαγωγικά
 DocType: Lead,From Customer,Από πελάτη
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Κλήσεις
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Κλήσεις
 DocType: Project,Total Costing Amount (via Time Logs),Σύνολο Κοστολόγηση Ποσό (μέσω χρόνος Καταγράφει)
 DocType: Purchase Order Item Supplied,Stock UOM,Μ.Μ. Αποθέματος
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
 ,Projected,Προβλεπόμενη
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Ο σειριακός αριθμός {0} δεν ανήκει στην αποθήκη {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Σημείωση : το σύστημα δεν θα ελέγχει για υπέρβαση ορίων παράδοσης και κράτησης για το είδος {0} καθώς η ποσότητα ή το ποσό είναι 0
@@ -2593,13 +2392,10 @@
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
 DocType: Journal Entry,Remark,Παρατήρηση
 DocType: Purchase Receipt Item,Rate and Amount,Τιμή και ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Βαρετό
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Από παραγγελία πώλησης
-DocType: Blog Category,Parent Website Route,Γονική διαδρομή ιστοσελίδας
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Και οι δύο αποθήκες πρέπει να ανήκουν στην ίδια εταιρεία
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Δεν δημιουργήθηκαν επαφές 
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ανενεργό
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Δεν δημιουργήθηκαν επαφές
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Ποσό αποδεικτικοού κόστους αποστολής εμπορευμάτων
 DocType: Time Log,Batched for Billing,Ομαδοποιημένα για χρέωση
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Λογαριασμοί από τους προμηθευτές.
@@ -2607,20 +2403,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Ποσό έκπτωσης
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Π.Χ. Φπα
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,Π.Χ. Φπα
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Στοιχείο 4
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot αερίου μορφοποίησης μετάλλου
-DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης 
+DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
 DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Αποθήκη {0}: η εταιρεία είναι απαραίτητη
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Πηγαίνετε στην κατάλληλη ομάδα (συνήθως Πηγή Χρηματοδότησης&gt; Βραχυπρόθεσμες Υποχρεώσεις&gt; φόρους και δασμούς και να δημιουργήσετε ένα νέο λογαριασμό (κάνοντας κλικ στην επιλογή Προσθήκη Παιδί) του τύπου «φόρος» και δεν αναφέρουν το ποσοστό φόρου.
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Λέιζερ κοπή
-DocType: Event,Monday,Δευτέρα
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Account,Payable,Πληρωτέος
 DocType: Salary Slip,Arrear Amount,Καθυστερημένο ποσό
@@ -2633,7 +2426,6 @@
 DocType: Lead,Address Desc,Περιγραφή διεύθυνσης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις επιλογές πωλήση - αγορά
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Που γίνονται οι μεταποιητικές εργασίες
-DocType: Page,All,Όλα
 DocType: Stock Entry Detail,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
 DocType: Employee,Confirmation Date,Ημερομηνία επιβεβαίωσης
@@ -2641,9 +2433,8 @@
 DocType: Account,Sales User,Χρήστης πωλήσεων
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Η ελάχιστη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την μέγιστη ποσότητα
 DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Σετ
 DocType: Lead,Lead Owner,Ιδιοκτήτης επαφής
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Αποθήκη απαιτείται
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Αποθήκη απαιτείται
 DocType: Employee,Marital Status,Οικογενειακή κατάσταση
 DocType: Stock Settings,Auto Material Request,Αυτόματη αίτηση υλικού
 DocType: Time Log,Will be updated when billed.,Θα ενημερωθεί με την τιμολόγηση.
@@ -2657,44 +2448,40 @@
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Προμηθεύτηκε είδος παραγγελίας αγοράς
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Όνομα Εταιρίας δεν μπορεί να είναι Εταιρεία
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Τίτλοι για πρότυπα εκτύπωσης, π.Χ. Προτιμολόγιο."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Στίλβωσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ. 
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Εγγραφή όλων των ανακοινώσεων τύπου e-mail, τηλέφωνο, chat, επίσκεψη, κ.α."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Παρακαλείστε να αναφέρετε στρογγυλεύουν Κέντρο Κόστους στην Εταιρεία
 DocType: Purchase Invoice,Terms,Όροι
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Δημιουργία νέου
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Δημιουργία νέου
 DocType: Buying Settings,Purchase Order Required,Απαιτείται παραγγελία αγοράς
 ,Item-wise Sales History,Ιστορικό πωλήσεων ανά είδος
 DocType: Expense Claim,Total Sanctioned Amount,Σύνολο εγκεκριμένων ποσών
 ,Purchase Analytics,Ανάλυση αγοράς
 DocType: Sales Invoice Item,Delivery Note Item,Είδος δελτίου αποστολής
 DocType: Expense Claim,Task,Έργασία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Ξύρισμα
 DocType: Purchase Taxes and Charges,Reference Row #,Γραμμή αναφοράς #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Ο αριθμός παρτίδας είναι απαραίτητος για το είδος {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Αυτός είναι ένας κύριος πωλητής και δεν μπορεί να επεξεργαστεί.
 ,Stock Ledger,Καθολικό αποθέματος
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Τιμή: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Τιμή: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Παρακρατήσεις στη βεβαίωση αποδοχών
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Σημειώσεις
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Επιλέξτε πρώτα έναν κόμβο ομάδας.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Κατεβάστε μια έκθεση που περιέχει όλες τις πρώτες ύλες με την πιο πρόσφατη κατάσταση των αποθεμάτων τους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Αντιμετωπίζοντας
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Κοινότητα Φόρουμ
 DocType: Leave Application,Leave Balance Before Application,Υπόλοιπο άδειας πριν από την εφαρμογή
 DocType: SMS Center,Send SMS,Αποστολή SMS
 DocType: Company,Default Letter Head,Προεπιλογή κεφαλίδα επιστολόχαρτου
 DocType: Time Log,Billable,Χρεώσιμο
-DocType: Authorization Rule,This will be used for setting rule in HR module,Αυτό θα χρησιμοποιηθεί για την ρύθμιση κανόνα στην ενότητα hr
 DocType: Account,Rate at which this tax is applied,Ποσοστό με το οποίο επιβάλλεται ο φόρος αυτός
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Αναδιάταξη ποσότητας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
@@ -2706,12 +2493,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Απώλεια ευκαιρίας
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Τα πεδία με έκπτωση θα είναι διαθέσιμα σε παραγγελία αγοράς, αποδεικτικό παραλαβής αγοράς, τιμολόγιο αγοράς"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα του νέου λογαριασμού. Σημείωση: Παρακαλώ μην δημιουργείτε λογαριασμούς για τους πελάτες και προμηθευτές
-DocType: Report,Report Type,Τύπος έκθεσης
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Φόρτωση
 DocType: BOM Replace Tool,BOM Replace Tool,Εργαλείο αντικατάστασης Λ.Υ.
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Προκαθορισμένα πρότυπα διεύθυνσης ανά χώρα
 DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Εμφάνιση φόρου διάλυση
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Αν δραστηριοποιείστε σε μεταποιητικές δραστηριότητες, επιτρέπει την επιλογή 'κατασκευάζεται '"
@@ -2721,16 +2506,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 DocType: Purchase Order Item,Material Request Detail No,Αρ. Λεπτομερειών αίτησης υλικού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Σκληρό καμπής
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
 DocType: Company,Default Cash Account,Προεπιλεγμένος λογαριασμός μετρητών
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Σημείωση: εάν η πληρωμή δεν γίνεται κατά οποιαδήποτε αναφορά, δημιουργήστε την λογιστική εγγραφή χειροκίνητα."
 DocType: Item,Supplier Items,Είδη προμηθευτή
 DocType: Opportunity,Opportunity Type,Τύπος ευκαιρίας
@@ -2742,112 +2526,96 @@
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
 ,Stock Ageing,Γήρανση αποθέματος
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Αυτόματη αποστολή email στις επαφές για την υποβολή των συναλλαγών.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
-DocType: Event,Sunday,Κυριακή
 DocType: Sales Team,Contribution (%),Συμβολή (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Αρμοδιότητες
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Αρμοδιότητες
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Παρακαλώ εισάγετε τουλάχιστον 1 τιμολόγιο στον πίνακα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Προσθήκη χρηστών
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Προσθήκη χρηστών
 DocType: Pricing Rule,Item Group,Ομάδα ειδών
 DocType: Task,Actual Start Date (via Time Logs),Πραγματική Ημερομηνία Έναρξης (μέσω χρόνος Καταγράφει)
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Έως {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
-DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ. 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
+DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
 DocType: Time Log Batch,Total Hours,Σύνολο ωρών
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Αυτοκίνητο
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Το είδος είναι απαραίτητο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Μεταλλικά ένεση γείσο
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Από το δελτίο αποστολής
 DocType: Time Log,From Time,Από ώρα
 DocType: Notification Control,Custom Message,Προσαρμοσμένο μήνυμα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",Επιλέξτε τη χώρα σας και ελέγξτε την ζώνη ώρας και το νόμισμα.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Επενδυτική τραπεζική
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Αποξείδωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Άμμος χύτευσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Ηλεκτρολυτική
 DocType: Purchase Invoice Item,Rate,Τιμή
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Εκπαιδευόμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Εκπαιδευόμενος
 DocType: Newsletter,A Lead with this email id should exist,Μια επαφή με αυτή τη διεύθυνση email θα πρέπει να υπάρχει
 DocType: Stock Entry,From BOM,Από BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Βασικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Η 'έως ημερομηνία' πρέπει να είναι η ίδια με την 'από ημερομηνία'΄για την άδεια μισής ημέρας
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","Π.Χ. Kg, μονάδα, αριθμοί, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","Π.Χ. Kg, μονάδα, αριθμοί, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
 DocType: Salary Structure,Salary Structure,Μισθολόγιο
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Πολλαπλοί κανόνας τιμής υπάρχουν με τα ίδια κριτήρια, παρακαλώ να επιλύσετε την διένεξη \ σύγκρουση με τον ορισμό προτεραιότητας. Κανόνες τιμής: {0}"""
 DocType: Account,Bank,Τράπεζα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 DocType: Hub Settings,Access Token,Η πρόσβαση παραχωρήθηκε
 DocType: Sales Invoice Item,Serial No,Σειριακός αριθμός
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
-DocType: Item,Is Fixed Asset Item,Είναι πάγιο στοιχείο 
+DocType: Item,Is Fixed Asset Item,Είναι πάγιο στοιχείο
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Αν έχετε μεγάλες μορφές εκτύπωσης, αυτό το χαρακτηριστικό μπορεί να χρησιμοποιηθεί για να χωρίσει τη σελίδα που θα εκτυπωθεί σε πολλές σελίδες με όλες τις κεφαλίδες και τα υποσέλιδα σε κάθε σελίδα"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Όλα τα εδάφη
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 DocType: Fiscal Year,Year Name,Όνομα έτους
-DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας 
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
+DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
 DocType: Purchase Invoice Item,Image View,Προβολή εικόνας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Φινίρισμα και βιομηχανικές φινίρισμα
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Κινητές αξίες & χρηματιστήρια εμπορευμάτων
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Γεώτρηση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow μορφοποίησης
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
 DocType: Tax Rule,Shipping City,Αποστολές Σίτι
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Account,Purchase User,Χρήστης αγορών
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Σφυρηλάτηση
-DocType: Web Page,Slideshow,Παρουσίαση
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Το προεπιλεγμένο πρότυπο διεύθυνσης δεν μπορεί να διαγραφεί
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
 DocType: Journal Entry,Print Heading,Εκτύπωση κεφαλίδας
 DocType: Quotation,Maintenance Manager,Υπεύθυνος συντήρησης
-DocType: Workflow State,Search,Αναζήτηση
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Το σύνολο δεν μπορεί να είναι μηδέν
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,Οι 'ημέρες από την τελευταία παραγγελία' πρέπει να είναι περισσότερες από 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Μπρουτζοκόλληση
 DocType: C-Form,Amended From,Τροποποίηση από
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Πρώτη ύλη
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Ποσό φόρου μετά ποσού έκπτωσης
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα. 
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Υπάρχει θυγατρικός λογαριασμός για αυτόν το λογαριασμό. Δεν μπορείτε να διαγράψετε αυτόν το λογαριασμό.
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Είτε ποσότητα-στόχος ή ποσό-στόχος είναι απαραίτητα.
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
 DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
@@ -2856,44 +2624,43 @@
 ,Produced,Παράχθηκε
 DocType: Item,Item Code for Suppliers,Κώδικας στοιχείων για Προμηθευτές
 DocType: Issue,Raised By (Email),Δημιουργήθηκε από (email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Γενικός
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Επισύναψη επιστολόχαρτου
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Γενικός
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Επισύναψη επιστολόχαρτου
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#39;αποκοπή συντελεστές τους. Αυτό θα δημιουργήσει ένα πρότυπο πρότυπο, το οποίο μπορείτε να επεξεργαστείτε και να προσθέσετε περισσότερο αργότερα."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#39;αποκοπή συντελεστές τους. Αυτό θα δημιουργήσει ένα πρότυπο πρότυπο, το οποίο μπορείτε να επεξεργαστείτε και να προσθέσετε περισσότερο αργότερα."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
 DocType: Authorization Rule,Applicable To (Designation),Εφαρμοστέα σε (ονομασία)
-DocType: Blog Post,Blog Post,Δημοσίευση blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Ομαδοποίηση κατά
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ενεργοποίηση / απενεργοποίηση νομισμάτων.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Ταχυδρομικές δαπάνες
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Purchase Order,The date on which recurring order will be stop,Η ημερομηνία κατά την οποία η επαναλαμβανόμενη παραγγελία θα σταματήσει
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} Πρέπει να μειωθεί κατά {1} ή θα πρέπει να αυξηθεί η ανοχή υπερχείλισης
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Σύνολο παρόντων
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ώρα
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Ώρα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Δημιουργία προσφοράς
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Όλα αυτά τα είδη έχουν ήδη τιμολογηθεί
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Μπορεί να εγκριθεί από {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
 DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
 DocType: Features Setup,Point of Sale,Point of sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Κέρλινγκ
 DocType: Account,Tax,Φόρος
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Γραμμή {0}: {1} δεν είναι έγκυρο {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Διύλιση
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Γραμμή {0}: {1} δεν είναι έγκυρο {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Από Bundle Προϊόν
 DocType: Production Planning Tool,Production Planning Tool,Εργαλείο σχεδιασμού παραγωγής
 DocType: Quality Inspection,Report Date,Ημερομηνία έκθεσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Δρομολόγηση
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Job Opening,Job Title,Τίτλος εργασίας
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Παραλήπτες
 DocType: Features Setup,Item Groups in Details,Ομάδες ειδών στις λεπτομέρειες
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
@@ -2902,33 +2669,29 @@
 DocType: Stock Entry,Update Rate and Availability,Ενημέρωση τιμή και τη διαθεσιμότητα
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Ποσοστό που επιτρέπεται να παραληφθεί ή να παραδοθεί περισσότερο από την ποσότητα παραγγελίας. Για παράδειγμα: εάν έχετε παραγγείλει 100 μονάδες. Και το επίδομα σας είναι 10%, τότε θα μπορούν να παραληφθούν 110 μονάδες."
 DocType: Pricing Rule,Customer Group,Ομάδα πελατών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: Item,Website Description,Περιγραφή δικτυακού τόπου
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
 DocType: Address,Plant,Βιομηχανικός εξοπλισμός
-DocType: DocType,Setup,Εγκατάσταση
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Ψυχρή έλαση
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
 DocType: GL Entry,Against Voucher Type,Κατά τον τύπο αποδεικτικού
 DocType: Item,Attributes,Γνωρίσματα
-DocType: Packing Slip,Get Items,Βρες είδη
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
-DocType: DocField,Image,Εικόνα
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Δημιούργησε τιμολόγιο έμμεσης εσωτερικής φορολογίας 
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Δημιούργησε τιμολόγιο έμμεσης εσωτερικής φορολογίας
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
-DocType: Communication,Other,Άλλος
 DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Αναγνωριστικό λειτουργίας δεν έχει οριστεί
 DocType: Production Order,Planned Start Date,Προγραμματισμένη ημερομηνία έναρξης
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Συντήρηση. Επίσκεψη
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Συντήρηση. Επίσκεψη
 DocType: Leave Type,Is Encash,Είναι είσπραξη
 DocType: Purchase Invoice,Mobile No,Αρ. Κινητού
 DocType: Payment Tool,Make Journal Entry,Δημιούργησε λογιστική εγγραφή
@@ -2936,35 +2699,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Τα στοιχεία με βάση το έργο δεν είναι διαθέσιμα στοιχεία για προσφορά
 DocType: Project,Expected End Date,Αναμενόμενη ημερομηνία λήξης
 DocType: Appraisal Template,Appraisal Template Title,Τίτλος προτύπου αξιολόγησης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Εμπορικός
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Εμπορικός
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Μητρική Θέση {0} δεν πρέπει να είναι ένα αναντικατάστατο
 DocType: Cost Center,Distribution Id,ID διανομής
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Εκπληκτικές υπηρεσίες
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Όλα τα προϊόντα ή τις υπηρεσίες.
 DocType: Purchase Invoice,Supplier Address,Διεύθυνση προμηθευτή
-DocType: Contact Us Settings,Address Line 2,Γραμμή διεύθυνσης 2
-DocType: ToDo,Reference,Αναφορά
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Διάτρηση
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ποσότητα εκτός
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Η σειρά είναι απαραίτητη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους από {1} σε {2} σε προσαυξήσεις των {3}
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Προεπιλεγμένοι λογαριασμοί εισπρακτέων
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Πριόνισμα
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Πλαστικοποίησης
 DocType: Item Reorder,Transfer,Μεταφορά
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
-DocType: Authorization Rule,Applicable To (Employee), Εφαρμοστέα σε (υπάλληλος)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Πυροσυσσωμάτωση
 DocType: Journal Entry,Pay To / Recd From,Πληρωτέο προς / λήψη από
 DocType: Naming Series,Setup Series,Εγκατάσταση σειρών
 DocType: Supplier,Contact HTML,Επαφή ΗΤΜΛ
@@ -2975,58 +2732,53 @@
 DocType: Company,Retail,Λιανική πώληση
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
-DocType: Product Bundle,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Σύνθλιψη
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
 DocType: GL Entry,Remarks,Παρατηρήσεις
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
-DocType: Features Setup,POS View,Προβολή POS 
+DocType: Features Setup,POS View,Προβολή POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Συνεχής χύτευση
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Παρακαλώ ορίστε μια
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Πάνω από
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Κρύο μέγεθος
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Ο λογαριασμός {0} δεν μπορεί να είναι ομάδα
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Περιοχή
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
 DocType: Holiday List,Weekly Off,Εβδομαδιαίες αργίες
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα το 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Προσωρινά κέρδη / ζημιές (πίστωση)
 DocType: Sales Invoice,Return Against Sales Invoice,Επιστροφή Ενάντια Τιμολόγιο Πώλησης
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Στοιχείο 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Παρακαλώ ορίστε προεπιλεγμένη τιμή {0} στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Παρακαλώ ορίστε προεπιλεγμένη τιμή {0} στην εταιρεία {1}
 DocType: Serial No,Creation Time,Χρόνος δημιουργίας
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Σύνολο εσόδων
 DocType: Sales Invoice,Product Bundle Help,Προϊόν Βοήθεια Bundle
 ,Monthly Attendance Sheet,Μηνιαίο δελτίο συμμετοχής
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Δεν βρέθηκαν εγγραφές
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Ο λογαριασμός {0} είναι ανενεργός
 DocType: GL Entry,Is Advance,Είναι προκαταβολή
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Η συμμετοχή από και μέχρι είναι απαραίτητη
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Παρακαλώ εισάγετε τιμή στο πεδίο 'υπεργολαβία' ναι ή όχι
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Ο τύπος λογαριασμού ""κέρδη και ζημίες"" {0} δεν επιτρέπετεαι στην αρχική καταχώρηση λογαριασμών"
-DocType: Workflow State,Time,Χρόνος
 DocType: Features Setup,Sales Discounts,Εκπτώσεις πωλήσεων
 DocType: Hub Settings,Seller Country,Χώρα πωλητή
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
 DocType: Sales Invoice,Terms and Conditions Details,Λεπτομέρειες όρων και προϋποθέσεων
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Φόρους επί των πωλήσεων και Χρεώσεις Πρότυπο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ένδυση & αξεσουάρ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ένδυση & αξεσουάρ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Αριθμός παραγγελίας
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ΗΤΜΛ / banner που θα εμφανιστούν στην κορυφή της λίστας των προϊόντων.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Καθορίστε τις συνθήκες για τον υπολογισμό του κόστους αποστολής
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Προσθήκη παιδιού
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ο ρόλος επιτρέπεται να καθορίζει παγωμένους λογαριασμούς & να επεξεργάζετε παγωμένες καταχωρήσεις
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Δεν είναι δυνατή η μετατροπή του κέντρου κόστους σε καθολικό, όπως έχει κόμβους-παιδιά"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Ο συντελεστής μετατροπής είναι απαραίτητος
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Σειριακός αριθμός #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Προμήθεια επί των πωλήσεων
 DocType: Offer Letter Term,Value / Description,Αξία / Περιγραφή
@@ -3034,15 +2786,13 @@
 ,Customers Not Buying Since Long Time,Πελάτες που έχουν πολύ καιρό να αγοράσουν
 DocType: Production Order,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Διογκώνοντας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Χύτευση Εξατμιστική-μοτίβο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Δαπάνες ψυχαγωγίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Το τιμολόγιο πώλησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Το τιμολόγιο πώλησης {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ηλικία
 DocType: Time Log,Billing Amount,Ποσό Χρέωσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ορίστηκε μη έγκυρη ποσότητα για το είδος {0}. Η ποσότητα αυτή θα πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Αιτήσεις για χορήγηση άδειας.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να διαγραφεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Νομικές δαπάνες
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί η αυτοματοποιημένη παραγγελία, π.Χ. 05, 28 Κλπ"
 DocType: Sales Invoice,Posting Time,Ώρα αποστολής
@@ -3056,26 +2806,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Νέα έσοδα πελατών
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Έξοδα μετακίνησης
 DocType: Maintenance Visit,Breakdown,Ανάλυση
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Ο λογαριασμός: {0} με το νόμισμα: {1} δεν μπορεί να επιλεγεί
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Ακονίζοντας
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
-DocType: Feed,Full Name,Ονοματεπώνυμο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Στερεώνοντας
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Επιτήρηση
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Η προεπιλεγμένη αποθήκη είναι απαραίτητη για αποθηκεύσιμα είδη.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Πληρωμή του μισθού για τον μήνα {0} και έτος {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 ,Transferred Qty,Μεταφερόμενη ποσότητα
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Πλοήγηση
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Προγραμματισμός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Προγραμματισμός
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Δημιούργησε χρονολόγιο παρτίδας
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Εκδόθηκε
 DocType: Project,Total Billing Amount (via Time Logs),Συνολικό Ποσό Χρέωσης (μέσω χρόνος Καταγράφει)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Πουλάμε αυτό το είδος
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Πουλάμε αυτό το είδος
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID προμηθευτή
 DocType: Journal Entry,Cash Entry,Καταχώρηση μετρητών
 DocType: Sales Partner,Contact Desc,Περιγραφή επαφής
@@ -3084,18 +2831,16 @@
 DocType: Brand,Item Manager,Θέση Διευθυντή
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Προσθέστε γραμμές για να θέσουν ετήσιους προϋπολογισμούς σε λογαριασμούς.
 DocType: Buying Settings,Default Supplier Type,Προεπιλεγμένος τύπος προμηθευτής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Λατομεία
 DocType: Production Order,Total Operating Cost,Συνολικό κόστος λειτουργίας
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Σημείωση : το σημείο {0} εισήχθηκε πολλαπλές φορές
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Όλες οι επαφές.
 DocType: Newsletter,Test Email Id,Δοκιμαστικό email ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Συντομογραφία εταιρείας
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Συντομογραφία εταιρείας
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Αν ακολουθείτε έλεγχο ποιότητας. Επιτρέπει την επιλογή (εξασφάλιση ποιότητας) q.A. Απαιτείται και αρ. Δ.Π. στο αποδεικτικό παραλαβής αγοράς.
 DocType: GL Entry,Party Type,Τύπος συμβαλλόμενου
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Η πρώτη ύλη δεν μπορεί να είναι ίδια με το κύριο είδος
 DocType: Item Attribute Value,Abbreviation,Συντομογραφία
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Δεν επιτρέπεται δεδομένου ότι το {0} υπερβαίνει τα όρια
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Περιστροφική χύτευση
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Κύρια εγγραφή προτύπου μισθολογίου.
 DocType: Leave Type,Max Days Leave Allowed,Μέγιστο πλήθος ημερών άδειας που επιτρέπεται
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Ορισμός φορολογική Κανόνας για το καλάθι αγορών
@@ -3109,15 +2854,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Προσφορές σε επαφές ή πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
 ,Territory Target Variance Item Group-Wise,Εύρος στόχων περιοχής ανά ομάδα ειδών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Όλες οι ομάδες πελατών
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,Η {0} είναι απαραίτητη. Ίσως δεν έχει δημιουργηθεί εγγραφή ισοτιμίας συναλλάγματος από {1} έως {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Φόρος προτύπου είναι υποχρεωτική.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν υπάρχει
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Τιμή τιμοκαταλόγου (νόμισμα της εταιρείας)
 DocType: Account,Temporary,Προσωρινός
 DocType: Address,Preferred Billing Address,Προτιμώμενη διεύθυνση χρέωσης
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Γραμματέας
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Γραμματέας
 DocType: Serial No,Distinct unit of an Item,Διακριτή μονάδα ενός είδους
 DocType: Pricing Rule,Buying,Αγορά
 DocType: HR Settings,Employee Records to be created by,Εγγραφές των υπαλλήλων που πρόκειται να δημιουργηθούν από
@@ -3130,24 +2875,21 @@
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
 DocType: Purchase Order Item,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Σιδερώματος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} Είναι σταματημένο
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ανερχόμενες εκδηλώσεις
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ο πελάτης είναι απαραίτητος
-DocType: Letter Head,Letter Head,Επικεφαλίδα επιστολόχαρτου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Γρήγορη Έναρξη
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} είναι υποχρεωτική για την Επιστροφή
 DocType: Purchase Order,To Receive,Να Λάβω
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Συρρίκνωση τοποθέτηση
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Έσοδα / δαπάνες
 DocType: Employee,Personal Email,Προσωπικό email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Συνολική διακύμανση
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Συνολική διακύμανση
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Εάν είναι ενεργοποιημένο, το σύστημα θα καταχωρεί λογιστικές εγγραφές για την απογραφή αυτόματα."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Μεσιτεία
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Μεσιτεία
 DocType: Address,Postal Code,Ταχυδρομικός Κώδικας
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Σε λεπτά 
@@ -3155,32 +2897,28 @@
 DocType: Customer,From Lead,Από επαφή
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Πλάνες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Πρότυπες πωλήσεις
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Πρότυπες πωλήσεις
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Τουλάχιστον μια αποθήκη είναι απαραίτητη
 DocType: Serial No,Out of Warranty,Εκτός εγγύησης
 DocType: BOM Replace Tool,Replace,Αντικατάσταση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Παρακαλώ εισάγετε προεπιλεγμένη μονάδα μέτρησης
 DocType: Purchase Invoice Item,Project Name,Όνομα έργου
 DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
-DocType: Workflow State,Edit,Επεξεργασία
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Features Setup,Item Batch Nos,Αρ. Παρτίδας είδους
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
 apps/erpnext/erpnext/config/learn.py +204,Human Resource,Ανθρώπινο Δυναμικό
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας 
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Πληρωμή συμφωνίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Φορολογικές απαιτήσεις
 DocType: BOM Item,BOM No,Αρ. Λ.Υ.
-DocType: Contact Us Settings,Pincode,Κωδικός pin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Η λογιστική εγγραφή {0} δεν έχει λογαριασμό {1} ή έχει ήδη αντιπαραβληθεί με άλλο αποδεικτικό
 DocType: Item,Moving Average,Κινητός μέσος
 DocType: BOM Replace Tool,The BOM which will be replaced,Η Λ.Υ. που θα αντικατασταθεί
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Η νέα Μ.Μ. Αποθέματος πρέπει να είναι διαφορετική από την τρέχουσα Μ.Μ.αποθέματος
 DocType: Account,Debit,Χρέωση
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Οι άδειες πρέπει να κατανέμονται σαν πολλαπλάσια του 0, 5"
 DocType: Production Order,Operation Cost,Κόστος λειτουργίας
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ανεβάστε παρουσίες από ένα αρχείο .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Οφειλόμενο ποσό
@@ -3196,10 +2934,7 @@
 DocType: Project,Default Cost Center,Προεπιλεγμένο κέντρο κόστους
 DocType: Purchase Invoice,End Date,Ημερομηνία λήξης
 DocType: Employee,Internal Work History,Ιστορία εσωτερική εργασία
-DocType: DocField,Column Break,Αλλαγή στήλης
-DocType: Event,Thursday,Πέμπτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Στροφή
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
 DocType: Sales Invoice,Exhibition,Έκθεση
@@ -3212,31 +2947,30 @@
 DocType: Employee,Held On,Πραγματοποιήθηκε την
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Είδος παραγωγής
 ,Employee Information,Πληροφορίες υπαλλήλου
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ποσοστό ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Ποσοστό ( % )
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Ημερομηνία λήξης για η χρήση 
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Ημερομηνία λήξης για η χρήση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Μείωση κερδών για άδεια άνευ αποδοχών (Α.Α.Α.)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Σημείωση : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Περίληψη της Εβδομάδας
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} Το είδος στη γραμμή {1} πρέπει να είναι αγορασμένο ή από υπεργολαβία
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
 DocType: GL Entry,Party,Συμβαλλόμενος
 DocType: Sales Order,Delivery Date,Ημερομηνία παράδοσης
-DocType: DocField,Currency,Νόμισμα
 DocType: Opportunity,Opportunity Date,Ημερομηνία ευκαιρίας
 DocType: Purchase Receipt,Return Against Purchase Receipt,Επιστροφή Ενάντια απόδειξη αγοράς
 DocType: Purchase Order,To Bill,Για τιμολόγηση
 DocType: Material Request,% Ordered,Διέταξε%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Εργασία με το κομμάτι
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Εργασία με το κομμάτι
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Μέση τιμή αγοράς
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
@@ -3253,77 +2987,68 @@
 DocType: Opportunity,To Discuss,Για συζήτηση
 DocType: SMS Settings,SMS Settings,Ρυθμίσεις SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Προσωρινή Λογαριασμοί
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Μαύρος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Account,Auditor,Ελεγκτής
 DocType: Purchase Order,End date of current order's period,Ημερομηνία λήξης της περιόδου της τρέχουσας παραγγελίας
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Πραγματοποίηση προσφοράς Επιστολή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Απόδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
-DocType: DocField,Fold,Αναδίπλωση
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή πρέπει να είναι ίδιο με το Πρότυπο
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Παρακαλώ ορίστε
 DocType: Task,Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID πελάτη
-DocType: Page,Page Name,Όνομα σελίδας
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Σε καιρό πρέπει να είναι μεγαλύτερη από ό, τι από καιρό"
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Αποθήκη {0}:ο γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle φινίρισμα
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","Π.Χ. "" Mc """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","Π.Χ. "" Mc """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Δεν μπορεί να υπάρχει απόθεμα για το είδος {0} γιατί έχει παραλλαγές
 ,Sales Person-wise Transaction Summary,Περίληψη συναλλαγών ανά πωλητή
-DocType: System Settings,Time Zone,Ζώνη ώρας
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Εγγραφή για erpnext hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ποσοστά μηνιαίας διανομής
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Των υλικών που παραδίδονται σε αυτό το δελτίο αποστολής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Συρραφή
 DocType: Customer,Customer Details,Στοιχεία πελάτη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Διαμόρφωση
 DocType: Employee,Reports to,Εκθέσεις προς
 DocType: SMS Settings,Enter url parameter for receiver nos,Εισάγετε παράμετρο url για αριθμούς παραλήπτη
 DocType: Sales Invoice,Paid Amount,Καταβληθέν ποσό
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Το κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου 'ευθύνη'
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Το υπόλοιπο του λογαριασμού είναι ήδη χρεωστικό, δεν μπορείτε να ορίσετε την επιλογή το υπόλοιπο πρέπει να είναι 'πιστωτικό'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Διαχείριση ποιότητας
 DocType: Production Planning Tool,Filter based on customer,Φιλτράρισμα με βάση τον πελάτη
 DocType: Payment Tool Detail,Against Voucher No,Κατά τον αρ. αποδεικτικού
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 DocType: Tax Rule,Purchase,Αγορά
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ισολογισμός ποσότητας
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ισολογισμός ποσότητας
 DocType: Item Group,Parent Item Group,Ομάδα γονικού είδους
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} για {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Κέντρα κόστους
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Αποθήκες.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Αποθήκες.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Ισοτιμία με την οποία το νόμισμα του προμηθευτή μετατρέπεται στο βασικό νόμισμα της εταιρείας
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Γραμμή #{0}: υπάρχει χρονική διένεξη με τη γραμμή {1}
 DocType: Opportunity,Next Contact,Επόμενο Επικοινωνία
 DocType: Employee,Employment Type,Τύπος απασχόλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Πάγια
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι σε δύο εγγραφές alocation
 DocType: Item Group,Default Expense Account,Προεπιλεγμένος λογαριασμός δαπανών
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
-DocType: Page,Yes,Ναι
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία αγοράς, τιμολόγιο αγοράς ή ημερολογιακή εγγραφή "
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Κατά τον τύπο του αποδεικτικού πρέπει να είναι παραγγελία αγοράς, τιμολόγιο αγοράς ή ημερολογιακή εγγραφή"
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Υπάρχει Προεπιλογή Δραστηριότητα κόστος για Τύπος Δραστηριότητα - {0}
 DocType: Production Order,Planned Operating Cost,Προγραμματισμένο λειτουργικό κόστος
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Νέο {0} όνομα
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Επισυνάπτεται #{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Επισυνάπτεται #{0}
 DocType: Job Applicant,Applicant Name,Όνομα αιτούντος
 DocType: Authorization Rule,Customer / Item Name,Πελάτης / όνομα είδους
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3336,7 +3061,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Ο σειριακός αριθμός είναι απαραίτητος για το είδος {0}
 DocType: Item Variant Attribute,Attribute,Χαρακτηριστικό
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Παρακαλείστε να αναφέρετε από / προς το εύρος
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Δημιουργήθηκε από
 DocType: Serial No,Under AMC,Σύμφωνα με Ε.Σ.Υ.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Το πσό αποτίμησης είδους υπολογίζεται εκ νέου εξετάζοντας τα αποδεικτικά κόστους μεταφοράς
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές πωλήσεων.
@@ -3348,17 +3072,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Ελάχιστο ποσό
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ενημέρωση τελικών ειδών
 DocType: Workstation,per hour,Ανά ώρα
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Η σειρά {0} έχει ήδη χρησιμοποιηθεί σε {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Ο λογαριασμός για την αποθήκη (διαρκής απογραφή) θα δημιουργηθεί στο πλαίσιο του παρόντος λογαριασμού.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Πληρωμένο Ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Υπεύθυνος έργου
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
 DocType: Customer,Default Taxes and Charges,Προεπιλογή Φόροι και τέλη
 DocType: Account,Receivable,Εισπρακτέος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
 DocType: Sales Invoice,Supplier Reference,Σύσταση προμηθευτή
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Εάν είναι επιλεγμένο, οι Λ.Υ. Για τα εξαρτήματα θα ληφθούν υπόψη για να παρθούν οι πρώτες ύλες. Διαφορετικά, όλα τα υπο-συγκρότημα είδη θα πρέπει να αντιμετωπίζονται ως πρώτη ύλη."
@@ -3366,8 +3089,8 @@
 DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
 DocType: Employee Education,Qualification,Προσόν
 DocType: Item Price,Item Price,Τιμή είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Σαπούνι & απορρυπαντικά
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
@@ -3376,7 +3099,6 @@
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Στατιστικά στοιχεία υποστήριξης
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Η εταιρεία λείπει στις αποθήκες {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Εργαλείο αντικατάστασης Μ.Μ. για το απόθεμα
 DocType: POS Profile,Terms and Conditions,Όροι και προϋποθέσεις
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Η 'εώς ημερομηνία' πρέπει να είναι εντός της χρήσης. Υποθέτοντας 'έως ημερομηνία' = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Εδώ μπορείτε να διατηρήσετε το ύψος, το βάρος, τις αλλεργίες, ιατροφαρμακευτική περίθαλψη, κλπ. Ανησυχίες"
@@ -3388,7 +3110,7 @@
 DocType: Sales Order Item,For Production,Για την παραγωγή
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Παρακαλώ εισάγετε την παραγγελία πώλησης στον παραπάνω πίνακα
 DocType: Project Task,View Task,Προβολή εργασιών
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Το οικονομικό έτος σας αρχίζει
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Το οικονομικό έτος σας αρχίζει
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Παρακαλώ εισάγετε αποδεικτικά παραλαβής αγοράς
 DocType: Sales Invoice,Get Advances Received,Βρες προκαταβολές που εισπράχθηκαν
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
@@ -3396,20 +3118,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Ρύθμιση διακομιστή εισερχομένων για το email ID υποστήριξης. ( Π.Χ. Support@example.Com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Γυάλισμα
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
 DocType: Sales Invoice Item,Sales Order Item,Είδος παραγγελίας πώλησης
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
 DocType: BOM,Manage cost of operations,Διαχειριστείτε το κόστος των εργασιών
 DocType: Features Setup,Item Advanced,Στοιχεία είδους για προχωρημένους
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Θερμή έλαση
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Όταν υποβληθεί οποιαδήποτε από τις επιλεγμένες συναλλαγές, θα ανοίξει αυτόματα ένα pop-up παράθυρο email ώστε αν θέλετε να στείλετε ένα μήνυμα email στη συσχετισμένη επαφή για την εν λόγω συναλλαγή, με τη συναλλαγή ως συνημμένη."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Καθολικές ρυθμίσεις
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
 DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
 DocType: Account,Account,Λογαριασμός
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Ο σειριακός αριθμός {0} έχει ήδη ληφθεί
@@ -3418,35 +3138,28 @@
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Αναρρωτική άδεια
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Άκυρη {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Αναρρωτική άδεια
 DocType: Email Digest,Email Digest,Ενημερωτικό άρθρο email
 DocType: Delivery Note,Billing Address Name,Όνομα διεύθυνσης χρέωσης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Πολυκαταστήματα
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Ισοροπία συστήματος
-DocType: Workflow,Is Active,Είναι ενεργό
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Πολυκαταστήματα
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Ισοροπία συστήματος
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Αποθηκεύστε πρώτα το έγγραφο.
 DocType: Account,Chargeable,Χρεώσιμο
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Αλλαγή συντομογραφίας
-DocType: Workflow State,Primary,Πρωταρχικός
 DocType: Expense Claim Detail,Expense Date,Ημερομηνία δαπάνης
 DocType: Item,Max Discount (%),Μέγιστη έκπτωση (%)
-DocType: Communication,More Information,Περισσότερες πληροφορίες
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Ποσό τελευταίας παραγγελίας 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Ανατίναξη
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Ποσό τελευταίας παραγγελίας
 DocType: Company,Warn,Προειδοποιώ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Η αποτίμηση είδους ενημερώθηκε
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
 DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Order,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
 DocType: Purchase Invoice,Recurring Print Format,Επαναλαμβανόμενες έντυπη μορφή
-DocType: Communication,Series,Σειρά
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Διαχειριστής ανάπτυξης επιχείρησης
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Σκοπός επίσκεψης συντήρησης
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Περίοδος
 ,General Ledger,Γενικό καθολικό
@@ -3456,9 +3169,7 @@
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 DocType: Features Setup,To get Item Group in details table,Για λήψη της oμάδας ειδών σε πίνακα λεπτομερειών
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Επαναχαράσσοντας
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Χαλκογραφία
 DocType: Sales Invoice,Commission,Προμήθεια
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3472,7 +3183,7 @@
 {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<H4> προεπιλεγμένο πρότυπο </ h4> 
- <p> <a χρήσεις href=""http://jinja.Pocoo.Org/docs/templates/""> τζίντζα templating </a> και όλα τα πεδία της διεύθυνσης ( συμπεριλαμβανομένων των προσαρμοσμένων πεδίων αν υπάρχουν) θα είναι διαθέσιμη </ p> 
+ <p> <a χρήσεις href=""http://jinja.Pocoo.Org/docs/templates/""> τζίντζα templating </a> και όλα τα πεδία της διεύθυνσης ( συμπεριλαμβανομένων των προσαρμοσμένων πεδίων αν υπάρχουν) θα είναι διαθέσιμη </ p> 
  <pre> <κωδικός> {{address_line1}} & lt? br & gt? 
  {% αν address_line2%} {{address_line2}} & lt? br & gt? { % endif -%} 
  {{}} πόλη & lt? br & gt? 
@@ -3484,7 +3195,7 @@
  {% αν email_id%} email: {{email_id}} & lt? br & gt ? {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Προεπιλεγμένο ποσό
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Περίληψη Αυτό το Μήνα
 DocType: Quality Inspection Reading,Quality Inspection Reading,Μέτρηση επιθεώρησης ποιότητας
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
@@ -3503,13 +3214,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
 DocType: Payment Tool,Get Outstanding Vouchers,Βρες εκκρεμή αποδεικτικά
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
 DocType: Appraisal,Start Date,Ημερομηνία έναρξης
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Αξία
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Κατανομή αδειών για μία περίοδο.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Κάντε κλικ εδώ για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
@@ -3519,55 +3229,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Μέσος χρόνος που απαιτείται από τον προμηθευτή να παραδώσει
 DocType: Time Log,Hours,Ώρες
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Τροχαίο
-DocType: ToDo,Priority,Προτεραιότητα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
-DocType: Dropbox Backup,Dropbox Access Allowed,Επιτρέπεται η πρόσβαση στο dropbox
-DocType: Dropbox Backup,Weekly,Εβδομαδιαίος
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Π.Χ. SMSgateway.Com / api / send_SMS.Cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Λήψη
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Λήψη
 DocType: Maintenance Visit,Fully Completed,Πλήρως ολοκληρωμένο
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ολοκληρωμένο
 DocType: Employee,Educational Qualification,Εκπαιδευτικά προσόντα
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} έχει προστεθεί με επιτυχία στην λίστα ενημερωτικών δελτίων μας.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Μηχανουργική κατεργασία με δέσμη ηλεκτρονίων
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Κύριες εκθέσεις
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Ενημερώθηκαν τα υπόλοιπα για καθολικές καταχωρήσεις αποθέματος
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Κύριες εκθέσεις
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Purchase Receipt Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
 ,Requested Items To Be Ordered,Είδη που ζητήθηκε να παραγγελθούν
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Οι παραγγελίες μου
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Οι παραγγελίες μου
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
 DocType: Time Log,For Manufacturing,Στον τομέα της Μεταποίησης
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Σύνολα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Σύνολα
 DocType: BOM,Manufacturing,Παραγωγή
 ,Ordered Items To Be Delivered,Παραγγελθέντα είδη για παράδοση
 DocType: Account,Income,Έσοδα
-,Setup Wizard,Οδηγός εγκατάστασης
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Κάτι πήγε στραβά!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ημερομηνία ολοκλήρωσης
 DocType: Purchase Invoice Item,Amount (Company Currency),Ποσό (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die χύτευσης
-DocType: Email Alert,Reference Date,Ημερομηνία αναφοράς
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Παρακαλώ εισάγετε ένα έγκυρο αριθμό κινητού
 DocType: Budget Detail,Budget Detail,Λεπτομέρειες προϋπολογισμού
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Παρακαλώ εισάγετε το μήνυμα πριν από την αποστολή
-DocType: Async Task,Status,Κατάσταση
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Η Μ.Μ. ενημερώθηκε για το είδος {0}
-DocType: Company History,Year,Έτος
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Προφίλ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Παρακαλώ ενημερώστε τις ρυθμίσεις SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Χρόνος καταγραφής {0} έχει ήδη χρεωθεί
@@ -3580,55 +3278,52 @@
 ,Serial No Service Contract Expiry,Λήξη σύμβασης παροχής υπηρεσιών για τον σειριακό αριθμό
 DocType: Item,Unit of Measure Conversion,Μονάδα μετατροπής Μέτρου
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Υπάλληλος που δεν μπορεί να αλλάξει
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
 DocType: Naming Series,Help HTML,Βοήθεια ΗΤΜΛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Επίδομα πάνω-{0} ξεπεράστηκε για το είδος {1}
 DocType: Address,Name of person or organization that this address belongs to.,Όνομα προσώπου ή οργανισμού που ανήκει αυτή η διεύθυνση.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Οι προμηθευτές σας
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Οι προμηθευτές σας
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Ένα άλλο μισθολόγιο είναι {0} ενεργό για τον υπάλληλο {0}. Παρακαλώ ορίστε την κατάσταση του ως ανενεργό για να προχωρήσετε.
 DocType: Purchase Invoice,Contact,Επαφή
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Ελήφθη Από
 DocType: Features Setup,Exports,Εξαγωγές
 DocType: Lead,Converted,Έχει μετατραπεί
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Από {0} για {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 DocType: Issue,Content Type,Τύπος περιεχομένου
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ηλεκτρονικός υπολογιστής
 DocType: Item,List this Item in multiple groups on the website.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Το είδος: {0} δεν υπάρχει στο σύστημα
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
-DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία 
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
+DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
 DocType: Cost Center,Budgets,Κατασκευή έκθεσης
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ενημέρωση
 DocType: Employee,Emergency Contact Details,Είδη επικοινωνίας έκτακτης ανάγκης
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Τι κάνει;
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Τι κάνει;
 DocType: Delivery Note,To Warehouse,Προς αποθήκη
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Ο λογαριασμός {0} έχει εισαχθεί περισσότερες από μία φορά για τη χρήση {1}
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""έχει σειριακό αριθμό"" δεν μπορεί να είναι ""ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Ηλεκτρικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Ηλεκτρικός
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Το ID χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Από αξίωση εγγύησης
 DocType: Stock Entry,Default Source Warehouse,Προεπιλεγμένη αποθήκη πηγής
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Λείανση
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
-DocType: User,Enabled,Ενεργοποιημένο
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ενεργητικό αποθέματος
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Θέλετε πραγματικά να υποβάλλετε όλες βεβαιώσεις αποδοχών για τον μήνα {0} και το έτος {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Εισαγωγή συνδρομητών
@@ -3636,19 +3331,18 @@
 DocType: Attendance,Present,Παρόν
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Το δελτίο αποστολής {0} δεν πρέπει να υποβάλλεται
 DocType: Notification Control,Sales Invoice Message,Μήνυμα τιμολογίου πώλησης
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Κλείσιμο του λογαριασμού {0} πρέπει να είναι τύπου Ευθύνης / Ίδια Κεφάλαια
 DocType: Authorization Rule,Based On,Με βάση την
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
-DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι 
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Δραστηριότητες / εργασίες έργου
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Δημιουργία βεβαιώσεων αποδοχών
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} Δεν είναι έγκυρη ταυτότητα email
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",Η επιλογή αγορά πρέπει να οριστεί αν είναι επιλεγμένο το πεδίο 'εφαρμοστέο σε' ως {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Η έκπτωση πρέπει να είναι μικρότερη από 100
-DocType: ToDo,Low,Χαμηλός
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Κλώση
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
@@ -3670,17 +3364,15 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Το όνομα εκστρατείας είναι απαραίτητο
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Receipt Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Βαθιά σχεδίασης
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Νέα Ενημερωτικό Δελτίο
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Προβολή υπόλοιπου
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",". Παράδειγμα: abcd # # # # # αν έχει οριστεί σειρά και ο σειριακός αριθμός δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί σειριακός αριθμός αυτόματα με βάση αυτή τη σειρά. Αν θέλετε πάντα να αναφέρεται ρητά ο σειριακός αριθμός για αυτό το προϊόν, αφήστε κενό αυτό το πεδίο"
-DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες 
+DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Ποσό
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Καθηλωτική
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
 ,Sales Analytics,Ανάλυση πωλήσεων
 DocType: Manufacturing Settings,Manufacturing Settings,Ρυθμίσεις παραγωγής
@@ -3692,28 +3384,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Νέο όνομα λογαριασμού
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Κόστος πρώτων υλών που προμηθεύτηκαν
 DocType: Selling Settings,Settings for Selling Module,Ρυθμίσεις για τη λειτουργική μονάδα πωλήσεων
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Εξυπηρέτηση πελατών
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Εξυπηρέτηση πελατών
 DocType: Item,Thumbnail,Μικρογραφία
 DocType: Item Customer Detail,Item Customer Detail,Λεπτομέρειες πελατών είδους
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Επιβεβαίωση email σας
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Προσφορά υποψήφιος δουλειά.
 DocType: Notification Control,Prompt for Email on Submission of,Ερώτηση για email κατά την υποβολή του
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ημέρες κατά την περίοδο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} Απαιτείται
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Κενού χύτευση
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
-DocType: Contact Us Settings,City,Πόλη
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Κατεργασία με υπερήχους
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Το είδος {0} πρέπει να είναι ένα είδος πώλησης
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
 DocType: Account,Equity,Διαφορά ενεργητικού - παθητικού
 DocType: Sales Order,Printing Details,Λεπτομέρειες εκτύπωσης
 DocType: Task,Closing Date,Καταληκτική ημερομηνία
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Μηχανικός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Μηχανικός
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Συνελεύσεις Αναζήτηση Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
 DocType: Sales Partner,Partner Type,Τύπος συνεργάτη
@@ -3721,7 +3409,7 @@
 DocType: Authorization Rule,Customerwise Discount,Έκπτωση με βάση πελάτη
 DocType: Purchase Invoice,Against Expense Account,Κατά τον λογαριασμό δαπανών
 DocType: Production Order,Production Order,Εντολή παραγωγής
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Quotation Item,Against Docname,Κατά όνομα εγγράφου
 DocType: SMS Center,All Employee (Active),Όλοι οι υπάλληλοι (ενεργοί)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Δείτε τώρα
@@ -3729,26 +3417,24 @@
 DocType: BOM,Raw Material Cost,Κόστος πρώτων υλών
 DocType: Item,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Διάγραμμα gantt 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Η σειρά ενημερώθηκε
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Ο τύπος έκθεσης είναι υποχρεωτικός
 DocType: Item,Serial Number Series,Σειρά σειριακών αριθμών
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι απαραίτητη για το απόθεμα του είδους {0} στη γραμμή {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Λιανική & χονδρική πώληση
 DocType: Issue,First Responded On,Πρώτη απάντηση στις
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Εμφάνιση του είδους σε πολλαπλές ομάδες
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Ο πρώτος χρήστης : εσείς
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Ο πρώτος χρήστης : εσείς
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Επιτυχής συμφωνία
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Επιτυχής συμφωνία
 DocType: Production Order,Planned End Date,Προγραμματισμένη ημερομηνία λήξης
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Tax Rule,Validity,Εγκυρότητα
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Ποσό τιμολόγησης
 DocType: Attendance,Attendance,Συμμετοχή
-DocType: Page,No,Όχι
 DocType: BOM,Materials,Υλικά
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Αν δεν είναι επιλεγμένο, η λίστα θα πρέπει να προστίθεται σε κάθε τμήμα όπου πρέπει να εφαρμοστεί."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Η ημερομηνία αποστολής και ώρα αποστολής είναι απαραίτητες
@@ -3756,55 +3442,46 @@
 ,Item Prices,Τιμές είδους
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
 DocType: Period Closing Voucher,Period Closing Voucher,Δικαιολογητικό κλεισίματος περιόδου
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Κύρια εγγραφή τιμοκαταλόγου.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: Task,Review Date,Ημερομηνία αξιολόγησης
 DocType: Purchase Invoice,Advance Payments,Προκαταβολές
-DocType: DocPerm,Level,Επίπεδο
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Η αποθήκη προορισμού στη γραμμή {0} πρέπει να είναι η ίδια όπως στη εντολή παραγωγής
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Άλεσμα
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Δεν έχετε άδεια να χρησιμοποιήσετε το εργαλείο πληρωμής
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Οι διευθύνσεις email για επαναλαμβανόμενα %s δεν έχουν οριστεί
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
 DocType: Company,Round Off Account,Στρογγυλεύουν Λογαριασμού
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Φάγωμα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Δαπάνες διοικήσεως
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Συμβουλή
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Συμβουλή
 DocType: Customer Group,Parent Customer Group,Γονική ομάδα πελατών
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
-DocType: Appraisal Goal,Score Earned,Αποτέλεσμα 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
+DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Π.Χ. "" Η εταιρεία μου llc """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Ανακοίνωση Περίοδος
 DocType: Bank Reconciliation Detail,Voucher ID,ID αποδεικτικού
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Αυτή είναι μια κύρια περιοχή και δεν μπορεί να επεξεργαστεί.
-DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους 
+DocType: Packing Slip,Gross Weight UOM,Μ.Μ. Μικτού βάρους
 DocType: Email Digest,Receivables / Payables,Απαιτήσεις / υποχρεώσεις
 DocType: Delivery Note Item,Against Sales Invoice,Κατά το τιμολόγιο πώλησης
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Σφράγιση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
-DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη 
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 DocType: Task,Actual End Date (via Time Logs),Πραγματική Ημερομηνία λήξης (μέσω χρόνος Καταγράφει)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους 
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους
 DocType: Delivery Note,Print Without Amount,Εκτυπώστε χωρίς ποσό
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Η φορολογική κατηγορία δεν μπορεί να είναι αποτίμηση ή αποτίμηση και σύνολο, γιατι τα είδη δεν είναι είδη αποθέματος"
-DocType: User,Last Name,Επώνυμο
-DocType: Web Page,Left,Αριστερά
-DocType: Event,All Day,Ολοήμερο
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Η φορολογική κατηγορία δεν μπορεί να είναι αποτίμηση ή αποτίμηση και σύνολο, γιατι τα είδη δεν είναι είδη αποθέματος"
 DocType: Issue,Support Team,Ομάδα υποστήριξης
 DocType: Appraisal,Total Score (Out of 5),Συνολική βαθμολογία (από 5)
-DocType: Contact Us Settings,State,Πολιτεία
 DocType: Batch,Batch,Παρτίδα
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Υπόλοιπο
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Υπόλοιπο
 DocType: Project,Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων)
-DocType: User,Gender,Φύλο
 DocType: Journal Entry,Debit Note,Χρεωστικό σημείωμα
 DocType: Stock Entry,As per Stock UOM,Ανά Μ.Μ. Αποθέματος
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Δεν έχει λήξει
@@ -3812,50 +3489,46 @@
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Προεπιλογή Έτοιμα προϊόντα Αποθήκη
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Πωλητής
 DocType: Sales Invoice,Cold Calling,Cold calling
-DocType: SMS Parameter,SMS Parameter,Παράμετροι SMS 
+DocType: SMS Parameter,SMS Parameter,Παράμετροι SMS
 DocType: Maintenance Schedule Item,Half Yearly,Εξαμηνιαία
 DocType: Lead,Blog Subscriber,Συνδρομητής blog
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Δημιουργία κανόνων για τον περιορισμό των συναλλαγών που βασίζονται σε αξίες.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Εάν είναι επιλεγμένο, ο συνολικός αριθμός των εργάσιμων ημερών θα περιλαμβάνει τις αργίες, και αυτό θα μειώσει την αξία του μισθού ανά ημέρα"
 DocType: Purchase Invoice,Total Advance,Σύνολο προκαταβολών
-DocType: Workflow State,User,Χρήστης
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Επεξεργασία Μισθοδοσίας
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ορισμός ως απολεσθέν
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Απόδειξη πληρωμής Σημείωση
 DocType: Customer,Credit Days Based On,Πιστωτικές ημερών βάσει της
 DocType: Tax Rule,Tax Rule,Φορολογικές Κανόνας
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο πωλήσεων
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Προγραμματίστε κούτσουρα χρόνο εκτός των ωρών εργασίας του σταθμού εργασίας.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} Έχει ήδη υποβληθεί
 ,Items To Be Requested,Είδη που θα ζητηθούν
-DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Τιμή χρέωσης ανάλογα με τον τύπο δραστηριότητας (ανά ώρα)
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ραφή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου "
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Το email ID της εταιρείας δεν βρέθηκε, ως εκ τούτου, δεν αποστέλλονται μηνύματα ταχυδρομείου"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 DocType: Production Planning Tool,Filter based on item,Φιλτράρισμα με βάση το είδος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
 DocType: Purchase Common,Purchase Common,Purchase common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} Έχει τροποποιηθεί. Παρακαλώ ανανεώστε.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Από ευκαιρία
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Τυφλές
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Λογαριασμοί για πελάτες.
-DocType: DocField,Default,Προεπιλεγμένο
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} συνδρομητές προστέθηκαν
 DocType: Maintenance Schedule,Schedule,Χρονοδιάγραμμα
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Ορίστε τον προϋπολογισμό γι &#39;αυτό το Κέντρο Κόστους. Για να ρυθμίσετε δράση του προϋπολογισμού, ανατρέξτε στην ενότητα &quot;Εταιρεία Λίστα&quot;"
@@ -3866,70 +3539,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Expense Claim,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Επιλέγοντας 'ναι' θα δοθεί μια μοναδική ταυτότητα σε κάθε οντότητα αυτού του είδους που μπορεί να εμφανιστεί στην κύρια εγγραφή σειριακού αριθμού
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
 DocType: Address,Office,Γραφείο
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Πρότυπες εκθέσεις
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Για να δημιουργήσετε ένα λογαριασμό φόρων
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Παρτίδα Απογραφή
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Παρτίδα Απογραφή
 DocType: Employee,Contract End Date,Ημερομηνία λήξης συμβολαίου
 DocType: Sales Order,Track this Sales Order against any Project,Παρακολουθήστε αυτές τις πωλήσεις παραγγελίας σε οποιουδήποτε έργο
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Εμφάνισε παραγγελίες πώλησης (εκκρεμεί παράδοση) με βάση τα ανωτέρω κριτήρια
-DocType: DocShare,Document Type,Τύπος εγγράφου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Από προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Από προσφορά προμηθευτή
 DocType: Deduction Type,Deduction Type,Τύπος κράτησης
 DocType: Attendance,Half Day,Μισή ημέρα
 DocType: Pricing Rule,Min Qty,Ελάχιστη ποσότητα
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Για να παρακολουθείτε τα στοιχεία των πωλήσεων και παραστατικά αγοράς με αρ παρτίδα. &quot;Προτιμώμενα Βιομηχανία: Φάρμακα&quot;
 DocType: GL Entry,Transaction Date,Ημερομηνία συναλλαγής
 DocType: Production Plan Item,Planned Qty,Προγραμματισμένη ποσότητα
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Σύνολο φόρου
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Σύνολο φόρου
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Για Ποσότητα (Τεμ Κατασκευάζεται) είναι υποχρεωτικά
 DocType: Stock Entry,Default Target Warehouse,Προεπιλεγμένη αποθήκη προορισμού
 DocType: Purchase Invoice,Net Total (Company Currency),Καθαρό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
 DocType: Notification Control,Purchase Receipt Message,Μήνυμα αποδεικτικού παραλαβής αγοράς
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,"Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ό, τι την περίοδο"
 DocType: Production Order,Actual Start Date,Πραγματική ημερομηνία έναρξης
 DocType: Sales Order,% of materials delivered against this Sales Order,% Των υλικών που παραδόθηκαν σε αυτήν την παραγγελία πώλησης
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Καταγραφή κίνησης είδους
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Ενημερωτικό δελτίο Λίστα Συνδρομητής
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Υπηρεσία
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 ,Monthly Salary Register,Μηνιαίο ταμείο μισθοδοσίας
-apps/frappe/frappe/website/template.py +140,Next,Επόμενος
 DocType: Warranty Claim,If different than customer address,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
 DocType: BOM Operation,BOM Operation,Λειτουργία Λ.Υ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Στο ποσό της προηγούμενης γραμμής
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Παρακαλώ εισάγετε ποσό πληρωμής σε τουλάχιστον μία σειρά
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Παρακαλώ εισάγετε ποσό πληρωμής σε τουλάχιστον μία σειρά
 DocType: POS Profile,POS Profile,POS Προφίλ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Γραμμή {0}:το ποσό πληρωμής δεν μπορεί να είναι μεγαλύτερο από ό,τι το οφειλόμενο ποσό"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Το σύνολο των απλήρωτων
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Το σύνολο των απλήρωτων
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Το αρχείο καταγραφής χρονολογίου δεν είναι χρεώσιμο
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Αγοραστής
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Αγοραστής
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Η καθαρή αμοιβή δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Παρακαλώ εισάγετε τα αποδεικτικά έναντι χειροκίνητα
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Παρακαλώ εισάγετε τα αποδεικτικά έναντι χειροκίνητα
 DocType: SMS Settings,Static Parameters,Στατικές παράμετροι
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
@@ -3938,14 +3604,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Αποστολή μαζικών SMS στις επαφές σας
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Σκεφτείτε φόρο ή επιβάρυνση για
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-κύλισης
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Πιστωτική κάρτα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Πιστωτική κάρτα
 DocType: BOM,Item to be manufactured or repacked,Είδος που θα κατασκευαστεί ή θα ανασυσκευαστεί
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αποθέματος.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές αποθέματος.
 DocType: Purchase Invoice,Next Date,Επόμενη ημερομηνία
 DocType: Employee Education,Major/Optional Subjects,Σημαντικές / προαιρετικά θέματα
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Παρακαλώ εισάγετε φόρους και επιβαρύνσεις
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Κατεργασίας
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
 DocType: Hub Settings,Seller Name,Ονομα πωλητή
@@ -3955,47 +3619,44 @@
 DocType: Stock Entry,Repack,Επανασυσκευασία
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Πρέπει να αποθηκεύσετε τη φόρμα πριν προχωρήσετε
 DocType: Item Attribute,Numeric Values,Αριθμητικές τιμές
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Επισύναψη logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Επισύναψη logo
 DocType: Customer,Commission Rate,Ποσό προμήθειας
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Το χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Το χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό
 DocType: Manufacturing Settings,Allow Production on Holidays,Επίτρεψε παραγωγή σε αργίες
-DocType: Sales Order,Customer's Purchase Order Date,Ημερομηνία παραγγελίας αγοράς πελάτη 
+DocType: Sales Order,Customer's Purchase Order Date,Ημερομηνία παραγγελίας αγοράς πελάτη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Μετοχικού Κεφαλαίου
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Επιλέξτε ένα αρχείο csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Αποστολή αντίγραφα ασφαλείας σε Dropbox
 DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Σχεδιαστής
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
 DocType: Serial No,Delivery Details,Λεπτομέρειες παράδοσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Αυτόματη δημιουργία Υλικό Αίτημα εάν η ποσότητα πέσει κάτω από αυτό το επίπεδο
 ,Item-wise Purchase Register,Ταμείο αγορών ανά είδος
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Για να ορίσετε το επίπεδο αναπαραγγελίας, στοιχείο πρέπει να είναι ένα στοιχείο αγοράς ή κατασκευής του Είδους"
 ,Supplier Addresses and Contacts,Διευθύνσεις προμηθευτή και επαφές
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Κύρια εγγραφή έργου.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill Υλικών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
-DocType: Dropbox Backup,Send Notifications To,Αποστολή ενημερώσεων σε
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ημ. αναφοράς
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ημ. αναφοράς
 DocType: Employee,Reason for Leaving,Αιτιολογία αποχώρησης
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Παρακαλώ δημιουργήστε μισθολόγιο για τον υπάλληλο {0}

diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 584ae12..faf7c8a 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv

@@ -1,12 +1,11 @@
 DocType: Employee,Salary Mode,Modo de Salario
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione Distribución mensual, si desea realizar un seguimiento basado en la estacionalidad."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de Consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de Consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recocido
 DocType: Item,Customer Items,Artículos de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
@@ -16,15 +15,13 @@
 DocType: Employee,Leave Approvers,Supervisores de Vacaciones
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Alquilado
-DocType: About Us Settings,Website,Sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde solicitud de material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Desde solicitud de material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Requerido por
@@ -39,20 +36,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie actualizado correctamente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntadas
 DocType: Pricing Rule,Apply On,Aplique En
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
 ,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva Aplicación de Permiso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar variantes
-DocType: Sales Invoice Item,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de Fallecimiento
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
@@ -60,48 +56,45 @@
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidado de la Salud
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección De Correo Electrónico
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección De Correo Electrónico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Contador
 DocType: Cost Center,Stock User,Foto del usuario
 DocType: Company,Phone No,Teléfono No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Bitácora de actividades realizadas por los usuarios en las tareas que se utilizan para el seguimiento del tiempo y la facturación.
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuevo {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nuevo {0}: # {1}
 ,Sales Partners Commission,Comisiones de Ventas
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
-DocType: Print Settings,Classic,Clásico
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
 DocType: BOM,Operations,Operaciones
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de Descuento para {0}
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nombre nuevo"
 DocType: Packed Item,Parent Detail docname,Detalle Principal docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un Trabajo .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hacer Entrada del Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondos de Pensiones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondos de Pensiones
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
 DocType: Lead,Person Name,Nombre de la persona
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o marcar 'Fecha final'"
@@ -117,46 +110,41 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la operación
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo del Material que se adjunta
-DocType: Blog Post,Guest,Invitado
 DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} es obligatorio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
-DocType: Standard Reply,Owner,Propietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Bajo Graduación
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo On
 DocType: BOM,Total Cost,Coste total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes Raíces
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes Raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
-DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos
 DocType: Newsletter,Email Sent?,Enviar Email ?
 DocType: Journal Entry,Contra Entry,Entrada Contra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar Registros Tiempo
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -164,22 +152,20 @@
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezar
 DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Bitácora de Lotes para  facturación.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado
 DocType: Lead,Request Type,Tipo de solicitud
 DocType: Leave Application,Reason,Razón
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ejecución
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Los detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Productos y precios
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación .
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
@@ -191,9 +177,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
-DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
 DocType: Production Planning Tool,Sales Orders,Ordenes de Venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
@@ -205,8 +188,7 @@
 DocType: Bank Reconciliation,Bank Account,Cuenta Bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 DocType: Selling Settings,Default Territory,Territorio Predeterminado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisión
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rechinar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
@@ -218,43 +200,39 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 ,Production Orders in Progress,Órdenes de producción en progreso
 DocType: Lead,Address & Contact,Dirección y Contacto
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Newsletter List,Total Subscribers,Los suscriptores totales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre del Contacto
+,Contact Name,Nombre del Contacto
 DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, establece Naming Series para {0} a través de Configuración&gt; Configuración&gt; Serie Naming"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
-DocType: Bulk Email,Message,Mensaje
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
-DocType: Dropbox Backup,Dropbox Access Key,Clave de Acceso de Dropbox 
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
 DocType: Lead,Do Not Contact,No contactar
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorios
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Solicitud de Materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Cepillo de alambre
 DocType: Employee,Relation,Relación
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad Rechazada
@@ -268,12 +246,10 @@
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número Móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar Horario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cuenta de Gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más Reciente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Máximo 5 caracteres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras de tiempo para las órdenes de producción. Las operaciones ya no tendrán un seguimiento.
@@ -284,55 +260,43 @@
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
-DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforación por láser
-DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inventario
 DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
-DocType: Communication,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil Laboral
 DocType: Newsletter,Newsletter,Boletín de Noticias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Besuqueo
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,El Artículo está Actualizado
-DocType: Async Task,System Manager,Administrador del Sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura
 DocType: Sales Invoice Item,Delivery Note,Notas de Entrega
-DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
 DocType: Employee,Company Email,Correo de la compañía
-DocType: Workflow State,Refresh,Actualizar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los campos tales como la divisa, tasa de conversión, el total de las importaciones, la importación total general etc están disponibles en recibo de compra, cotización de proveedor, factura de compra, orden de compra, etc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca en el campo si 'Repite un día al mes'---"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca en el campo si 'Repite un día al mes'---"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione Producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccione Producto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe presentarse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuración completa !
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
@@ -349,40 +313,36 @@
 DocType: Purchase Invoice Item,Item Name,Nombre del Producto
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
 DocType: Employee,Widowed,Viudo
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados en Cantidad proyectada y pedido mínimo Cantidad"
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados en Cantidad proyectada y pedido mínimo Cantidad"
 DocType: Workstation,Working Hours,Horas de Trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
 ,Purchase Register,Registro de Compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Ausencias'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de Pérdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de vacaciones: {0}
 DocType: Employee,Single,solo
 DocType: Issue,Attachment,Adjunto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,El presupuesto no se puede establecer para un grupo del centro de costos
 DocType: Account,Cost of Goods Sold,Costo de las Ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Por favor, introduzca el Centro de Costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, introduzca el Centro de Costos"
 DocType: Journal Entry Account,Sales Order,Ordenes de Venta
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Precio de venta promedio 
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Precio de venta promedio
 DocType: Purchase Order,Start date of current order's period,Fecha del periodo del actual orden de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la linea {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la linea {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
-DocType: Delivery Note,% Installed,"
-% Instalado"
+DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: BOM,Item Desription,Descripción del Artículo
 DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
 DocType: Account,Is Group,Es un grupo
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,De corte longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sin comenzar
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
@@ -391,48 +351,42 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas Congeladas Hasta
 DocType: SMS Log,Sent On,Enviado Por
+DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldeo Shell
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Employee,Health Concerns,Preocupaciones de salud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No pagado
-DocType: Packing Slip,From Package No.,Del Paquete N º 
+DocType: Packing Slip,From Package No.,Del Paquete N º
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
 DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva
 DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de Asistencia .
 DocType: Bank Reconciliation,Journal Entries,Asientos contables
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el Plan de Producción
-DocType: System Settings,Loading...,Cargando ...
-DocType: DocField,Password,Contraseña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelado por deposición fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o Pagado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos Cosméticos
-DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
-DocType: Communication,Subject,Sujeto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos Cosméticos
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
@@ -440,7 +394,6 @@
 DocType: Purchase Invoice Item,Item,Productos
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y Ganancias
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nueva Unidad de Medida NO debe ser de tipo Numero Entero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Muebles y Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
@@ -451,19 +404,19 @@
 DocType: Production Planning Tool,Material Requirement,Solicitud de Material
 DocType: Company,Delete Company Transactions,Eliminar Transacciones de la empresa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} es una dirección de correo electrónico inválida en 'Notificación\Email'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Facturación Total este año:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturación Total este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Territory,For reference,Por referencia
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Cierre (Cred)
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Job Applicant,Thread HTML,Tema HTML
 DocType: Company,Ignore,Pasar por alto
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
@@ -471,7 +424,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos en su negocio.  Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
@@ -479,13 +432,11 @@
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,Iniciativa ID
 DocType: C-Form Invoice Detail,Grand Total,Total
-DocType: About Us Settings,Website Manager,Administrador de Página Web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Warranty Claim,Resolution,Resolución
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por Pagar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Volver Ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione órdenes de venta a partir del cual desea crear órdenes de producción.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales.
@@ -494,15 +445,13 @@
 DocType: Quotation,Quotation To,Cotización Para
 DocType: Lead,Middle Income,Ingresos Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Monto asignado no puede ser negativo
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
-DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -522,20 +471,16 @@
 DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por:
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir al Grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -543,25 +488,20 @@
 DocType: Customer,Fixed Days,Días Fijos
 DocType: Sales Invoice,Packing List,Lista de Envío
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicación
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
 DocType: Material Request,Material Transfer,Transferencia de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Configuración
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
 DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Más
 DocType: Pricing Rule,Sales Manager,Gerente De Ventas
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
@@ -569,17 +509,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Purchase Receipt,Other Details,Otros Datos
 DocType: Account,Accounts,Contabilidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Esquila Heterosexual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad del vendedor
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
@@ -588,13 +527,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Pedidos de Venta, Factura de Venta o Entrada de Diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de la Tarea
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
-DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nombre de la campaña
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
@@ -603,29 +539,25 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no es un producto de stock
 DocType: Mode of Payment Account,Default Account,Cuenta Predeterminada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
-DocType: Contact Us Settings,Address Title,Dirección Título
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-DocType: Dropbox Backup,Daily,Diario
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
 DocType: Employee,Cell Number,Número de movil
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual.
 DocType: Item Group,Website Specifications,Especificaciones del Sitio Web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva Cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Los asientos contables se pueden hacer en contra de nodos hoja. No se permiten los comentarios en contra de los grupos.
-DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
-DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de Ventas.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -673,10 +605,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnología
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la linea {0}.
@@ -688,10 +619,10 @@
 DocType: Company,Default Bank Account,Cuenta Bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Números
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Números
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de Conciliación Bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
@@ -709,19 +640,17 @@
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
 DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
-DocType: Comment,Reference Name,Nombre de referencia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario Objetivo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad/Pérdida Neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición
 DocType: Sales Order Item,Projected Qty,Cant. Proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
@@ -730,10 +659,9 @@
 DocType: Expense Claim,Expenses,Gastos
 ,Purchase Receipt Trends,Tendencias de Recibos de Compra
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla de la que usted desea conseguir los Objetivos de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de Registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Replanteo
 DocType: Item,Re-Order Qty,Reordenar Cantidad
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0}
@@ -743,18 +671,16 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede cargar {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,Balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
 DocType: Salary Slip,Working Days,Días de Trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso Bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -764,29 +690,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
 DocType: Purchase Invoice Item,Purchase Receipt,Recibos de Compra
 ,Received Items To Be Billed,Recepciones por Facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorreo abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
 DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
 DocType: Bank Reconciliation,Total Amount,Importe total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicación por internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Production Planning Tool,Production Orders,Órdenes de Producción
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de balance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos
+DocType: Bank Reconciliation,Account Currency,Moneda de la Cuenta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
 DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda
@@ -795,7 +721,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
 DocType: Employee,Permanent Address Is,Dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es una compra de productos
@@ -811,56 +737,51 @@
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos
-DocType: Contact Us Settings,Address Line 1,Dirección Línea 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de Compañía
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variación
+,Company Name,Nombre de Compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y Mes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Coste de electricidad
 DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado
-DocType: Comment,Unsubscribed,No Suscrito
 DocType: Opportunity,Walk In,Entrar
 DocType: Item,Inspection Criteria,Criterios de Inspección
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de Centros de Costos Financieros.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanco
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Hacer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su Fotografía
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Hacer
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
-DocType: Workflow State,Stop,Detenerse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de Apertura
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de Asignación de Vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnición
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
 DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: POS Profile,Cash/Bank Account,Cuenta de Caja / Banco
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra
 DocType: Workstation,Wages,Salario
@@ -876,14 +797,14 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Almacén
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 DocType: BOM Operation,Operation,Operación
 DocType: Lead,Organization Name,Nombre de la Organización
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
@@ -902,28 +823,26 @@
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de los registros de tiempo
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Opportunity,Your sales person who will contact the customer in future,Su persona de ventas que va a ponerse en contacto con el cliente en el futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Company,Default Currency,Moneda Predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca designación de este contacto
-DocType: Contact Us Settings,Address,Direcciones
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
-DocType: SMS Center,Total Characters,Total Caracteres 
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
+DocType: SMS Center,Total Characters,Total Caracteres
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribución %
 DocType: Item,website page link,el vínculo web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccionar registros de tiempo e Presentar después de crear una nueva factura de venta .
 DocType: Global Defaults,Global Defaults,Predeterminados globales
@@ -941,14 +860,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fundición de precisión
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al Código del Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
 DocType: Item,UOMs,Unidades de Medida
@@ -956,50 +873,43 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
-DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricación de objetos laminados
+DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de Balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Formando Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
 DocType: Lead,Lead,Iniciativas
 DocType: Email Digest,Payables,Cuentas por Pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
 DocType: Purchase Invoice Item,Net Rate,Tasa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Holiday,Holiday,Feriado
-DocType: Event,Saturday,Sábado
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
 ,Daily Time Log Summary,Resumen Diario de Registro de Hora
-DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 DocType: Global Defaults,Current Fiscal Year,Año Fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entradas' no puede estar vacío
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 ,Trial Balance,Balanza de Comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de Empleados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
 DocType: Contact,User ID,ID de usuario
-DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
-DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
-DocType: Communication,Delivery Status,Estado del Envío
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -1009,13 +919,11 @@
 DocType: BOM Item,Item Description,Descripción del Artículo
 DocType: Payment Tool,Payment Mode,Método de pago
 DocType: Purchase Invoice,Is Recurring,Es recurrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo
 DocType: Purchase Order,Supplied Items,Artículos suministrados
 DocType: Production Order,Qty To Manufacture,Cantidad Para Fabricación
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura Temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
@@ -1029,50 +937,47 @@
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de Venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número del Empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
-DocType: Item,Auto re-order,Ordenar automáticamente 
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
+DocType: Item,Auto re-order,Ordenar automáticamente
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
-DocType: Report,Disabled,Deshabilitado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Sus productos o servicios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Sus productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
-DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén 
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nombre es necesario
+DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
 DocType: Address,City/Town,Ciudad/Provincia
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Maquinaria y Equipos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
-DocType: Hub Settings,Seller Website,Sitio Web Vendedor 
+DocType: Hub Settings,Seller Website,Sitio Web Vendedor
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio prevista.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Por proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
-apps/frappe/frappe/config/desk.py +7,Tools,Herramientas
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El número de la orden de producción es obligatoria para la entrada de productos fabricados en el stock
 DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
@@ -1080,23 +985,21 @@
 DocType: Journal Entry,Journal Entry,Asientos Contables
 DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Boletin:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución Objetivo
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarios
 DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede que usted debe cambiar &#39;Distribuir los cargos basados en&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede que usted debe cambiar &#39;Distribuir los cargos basados en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos
 DocType: BOM Operation,Workstation,Puesto de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
-DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
+DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
 DocType: Salary Slip,Earning,Ganancia
 ,BOM Browser,Explorar listas de materiales (LdM)
@@ -1104,24 +1007,20 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede hacer un registro de tiempo sólo contra una orden de producción presentada
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Boletines para contactos, clientes potenciales ."
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
-DocType: DocField,Description,Descripción
 DocType: Authorization Rule,Average Discount,Descuento Promedio
-DocType: Letter Head,Is Default,Es por defecto
 DocType: Address,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ver oferta Carta
-DocType: Communication,Communication,Comunicaciones
 DocType: Item,Is Service Item,Es un servicio
 DocType: Activity Cost,Projects,Proyectos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Por favor, seleccione el año fiscal"
@@ -1141,7 +1040,7 @@
 DocType: Item,Maintain Stock,Mantener Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la linea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1151,7 +1050,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de ausencia sin pago
@@ -1165,27 +1064,23 @@
 DocType: HR Settings,Employee Settings,Configuración del Empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
  Se utiliza para las tasas y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la Cuenta
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Compramos este artículo
 DocType: Address,Billing,Facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,No enviado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formación
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
 DocType: Shipping Rule,Shipping Account,cuenta Envíos
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios
 DocType: Quality Inspection,Readings,Lecturas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
@@ -1195,89 +1090,80 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con artículos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La fecha en que se generará próxima factura. Se genera en enviar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gobierno
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gobierno
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
 DocType: Material Request Item,Sales Order No,Orden de Venta No
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Pricing Rule,For Price List,Por lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de Ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén
 DocType: Time Log Batch Detail,Time Log Batch Detail,Detalle de Grupo de Horas Registradas
-DocType: Workflow State,Tasks,Tareas
 DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
-DocType: Event,Tuesday,Martes
 DocType: Leave Block List,Block Holidays on important days.,Bloqueo de vacaciones en días importantes.
 ,Accounts Receivable Summary,Balance de Cuentas por Cobrar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
 DocType: UOM,UOM Name,Nombre Unidad de Medida
-DocType: Top Bar Item,Target,Objetivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribución Monto
 DocType: Sales Invoice,Shipping Address,Dirección de envío
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marca principal
-DocType: ToDo,Due Date,Fecha de vencimiento
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Marca principal
 DocType: Sales Invoice Item,Brand Name,Marca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,La Organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Caja
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,La Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Pricing Rule,Pricing Rule,Reglas de Precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas bancarias
 ,Bank Reconciliation Statement,Extractos Bancarios
 DocType: Address,Lead Name,Nombre de la Iniciativa
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo inicial de Stock
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundición centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventario de Pasivos
 DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor
@@ -1287,8 +1173,8 @@
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la linea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 DocType: SMS Center,Receiver List,Lista de receptores
@@ -1296,29 +1182,25 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Configuración de las categorías de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Añadir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
 DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Ingresos Superior
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
@@ -1326,12 +1208,9 @@
 DocType: Company,Default Values,Valores Predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
-DocType: Customer,Default Price List,Lista de precios Por defecto 
+DocType: Customer,Default Price List,Lista de precios Por defecto
 DocType: Payment Reconciliation,Payments,Pagos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensado isostático en caliente
-DocType: ToDo,Medium,Medio
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 ,Customer Credit Balance,Saldo de Clientes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,"Por favor, verifique su Email de identificación"
@@ -1339,12 +1218,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 DocType: Quotation,Term Details,Detalles de los Terminos
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 DocType: Warranty Claim,Warranty Claim,Reclamación de garantía
 ,Lead Details,Iniciativas
-DocType: Authorization Rule,Approving User,Aprobar Usuario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para
 DocType: Bank Reconciliation,From Date,Desde la fecha
@@ -1359,62 +1235,59 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP )
 DocType: Territory,Territory Manager,Gerente de Territorio
-DocType: Selling Settings,Selling Settings,Configuración de Ventas 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en Línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
+DocType: Selling Settings,Selling Settings,Configuración de Ventas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en Línea
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
 ,Item Shortage Report,Reportar carencia de producto
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Números de serie únicos para cada producto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
 DocType: Upload Attendance,Get Template,Verificar Plantilla
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Coeficiente de Ponderación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}"
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Productos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad es requerida para las cuentas de Cobrar/Pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente Contacto por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la linea {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
 DocType: Quotation,Order Type,Tipo de Orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar
 ,Item-wise Sales Register,Detalle de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este Impuesto en el precio base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totales del Objetivo
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totales del Objetivo
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Sales Invoice Item,Batch No,Lote No.
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
-DocType: DocPerm,Delete,Eliminar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
 DocType: Sales Team,Contribution to Net Total,Contribución Neta Total
 DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
@@ -1423,44 +1296,38 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
-DocType: Communication,Received,Recibido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
-DocType: DocField,Attach Image,Adjuntar Imagen
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
-DocType: Stock Reconciliation Item,Leave blank if no change,Dejar en blanco si no hay cambio
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registros de tiempo para su fabricación.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Inventario para  Nivel de Reordemaniento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registro de Tiempo para las Tareas.
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
 DocType: Employee,Salutation,Saludo
-DocType: Communication,Rejected,Rechazado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear Lista de Receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
-DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Fecha de Emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad Consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicaciones
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Payment Tool,Make Payment Entry,Registrar pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
@@ -1477,32 +1344,27 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Articulo de la Cotización del Proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Hacer Estructura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Cizallamiento
 DocType: Item,Has Variants,Tiene Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la moneda predeterminada en la compañía principal y los valores predeterminados globales"
-DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto de Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestión de Proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcanzado
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,por ejemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de Productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
 ,Amount to Deliver,Cantidad para envío
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hubo errores .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un Producto o Servicio
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la Orden de Venta
@@ -1517,29 +1379,29 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
 DocType: Material Request Item,Material Request Item,Elemento de la Solicitud de Material
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Árbol de las categorías de producto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una linea mayor o igual al numero de linea actual.
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rojo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Installation Note,Installation Time,Tiempo de instalación
+DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversiones
 DocType: Issue,Resolution Details,Detalles de la resolución
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Cambie la unidad de medida (UdM) para el producto.
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},El producto {0} debe ser un servicio o producto para la venta {1}
 DocType: Item Group,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 ,Qty to Order,Cantidad a Solicitar
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para realizar el seguimiento de marca en el siguiente documentación Nota de entrega, Oportunidad, solicitud de materiales, de artículos, de órdenes de compra, compra vale, Recibo Comprador, la cita, la factura de venta, producto Bundle, órdenes de venta, de serie"
@@ -1548,31 +1410,24 @@
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Desde órden de compra
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Las direcciones de clientes y contactos
-DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia 
+DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Especificado
-DocType: Communication,Date,Fecha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar un momento.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener la función de 'Supervisor de Gastos'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Tiene lote No
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 DocType: Employee,Personal Details,Datos Personales
 ,Maintenance Schedules,Programas de Mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Repujado
 ,Quotation Trends,Tendencias de Cotización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
-DocType: Authorization Rule,Above Value,Valor Superior
 ,Pending Amount,Monto Pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de Conversión
 DocType: Purchase Order,Delivered,Enviado
@@ -1581,35 +1436,28 @@
 DocType: Journal Entry,Accounts Receivable,Cuentas por Cobrar
 ,Supplier-Wise Sales Analytics,Análisis de Ventas (Proveedores)
 DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país
-DocType: Custom Field,Custom,Personalizar
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Inyección de plásticos
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de las cuentas financieras
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
-apps/frappe/frappe/config/setup.py +130,Printing,Impresión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos está pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,El día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,deportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Por favor, establezca las llaves de acceso de Dropbox en la configuración de su sistema"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unidad
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Su año Financiero termina en
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Su año Financiero termina en
 DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
-DocType: Authorization Rule,Approving Role,Aprobar Rol
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
@@ -1617,7 +1465,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Disimular las características como de serie n , POS , etc"
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, linea {0}"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, linea {0}"
 DocType: Salary Slip,Deduction,Deducción
 DocType: Address Template,Address Template,Plantillas de direcciones
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
@@ -1629,7 +1477,7 @@
 DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por el Usuario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Actualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Costo Actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí.
@@ -1637,31 +1485,27 @@
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, seleccione un archivo csv con datos válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimiento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,SO Cantidad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
 DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
-apps/erpnext/erpnext/hooks.py +84,Shipments,Los envíos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión
+apps/erpnext/erpnext/hooks.py +68,Shipments,Los envíos
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Fila #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Fila #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
 DocType: Pricing Rule,Supplier,Proveedores
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Gastos Varios
 DocType: Global Defaults,Default Company,Compañía Predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la linea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la linea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Employee,Bank Name,Nombre del Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado
@@ -1672,26 +1516,22 @@
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde Moneda
-DocType: DocField,Name,Nombre
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de linea anterior' o ' Total de linea anterior' para la primera linea
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado
-DocType: Web Form,Select DocType,Seleccione tipo de documento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo Centro de Costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nuevo Centro de Costo
 DocType: Bin,Ordered Quantity,Cantidad Pedida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra orden de venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra orden de venta {1}
 DocType: Account,Fixed Asset,Activos Fijos
 DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
@@ -1707,10 +1547,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipos de Oficina
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrónica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde programa de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
 DocType: Purchase Invoice,Contact Details,Datos del Contacto
 DocType: C-Form,Received Date,Fecha de Recepción
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
@@ -1721,14 +1561,14 @@
 DocType: Job Applicant,Job Opening,Oportunidad de empleo
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de Pagos
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnología
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar Solicitudes de Material ( MRP ) y Órdenes de Producción .
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Monto Facturado
 DocType: Time Log,To Time,Para Tiempo
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar registros secundarios , explorar el árbol y haga clic en el registro en el que desea agregar más registros."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,Cant. Completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
@@ -1737,12 +1577,10 @@
 DocType: Item,Customer Item Codes,Códigos de clientes
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago contra órdenes o facturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere Unidad de Medida para Nuevo Inventario
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
@@ -1752,15 +1590,13 @@
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldeo por compresión
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Sus clientes
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 DocType: Sales Order,Not Delivered,No Entregado
 ,Bank Clearance Summary,Liquidez Bancaria
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código del artículo> Grupo Elemento> Marca
 DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
-DocType: Event,Friday,Viernes
 DocType: Time Log,Costing Amount,Costo acumulado
 DocType: Process Payroll,Submit Salary Slip,Presentar nómina
 DocType: Salary Structure,Monthly Earning & Deduction,Ingresos Mensuales y Deducción
@@ -1768,16 +1604,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del Remitente
-DocType: Page,Title,Nombre
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalización 
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: SMS Log,Sent To,Enviado A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Hacer Factura de Venta
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Desde la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles de Empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
@@ -1792,30 +1626,28 @@
 DocType: Serial No,Delivery Time,Tiempo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad Basada en
 DocType: Item,End of Life,Final de la Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Sales Invoice,Recurring,Periódico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reordenar productos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,Usuario elegirá siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de Instalación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Agregar impuestos
 ,Financial Analytics,Análisis Financieros
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Filial
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
 DocType: Quality Inspection,Purchase Receipt No,Recibo de Compra No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
-DocType: System Settings,In Hours,Horas
 DocType: Process Payroll,Create Salary Slip,Crear Nómina
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Importe pendiente de banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulido
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Importe pendiente de banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la linea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
@@ -1827,14 +1659,12 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
 DocType: Sales Invoice,Mass Mailing,Correo Masivo
-DocType: Page,Standard,Estándar
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
 DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
@@ -1844,28 +1674,23 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Está Inactivo
 DocType: Buying Settings,Buying Settings,Configuración de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabado en masa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Tool,Payment Account,Pago a cuenta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
-DocType: User,Female,Femenino
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
-DocType: Print Settings,Modern,Moderno
-DocType: Communication,Replied,Respondio
 DocType: Payment Tool,Total Payment Amount,Importe total a pagar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
@@ -1873,7 +1698,6 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento  excepto el rol que se especifica a continuación .
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
@@ -1883,7 +1707,7 @@
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este Contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidad de Medida
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Task Depends On,Task Depends On,Tarea Depende de
 DocType: Lead,Opportunity,Oportunidades
@@ -1902,17 +1726,15 @@
 DocType: Purchase Invoice,Advances,Anticipos
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
-DocType: Campaign,Campaign-.####,Campaña-.#### 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación
+DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Tiene Nodo Niño
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanizado fotoquímico
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1954,33 +1776,29 @@
  8. Introduzca Row: Si se basa en ""Anterior Fila Total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior).
  9. Considere impuesto o cargo para: En esta sección se puede especificar si el impuesto / carga es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-DocType: Note,Note,nota
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
-DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Journal Entry,Credit Note,Nota de Crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},La cantidad completada no puede ser mayor de {0} para la operación {1}
 DocType: Features Setup,Quality,Calidad
-DocType: Contact Us Settings,Introduction,Introducción
 DocType: Warranty Claim,Service Address,Dirección del Servicio
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Número máximo de 100 filas de Conciliación de Inventario.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Número máximo de 100 filas de Conciliación de Inventario.
 DocType: Stock Entry,Manufacture,Manufactura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Fecha de liquidación no definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Fecha de liquidación no definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producción
 DocType: Item,Allow Production Order,Permitir Orden de Producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones
@@ -1990,14 +1808,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Los gastos de servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
-,Download Backups,Descargar Backups
 DocType: Notification Control,Sales Order Message,Mensaje de la Orden de Venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de Pago
 DocType: Process Payroll,Select Employees,Seleccione Empleados
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalles
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 DocType: Employee,Emergency Contact,Contacto de Emergencia
 DocType: Item,Quality Parameters,Parámetros de Calidad
@@ -2019,30 +1835,25 @@
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento
 DocType: Account,Income Account,Cuenta de Ingresos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste"
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Cost Center,Cost Center,Centro de Costos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
 DocType: Upload Attendance,Upload HTML,Subir HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance total ({0}) en contra de la orden {1} no puede ser mayor \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Fecha de relevo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Láser diseñado conformación neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del Artículo
@@ -2050,10 +1861,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Ajustes de Inventarios
-DocType: User,Bio,Biografía
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nombre de Nuevo Centro de Coste
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nombre de Nuevo Centro de Coste
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No se encontró plantilla de dirección por defecto. Favor cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección.
 DocType: Appraisal,HR User,Usuario Recursos Humanos
@@ -2064,27 +1874,24 @@
 DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
 ,Pending SO Items For Purchase Request,A la espera de la Orden de Compra (OC) para crear Solicitud de Compra (SC)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 ,Profit and Loss Statement,Estado de Pérdidas y Ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de Valoración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotización {0} se cancela
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleado {0} estaba de permiso en {1} . No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2094,11 +1901,9 @@
 DocType: Production Order Operation,Make Time Log,Hacer Registro de Tiempo
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de molienda
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
@@ -2134,7 +1939,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Marque si es factura periódica, desmarque para detener periodicidad o poner una fecha final"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo {0} filas permitidos
 DocType: C-Form Invoice Detail,Net Total,Total Neto
 DocType: Bin,FCFS Rate,Cambio FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturación (Facturas de venta)
@@ -2150,7 +1954,6 @@
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanizado electroquímico
 ,Requested,Requerido
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
@@ -2159,11 +1962,10 @@
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
 DocType: Features Setup,Sales and Purchase,Ventas y Compras
 DocType: Supplier Quotation Item,Material Request No,Nº de Solicitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
-apps/frappe/frappe/templates/base.html +134,Added,Agregado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Vista en árbol para la administración de los territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de Venta
 DocType: Journal Entry Account,Party Balance,Saldo de socio
@@ -2177,11 +1979,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo Root
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
@@ -2191,12 +1991,11 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Rocíe la formación
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
@@ -2207,41 +2006,38 @@
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo
 DocType: Bin,Bin,Papelera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Saliente
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Company,Compañía(s)
 DocType: Account,Expense Account,Cuenta de gastos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del Proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el Nombre de Sesión
 DocType: Installation Note Item,Against Document No,Contra el Documento No
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrar Puntos de venta.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspección
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Vista detallada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviarlo"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nombre o Email es obligatorio
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad entrante
 DocType: Employee,Exit,Salir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo Root es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo Root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabado vibratorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
@@ -2249,42 +2045,38 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Molienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de Proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduzca el nombre de la campaña si el origen de la encuesta es una campaña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Periódicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Periódicos
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de Reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
 DocType: Item,Valuation Method,Método de Valoración
 DocType: Sales Invoice,Sales Team,Equipo de Ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entrada Duplicada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada Duplicada
 DocType: Serial No,Under Warranty,Bajo Garantía
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del Empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Riesgo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Riesgo
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Número de orden {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de Empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcado
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
 ,Issued Items Against Production Order,Productos emitidos con una orden de producción
 DocType: Pricing Rule,Purchase Manager,Gerente de Compras
@@ -2304,9 +2096,7 @@
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
-DocType: Website Settings,Website Settings,Configuración del Sitio Web
 DocType: Activity Cost,Billing Rate,Tasa de facturación
 ,Qty to Deliver,Cantidad para Ofrecer
 DocType: Monthly Distribution Percentage,Month,Mes.
@@ -2316,18 +2106,17 @@
 DocType: Material Request,Requested For,Solicitados para
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Imagenes de entradas
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de Mercado
-DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
@@ -2342,10 +2131,9 @@
 ,Billed Amount,Importe Facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación Bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
-DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Lead,Lower Income,Ingreso Bajo
@@ -2354,38 +2142,34 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
 DocType: Features Setup,Sales Extras,Extras Ventas
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} contra el centro de costos {2} es mayor por {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} contra el centro de costos {2} es mayor por {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
 ,Qty to Receive,Cantidad a Recibir
 DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factor de conversión no puede estar en fracciones
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta de sobregiros
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura de saldos de capital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas"
 DocType: Appraisal,Appraisal,Evaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2398,12 +2182,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
 DocType: BOM Operation,Hour Rate,Hora de Cambio
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Desde cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Orden de Compra del Artículo No
-DocType: System Settings,System Settings,Configuración del Sistema
 DocType: Project,Project Type,Tipo de Proyecto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costo de diversas actividades
@@ -2415,32 +2198,28 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del Proveedor
-DocType: Communication,Recipients,Destinatarios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la linea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
 DocType: Sales Order,Recurring Order,Orden Recurrente
 DocType: Company,Default Income Account,Cuenta de Ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenido a ERPNext
+,Welcome to ERPNext,Bienvenido a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número de Detalle de Comprobante
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Iniciativa a cotización
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La órden de compra {0} no existe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,La órden de compra {0} no existe
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
@@ -2448,13 +2227,10 @@
 DocType: Issue,Opening Date,Fecha de Apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta
-DocType: Blog Category,Parent Website Route,Ruta del Website Principal
 DocType: Sales Order,Not Billed,No facturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos todavía
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No activo
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
@@ -2462,20 +2238,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las Órdenes de Venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Ir al grupo apropiado, usualmente (Fuente de los fondos> Pasivos Corrientes> Impuestos y derechos) y crear una nueva cuenta, haciendo clic en Añadir hijo de tipo ""Impuestos"" y referir a la tasa de impuestos."
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte por láser
-DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entradas de Inventario
 DocType: Account,Payable,Pagadero
 DocType: Salary Slip,Arrear Amount,Monto Mora
@@ -2488,16 +2261,14 @@
 DocType: Lead,Address Desc,Dirección
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
-DocType: Page,All,Todos
 DocType: Stock Entry Detail,Source Warehouse,fuente de depósito
 DocType: Installation Note,Installation Date,Fecha de Instalación
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 DocType: Account,Sales User,Usuario de Ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Lead,Lead Owner,Propietario de la Iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Se requiere Almacén
 DocType: Employee,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
@@ -2507,44 +2278,39 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Entregado
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución Mensual Porcentual
-DocType: Territory,Territory Targets,Territorios Objetivos 
+DocType: Territory,Territory Targets,Territorios Objetivos
 DocType: Delivery Note,Transporter Info,Información de Transportista
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
 DocType: Purchase Invoice,Terms,Términos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Crear
 DocType: Buying Settings,Purchase Order Required,Órden de compra requerida
 ,Item-wise Sales History,Detalle de las ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
 ,Purchase Analytics,Analítico de Compras
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
 DocType: Expense Claim,Task,Tarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Afeitado
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
 ,Stock Ledger,Mayor de Inventarios
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducción En Planilla
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione un nodo de grupo primero.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de Recursos Humanos
 DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Cantidad
 DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
@@ -2555,8 +2321,6 @@
 DocType: Task,depends_on,depende de
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad Perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos 'descuento' estarán disponibles en la orden de compra, recibo de compra y factura de compra"
-DocType: Report,Report Type,Tipo de informe
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Cargando
 DocType: BOM Replace Tool,BOM Replace Tool,Herramienta de reemplazo de lista de materiales (LdM)
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
@@ -2567,16 +2331,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Purchase Order Item,Material Request Detail No,Detalle de Solicitud de Materiales No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneado duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Hacer Visita de Mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
 DocType: Item,Supplier Items,Artículos del Proveedor
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidad
@@ -2588,64 +2351,56 @@
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Fila {0}: Cantidad no esta disponible en almacén {1} del {2} {3}.  Disponible Cantidad: {4}, Transferir Cantidad: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
-DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribución (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de artículos
 DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (Vía registros)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente Facturado
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto Total Soprepasado
 DocType: Time Log Batch,Total Hours,Total de Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde fecha
 DocType: Notification Control,Custom Message,Mensaje personalizado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su País, Zona Horaria y Moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Inversión
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fundición de arena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
 DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con este correo electrónico debería existir
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Salary Structure,Salary Structure,Estructura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea Aérea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Por almacén
 DocType: Employee,Offer Date,Fecha de Oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2654,86 +2409,74 @@
 DocType: Item,Is Fixed Asset Item,Son partidas de activo fijo
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias hojas con todos los encabezados y pies de página en cada una"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 DocType: Fiscal Year,Year Name,Nombre del Año
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de Socio de Ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial
 DocType: Issue,Opening Time,Tiempo de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
 DocType: Shipping Rule,Calculate Based On,Calcular basado en
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y Total
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
 DocType: Account,Purchase User,Usuario de Compras
 DocType: Notification Control,Customize the Notification,Personalice la Notificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo
-DocType: Web Page,Slideshow,Presentación
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
 DocType: Sales Invoice,Shipping Rule,Regla de envío
 DocType: Journal Entry,Print Heading,Título de impresión
 DocType: Quotation,Maintenance Manager,Gerente de Mantenimiento
-DocType: Workflow State,Search,Búsqueda
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde el último pedido' debe ser mayor o igual a cero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificado Desde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia Prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Materia Prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
 DocType: Leave Control Panel,Carry Forward,Cargar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
 ,Produced,Producido
 DocType: Item,Item Code for Suppliers,Código del producto para Proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Adjuntar membrete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; IVA, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; IVA, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
-DocType: Blog Post,Blog Post,Entrada en el Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Gastos Postales
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear Cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impuesto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Fila {0}: {1} no es un {2} válido 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinación
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Fila {0}: {1} no es un {2} válido
 DocType: Production Planning Tool,Production Planning Tool,Herramienta de planificación de la producción
 DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Enrutamiento
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
@@ -2742,27 +2485,23 @@
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
 DocType: Pricing Rule,Customer Group,Categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
-DocType: Item,Website Description,Descripción del Sitio Web 
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+DocType: Item,Website Description,Descripción del Sitio Web
 DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
 ,Sales Register,Registros de Ventas
 DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
 DocType: Address,Plant,Planta
-DocType: DocType,Setup,Configuración
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminación en frío
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Por favor seleccione trasladar, si usted desea incluir los saldos del año fiscal anterior a este año"
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
-DocType: Packing Slip,Get Items,Obtener Artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtener Artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
-DocType: DocField,Image,Imagen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
-DocType: Communication,Other,Otro
 DocType: C-Form,C-Form,C - Forma
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
@@ -2774,33 +2513,26 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id de Distribución
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
 DocType: Purchase Invoice,Supplier Address,Dirección del proveedor
-DocType: Contact Us Settings,Address Line 2,Dirección Línea 2
-DocType: ToDo,Reference,Referencia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant.
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serie es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios Financieros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios Financieros
 DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
-DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
+DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto
 DocType: Item Reorder,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,La sinterización
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Serie de configuración
-DocType: Supplier,Contact HTML,"HTML del Contacto
-"
+DocType: Supplier,Contact HTML,HTML del Contacto
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra
 DocType: Payment Reconciliation,Maximum Amount,Importe máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la Regla Precios?
@@ -2808,8 +2540,7 @@
 DocType: Company,Retail,venta al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} no existe Cliente
 DocType: Attendance,Absent,Ausente
-DocType: Product Bundle,Product Bundle,Conjunto/Paquete de productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Conjunto/Paquete de productos
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
 DocType: Upload Attendance,Download Template,Descargar Plantilla
 DocType: GL Entry,Remarks,Observaciones
@@ -2817,21 +2548,18 @@
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional 
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
 DocType: Sales Invoice,Return Against Sales Invoice,Devolución Contra Factura de venta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Elemento 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
 DocType: Serial No,Creation Time,Momento de la creación
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingresos Totales
 DocType: Sales Invoice,Product Bundle Help,Ayuda del conjunto/paquete de productos
@@ -2841,38 +2569,34 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
-DocType: Workflow State,Time,Tiempo
 DocType: Features Setup,Sales Discounts,Descuentos sobre Ventas
-DocType: Hub Settings,Seller Country,País del Vendedor 
+DocType: Hub Settings,Seller Country,País del Vendedor
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
-DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones 
+DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar subcuenta
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene cuentas secundarias"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere el factor de conversión
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comisión de Ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 ,Customers Not Buying Since Long Time,Clientes Ausentes
 DocType: Production Order,Expected Delivery Date,Fecha Esperada de Envio
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-modelo de fundición
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Gastos de Entretenimiento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Las solicitudes de licencia .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Gastos Legales
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 28, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
@@ -2885,23 +2609,21 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
-DocType: Feed,Full Name,Nombre Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificación
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Haga Registro de Tiempo de Lotes
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Monto total de facturación (a través de los registros de tiempo)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vendemos este artículo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Proveedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
@@ -2910,18 +2632,16 @@
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar lineas para establecer los presupuestos anuales de las cuentas.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Identificación del email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra
 DocType: GL Entry,Party Type,Tipo de entidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,El moldeo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla Maestra para Salario .
 DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos
 DocType: Payment Tool,Set Matching Amounts,Coincidir pagos
@@ -2932,15 +2652,15 @@
 ,Qty to Transfer,Cantidad a Transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
-,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretario
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
@@ -2952,38 +2672,33 @@
 ,Item-wise Price List Rate,Detalle del Listado de Precios
 DocType: Purchase Order Item,Supplier Quotation,Cotizaciónes a Proveedores
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
-DocType: Letter Head,Letter Head,Membretes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
 DocType: Purchase Order,To Receive,Recibir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink apropiado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingresos / gastos
 DocType: Employee,Personal Email,Correo Electrónico Personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
 DocType: Customer,From Lead,De la iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre del proyecto
-DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
@@ -2991,20 +2706,18 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Activos por Impuestos
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
-DocType: Contact Us Settings,Pincode,Código PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Promedio Movil
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nueva Unidad de Medida del Inventario debe ser diferente de la Unidad de Medida actual
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este problema, utilice el botón ""Asignar"" en la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,Para la moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
@@ -3013,10 +2726,7 @@
 DocType: Project,Default Cost Center,Centro de coste por defecto
 DocType: Purchase Invoice,End Date,Fecha Final
 DocType: Employee,Internal Work History,Historial de trabajo interno
-DocType: DocField,Column Break,Salto de columna
-DocType: Event,Thursday,Jueves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Capital de riesgo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Torneado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Account,Expense,Gastos
 DocType: Sales Invoice,Exhibition,Exposición
@@ -3028,27 +2738,26 @@
 DocType: Employee,Held On,Retenida en
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción
 ,Employee Information,Información del Empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Procentaje (% )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Procentaje (% )
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por 'nombre'"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un producto para compra o sub-contratado en la linea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
 DocType: GL Entry,Party,Socio
 DocType: Sales Order,Delivery Date,Fecha de Entrega
-DocType: DocField,Currency,Divisa
 DocType: Opportunity,Opportunity Date,Oportunidad Fecha
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
 DocType: Purchase Order,To Bill,A Facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pieza de trabajo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Promedio de Compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
@@ -3062,74 +2771,64 @@
 DocType: Opportunity,To Discuss,Para Discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crear una carta de oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorno
-DocType: DocField,Fold,Plegar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Inhabilitar
 DocType: Project Task,Pending Review,Pendiente de revisar
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Por favor, especifique"
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
-DocType: Page,Page Name,Nombre de la Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time
 DocType: Journal Entry Account,Exchange Rate,Tipo de Cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabado husillo
 DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por ejemplo ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
-DocType: System Settings,Time Zone,Zona Horaria
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados contra la nota de entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado
 DocType: Customer,Customer Details,Datos del Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Informes al
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Can. en balance
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Can. en balance
 DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de Costos
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Almacenes.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Almacenes.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
 DocType: Employee,Employment Type,Tipo de Empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Activos Fijos
 DocType: Item Group,Default Expense Account,Cuenta de Gastos por defecto
 DocType: Employee,Notice (days),Aviso (días)
-DocType: Page,Yes,Sí
 DocType: Employee,Encashment Date,Fecha de Cobro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo {0} Nombre
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de Artículo
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3138,10 +2837,9 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
+Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
 DocType: Item Variant Attribute,Attribute,Atributo
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creado por
 DocType: Serial No,Under AMC,Bajo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
@@ -3153,45 +2851,43 @@
 DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualización de las Mercancías Terminadas
 DocType: Workstation,per hour,por horas
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} ya se utiliza en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 DocType: Account,Receivable,Cuenta por Cobrar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
 DocType: Sales Invoice,Supplier Reference,Referencia del Proveedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
 DocType: Material Request,Material Issue,Incidencia de Material
-DocType: Hub Settings,Seller Description, Descripción del Vendedor
+DocType: Hub Settings,Seller Description,Descripción del Vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precios de Productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y Detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en Movimiento y Vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y Detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en Movimiento y Vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
-DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
+DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar Unidad de Medida
 DocType: POS Profile,Terms and Conditions,Términos y Condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0} 
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Purchase Invoice,In Words,En palabras
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Production Planning Tool,Material Request For Warehouse,Solicitud de material para el almacén
 DocType: Sales Order Item,For Production,Por producción
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Por favor, ingrese la Orden de Venta (OV) en la siguiente tabla"
 DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Su año Financiero inicia en
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Su año Financiero inicia en
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
@@ -3200,14 +2896,12 @@
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escasez Cantidad
 DocType: Salary Slip,Salary Slip,Planilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, "
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete,"
 DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
 DocType: Salary Slip,Payment Days,Días de Pago
 DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
 DocType: Features Setup,Item Advanced,Producto anticipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminación en caliente
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del Empleado
@@ -3219,34 +2913,27 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad
 DocType: Email Digest,Email Digest,Boletín por Correo Electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por Departamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del Sistema
-DocType: Workflow,Is Active,Está Activo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por Departamento
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Balance del Sistema
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbado
 DocType: Company,Change Abbreviation,Cambiar Abreviación
-DocType: Workflow State,Primary,Primario
 DocType: Expense Claim Detail,Expense Date,Fecha de Gasto
 DocType: Item,Max Discount (%),Descuento Máximo (%)
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Monto de la última orden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoración del producto actualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de Manufactura
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
-DocType: Communication,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
 DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
-DocType: Communication,Email,Correo electrónico
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 ,General Ledger,Balance General
@@ -3256,9 +2943,7 @@
 ,Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Features Setup,To get Item Group in details table,Para obtener Grupo de Artículo en la tabla detalles
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibujar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Aguafuerte
 DocType: Sales Invoice,Commission,Comisión
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3284,7 +2969,7 @@
  {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Importe por Defecto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Almacén no se encuentra en el sistema
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
@@ -3297,13 +2982,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Payment Tool,Get Outstanding Vouchers,Verificar Comprobantes Pendientes
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las vacaciones para un período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
@@ -3313,11 +2997,7 @@
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodando
-DocType: ToDo,Priority,Prioridad
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
-DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox Permitido
-DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado
@@ -3325,42 +3005,34 @@
 DocType: Workstation,Operating Costs,Costos Operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldo de Apertura de Libro Mayor de Inventarios han sido actualizados
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes Generales
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Por fabricación
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totales
 DocType: BOM,Manufacturing,Producción
 ,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
 DocType: Account,Income,Ingresos
-,Setup Wizard,Asistente de configuración
 DocType: Industry Type,Industry Type,Tipo de Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
-DocType: Email Alert,Reference Date,Fecha de referencia
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 DocType: Budget Detail,Budget Detail,Detalle del presupuesto
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
-DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de Medida Actualizado para el punto {0}
-DocType: Company History,Year,Año
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles del Punto de Venta POS
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Hora de registro {0} ya facturado
@@ -3373,12 +3045,12 @@
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
 DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
 DocType: Purchase Invoice,Contact,Contacto
@@ -3388,36 +3060,32 @@
 DocType: Employee,Date of Issue,Fecha de emisión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 DocType: Issue,Content Type,Tipo de Contenido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Cost Center,Budgets,Presupuestos
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado
 DocType: Employee,Emergency Contact Details,Detalles de Contacto de Emergencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿Qué hace?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de Comisión Promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pulido
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde el último pedido
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Días desde el último pedido
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
-DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea enviar toda la nómina para el mes {0} y año {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar suscriptores
@@ -3430,11 +3098,8 @@
 DocType: Stock Settings,Stock Frozen Upto,Inventario Congelado hasta
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del Proyecto / Tarea.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar etiquetas salariales
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no es un ID de correo electrónico válido
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
-DocType: ToDo,Low,Bajo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Hilado
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
@@ -3452,10 +3117,9 @@
 DocType: Email Digest,Receivables,Cuentas por Cobrar
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Ingrese correo electrónico de identificación separadas por comas, la orden será enviada automáticamente en una fecha particular"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la Campaña 
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la Campaña
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Receipt Item,Rejected Serial No,Rechazado Serie No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embutición profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo Boletín
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3466,7 +3130,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de Ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
@@ -3476,25 +3139,20 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme su Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ofrecer al candidato un empleo.
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} es necesario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldeo por vacío
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
-DocType: Contact Us Settings,City,Ciudad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
 DocType: Task,Closing Date,Fecha de Cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
 DocType: Sales Partner,Partner Type,Tipo de Socio
@@ -3502,7 +3160,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de Producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
@@ -3510,25 +3168,23 @@
 DocType: BOM,Raw Material Cost,Costo de la Materia Prima
 DocType: Item,Re-Order Level,Reordenar Nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Actualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de informe es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Item,Serial Number Series,Número de Serie Serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la linea {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El primer usuario: Usted
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado con éxito
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado con éxito
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
-DocType: Page,No,No
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
@@ -3536,30 +3192,26 @@
 ,Item Prices,Precios de los Artículos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Cierre de Período
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Configuracion de las listas de precios
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Configuracion de las listas de precios
 DocType: Task,Review Date,Fecha de Revisión
-DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la linea {0} deben ser los mismos para la orden de producción
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Molienda
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no especificado para %s recurrentes
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordisqueando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Gastos de Administración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
 DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
-DocType: Email Digest,Receivables / Payables,Cobrables/ Pagables 
+DocType: Email Digest,Receivables / Payables,Cobrables/ Pagables
 DocType: Delivery Note Item,Against Sales Invoice,Contra la Factura de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas
@@ -3570,17 +3222,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
 DocType: Delivery Note,Print Without Amount,Imprimir sin Importe
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
-DocType: User,Last Name,Apellido
-DocType: Web Page,Left,Izquierda
-DocType: Event,All Day,Todo el Día
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
 DocType: Issue,Support Team,Equipo de Soporte
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
-DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lotes de Producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
-DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de Débito
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
@@ -3593,7 +3240,6 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Total Anticipo
-DocType: Workflow State,User,Usuario
 DocType: Opportunity Item,Basic Rate,Precio base
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como Perdidos
 DocType: Customer,Credit Days Based On,Días de crédito basados en
@@ -3601,31 +3247,27 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
 ,Items To Be Requested,Solicitud de Productos
-DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Correo de la compañía no encontrado, por lo que el correo no ha sido enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Correo de la compañía no encontrado, por lo que el correo no ha sido enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio
 DocType: Attendance,Employee Name,Nombre del Empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 DocType: Purchase Common,Purchase Common,Compra Común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de Empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la linea {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
-DocType: DocField,Default,Defecto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
@@ -3635,18 +3277,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este artículo que se puede ver en la máster de No de Serie."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
 DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
 DocType: Employee,Current Address Is,La Dirección Actual es
 DocType: Address,Office,Oficina
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Existencias
 DocType: Employee,Current Address,Dirección Actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
@@ -3654,14 +3295,13 @@
 DocType: Employee,Contract End Date,Fecha Fin de Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
-DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Desde cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
 DocType: GL Entry,Transaction Date,Fecha de Transacción
 DocType: Production Plan Item,Planned Qty,Cantidad Planificada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
@@ -3671,27 +3311,23 @@
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Movimientos de inventario
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
-DocType: Email Account,Service,Servicio
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen Bruto %
 DocType: BOM,With Operations,Con operaciones
 ,Monthly Salary Register,Registar Salario Mensual
-apps/frappe/frappe/website/template.py +140,Next,Próximo
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,El electropulido
 DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una linea"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una linea"
 DocType: POS Profile,POS Profile,Perfiles POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Cantidad de pago no puede ser superior a Monto Pendiente
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total no pagado
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registro de Horas no es Facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salario neto no puede ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuesto del artículo
@@ -3700,14 +3336,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Tarjeta de Crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Tarjeta de Crédito
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Laboreo
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Hub Settings,Seller Name,Nombre del Vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
@@ -3715,23 +3349,22 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Stock Entry,Repack,Vuelva a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root no se puede editar .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root no se puede editar .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Producción en Vacaciones
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de Pedido de Compra del Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
-DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad de Dropbox
 DocType: Purchase Order,To Receive and Bill,Para Recibir y pagar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de Términos y Condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la linea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'Solicitud de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de Compras
 DocType: Batch,Expiry Date,Fecha de caducidad
@@ -3739,20 +3372,18 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proyecto maestro
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref
-DocType: Employee,Reason for Leaving,Razones de Renuncia 
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Fecha Ref
+DocType: Employee,Reason for Leaving,Razones de Renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
 DocType: GL Entry,Is Opening,Es apertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"

diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 0f1bbc0..690c220 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de pago
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Seleccione la distribución mensual, si usted desea monitoreo de las temporadas"
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advertencia: El mismo artículo se ha introducido varias veces.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Productos ya sincronizados
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Productos de consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recocido
 DocType: Item,Customer Items,Partidas de deudores
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: de cuenta padre {1} no puede ser una cuenta de libro mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Supervisores de ausencias
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Arrendado
-DocType: About Us Settings,Website,Sitio web
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactación más sinterización
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
-DocType: Purchase Order,Customer Contact,Contacto con el cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Desde requisición de materiales
+DocType: Purchase Order,Customer Contact,Contacto del cliente
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Desde requisición de materiales
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Árbol: {0}
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la línea {0}"
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado por
@@ -43,125 +40,118 @@
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Secuencia actualizada correctamente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Puntadas
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
 ,Purchase Order Items To Be Received,Productos por recibir desde orden de compra
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nueva solicitud de ausencia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,GIRO BANCARIO
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Giro bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1 . Utilice esta opción para mantener el código del producto asignado por el cliente, de esta manera podrá encontrarlo en el buscador"
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar variantes
-DocType: Sales Invoice Item,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de graduación
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
 DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crear un nuevo perfil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Asistencia médica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retraso en el pago (días)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección de correo electrónico
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Dirección de correo electrónico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Company,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Línea # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Línea # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No.
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, seleccione la lista de precios"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Tratamiento de la madera
-DocType: Production Order Operation,Work In Progress,TRABAJOS EN PROCESO
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impresión 3D
+DocType: Production Order Operation,Work In Progress,Trabajo en proceso
 DocType: Employee,Holiday List,Lista de festividades
 DocType: Time Log,Time Log,Gestión de tiempos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Contador
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Company,Phone No,Teléfono No.
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Bitácora de actividades realizadas por los usuarios en las tareas que se utilizan para el seguimiento del tiempo y la facturación.
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuevo {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nuevo/a {0}: #{1}
 ,Sales Partners Commission,Comisiones de socios de ventas
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atributo Valor {0} no se puede quitar de {1} como Artículo Variantes \ existen con este atributo.
-DocType: Print Settings,Classic,Clásico
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
 DocType: BOM,Operations,Operaciones
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de descuento para {0}
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleccione Almacén ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Abarrotes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crear entrada de banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondo de pensiones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,El almacén es obligatorio si el tipo de cuenta es 'almacén'
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Lead,Person Name,Nombre de persona
-DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o marcar una fecha final"
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Marque si es una orden recurrente, desmarque si quiere detenerla o definir una fecha final"
 DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Por favor, configure el sistema de Nombre de Empleados a través de: Recursos Humanos > Configuración de recursos humanos"
 DocType: POS Profile,Write Off Cost Center,Desajuste de centro de costos
-DocType: Warehouse,Warehouse Detail,Detalle de almacenes
+DocType: Warehouse,Warehouse Detail,Detalles de almacen
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),Imagen del producto (si no utilizará diapositivas)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la operación
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por hora / 60) * Tiempo real de la operación
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
-DocType: Blog Post,Guest,Invitado
 DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales (LdM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} es obligatorio
 DocType: Stock Entry,Additional Costs,Costes adicionales
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
-DocType: Standard Reply,Owner,Propietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Por favor, ingrese primero la compañía"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, seleccione primero la compañía"
 DocType: Employee Education,Under Graduate,Estudiante
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Escariado
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Bienes raíces
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
-DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar.
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Gastos sobre existencias
 DocType: Newsletter,Email Sent?,Enviar Email?
@@ -169,30 +159,28 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostrar gestión de tiempos
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Suministro de materia prima para la compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,El producto {0} debe ser un producto para la compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera validada.
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Enderezado
 DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Lotes de gestión de tiempos para facturación.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,El boletín de noticias ya ha sido enviado
 DocType: Lead,Request Type,Tipo de solicitud
 DocType: Leave Application,Reason,Razón
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ejecución
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el administrador del sistema (puede cambiar esto más adelante).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Productos y precios
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Productos y precios
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la evaluación.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa de la lista de precios (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Iniciar
-DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Seleccione términos y condiciones
 DocType: Production Planning Tool,Sales Orders,Ordenes de venta
 DocType: Purchase Taxes and Charges,Valuation,Valuación
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Cuenta bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
 DocType: Selling Settings,Default Territory,Territorio predeterminado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisión
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rechinar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de la gestión de tiempos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recibida el
 DocType: Sales Partner,Reseller,Re-vendedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Por favor, introduzca compañia"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Newsletter List,Total Subscribers,Suscriptores totales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre de contacto
+,Contact Name,Nombre de contacto
 DocType: Production Plan Item,SO Pending Qty,Cant. de OV pendientes
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Vivienda Doble
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, las secuencias e identificadores para {0} a través de Configuración> Configuración> Secuencias e identificadores"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
-apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
-DocType: Bulk Email,Message,Mensaje
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
-DocType: Dropbox Backup,Dropbox Access Key,Clave de acceso a Dropbox
 DocType: Payment Tool,Reference No,Referencia No.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido
 DocType: Lead,Do Not Contact,No contactar
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Requisición de Materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Requisición de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
 DocType: Item,Purchase Details,Detalles de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Cepillo de alambre
 DocType: Employee,Relation,Relación
 DocType: Shipping Rule,Worldwide Shipping,Envío al mundo entero
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordenes de clientes confirmadas.
@@ -284,45 +265,34 @@
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Cuenta de gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caractéres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma.
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Máximo 5 caractéres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desactiva la creación de bitácoras (gestión de tiempos) para las órdenes de producción (OP). Las operaciones ya no tendrán un seguimiento.
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
 apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Item,Synced With Hub,Sincronizado con Hub.
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña Incorrecta
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,El elemento {0} debe ser un servicio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
-DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perforación por láser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nueva unidad de medida (UdM)
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
-DocType: Communication,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Perfil del puesto
 DocType: Newsletter,Newsletter,Boletín de noticias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Tapado / Sellado
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Se ha actualizado el producto
-DocType: Async Task,System Manager,Administrador del sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
 DocType: Sales Invoice Item,Delivery Note,Nota de entrega
-DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acceso a Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Workstation,Rent Cost,Costo de arrendamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Por favor seleccione el mes y el año
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Email de la compañía
 DocType: GL Entry,Debit Amount in Account Currency,Importe debitado con la divisa
 DocType: Shipping Rule,Valid for Countries,Válido para los Países
-DocType: Workflow State,Refresh,Actualizar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los campos tales como la divisa, tasa de conversión, el total de las importaciones, la importación total general etc están disponibles en recibo de compra, cotización de proveedor, factura de compra, orden de compra, etc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleccione producto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,la factura de compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,El recibo de compra debe validarse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,La configuración ya se ha completado!
-,Finished Goods,PRODUCTOS TERMINADOS
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,La configuración ya se ha completado!
+,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 DocType: Maintenance Visit,Maintenance Type,Tipo de mantenimiento
@@ -370,34 +337,33 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, NO crear cuentas de clientes y/o proveedores. Estas son creadas en los maestros de clientes/proveedores."
 DocType: Currency Exchange,Currency Exchange,Cambio de divisas
 DocType: Purchase Invoice Item,Item Name,Nombre del producto
+DocType: Authorization Rule,Approving User  (above authorized value),La aprobación del usuario (por encima del valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo Acreedor
 DocType: Employee,Widowed,Viudo
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados en Cantidad proyectada y pedido mínimo Cantidad"
-DocType: Workstation,Working Hours,Horas de Trabajo
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Elementos que deben exigirse que son "" Fuera de Stock "", considerando todos los almacenes basados en Cantidad proyectada y pedido mínimo Cantidad"
+DocType: Workstation,Working Hours,Horas de trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
 ,Purchase Register,Registro de compras
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Médico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Abalorios Tubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}
 DocType: Employee,Single,Soltero
 DocType: Issue,Attachment,Adjunto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,El presupuesto no se puede establecer para un grupo del centro de costos
-DocType: Account,Cost of Goods Sold,COSTO SOBRE VENTAS
+DocType: Account,Cost of Goods Sold,Costo sobre ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Por favor, introduzca el centro de costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, introduzca el centro de costos"
 DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Precio de venta promedio 
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Precio de venta promedio
 DocType: Purchase Order,Start date of current order's period,Fecha inicial del período de ordenes
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la línea {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la línea {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios
-DocType: Delivery Note,% Installed,"
-% Instalado"
+DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: BOM,Item Desription,Descripción de producto
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
@@ -405,10 +371,8 @@
 DocType: Account,Is Group,Es un grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Corte longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta caso No.' no puede ser inferior a 'desde el caso No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,No iniciado
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
@@ -417,51 +381,46 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master de vacaciones .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Fecha de solicitud
-DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, introduzca el código del producto."
+DocType: Delivery Note,Billing Address,Dirección de facturación
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el Importe"
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Employee,Health Concerns,Problemas de salud
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No pagado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Impagado
 DocType: Packing Slip,From Package No.,Desde paquete No.
 DocType: Item Attribute,To Range,A rango
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
 DocType: Features Setup,Imports,Importaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Union adhesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Hojas totales asignados es obligatorio
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Actividades pendientes para hoy
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de Asistencia .
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registros de asistencias.
 DocType: Bank Reconciliation,Journal Entries,Asientos contables
-DocType: Sales Order Item,Used for Production Plan,Se utiliza para el Plan de Producción
-DocType: System Settings,Loading...,Cargando ...
-DocType: DocField,Password,Contraseña
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelado por deposición fundida
+DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
-DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
+DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" no existe"
 DocType: Pricing Rule,Valid Upto,Válido hasta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o pagado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Productos cosméticos
-DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
-DocType: Communication,Subject,Asunto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
 ,Serial No Warranty Expiry,Garantía de caducidad del numero de serie
@@ -469,42 +428,41 @@
 DocType: Purchase Invoice Item,Item,Productos
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestión de sub-contrataciones
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nueva unidad de medida no debe ser un entero
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestión de sub-contrataciones
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,MUEBLES Y ENSERES
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
 DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","si es desactivado,  el campo 'Total redondeado' no será visible en ninguna transacción"
 DocType: BOM,Operating Cost,Costo de operacion
-,Gross Profit,Utilidad bruta
+,Gross Profit,Beneficio Bruto
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Incremento no puede ser 0
 DocType: Production Planning Tool,Material Requirement,Solicitud de material
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,El producto {0} no es un producto para la compra
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} es una dirección de correo electrónico inválida en 'Email de notificación'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Facturación total este año:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total facturado este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar de serie n {0}, ya que se utiliza en las transacciones de valores"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Cierre (Cred)
-DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Cierre (Cred)
+DocType: Serial No,Warranty Period (Days),Período de garantía (Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 ,Pending Qty,Cantidad pendiente
 DocType: Job Applicant,Thread HTML,Hilo HTML
 DocType: Company,Ignore,Pasar por alto
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos / temporadas en su negocio.  Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual** en el **Centro de Costos**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribución Mensual** le ayuda a distribuir su presupuesto a través de meses si tiene periodos / temporadas en su negocio.  Para distribuir un presupuesto utilizando esta distribución, debe establecer **Distribución Mensual** en el **Centro de Costos**"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
@@ -512,7 +470,6 @@
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
-DocType: About Us Settings,Website Manager,Administrador de Página Web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Warranty Claim,Resolution,Resolución
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregado: {0}
@@ -520,25 +477,24 @@
 DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Devoluciones de ventas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione las órdenes de venta con las cuales desea crear la orden de producción.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
+DocType: Authorization Rule,Customer or Item,Cliente o artículo
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de datos de clientes.
 DocType: Quotation,Quotation To,Cotización para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Monto asignado no puede ser negativo
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
-DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Agente de ventas
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,La orden de producción es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de propuestas
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Error de stock negativo ( {6} ) para el producto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -552,27 +508,23 @@
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el Año Fiscal {2}
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el año fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Ajustes para módulo de compras
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra"
 DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
 DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
@@ -580,25 +532,20 @@
 DocType: Customer,Fixed Days,Días fijos
 DocType: Sales Invoice,Packing List,Lista de embalaje
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicación
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
 DocType: Activity Cost,Projects User,Usuario de proyectos
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
 DocType: Material Request,Material Transfer,Transferencia de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Configuración
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
 DocType: BOM Operation,Operation Time,Tiempo de operación
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Más
 DocType: Pricing Rule,Sales Manager,Gerente de ventas
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renombrar
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Doblado
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
@@ -607,64 +554,56 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Purchase Receipt,Other Details,Otros detalles
 DocType: Account,Accounts,Contabilidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Troquelado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Almacén rechazado es obligatorio para el producto rechazado
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 DocType: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad de vendedor
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad
-DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía
+DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de venta, factura de venta o registro de diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,No se puede encontrar el tipo de cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
-DocType: Journal Entry,Credit Card Entry,Introducción de tarjeta de crédito
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
+DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Asunto de tarea
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Productos recibidos de proveedores.
-DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nombre de la campaña
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ACTIVO CIRCULANTE
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} no es un producto de stock
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
-DocType: Contact Us Settings,Address Title,Dirección
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
-DocType: Dropbox Backup,Daily,Diario
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Employee,Cell Number,Número de movil
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Las solicitudes de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdído
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energía
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina mensual.
-DocType: Item Group,Website Specifications,Especificaciones del Sitio Web
+DocType: Item Group,Website Specifications,Especificaciones del sitio web
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nueva cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Los asientos contables se deben crear en las subcuentas. los asientos en 'grupos' de cuentas no están permitidos.
-DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
-DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campañas de venta.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -712,10 +651,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para carrito de compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnología
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","El asiento {0} está enlazado con la orden {1}, compruebe si debe obtenerlo por adelantado en esta factura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,GASTOS DE MANTENIMIENTO (OFICINA)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
@@ -723,61 +661,59 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar correo electronico
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos.
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de conciliación bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mis facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mis facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
 apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales (LdM) para comenzar
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube saldo de existencias a través csv .
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Subir el balance de existencias a través de un archivo .csv
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar ahora.
 ,Support Analytics,Soporte analítico
-DocType: Item,Website Warehouse,Almacén del Sitio Web
+DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,La puntuación debe ser menor o igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clientes y Proveedores
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clientes y proveedores
 DocType: Email Digest,Email Digest Settings,Configuración del boletín de correo electrónico
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Soporte técnico para los clientes
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para habilitar las características de 'Punto de Venta'
 DocType: Bin,Moving Average Rate,Porcentaje de precio medio variable
 DocType: Production Planning Tool,Select Items,Seleccionar productos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
-DocType: Comment,Reference Name,Nombre de referencia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra factura {1} de fecha {2}
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: Sales Invoice Item,Target Warehouse,Inventario estimado
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,La fecha prevista de entrega no puede ser anterior a la fecha de la órden de venta
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utilidad / Pérdida neta
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Producto para manufactura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Molde para fundición
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Estado es {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} el estado es {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Orden de compra a pago
 DocType: Sales Order Item,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
 DocType: Newsletter,Newsletter Manager,Administrador de boletínes
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Apertura&#39;
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Expense Claim,Expenses,Gastos
 DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
 ,Purchase Receipt Trends,Tendencias de recibos de compra
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla con la cual desea obtener los objetivos de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Cantidad mínima para ordenar
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a: {0}
@@ -787,19 +723,17 @@
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación de desempeño.
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
-apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},No se puede trasladar {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto de venta (POS)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,El balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Clavado
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la línea anterior al total
 DocType: Salary Slip,Working Days,Días de trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,El nombre de la compañía para configurar el sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir vacaciones con el numero total de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -809,30 +743,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Ver Suscriptores
 DocType: Purchase Invoice Item,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Chorro abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
 DocType: Salary Slip,Leave Encashment Amount,Importe de ausencias / vacaciones pagadas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
 DocType: Bank Reconciliation,Total Amount,Importe total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publicación por internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Production Planning Tool,Production Orders,Órdenes de producción
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de balance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos
-DocType: GL Entry,Account Currency,Divisa
+DocType: Bank Reconciliation,Account Currency,Divisa de cuenta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo"
 DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda.
@@ -841,7 +774,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
@@ -853,70 +786,65 @@
 DocType: Payment Tool,Paid,Pagado
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Tal vez no se crea registro de cambio de divisa para
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Posiblemente el registro de cambio de divisa no ha sido creado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Envíos realizados a los clientes
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos indirectos
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Establecer el importe de pago = pago pendiente
-DocType: Contact Us Settings,Address Line 1,Dirección línea 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de compañía
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variación
+,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Seleccione el producto a transferir
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
 DocType: Process Payroll,Select Payroll Year and Month,"Seleccione la nómina, año y mes"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Ir al grupo apropiado, usualmente (Aplicación de Fondos> Activo Circulante> Cuentas Bancarias) y crear una nueva cuenta haciendo clic en Añadir hijo del tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Costos de energía electrica
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
-DocType: Comment,Unsubscribed,No suscrito
 DocType: Opportunity,Walk In,Entrar
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de centros de costos financieros.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanco
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Crear
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Adjunte su fotografía
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Crear
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
-DocType: Workflow State,Stop,Detener
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error. Una razón probable es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mi carrito
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de apertura
 DocType: Holiday List,Holiday List Name,Nombre de festividad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de ausencia
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de asignación de vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si Presupuesto Mensual excedido (por cuenta de gastos)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Recortar
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
 DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: POS Profile,Cash/Bank Account,Cuenta de caja / banco
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Presentación
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuento sobre compras
-DocType: Workstation,Wages,Salario.
+DocType: Workstation,Wages,Salario
 DocType: Time Log,Will be updated only if Time Log is 'Billable',Se actualizara solo si la gestión de tiempos puede facturarse
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
@@ -930,21 +858,22 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Almacén
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Cuenta no coincide con la Compañía
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
 DocType: BOM Operation,Operation,Operación
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Ventas Solicitar {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Crear asientos de stock
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Crear asientos de stock
 DocType: Packing Slip,Net Weight UOM,Unidad de medida de peso neto
 DocType: Item,Default Supplier,Proveedor predeterminado
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción
@@ -959,29 +888,27 @@
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de la gestión de tiempos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto posteriormente con el cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
-DocType: Contact Us Settings,Address,Dirección
 DocType: Expense Claim,From Employee,Desde Empleado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,y año:
 DocType: Email Digest,Annual Expense,Gasto anual
-DocType: SMS Center,Total Characters,Total Caracteres 
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
+DocType: SMS Center,Total Characters,Total Caracteres
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura para reconciliación de pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Margen %
 DocType: Item,website page link,el vínculo web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Se esta preparando el sistema para el primer uso.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la compañía para su referencia. Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Reglas de envio para el carrito de compras
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,La orden de producción {0} debe ser cancelada antes de cancelar esta orden ventas
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccione la gestión de tiempos y valide para crear una nueva factura de ventas.
@@ -1001,67 +928,58 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada que solicitar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Fundición de precisión
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 DocType: Price List Country,Price List Country,Lista de precios del país
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
-DocType: Item,UOMs,Unidades de medida
+DocType: Item,UOMs,UdM
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
-DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricación de objetos laminados
+DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de balance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
 DocType: Account,Warehouse,Almacén
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Holiday,Holiday,Vacaciones
-DocType: Event,Saturday,Sábado.
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales
 ,Daily Time Log Summary,Resumen de registros diarios
-DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Las entradas no pueden estar vacías
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Las entradas no pueden estar vacías
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configuración de empleados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Matriz """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
-DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Investigación
+DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Contact,User ID,ID de usuario
-DocType: Communication,Sent,Enviado.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Mostrar libro mayor
-DocType: File,Lft,Izquierda-
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
-DocType: Communication,Delivery Status,Estado del envío
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Production Order,Manufacture against Sales Order,Manufacturar para pedido de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
@@ -1072,13 +990,11 @@
 DocType: BOM Item,Item Description,Descripción del producto
 DocType: Payment Tool,Payment Mode,Método de pago
 DocType: Purchase Invoice,Is Recurring,Es recurrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,De metal sinterizado por láser directo
 DocType: Purchase Order,Supplied Items,Productos suministrados
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
 DocType: Address,Address Type,Tipo de dirección
@@ -1094,77 +1010,73 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Orden de venta {0} no es válida
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número de empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cuenta matriz {0} creada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
-DocType: Item,Auto re-order,Ordenar automáticamente 
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
+DocType: Item,Auto re-order,Ordenar automáticamente
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
-DocType: Report,Disabled,Deshabilitado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
+DocType: Email Digest,Add Quote,Añadir Cita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Los productos o servicios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Órden de compra (OC)
 DocType: Warehouse,Warehouse Contact Info,Información de contacto del almacén
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,El nombre es necesario
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
 DocType: Address,City/Town,Ciudad / Provincia
 DocType: Email Digest,Annual Income,Ingresos anuales
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
-DocType: Hub Settings,Seller Website,Sitio Web del vendedor
+DocType: Hub Settings,Seller Website,Sitio web del vendedor
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,La fecha prevista de entrega es menor que la fecha de inicio planeada.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,De proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Sólo puede existir una 'regla de envió' con valor 0 o valor en blanco en 'para el valor'
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
-apps/frappe/frappe/config/desk.py +7,Tools,Herramientas
-DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
+DocType: Item,Website Item Groups,Grupos de productos en el sitio web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,El número de la orden de producción es obligatoria para la entrada de productos fabricados en el stock
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
 DocType: Journal Entry,Journal Entry,Asiento contable
-DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
+DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarios
 DocType: Salary Slip,Bank Account No.,Número de cuenta bancaria
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","El total de {0} productos es cero, usted debe cambiar la opción 'Distribuir cargos basados en'"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de impuestos y cargos
-DocType: BOM Operation,Workstation,Puesto de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+DocType: BOM Operation,Workstation,Puesto de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione la compañía"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No hay datos
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo de la plantilla de evaluación
 DocType: Salary Slip,Earning,Ingresos
 DocType: Payment Tool,Party Account Currency,Divisa de la cuenta de tercero/s
@@ -1174,26 +1086,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Usted puede crear una gestión de tiempos para una orden de producción
-DocType: Maintenance Schedule Item,No of Visits,No. de visitas
-DocType: File,old_parent,old_parent
+DocType: Maintenance Schedule Item,No of Visits,Número de visitas
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Boletín de noticias para contactos y clientes potenciales.
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa de la cuenta de clausura debe ser {0}
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La divisa / moneda de la cuenta de cierre debe ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Envios por facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
-DocType: DocField,Description,Descripción
 DocType: Authorization Rule,Average Discount,Descuento Promedio
-DocType: Letter Head,Is Default,Es por defecto
 DocType: Address,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ver oferta Carta
-DocType: Communication,Communication,Comunicaciones
 DocType: Item,Is Service Item,Es un servicio
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Por favor, seleccione el año fiscal"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Desde {0} | {1} {2}
@@ -1212,7 +1121,7 @@
 DocType: Item,Maintain Stock,Mantener stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
@@ -1220,9 +1129,9 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan de cuentas
-DocType: Material Request,Terms and Conditions Content,Contenido de los 'términos y condiciones'
+DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1230,36 +1139,33 @@
 ,Purchase Invoice Trends,Tendencias de compras
 DocType: Employee,Better Prospects,Mejores Prospectos
 DocType: Appraisal,Goals,Objetivos
-DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
+DocType: Warranty Claim,Warranty / AMC Status,Garantía / Estado de CMA
 ,Accounts Browser,Navegador de Cuentas
 DocType: GL Entry,GL Entry,Entrada GL
 DocType: HR Settings,Employee Settings,Configuración de empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},El asiento contable para {0}: {1} sólo puede hacerse con la divisa: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,No Estructura Salarial activo que se encuentra para el empleado {0} y el mes
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regla de impuestos para las transacciones.
 DocType: Rename Tool,Type of document to rename.,Indique el tipo de documento que desea cambiar de nombre.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Compramos este producto
 DocType: Address,Billing,Facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,No enviado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formación explosiva
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 DocType: Shipping Rule,Shipping Account,Cuenta de envíos
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios.
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub-Ensamblajes
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub-Ensamblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Supplier,Stock Manager,Gerente de almacén
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
@@ -1268,138 +1174,125 @@
 apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección
-DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
+DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Línea {0}: La cantidad asignada {1} debe ser menor o igual al importe en comprobante de diario {2}
 DocType: Item,Inventory,inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para habilitar la vista de 'Punto de Venta'
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,No se puede realizar un pago con el carrito de compras vacío
 DocType: Item,Sales Details,Detalles de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fijación
 DocType: Opportunity,With Items,Con productos
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En cantidad
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Fecha en que se generará próxima factura. Es generada al validar.
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gubernamental
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantes del producto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gubernamental
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
 DocType: Sales Invoice,Source,Referencia
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Inicio del ejercicio contable
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,No se encontraron registros en la tabla de pagos
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Inicio del ejercicio contable
 DocType: Employee External Work History,Total Experience,Experiencia total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Material Request Item,Sales Order No,Orden de venta No.
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferir materiales para producción
 DocType: Pricing Rule,For Price List,Por lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Programas
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el plan general de contabilidad."
 DocType: Maintenance Visit,Maintenance Visit,Visita de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Categoría de cliente> Territorio
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén
 DocType: Time Log Batch Detail,Time Log Batch Detail,Detalle de gestión de tiempos
-DocType: Workflow State,Tasks,Tareas
 DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
-DocType: Event,Tuesday,Martes
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
 ,Accounts Receivable Summary,Balance de cuentas por cobrar
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Hojas para el tipo {0} ya asignado para Empleado {1} para el período {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
-DocType: Top Bar Item,Target,Objetivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Importe de contribución
 DocType: Sales Invoice,Shipping Address,Dirección de envío.
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marca principal
-DocType: ToDo,Due Date,Fecha de vencimiento
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Marca principal
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Caja
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La lista de receptores se encuentra vacía. Por favor, cree una lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de ordenes de venta
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},El asiento contable para {0} sólo puede hacerse con la divisa: {1}
 DocType: Pricing Rule,Pricing Rule,Regla de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Muescas
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,BANCOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bancos
 ,Bank Reconciliation Statement,Estados de conciliación bancarios
 DocType: Address,Lead Name,Nombre de la iniciativa
 ,POS,Punto de venta POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo inicial de Stock
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo inicial de Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Monto no reflejado en banco
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Monto no reflejado en banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundición centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Acabado asistido por campo magnético
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Receipt,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
 DocType: Production Planning Tool,Select Sales Orders,Seleccione órdenes de ventas
 ,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de cotización
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Entregado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Entregado
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crear una cotización
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Importe pagado
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
-apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Ver
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Ver {0}
 DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,¡Importación Exitosa!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Edad (días)
 DocType: Quotation Item,Quotation Item,Cotización del producto
 DocType: Account,Account Name,Nombre de la Cuenta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Categorías principales de proveedores.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor.
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Agregar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} está cancelado o detenido
 DocType: Accounts Settings,Credit Controller,Controlador de créditos
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,El recibo de compra {0} no esta validado
 DocType: Company,Default Payable Account,Cuenta por pagar por defecto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para las compras online, normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa.
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos humanos
 DocType: Lead,Upper Income,Ingresos superior
 DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis asuntos
@@ -1408,12 +1301,9 @@
 DocType: Company,Default Values,Valores predeterminados
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Línea {0}: El importe pagado no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press apropiado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
 DocType: Payment Reconciliation,Payments,Pagos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensado isostático en caliente
-DocType: ToDo,Medium,Medio
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de clientes
@@ -1422,12 +1312,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 DocType: Quotation,Term Details,Detalles de términos y condiciones
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 DocType: Warranty Claim,Warranty Claim,Reclamación de garantía
 ,Lead Details,Detalle de Iniciativas
-DocType: Authorization Rule,Approving User,Usuario que permite aprobar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para.
 DocType: Bank Reconciliation,From Date,Desde la fecha
@@ -1449,157 +1336,145 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Subastas en línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisición de materiales usados para crear este movimiento de inventario
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Elemento de producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',la gestión de tiempos {0} debe estar validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',El lote de gestión de tiempos {0} debe estar validado
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total de ausencias asigandas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca Año válida Financiera fechas inicial y final"
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
 DocType: Address,Postal,Postal
-DocType: Item,Weightage,Coeficiente de ponderación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minería
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resina de colada
+DocType: Item,Weightage,Asignación
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe una categoría de cliente con el mismo nombre, por favor cambie el nombre del cliente o cambie el nombre de la categoría"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Por favor, seleccione primero {0}."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
 DocType: Territory,Parent Territory,Territorio principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Productos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},El tipo de entidad y tercero/s son requeridos para las cuentas de cobrar/pagar {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente contacto por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos: {1}
 DocType: Quotation,Order Type,Tipo de orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 DocType: Payment Tool,Find Invoices to Match,Facturas a conciliar
 ,Item-wise Sales Register,Detalle de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","por ejemplo ""Banco Nacional XYZ"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total meta / objetivo
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Total meta / objetivo
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrito de compras habilitado
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,No existen órdenes de producción (OP)
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,la nómina salarial para el empleado {0}  ya se ha creado para este mes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,la nómina salarial para el empleado {0}  ya se ha creado para este mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Sales Invoice Item,Batch No,Lote No.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
-DocType: DocPerm,Delete,Eliminar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuevo/a: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Una orden detenida no puede ser cancelada, debe continuarla antes de cancelar."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crear órden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crear órden de Compra
 DocType: SMS Center,Send To,Enviar a.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y referencias
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
-DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
-DocType: Communication,Received,Recibido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,A este producto no se le permite tener orden de producción.
-DocType: DocField,Attach Image,Adjuntar Imagen
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
-DocType: Stock Reconciliation Item,Leave blank if no change,Dejar en blanco si no hay cambio
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Gestión de tiempos para la producción.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar nivel de reabastecimiento para el almacen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Gestión de tiempos para las tareas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pago
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
 DocType: Employee,Salutation,Saludo.
-DocType: Communication,Rejected,Rechazado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para el atributo {1} no existe en la lista de artículo válida Atributo Valores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
-DocType: DocType,System,Sistema.
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicaciones
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 DocType: Payment Tool,Make Payment Entry,Registrar pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
 ,Sales Invoice Trends,Tendencias de ventas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar vacaciones
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,por
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
 DocType: Stock Settings,Allowance Percent,Porcentaje de reserva
 DocType: SMS Settings,Message Parameter,Parámetro del mensaje
 DocType: Serial No,Delivery Document No,Documento de entrega No.
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener elementos desde los 'recibos de compra'
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener productos desde recibo de compra
 DocType: Serial No,Creation Date,Fecha de creación
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},El producto {0} aparece varias veces en el Listado de Precios {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Producto de la cotización del proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crear estructura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Esquilar
 DocType: Item,Has Variants,Posee variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Clic en el botón ""Crear factura de venta"" para crearla."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Empacado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la divisa por defecto en la compañía principal y los valores predeterminados globales"
-DocType: Dropbox Backup,Dropbox Access Secret,Acceso Secreto a Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestión de proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
 DocType: Budget Detail,Fiscal Year,Año fiscal
 DocType: Cost Center,Budget,Presupuesto
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Presupuesto no se puede asignar en contra {0}, ya que no es una cuenta de ingresos o gastos"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcanzado
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,por ejemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
 DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
 ,Amount to Deliver,Cantidad para envío
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hubo errores .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un Producto o Servicio
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creado
 DocType: Delivery Note Item,Against Sales Order,Contra la orden de venta
@@ -1611,17 +1486,17 @@
 DocType: Employee,Salary Information,Información salarial.
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
-DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
+DocType: Website Item Group,Website Item Group,Grupo de productos en el sitio web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,IMPUESTOS Y ARANCELES
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,la tabla del producto que se mosatrara en el sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
 DocType: Material Request Item,Material Request Item,Requisición de materiales del producto
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de las categorías de producto
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Árbol de las categorías de producto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rojo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
@@ -1631,12 +1506,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Línea # {0}: La operación {1} no se ha completado para la cantidad: {2} de productos terminados en orden de producción # {3}. Por favor, actualice el estado de la operación a través de la gestión de tiempos"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Cambie la unidad de medida (UdM) para el producto.
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},El producto {0} debe ser un servicio o producto para la venta {1}
-DocType: Item Group,Show In Website,Mostrar en el sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+DocType: Item Group,Show In Website,Mostrar en el sitio web
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 ,Qty to Order,Cantidad a solicitar
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para realizar el seguimiento de la 'marca' en los documentos: nota de entrega, oportunidad, solicitud de materiales, productos, de órdenes de compra, recibo de compra, comprobante de compra, cotización, factura de venta, paquete de productos, órdenes de venta y número de serie."
@@ -1645,159 +1519,140 @@
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Desde órden de compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Direcciones de clientes y contactos
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No especificado
-DocType: Communication,Date,Fecha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tome asiento mientras el sistema está siendo configurado. Esto puede tomar unos minutos.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener la función de 'Supervisor de Gastos'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
-DocType: Item,Has Batch No,Posee No. de lote
+DocType: Item,Has Batch No,Posee numero de lote
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
 DocType: Employee,Personal Details,Datos personales
 ,Maintenance Schedules,Programas de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Troquelado
 ,Quotation Trends,Tendencias de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Unión
-DocType: Authorization Rule,Above Value,Valor máximo
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
 DocType: Purchase Order,Delivered,Enviado
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuración del servidor de correo entrante corporativo. (por ejemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de vehículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
 ,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
 DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país.
-DocType: Custom Field,Custom,Personalizar
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Inyección de plásticos
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de cuentas financieras
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
-DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
-apps/frappe/frappe/config/setup.py +130,Printing,Impresión
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,El reembolso de gastos estará pendiente de aprobación. Sólo el supervisor de gastos puede actualizar el estado.
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Los día(s) para los cuales usted esta aplicando la ausencia son días festivos, usted no necesita realizar una solicitud de permiso/vacaciones/ausencias."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Deportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Por favor, establezca las llaves de acceso de Dropbox en la configuración de su sistema"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unidad(es)
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique la compañía"
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,El año financiero finaliza el
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el cual se envian los productos rechazados
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,El año financiero finaliza el
 DocType: POS Profile,Price List,Lista de precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
-DocType: Authorization Rule,Approving Role,Rol que permite aprobaciones
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar las características como numeros de serie, POS, etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Después de solicitudes de materiales se han planteado de forma automática según el nivel de re-orden del articulo
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. la divisa debe ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},"La fecha de liquidación no puede ser inferior a la fecha de verificación, línea {0}"
 DocType: Salary Slip,Deduction,Deducción
 DocType: Address Template,Address Template,Plantillas de direcciones
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
 DocType: Territory,Classification of Customers by region,Clasificación de clientes por región
-DocType: Project,% Tasks Completed,% Tareas Completadas
+DocType: Project,% Tasks Completed,% Tareas completadas
 DocType: Project,Gross Margin,Margen bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuario deshabilitado
 DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
 DocType: Quotation,Maintenance User,Mantenimiento por usuario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo actualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran aquí.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descripción del trabajo
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, seleccione un archivo csv con datos válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimiento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,Cant. OV
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén {0}, por lo tanto, no se puede re-asignar o modificar el almacén"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén {0}, por lo tanto, no se puede re-asignar o modificar el almacén"
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Envíos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldeo por inmersión
-DocType: Purchase Order,To be delivered to customer,Para ser entregado al cliente
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada
+apps/erpnext/erpnext/hooks.py +68,Shipments,Envíos
+DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,La gestión de tiempos debe estar validada.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Línea #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Línea #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
 DocType: Pricing Rule,Supplier,Proveedor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,GASTOS VARIOS
 DocType: Global Defaults,Default Company,Compañía predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Employee,Bank Name,Nombre del banco
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mas
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Arriba
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado
 DocType: Leave Application,Total Leave Days,Días totales de ausencia
-DocType: Journal Entry Account,Credit in Account Currency,Divisa de la cuenta de credito
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 DocType: Currency Exchange,From Currency,Desde moneda
-DocType: DocField,Name,Nombre
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Monto no reflejado en el sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Monto no reflejado en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Otros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. Por favor seleccione otro valor para {0}.
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado
-DocType: Web Form,Select DocType,Seleccione un 'DocType'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banca
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuevo centro de costos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nuevo centro de costos
 DocType: Bin,Ordered Quantity,Cantidad ordenada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
 DocType: Purchase Order Item,Reference Document Type,Referencia Tipo de documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} para orden de venta (OV) {1}
 DocType: Account,Fixed Asset,Activo Fijo
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventario Serializado
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventario Serializado
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
 DocType: Time Log Batch,Total Billing Amount,Importe total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por cobrar
@@ -1805,19 +1660,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Órdenes de venta a pagar
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Gestión de tiempos creados:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de medida (UdM)
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Salto de página
 DocType: Production Order Operation,Pending,Pendiente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,"No se puede cambiar la  (UdM) por defecto de la variante. Para poder cambiarla, necesita hacerlo desde la plantilla"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,EQUIPO DE OFICINA
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electrónicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónicos
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar requisición de materiales cuando se alcance un nivel bajo el stock
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde programa de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa
 DocType: Purchase Invoice,Contact Details,Detalles de contacto
 DocType: C-Form,Received Date,Fecha de recepción
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
@@ -1829,14 +1684,15 @@
 DocType: Job Applicant,Job Opening,Oportunidad de empleo
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de pagos
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tecnología
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 DocType: Offer Letter,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Monto total facturado
 DocType: Time Log,To Time,Hasta hora
+DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para agregar sub-grupos, examine el árbol y haga clic en el registro donde desea agregar los sub-registros"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,Cantidad completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,La lista de precios {0} está deshabilitada
@@ -1846,12 +1702,10 @@
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Crear entradas de pago para las órdenes o facturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Se requiere nueva unidad de medida (UdM) para el inventario
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique un numero de caso válido"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Nº de serie de los productos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
@@ -1861,15 +1715,13 @@
 DocType: Bin,Actual Quantity,Cantidad actual
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldeo por compresión
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Sus clientes
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Liquidez bancaria
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código del producto> Grupos> Marca
 DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
-DocType: Event,Friday,Viernes
 DocType: Time Log,Costing Amount,Costo acumulado
 DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial
 DocType: Salary Structure,Monthly Earning & Deduction,Ingresos mensuales y deducciones
@@ -1877,16 +1729,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del remitente
-DocType: Page,Title,Nombre
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalización 
-DocType: POS Profile,[Select],[Seleccionar]
+DocType: POS Profile,[Select],[Select]
 DocType: SMS Log,Sent To,Enviado a
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crear factura de venta
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Desde la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles del empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
@@ -1901,31 +1751,29 @@
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
-DocType: Purchase Order,Customer Mobile No,Cliente Móvil No
+DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 DocType: Sales Invoice,Recurring,Recurrente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de instalación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Agregar impuestos
 ,Financial Analytics,Análisis financiero
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Subsidiaria
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
 DocType: Quality Inspection,Purchase Receipt No,Recibo de compra No.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
-DocType: System Settings,In Hours,Horas
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Importe previsto en banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulido
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Importe previsto en banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Origen de fondos (Pasivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
@@ -1938,15 +1786,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Sales Invoice,Mass Mailing,Correo masivo
-DocType: Page,Standard,Estándar
 DocType: Rename Tool,File to Rename,Archivo a renombrar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamaño
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
@@ -1956,48 +1802,43 @@
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Se encuentra congelado(a)
 DocType: Buying Settings,Buying Settings,Configuración de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabado en masa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante corporativo de ventas. (por ejemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Tool,Payment Account,Cuenta de pagos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Borrador
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
-DocType: User,Female,Femenino
-DocType: Journal Entry Account,Debit in Account Currency,Divisa de la cuenta de débito
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
-DocType: Print Settings,Modern,Moderno
-DocType: Communication,Replied,Ya respondió
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Inválido referencia {0} {1}
 DocType: Payment Tool,Total Payment Amount,Importe total
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la orden de producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores de 'Tiene No. de serie', 'Tiene No. de lote', 'Es un producto en stock' y 'Método de valoración'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Existen transacciones de stock para este producto, \ usted no puede cambiar los valores: 'Posee numero de serie', 'Posee numero de lote', 'Es un producto en stock' y 'Método de valoración'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Asiento Rápida
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} no esta presentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} no ha sido validada
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Listado de solicitudes de productos.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Se crearan ordenes de producción separadas para cada producto terminado.
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Configuración completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",El asiento contable actualmente se encuentra congelado; nadie puede modificar este registro excepto el rol que se especifica a continuación.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Lista de distribución del boletín informativo
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Ausente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida (UdM)
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidad de Medida (UdM)
 DocType: Fiscal Year,Year End Date,Año de finalización
 DocType: Task Depends On,Task Depends On,Tarea depende de
 DocType: Lead,Opportunity,Oportunidad
@@ -2016,18 +1857,17 @@
 DocType: Purchase Invoice,Advances,Anticipos
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Precio base (según la UdM)
-DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
-DocType: Campaign,Campaign-.####,Campaña-.#### 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perforación
+DocType: SMS Log,No of Requested SMS,Número de SMS solicitados
+DocType: Campaign,Campaign-.####,Campaña-.####
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedores / comisionistas / afiliados / distribuidores que venden productos de empresas a cambio de una comisión.
 DocType: Customer Group,Has Child Node,Posee Sub-grupo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra la orden de compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mecanizado fotoquímico
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2069,11 +1909,9 @@
  8. Introduzca Row: Si se basa en ""Anterior Fila Total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior).
  9. Considere impuesto o cargo para: En esta sección se puede especificar si el impuesto / carga es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
-DocType: Email Account,Email Ids,IDs de Correo Electrónico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
@@ -2081,41 +1919,37 @@
 DocType: Journal Entry,Credit Note,Nota de crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},La cantidad completada no puede ser mayor de {0} para la operación {1}
 DocType: Features Setup,Quality,Calidad
-DocType: Contact Us Settings,Introduction,Introducción
 DocType: Warranty Claim,Service Address,Dirección de servicio
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Máximo 100 lineas para la conciliación de inventario.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Máximo 100 lineas para la conciliación de inventario.
 DocType: Stock Entry,Manufacture,Manufacturar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Entregar primero la nota
 DocType: Purchase Invoice,Currency and Price List,Divisa y listas de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Fecha de liquidación no definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Fecha de liquidación no definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producción
 DocType: Item,Allow Production Order,Permitir orden de producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Validado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mis direcciones
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Sucursal principal de la organización.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ó
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,SERVICIOS PUBLICOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mayor
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
-,Download Backups,Descargar Backups
 DocType: Notification Control,Sales Order Message,Mensaje de la orden de venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de pago
 DocType: Process Payroll,Select Employees,Seleccione los empleados
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalles
-DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
+DocType: Purchase Invoice,Total Taxes and Charges,Total impuestos y cargos
 DocType: Employee,Emergency Contact,Contacto de emergencia
 DocType: Item,Quality Parameters,Parámetros de calidad
 DocType: Target Detail,Target  Amount,Importe previsto
@@ -2129,6 +1963,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 DocType: Product Bundle,Parent Item,Producto padre / principal
 DocType: Account,Account Type,Tipo de cuenta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deja tipo {0} no se pueden reenviar-llevar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
@@ -2136,33 +1971,28 @@
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplastamiento
 DocType: Account,Income Account,Cuenta de ingresos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moldura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 DocType: Item Reorder,Material Request Type,Tipo de requisición
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Cost Center,Cost Center,Centro de costos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje en la orden de compra
 DocType: Tax Rule,Shipping Country,País de envío
 DocType: Upload Attendance,Upload HTML,Subir HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance total ({0}) en contra de la orden {1} no puede ser mayor \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Fecha de relevo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacen sólo se puede cambiar a través de: Entradas de inventario / Nota de entrega / Recibo de compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Láser diseñado conformación neta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
@@ -2170,10 +2000,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
-DocType: User,Bio,Biografía
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía "
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nombre del nuevo centro de costos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nombre del nuevo centro de costos
 DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,No se encontró plantilla de dirección por defecto. Favor cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección.
 DocType: Appraisal,HR User,Usuario de recursos humanos
@@ -2185,31 +2014,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de transacción
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
 DocType: Supplier,Billing Currency,Moneda de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
 ,Profit and Loss Statement,Cuenta de pérdidas y ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle de herramienta de pago
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
-DocType: Purchase Order,Customer Address Display,Dirección del cliente Pantalla
+DocType: Purchase Order,Customer Address Display,Dirección del cliente mostrada
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unidad de medida por defecto para el producto {0} no se puede cambiar directamente, porque ya se ha realizado alguna transacción(es) con otra UdM. Para cambiar la UdM por defecto, utilice la herramienta bajo el modulo de inventario"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,La cotización {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,La cotización {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
@@ -2217,19 +2040,18 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos.
 ,S.O. No.,OV No.
 DocType: Production Order Operation,Make Time Log,Crear gestión de tiempos
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Por favor ajuste la cantidad de pedido
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 DocType: Price List,Applicable for Countries,Aplicable para los Países
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,EQUIPO DE COMPUTO
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Esmerilado Electro-químico
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Equipo de computo
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de comenzar los registros de contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la regla precios
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
 DocType: Journal Entry,Excise Entry,Registro de impuestos especiales
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: orden de venta {0} ya existe para la orden de compra {1} del cliente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Advertencia: La orden de venta {0} ya existe para la orden de compra {1} del cliente
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2261,7 +2083,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Marque si es factura periódica, desmarque para detener periodicidad o poner una fecha final"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo: {0} lineas permitidas
 DocType: C-Form Invoice Detail,Net Total,Total Neto
 DocType: Bin,FCFS Rate,Cambio FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturación (Facturas de venta)
@@ -2278,38 +2099,35 @@
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mecanizado Electro-químico
 ,Requested,Solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,No hay observaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
 DocType: Account,Stock Received But Not Billed,Inventario entrante no facturado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Cuenta raíz debe ser un grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrazados + Vacaciones - Total deducciones
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
 DocType: Features Setup,Sales and Purchase,Compras y ventas
 DocType: Supplier Quotation Item,Material Request No,Requisición de materiales Nº
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
-apps/frappe/frappe/templates/base.html +134,Added,Agregado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administración de territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
 DocType: Sales Invoice Item,Time Log Batch,Lote de gestión de tiempos
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el sueldo total pagado según los siguientes criterios
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el salario total pagado según los siguientes criterios
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtener registros relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Asiento contable de inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo de root
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Línea # {0}: No se puede devolver más de {1} para el producto {2}
@@ -2319,60 +2137,56 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos después del descuento (Divisa por defecto)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},El almacén de destino es obligatorio para la línea {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,La cuenta {0} se encuentra congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sólo se puede hacer el pago contra facturados {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
 DocType: Stock Entry,Subcontract,Sub-contrato
 apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,"Por favor, introduzca {0} primero"
-DocType: Production Planning Tool,Get Items From Sales Orders,Obtener elementos desde las 'ordenes de compa'
+DocType: Production Planning Tool,Get Items From Sales Orders,Obtener productos desde orden de compra
 DocType: Production Order Operation,Actual End Time,Hora actual de finalización
 DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios
 DocType: Item,Manufacturer Part Number,Número de componente del fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tiempo estimado y costo
 DocType: Bin,Bin,Papelera
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Saliente
-DocType: SMS Log,No of Sent SMS,No. de SMS enviados
+DocType: SMS Log,No of Sent SMS,Número de SMS enviados
 DocType: Account,Company,Compañía
 DocType: Account,Expense Account,Cuenta de costos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,El elemento en la fila {0}: Recibo Compra {1} no existe en la tabla de 'Recibos de Compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
 DocType: Installation Note Item,Against Document No,Contra el Documento No
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrar socios de ventas.
 DocType: Quality Inspection,Inspection Type,Tipo de inspección
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviarlo"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,El nombre o E-mail es obligatorio
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad entrante
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad de productos entrantes
 DocType: Purchase Order Item,Returned Qty,Cantidad devuelta
 DocType: Employee,Exit,Salir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,tipo de root es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,tipo de root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de serie {0} creado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Acabado vibratorio
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para la comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período de prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
@@ -2380,46 +2194,43 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para fecha y hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Molienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retractilado
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Actividades pendientes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de proveedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de periódicos
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de periódicos
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fundición
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Una cuenta que tiene sub-grupos no puede convertirse en libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Una cuenta que tiene sub-grupos no puede convertirse en libro mayor
 DocType: Address,Preferred Shipping Address,Dirección de envío preferida
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
-DocType: Item,Valuation Method,Método de Valoración
+DocType: Item,Valuation Method,Método de valoración
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},No se puede encontrar el tipo de cambio para {0} a {1}
 DocType: Sales Invoice,Sales Team,Equipo de ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entrada duplicada
-DocType: Serial No,Under Warranty,Bajo Garantía
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada duplicada
+DocType: Serial No,Under Warranty,Bajo garantía
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de riesgo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de riesgo
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas vacaciones asignadas (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,El número de serie {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Órdenes
+apps/erpnext/erpnext/hooks.py +54,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Recalcado
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
-,Issued Items Against Production Order,Productos entregados desde ordenes de producción 
+,Issued Items Against Production Order,Productos entregados desde ordenes de producción
 DocType: Pricing Rule,Purchase Manager,Gerente de compras
 DocType: Payment Tool,Payment Tool,Herramientas de pago
 DocType: Target Detail,Target Detail,Detalle de objetivo
@@ -2428,7 +2239,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Límite de crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción.
 DocType: GL Entry,Voucher No,Comprobante No.
@@ -2438,11 +2248,10 @@
 DocType: Customer,Address and Contact,Dirección y contacto
 DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Comentarios.
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deje no pueden ser distribuidas antes {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Horario de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Chorreo abrasivo por maquina
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Horario de mantenimiento
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
-DocType: Website Settings,Website Settings,Configuración del Sitio Web
 DocType: Item,Reorder level based on Warehouse,Nivel de reabastecimiento basado en almacén
 DocType: Activity Cost,Billing Rate,Monto de facturación
 ,Qty to Deliver,Cantidad a entregar
@@ -2450,23 +2259,22 @@
 ,Stock Analytics,Análisis de existencias.
 DocType: Installation Note Item,Against Document Detail No,Contra documento No.
 DocType: Quality Inspection,Outgoing,Saliente
-DocType: Material Request,Requested For,Solicitado para
+DocType: Material Request,Requested For,Solicitado por
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,La cuenta root no se puede borrar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,La cuenta root no se puede borrar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar entradas de stock
 ,Is Primary Address,Es Dirección Primaria
-DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrar direcciones
 DocType: Pricing Rule,Item Code,Código del producto
 DocType: Production Planning Tool,Create Production Orders,Crear órdenes de producción
-DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
+DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
-DocType: Communication,Phone,Teléfono
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Cierre (Deb)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Cierre (Deb)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
@@ -2482,52 +2290,48 @@
 ,Billed Amount,Importe facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Agregar algunos registros de muestra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestión de ausencias
-DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Lead,Lower Income,Ingreso menor
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias "
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias"
 DocType: Payment Tool,Against Vouchers,Contra comprobantes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
 DocType: Features Setup,Sales Extras,Ventas extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},El presupuesto {0} para la cuenta {1} en el centro de costos {2} es mayor por {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras
 ,Qty to Receive,Cantidad a recibir
 DocType: Leave Block List,Leave Block List Allowed,Lista de 'bloqueo de vacaciones / permisos' permitida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,No se pueden utilizar fracciones en el factor de conversión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},la cotización {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,CUENTA DE SOBRE-GIROS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta de sobre-giros
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestamos en garantía
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Productos Increíbles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,APERTURA DE CAPITAL
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"No se puede permitir la ausencia, ya que no está autorizado para aprobar sobre fechas bloqueadas"
-DocType: Appraisal,Appraisal,Evaluación.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Fundición a la espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dibujar
+DocType: Appraisal,Appraisal,Evaluación
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Repetir fecha
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante autorizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2541,12 +2345,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa por defecto)
 DocType: BOM Operation,Hour Rate,Salario por hora
 DocType: Stock Settings,Item Naming By,Ordenar productos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Desde cotización
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Desde cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la producción
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Numero de producto de la orden de compra
-DocType: System Settings,System Settings,Configuración del sistema
 DocType: Project,Project Type,Tipo de proyecto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Es obligatoria la meta fe facturación.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costo de diversas actividades
@@ -2554,37 +2357,33 @@
 DocType: Item,Inspection Required,Inspección requerida
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Sales Order,Fully Billed,Totalmente facturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,EFECTIVO EN CAJA
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo en caja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del proveedor
-DocType: Communication,Recipients,Destinatarios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Atornillado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Moleteado
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,TRANSFERENCIA BANCARIA
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Por favor, seleccione la cuenta bancaria"
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,La fecha 'Desde' tiene que ser menor de la fecha 'Hasta'
 DocType: Sales Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenido a ERPNext
+,Welcome to ERPNext,Bienvenido a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número de Detalle de Comprobante
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Iniciativa a cotización
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará sobre-entregas y exceso de almacenamiento para el producto {0} ya que la cantidad es 0
@@ -2592,13 +2391,10 @@
 DocType: Issue,Opening Date,Fecha de apertura
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y cantidad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Aburrido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Desde órden de venta (OV)
-DocType: Blog Category,Parent Website Route,Ruta de website principal
 DocType: Sales Order,Not Billed,No facturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No activo
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
@@ -2606,24 +2402,21 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 DocType: Shopping Cart Settings,Quotation Series,Series de cotizaciones
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Formando gas de metal caliente
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: El nombre de la compañia es obligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Ir al grupo apropiado, usualmente (Fuente de los fondos> Pasivos Corrientes> Impuestos y derechos) y crear una nueva cuenta, haciendo clic en Añadir hijo de tipo ""Impuestos"" y referir a la tasa de impuestos."
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte por láser
-DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Account,Payable,Pagadero
 DocType: Salary Slip,Arrear Amount,Cuantía pendiente
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes nuevos
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Beneficio Bruto%
 DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
@@ -2632,17 +2425,15 @@
 DocType: Lead,Address Desc,Dirección
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
-DocType: Page,All,Todos
 DocType: Stock Entry Detail,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 DocType: Account,Sales User,Usuario de ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
-DocType: Stock Entry,Customer or Supplier Details, Detalle de cliente o proveedor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Establecer
+DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Lead,Lead Owner,Propietario de la iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Se requiere el almacén
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisición de materiales automática
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
@@ -2656,44 +2447,40 @@
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nombre de la empresa no puede ser la empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones: correo electrónico, teléfono, chats, visitas, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo"
 DocType: Purchase Invoice,Terms,Términos.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crear
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Crear
 DocType: Buying Settings,Purchase Order Required,Órden de compra requerida
 ,Item-wise Sales History,Detalle de las ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
 ,Purchase Analytics,Analítico de compras
 DocType: Sales Invoice Item,Delivery Note Item,Nota de entrega del producto
 DocType: Expense Claim,Task,Tarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Viruta
 DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
 ,Stock Ledger,Mayor de Inventarios
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Calificación: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Calificación: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Seleccione primero un nodo de grupo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Frente a
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro Comunitario
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro de la comunidad
 DocType: Leave Application,Leave Balance Before Application,Ausencias disponibles antes de la solicitud
 DocType: SMS Center,Send SMS,Enviar mensaje SMS
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Esto se utiliza para ajustar la regla en el módulo de recursos humanos (RRHH)
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Cantidad a reabastecer
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
@@ -2705,12 +2492,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidad perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos 'descuento' estarán disponibles en la orden de compra, recibo de compra y factura de compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores
-DocType: Report,Report Type,Tipo de reporte
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Cargando
 DocType: BOM Replace Tool,BOM Replace Tool,Herramienta de reemplazo de lista de materiales (LdM)
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas predeterminadas para un país en especial
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar impuestos ruptura
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mostrar impuesto fragmentado
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Si usted esta involucrado en la actividad de manufactura, habilite la opción 'Es manufacturado'"
@@ -2718,18 +2503,17 @@
 DocType: Sales Invoice,Rounded Total,Total redondeado
 DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
-DocType: Serial No,Out of AMC,Fuera de AMC
+DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 DocType: Purchase Order Item,Material Request Detail No,Detalle de requisición de materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneado duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Crear visita de mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuración general del sistema.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Si el pago no se hace en con una  referencia, deberá hacer entrada al diario manualmente."
 DocType: Item,Supplier Items,Artículos de proveedor
 DocType: Opportunity,Opportunity Type,Tipo de oportunidad
@@ -2737,70 +2521,62 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},El centro de costos es requerido para la cuenta de 'perdidas y ganancias' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borradas por el creador de la compañía
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una cuenta bancaria
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Línea {0}: La cantidad no esta disponible en el almacén {1} del {2} {3}. Cantidad disponible: {4}, Transferir Cantidad: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Elemento 3
-DocType: Purchase Order,Customer Contact Email,Cliente de correo electrónico de contacto
-DocType: Event,Sunday,Domingo.
+DocType: Purchase Order,Customer Contact Email,Correo electrónico de contacto de cliente
 DocType: Sales Team,Contribution (%),Margen (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de productos
 DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (gestión de tiempos)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto total pendiente
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotores
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Un producto es requerido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldeo por inyección de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Desde nota de entrega
 DocType: Time Log,From Time,Desde hora
 DocType: Notification Control,Custom Message,Mensaje personalizado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Inversión en la banca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Inversión en la banca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Fundición de arena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
 DocType: Newsletter,A Lead with this email id should exist,Debe existir un correo relacionado a esta Iniciativa.
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
 DocType: Salary Structure,Salary Structure,Estructura salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea aérea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2809,45 +2585,37 @@
 DocType: Item,Is Fixed Asset Item,Es un activo fijo
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias hojas con todos los encabezados y pies de página en cada una"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 DocType: Fiscal Year,Year Name,Nombre del año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
 DocType: Purchase Invoice Item,Image View,Vista de imagen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terminado y acabado industrial
 DocType: Issue,Opening Time,Hora de apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martilleo
-DocType: Web Page,Slideshow,Presentación.
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
 DocType: Sales Invoice,Shipping Rule,Regla de envío
 DocType: Journal Entry,Print Heading,Imprimir encabezado
 DocType: Quotation,Maintenance Manager,Gerente de mantenimiento
-DocType: Workflow State,Search,Buscar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,Los días desde el último pedido debe ser mayor o igual a cero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificado Desde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Es obligatoria la meta de facturacion
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
 DocType: Leave Control Panel,Carry Forward,Trasladar
@@ -2856,44 +2624,43 @@
 ,Produced,Producido
 DocType: Item,Item Code for Suppliers,Código del producto para proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Adjuntar membrete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
-DocType: Blog Post,Blog Post,Entrada en el Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar / Deshabilitar divisas
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Purchase Order,The date on which recurring order will be stop,Fecha en que el pedido recurrente es detenido
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Presente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferir material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferir material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crear cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
 DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 DocType: Features Setup,Point of Sale,Punto de Venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impuesto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refinación
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Línea {0}: {1} no es un {2} válido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Producto
 DocType: Production Planning Tool,Production Planning Tool,Planificar producción
 DocType: Quality Inspection,Report Date,Fecha del reporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Enrutamiento
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ya asignado para Empleado {1} para el período {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatarios
 DocType: Features Setup,Item Groups in Details,Detalles de grupos del producto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
@@ -2902,33 +2669,29 @@
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
 DocType: Pricing Rule,Customer Group,Categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
-DocType: Item,Website Description,Descripción del Sitio Web 
-DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
+DocType: Item,Website Description,Descripción del sitio web
+DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 ,Sales Register,Registro de ventas
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
 DocType: Address,Plant,Planta
-DocType: DocType,Setup,Configuración
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminación en frío
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
-DocType: Packing Slip,Get Items,Obtener artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Fecha del último pedido
-DocType: DocField,Image,Imagen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crear una factura de 'impuestos especiales'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
-DocType: Communication,Other,Otro
 DocType: C-Form,C-Form,C - Forma
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
 DocType: Serial No,Creation Document Type,Creación de documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Visita de mantenimiento
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
 DocType: Purchase Invoice,Mobile No,Nº Móvil
 DocType: Payment Tool,Make Journal Entry,Crear asiento contable
@@ -2936,35 +2699,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para la cotización
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 DocType: Cost Center,Distribution Id,Id de Distribución
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los productos o servicios.
 DocType: Purchase Invoice,Supplier Address,Dirección de proveedor
-DocType: Contact Us Settings,Address Line 2,Dirección línea 2
-DocType: ToDo,Reference,Referencia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforado
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,La secuencia es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicios financieros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3}
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
-DocType: Leave Allocation,Unused leaves,Hojas no utilizadas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+DocType: Leave Allocation,Unused leaves,Ausencias no utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cred
 DocType: Customer,Default Receivable Accounts,Cuentas por cobrar predeterminadas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Región de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterización
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
 DocType: Supplier,Contact HTML,HTML de Contacto
@@ -2975,74 +2732,67 @@
 DocType: Company,Retail,Ventas al por menor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
-DocType: Product Bundle,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Aplastante
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
 DocType: GL Entry,Remarks,Observaciones
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima 
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Features Setup,POS View,Vista POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,El registro de la instalación para un número de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colada continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un/a"
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Arriba
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamiento en frío
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito) 
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Devolución Contra Factura de venta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Elemento 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, establezca el valor predeterminado  {0} en la compañía {1}"
 DocType: Serial No,Creation Time,Hora de creación
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingresos Totales
 DocType: Sales Invoice,Product Bundle Help,Ayuda de 'conjunto / paquete de productos'
 ,Monthly Attendance Sheet,Hoja de ssistencia mensual
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtener elementos del paquete del producto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,El tipo de cuenta 'Pérdidas y ganancias' {0} no esta permitida para el asiento de apertura
-DocType: Workflow State,Time,Tiempo
 DocType: Features Setup,Sales Discounts,Descuentos sobre ventas
 DocType: Hub Settings,Seller Country,País de vendedor
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de términos y condiciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones para calcular el monto del envío
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Agregar elemento
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Se requiere un factor de conversión
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,COMISIÓN EN VENTAS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 DocType: Tax Rule,Billing Country,País de facturación
 ,Customers Not Buying Since Long Time,Clientes Ausentes
 DocType: Production Order,Expected Delivery Date,Fecha prevista de entrega
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Abultado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Modelo de fundición evaporativo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Edad
 DocType: Time Log,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Solicitudes de ausencia.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,GASTOS LEGALES
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","El día del mes en el cual se generará la orden automática por ejemplo 05, 29, etc."
 DocType: Sales Invoice,Posting Time,Hora de contabilización
@@ -3056,26 +2806,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de viaje
 DocType: Maintenance Visit,Breakdown,Desglose
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,La cuenta: {0} con la divisa: {1} no se puede seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: desde cuenta padre {1} no pertenece a la compañía: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afilando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
-DocType: Feed,Full Name,Nombre completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Remachado
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para un elemento en stock.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 ,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificación
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Crear lotes de gestión de tiempos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vendemos este producto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID de Proveedor
 DocType: Journal Entry,Cash Entry,Entrada de caja
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
@@ -3084,18 +2831,16 @@
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Agregar las lineas para establecer los presupuestos anuales.
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos.
 DocType: Newsletter,Test Email Id,Prueba de Email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la compañia
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviatura de la compañia
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la inspección de calidad. Habilitará el QA del artículo y el número de QA en el recibo de compra
 DocType: GL Entry,Party Type,Tipo de entidad
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Moldeo rotacional
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plantilla maestra de nómina salarial
 DocType: Leave Type,Max Days Leave Allowed,Máximo de días de ausencia permitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
@@ -3106,66 +2851,61 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Carrito
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Gracias por su interés en suscribirse a nuestras actualizaciones
 ,Qty to Transfer,Cantidad a transferir
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones para clientes y oportunidades
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. posiblemente el tipo de cambio no se ha creado para {1} en {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Cuenta {0}: desde cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este lote de gestión de tiempos ha sido cancelado.
 ,Reqd By Date,Fecha de solicitud
 DocType: Salary Slip Earning,Salary Slip Earning,Ingresos en nómina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ACREEDORES
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Acreedores
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 ,Item-wise Price List Rate,Detalle del listado de precios
 DocType: Purchase Order Item,Supplier Quotation,Cotización de proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Planchado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos Eventos
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
-DocType: Letter Head,Letter Head,Membrete
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
 DocType: Purchase Order,To Receive,Recibir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Retractilar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,usuario@ejemplo.com
 DocType: Email Digest,Income / Expense,Ingresos / gastos
 DocType: Employee,Personal Email,Correo electrónico personal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Bolsa de valores
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Bolsa de valores
 DocType: Address,Postal Code,Codigo postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo)
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 DocType: Hub Settings,Name Token,Nombre de Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planificar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Venta estándar
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Venta estándar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Por favor, ingrese unidad de medida (UdM) predeterminada"
 DocType: Purchase Invoice Item,Project Name,Nombre de proyecto
 DocType: Supplier,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
-DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
 DocType: Features Setup,Item Batch Nos,Números de lote del producto
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
@@ -3173,20 +2913,18 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Impuestos pagados
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
-DocType: Contact Us Settings,Pincode,Código PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Precio medio variable
 DocType: BOM Replace Tool,The BOM which will be replaced,La lista de materiales que será sustituida
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,La nueva unidad de medida (UdM) del Inventario debe ser diferente a la actual
 DocType: Account,Debit,Debe
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Subir la asistencia desde un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo pendiente
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este asunto / problema, utilice el botón 'Asignar' en la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,A moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
@@ -3195,10 +2933,7 @@
 DocType: Project,Default Cost Center,Centro de costos por defecto
 DocType: Purchase Invoice,End Date,Fecha final
 DocType: Employee,Internal Work History,Historial de trabajo interno
-DocType: DocField,Column Break,Salto de columna
-DocType: Event,Thursday,Jueves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Capital de riesgo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Torneado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
 DocType: Sales Invoice,Exhibition,Exposición
@@ -3211,31 +2946,30 @@
 DocType: Employee,Held On,Retenida en
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción
 ,Employee Information,Información del empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Porcentaje (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Porcentaje (%)
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Fin del ejercicio contable
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crear cotización de proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por licencia sin goce de salario (LSS)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumen de la semana.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser 'un producto para compra' o sub-contratado en la línea {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
 DocType: GL Entry,Party,Tercero
 DocType: Sales Order,Delivery Date,Fecha de entrega
-DocType: DocField,Currency,Divisa / Moneda
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado/a
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Precio promedio de compra
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
 DocType: Employee,History In Company,Historia en la Compañia
@@ -3252,77 +2986,68 @@
 DocType: Opportunity,To Discuss,Para discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas temporales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crear una carta de oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retornar
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
-DocType: DocField,Fold,Plegar
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,La unidad de medida (UdM) predeterminada para la variante debe ser la misma que la plantilla
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
 DocType: Project Task,Pending Review,Pendiente de revisar
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Por favor, especifique"
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
-DocType: Page,Page Name,Nombre de la página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,'hasta hora' debe ser mayor que 'desde hora'
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle finishing
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por ejemplo ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
-DocType: System Settings,Time Zone,Zona Horaria
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,El almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados para esta nota de entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Grapado
 DocType: Customer,Customer Details,Datos de cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formación
 DocType: Employee,Reports to,Enviar Informes a
-DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
+DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para los números de los receptores
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Cuenta de cierre {0} debe ser de tipo 'Patrimonio'
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Comprobante No.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
 DocType: Tax Rule,Purchase,Compra
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance
 DocType: Item Group,Parent Item Group,Grupo principal de productos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de costos
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Almacenes.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Listado de almacenes.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasa por la cual la divisa del proveedor es convertida como moneda base de la compañía
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Opportunity,Next Contact,Siguiente contacto
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
 DocType: Item Group,Default Expense Account,Cuenta de gastos por defecto
 DocType: Employee,Notice (days),Aviso (días)
-DocType: Page,Yes,Sí
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
 DocType: Employee,Encashment Date,Fecha de cobro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformado
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","El tipo de comprobante debe pertenecer a orden de compra, factura de compra o registro de diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo nombre de: {0} 
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuevo nombre de: {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de artículo
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3331,15 +3056,14 @@
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
+Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No. de serie es obligatoria para el producto {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creado por
-DocType: Serial No,Under AMC,Bajo AMC
+DocType: Serial No,Under AMC,Bajo CMA (Contrato de mantenimiento anual)
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
-DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
+DocType: BOM Replace Tool,Current BOM,Lista de materiales (LdM) actual
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Agregar No. de serie
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,IMPRESIONES Y PAPELERÍA
@@ -3347,68 +3071,64 @@
 DocType: Payment Reconciliation,Minimum Amount,Importe mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Actualizar mercancía terminada
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Secuencia {0} ya utilizada en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
 DocType: Customer,Default Taxes and Charges,Impuestos y cargos por defecto
 DocType: Account,Receivable,A cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
 DocType: Sales Invoice,Supplier Reference,Referencia de proveedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
-DocType: Material Request,Material Issue,Incidencia de material
+DocType: Material Request,Material Issue,Expedición de material
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Jabón y detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
-DocType: Warehouse,Warehouse Name,Nombre del Almacén
+DocType: Warehouse,Warehouse Name,Nombre del almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
-DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
+DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar unidad de medida (UdM)
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0} 
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Purchase Invoice,In Words,En palabras
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Production Planning Tool,Material Request For Warehouse,Requisición de materiales para el almacén
 DocType: Sales Order Item,For Production,Por producción
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Por favor, ingrese la Orden de Venta (OV) en la siguiente tabla"
 DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,El año financiero inicia el
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,El año financiero inicia el
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Por favor, ingrese los recibos de compra"
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
-DocType: Email Digest,Add/Remove Recipients,Agregar / Quitar destinatarios
+DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante corporativo de soporte técnico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Salary Slip,Salary Slip,Nómina salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruñido
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Hasta la fecha' es requerido
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete, "
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete,"
 DocType: Sales Invoice Item,Sales Order Item,Producto de la orden de venta
 DocType: Salary Slip,Payment Days,Días de pago
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
 DocType: Features Setup,Item Advanced,Producto anticipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminación en caliente
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del empleado
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
 DocType: Salary Slip,Net Pay,Pago Neto
 DocType: Account,Account,Cuenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
@@ -3417,47 +3137,38 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades de venta.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},No válida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
 DocType: Email Digest,Email Digest,Boletín por correo electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Tiendas por departamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Balance del sistema
-DocType: Workflow,Is Active,Está activo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Balance del sistema
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Desbarbado
 DocType: Company,Change Abbreviation,Cambiar abreviación
-DocType: Workflow State,Primary,Primario
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
 DocType: Item,Max Discount (%),Descuento máximo (%)
-DocType: Communication,More Information,Mas información
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Monto de la última orden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Voladura
 DocType: Company,Warn,Advertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valoración del producto actualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de producción
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
-DocType: Communication,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser menor que la fecha de la orden de compra
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
-DocType: Communication,Email,Correo electrónico (Email)
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 ,General Ledger,Balance general
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver iniciativas
 DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","El Email debe ser único,  {0} ya existe"
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Por favor, seleccione primero {0}"
 DocType: Features Setup,To get Item Group in details table,"Para obtener el grupo del producto, en detalles de tabla"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redibujar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Grabado
 DocType: Sales Invoice,Commission,Comisión
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3483,10 +3194,10 @@
  {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Importe por defecto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,El almacén no se encuentra en el sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
@@ -3501,76 +3212,63 @@
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 DocType: Supplier,Address and Contacts,Dirección y contactos
-DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenerlo adecuado para la web 900px (H) por 100px (V)
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Payment Tool,Get Outstanding Vouchers,Obtener comprobantes pendientes de pago
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las ausencias para un período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Haga clic aquí para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como padre / principal.
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar 'En stock' o 'No disponible' basado en el stock disponible del almacén.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Lista de Materiales (LdM)
-DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío 
+DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rodado
-DocType: ToDo,Priority,Prioridad
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
-DocType: Dropbox Backup,Dropbox Access Allowed,Acceso a Dropbox permitido
-DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recibir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Recibir
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completado
 DocType: Employee,Educational Qualification,Formación académica
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestro boletín de noticias
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la cotización ha sido hecha."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Generales
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,las entradas en el diario de existencias han sido actualizadas
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Informes Generales
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mis pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Nombre de la lista de precios
 DocType: Time Log,For Manufacturing,Para producción
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totales
 DocType: BOM,Manufacturing,Manufactura
 ,Ordered Items To Be Delivered,Ordenes pendientes de entrega
 DocType: Account,Income,Ingresos
-,Setup Wizard,Asistente de configuración.
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las fechas bloqueadas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundición a presión
-DocType: Email Alert,Reference Date,Fecha de referencia
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidad de la organización (departamento) maestro.
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 DocType: Budget Detail,Budget Detail,Detalle del presupuesto
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
-DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Unidad de medida (UdM) actualizada para el producto {0}
-DocType: Company History,Year,Año
-apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles de punto de venta POS
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Perfiles de punto de venta (POS)
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,La gestión de tiempos {0} ya se encuentra facturada
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,PRESTAMOS SIN GARANTÍA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Monto total pagado
@@ -3579,75 +3277,71 @@
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,El empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda 'HTML'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus proveedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
 DocType: Purchase Invoice,Contact,Contacto
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Recibido de
 DocType: Features Setup,Exports,Exportaciones
 DocType: Lead,Converted,Convertido
-DocType: Item,Has Serial No,Posee No. de serie
+DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
 DocType: Issue,Content Type,Tipo de contenido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computadora
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
 DocType: Payment Reconciliation,Get Unreconciled Entries,Verificar entradas no conciliadas
 DocType: Cost Center,Budgets,Presupuestos
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado
 DocType: Employee,Emergency Contact Details,Detalles de contacto de emergencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,¿A qué se dedica?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"'Número de serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pendiente
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Desde reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pulido
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde la última orden
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Días desde la última orden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
-DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},¿Realmente desea validar toda la nómina salarial para el mes {0} y año {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar suscriptores
 DocType: Target Detail,Target Qty,Cantidad estimada
 DocType: Attendance,Present,Presente
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar presentada
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta {0} Clausura tiene que ser de Responsabilidad / Patrimonio
 DocType: Authorization Rule,Based On,Basado en
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del proyecto / tarea.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar nóminas salariales
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} no es un ID de correo electrónico (Email) válido
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
-DocType: ToDo,Low,Bajo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Hilado
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
@@ -3669,7 +3363,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la campaña
 DocType: Maintenance Visit,Maintenance Date,Fecha de mantenimiento
 DocType: Purchase Receipt Item,Rejected Serial No,No. de serie rechazado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Embutición profunda
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo boletín
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar balance
@@ -3680,7 +3373,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
 ,Sales Analytics,Análisis de ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de producción
@@ -3692,28 +3384,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nombre de nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme su Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ofrecer al candidato un empleo.
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de hojas asignados más de día en el período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} es necesario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldeo por vacío
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
-DocType: Contact Us Settings,City,Ciudad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Mecanizado por ultrasonidos
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Error: No es un ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,El producto {0} debe ser un producto para la venta
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
 DocType: Sales Order,Printing Details,Detalles de impresión
 DocType: Task,Closing Date,Fecha de cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
 DocType: Sales Partner,Partner Type,Tipo de socio
@@ -3721,7 +3409,7 @@
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
@@ -3729,26 +3417,24 @@
 DocType: BOM,Raw Material Cost,Costo de materia prima
 DocType: Item,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
-DocType: Employee,Cheque,CHEQUE
+DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,El tipo de reporte es obligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El primer usuario: Usted
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,El primer usuario: Usted
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliado exitosamente
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliado exitosamente
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
-DocType: Page,No,No
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
@@ -3756,55 +3442,46 @@
 ,Item Prices,Precios de los productos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Cierre de período
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Configuracion de las listas de precios
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Configuracion de las listas de precios
 DocType: Task,Review Date,Fecha de revisión
 DocType: Purchase Invoice,Advance Payments,Pagos adelantados
-DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Email de notificación' no especificado para %s recurrentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Molienda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Email de notificación' no especificado para %s recurrentes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordisqueando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consuloría
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por ejemplo ""Mi Compañia LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de notificación
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 DocType: Packing Slip,Gross Weight UOM,Peso bruto de la unidad de medida (UdM)
 DocType: Email Digest,Receivables / Payables,Por cobrar / Por pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra la factura de venta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 DocType: Task,Actual End Date (via Time Logs),Fecha de finalización (gestión de tiempos)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
-DocType: User,Last Name,Apellido
-DocType: Web Page,Left,Inactivo/Fuera
-DocType: Event,All Day,Todo el Día
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
 DocType: Issue,Support Team,Equipo de soporte
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
-DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lotes de producto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
-DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de débito
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
@@ -3818,44 +3495,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Total anticipo
-DocType: Workflow State,User,Usuario
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Procesando nómina
 DocType: Opportunity Item,Basic Rate,Precio base
 DocType: GL Entry,Credit Amount,Importe acreditado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como perdido
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pago de recibos Nota
 DocType: Customer,Credit Days Based On,Días de crédito basados en
 DocType: Tax Rule,Tax Rule,Regla fiscal
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener mismo precio durante todo el ciclo de ventas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear las horas adicionales en la estación de trabajo.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ya ha sido validada
 ,Items To Be Requested,Solicitud de Productos
-DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Monto de facturación basado en el tipo de actividad (por hora)
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Email de la compañía no encontrado, por lo que el correo no ha sido enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 DocType: Production Planning Tool,Filter based on item,Filtro basado en producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de inicio
 DocType: Attendance,Employee Name,Nombre de empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 DocType: Purchase Common,Purchase Common,Compra común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Desde oportunidades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
-DocType: DocField,Default,Predeterminado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} suscriptores añadidos
 DocType: Maintenance Schedule,Schedule,Programa
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Defina el presupuesto para este centro de costos, puede configurarlo en 'Listado de compañía'"
@@ -3866,86 +3539,77 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
 DocType: Selling Settings,Campaign Naming By,Ordenar campañas por
 DocType: Employee,Current Address Is,La dirección actual es
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 DocType: Address,Office,Oficina
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Informes Estándares
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una cuenta de impuestos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
 DocType: Employee,Current Address,Dirección actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventario de lotes
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventario de lotes
 DocType: Employee,Contract End Date,Fecha de finalización de contrato
-DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
+DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores
-DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Desde cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Desde cotización de proveedor
 DocType: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Para realizar un seguimiento de los productos en los documentos de compra y venta, con los números de lote. 'Industria preferida: Químicos'"
 DocType: GL Entry,Transaction Date,Fecha de transacción
 DocType: Production Plan Item,Planned Qty,Cantidad planificada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Impuesto Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Por cantidad (cantidad fabricada) es obligatoria
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
 DocType: Notification Control,Purchase Receipt Message,Mensaje de recibo de compra
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de hojas asignados más de periodo
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados para esta orden de venta
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Listado de todos los movimientos de inventario.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Lista de suscriptores al boletín
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortajar
-DocType: Email Account,Service,Servicios
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Asientos contables ya se han hecho en moneda {0} para la compañía de {1}. Por favor, seleccione una cuenta por cobrar o por pagar con la moneda {0}."
 ,Monthly Salary Register,Registar salario mensual
-apps/frappe/frappe/website/template.py +140,Next,Siguiente
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
 DocType: BOM Operation,BOM Operation,Operación de la lista de materiales (LdM)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropulido
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una línea"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Por favor, ingrese el importe pagado en una línea"
 DocType: POS Profile,POS Profile,Perfil de POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Línea {0}: El importe de pago no puede ser superior al monto pendiente de pago
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total impagado
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total impagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,La gestión de tiempos no se puede facturar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,El salario neto no puede ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, ingrese los recibos correspondientes manualmente"
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del producto
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,PASIVO CIRCULANTE
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Pasivo circulante
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-balanceo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,TARJETA DE CRÉDITO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Laboreo
 DocType: Sales Invoice Item,Drop Ship,Nave de la gota
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
 DocType: Hub Settings,Seller Name,Nombre de vendedor
@@ -3955,47 +3619,44 @@
 DocType: Stock Entry,Repack,Re-empacar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
 DocType: Item Attribute,Numeric Values,Valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,El carrito esta vacío.
 DocType: Production Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Usuario root no se puede editar.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Usuario root no se puede editar.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Monto asignado no puede superar el importe no ajustado
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir producción en días festivos
 DocType: Sales Order,Customer's Purchase Order Date,Fecha de pedido de compra del cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital de inventario
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
-DocType: Dropbox Backup,Send Backups to Dropbox,Enviar copias de seguridad hacia Dropbox
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crear automáticamente una 'requisición de materiales' si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,Detalle de compras
 DocType: Batch,Expiry Date,Fecha de caducidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para establecer el nivel de reabastecimiento, el producto debe ser de 'compra' o un producto para fabricación"
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Listado de todos los proyectos.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtener elementos desde la 'lista de materiales'
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales (LdM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificaciones a>
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref.
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Cuenta {0} no existe
-DocType: Account,Cash,EFECTIVO
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Cuenta {0} no existe
+DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía para la página web y otras publicaciones.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, cree una estructura salarial para el empleado {0}"

diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 66e054f..4c4f8f8 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,حالت حقوق و دستمزد
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",انتخاب توزیع ماهانه، اگر شما می خواهید برای ردیابی بر اساس فصلی.
 DocType: Employee,Divorced,طلاق
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,هشدار: همان مورد وارد شده است چندین بار.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,هشدار: همان مورد وارد شده است چندین بار.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,آیتم ها در حال حاضر همگام سازی
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,اجازه می دهد مورد به چند بار در یک معامله اضافه شود
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,لغو مواد مشاهده {0} قبل از لغو این ادعا گارانتی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,محصولات قابل فروش
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,محصولات قابل فروش
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,لطفا ابتدا حزب نوع را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,آنیل
 DocType: Item,Customer Items,آیتم های مشتری
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,حساب {0}: حساب مرجع {1} می تواند یک دفتر نمی
 DocType: Item,Publish Item to hub.erpnext.com,مورد انتشار hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,ترک Approvers
 DocType: Sales Partner,Dealer,دلال
 DocType: Employee,Rented,اجاره
-DocType: About Us Settings,Website,سایت اینترنتی
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,تراکم علاوه پخت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* * * * آیا می شود در معامله محاسبه می شود.
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,از درخواست مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,از درخواست مواد
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} درخت
 DocType: Job Applicant,Job Applicant,درخواستگر کار
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,نتایج بیشتری.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,حقوقی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,حقوقی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},مالیات واقعی نوع می تواند در میزان مورد در ردیف شامل نمی شود {0}
 DocType: C-Form,Customer,مشتری
 DocType: Purchase Receipt Item,Required By,مورد نیاز
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,سری به روز رسانی با موفقیت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,دوخت
 DocType: Pricing Rule,Apply On,درخواست در
 DocType: Item Price,Multiple Item prices.,قیمت مورد چندگانه.
 ,Purchase Order Items To Be Received,سفارش خرید اقلام به دریافت
 DocType: SMS Center,All Supplier Contact,همه با منبع تماس با
 DocType: Quality Inspection Reading,Parameter,پارامتر
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,جدید مرخصی استفاده
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید به همان صورت {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,جدید مرخصی استفاده
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,حواله بانکی
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. برای حفظ مشتری کد عاقلانه مورد و به آنها جستجو بر اساس استفاده از کد خود را در این گزینه
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,نمایش انواع
-DocType: Sales Invoice Item,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,مقدار
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,در انبار
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,تولید مورد طرح
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,را نمایش جدید POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,بهداشت و درمان
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
 DocType: Purchase Invoice,Monthly,ماهیانه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),تاخیر در پرداخت (روز)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,فاکتور
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,آدرس ایمیل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,دفاع
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,آدرس ایمیل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Company,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ردیف # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ردیف # {0}:
 DocType: Delivery Note,Vehicle No,خودرو بدون
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,لطفا لیست قیمت را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,نجاری
 DocType: Production Order Operation,Work In Progress,کار در حال انجام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,چاپ سه بعدی
 DocType: Employee,Holiday List,فهرست تعطیلات
 DocType: Time Log,Time Log,زمان ورود
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,حسابدار
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,حسابدار
 DocType: Cost Center,Stock User,سهام کاربر
 DocType: Company,Phone No,تلفن
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",ورود از فعالیت های انجام شده توسط کاربران در برابر وظایف است که می تواند برای ردیابی زمان، صدور صورت حساب استفاده می شود.
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},جدید {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},جدید {0}: # {1}
 ,Sales Partners Commission,کمیسیون همکاران فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,مخفف می توانید بیش از 5 کاراکتر ندارد
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",موجودیت مقدار {0} نمی تواند از {1} به عنوان مورد انواع \ برداشته شود با این ویژگی وجود دارد.
-DocType: Print Settings,Classic,کلاسیک
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,این یک حساب ریشه است و نمی تواند ویرایش شود.
 DocType: BOM,Operations,عملیات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},آیا می توانم مجوز بر اساس تخفیف برای تنظیم نشده {0}
 DocType: Bin,Quantity Requested for Purchase,تعداد درخواست برای خرید
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ضمیمه. CSV فایل با دو ستون، یکی برای نام قدیمی و یکی برای نام جدید
 DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و مادر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,کیلوگرم
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,کیلوگرم
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,باز کردن برای یک کار.
 DocType: Item Attribute,Increment,افزایش
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,انتخاب کنید ... انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,تبلیغات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,تبلیغات
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Employee,Married,متاهل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,خواربار
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,را بانک ورودی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,انبار اجباری است اگر نوع حساب انبار است
 DocType: SMS Center,All Sales Person,همه فرد از فروش
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",بررسی کنید که تکرار منظور، تیک برای جلوگیری از تکرار و یا قرار دادن پایان مناسب عضویت
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
 DocType: SMS Log,SMS Log,SMS ورود
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
-DocType: Blog Post,Guest,مهمان
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,صورت مواد
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},از {0} به {1}
 DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
 DocType: Journal Entry,Opening Entry,ورود افتتاح
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} الزامی است
 DocType: Stock Entry,Additional Costs,هزینه های اضافی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
 DocType: Lead,Product Enquiry,پرس و جو محصولات
-DocType: Standard Reply,Owner,مالک
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,لطفا ابتدا وارد شرکت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
 DocType: Employee Education,Under Graduate,مقطع
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,هدف در
 DocType: BOM,Total Cost,هزینه کل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,گزارش فعالیت:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,عقار
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,عقار
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,بیانیه ای از حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,داروسازی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
 DocType: Expense Claim Detail,Claim Amount,مقدار ادعا
 DocType: Employee,Mr,آقای
-DocType: Custom Script,Client,مشتری
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,نوع منبع / تامین کننده
 DocType: Naming Series,Prefix,پیشوند
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,مصرفی
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,مصرفی
 DocType: Upload Attendance,Import Log,واردات ورود
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ارسال
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,حقوق سالانه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,حقوق سالانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,هزینه سهام
 DocType: Newsletter,Email Sent?,ایمیل فرستاده شده است؟
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,نمایش زمان گزارش ها
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
 DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,مورد {0} باید مورد خرید است
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,به روز خواهد شد پس از فاکتور فروش ارائه شده است.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",شامل مالیات در ردیف {0} در مورد نرخ، مالیات در ردیف {1} باید گنجانده شود
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,صاف
 DocType: BOM Replace Tool,New BOM,BOM جدید
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,دسته سیاههها زمان برای صدور صورت حساب.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ریخته گری Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,عضویت در خبرنامه قبلا ارسال شده است
 DocType: Lead,Request Type,درخواست نوع
 DocType: Leave Application,Reason,دلیل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,رادیو و تلویزیون
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,اعدام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,اولین کاربر تبدیل خواهد شد مدیر سیستم (شما می توانید این تنظیمات را تغییر دهید).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,رادیو و تلویزیون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,اعدام
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,اولین کاربر تبدیل خواهد شد مدیر سیستم (شما می توانید این تنظیمات را تغییر دهید).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,جزئیات عملیات انجام شده است.
-DocType: Serial No,Maintenance Status,وضعیت نگهداری 
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,اقلام و قیمت گذاری
+DocType: Serial No,Maintenance Status,وضعیت نگهداری
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,اقلام و قیمت گذاری
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. با فرض از تاریخ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,کارمند برای آنها ایجاد می کنید ارزیابی انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},هزینه مرکز {0} به شرکت تعلق ندارد {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,لیست قیمت ها باید قابل استفاده برای خرید و یا فروش است
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},تاریخ نصب و راه اندازی نمی تواند قبل از تاریخ تحویل برای مورد است {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),تخفیف در لیست قیمت نرخ (٪)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,شروع
-DocType: User,First Name,نام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ریخته گری کامل قالب
 DocType: Offer Letter,Select Terms and Conditions,انتخاب شرایط و ضوابط
 DocType: Production Planning Tool,Sales Orders,سفارشات فروش
 DocType: Purchase Taxes and Charges,Valuation,ارزیابی
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,حساب بانکی
 DocType: Leave Type,Allow Negative Balance,اجازه می دهد تراز منفی
 DocType: Selling Settings,Default Territory,به طور پیش فرض سرزمین
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,تلویزیون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,تلویزیون
 DocType: Production Order Operation,Updated via 'Time Log',به روز شده از طریق &#39;زمان ورود &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},حساب {0} به شرکت تعلق ندارد {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
 DocType: Customer Group,Mention if non-standard receivable account applicable,اگر حساب دریافتنی ذکر غیر استاندارد قابل اجرا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,ذخیره سازی قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,دریافت در
 DocType: Sales Partner,Reseller,نمایندگی فروش
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,لطفا شرکت وارد
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر مورد فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
 DocType: Newsletter List,Total Subscribers,مجموع مشترکین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,تماس با نام
+,Contact Name,تماس با نام
 DocType: Production Plan Item,SO Pending Qty,SO در انتظار تعداد
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,درخواست برای خرید.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,مسکن دو
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,برگ در سال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,برگ در سال
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری مجموعه
 DocType: Time Log,Will be updated when batched.,خواهد شد که بسته بندی های کوچک به روز شد.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ردیف {0}: لطفا بررسی کنید آیا پیشرفته در برابر حساب {1} در صورتی که این یک ورودی پیش است.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},انبار {0} به شرکت تعلق ندارد {1}
-DocType: Bulk Email,Message,پیام
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox به دسترسی های کلیدی
 DocType: Payment Tool,Reference No,مرجع بدون
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,سالیانه
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
 DocType: Material Request Item,Min Order Qty,حداقل تعداد سفارش
 DocType: Lead,Do Not Contact,آیا تماس با نه
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,شناسه منحصر به فرد برای ردیابی تمام فاکتورها در محدوده زمانی معین. این است که در ارائه تولید می شود.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,نرم افزار توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,نرم افزار توسعه
 DocType: Item,Minimum Order Qty,حداقل تعداد سفارش تعداد
 DocType: Pricing Rule,Supplier Type,نوع منبع
 DocType: Item,Publish in Hub,انتشار در توپی
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,مسواک زدن سیم
 DocType: Employee,Relation,ارتباط
 DocType: Shipping Rule,Worldwide Shipping,حمل و نقل در سراسر جهان
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
 DocType: Maintenance Schedule,Generate Schedule,تولید برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,سر هزینه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,لطفا ابتدا شارژ نوع را انتخاب کنید
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخرین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,حداکثر 5 کاراکتر
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,انتخاب زبان
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,حداکثر 5 کاراکتر
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",غیر فعال ایجاد شده از سیاهههای مربوط در برابر سفارشات تولید. عملیات باید در برابر سفارش تولید ردیابی نمی
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,نوع از
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,مورد {0} باید مورد خدمات شود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
-DocType: DocType,Administrator,مدیر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,حفاری با لیزر
-DocType: Stock UOM Replace Utility,New Stock UOM,جدید بورس UOM
 DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب
 DocType: Employee,External Work History,سابقه کار خارجی
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,خطا مرجع مدور
-DocType: Communication,Closed,بسته
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
 DocType: Lead,Industry,صنعت
 DocType: Employee,Job Profile,نمایش شغلی
 DocType: Newsletter,Newsletter,عضویت در خبرنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,هیدروفرمینگ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
 DocType: Journal Entry,Multi Currency,چند ارز
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,مورد به روز شده است
-DocType: Async Task,System Manager,سیستم مدیریت
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
 DocType: Sales Invoice Item,Delivery Note,رسید
-DocType: Dropbox Backup,Allow Dropbox Access,اجازه دسترسی Dropbox به
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,راه اندازی مالیات
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Workstation,Rent Cost,اجاره هزینه
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,لطفا ماه و سال را انتخاب کنید
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,شرکت پست الکترونیک
 DocType: GL Entry,Debit Amount in Account Currency,مقدار بدهی در حساب ارز
 DocType: Shipping Rule,Valid for Countries,معتبر برای کشورهای
-DocType: Workflow State,Refresh,تازه کردن
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",همه رشته های مرتبط مانند واردات ارز، نرخ تبدیل، کل واردات، واردات بزرگ و غیره کل موجود در رسید خرید، نقل قول تامین کننده، خرید فاکتور، سفارش خرید و غیره می باشد
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,سرعت که در آن مشتریان ارز به ارز پایه مشتری تبدیل
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",موجود در BOM، تحویل توجه داشته باشید، خرید فاکتور، سفارش تولید، سفارش خرید، رسید خرید، فاکتور فروش، سفارش فروش، انبار ورودی، برنامه زمانی
 DocType: Item Tax,Tax Rate,نرخ مالیات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,انتخاب مورد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,انتخاب مورد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,خرید فاکتور {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,رسید خرید باید ارائه شود
-DocType: Stock UOM Replace Utility,Current Stock UOM,در حال حاضر سهام UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,آدرس ایمیل شما
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,لطفا پیوست را ببینید
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,برش جت آب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
 ,Finished Goods,محصولات تمام شده
 DocType: Delivery Note,Instructions,دستورالعمل
 DocType: Quality Inspection,Inspected By,بازرسی توسط
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,لطفا حساب برای مشتریان و تامین کنندگان ایجاد کنید. آنها به طور مستقیم از استادان مشتری / تامین کننده ایجاد شده است.
 DocType: Currency Exchange,Currency Exchange,صرافی
 DocType: Purchase Invoice Item,Item Name,نام آیتم
+DocType: Authorization Rule,Approving User  (above authorized value),تصویب کاربر (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,میزان اعتبار
 DocType: Employee,Widowed,بیوه
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",آیتم را به درخواست شود که &quot;خارج از بورس&quot; با توجه به تمام انبارها بر اساس تعداد پیش بینی شده و حداقل تعداد سفارش
@@ -378,22 +346,21 @@
 ,Purchase Register,خرید ثبت نام
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
 DocType: Workstation,Consumable Cost,هزینه مصرفی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,پزشکی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,پزشکی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,دلیل برای از دست دادن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,خم کن کاغذ لوله
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 DocType: Employee,Single,تک
 DocType: Issue,Attachment,دلبستگی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,بودجه می تواند برای مرکز هزینه گروه تواند تنظیم شود
 DocType: Account,Cost of Goods Sold,هزینه کالاهای فروخته شده
 DocType: Purchase Invoice,Yearly,سالیانه
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,لطفا وارد مرکز هزینه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا وارد مرکز هزینه
 DocType: Journal Entry Account,Sales Order,سفارش فروش
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,الان متوسط. فروش نرخ
 DocType: Purchase Order,Start date of current order's period,تاریخ دوره منظور فعلی شروع
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},تعداد می تواند یک بخش در ردیف نمی {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},تعداد می تواند یک بخش در ردیف نمی {0}
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
 DocType: Delivery Note,% Installed,٪ نصب
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,لطفا ابتدا نام شرکت وارد
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,گروه
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,تنظیم به صورت خودکار سریال بر اساس شماره FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,بررسی تولید کننده فاکتور شماره منحصر به فرد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,ترمو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,اتاق های برش
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','به شماره پرونده' نمی تواند کمتر از 'از شماره پرونده' باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,غیر انتفاعی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,غیر انتفاعی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,شروع نشده
 DocType: Lead,Channel Partner,کانال شریک
 DocType: Account,Old Parent,قدیمی مرجع
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,کارشناسی ارشد تعطیلات.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,قالب ریزی و سازه پوسته
 DocType: Material Request Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,لطفا کد مورد را وارد کنید.
 DocType: BOM,Costing,هزینه یابی
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,مجموع تعداد
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,به محدوده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,اوراق بهادار و سپرده ها
 DocType: Features Setup,Imports,واردات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,باند
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Job Opening,Description of a Job Opening,شرح یک شغل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,فعالیت های در انتظار برای امروز
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,ثبت حضور و غیاب.
 DocType: Bank Reconciliation,Journal Entries,ورودی های دفتر روزنامه
 DocType: Sales Order Item,Used for Production Plan,مورد استفاده برای طرح تولید
-DocType: System Settings,Loading...,در حال بارگذاری ...
-DocType: DocField,Password,رمز عبور
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,مدل سازی رسوب ذوب
 DocType: Manufacturing Settings,Time Between Operations (in mins),زمان بین عملیات (در دقیقه)
 DocType: Customer,Buyer of Goods and Services.,خریدار کالا و خدمات.
 DocType: Journal Entry,Accounts Payable,حساب های پرداختنی
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,اضافه کردن مشترکین
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",وجود ندارد
 DocType: Pricing Rule,Valid Upto,معتبر تا حد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,لیست تعداد کمی از مشتریان خود را. آنها می تواند سازمان ها یا افراد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,درآمد مستقیم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,افسر اداری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,افسر اداری
 DocType: Payment Tool,Received Or Paid,دریافت یا پرداخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Stock Entry,Difference Account,حساب تفاوت
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-DocType: DocField,Type,نوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
-DocType: Communication,Subject,موضوع
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 ,Serial No Warranty Expiry,سریال بدون گارانتی انقضاء
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,بخش
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,جدید UOM NOT باید از نوع عدد صحیح است
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,مبلمان و دستگاه ها
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,سرعت که در آن لیست قیمت ارز به ارز پایه شرکت تبدیل
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,مورد نیاز مواد
 DocType: Company,Delete Company Transactions,حذف معاملات شرکت
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,مورد {0} است خرید مورد
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} آدرس ایمیل نامعتبر در &#39;هشدار از طریق \ آدرس ایمیل&#39; است
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,حسابداری مجموع این سال:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,حسابداری مجموع این سال:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",نمی توانید حذف سریال نه {0}، آن را به عنوان در معاملات سهام مورد استفاده
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),بسته شدن (کروم)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),بسته شدن (کروم)
 DocType: Serial No,Warranty Period (Days),دوره گارانتی (روز)
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 ,Pending Qty,انتظار تعداد
 DocType: Job Applicant,Thread HTML,HTML موضوع
 DocType: Company,Ignore,نادیده گرفتن
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS با شماره های زیر ارسال گردید: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
 DocType: Pricing Rule,Valid From,معتبر از
 DocType: Sales Invoice,Total Commission,کمیسیون ها
 DocType: Pricing Rule,Sales Partner,شریک فروش
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** توزیع ماهانه ** شما کمک می کند بودجه خود را توزیع در سراسر ماه اگر شما فصلی در کسب و کار شما. برای توزیع بودجه با استفاده از این توزیع، تنظیم این توزیع ماهانه ** ** ** در مرکز هزینه **
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
-DocType: About Us Settings,Website Manager,مدیر وب سایت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,سال مالی تاریخ شروع نباید بیشتر از سال مالی پایان تاریخ
 DocType: Warranty Claim,Resolution,حل
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},تحویل: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,صدور صورت حساب و وضعیت تحویل
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,قبلی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,بازگشت فروش
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,سفارشات فروش که از آن شما می خواهید برای ایجاد سفارشات تولید را انتخاب کنید.
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,قطعات حقوق و دستمزد.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,پایگاه داده از مشتریان بالقوه است.
+DocType: Authorization Rule,Customer or Item,مشتری و یا مورد
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,پایگاه داده مشتری می باشد.
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,غلت
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,واحد اندازه گیری پیش فرض برای مورد {0} می توانید به طور مستقیم نمی توان تغییر چون در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. شما نیاز به ایجاد یک آیتم جدید به استفاده از پیش فرض UOM متفاوت است.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
-DocType: Event,Wednesday,چهار شنبه
 DocType: Sales Invoice,Customer's Vendor,فروشنده مشتری
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,سفارش تولید الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,نوشتن طرح های پیشنهادی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,نوشتن طرح های پیشنهادی
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,یک نفر دیگر فروش {0} با شناسه کارمند همان وجود دارد
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},خطا بورس منفی ({6}) برای مورد {0} در انبار {1} در {2} {3} در {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,شرکت سال مالی
@@ -550,27 +507,23 @@
 DocType: Employee,Reason for Resignation,دلیل استعفای
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,الگو برای ارزیابی عملکرد.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,فاکتور / مجله ورود به جزئیات
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' در سال مالی شماره {2}  وجود ندارد  
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' در سال مالی شماره {2}  وجود ندارد
 DocType: Buying Settings,Settings for Buying Module,تنظیمات برای خرید ماژول
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,لطفا ابتدا وارد رسید خرید
 DocType: Buying Settings,Supplier Naming By,تامین کننده نامگذاری توسط
 DocType: Activity Type,Default Costing Rate,به طور پیش فرض هزینه یابی نرخ
 DocType: Maintenance Schedule,Maintenance Schedule,برنامه نگهداری و تعمیرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",مشاهده قوانین سپس قیمت گذاری بر اساس مشتری، مشتری گروه، منطقه، تامین کننده، تامین کننده نوع، کمپین، فروش شریک و غیره فیلتر
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,لطفا Dropbox به ماژول پایتون نصب
 DocType: Employee,Passport Number,شماره پاسپورت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,مدیر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,از رسید خرید
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,مدیر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,از رسید خرید
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
 DocType: SMS Settings,Receiver Parameter,گیرنده پارامتر
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
 DocType: Sales Person,Sales Person Targets,اهداف فرد از فروش
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,برای
-apps/frappe/frappe/templates/base.html +145,Please enter email address,لطفا آدرس ایمیل را وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,پایان لوله تشکیل
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,تبدیل به گروه
 DocType: Activity Cost,Activity Type,نوع فعالیت
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,روز ثابت
 DocType: Sales Invoice,Packing List,فهرست بسته بندی
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,سفارشات خرید به تولید کنندگان داده می شود.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,انتشارات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,انتشارات
 DocType: Activity Cost,Projects User,پروژه های کاربری
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,مصرف
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} در فاکتور جزییات جدول یافت نشد
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} در فاکتور جزییات جدول یافت نشد
 DocType: Company,Round Off Cost Center,دور کردن مرکز هزینه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات مشاهده {0} باید قبل از لغو این سفارش فروش لغو
 DocType: Material Request,Material Transfer,انتقال مواد
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),افتتاح (دکتر)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},مجوز های ارسال و زمان باید بعد {0}
-apps/frappe/frappe/config/setup.py +59,Settings,تنظیمات
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,مالیات هزینه فرود آمد و اتهامات
 DocType: Production Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: BOM Operation,Operation Time,زمان عمل
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,بیش
 DocType: Pricing Rule,Sales Manager,مدیر فروش
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,تغییر نام
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,خم
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,اجازه می دهد کاربر
 DocType: Journal Entry,Bill No,شماره صورتحساب
 DocType: Purchase Invoice,Quarterly,فصلنامه
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Purchase Receipt,Other Details,سایر مشخصات
 DocType: Account,Accounts,حسابها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,بازار یابی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,قیچی و برش مستقیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,بازار یابی
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,برای پیگیری آیتم در فروش و خرید اسناد بر اساس NOS سریال خود را. این هم می تواند برای پیگیری جزئیات ضمانت محصول استفاده می شود.
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,انبار را رد کرد مقابل آیتم regected الزامی است
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 DocType: Employee,Provide email id registered in company,ارائه ایمیل شناسه ثبت شده در شرکت
 DocType: Hub Settings,Seller City,فروشنده شهر
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,نوع درخت
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,مقدار و انبار
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",علیه کوپن نوع باید یکی از سفارش فروش، فاکتور فروش و یا مجله ورودی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,قادر به پیدا کردن نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,جو زمین
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,خوش آمد
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,جو زمین
 DocType: Journal Entry,Credit Card Entry,ورود کارت اعتباری
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,وظیفه تم
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,محصولات از تولید کنندگان دریافت کرد.
-DocType: Communication,Open,باز
 DocType: Lead,Campaign Name,نام کمپین
 ,Reserved,رزرو شده
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} است مورد سهام نمی
 DocType: Mode of Payment Account,Default Account,به طور پیش فرض حساب
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
-DocType: Contact Us Settings,Address Title,عنوان نشانی
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
-DocType: Dropbox Backup,Daily,روزانه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,حساب با معامله های موجود را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,حساب با معامله های موجود را نمی توان تبدیل به لجر
 DocType: Delivery Note,Customer's Purchase Order No,مشتری سفارش خرید بدون
 DocType: Employee,Cell Number,شماره همراه
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,درخواست مواد تولید خودکار
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,از دست رفته
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,شما می توانید کوپن در حال حاضر در &quot;علیه مجله ورودی&quot; ستون وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,انرژی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,بیانیه حقوق ماهانه.
 DocType: Item Group,Website Specifications,مشخصات وب سایت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,حساب جدید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,مطالب حسابداری می تواند در مقابل برگ ساخته شده است. مطالب در برابر گروه امکان پذیر نیست.
-DocType: ToDo,High,زیاد
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
-DocType: User,Male,مرد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},تعداد رسید خرید مورد نیاز برای مورد {0}
 DocType: Item Attribute Value,Item Attribute Value,مورد موجودیت مقدار
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,کمپین فروش.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,شخصی
 DocType: Expense Claim Detail,Expense Claim Type,هزینه نوع ادعا
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,تنظیمات پیش فرض برای سبد خرید
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",مجله ورودی {0} است و مخالف نظم مرتبط {1}، بررسی کنید که آیا باید آن را به عنوان پیش در این فاکتور کشیده.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,بیوتکنولوژی
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",مجله ورودی {0} است و مخالف نظم مرتبط {1}، بررسی کنید که آیا باید آن را به عنوان پیش در این فاکتور کشیده.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,بیوتکنولوژی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,هزینه نگهداری و تعمیرات دفتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Account,Liability,مسئوليت
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Process Payroll,Send Email,ارسال ایمیل
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;به روز رسانی سهام&#39; بررسی نمی شود، زیرا موارد از طریق تحویل نمی {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,شماره
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,شماره
 DocType: Item,Items with higher weightage will be shown higher,پاسخ همراه با بین وزنها بالاتر خواهد بود بالاتر نشان داده شده است
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,جزئیات مغایرت گیری بانک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,فاکتورها من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,فاکتورها من
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,بدون کارمند یافت
 DocType: Purchase Order,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",برای فعال کردن &quot;نقطه ای از فروش&quot; ویژگی های
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
-DocType: Comment,Reference Name,نام مرجع
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: Sales Invoice Item,Target Warehouse,هدف انبار
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش فروش تاریخ است
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
 DocType: Production Order,Item To Manufacture,آیتم را ساخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ریخته گری قالب دائم
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} وضعیت {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,سفارش خرید به پرداخت
 DocType: Sales Order Item,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
 DocType: Newsletter,Newsletter Manager,مدیر خبرنامه
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;افتتاح&#39;
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
 DocType: Expense Claim,Expenses,مخارج
 DocType: Item Variant Attribute,Item Variant Attribute,مورد متغیر ویژگی
 ,Purchase Receipt Trends,روند رسید خرید
 DocType: Appraisal,Select template from which you want to get the Goals,قالب را انتخاب که از آن شما می خواهید برای دریافت به اهداف
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,تحقیق و توسعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,تحقیق و توسعه
 ,Amount to Bill,مقدار به بیل
 DocType: Company,Registration Details,جزییات ثبت نام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,پوست بزرگ هستند
 DocType: Item,Re-Order Qty,تعداد نقطه سفارش
 DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},برنامه ریزی برای ارسال به {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,جزئیات سهام
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ارزش پروژه
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,نقطه از فروش
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},نمی تواند حمل به جلو {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
 DocType: Account,Balance must be,موجودی باید
 DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
 DocType: Notification Control,Expense Claim Rejected Message,پیام ادعای هزینه رد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,دقیقی ارایه
 ,Available Qty,در دسترس تعداد
 DocType: Purchase Taxes and Charges,On Previous Row Total,در ردیف قبلی مجموع
 DocType: Salary Slip,Working Days,روزهای کاری
 DocType: Serial No,Incoming Rate,نرخ ورودی
 DocType: Packing Slip,Gross Weight,وزن ناخالص
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.
 DocType: HR Settings,Include holidays in Total no. of Working Days,شامل تعطیلات در مجموع هیچ. از روز کاری
 DocType: Job Applicant,Hold,نگه داشتن
 DocType: Employee,Date of Joining,تاریخ پیوستن
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,مشخصات مشترکین
 DocType: Purchase Invoice Item,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,شمشیرهای
 DocType: Employee,Ms,خانم
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} باید فعال باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} باید فعال باشد
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
 DocType: Salary Slip,Leave Encashment Amount,ترک Encashment مقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},سریال بدون {0} به مورد تعلق ندارد {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مورد نیاز تعداد
 DocType: Bank Reconciliation,Total Amount,مقدار کل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,انتشارات اینترنت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,انتشارات اینترنت
 DocType: Production Planning Tool,Production Orders,سفارشات تولید
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ارزش موجودی
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,فهرست قیمت فروش
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,انتشار همگام موارد
-DocType: GL Entry,Account Currency,حساب ارز
+DocType: Bank Reconciliation,Account Currency,حساب ارز
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,لطفا در شرکت گرد حساب فعال ذکر
 DocType: Purchase Receipt,Range,محدوده
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Features Setup,Item Barcode,بارکد مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,خرید فاکتور پیشرفته
 DocType: Address,Shop,فروشگاه
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در POS فاکتور به روز شده در زمانی که این حالت انتخاب شده است.
 DocType: Employee,Permanent Address Is,آدرس دائمی است
 DocType: Production Order Operation,Operation completed for how many finished goods?,عملیات برای چند کالا به پایان رسید به پایان؟
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,نام تجاری
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,نام تجاری
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,کمک هزینه برای بیش از {0} عبور برای مورد {1}.
 DocType: Employee,Exit Interview Details,جزییات خروج مصاحبه
 DocType: Item,Is Purchase Item,آیا مورد خرید
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,خرید سفارش مورد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,درآمد غیر مستقیم
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,تنظیم مقدار پرداخت = مقدار برجسته
-DocType: Contact Us Settings,Address Line 1,خط 1 آدرس
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,واریانس
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,نام شرکت
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,واریانس
+,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,انتخاب مورد انتقال
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,نمایش یک لیست از تمام فیلم ها کمک
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,انتخاب سر حساب بانکی است که چک نهشته شده است.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,کاربر مجاز به ویرایش لیست قیمت نرخ در معاملات
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,شیمیایی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,شیمیایی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 DocType: Process Payroll,Select Payroll Year and Month,انتخاب سال و ماه حقوق و دستمزد
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",برو به گروه مناسب (معمولا استفاده از وجوه&gt; دارایی های نقد&gt; حساب های بانکی و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع &quot;بانک&quot;
 DocType: Workstation,Electricity Cost,هزینه برق
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
-DocType: Comment,Unsubscribed,اشتراک لغو
 DocType: Opportunity,Walk In,راه رفتن در
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,درخت مراکز هزینه finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,انتقال
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,سفید
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,سفید
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ضمیمه تصویر شما
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ساخت
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ضمیمه تصویر شما
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ساخت
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
-DocType: Workflow State,Stop,توقف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یک خطای وجود دارد. یکی از دلایل احتمالی میتواند این باشد که شما به صورت ذخیره نیست. لطفا support@erpnext.com تماس بگیرید اگر مشکل همچنان ادامه دارد.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,سبد من
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},نوع سفارش باید یکی از است {0}
 DocType: Lead,Next Contact Date,تماس با آمار بعدی
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,باز کردن تعداد
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,گزینه های سهام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,گزینه های سهام
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},تعداد برای {0}
 DocType: Leave Application,Leave Application,مرخصی استفاده
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ترک ابزار تخصیص
 DocType: Leave Block List,Leave Block List Dates,ترک فهرست بلوک خرما
 DocType: Company,If Monthly Budget Exceeded (for expense account),اگر بودجه ماهانه بیش از (برای حساب هزینه)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,پیرایش
 DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
 DocType: Company,Default Terms,به طور پیش فرض شرایط
 DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
 DocType: POS Profile,Cash/Bank Account,نقد / حساب بانکی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,بایگانی
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,تخفیف
 DocType: Features Setup,Purchase Discounts,تخفیف خرید
 DocType: Workstation,Wages,مزد
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این رکورد هستید. لطفاٌ 'وضعیت' را روزآمد و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,حساب با شرکت مطابقت ندارد
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,انبار WIP
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
 DocType: BOM Operation,Operation,عمل
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,هزینه فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,خرید استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,خرید استاندارد
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,به طور پیش فرض مرکز فروش هزینه
 DocType: Sales Partner,Implementation Partner,شریک اجرای
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ساخت نوشته های سهام
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
 DocType: Item,Default Supplier,به طور پیش فرض تامین کننده
 DocType: Manufacturing Settings,Over Production Allowance Percentage,بر تولید درصد کمک هزینه
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,به روز شده از طریق زمان گزارش ها
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
 DocType: Opportunity,Your sales person who will contact the customer in future,فرد از فروش خود را خواهد کرد که مشتری در آینده تماس
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
 DocType: Company,Default Currency,به طور پیش فرض ارز
 DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
-DocType: Contact Us Settings,Address,نشانی
 DocType: Expense Claim,From Employee,از کارمند
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
 DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,حمل و نقل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,حمل و نقل
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,و سال:
 DocType: Email Digest,Annual Expense,هزینه سالانه
 DocType: SMS Center,Total Characters,مجموع شخصیت
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,جزئیات C-فرم فاکتور
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,پرداخت آشتی فاکتور
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,سهم٪
 DocType: Item,website page link,لینک صفحه وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,اجازه دهید سیستم آماده برای استفاده است.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,شماره ثبت شرکت برای رجوع کنید. شماره مالیاتی و غیره
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,زمان ثبت را انتخاب کرده و ثبت برای ایجاد یک فاکتور فروش جدید.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,فاکتور فروش پیشرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,هیچ چیز برای درخواست
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,اداره
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,اداره
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,نوع فعالیت برای ورق های زمان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ریخته گری سرمایه گذاری
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},در هر دو صورت بانکی و یا اعتباری مقدار مورد نیاز است برای {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,فعال
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ابی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ابی
 DocType: Purchase Invoice,Is Return,آیا بازگشت
 DocType: Price List Country,Price List Country,لیست قیمت کشور
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,گره علاوه بر این می تواند تنها تحت نوع گره &#39;گروه&#39; ایجاد
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},نمایش POS {0} در حال حاضر برای کاربر ایجاد: {1} و {2} شرکت
 DocType: Purchase Order Item,UOM Conversion Factor,UOM عامل تبدیل
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,تولید شی و روکش
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,تشکیل کشش
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فرد از فروش شما یادآوری در این تاریخ دریافت برای تماس با مشتری
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,مالیاتی و دیگر کسورات حقوق و دستمزد.
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
 DocType: Account,Warehouse,مخزن
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
 ,Purchase Order Items To Be Billed,سفارش خرید گزینه هایی که صورتحساب
 DocType: Purchase Invoice Item,Net Rate,نرخ خالص
 DocType: Purchase Invoice Item,Purchase Invoice Item,خرید آیتم فاکتور
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,سهام لجر مطالب و GL مطالب برای دریافت خرید انتخاب reposted
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,مورد 1
 DocType: Holiday,Holiday,روز تعطیل
-DocType: Event,Saturday,روز شنبه
 DocType: Leave Control Panel,Leave blank if considered for all branches,خالی بگذارید اگر برای تمام شاخه های در نظر گرفته
 ,Daily Time Log Summary,روزانه زمان ورود خلاصه
-DocType: DocField,Label,برچسب
 DocType: Payment Reconciliation,Unreconciled Payment Details,مشخصات پرداخت Unreconciled
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
 DocType: Lead,Call,دعوت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,راه اندازی کارکنان
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,شبکه &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,پژوهش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,پژوهش
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Contact,User ID,ID کاربر
-DocType: Communication,Sent,فرستاده
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,مشخصات لجر
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
-DocType: Communication,Delivery Status,تحویل وضعیت
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 DocType: Production Order,Manufacture against Sales Order,ساخت در برابر سفارش فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,مورد توضیحات
 DocType: Payment Tool,Payment Mode,حالت پرداخت
 DocType: Purchase Invoice,Is Recurring,تکرارشونده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,فلز مستقیم پخت لیزر
 DocType: Purchase Order,Supplied Items,اقلام عرضه
 DocType: Production Order,Qty To Manufacture,تعداد برای تولید
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,حفظ همان نرخ در سراسر چرخه خرید
 DocType: Opportunity Item,Opportunity Item,مورد فرصت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,افتتاح موقت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,کارمند مرخصی تعادل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
 DocType: Address,Address Type,نوع نشانی
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,کوچک
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,کوچک
 DocType: Employee,Employee Number,شماره کارمند
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},مورد هیچ (بازدید کنندگان) در حال حاضر در حال استفاده است. سعی کنید از مورد هیچ {0}
 ,Invoiced Amount (Exculsive Tax),مقدار صورتحساب (Exculsive مالیات)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,آیتم 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,سر حساب {0} ایجاد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,سبز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,سبز
 DocType: Item,Auto re-order,خودکار دوباره سفارش
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,مجموع بهدستآمده
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,مجموع بهدستآمده
 DocType: Employee,Place of Issue,محل صدور
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,قرارداد
-DocType: Report,Disabled,غیر فعال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,قرارداد
+DocType: Email Digest,Add Quote,اضافه کردن نقل قول
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,کشاورزی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,محصولات و یا خدمات شما
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,محصولات و یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,نام مورد نیاز است
 DocType: Purchase Invoice,Recurring Type,تکرار نوع
 DocType: Address,City/Town,شهرستان / شهر
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,مورد {0} باید مورد-فرعی قرارداد است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,تجهیزات سرمایه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,انتظار می رود تاریخ تحویل کمتر از برنامه ریزی شده تاریخ شروع است.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,خروجی ها
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",فقط یک قانون حمل و نقل شرط با 0 یا مقدار خالی برای &quot;به ارزش&quot;
 DocType: Authorization Rule,Transaction,معامله
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,توجه: این مرکز هزینه یک گروه است. می توانید ورودی های حسابداری در برابر گروه های را ندارد.
-apps/frappe/frappe/config/desk.py +7,Tools,ابزار
 DocType: Item,Website Item Groups,گروه مورد وب سایت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,تعداد سفارش تولید برای ورود سهام تولید هدف الزامی است
 DocType: Purchase Invoice,Total (Company Currency),مجموع (شرکت ارز)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,ورودی دفتر
 DocType: Workstation,Workstation Name,نام ایستگاه های کاری
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
 DocType: Sales Partner,Target Distribution,توزیع هدف
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,نظرات
 DocType: Salary Slip,Bank Account No.,شماره حساب بانکی
 DocType: Naming Series,This is the number of the last created transaction with this prefix,این تعداد از آخرین معامله ایجاد شده با این پیشوند است
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},نرخ گذاری مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},نرخ گذاری مورد نیاز برای مورد {0}
 DocType: Quality Inspection Reading,Reading 8,خواندن 8
 DocType: Sales Partner,Agent,عامل
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما را باید تغییر &#39;پخش اتهامات بر اساس &quot;
 DocType: Purchase Invoice,Taxes and Charges Calculation,مالیات و هزینه محاسبه
 DocType: BOM Operation,Workstation,ایستگاه های کاری
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,سخت افزار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,سخت افزار
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یک شرکت را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,بدون اطلاعات
 DocType: Appraisal Template Goal,Appraisal Template Goal,هدف ارزیابی الگو
 DocType: Salary Slip,Earning,سود
 DocType: Payment Tool,Party Account Currency,حزب حساب ارز
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,شرایط با هم تداخل دارند بین:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,مجموع ارزش ترتیب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,غذا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,شما می توانید ورود به سیستم زمان تنها در برابر یک سفارش تولید ارائه را
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",خبرنامه به مخاطبین، منجر می شود.
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,عملیات نمی تواند خالی باشد.
 ,Delivered Items To Be Billed,آیتم ها تحویل داده شده به صورتحساب می شود
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
-DocType: DocField,Description,شرح
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
-DocType: Letter Head,Is Default,آیا پیش فرض
 DocType: Address,Utilities,نرم افزار
 DocType: Purchase Invoice Item,Accounting,حسابداری
 DocType: Features Setup,Features Setup,ویژگی های راه اندازی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,نمایش نامه پیشنهاد
-DocType: Communication,Communication,ارتباط
 DocType: Item,Is Service Item,آیا مورد خدمات
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
 DocType: Activity Cost,Projects,پروژه
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,لطفا سال مالی انتخاب کنید
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},از {0} | {1} {2}
@@ -1180,7 +1090,7 @@
 DocType: Item,Will also apply to variants,همچنین به انواع اعمال می شود
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,آیا می توانم مالی سال تاریخ شروع و تاریخ پایان سال مالی تغییر نه یک بار سال مالی ذخیره شده است.
 DocType: Quotation,Shopping Cart,سبد خرید
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,الان متوسط روزانه خروجی
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,الان متوسط روزانه خروجی
 DocType: Pricing Rule,Campaign,کمپین
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
 DocType: Purchase Invoice,Contact Person,شخص تماس
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,حفظ سهام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 DocType: Leave Control Panel,Leave blank if considered for all designations,خالی بگذارید اگر برای همه در نظر گرفته نامگذاریهای
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,از تاریخ ساعت
 DocType: Email Digest,For Company,برای شرکت
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,فهرست کارهای
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,شاگرد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,تعداد منفی مجاز نیست
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,شاگرد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,تعداد منفی مجاز نیست
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",مالیات جدول جزئیات ذهن از آیتم های کارشناسی ارشد به عنوان یک رشته و ذخیره شده در این زمینه. مورد استفاده برای مالیات و هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,ضربت نیزه
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب منجمد است، ورودی ها را به کاربران محدود شده مجاز می باشد.
 DocType: Email Digest,Bank Balance,بانک تعادل
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,هیچ ساختار حقوق و دستمزد برای کارکنان فعال یافت {0} و ماه
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، شرایط مورد نیاز و غیره
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
 DocType: Rename Tool,Type of document to rename.,نوع سند به تغییر نام دهید.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ما خرید این مورد
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,ما خرید این مورد
 DocType: Address,Billing,صدور صورت حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,ارسال نشد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,تشکیل مواد منفجره
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),مجموع مالیات و هزینه (شرکت ارز)
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,برنامه ریزی برای ارسال به {0} دریافت کنندگان
 DocType: Quality Inspection,Readings,خوانش
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,مجامع زیر
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,مجامع زیر
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Supplier,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,روانکاو
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به مقدار JV {2}
 DocType: Item,Inventory,فهرست
 DocType: Features Setup,"To enable ""Point of Sale"" view",برای فعال کردن &quot;نقطه ای از فروش&quot; مشاهده
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,پرداخت می توانید برای سبد خرید خالی نمی شود ساخته شده
 DocType: Item,Sales Details,جزییات فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,پین کردن
 DocType: Opportunity,With Items,با اقلام
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,در تعداد
 DocType: Notification Control,Expense Claim Rejected,ادعای هزینه رد
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
 DocType: Item Attribute,Item Attribute,صفت مورد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,دولت
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,انواع آیتم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,دولت
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,انواع آیتم
 DocType: Company,Services,خدمات
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),مجموع ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),مجموع ({0})
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
 DocType: Sales Invoice,Source,منبع
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,مالی سال تاریخ شروع
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,مالی سال تاریخ شروع
 DocType: Employee External Work History,Total Experience,تجربه ها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,حمل و نقل و حمل و نقل اتهامات
 DocType: Material Request Item,Sales Order No,سفارش فروش بدون
 DocType: Item Group,Item Group Name,مورد نام گروه
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,گرفته
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,گرفته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,انتقال مواد برای تولید
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,اجرایی جستجو
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",نرخ خرید برای آیتم: {0} یافت نشد، که لازم است به کتاب ثبت حسابداری (هزینه). لطفا قیمت مورد را با لیست قیمت خرید ذکر است.
 DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),تخفیف اضافی مبلغ (ارز شرکت)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},خطا: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},خطا: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,لطفا حساب جدید را از نمودار از حساب ایجاد کنید.
 DocType: Maintenance Visit,Maintenance Visit,نگهداری و تعمیرات مشاهده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,مشتری&gt; مشتری گروه&gt; منطقه
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,دسته موجود در انبار تعداد
 DocType: Time Log Batch Detail,Time Log Batch Detail,زمان ورود دسته ای جزئیات
-DocType: Workflow State,Tasks,وظایف
 DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
-DocType: Event,Tuesday,سهشنبه
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
 ,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},برگ برای نوع {0} در حال حاضر برای کارمند {1} اختصاص داده شده برای دوره {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
 DocType: UOM,UOM Name,نام UOM
-DocType: Top Bar Item,Target,هدف
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,مقدار سهم
 DocType: Sales Invoice,Shipping Address,حمل و نقل آدرس
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,این ابزار کمک می کند تا شما را به روز رسانی و یا تعمیر کمیت و ارزیابی سهام در سیستم. این است که به طور معمول برای همزمان سازی مقادیر سیستم و آنچه که واقعا در انبارها شما وجود دارد استفاده می شود.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,به عبارت قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,استاد با نام تجاری.
-DocType: ToDo,Due Date,تاریخ
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,استاد با نام تجاری.
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,جعبه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,سازمان
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,جعبه
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,سازمان
 DocType: Monthly Distribution,Monthly Distribution,توزیع ماهانه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید برنامه سفارش فروش
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},ثبت حسابداری برای {0} تنها می تواند در ارز ساخته شده است: {1}
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,اهمیت حیاتی
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ردیف # {0}: برگشتی مورد {1} در وجود دارد نمی {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,حساب های بانکی
 ,Bank Reconciliation Statement,صورتحساب مغایرت گیری بانک
 DocType: Address,Lead Name,نام راهبر
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,باز کردن تعادل سهام
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,باز کردن تعادل سهام
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} باید تنها یک بار به نظر می رسد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,مقدار به بانک منعکس نشده است
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,مقدار به بانک منعکس نشده است
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ادعای هزینه شرکت.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ریخته گری گریز از
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,میدان مغناطیسی کمک به پایان رساندن
 DocType: Company,Default Holiday List,پیش فرض لیست تعطیلات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,بدهی سهام
 DocType: Purchase Receipt,Supplier Warehouse,انبار عرضه کننده کالا
 DocType: Opportunity,Contact Mobile No,تماس با موبایل بدون
 DocType: Production Planning Tool,Select Sales Orders,سفارشات فروش را انتخاب
 ,Material Requests for which Supplier Quotations are not created,درخواست مواد که نقل قول تامین کننده ایجاد نمی
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,برای پیگیری موارد با استفاده از بارکد. شما قادر به ورود به اقلام در توجه داشته باشید تحویل و فاکتور فروش توسط اسکن بارکد مورد خواهد بود.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,علامت گذاری به عنوان تحویل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,علامت گذاری به عنوان تحویل
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,را نقل قول
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
 DocType: SMS Center,Receiver List,فهرست گیرنده
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} نمایش
 DocType: Salary Structure Deduction,Salary Structure Deduction,کسر ساختار حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,پخت لیزر انتخابی
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,واردات موفق!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),سن (روز)
 DocType: Quotation Item,Quotation Item,مورد نقل قول
 DocType: Account,Account Name,نام حساب
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,از تاریخ نمی تواند بیشتر از به روز
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,سریال بدون {0} مقدار {1} می تواند یک بخش نمی
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,نوع منبع کارشناسی ارشد.
 DocType: Purchase Order Item,Supplier Part Number,تامین کننده شماره قسمت
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,افزودن
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,نرخ تبدیل نمی تواند 0 یا 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} لغو و یا متوقف
 DocType: Accounts Settings,Credit Controller,کنترل اعتبار
 DocType: Delivery Note,Vehicle Dispatch Date,اعزام خودرو تاریخ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,رسید خرید {0} است ارسال نشده
 DocType: Company,Default Payable Account,به طور پیش فرض پرداختنی حساب
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",تنظیمات برای سبد خرید آنلاین مانند قوانین حمل و نقل، لیست قیمت و غیره
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,راه اندازی کامل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}٪ صورتحساب
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,این سایت متعلق به تعداد
 DocType: Party Account,Party Account,حساب حزب
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,منابع انسانی
 DocType: Lead,Upper Income,درآمد بالاتر
 DocType: Journal Entry Account,Debit in Company Currency,بدهی شرکت در ارز
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,مسائل مربوط به من
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,مقادیر پیش فرض
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ردیف {0}: میزان پرداخت نمی تونه منفی
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,اتصالات مطبوعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 DocType: Payment Reconciliation,Payments,پرداخت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,با فشار دادن isostatic داغ
-DocType: ToDo,Medium,متوسط
 DocType: Budget Detail,Budget Allocated,بودجه اختصاص داده شده
 DocType: Journal Entry,Entry Type,نوع ورودی
 ,Customer Credit Balance,تعادل اعتباری مشتری
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,به روز رسانی تاریخ های پرداخت بانک با مجلات.
 DocType: Quotation,Term Details,جزییات مدت
 DocType: Manufacturing Settings,Capacity Planning For (Days),برنامه ریزی ظرفیت برای (روز)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
 DocType: Warranty Claim,Warranty Claim,ادعای گارانتی
 ,Lead Details,مشخصات راهبر
-DocType: Authorization Rule,Approving User,تصویب کاربر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,واحد فورج و
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,آبکاری
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
 DocType: Pricing Rule,Applicable For,قابل استفاده برای
 DocType: Bank Reconciliation,From Date,از تاریخ
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,مزایده آنلاین
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,مزایده آنلاین
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,لطفا یا مقدار و یا نرخ گذاری و یا هر دو مشخص
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",شرکت، ماه و سال مالی الزامی است
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,درخواست مواد مورد استفاده در ساخت این سهام ورود
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',زمان ورود دسته ای {0} باید &#39;فرستاده&#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,را حسابداری برای ورود به جنبش هر سهام
 DocType: Leave Allocation,Total Leaves Allocated,مجموع برگ اختصاص داده شده
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},انبار مورد نیاز در ردیف بدون {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,لطفا معتبر مالی سال تاریخ شروع و پایان را وارد کنید
 DocType: Employee,Date Of Retirement,تاریخ بازنشستگی
 DocType: Upload Attendance,Get Template,دریافت قالب
 DocType: Address,Postal,پستی
 DocType: Item,Weightage,بین وزنها
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,استخراج معدن
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ریخته گری رزین
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,لطفا {0} انتخاب کنید.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},متن {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},متن {0}
 DocType: Territory,Parent Territory,سرزمین پدر و مادر
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
 DocType: Stock Entry,Material Receipt,دریافت مواد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,محصولات
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,محصولات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اگر این فقره انواع، سپس آن را نمی تواند در سفارشات فروش و غیره انتخاب شود
 DocType: Lead,Next Contact By,بعد تماس با
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},انبار {0} نمی تواند حذف شود مقدار برای مورد وجود دارد {1}
 DocType: Quotation,Order Type,نوع سفارش
 DocType: Purchase Invoice,Notification Email Address,هشدار از طریق ایمیل
 DocType: Payment Tool,Find Invoices to Match,یافتن فاکتورها به در نظر گرفتن
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",به عنوان مثال &quot;XYZ بانک ملی&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",به عنوان مثال &quot;XYZ بانک ملی&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا این مالیات شامل در نرخ پایه؟
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,مجموع هدف
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,مجموع هدف
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,سبد خرید فعال است
 DocType: Job Applicant,Applicant for a Job,متقاضی برای شغل
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,بدون سفارشات تولید ایجاد
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این ماه ایجاد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این ماه ایجاد
 DocType: Stock Reconciliation,Reconciliation JSON,آشتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Sales Invoice Item,Batch No,دسته بدون
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,اصلی
-DocType: DocPerm,Delete,حذف کردن
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,نوع دیگر
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},جدید {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,منظور متوقف نمی تواند لغو شود. Unstop برای لغو.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
 DocType: Sales Team,Contribution to Net Total,کمک به شبکه ها
 DocType: Sales Invoice Item,Customer's Item Code,کد مورد مشتری
 DocType: Stock Reconciliation,Stock Reconciliation,سهام آشتی
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,متقاضی برای یک کار.
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
-DocType: Country,Country,کشور
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,نشانی ها
-DocType: Communication,Received,رسیده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},تکراری سریال بدون برای مورد وارد {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,یک شرط برای یک قانون ارسال کالا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,مورد مجاز به سفارش تولید.
-DocType: DocField,Attach Image,ضمیمه تصویر
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص از اقلام محاسبه)
-DocType: Stock Reconciliation Item,Leave blank if no change,خالی بگذارید اگر هیچ تغییری
 DocType: Sales Order,To Deliver and Bill,برای ارائه و بیل
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,سیاههها زمان برای تولید.
 DocType: Item,Apply Warehouse-wise Reorder Level,درخواست انبار و زرنگ ترتیب مجدد سطح
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,زمان ورود برای انجام وظایف.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,پرداخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,پرداخت
 DocType: Production Order Operation,Actual Time and Cost,زمان و هزینه های واقعی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},درخواست مواد از حداکثر {0} را می توان برای مورد {1} در برابر سفارش فروش ساخته شده {2}
 DocType: Employee,Salutation,سلام
-DocType: Communication,Rejected,رد
 DocType: Pricing Rule,Brand,مارک
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,موارد نرم افزاری در زمان فروش.
 DocType: Sales Order Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
 DocType: Quality Inspection Reading,Reading 10,خواندن 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",لیست محصولات و یا خدمات خود را که شما خرید و یا فروش. مطمئن شوید برای بررسی گروه مورد، واحد اندازه گیری و خواص دیگر زمانی که شما شروع می شود.
 DocType: Hub Settings,Hub Node,مرکز گره
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,شما وارد آیتم های تکراری. لطفا اصلاح و دوباره سعی کنید.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر ویژگی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,وابسته
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,وابسته
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,تمام شده
 DocType: Packing Slip,To Package No.,برای بسته بندی شماره
-DocType: DocType,System,سیستم
 DocType: Warranty Claim,Issue Date,تاریخ صدور
 DocType: Activity Cost,Activity Cost,هزینه فعالیت
 DocType: Purchase Receipt Item Supplied,Consumed Qty,مصرف تعداد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ارتباطات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ارتباطات
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),نشان می دهد که بسته به بخشی از این تحویل (فقط پیش نویس) است
 DocType: Payment Tool,Make Payment Entry,ورود را پرداخت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},تعداد برای مورد {0} باید کمتر از است {1}
 ,Sales Invoice Trends,فروش روند فاکتور
 DocType: Leave Application,Apply / Approve Leaves,درخواست / برگ تصویب
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,برای
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',می توانید ردیف مراجعه تنها در صورتی که نوع اتهام است &#39;در مقدار قبلی ردیف &quot;یا&quot; قبل ردیف ها&#39;
 DocType: Sales Order Item,Delivery Warehouse,انبار تحویل
 DocType: Stock Settings,Allowance Percent,درصد کمک هزینه
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",فروش باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 DocType: Purchase Order Item,Supplier Quotation Item,تامین کننده مورد عبارت
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,را ساختار حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,موی مرا کوتاه کنید
 DocType: Item,Has Variants,دارای انواع
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,در &#39;را فاکتور فروش&#39; را فشار دهید کلیک کنید برای ایجاد یک فاکتور فروش جدید.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,بسته بندی و برچسب زدن
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,لطفا پیش فرض ارز در شرکت استاد و به طور پیش فرض در جهان مشخص
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox به دسترسی راز
 DocType: Purchase Invoice,Recurring Invoice,فاکتور در محدوده زمانی معین
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,مدیریت پروژه
 DocType: Supplier,Supplier of Goods or Services.,تامین کننده کالا یا خدمات.
 DocType: Budget Detail,Fiscal Year,سال مالی
 DocType: Cost Center,Budget,بودجه
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,به دست آورد
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,به دست آورد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,منطقه / مشتریان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,به عنوان مثال 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به فاکتور مقدار برجسته {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,به عنوان مثال 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به فاکتور مقدار برجسته {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,به عبارت قابل مشاهده خواهد بود زمانی که به فاکتور فروش را نجات دهد.
 DocType: Item,Is Sales Item,آیا مورد فروش
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,مورد گروه درخت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} است راه اندازی برای سریال شماره ندارید. استاد مورد
-DocType: Maintenance Visit,Maintenance Time,زمان نگهداری 
+DocType: Maintenance Visit,Maintenance Time,زمان نگهداری
 ,Amount to Deliver,مقدار برای ارائه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,یک محصول یا خدمت
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,خطاهایی وجود دارد.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,بهره برداری
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,یک محصول یا خدمت
 DocType: Naming Series,Current Value,ارزش فعلی
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ایجاد شد
 DocType: Delivery Note Item,Against Sales Order,علیه سفارش فروش
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
 DocType: Website Item Group,Website Item Group,وب سایت مورد گروه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,وظایف و مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,لطفا تاریخ مرجع وارد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,لطفا تاریخ مرجع وارد
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} نوشته های پرداخت نمی تواند فیلتر {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,جدول برای مورد است که در وب سایت نشان داده خواهد شد
 DocType: Purchase Order Item Supplied,Supplied Qty,عرضه تعداد
 DocType: Material Request Item,Material Request Item,مورد درخواست مواد
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,درخت گروه مورد.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,درخت گروه مورد.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
 ,Item-wise Purchase History,تاریخچه خرید مورد عاقلانه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,قرمز
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,قرمز
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ردیف # {0}: عملیات {1} برای {2} تعداد کالا به پایان رسید در تولید تکمیل مرتب # {3}. لطفا وضعیت عملیات به روز رسانی از طریق زمان گزارش ها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,تغییر UOM برای آیتم استفاده کنید.
 DocType: Quality Inspection Reading,Acceptance Criteria,ملاک پذیرش
 DocType: Item Attribute,Attribute Name,نام مشخصه
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},مورد {0} باید به فروش و یا مورد خدمات می شود {1}
 DocType: Item Group,Show In Website,نمایش در وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,گروه
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,گروه
 DocType: Task,Expected Time (in hours),زمان مورد انتظار (در ساعت)
 ,Qty to Order,تعداد سفارش
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",برای پیگیری نام تجاری در مدارک زیر را تحویل توجه داشته باشید، فرصت، درخواست مواد، مورد، سفارش خرید، خرید کوپن، دریافت مشتری، نقل قول، فاکتور فروش، محصولات بسته نرم افزاری، سفارش فروش، سریال بدون
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,جدول پاک کردن
 DocType: Features Setup,Brands,علامت های تجاری
 DocType: C-Form Invoice Detail,Invoice No,شماره فاکتور
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,از سفارش خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,از سفارش خرید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترک نمی تواند اعمال شود / قبل از {0} لغو، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
 DocType: Activity Cost,Costing Rate,هزینه یابی نرخ
 ,Customer Addresses And Contacts,آدرس و اطلاعات تماس و ضوابط
 DocType: Employee,Resignation Letter Date,استعفای نامه تاریخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,تنظیم نشده
-DocType: Communication,Date,تاریخ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,سفت و سخت در حالی که سیستم شما در حال راه اندازی. این ممکن است چند لحظه طول بکشد.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,جفت
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,جفت
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 DocType: Maintenance Schedule Detail,Actual Date,تاریخ واقعی
 DocType: Item,Has Batch No,دارای دسته ای بدون
 DocType: Delivery Note,Excise Page Number,مالیات کالاهای داخلی صفحه شماره
 DocType: Employee,Personal Details,اطلاعات شخصی
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ختم
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",عنوان سفارش تولید می توان برای این آیتم به ساخته شده، آن را باید یک مورد سهام باشد.
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,پیوستن
-DocType: Authorization Rule,Above Value,بالاتر از ارزش 
 ,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
 DocType: Purchase Order,Delivered,تحویل
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),راه اندازی سرور های دریافتی برای شغل ایمیل ID. (به عنوان مثال jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,مجموع برگ اختصاص داده {0} نمی تواند کمتر از برگ حال حاضر مورد تایید {1} برای دوره
 DocType: Journal Entry,Accounts Receivable,حسابهای دریافتنی
 ,Supplier-Wise Sales Analytics,تامین کننده حکیم فروش تجزیه و تحلیل ترافیک
 DocType: Address Template,This format is used if country specific format is not found,این قالب استفاده شده است اگر قالب خاص کشور یافت نشد
-DocType: Custom Field,Custom,رسم
 DocType: Production Order,Use Multi-Level BOM,استفاده از چند سطح BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,قالب گیری تزریقی
 DocType: Bank Reconciliation,Include Reconciled Entries,شامل مطالب آشتی
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,درخت حساب finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,خالی بگذارید اگر برای همه نوع کارمند در نظر گرفته
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهامات بر اساس
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,حساب {0} باید از نوع &#39;دارائی های ثابت&#39; به عنوان مورد {1} مورد دارایی است
 DocType: HR Settings,HR Settings,تنظیمات HR
-apps/frappe/frappe/config/setup.py +130,Printing,چاپ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده می تعطیلات. شما نیاز به درخواست برای ترک نخواهد کرد.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,و
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,مخفف نمیتواند خالی باشد یا فضای
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ورزشی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,مجموع واقعی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,واحد
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,لطفا کلیدهای دسترسی Dropbox به پیکربندی در سایت خود تنظیم
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,واحد
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,لطفا شرکت مشخص
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,انبار که در آن شما می حفظ سهام از اقلام را رد کرد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,سال مالی خود را به پایان می رسد در
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,سال مالی خود را به پایان می رسد در
 DocType: POS Profile,Price List,لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ادعاهای هزینه
 DocType: Issue,Support,پشتیبانی
-DocType: Authorization Rule,Approving Role,تصویب نقش
 ,BOM Search,BOM جستجو
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),بسته شدن (باز مجموع +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,لطفا ارز در شرکت مشخص
 DocType: Workstation,Wages per hour,دستمزد در ساعت
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},تعادل سهام در دسته {0} تبدیل خواهد شد منفی {1} برای مورد {2} در انبار {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",نمایش / عدم نمایش ویژگی های مانند سریال شماره، POS و غیره
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارز باید {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارز باید {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},تاریخ ترخیص کالا از نمی تواند قبل از تاریخ چک در ردیف شود {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},تاریخ ترخیص کالا از نمی تواند قبل از تاریخ چک در ردیف شود {0}
 DocType: Salary Slip,Deduction,کسر
 DocType: Address Template,Address Template,آدرس الگو
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
@@ -1706,77 +1570,69 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,کاربر غیر فعال
 DocType: Opportunity,Quotation,نقل قول
 DocType: Salary Slip,Total Deduction,کسر مجموع
-DocType: Quotation,Maintenance User,کاربر نگهداری 
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,هزینه به روز رسانی
+DocType: Quotation,Maintenance User,کاربر نگهداری
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,هزینه به روز رسانی
 DocType: Employee,Date of Birth,تاریخ تولد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,مورد {0} در حال حاضر بازگشت شده است
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** سال مالی نشان دهنده یک سال مالی. تمام پست های حسابداری و دیگر معاملات عمده در برابر سال مالی ** ** ردیابی.
 DocType: Opportunity,Customer / Lead Address,مشتری / سرب آدرس
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,شرح شغل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,شرح شغل
 DocType: Purchase Order Item,Qty as per Stock UOM,تعداد در هر بورس UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,لطفا یک فایل CSV معتبر با داده را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,پوشش
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
 DocType: Expense Claim,Approver,تصویب
 ,SO Qty,SO تعداد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",نوشته های سهام در مقابل انبار وجود داشته باشد {0}، از این رو شما می توانید دوباره اختصاص و یا تغییر انبار
 DocType: Appraisal,Calculate Total Score,محاسبه مجموع امتیاز
 DocType: Supplier Quotation,Manufacturing Manager,ساخت مدیر
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
-apps/erpnext/erpnext/hooks.py +84,Shipments,محموله
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,قالب ریزی و سازه شیب
-DocType: Purchase Order,To be delivered to customer,به مشتری تحویل
+apps/erpnext/erpnext/hooks.py +68,Shipments,محموله
+DocType: Purchase Order Item,To be delivered to customer,به مشتری تحویل
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,زمان ورود وضعیت باید ارائه شود.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,سریال نه {0} به هیچ انبار تعلق ندارد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,راه اندازی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ردیف #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ردیف #
 DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز)
 DocType: Pricing Rule,Supplier,تامین کننده
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,هزینه های متفرقه
 DocType: Global Defaults,Default Company,به طور پیش فرض شرکت
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
 DocType: Employee,Bank Name,نام بانک
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-بالا
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,کاربر {0} غیر فعال است
 DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
-DocType: Journal Entry Account,Credit in Account Currency,اعتبار در حساب کاربری ارز
 DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} برای مورد الزامی است {1}
 DocType: Currency Exchange,From Currency,از ارز
-DocType: DocField,Name,نام
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,مقدار در سیستم منعکس نشده است
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},سفارش فروش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,مقدار در سیستم منعکس نشده است
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,دیگران
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,دیگران
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.
 DocType: POS Profile,Taxes and Charges,مالیات و هزینه
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",یک محصول یا یک سرویس است که خریداری شده، به فروش می رسد و یا نگه داشته در انبار.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,تکمیل شده
-DocType: Web Form,Select DocType,انتخاب DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,لنجرنج
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,بانکداری
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداری
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,مرکز هزینه جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,مرکز هزینه جدید
 DocType: Bin,Ordered Quantity,تعداد دستور داد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
 DocType: Quality Inspection,In Process,در حال انجام
 DocType: Authorization Rule,Itemwise Discount,Itemwise تخفیف
 DocType: Purchase Order Item,Reference Document Type,مرجع نوع سند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
 DocType: Account,Fixed Asset,دارائی های ثابت
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,پرسشنامه سریال
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,پرسشنامه سریال
 DocType: Activity Type,Default Billing Rate,به طور پیش فرض نرخ صدور صورت حساب
 DocType: Time Log Batch,Total Billing Amount,کل مقدار حسابداری
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,حساب دریافتنی
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,سفارش فروش به پرداخت
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,زمان ثبت ایجاد:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Employee,Blood Group,گروه خونی
 DocType: Purchase Invoice Item,Page Break,شکست صفحه
 DocType: Production Order Operation,Pending,در انتظار
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,کاربرانی که می توانند برنامه های مرخصی یک کارمند خاص را تایید
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,شما می توانید به طور پیش فرض از نوع UOM را تغییر دهید. به تغییر پیش فرض UOM برای متغیر UOM تغییر پیش فرض از الگو
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,تجهیزات اداری
 DocType: Purchase Invoice Item,Qty,تعداد
 DocType: Fiscal Year,Companies,شرکت های
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,الکترونیک
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,الکترونیک
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,افزایش درخواست مواد زمانی که سهام سطح دوباره سفارش می رسد
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,از نگهداری برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,تمام وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,تمام وقت
 DocType: Purchase Invoice,Contact Details,اطلاعات تماس
 DocType: C-Form,Received Date,تاریخ دریافت
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",اگر شما یک قالب استاندارد در مالیات فروش و اتهامات الگو ایجاد کرده اند، یکی را انتخاب کنید و کلیک بر روی دکمه زیر کلیک کنید.
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,افتتاح شغلی
 DocType: Payment Reconciliation,Payment Reconciliation,آشتی پرداخت
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,تکنولوژی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
 DocType: Offer Letter,Offer Letter,ارائه نامه
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,تولید مواد درخواست (MRP) و سفارشات تولید.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,مجموع صورتحساب AMT
 DocType: Time Log,To Time,به زمان
+DocType: Authorization Rule,Approving Role (above authorized value),تصویب نقش (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",برای اضافه کردن گره فرزند، کشف درخت و کلیک بر روی گره که در آن شما می خواهید برای اضافه کردن گره.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
 DocType: Production Order Operation,Completed Qty,تکمیل تعداد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,کدهای مورد مشتری
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ایجاد مطالب پرداخت در برابر دستورات و یا فاکتورها.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,جوش
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,جدید بورس UOM مورد نیاز است
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا یک معتبر را مشخص &#39;از مورد شماره&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
 DocType: Features Setup,Item Serial Nos,مورد سریال شماره
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,تعداد واقعی
 DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,سریال بدون {0} یافت نشد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,مشتریان شما
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,قالب ریزی و سازه های فشرده سازی
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,مشتریان شما
 DocType: Leave Block List Date,Block Date,بلوک عضویت
 DocType: Sales Order,Not Delivered,تحویل داده است
 ,Bank Clearance Summary,بانک ترخیص کالا از خلاصه
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",ایجاد و مدیریت روزانه، هفتگی و ماهانه هضم ایمیل.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,کد مورد&gt; آیتم گروه&gt; نام تجاری
 DocType: Appraisal Goal,Appraisal Goal,ارزیابی هدف
-DocType: Event,Friday,جمعه
 DocType: Time Log,Costing Amount,هزینه مبلغ
 DocType: Process Payroll,Submit Salary Slip,ثبت کردن لغزش حقوق
 DocType: Salary Structure,Monthly Earning & Deduction,سود ماهانه و کسر
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,واردات به صورت فله
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
 DocType: SMS Log,Sender Name,نام فرستنده
-DocType: Page,Title,عنوان
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,سفارشی
 DocType: POS Profile,[Select],[انتخاب]
 DocType: SMS Log,Sent To,فرستادن به
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,را فاکتور فروش
 DocType: Company,For Reference Only.,برای مرجع تنها.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},نامعتبر {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},نامعتبر {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,جستجوی پیشرفته مقدار
 DocType: Manufacturing Settings,Capacity Planning,برنامه ریزی ظرفیت
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
 DocType: Journal Entry,Reference Number,شماره مرجع
 DocType: Employee,Employment Details,جزییات استخدام
 DocType: Employee,New Workplace,جدید محل کار
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
 DocType: Item,End of Life,پایان زندگی
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,سفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,سفر
 DocType: Leave Block List,Allow Users,کاربران اجازه می دهد
 DocType: Purchase Order,Customer Mobile No,مشتری تلفن همراه بدون
 DocType: Sales Invoice,Recurring,در محدوده زمانی معین
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,مواد انتقال
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
 DocType: Installation Note,Installation Note,نصب و راه اندازی توجه داشته باشید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,اضافه کردن مالیات
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,اضافه کردن مالیات
 ,Financial Analytics,تجزیه و تحلیل ترافیک مالی
 DocType: Quality Inspection,Verified By,تایید شده توسط
 DocType: Address,Subsidiary,فرعی
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
 DocType: Quality Inspection,Purchase Receipt No,رسید خرید بدون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,بیعانه
-DocType: System Settings,In Hours,در ساعت
 DocType: Process Payroll,Create Salary Slip,ایجاد لغزش حقوق
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,تعادل انتظار می رود به عنوان در هر بانکی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,سنباده
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,تعادل انتظار می رود به عنوان در هر بانکی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),منابع درآمد (بدهی)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
 DocType: Appraisal,Employee,کارمند
@@ -1917,48 +1766,41 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,گروه های کوپن
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Sales Invoice,Mass Mailing,پستی دسته جمعی
-DocType: Page,Standard,استاندارد
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,نمایش پرداخت
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,اندازه
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,نگهداری و تعمیرات برنامه {0} باید قبل از لغو این سفارش فروش لغو
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,دارویی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,دارویی
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,هزینه اقلام خریداری شده
 DocType: Selling Settings,Sales Order Required,سفارش فروش مورد نیاز
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ایجاد مشتری
 DocType: Purchase Invoice,Credit To,اعتبار به
 DocType: Employee Education,Post Graduate,فوق لیسانس
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,جزئیات برنامه نگهداری و تعمیرات 
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,جزئیات برنامه نگهداری و تعمیرات
 DocType: Quality Inspection Reading,Reading 9,خواندن 9
 DocType: Supplier,Is Frozen,آیا منجمد
 DocType: Buying Settings,Buying Settings,تنظیمات خرید
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,به پایان رساندن توده
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,شماره BOM برای مورد خوبی در دست اجرا
 DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),راه اندازی سرور های دریافتی برای ایمیل فروش شناسه. (به عنوان مثال sales@example.com)
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Tool,Payment Account,حساب پرداخت
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,پیش نویس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,جبرانی فعال
 DocType: Quality Inspection Reading,Accepted,پذیرفته
-DocType: User,Female,زن
-DocType: Journal Entry Account,Debit in Account Currency,بدهی در حساب ارز
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
-DocType: Print Settings,Modern,مدرن
-DocType: Communication,Replied,پاسخ
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
 DocType: Payment Tool,Total Payment Amount,مجموع مقدار پرداخت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) نمی تواند بیشتر از quanitity برنامه ریزی شده ({2}) در سفارش تولید {3}
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
 DocType: Newsletter,Test,تست
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",همانطور که معاملات سهام موجود برای این آیتم به، \ شما می توانید مقادیر تغییر نمی کند ندارد سریال &#39;،&#39; دارای دسته ای بدون &#39;،&#39; آیا مورد سهام &quot;و&quot; روش های ارزش گذاری &#39;
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,شما می توانید نرخ تغییر اگر BOM agianst هر مورد ذکر شده
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,شما می توانید نرخ تغییر اگر BOM agianst هر مورد ذکر شده
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,درخواست ها برای اقلام است.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,سفارش تولید جداگانه خواهد شد برای هر مورد خوب به پایان رسید ساخته شده است.
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,راه اندازی کامل
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ثبت حسابداری تا این تاریخ منجمد، هیچ کس نمی تواند انجام / اصلاح ورود به جز نقش های مشخص شده زیر.
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,وضعیت پروژه
 DocType: UOM,Check this to disallow fractions. (for Nos),بررسی این به ندهید فراکسیون. (برای NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,عضویت در خبرنامه لیست پستی
 DocType: Delivery Note,Transporter Name,نام حمل و نقل
+DocType: Authorization Rule,Authorized Value,ارزش مجاز
 DocType: Contact,Enter department to which this Contact belongs,بخش وارد کنید که این تماس به آن تعلق
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,مجموع غایب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,واحد اندازه گیری
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,واحد اندازه گیری
 DocType: Fiscal Year,Year End Date,سال پایان تاریخ
 DocType: Task Depends On,Task Depends On,کار بستگی به
 DocType: Lead,Opportunity,فرصت
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),نرخ پایه (به عنوان در سهام UOM)
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
 DocType: Campaign,Campaign-.####,کمپین - ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,پر سر و صدا
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,توزیع کننده شخص ثالث / فروشنده / نماینده کمیسیون / وابسته به / نمایندگی فروش که به فروش می رساند محصولات شرکت برای کمیسیون.
 DocType: Customer Group,Has Child Node,دارای گره فرزند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",پارامترهای URL شخص را اینجا وارد کنید (به عنوان مثال فرستنده = ERPNext، نام کاربری = ERPNext و رمز = 1234 و غیره)
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} در هر سال مالی فعال است. برای جزئیات بیشتر {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,این یک مثال وب سایت خودکار تولید شده از ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,محدوده سالمندی 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ماشینکاری فتوشیمیایی
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.",قالب مالیاتی استاندارد است که می تواند به تمام معاملات خرید استفاده شود. این الگو می تواند شامل لیستی از سر مالیات و همچنین دیگر سر هزینه مانند &quot;حمل و نقل&quot;، &quot;بیمه&quot;، &quot;سیستم های انتقال مواد&quot; و غیره #### توجه داشته باشید نرخ مالیات در اینجا تعریف می کنید خواهد بود که نرخ مالیات استاندارد برای همه آیتم ها ** * * * * * * * *. اگر تعداد آیتم ها ** ** که نرخ های مختلف وجود دارد، آنها باید در مورد مالیات ** ** جدول اضافه می شود در مورد ** ** استاد. #### شرح ستون 1. نوع محاسبه: - این می تواند بر روی ** ** خالص مجموع باشد (که مجموع مبلغ پایه است). - ** در انتظار قبلی مجموع / مقدار ** (برای مالیات تجمعی و یا اتهامات عنوان شده علیه). اگر شما این گزینه را انتخاب کنید، مالیات به عنوان یک درصد از سطر قبلی (در جدول مالیاتی) و یا مقدار کل اعمال می شود. - ** ** واقعی (به عنوان ذکر شده). 2. حساب سر: دفتر حساب که تحت آن این مالیات خواهد شد رزرو 3. مرکز هزینه: اگر مالیات / هزینه درآمد (مانند حمل و نقل) است و یا هزینه آن نیاز دارد تا در برابر یک مرکز هزینه رزرو شود. 4. توضیحات: توضیحات از مالیات (که در فاکتورها / به نقل از چاپ). 5. نرخ: نرخ مالیات. 6. مقدار: مبلغ مالیات. 7. مجموع: مجموع تجمعی به این نقطه است. 8. ردیف را وارد کنید: اگر بر اساس &quot;سطر قبلی مجموع&quot; شما می توانید تعداد ردیف خواهد شد که به عنوان پایه ای برای این محاسبه (به طور پیش فرض سطر قبلی است) گرفته شده را انتخاب کنید. 9. در نظر بگیرید مالیات و یا هزینه برای: در این بخش شما می توانید مشخص کنید اگر مالیات / بار فقط برای ارزیابی (و نه بخشی از کل ارسال ها) و یا تنها برای کل (ارزش به آیتم اضافه کنید) و یا برای هر دو. 10. اضافه کردن و یا کسر: آیا شما می خواهید برای اضافه کردن یا کسر مالیات.
-DocType: Note,Note,یادداشت
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
-DocType: Email Account,Email Ids,ایمیل شناسه
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 DocType: Tax Rule,Billing City,صدور صورت حساب شهر
 DocType: Global Defaults,Hide Currency Symbol,مخفی ارز نماد
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,اعتبار توجه داشته باشید
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},تکمیل تعداد نمی تواند بیش از {0} برای عملیات {1}
 DocType: Features Setup,Quality,کیفیت
-DocType: Contact Us Settings,Introduction,معرفی
 DocType: Warranty Claim,Service Address,خدمات آدرس
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,حداکثر 100 ردیف برای سهام آشتی.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,حداکثر 100 ردیف برای سهام آشتی.
 DocType: Stock Entry,Manufacture,ساخت
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,لطفا توجه داشته باشید برای اولین بار از تحویل
 DocType: Purchase Invoice,Currency and Price List,نرخ ارز و لیست قیمت
 DocType: Opportunity,Customer / Lead Name,مشتری / نام سرب
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,تولید
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,تولید
 DocType: Item,Allow Production Order,اجازه سفارش تولید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
 DocType: Installation Note Item,Installed Qty,نصب تعداد
 DocType: Lead,Fax,فکس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ارسال شده
 DocType: Salary Structure,Total Earning,سود مجموع
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,آدرس من
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,شاخه سازمان کارشناسی ارشد.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,یا
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,هزینه آب و برق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-بالاتر از
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
-,Download Backups,دانلود پشتیبان گیری
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,نوع پرداخت
 DocType: Process Payroll,Select Employees,انتخاب کارمندان
 DocType: Bank Reconciliation,To Date,به روز
 DocType: Opportunity,Potential Sales Deal,معامله فروش بالقوه
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,جزئیات
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع مالیات و هزینه
 DocType: Employee,Emergency Contact,تماس اضطراری
 DocType: Item,Quality Parameters,پارامترهای کیفیت
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,سریال بدون / دسته
 DocType: Product Bundle,Parent Item,مورد پدر و مادر
 DocType: Account,Account Type,نوع حساب
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,نوع ترک {0} نمی تواند حمل فرستاده
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
 DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خرید
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,فرم سفارشی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,برش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,تنظیمات کوپن
 DocType: Account,Income Account,حساب درآمد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,قالب ریزی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
-apps/frappe/frappe/desk/moduleview.py +61,Documents,اسناد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,کد عکس
 DocType: Cost Center,Cost Center,مرکز هزینه زا
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,کوپن #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,کوپن #
 DocType: Notification Control,Purchase Order Message,خرید سفارش پیام
 DocType: Tax Rule,Shipping Country,حمل و نقل کشور
 DocType: Upload Attendance,Upload HTML,بارگذاری HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",پیش مجموع ({0}) و مخالف نظم {1} نمی تواند بیشتر \ از جمع کل ({2})
 DocType: Employee,Relieving Date,تسکین عضویت
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق بورس ورودی تغییر / تحویل توجه / رسید خرید
 DocType: Employee Education,Class / Percentage,کلاس / درصد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئیس بازاریابی و فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,مالیات بر عایدات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,لیزر مهندسی شکل دادن خالص
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,رئیس بازاریابی و فروش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,مالیات بر عایدات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",اگر قانون قیمت گذاری انتخاب شده برای قیمت &quot;ساخته شده، آن را به لیست قیمت بازنویسی. قیمت قانون قیمت گذاری قیمت نهایی است، بنابراین هیچ تخفیف بیشتر قرار داشته باشد. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، از آن خواهد شد در زمینه &#39;نرخ&#39; برداشته، به جای درست &quot;لیست قیمت نرخ.
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
-DocType: User,Bio,بیوگرافی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,مدیریت مشتری گروه درخت.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,نام مرکز هزینه
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,بدون پیش فرض آدرس الگو در بر داشت. لطفا یکی از جدید از راه اندازی&gt; چاپ و نام تجاری&gt; آدرس الگو ایجاد کنید.
 DocType: Appraisal,HR User,HR کاربر
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,خیلی بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,خیلی بزرگ
 ,Profit and Loss Statement,بیانیه سود و زیان
 DocType: Bank Reconciliation Detail,Cheque Number,شماره چک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,فشار
 DocType: Payment Tool Detail,Payment Tool Detail,جزئیات ابزار پرداخت
 ,Sales Browser,مرورگر فروش
 DocType: Journal Entry,Total Credit,مجموع اعتباری
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,محلی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),وام و پیشرفت (دارایی)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,بدهکاران
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,بزرگ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,بدون کارمند پیدا نشد!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,بزرگ
 DocType: C-Form Invoice Detail,Territory,خاک
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Purchase Order,Customer Address Display,آدرس مشتری ها
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,پرداخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",واحد اندازه گیری پیش فرض برای مورد {0} نمی تواند مستقیما تغییر داد، زیرا \ شما در حال حاضر ساخته شده برخی از معامله (ها) با UOM است. به تغییر پیش فرض UOM، \ با استفاده از &quot;UOM جایگزین سودمند &#39;ابزار تحت ماژول انبار.
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,مشخص نرخ ارز برای تبدیل یک ارز به ارز را به یکی دیگر
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,نقل قول {0} لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,نقل قول {0} لغو
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,مجموع مقدار برجسته
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,کارمند {0} در مرخصی بود {1}. آیا می توانم حضور علامت نیست.
 DocType: Sales Partner,Targets,اهداف
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
 ,S.O. No.,SO شماره
 DocType: Production Order Operation,Make Time Log,را زمان ورود
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,لطفا مقدار سفارش مجدد مجموعه
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,کامپیوتر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,الکترو شیمیایی سنگ زنی
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,لطفا راه اندازی نمودار خود را از حساب شما قبل از شروع مطالب حسابداری
 DocType: Purchase Invoice,Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,لغو شد
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,از تاریخ در ساختار حقوق و دستمزد نمی تواند کمتر از کارمند پیوستن به تاریخ.
 DocType: Employee Education,Graduate,فارغ التحصیل
 DocType: Leave Block List,Block Days,بلوک روز
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",بررسی کنید که تکرار فاکتور، تیک برای جلوگیری از تکرار و یا قرار دادن پایان مناسب عضویت
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,حداکثر {0} ردیف اجازه
 DocType: C-Form Invoice Detail,Net Total,مجموع خالص
 DocType: Bin,FCFS Rate,FCFS نرخ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),صورت حساب (فاکتور فروش)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,اهداف
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعت کار موجود در ایستگاه های کاری {1}، شکستن عملیات به عملیات های متعدد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ماشینکاری الکتروشیمیایی
 ,Requested,خواسته
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,بدون شرح
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,سر رسیده
 DocType: Account,Stock Received But Not Billed,سهام دریافتی اما صورتحساب نه
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,حساب کاربری ریشه باید یک گروه باشد
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ناخالص پرداخت + تعویق وام مبلغ + Encashment مقدار - کسر مجموع
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Features Setup,Sales and Purchase,فروش و خرید
 DocType: Supplier Quotation Item,Material Request No,درخواست مواد بدون
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,سرعت که در آن مشتری ارز به ارز پایه شرکت تبدیل
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} با موفقیت از این لیست لغو شد.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),نرخ خالص (شرکت ارز)
-apps/frappe/frappe/templates/base.html +134,Added,اضافه شده
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,مدیریت درخت منطقه.
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,سال مالی {0} یافت نشد.
 DocType: Bank Reconciliation,Get Relevant Entries,دریافت مطالب مرتبط
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ثبت حسابداری برای انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ضرب
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
-apps/frappe/frappe/desk/query_report.py +136,Total,کل
 DocType: Purchase Invoice,Apply Additional Discount On,درخواست تخفیف اضافی
 DocType: Account,Root Type,نوع ریشه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},ردیف # {0}: نمی تواند بیشتر از بازگشت {1} برای مورد {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
 DocType: Quality Inspection,Quality Inspection,بازرسی کیفیت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,اسپری تشکیل
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,بسیار کوچک
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,حساب {0} منجمد است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL یا BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,حداقل سطح موجودی
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,تولید کننده شماره قسمت
 DocType: Production Order Operation,Estimated Time and Cost,برآورد زمان و هزینه
 DocType: Bin,Bin,صندوق
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,تعداد SMS های ارسال شده
 DocType: Account,Company,شرکت
 DocType: Account,Expense Account,حساب هزینه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,نرمافزار
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,رنگ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,نرمافزار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,رنگ
 DocType: Maintenance Visit,Scheduled,برنامه ریزی
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",لطفا آیتم را انتخاب کنید که در آن &quot;آیا مورد سهام&quot; است &quot;نه&quot; و &quot;آیا مورد فروش&quot; است &quot;بله&quot; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,انتخاب توزیع ماهانه به طور یکنواخت توزیع در سراسر اهداف ماه می باشد.
 DocType: Purchase Invoice Item,Valuation Rate,نرخ گذاری
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,مورد ردیف {0}: رسید خرید {1} در جدول بالا &#39;خرید رسید&#39; وجود ندارد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,پروژه تاریخ شروع
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,تا
 DocType: Rename Tool,Rename Log,تغییر نام ورود
 DocType: Installation Note Item,Against Document No,در برابر سند بدون
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,فروش همکاران مدیریت.
 DocType: Quality Inspection,Inspection Type,نوع بازرسی
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},لطفا انتخاب کنید {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,پژوهشگر
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,به روز رسانی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,پژوهشگر
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,لطفا قبل از ارسال خبرنامه نجات
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,نام و نام خانوادگی پست الکترونیک و یا اجباری است
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,بازرسی کیفیت ورودی.
 DocType: Purchase Order Item,Returned Qty,بازگشت تعداد
 DocType: Employee,Exit,خروج
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,نوع ریشه الزامی است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,نوع ریشه الزامی است
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,سریال بدون {0} ایجاد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,به پایان رساندن سرند
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",برای راحتی مشتریان، این کدها می توان در فرمت چاپ مانند فاکتورها و تحویل یادداشت استفاده می شود
 DocType: Employee,You can enter any date manually,شما می توانید هر روز دستی وارد کنید
 DocType: Sales Invoice,Advertisement,اعلان
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,دوره وابسته به التزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,دوره وابسته به التزام
 DocType: Customer Group,Only leaf nodes are allowed in transaction,تنها برگ در معامله اجازه
 DocType: Expense Claim,Expense Approver,تصویب هزینه
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,پر زحمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,کوچک کردن کاغذ بسته بندی
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,فعالیت در انتظار
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,تایید شده
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,تامین کننده&gt; تامین کننده نوع
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,روزنامه
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,قال
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,فروپاشی حقوق و دستمزد بر اساس سود و کسر.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,حساب با گره فرزند را نمی توان تبدیل به لجر
 DocType: Address,Preferred Shipping Address,ترجیح آدرس حمل و نقل
 DocType: Purchase Receipt Item,Accepted Warehouse,انبار پذیرفته شده
 DocType: Bank Reconciliation Detail,Posting Date,تاریخ ارسال
 DocType: Item,Valuation Method,روش های ارزش گذاری
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},قادر به پیدا کردن نرخ ارز برای {0} به {1}
 DocType: Sales Invoice,Sales Team,تیم فروش
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,ورود تکراری
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ورود تکراری
 DocType: Serial No,Under Warranty,تحت گارانتی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[خطا]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش فروش را نجات دهد.
 ,Employee Birthday,کارمند تولد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
 DocType: Pricing Rule,Discount Percentage,درصد تخفیف
 DocType: Payment Reconciliation Invoice,Invoice Number,شماره فاکتور
-apps/erpnext/erpnext/hooks.py +70,Orders,سفارشات
+apps/erpnext/erpnext/hooks.py +54,Orders,سفارشات
 DocType: Leave Control Panel,Employee Type,نوع کارمند
 DocType: Employee Leave Approver,Leave Approver,ترک تصویب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,سنبه کاری
 DocType: Manufacturing Settings,Material Transferred for Manufacture,مواد منتقل شده برای ساخت
 DocType: Expense Claim,"A user with ""Expense Approver"" role","یک کاربر با نقشه ""تایید کننده هزینه ها"""
 ,Issued Items Against Production Order,آیتم صادره علیه سفارش تولید
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,دوره نامعتبر
 DocType: Customer,Credit Limit,محدودیت اعتبار
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,انتخاب نوع معامله
 DocType: GL Entry,Voucher No,کوپن بدون
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,آدرس و تماس با
 DocType: Customer,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Employee,Feedback,باز خورد
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",می توانید قبل از ترک نمی اختصاص داده شود {0}، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,نگهداری. برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ماشینکاری جت ساینده
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,نگهداری. برنامه
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
-DocType: Website Settings,Website Settings,تنظیمات وب سایت
 DocType: Item,Reorder level based on Warehouse,سطح تغییر مجدد ترتیب بر اساس انبار
 DocType: Activity Cost,Billing Rate,نرخ صدور صورت حساب
 ,Qty to Deliver,تعداد برای ارائه
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,پیگیری این تحویل توجه داشته باشید در مقابل هر پروژه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,حساب کاربری ریشه نمی تواند حذف شود
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,نمایش مطالب سهام
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,مدیریت آدرس
 DocType: Pricing Rule,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
-DocType: Communication,Phone,تلفن
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),بسته شدن (دکتر)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),بسته شدن (دکتر)
 DocType: Contact,Passive,غیر فعال
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,سریال بدون {0} در سهام
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,قالب های مالیاتی برای فروش معاملات.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,مقدار فاکتور شده
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,دریافت به روز رسانی
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,اضافه کردن چند پرونده نمونه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,درخواست مواد {0} است لغو و یا متوقف
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,اضافه کردن چند پرونده نمونه
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ترک مدیریت
-DocType: Event,Groups,گروه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,گروه های حساب
 DocType: Sales Order,Fully Delivered,به طور کامل تحویل
 DocType: Lead,Lower Income,درآمد پایین
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,راهنما سریع
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
 DocType: Features Setup,Sales Extras,فروش افزودنیهای پیشنهاد شده
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} بودجه برای حساب {1} در برابر مرکز هزینه {2} خواهد تجاوز {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ارزش و یا تعداد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,دقیقه
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
 ,Qty to Receive,تعداد دریافت
 DocType: Leave Block List,Leave Block List Allowed,ترک فهرست بلوک های مجاز
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,عامل تبدیل نمی تواند در کسری شود
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,شما آن را برای ورود استفاده کنید
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,شما آن را برای ورود استفاده کنید
 DocType: Sales Partner,Retailer,خرده فروش
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,انواع تامین کننده
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,بانک حساب چک بی محل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,را لغزش حقوق
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,وام
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,محصولات عالی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,آیا می توانم مرخصی را تایید نمی که شما مجاز به تصویب برگ در تاریخهای بلوک
 DocType: Appraisal,Appraisal,ارزیابی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ریخته گری را از دست داده-فوم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,نقشه کشی
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,تاریخ تکرار شده است
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,امضای مجاز
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},ترک تصویب شود باید یکی از {0}
 DocType: Hub Settings,Seller Email,فروشنده ایمیل
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق خرید فاکتور)
 DocType: Workstation Working Hour,Start Time,زمان شروع
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
 DocType: BOM Operation,Hour Rate,یک ساعت یک نرخ
 DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,از عبارت
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,از عبارت
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},یکی دیگر از ورودی اختتامیه دوره {0} شده است پس از ساخته شده {1}
 DocType: Production Order,Material Transferred for Manufacturing,مواد منتقل ساخت
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,حساب {0} می کند وجود دارد نمی
 DocType: Purchase Receipt Item,Purchase Order Item No,خرید سفارش هیچ موردی
-DocType: System Settings,System Settings,تنظیمات سیستم
 DocType: Project,Project Type,نوع پروژه
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,در هر دو صورت تعداد هدف یا هدف مقدار الزامی است.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,هزینه فعالیت های مختلف
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,پول نقد در دست
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 DocType: Serial No,Is Cancelled,آیا لغو
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,محموله های من
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,محموله های من
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
-DocType: Communication,Recipients,دریافت کنندگان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,از screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,وضعیت تایید
 DocType: Hub Settings,Publish Items to Hub,انتشار مطلبی برای توپی
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},از مقدار باید کمتر از ارزش در ردیف شود {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,انتقال سیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,لطفا حساب بانکی را انتخاب کنید
 DocType: Newsletter,Create and Send Newsletters,ایجاد و ارسال خبرنامه
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,از تاریخ باید قبل از به روز می شود
 DocType: Sales Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,مشتری گروه / مشتریان
 DocType: Item Group,Check this if you want to show in website,بررسی این اگر شما می خواهید برای نشان دادن در وب سایت
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,به ERPNext خوش آمدید
+,Welcome to ERPNext,به ERPNext خوش آمدید
 DocType: Payment Reconciliation Payment,Voucher Detail Number,جزئیات شماره کوپن
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,منجر به عبارت
 DocType: Lead,From Customer,از مشتری
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,تماس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,تماس
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
 ,Projected,بینی
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},سریال بدون {0} به انبار تعلق ندارد {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,توجه: سیستم نمی خواهد بیش از چک زایمان و بیش از رزرو مورد {0} به عنوان مقدار و یا مقدار 0 است
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,افتتاح عضویت
 DocType: Journal Entry,Remark,اظهار
 DocType: Purchase Receipt Item,Rate and Amount,سرعت و مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,خسته کننده
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,از سفارش فروش
-DocType: Blog Category,Parent Website Route,وب سایت مسیر پدر و مادر
 DocType: Sales Order,Not Billed,صورتحساب نه
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,هر دو انبار باید به همان شرکت تعلق
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,بدون اطلاعات تماس اضافه نشده است.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,فعال نیست
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,هزینه فرود مقدار کوپن
 DocType: Time Log,Batched for Billing,بسته بندی های کوچک برای صدور صورت حساب
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,لوایح مطرح شده توسط تولید کنندگان.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,مقدار تخفیف
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت علیه خرید فاکتور
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,به عنوان مثال مالیات بر ارزش افزوده
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,(4 مورد)
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,گاز گرم فلز تشکیل
 DocType: Sales Order Item,Sales Order Date,سفارش فروش تاریخ
 DocType: Sales Invoice Item,Delivered Qty,تحویل تعداد
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",برو به گروه مناسب (معمولا منابع درآمد&gt; بدهی های جاری&gt; مالیات و عوارض و ایجاد یک حساب جدید (با کلیک بر روی اضافه کردن کودکان) از نوع &quot;مالیات&quot; و انجام ذکر نرخ مالیات.
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,برش لیزری
-DocType: Event,Monday,دوشنبه
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Account,Payable,قابل پرداخت
 DocType: Salary Slip,Arrear Amount,مقدار تعویق وام
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,نشانی محصول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,حداقل یکی از خرید و یا فروش باید انتخاب شود
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,که در آن عملیات ساخت در حال انجام شده است.
-DocType: Page,All,همه
 DocType: Stock Entry Detail,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
 DocType: Employee,Confirmation Date,تایید عضویت
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,فروش کاربر
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,حداقل تعداد نمی تواند بیشتر از حداکثر تعداد
 DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,تنظیم
 DocType: Lead,Lead Owner,مالک راهبر
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,انبار مورد نیاز است
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,انبار مورد نیاز است
 DocType: Employee,Marital Status,وضعیت تاهل
 DocType: Stock Settings,Auto Material Request,درخواست مواد خودکار
 DocType: Time Log,Will be updated when billed.,خواهد شد که در صورتحساب یا لیست به روز شد.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,خرید سفارش مورد عرضه
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,نام شرکت می تواند شرکت نیست
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,سران نامه برای قالب چاپ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوین برای قالب چاپ به عنوان مثال پروفرم فاکتور.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
 DocType: POS Profile,Update Stock,به روز رسانی سهام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM مختلف برای اقلام خواهد به نادرست (مجموع) خالص ارزش وزن منجر شود. مطمئن شوید که وزن خالص هر یک از آیتم است در UOM همان.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM نرخ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",ضبط تمام ارتباطات از نوع ایمیل، تلفن، چت،، و غیره
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,لطفا دور کردن مرکز هزینه در شرکت ذکر
 DocType: Purchase Invoice,Terms,شرایط
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,ایجاد جدید
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,ایجاد جدید
 DocType: Buying Settings,Purchase Order Required,خرید سفارش مورد نیاز
 ,Item-wise Sales History,تاریخچه فروش آیتم و زرنگ
 DocType: Expense Claim,Total Sanctioned Amount,کل مقدار تحریم
 ,Purchase Analytics,تجزیه و تحلیل ترافیک خرید
 DocType: Sales Invoice Item,Delivery Note Item,تحویل توجه داشته باشید مورد
 DocType: Expense Claim,Task,وظیفه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,اصلاح
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع ردیف #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},تعداد دسته برای مورد الزامی است {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,این فرد از فروش ریشه است و نمی تواند ویرایش شود.
 ,Stock Ledger,سهام لجر
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},نرخ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},نرخ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,حقوق و دستمزد کسر لغزش
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,یادداشت
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,اولین انتخاب یک گره گروه.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},هدف باید یکی از است {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,دانلود گزارش حاوی تمام مواد خام با آخرین وضعیت موجودی خود را
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,نما
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,انجمن
 DocType: Leave Application,Leave Balance Before Application,ترک تعادل قبل از اعمال
 DocType: SMS Center,Send SMS,ارسال اس ام اس
 DocType: Company,Default Letter Head,پیش فرض سر نامه
 DocType: Time Log,Billable,قابل پرداخت
-DocType: Authorization Rule,This will be used for setting rule in HR module,این خواهد شد برای تنظیم قانون در ماژول HR استفاده
 DocType: Account,Rate at which this tax is applied,سرعت که در آن این مالیات اعمال می شود
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ترتیب مجدد تعداد
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,فرصت از دست رفته
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",زمینه های تخفیف در سفارش خرید، رسید خرید، خرید فاکتور در دسترس خواهد بود
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب کاربری جدید. توجه: لطفا حساب برای مشتریان و تامین کنندگان ایجاد نمی
-DocType: Report,Report Type,نوع گزارش
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,بارگیری
 DocType: BOM Replace Tool,BOM Replace Tool,BOM به جای ابزار
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,کشور به طور پیش فرض عاقلانه آدرس قالب
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,نمایش مالیاتی تجزیه
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,اطلاعات واردات و صادرات
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',اگر شما در فعالیت های تولید باشد. را قادر می سازد آیتم های تولیدی است
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
 DocType: Serial No,Out of AMC,از AMC
 DocType: Purchase Order Item,Material Request Detail No,جزئیات درخواست مواد بدون
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,عطف سخت
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,را نگهداری سایت
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
 DocType: Company,Default Cash Account,به طور پیش فرض حساب های نقدی
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",توجه: در صورت پرداخت در مقابل هر مرجع ساخته شده است، را مجله ورودی دستی.
 DocType: Item,Supplier Items,آیتم ها تامین کننده
 DocType: Opportunity,Opportunity Type,نوع فرصت
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
 ,Stock Ageing,سهام سالمندی
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ارسال ایمیل خودکار به تماس در معاملات ارائه.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",ردیف {0}: تعداد در انبار avalable نمی {1} در {2} {3}. در دسترس تعداد: {4}، انتقال تعداد: {5}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
-DocType: Event,Sunday,یکشنبه
 DocType: Sales Team,Contribution (%),سهم (٪)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,مسئولیت
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,قالب
 DocType: Sales Person,Sales Person Name,فروش نام شخص
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,لطفا حداقل 1 فاکتور در جدول وارد کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,اضافه کردن کاربران
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,اضافه کردن کاربران
 DocType: Pricing Rule,Item Group,مورد گروه
 DocType: Task,Actual Start Date (via Time Logs),تاریخ شروع واقعی (از طریق زمان سیاههها)
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},به {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
 DocType: Item,Default BOM,به طور پیش فرض BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
 DocType: Time Log Batch,Total Hours,جمع ساعت
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,خودرو
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,مورد نیاز است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,قالب گیری تزریقی ساخته شده از فلز
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Time Log,From Time,از زمان
 DocType: Notification Control,Custom Message,سفارشی پیام
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",انتخاب کشور خود، منطقه زمانی و ارز
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,بانکداری سرمایه گذاری
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ترشی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ریخته گری شن و ماسه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,آبکاری
 DocType: Purchase Invoice Item,Rate,نرخ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,انترن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,انترن
 DocType: Newsletter,A Lead with this email id should exist,سرب با این ایمیل ID باید وجود داشته باشد
 DocType: Stock Entry,From BOM,از BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,پایه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,به روز باید برای مرخصی نصف روز از همان تاریخ است
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
 DocType: Salary Structure,Salary Structure,ساختار حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",قانون قیمت های متعدد را با معیارهای همان وجود دارد، لطفا \ درگیری با اختصاص اولویت حل و فصل. مشاهده قوانین قیمت: {0}
 DocType: Account,Bank,بانک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,مواد شماره
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 DocType: Hub Settings,Access Token,نشانه دسترسی
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,آیا مورد دارائی های ثابت
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",اگر شما فرمت چاپ طولانی، این ویژگی می تواند مورد استفاده قرار گیرد به تقسیم صفحه به چند صفحه با تمام Header ها و Footer در هر صفحه چاپ شود
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,همه مناطق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 DocType: Fiscal Year,Year Name,نام سال
 DocType: Process Payroll,Process Payroll,حقوق و دستمزد فرآیند
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
 DocType: Product Bundle Item,Product Bundle Item,محصولات بسته نرم افزاری مورد
 DocType: Sales Partner,Sales Partner Name,نام شریک فروش
 DocType: Purchase Invoice Item,Image View,تصویر مشخصات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,اختتامیه و به پایان رساندن صنعتی
 DocType: Issue,Opening Time,زمان باز شدن
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,از و به تاریخ های الزامی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,اوراق بهادار و بورس کالا
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,حفر
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,قالب گیری ضربه
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
 DocType: Tax Rule,Shipping City,حمل و نقل شهر
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,این مورد یک نوع از {0} (الگو) است. ویژگی خواهد شد بیش از قالب کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 DocType: Account,Purchase User,خرید کاربر
 DocType: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,چکش
-DocType: Web Page,Slideshow,نمایش به صورت اسلاید
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,به طور پیش فرض آدرس الگو نمی تواند حذف شود
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
 DocType: Journal Entry,Print Heading,چاپ سرنویس
 DocType: Quotation,Maintenance Manager,مدیر نگهداری و تعمیرات
-DocType: Workflow State,Search,جستجو
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,مجموع نمیتواند صفر باشد
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""روز پس از آخرین سفارش"" باید بزرگتر یا مساوی صفر باشد"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,لحیم کاری
 DocType: C-Form,Amended From,اصلاح از
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,مواد اولیه
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,مواد اولیه
 DocType: Leave Application,Follow via Email,از طریق ایمیل دنبال کنید
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,مبلغ مالیات پس از تخفیف مبلغ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,حساب کودک برای این حساب وجود دارد. شما می توانید این حساب را حذف کنید.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,در هر دو صورت تعداد مورد نظر و یا مقدار هدف الزامی است
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
 DocType: Leave Control Panel,Carry Forward,حمل به جلو
@@ -2801,44 +2570,43 @@
 ,Produced,ساخته
 DocType: Item,Item Code for Suppliers,کد مورد برای تولید کنندگان
 DocType: Issue,Raised By (Email),مطرح شده توسط (ایمیل)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,عمومی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ضمیمه سربرگ
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,عمومی
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,ضمیمه سربرگ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",لیست سر مالیاتی خود را، نرخ استاندارد (به عنوان مثال مالیات بر ارزش افزوده، آداب و رسوم و غیره آنها باید نام منحصر به فرد) و. این کار یک قالب استاندارد، که شما می توانید ویرایش و اضافه کردن بعد تر ایجاد کنید.
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",لیست سر مالیاتی خود را، نرخ استاندارد (به عنوان مثال مالیات بر ارزش افزوده، آداب و رسوم و غیره آنها باید نام منحصر به فرد) و. این کار یک قالب استاندارد، که شما می توانید ویرایش و اضافه کردن بعد تر ایجاد کنید.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
 DocType: Journal Entry,Bank Entry,بانک ورودی
 DocType: Authorization Rule,Applicable To (Designation),به (برای تعیین)
-DocType: Blog Post,Blog Post,وبلاگ پست
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,گروه توسط
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,فعال / غیر فعال کردن ارز.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,هزینه پستی
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Purchase Order,The date on which recurring order will be stop,از تاریخ تکرار می شود منظور متوقف خواهد شد
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} باید توسط {1} و یا شما باید افزایش تحمل سرریز کاهش می یابد
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,در حال حاضر مجموع
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ساعت
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ساعت
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,انتقال مواد به تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,انتقال مواد به تامین کننده
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ایجاد استعلام
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,شما مجاز به تصویب برگ در تاریخ بلوک
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,همه این موارد در حال حاضر صورتحساب شده است
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},می توان با تصویب {0}
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
 DocType: BOM Replace Tool,The new BOM after replacement,BOM جدید پس از تعویض
 DocType: Features Setup,Point of Sale,نقطه ای از فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,پیچش یا حلقه زنی
 DocType: Account,Tax,مالیات
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ردیف {0}: {1} است معتبر نیست {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,پالایش
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ردیف {0}: {1} است معتبر نیست {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,از بسته نرم افزاری محصولات
 DocType: Production Planning Tool,Production Planning Tool,تولید ابزار برنامه ریزی
 DocType: Quality Inspection,Report Date,گزارش تخلف
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,مسیریابی
 DocType: C-Form,Invoices,فاکتورها
 DocType: Job Opening,Job Title,عنوان شغلی
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} در حال حاضر برای کارمند {1} اختصاص داده شده برای دوره {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} دریافت کنندگان
 DocType: Features Setup,Item Groups in Details,گروه مورد در جزئیات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,نرخ به روز رسانی و در دسترس بودن
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,درصد شما مجاز به دریافت و یا ارائه بیش برابر مقدار سفارش داد. به عنوان مثال: اگر شما 100 واحد دستور داده اند. و کمک هزینه خود را 10٪ و سپس شما مجاز به دریافت 110 واحد است.
 DocType: Pricing Rule,Customer Group,مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: Item,Website Description,وب سایت توضیحات
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
 ,Sales Register,فروش ثبت نام
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
 DocType: Address,Plant,گیاه
-DocType: DocType,Setup,برپایی
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,نورد سرد
 DocType: Customer Group,Customer Group Name,نام مشتری گروه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,لطفا انتخاب کنید حمل به جلو اگر شما نیز می خواهید که شامل تعادل سال گذشته مالی برگ به سال مالی جاری
 DocType: GL Entry,Against Voucher Type,در برابر نوع کوپن
 DocType: Item,Attributes,ویژگی های
-DocType: Packing Slip,Get Items,گرفتن اقلام
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,لطفا وارد حساب فعال
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,گرفتن اقلام
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
-DocType: DocField,Image,تصویر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,را فاکتور مالیات کالاهای داخلی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},حساب {0} می کند به شرکت تعلق نمی {1}
-DocType: Communication,Other,دیگر
 DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID عملیات تنظیم نشده
 DocType: Production Order,Planned Start Date,برنامه ریزی تاریخ شروع
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,نگهداری. دیدار
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,نگهداری. دیدار
 DocType: Leave Type,Is Encash,آیا Encash
 DocType: Purchase Invoice,Mobile No,موبایل بدون
 DocType: Payment Tool,Make Journal Entry,مجله را ورود
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,اطلاعات پروژه و زرنگ در دسترس برای عین نمی
 DocType: Project,Expected End Date,انتظار می رود تاریخ پایان
 DocType: Appraisal Template,Appraisal Template Title,ارزیابی الگو عنوان
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,تجاری
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,تجاری
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,مورد پدر و مادر {0} نباید آیتم سهام
 DocType: Cost Center,Distribution Id,توزیع کد
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,خدمات عالی
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,همه محصولات یا خدمات.
 DocType: Purchase Invoice,Supplier Address,تامین کننده آدرس
-DocType: Contact Us Settings,Address Line 2,خط 2 آدرس
-DocType: ToDo,Reference,ارجاع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,سوراخ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,از تعداد
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,سری الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,خدمات مالی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,خدمات مالی
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3}
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,کروم
 DocType: Customer,Default Receivable Accounts,پیش فرض حسابهای دریافتنی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,اره
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ورقه ورقه
 DocType: Item Reorder,Transfer,انتقال
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,پخت
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
 DocType: Supplier,Contact HTML,تماس با HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,خرده فروشی
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,مشتری {0} وجود ندارد
 DocType: Attendance,Absent,غایب
-DocType: Product Bundle,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,خرد کن
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
 DocType: GL Entry,Remarks,سخنان
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
 DocType: Features Setup,POS View,POS مشخصات
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ریخته گری مداوم
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,لطفا مشخص کنید
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,در بالا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,اندازه سرد
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,حساب {0} نمی تواند یک گروه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,منطقه
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
 DocType: Holiday List,Weekly Off,فعال هفتگی
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),موقت سود / زیان (اعتباری)
 DocType: Sales Invoice,Return Against Sales Invoice,بازگشت علیه فاکتور فروش
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,مورد 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},لطفا مقدار پیش فرض {0} در شرکت راه {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},لطفا مقدار پیش فرض {0} در شرکت راه {1}
 DocType: Serial No,Creation Time,زمان ایجاد
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,درآمد کل
 DocType: Sales Invoice,Product Bundle Help,محصولات بسته نرم افزاری راهنما
 ,Monthly Attendance Sheet,جدول ماهانه حضور و غیاب
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,موردی یافت
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,حساب {0} غیر فعال است
 DocType: GL Entry,Is Advance,آیا پیشرفته
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,حضور و غیاب حضور و غیاب از تاریخ و به روز الزامی است
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,لطفا وارد است واگذار شده به عنوان بله یا نه
 DocType: Sales Team,Contact No.,تماس با شماره
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'سود و زیان' نوع حساب {0} در افتتاح ورودی مجاز نیست
-DocType: Workflow State,Time,زمان
 DocType: Features Setup,Sales Discounts,تخفیف فروش
 DocType: Hub Settings,Seller Country,فروشنده کشور
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
 DocType: Sales Invoice,Terms and Conditions Details,قوانین و مقررات جزئیات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,مالیات فروش و اتهامات الگو
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,پوشاک و لوازم جانبی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,پوشاک و لوازم جانبی
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,تعداد سفارش
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / بنر که در بالای لیست محصولات نشان خواهد داد.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,مشخص شرایط برای محاسبه مقدار حمل و نقل
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,اضافه کردن کودک
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,نقش مجاز به تنظیم حساب های یخ زده و منجمد ویرایش مطالب
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,می تواند مرکز هزینه به دفتر تبدیل کند آن را به عنوان گره فرزند
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,عامل تبدیل مورد نیاز است
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,سریال #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,کمیسیون فروش
 DocType: Offer Letter Term,Value / Description,ارزش / توضیحات
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,مشتریان خرید از آنجا که زمان طولانی
 DocType: Production Order,Expected Delivery Date,انتظار می رود تاریخ تحویل
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,بر امده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ریخته گری تبخیری-الگوی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,هزینه سرگرمی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاکتور فروش {0} باید لغو شود قبل از لغو این سفارش فروش
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,فاکتور فروش {0} باید لغو شود قبل از لغو این سفارش فروش
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,سن
 DocType: Time Log,Billing Amount,مقدار حسابداری
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,مقدار نامعتبر مشخص شده برای آیتم {0}. تعداد باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,برنامه های کاربردی برای مرخصی.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,حساب با معامله های موجود نمی تواند حذف شود
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,هزینه های قانونی
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",روز از ماه که در آن منظور خواهد شد به عنوان مثال خودکار 05، 28 و غیره تولید
 DocType: Sales Invoice,Posting Time,مجوز های ارسال و زمان
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,جدید درآمد و ضوابط
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,هزینه های سفر
 DocType: Maintenance Visit,Breakdown,تفکیک
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,حساب: {0} با ارز: {1} نمی تواند انتخاب شود
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,حد عالی رساندن
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
-DocType: Feed,Full Name,نام و نام خانوادگی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,عقد
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,عفو مشروط
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,به طور پیش فرض انبار سهام مورد الزامی است.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},پرداخت حقوق و دستمزد برای ماه {0} و {1} سال
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,کل مقدار پرداخت
 ,Transferred Qty,انتقال تعداد
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ناوبری
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,برنامه ریزی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,برنامه ریزی
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,را زمان ورود دسته ای
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,صادر
 DocType: Project,Total Billing Amount (via Time Logs),کل مقدار حسابداری (از طریق زمان سیاههها)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ما فروش این مورد
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,ما فروش این مورد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,تامین کننده کد
 DocType: Journal Entry,Cash Entry,نقدی ورودی
 DocType: Sales Partner,Contact Desc,تماس با محصول،
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,مدیریت آیتم ها
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,اضافه کردن ردیف به راه بودجه سالانه در حساب.
 DocType: Buying Settings,Default Supplier Type,به طور پیش فرض نوع تامین کننده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,کانی های با ارزش
 DocType: Production Order,Total Operating Cost,مجموع هزینه های عملیاتی
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,توجه: مورد {0} وارد چندین بار
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,همه اطلاعات تماس.
 DocType: Newsletter,Test Email Id,تست ایمیل کد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,مخفف شرکت
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,مخفف شرکت
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,اگر شما به دنبال بازرسی کیفیت. را قادر می سازد مورد QA مورد نیاز و QA بدون در رسید خرید
 DocType: GL Entry,Party Type,نوع حزب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,مواد اولیه را نمی توان همان آیتم های اصلی
 DocType: Item Attribute Value,Abbreviation,مخفف
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized نه از {0} بیش از محدودیت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,قالب ریزی و سازه های گردان
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,کارشناسی ارشد قالب حقوق و دستمزد.
 DocType: Leave Type,Max Days Leave Allowed,حداکثر روز مرخصی مجاز
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,مجموعه قوانین مالیاتی برای سبد خرید
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,به نقل از به آگهی یا مشتریان.
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
 ,Territory Target Variance Item Group-Wise,منطقه مورد هدف واریانس گروه حکیم
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,همه گروه های مشتری
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} الزامی است. شاید رکورد ارز برای {1} به {2} ایجاد نمی شود.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,قالب مالیات اجباری است.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,حساب {0}: حساب مرجع {1} وجود ندارد
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),لیست قیمت نرخ (شرکت ارز)
 DocType: Account,Temporary,موقت
 DocType: Address,Preferred Billing Address,ترجیح آدرس صورت حساب
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,دبیر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,دبیر
 DocType: Serial No,Distinct unit of an Item,واحد مجزا از یک آیتم
 DocType: Pricing Rule,Buying,خرید
 DocType: HR Settings,Employee Records to be created by,سوابق کارمند به ایجاد شود
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
 DocType: Purchase Order Item,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,اتو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} متوقف شده است
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,رویدادهای نزدیک
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مشتری مورد نیاز است
-DocType: Letter Head,Letter Head,نامه سر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ورود سریع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} برای بازگشت الزامی است
 DocType: Purchase Order,To Receive,برای دریافت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,کوچک کردن اتصالات
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,درآمد / هزینه
 DocType: Employee,Personal Email,ایمیل شخصی
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,واریانس ها
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,واریانس ها
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",اگر فعال باشد، سیستم مطالب حسابداری برای موجودی ارسال به صورت خودکار.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,حق العمل
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,حق العمل
 DocType: Address,Postal Code,کد پستی
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",در دقیقه به روز رسانی از طریق &#39;زمان ورود &quot;
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,سفارشات برای تولید منتشر شد.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Hub Settings,Name Token,نام رمز
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,طرح و برنامه
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,فروش استاندارد
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,فروش استاندارد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,حداقل یک انبار الزامی است
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Replace Tool,Replace,جایگزین کردن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,لطفا واحد به طور پیش فرض اندازه گیری وارد کنید
 DocType: Purchase Invoice Item,Project Name,نام پروژه
 DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
-DocType: Workflow State,Edit,ویرایش
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Features Setup,Item Batch Nos,دسته مورد شماره
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,آشتی پرداخت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,دارایی های مالیاتی
 DocType: BOM Item,BOM No,BOM بدون
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,جدید بورس UOM باید متفاوت از UOM سهام فعلی
 DocType: Account,Debit,بدهی
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,برگ باید در تقسیم عددی بر مضرب 0.5 اختصاص داده
 DocType: Production Order,Operation Cost,هزینه عملیات
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,آپلود حضور از یک فایل. CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,برجسته AMT
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,مرکز هزینه به طور پیش فرض
 DocType: Purchase Invoice,End Date,تاریخ پایان
 DocType: Employee,Internal Work History,تاریخچه کار داخلی
-DocType: DocField,Column Break,فرار از ستون
-DocType: Event,Thursday,پنج شنبه
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,سهام خصوصی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,عطف
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
 DocType: Sales Invoice,Exhibition,نمایشگاه
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,برگزار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,مورد تولید
 ,Employee Information,اطلاعات کارمند
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),نرخ (٪)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),نرخ (٪)
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,مالی سال پایان تاریخ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),کاهش سود برای مرخصی بدون حقوق (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},توجه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,خلاصه این هفته
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} باید مورد خریداری شده و یا زیر قرارداد را در ردیف شود {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
 DocType: GL Entry,Party,حزب
 DocType: Sales Order,Delivery Date,تاریخ تحویل
-DocType: DocField,Currency,پول
 DocType: Opportunity,Opportunity Date,فرصت تاریخ
 DocType: Purchase Receipt,Return Against Purchase Receipt,بازگشت علیه رسید خرید
 DocType: Purchase Order,To Bill,به بیل
 DocType: Material Request,% Ordered,مرتب٪
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,کار از روی مقاطعه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,کار از روی مقاطعه
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,الان متوسط. نرخ خرید
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
 DocType: Employee,History In Company,تاریخچه در شرکت
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,به بحث در مورد
 DocType: SMS Settings,SMS Settings,تنظیمات SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,حساب موقت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,سیاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,سیاه
 DocType: BOM Explosion Item,BOM Explosion Item,BOM مورد انفجار
 DocType: Account,Auditor,ممیز
 DocType: Purchase Order,End date of current order's period,تاریخ پایان دوره منظور فعلی
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,را پیشنهاد نامه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,برگشت
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
-DocType: DocField,Fold,تاه
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,واحد اندازه گیری پیش فرض برای متغیر باید همان الگو باشد
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,لطفا مشخص کنید
 DocType: Task,Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,شناسه مشتری
-DocType: Page,Page Name,صفحه نام
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,به زمان باید بیشتر از از زمان است
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},انبار {0}: حساب مرجع {1} به شرکت bolong نمی {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,به پایان رساندن اسپیندل
 DocType: BOM,Last Purchase Rate,تاریخ و زمان آخرین نرخ خرید
 DocType: Account,Asset,دارایی
 DocType: Project Task,Task ID,وظیفه ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",به عنوان مثال &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",به عنوان مثال &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,سهام نمی تواند برای مورد وجود داشته باشد {0} از انواع است
 ,Sales Person-wise Transaction Summary,فروش شخص عاقل خلاصه معامله
-DocType: System Settings,Time Zone,منطقه زمانی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,انبار {0} وجود ندارد
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ثبت نام برای ERPNext توپی
 DocType: Monthly Distribution,Monthly Distribution Percentages,درصد ماهانه توزیع
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
 DocType: Delivery Note,% of materials delivered against this Delivery Note,درصد از مواد در برابر این تحویل توجه تحویل
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,صتبلرس
 DocType: Customer,Customer Details,اطلاعات مشتری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,شکل دهی
 DocType: Employee,Reports to,گزارش به
 DocType: SMS Settings,Enter url parameter for receiver nos,پارامتر آدرس را وارد کنید برای گیرنده NOS
 DocType: Sales Invoice,Paid Amount,مبلغ پرداخت
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',بستن حساب {0} باید از نوع &#39;مسئولیت &quot;است
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,مدیریت کیفیت
 DocType: Production Planning Tool,Filter based on customer,فیلتر بر اساس مشتری
 DocType: Payment Tool Detail,Against Voucher No,علیه کوپن بدون
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Tax Rule,Purchase,خرید
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,تعداد موجودی
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,تعداد موجودی
 DocType: Item Group,Parent Item Group,مورد گروه پدر و مادر
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} برای {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,مراکز هزینه
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ساختمان و ذخیره سازی.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ساختمان و ذخیره سازی.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,سرعت که در آن عرضه کننده کالا در ارز به ارز پایه شرکت تبدیل
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ردیف # {0}: درگیری های تنظیم وقت با ردیف {1}
 DocType: Opportunity,Next Contact,بعد تماس
 DocType: Employee,Employment Type,نوع استخدام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,دارایی های ثابت
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,دوره نرم افزار نمی تواند در سراسر دو رکورد alocation شود
 DocType: Item Group,Default Expense Account,حساب پیش فرض هزینه
 DocType: Employee,Notice (days),مقررات (روز)
-DocType: Page,Yes,بله
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
 DocType: Employee,Encashment Date,Encashment عضویت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",علیه کوپن نوع باید یکی از سفارش خرید، خرید فاکتور یا مجله ورودی است
 DocType: Account,Stock Adjustment,تنظیم سهام
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},هزینه به طور پیش فرض برای فعالیت نوع فعالیت وجود دارد - {0}
 DocType: Production Order,Planned Operating Cost,هزینه های عملیاتی برنامه ریزی شده
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,جدید {0} نام
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},لطفا پیدا متصل {0} # {1}
 DocType: Job Applicant,Applicant Name,نام متقاضی
 DocType: Authorization Rule,Customer / Item Name,مشتری / نام آیتم
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},سریال بدون برای مورد الزامی است {0}
 DocType: Item Variant Attribute,Attribute,ویژگی
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,لطفا از مشخص / به محدوده
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,خلق شده توسط
 DocType: Serial No,Under AMC,تحت AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,نرخ گذاری مورد محاسبه در نظر دارد فرود هزینه مقدار کوپن
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,تنظیمات پیش فرض برای فروش معاملات.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,حداقل مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,به روز رسانی به پایان رسید کالا
 DocType: Workstation,per hour,در ساعت
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},سری {0} در حال حاضر در مورد استفاده {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,حساب برای انبار (موجودی ابدی) خواهد شد تحت این حساب ایجاد شده است.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,مبلغ پرداخت شده
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,اعزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,مدیر پروژه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
 DocType: Customer,Default Taxes and Charges,مالیات به طور پیش فرض ها و اتهامات
 DocType: Account,Receivable,دریافتنی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
 DocType: Sales Invoice,Supplier Reference,مرجع عرضه کننده کالا
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",در صورت انتخاب، BOM برای اقلام زیر مونتاژ خواهد شد برای گرفتن مواد اولیه در نظر گرفته. در غیر این صورت، تمام آیتم های زیر مونتاژ خواهد شد به عنوان ماده خام درمان می شود.
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,فروشنده توضیحات
 DocType: Employee Education,Qualification,صلاحیت
 DocType: Item Price,Item Price,آیتم قیمت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,صابون و مواد شوینده
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,فیلم و ویدیو
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
 DocType: Warehouse,Warehouse Name,نام انبار
 DocType: Naming Series,Select Transaction,انتخاب معامله
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,نرخ مواد بر اساس
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics پشتیبانی
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شرکت در انبارها از دست رفته {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,سهام UOM جایگزین سودمند
 DocType: POS Profile,Terms and Conditions,شرایط و ضوابط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},به روز باید در سال مالی باشد. با فرض به روز = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",در اینجا شما می توانید قد، وزن، آلرژی ها، نگرانی های پزشکی و غیره حفظ
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,برای تولید
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,لطفا سفارش فروش در جدول فوق را وارد کنید
 DocType: Project Task,View Task,مشخصات کار
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,سال مالی شما آغاز می شود در
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,سال مالی شما آغاز می شود در
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,لطفا رسید خرید وارد کنید
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت های دریافتی
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),راه اندازی سرور های دریافتی برای ایمیل پشتیبانی شناسه. (به عنوان مثال support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,چکش
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'تا تاریخ' مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'تا تاریخ' مورد نیاز است
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
 DocType: Sales Invoice Item,Sales Order Item,سفارش فروش مورد
 DocType: Salary Slip,Payment Days,روز پرداخت
 DocType: BOM,Manage cost of operations,مدیریت هزینه های عملیات
 DocType: Features Setup,Item Advanced,مورد و جوی پیشرفته
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,نورد گرم
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",هنگامی که هر یک از معاملات چک می &quot;فرستاده&quot;، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه &quot;تماس&quot; در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,تنظیمات جهانی
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
 DocType: Salary Slip,Net Pay,پرداخت خالص
 DocType: Account,Account,حساب
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,سریال بدون {0} در حال حاضر دریافت شده است
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,جزییات تیم فروش
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,مرخصی استعلاجی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},نامعتبر {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,مرخصی استعلاجی
 DocType: Email Digest,Email Digest,ایمیل خلاصه
 DocType: Delivery Note,Billing Address Name,حسابداری نام آدرس
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,فروشگاه های گروه
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,تعادل سیستم
-DocType: Workflow,Is Active,فعال است
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,فروشگاه های گروه
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,تعادل سیستم
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ذخیره سند اول است.
 DocType: Account,Chargeable,پرشدنی
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,تغییر اختصار
-DocType: Workflow State,Primary,اولیه
 DocType: Expense Claim Detail,Expense Date,هزینه عضویت
 DocType: Item,Max Discount (%),حداکثر تخفیف (٪)
-DocType: Communication,More Information,اطلاعات بیشتر
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,مبلغ آخرین سفارش 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,سندبلاست
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,مبلغ آخرین سفارش
 DocType: Company,Warn,هشدار دادن
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ارزیابی مورد به روز شده
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
 DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Order,Raw Materials Supplied,مواد اولیه عرضه شده
 DocType: Purchase Invoice,Recurring Print Format,تکرار چاپ فرمت
-DocType: Communication,Series,سلسله
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
-DocType: Communication,Email,ایمیل
 DocType: Item Group,Item Classification,طبقه بندی مورد
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,مدیر توسعه تجاری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,مدیر توسعه تجاری
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,هدف نگهداری سایت
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,دوره
 ,General Ledger,لجر عمومی
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 DocType: Features Setup,To get Item Group in details table,برای دریافت مورد گروه در جدول جزئیات
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ترسیم مجدد
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,قلم زنی
 DocType: Sales Invoice,Commission,کمیسیون
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4 style="";text-align:right;direction:rtl""> به طور پیش فرض الگو </h4><p style="";text-align:right;direction:rtl""> با استفاده از <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja قالب</a> و تمامی زمینه های آدرس (از جمله زمینه های سفارشی در صورت وجود) در دسترس خواهد بود </p><pre style="";text-align:right;direction:rtl""> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,مقدار پیش فرض
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,انبار در سیستم یافت نشد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,انبار در سیستم یافت نشد
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,خلاصه این ماه
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
 DocType: Payment Tool,Get Outstanding Vouchers,دریافت کوپن های برجسته
 DocType: Warranty Claim,Resolved By,حل
 DocType: Appraisal,Start Date,تاریخ شروع
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ارزش
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,اختصاص برگ برای یک دوره.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,به منظور بررسی اینجا را کلیک کنید
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,میانگین زمان گرفته شده توسط منبع برای ارائه
 DocType: Time Log,Hours,ساعت
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,نورد
-DocType: ToDo,Priority,اولویت
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox به دسترسی مجاز
-DocType: Dropbox Backup,Weekly,هفتگی
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,به عنوان مثال. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,دريافت كردن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,دريافت كردن
 DocType: Maintenance Visit,Fully Completed,طور کامل تکمیل شده
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}٪ کامل
 DocType: Employee,Educational Qualification,صلاحیت تحصیلی
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} با موفقیت به لیست خبرنامه اضافه شده است.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ماشینکاری پرتو الکترونی
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,گزارشهای اصلی
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,سهام لجر نوشته توازن به روز شده
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,گزارشهای اصلی
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,افزودن / ویرایش قیمتها
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,افزودن / ویرایش قیمتها
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,نمودار مراکز هزینه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,سفارشهای من
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,سفارشهای من
 DocType: Price List,Price List Name,لیست قیمت نام
 DocType: Time Log,For Manufacturing,برای ساخت
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,مجموع
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,مجموع
 DocType: BOM,Manufacturing,ساخت
 ,Ordered Items To Be Delivered,آیتم ها دستور داد تا تحویل
 DocType: Account,Income,درامد
-,Setup Wizard,راه اندازی جادوگر
 DocType: Industry Type,Industry Type,نوع صنعت
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,مشکلی!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تاریخ تکمیل
 DocType: Purchase Invoice Item,Amount (Company Currency),مقدار (شرکت ارز)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ریخته گری
-DocType: Email Alert,Reference Date,مرجع تاریخ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,لطفا NOS تلفن همراه معتبر وارد کنید
 DocType: Budget Detail,Budget Detail,جزئیات بودجه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا قبل از ارسال پیام را وارد کنید
-DocType: Async Task,Status,وضعیت
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},سهام UOM به روز شده برای مورد {0}
-DocType: Company History,Year,سال
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,نقطه از فروش مشخصات
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,لطفا تنظیمات SMS به روز رسانی
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,زمان ورود {0} در حال حاضر در صورتحساب یا لیست
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,سریال بدون خدمات قرارداد انقضاء
 DocType: Item,Unit of Measure Conversion,واحد تبدیل اندازه گیری
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,کارمند نمی تواند تغییر کند
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
 DocType: Naming Series,Help HTML,راهنما HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},کمک هزینه برای بیش از {0} عبور برای مورد {1}
 DocType: Address,Name of person or organization that this address belongs to.,نام و نام خانوادگی شخص و یا سازمانی که این آدرس متعلق به.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,تامین کنندگان شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,تامین کنندگان شما
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,یکی دیگر از ساختار حقوق {0} برای کارکنان فعال است {1}. لطفا مطمئن وضعیت خود را غیر فعال &#39;به عنوان خوانده شده
 DocType: Purchase Invoice,Contact,تماس
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,دریافت شده از
 DocType: Features Setup,Exports,صادرات
 DocType: Lead,Converted,مبدل
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: از {0} برای {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 DocType: Issue,Content Type,نوع محتوا
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,کامپیوتر
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کامپیوتر
 DocType: Item,List this Item in multiple groups on the website.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,مورد: {0} در سیستم وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Cost Center,Budgets,بودجه
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,به روز شده
 DocType: Employee,Emergency Contact Details,جزییات تماس اضطراری
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,چه کاری انجام میدهد؟
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,چه کاری انجام میدهد؟
 DocType: Delivery Note,To Warehouse,به انبار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},حساب {0} است بیش از یک بار برای سال مالی وارد شده است {1}
-,Average Commission Rate,متوسط نرخ کمیسیون
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+,Average Commission Rate,متوسط نرخ کمیسیون
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,برق
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,برق
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID کاربر برای کارمند تنظیم نشده {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,عکاسی
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,از ادعای گارانتی
 DocType: Stock Entry,Default Source Warehouse,به طور پیش فرض منبع انبار
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,لپینگ
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,روز پس از آخرین سفارش
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,روز پس از آخرین سفارش
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
-DocType: User,Enabled,فعال
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,دارایی های سهام
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},آیا شما واقعا می خواهید برای ارسال تمام لغزش حقوق برای ماه {0} و {1} سال
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,مشترکین واردات
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,حاضر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,تحویل توجه داشته باشید {0} باید ارائه شود
 DocType: Notification Control,Sales Invoice Message,فاکتور فروش پیام
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,با بستن حساب {0} باید از نوع مسئولیت / حقوق صاحبان سهام می باشد
 DocType: Authorization Rule,Based On,بر اساس
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,فعالیت پروژه / وظیفه.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,تولید حقوق و دستمزد ورقه
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} است یک شناسه ایمیل معتبر نیست
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",خرید باید بررسی شود، اگر قابل استفاده برای عنوان انتخاب شده {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,تخفیف باید کمتر از 100 باشد
-DocType: ToDo,Low,کم
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,نخ ریسی
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
@@ -3601,9 +3296,8 @@
 DocType: Quality Inspection Reading,Reading 5,خواندن 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date",را وارد کنید ایمیل ID با کاما جدا شده، منظور خواهد شد به صورت خودکار در زمان مشخص از طریق پست
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,نام کمپین الزامی است
-DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات 
+DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Receipt Item,Rejected Serial No,رد سریال
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,کشش عمیق
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,عضویت در خبرنامه جدید
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,نمایش تعادل
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,محدوده سالمندی 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,مقدار
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,پرچین
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
 ,Sales Analytics,تجزیه و تحلیل ترافیک فروش
 DocType: Manufacturing Settings,Manufacturing Settings,تنظیمات ساخت
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,نام حساب
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,هزینه مواد اولیه عرضه شده
 DocType: Selling Settings,Settings for Selling Module,تنظیمات برای فروش ماژول
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,خدمات مشتریان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,خدمات مشتریان
 DocType: Item,Thumbnail,بند انگشتی
 DocType: Item Customer Detail,Item Customer Detail,مورد جزئیات و ضوابط
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,تکرار ایمیل شما
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,پیشنهاد نامزد یک کار.
 DocType: Notification Control,Prompt for Email on Submission of,اعلان برای ایمیل در ارسال مقاله از
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,مجموع برگ اختصاص داده بیش از روز در دوره
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,پیش فرض کار در انبار پیشرفت
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} مورد نیاز است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,قالب ریزی و سازه های خلاء
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
-DocType: Contact Us Settings,City,شهرستان
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ماشینکاری آلتراسونیک
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,خطا: نه یک شناسه معتبر است؟
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,مورد {0} باید مورد فروش می شود
 DocType: Naming Series,Update Series Number,به روز رسانی سری شماره
 DocType: Account,Equity,انصاف
 DocType: Sales Order,Printing Details,اطلاعات چاپ
 DocType: Task,Closing Date,اختتامیه عضویت
 DocType: Sales Order Item,Produced Quantity,مقدار زیاد تولید
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,مهندس
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,مهندس
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,مجامع جستجو فرعی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
 DocType: Sales Partner,Partner Type,نوع شریک
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise تخفیف
 DocType: Purchase Invoice,Against Expense Account,علیه صورتحساب
 DocType: Production Order,Production Order,سفارش تولید
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,نصب و راه اندازی {0} توجه داشته باشید در حال حاضر ارائه شده است
 DocType: Quotation Item,Against Docname,علیه Docname
 DocType: SMS Center,All Employee (Active),همه کارکنان (فعال)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,مشاهده در حال حاضر
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,هزینه مواد خام
 DocType: Item,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,نمودار گانت
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,سری به روز رسانی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,نوع گزارش الزامی است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,نوع گزارش الزامی است
 DocType: Item,Serial Number Series,شماره سریال سری
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},انبار سهام مورد {0} در ردیف الزامی است {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,خرده فروشی و عمده فروشی
 DocType: Issue,First Responded On,اول پاسخ در
 DocType: Website Item Group,Cross Listing of Item in multiple groups,صلیب فهرست مورد در گروه های متعدد
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,اولین کاربر: شما
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,اولین کاربر: شما
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,موفقیت آشتی
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,موفقیت آشتی
 DocType: Production Order,Planned End Date,برنامه ریزی پایان تاریخ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,که در آن موارد ذخیره می شود.
 DocType: Tax Rule,Validity,اعتبار
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مقدار صورتحساب
 DocType: Attendance,Attendance,حضور
-DocType: Page,No,بدون
 DocType: BOM,Materials,مصالح
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",اگر بررسی نیست، لیست خواهد باید به هر بخش که در آن به کار گرفته شوند اضافه شده است.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,تاریخ ارسال و زمان ارسال الزامی است
@@ -3689,55 +3376,46 @@
 ,Item Prices,قیمت مورد
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
 DocType: Period Closing Voucher,Period Closing Voucher,دوره کوپن اختتامیه
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,لیست قیمت کارشناسی ارشد.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,لیست قیمت کارشناسی ارشد.
 DocType: Task,Review Date,بررسی تاریخ
 DocType: Purchase Invoice,Advance Payments,پیش پرداخت
-DocType: DocPerm,Level,سطح
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,انبار هدف در ردیف {0} باید به همان ترتیب تولید می شود
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,فرز
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,بدون اجازه به استفاده از ابزار پرداخت
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %s مشخص نشده است
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,نرخ ارز می تواند پس از ساخت ورودی با استفاده از یک ارز دیگر، نمی توان تغییر داد
 DocType: Company,Round Off Account,دور کردن حساب
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,پر وعده
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,هزینه های اداری
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,مشاور
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,مشاور
 DocType: Customer Group,Parent Customer Group,مشتریان پدر و مادر گروه
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,تغییر
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",به عنوان مثال &quot;من شرکت LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,مقررات دوره
 DocType: Bank Reconciliation Detail,Voucher ID,ID کوپن
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,این یک سرزمین ریشه است و نمی تواند ویرایش شود.
 DocType: Packing Slip,Gross Weight UOM,وزن UOM
 DocType: Email Digest,Receivables / Payables,مطالبات / بدهی
 DocType: Delivery Note Item,Against Sales Invoice,علیه فاکتور فروش
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,مهر زنی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 DocType: Task,Actual End Date (via Time Logs),واقعی پایان تاریخ (از طریق زمان سیاههها)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,لطفا پدر و مادر مرکز هزینه وارد
 DocType: Delivery Note,Print Without Amount,چاپ بدون مقدار
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
-DocType: User,Last Name,نام خانوادگی
-DocType: Web Page,Left,چپ
-DocType: Event,All Day,تمام روز
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
 DocType: Issue,Support Team,تیم پشتیبانی
 DocType: Appraisal,Total Score (Out of 5),نمره کل (از 5)
-DocType: Contact Us Settings,State,دولت
 DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,تراز
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,تراز
 DocType: Project,Total Expense Claim (via Expense Claims),مجموع ادعای هزینه (از طریق ادعاهای هزینه)
-DocType: User,Gender,جنس
 DocType: Journal Entry,Debit Note,بدهی توجه داشته باشید
 DocType: Stock Entry,As per Stock UOM,همانطور که در بورس UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,تمام نشده است
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,ایجاد قوانین برای محدود کردن معاملات بر اساس ارزش.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",اگر علامت زده شود، هیچ مجموع. از روز کاری شامل تعطیلات، و این خواهد شد که ارزش حقوق پستها در طول روز کاهش
 DocType: Purchase Invoice,Total Advance,جستجوی پیشرفته مجموع
-DocType: Workflow State,User,کاربر
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,پردازش حقوق و دستمزد
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,تنظیم به عنوان از دست رفته
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,دریافت پرداخت توجه
 DocType: Customer,Credit Days Based On,روز اعتباری بر اساس
 DocType: Tax Rule,Tax Rule,قانون مالیات
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,حفظ همان نرخ در طول چرخه فروش
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,برنامه ریزی سیاهههای مربوط به زمان در خارج از ساعات کاری ایستگاه کاری.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} در حال حاضر ارائه شده است
 ,Items To Be Requested,گزینه هایی که درخواست شده
-DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),نرخ صدور صورت حساب بر اساس نوع فعالیت (در ساعت)
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,گذاری لبه کیسه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",شرکت پست الکترونیک ID یافت نشد، از این رو پست الکترونیکی فرستاده نمی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 DocType: Production Planning Tool,Filter based on item,فیلتر در مورد بر اساس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
 DocType: Purchase Common,Purchase Common,خرید مشترک
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} اصلاح شده است. لطفا بازخوانی کنید.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,توقف کاربران از ساخت نرم افزار مرخصی در روز بعد.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,از فرصت
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,نبلرس
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
-DocType: DocField,Default,پیش فرض
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} مشترک افزوده شد
 DocType: Maintenance Schedule,Schedule,برنامه
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",تعریف بودجه برای این مرکز هزینه. برای تنظیم اقدام بودجه، نگاه کنید به &quot;فهرست شرکت&quot;
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Expense Claim,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",انتخاب &quot;بله&quot; خواهد یک هویت منحصر به فرد به هر یک از موجودیت این مورد است که می تواند در سریال بدون استاد مشاهده دهد.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
 DocType: Address,Office,دفتر
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,گزارش استاندارد
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,برای ایجاد یک حساب مالیاتی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,لطفا هزینه حساب وارد کنید
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
 DocType: Employee,Current Address,آدرس فعلی
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,دسته پرسشنامه
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,دسته پرسشنامه
 DocType: Employee,Contract End Date,پایان دادن به قرارداد تاریخ
 DocType: Sales Order,Track this Sales Order against any Project,پیگیری این سفارش فروش در مقابل هر پروژه
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,سفارشات فروش کشش (در انتظار برای ارائه) بر اساس معیارهای فوق
-DocType: DocShare,Document Type,نوع سند
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,از عبارت تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,از عبارت تامین کننده
 DocType: Deduction Type,Deduction Type,نوع کسر
 DocType: Attendance,Half Day,نیم روز
 DocType: Pricing Rule,Min Qty,حداقل تعداد
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",برای پیگیری موارد در فروش و اسناد خرید با NOS دسته ای. &quot;صنعت ترجیحی: مواد شیمیایی&quot;
 DocType: GL Entry,Transaction Date,تاریخ تراکنش
 DocType: Production Plan Item,Planned Qty,برنامه ریزی تعداد
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,مالیات ها
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,مالیات ها
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,برای کمیت (تعداد تولیدی) الزامی است
 DocType: Stock Entry,Default Target Warehouse,به طور پیش فرض هدف انبار
 DocType: Purchase Invoice,Net Total (Company Currency),مجموع خالص (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
 DocType: Notification Control,Purchase Receipt Message,خرید دریافت پیام
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,مجموع برگ اختصاص داده بیش از دوره
 DocType: Production Order,Actual Start Date,واقعی تاریخ شروع
 DocType: Sales Order,% of materials delivered against this Sales Order,درصد از مواد در برابر این سفارش فروش تحویل
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,جنبش مورد سابقه بوده است.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,عضویت در خبرنامه لیست مشترک
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,سرویس
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 ,Monthly Salary Register,ماهانه حقوق ثبت نام
-apps/frappe/frappe/website/template.py +140,Next,بعد
 DocType: Warranty Claim,If different than customer address,اگر متفاوت از آدرس مشتری
 DocType: BOM Operation,BOM Operation,عملیات BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,الکتروپولیش
 DocType: Purchase Taxes and Charges,On Previous Row Amount,در قبلی مقدار ردیف
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,لطفا مقدار پرداخت در حداقل یک سطر وارد
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,لطفا مقدار پرداخت در حداقل یک سطر وارد
 DocType: POS Profile,POS Profile,نمایش POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ردیف {0}: مبلغ پرداخت نمی تواند بیشتر از مقدار برجسته
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,مجموع پرداخت نشده
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,مجموع پرداخت نشده
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,زمان ورود است قابل پرداخت نیست
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,خریدار
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,خریدار
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,پرداخت خالص نمی تونه منفی
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,لطفا علیه کوپن دستی وارد کنید
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,لطفا علیه کوپن دستی وارد کنید
 DocType: SMS Settings,Static Parameters,پارامترهای استاتیک
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ارسال اس ام اس انبوه به مخاطبین خود
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,مالیات و یا هزینه در نظر بگیرید برای
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,تعداد واقعی الزامی است
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,کراس آلیاژها
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,کارت اعتباری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا repacked
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,تنظیمات پیش فرض برای انجام معاملات سهام.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,تنظیمات پیش فرض برای انجام معاملات سهام.
 DocType: Purchase Invoice,Next Date,تاریخ بعدی
 DocType: Employee Education,Major/Optional Subjects,عمده / موضوع اختیاری
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,لطفا مالیات و هزینه وارد
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ماشینکاری
 DocType: Sales Invoice Item,Drop Ship,قطره کشتی
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",در اینجا شما می توانید جزئیات خانواده مانند نام و شغل پدر و مادر، همسر و فرزندان حفظ
 DocType: Hub Settings,Seller Name,نام فروشنده
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,REPACK
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,شما باید فرم را قبل از ادامه جویی در هزینه
 DocType: Item Attribute,Numeric Values,مقادیر عددی
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ضمیمه لوگو
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,ضمیمه لوگو
 DocType: Customer,Commission Rate,کمیسیون نرخ
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,سبد خرید خالی است
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ریشه را نمیتوان ویرایش کرد.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,مقدار اختصاص داده شده نمی تواند بزرگتر از مقدار unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ریشه را نمیتوان ویرایش کرد.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,مقدار اختصاص داده شده نمی تواند بزرگتر از مقدار unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,اجازه تولید در تعطیلات
 DocType: Sales Order,Customer's Purchase Order Date,مشتری سفارش خرید عضویت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,سرمایه سهام
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,لطفا یک فایل CSV را انتخاب کنید
-DocType: Dropbox Backup,Send Backups to Dropbox,ارسال به پشتیبان گیری Dropbox به
 DocType: Purchase Order,To Receive and Bill,برای دریافت و بیل
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,طراح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,طراح
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,شرایط و ضوابط الگو
 DocType: Serial No,Delivery Details,جزئیات تحویل
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,به طور خودکار ایجاد درخواست مواد اگر مقدار می افتد در زیر این سطح
 ,Item-wise Purchase Register,مورد عاقلانه ثبت نام خرید
 DocType: Batch,Expiry Date,تاریخ انقضا
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",برای تنظیم سطح دوباره سفارش دادن، مورد باید مورد خرید و یا مورد ساخت می باشد
 ,Supplier Addresses and Contacts,آدرس منبع و اطلاعات تماس
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +18,Project master.,کارشناسی ارشد پروژه.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,بیل از مواد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
-DocType: Dropbox Backup,Send Notifications To,ارسال اعلانها به
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,کد عکس تاریخ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,کد عکس تاریخ
 DocType: Employee,Reason for Leaving,دلیلی برای ترک
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,حساب {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,حساب {0} وجود ندارد
 DocType: Account,Cash,نقد
 DocType: Employee,Short biography for website and other publications.,بیوگرافی کوتاه برای وب سایت ها و نشریات دیگر.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},لطفا ساختار حقوق برای کارکنان ایجاد {0}

diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index f86d45f..3f10b28 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,palkan tila
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",valitse toimitusten kk jaksotus mikäli haluat kausiluonteisen seurannan
 DocType: Employee,Divorced,eronnut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,varoitus: sama tuote on syötetty useamman kerran
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,tuotteet on jo synkronoitu
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,peruuta materiaalikäynti {0} ennen peruutat takuuvaatimuksen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,kuluttajatavarat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,kuluttajatavarat
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,valitse ensin osapuoli tyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Hehkutus
 DocType: Item,Customer Items,asiakkaan tuotteet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
 DocType: Item,Publish Item to hub.erpnext.com,Julkaise Tuote on hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,poistumis hyväksyjät
 DocType: Sales Partner,Dealer,jakaja
 DocType: Employee,Rented,Vuokrattu
-DocType: About Us Settings,Website,verkkosivusto
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,koonti plus sintraus
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,materiaalipyynnöstä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,materiaalipyynnöstä
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} puu
 DocType: Job Applicant,Job Applicant,Työnhakija
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ei enempää tuloksia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Oikeudellinen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Oikeudellinen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},todellista veroa ei voi sisällyttää tuotteen tasoon rivillä {0}
 DocType: C-Form,Customer,asiakas
 DocType: Purchase Receipt Item,Required By,pyytäjä
@@ -38,25 +35,24 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),valuutta taso on oltava sama kuin {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","kaikkiin vientiin liittyviin asakirjoihin kuten lähete, tarjous, tilausvahvistus, myyntilasku, myyntitilaus jne on saatavilla esim valuutta, muuntotaso, vienti yhteensä, viennin loppusumma ym"
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,"poistu, tyypin nimi"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,sarja päivitetty onnistuneesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,kutina
 DocType: Pricing Rule,Apply On,käytä
 DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
 ,Purchase Order Items To Be Received,Ostotilaus eriä olevan vastaanotettu
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
 DocType: Quality Inspection Reading,Parameter,parametri
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,uusi poistumissovellus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,uusi poistumissovellus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,pankki sekki
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. käytä tätä vaihtoehtoa määritelläksesi hakukelpoisen asiakaskohtaisen tuotekoodin
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,näytä mallivaihtoehdot
-DocType: Sales Invoice Item,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Määrä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,vuoden syöttö
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,varastossa
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},käyttäjä {0} on jo nimetty työsuhteeseen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Tee uusi POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,terveydenhuolto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 DocType: Purchase Invoice,Monthly,Kuukausittain
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Viivästyminen (päivää)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,jaksotus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,sähköpostiosoite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,puolustus
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,sähköpostiosoite
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
 DocType: Company,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),pisteet (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rivi # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rivi # {0}:
 DocType: Delivery Note,Vehicle No,ajoneuvon nro
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ole hyvä ja valitse hinnasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,puun työstö
 DocType: Production Order Operation,Work In Progress,työnalla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-tulostus
 DocType: Employee,Holiday List,lomaluettelo
 DocType: Time Log,Time Log,aikaloki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Kirjanpitäjä
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Kirjanpitäjä
 DocType: Cost Center,Stock User,varasto käyttäjä
 DocType: Company,Phone No,Puhelin ei
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","lokiaktiviteetit kohdistettuna käyttäjien tehtäviin, joista aikaseuranta tai laskutus on mahdollista"
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Uusi {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Uusi {0}: # {1}
 ,Sales Partners Commission,myyntikumppanit provisio
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Lyhenne voi olla enintään 5 merkkiä
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Määrite Arvo {0} ei voi poistaa {1} kuin Tuote vaihtoehdot \ esiintyy tämän Taito.
-DocType: Print Settings,Classic,perinteinen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,tämä on kantatili eikä sitä voi muokata
 DocType: BOM,Operations,Toiminnot
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},oikeutusta ei voi asettaa alennuksen perusteella {0}
 DocType: Bin,Quantity Requested for Purchase,Määrä pyydetty ostoa
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Avaaminen ja työn.
 DocType: Item Attribute,Increment,Lisäys
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Valitse Varasto ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,mainonta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,mainonta
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama yhtiö on merkitty enemmän kuin kerran
 DocType: Employee,Married,Naimisissa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei saa {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 DocType: Payment Reconciliation,Reconcile,yhteensovitus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,päivittäistavara
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,tee pankkikirjaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,eläkerahastot
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,eläkerahastot
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,varasto vaaditaan mikäli tilin tyyppi on varastotili
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Lead,Person Name,henkilönimi
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","täppää toistuva tilaus, lopettaaksesi toistumisen poista täppä tai aseta päätöspäivä"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(tuntitaso / 60) * todellinen käytetty aika
 DocType: SMS Log,SMS Log,tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
-DocType: Blog Post,Guest,vieras
 DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
 DocType: Lead,Interested,kiinnostunut
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,materiaalilasku
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Aukko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,avauskirjaus
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} on pakollinen
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
 DocType: Lead,Product Enquiry,tavara kysely
-DocType: Standard Reply,Owner,Omistaja
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Anna yritys ensin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,valmistumisen alla
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,tavoitteeseen
 DocType: BOM,Total Cost,kokonaiskustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Väljentäminen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,aktiivisuus loki:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,kiinteistöt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,kiinteistöt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,tiliote
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,vaatimuksen arvomäärä
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,asiakas
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
 DocType: Naming Series,Prefix,Etuliite
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,käytettävä
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,käytettävä
 DocType: Upload Attendance,Import Log,tuo loki
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,lähetä
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,vuosipalkka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,vuosipalkka
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,varaston kulut
 DocType: Newsletter,Email Sent?,sähköposti lähetetty?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,näytä aikalokit
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,asennus tila
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
 DocType: Item,Supply Raw Materials for Purchase,toimita raaka-aineita ostoon
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,tuotteen {0} tulee olla ostotuote
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,päivitetään kun myyntilasku on lähetetty
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,tekstiviesti keskus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,suoristus
 DocType: BOM Replace Tool,New BOM,uusi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,erän aikaloki laskutukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,vastagravitaatio valu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Uutiskirje on jo lähetetty
 DocType: Lead,Request Type,pyydä tyyppi
 DocType: Leave Application,Reason,syy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,julkaisu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,suoritus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ensimmäisestä käyttäjästä tulee järjestelmänhallitsia (voit muuttaa asetusta myöhemmin)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,suoritus
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ensimmäisestä käyttäjästä tulee järjestelmänhallitsia (voit muuttaa asetusta myöhemmin)
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
 DocType: Serial No,Maintenance Status,"huolto, tila"
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,tuotteet ja hinnoittelu
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,tuotteet ja hinnoittelu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},alkaen päivä tulee olla tilikaudella olettaen alkaen päivä = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"valitse työntekijä, jolle olet tekemässä arvioinnin"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},kustannuspaikka {0} ei kuulu yritykseen {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,hinnastoa tulee sovelletaa ostamiseen tai myymiseen
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},asennuspäivä ei voi olla ennen tuotteen toimitusaikaa {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),hinnaston alennus taso (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,alku
-DocType: User,First Name,etunimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,täysimuovaus valu
 DocType: Offer Letter,Select Terms and Conditions,valitse ehdot ja säännöt
 DocType: Production Planning Tool,Sales Orders,myyntitilaukset
 DocType: Purchase Taxes and Charges,Valuation,arvo
@@ -215,59 +200,55 @@
 DocType: Earning Type,Earning Type,ansio tyyppi
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,poista kapasiteettisuunnittelu ja aikaseuranta käytöstä
 DocType: Bank Reconciliation,Bank Account,pankkitili
-DocType: Leave Type,Allow Negative Balance,hyväksy negatiivinen tase 
+DocType: Leave Type,Allow Negative Balance,hyväksy negatiivinen tase
 DocType: Selling Settings,Default Territory,oletus alue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,hammasväli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisio
 DocType: Production Order Operation,Updated via 'Time Log',päivitetty 'aikaloki' kautta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},tili {0} ei kuulu yritykselle {1}
 DocType: Naming Series,Series List for this Transaction,sarjalistaus tähän tapahtumaan
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saatu
 DocType: Sales Partner,Reseller,Jälleenmyyjä
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Anna Company
 DocType: Delivery Note Item,Against Sales Invoice Item,myyntilaskun kohdistus / tuote
 ,Production Orders in Progress,tuotannon tilaukset on käsittelyssä
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
 DocType: Newsletter List,Total Subscribers,alihankkijat yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,"yhteystiedot, nimi"
+,Contact Name,"yhteystiedot, nimi"
 DocType: Production Plan Item,SO Pending Qty,odottavat myyntitilaukset yksikkömäärä
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,tee palkkalaskelma edellä mainittujen kriteerien mukaan
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pyydä ostaa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,tuplakotelointi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lievittää Date on oltava suurempi kuin päivämäärä Liittymisen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,poistumiset vuodessa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,poistumiset vuodessa
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,nimeä sarjat {0} määritykset> asetukset> nimeä sarjat
 DocType: Time Log,Will be updated when batched.,päivitetään keräilyssä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
-DocType: Bulk Email,Message,Viesti
 DocType: Item Website Specification,Item Website Specification,tuote verkkosivujen asetukset
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox pääsy tunnus
 DocType: Payment Tool,Reference No,Viitenumero
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,poistuminen estetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vuotuinen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,poistuminen estetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"myyntilasku, nro"
 DocType: Material Request Item,Min Order Qty,min tilaus yksikkömäärä
 DocType: Lead,Do Not Contact,älä ota yhteyttä
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,uniikki tunnus toistuvan laskutuksen jäljittämiseen muodostetaan lähetettäessä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittaja tyyppi
 DocType: Item,Publish in Hub,Julkaista Hub
 ,Terretory,alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,päivitä tilityspäivä
 DocType: Item,Purchase Details,oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,johdotus harjaus
 DocType: Employee,Relation,Suhde
 DocType: Shipping Rule,Worldwide Shipping,Maailmanlaajuinen Toimitus
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,asiakkailta vahvistetut tilaukset
@@ -279,16 +260,14 @@
 DocType: Lead,Suggestions,ehdotuksia
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"tuoteryhmä työkalu, aseta budjetit tällä, voit tehdä kausiluonteisen budjetin asettamalla jaksotuksen"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},syötä emotiliryhmä varastolle {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
 DocType: Supplier,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,upottava
 DocType: Purchase Invoice Item,Expense Head,"kulu, otsikko"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,valitse ensin veloitus tyyppi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 merkkiä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,valitse kieli
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 merkkiä
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,luettelon ensimmäinen poistumis hyväksyjä on oletushyväksyjä
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","poistaa käytöstä aikalokin kohdistuksen tuotannon tilaukseen, tapahtumat ei kohdistu tuotannon tilaukseen"
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,mallista
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,tuote {0} tulee olla palvelutuote
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
-DocType: DocType,Administrator,ylläpitäjä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser poraus
-DocType: Stock UOM Replace Utility,New Stock UOM,uusi varasto UOM
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,kiertoviite vihke
-DocType: Communication,Closed,suljettu
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen"
 DocType: Lead,Industry,teollisuus
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Tiedote
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,hydro muovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,tuote päivitetty
-DocType: Async Task,System Manager,järjestelmähallinta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
 DocType: Sales Invoice Item,Delivery Note,lähete
-DocType: Dropbox Backup,Allow Dropbox Access,salli Dropbox pääsy
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,verojen perusmääritykset
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"maksukirjausta on muutettu siirron jälkeen, siirrä se uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Workstation,Rent Cost,vuokrakustannukset
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,yrityksen sähköposti
 DocType: GL Entry,Debit Amount in Account Currency,Debit Määrä tilini Valuutta
 DocType: Shipping Rule,Valid for Countries,Voimassa Maat
-DocType: Workflow State,Refresh,Virkistää
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","kaikkiin tuontiin liittyviin asakirjoihin kuten toimittajan ostotarjous, ostotilaus, ostolasku, ostokuitti, jne on saatavilla esim valuutta, muuntotaso, vienti yhteensä, tuonnin loppusumma ym"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,pidetään kokonaistilauksena
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Syötä &quot;Toista päivänä Kuukausi &#39;kentän arvo
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Syötä &quot;Toista päivänä Kuukausi &#39;kentän arvo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM on saatavana, lähetteessä, ostolaskussa, tuotannon tilauksessa, ostotilauksessa, ostokuitissa, myyntilaskussa, myyntilauksessa, varaston kirjauksessa ja aikataulukossa"
 DocType: Item Tax,Tax Rate,vero taso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,valitse tuote
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,valitse tuote
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ostokuitti on lähetettävä
-DocType: Stock UOM Replace Utility,Current Stock UOM,nykyinen varasto UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,erä (erä-tuote) tuotteesta
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ei voi olla vain 1 tilini kohden Yhtiö {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Sähköpostiosoitteesi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,katso liitetiedosto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,vesisuihku leikkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,määritys on valmis
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,määritys on valmis
 ,Finished Goods,valmiit tavarat
 DocType: Delivery Note,Instructions,ohjeet
 DocType: Quality Inspection,Inspected By,tarkastanut
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"älä luo asiakas-, tai toimittajatilejä, ne laaditaan suoraan asiakas- / toimittaja valvonnassa"
 DocType: Currency Exchange,Currency Exchange,valuutanvaihto
 DocType: Purchase Invoice Item,Item Name,tuotteen nimi
+DocType: Authorization Rule,Approving User  (above authorized value),Hyväksymisestä User (edellä valtuutettu arvo)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,"kredit, tase"
 DocType: Employee,Widowed,jäänyt leskeksi
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","pyydetyt tuotteet jotka ovat ""loppu"" kaikista varastoista ennustetun tuote yksikkömäärän ja minimi tilaus yksikkömäärän mukaan"
@@ -378,22 +346,21 @@
 ,Purchase Register,Osto Rekisteröidy
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'poistumisen hyväksyjä'
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lääketieteellinen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,häviön syy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,putki saumaus
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 DocType: Employee,Single,yksittäinen
 DocType: Issue,Attachment,Liite
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,budjettia ei voi määrittää kustannuspaikkaryhmälle
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
 DocType: Purchase Invoice,Yearly,Vuosittain
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,syötä kustannuspaikka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,syötä kustannuspaikka
 DocType: Journal Entry Account,Sales Order,myyntitilaus
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,keskimääräinen myynnin taso
 DocType: Purchase Order,Start date of current order's period,aloituspäivä nykyiselle tilauskaudelle
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Määrä voi olla murto-osa rivillä {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Määrä voi olla murto-osa rivillä {0}
 DocType: Purchase Invoice Item,Quantity and Rate,yksikkömäärä ja taso
 DocType: Delivery Note,% Installed,% asennettu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Anna yrityksen nimi ensin
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,on ryhmä
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaattisesti Serial nro perustuu FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,lämpö muovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,halkaisu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','aloitustapahtuma nro' ei voi olla pienempi 'päättymistapahtuma nro'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,nettotulos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,nettotulos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ei aloitettu
 DocType: Lead,Channel Partner,välityskumppani
 DocType: Account,Old Parent,Vanha Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,lomien valvonta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,kuoren muovaus
 DocType: Material Request Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",täpättäessä veron arvomäärää pidetään jo sisällettynä tulostetasoon / tulostemäärään
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Laitumelle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,arvopaperit ja talletukset
 DocType: Features Setup,Imports,tuonnit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,pitävä sidos
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Yhteensä lehdet jaetaan on pakollinen
 DocType: Job Opening,Description of a Job Opening,avoimen työn kuvaus
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Vireillä toimintaa tänään
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,osallistumis tietue
 DocType: Bank Reconciliation,Journal Entries,päiväkirjakirjaukset
 DocType: Sales Order Item,Used for Production Plan,käytetään tuotannon suunnitelmassa
-DocType: System Settings,Loading...,Ladataan ...
-DocType: DocField,Password,Salasana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,sulautustallennus mallinnus
 DocType: Manufacturing Settings,Time Between Operations (in mins),toimintojen välinen aika (minuuteissa)
 DocType: Customer,Buyer of Goods and Services.,ostaja tavarat ja palvelut
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,lisätä tilaajia
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ei ole olemassa"
 DocType: Pricing Rule,Valid Upto,voimassa asti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Luetella muutamia asiakkaisiin. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,suorat tulot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,hallintovirkailija
 DocType: Payment Tool,Received Or Paid,Vastaanotettu tai maksettu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
 DocType: Production Order,Additional Operating Cost,lisätoimintokustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kosmetiikka
-DocType: DocField,Type,tyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
-DocType: Communication,Subject,aihe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetiikka
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Netto
 DocType: Employee,Emergency Phone,hätänumero
 ,Serial No Warranty Expiry,sarjanumeron takuu on päättynyt
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,tuote
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,tuloslaskelma
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Toimitusjohtaja Alihankinta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,uusi UOM ei voi olla tyyppi kokonaisluku
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Toimitusjohtaja Alihankinta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,kalusteet ja tarvikkeet
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"taso, jolla hinnasto valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,materiaalitarve
 DocType: Company,Delete Company Transactions,poista yrityksen tapahtumia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,tuote {0} ei ole ostotuote
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} virheellinen osoite 'ilmoitukset \ sähköpostiosoite'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,"laskutuksen kokomaismäärä, tämä vuosi"
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,"laskutuksen kokomaismäärä, tämä vuosi"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Voi poistaa Sarjanumero {0}, koska sitä käytetään varastotapahtumat"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),sulku (cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),sulku (cr)
 DocType: Serial No,Warranty Period (Days),takuuaika (päivää)
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 ,Pending Qty,Odottaa Kpl
 DocType: Job Applicant,Thread HTML,HTML säije
 DocType: Company,Ignore,ohita
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},tekstiviesti lähetetään seuraaviin numeroihin: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
 DocType: Pricing Rule,Valid From,voimassa alkaen
 DocType: Sales Invoice,Total Commission,provisio yhteensä
 DocType: Pricing Rule,Sales Partner,myyntikumppani
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**toimitusten kk jaksotus** auttaa jakamaan budjettia eri kuukausille, jos on kausivaihtelua. **toimitusten kk jaksotus** otetaan **kustannuspaikka** kohdassa."
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,tili- / kirjanpitokausi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",sarjanumeroita ei voi yhdistää
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,vihje tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
-DocType: About Us Settings,Website Manager,verkkosivujen hallinta
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,tilikauden aloituspäivä tule olla suurempi kuin tilikauden päättymispäivä
 DocType: Warranty Claim,Resolution,johtopäätös
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Toimitettu: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toista asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Edellinen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Myynti Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"valitse ne myyntitilaukset, josta haluat tehdä tuotannon tilauksen"
 DocType: Item,Delivered by Supplier (Drop Ship),Toimitetaan Toimittaja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,palkkakomponentteja
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,tietokanta potentiaalisista asiakkaista
+DocType: Authorization Rule,Customer or Item,Asiakas tai Tuote
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,asiakasrekisteri
 DocType: Quotation,Quotation To,tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,rumpuhionta
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Sinun täytyy luoda uusi Tuote käyttää eri Default UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,kohdennettu arvomäärä ei voi olla negatiivinen
 DocType: Purchase Order Item,Billed Amt,"laskutettu, pankkipääte"
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
-DocType: Event,Wednesday,keskiviikko
 DocType: Sales Invoice,Customer's Vendor,asiakkaan tosite
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,tuotannon tilaus vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Ehdotus Kirjoittaminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Ehdotus Kirjoittaminen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,toinen myyjä {0} on jo olemassa samalla työntekijä tunnuksella
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},negatiivisen varaston virhe ({6}) tuotteelle {0} varasto {1}:ssa {2} {3}:lla {4} {5}:ssa
 DocType: Fiscal Year Company,Fiscal Year Company,yrityksen tilikausi
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Oletus Kustannuslaskenta Hinta
 DocType: Maintenance Schedule,Maintenance Schedule,huoltoaikataulu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,asenna Dropbox python moduuli
 DocType: Employee,Passport Number,passin numero
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,hallinta
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ostokuitista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,hallinta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ostokuitista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,sama tuote on syötetty monta kertaa
 DocType: SMS Settings,Receiver Parameter,vastaanottoparametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'perustaja' ja 'ryhmä' ei voi olla samat
 DocType: Sales Person,Sales Person Targets,myyjän tavoitteet
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,(lle)
-apps/frappe/frappe/templates/base.html +145,Please enter email address,syötä sähköpostiosoite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,putkenmuotoilun loppu
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,aktiviteettimuoto
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,säädetyt päivät
 DocType: Sales Invoice,Packing List,pakkausluettelo
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ostotilaukset annetaan Toimittajat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Kustannustoiminta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kustannustoiminta
 DocType: Activity Cost,Projects User,Projektit Käyttäjä
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,käytetty
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ei löydy laskun lisätiedot taulukosta
 DocType: Company,Round Off Cost Center,pyöristys kustannuspaikka
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,huoltokäynti {0} on peruttava ennen myyntitilauksen perumista
 DocType: Material Request,Material Transfer,materiaalisiirto
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),perustaminen (€)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kirjoittamisen aikaleima on sen jälkeen {0}
-apps/frappe/frappe/config/setup.py +59,Settings,asetukset
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,kohdistuneet kustannukset verot ja maksut
 DocType: Production Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Lisää
 DocType: Pricing Rule,Sales Manager,myynninhallinta
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Nimetä uudelleen
 DocType: Journal Entry,Write Off Amount,poiston arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Taipuva
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Salli Käyttäjä
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Neljännesvuosittain
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,syötä tuotten lisätiedot
 DocType: Purchase Receipt,Other Details,muut lisätiedot
 DocType: Account,Accounts,tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,suora jako
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markkinointi
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"jäljitä tuotteen myynti- ja ostotositteet sarjanumeron mukaan, tätä käytetään myös tavaran takuutietojen jäljitykseen"
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan regected kohde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Hylätty Warehouse on pakollista vastaan regected kohde
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
 DocType: Employee,Provide email id registered in company,tarkista sähköpostitunnuksen rekisteröinti yritykselle
 DocType: Hub Settings,Seller City,myyjä kaupunki
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Tarjoa Kirje Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,tyyppipuu
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),provisio taso (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","tositetyypin kirjaus tulee kohdistaa myyntitilaukseen, myyntilaskuun tai päiväkirjaan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ei löydy valuuttakurssi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ilmakehä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,tervetuloa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ilmakehä
 DocType: Journal Entry,Credit Card Entry,luottokorttikirjaus
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,tehtävän aihe
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,tavarat tastaanotettu toimittajilta
-DocType: Communication,Open,Avoin
 DocType: Lead,Campaign Name,Kampanjan nimi
 ,Reserved,Varattu
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ei ole varastotuote
 DocType: Mode of Payment Account,Default Account,oletustili
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"vihje on annettava, jos tilaisuus on tehty vihjeestä"
-DocType: Contact Us Settings,Address Title,osoiteotsikko
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunnitellut End Time
 ,Sales Person Target Variance Item Group-Wise,"tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
-DocType: Dropbox Backup,Daily,päivittäinen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Employee,Cell Number,solunumero
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaali pyynnöt Luotu
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Menetetty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,kuukausipalkka tosite
 DocType: Item Group,Website Specifications,Verkkosivujen tiedot
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,uusi tili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,"kirjanpidon kirjaukset voidaan kodistaa jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
-DocType: ToDo,High,korkeus
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,"kirjanpidon kirjaukset voidaan kodistaa jatkosidoksiin, kohdistus ryhmiin ei ole sallittu"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Opportunity,Maintenance,huolto
-DocType: User,Male,Uros
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},ostokuitin numero vaaditaan tuotteelle {0}
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,myynnin kampanjat
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,henkilökohtainen
 DocType: Expense Claim Detail,Expense Claim Type,kuluvaatimuksen tyyppi
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ostoskorin oletusasetukset
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","päiväkirjakirjaus {0} kohdistuu tilaukseen {1}, täppää mikäli se tulee siirtää etukäteen tähän laskuun"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotekniikka
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","päiväkirjakirjaus {0} kohdistuu tilaukseen {1}, täppää mikäli se tulee siirtää etukäteen tähän laskuun"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotekniikka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,toimitilan huoltokulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Anna Kohta ensin
 DocType: Account,Liability,vastattavat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,taustaperhe
 DocType: Process Payroll,Send Email,lähetä sähköposti
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Varoitus: Virheellinen Liite {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'varastonpäivitys' täppyä ei voi käyttää tuotteita ei ole toimitettu {0} kautta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,omat laskut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,omat laskut
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Yksikään työntekijä ei löytynyt
 DocType: Purchase Order,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Jotta &quot;Point of Sale&quot; ominaisuuksia
 DocType: Bin,Moving Average Rate,liukuva keskiarvo taso
 DocType: Production Planning Tool,Select Items,valitse tuotteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
-DocType: Comment,Reference Name,Viite Name
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: Sales Invoice Item,Target Warehouse,tavoite varasto
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,odotettu toimituspäivä ei voi olla ennen myyntitilauksen päivää
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,kaikki tuoteryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,netto voitto/tappio
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
 DocType: Production Order,Item To Manufacture,tuote valmistukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pysyvä muotti valu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tila on {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ostotilaus to Payment
 DocType: Sales Order Item,Projected Qty,ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,maksun eräpäivä
 DocType: Newsletter,Newsletter Manager,uutiskirjehallinta
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','avautuu'
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
 DocType: Expense Claim,Expenses,kulut
 DocType: Item Variant Attribute,Item Variant Attribute,Tuote Variant Taito
 ,Purchase Receipt Trends,Ostokuitti Trendit
 DocType: Appraisal,Select template from which you want to get the Goals,"valitse mallipohja, johon haluat asettaa tavoitteet"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Tutkimus ja kehitys
 ,Amount to Bill,laskutettava arvomäärä
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ahtaus
 DocType: Item,Re-Order Qty,uudelleentilattava yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,"poistu estoluettelo, päivä"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},aikataulutettu lähettämään {0}:lle
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ei voi siirtää {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
 DocType: Account,Balance must be,taseen on oltava
 DocType: Hub Settings,Publish Pricing,Julkaise Hinnoittelu
 DocType: Notification Control,Expense Claim Rejected Message,kuluvaatimus hylätty viesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Naulaus
 ,Available Qty,saatava yksikkömäärä
 DocType: Purchase Taxes and Charges,On Previous Row Total,edellinen rivi yhteensä
 DocType: Salary Slip,Working Days,työpäivät
 DocType: Serial No,Incoming Rate,saapuva taso
 DocType: Packing Slip,Gross Weight,bruttopaino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"yrityksen nimi, jolle olet luomassa tätä järjestelmää"
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"yrityksen nimi, jolle olet luomassa tätä järjestelmää"
 DocType: HR Settings,Include holidays in Total no. of Working Days,"sisältää vapaapäiviä, työpäiviä yhteensä"
 DocType: Job Applicant,Hold,pidä
 DocType: Employee,Date of Joining,liittymispäivä
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,näytä tilaajia
 DocType: Purchase Invoice Item,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,räjäytys
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,valuuttataso valvonta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,suunnittele materiaalit alituotantoon
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} tulee olla aktiivinen
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,peruuta materiaalikäynti {0} ennen peruutat huoltokäynnin
 DocType: Salary Slip,Leave Encashment Amount,"perintä, arvomäärä"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},sarjanumero {0} ei kuulu tuotteelle {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,vaadittu yksikkömäärä
 DocType: Bank Reconciliation,Total Amount,kokonaisarvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,internet julkaisu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Production Planning Tool,Production Orders,tuotannon tilaukset
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,tase arvo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,myyntihinnasto
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Julkaise synkronoida kohteita
-DocType: GL Entry,Account Currency,Tilin valuutta
+DocType: Bank Reconciliation,Account Currency,Tilin valuutta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,merkitse yrityksen pyöristys tili
 DocType: Purchase Receipt,Range,Alue
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Features Setup,Item Barcode,tuote viivakoodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,tuotemallit {0} päivitetty
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukeminen 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"ostolasku, edistynyt"
 DocType: Address,Shop,osta
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
 DocType: Employee,Permanent Address Is,pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Toiminto suoritettu kuinka monta valmiit tavarat?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,brändi
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,brändi
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Avustus yli- {0} ristissä Kohta {1}.
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
 DocType: Item,Is Purchase Item,on ostotuote
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ostotilaus Kohde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,välilliset tulot
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Aseta Maksusumma = jäljellä
-DocType: Contact Us Settings,Address Line 1,osoiterivi 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,vaihtelu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Yrityksen nimi
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,vaihtelu
+,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,talitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,talitse siirrettävä tuote
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Katso luettelo kaikista ohjevideot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"valitse pankin tilin otsikko, minne shekki/takaus talletetaan"
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,salli käyttäjän muokata hinnaston tasoa tapahtumissa
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemiallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,rivi {0}: maksu kohdistettuna myynti- / ostotilaukseen tulee aina merkitä ennakkomaksuksi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemiallinen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 DocType: Process Payroll,Select Payroll Year and Month,valitse palkkaluettelo vuosi ja kuukausi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","siirry kyseiseen ryhmään (yleensä kohteessa rahastot> lyhytaikaiset vastaavat> pankkitilit ja tee uusi tili (valitsemalla lisää alasidos) ""pankki"""
 DocType: Workstation,Electricity Cost,sähkön kustannukset
 DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työntekijälle syntymäpäivämuistutuksia
-DocType: Comment,Unsubscribed,peruutettu
 DocType: Opportunity,Walk In,kävele sisään
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,kustannuspaikkapuu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,siirretty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,valkoinen
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,lataa kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,valkoinen
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Liitä Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Tehdä
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Liitä Picture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Tehdä
 DocType: Journal Entry,Total Amount in Words,sanat kokonaisarvomäärä
-DocType: Workflow State,Stop,pysäytä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"tapahui virhe: todennäköinen syy on ettet ole tallentanut lomakketta, mikäli ongelma jatkuu ota yhteyttä sähköpostiin support@erpnext.com"
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Ostoskori
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},tilaus tyyppi tulee olla {0}:n
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,avaus yksikkömäärä
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,kuluvaatimus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},yksikkömäärään {0}
 DocType: Leave Application,Leave Application,poistumissovellus
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,poistumiskohdistus työkalu
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jos Kuukausibudjetti ylitetty (varten kululaskelma)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,trimmaus
 DocType: Workstation,Net Hour Rate,netto tuntitaso
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,"kohdistetut kustannukset, ostokuitti"
 DocType: Company,Default Terms,oletus ehdot
 DocType: Packing Slip Item,Packing Slip Item,"pakkauslappu, tuote"
 DocType: POS Profile,Cash/Bank Account,kassa- / pankkitili
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,toimitus (lle)
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,arkistointi
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,alennus
 DocType: Features Setup,Purchase Discounts,Osto Alennukset
 DocType: Workstation,Wages,Palkat
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 DocType: Serial No,Creation Document No,asiakirjan luonti nro
 DocType: Issue,Issue,aihe
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tili ei vastaa Yritys
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP varasto
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},sarjanumero {0} on huoltokannassa {1} asti
 DocType: BOM Operation,Operation,Toiminta
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,myynnin kulut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,perusostaminen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,perusostaminen
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Viestit
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Making Stock Viestit
 DocType: Packing Slip,Net Weight UOM,Nettopaino UOM
 DocType: Item,Default Supplier,oletus toimittaja
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ylituotannon rajoitusprosentti
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,päivitetty aikalokin kautta
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä
 DocType: Opportunity,Your sales person who will contact the customer in future,"Myyjä, joka ottaa yhteyttä asiakkaaseen tulevaisuudessa"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Luetella muutaman oman toimittajia. Ne voivat olla organisaatioita tai yksilöitä.
 DocType: Company,Default Currency,oletusvaluutta
 DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
-DocType: Contact Us Settings,Address,Osoite
 DocType: Expense Claim,From Employee,työntekijästä
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} nolla
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,varoitus: järjestelmä ei tarkista liikalaskutusta sillä tuotteen arvomäärä {0} on {1} nolla
 DocType: Journal Entry,Make Difference Entry,tee erokirjaus
 DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,kuljetus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,kuljetus
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ja vuosi:
 DocType: Email Digest,Annual Expense,Vuosikuluna
 DocType: SMS Center,Total Characters,henkilöt yhteensä
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},valitse BOM tuotteelle BOM kentästä {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-muoto laskutus lisätiedot
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,maksun täsmäytys laskuun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,panostus %
 DocType: Item,website page link,verkkosivusto sivulla linkki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,valmistellaan järjestelmän ensimmäiseen käyttökertaan
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"yrityksen rekisterinumero viitteeksi, vero numerot jne"
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskori toimitus sääntö
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,tuotannon tilaus {0} tulee peruuttaa ennen myyntitilauksen peruutusta
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,valitse aikaloki ja lähetä tehdäksesi uuden myyntilaskun
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,"myyntilasku, ennakko"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Mitään pyytää
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','aloituspäivä' ei voi olla ennen 'päättymispäivää'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,hallinto
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,aikalomakkeen aktiviteetti tyyppit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,sijoitukset valanta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},joko debet- tai kredit arvomäärä vaaditaan {0}:lle
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"sanat näkyvät, kun tallennat palkkalaskelman, nettomaksu"
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiivinen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,sininen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,sininen
 DocType: Purchase Invoice,Is Return,on palautus
 DocType: Price List Country,Price List Country,Hinnasto Maa
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,tulevat sidoket voi olla ainoastaan 'ryhmä' tyyppisiä sidoksia
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profiili {0} on jo luotu käyttäjälle: {1} ja yritykselle {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM muuntokerroin
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminoitu esine valmistus
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,toimittaja tietokanta
 DocType: Account,Balance Sheet,tasekirja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,venytys muovaus
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"myyjä, joka saa muistutuksen asiakkaan yhetdenotosta"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,verot- ja muut palkan vähennykset
 DocType: Lead,Lead,vihje
 DocType: Email Digest,Payables,maksettavat
 DocType: Account,Warehouse,Varasto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettotaso
 DocType: Purchase Invoice Item,Purchase Invoice Item,"ostolasku, tuote"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,varaston tilikirjan- sekä päätilikirjan kirjaukset siirretty ostotositteisiin
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,tuote 1
 DocType: Holiday,Holiday,loma
-DocType: Event,Saturday,lauantai
 DocType: Leave Control Panel,Leave blank if considered for all branches,tyhjä mikäli se pidetään vaihtoehtona kaikissa toimialoissa
 ,Daily Time Log Summary,päivittäinen aikaloki yhteenveto
-DocType: DocField,Label,Etiketti
 DocType: Payment Reconciliation,Unreconciled Payment Details,kohdistamattomien maksujen lisätiedot
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
 DocType: Lead,Call,pyyntö
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,tasekokeilu
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,työntekijän perusmääritykset
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","raja """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ole hyvä ja valitse etuliite ensin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Tutkimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Contact,User ID,käyttäjätunnus
-DocType: Communication,Sent,lähetetty
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,näytä tilikirja
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
-DocType: Communication,Delivery Status,toimituksen tila
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
 DocType: Production Order,Manufacture against Sales Order,valmistus kohdistus myyntitilaukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,tuotteen kuvaus
 DocType: Payment Tool,Payment Mode,maksutila
 DocType: Purchase Invoice,Is Recurring,on toistuva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,suora metalli lasersintraus
 DocType: Purchase Order,Supplied Items,tuotteet toimitettu
 DocType: Production Order,Qty To Manufacture,valmistettava yksikkömäärä
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ylläpidä samaa tasoa läpi ostosyklin
 DocType: Opportunity Item,Opportunity Item,"tilaisuus, tuote"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,tilapäinen avaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,kryomuovaus
 ,Employee Leave Balance,työntekijän poistumistase
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},tilin tase {0} on oltava {1}
 DocType: Address,Address Type,osoitteen tyyppi
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,hae odottavat laskut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,myyntitilaus {0} ei ole kelvollinen
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",yhtiöitä ei voi yhdistää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,pieni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,pieni
 DocType: Employee,Employee Number,työntekijän numero
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,tuote 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,tilin otsikko {0} luotu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,vihreä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,vihreä
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,"yhteensä, saavutettu"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,"yhteensä, saavutettu"
 DocType: Employee,Place of Issue,aiheen alue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,sopimus
-DocType: Report,Disabled,poistettu käytöstä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,sopimus
+DocType: Email Digest,Add Quote,Lisää Lainaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM muuntokerroin vaaditaan UOM {0}:lle tuotteessa: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,rivi {0}: yksikkömäärä vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Maatalous
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Omat tavarat tai palvelut
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Maatalous
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Omat tavarat tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,tämä on kantatuoteryhmä eikä sitä voi muokata
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,nimi vaaditaan
 DocType: Purchase Invoice,Recurring Type,toistuva tyyppi
 DocType: Address,City/Town,kaupunki/kunta
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen verotaso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,odotettu toimituspäivä on pienempi kuin suunniteltu aloituspäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,toimittajalle
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,tilityypin asetukset auttaa valitsemaan oikean tilin tapahtumaan
 DocType: Purchase Invoice,Grand Total (Company Currency),kokonaissumma (yrityksen valuutta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,lähtevät yhteensä
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","vain yksi toimitussääntö voi olla 0 tai tyhjä ""arvoon"":ssa"
 DocType: Authorization Rule,Transaction,tapahtuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,"huom, tämä kustannuspaikka on ryhmä eikä ryhmää kohtaan voi tehdä kirjanpidon kirjauksia"
-apps/frappe/frappe/config/desk.py +7,Tools,työkalut
 DocType: Item,Website Item Groups,tuoteryhmien verkkosivu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,tuotannon tilausnumero vaaditaan valmistuneiden tuotteiden varaston kirjausen osalta
 DocType: Purchase Invoice,Total (Company Currency),yhteensä (yrityksen valuutta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,päiväkirjakirjaus
 DocType: Workstation,Workstation Name,työaseman nimi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,"toimitus, tavoitteet"
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,kommentit
 DocType: Salary Slip,Bank Account No.,pankkitilin nro
 DocType: Naming Series,This is the number of the last created transaction with this prefix,viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},arvotaso vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},arvotaso vaaditaan tuotteelle {0}
 DocType: Quality Inspection Reading,Reading 8,Lukeminen 8
 DocType: Sales Partner,Agent,agentti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","määrä {0} kaikkille tuotteille on nolla, ehkä tulisi muuttaa kontaa ""toimitusmaksu perusteet"""
 DocType: Purchase Invoice,Taxes and Charges Calculation,verot ja maksut laskelma
 DocType: BOM Operation,Workstation,työasema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,kova tavara
 DocType: Attendance,HR Manager,henkilöstön hallinta
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,"arviointi, mallipohja tavoite"
 DocType: Salary Slip,Earning,ansio
 DocType: Payment Tool,Party Account Currency,PartyAccount Valuutta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,tilausten arvo yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,ruoka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,voit kohdistaa aikalokin tuotannon tilaukseen
 DocType: Maintenance Schedule Item,No of Visits,Ei annettu Vierailut
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","uutiskirjeet yhteystiedoiksi, vihjeiksi"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuutta sulkeminen on otettava {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},"kaikista tavoitteiden pisteiden summa  tulee olla 100, nyt se on {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Toimintoja ei voi jättää tyhjäksi.
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,sarjanumerolle ei voi muuttaa varastoa
-DocType: DocField,Description,kuvaus
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
-DocType: Letter Head,Is Default,on oletus
 DocType: Address,Utilities,hyödykkeet
 DocType: Purchase Invoice Item,Accounting,Kirjanpito
 DocType: Features Setup,Features Setup,ominaisuuksien määritykset
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,näytä tarjouskirje
-DocType: Communication,Communication,viestintä
 DocType: Item,Is Service Item,on palvelutuote
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ole hyvä ja valitse Tilikausi
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},alkaen {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,alkaen aikajana
 DocType: Email Digest,For Company,yritykselle
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,tilikartta
 DocType: Material Request,Terms and Conditions Content,ehdot ja säännöt sisältö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,ei aikataulutettu
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 ,Batch-Wise Balance History,"erä työkalu, tasehistoria"
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do - tehtävät luettelo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,opettelu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatiivinen Määrä ei ole sallittua
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","verotaulukkotiedot, jotka merkataan ja tallennetään tähän kenttään noudetaan tuote työkalusta, jota käytetään veroihin ja maksuihin"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitili
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ei aktiivisia Palkkarakenne löytynyt työntekijä {0} ja kuukausi
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,tilin tase
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Verosääntöön liiketoimia.
 DocType: Rename Tool,Type of document to rename.,asiakirjan tyyppi uudelleenimeä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ostamme tätä tuotetta
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,ostamme tätä tuotetta
 DocType: Address,Billing,Laskutus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,laipoitus
-DocType: Bulk Email,Not Sent,Ei lähetetty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,räjäytyksen muodostus
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),verot ja maksut yhteensä (yrityksen valuutta)
 DocType: Shipping Rule,Shipping Account,toimituskulutili
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,aikataulutettu lähettämään vastaanottajille {0}
 DocType: Quality Inspection,Readings,Lukemat
 DocType: Stock Entry,Total Additional Costs,Lisäkustannusten kokonaismäärää
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,alikokoonpanot
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,alikokoonpanot
 DocType: Shipping Rule Condition,To Value,arvoon
 DocType: Supplier,Stock Manager,varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},lähde varasto on pakollinen rivin {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,työaseman työaika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analyytikko
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},rivi {0}: kohdennettavan arvomäärä {1} on oltava suurempi tai yhtä suuri kuin tosite arvomäärä {2}
 DocType: Item,Inventory,inventaario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Jotta &quot;Point of Sale&quot; näkymä
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,maksua ei voi tehdä tyhjällä ostoskorilla
 DocType: Item,Sales Details,myynnin lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,tuotteilla
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,yksikkömääränä
 DocType: Notification Control,Expense Claim Rejected,kuluvaatimus hylätty
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",laskun luontipäivä muodostuu lähettäessä
 DocType: Item Attribute,Item Attribute,tuotetuntomerkki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,hallinto
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,tuotemallit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,hallinto
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,tuotemallit
 DocType: Company,Services,palvelut
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),yhteensä ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),yhteensä ({0})
 DocType: Cost Center,Parent Cost Center,pääkustannuspaikka
 DocType: Sales Invoice,Source,lähde
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,tilikauden aloituspäivä
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,tilikauden aloituspäivä
 DocType: Employee External Work History,Total Experience,kustannukset yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,vastaupotus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,pakkauslaput peruttu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,pakkauslaput peruttu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Material Request Item,Sales Order No,"myyntitilaus, numero"
 DocType: Item Group,Item Group Name,"tuoteryhmä, nimi"
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,otettu
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,otettu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,materiaalisiirto tuotantoon
 DocType: Pricing Rule,For Price List,hinnastoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,edistynyt haku
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
 DocType: Maintenance Schedule,Schedules,aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto arvomäärä
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennuksen arvomäärä (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},virhe: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},virhe: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"tee uusi tili, tilikartasta"
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,asiakas> asiakasryhmä> alue
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,saatava varaston eräyksikkömäärä
 DocType: Time Log Batch Detail,Time Log Batch Detail,aikaloki erä lisätiedot
-DocType: Workflow State,Tasks,tehtävät
 DocType: Landed Cost Voucher,Landed Cost Help,"kohdistetut kustannukset, ohje"
-DocType: Event,Tuesday,tiistai
 DocType: Leave Block List,Block Holidays on important days.,estölomat tärkeinä päivinä
 ,Accounts Receivable Summary,saatava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lehdet tyyppi {0} on jo myönnetty Työsuhde {1} kauden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,UOM nimi
-DocType: Top Bar Item,Target,tavoite
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,panostuksen arvomäärä
 DocType: Sales Invoice,Shipping Address,toimitusosoite
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"tämä työkalu auttaa sinua päivittämään tai korjaamaan varastomäärän ja -arvon järjestelmään, sitä käytetään yleensä synkronoitaessa järjestelmän arvoja ja varaston todellisia fyysisiä arvoja"
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"sanat näkyvät, kun tallennat lähetteen"
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,brändin valvonta
-DocType: ToDo,Due Date,eräpäivä
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,brändin valvonta
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,pl
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,organisaatio
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,pl
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,organisaatio
 DocType: Monthly Distribution,Monthly Distribution,toimitus kuukaudessa
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"vastaanottajalista on tyhjä, tee vastaanottajalista"
 DocType: Production Plan Sales Order,Production Plan Sales Order,tuotantosuunnitelma myyntitilaukselle
 DocType: Sales Partner,Sales Partner Target,myyntikumppani tavoite
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kirjaus {0} voidaan tehdä vain valuutassa: {1}
 DocType: Pricing Rule,Pricing Rule,Hinnoittelu Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kulminta
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,pankkitilit
 ,Bank Reconciliation Statement,pankin täsmäytystosite
 DocType: Address,Lead Name,vihje nimi
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,avaa varastotase
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,avaa varastotase
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} saa esiintyä vain kerran
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan Ostotilaus {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan Ostotilaus {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},poistumiset kohdennettu {0}:n
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,arvomäärät eivät heijastu pankkiin
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,arvomäärät eivät heijastu pankkiin
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,yrityksen kuluvaatimukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,keskipako valanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magneettikenttä-avusteinen viimeistely
 DocType: Company,Default Holiday List,oletus lomaluettelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,varasto vastattavat
 DocType: Purchase Receipt,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 DocType: Production Planning Tool,Select Sales Orders,valitse myyntitilaukset
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joita ei löydy toimittajan tarjouskyselyistä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"seuraa tuotteita viivakoodia käyttämällä, löydät tuotteet lähetteeltä ja myyntilaskulta skannaamalla tuotteen viivakoodin"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merkitse Toimitetaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Merkitse Toimitetaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,tee tarjous
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},muuntokerroin oletus mittayksikkön tulee olla 1 rivillä {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},poistumis tyyppi {0} ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 DocType: SMS Center,Receiver List,Vastaanotin List
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} näytä
 DocType: Salary Structure Deduction,Salary Structure Deduction,"palkkarakenne, vähennys"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Valikoiva lasersintraus
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,tuonti onnistunut!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Määrä saa olla enintään {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ikä (päivää)
 DocType: Quotation Item,Quotation Item,tarjous tuote
 DocType: Account,Account Name,Tilin nimi
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,alkaen päivä ei voi olla suurempi kuin päättymispäivä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,sarjanumero {0} yksikkömäärä {1} ei voi olla murto-osa
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,toimittajatyypin valvonta
 DocType: Purchase Order Item,Supplier Part Number,toimittajan osanumero
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Lisää
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,muuntotaso ei voi olla 0 tai 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} peruuntuu tai keskeytyy
 DocType: Accounts Settings,Credit Controller,kredit valvoja
 DocType: Delivery Note,Vehicle Dispatch Date,ajoneuvon toimituspäivä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,ostokuittia {0} ei ole lähetetty
 DocType: Company,Default Payable Account,oletus maksettava tili
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","online-ostoskorin asetukset, kuten toimitustavat, hinnastot jne"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,määritys valmis
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% laskutettu
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,osapuolitili
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,henkilöstöresurssit
 DocType: Lead,Upper Income,ylemmät tulot
 DocType: Journal Entry Account,Debit in Company Currency,Debit in Company Valuutta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,omat aiheet
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,oletus arvot
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,rivi {0}: maksun arvomäärä ei voi olla negatiivinen
 DocType: Expense Claim,Total Amount Reimbursed,hyvityksen kokonaisarvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,puristussovitin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
 DocType: Payment Reconciliation,Payments,maksut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,kuumaisostaattinen prässi
-DocType: ToDo,Medium,Keskikokoinen
 DocType: Budget Detail,Budget Allocated,"budjetti, kohdennettu"
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,asiakas kredit tase
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,päivitä pankin maksupäivät päiväkirjojen kanssa
 DocType: Quotation,Term Details,ehdon lisätiedot
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
 DocType: Warranty Claim,Warranty Claim,takuuvaatimus
 ,Lead Details,"vihje, lisätiedot"
-DocType: Authorization Rule,Approving User,"hyväksyntä, käyttäjä"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,taonta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pinnoitus
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
 DocType: Pricing Rule,Applicable For,sovellettavissa
 DocType: Bank Reconciliation,From Date,alkaen päivästä
@@ -1420,7 +1308,7 @@
 DocType: Employee,Permanent Address,pysyvä osoite
 apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,tuote {0} on palvelutuote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
-						than Grand Total {2}",Maksettu ennakko vastaan {0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
+						than Grand Total {2}",Maksettu ennakko vastaan {0} {1} ei voi olla suurempi \ kuin Grand Yhteensä {2}
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,valitse tuotekoodi
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),pienennä vähennystä poistuttaessa ilman palkkaa (LWP)
 DocType: Territory,Territory Manager,aluehallinta
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennuksen
 DocType: Selling Settings,Selling Settings,myynnin asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auctions
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auctions
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"määritä määrä, arvotaso tai molemmat"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","yritys, kuukausi ja tilikausi vaaditaan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,tuotteet vähissä raportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","paino on mainittu, \ ssa mainitse  ""paino UOM"" myös"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,tuotteen yksittäisyksikkö
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"aikalokin erä {0} pitää ""lähettää"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,tee kirjanpidon kirjaus kaikille varastotapahtumille
 DocType: Leave Allocation,Total Leaves Allocated,"poistumisten yhteismäärä, kohdennettu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},varastolta vaaditaan rivi nro {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä
 DocType: Employee,Date Of Retirement,eläkkepäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
 DocType: Address,Postal,Posti-
 DocType: Item,Weightage,painoarvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kaivostoiminta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin valu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"saman niminen asiakasryhmä on jo olemassa, vaihda asiakkaan nimi tai nimeä asiakasryhmä uudelleen"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ole hyvä ja valitse {0} ensin.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teksti {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teksti {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,materiaali kuitti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,tavarat
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,tavarat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},osapuolitili sekä osapuoli vaaditaansaatava / maksettava tilille {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",mikäli tällä tuotteella on useita malleja sitä ei voi valita myyntitilaukseen yms
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},vaadittu tuotemäärä {0} rivillä {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},vaadittu tuotemäärä {0} rivillä {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},varastoa {0} ei voi poistaa silla siellä on tuotteita {1}
 DocType: Quotation,Order Type,tilaus tyyppi
 DocType: Purchase Invoice,Notification Email Address,sähköpostiosoite ilmoituksille
 DocType: Payment Tool,Find Invoices to Match,etsi täsmäävät laskut
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","esim, ""XYZ kansallinen pankki"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","esim, ""XYZ kansallinen pankki"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,tavoite yhteensä
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,tavoite yhteensä
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Ostoskori on käytössä
 DocType: Job Applicant,Applicant for a Job,työn hakija
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,tuotannon tilauksia ei ole tehty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,työntekijöiden palkkalaskelma {0} on jo luotu tässä kuussa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,työntekijöiden palkkalaskelma {0} on jo luotu tässä kuussa
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Sales Invoice Item,Batch No,erän nro
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Tärkein
-DocType: DocPerm,Delete,poista
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,malli
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Uusi {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,aseta sarjojen numeroinnin etuliite tapahtumiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"pysäytettyä tilausta ei voi peruuttaa peruuttaa, käynnistä se jotta voit peruuttaa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,perintä?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Item,Variants,mallit
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,lähetä kenelle
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,työn hakija.
 DocType: Purchase Order Item,Warehouse and Reference,Varasto ja viite
 DocType: Supplier,Statutory info and other general information about your Supplier,toimittajan lakisääteiset- ja muut päätiedot
-DocType: Country,Country,maa
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,osoitteet
-DocType: Communication,Received,Vastaanotettu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},monista tuotteelle kirjattu sarjanumero {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,edellyttää toimitustapaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,tuotteella ei voi olla tuotannon tilausta
-DocType: DocField,Attach Image,liitä kuva
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"pakkauksen nettopaino, summa lasketaan automaattisesti tuotteiden nettopainoista"
-DocType: Stock Reconciliation Item,Leave blank if no change,tyhjä ellei muutoksia
 DocType: Sales Order,To Deliver and Bill,toimitukseen ja laskutukseen
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,aikaloki valmistukseen
 DocType: Item,Apply Warehouse-wise Reorder Level,käytä varasto työkalua uuden ostotilauksen suositusarvon määrittämiseen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} tulee lähettää
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,aikaloki tehtävät
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Maksu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Maksu
 DocType: Production Order Operation,Actual Time and Cost,todellinen aika ja hinta
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},materiaalipyyntö max {0} voidaan tehdä tuotteelle {1} kohdistettuna myyntitilaukseen {2}
 DocType: Employee,Salutation,titteli/tervehdys
-DocType: Communication,Rejected,Hylätty
 DocType: Pricing Rule,Brand,brändi
 DocType: Item,Will also apply for variants,sovelletaan myös muissa malleissa
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,kokoa tuotteet myyntihetkellä
 DocType: Sales Order Item,Actual Qty,todellinen yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
 DocType: Hub Settings,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Päällekkäisiä tuotteita on syötetty. Korjaa ja yritä uudelleen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Arvo {0} varten Taito {1} ei ole luettelossa voimassa Tuote attribuuttiarvojen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,kolleega
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,vanhentunut
 DocType: Packing Slip,To Package No.,pakkausnumeroon
-DocType: DocType,System,järjestelmä
 DocType: Warranty Claim,Issue Date,aiheen päivä
 DocType: Activity Cost,Activity Cost,aktiviteettikustannukset
 DocType: Purchase Receipt Item Supplied,Consumed Qty,käytetty yksikkömäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,tietoliikenne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,tietoliikenne
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 DocType: Payment Tool,Make Payment Entry,tee maksukirjaus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
 ,Sales Invoice Trends,"myyntilasku, trendit"
 DocType: Leave Application,Apply / Approve Leaves,käytä / hyväksy poistumiset
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Varten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
 DocType: Stock Settings,Allowance Percent,Päästöoikeuden Prosenttia
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",myynnin tulee olla täpättynä mikäli saatavilla {0} on valittu
 DocType: Purchase Order Item,Supplier Quotation Item,"toimittajan tarjouskysely, tuote"
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,tee palkkarakenne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,leikkauslujuus
 DocType: Item,Has Variants,on useita malleja
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,valitse 'tee myyntilasku' painike ja tee uusi myyntilasku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,pakkaukset ja merkinnät
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 DocType: Sales Person,Parent Sales Person,emomyyjä
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,syötä yrityksen oletusvaluutta kohdassa yrityksen valvonta ja yleiset oletusasetukset
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox pääsy salaus
 DocType: Purchase Invoice,Recurring Invoice,toistuva Lasku
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Toimitusjohtaja Projektit
 DocType: Supplier,Supplier of Goods or Services.,toimittaja tavarat tai palvelut
 DocType: Budget Detail,Fiscal Year,tilikausi
 DocType: Cost Center,Budget,budjetti
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,saavutettu
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,alueella / asiakas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"esim, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,"esim, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"sanat näkyvät, kun tallennat myyntilaskun"
 DocType: Item,Is Sales Item,on myyntituote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,tuoteryhmäpuu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"tuotteelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
 ,Amount to Deliver,toimitettava arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,tavara tai palvelu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,oli virheitä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,naputus
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,tavara tai palvelu
 DocType: Naming Series,Current Value,nykyinen arvo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,tehnyt {0}
 DocType: Delivery Note Item,Against Sales Order,myyntitilauksen kohdistus
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
 DocType: Website Item Group,Website Item Group,tuoteryhmän verkkosivu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,tullit ja verot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Anna Viiteajankohta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Anna Viiteajankohta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,verkkosivuilla näkyvien tuotteiden taulukko
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
 DocType: Material Request Item,Material Request Item,tuote materiaalipyyntö
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,tuoteryhmien puu
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,tuoteryhmien puu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,punainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,punainen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,avoimet tuotannon tilausket
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"rivi # {0}: toiminto {1} ei ole valmis {2} valmiiden tuotteiden yksikkömäärä tuotantotilauksessa # {3}, päivitä toiminnon tila aikalokin kautta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,muuta tuotteen UOM
 DocType: Quality Inspection Reading,Acceptance Criteria,hyväksymiskriteerit
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},tuote {0} tulee olla myynti- tai palvelutuotteessa {1}
 DocType: Item Group,Show In Website,näytä verkkosivustossa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ryhmä
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,ryhmä
 DocType: Task,Expected Time (in hours),odotettu aika (tunteina)
 ,Qty to Order,tilattava yksikkömäärä
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","seuraa brändin nimeä seuraavissa asiakirjoissa: lähete, tilaisuus, materiaalipyyntö, tuote, ostotilaus, ostokuitti, tarjous, myyntilasku, tavarakokonaisuus, myyntitilaus ja sarjanumero"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,tyhjennä taulukko
 DocType: Features Setup,Brands,brändit
 DocType: C-Form Invoice Detail,Invoice No,laskun nro
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ostotilauksesta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ostotilauksesta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jätä ei voida soveltaa / peruuttaa ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 ,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet
 DocType: Employee,Resignation Letter Date,Eroaminen Letter Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,hinnoittelusäännöt on suodatettu määrän mukaan
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ei asetettu
-DocType: Communication,Date,päivä
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toista Asiakas Liikevaihto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"odota kunnes järjestelmä määritetty, tämä saattaa kestää hetken"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pari
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pari
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 DocType: Maintenance Schedule Detail,Actual Date,todellinen päivä
 DocType: Item,Has Batch No,on erä nro
 DocType: Delivery Note,Excise Page Number,poisto sivunumero
 DocType: Employee,Personal Details,henkilökohtaiset lisätiedot
 ,Maintenance Schedules,huoltoaikataulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,pakotus
 ,Quotation Trends,"tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",mikäli tälle tuotteelle sallitaan tuotannon tilaus sen tulee olla varastotuote
 DocType: Shipping Rule Condition,Shipping Amount,toimituskustannus arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Liittyminen
-DocType: Authorization Rule,Above Value,yläarvo
 ,Pending Amount,odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
 DocType: Purchase Order,Delivered,toimitettu
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),määritä työpaikkahaun sähköpostin saapuvan palvelimen asetukset (esim ura@example.com)
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvojen lukumäärä
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,päivä jolloin toistuva lasku lakkaa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Yhteensä myönnetty lehdet {0} ei voi olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Journal Entry,Accounts Receivable,saatava tilit
 ,Supplier-Wise Sales Analytics,"toimittaja työkalu, myyntianalyysi"
 DocType: Address Template,This format is used if country specific format is not found,tätä muotoa käytetään ellei alueelle määriteltyä muotoa löydy
-DocType: Custom Field,Custom,oma
 DocType: Production Order,Use Multi-Level BOM,käytä useampi asteista BOM:ia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ruisku muovaus
 DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,tilipuu
 DocType: Leave Control Panel,Leave blank if considered for all employee types,tyhjä mikäli se pidetään vaihtoehtona  kaikissa työntekijä tyypeissä
 DocType: Landed Cost Voucher,Distribute Charges Based On,toimitusmaksut perustuen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,tili {0} tulee olla 'pitkaikaiset vastaavat' tili sillä tuotella {1} on tasearvo
 DocType: HR Settings,HR Settings,henkilöstön asetukset
-apps/frappe/frappe/config/setup.py +130,Printing,Painaminen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennuksen arvomäärä
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"anotut poissaolopäivät lomapäiviä, sinun ei tarvitse anoa lupaa"
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ja
 DocType: Leave Block List Allow,Leave Block List Allow,"poistu estoluettelo, salli"
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,urheilu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"yhteensä, todellinen"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,yksikkö
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,määritä Dropbox pääsyn asetukset
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,yksikkö
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ilmoitathan Company
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"varasto, jossä säilytetään hylätyt tuotteet"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Tilikautesi päättyy
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tilikautesi päättyy
 DocType: POS Profile,Price List,Hinnasto
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,kuluvaatimukset
 DocType: Issue,Support,tuki
-DocType: Authorization Rule,Approving Role,"hyväksyntä, rooli"
 ,BOM Search,BOM haku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),sulku (avaus + summat)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,määritä yrityksen valuutta
 DocType: Workstation,Wages per hour,Tuntipalkat
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","näytä / piilota ominaisuuksia kuten sarjanumero, POS jne"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat Materiaali pyynnöt on esitetty automaattisesti perustuu lähetyksen uudelleen jotta taso
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM muuntokerroin vaaditaan rivillä {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},tilityspäivä ei voi olla ennen tarkistuspäivää rivillä {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},tilityspäivä ei voi olla ennen tarkistuspäivää rivillä {0}
 DocType: Salary Slip,Deduction,vähennys
 DocType: Address Template,Address Template,"osoite, mallipohja"
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,syötä työntekijätunnu tälle myyjälle
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,tarjous
 DocType: Salary Slip,Total Deduction,vähennys yhteensä
 DocType: Quotation,Maintenance User,"huolto, käyttäjä"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,kustannukset päivitetty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,syntymäpäivä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,tuote {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** kaikki tilikauden kirjanpitoon kirjatut tositteet ja päätapahtumat on jäljitetty **tilikausi**
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varoitus: Virheellinen SSL-varmenteen kiinnittymiseen {0}
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,työn kuvaus
 DocType: Purchase Order Item,Qty as per Stock UOM,yksikkömäärä / varasto UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Valitse kelvollinen csv tiedoston tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,päällystetään
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
 DocType: Expense Claim,Approver,hyväksyjä
 ,SO Qty,myyntitilaukset yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",varaston kirjauksia on kohdistettuna varastoon {0} joten uudelleenmääritys tai muokkaus ei onnistu
 DocType: Appraisal,Calculate Total Score,laske yhteispisteet
 DocType: Supplier Quotation,Manufacturing Manager,valmistuksenhallinta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
-apps/erpnext/erpnext/hooks.py +84,Shipments,toimitukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,kastomuovaus
-DocType: Purchase Order,To be delivered to customer,Toimitetaan asiakkaalle
+apps/erpnext/erpnext/hooks.py +68,Shipments,toimitukset
+DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,aikalokin tila pitää lähettää
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,perusmääritykset
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rivi #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rivi #
 DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta)
 DocType: Pricing Rule,Supplier,toimittaja
 DocType: C-Form,Quarter,Neljännes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,sekalaiset kulut
 DocType: Global Defaults,Default Company,oletus yritys
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista "
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista"
 DocType: Employee,Bank Name,pankin nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-yllä
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,käyttäjä {0} on poistettu käytöstä
 DocType: Leave Application,Total Leave Days,"poistumisten yhteismäärä, päivät"
-DocType: Journal Entry Account,Credit in Account Currency,Luotto Tilin Valuutta
 DocType: Email Digest,Note: Email will not be sent to disabled users,huom: sähköpostia ei lähetetä käytöstä poistetuille käyttäjille
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,valitse yritys...
 DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Currency Exchange,From Currency,valuutasta
-DocType: DocField,Name,Nimi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,arvomäärät eivät heijastu järjestelmässä
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","valitse kohdennettava arvomäärä, laskun tyyppi ja laskun numero vähintään yhdelle riville"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},myyntitilaus vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,arvomäärät eivät heijastu järjestelmässä
 DocType: Purchase Invoice Item,Rate (Company Currency),taso (yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Muut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Muut
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ei löydä vastaavia Tuote. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,valmistunut
-DocType: Web Form,Select DocType,valitse asiakirjatyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,lähesty /avaa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,pankkitoiminta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,pankkitoiminta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,uusi kustannuspaikka
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,uusi kustannuspaikka
 DocType: Bin,Ordered Quantity,tilattu määrä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
 DocType: Quality Inspection,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
 DocType: Purchase Order Item,Reference Document Type,Viite Asiakirjan tyyppi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,pitkaikaiset vastaavat
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
 DocType: Time Log Batch,Total Billing Amount,laskutuksen kokomaisarvomäärä
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,saatava tili
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,myyntitilauksesta maksuun
 DocType: Expense Claim Detail,Expense Claim Detail,kuluvaatimus lisätiedot
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,aikaloki on luotu:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,paino UOM
 DocType: Employee,Blood Group,Veriryhmä
 DocType: Purchase Invoice Item,Page Break,Sivunvaihto
 DocType: Production Order Operation,Pending,odottaa
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,seuraavat käyttäjät voivat hyväksyä määriteltyjen työntekijöiden poistumissovellukset
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Et voi muuttaa oletuksena UOM Variant. Oletusasetusten UOM muunnokseen muutos oletus UOM mallin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Office Kalusto
 DocType: Purchase Invoice Item,Qty,yksikkömäärä
 DocType: Fiscal Year,Companies,Yritykset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,elektroniikka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektroniikka
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,korota materiaalipyyntö kun varastoarvo saavuttaa uuden ostotilauksen tason
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,huoltoaikataulusta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,päätoiminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,päätoiminen
 DocType: Purchase Invoice,Contact Details,"yhteystiedot, lisätiedot"
 DocType: C-Form,Received Date,Saivat Date
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",mikäli olet tehnyt perusmallipohjan myyntiveroille ja maksumallin valitse se ja jatka alla olevalla painikella
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,maksun täsmäytys
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,valitse vastuuhenkilön nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,teknologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,teknologia
 DocType: Offer Letter,Offer Letter,Tarjoa Kirje
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,muodosta materiaalipyymtö (MRP) ja tuotantotilaus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,"kokonaislaskutus, pankkipääte"
 DocType: Time Log,To Time,aikaan
+DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",tutki puita ja lisää alasidoksia klikkaamalla sidosta johon haluat lisätä sidoksia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM palautus: {0} ei voi pää tai alasidos {2}
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,hinnasto {0} on poistettu käytöstä
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,asiakkaan tuotekoodit
 DocType: Opportunity,Lost Reason,hävitty syy
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,kohdista maksukirjaukset tilauksiin tai laskuihin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,hitsata
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,uusi varasto UOM vaaditaan
 DocType: Quality Inspection,Sample Size,näytteen koko
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,kaikki tuotteet on jo laskutettu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Määritä kelvollinen &quot;Case No.&quot;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 DocType: Project,External,ulkoinen
 DocType: Features Setup,Item Serial Nos,tuote sarjanumerot
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,käyttäjät ja käyttöoikeudet
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,todellinen määrä
 DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,sarjanumeroa {0} ei löydy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,prässimuovaus
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Omat asiakkaat
 DocType: Leave Block List Date,Block Date,estopäivä
 DocType: Sales Order,Not Delivered,toimittamatta
 ,Bank Clearance Summary,pankin tilitysyhteenveto
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,tuotekoodi> tuoteryhmä> brändi
 DocType: Appraisal Goal,Appraisal Goal,arvioinnin tavoite
-DocType: Event,Friday,perjantai
 DocType: Time Log,Costing Amount,"kustannuslaskenta, arvomäärä"
 DocType: Process Payroll,Submit Salary Slip,lähetä palkkalaskelma
 DocType: Salary Structure,Monthly Earning & Deduction,kuukausittainen ansio & vähennys
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,tuo massana
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
 DocType: SMS Log,Sender Name,lähettäjän nimi
-DocType: Page,Title,otsikko
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,muokata
 DocType: POS Profile,[Select],[valitse]
 DocType: SMS Log,Sent To,lähetetty kenelle
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,tee myyntilasku
 DocType: Company,For Reference Only.,vain viitteeksi
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},virheellinen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,ennakko arvomäärä
 DocType: Manufacturing Settings,Capacity Planning,kapasiteetin suunnittelu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'aloituspäivä' vaaditaan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'aloituspäivä' vaaditaan
 DocType: Journal Entry,Reference Number,viitenumero
 DocType: Employee,Employment Details,"työsopimus, lisätiedot"
 DocType: Employee,New Workplace,Uusi Työpaikka
@@ -1873,14 +1724,14 @@
 apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ei Item kanssa Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,mikäli sinulla on myyntitiimi ja myyntikumppaneita (välityskumppanit) voidaan ne tagata ja ylläpitää niiden panostusta myyntiaktiviteetteihin
-DocType: Item,Show a slideshow at the top of the page,näytä diaesitys sivun yläreunassa 
+DocType: Item,Show a slideshow at the top of the page,näytä diaesitys sivun yläreunassa
 DocType: Item,"Allow in Sales Order of type ""Service""","salli myyntitilaukset tyypille ""palvelu"""
 apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,varastoi
 DocType: Time Log,Projects Manager,"projektihallinta, pääkäyttäjä"
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
 DocType: Item,End of Life,elinkaaren loppu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,matka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,matka
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Asiakas Mobile Ei
 DocType: Sales Invoice,Recurring,Toistuva
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Nimeä Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,päivitä kustannukset
 DocType: Item Reorder,Item Reorder,tuote tiedostot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,materiaalisiirto
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","määritä toiminnot, käyttökustannukset ja anna toiminnoille oma uniikki numero"
 DocType: Purchase Invoice,Price List Currency,"hinnasto, valuutta"
 DocType: Naming Series,User must always select,käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
 DocType: Installation Note,Installation Note,asennus huomautus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,lisää veroja
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,lisää veroja
 ,Financial Analytics,talousanalyysi
 DocType: Quality Inspection,Verified By,vahvistanut
 DocType: Address,Subsidiary,tytäryhtiö
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","yrityksen oletusvaluuttaaei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
 DocType: Quality Inspection,Purchase Receipt No,Ostokuitti No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
-DocType: System Settings,In Hours,tunteina
 DocType: Process Payroll,Create Salary Slip,tee palkkalaskelma
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,odotettu tase / pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,puskuroi
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,odotettu tase / pankki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),rahoituksen lähde (vieras pääoma)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
 DocType: Appraisal,Employee,työntekijä
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,tositteen ryhmä
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,perus
 DocType: Rename Tool,File to Rename,uudelleennimettävä tiedosto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Näytä Maksut
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,koko
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
 DocType: Notification Control,Expense Claim Approved,kuluvaatimus hyväksytty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,myyntitilaus vaaditaan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,tee asiakas
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lukeminen 9
 DocType: Supplier,Is Frozen,on jäädytetty
 DocType: Buying Settings,Buying Settings,ostotoiminnan asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass viimeistely
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nro valmiille tuotteelle
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),määritä myynnin sähköpostin saapuvan palvelimen asetukset (esim myynti@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,maksutili
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,luonnos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,korvaava on pois
 DocType: Quality Inspection Reading,Accepted,hyväksytyt
-DocType: User,Female,nainen
-DocType: Journal Entry Account,Debit in Account Currency,Debit Account Valuutta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
-DocType: Print Settings,Modern,Nykyaikainen
-DocType: Communication,Replied,Vastasi
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
 DocType: Payment Tool,Total Payment Amount,maksujen kokonaisarvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei voi olla suurempi arvo kuin suunniteltu tuotantomäärä ({2}) tuotannon tilauksessa {3}
 DocType: Shipping Rule,Shipping Rule Label,toimitus sääntö etiketti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,raaka-aineet ei voi olla tyhjiä
 DocType: Newsletter,Test,testi
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","tuotteella on varastotapahtumia \ ei voi muuttaa arvoja ""sarjanumero"", ""eränumero"", ""varastotuote"" ja ""arvomenetelmä"""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Nopea Päiväkirjakirjaus
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"tasoa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
 DocType: Stock Entry,For Quantity,yksikkömäärään
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Pyynnöt kohteita.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,erillinen tuotannon tilaus luodaan jokaiselle valmistuneelle tuotteelle
 DocType: Purchase Invoice,Terms and Conditions1,ehdot ja säännöt 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,määritykset suoritettu loppuun
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","kirjanpidon kirjaus on toistaiseksi jäädytetty, vain alla mainitussa roolissa voi tällä hetkellä kirjata / muokata tiliä"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,tallenna asiakirja ennen huoltoaikataulun muodostusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti Status
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Uutiskirje Postituslista
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
+DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
 DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, johon tämä yhteystieto kuuluu"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"yhteensä, puuttua"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,mittayksikkö
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,mittayksikkö
 DocType: Fiscal Year,Year End Date,Vuoden lopetuspäivä
 DocType: Task Depends On,Task Depends On,tehtävä riippuu
 DocType: Lead,Opportunity,tilaisuus
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Hinta (per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Ei annettu Pyydetty SMS
 DocType: Campaign,Campaign-.####,kampanja -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Läpitunkeva
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
 DocType: Customer Group,Has Child Node,alasidoksessa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, täppää {2} saadaksesi lisätietoja"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"tämä on demo verkkosivu, joka on muodostettu automaattisesti ERPNext:ssä"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,vanhentumisen skaala 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemiallinen koneistus
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","perusveromallipohja, jota voidaan käyttää kaikkiin ostotapahtumiin. tämä mallipohja voi sisältää listan perusveroista ja myös muita veroja, kuten ""toimitus"", ""vakuutus"", ""käsittely"" jne #### huomaa että tänne määritelty veroprosentti tulee olemaan oletus kaikille **tuotteille**, mikäli **tuotteella** on eri veroprosentti tulee se määritellä **tuotteen vero** taulukossa **tuote** työkalussa. #### sarakkeiden kuvaus 1. laskennan tyyppi: - tämä voi olla **netto yhteensä** (eli summa perusarvosta). - **edellisen rivin summa / määrä ** (kumulatiivisille veroille tai maksuille, mikäli tämän on valittu edellisen rivin vero lasketaan prosentuaalisesti (verotaulukon) mukaan arvomäärästä tai summasta 2. tilin otsikko: tilin tilikirja, johon verot varataan 3. kustannuspaikka: mikäli vero / maksu on tuloa (kuten toimitus) tai kulua tulee se varata kustannuspaikkaa vastaan 4. kuvaus: veron kuvaus (joka tulostetaan laskulla / tositteella) 5. taso: veroprosentti. 6. määrä: veron arvomäärä 7. yhteensä: kumulatiivinen yhteissumma tähän asti. 8. syötä rivi: mikäli käytetään riviä ""edellinen rivi yhteensä"", voit valita rivin numeron, jota käytetään laskelman pohjana 9. pidä vero tai kustannus: tässä osiossa voit määrittää, jos vero / kustannus on pelkkä arvo (ei kuulu summaan) tai pelkästään summaan (ei lisää tuotteen arvoa) tai kumpaakin 10. lisää tai vähennä: voit lisätä tai vähentää veroa"
-DocType: Note,Note,Huomata
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
-DocType: Email Account,Email Ids,sähköpostitunnukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ei voi valmistaa suurempaa määrää tuotteita {0} kuin myyntitilauksen määrä {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,pankki / kassa
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Global Defaults,Hide Currency Symbol,piilota valuuttasymbooli
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,hyvityslasku
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},valmiit yksikkömäärä voi olla enintään {0} toimintoon {1}
 DocType: Features Setup,Quality,Laatu
-DocType: Contact Us Settings,Introduction,esittely
 DocType: Warranty Claim,Service Address,palveluosoite
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,max 100 riviä varaston täsmäytyksessä
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,max 100 riviä varaston täsmäytyksessä
 DocType: Stock Entry,Manufacture,Valmistus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ensin lähete
 DocType: Purchase Invoice,Currency and Price List,Valuutta ja hinnasto
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,tilityspäivää ei ole mainittu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,tuotanto
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,tilityspäivää ei ole mainittu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,tuotanto
 DocType: Item,Allow Production Order,salli tuotannon tilaus
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
 DocType: Lead,Fax,faksi
 DocType: Purchase Taxes and Charges,Parenttype,emotyyppi
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,lähetetty
 DocType: Salary Structure,Total Earning,ansiot yhteensä
 DocType: Purchase Receipt,Time at which materials were received,vaihtomateriaalien vastaanottoaika
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,omat osoitteet
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"organisaatio, toimiala valvonta"
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,tai
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-yli
 DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
-,Download Backups,lataa varmuuskopiot
 DocType: Notification Control,Sales Order Message,"myyntitilaus, viesti"
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","aseta oletusarvot kuten yritys, valuutta, kuluvan tilikausi jne"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,maksun tyyppi
 DocType: Process Payroll,Select Employees,valitse työntekijät
 DocType: Bank Reconciliation,To Date,päivään
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,lisätiedot
 DocType: Purchase Invoice,Total Taxes and Charges,verot ja maksut yhteensä
 DocType: Employee,Emergency Contact,hätäyhteydenotto
 DocType: Item,Quality Parameters,laatuparametrit
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,sarjanumero / erä
 DocType: Product Bundle,Parent Item,Parent Kohde
 DocType: Account,Account Type,Tilin tyyppi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Jätä Tyyppi {0} ei voida tehdä, toimitetaan"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,tuotantoon
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Varattu Määrä
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostokuitti Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,muotojen muokkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,leikkaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,tasoitus
 DocType: Account,Income Account,tulotili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Reunus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
-apps/frappe/frappe/desk/moduleview.py +61,Documents,asiakirjat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Viite
 DocType: Cost Center,Cost Center,kustannuspaikka
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,tosite #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,tosite #
 DocType: Notification Control,Purchase Order Message,Ostotilaus Message
 DocType: Tax Rule,Shipping Country,Toimitusmaa
 DocType: Upload Attendance,Upload HTML,lataa HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",ennakot yhteensä ({0}) kohdistettuna tilauksiin {1} ei voi olla suurempi \ kuin kokonaissumma ({2})
 DocType: Employee,Relieving Date,Lievittää Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla
 DocType: Employee Education,Class / Percentage,luokka / prosenttia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,verkkomuotoiluun suunniteltu laser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,markkinoinnin ja myynnin pää
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,tulovero
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","mikäli 'hinnalle' on tehty hinnoittelusääntö se korvaa hinnaston, hinnoittelusääntö on lopullinen hinta joten lisäalennusta ei voi antaa, näin myyntitilaus, ostotilaus ym tapahtumaissa tuote sijoittuu paremmin 'arvo' kenttään 'hinnaston arvo' kenttään"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,jäljitä vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,uuden kustannuspaikan nimi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,"poistu, ohjauspaneeli"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"oletus osoite, mallipohjaa ei löytynyt, luo uusi mallipohja kohdassa määritykset> tulostus ja brändäys> osoitemallipohja"
 DocType: Appraisal,HR User,henkilöstön käyttäjä
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
 ,Pending SO Items For Purchase Request,"ostettavat pyyntö, odottavat myyntitilaukset"
 DocType: Supplier,Billing Currency,Laskutus Valuutta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,erittäin suuri
 ,Profit and Loss Statement,tuloslaskelma selvitys
 DocType: Bank Reconciliation Detail,Cheque Number,takaus/shekki numero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Painamalla
 DocType: Payment Tool Detail,Payment Tool Detail,maksutyökalu lisätiedot
 ,Sales Browser,myyntiselain
 DocType: Journal Entry,Total Credit,kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Suuri
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Yksikään työntekijä ei löytynyt!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Suuri
 DocType: C-Form Invoice Detail,Territory,alue
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,vierailujen määrä vaaditaan
 DocType: Purchase Order,Customer Address Display,Asiakkaan osoite Näyttö
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Kiillotus
 DocType: Production Order Operation,Planned Start Time,Suunnitellut Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,sulje tase ja tuloslaskelma kirja
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Oletus mittayksikkö Tuote {0} ei voi muuttaa suoraan, koska \ olet jo tehnyt joitakin tapahtuma (s) toisen UOM. Oletusasetusten UOM, \ käyttö &quot;UOM Vaihda Utility&quot; työkalu alla Stock moduuli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,tarjous {0} on peruttu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,tarjous {0} on peruttu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,odottava arvomäärä yhteensä
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"työntekijä {0} on poissa {1}, ei voi merkitä osallistumista"
 DocType: Sales Partner,Targets,tavoitteet
@@ -2175,19 +1999,18 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
 ,S.O. No.,myyntitilaus nro
 DocType: Production Order Operation,Make Time Log,Tee Time Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Aseta tilausrajaa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},tee asiakasvihje {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,tietokoneet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,sähkökemiallinen hionta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,tämä on kanta-asiakasryhmä eikä sitä voi muokata
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,määritä tilikartta ennen kirjanpidon kirjausten aloittamista
 DocType: Purchase Invoice,Ignore Pricing Rule,ohita hinnoittelu sääntö
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,peruttu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,päivästä ei voi olla pienempi kuin työntekijän aloituspäivä palkkarakenteessa
 DocType: Employee Education,Graduate,valmistunut
 DocType: Leave Block List,Block Days,estopäivää
 DocType: Journal Entry,Excise Entry,aksiisikirjaus
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varoitus: Myyntitilaus {0} on jo olemassa vastaan Asiakkaan Ostotilaus {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Varoitus: Myyntitilaus {0} on jo olemassa vastaan Asiakkaan Ostotilaus {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","täppää toistuva lasku, lopettaaksesi toistumisen poista täppä tai aseta päätöspäivä"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
 DocType: Packing Slip,If more than one package of the same type (for print),mikäli useampi saman tyypin pakkaus (tulostus)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Suurin {0} rivit sallittu
 DocType: C-Form Invoice Detail,Net Total,netto yhteensä
 DocType: Bin,FCFS Rate,FCFS taso
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),laskutus (myyntilasku)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Tarkoituksiin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,vähintään yhdellä tuottella tulee olla negatiivinen määrä palautus asiakirjassa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","tuote {0} kauemmin kuin mikään saatavillaoleva työaika työasemalla {1}, hajoavat toiminta useiksi toiminnoiksi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,sähkökemiallinen työstö
 ,Requested,Pyydetty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ei Huomautuksia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Myöhässä
 DocType: Account,Stock Received But Not Billed,varasto vastaanotettu mutta ei laskutettu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root on ryhmä
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,bruttomaksu + jäännösarvomäärä + perintä määrä - vähennys yhteensä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Features Setup,Sales and Purchase,myynti ja osto
 DocType: Supplier Quotation Item,Material Request No,materiaalipyyntö nro
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},tuotteelle {0} laatutarkistus
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"taso, jolla asiakkaan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} on poistettu tästä luettelosta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),nettotaso (yrityksen valuutta)
-apps/frappe/frappe/templates/base.html +134,Added,lisätty
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,myyntilasku
 DocType: Journal Entry Account,Party Balance,osatase
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,tilikautta {0} ei löydy
 DocType: Bank Reconciliation,Get Relevant Entries,hae tarvittavat kirjaukset
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,kirjanpidon varaston kirjaus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,lyönti
 DocType: Sales Invoice,Sales Team1,myyntitiimi 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
-apps/frappe/frappe/desk/query_report.py +136,Total,yhteensä
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
 DocType: Account,Root Type,kantatyyppi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),veron arvomäärä alennusten jälkeen (yrityksen valuutta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},tavoite varasto on pakollinen rivin {0}
 DocType: Quality Inspection,Quality Inspection,laatutarkistus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ruisku muovaaminen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,erittäin suuri
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,varoitus: pyydetty materiaali yksikkömäärä on pienempi kuin vähimmäis ostotilausmäärä
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ruoka, juoma ja tupakka"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL tai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Pienin Inventory Level
 DocType: Stock Entry,Subcontract,alihankinta
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,valmistajan osanumero
 DocType: Production Order Operation,Estimated Time and Cost,arvioitu aika ja kustannus
 DocType: Bin,Bin,Astia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nuuskia
 DocType: SMS Log,No of Sent SMS,Ei annettu Lähetetyt SMS
 DocType: Account,Company,Yritys
 DocType: Account,Expense Account,kulutili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ohjelmisto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ohjelmisto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,väritä
 DocType: Maintenance Visit,Scheduled,aikataulutettu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","valitse tuote joka ""varastotuote"", ""numero"" ja ""myyntituote"" valinnat täpätty kohtaan ""kyllä"", tuotteella ole muuta tavarakokonaisuutta"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,valitse toimitusten kk jaksotus tehdäksesi kausiluonteiset toimitusttavoitteet
 DocType: Purchase Invoice Item,Valuation Rate,arvotaso
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,"hinnasto, valuutta ole valittu"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,tuotetta rivillä {0}: ostokuittilla {1} ei ole olemassa ylläolevassa 'ostokuitit' taulukossa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,asti
 DocType: Rename Tool,Rename Log,Nimeä Log
 DocType: Installation Note Item,Against Document No,asiakirjan nro kohdistus
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,hallitse myyntikumppaneita
 DocType: Quality Inspection,Inspection Type,tarkistus tyyppi
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Ole hyvä ja valitse {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Ole hyvä ja valitse {0}
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Tutkija
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,päivitys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Tutkija
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Säilytä uutiskirje ennen lähettämistä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nimi tai Sähköposti on pakollinen
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,"saapuva, laatuntarkistus"
 DocType: Purchase Order Item,Returned Qty,Palautetut Kpl
 DocType: Employee,Exit,poistu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,kantatyyppi vaaditaan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,kantatyyppi vaaditaan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,sarjanumeron on luonut {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,tärytin viimeistely
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Sales Invoice,Advertisement,mainos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Koeaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Koeaika
 DocType: Customer Group,Only leaf nodes are allowed in transaction,vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,tuote ostokuitti toimitettu
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,aikajana
 DocType: SMS Settings,SMS Gateway URL,tekstiviesti reititin URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,hionta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,kutistekalvopakkaus
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Odottaa Aktiviteetit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Vahvistettu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,toimittaja> toimittaja tyyppi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,pankkipääte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,vain 'hyväksytty' poistumissovellus voidaan lähettää
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,osoiteotsikko on pakollinen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,valitse tilikausi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,sulatus
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,palkkaerittelyn kohdistetut ansiot ja vähennykset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
 DocType: Address,Preferred Shipping Address,suositellut toimitusosottet
 DocType: Purchase Receipt Item,Accepted Warehouse,hyväksytyt varasto
 DocType: Bank Reconciliation Detail,Posting Date,Julkaisupäivä
 DocType: Item,Valuation Method,arvomenetelmä
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Ei löydy valuuttakurssin {0} on {1}
 DocType: Sales Invoice,Sales Team,myyntitiimi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,monista kirjaus
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,monista kirjaus
 DocType: Serial No,Under Warranty,takuun alla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[virhe]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"sanat näkyvät, kun tallennat myyntitilauksen"
 ,Employee Birthday,työntekijän syntymäpäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,pääomasijoitus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,pääomasijoitus
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,sarjanumeroa {0} ei ole olemassa
 DocType: Pricing Rule,Discount Percentage,alennusprosentti
 DocType: Payment Reconciliation Invoice,Invoice Number,laskun numero
-apps/erpnext/erpnext/hooks.py +70,Orders,Tilaukset
+apps/erpnext/erpnext/hooks.py +54,Orders,Tilaukset
 DocType: Leave Control Panel,Employee Type,työntekijä tyyppi
 DocType: Employee Leave Approver,Leave Approver,poistumis hyväksyjä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,rehvailu
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiaali Siirretty valmistus
 DocType: Expense Claim,"A user with ""Expense Approver"" role","käyttäjä jolla on ""kulujen hyväksyjä"" rooli"
 ,Issued Items Against Production Order,merkityt tuotteet on liitetty tuotannon tilaukseen
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Virheellinen ajanjakso
 DocType: Customer,Credit Limit,luottoraja
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,valitse tapahtuman tyyppi
 DocType: GL Entry,Voucher No,tosite nro
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Osoite ja yhteystiedot
 DocType: Customer,Last Day of the Next Month,Viimeinen päivä Seuraava kuukausi
 DocType: Employee,Feedback,palaute
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jätä ei voida myöntää ennen {0}, kun loman saldo on jo carry-välitti tulevaisuudessa loman jakamista ennätys {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Aikataulu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,koneellinen työstö
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Aikataulu
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
-DocType: Website Settings,Website Settings,verkkosivujen asetukset
 DocType: Item,Reorder level based on Warehouse,Järjestä taso perustuu Warehouse
 DocType: Activity Cost,Billing Rate,laskutus taso
 ,Qty to Deliver,toimitettava yksikkömäärä
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Pyydetty For
 DocType: Quotation Item,Against Doctype,asiakirjan tyyppi kohdistus
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,kantaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,kantaa ei voi poistaa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,näytä varaston kirjaukset
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,työnalla varasto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Viite # {0} päivätty {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hallitse Osoitteet
 DocType: Pricing Rule,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
 DocType: Serial No,Warranty / AMC Details,takuu / AMC lisätiedot
 DocType: Journal Entry,User Remark,käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
-DocType: Communication,Phone,Puhelin
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),sulku (dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),sulku (dr)
 DocType: Contact,Passive,Passiivinen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,sarjanumero {0} ei varastossa
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,veromallipohja myyntitapahtumiin
@@ -2428,10 +2237,9 @@
 ,Billed Amount,laskutettu arvomäärä
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,hae päivitykset
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lisää muutama esimerkkitietue
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Lisää muutama esimerkkitietue
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,poistumishallinto
-DocType: Event,Groups,ryhmät
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,tilin ryhmä
 DocType: Sales Order,Fully Delivered,täysin toimitettu
 DocType: Lead,Lower Income,matala tulo
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,pikaohjeet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},lähde ja tavoite varasto eivät voi olla samat rivillä {0}
 DocType: Features Setup,Sales Extras,myynnin ekstrat
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} tilin budjetti {1} kustannuspaikkaa kohtaan {2} ylittyy {3}:lla
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} tilin budjetti {1} kustannuspaikkaa kohtaan {2} ylittyy {3}:lla
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},ostotilauksen numero vaaditaan tuotteelle {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','aloituspäivä' tulee olla ennen 'päättymispäivää'
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,arvo tai yksikkömäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuutti
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuutti
 DocType: Purchase Invoice,Purchase Taxes and Charges,oston verot ja maksut
 ,Qty to Receive,vastaanotettava yksikkömäärä
 DocType: Leave Block List,Leave Block List Allowed,"poistu estoluettelo, sallittu"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,muuntokertoimella ei voi olla osia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Tulet käyttämään sitä sisäänkirjautumiseen
 DocType: Sales Partner,Retailer,Jälleenmyyjä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kiitos tilin on oltava Tase tili
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,kaikki toimittajatyypit
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,pankin tilinylitystili
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,tee palkkalaskelma
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,taatut lainat
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,hyvät tavarat
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,hyvät tavarat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,avaa oman pääoman tase
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"ei voi hyväksyä, poistumista sillä sinulla ei ole oikeuksia hyväksyä lohkopäivämääriä"
 DocType: Appraisal,Appraisal,arviointi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kadonnut-vaahto valu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,piirto
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,päivä toistetaan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Valtuutettu allekirjoittaja
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},poistumis hyväksyjä tulee olla {0}:sta
 DocType: Hub Settings,Seller Email,myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Workstation Working Hour,Start Time,aloitusaika
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto arvomäärä (yrityksen valuutta)
 DocType: BOM Operation,Hour Rate,tuntitaso
 DocType: Stock Settings,Item Naming By,tuotteen nimeäjä
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,tarjouksesta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,tarjouksesta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},toinen jakson sulkukirjaus {0} on tehty {1} jälkeen
 DocType: Production Order,Material Transferred for Manufacturing,materiaali siirretty tuotantoon
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tiliä {0} ei löydy
 DocType: Purchase Receipt Item,Purchase Order Item No,Ostotilaus Tuote nro
-DocType: System Settings,System Settings,järjestelmäasetukset
 DocType: Project,Project Type,projekti tyyppi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,vaihtelevien aktiviteettien kustannukset
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,täysin laskutettu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,käsirahat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"roolin käyttäjät ei voi jäädyttää tilejä, tai luoda / muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 DocType: Serial No,Is Cancelled,on peruutettu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Omat lähetykset
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Omat lähetykset
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
-DocType: Communication,Recipients,Vastaanottajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ruuvaamalla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,johdotus siirto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,johdotus siirto
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,valitse pankkitili
 DocType: Newsletter,Create and Send Newsletters,tee ja lähetä uutiskirjeitä
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,alkaen päivä on ennen päättymispäivää
 DocType: Sales Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,asiakasryhmä / asiakas
 DocType: Item Group,Check this if you want to show in website,täppää mikäli haluat näyttää tämän verkkosivuilla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,tervetuloa ERPNext
+,Welcome to ERPNext,tervetuloa ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,tosite lisätiedot numero
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,vihjeestä tarjous
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,pyynnöt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,pyynnöt
 DocType: Project,Total Costing Amount (via Time Logs),kustannuslaskenta arvomäärä yhteensä (aikaloki)
 DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ostotilausta {0} ei ole lähetetty
 ,Projected,ennustus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},sarjanumero {0} ei kuulu varastoon {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Opening Date
 DocType: Journal Entry,Remark,Huomautus
 DocType: Purchase Receipt Item,Rate and Amount,taso ja arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Tylsä
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,myyntitilauksesta
-DocType: Blog Category,Parent Website Route,Parent Verkkosivujen Route
 DocType: Sales Order,Not Billed,Ei laskuteta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Molemmat Warehouse on kuuluttava samaan Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,yhteystietoja ei ole lisätty
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ei aktiivinen
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,"kohdistetut kustannukset, arvomäärä"
 DocType: Time Log,Batched for Billing,Annosteltiin for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Laskut esille Toimittajat.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,alennus arvomäärä
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),takuuaika (päivinä)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"esim, alv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
 DocType: Shopping Cart Settings,Quotation Series,"tarjous, sarjat"
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,kuuma metallikaasu muovaus
 DocType: Sales Order Item,Sales Order Date,"myyntitilaus, päivä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","siirry kyseiseen ryhmään (yleensä rahoituksen lähde> lyhytaikaiset vastattavat> verot ja tullit ja tee uusi tili (valitsemalla lisää alasidos) ""vero"" muista mainita veroaste"
 ,Payment Period Based On Invoice Date,maksuaikaa perustuu laskun päiväykseen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserleikkaus
-DocType: Event,Monday,Maanantai
 DocType: Journal Entry,Stock Entry,varaston kirjaus
 DocType: Account,Payable,maksettava
 DocType: Salary Slip,Arrear Amount,jäännös arvomäärä
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,osoitetiedot
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Ainakin yksi tai myyminen ostaminen on valittava
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,missä valmistus tapahtuu
-DocType: Page,All,Kaikki
 DocType: Stock Entry Detail,Source Warehouse,lähde varasto
 DocType: Installation Note,Installation Date,asennuspäivä
 DocType: Employee,Confirmation Date,vahvistuspäivä
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,myynnin käyttäjä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,min yksikkömäärä ei voi olla suurempi kuin max yksikkömäärä
 DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,aseta
 DocType: Lead,Lead Owner,vihjeen omistaja
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,varastolta vaaditaan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,varastolta vaaditaan
 DocType: Employee,Marital Status,Siviilisääty
 DocType: Stock Settings,Auto Material Request,automaattinen materiaalipyynto
 DocType: Time Log,Will be updated when billed.,päivitetään laskutettaessa
@@ -2597,49 +2389,45 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,eläkkepäivän on oltava suurempi kuin liittymispäivä
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% toimitettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,tuote {0}: tilattu yksikkömäärä {1} ei voi olla pienempi kuin pienin tilaus yksikkömäärä {2} (määritellylle tuotteelle)
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,tuote ostotilaus toimitettu
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Yrityksen nimeä ei voi Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,kirjeen ylätunniste mallipohjan tulostukseen
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"tuolostus, mallipohjan otsikot esim, proformalaskuun"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,arvotyypin maksuja ei voi sisällyttää
 DocType: POS Profile,Update Stock,päivitä varasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,super viimeistely
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"tuotteiden eri UOM johtaa virheellisiin (kokonais) painoarvon, varmista, että tuotteiden nettopainot on samassa UOM:ssa"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,siirrä tuotteita lähetteeltä
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Kirjaa kaikista viestinnän tyypin sähköposti, puhelin, chatti, käynti, jne."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,määritä yrityksen pyöristys kustannuspaikka
 DocType: Purchase Invoice,Terms,ehdot
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,tee uusi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,tee uusi
 DocType: Buying Settings,Purchase Order Required,ostotilaus vaaditaan
 ,Item-wise Sales History,"tuote työkalu, myyntihistoria"
 DocType: Expense Claim,Total Sanctioned Amount,sanktioarvomäärä yhteensä
 ,Purchase Analytics,Osto Analytics
 DocType: Sales Invoice Item,Delivery Note Item,lähetteen tuote
 DocType: Expense Claim,Task,tehtävä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,lastutus
 DocType: Purchase Taxes and Charges,Reference Row #,Viite Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},eränumero on pakollinen tuotteelle {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,tämä on kantamyyjä eikä niitä voi muokata
 ,Stock Ledger,varaston tilikirja
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Hinta: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Hinta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,"palkkalaskelma, vähennys"
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Huomautuksia
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,valitse ensin ryhmä sidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,täytä muoto ja tallenna se
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"lataa raportti, joka  sisältää kaikki raaka-aineet viimeisimmän varastotaseen mukaan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,kohtaaminen
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Yhteisön Forum
 DocType: Leave Application,Leave Balance Before Application,poistu taseesta ennen sovellusta
 DocType: SMS Center,Send SMS,lähetä tekstiviesti
 DocType: Company,Default Letter Head,oletus kirjeen otsikko
 DocType: Time Log,Billable,Laskutettava
-DocType: Authorization Rule,This will be used for setting rule in HR module,tätä käytetään sääntöjen asetuksissa henkilöstömoduulin
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,uudellentilattu yksikkömäärä
 DocType: Company,Stock Adjustment Account,varastonsäätötili
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,tilaisuus hävitty
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","alennuskentät saatavilla ostotilauksella, ostokuitilla ja ostolaskulla"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nimi uusi tili. Huomautus: Älä luo asiakastilejä ja Toimittajat
-DocType: Report,Report Type,raportin tyyppi
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ladataan
 DocType: BOM Replace Tool,BOM Replace Tool,BOM korvaustyökalu
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,"maa työkalu, oletus osoite, mallipohja"
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Näytä vero hajottua
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"mikäli valmistutoiminta on käytössä aktivoituu tuote ""valmistettu"""
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,materiaalipyynnön yksilönro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,vaikea kääntö
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,tee huoltokäynti
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},"huom, jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","huom: mikäli maksu suoritetaan ilman viitettä, tee päiväkirjakirjaus manuaalisesti"
 DocType: Item,Supplier Items,toimittajan tuotteet
 DocType: Opportunity,Opportunity Type,tilaisuus tyyppi
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,syntymäpäivä ei voi olla tämän päivän jälkeen
 ,Stock Ageing,varaston vanheneminen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,aseta avoimeksi
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"lähetä sähköpostia automaattisesti yhteyshenkilöille kun tapahtuman ""lähetys"" tehdään"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","rivi {0}: yksikkömäärä ei ole saatavana varastossa {1}:ssa {2} {3}:n, saatava yksikkömäärä: {4}, siirrä yksikkömäärä: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,tuote 3
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
-DocType: Event,Sunday,sunnuntai
 DocType: Sales Team,Contribution (%),panostus (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,huom: maksukirjausta ei synny sillä 'kassa- tai pankkitiliä' ei ole määritetty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Vastuut
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,mallipohja
 DocType: Sales Person,Sales Person Name,myyjän nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,syötä taulukkoon vähintään yksi lasku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lisää käyttäjiä
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Lisää käyttäjiä
 DocType: Pricing Rule,Item Group,tuoteryhmä
 DocType: Task,Actual Start Date (via Time Logs),todellinen aloituspäivä (aikalokin mukaan)
 DocType: Stock Reconciliation Item,Before reconciliation,ennen täsmäytystä
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},(lle) {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),verot ja maksut lisätty (yrityksen valuutta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
 DocType: Item,Default BOM,oletus BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,kaareutuma
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,kirjoita yrityksen nimi uudelleen vahvistukseksi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Time Log Batch,Total Hours,tunnit yhteensä
 DocType: Journal Entry,Printing Settings,Asetusten tulostaminen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,tuote vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal ruiskuvalu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,lähetteestä
 DocType: Time Log,From Time,ajasta
 DocType: Notification Control,Custom Message,oma viesti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,sijoitukset pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","valitse maa, aikavyöhyke ja valuutta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,hinnasto vaihtotaso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,valinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,hiekka valu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,galvanointi
 DocType: Purchase Invoice Item,Rate,taso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,harjoitella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,harjoitella
 DocType: Newsletter,A Lead with this email id should exist,kyseisen sähköpostin tunnuksella löytyy kytketty markkinavihje
 DocType: Stock Entry,From BOM,BOM:sta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,perustiedot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,päivä tulee olla sama kuin 1/2 päivä poistumisessa
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
 DocType: Salary Structure,Salary Structure,palkkarakenne
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","useampi hintasääntö löytyy samoilla kriteereillä, selvitä \ konflikti antamalla prioriteett, hintasäännöt: {0}"
 DocType: Account,Bank,pankki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,materiaali aihe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,varastoon
 DocType: Employee,Offer Date,Tarjous Date
 DocType: Hub Settings,Access Token,Access Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,on pitkaikaiset vastaavat tuote
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",mikäli tulostusmuoto on pitka tätä toimitoa voidaan käyttää jaottelemaan tulostus useammalle sivulle ylä- ja alatunnistein
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,vierintä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Process Palkanlaskenta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,tavarakokonaisuus tuote
 DocType: Sales Partner,Sales Partner Name,myyntikumppani nimi
 DocType: Purchase Invoice Item,Image View,kuvanäkymä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,viimeistely & teollinen viimeistely
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,alkaen- ja päätyen päivä vaaditaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,arvopaperit & hyödykkeet vaihto
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,poraus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhallusmuovaus
 DocType: Purchase Taxes and Charges,Valuation and Total,arvo ja summa
 DocType: Tax Rule,Shipping City,Toimitus Kaupunki
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 DocType: Account,Purchase User,Osto Käyttäjä
 DocType: Notification Control,Customize the Notification,muokkaa ilmoitusta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,vasarointi
-DocType: Web Page,Slideshow,diaesitys
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
 DocType: Sales Invoice,Shipping Rule,toimitus sääntö
 DocType: Journal Entry,Print Heading,Tulosta Otsikko
 DocType: Quotation,Maintenance Manager,huoltohallinto
-DocType: Workflow State,Search,haku
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,yhteensä ei voi olla nolla
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'päivää edellisestä tilauksesta' on oltava suurempi tai yhtäsuuri kuin nolla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,juotos
 DocType: C-Form,Amended From,muutettu mistä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,raaka-aine
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,raaka-aine
 DocType: Leave Application,Follow via Email,seuraa sähköpostitse
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,veron arvomäärä alennuksen jälkeen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,tavoite yksikkömäärä tai tavoite arvomäärä vaaditaan
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
 DocType: Leave Control Panel,Carry Forward,siirrä
@@ -2801,80 +2570,74 @@
 ,Produced,Valmistettu
 DocType: Item,Item Code for Suppliers,toimittajan tuotekoodi
 DocType: Issue,Raised By (Email),Raised By (sähköposti)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,pää
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Kiinnitä Kirjelomake
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,pää
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Kiinnitä Kirjelomake
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},sarjanumero edelyttää sarjoitettua tuotetta {0}
 DocType: Journal Entry,Bank Entry,pankkikirjaus
 DocType: Authorization Rule,Applicable To (Designation),sovellettavissa (nimi)
-DocType: Blog Post,Blog Post,Blogikirjoitus
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ryhmän
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,"aktivoi / poista käytöstä, valuutat"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,postituskulut
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (pankkipääte)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Purchase Order,The date on which recurring order will be stop,päivä jolloin toistuva tilaus lakkaa
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} on alennettava {1} tai määrittää suurempi virtaustoleranssiarvo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,esillä yhteensä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,tunti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,tunti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,materiaalisiirto toimittajalle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,materiaalisiirto toimittajalle
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,tee tarjous
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
 DocType: Shipping Rule,Shipping Rule Conditions,toimitus sääntö ehdot
 DocType: BOM Replace Tool,The new BOM after replacement,uusi BOM korvauksen jälkeen
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,kiharrus
 DocType: Account,Tax,vero
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rivi {0}: {1} ei ole kelvollinen {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Öljynjalostus
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rivi {0}: {1} ei ole kelvollinen {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Alkaen Tuote Bundle
 DocType: Production Planning Tool,Production Planning Tool,Tuotannon suunnittelu Tool
 DocType: Quality Inspection,Report Date,raporttipäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Reititys
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} on jo myönnetty Työsuhde {1} kauden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} vastaanottajat
 DocType: Features Setup,Item Groups in Details,"tuoteryhmä, lisätiedot"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),aloita Point-of-Sale (POS)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,"käyntiraportti huoltopyynnöille
-"
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,käyntiraportti huoltopyynnöille
 DocType: Stock Entry,Update Rate and Availability,Päivitysnopeus ja saatavuus
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"vastaanoton tai toimituksen prosenttiosuus on liian suuri suhteessa tilausmäärään, esim: mikäli 100 yksikköä on tilattu sallittu ylitys on 10% niin sallittu määrä on 110 yksikköä"
 DocType: Pricing Rule,Customer Group,asiakasryhmä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: Item,Website Description,verkkosivujen kuvaus
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
 ,Sales Register,myyntirekisteri
 DocType: Quotation,Quotation Lost Reason,"tarjous hävitty, syy"
 DocType: Address,Plant,Kasvi
-DocType: DocType,Setup,määritykset
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ei muokattavaa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Yhteenveto tässä kuussa ja keskeneräisten toimien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,kylmävalssaus
 DocType: Customer Group,Customer Group Name,asiakasryhmän nimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},poista lasku {0} C-kaaviosta {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Item,Attributes,tuntomerkkejä
-DocType: Packing Slip,Get Items,hae tuotteet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,syötä poistotili
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,syötä poistotili
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Päivämäärä
-DocType: DocField,Image,kuva
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,tee poistolasku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
-DocType: Communication,Other,Muut
 DocType: C-Form,C-Form,C-muoto
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID ei ole asetettu
 DocType: Production Order,Planned Start Date,Suunnitellut aloituspäivä
 DocType: Serial No,Creation Document Type,asiakirjantyypin luonti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vierailu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vierailu
 DocType: Leave Type,Is Encash,on perintä
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,tee päiväkirjakirjaus
@@ -2882,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Appraisal Template,Appraisal Template Title,"arviointi, mallipohja otsikko"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,kaupallinen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,kaupallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Kohta {0} ei saa olla Kanta Tuote
 DocType: Cost Center,Distribution Id,"toimitus, tunnus"
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,hyvät palvelut
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,kaikki tavarat tai palvelut
 DocType: Purchase Invoice,Supplier Address,toimittajan osoite
-DocType: Contact Us Settings,Address Line 2,osoiterivi 2
-DocType: ToDo,Reference,Viite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforointi
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,sarjat ovat pakollisia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,talouspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,talouspalvelu
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vastinetta Taito {0} on oltava alueella {1} ja {2} vuonna välein {3}
 DocType: Tax Rule,Sales,myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},varastolta vaaditaan varastotuotteelle {0}
 DocType: Leave Allocation,Unused leaves,Käyttämättömät lehdet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,oletus saatava tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sahaus
 DocType: Tax Rule,Billing State,Laskutus valtion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminointi
 DocType: Item Reorder,Transfer,siirto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,sintraus
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,sarjojen määritys
 DocType: Supplier,Contact HTML,"yhteystiedot, HTML"
@@ -2921,9 +2678,8 @@
 DocType: Company,Retail,Vähittäiskauppa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
-DocType: Product Bundle,Product Bundle,tavarakokonaisuus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,tavarakokonaisuus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,murskaava
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
 DocType: GL Entry,Remarks,Huomautuksia
@@ -2931,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,poisto perustuu
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,sarjanumeron asennustietue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,jatkuva osajako
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ilmoitathan
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yläpuolella
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,kylmä mitoitus
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,tili {0} ei voi ryhmä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Alue
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
 DocType: Holiday List,Weekly Off,viikottain pois
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","esim 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),voitto/tappio ote (kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,palautus kohdistettuna myyntilaskuun
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,tuote 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Aseta oletusarvo {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Aseta oletusarvo {0} in Company {1}
 DocType: Serial No,Creation Time,tekoaika
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,liikevaihto yhteensä
 DocType: Sales Invoice,Product Bundle Help,"tavarakokonaisuus, ohjeet"
 ,Monthly Attendance Sheet,kuukausittaiset osallistumistaulukot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,tietuetta ei löydy
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Saamaan kohteita Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,tili {0} ei ole aktiivinen
 DocType: GL Entry,Is Advance,on ennakko
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"osallistuminen päivästä, osallistuminen päivään To vaaditaan"
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä tai ei)"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"syötä ""on alihankittu"" (kyllä tai ei)"
 DocType: Sales Team,Contact No.,yhteystiedot nro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'tuloslaskelma' tiliä {0} ei sallita avauskirjaukseen
-DocType: Workflow State,Time,aika
 DocType: Features Setup,Sales Discounts,myynnin alennukset
 DocType: Hub Settings,Seller Country,myyjä maa
 DocType: Authorization Rule,Authorization Rule,Valtuutus Rule
 DocType: Sales Invoice,Terms and Conditions Details,ehdot ja säännöt lisätiedot
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,myynnin verojen ja maksujen mallipohja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,tilausten lukumäärä
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / banneri joka näkyy tuoteluettelon päällä
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,määritä toimituskustannus arvomäärälaskennan ehdot
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,lisää alasidos
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,rooli voi jäädyttää- sekä muokata jäädytettyjä kirjauksia
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"kustannuspaikasta ei voi siirtää tilikirjaan, sillä kustannuspaikalla on alasidoksia"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,muuntokerroin vaaditaan
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,sarja #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,provisio myynti
 DocType: Offer Letter Term,Value / Description,arvo / kuvaus
@@ -2980,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,asiakkaat jotka ei ole ostaneet pitkään aikaan
 DocType: Production Order,Expected Delivery Date,odotettu toimituspäivä
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,pullistua
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,haihduttava-rutiini valu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,edustuskulut
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ikä
 DocType: Time Log,Billing Amount,laskutuksen arvomäärä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,virheellinen yksikkömäärä on määritetty tuotteelle {0} se tulee olla suurempi kuin 0
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,poistumishakemukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,juridiset kulut
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","kuukauden päivä jolloin automaattinen uusi tilaus muodostetaan, esim 05, 28 jne"
 DocType: Sales Invoice,Posting Time,Kirjoittamisen aika
@@ -3002,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Uusi asiakas Liikevaihto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,matkakulut
 DocType: Maintenance Visit,Breakdown,hajoitus
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuin Päivämäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,hoonaus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Koeaika
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
-DocType: Feed,Full Name,kokonimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ratkaisija
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Koeaika
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,oletus Varasto vaaditaan varastotuotteelle
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},palkanmaksu kuukausi {0} vuosi {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
 ,Transferred Qty,siirretty yksikkömäärä
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikkuminen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Suunnittelu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Tee Time Log Erä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,liitetty
 DocType: Project,Total Billing Amount (via Time Logs),laskutuksen kokomaisarvomäärä (aikaloki)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,myymme tätä tuotetta
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,myymme tätä tuotetta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,toimittaja tunnus
 DocType: Journal Entry,Cash Entry,kassakirjaus
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
@@ -3030,18 +2777,16 @@
 DocType: Brand,Item Manager,tuotehallinta
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,lisää rivejä tilien vuosibudjetin tekoon
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Louhinta
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,kaikki yhteystiedot
 DocType: Newsletter,Test Email Id,testi sähköposti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,yrityksen lyhenne
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,yrityksen lyhenne
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"laatutarkistus aktivoi tuotehyväksynnän vaatimuksen, sekä tuotehyväksyntänumeron ostokuitissa"
 DocType: GL Entry,Party Type,osapuoli tyyppi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,raaka-aine ei voi olla päätuote
 DocType: Item Attribute Value,Abbreviation,Lyhenne
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotaatiovalu
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,palkka mallipohja valvonta
 DocType: Leave Type,Max Days Leave Allowed,maksimi poistumispäivät sallittu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Aseta Tax Rule ostoskoriin
@@ -3055,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
 ,Territory Target Variance Item Group-Wise,"aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vero malli on pakollinen.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),"hinnasto, taso (yrityksen valuutta)"
 DocType: Account,Temporary,väliaikainen
 DocType: Address,Preferred Billing Address,suositeltu laskutusosoite
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentti Allocation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,sihteeri
 DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö
 DocType: Pricing Rule,Buying,ostaminen
 DocType: HR Settings,Employee Records to be created by,työntekijä tietue on tehtävä
@@ -3076,42 +2821,37 @@
 ,Item-wise Price List Rate,"tuote työkalu, hinnasto taso"
 DocType: Purchase Order Item,Supplier Quotation,toimittajan tarjouskysely
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,silitys
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} on pysäytetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
 DocType: Lead,Add to calendar on this date,lisää kalenteriin (tämä päivä)
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Tulevat tapahtumat
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,asiakasta velvoitetaan
-DocType: Letter Head,Letter Head,Kirje Head
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Pikasyöttö
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on pakollinen palautukseen
 DocType: Purchase Order,To Receive,vastaanottoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,kutistekalvosovitus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,tuotot / kulut
 DocType: Employee,Personal Email,henkilökohtainen sähköposti
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,vaihtelu yhteensä
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,vaihtelu yhteensä
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","mikäli aktiivinen, järjestelmä lähettää kirjanpidon kirjaukset automaattisesti"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,välityspalkkio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,välityspalkkio
 DocType: Address,Postal Code,postikoodi
 DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'"," ""aikaloki"" päivitys minuuteissa"
+Updated via 'Time Log'","""aikaloki"" päivitys minuuteissa"
 DocType: Customer,From Lead,vihjeestä
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,tuotantoon luovutetut tilaukset
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Hub Settings,Name Token,Name Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Höylääminen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,perusmyynti
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,perusmyynti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ainakin yksi varasto on pakollinen
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Korvata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,syötä oletus mittayksikkö
 DocType: Purchase Invoice Item,Project Name,Hankkeen nimi
 DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
-DocType: Workflow State,Edit,muokkaa
 DocType: Journal Entry Account,If Income or Expense,mikäli tulot tai kulut
 DocType: Features Setup,Item Batch Nos,tuote erä nro
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
@@ -3119,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,maksun täsmäytys toiseen maksuun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,"vero, vastaavat"
 DocType: BOM Item,BOM No,BOM nro
-DocType: Contact Us Settings,Pincode,PIN koodi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Replace Tool,The BOM which will be replaced,korvattava BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,uusi varasto UOM tulee olla eri kuin nykyinen varasto UOM
 DocType: Account,Debit,debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"poistumiset tulee kohdentaa luvun 0,5 kerrannaisina"
 DocType: Production Order,Operation Cost,toiminnan kustannus
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,lataa osallistumislomake .csv-tiedostoon
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,"odottaa, pankkipääte"
@@ -3141,10 +2879,7 @@
 DocType: Project,Default Cost Center,oletus kustannuspaikka
 DocType: Purchase Invoice,End Date,päättymispäivä
 DocType: Employee,Internal Work History,sisäinen työhistoria
-DocType: DocField,Column Break,sarakkeenvaihto
-DocType: Event,Thursday,torstai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,kääntö
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,kulu
 DocType: Sales Invoice,Exhibition,näyttely
@@ -3157,31 +2892,30 @@
 DocType: Employee,Held On,järjesteltiin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,tuotanto tuote
 ,Employee Information,työntekijän tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),taso (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),taso (%)
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,tilikauden lopetuspäivä
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,tilikauden lopetuspäivä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ei voi suodattaa tositenumero pohjalta mikäli tosite on ryhmässä
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,tee toimittajan tarjouskysely
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,tee toimittajan tarjouskysely
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),pienennä ansiota poistuttaessa ilman palkkaa (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,erän tunnus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Huomautus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,lähete trendit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Viikon yhteenveto
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} on ostettu tai alihankintatuotteena rivillä {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,tiliä: {0} voi päivittää vain varastotapahtumien kautta
 DocType: GL Entry,Party,Puolue
 DocType: Sales Order,Delivery Date,toimituspäivä
-DocType: DocField,Currency,valuutta
 DocType: Opportunity,Opportunity Date,tilaisuus päivä
 DocType: Purchase Receipt,Return Against Purchase Receipt,palautus kohdistettuna ostokuittin
 DocType: Purchase Order,To Bill,laskutukseen
 DocType: Material Request,% Ordered,% Järjestetty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Urakkatyö
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,keskimääräinen ostamisen taso
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
@@ -3198,77 +2932,68 @@
 DocType: Opportunity,To Discuss,keskusteluun
 DocType: SMS Settings,SMS Settings,tekstiviesti asetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,väliaikaiset tilit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,musta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM tuotteen räjäytys
 DocType: Account,Auditor,Tilintarkastaja
 DocType: Purchase Order,End date of current order's period,nykyisen tilauskauden päättymispäivä
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tee tarjous Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,paluu
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
-DocType: DocField,Fold,taitos
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Oletus mittayksikkö Variant on oltava sama kuin malli
 DocType: Production Order Operation,Production Order Operation,tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
 DocType: Project Task,Pending Review,odottaa näkymä
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Ilmoitathan
 DocType: Task,Total Expense Claim (via Expense Claim),kuluvaatimus yhteensä (kuluvaatimuksesta)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,asiakastunnus
-DocType: Page,Page Name,Sivun nimi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,aikaan on oltava suurempi kuin aloitusaika
 DocType: Journal Entry Account,Exchange Rate,valuutta taso
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,myyntitilausta {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,karan viimeistely
 DocType: BOM,Last Purchase Rate,viimeisin ostotaso
 DocType: Account,Asset,vastaavat
 DocType: Project Task,Task ID,tehtävätunnus
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","esim, ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","esim, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja
 ,Sales Person-wise Transaction Summary,"myyjän työkalu,  tapahtuma yhteenveto"
-DocType: System Settings,Time Zone,aikavyöhyke
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Ilmoittaudu ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet"
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,valittu tuote voi olla erä
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiaaleja toimitettu tätä lähetettä vastaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,nidonta
 DocType: Customer,Customer Details,"asiakas, lisätiedot"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,muotoilu
 DocType: Employee,Reports to,raportoi
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Sales Invoice,Paid Amount,maksettu arvomäärä
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',sulkutilin {0} tulee olla tyyppiä 'vastattavat'
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,määrähallinta
 DocType: Production Planning Tool,Filter based on customer,suodata asiakkaisiin perustuen
 DocType: Payment Tool Detail,Against Voucher No,kuitin nro kohdistus
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä Tuote {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
 DocType: Tax Rule,Purchase,Osto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,taseyksikkömäärä
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,taseyksikkömäärä
 DocType: Item Group,Parent Item Group,päätuoteryhmä
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} on {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,kustannuspaikat
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,varastoissa
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,varastoissa
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"taso, jolla toimittajan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rivi # {0}: ajoitukset ristiriidassa rivin {1}
 DocType: Opportunity,Next Contact,Seuraava Yhteystiedot
 DocType: Employee,Employment Type,työsopimus tyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,pitkaikaiset vastaavat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
 DocType: Item Group,Default Expense Account,oletus kulutili
 DocType: Employee,Notice (days),Ilmoitus (päivää)
-DocType: Page,Yes,Kyllä
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
 DocType: Employee,Encashment Date,perintä päivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,sähköinen muovaus
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","tositetyypin kirjaus tulee kohdistaa ostotilauksen, ostolaskuun tai päiväkirjaan"
 DocType: Account,Stock Adjustment,varastonsäätö
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},oletus aktiviteettikustannus aktiviteetin tyypille - {0}
 DocType: Production Order,Planned Operating Cost,suunnitellut käyttökustannukset
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Uusi {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Ohessa {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Ohessa {0} # {1}
 DocType: Job Applicant,Applicant Name,hakijan nimi
 DocType: Authorization Rule,Customer / Item Name,asiakas / tuotteen nimi
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3282,7 +3007,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},sarjanumero vaaditaan tuotteelle {0}
 DocType: Item Variant Attribute,Attribute,tuntomerkki
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ilmoitathan mistä / vaihtelevan
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,tekijä
 DocType: Serial No,Under AMC,AMC:n alla
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,tuotteen arvon taso on päivitetty kohdistettujen tositteiden arvomäärä kustannuksen mukaan
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,myynnin oletusasetukset
@@ -3294,17 +3018,16 @@
 DocType: Payment Reconciliation,Minimum Amount,minimi arvomäärä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,päivitä valmiit tavarat
 DocType: Workstation,per hour,tunnissa
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},sarjat {0} on käytetty {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,varaston (jatkuva inventaario) tehdään tälle tilille.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, sillä kohdistettuja varaston tilikirjan kirjauksia on olemassa."
 DocType: Company,Distribution,toimitus
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,maksettu arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,projektihallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 DocType: Customer,Default Taxes and Charges,Oletus Verot ja maksut
 DocType: Account,Receivable,saatava
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
 DocType: Sales Invoice,Supplier Reference,toimittajan viite
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","täpättynä alikokoonpanon BOM tuotteita pidetään raaka-ainehankinnoissa, muutoin kaikkia alikokoonpanon tuotteita käsitellään yhtenä raaka-aineena"
@@ -3312,8 +3035,8 @@
 DocType: Hub Settings,Seller Description,myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
 DocType: Item Price,Item Price,tuote hinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,saippua & pesuaine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,saippua & pesuaine
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
 DocType: Warehouse,Warehouse Name,varaston nimi
 DocType: Naming Series,Select Transaction,valitse tapahtuma
@@ -3322,8 +3045,7 @@
 DocType: BOM,Rate Of Materials Based On,materiaaliarvostelu perustuen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,tuki Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},yritystä ei löydy varastoissa {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,varasto UOM vaihda yksikkö
-DocType: POS Profile,Terms and Conditions,ehdot ja säännöt 
+DocType: POS Profile,Terms and Conditions,ehdot ja säännöt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"päivä tulee olla tällä tilikaudella, oletettu lopetuspäivä = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","tässä voit ylläpitää terveystietoja, pituus, paino, allergiat, lääkkeet jne"
 DocType: Leave Block List,Applies to Company,koskee yritystä
@@ -3334,7 +3056,7 @@
 DocType: Sales Order Item,For Production,tuotantoon
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,syötä myyntitilaus taulukon yläpuolelle
 DocType: Project Task,View Task,näytä tehtävä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Tilikautesi alkaa
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tilikautesi alkaa
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Anna Osto Kuitit
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
@@ -3342,20 +3064,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),määritä teknisen tuen sähköpostin saapuvan palvelimen asetukset (esim tekniikka@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Salary Slip,Salary Slip,palkkalaskelma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,siivous
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'päättymispäivä' vaaditaan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'päättymispäivä' vaaditaan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","muodosta pakkausluetteloita toimitettaville pakkauksille, käytetään pakkausnumeron, -sisältö ja painon määritykseen"
 DocType: Sales Invoice Item,Sales Order Item,"myyntitilaus, tuote"
 DocType: Salary Slip,Payment Days,maksupäivää
 DocType: BOM,Manage cost of operations,hallitse toimien kustannuksia
 DocType: Features Setup,Item Advanced,"tuote, edistynyt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,kuuma valssaus
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","täpättäessä sähköposti-ikkuna avautuu välittömästi kun tapahtuma ""lähetetty"", oletus vastaanottajana on tapahtuman ""yhteyshenkilö"" ja tapahtuma liitteenä, voit valita lähetätkö tapahtuman sähköpostilla"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,yleiset asetukset
 DocType: Employee Education,Employee Education,työntekijä koulutus
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,tili
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,sarjanumero {0} on jo saapunut
@@ -3364,35 +3084,28 @@
 DocType: Customer,Sales Team Details,myyntitiimin lisätiedot
 DocType: Expense Claim,Total Claimed Amount,vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,myynnin potentiaalisia tilaisuuksia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,sairaspoistuminen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Virheellinen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,sairaspoistuminen
 DocType: Email Digest,Email Digest,sähköpostitiedote
 DocType: Delivery Note,Billing Address Name,laskutusosoite nimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,osasto kaupat
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,järjestelmätase
-DocType: Workflow,Is Active,on aktiivinen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,järjestelmätase
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,tallenna ensimmäinen asiakirja
 DocType: Account,Chargeable,veloitettava
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,muutos lyhennys
-DocType: Workflow State,Primary,Ensisijainen
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
 DocType: Item,Max Discount (%),Max Alennus (%)
-DocType: Communication,More Information,Lisää tietoa
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,edellinen tilaus arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Räjäytystyöt
 DocType: Company,Warn,varoita
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,tuotteen arvo päivitetty
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
 DocType: BOM,Manufacturing User,Valmistus Käyttäjä
 DocType: Purchase Order,Raw Materials Supplied,raaka-aineet toimitettu
 DocType: Purchase Invoice,Recurring Print Format,toistuvat tulostusmuodot
-DocType: Communication,Series,sarjat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,odotettu toimituspäivä ei voi olla ennen ostotilauksen päivää
 DocType: Appraisal,Appraisal Template,"arviointi, mallipohja"
-DocType: Communication,Email,sähköposti
 DocType: Item Group,Item Classification,tuote luokittelu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,myynninkehityshallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,myynninkehityshallinta
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,"huoltokäynti, tarkoitus"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Aika
 ,General Ledger,päätilikirja
@@ -3402,9 +3115,7 @@
 ,Itemwise Recommended Reorder Level,"tuote työkalu, uuden ostotilauksen suositusarvo"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 DocType: Features Setup,To get Item Group in details table,saadaksesi tuoteryhmän lisätiedot taulukossa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,uudelleenpiirto
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,erä {0} tuotteesta {1} on vanhentunut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,etsaus
 DocType: Sales Invoice,Commission,provisio
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3419,13 +3130,13 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Default Template </h4><p> Käyttää <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templaattimateriaalit</a> ja kaikilla aloilla Address (mukaan lukien omat kentät mahdollinen) on saatavilla </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,oletus arvomäärä
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,varastoa ei löydy järjestelmästä
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,varastoa ei löydy järjestelmästä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Tämän kuun Yhteenveto
 DocType: Quality Inspection Reading,Quality Inspection Reading,laarutarkistuksen luku
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`jäädytä varasto` joka on vanhempi kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
 ,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),todellinen yksikkömäärä (lähde/tavoite)
 DocType: Item Customer Detail,Ref Code,Ref Koodi
 apps/erpnext/erpnext/config/hr.py +13,Employee records.,työntekijä tietue
@@ -3438,13 +3149,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM muunto lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Payment Tool,Get Outstanding Vouchers,hae odottavat tositteet
 DocType: Warranty Claim,Resolved By,ratkaissut
 DocType: Appraisal,Start Date,aloituspäivä
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,arvo
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,kohdistaa poistumisen kaudelle
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,vahvistaaksesi klikkaa tästä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
@@ -3454,55 +3164,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Keskimääräinen aika toimittajan toimittamaan
 DocType: Time Log,Hours,tuntia
 DocType: Project,Expected Start Date,odotettu aloituspäivä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Prioriteetti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox pääsy sallittu
-DocType: Dropbox Backup,Weekly,viikoittain
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"esim, smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Vastaanottaa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Vastaanottaa
 DocType: Maintenance Visit,Fully Completed,täysin valmis
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% valmis
 DocType: Employee,Educational Qualification,koulutusksen arviointi
 DocType: Workstation,Operating Costs,käyttökustannukset
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} on lisätty uutiskirje luetteloon.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},rivi {0}: uusi tilaus on jo kirjattu tähän varastoon {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,elektronisädekoneistus
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"ostojenhallinta, valvonta"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,tuotannon tilaus {0} on lähetettävä
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,pääraportit
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,varaston tilikirjan kirjausten tase päivitetty
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,pääraportit
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,päivään ei voi olla ennen aloituspäivää
 DocType: Purchase Receipt Item,Prevdoc DocType,esihallitse asiakirjatyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Lisää / muokkaa hintoja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,kustannuspaikkakaavio
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Omat tilaukset
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Omat tilaukset
 DocType: Price List,Price List Name,Hinnasto Name
 DocType: Time Log,For Manufacturing,valmistukseen
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,summat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,summat
 DocType: BOM,Manufacturing,Valmistus
 ,Ordered Items To Be Delivered,toimitettavat tilatut tuotteet
 DocType: Account,Income,tulo
-,Setup Wizard,määritys työkalu
 DocType: Industry Type,Industry Type,teollisuus tyyppi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,jokin meni pieleen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,varoitus: poistumissovellus sisältää seuraavat estopäivät
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,myyntilasku {0} on lähetetty
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),arvomäärä (yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,die valu
-DocType: Email Alert,Reference Date,Viite Päivämäärä
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Anna kelvolliset mobiili nos
 DocType: Budget Detail,Budget Detail,budjetti yksityiskohdat
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
-DocType: Async Task,Status,tila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},varaston UOM päivitetty tuotteelle {0}
-DocType: Company History,Year,Vuosi
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,aikaloki {0} on jo laskutettu
@@ -3515,75 +3213,71 @@
 ,Serial No Service Contract Expiry,palvelusopimuksen päättyminen sarjanumerolle
 DocType: Item,Unit of Measure Conversion,mittayksikön muunto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,työntekijää ei voi muuttaa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,kredit / debet kirjausta ei voi tehdä samalle tilille yhtäaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Avustus yli- {0} ristissä Kohta {1}
 DocType: Address,Name of person or organization that this address belongs to.,henkilön- tai organisaation nimi kenelle tämä osoite kuuluu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,omat toimittajat
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,omat toimittajat
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,toinen palkkarakenne {0} on aktiivinen työntekijälle {1}. päivitä tila 'passiiviseksi' jatkaaksesi
 DocType: Purchase Invoice,Contact,yhteystiedot
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Saadut
 DocType: Features Setup,Exports,viennit
 DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: valitse {0} on {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 DocType: Issue,Content Type,sisällön tyyppi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,tietokone
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
 DocType: Payment Reconciliation,Get Unreconciled Entries,hae täsmäämättömät kirjaukset
 DocType: Cost Center,Budgets,budjetit
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,päivitetty
 DocType: Employee,Emergency Contact Details,hätäyhteydenoton lisätiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,mitä tämä tekee?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,mitä tämä tekee?
 DocType: Delivery Note,To Warehouse,varastoon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},"tilillä {0} on useampi, kuin yksi kirjaus tilikaudella {1}"
 ,Average Commission Rate,keskimääräinen provisio taso
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'on sarjanumero' joka voi olla ainoastaan varastotuote
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,päivitä lisäkustannukset jotta tuotteisiin kohdistuneet kustannukset voidaan laskea
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,sähköinen
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},käyttäjätunnusta ei asetettu työntekijälle {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Aineenpoistopuhalluksella
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,takuuvaatimukseen
 DocType: Stock Entry,Default Source Warehouse,oletus lähde varasto
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lappalainen
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,päivää edellisestä tilauksesta
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,päivää edellisestä tilauksesta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Pankkikortti tilille on kuitenkin taseen tili
 DocType: Buying Settings,Naming Series,nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,"poistu estoluettelo, nimi"
-DocType: User,Enabled,aktivoi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"varasto, vastaavat"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},haluatko varmasti lähettää kaikkii kuukausi {0} vuosi {1} palkkalaskelmat 
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},haluatko varmasti lähettää kaikkii kuukausi {0} vuosi {1} palkkalaskelmat
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,tuo tilaajat
 DocType: Target Detail,Target Qty,tavoite yksikkömäärä
 DocType: Attendance,Present,Nykyinen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,lähetettä {0} ei saa lähettää
 DocType: Notification Control,Sales Invoice Message,"myyntilasku, viesti"
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Tilin sulkemisen {0} on oltava tyyppiä Vastuu / Oma pääoma
 DocType: Authorization Rule,Based On,perustuu
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Tuote {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Ajanjaksona ja AIKA Voit päivämäärät pakollinen toistuvia {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hanketoimintaa / tehtävä.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,muodosta palkkalaskelmat
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ei sallittu sähköpostitunnus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
-DocType: ToDo,Low,Alhainen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,kehruu
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta tilausrajaa
 DocType: Landed Cost Voucher,Landed Cost Voucher,"kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista päivä Kuukausi
@@ -3605,7 +3299,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,kampanjan nimi vaaditaan
 DocType: Maintenance Visit,Maintenance Date,"huolto, päivä"
 DocType: Purchase Receipt Item,Rejected Serial No,Hylätty sarjanumero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,syväpiirto
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Uusi uutiskirje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,näytä tase
@@ -3615,7 +3308,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,arvomäärä
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Mukaansatempaava
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
 ,Sales Analytics,myyntianalyysi
 DocType: Manufacturing Settings,Manufacturing Settings,valmistuksen asetukset
@@ -3627,28 +3319,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,nimeä uusi tili
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,myyntimoduulin asetukset
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,asiakaspalvelu
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,vahvista sähköposti
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tarjous ehdokas Job.
 DocType: Notification Control,Prompt for Email on Submission of,Kysyy Sähköposti esitettäessä
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Yhteensä myönnetty lehdet ovat enemmän kuin päivää kaudella
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,tuote {0} tulee olla varastotuote
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} on pakollinen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,vakuumi muovaus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,odotettu päivä ei voi olla ennen materiaalipyynnön päiväystä
-DocType: Contact Us Settings,City,Kaupunki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ultraäänityöstö
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,tuotteen {0} tulee olla myyntituote
 DocType: Naming Series,Update Series Number,päivitä sarjanumerot
 DocType: Account,Equity,oma pääoma
 DocType: Sales Order,Printing Details,Tulostus Lisätiedot
 DocType: Task,Closing Date,sulkupäivä
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,insinööri
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
 DocType: Sales Partner,Partner Type,kumppani tyyppi
@@ -3656,7 +3344,7 @@
 DocType: Authorization Rule,Customerwise Discount,asiakaskohtainen alennus
 DocType: Purchase Invoice,Against Expense Account,kulutilin kohdistus
 DocType: Production Order,Production Order,tuotannon tilaus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,asennus huomautus {0} on jo lähetetty
 DocType: Quotation Item,Against Docname,asiakirjan nimi kohdistus
 DocType: SMS Center,All Employee (Active),kaikki työntekijät (aktiiviset)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,näytä nyt
@@ -3664,26 +3352,24 @@
 DocType: BOM,Raw Material Cost,raaka-ainekustannukset
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,gantt kaavio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,sarja päivitetty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,raportin tyyppi vaaditaan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,sarjanumero sarjat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},varasto vaaditaan varastotuotteelle {0} rivillä {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
 DocType: Issue,First Responded On,ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ensimmäinen käyttäjä: sinä
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ensimmäinen käyttäjä: sinä
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,onnistuneesti täsmäytetty
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Production Order,Planned End Date,Suunnitellut Päättymispäivä
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,missä tuotteet varastoidaan
 DocType: Tax Rule,Validity,Voimassaolo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,laskutettu arvomäärä
 DocType: Attendance,Attendance,osallistuminen
-DocType: Page,No,Ei
 DocType: BOM,Materials,materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
@@ -3691,55 +3377,46 @@
 ,Item Prices,tuote hinnat
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"sanat näkyvät, kun tallennat ostotilauksen"
 DocType: Period Closing Voucher,Period Closing Voucher,kauden sulkutosite
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,hinnasto valvonta
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,hinnasto valvonta
 DocType: Task,Review Date,Review Date
 DocType: Purchase Invoice,Advance Payments,Ennakkomaksut
-DocType: DocPerm,Level,taso
 DocType: Purchase Taxes and Charges,On Net Total,netto yhteensä:ssä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Milling
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ei valtuutusta käyttää maksutyökalua
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuutta ei voi muuttaa tehtyään merkinnät jollakin toisella valuutta
 DocType: Company,Round Off Account,pyöristys tili
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nakerrus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,hallinnolliset kulut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,konsultointi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,konsultointi
 DocType: Customer Group,Parent Customer Group,Parent Asiakasryhmä
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,muutos
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 DocType: Appraisal Goal,Score Earned,ansaitut pisteet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","esim, ""minunyritys LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Irtisanomisaika
 DocType: Bank Reconciliation Detail,Voucher ID,tosite tunnus
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,tämä on kanta-alue eikä sitä voi muokata
 DocType: Packing Slip,Gross Weight UOM,bruttopaino UOM
 DocType: Email Digest,Receivables / Payables,saatavat / maksettavat
-DocType: Delivery Note Item,Against Sales Invoice,myyntilaskun kohdistus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,leimaus
+DocType: Delivery Note Item,Against Sales Invoice,myyntilaskun kohdistus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,näytä nolla-arvot
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,tuotemääräarvio valmistuksen- / uudelleenpakkauksen jälkeen annetuista raaka-aineen määristä
 DocType: Payment Reconciliation,Receivable / Payable Account,saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,myyntitilauksen kohdistus / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 DocType: Task,Actual End Date (via Time Logs),todellinen päättymispäivä (aikalokin mukaan)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,syötä pääkustannuspaikka
 DocType: Delivery Note,Print Without Amount,tulosta ilman arvomäärää
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,veroluokka ei voi olla 'arvo' tai 'arvo ja summa'sillä kaikki tuotteet ovat ei-varasto tuotteita
-DocType: User,Last Name,Sukunimi
-DocType: Web Page,Left,Vasen
-DocType: Event,All Day,(1/1 päivä)
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,veroluokka ei voi olla 'arvo' tai 'arvo ja summa'sillä kaikki tuotteet ovat ei-varasto tuotteita
 DocType: Issue,Support Team,tukitiimi
 DocType: Appraisal,Total Score (Out of 5),osumat (5:stä) yhteensä
-DocType: Contact Us Settings,State,asema
 DocType: Batch,Batch,erä
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,tase
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,tase
 DocType: Project,Total Expense Claim (via Expense Claims),kuluvaatimus yhteensä (kuluvaatimuksesta)
-DocType: User,Gender,sukupuoli
 DocType: Journal Entry,Debit Note,debet viesti
 DocType: Stock Entry,As per Stock UOM,varasto UOM:ään
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ei vanhentunut
@@ -3753,44 +3430,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,tee tapahtumien arvoon perustuvia rajoitussääntöjä
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
 DocType: Purchase Invoice,Total Advance,"yhteensä, ennakko"
-DocType: Workflow State,User,käyttäjä
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Käsittely Payroll
 DocType: Opportunity Item,Basic Rate,perustaso
 DocType: GL Entry,Credit Amount,Luoton määrä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,aseta kadonneeksi
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksukuitin Huomautus
 DocType: Customer,Credit Days Based On,"kredit päivää, perustuen"
 DocType: Tax Rule,Tax Rule,Verosääntöön
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ylläpidä samaa tasoa läpi myyntisyklin
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Suunnittele aikaa lokit ulkopuolella Workstation työaikalain.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} on jo lähetetty
 ,Items To Be Requested,tuotteet joita on pyydettävä
-DocType: Purchase Order,Get Last Purchase Rate,hae viimeisin ostotaso
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Laskutus Hinta perustuu Toimintalaji (tunnissa)
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,saumaus
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",sähköpostia ei lähetetty sillä yrityksen sähköpostitunnusta ei löytyny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 DocType: Production Planning Tool,Filter based on item,suodata tuotteeseen perustuen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Luottotililtä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
 DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen  valuutta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
 DocType: Purchase Common,Purchase Common,Osto Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} on muutettu, päivitä"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,tilaisuudesta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Sammutus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,työntekijä etuudet
 DocType: Sales Invoice,Is POS,on POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Laskut nostetaan asiakkaille.
-DocType: DocField,Default,oletus
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} luettelo lisätty
 DocType: Maintenance Schedule,Schedule,aikataulu
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Määritä budjetti tälle Kustannuspaikka. Asettaa budjetti toiminta, katso &quot;Yhtiö List&quot;"
@@ -3801,70 +3474,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Expense Claim,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","valitsemalla ""kyllä"" tämän tuotteen varaston kirjaus antaa jokaiselle uniikin identiteetin joka näkyy sarjanumero valvonnassa"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 DocType: Address,Office,Toimisto
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,perusraportit
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,valitse työntekijä tietue ensin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,voit luoda verotilin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,syötä kulutili
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,syötä kulutili
 DocType: Account,Stock,varasto
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,oston/valmistuksen lisätiedot
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Erä Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Erä Inventory
 DocType: Employee,Contract End Date,sopimuksen päättymispäivä
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,siillä myyntitilaukset (odottaa toimitusta) perustuen kriteereihin yllä
-DocType: DocShare,Document Type,asiakirja tyyppi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,toimittajan tarjouksesta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,toimittajan tarjouksesta
 DocType: Deduction Type,Deduction Type,vähennyksen tyyppi
 DocType: Attendance,Half Day,1/2 päivä
 DocType: Pricing Rule,Min Qty,min yksikkömäärä
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Seurata kohteita myynti- ja osto asiakirjat erän nos. &quot;Ensisijainen Teollisuus: Kemikaalit&quot;
 DocType: GL Entry,Transaction Date,tapahtuma päivä
 DocType: Production Plan Item,Planned Qty,suunniteltu yksikkömäärä
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,verot yhteensä
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,verot yhteensä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,yksikkömäärään (valmistettu yksikkömäärä) vaaditaan
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa saatava / maksettava tilille
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa saatava / maksettava tilille
 DocType: Notification Control,Purchase Receipt Message,Ostokuitti Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Yhteensä myönnetty lehdet ovat enemmän kuin kaudella
 DocType: Production Order,Actual Start Date,todellinen aloituspäivä
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiaaleja toimitettu tätä myyntitilausta vastaan
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,tietueessa on tuotemuutoksia
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Uutiskirje List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,palvelu
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,toiminnoilla
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 ,Monthly Salary Register,"kuukausipalkka, rekisteri"
-apps/frappe/frappe/website/template.py +140,Next,Seuraava
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
 DocType: BOM Operation,BOM Operation,BOM käyttö
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,elektrolyyttisen
 DocType: Purchase Taxes and Charges,On Previous Row Amount,edellisen rivin arvomäärä
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,syötä maksun arvomäärä ainakin yhdelle riville
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,syötä maksun arvomäärä ainakin yhdelle riville
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,rivi {0}: maksun summa ei voi olla suurempi kuin odottava arvomäärä
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,maksamattomat yhteensä
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,maksamattomat yhteensä
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,aikaloki ei ole laskutettavissa
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Ostaja
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Ostaja
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net palkkaa ei voi olla negatiivinen
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Anna Against Lahjakortit manuaalisesti
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Anna Against Lahjakortit manuaalisesti
 DocType: SMS Settings,Static Parameters,staattinen parametri
 DocType: Purchase Order,Advance Paid,ennakkoon maksettu
 DocType: Item,Item Tax,tuote vero
@@ -3873,16 +3539,14 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,lähetä massatekstiviesti yhteystiedoillesi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,pidetään veroille tai maksuille
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ristimuovaus
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,varaston tapahtumien oletusasetukset
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,varaston tapahtumien oletusasetukset
 DocType: Purchase Invoice,Next Date,Seuraava päivä
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,syötä verot ja maksut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Koneistus
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset "
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset"
 DocType: Hub Settings,Seller Name,myyjä nimi
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),verot ja maksut vähennetty (yrityksen valuutta)
 DocType: Item Group,General Settings,pääasetukset
@@ -3890,47 +3554,44 @@
 DocType: Stock Entry,Repack,pakkaa uudelleen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sinun tulee tallentaa lomake ennen kuin jatkat
 DocType: Item Attribute,Numeric Values,Numeroarvot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Kiinnitä Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Kiinnitä Logo
 DocType: Customer,Commission Rate,provisio taso
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,estä poistumissovellukset osastoittain
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Ostoskori on tyhjä
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,kantaa ei voi muokata
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,kohdennettu arvomäärä ei voi olla suurempi kuin säätämätön arvomäärä
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,kantaa ei voi muokata
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,kohdennettu arvomäärä ei voi olla suurempi kuin säätämätön arvomäärä
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Order,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,osakepääoma
 DocType: Packing Slip,Package Weight Details,"pakkauspaino, lisätiedot"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Valitse csv tiedosto
-DocType: Dropbox Backup,Send Backups to Dropbox,lähetä varmuuskopiot Dropbox:iin
 DocType: Purchase Order,To Receive and Bill,vastaanottoon ja laskutukseen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,suunnittelija
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,tee materiaalipyyntö automaattisesti mikäli määrä laskee alle asetetun tason
 ,Item-wise Purchase Register,"tuote työkalu, ostorekisteri"
 DocType: Batch,Expiry Date,vanhenemis päivä
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Asettaa reorder tasolla, kohde on osto Tuote tai valmistus Tuote"
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +18,Project master.,projekti valvonta
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,hae tuotteita BOM:sta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,"virtausaika, päivää"
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,materiaalien lasku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
-DocType: Dropbox Backup,Send Notifications To,lähetä ilmoituksia
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,poistumisen syy
 DocType: Expense Claim Detail,Sanctioned Amount,sanktioitujen arvomäärä
 DocType: GL Entry,Is Opening,on avaus
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,tiliä {0} ei löydy
 DocType: Account,Cash,Käteinen
 DocType: Employee,Short biography for website and other publications.,lyhyt historiikki verkkosivuille ja muihin julkaisuihin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},tee työntekijöille palkkarakenne {0}

diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 7eaa1e7..6a8900e 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv

@@ -1,34 +1,31 @@
 DocType: Employee,Salary Mode,Mode de rémunération
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Sélectionnez une distribution mensuelle, si vous voulez suivre basée sur la saisonnalité."
 DocType: Employee,Divorced,Divorcé
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attention: même élément a été saisi plusieurs fois.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articles déjà synchronisés
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera à être ajouté à plusieurs reprises dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler Matériau Visitez {0} avant d'annuler cette revendication de garantie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produits de consommation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de consommation
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,S&#39;il vous plaît sélectionner partie Type premier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recuit
 DocType: Item,Customer Items,Articles de clients
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
 DocType: Item,Publish Item to hub.erpnext.com,Publier un item au hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notifications par courriel
 DocType: Item,Default Unit of Measure,Unité de mesure par défaut
 DocType: SMS Center,All Sales Partner Contact,Tous les contacts des partenaires commerciaux
-DocType: Employee,Leave Approvers,Laisser approbateurs
+DocType: Employee,Leave Approvers,Approbateurs d'absence
 DocType: Sales Partner,Dealer,Revendeur
 DocType: Employee,Rented,Loué
-DocType: About Us Settings,Website,Site Web
 DocType: POS Profile,Applicable for User,Applicable pour l&#39;utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Arrêtée ordre de production ne peut pas être annulée, déboucher d&#39;abord annuler"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactage ainsi frittage
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Devise est nécessaire pour Liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
 DocType: Purchase Order,Customer Contact,Contact client
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,De Demande de Matériel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,De Demande de Matériel
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Arbre
 DocType: Job Applicant,Job Applicant,Demandeur d&#39;emploi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Plus de résultats.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,juridique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,juridique
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Le type de taxe réel ne peut pas être inclus dans le prix de l'article à la ligne {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requis par
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
 DocType: Leave Type,Leave Type Name,Laisser Nom Type
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,prix règle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Piqûre
 DocType: Pricing Rule,Apply On,Pas autorisé à modifier compte gelé {0}
-DocType: Item Price,Multiple Item prices.,Prix des ouvrages multiples.
+DocType: Item Price,Multiple Item prices.,Prix des ouvrages multiples.
 ,Purchase Order Items To Be Received,Articles de bons de commande pour être reçu
 DocType: SMS Center,All Supplier Contact,Tous les contacts fournisseur
 DocType: Quality Inspection Reading,Parameter,Paramètre
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nouvelle demande d&#39;autorisation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Pour maintenir le code de référence du client et de les rendre consultables en fonction de leur code, utiliser cette option"
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nouvelle demande d&#39;autorisation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Projet de la Banque
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Utiliser cette option pour maintenir le code de référence du client et les rendre consultables en fonction de leur code.
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de compte de paiement
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Voir les variantes
-DocType: Sales Invoice Item,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prêts ( passif)
 DocType: Employee Education,Year of Passing,Année de passage
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En Stock
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Élément du plan de production
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faites nouveau profil de POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,soins de santé
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,soins de santé
 DocType: Purchase Invoice,Monthly,Mensuel
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Retard de paiement (jours)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresse E-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,défense
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresse E-mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,défense
 DocType: Company,Abbr,Abréviation
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,No du véhicule
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,S&#39;il vous plaît sélectionnez Liste des Prix
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Travail du bois
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impression en 3D
 DocType: Employee,Holiday List,Liste de vacances
 DocType: Time Log,Time Log,Temps Connexion
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Comptable
 DocType: Cost Center,Stock User,Stock utilisateur
 DocType: Company,Phone No,N ° de téléphone
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Connexion des activités réalisées par les utilisateurs contre les tâches qui peuvent être utilisés pour le suivi du temps, de la facturation."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Partenaires Sales Commission
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,L'abbréviation ne peut pas avoir plus de 5 caractères
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Attribut Valeur {0} ne peut pas être retiré de {1} comme Point Variantes \ existe avec cet attribut.
-DocType: Print Settings,Classic,Classique
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Il s'agit d'un compte root et ne peut être modifié .
 DocType: BOM,Operations,Opérations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossible de définir l'autorisation sur la base des prix réduits pour {0}
 DocType: Bin,Quantity Requested for Purchase,Quantité demandée pour l&#39;achat
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attacher fichier .csv avec deux colonnes, une pour l&#39;ancien nom et un pour le nouveau nom"
 DocType: Packed Item,Parent Detail docname,DocName Détail Parent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ouverture d&#39;un emploi.
 DocType: Item Attribute,Increment,Incrément
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Sélectionnez Entrepôt ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicité
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,publicité
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Même Société a été inscrite plus d&#39;une fois
 DocType: Employee,Married,Marié
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},désactiver
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},désactiver
 DocType: Payment Reconciliation,Reconcile,réconcilier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,épicerie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Assurez accès des banques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Les fonds de pension
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Les fonds de pension
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Entrepôt est obligatoire si le type de compte est Entrepôt
 DocType: SMS Center,All Sales Person,Tous les commerciaux
 DocType: Lead,Person Name,Nom Personne
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Vérifiez si l'ordre récurrent, décochez d'arrêter récurrents ou mettre bon Date de fin"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Le tarif à l'heure / 60) * le temps réel d'opération
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des articles livrés
-DocType: Blog Post,Guest,Invité
 DocType: Quality Inspection,Get Specification Details,Obtenez les détails Spécification
 DocType: Lead,Interested,Intéressé
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,De la valeur doit être inférieure à la valeur à la ligne {0}
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Ouverture
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Ouverture
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} est obligatoire
 DocType: Stock Entry,Additional Costs,Coûts additionels
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
 DocType: Lead,Product Enquiry,Demande d&#39;information produit
-DocType: Standard Reply,Owner,propriétaire
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,S'il vous plaît entrez première entreprise
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Se il vous plaît sélectionnez Société premier
 DocType: Employee Education,Under Graduate,Sous Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alésage
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Journal d'activité:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Point {0} n'existe pas dans le système ou a expiré
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobilier
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Point {0} n'existe pas dans le système ou a expiré
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Relevé de compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,médicaments
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,médicaments
 DocType: Expense Claim Detail,Claim Amount,Montant réclamé
 DocType: Employee,Mr,M.
-DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur Type / Fournisseur
 DocType: Naming Series,Prefix,Préfixe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,consommable
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,consommable
 DocType: Upload Attendance,Import Log,Importer Connexion
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Envoyer
 DocType: Sales Invoice Item,Delivered By Supplier,Livré Par Fournisseur
 DocType: SMS Center,All Contact,Tout contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salaire Annuel
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l&#39;exercice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Facteur de conversion de l'unité de mesure par défaut doit être de 1 à la ligne {0}
 DocType: Newsletter,Email Sent?,Courriel envoyés?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédit Entreprise Devise
 DocType: Delivery Note,Installation Status,Etat de l&#39;installation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Approvisionnement en matières premières pour l&#39;achat
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Parent Site Route
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Toutes les dates et employé combinaison dans la période choisie viendra dans le modèle, avec des records de fréquentation existants"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,« À jour» est nécessaire
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sera mis à jour après la facture de vente est soumise.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Utilisateur {0} est désactivé
 DocType: SMS Center,SMS Center,Centre SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Redressement
 DocType: BOM Replace Tool,New BOM,Nouvelle nomenclature
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Logs pour la facturation.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,", À contre coulée"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Entrepôt requis pour stock Article {0}
 DocType: Lead,Request Type,Type de demande
 DocType: Leave Application,Reason,Raison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Diffusion
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,exécution
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Le premier utilisateur deviendra le System Manager (vous pouvez changer cela plus tard).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Diffusion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,exécution
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Le premier utilisateur deviendra le System Manager (vous pouvez changer cela plus tard).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Les détails des opérations effectuées.
 DocType: Serial No,Maintenance Status,Statut d&#39;entretien
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articles et Prix
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articles et Prix
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},De la date doit être dans l'exercice. En supposant Date d'= {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Sélectionnez l&#39;employé pour lequel vous créez l&#39;évaluation.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Numéro de commande requis pour objet {0}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Compte {0} doit être SAMES comme crédit du compte dans la facture d'achat en ligne {0}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Remise sur la liste des prix Taux (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Démarrer
-DocType: User,First Name,Prénom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-coulée en moule
 DocType: Offer Letter,Select Terms and Conditions,Sélectionnez Termes et Conditions
 DocType: Production Planning Tool,Sales Orders,Commandes clients
 DocType: Purchase Taxes and Charges,Valuation,Évaluation
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Compte bancaire
 DocType: Leave Type,Allow Negative Balance,Autoriser un solde négatif
 DocType: Selling Settings,Default Territory,Territoire défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Télévision
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tailladant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
 DocType: Production Order Operation,Updated via 'Time Log',Mise à jour via 'Log Time'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Compte {0} n'appartient pas à la société {1}
 DocType: Naming Series,Series List for this Transaction,Liste série pour cette transaction
 DocType: Sales Invoice,Is Opening Entry,Est l&#39;ouverture d&#39;entrée
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si créance non standard applicable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Warehouse est nécessaire avant Soumettre
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Reçu le
 DocType: Sales Partner,Reseller,Revendeur
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,S'il vous plaît entrer Société
 DocType: Delivery Note Item,Against Sales Invoice Item,Sur l'objet de la facture de vente
 ,Production Orders in Progress,Les commandes de produits en cours
 DocType: Lead,Address & Contact,Adresse et coordonnées
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les feuilles inutilisées d&#39;attributions antérieures
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
 DocType: Newsletter List,Total Subscribers,Nombre total d&#39;abonnés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Nom
+,Contact Name,Contact Nom
 DocType: Production Plan Item,SO Pending Qty,SO attente Qté
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée le bulletin de salaire pour les critères mentionnés ci-dessus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Demande d&#39;achat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double logement
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Seul le congé approbateur sélectionné peut soumettre cette demande de congé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Vous n'êtes pas autorisé à ajouter ou mettre à jour les entrées avant {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,De feuilles par année
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,S&#39;il vous plaît mettre Naming série pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 DocType: Time Log,Will be updated when batched.,Sera mis à jour lorsque lots.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Se il vous plaît vérifier 'Est Advance' contre compte {1} si ce est une entrée avance.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
-DocType: Bulk Email,Message,Message
 DocType: Item Website Specification,Item Website Specification,Spécification Site élément
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Clé d&#39;accès
 DocType: Payment Tool,Reference No,No de référence
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Laisser Bloqué
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},dépenses
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Annuel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Laisser Bloqué
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},dépenses
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Aucune facture de vente
 DocType: Material Request Item,Min Order Qty,Quantité de commande minimale
 DocType: Lead,Do Not Contact,Ne communiquez pas avec
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;identifiant unique pour le suivi de toutes les factures récurrentes. Il est généré lors de la soumission.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Quantité de commande minimum
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Item,Publish in Hub,Publier dans Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Nom de la campagne est nécessaire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Demande de matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Nom de la campagne est nécessaire
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Demande de matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à jour Date de Garde
 DocType: Item,Purchase Details,Détails de l'achat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Le brossage
 DocType: Employee,Relation,Rapport
 DocType: Shipping Rule,Worldwide Shipping,Livraison internationale
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmé commandes provenant de clients.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
 DocType: Maintenance Schedule,Generate Schedule,Générer annexe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chef des frais
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,S'il vous plaît sélectionnez le type de Facturation de la première
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,dernier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,5 caractères maximum
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Sélectionnez votre langue
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,5 caractères maximum
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier congé approbateur dans la liste sera définie comme le congé approbateur de défaut
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Désactive la création de registres de temps contre les ordres de fabrication. Opérations ne doivent pas être suivis contre ordre de fabrication
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Variante du
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Réglages pour le Module des ressources humaines
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
-DocType: DocType,Administrator,Administrateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,perçage laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nouveau stock UDM
 DocType: Period Closing Voucher,Closing Account Head,Fermeture chef Compte
 DocType: Employee,External Work History,Histoire de travail externe
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Référence circulaire erreur
-DocType: Communication,Closed,Fermé
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dans Words (Exportation) sera visible une fois que vous enregistrez le bon de livraison.
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profil d'emploi
 DocType: Newsletter,Newsletter,Bulletin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Pelotage
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notification par courriel lors de la création de la demande de matériel automatique
 DocType: Journal Entry,Multi Currency,Multi-devise
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,S'il vous plaît entrez prévue Quantité pour l'article {0} à la ligne {1}
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de facture
 DocType: Sales Invoice Item,Delivery Note,Bon de livraison
-DocType: Dropbox Backup,Allow Dropbox Access,Autoriser l'accès au Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Mise en place d&#39;impôts
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Résumé pour cette semaine et les activités en suspens
 DocType: Workstation,Rent Cost,louer coût
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
@@ -330,40 +300,37 @@
 DocType: Employee,Company Email,E-mail entreprise
 DocType: GL Entry,Debit Amount in Account Currency,Montant de débit en compte Devises
 DocType: Shipping Rule,Valid for Countries,Valable pour les pays
-DocType: Workflow State,Refresh,Rafraîchir
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tous les champs importation connexes comme monnaie , taux de conversion , total d'importation , importation grande etc totale sont disponibles en Achat réception , Devis fournisseur , Facture d'achat , bon de commande , etc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet article est un modèle et ne peut être utilisé dans les transactions. Attributs d'élément seront copiés dans les variantes moins 'No Copy »est réglé
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total de la commande Considéré
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",Vous devez enregistrer le formulaire avant de procéder
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,1 devise = [ ? ] Fraction
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,1 devise = [ ? ] Fraction
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Vitesse à laquelle la devise du client est converti en devise de base du client
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en nomenclature , bon de livraison , facture d'achat , ordre de production, bon de commande , bon de réception , la facture de vente , Sales Order , Stock entrée , des feuilles de temps"
 DocType: Item Tax,Tax Rate,Taux d&#39;imposition
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Sélectionner un élément
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Sélectionner un élément
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: N ° de lot doit être le même que {1} {2}
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir en groupe non-
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convertir en non-groupe
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Reçu d'achat doit être présentée
-DocType: Stock UOM Replace Utility,Current Stock UOM,Emballage Stock actuel
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lot d'un article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la facture
 DocType: GL Entry,Debit Amount,Débit Montant
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Votre adress email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,S'il vous plaît voir la pièce jointe
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,S'il vous plaît voir la pièce jointe
 DocType: Purchase Order,% Received,% reçus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,découpe au jet d&#39;eau
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Configuration déjà terminée !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Configuration déjà terminée !
 ,Finished Goods,Produits finis
 DocType: Delivery Note,Instructions,Instructions
 DocType: Quality Inspection,Inspected By,Inspecté par
 DocType: Maintenance Visit,Maintenance Type,Type d&#39;entretien
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},N ° de série {0} ne fait pas partie de la livraison Remarque {1}
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d&#39;inspection Article de qualité
-DocType: Leave Application,Leave Approver Name,Laissez Nom approbateur
+DocType: Leave Application,Leave Approver Name,Nom de l'approbateur d'absence
 ,Schedule Date,calendrier Date
 DocType: Packed Item,Packed Item,Article d&#39;emballage de livraison Note
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,non Soumis
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,S&#39;il vous plaît ne créez pas de comptes pour les clients et les fournisseurs. Ils sont créés directement par les maîtres clients / fournisseurs.
 DocType: Currency Exchange,Currency Exchange,Change de devises
 DocType: Purchase Invoice Item,Item Name,Nom d&#39;article
+DocType: Authorization Rule,Approving User  (above authorized value),Approuver l&#39;utilisateur (valeur autorisée ci-dessus)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Solde de crédit
 DocType: Employee,Widowed,Veuf
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Articles à être demandés, qui sont &quot;Out of Stock&quot; compte tenu de tous les entrepôts basés sur quantité projetée et qté minimum"
@@ -380,22 +348,21 @@
 ,Purchase Register,Achat S&#39;inscrire
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
 DocType: Workstation,Consumable Cost,Coût de consommable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
 DocType: Purchase Receipt,Vehicle Date,Date de véhicule
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Numéro de référence est obligatoire si vous avez entré date de référence
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Raison pour perdre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube de perles
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation est fermé aux dates suivantes selon la liste de vacances: {0}
 DocType: Employee,Single,Unique
 DocType: Issue,Attachment,Pièce jointe
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget ne peut pas être réglé pour le centre de coûts du Groupe
 DocType: Account,Cost of Goods Sold,Montant payé + Write Off montant ne peut être supérieur à Total
 DocType: Purchase Invoice,Yearly,Annuel
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
 DocType: Journal Entry Account,Sales Order,Commande
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Moy. Taux de vente
 DocType: Purchase Order,Start date of current order's period,Date de la période de l'ordre courant de démarrage
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Quantité ne peut pas être une fraction de la rangée
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Quantité ne peut pas être une fraction de la rangée
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et taux
 DocType: Delivery Note,% Installed,Installé%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,S'il vous plaît entrez le nom de l'entreprise d'abord
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Est un groupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Réglage automatique de série n ° basé sur FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoformage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Refendage
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«Le cas No ' ne peut pas être inférieure à 'Du Cas No'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,À but non lucratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,À but non lucratif
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non commencé
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Vieux
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes gelés jusqu'au
 DocType: SMS Log,Sent On,Sur envoyé
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionnée à plusieurs reprises dans le tableau Attributs
+DocType: HR Settings,Employee record is created using selected field. ,dossier de l&#39;employé est créé en utilisant champ sélectionné.
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Débit doit être égal à crédit . La différence est {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moulage Shell
 DocType: Material Request Item,Required Date,Requis Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,S'il vous plaît entrez le code d'article .
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si elle est cochée, le montant de la taxe sera considéré comme déjà inclus dans le tarif Imprimer / Print Montant"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantité totale
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Se situer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et des dépôts
 DocType: Features Setup,Imports,Importations
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Collage
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Nombre de feuilles alloués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une ouverture d'emploi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activités en suspens pour aujourd&#39;hui
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de fréquentation.
 DocType: Bank Reconciliation,Journal Entries,Journal Entries
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour plan de production
-DocType: System Settings,Loading...,Chargement en cours ...
-DocType: DocField,Password,Mot de passe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Extrusion de fil
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
 DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Ajouter abonnés
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" N'existe pas"
 DocType: Pricing Rule,Valid Upto,Jusqu&#39;à valide
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Énumérer quelques-unes de vos clients . Ils pourraient être des organisations ou des individus .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Choisissez votre langue
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur les compte , si regroupées par compte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Agent administratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Agent administratif
 DocType: Payment Tool,Received Or Paid,Reçus ou payés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,S&#39;il vous plaît sélectionnez Société
 DocType: Stock Entry,Difference Account,Compte de la différence
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer sa tâche en tant que tâche dépendante {0} est pas fermée.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
 DocType: Production Order,Additional Operating Cost,Coût de fonctionnement supplémentaires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,produits de beauté
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
-DocType: Communication,Subject,Sujet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,produits de beauté
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Pour fusionner , les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Shipping Rule,Net Weight,Poids net
 DocType: Employee,Emergency Phone,téléphone d'urgence
 ,Serial No Warranty Expiry,N ° de série expiration de garantie
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Article
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et profits
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestion de la sous-traitance
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nouveau UDM doit pas être de type entier Nombre
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestion de la sous-traitance
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubles et articles d'ameublement
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la monnaie Liste de prix est converti en devise de base entreprise
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
@@ -482,21 +441,21 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Supprimer Transactions Société
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Point {0} n'est pas acheter l'article
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} est une adresse de courriel invalide dans «L'adresse de notification courriel'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Facturation totale de cette année:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturation totale de cette année:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Purchase Invoice,Supplier Invoice No,Fournisseur facture n
 DocType: Territory,For reference,Pour référence
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Vous ne pouvez pas supprimer de série n {0}, tel qu&#39;il est utilisé dans les transactions d&#39;achat d&#39;actions"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fermeture (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fermeture (Cr)
 DocType: Serial No,Warranty Period (Days),Période de garantie (jours)
 DocType: Installation Note Item,Installation Note Item,Article Remarque Installation
 ,Pending Qty,En attente Quantité
 DocType: Job Applicant,Thread HTML,Discussion HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
 DocType: Pricing Rule,Valid From,Aucun article avec Serial Non {0}
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -506,15 +465,14 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribution mensuelle ** vous aide à distribuer votre budget à travers les mois si vous avez la saisonnalité dans votre entreprise.
 
  Pour distribuer un budget en utilisant cette distribution, réglez ce ** distribution mensuelle ** ** dans le centre de coûts **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Aucun documents trouvés dans le tableau de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Aucun documents trouvés dans le tableau de la facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Se il vous plaît sélectionnez Société et partie Type premier
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Point {0} a été saisi plusieurs fois contre une même opération
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , série n ne peut pas être fusionné"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Assurez- Commande
 DocType: Project Task,Project Task,Groupe de Projet
-,Lead Id,Id plomb
+,Lead Id,Id prospect
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Gestionnaire de site Web
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
 DocType: Warranty Claim,Resolution,Résolution
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Livré: {0}
@@ -522,27 +480,26 @@
 DocType: Sales Order,Billing and Delivery Status,Facturation et de livraison Statut
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Précedent
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retour de Ventes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Sélectionnez les commandes clients à partir de laquelle vous souhaitez créer des ordres de fabrication.
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Éléments du salaire.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de données de clients potentiels.
+DocType: Authorization Rule,Customer or Item,Client ou Point
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Base de données clients.
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Ouverture ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Le montant alloué ne peut être négatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que vous avez déjà fait une transaction (s) avec une autre unité de mesure. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 DocType: Purchase Order Item,Billed Amt,Bec Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stocks sont faites.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},contacts
-DocType: Event,Wednesday,Mercredi
 DocType: Sales Invoice,Customer's Vendor,Client Fournisseur
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordre de fabrication est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Rédaction de propositions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Rédaction de propositions
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Sales Person {0} existe avec le même ID d&#39;employé
-apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Facture de vente {0} doit être annulée avant d'annuler cette commande client
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Erreur inventaire négatif ({6}) pour item {0} dans l'entrepot {1} sur {2} {3} dans {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Exercice Société
 DocType: Packing Slip Item,DN Detail,Détail DN
 DocType: Time Log,Billed,Facturé
@@ -561,46 +518,37 @@
 DocType: Activity Type,Default Costing Rate,Taux de défaut Costing
 DocType: Maintenance Schedule,Maintenance Schedule,Calendrier d&#39;entretien
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Ensuite, les règles de tarification sont filtrés sur la base de clientèle, par groupe de clients, Territoire, fournisseur, le type de fournisseur, campagne, etc Sales Partner"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,S&#39;il vous plaît installer Dropbox module Python
 DocType: Employee,Passport Number,Numéro de passeport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,directeur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De ticket de caisse
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,directeur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De ticket de caisse
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Même élément a été saisi plusieurs fois.
 DocType: SMS Settings,Receiver Parameter,Paramètre récepteur
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basé sur' et 'Groupé par' ne peuvent pas être identiques
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,à
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Veuillez entrer une adresse E-mail .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Le tube du bout formant
 DocType: Production Order Operation,In minutes,En quelques minutes
 DocType: Issue,Resolution Date,Date de Résolution
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Les frais de téléphone
 DocType: Selling Settings,Customer Naming By,Client de nommage par
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir en groupe
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir au groupe
 DocType: Activity Cost,Activity Type,Type d&#39;activité
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montant Livré
 DocType: Customer,Fixed Days,Jours fixes
 DocType: Sales Invoice,Packing List,Packing List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Achetez commandes faites aux fournisseurs.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,édition
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,édition
 DocType: Activity Cost,Projects User,Projets utilisateur
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consommé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} introuvable pas dans les Détails de la facture
 DocType: Company,Round Off Cost Center,Arrondir Centre de coûts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Doublons {0} avec la même {1}
 DocType: Material Request,Material Transfer,De transfert de matériel
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),{0} doit être inférieur ou égal à {1}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Horodatage affichage doit être après {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Réglages
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et frais de Landed Cost
 DocType: Production Order Operation,Actual Start Time,Heure de début réelle
 DocType: BOM Operation,Operation Time,Temps de fonctionnement
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Plus
 DocType: Pricing Rule,Sales Manager,Directeur des ventes
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Renommer
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Fléchissement
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permettre à l&#39;utilisateur
 DocType: Journal Entry,Bill No,Numéro de la facture
 DocType: Purchase Invoice,Quarterly,Trimestriel
 DocType: Selling Settings,Delivery Note Required,Remarque livraison requis
@@ -609,17 +557,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Pour signaler un problème, passez à"
 DocType: Purchase Receipt,Other Details,Autres détails
 DocType: Account,Accounts,Comptes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,commercialisation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cisaillement droite
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,commercialisation
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Pour suivre pièce documents de vente et d&#39;achat en fonction de leurs numéros de série. Ce n&#39;est peut également être utilisé pour suivre les détails de la garantie du produit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Entrepôt rejeté est obligatoire contre l'article regected
 DocType: Account,Expenses Included In Valuation,Frais inclus dans l&#39;évaluation
 DocType: Employee,Provide email id registered in company,Fournir id e-mail enregistrée dans la société
 DocType: Hub Settings,Seller City,Vendeur Ville
 DocType: Email Digest,Next email will be sent on:,Email sera envoyé le:
 DocType: Offer Letter Term,Offer Letter Term,Offrez Lettre terme
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Point a variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Point a variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Article {0} introuvable
 DocType: Bin,Stock Value,Valeur de l&#39;action
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Type d' arbre
@@ -628,14 +575,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantité et entrepôt
 DocType: Sales Invoice,Commission Rate (%),Taux de commission (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","le type de bon doit être un ordre de vente, une facture de vente ou une entrée du journal"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Impossible de trouver le taux de change
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aérospatial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aérospatial
 DocType: Journal Entry,Credit Card Entry,Entrée de carte de crédit
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tâche Objet
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
-DocType: Communication,Open,Ouvert
 DocType: Lead,Campaign Name,Nom de la campagne
 ,Reserved,réservé
 DocType: Purchase Order,Supply Raw Materials,Raw Materials Supply
@@ -643,30 +586,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Actif à court terme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} n'est pas un article de stock
 DocType: Mode of Payment Account,Default Account,Compte par défaut
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Chef de file doit être réglée si l'occasion est composé de plomb
-DocType: Contact Us Settings,Address Title,Titre de l'adresse
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Le prospect doit être réglée si l'occasion est créé à partir de ce prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Laissez uniquement les applications ayant le statut « Approuvé » peut être soumis
 DocType: Production Order Operation,Planned End Time,Fin planifiée Temps
 ,Sales Person Target Variance Item Group-Wise,S'il vous plaît entrer un message avant de l'envoyer
-DocType: Dropbox Backup,Daily,Quotidien
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
 DocType: Delivery Note,Customer's Purchase Order No,Bon de commande du client Non
 DocType: Employee,Cell Number,Nombre de cellules
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Demandes de matériel généré automatiquement
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,énergie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,énergie
 DocType: Opportunity,Opportunity From,De opportunité
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Fiche de salaire mensuel.
 DocType: Item Group,Website Specifications,Site Web Spécifications
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,nouveau compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Du {0} de type {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Les écritures comptables ne peuvent être faites sur les nœuds feuilles. Les entrées dans les groupes ne sont pas autorisées.
-DocType: ToDo,High,Haut
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler BOM car il est lié à d'autres nomenclatures
 DocType: Opportunity,Maintenance,Entretien
-DocType: User,Male,Masculin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numéro du bon de réception requis pour objet {0}
 DocType: Item Attribute Value,Item Attribute Value,Point Attribut Valeur
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagnes de vente .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -714,10 +654,9 @@
 DocType: Address,Personal,Personnel
 DocType: Expense Claim Detail,Expense Claim Type,Type de demande d&#39;indemnité
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Les paramètres par défaut pour Panier
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tiré comme l'avance dans la présente facture."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal entrée {0} est lié contre l'ordonnance {1}, vérifier si elle doit être tiré comme l'avance dans la présente facture."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Date d'adhésion doit être supérieure à Date de naissance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,S'il vous plaît entrer article premier
 DocType: Account,Liability,responsabilité
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montant sanctionné ne peut pas être supérieure à la revendication Montant en ligne {0}.
@@ -725,14 +664,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Barcode valide ou N ° de série
 DocType: Employee,Family Background,Antécédents familiaux
 DocType: Process Payroll,Send Email,Envoyer un E-mail
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Aucune autorisation
 DocType: Company,Default Bank Account,Compte bancaire
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pour filtrer sur la base du Parti, sélectionnez Parti premier type"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mettre à jour Stock' ne peut pas être vérifié parce que les articles ne sont pas livrés par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Transaction non autorisée contre arrêté l'ordre de fabrication {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Transaction non autorisée contre arrêté l'ordre de fabrication {0}
 DocType: Item,Items with higher weightage will be shown higher,Articles avec weightage supérieur seront affichés supérieur
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail du rapprochement bancaire
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mes factures
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mes factures
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Aucun employé trouvé
 DocType: Purchase Order,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
@@ -751,35 +691,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pour activer &quot;Point de vente&quot; caractéristiques
 DocType: Bin,Moving Average Rate,Moving Prix moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les objets
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
-DocType: Comment,Reference Name,Nom de référence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 DocType: Maintenance Visit,Completion Status,L&#39;état d&#39;achèvement
 DocType: Sales Invoice Item,Target Warehouse,Cible d&#39;entrepôt
 DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ."
 DocType: Upload Attendance,Import Attendance,Importer Participation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d&#39;activité
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Bénéfice net / perte nette
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
 DocType: Production Order,Item To Manufacture,Point à la fabrication de
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Coulée en moule permanent
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statut est {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Achetez commande au paiement
 DocType: Sales Order Item,Projected Qty,Qté projeté
 DocType: Sales Invoice,Payment Due Date,Date d'échéance
 DocType: Newsletter,Newsletter Manager,Bulletin Gestionnaire
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Point Variant {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Ouverture&#39;
 DocType: Notification Control,Delivery Note Message,Note Message de livraison
 DocType: Expense Claim,Expenses,Note: Ce centre de coûts est un groupe . Vous ne pouvez pas faire les écritures comptables contre des groupes .
 DocType: Item Variant Attribute,Item Variant Attribute,Point Variant Attribut
 ,Purchase Receipt Trends,Achat Tendances reçus
 DocType: Appraisal,Select template from which you want to get the Goals,Sélectionnez le modèle à partir duquel vous souhaitez obtenir des Objectifs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Recherche & Développement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Recherche & Développement
 ,Amount to Bill,Montant à facturer
 DocType: Company,Registration Details,Détails de l&#39;enregistrement
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Jalonnement
 DocType: Item,Re-Order Qty,Re-commande Quantité
 DocType: Leave Block List Date,Leave Block List Date,Laisser Date de Block List
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Prévu pour envoyer à {0}
@@ -790,18 +727,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Détails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point de vente
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Point {0} doit être un achat article
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
 DocType: Account,Balance must be,Solde doit être
 DocType: Hub Settings,Publish Pricing,Publier Prix
 DocType: Notification Control,Expense Claim Rejected Message,Demande d&#39;indemnité rejeté le message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Cloutage
-,Available Qty,Quantité disponible 
+,Available Qty,Quantité disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Le total de la rangée précédente
 DocType: Salary Slip,Working Days,Jours ouvrables
 DocType: Serial No,Incoming Rate,Taux d&#39;entrée
 DocType: Packing Slip,Gross Weight,Poids brut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Le nom de votre entreprise pour laquelle vous configurez ce système .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inclure les vacances en aucun totale. de jours de travail
 DocType: Job Applicant,Hold,Tenir
 DocType: Employee,Date of Joining,Date d&#39;adhésion
@@ -811,30 +746,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Voir abonnés
 DocType: Purchase Invoice Item,Purchase Receipt,Achat Réception
 ,Received Items To Be Billed,Articles reçus à être facturé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Grenaillage
 DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Campagne . # # # #
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver slot Temps dans les prochaines {0} jours pour l&#39;opération {1}
 DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} doit être actif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} doit être actif
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,S&#39;il vous plaît sélectionner le type de document premier
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,S'il vous plaît créer la structure des salaires pour les employés {0}
 DocType: Salary Slip,Leave Encashment Amount,Laisser Montant Encaissement
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},compensatoire
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantité requise
 DocType: Bank Reconciliation,Total Amount,Montant total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publication Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
 DocType: Production Planning Tool,Production Orders,Ordres de fabrication
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valeur du solde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de prix de vente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publier pour synchroniser les éléments
-DocType: GL Entry,Account Currency,Compte
+DocType: Bank Reconciliation,Account Currency,Compte
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,S&#39;il vous plaît mentionner ronde Compte Off dans Société
 DocType: Purchase Receipt,Range,Gamme
 DocType: Supplier,Default Payable Accounts,Comptes créditeurs par défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employé {0} n'est pas actif , ou n'existe pas"
 DocType: Features Setup,Item Barcode,Barcode article
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Point variantes {0} mis à jour
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Point variantes {0} mis à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Paiement à l&#39;avance Facture
 DocType: Address,Shop,Magasiner
@@ -843,7 +777,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Par défaut Banque / argent compte sera automatiquement mis à jour dans la facture POS lorsque ce mode est sélectionné.
 DocType: Employee,Permanent Address Is,Adresse permanente est
 DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marque
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marque
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Allocation pour les plus de {0} franchi pour objet {1}.
 DocType: Employee,Exit Interview Details,Quittez Détails Interview
 DocType: Item,Is Purchase Item,Est-Item
@@ -854,68 +788,63 @@
 DocType: Lead,Request for Information,Demande de renseignements
 DocType: Payment Tool,Paid,Payé
 DocType: Salary Slip,Total in words,Total en mots
-DocType: Material Request Item,Lead Time Date,Plomb Date Heure
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être fiche de change est pas créé pour
+DocType: Material Request Item,Lead Time Date,Délai Date Heure
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,est obligatoire. Peut-être que le taux de change n'est pas créé pour
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier Pas de série pour objet {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles, de stockage, de série et de lot »Aucun produit Bundle &#39;Aucune sera considérée comme de la table&quot; Packing List&#39;. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d&#39;emballage pour un objet quelconque &#39;Bundle produit&#39;, ces valeurs peuvent être saisies dans le tableau principal de l&#39;article, les valeurs seront copiés sur &quot;Packing List &#39;table."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Les livraisons aux clients.
 DocType: Purchase Invoice Item,Purchase Order Item,Achat Passer commande
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,{0} {1} statut est débouchées
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Réglez montant du paiement = Encours
-DocType: Contact Us Settings,Address Line 1,Adresse ligne 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nom de l'entreprise
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Sélectionner un élément de transfert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Sélectionner un élément de transfert
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d&#39;aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permettre à l&#39;utilisateur d&#39;éditer Prix List Noter dans les transactions
 DocType: Pricing Rule,Max Qty,Qté Max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimique
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
 DocType: Process Payroll,Select Payroll Year and Month,Sélectionnez paie Année et mois
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Aller au groupe approprié (généralement l&#39;utilisation des fonds&gt; Actif à court terme&gt; Comptes bancaires et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «Banque»
 DocType: Workstation,Electricity Cost,Coût de l'électricité
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer des employés anniversaire rappels
-DocType: Comment,Unsubscribed,Désabonné
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Critères d&#39;inspection
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Il ne faut pas mettre à jour les entrées de plus que {0}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transféré
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Téléchargez votre tête et le logo lettre. (Vous pouvez les modifier ultérieurement).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanc
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Téléchargez votre tête et le logo lettre. (Vous pouvez les modifier ultérieurement).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Blanc
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Joindre votre photo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Faire
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Joindre votre photo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Faire
 DocType: Journal Entry,Total Amount in Words,Montant total en mots
-DocType: Workflow State,Stop,arrêtez
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Il y avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mon panier
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},type d'ordre doit être l'un des {0}
 DocType: Lead,Next Contact Date,Date Contact Suivant
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'ouverture
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Options sur actions
 DocType: Journal Entry Account,Expense Claim,Demande d&#39;indemnité de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantité pour {0}
 DocType: Leave Application,Leave Application,Demande de congés
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Laisser outil de répartition
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Absence outil de répartition
 DocType: Leave Block List,Leave Block List Dates,Laisser Dates de listes rouges d&#39;
 DocType: Company,If Monthly Budget Exceeded (for expense account),Si le budget mensuel dépassé (pour compte de dépenses)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Garniture
 DocType: Workstation,Net Hour Rate,Taux net de Hour
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost reçu d&#39;achat
 DocType: Company,Default Terms,Conditions défaut
 DocType: Packing Slip Item,Packing Slip Item,Emballage article Slip
 DocType: POS Profile,Cash/Bank Account,Trésorerie / Compte bancaire
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Les articles retirés avec aucun changement dans la quantité ou la valeur.
 DocType: Delivery Note,Delivery To,Livrer à
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Dépôt
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabais
 DocType: Features Setup,Purchase Discounts,Rabais sur l&#39;achat
 DocType: Workstation,Wages,Salaires
@@ -932,7 +861,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettre à jour le «Status» et Save
 DocType: Serial No,Creation Document No,Création document n
 DocType: Issue,Issue,Question
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour objet variantes. par exemple la taille, la couleur, etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte ne correspond pas avec la Compagnie
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour objet variantes. par exemple la taille, la couleur, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Entrepôt
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
 DocType: BOM Operation,Operation,Opération
@@ -940,13 +870,13 @@
 DocType: Tax Rule,Shipping State,Etat de livraison
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide 'obtenir des éléments de reçus d'achat de la touche
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Fournisseur numéro de livraison en double dans {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,achat standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,achat standard
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} {1} est
 DocType: Opportunity,Contact Info,Information de contact
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Faire Stock entrées
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Faire Stock entrées
 DocType: Packing Slip,Net Weight UOM,Emballage Poids Net
 DocType: Item,Default Supplier,Par défaut Fournisseur
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Surproduction Allocation Pourcentage
@@ -961,29 +891,27 @@
 DocType: Time Log Batch,updated via Time Logs,mise à jour via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,âge moyen
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre personne de ventes prendra contact avec le client dans le futur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Énumérer quelques-unes de vos fournisseurs . Ils pourraient être des organisations ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Énumérer quelques-unes de vos fournisseurs . Ils pourraient être des organisations ou des individus .
 DocType: Company,Default Currency,Devise par défaut
 DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
-DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,De employés
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
 DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence
 DocType: Upload Attendance,Attendance From Date,Participation De Date
 DocType: Appraisal Template Goal,Key Performance Area,Section de performance clé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,et l&#39;année:
 DocType: Email Digest,Annual Expense,Dépense annuelle
 DocType: SMS Center,Total Characters,Nombre de caractères
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Se il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Se il vous plaît sélectionner dans le champ BOM BOM pour objet {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Détail Facture
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rapprochement des paiements de facture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribution%
 DocType: Item,website page link,Lien vers page web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Préparons le système pour la première utilisation.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numéros d'immatriculation de l’entreprise pour votre référence. Numéros de taxes, etc"
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Panier Livraison règle
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Tous les groupes de clients
 ,Ordered Items To Be Billed,Articles commandés à facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Sélectionnez registres de temps et de soumettre à créer une nouvelle facture de vente.
@@ -1003,14 +931,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Advance facture de vente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Pas de requête à demander
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',« Date de Début réel » ne peut être supérieur à ' Date réelle de fin »
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,gestion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,gestion
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Types d&#39;activités pour les feuilles de temps
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Coulée de
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Soit de débit ou de montant de crédit est nécessaire pour {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la variante de l'article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire net (en lettres) sera visible une fois que vous enregistrez le bulletin de salaire.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actif
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Bleu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Bleu
 DocType: Purchase Invoice,Is Return,Est de retour
 DocType: Price List Country,Price List Country,Liste des Prix Pays
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,D'autres nœuds peuvent être créées que sous les nœuds de type 'Groupe'
@@ -1020,50 +946,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} déjà créé pour l&#39;utilisateur: {1} et {2} société
 DocType: Purchase Order Item,UOM Conversion Factor,Facteur de conversion Emballage
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,La fabrication de l&#39;objet stratifié
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centre de coûts pour l'objet avec le code d'objet '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Étirage
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre personne de ventes recevera un rappel cette date pour contacter le client
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","D&#39;autres comptes peuvent être faites dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,De l&#39;impôt et autres déductions salariales.
-DocType: Lead,Lead,Conduire
+DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
 DocType: Account,Warehouse,entrepôt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
 ,Purchase Order Items To Be Billed,Purchase Order articles qui lui seront facturées
 DocType: Purchase Invoice Item,Net Rate,Taux net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Achat d&#39;article de facture
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Registre des stocks Entrées et GL sont entrées Quote pour les reçus d'achat sélectionnés
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Point 1
 DocType: Holiday,Holiday,Vacances
-DocType: Event,Saturday,Samedi
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide si cela est jugé pour toutes les branches
 ,Daily Time Log Summary,Daily Time Sommaire du journal
-DocType: DocField,Label,Étiquette
 DocType: Payment Reconciliation,Unreconciled Payment Details,Non rapprochés détails de paiement
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Global Defaults,Disable Rounded Total,Désactiver totale arrondie
 DocType: Lead,Call,Appeler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Mise en place d&#39;employés
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grille """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,nourriture
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,recherche
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,S&#39;il vous plaît spécifier au moins un attribut dans le tableau Attributs
 DocType: Contact,User ID,ID utilisateur
-DocType: Communication,Sent,expédié
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Voir Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
-DocType: Communication,Delivery Status,Statut de la livraison
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
 DocType: Production Order,Manufacture against Sales Order,Fabrication à l&#39;encontre des commandes clients
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,revenu indirect
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,revenu indirect
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Le Point {0} ne peut pas avoir lot
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
@@ -1074,13 +993,11 @@
 DocType: BOM Item,Item Description,Description de l&#39;objet
 DocType: Payment Tool,Payment Mode,mode de paiement
 DocType: Purchase Invoice,Is Recurring,Est récurrent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Frittage laser direct de métal
 DocType: Purchase Order,Supplied Items,Articles fournis
 DocType: Production Order,Qty To Manufacture,Quantité à fabriquer
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le taux de même tout au long du cycle d&#39;achat
 DocType: Opportunity Item,Opportunity Item,Article occasion
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ouverture temporaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Congé employé Solde
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
 DocType: Address,Address Type,Type d&#39;adresse
@@ -1096,35 +1013,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez Factures en souffrance
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Company ( pas client ou fournisseur ) maître .
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Petit
 DocType: Employee,Employee Number,Numéro d&#39;employé
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Entrées avant {0} sont gelés
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Point 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Responsable du compte {0} a été crée
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Vert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Vert
 DocType: Item,Auto re-order,Auto re-commande
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total obtenu
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total obtenu
 DocType: Employee,Place of Issue,Lieu d&#39;émission
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrat
-DocType: Report,Disabled,Desactivé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrat
+DocType: Email Digest,Add Quote,Ajouter Citer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,N ° de série {0} créé
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ligne {0}: Quantité est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agriculture
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vos produits ou services
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Vos produits ou services
 DocType: Mode of Payment,Mode of Payment,Mode de paiement
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ceci est un groupe d'élément de racine et ne peut être modifié .
 DocType: Journal Entry Account,Purchase Order,Bon de commande
 DocType: Warehouse,Warehouse Contact Info,Entrepôt Info Contact
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Le nom est obligatoire
 DocType: Purchase Invoice,Recurring Type,Type de courant
 DocType: Address,City/Town,Ville
 DocType: Email Digest,Annual Income,Revenu annuel
 DocType: Serial No,Serial No Details,Détails Pas de série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Livraison Remarque {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Exercice Date de début
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipements de capitaux
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prix règle est d'abord sélectionné sur la base de «postuler en« champ, qui peut être l'article, groupe d'articles ou de marque."
@@ -1134,14 +1050,13 @@
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Date de livraison prévue est moindre que prévue Date de début.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,pour fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total (Société Monnaie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sortant total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Il ne peut y avoir une règle de livraison Etat avec 0 ou valeur vide pour "" To Value """
 DocType: Authorization Rule,Transaction,Transaction
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Prix règle pour l'escompte
-apps/frappe/frappe/config/desk.py +7,Tools,Outils
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Prix règle pour l'escompte
 DocType: Item,Website Item Groups,Groupes d&#39;articles Site web
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,numéro d'ordre de production est obligatoire pour l'entrée en stock but fabrication
 DocType: Purchase Invoice,Total (Company Currency),Total (Société devise)
@@ -1149,24 +1064,22 @@
 DocType: Journal Entry,Journal Entry,Journal d'écriture
 DocType: Workstation,Workstation Name,Nom de la station de travail
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Envoyer Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Commentaires
 DocType: Salary Slip,Bank Account No.,No. de compte bancaire
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Il s&#39;agit du numéro de la dernière transaction créée par ce préfixe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},{0} {1} est l'état 'arrêté'
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},{0} {1} est l'état 'arrêté'
 DocType: Quality Inspection Reading,Reading 8,Lecture 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} pour tous les articles est zéro, vous devriez peut-être changer &quot;Distribuer accusations fondées sur &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taxes et frais de calcul
 DocType: BOM Operation,Workstation,station de travail
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Sales Person cible Variance article Groupe Sage
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Sales Person cible Variance article Groupe Sage
 DocType: Attendance,HR Manager,Responsable des Ressources Humaines
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,S&#39;il vous plaît sélectionner une entreprise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Point {0} doit être fonction Point
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Point {0} doit être fonction Point
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Vous devez activer Panier
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Aucune donnée
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objectif modèle d&#39;évaluation
 DocType: Salary Slip,Earning,Revenus
 DocType: Payment Tool,Party Account Currency,Compte Parti devise
@@ -1176,26 +1089,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Sur le Journal des entrées {0} est déjà ajusté par un autre bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ordre Valeur totale
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Alimentation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de vieillissement 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Vous pouvez faire un journal de temps que contre une ordonnance de production soumis
 DocType: Maintenance Schedule Item,No of Visits,Pas de visites
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bulletins aux contacts, prospects."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Devise de la clôture des comptes doit être {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Opérations ne peuvent pas être laissés en blanc.
 ,Delivered Items To Be Billed,Les items livrés à être facturés
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Entrepôt ne peut être modifié pour le numéro de série
-DocType: DocField,Description,Description
 DocType: Authorization Rule,Average Discount,Remise moyenne
-DocType: Letter Head,Is Default,Est défaut
 DocType: Address,Utilities,Utilitaires
 DocType: Purchase Invoice Item,Accounting,Comptabilité
 DocType: Features Setup,Features Setup,Features Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Voir offre Lettre
-DocType: Communication,Communication,Communication
 DocType: Item,Is Service Item,Est-Point de service
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Période d&#39;application ne peut pas être la période d&#39;allocation de congé à l&#39;extérieur
 DocType: Activity Cost,Projects,Projets
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,S'il vous plaît sélectionner l'Exercice
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Du {0} | {1} {2}
@@ -1214,7 +1124,7 @@
 DocType: Item,Maintain Stock,Maintenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est jugé pour toutes les désignations
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans l'article Noter
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De Datetime
 DocType: Email Digest,For Company,Pour l&#39;entreprise
@@ -1224,7 +1134,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan comptable
 DocType: Material Request,Terms and Conditions Content,Termes et Conditions de contenu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Point {0} n'est pas un stock Article
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenue
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dépend de congé non payé
@@ -1238,31 +1148,28 @@
 DocType: HR Settings,Employee Settings,Réglages des employés
 ,Batch-Wise Balance History,Discontinu Histoire de la balance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Liste de tâches à faire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantité négatif n'est pas autorisé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Apprenti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantité négatif n'est pas autorisé
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impôt table récupérées par le maître de l'article comme une chaîne et stockée dans ce domaine en détail.
  Utilisé pour les impôts et frais"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Employé ne peut pas rendre compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées sont autorisés pour les utilisateurs restreints ."
 DocType: Email Digest,Bank Balance,Solde bancaire
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite en monnaie: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptabilité pour {0}: {1} ne peut être faite en monnaie: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Aucune structure salariale actif trouvé pour l&#39;employé {0} et le mois
 DocType: Job Opening,"Job profile, qualifications required etc.",Non authroized depuis {0} dépasse les limites
 DocType: Journal Entry Account,Account Balance,Solde du compte
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Règle d&#39;impôt pour les transactions.
 DocType: Rename Tool,Type of document to rename.,Type de document à renommer.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nous achetons cet article
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Nous achetons cet article
 DocType: Address,Billing,Facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanger
-DocType: Bulk Email,Not Sent,Non Envoyés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Formage par explosion
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total des taxes et charges (Société Monnaie)
 DocType: Shipping Rule,Shipping Account,Compte de livraison
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Prévu pour envoyer à {0} bénéficiaires
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sous assemblées
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,sous assemblées
 DocType: Shipping Rule Condition,To Value,To Value
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Entrepôt de Source est obligatoire pour la ligne {0}
@@ -1272,105 +1179,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importation a échoué!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation heures de travail
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analyste
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analyste
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant JV {2}
 DocType: Item,Inventory,Inventaire
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pour activer &quot;Point de vente&quot; vue
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Le paiement ne peut être fait pour le chariot vide
 DocType: Item,Sales Details,Détails ventes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Épinglant
 DocType: Opportunity,With Items,Avec Articles
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qté
 DocType: Notification Control,Expense Claim Rejected,Demande d&#39;indemnité rejetée
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
 DocType: Item Attribute,Item Attribute,Point Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Des variantes de l&#39;article
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Si différente de l'adresse du client
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Des variantes de l&#39;article
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Aucun documents trouvés dans le tableau de paiement
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Date de Début de l'exercice financier
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Aucun documents trouvés dans le tableau de paiement
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Date de Début de l'exercice financier
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Chanfrainage
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Point {0} doit être un élément de sous- traitance
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Fret et d'envoi en sus
 DocType: Material Request Item,Sales Order No,Ordonnance n ° de vente
 DocType: Item Group,Item Group Name,Nom du groupe d&#39;article
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Pris
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Matériaux de transfert pour la fabrication
 DocType: Pricing Rule,For Price List,Annuler matériaux Visites {0} avant l'annulation de cette visite d'entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","taux d'achat pour l'article: {0} introuvable, qui est nécessaire pour réserver l'entrée comptabilité (charges). Se il vous plaît mentionner le prix de l'article à une liste de prix d'achat."
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,Numéro du détail BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de réduction supplémentaire (devise Société)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erreur: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erreur: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,S'il vous plaît créer un nouveau compte de plan comptable .
 DocType: Maintenance Visit,Maintenance Visit,Visite de maintenance
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Groupe de clientèle> Territoire
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lot Quantité à Entrepôt
 DocType: Time Log Batch Detail,Time Log Batch Detail,Temps connecter Détail du lot
-DocType: Workflow State,Tasks,tâches
 DocType: Landed Cost Voucher,Landed Cost Help,Aide Landed Cost
-DocType: Event,Tuesday,Mardi
 DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
 ,Accounts Receivable Summary,Le résumé de comptes débiteurs
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Feuilles pour le type {0} déjà alloué pour les employés {1} pour la période {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Se il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
 DocType: UOM,UOM Name,Nom UDM
-DocType: Top Bar Item,Target,Cible
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Montant de la contribution
 DocType: Sales Invoice,Shipping Address,Adresse de livraison
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Cet outil vous permet de mettre à jour ou de corriger la quantité et l'évaluation de stock dans le système. Il est généralement utilisé pour synchroniser les valeurs du système et ce qui existe réellement dans vos entrepôts.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dans les mots seront visibles une fois que vous enregistrez le bon de livraison.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marque maître.
-DocType: ToDo,Due Date,Due Date
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Marque maître.
 DocType: Sales Invoice Item,Brand Name,La marque
 DocType: Purchase Receipt,Transporter Details,Transporter Détails
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,boîte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,l'Organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,boîte
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,l'Organisation
 DocType: Monthly Distribution,Monthly Distribution,Une distribution mensuelle
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Soit quantité de cible ou le montant cible est obligatoire .
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de Production Ventes Ordre
 DocType: Sales Partner,Sales Partner Target,Cible Sales Partner
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrée de comptabilité pour {0} ne peut être effectué en monnaie: {1}
 DocType: Pricing Rule,Pricing Rule,Provision pour plus - livraison / facturation excessive franchi pour objet {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Encocheuse
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Demande de Matériel à Bon de commande
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: article retourné {1} ne existe pas dans {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaires
 ,Bank Reconciliation Statement,Énoncé de rapprochement bancaire
-DocType: Address,Lead Name,Nom du chef de
+DocType: Address,Lead Name,Nom du prospect
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Ouverture Stock Solde
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ouverture Stock Solde
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} doit apparaître qu'une seule fois
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Forums
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d'éléments pour emballer
 DocType: Shipping Rule Condition,From Value,De la valeur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Fabrication Quantité est obligatoire
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Les montants ne figurent pas dans la banque
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Les montants ne figurent pas dans la banque
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Les réclamations pour frais de la société.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Coulée centrifuge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Finition assisté de champ magnétique
 DocType: Company,Default Holiday List,Par défaut Liste vacances
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passif stock
 DocType: Purchase Receipt,Supplier Warehouse,Entrepôt Fournisseur
-DocType: Opportunity,Contact Mobile No,Contact Mobile Aucune
+DocType: Opportunity,Contact Mobile No,Contact No portable
 DocType: Production Planning Tool,Select Sales Orders,Sélectionnez les commandes clients
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le jour (s) sur lequel vous postulez pour un congé sont des jours fériés. Vous ne devez pas demander l&#39;autorisation.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pour suivre les éléments à l&#39;aide de code à barres. Vous serez en mesure d&#39;entrer dans les articles bon de livraison et la facture de vente par balayage de code à barres de l&#39;article.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marquer comme Livré
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marquer comme Livré
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faire offre
 DocType: Dependent Task,Dependent Task,Tâche dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},revenu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'unité de mesure par défaut doit être 1 dans la ligne {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l&#39;avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter anniversaire rappels
 DocType: SMS Center,Receiver List,Liste des récepteurs
@@ -1378,31 +1276,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantité consommée
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Voir
 DocType: Salary Structure Deduction,Salary Structure Deduction,Déduction structure salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Frittage sélectif par laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importez réussie !
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans facteur de conversion de table
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût de documents publiés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Âge (jours)
-DocType: Quotation Item,Quotation Item,Article devis
+DocType: Quotation Item,Quotation Item,Article de la soumission
 DocType: Account,Account Name,Nom du compte
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Date d'entrée ne peut pas être supérieur à ce jour
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,N ° de série {0} {1} quantité ne peut pas être une fraction
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Solde de compte {0} doit toujours être {1}
 DocType: Purchase Order Item,Supplier Part Number,Numéro de pièce fournisseur
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Ajouter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Un groupe de clients existe avec le même nom s'il vous plaît changer le nom du client ou renommer le groupe de clients
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Le taux de conversion ne peut pas être égal à 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Date de véhicule Dispatch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Reçu d'achat {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte à payer par défaut
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier en ligne telles que les règles d'expédition, liste de prix, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuration terminée
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Facturé
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Quantité réservés
 DocType: Party Account,Party Account,Compte Parti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ressources humaines
 DocType: Lead,Upper Income,Revenu élevé
 DocType: Journal Entry Account,Debit in Company Currency,Débit en Entreprise Devise
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mes questions
@@ -1411,12 +1305,9 @@
 DocType: Company,Default Values,Les Valeurs Par Défaut
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Montant du paiement ne peut être négative
 DocType: Expense Claim,Total Amount Reimbursed,Montant total remboursé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Emmanchement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Sur le fournisseur de la facture {0} datée  {1}
 DocType: Customer,Default Price List,Liste des prix défaut
 DocType: Payment Reconciliation,Payments,Paiements
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Pressage isostatique à chaud
-DocType: ToDo,Medium,Moyen
 DocType: Budget Detail,Budget Allocated,Budget alloué
 DocType: Journal Entry,Entry Type,Type d&#39;entrée
 ,Customer Credit Balance,Solde de crédit à la clientèle
@@ -1425,12 +1316,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
 DocType: Quotation,Term Details,Détails terme
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de la capacité pendant (jours)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Aucun des éléments ont tout changement dans la quantité ou la valeur.
 DocType: Warranty Claim,Warranty Claim,Demande de garantie
-,Lead Details,Le plomb Détails
-DocType: Authorization Rule,Approving User,Approuver l&#39;utilisateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placage
+,Lead Details,Détails du prospect
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
 DocType: Pricing Rule,Applicable For,Applicable pour
 DocType: Bank Reconciliation,From Date,Partir de la date
@@ -1452,64 +1340,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Montant payé (Société devise)
 DocType: Purchase Invoice,Additional Discount,Remise supplémentaires
 DocType: Selling Settings,Selling Settings,Réglages de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Enchères en ligne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Enchères en ligne
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,S'il vous plaît spécifier Quantité ou l'évaluation des taux ou à la fois
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Société , le mois et l'année fiscale est obligatoire"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Dépenses de marketing
 ,Item Shortage Report,Point Pénurie rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n Se il vous plaît mentionner ""Poids UOM« trop"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n Se il vous plaît mentionner ""Poids UOM« trop"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisé pour réaliser cette Stock Entrée
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Une seule unité d&#39;un élément.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Geler stocks Older Than [ jours]
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faites une entrée comptabilité pour chaque mouvement du stock
 DocType: Leave Allocation,Total Leaves Allocated,Feuilles total alloué
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Entrepôt nécessaire au rang n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Entrepôt nécessaire au rang n {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,S&#39;il vous plaît entrer valide financier Année Dates de début et de fin
 DocType: Employee,Date Of Retirement,Date de la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Exploitation minière
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Résine de coulée
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,S'il vous plaît sélectionnez {0} en premier.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texte {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texte {0}
 DocType: Territory,Parent Territory,Territoire Parent
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
 DocType: Stock Entry,Material Receipt,Réception matériau
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produits
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produits
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Type de Parti et le Parti est nécessaire pour recevoir / payer compte {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a variantes, alors il ne peut pas être sélectionné dans les ordres de vente, etc."
 DocType: Lead,Next Contact By,Suivant Par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Quantité requise pour objet {0} à la ligne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Quantité requise pour objet {0} à la ligne {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe quantité pour objet {1}
 DocType: Quotation,Order Type,Type d&#39;ordre
 DocType: Purchase Invoice,Notification Email Address,Adresse e-mail de notification
 DocType: Payment Tool,Find Invoices to Match,Trouver factures pour correspondre
 ,Item-wise Sales Register,Ventes point-sage S&#39;enregistrer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","par exemple ""XYZ Banque Nationale """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","par exemple ""XYZ Banque Nationale """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Cible total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Cible total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Panier est activé
 DocType: Job Applicant,Applicant for a Job,Candidat à un emploi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Section de base
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Entrepôt réservé requis pour l'article courant {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Entrepôt réservé requis pour l'article courant {0}
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 DocType: Sales Invoice Item,Batch No,Numéro du lot
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs commandes clients contre bon de commande d&#39;un client
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
-DocType: DocPerm,Delete,Supprimer
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nouvelle {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe de numérotation des séries sur vos transactions
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Compte des parents ne peut pas être un grand livre
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
 DocType: Employee,Leave Encashed?,Laisser encaissés?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Faites bon de commande
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Faites bon de commande
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
 DocType: Sales Team,Contribution to Net Total,Contribution à Total net
 DocType: Sales Invoice Item,Customer's Item Code,Code article client
 DocType: Stock Reconciliation,Stock Reconciliation,Stock réconciliation
@@ -1518,53 +1404,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Candidat à un emploi.
 DocType: Purchase Order Item,Warehouse and Reference,Entrepôt et référence
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations légales et autres informations générales au sujet de votre Fournisseur
-DocType: Country,Country,Pays
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresses
-DocType: Communication,Received,reçu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Sur le Journal des entrées {0} n'a pas d'entrée {1} non associée
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N ° de série entré pour objet {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une règle de livraison
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item est pas autorisé à avoir ordre de fabrication.
-DocType: DocField,Attach Image,Joindre l'image
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (Calculé automatiquement comme la somme du poids net des articles)
-DocType: Stock Reconciliation Item,Leave blank if no change,Laissez ce champ vide si aucun changement
 DocType: Sales Order,To Deliver and Bill,De livrer et le projet de loi
 DocType: GL Entry,Credit Amount in Account Currency,Montant de crédit en compte Devises
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Temps pour la fabrication des journaux.
 DocType: Item,Apply Warehouse-wise Reorder Level,Appliquer Warehouse-sage Réorganiser Niveau
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} doit être soumis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} doit être soumis
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Le journal du temps pour les tâches.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Paiement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Paiement
 DocType: Production Order Operation,Actual Time and Cost,Temps réel et coût
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour objet {1} contre Commande {2}
 DocType: Employee,Salutation,Salutation
-DocType: Communication,Rejected,Rejeté
 DocType: Pricing Rule,Brand,Marque
 DocType: Item,Will also apply for variants,Se appliquera également pour les variantes
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Regrouper des envois au moment de la vente.
 DocType: Sales Order Item,Actual Qty,Quantité réelle
 DocType: Sales Invoice Item,References,Références
 DocType: Quality Inspection Reading,Reading 10,Lecture 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Référencez vos produits ou services que vous achetez ou vendez.
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Référencez vos produits ou services que vous achetez ou vendez.
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré les doublons . S'il vous plaît corriger et essayer à nouveau.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valeur {0} pour l&#39;attribut {1} ne existe pas dans la liste des valeurs d&#39;attribut valide article
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,associé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associé
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,"Société Email ID introuvable , donc postez pas envoyé"
 DocType: SMS Center,Create Receiver List,Créer une liste Receiver
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expiré
 DocType: Packing Slip,To Package No.,Pour Emballer n °
-DocType: DocType,System,Système
 DocType: Warranty Claim,Issue Date,Date d&#39;émission
 DocType: Activity Cost,Activity Cost,Le coût de l'activité
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,télécommunications
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,télécommunications
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
 DocType: Payment Tool,Make Payment Entry,Effectuer un paiement d'entrée
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieur à {1}
 ,Sales Invoice Trends,Soldes Tendances de la facture
 DocType: Leave Application,Apply / Approve Leaves,Appliquer / Approuver Feuilles
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pour
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Remarque : {0}
 DocType: Sales Order Item,Delivery Warehouse,Entrepôt de livraison
 DocType: Stock Settings,Allowance Percent,Pourcentage allocation
@@ -1574,35 +1455,30 @@
 DocType: Serial No,Creation Date,date de création
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},S'il vous plaît indiquer Devise par défaut en maître de compagnie et par défaut mondiaux
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vente doit être vérifiée, si pour Applicable est sélectionné comme {0}"
-DocType: Purchase Order Item,Supplier Quotation Item,Article Devis Fournisseur
+DocType: Purchase Order Item,Supplier Quotation Item,Article Estimation Fournisseur
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Faire structure salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tonte
 DocType: Item,Has Variants,A Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Cliquez sur le bouton pour créer une nouvelle facture de vente «Facture de vente Make &#39;.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballage et l&#39;étiquetage
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribution mensuelle
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,N ° de série {0} n'existe pas
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox accès secrète
 DocType: Purchase Invoice,Recurring Invoice,Facture récurrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestion de projets
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de biens ou services.
 DocType: Budget Detail,Fiscal Year,Exercice
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté contre {0}, car il est pas un compte de revenus ou de dépenses"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Atteint
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territoire / client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,par exemple 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,par exemple 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dans les mots seront visibles une fois que vous enregistrez la facture de vente.
 DocType: Item,Is Sales Item,Est-Point de vente
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Point arborescence de groupe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Point {0} n'est pas configuré pour maître numéros de série Check Point
 DocType: Maintenance Visit,Maintenance Time,Temps de maintenance
 ,Amount to Deliver,Nombre à livrer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un produit ou service
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Il y avait des erreurs .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapotement
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un produit ou service
 DocType: Naming Series,Current Value,Valeur actuelle
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} créé
 DocType: Delivery Note Item,Against Sales Order,Sur la commande
@@ -1617,15 +1493,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe Article Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Frais et taxes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,S'il vous plaît entrer Date de référence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,S'il vous plaît entrer Date de référence
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrées de paiement ne peuvent pas être filtrées par {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour le point qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
 DocType: Material Request Item,Material Request Item,Article demande de matériel
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arbre de groupes des ouvrages .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Arbre de groupes des ouvrages .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nos série requis pour Serialized article {0}
 ,Item-wise Purchase History,Historique des achats (par Article)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rouge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rouge
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Commandes ouverte de production
@@ -1635,12 +1511,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Opération {1} ne est pas terminée pour {2} Quantité de produits finis en ordre de fabrication # {3}. Se il vous plaît mettre à jour l'état de fonctionnement via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Laisser Bill of Materials devrait être «oui» . Parce que un ou plusieurs nomenclatures actifs présents pour cet article
 DocType: Issue,Resolution Details,Détails de la résolution
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Changer Emballage pour un article.
 DocType: Quality Inspection Reading,Acceptance Criteria,Critères d&#39;acceptation
 DocType: Item Attribute,Attribute Name,Nom de l'attribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Ajouter au panier
 DocType: Item Group,Show In Website,Afficher dans le site Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Groupe
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Groupe
 DocType: Task,Expected Time (in hours),Durée prévue (en heures)
 ,Qty to Order,Quantité à commander
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Pour suivre le nom de la marque dans les documents suivants de Livraison, Opportunité, Demande de Matériel, Item, bon de commande, bon d&#39;achat, l&#39;acheteur réception, offre, facture de vente, Fagot produit, Sales Order, No de série"
@@ -1649,78 +1524,67 @@
 DocType: Holiday List,Clear Table,Effacer le tableau
 DocType: Features Setup,Brands,Marques
 DocType: C-Form Invoice Detail,Invoice No,Aucune facture
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,De bon de commande
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,De bon de commande
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être appliquée / annulée avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 DocType: Activity Cost,Costing Rate,Taux Costing
 ,Customer Addresses And Contacts,Adresses et contacts clients
 DocType: Employee,Resignation Letter Date,Date de lettre de démission
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Les règles de tarification sont encore filtrés en fonction de la quantité.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,non définie
-DocType: Communication,Date,Date
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répétez Revenu à la clientèle
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Veuillez patienter pendant l’installation. L’opération peut prendre quelques minutes. 
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de frais'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Assistant de configuration
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Assistant de configuration
 DocType: Bank Reconciliation Detail,Against Account,Sur le compte
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 DocType: Item,Has Batch No,A lot no
 DocType: Delivery Note,Excise Page Number,Numéro de page d&#39;accise
 DocType: Employee,Personal Details,Données personnelles
 ,Maintenance Schedules,Programmes d&#39;entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gaufrage
-,Quotation Trends,Devis Tendances
+,Quotation Trends,Soumission Tendances
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Le groupe d'articles ne sont pas mentionnés dans le maître de l'article pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Débit Pour compte doit être un compte à recevoir
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Comme ordre de fabrication peut être faite de cet élément, il doit être un article en stock ."
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Adhésion
-DocType: Authorization Rule,Above Value,Au-dessus de la valeur
 ,Pending Amount,Montant en attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de conversion
 DocType: Purchase Order,Delivered,Livré
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuration serveur entrant pour les emplois id e-mail . (par exemple jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Nombre de véhicules
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêter
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Nombre de feuilles alloués {0} ne peut pas être inférieure à feuilles déjà approuvés {1} pour la période
 DocType: Journal Entry,Accounts Receivable,Débiteurs
 ,Supplier-Wise Sales Analytics,Fournisseur - Wise ventes Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ce format est utilisé si le format spécifique au pays n'est pas trouvé
-DocType: Custom Field,Custom,Coutume
 DocType: Production Order,Use Multi-Level BOM,Utilisez Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Le moulage par injection
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rapprochées
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborescence des comptes financiers.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide si cela est jugé pour tous les types d&#39;employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer accusations fondées sur
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Le compte {0} doit être de type 'Actif ', l'objet {1} étant un article Actif"
 DocType: HR Settings,HR Settings,Paramètrages RH
-apps/frappe/frappe/config/setup.py +130,Printing,Impression
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Remboursement de frais est en attente d'approbation . Seulement l'approbateur des frais peut mettre à jour le statut .
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,S'il vous plaît entrer comptes débiteurs groupe / à payer en master de l'entreprise
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,et
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abr ne peut être vide ou l&#39;espace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportif
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totales réelles
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unité
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,S'il vous plaît définir les clés d'accès Dropbox sur votre site config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,unité
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,S&#39;il vous plaît préciser Company
 ,Customer Acquisition and Loyalty,Acquisition et fidélisation client
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Entrepôt où vous êtes maintenant le bilan des éléments rejetés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Date de fin de la période comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Date de fin de la période comptable
 DocType: POS Profile,Price List,Liste des prix
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est maintenant l'Année Fiscale par défaut. Rafraîchissez la page pour que les modifications soient prises en compte. Svp
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Remboursement des dépenses
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Approuver rôle
 ,BOM Search,BOM Recherche
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fermeture (ouverture + totaux)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Se il vous plaît spécifier la devise de Société
 DocType: Workstation,Wages per hour,Salaires par heure
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",commercial
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Compte {0} est invalide. Compte doit être {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Suite à des demandes importantes ont été soulevées automatiquement en fonction du niveau de re-commande de l&#39;article
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Compte {0} est invalide. Compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Point {0} a été saisi plusieurs fois avec la même description ou la date ou de l'entrepôt
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Chefs de lettre pour des modèles d'impression .
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Chefs de lettre pour des modèles d'impression .
 DocType: Salary Slip,Deduction,Déduction
 DocType: Address Template,Address Template,Modèle d'adresse
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,S&#39;il vous plaît entrer Employee ID de cette personne de ventes
@@ -1732,76 +1596,68 @@
 DocType: Opportunity,Quotation,Devis
 DocType: Salary Slip,Total Deduction,Déduction totale
 DocType: Quotation,Maintenance User,Maintenance utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Coût Mise à jour
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Coût Mise à jour
 DocType: Employee,Date of Birth,Date de naissance
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Nouveau Stock UDM doit être différent de stock actuel Emballage
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Exercice ** représente un exercice. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
-DocType: Opportunity,Customer / Lead Address,Client / plomb adresse
+DocType: Opportunity,Customer / Lead Address,Adresse Client / Prospect
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur l&#39;attachement {0}
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable aux (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Description du poste
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Description du poste
 DocType: Purchase Order Item,Qty as per Stock UOM,Qté en stock pour Emballage
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Date de liquidation ne peut pas être avant le check date dans la ligne {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revêtement
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" pas autorisés à nommer série"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace de Leads, Citations, Sales Order etc de campagnes de mesurer le retour sur investissement. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace de Leads, Citations, Sales Order etc de campagnes de mesurer le retour sur investissement."
 DocType: Expense Claim,Approver,Approbateur
 ,SO Qty,SO Quantité
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Les entrées en stocks existent contre entrepôt {0}, donc vous ne pouvez pas réaffecter ou modifier Entrepôt"
 DocType: Appraisal,Calculate Total Score,Calculer Score total
 DocType: Supplier Quotation,Manufacturing Manager,Responsable de la fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Compte {0} n'appartient pas à la Société {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Livraisons
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moulage par immersion
-DocType: Purchase Order,To be delivered to customer,Pour être livré à la clientèle
+apps/erpnext/erpnext/hooks.py +68,Shipments,Livraisons
+DocType: Purchase Order Item,To be delivered to customer,Pour être livré à la clientèle
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Log Time Etat doit être soumis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N ° de série {0} ne fait pas partie de tout entrepôt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuration
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ligne #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ligne #
 DocType: Purchase Invoice,In Words (Company Currency),En Words (Société Monnaie)
 DocType: Pricing Rule,Supplier,Fournisseur
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Nombre de mots
 DocType: Global Defaults,Default Company,Société défaut
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, se il vous plaît situé dans Réglages Stock"
 DocType: Employee,Bank Name,Nom de la banque
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Au-dessus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Territoire cible Variance article Groupe Sage
 DocType: Leave Application,Total Leave Days,Total des jours de congé
-DocType: Journal Entry Account,Credit in Account Currency,Crédit Compte
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque: E-mail ne sera pas envoyé aux utilisateurs handicapés
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Sélectionnez Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est jugé pour tous les ministères
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",S'il vous plaît vous connecter à Upvote !
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Currency Exchange,From Currency,De Monnaie
-DocType: DocField,Name,Nom
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Commande requis pour objet {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Les montants ne figurent pas dans le système
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Se il vous plaît sélectionnez Montant alloué, type de facture et numéro de facture dans atleast une rangée"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Commande requis pour objet {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Les montants ne figurent pas dans le système
 DocType: Purchase Invoice Item,Rate (Company Currency),Taux (Monnaie de la société)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,autres
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,autres
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Vous ne trouvez pas un produit trouvé. S&#39;il vous plaît sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Impôts et taxes
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produit ou un service qui est acheté, vendu ou conservé en stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Point {0} a été saisi plusieurs fois avec la même description ou la date
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Terminé
-DocType: Web Form,Select DocType,Sélectionnez DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Abordant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancaire
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancaire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nouveau centre de coût
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nouveau centre de coût
 DocType: Bin,Ordered Quantity,Quantité commandée
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","par exemple "" Construire des outils pour les constructeurs """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
 DocType: Purchase Order Item,Reference Document Type,Référence Type de document
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Stocks en série
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Stocks en série
 DocType: Activity Type,Default Billing Rate,Par défaut taux de facturation
 DocType: Time Log Batch,Total Billing Amount,Montant total de la facturation
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Compte à recevoir
@@ -1809,38 +1665,39 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Classement des ventes au paiement
 DocType: Expense Claim Detail,Expense Claim Detail,Détail remboursement des dépenses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs créé:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
 DocType: Item,Weight UOM,Poids Emballage
 DocType: Employee,Blood Group,Groupe sanguin
 DocType: Purchase Invoice Item,Page Break,Saut de page
 DocType: Production Order Operation,Pending,En attendant
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Les utilisateurs qui peuvent approuver les demandes d'autorisation d'un employé en particulier
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Vous ne pouvez pas changer UOM de défaut de la variante. Pour changer UOM par défaut pour la variante UOM changement défaut du modèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Équipement de bureau
 DocType: Purchase Invoice Item,Qty,Qté
 DocType: Fiscal Year,Companies,Sociétés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,électronique
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,électronique
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Soulever demande de matériel lorsque le stock atteint le niveau de réapprovisionnement
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,De Calendrier d'entretien
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,À plein temps
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,À plein temps
 DocType: Purchase Invoice,Contact Details,Coordonnées
 DocType: C-Form,Received Date,Date de réception
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si vous avez créé un modèle standard en taxes de vente et frais Template, sélectionnez l&#39;une et cliquez sur le bouton ci-dessous."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,S&#39;il vous plaît spécifier un pays pour cette règle de port ou consultez Livraison dans le monde
 DocType: Stock Entry,Total Incoming Value,Valeur entrant total
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Prix d'achat Liste
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Prix d'achat Liste
 DocType: Offer Letter Term,Offer Term,Offre terme
 DocType: Quality Inspection,Quality Manager,Responsable Qualité
 DocType: Job Applicant,Job Opening,Offre d&#39;emploi
 DocType: Payment Reconciliation,Payment Reconciliation,Rapprochement des paiements
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,S'il vous plaît sélectionnez le nom de la personne Incharge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 DocType: Offer Letter,Offer Letter,Offrez Lettre
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Lieu à des demandes de matériel (MRP) et de la procédure de production.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturé Amt
 DocType: Time Log,To Time,To Time
+DocType: Authorization Rule,Approving Role (above authorized value),Approuver Rôle (valeur autorisée ci-dessus)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Pour ajouter des nœuds de l'enfant , explorer arborescence et cliquez sur le nœud sous lequel vous voulez ajouter d'autres nœuds ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
 DocType: Production Order Operation,Completed Qty,Quantité complétée
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Série {0} déjà utilisé dans {1}
@@ -1850,12 +1707,10 @@
 DocType: Item,Customer Item Codes,Codes de référence du client
 DocType: Opportunity,Lost Reason,Raison perdu
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Créer des entrées de paiement contre commandes ou factures.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soudage
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nouveau stock UDM est requis
 DocType: Quality Inspection,Sample Size,Taille de l&#39;échantillon
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',S&#39;il vous plaît indiquer une valide »De Affaire n &#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"D&#39;autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"D&#39;autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
 DocType: Project,External,Externe
 DocType: Features Setup,Item Serial Nos,N° de série
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et autorisations
@@ -1865,15 +1720,13 @@
 DocType: Bin,Actual Quantity,Quantité réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple: Jour suivant Livraison
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,N ° de série {0} introuvable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,vos clients
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Le moulage par compression
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,vos clients
 DocType: Leave Block List Date,Block Date,Date de bloquer
 DocType: Sales Order,Not Delivered,Non Livré
 ,Bank Clearance Summary,Résumé de l'approbation de la banque
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des recueils d' email quotidiens, hebdomadaires et mensuels ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Code de l'article> Le groupe d'articles> Marque
 DocType: Appraisal Goal,Appraisal Goal,Objectif d&#39;évaluation
-DocType: Event,Friday,Vendredi
 DocType: Time Log,Costing Amount,Montant des coûts
 DocType: Process Payroll,Submit Salary Slip,Envoyer le bulletin de salaire
 DocType: Salary Structure,Monthly Earning & Deduction,Revenu mensuel &amp; Déduction
@@ -1881,16 +1734,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importer en vrac
 DocType: Sales Partner,Address & Contacts,Adresse & Coordonnées
 DocType: SMS Log,Sender Name,Nom de l&#39;expéditeur
-DocType: Page,Title,Titre
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personnaliser
 DocType: POS Profile,[Select],[Choisir ]
 DocType: SMS Log,Sent To,Envoyé À
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Faire la facture de vente
 DocType: Company,For Reference Only.,Pour référence seulement.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Non valide {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valide {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Montant de l&#39;avance
 DocType: Manufacturing Settings,Capacity Planning,Planification des capacités
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Date début' est nécessaire
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Date début' est nécessaire
 DocType: Journal Entry,Reference Number,Numéro de référence
 DocType: Employee,Employment Details,Détails de l&#39;emploi
 DocType: Employee,New Workplace,Travail du Nouveau-
@@ -1905,7 +1756,7 @@
 DocType: Serial No,Delivery Time,L'heure de la livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé sur le vieillissement
 DocType: Item,End of Life,Fin de vie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Quantité ne peut pas être une fraction dans la ligne {0}
 DocType: Leave Block List,Allow Users,Autoriser les utilisateurs
 DocType: Purchase Order,Customer Mobile No,Client Mobile Pas
 DocType: Sales Invoice,Recurring,Récurrent
@@ -1913,23 +1764,21 @@
 DocType: Rename Tool,Rename Tool,Outil de renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,mise à jour des coûts
 DocType: Item Reorder,Item Reorder,Réorganiser article
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,transfert de matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Précisez les activités, le coût d'exploitation et de donner une opération unique, non à vos opérations ."
 DocType: Purchase Invoice,Price List Currency,Devise Prix
 DocType: Naming Series,User must always select,L&#39;utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif
 DocType: Installation Note,Installation Note,Note d&#39;installation
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Ajouter impôts
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Ajouter impôts
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Vérifié par
 DocType: Address,Subsidiary,Filiale
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",Voyage
 DocType: Quality Inspection,Purchase Receipt No,Achetez un accusé de réception
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
-DocType: System Settings,In Hours,Dans Heures
 DocType: Process Payroll,Create Salary Slip,Créer bulletin de salaire
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,L'équilibre attendu que par banque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polissage
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,L'équilibre attendu que par banque
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source des fonds ( Passif )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Entrepôt ne peut pas être supprimé car il existe entrée stock registre pour cet entrepôt .
 DocType: Appraisal,Employee,Employé
@@ -1942,15 +1791,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Règles pour ajouter les frais d'envoi .
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Sur requis
 DocType: Sales Invoice,Mass Mailing,Mailing de masse
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fichier à Renommer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ordre de fabrication {0} doit être annulée avant d'annuler cette commande client
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numéro de commande requis pour objet {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afficher les paiements
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taille
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Divulgué BOM {0} ne existe pas pour objet {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme de maintenance {0} doit être annulée avant d'annuler cette commande client
 DocType: Notification Control,Expense Claim Approved,Demande d&#39;indemnité Approuvé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,pharmaceutique
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des articles achetés
 DocType: Selling Settings,Sales Order Required,Commande obligatoire
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,créer clientèle
@@ -1960,30 +1807,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lecture 9
 DocType: Supplier,Is Frozen,Est Gelé
 DocType: Buying Settings,Buying Settings,Réglages d&#39;achat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,La finition de masse
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N ° nomenclature pour un produit fini Bonne
 DocType: Upload Attendance,Attendance To Date,La participation à ce jour
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Cas No (s ) en cours d'utilisation . Essayez de l'affaire n ° {0}
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Compte de paiement
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Veuillez indiquer Société de procéder
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Avant-projet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,faire
 DocType: Quality Inspection Reading,Accepted,Accepté
-DocType: User,Female,Femme
-DocType: Journal Entry Account,Debit in Account Currency,Débit en compte Devises
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,S&#39;il vous plaît faire sûr que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base restera tel qu&#39;il est. Cette action ne peut être annulée.
-DocType: Print Settings,Modern,Moderne
-DocType: Communication,Replied,Répondu
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Référence non valide {0} {1}
 DocType: Payment Tool,Total Payment Amount,Montant du paiement total
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieure à quanitity prévu ({2}) dans la commande de fabrication {3}
 DocType: Shipping Rule,Shipping Rule Label,Livraison règle étiquette
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Comme il ya des transactions sur actions existants pour cet article, \ vous ne pouvez pas modifier les valeurs de &#39;A Numéro de série &quot;,&quot; A lot Non »,« Est-Stock Item »et« Méthode d&#39;évaluation »"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Journal Entrée rapide
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
 DocType: Employee,Previous Work Experience,L&#39;expérience de travail antérieure
 DocType: Stock Entry,For Quantity,Pour Quantité
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour l'évaluation . Vous ne pouvez sélectionner que l'option «Total» pour le montant de la ligne précédente ou total de la ligne précédente
@@ -1991,17 +1833,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Gestion des demandes d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
 DocType: Purchase Invoice,Terms and Conditions1,Termes et conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installation terminée
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Les entrées comptable sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf le(s) rôle(s) spécifié ci-dessous."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,S'il vous plaît enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,État du projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bulletin Liste de Diffusion
 DocType: Delivery Note,Transporter Name,Nom Transporteur
+DocType: Authorization Rule,Authorized Value,Valeur autorisée
 DocType: Contact,Enter department to which this Contact belongs,Entrez département auquel appartient ce contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Absent total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Une autre entrée de clôture de la période {0} a été faite après {1}
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unité de mesure
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unité de mesure
 DocType: Fiscal Year,Year End Date,Date de Fin de l'exercice
 DocType: Task Depends On,Task Depends On,Groupe dépend
 DocType: Lead,Opportunity,Occasion
@@ -2022,16 +1864,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme par Stock UDM)
 DocType: SMS Log,No of Requested SMS,Pas de SMS demandés
 DocType: Campaign,Campaign-.####,Campagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perçant
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines étapes
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Fin du contrat La date doit être supérieure à date d'adhésion
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un tiers distributeur / commerçant / commissionnaire / affilié / revendeur qui vend les produits de l'entreprise en échange d'une commission.
 DocType: Customer Group,Has Child Node,A Node enfant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} dans aucun exercice actif. Pour plus de détails, consultez {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Par défaut Warehouse est obligatoire pour les stock Article .
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamme de vieillissement 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinage photochimique
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2073,11 +1914,9 @@
  8. Entrez Row: Si elle est basée sur ""Précédent Row total"" vous pouvez sélectionner le numéro de la ligne qui sera pris comme base pour ce calcul (par défaut est la ligne précédente).
  9. Considérez taxe ou redevance pour: Dans cette section, vous pouvez spécifier si la taxe / redevance est seulement pour l'évaluation (pas une partie du total) ou seulement pour le total (ne pas ajouter de la valeur à l'élément) ou pour les deux.
  10. Ajouter ou déduire: Que vous voulez ajouter ou déduire la taxe."
-DocType: Note,Note,Remarque
 DocType: Purchase Receipt Item,Recd Quantity,Quantité recd
-DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},effondrement
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock entrée {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Compte en Banque / trésorerie
 DocType: Tax Rule,Billing City,Facturation Ville
 DocType: Global Defaults,Hide Currency Symbol,Masquer le symbole monétaire
@@ -2085,40 +1924,36 @@
 DocType: Journal Entry,Credit Note,Note de crédit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Terminé Quantité ne peut pas être plus que {0} pour l&#39;opération {1}
 DocType: Features Setup,Quality,Qualité
-DocType: Contact Us Settings,Introduction,Introduction
 DocType: Warranty Claim,Service Address,Adresse du service
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 lignes pour Stock réconciliation.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 lignes pour Stock réconciliation.
 DocType: Stock Entry,Manufacture,Fabrication
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Se il vous plaît Livraison première note
 DocType: Purchase Invoice,Currency and Price List,Monnaie et liste de prix
-DocType: Opportunity,Customer / Lead Name,Entrepôt {0} n'existe pas
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Production
+DocType: Opportunity,Customer / Lead Name,Nom du Client / Prospect
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Production
 DocType: Item,Allow Production Order,Permettre les ordres de fabrication
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ligne {0} : Date de début doit être avant Date de fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantité)
 DocType: Installation Note Item,Installed Qty,Qté installée
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Soumis
 DocType: Salary Structure,Total Earning,Gains totale
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçues
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mes adresses
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Point impôt Row {0} doit avoir un compte de type de l'impôt sur le revenu ou de dépenses ou ou taxé
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ou
 DocType: Sales Order,Billing Status,Statut de la facturation
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Commande {0} n'est pas soumis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-dessus
 DocType: Buying Settings,Default Buying Price List,Défaut d'achat Liste des Prix
-,Download Backups,Télécharger sauvegardes
 DocType: Notification Control,Sales Order Message,Message de commande client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Valeurs par défaut comme : societé , devise , année financière en cours , etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Type de paiement
 DocType: Process Payroll,Select Employees,Sélectionnez employés
 DocType: Bank Reconciliation,To Date,À ce jour
 DocType: Opportunity,Potential Sales Deal,Offre de vente potentiels
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Détails
 DocType: Purchase Invoice,Total Taxes and Charges,Total Taxes et frais
 DocType: Employee,Emergency Contact,En cas d'urgence
 DocType: Item,Quality Parameters,Paramètres de qualité
@@ -2133,6 +1968,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,N ° de série / lot
 DocType: Product Bundle,Parent Item,Article Parent
 DocType: Account,Account Type,Type de compte
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Laissez type {0} ne peut pas être transmis carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Sélectionnez à télécharger:
 ,To Produce,A Produire
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l&#39;article, les lignes {3} doivent également être inclus"
@@ -2140,44 +1976,38 @@
 DocType: Bin,Reserved Quantity,Quantité réservée
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acheter des articles reçus
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personnalisation des formulaires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Coupe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplanissement
 DocType: Account,Income Account,Compte de revenu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Moulage
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Accouchement
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Livraison
 DocType: Stock Reconciliation Item,Current Qty,Quantité actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
 DocType: Appraisal Goal,Key Responsibility Area,Section à responsabilité importante
 DocType: Item Reorder,Material Request Type,Type de demande de matériel
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Facteur de conversion UOM est obligatoire
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documents
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Réf
 DocType: Cost Center,Cost Center,Centre de coûts
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Achat message Ordre
 DocType: Tax Rule,Shipping Country,Pays de livraison
 DocType: Upload Attendance,Upload HTML,Téléchargez HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance totale ({0}) contre l'ordonnance {1} ne peut pas être supérieure \
  que le Grand total ({2})"
 DocType: Employee,Relieving Date,Date de soulager
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié via Stock Entrée / bon de livraison / reçu d'achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsable du marketing et des ventes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Facteur de conversion UDM est nécessaire dans la ligne {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser conçu façonnage net
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se il est sélectionné Prix règle est faite pour «Prix», il écrasera Prix. Prix Prix de la règle est le prix définitif, donc pas de réduction supplémentaire devrait être appliqué. Ainsi, dans les transactions comme des commandes clients, bon de commande, etc., il sera récupéré dans le champ 'Prix', plutôt que champ 'Prix List Noter »."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsable du marketing et des ventes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Facteur de conversion UDM est nécessaire dans la ligne {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se il est sélectionné Prix règle est faite pour «Prix», il écrasera Prix. Prix Prix de la règle est le prix définitif, donc pas de réduction supplémentaire devrait être appliqué. Ainsi, dans les transactions comme des commandes clients, bon de commande, etc., il sera récupéré dans le champ 'Prix', plutôt que champ 'Prix List Noter »."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Piste mène par type d'industrie .
 DocType: Item Supplier,Item Supplier,Fournisseur d&#39;article
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,S'il vous plaît entrez le code d'article pour obtenir n ° de lot
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},S'il vous plaît sélectionnez une valeur pour {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toutes les adresses.
 DocType: Company,Stock Settings,Paramètres de stock
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gérer l'arborescence de groupe de clients .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nouveau centre de coûts Nom
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nouveau centre de coûts Nom
 DocType: Leave Control Panel,Leave Control Panel,Laisser le Panneau de configuration
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Aucune valeur par défaut Adresse modèle trouvé. S'il vous plaît créer un nouveau à partir de Configuration> Presse et Branding> Adresse modèle.
 DocType: Appraisal,HR User,Utilisateur HR
@@ -2189,31 +2019,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Quantité réelle après transaction
 ,Pending SO Items For Purchase Request,"Articles en attente Donc, pour demande d&#39;achat"
 DocType: Supplier,Billing Currency,Devise de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Compte de résultat
 DocType: Bank Reconciliation Detail,Cheque Number,Numéro de chèque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pressage
 DocType: Payment Tool Detail,Payment Tool Detail,Paiement outil Détail
 ,Sales Browser,Exceptionnelle pour {0} ne peut pas être inférieur à zéro ( {1} )
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,arrondis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,arrondis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et avances ( actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grand
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Aucun employé trouvé!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grand
 DocType: C-Form Invoice Detail,Territory,Territoire
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Paiement du salaire pour le mois {0} et {1} an
 DocType: Purchase Order,Customer Address Display,Adresse du client Affichage
 DocType: Stock Settings,Default Valuation Method,Méthode d&#39;évaluation par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polissage
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que \ vous avez déjà fait une transaction (s) avec une autre unité de mesure. Pour changer UOM par défaut, \ &#39;utilisation&#39; UOM Remplacer Utility &#39;outil sous module de Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Devis {0} est annulée
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Devis {0} est annulée
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Encours total
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employé {0} a été en congé de {1} . Vous ne pouvez pas marquer la fréquentation .
 DocType: Sales Partner,Targets,Cibles
@@ -2221,14 +2045,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les opérations de vente peuvent être assignées à plusieurs **Agent Commerciaux** de sorte que vous pouvez configurer et surveiller les cibles.
 ,S.O. No.,S.O. Non.
 DocType: Production Order Operation,Make Time Log,Prenez le temps Connexion
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prix / Rabais
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prix / Rabais
 DocType: Price List,Applicable for Countries,Applicable pour les pays
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Ordinateurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chimique broyage
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,S'il vous plaît configurer votre plan de comptes avant de commencer Écritures comptables
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorez règle de prix
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annulé
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De date dans la structure des salaires ne peut pas être moindre que l&#39;employé Date de démarrage.
 DocType: Employee Education,Graduate,Diplômé
 DocType: Leave Block List,Block Days,Bloquer les jours
@@ -2265,7 +2088,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Vérifiez si la facture récurrente, décochez-vous s&#39;arrête ou mis Date de fin correcte"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Vous ne pouvez pas convertir au groupe parce Master Type ou Type de compte est sélectionné .
 DocType: Packing Slip,If more than one package of the same type (for print),Si plus d&#39;un paquet du même type (pour l&#39;impression)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,"Afficher / Masquer les caractéristiques de série comme nos , POS , etc"
 DocType: C-Form Invoice Detail,Net Total,Total net
 DocType: Bin,FCFS Rate,Taux PAPS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturation (facture de vente)
@@ -2282,20 +2104,19 @@
 DocType: Maintenance Visit,Purposes,Buts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast un article doit être saisi avec quantité négative dans le document de retour
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longtemps que les heures de travail disponibles dans poste de travail {1}, briser l&#39;opération en plusieurs opérations"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Usinage électrochimique
 ,Requested,demandé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Non Remarques
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,En retard
 DocType: Account,Stock Received But Not Billed,Stock reçus mais non facturés
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Compte racine doit être un groupe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salaire brut + + Montant Montant échu Encaissement - Déduction totale
 DocType: Monthly Distribution,Distribution Name,Nom distribution
 DocType: Features Setup,Sales and Purchase,Vente et achat
 DocType: Supplier Quotation Item,Material Request No,Demande de Support Aucun
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0} 
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Vitesse à laquelle la devise du client est converti en devise de base entreprise
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a été désabonné avec succès de cette liste.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux net (Société devise)
-apps/frappe/frappe/templates/base.html +134,Added,Ajouté
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gérer l'arboressence des territoirs.
 DocType: Journal Entry Account,Sales Invoice,Facture de vente
 DocType: Journal Entry Account,Party Balance,Solde Parti
@@ -2309,11 +2130,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Exercice {0} introuvable.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenez les entrées pertinentes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrée comptable pour Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Point {0} n'existe pas
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Point {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du client
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer de remise supplémentaire sur
 DocType: Account,Root Type,Type de Racine
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Vous ne pouvez pas revenir plus de {1} pour le point {2}
@@ -2323,130 +2142,121 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la taxe Après Montant de la remise (Société devise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Entrepôt de cible est obligatoire pour la ligne {0}
 DocType: Quality Inspection,Quality Inspection,Inspection de la Qualité
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Vaporiser former
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attention: Matériel requis Quantité est inférieure Quantité minimum à commander
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Très Petit
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Attention: Matériel requis Quantité est inférieure Quantité minimum à commander
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité juridique / Filiale avec un tableau distinct des comptes appartenant à l'Organisation.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation , boissons et tabac"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Ne peut effectuer le paiement contre non facturés {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveau de Stock Minimal
 DocType: Stock Entry,Subcontract,Sous-traiter
 apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,S&#39;il vous plaît entrer {0} premier
-DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir des éléments de Sales Orders
+DocType: Production Planning Tool,Get Items From Sales Orders,Obtenir des éléments de l'ordre de vente
 DocType: Production Order Operation,Actual End Time,Fin du temps réel
 DocType: Production Planning Tool,Download Materials Required,Télécharger Matériel requis
 DocType: Item,Manufacturer Part Number,Numéro de pièce du fabricant
 DocType: Production Order Operation,Estimated Time and Cost,Durée et Coût estimatif
 DocType: Bin,Bin,Boîte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Rebord
 DocType: SMS Log,No of Sent SMS,Pas de SMS envoyés
 DocType: Account,Company,Entreprise
 DocType: Account,Expense Account,Compte de dépenses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,logiciel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Couleur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,logiciel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Couleur
 DocType: Maintenance Visit,Scheduled,Prévu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",S&#39;il vous plaît sélectionner Point où &quot;Est Stock Item&quot; est &quot;Non&quot; et &quot;est le point de vente&quot; est &quot;Oui&quot; et il n&#39;y a pas d&#39;autre groupe de produits
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Sélectionnez une distribution mensuelle de distribuer inégalement cibles à travers les mois.
 DocType: Purchase Invoice Item,Valuation Rate,Taux d&#39;évaluation
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Liste des Prix devise sélectionné
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Point Row {0}: Reçu d'achat {1} ne existe pas dans le tableau ci-dessus 'achat reçus »
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà appliqué pour {1} entre {2} et {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de début du projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Renommez identifiez-vous
 DocType: Installation Note Item,Against Document No,Sur le document n °
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gérer partenaires commerciaux.
 DocType: Quality Inspection,Inspection Type,Type d&#39;inspection
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},S'il vous plaît sélectionnez {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},S'il vous plaît sélectionnez {0}
 DocType: C-Form,C-Form No,C-formulaire n °
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,chercheur
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Mettre à jour
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,chercheur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,{0} {1} n'est pas soumis
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nom ou Email est obligatoire
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Contrôle de la qualité entrant.
 DocType: Purchase Order Item,Returned Qty,Retourné Quantité
 DocType: Employee,Exit,Sortie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Type de Root est obligatoire
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Type de Root est obligatoire
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,aucune autorisation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Tribofinition
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d&#39;impression comme les factures et les bons de livraison"
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
 DocType: Sales Invoice,Advertisement,Publicité
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Période De Probation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Période De Probation
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
 DocType: Expense Claim,Expense Approver,Dépenses approbateur
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Article reçu d&#39;achat fournis
 apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Payer
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pour La date du 
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pour La date du
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Broyage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Mise sous film rétractable
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activités en attente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmé
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fournisseur> Type de fournisseur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Type de partie de Parent
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Date de livraison prévue ne peut pas être avant commande date
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Date de livraison prévue ne peut pas être avant commande date
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Le titre de l'adresse est obligatoire
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l&#39;enquête est la campagne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Éditeurs de journaux
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Sélectionner exercice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fonte
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Réorganiser Niveau
 DocType: Attendance,Attendance Date,Date de Participation
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,rupture des salaires basée sur l&#39;obtention et la déduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
 DocType: Address,Preferred Shipping Address,Preferred Adresse de livraison
 DocType: Purchase Receipt Item,Accepted Warehouse,Entrepôt acceptable
 DocType: Bank Reconciliation Detail,Posting Date,Date de publication
 DocType: Item,Valuation Method,Méthode d&#39;évaluation
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Impossible de trouver le taux de change pour {0} au {1}
 DocType: Sales Invoice,Sales Team,Équipe des ventes
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,dupliquer entrée
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,dupliquer entrée
 DocType: Serial No,Under Warranty,Sous garantie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
 ,Employee Birthday,Anniversaire des employés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,capital de risque
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capital de risque
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Feuilles de nouveaux alloués (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Maître d'adresses.
 DocType: Pricing Rule,Discount Percentage,Annuler Matériel Visiter {0} avant d'annuler ce numéro de client
 DocType: Payment Reconciliation Invoice,Invoice Number,Numéro de facture
-apps/erpnext/erpnext/hooks.py +70,Orders,Commandes
+apps/erpnext/erpnext/hooks.py +54,Orders,Commandes
 DocType: Leave Control Panel,Employee Type,Type de contrat
-DocType: Employee Leave Approver,Leave Approver,Laisser approbateur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Emboutissage
+DocType: Employee Leave Approver,Leave Approver,Approbateur d'absence
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Matériel transféré pour Fabrication
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilisateur avec le rôle ""Autorise les dépenses"""
 ,Issued Items Against Production Order,Articles émis contre un ordre de fabrication
 DocType: Pricing Rule,Purchase Manager,Directeur des achats
 DocType: Payment Tool,Payment Tool,Paiement Outil
 DocType: Target Detail,Target Detail,Détail cible
-DocType: Sales Order,% of materials billed against this Sales Order,% De matières facturées sur cette ordonnance de vente
+DocType: Sales Order,% of materials billed against this Sales Order,% De matières facturées sur cette ordre de vente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrée de clôture de la période
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,S'il vous plaît entrer les détails de l' article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Actifs d'impôt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Période non valide
 DocType: Customer,Credit Limit,Limite de crédit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Sélectionner le type de transaction
 DocType: GL Entry,Voucher No,No du bon
-DocType: Leave Allocation,Leave Allocation,Laisser Allocation
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Devis {0} de type {1}
+DocType: Leave Allocation,Leave Allocation,Absence Allocation
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Les demandes matérielles {0} créés
 apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Modèle de termes ou d&#39;un contrat.
 DocType: Customer,Address and Contact,Adresse et contact
 DocType: Customer,Last Day of the Next Month,Dernier jour du mois prochain
 DocType: Employee,Feedback,Commentaire
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être attribué avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Calendrier
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrasive jet usinage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Calendrier
 DocType: Stock Settings,Freeze Stock Entries,Congeler entrées en stocks
-DocType: Website Settings,Website Settings,Réglages Site web
 DocType: Item,Reorder level based on Warehouse,Niveau de réapprovisionnement basée sur Entrepôt
 DocType: Activity Cost,Billing Rate,Taux de facturation
 ,Qty to Deliver,Quantité à livrer
@@ -2457,20 +2267,19 @@
 DocType: Material Request,Requested For,Demandée pour
 DocType: Quotation Item,Against Doctype,Contre Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Suivre ce bon de livraison contre tout projet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Prix ou à prix réduits
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Prix ou à prix réduits
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Voir les entrées en stocks
 ,Is Primary Address,Est-Adresse primaire
 DocType: Production Order,Work-in-Progress Warehouse,Entrepôt Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Référence #{0} daté {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gérer les adresses
 DocType: Pricing Rule,Item Code,Code de l&#39;article
 DocType: Production Planning Tool,Create Production Orders,Créer des ordres de fabrication
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
 DocType: Journal Entry,User Remark,Remarque l&#39;utilisateur
 DocType: Lead,Market Segment,Segment de marché
-DocType: Communication,Phone,Téléphone
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents de travail des employés internes
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fermeture (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fermeture (Dr)
 DocType: Contact,Passive,Passif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N ° de série {0} pas en stock
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
@@ -2486,10 +2295,9 @@
 ,Billed Amount,Montant facturé
 DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Mises à jour
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Ajouter quelque exemple de dossier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Ajouter quelque exemple de dossier
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Gestion des congés
-DocType: Event,Groups,Groupes
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groupe par compte
 DocType: Sales Order,Fully Delivered,Entièrement Livré
 DocType: Lead,Lower Income,Basse revenu
@@ -2498,40 +2306,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Aide rapide
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Frais juridiques
 DocType: Features Setup,Sales Extras,Extras ventes
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Le budget {0} pour le compte {1} va excéder le poste de coût {2} de {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Le budget {0} pour le compte {1} va excéder le poste de coût {2} de {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Vous ne pouvez pas reporter {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
 ,Stock Projected Qty,Stock projeté Quantité
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
 DocType: Warranty Claim,From Company,De Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Le salaire net ne peut pas être négatif
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Le salaire net ne peut pas être négatif
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impôts achat et les frais
 ,Qty to Receive,Quantité à recevoir
 DocType: Leave Block List,Leave Block List Allowed,Laisser Block List admis
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Installation Remarque {0} a déjà été soumis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Vous l'utiliserez pour vous identifier
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Vous l'utiliserez pour vous identifier
 DocType: Sales Partner,Retailer,Détaillant
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les types de fournisseurs
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Code de l'article est obligatoire, car l'article n'est pas numéroté automatiquement"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Activer / désactiver les monnaies .
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},La soumission {0} n'est pas un type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d&#39;entretien
 DocType: Sales Order,%  Delivered,Livré%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Compte du découvert bancaire
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Faire fiche de salaire
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Parcourir BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pas de nomenclature par défaut existe pour objet {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produits impressionnants
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prêts garantis
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produits impressionnants
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Ouverture équité en matière d&#39;équilibre
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Vous ne pouvez pas approuver les congés que vous n'êtes pas autorisé à approuver les congés sur les dates de bloc
 DocType: Appraisal,Appraisal,Évaluation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Coulée à mousse perdue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Dessin
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La date est répétée
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Abréviation ne peut pas avoir plus de 5 caractères
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signataire autorisé
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
 DocType: Hub Settings,Seller Email,Vendeur Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d&#39;achat total (via la facture d&#39;achat)
 DocType: Workstation Working Hour,Start Time,Heure de début
@@ -2545,12 +2350,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant net (Société devise)
 DocType: BOM Operation,Hour Rate,Taux horraire
 DocType: Stock Settings,Item Naming By,Point de noms en
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De offre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De offre
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Point Wise impôt Détail
 DocType: Production Order,Material Transferred for Manufacturing,Matériel transféré pour la fabrication
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Le compte {0} ne existe pas
 DocType: Purchase Receipt Item,Purchase Order Item No,Achetez article ordonnance n
-DocType: System Settings,System Settings,Paramètres système
 DocType: Project,Project Type,Type de projet
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,annuel
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Coût de diverses activités
@@ -2559,36 +2363,32 @@
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement Qualifié
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Votre exercice social commence le
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Entrepôt de livraison requise pour stock pièce {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d&#39;emballage. (Pour l&#39;impression)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés
 DocType: Serial No,Is Cancelled,Est annulée
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mes envois
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mes envois
 DocType: Journal Entry,Bill Date,Date de la facture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Même s'il existe plusieurs règles de tarification avec la plus haute priorité, les priorités internes alors suivantes sont appliquées:"
 DocType: Supplier,Supplier Details,Détails de produit
-DocType: Communication,Recipients,Destinataires
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Baise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Statut d&#39;approbation
 DocType: Hub Settings,Publish Items to Hub,Publier les articles au Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Parent Site Web page
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Virement
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,S&#39;il vous plaît sélectionner compte bancaire
 DocType: Newsletter,Create and Send Newsletters,Créer et envoyer des newsletters
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Partir de la date doit être antérieure à ce jour
 DocType: Sales Order,Recurring Order,Ordre récurrent
 DocType: Company,Default Income Account,Compte d'exploitation
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
 DocType: Item Group,Check this if you want to show in website,Cochez cette case si vous souhaitez afficher sur le site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenue à ERPNext
+,Welcome to ERPNext,Bienvenue à ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon nombre de Détail
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Conduire à Devis
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Délai pour estimation
 DocType: Lead,From Customer,Du client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,appels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,appels
 DocType: Project,Total Costing Amount (via Time Logs),Montant total Costing (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,entrer une valeur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,entrer une valeur
 ,Projected,Projection
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Les paramètres par défaut pour les transactions boursières .
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
@@ -2596,13 +2396,10 @@
 DocType: Issue,Opening Date,Date d&#39;ouverture
 DocType: Journal Entry,Remark,Remarque
 DocType: Purchase Receipt Item,Rate and Amount,Taux et le montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Ennuyeux
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,De Sales Order
-DocType: Blog Category,Parent Website Route,Montant de l'impôt après réduction Montant
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,De l'ordre de vente
 DocType: Sales Order,Not Billed,Non Facturé
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même entreprise
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Aucun contact encore ajouté.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Non actif
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Bon Montant
 DocType: Time Log,Batched for Billing,Par lots pour la facturation
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Factures reçues des fournisseurs.
@@ -2610,20 +2407,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,S'il vous plaît tirer des articles de livraison Note
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d&#39;achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,par exemple TVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,par exemple TVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Point 4
 DocType: Journal Entry Account,Journal Entry Account,Compte Entrée Journal
-DocType: Shopping Cart Settings,Quotation Series,Devis série
+DocType: Shopping Cart Settings,Quotation Series,Soumission série
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), changez le groupe de l'article ou renommez l'article SVP"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot gaz de formage des métaux
 DocType: Sales Order Item,Sales Order Date,Date de Commande
 DocType: Sales Invoice Item,Delivered Qty,Qté livrée
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Aller au groupe approprié (généralement source de fonds&gt; Passif à court terme&gt; Impôts et taxes et de créer un nouveau compte (en cliquant sur Ajouter un enfant) de type «impôt» et faire mentionner le taux de l&#39;impôt.
 ,Payment Period Based On Invoice Date,Période de paiement basé sur Date de la facture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manquant Taux de change pour {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Découpe laser
-DocType: Event,Monday,Lundi
 DocType: Journal Entry,Stock Entry,Entrée Stock
 DocType: Account,Payable,Impôt sur le revenu
 DocType: Salary Slip,Arrear Amount,Montant échu
@@ -2636,7 +2430,6 @@
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Au moins un de la vente ou l'achat doit être sélectionné
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Lorsque les opérations de fabrication sont réalisées.
-DocType: Page,All,Tous
 DocType: Stock Entry Detail,Source Warehouse,Source d&#39;entrepôt
 DocType: Installation Note,Installation Date,Date d&#39;installation
 DocType: Employee,Confirmation Date,date de confirmation
@@ -2644,9 +2437,8 @@
 DocType: Account,Sales User,Ventes utilisateur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Quantité de minute ne peut être supérieure à Max Quantité
 DocType: Stock Entry,Customer or Supplier Details,Client ou fournisseur détails
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Série est obligatoire
-DocType: Lead,Lead Owner,Conduire du propriétaire
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Entrepôt est nécessaire
+DocType: Lead,Lead Owner,Propriétaire du prospect
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Entrepôt est nécessaire
 DocType: Employee,Marital Status,État civil
 DocType: Stock Settings,Auto Material Request,Auto Demande de Matériel
 DocType: Time Log,Will be updated when billed.,Sera mis à jour lorsqu&#39;ils sont facturés.
@@ -2660,44 +2452,40 @@
 DocType: Territory,Territory Targets,Les objectifs du Territoire
 DocType: Delivery Note,Transporter Info,Infos Transporteur
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Point de commande fourni
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nom de l&#39;entreprise ne peut pas être entreprise
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Journal Bon {0} n'a pas encore compte {1} .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression par exemple Facture proforma.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,charges de type d&#39;évaluation ne peuvent pas marqué comme Inclusive
 DocType: POS Profile,Update Stock,Mise à jour Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinition
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différents Emballage des articles mènera à incorrects (Total ) Valeur de poids . Assurez-vous que poids net de chaque article se trouve dans la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,POS- Cadre . #
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entrées de journal {0} sont non liée
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Entrées de journal {0} sont non liée
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Enregistrement de toutes les communications de type de mail, téléphone, chat, visite, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,S&#39;il vous plaît mentionner Centre de coûts Round Off dans Société
 DocType: Purchase Invoice,Terms,termes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,créer un nouveau
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,créer un nouveau
 DocType: Buying Settings,Purchase Order Required,Bon de commande requis
 ,Item-wise Sales History,Historique des ventes (par Article)
 DocType: Expense Claim,Total Sanctioned Amount,Montant total sanctionné
 ,Purchase Analytics,Les analyses des achats
 DocType: Sales Invoice Item,Delivery Note Item,Point de Livraison
 DocType: Expense Claim,Task,Tâche
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasage
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour objet {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Il s'agit d'une personne de ventes de racines et ne peut être modifié .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Taux: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Taux: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Déduction bulletin de salaire
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Remarques
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Sélectionnez un noeud de premier groupe.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},L'objectif doit être l'un des {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Remplissez le formulaire et l'enregistrer
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Télécharger un rapport contenant toutes les matières premières avec leur dernier état des stocks
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Parement
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Communauté Forum
 DocType: Leave Application,Leave Balance Before Application,Laisser Solde Avant d&#39;application
 DocType: SMS Center,Send SMS,Envoyer un SMS
 DocType: Company,Default Letter Head,Par défaut Lettre Head
 DocType: Time Log,Billable,Facturable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Il sera utilisé pour la règle de réglage dans le module RH
 DocType: Account,Rate at which this tax is applied,Vitesse à laquelle cet impôt est appliqué
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Réorganiser Quantité
 DocType: Company,Stock Adjustment Account,Compte d&#39;ajustement de stock
@@ -2709,12 +2497,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Une occasion manquée
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Les champs d&#39;actualisation sera disponible en commande, reçu d&#39;achat, facture d&#39;achat"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S&#39;il vous plaît ne créez pas de comptes clients et fournisseurs
-DocType: Report,Report Type,Rapport Genre
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Chargement
 DocType: BOM Replace Tool,BOM Replace Tool,Outil Remplacer BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles pays sage d'adresses par défaut
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur fournit au client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Afficher impôt rupture
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer des données et de l&#39;Exportation
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Invalid Nom d'utilisateur Mot de passe ou de soutien . S'il vous plaît corriger et essayer à nouveau.
@@ -2724,16 +2510,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Pourcentage allocation doit être égale à 100 %
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Purchase Order Item,Material Request Detail No,Détail Demande Support Aucun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Le tournage dur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Assurez visite d'entretien
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Se il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
 DocType: Company,Default Cash Account,Compte caisse
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuration de l'entreprise 
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Configuration de l'entreprise
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Quantité en ligne {0} ( {1} ) doit être la même que la quantité fabriquée {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},S'il vous plaît spécifier un ID de ligne valide pour {0} en ligne {1}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Remarque: Si le paiement ne est pas faite contre toute référence, assurez Journal entrée manuellement."
 DocType: Item,Supplier Items,Fournisseur Articles
 DocType: Opportunity,Opportunity Type,Type d&#39;opportunité
@@ -2745,7 +2530,7 @@
 DocType: Hub Settings,Publish Availability,Publier Disponibilité
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Date de naissance ne peut pas être supérieure à aujourd&#39;hui.
 ,Stock Ageing,Stock vieillissement
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' est désactivée
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' est désactivée
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvrir
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des e-mails automatiques aux contacts sur les transactions Soumission.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2753,59 +2538,51 @@
  Disponible Quantité: {4}, transfert Quantité: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Point 3
 DocType: Purchase Order,Customer Contact Email,Client Contact Courriel
-DocType: Event,Sunday,Dimanche
 DocType: Sales Team,Contribution (%),Contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Casual congé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilités
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom Sales Person
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,recevable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Ajouter des utilisateurs
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Ajouter des utilisateurs
 DocType: Pricing Rule,Item Group,Groupe d&#39;éléments
 DocType: Task,Actual Start Date (via Time Logs),Date de début réelle (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},A {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Les impôts et les frais supplémentaires (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
 DocType: Sales Order,Partly Billed,Présentée en partie
 DocType: Item,Default BOM,Nomenclature par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours total Amt
 DocType: Time Log Batch,Total Hours,Total des heures
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automobile
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Point n'est nécessaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,moulage par injection de métal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automobile
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De bon de livraison
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Message personnalisé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banques d'investissement
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Sélectionnez votre pays, Fuseau horaire et devise"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banques d'investissement
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,N ° de série {0} a déjà été reçu
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de change Prix de liste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Décapage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Moulage en sable
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Taux
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,interne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,interne
 DocType: Newsletter,A Lead with this email id should exist,Un responsable de cet identifiant de courriel doit exister
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,de base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,de base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,transactions d'actions avant {0} sont gelés
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur "" Générer annexe '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","kg par exemple, l&#39;unité, n, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","kg par exemple, l&#39;unité, n, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Centre de coûts est nécessaire pour compte » de profits et pertes "" {0}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,enregistrement précédent
 DocType: Salary Structure,Salary Structure,Grille des salaires
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple règle de prix existe avec les mêmes critères, se il vous plaît résoudre \
  conflit en attribuant des priorités. Règles Prix: {0}"
 DocType: Account,Bank,Banque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,compagnie aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,compagnie aérienne
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
 DocType: Hub Settings,Access Token,Jeton d'accès
@@ -2814,45 +2591,37 @@
 DocType: Item,Is Fixed Asset Item,Est- Fixed Asset article
 DocType: Stock Entry,Including items for sub assemblies,Incluant les éléments pour des sous-ensembles
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Si vous avez longtemps imprimer des formats, cette fonction peut être utilisée pour diviser la page à imprimer sur plusieurs pages avec tous les en-têtes et pieds de page sur chaque page"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tous les secteurs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tous les secteurs
 DocType: Purchase Invoice,Items,Articles
 DocType: Fiscal Year,Year Name,Nom Année
 DocType: Process Payroll,Process Payroll,processus de paye
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Compte de capital
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Compte de capital
 DocType: Product Bundle Item,Product Bundle Item,Produit Bundle Point
 DocType: Sales Partner,Sales Partner Name,Nom Sales Partner
 DocType: Purchase Invoice Item,Image View,Voir l&#39;image
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finition &amp; finition industrielle
 DocType: Issue,Opening Time,Ouverture Heure
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De et la date exigée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction
 DocType: Delivery Note Item,From Warehouse,De Entrepôt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Forage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soufflage
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 DocType: Tax Rule,Shipping City,Ville de livraison
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Cet article est une variante de {0} (Template). Attributs seront copiés à partir du modèle à moins 'No Copy »est réglé
 DocType: Account,Purchase User,Achat utilisateur
 DocType: Notification Control,Customize the Notification,Personnaliser la notification
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martelage
-DocType: Web Page,Slideshow,Diaporama
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Adresse par défaut modèle ne peut pas être supprimé
 DocType: Sales Invoice,Shipping Rule,Livraison règle
 DocType: Journal Entry,Print Heading,Imprimer Cap
 DocType: Quotation,Maintenance Manager,Responsable de l'entretien
-DocType: Workflow State,Search,Rechercher
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brasage
 DocType: C-Form,Amended From,Modifié depuis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matières premières
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivez par e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Aucun article avec Barcode {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Voulez-vous vraiment arrêter
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},services impressionnants
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},services impressionnants
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,S&#39;il vous plaît sélectionnez Date de publication abord
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d&#39;ouverture devrait être avant la date de clôture
 DocType: Leave Control Panel,Carry Forward,Reporter
@@ -2861,45 +2630,44 @@
 ,Produced,produit
 DocType: Item,Item Code for Suppliers,Code de l&#39;article pour les fournisseurs
 DocType: Issue,Raised By (Email),Raised By (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Général
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Joindre l'entête
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Général
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Joindre l'entête
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Vous ne pouvez pas déduire lorsqu'une catégorie est pour « évaluation » ou « évaluation et Total """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inscrivez vos têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inscrivez vos têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Dupliquer entrée . S'il vous plaît vérifier une règle d'autorisation {0}
 DocType: Journal Entry,Bank Entry,Entrée de la Banque
 DocType: Authorization Rule,Applicable To (Designation),Applicable à (désignation)
-DocType: Blog Post,Blog Post,Article de blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Par groupe
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activer / Désactiver la devise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Frais postaux
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Montant)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,La date à laquelle commande récurrente sera arrêter
 DocType: Quality Inspection,Item Serial No,N° de série
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} doit être réduite par {1} ou vous devez augmenter la tolérance de dépassement
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Présent total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,heure
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,heure
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfert de matériel au fournisseur
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,S'il vous plaît créer clientèle de plomb {0}
-DocType: Lead,Lead Type,Type de câbles
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfert de matériel au fournisseur
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Les nouveaux numéro de série ne peuvent avoir d'entrepot. L'entrepot doit être établi par l'entré des stock ou le reçus d'achat
+DocType: Lead,Lead Type,Type de prospect
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,créer offre
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tous ces articles ont déjà été facturés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Vous n&#39;êtes pas autorisé à approuver les congés sur les dates de bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Règle expédition Conditions
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle nomenclature après le remplacement
 DocType: Features Setup,Point of Sale,Point de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impôt
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} ne est pas valide {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinage
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} ne est pas valide {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle de produit
 DocType: Production Planning Tool,Production Planning Tool,Outil de planification de la production
 DocType: Quality Inspection,Report Date,Date du rapport
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routage
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} déjà alloué pour les employés {1} pour la période {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} destinataire(s)
 DocType: Features Setup,Item Groups in Details,Groupes d&#39;articles en détails
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantité de Fabrication doit être supérieur à 0.
@@ -2908,33 +2676,29 @@
 DocType: Stock Entry,Update Rate and Availability,Mise à jour Coter et Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou de livrer plus sur la quantité commandée. Par exemple: Si vous avez commandé 100 unités. et votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: Pricing Rule,Customer Group,Groupe de clients
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Contre le projet de loi {0} {1} daté
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Contre le projet de loi {0} {1} daté
 DocType: Item,Website Description,Description du site Web
 DocType: Serial No,AMC Expiry Date,AMC Date d&#39;expiration
 ,Sales Register,Registre des ventes
-DocType: Quotation,Quotation Lost Reason,Devis perdu la raison
+DocType: Quotation,Quotation Lost Reason,Soumission perdu la raison
 DocType: Address,Plant,Plante
-DocType: DocType,Setup,Configuration
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Résumé pour ce mois et les activités en suspens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminage à froid
 DocType: Customer Group,Customer Group Name,Nom du groupe client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Se il vous plaît supprimer ce Facture {0} de C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Se il vous plaît supprimer ce Facture {0} de C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,S&#39;il vous plaît sélectionnez Report si vous souhaitez également inclure le solde de l&#39;exercice précédent ne laisse à cet exercice
 DocType: GL Entry,Against Voucher Type,Sur le type de bon
 DocType: Item,Attributes,Attributs
-DocType: Packing Slip,Get Items,Obtenir les éléments
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtenir les éléments
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Dernière date de commande
-DocType: DocField,Image,Image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Faire accise facture
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Le compte {0} ne appartient pas à la société {1}
-DocType: Communication,Other,Autre
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Opération carte d&#39;identité pas réglé
 DocType: Production Order,Planned Start Date,Date de début prévue
 DocType: Serial No,Creation Document Type,Type de document de création
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visite
 DocType: Leave Type,Is Encash,Est encaisser
 DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Payment Tool,Make Journal Entry,Assurez Journal Entrée
@@ -2942,38 +2706,32 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,alloué avec succès
 DocType: Project,Expected End Date,Date de fin prévue
 DocType: Appraisal Template,Appraisal Template Title,Titre modèle d&#39;évaluation
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Reste du monde
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Reste du monde
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne doit pas être un élément de Stock
 DocType: Cost Center,Distribution Id,Id distribution
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Services impressionnants
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tous les produits ou services.
 DocType: Purchase Invoice,Supplier Address,Adresse du fournisseur
-DocType: Contact Us Settings,Address Line 2,Adresse ligne 2
-DocType: ToDo,Reference,Référence
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforateur
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantité
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Règles de calcul du montant de l&#39;expédition pour une vente
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Congé de type {0} ne peut pas être plus long que {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,services financiers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,services financiers
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valeur pour l&#39;attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3}
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},{0} est obligatoire
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},{0} est obligatoire
 DocType: Leave Allocation,Unused leaves,Feuilles inutilisées
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Par défaut Débiteurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sciage
 DocType: Tax Rule,Billing State,État de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminage
 DocType: Item Reorder,Transfer,Transférer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
 DocType: Authorization Rule,Applicable To (Employee),Applicable aux (Employé)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Date d&#39;échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Frittage
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
 DocType: Naming Series,Setup Series,Série de configuration
-DocType: Supplier,Contact HTML,Contacter HTML
+DocType: Supplier,Contact HTML,Contact HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Achat reçus
 DocType: Payment Reconciliation,Maximum Amount,Montant maximal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Comment Prix règle est appliquée?
@@ -2981,74 +2739,67 @@
 DocType: Company,Retail,Détail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
-DocType: Product Bundle,Product Bundle,Bundle de produit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle de produit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: référence non valide {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Écrasement
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achetez Taxes et frais Template
 DocType: Upload Attendance,Download Template,Télécharger le modèle
 DocType: GL Entry,Remarks,Remarques
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Numéro d'article de la matériel première
 DocType: Journal Entry,Write Off Based On,Ecrire Off Basé sur
 DocType: Features Setup,POS View,POS View
-apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,N° de série pour un dossier d'installation 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Coulée continue
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,N° de série pour un dossier d'installation
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Veuillez spécifier un
 DocType: Offer Letter,Awaiting Response,En attente de réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Au dessus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionnement froide
 DocType: Salary Slip,Earning & Deduction,Gains et déduction
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Compte {0} ne peut pas être un groupe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Région
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer dans diverses opérations .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
 DocType: Holiday List,Weekly Off,Hebdomadaire Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pour exemple, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
 DocType: Sales Invoice,Return Against Sales Invoice,Retour contre facture de vente
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Point 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Se il vous plaît définir la valeur par défaut {0} dans {1} Société
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Se il vous plaît définir la valeur par défaut {0} dans {1} Société
 DocType: Serial No,Creation Time,Date de création
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Revenu total
 DocType: Sales Invoice,Product Bundle Help,Produit Bundle Aide
 ,Monthly Attendance Sheet,Feuille de présence mensuel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Aucun enregistrement trouvé
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obtenir des éléments de Bundle de produit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Le compte {0} est inactif
 DocType: GL Entry,Is Advance,Est-Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,{0} {1} contre facture {1}
 DocType: Sales Team,Contact No.,Contactez No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Le compte {0} de type 'profit et pertes' n'est pas permis dans une ouverture d'entrée.
-DocType: Workflow State,Time,Temps
 DocType: Features Setup,Sales Discounts,Escomptes sur ventes
 DocType: Hub Settings,Seller Country,Vendeur Pays
 DocType: Authorization Rule,Authorization Rule,Règle d&#39;autorisation
 DocType: Sales Invoice,Terms and Conditions Details,Termes et Conditions Détails
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Taxes de vente et frais Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Nombre de l'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Préciser les conditions pour calculer le montant de l'expédition
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Ajouter un enfant
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rôle autorisés à fixer congelés Comptes et modifier les entrées congelés
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Vous ne pouvez pas convertir le centre de coûts à livre car il possède des nœuds enfant
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Facture de vente {0} a déjà été soumis
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# Série
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commission sur les ventes
 DocType: Offer Letter Term,Value / Description,Valeur / Description
 DocType: Tax Rule,Billing Country,Pays de facturation
 ,Customers Not Buying Since Long Time,Les clients ne pas acheter Depuis Long Time
 DocType: Production Order,Expected Delivery Date,Date de livraison prévue
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,De débit et de crédit pas égale pour {0} # {1}. La différence est {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Renflé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Évaporation motif coulée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Frais de représentation
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Montant du rabais
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Âge
 DocType: Time Log,Billing Amount,Montant de facturation
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée non valide pour l'élément {0} . Quantité doit être supérieur à 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Les demandes de congé.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Actifs stock
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Le jour du mois au cours duquel l'ordre automatique sera généré par exemple 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Affichage Temps
@@ -3062,46 +2813,41 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Revenu clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Code article nécessaire au rang n ° {0}
 DocType: Maintenance Visit,Breakdown,Panne
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Compte: {0} avec la monnaie: {1} ne peut pas être sélectionné
 DocType: Bank Reconciliation Detail,Cheque Date,Date de chèques
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme le Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,probation
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
-DocType: Feed,Full Name,Nom et Prénom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchage
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,probation
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,{0} {1} contre le projet de loi {2} du {3}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Centre de coûts est nécessaire à la ligne {0} dans le tableau des impôts pour le type {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique de taux de la liste de prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montant total payé
 ,Transferred Qty,Quantité transféré
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Naviguer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planification
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planification
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Prenez le temps Connexion lot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Publié
 DocType: Project,Total Billing Amount (via Time Logs),Montant total de la facturation (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nous vendons cet article
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Nous vendons cet article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fournisseur Id
 DocType: Journal Entry,Cash Entry,Cash Prix d'entrée
-DocType: Sales Partner,Contact Desc,Contacter Desc
+DocType: Sales Partner,Contact Desc,Contact Desc
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades"
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer des rapports réguliers sommaires par e-mail.
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Ajoutez des lignes pour établir des budgets annuels sur des comptes.
 DocType: Buying Settings,Default Supplier Type,Fournisseur Type par défaut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Carrières
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Stock ne peut pas être mis à jour contre livraison Remarque {0}
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tous les contacts.
 DocType: Newsletter,Test Email Id,Id Test Email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abréviation de l'entreprise
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abréviation de l'entreprise
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si vous suivez contrôle de la qualité . Permet article AQ requis et AQ Pas de ticket de caisse
 DocType: GL Entry,Party Type,Type de partie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Point {0} ignoré car il n'est pas un article en stock
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} {1} a été modifié . S'il vous plaît Actualiser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Le rotomoulage
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maître de modèle de salaires .
 DocType: Leave Type,Max Days Leave Allowed,Laisser jours Max admis
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Définissez la règle d&#39;impôt pour panier
@@ -3112,18 +2858,18 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Chariot
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Merci de votre intérêt pour vous abonnant à nos mises à jour
 ,Qty to Transfer,Qté à Transférer
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citations à prospects ou clients.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Soumission à prospects ou clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock congelé
-,Territory Target Variance Item Group-Wise,Entretien Visitez {0} doit être annulée avant d'annuler cette commande client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
+,Territory Target Variance Item Group-Wise,Territoire cible Variance Item Group-Wise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tous les groupes client
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Modèle d&#39;impôt est obligatoire.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifs Taux (Société Monnaie)
 DocType: Account,Temporary,Temporaire
 DocType: Address,Preferred Billing Address,Préféré adresse de facturation
 DocType: Monthly Distribution Percentage,Percentage Allocation,Répartition en pourcentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secrétaire
 DocType: Serial No,Distinct unit of an Item,Unité distincte d'un élément
 DocType: Pricing Rule,Buying,Achat
 DocType: HR Settings,Employee Records to be created by,Dossiers sur les employés à être créées par
@@ -3134,45 +2880,40 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Numéro de série est obligatoire
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liste des Prix doit être applicable pour l'achat ou la vente d'
 ,Item-wise Price List Rate,Article sage Prix Tarif
-DocType: Purchase Order Item,Supplier Quotation,Devis Fournisseur
+DocType: Purchase Order Item,Supplier Quotation,Estimation Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dans les mots seront visibles une fois que vous enregistrez le devis.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Repassage
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} est arrêté
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Le code barre {0} est déjà utilisé dans l'article {1}
 DocType: Lead,Add to calendar on this date,Ajouter cette date au calendrier
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,S'il vous plaît entrer atleast une facture dans le tableau
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,évènements à venir
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Approuver rôle ne peut pas être même que le rôle de l'État est applicable aux
-DocType: Letter Head,Letter Head,A en-tête
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrée rapide
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
 DocType: Purchase Order,To Receive,A Recevoir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Frettage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Produits / charges
 DocType: Employee,Personal Email,Courriel personnel
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variance totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variance totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","S&#39;il est activé, le système affichera les écritures comptables pour l&#39;inventaire automatiquement."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,courtage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,courtage
 DocType: Address,Postal Code,Code Postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Mise à jour en quelques minutes 
  via 'Log Time'"
-DocType: Customer,From Lead,Du plomb
+DocType: Customer,From Lead,Du prospect
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Commandes validé pour la production.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Sélectionnez Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Profil POS nécessaire pour faire POS Entrée
 DocType: Hub Settings,Name Token,Nom du jeton
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Rabotage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,vente standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,vente standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 DocType: Serial No,Out of Warranty,Hors garantie
 DocType: BOM Replace Tool,Replace,Remplacer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Entrepôt de cible dans la ligne {0} doit être la même que la production de commande
 DocType: Purchase Invoice Item,Project Name,Nom du projet
 DocType: Supplier,Mention if non-standard receivable account,Mentionner si créance non standard
-DocType: Workflow State,Edit,Modifier
 DocType: Journal Entry Account,If Income or Expense,Si les produits ou charges
 DocType: Features Setup,Item Batch Nos,Nos lots d&#39;articles
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Différence
@@ -3180,13 +2921,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rapprochement des paiements Paiement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,avec les groupes
 DocType: BOM Item,BOM No,Numéro BOM
-DocType: Contact Us Settings,Pincode,Code Postal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La nomenclature qui sera remplacé
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nouveau stock UDM doit être different de l'actuel stock UDM
 DocType: Account,Debit,Débit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Les feuilles doivent être alloués par multiples de 0,5"
 DocType: Production Order,Operation Cost,Coût de l'opération
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Téléchargez la présence d&#39;un fichier. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Exceptionnelle Amt
@@ -3202,10 +2941,7 @@
 DocType: Project,Default Cost Center,Centre de coûts par défaut
 DocType: Purchase Invoice,End Date,Date de fin
 DocType: Employee,Internal Work History,Histoire de travail interne
-DocType: DocField,Column Break,Saut de colonne
-DocType: Event,Thursday,Jeudi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tournant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Réactions des clients
 DocType: Account,Expense,frais
 DocType: Sales Invoice,Exhibition,Exposition
@@ -3218,31 +2954,30 @@
 DocType: Employee,Held On,Tenu le
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Production Item
 ,Employee Information,Renseignements sur l&#39;employé
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taux (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Taux (%)
 DocType: Stock Entry Detail,Additional Cost,Supplément
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Date de fin de l'exercice financier
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Date de fin de l'exercice financier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base Bon Non, si regroupés par Chèque"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Faire Fournisseur offre
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Faire Fournisseur offre
 DocType: Quality Inspection,Incoming,Nouveau
 DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Réduire Gagner de congé sans solde (PLT)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: N ° de série {1} ne correspond pas à {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Règles d'application des prix et de ristournes .
 DocType: Batch,Batch ID,ID. du lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Compte avec des nœuds enfants ne peut pas être converti en livre
 ,Delivery Note Trends,Bordereau de livraison Tendances
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Résumé de la semaine
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} doit être un article ""Acheté"" ou ""Sous-traité"" à la ligne {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
 DocType: GL Entry,Party,Intervenants
 DocType: Sales Order,Delivery Date,Date de livraison
-DocType: DocField,Currency,Monnaie
 DocType: Opportunity,Opportunity Date,Date de possibilité
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retour contre Reçu d&#39;achat
 DocType: Purchase Order,To Bill,A facturer
 DocType: Material Request,% Ordered,% Commandé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,travail à la pièce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,travail à la pièce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
 DocType: Employee,History In Company,Dans l&#39;histoire de l&#39;entreprise
@@ -3259,77 +2994,68 @@
 DocType: Opportunity,To Discuss,Pour discuter
 DocType: SMS Settings,SMS Settings,Paramètres SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Comptes provisoires
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Noir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Noir
 DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
 DocType: Account,Auditor,Auditeur
 DocType: Purchase Order,End date of current order's period,Date de fin de la période de commande en cours
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Assurez Lettre d&#39;offre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retour
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
-DocType: DocField,Fold,Plier
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unité de mesure pour la variante par défaut doit être la même comme modèle
 DocType: Production Order Operation,Production Order Operation,Production ordre d'opération
 DocType: Pricing Rule,Disable,"Groupe ajoutée, rafraîchissant ..."
 DocType: Project Task,Pending Review,Attente d&#39;examen
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Veuillez spécifier
 DocType: Task,Total Expense Claim (via Expense Claim),Demande d&#39;indemnité totale (via remboursement de dépenses)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Client Id
-DocType: Page,Page Name,Nom de la page
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Time doit être supérieur From Time
 DocType: Journal Entry Account,Exchange Rate,Taux de change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Maximum {0} lignes autorisées
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Entrepôt {0}: compte de Parent {1} ne BOLONG à la société {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,La finition de la broche
 DocType: BOM,Last Purchase Rate,Purchase Rate Dernière
 DocType: Account,Asset,atout
 DocType: Project Task,Task ID,Groupe ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","par exemple ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","par exemple ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour objet {0} a depuis variantes
 ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction
-DocType: System Settings,Time Zone,Fuseau horaire
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,{0} n'est pas un courriel valide Identifiant
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Se inscrire ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Les pourcentages de distribution mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'élément sélectionné ne peut pas avoir lot
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Des matériaux livrés sur ce bon de livraison
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Agrafage
 DocType: Customer,Customer Details,Détails du client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Façonner
 DocType: Employee,Reports to,Rapports au
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour nos récepteurs
 DocType: Sales Invoice,Paid Amount,Montant payé
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',S'il vous plaît sélectionner valide volet n ° de procéder
 ,Available Stock for Packing Items,Disponible en stock pour l&#39;emballage Articles
 DocType: Item Variant,Item Variant,Point Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestion de la qualité
 DocType: Production Planning Tool,Filter based on customer,Filtre basé sur le client
 DocType: Payment Tool Detail,Against Voucher No,Sur le bon n°
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Point {0} est annulée
 DocType: Employee External Work History,Employee External Work History,Antécédents de travail des employés externe
 DocType: Tax Rule,Purchase,Achat
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Qté soldée
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Qté soldée
 DocType: Item Group,Parent Item Group,Groupe d&#39;éléments Parent
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pour {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centres de coûts
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Entrepôts.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Entrepôts.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la monnaie du fournisseur est converti en devise de base entreprise
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings conflits avec la ligne {1}
 DocType: Opportunity,Next Contact,Suivant Contactez
 DocType: Employee,Employment Type,Type d&#39;emploi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Facteur de conversion est requis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Période d&#39;application ne peut pas être sur deux dossiers de alocation
 DocType: Item Group,Default Expense Account,Compte de dépenses
 DocType: Employee,Notice (days),Avis ( jours )
-DocType: Page,Yes,Oui
 DocType: Tax Rule,Sales Tax Template,Modèle de la taxe de vente
 DocType: Employee,Encashment Date,Date de l&#39;encaissement
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroformage
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Le type de bon doit être un de bon de commande, une facture d'achat ou une entrée du journal"
 DocType: Account,Stock Adjustment,Stock ajustement
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe défaut Activité Coût pour le type d&#39;activité - {0}
 DocType: Production Order,Planned Operating Cost,Coût de fonctionnement prévues
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nom
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Se il vous plaît trouver ci-joint {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Se il vous plaît trouver ci-joint {0} # {1}
 DocType: Job Applicant,Applicant Name,Nom du demandeur
 DocType: Authorization Rule,Customer / Item Name,Client / Nom d&#39;article
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pas de série est obligatoire pour objet {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,S&#39;il vous plaît préciser à partir de / à la gamme
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Etabli par
 DocType: Serial No,Under AMC,En vertu de l&#39;AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,taux d'évaluation d'objet est recalculé compte tenu montant du bon de prix au débarquement
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,principal
@@ -3354,26 +3079,25 @@
 DocType: Payment Reconciliation,Minimum Amount,Montant minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marchandises mise à jour terminée
 DocType: Workstation,per hour,par heure
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},La date à laquelle la prochaine facture sera générée . Il est généré lors de la soumission .
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Compte de l'entrepôt ( de l'inventaire permanent ) sera créé sous ce compte .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Descendre : {0}
 DocType: Company,Distribution,Répartition
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Montant payé
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,envoi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Chef de projet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Réduction de Max permis pour l'article: {0} {1} est%
 DocType: Customer,Default Taxes and Charges,Taxes et frais de défaut
 DocType: Account,Receivable,Impression et image de marque
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d&#39;achat existe déjà
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d&#39;achat existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
 DocType: Sales Invoice,Supplier Reference,Référence fournisseur
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Si elle est cochée, la nomenclature des sous-ensembles points seront examinés pour obtenir des matières premières. Sinon, tous les éléments du sous-ensemble sera traitée comme une matière première."
 DocType: Material Request,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Vendeur description
 DocType: Employee Education,Qualification,Qualification
-DocType: Item Price,Item Price,Prix de l&#39;article
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Savons et de Détergents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+DocType: Item Price,Item Price,Prix de l&#39;article
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Savons et de Détergents
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ordonné
 DocType: Warehouse,Warehouse Name,Nom de l'entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner Transaction
@@ -3382,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,Taux de matériaux à base
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analyse du support
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Société est manquant dans les entrepôts {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitaire Stock Remplacer Emballage
 DocType: POS Profile,Terms and Conditions,Termes et Conditions
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pour la date doit être dans l'exercice. En supposant à ce jour = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez maintenir la hauteur, le poids, allergies, etc médicaux préoccupations"
@@ -3394,7 +3117,7 @@
 DocType: Sales Order Item,For Production,Pour la production
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,S'il vous plaît entrez la commande client dans le tableau ci-dessus
 DocType: Project Task,View Task,Voir Groupe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Date de début de la période comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Date de début de la période comptable
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Se il vous plaît entrer achat reçus
 DocType: Sales Invoice,Get Advances Received,Obtenez Avances et acomptes reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
@@ -3402,57 +3125,48 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cette Année financière que par défaut , cliquez sur "" Définir par défaut """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuration serveur entrant de soutien id e-mail . (par exemple support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Qté non couverte
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Variante d&#39;objet {0} existe avec les mêmes caractéristiques
 DocType: Salary Slip,Salary Slip,Fiche de paye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunissage
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'La date' est requise
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'La date' est requise
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des paquets à livrer. Utilisé pour notifier numéro de colis, le contenu du paquet et son poids."
 DocType: Sales Invoice Item,Sales Order Item,Poste de commande client
 DocType: Salary Slip,Payment Days,Jours de paiement
 DocType: BOM,Manage cost of operations,Gérer les coûts d&#39;exploitation
 DocType: Features Setup,Item Advanced,Article avancée
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminage à chaud
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Lorsque l&#39;une des opérations contrôlées sont «soumis», un e-mail pop-up s&#39;ouvre automatiquement pour envoyer un courrier électronique à l&#39;associé &quot;Contact&quot; dans cette transaction, la transaction en pièce jointe. L&#39;utilisateur peut ou ne peut pas envoyer l&#39;e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation des employés
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Il est nécessaire d&#39;aller chercher de l&#39;article Détails.
 DocType: Salary Slip,Net Pay,Salaire net
 DocType: Account,Account,Compte
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Négatif Stock erreur ( {6} ) pour le point {0} dans {1} Entrepôt sur {2} {3} {4} en {5}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Négatif Stock erreur ( {6} ) pour le point {0} dans {1} Entrepôt sur {2} {3} {4} en {5}
 ,Requested Items To Be Transferred,Articles demandé à être transférés
 DocType: Purchase Invoice,Recurring Id,Id récurrent
 DocType: Customer,Sales Team Details,Détails équipe de vente
 DocType: Expense Claim,Total Claimed Amount,Montant total réclamé
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Possibilités pour la vente.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,{0} numéros de série valides pour objet {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Non valide {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,{0} numéros de série valides pour objet {1}
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Nom de l'adresse de facturation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grands Magasins
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,l'équilibre du système
-DocType: Workflow,Is Active,Est active
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grands Magasins
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,l'équilibre du système
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Pas d'entrées comptables pour les entrepôts suivants
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Enregistrez le document en premier.
 DocType: Account,Chargeable,À la charge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Changer Abréviation
-DocType: Workflow State,Primary,Primaire
 DocType: Expense Claim Detail,Expense Date,Date de frais
 DocType: Item,Max Discount (%),Max Réduction (%)
-DocType: Communication,More Information,Plus d&#39;information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Dernière Montant de la commande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Minage
 DocType: Company,Warn,Avertir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Utilisation des fonds ( actif)
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
 DocType: BOM,Manufacturing User,Fabrication utilisateur
 DocType: Purchase Order,Raw Materials Supplied,Des matières premières fournies
 DocType: Purchase Invoice,Recurring Print Format,Format d&#39;impression récurrent
-DocType: Communication,Series,série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Une autre structure salariale {0} est active pour les employés {0} . S'il vous plaît faire son statut « inactif » pour continuer.
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Point Classification
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Directeur du développement des affaires
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Directeur du développement des affaires
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,But Visite d&#39;entretien
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,période
 ,General Ledger,Grand livre général
@@ -3462,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,S'il vous plaît sélectionnez {0} premier
 DocType: Features Setup,To get Item Group in details table,Pour obtenir Groupe d&#39;éléments dans le tableau de détails
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redessiner
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} du point {1} a expiré.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravure
 DocType: Sales Invoice,Commission,commission
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3490,7 +3202,7 @@
  {% si email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Montant par défaut
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Entrepôt pas trouvé dans le système
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Entrepôt pas trouvé dans le système
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Résumé de ce mois-ci
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecture d&#39;inspection de la qualité
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Figer les stocks datant de plus` doit être inférieur que %d jours.
@@ -3509,71 +3221,58 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
 DocType: Supplier,Address and Contacts,Adresse et contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Emballage
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web friendly, i.e. 900px par 100px"
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web friendly, i.e. 900px par 100px"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d&#39;objet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour en Achat réception contre chaque article
 DocType: Payment Tool,Get Outstanding Vouchers,Obtenez suspens Chèques
 DocType: Warranty Claim,Resolved By,Résolu par
 DocType: Appraisal,Start Date,Date de début
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valeur
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Compte temporaire ( actif)
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Cliquez ici pour vérifier
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
-DocType: Purchase Invoice Item,Price List Rate,Prix Liste des Prix
+DocType: Purchase Invoice Item,Price List Rate,Prix Liste des Prix
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Voir &quot;En stock&quot; ou &quot;Pas en stock» basée sur le stock disponible dans cet entrepôt.
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Nomenclature (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Délai moyen par le fournisseur de livrer
 DocType: Time Log,Hours,Heures
 DocType: Project,Expected Start Date,Date de début prévue
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Roulant
-DocType: ToDo,Priority,Priorité
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Supprimer l'élément si des accusations ne est pas applicable à cet élément
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox accès autorisé
-DocType: Dropbox Backup,Weekly,Hebdomadaire
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Par exemple. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Recevoir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Recevoir
 DocType: Maintenance Visit,Fully Completed,Entièrement complété
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l&#39;éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
 DocType: Employee Leave Approver,Employee Leave Approver,Congé employé approbateur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a été ajouté avec succès à notre liste de diffusion.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu , parce offre a été faite."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Usinage par faisceau d&#39;électrons
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Achat Maître Gestionnaire
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Client / Nom plomb
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordre de fabrication {0} doit être soumis
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},S'il vous plaît sélectionnez Date de début et date de fin de l'article {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapports principaux
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger entrées soldes à jour
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapports principaux
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,À ce jour ne peut pas être avant la date
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Ajouter / Modifier Prix
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Ajouter / Modifier Prix
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carte des centres de coûts
 ,Requested Items To Be Ordered,Articles demandés à commander
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mes Commandes
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mes Commandes
 DocType: Price List,Price List Name,Nom Liste des Prix
 DocType: Time Log,For Manufacturing,Pour Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaux
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaux
 DocType: BOM,Manufacturing,Fabrication
 ,Ordered Items To Be Delivered,Articles commandés à livrer
 DocType: Account,Income,Revenu
-,Setup Wizard,Assistant de configuration
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Quelque chose a mal tourné !
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Attention: la demande d&#39;autorisation contient les dates de blocs suivants
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,BOM {0} n'est pas actif ou non soumis
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Moulage sous pression
-DocType: Email Alert,Reference Date,Date de Référence
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unité d'organisation (département) maître .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,nos
 DocType: Budget Detail,Budget Detail,Détail du budget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Vous ne pouvez pas supprimer Aucune série {0} en stock . Première retirer du stock, puis supprimer ."
-DocType: Async Task,Status,Statut
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM mis à jour pour objet {0}
-DocType: Company History,Year,Année
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Heure du journal {0} déjà facturée
@@ -3586,55 +3285,52 @@
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
 DocType: Item,Unit of Measure Conversion,Unité de conversion de Mesure
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Employé ne peut être modifié
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Vous ne pouvez pas crédit et de débit même compte en même temps
 DocType: Naming Series,Help HTML,Aide HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée devrait être de 100 % . Il est {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Allocation pour les plus de {0} croisés pour objet {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de l&#39;organisation que cette adresse appartient.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,vos fournisseurs
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,vos fournisseurs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Une autre structure salariale {0} est actif pour l'employé {1}. Se il vous plaît faire son statut «inactif» pour continuer.
-DocType: Purchase Invoice,Contact,Contacter
+DocType: Purchase Invoice,Contact,Contact
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Reçu de
 DocType: Features Setup,Exports,Exportations
 DocType: Lead,Converted,Converti
 DocType: Item,Has Serial No,N ° de série a
 DocType: Employee,Date of Issue,Date d&#39;émission
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Du {0} pour {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
 DocType: Issue,Content Type,Type de contenu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ordinateur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à mettre en valeur Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
 DocType: Cost Center,Budgets,Budgets
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Mise à jour
 DocType: Employee,Emergency Contact Details,Détails de contact d&#39;urgence
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Que fait-elle ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Que fait-elle ?
 DocType: Delivery Note,To Warehouse,Pour Entrepôt
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Le compte {0} a été renseigné plus d'une fois pour l'année fiscale {1}
 ,Average Commission Rate,Taux moyen de la commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La participation ne peut pas être marqué pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Prix règle Aide
 DocType: Purchase Taxes and Charges,Account Head,Responsable du compte
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,local
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,local
 DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale Différence (Out - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taux de change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour les employés {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Grenaillage
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la revendication de garantie
 DocType: Stock Entry,Default Source Warehouse,Source d&#39;entrepôt par défaut
 DocType: Item,Customer Code,Code client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rappel d'anniversaire pour {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Clapotis
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Jours depuis la dernière commande
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Jours depuis la dernière commande
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débit Pour compte doit être un compte de bilan
 DocType: Buying Settings,Naming Series,Nommer Série
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
-DocType: User,Enabled,Activé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Statut du document de transition {0} {1}, n'est pas autorisé"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonnés à l&#39;importation
@@ -3642,19 +3338,18 @@
 DocType: Attendance,Present,Présent
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pas de clients ou fournisseurs Comptes trouvé
 DocType: Notification Control,Sales Invoice Message,Message facture de vente
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fermeture compte {0} doit être de type passif / Equity
 DocType: Authorization Rule,Based On,Basé sur
-DocType: Sales Order Item,Ordered Qty, Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Point {0} est désactivé
+DocType: Sales Order Item,Ordered Qty,Quantité commandée
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Point {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Jusqu&#39;à
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activité de projet / tâche.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Générer les bulletins de salaire
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} n'est pas un identifiant de courriel valide
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
-DocType: ToDo,Low,Bas
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filature
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon d'Landed Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},S'il vous plaît mettre {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
@@ -3676,7 +3371,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Le nom de la campagne est requis
 DocType: Maintenance Visit,Maintenance Date,Date de l&#39;entretien
 DocType: Purchase Receipt Item,Rejected Serial No,Rejeté N ° de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Emboutissage
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nouvelle Bulletin
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},{0} budget pour compte {1} contre des centres de coûts {2} dépassera par {3}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Voir solde
@@ -3687,7 +3381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM et fabrication Quantité sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Montant
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Rivetage
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
 ,Sales Analytics,Analytics Sales
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de fabrication
@@ -3699,28 +3392,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nom du nouveau compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coût des matières premières fournies
 DocType: Selling Settings,Settings for Selling Module,Paramètres module vente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Service à la clientèle
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Service à la clientèle
 DocType: Item,Thumbnail,Miniature
 DocType: Item Customer Detail,Item Customer Detail,Détail d&#39;article
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirmez Votre Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offre candidat un emploi.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Nombre de feuilles alloués sont plus de jours de la période
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Point {0} doit être un stock Article
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Par défaut Work In Progress Entrepôt
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Les paramètres par défaut pour les opérations comptables .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} est nécessaire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Le moulage sous vide
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date prévu ne peut pas être avant Matériel Date de la demande
-DocType: Contact Us Settings,City,Ville
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Usinage par ultrasons
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erreur: Pas un identifiant valide?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Point {0} doit être un élément de ventes
 DocType: Naming Series,Update Series Number,Numéro de série mise à jour
 DocType: Account,Equity,Opération {0} est répété dans le tableau des opérations
 DocType: Sales Order,Printing Details,Impression Détails
 DocType: Task,Closing Date,Date de clôture
 DocType: Sales Order Item,Produced Quantity,Quantité produite
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ingénieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ingénieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Recherche de sous-ensembles
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Aucun résultat
 DocType: Sales Partner,Partner Type,Type de partenaire
@@ -3728,7 +3417,7 @@
 DocType: Authorization Rule,Customerwise Discount,Remise Customerwise
 DocType: Purchase Invoice,Against Expense Account,Sur le compte des dépenses
 DocType: Production Order,Production Order,Ordre de fabrication
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Les demandes matérielles {0} créé
 DocType: Quotation Item,Against Docname,Contre docName
 DocType: SMS Center,All Employee (Active),Tous les employés (Actif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,voir maintenant
@@ -3736,82 +3425,71 @@
 DocType: BOM,Raw Material Cost,Raw Material Coût
 DocType: Item,Re-Order Level,Re-commande de niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduisez les articles et qté planifiée pour laquelle vous voulez soulever ordres de fabrication ou de télécharger des matières premières pour l&#39;analyse.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramme de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Mise à jour de la série
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Bulletin de salaire de l'employé {0} déjà créé pour ce mois-ci
 DocType: Item,Serial Number Series,Série Série Nombre
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Facteur de conversion ne peut pas être dans les fractions
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,D&#39;abord répondu le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Le premier utilisateur: Vous
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Le premier utilisateur: Vous
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Réconcilié avec succès
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Réconcilié avec succès
 DocType: Production Order,Planned End Date,Date de fin prévue
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Lorsque des éléments sont stockés.
 DocType: Tax Rule,Validity,Validité
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Montant facturé
 DocType: Attendance,Attendance,Présence
-DocType: Page,No,Aucun
 DocType: BOM,Materials,Matériels
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si ce n&#39;est pas cochée, la liste devra être ajouté à chaque département où il doit être appliqué."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Date d'affichage et l'affichage est obligatoire
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
-,Item Prices,Prix du lot
+,Item Prices,Prix du lot
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dans les mots seront visibles une fois que vous enregistrez le bon de commande.
 DocType: Period Closing Voucher,Period Closing Voucher,Bon clôture de la période
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Liste de prix principale.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Liste de prix principale.
 DocType: Task,Review Date,Date de revoir
 DocType: Purchase Invoice,Advance Payments,Paiements anticipés
-DocType: DocPerm,Level,Niveau
 DocType: Purchase Taxes and Charges,On Net Total,Le total net
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Bon de commande {0} n'est pas soumis
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Pas de permission pour utiliser l'outil Paiement
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fraisage
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Pas de permission pour utiliser l'outil Paiement
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
 DocType: Company,Round Off Account,Arrondir compte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grignotage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Dépenses administratives
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultant
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultant
 DocType: Customer Group,Parent Customer Group,Groupe Client parent
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Changement
 DocType: Purchase Invoice,Contact Email,Contact Courriel
 DocType: Appraisal Goal,Score Earned,Score gagné
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Période De Préavis
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","par exemple "" Mon Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Période De Préavis
 DocType: Bank Reconciliation Detail,Voucher ID,ID du Bon
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,C'est un territoire de racine et ne peut être modifié .
 DocType: Packing Slip,Gross Weight UOM,Emballage Poids brut
 DocType: Email Digest,Receivables / Payables,Créances / dettes
 DocType: Delivery Note Item,Against Sales Invoice,Sur la facture de vente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampillage
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Compte créditeur
 DocType: Landed Cost Item,Landed Cost Item,Article coût en magasin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte à recevoir / payer
 DocType: Delivery Note Item,Against Sales Order Item,Sur l'objet de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
 DocType: Item,Default Warehouse,Entrepôt de défaut
 DocType: Task,Actual End Date (via Time Logs),Date réelle de fin (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l&#39;encontre du compte de groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Le projet de loi n ° {0} déjà réservé dans la facture d'achat {1}
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Catégorie impôt ne peut pas être « évaluation » ou « évaluation et totale », comme tous les articles sont des articles hors stock"
-DocType: User,Last Name,Nom de famille
-DocType: Web Page,Left,Gauche
-DocType: Event,All Day,Toute la journée
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Catégorie impôt ne peut pas être « évaluation » ou « évaluation et totale », comme tous les articles sont des articles hors stock"
 DocType: Issue,Support Team,Équipe de soutien
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
-DocType: Contact Us Settings,State,État
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Demande d&#39;indemnité totale (via Remboursement des dépenses)
-DocType: User,Gender,Sexe
 DocType: Journal Entry,Debit Note,Note de débit
 DocType: Stock Entry,As per Stock UOM,Selon Stock UDM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Pas expiré
@@ -3825,44 +3503,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions fondées sur des valeurs .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si elle est cochée, aucune totale. des jours de travail comprennent vacances, ce qui réduira la valeur de salaire par jour"
 DocType: Purchase Invoice,Total Advance,Advance totale
-DocType: Workflow State,User,Utilisateurs
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Traitement de la paie
 DocType: Opportunity Item,Basic Rate,Taux de base
 DocType: GL Entry,Credit Amount,Le montant du crédit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Définir comme perdu
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Reçu de paiement Remarque
 DocType: Customer,Credit Days Based On,Jours de crédit basée sur
 DocType: Tax Rule,Tax Rule,Règle d&#39;impôt
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Maintenir même taux long cycle de vente
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiez les journaux de temps en dehors des heures de travail Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a déjà été soumis
 ,Items To Be Requested,Articles à demander
-DocType: Purchase Order,Get Last Purchase Rate,Obtenez Purchase Rate Dernière
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taux de facturation basé sur le type d&#39;activité (par heure)
 DocType: Company,Company Info,Informations sur l'entreprise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",Remarque: Il n'est pas assez solde de congés d'autorisation de type {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 DocType: Production Planning Tool,Filter based on item,Filtre basé sur l'article
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Compte de débit
 DocType: Fiscal Year,Year Start Date,Date de début Année
 DocType: Attendance,Employee Name,Nom de l&#39;employé
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrondie (Société Monnaie)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
 DocType: Purchase Common,Purchase Common,Achat commun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. S.V.P rafraîchir.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Empêcher les utilisateurs de faire des demandes d&#39;autorisation, les jours suivants."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Obturation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Avantages du personnel
 DocType: Sales Invoice,Is POS,Est-POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Emballé quantité doit être égale à la quantité pour l'article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Quantité fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité acceptés
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factures émises aux clients.
-DocType: DocField,Default,Par défaut
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Référence du projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnés ajoutés
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Définir budget pour ce centre de coûts. Pour définir l&#39;action budgétaire, voir «Liste des entreprises»"
@@ -3873,70 +3547,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Liste de prix introuvable ou desactivé
 DocType: Expense Claim,Approved,Approuvé
 DocType: Pricing Rule,Price,Profil de l'organisation
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",La sélection de &quot;Oui&quot; donner une identité unique à chaque entité de cet article qui peut être consulté dans le N ° de série maître.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Soulager date doit être supérieure à date d'adhésion
 DocType: Employee,Education,éducation
 DocType: Selling Settings,Campaign Naming By,Campagne Naming par
 DocType: Employee,Current Address Is,Adresse actuelle
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optionnel. Définit la devise par défaut de l&#39;entreprise, si non spécifié."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Optionnel. Définit la devise par défaut de l&#39;entreprise, si non spécifié."
 DocType: Address,Office,Bureau
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapports standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantité à partir de l&#39;entrepôt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pour créer un compte d'impôt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Adresse actuelle
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article est une variante d'un autre élément, puis la description, image, prix, taxes etc sera fixé à partir du modèle à moins explicitement spécifiée"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventaire
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventaire
 DocType: Employee,Contract End Date,Date de fin du contrat
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirez les ordres de vente (en attendant de livrer) sur la base des critères ci-dessus
-DocType: DocShare,Document Type,Type de document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fournisseur offre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,De Fournisseur offre
 DocType: Deduction Type,Deduction Type,Type de déduction
 DocType: Attendance,Half Day,Demi-journée
 DocType: Pricing Rule,Min Qty,Compte {0} est gelé
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Pour suivre les articles dans les ventes et les documents d&#39;achat avec nos batch. &quot;Préférés de l&#39;industrie: Produits chimiques&quot;
 DocType: GL Entry,Transaction Date,Date de la transaction
 DocType: Production Plan Item,Planned Qty,Quantité planifiée
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pour Quantité (Fabriqué Quantité) est obligatoire
 DocType: Stock Entry,Default Target Warehouse,Cible d&#39;entrepôt par défaut
 DocType: Purchase Invoice,Net Total (Company Currency),Total net (Société Monnaie)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Achat message de réception
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Nombre de feuilles alloués sont plus que la durée
 DocType: Production Order,Actual Start Date,Date de début réelle
-DocType: Sales Order,% of materials delivered against this Sales Order,% De matériaux livrés sur cette Commande vente
+DocType: Sales Order,% of materials delivered against this Sales Order,% De matériaux livrés sur cette ordre de vente
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gestion des mouvements du stock.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bulletin Liste abonné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortaiseuse
-DocType: Email Account,Service,service
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
 DocType: Project,Gross Margin %,Marge brute%
 DocType: BOM,With Operations,Avec des opérations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Les écritures comptables ont déjà été réalisés en monnaie {0} pour la société {1}. S&#39;il vous plaît sélectionner un compte à recevoir ou à payer avec de la monnaie {0}.
 ,Monthly Salary Register,S&#39;enregistrer Salaire mensuel
-apps/frappe/frappe/website/template.py +140,Next,Suivant
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Électrolytique
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le montant rangée précédente
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Se il vous plaît entrez paiement Montant en atleast une rangée
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Se il vous plaît entrez paiement Montant en atleast une rangée
 DocType: POS Profile,POS Profile,Profil POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Montant du paiement ne peut pas être supérieure à Encours
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total non rémunéré
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total non rémunéré
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Heure du journal n'est pas facturable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Point {0} est un modèle, s&#39;il vous plaît sélectionnez l&#39;une de ses variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Acheteur
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Acheteur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Landed Cost correctement mis à jour
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Se il vous plaît entrer le contre Chèques manuellement
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Se il vous plaît entrer le contre Chèques manuellement
 DocType: SMS Settings,Static Parameters,Paramètres statiques
 DocType: Purchase Order,Advance Paid,Acompte payée
 DocType: Item,Item Tax,Taxe sur l'Article
@@ -3945,14 +3612,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Prenons l&#39;impôt ou charge pour
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quantité réelle est obligatoire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Croix-laminage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Carte de crédit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Carte de crédit
 DocType: BOM,Item to be manufactured or repacked,Ce point doit être manufacturés ou reconditionnés
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,minute
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,minute
 DocType: Purchase Invoice,Next Date,Date suivante
 DocType: Employee Education,Major/Optional Subjects,Sujets principaux / en option
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Se il vous plaît entrer Taxes et frais
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinage
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ici vous pouvez conserver les détails de famille comme nom et la profession des parents, le conjoint et les enfants"
 DocType: Hub Settings,Seller Name,Vendeur Nom
@@ -3962,47 +3627,44 @@
 DocType: Stock Entry,Repack,Remballez
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Vous devez sauvegarder le formulaire avant de continuer
 DocType: Item Attribute,Numeric Values,Valeurs numériques
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Joindre le logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Joindre le logo
 DocType: Customer,Commission Rate,Taux de commission
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Assurez Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquer les demandes d&#39;autorisation par le ministère.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Le panier est vide
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Racine ne peut pas être modifié.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Le montant alloué ne peut pas être plus grand que le montant non-ajusté
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Racine ne peut pas être modifié.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Le montant alloué ne peut pas être plus grand que le montant non-ajusté
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la production pendant les vacances
 DocType: Sales Order,Customer's Purchase Order Date,Bon de commande de la date de clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital-actions
 DocType: Packing Slip,Package Weight Details,Détails Poids de l&#39;emballage
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,S&#39;il vous plaît sélectionner un fichier csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Envoyer sauvegardes à Dropbox
 DocType: Purchase Order,To Receive and Bill,Pour recevoir et le projet de loi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,créateur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,créateur
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termes et Conditions modèle
 DocType: Serial No,Delivery Details,Détails de la livraison
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 DocType: Item,Automatically create Material Request if quantity falls below this level,Créer automatiquement Demande de Matériel si la quantité tombe en dessous de ce niveau
 ,Item-wise Purchase Register,S&#39;enregistrer Achat point-sage
 DocType: Batch,Expiry Date,Date d&#39;expiration
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pour définir le niveau de réapprovisionnement, item doit être un objet d&#39;achat ou de fabrication de l&#39;article"
 ,Supplier Addresses and Contacts,Adresses des fournisseurs et contacts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,S'il vous plaît sélectionnez d'abord Catégorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projet de master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne plus afficher n&#39;importe quel symbole comme $ etc à côté de devises.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Leave Type,Is Carry Forward,Est-Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obtenir des éléments de nomenclature
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Diriger jours Temps
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Délai jours Temps
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
-DocType: Dropbox Backup,Send Notifications To,Envoyer des notifications aux
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Réf date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Réf date
 DocType: Employee,Reason for Leaving,Raison du départ
 DocType: Expense Claim Detail,Sanctioned Amount,Montant sanctionné
 DocType: GL Entry,Is Opening,Est l&#39;ouverture
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Compte {0} n'existe pas
 DocType: Account,Cash,Espèces
 DocType: Employee,Short biography for website and other publications.,Courte biographie pour le site Web et d&#39;autres publications.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},« Date de début prévue » ne peut être supérieur à ' Date de fin prévue '

diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 107720c..8d4691b 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,שכר Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","בחר בחתך חודשי, אם אתה רוצה לעקוב אחר המבוסס על עונתיות."
 DocType: Employee,Divorced,גרוש
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,אזהרה: פריט אותו הוזן מספר פעמים.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,אזהרה: פריט אותו הוזן מספר פעמים.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,פריטים כבר סונכרנו
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,הרשה פריט שיתווסף מספר פעמים בעסקה
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,לבטל חומר בקר {0} לפני ביטול תביעת אחריות זו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,מוצרים צריכה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,מוצרים צריכה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,אנא בחר מפלגה סוג ראשון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,חישול
 DocType: Item,Customer Items,פריטים לקוח
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,חשבון {0}: הורה חשבון {1} לא יכול להיות פנקס
 DocType: Item,Publish Item to hub.erpnext.com,פרסם פריט לhub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,השאר מאשרים
 DocType: Sales Partner,Dealer,סוחר
 DocType: Employee,Rented,הושכר
-DocType: About Us Settings,Website,אתר
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,דחיסה בתוספת sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* יחושב בעסקה.
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,מבקשת חומר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,מבקשת חומר
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} עץ
 DocType: Job Applicant,Job Applicant,עבודת מבקש
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,אין יותר תוצאות.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,משפטי
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,משפטי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},מס סוג בפועל לא ניתן כלול במחיר הפריט בשורת {0}
 DocType: C-Form,Customer,לקוחות
 DocType: Purchase Receipt Item,Required By,הנדרש על ידי
@@ -42,20 +39,19 @@
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Leave Type,Leave Type Name,השאר סוג שם
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,סדרת עדכון בהצלחה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,תפירה
 DocType: Pricing Rule,Apply On,החל ב
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
 DocType: SMS Center,All Supplier Contact,כל לתקשר עם הספק
 DocType: Quality Inspection Reading,Parameter,פרמטר
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,החדש Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# השורה {0}: שיעור חייב להיות זהה {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,החדש Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,המחאה בנקאית
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. כדי לשמור את קוד פריט החכם לקוחות ולגרום להם לחיפוש על סמך שימוש הקוד שלהם באפשרות זו
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,גרסאות הצג
-DocType: Sales Invoice Item,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,כמות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,במלאי
@@ -63,51 +59,49 @@
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,פרופיל קופה חדש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,בריאות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,בריאות
 DocType: Purchase Invoice,Monthly,חודשי
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,"כתובת דוא""ל"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ביטחון
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,"כתובת דוא""ל"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,# השורה {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,אנא בחר מחירון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,עיבוד עץ
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,הדפסת 3D
 DocType: Employee,Holiday List,רשימת החג
 DocType: Time Log,Time Log,הזמן התחבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,חשב
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,חשב
 DocType: Cost Center,Stock User,משתמש המניה
 DocType: Company,Phone No,מס 'טלפון
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","יומן של פעילויות המבוצע על ידי משתמשים מפני משימות שיכולים לשמש למעקב זמן, חיוב."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},חדש {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},חדש {0}: # {1}
 ,Sales Partners Commission,ועדת שותפי מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,קיצור לא יכול להיות יותר מ 5 תווים
-DocType: Print Settings,Classic,קלאסי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,זהו חשבון שורש ולא ניתן לערוך.
 DocType: BOM,Operations,פעולות
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},לא ניתן להגדיר הרשאות על בסיס הנחה עבור {0}
 DocType: Bin,Quantity Requested for Purchase,כמות המבוקשת לרכישה
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","צרף קובץ csv עם שתי עמודות, אחת לשם הישן ואחד לשם החדש"
 DocType: Packed Item,Parent Detail docname,docname פרט הורה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,קילוגרם
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,קילוגרם
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,פתיחה לעבודה.
 DocType: Item Attribute,Increment,תוספת
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,בחר מחסן ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,פרסום
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,פרסום
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,אותו החברה נכנסה יותר מפעם אחת
 DocType: Employee,Married,נשוי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,מכולת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
 DocType: Quality Inspection Reading,Reading 1,קריאת 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,הפוך בנק כניסה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,קרנות פנסיה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,קרנות פנסיה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,מחסן הוא חובה אם סוג החשבון הוא מחסן
 DocType: SMS Center,All Sales Person,כל איש המכירות
 DocType: Lead,Person Name,שם אדם
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","בדקו אם חוזר כדי, בטלו להפסיק חוזר או לשים תאריך סיום הולם"
@@ -124,40 +118,35 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
 DocType: SMS Log,SMS Log,SMS התחבר
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,עלות פריטים נמסר
-DocType: Blog Post,Guest,אורח
 DocType: Quality Inspection,Get Specification Details,קבל מפרט פרטים
 DocType: Lead,Interested,מעוניין
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ביל החומר
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,פתיחה
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,פתיחה
 DocType: Item,Copy From Item Group,העתק מ קבוצת פריט
 DocType: Journal Entry,Opening Entry,כניסת פתיחה
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} הוא חובה
 DocType: Stock Entry,Additional Costs,עלויות נוספות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,חשבון עם עסקה הקיימת לא ניתן להמיר לקבוצה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,חשבון עם עסקה הקיימת לא ניתן להמיר לקבוצה.
 DocType: Lead,Product Enquiry,חקירה מוצר
-DocType: Standard Reply,Owner,בעלים
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,אנא ראשון להיכנס החברה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,אנא בחר החברה ראשונה
 DocType: Employee Education,Under Graduate,תחת בוגר
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,יעד ב
 DocType: BOM,Total Cost,עלות כוללת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,יומן פעילות:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,"נדל""ן"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,"נדל""ן"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,הצהרה של חשבון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,תרופות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
 DocType: Expense Claim Detail,Claim Amount,סכום תביעה
 DocType: Employee,Mr,מר
-DocType: Custom Script,Client,הלקוח
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,סוג ספק / ספק
 DocType: Naming Series,Prefix,קידומת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,מתכלה
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,מתכלה
 DocType: Upload Attendance,Import Log,יבוא יומן
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,שלח
 DocType: Sales Invoice Item,Delivered By Supplier,נמסר על ידי ספק
 DocType: SMS Center,All Contact,כל הקשר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,משכורת שנתית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,הוצאות המניה
 DocType: Newsletter,Email Sent?,"דוא""ל שנשלח?"
@@ -165,29 +154,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,יומני זמן השידור
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
 DocType: Delivery Note,Installation Status,מצב התקנה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ מקובל שנדחו הכמות חייבת להיות שווה לכמות שהתקבל עבור פריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ מקובל שנדחו הכמות חייבת להיות שווה לכמות שהתקבל עבור פריט {0}
 DocType: Item,Supply Raw Materials for Purchase,חומרי גלם לאספקת רכישה
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,פריט {0} חייב להיות פריט רכישה
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","הורד את התבנית, למלא נתונים מתאימים ולצרף את הקובץ הנוכחי. כל שילוב התאריכים ועובדים בתקופה שנבחרה יבוא בתבנית, עם רישומי נוכחות קיימים"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,יעודכן לאחר חשבונית מכירות הוגשה.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","כדי לכלול מס בשורת {0} בשיעור פריט, מסים בשורות {1} חייבים להיות כלולים גם"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,מיישר
 DocType: BOM Replace Tool,New BOM,BOM החדש
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,אצווה יומני זמן לחיוב.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,ליהוק Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,עלון כבר נשלח
 DocType: Lead,Request Type,סוג הבקשה
 DocType: Leave Application,Reason,סיבה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,שידור
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ביצוע
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,המשתמש הראשון יהפוך את מנהל המערכת (אתה יכול לשנות את זה בהמשך).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,שידור
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,ביצוע
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,המשתמש הראשון יהפוך את מנהל המערכת (אתה יכול לשנות את זה בהמשך).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,פרטים של הפעולות שביצעו.
 DocType: Serial No,Maintenance Status,מצב תחזוקה
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,פריטים ותמחור
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,פריטים ותמחור
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},מתאריך צריך להיות בתוך שנת הכספים. בהנחת מתאריך = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,בחר את העובדים שעבורם אתה יוצר שמאות.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},עלות המרכז {0} אינו שייך לחברת {1}
@@ -197,11 +184,8 @@
 apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,כללים ליישום תמחור והנחה.
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},קונפליקטים התחבר הפעם עם {0} עבור {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,מחיר המחירון חייב להיות ישים עבור קנייה או מכירה
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},תאריך התקנה לא יכול להיות לפני מועד אספקה לפריט {0}
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},תאריך התקנה לא יכול להיות לפני מועד אספקה לפריט {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),הנחה על מחיר מחירון שיעור (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,התחל
-DocType: User,First Name,שם פרטים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ליהוק מלא עובש
 DocType: Offer Letter,Select Terms and Conditions,תנאים והגבלות בחרו
 DocType: Production Planning Tool,Sales Orders,הזמנות ומכירות
 DocType: Purchase Taxes and Charges,Valuation,הערכת שווי
@@ -213,56 +197,52 @@
 DocType: Bank Reconciliation,Bank Account,חשבון בנק
 DocType: Leave Type,Allow Negative Balance,לאפשר מאזן שלילי
 DocType: Selling Settings,Default Territory,טריטורית ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,טלוויזיה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,המבתר
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,טלוויזיה
 DocType: Production Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},חשבון {0} אינו שייך לחברת {1}
 DocType: Naming Series,Series List for this Transaction,רשימת סדרות לעסקה זו
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 DocType: Customer Group,Mention if non-standard receivable account applicable,להזכיר אם ישים חשבון חייבים שאינם סטנדרטי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,התקבל ב
 DocType: Sales Partner,Reseller,משווק
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,נא להזין חברה
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
 DocType: Newsletter List,Total Subscribers,סה&quot;כ מנויים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,שם איש קשר
+,Contact Name,שם איש קשר
 DocType: Production Plan Item,SO Pending Qty,SO המתנת כמות
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,בקש לרכישה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,דיור זוגי
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,עלים בכל שנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,עלים בכל שנה
 DocType: Time Log,Will be updated when batched.,יעודכן כאשר לכלך.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
-DocType: Bulk Email,Message,הודעה
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox מפתח הגישה
 DocType: Payment Tool,Reference No,אסמכתא
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,שנתי
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
 DocType: Material Request Item,Min Order Qty,להזמין כמות מינימום
 DocType: Lead,Do Not Contact,אל תצור קשר
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id הייחודי למעקב אחר כל החשבוניות חוזרות. הוא נוצר על שליחה.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,מפתח תוכנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,מפתח תוכנה
 DocType: Item,Minimum Order Qty,להזמין כמות מינימום
 DocType: Pricing Rule,Supplier Type,סוג ספק
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,צחצוח חוט
 DocType: Employee,Relation,ביחס
 DocType: Shipping Rule,Worldwide Shipping,משלוח ברחבי העולם
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,הזמנות אישרו מלקוחות.
@@ -278,12 +258,10 @@
 DocType: Supplier,Address HTML,כתובת HTML
 DocType: Lead,Mobile No.,מס 'נייד
 DocType: Maintenance Schedule,Generate Schedule,צור לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ראש ההוצאה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,אנא בחר Charge סוג ראשון
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,אחרון
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,מקסימום 5 תווים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,בחר את השפה שלך
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,מקסימום 5 תווים
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,המאשר החופשה הראשונה ברשימה תהיה לקבוע כברירת מחדל Leave המאשרת
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",משבית יצירת יומני זמן נגד הזמנות ייצור. פעולות לא להיות במעקב נגד ההפקה להזמין
@@ -294,29 +272,20 @@
 DocType: Item,Variant Of,גרסה של
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,פריט {0} חייב להיות פריט השירות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
-DocType: DocType,Administrator,מנהל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,קידוח לייזר
-DocType: Stock UOM Replace Utility,New Stock UOM,החדש במלאי של אוני 'מישגן
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,שגיאת הפניה מעגלית
-DocType: Communication,Closed,סגור
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח.
 DocType: Lead,Industry,תעשייה
 DocType: Employee,Job Profile,פרופיל עבודה
 DocType: Newsletter,Newsletter,עלון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,עִלוּסִים
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,פריט מתעדכן
-DocType: Async Task,System Manager,מנהל מערכת
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
 DocType: Sales Invoice Item,Delivery Note,תעודת משלוח
-DocType: Dropbox Backup,Allow Dropbox Access,אפשר גישה Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,הגדרת מסים
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Workstation,Rent Cost,עלות השכרה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,אנא בחר חודש והשנה
@@ -324,31 +293,28 @@
 DocType: Employee,Company Email,"חברת דוא""ל"
 DocType: GL Entry,Debit Amount in Account Currency,סכום חיוב במטבע חשבון
 DocType: Shipping Rule,Valid for Countries,תקף למדינות
-DocType: Workflow State,Refresh,רענן
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","כל התחומים הקשורים היבוא כמו מטבע, שער המרה, סך יבוא, וכו 'הסכום כולל יבוא זמינים בקבלת רכישה, הצעת מחיר של ספק, רכישת חשבונית, הזמנת רכש וכו'"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","זמין בBOM, תעודת משלוח, חשבוניות רכש, ייצור להזמין, הזמנת רכש, קבלת רכישה, מכירות חשבונית, הזמנת מכירות, מלאי כניסה, גליון"
 DocType: Item Tax,Tax Rate,שיעור מס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,פריט בחר
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,פריט בחר
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","פריט: {0} הצליח אצווה-חכם, לא ניתן ליישב באמצעות מניות \ פיוס, במקום להשתמש במלאי כניסה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,קבלת רכישה יש להגיש
-DocType: Stock UOM Replace Utility,Current Stock UOM,נוכחי במלאי של אוני 'מישגן
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,"כתובת הדוא""ל שלך"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,אנא ראה קובץ מצורף
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,חיתוך סילון מים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,התקנה כבר מלא !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,התקנה כבר מלא !!
 ,Finished Goods,מוצרים מוגמרים
 DocType: Delivery Note,Instructions,הוראות
 DocType: Quality Inspection,Inspected By,נבדק על ידי
@@ -363,6 +329,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,נא לא ליצור חשבונות ללקוחות וספקים. הם נוצרים ישירות ממאסטרי לקוחות / ספקים.
 DocType: Currency Exchange,Currency Exchange,המרת מטבע
 DocType: Purchase Invoice Item,Item Name,שם פריט
+DocType: Authorization Rule,Approving User  (above authorized value),אישור משתמש (מעל הערך מורשה)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,יתרת אשראי
 DocType: Employee,Widowed,אלמנה
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","פריטים לבקשו שהם ""אזל"" בהתחשב בכל המחסנים המבוססים על כמות צפויה וכמות הזמנה מינימאלית"
@@ -372,22 +339,21 @@
 ,Purchase Register,רכישת הרשמה
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
 DocType: Workstation,Consumable Cost,עלות מתכלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,רפואי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,רפואי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,סיבה לאיבוד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,אגלי צינור
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
 DocType: Employee,Single,אחת
 DocType: Issue,Attachment,קובץ מצורף
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,לא ניתן להגדיר תקציב עבור מרכז עלות הקבוצה
 DocType: Account,Cost of Goods Sold,עלות מכר
 DocType: Purchase Invoice,Yearly,שנתי
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,נא להזין מרכז עלות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,נא להזין מרכז עלות
 DocType: Journal Entry Account,Sales Order,להזמין מכירות
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,ממוצע. שיעור מכירה
 DocType: Purchase Order,Start date of current order's period,תאריך התחלה של תקופה של הצו הנוכחי
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},כמות אינה יכולה להיות חלק בשורת {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},כמות אינה יכולה להיות חלק בשורת {0}
 DocType: Purchase Invoice Item,Quantity and Rate,כמות ושיעור
 DocType: Delivery Note,% Installed,% מותקן
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,אנא ראשון להזין את שם חברה
@@ -397,10 +363,8 @@
 DocType: Account,Is Group,קבוצה
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,הגדר סידורי מס באופן אוטומטי על בסיס FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ספק בדוק חשבונית מספר הייחוד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,שיסוף
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""למקרה מס ' לא יכול להיות פחות מ 'מתיק מס' '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ללא כוונת רווח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ללא כוונת רווח
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,לא התחיל
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,האם ישן
@@ -409,13 +373,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,אב חג.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,דפוס פגז
 DocType: Material Request Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,נא להזין את קוד פריט.
 DocType: BOM,Costing,תמחיר
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,"סה""כ כמות"
@@ -425,35 +389,30 @@
 DocType: Item Attribute,To Range,לטווח
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ניירות ערך ופיקדונות
 DocType: Features Setup,Imports,יבוא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,מליטה הדבקה
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,סה&quot;כ עלים שהוקצו הוא חובה
 DocType: Job Opening,Description of a Job Opening,תיאור של פתיחת איוב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,פעילויות ממתינים להיום
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,נוכחות שיא.
 DocType: Bank Reconciliation,Journal Entries,תנועות יומן
 DocType: Sales Order Item,Used for Production Plan,המשמש לתכנית ייצור
-DocType: System Settings,Loading...,Loading ...
-DocType: DocField,Password,סיסמא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,דוגמנות בתצהיר התמזגה
 DocType: Manufacturing Settings,Time Between Operations (in mins),זמן בין פעולות (בדקות)
 DocType: Customer,Buyer of Goods and Services.,קונה של מוצרים ושירותים.
 DocType: Journal Entry,Accounts Payable,חשבונות לתשלום
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,להוסיף מנויים
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""לא קיים"
 DocType: Pricing Rule,Valid Upto,Upto חוקי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,הכנסה ישירה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,קצין מנהלי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,קצין מנהלי
 DocType: Payment Tool,Received Or Paid,התקבל או שולם
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,אנא בחר חברה
 DocType: Stock Entry,Difference Account,חשבון הבדל
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,קוסמטיקה
-DocType: DocField,Type,סוג
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
-DocType: Communication,Subject,נושא
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 ,Serial No Warranty Expiry,Serial No תפוגה אחריות
@@ -461,8 +420,7 @@
 DocType: Purchase Invoice Item,Item,פריט
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,קבלנות משנה ניהול
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,החדש של אוני 'מישגן לא חייבים להיות של מספר שלם סוג
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,קבלנות משנה ניהול
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ריהוט ומחברים
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,קצב שבו רשימת מחיר המטבע מומר למטבע הבסיס של החברה
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
@@ -474,21 +432,21 @@
 DocType: Production Planning Tool,Material Requirement,דרישת חומר
 DocType: Company,Delete Company Transactions,מחק עסקות חברה
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,פריט {0} לא לרכוש פריט
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} היא כתובת דוא""ל לא חוקית ב'כתובת דוא""ל \ ההודעה '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,"חיוב סה""כ שנה זו:"
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,"חיוב סה""כ שנה זו:"
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","לא יכול למחוק את מספר סידורי {0}, כפי שהוא משמש בעסקות מניות"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),סגירה (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),סגירה (Cr)
 DocType: Serial No,Warranty Period (Days),תקופת אחריות (ימים)
 DocType: Installation Note Item,Installation Note Item,פריט הערה התקנה
 ,Pending Qty,בהמתנה כמות
 DocType: Job Applicant,Thread HTML,אשכול HTML
 DocType: Company,Ignore,התעלם
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS שנשלח למספרים הבאים: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
 DocType: Pricing Rule,Valid From,בתוקף מ
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
@@ -496,7 +454,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** בחתך חודשי ** עוזר לך להפיץ את התקציב שלך על פני חודשים אם יש לך עונתיות בעסק שלך. על חלוקת תקציב באמצעות חלוקה זו, שנקבע בחתך חודשי ** זה ** במרכז העלות ** **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
@@ -504,7 +462,6 @@
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי עופרת
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
-DocType: About Us Settings,Website Manager,מנהל אתר
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,תאריך שנת כספים התחל לא צריך להיות גדול יותר מתאריך שנת הכספים End
 DocType: Warranty Claim,Resolution,רזולוציה
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},נמסר: {0}
@@ -512,25 +469,24 @@
 DocType: Sales Order,Billing and Delivery Status,סטטוס חיוב ומשלוח
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,קודם
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,חזור מכירות
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,בחר הזמנות ומכירות ממנו ברצונך ליצור הזמנות ייצור.
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,רכיבי שכר.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
+DocType: Authorization Rule,Customer or Item,הלקוח או פריט
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,מאגר מידע על לקוחות.
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,מתגלגל
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר, כי כבר עשו כמה עסקה (ים) עם יחידת מידה אחרת. יהיה עליך ליצור פריט חדש לשימוש יחידת מידת ברירת מחדל שונה."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
-DocType: Event,Wednesday,יום רביעי
 DocType: Sales Invoice,Customer's Vendor,הספק של הלקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ייצור להזמין מנדטורי
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,כתיבת הצעה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,כתיבת הצעה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,אדם אחר מכירות {0} קיים עם אותו זיהוי העובד
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
 DocType: Packing Slip Item,DN Detail,פרט DN
@@ -550,20 +506,16 @@
 DocType: Activity Type,Default Costing Rate,דרג תמחיר ברירת מחדל
 DocType: Maintenance Schedule,Maintenance Schedule,לוח זמנים תחזוקה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","חוקים ואז תמחור מסוננים החוצה על בסיס לקוחות, קבוצת לקוחות, טריטוריה, ספק, סוג של ספק, המבצע, שותף מכירות וכו '"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,בבקשה להתקין מודול פייתון dropbox
 DocType: Employee,Passport Number,דרכון מספר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,מנהל
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,מיום קבלת רכישה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,מנהל
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,מיום קבלת רכישה
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
 DocType: SMS Settings,Receiver Parameter,מקלט פרמטר
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""בהתבסס על 'ו' קבוצה על ידי 'אינו יכול להיות זהה"
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ל
-apps/frappe/frappe/templates/base.html +145,Please enter email address,אנא הכנס את כתובת דואר אלקטרוני
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,צינור סוף יצירה
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,להמיר לקבוצה
 DocType: Activity Cost,Activity Type,סוג הפעילות
@@ -571,25 +523,20 @@
 DocType: Customer,Fixed Days,ימים קבועים
 DocType: Sales Invoice,Packing List,רשימת אריזה
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,הזמנות רכש שניתנו לספקים.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,הוצאה לאור
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,הוצאה לאור
 DocType: Activity Cost,Projects User,משתמש פרויקטים
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,נצרך
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} לא נמצא בטבלת פרטי החשבונית
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} לא נמצא בטבלת פרטי החשבונית
 DocType: Company,Round Off Cost Center,לעגל את מרכז עלות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,בקרו תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Material Request,Material Transfer,העברת חומר
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),"פתיחה (ד""ר)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},חותמת זמן פרסום חייבת להיות אחרי {0}
-apps/frappe/frappe/config/setup.py +59,Settings,הגדרות
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,מסים עלות נחתו וחיובים
 DocType: Production Order Operation,Actual Start Time,בפועל זמן התחלה
 DocType: BOM Operation,Operation Time,מבצע זמן
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,יותר
 DocType: Pricing Rule,Sales Manager,מנהל מכירות
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,שינוי שם
 DocType: Journal Entry,Write Off Amount,לכתוב את הסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,כיפוף
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,לאפשר למשתמש
 DocType: Journal Entry,Bill No,ביל לא
 DocType: Purchase Invoice,Quarterly,הרבעונים
 DocType: Selling Settings,Delivery Note Required,תעודת משלוח חובה
@@ -598,17 +545,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,נא להזין את פרטי פריט
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,שיווק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,גז ישר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,שיווק
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,כדי לעקוב אחר פריט במכירות ובמסמכי רכישה מבוססת על nos הסידורי שלהם. זה גם יכול להשתמש כדי לעקוב אחר פרטי אחריות של המוצר.
 DocType: Purchase Receipt Item Supplied,Current Stock,המניה נוכחית
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,מחסן שנדחו הוא חובה נגד פריט regected
 DocType: Account,Expenses Included In Valuation,הוצאות שנכללו בהערכת שווי
 DocType: Employee,Provide email id registered in company,"לספק id הדוא""ל רשום בחברה"
 DocType: Hub Settings,Seller City,מוכר עיר
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
 DocType: Offer Letter Term,Offer Letter Term,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,סוג העץ
@@ -617,14 +563,10 @@
 DocType: Material Request Item,Quantity and Warehouse,כמות ומחסן
 DocType: Sales Invoice,Commission Rate (%),ועדת שיעור (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","נגד שובר סוג חייב להיות אחד מלהזמין מכירות, חשבוניות מכירות או יומן"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,לא ניתן למצוא את שער חליפין
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,התעופה והחלל
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ברוכים הבאים
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,התעופה והחלל
 DocType: Journal Entry,Credit Card Entry,כניסת כרטיס אשראי
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,נושא משימה
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,מוצרים שהתקבלו מספקים.
-DocType: Communication,Open,פתוח
 DocType: Lead,Campaign Name,שם מסע פרסום
 ,Reserved,שמורות
 DocType: Purchase Order,Supply Raw Materials,חומרי גלם אספקה
@@ -633,28 +575,25 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} הוא לא פריט מניות
 DocType: Mode of Payment Account,Default Account,חשבון ברירת מחדל
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
-DocType: Contact Us Settings,Address Title,כותרת כתובת
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
-DocType: Dropbox Backup,Daily,יומי
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,חשבון עם עסקה הקיימת לא ניתן להמיר לדג'ר
 DocType: Delivery Note,Customer's Purchase Order No,להזמין ללא הרכישה של הלקוח
 DocType: Employee,Cell Number,מספר סלולארי
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,בקשות אוטומטיות חומר שנוצרו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,איבדתי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,אנרגיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,אנרגיה
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,הצהרת משכורת חודשית.
 DocType: Item Group,Website Specifications,מפרט אתר
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,חשבון חדש
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,רישומים חשבונאיים יכולים להתבצע נגד צמתים עלה. ערכים נגד קבוצות אינם מורשים.
-DocType: ToDo,High,גבוה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
 DocType: Opportunity,Maintenance,תחזוקה
-DocType: User,Male,זכר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},מספר קבלת רכישה הנדרש לפריט {0}
 DocType: Item Attribute Value,Item Attribute Value,פריט תכונה ערך
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,מבצעי מכירות.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -683,10 +622,9 @@
 DocType: Address,Personal,אישי
 DocType: Expense Claim Detail,Expense Claim Type,סוג תביעת חשבון
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,הגדרות ברירת מחדל עבור עגלת קניות
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","יומן {0} מקושר נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כמקדמה בחשבונית זו."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ביוטכנולוגיה
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","יומן {0} מקושר נגד להזמין {1}, לבדוק אם הוא צריך להיות משך כמקדמה בחשבונית זו."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,ביוטכנולוגיה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,הוצאות משרד תחזוקה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,המינג
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,אנא ראשון להיכנס פריט
 DocType: Account,Liability,אחריות
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
@@ -694,14 +632,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Process Payroll,Send Email,שלח אי-מייל
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את &quot;מלאי עדכון &#39;, כי פריטים אינם מועברים באמצעות {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,מס
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,חשבוניות שלי
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,חשבוניות שלי
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,אף עובדים מצא
 DocType: Purchase Order,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
@@ -720,35 +659,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",כדי לאפשר &quot;נקודת המכירה&quot; תכונות
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
-DocType: Comment,Reference Name,שם התייחסות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: Sales Invoice Item,Target Warehouse,יעד מחסן
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת המכירות
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת המכירות
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
 DocType: Production Order,Item To Manufacture,פריט לייצור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ליהוק עובש קבוע
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} המצב הוא {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,הזמנת רכש לתשלום
 DocType: Sales Order Item,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
 DocType: Newsletter,Newsletter Manager,מנהל עלון
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Item Variant Attribute,Item Variant Attribute,תכונה Variant פריט
 ,Purchase Receipt Trends,מגמות קבלת רכישה
 DocType: Appraisal,Select template from which you want to get the Goals,בחר תבנית שממנה אתה רוצה לקבל את המטרות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,מחקר ופיתוח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,מחקר ופיתוח
 ,Amount to Bill,הסכום להצעת החוק
 DocType: Company,Registration Details,פרטי רישום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,עומס כבד
 DocType: Item,Re-Order Qty,Re-להזמין כמות
 DocType: Leave Block List Date,Leave Block List Date,השאר תאריך בלוק רשימה
 DocType: Pricing Rule,Price or Discount,מחיר או הנחה
@@ -758,18 +694,16 @@
 DocType: Sales Invoice Item,Stock Details,מניית פרטים
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,פרויקט ערך
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,נקודת מכירה
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},לא יכול לשאת קדימה {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","יתרת חשבון כבר בקרדיט, שאינך מורשה להגדרה 'יתרה חייבים להיות' כמו 'חיוב'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","יתרת חשבון כבר בקרדיט, שאינך מורשה להגדרה 'יתרה חייבים להיות' כמו 'חיוב'"
 DocType: Account,Balance must be,איזון חייב להיות
 DocType: Hub Settings,Publish Pricing,פרסם תמחור
 DocType: Notification Control,Expense Claim Rejected Message,הודעת תביעת הוצאות שנדחו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,סִמוּר
 ,Available Qty,כמות זמינה
 DocType: Purchase Taxes and Charges,On Previous Row Total,"בשורה הקודמת סה""כ"
 DocType: Salary Slip,Working Days,ימי עבודה
 DocType: Serial No,Incoming Rate,שערי נכנסים
 DocType: Packing Slip,Gross Weight,משקל ברוטו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.
 DocType: HR Settings,Include holidays in Total no. of Working Days,כולל חגים בסך הכל לא. ימי עבודה
 DocType: Job Applicant,Hold,החזק
 DocType: Employee,Date of Joining,תאריך ההצטרפות
@@ -779,29 +713,28 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,צפה מנויים
 DocType: Purchase Invoice Item,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,פיצוץ שוחקים
 DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,שער חליפין של מטבע שני.
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} חייב להיות פעיל
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
 DocType: Salary Slip,Leave Encashment Amount,השאר encashment הסכום
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},מספר סידורי {0} אינו שייך לפריט {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,חובה כמות
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Production Planning Tool,Production Orders,הזמנות ייצור
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ערך איזון
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,מחיר מחירון מכירות
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,לפרסם לסנכרן פריטים
-DocType: GL Entry,Account Currency,מטבע חשבון
+DocType: Bank Reconciliation,Account Currency,מטבע חשבון
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,נא לציין לעגל חשבון בחברה
 DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
 DocType: Features Setup,Item Barcode,ברקוד פריט
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Address,Shop,חנות
@@ -810,7 +743,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
 DocType: Employee,Permanent Address Is,כתובת קבע
 DocType: Production Order Operation,Operation completed for how many finished goods?,מבצע הושלם לכמה מוצרים מוגמרים?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,המותג
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,המותג
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,הפרשה ליתר {0} חצה לפריט {1}.
 DocType: Employee,Exit Interview Details,פרטי ראיון יציאה
 DocType: Item,Is Purchase Item,האם פריט הרכישה
@@ -829,58 +762,53 @@
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,הכנסות עקיפות
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,סכום תשלום שנקבע = סכום מצטיין
-DocType: Contact Us Settings,Address Line 1,שורת כתובת 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,שונות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,שם חברה
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,שונות
+,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,פריט בחר להעברה
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,הצגת רשימה של כל סרטי וידאו העזרה
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ראש בחר חשבון של הבנק שבו הופקד שיק.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,לאפשר למשתמש לערוך מחירון שיעור בעסקות
 DocType: Pricing Rule,Max Qty,מקס כמות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,כימיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,כימיה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
 DocType: Process Payroll,Select Payroll Year and Month,בחר שכר שנה וחודש
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",עבור לקבוצה המתאימה (בדרך כלל יישום של קרנות&gt; נכסים שוטפים&gt; חשבונות בנק וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) מסוג &quot;בנק&quot;
 DocType: Workstation,Electricity Cost,עלות חשמל
 DocType: HR Settings,Don't send Employee Birthday Reminders,אל תשלחו לעובדי יום הולדת תזכורות
-DocType: Comment,Unsubscribed,רישום בוטל
 DocType: Opportunity,Walk In,ללכת ב
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,עץ של מרכזי עלות finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,הועבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,לבן
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,לבן
 DocType: SMS Center,All Lead (Open),כל עופרת (הפתוח)
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,צרף התמונה שלך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,הפוך
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,צרף התמונה שלך
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,הפוך
 DocType: Journal Entry,Total Amount in Words,סכתי-הכל סכום מילים
-DocType: Workflow State,Stop,להפסיק
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,הייתה שגיאה. סיבה סבירה אחת יכולה להיות שלא שמרת את הטופס. אנא צור קשר עם support@erpnext.com אם הבעיה נמשכת.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,סל הקניות שלי
 DocType: Lead,Next Contact Date,התאריך לתקשר הבא
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,פתיחת כמות
 DocType: Holiday List,Holiday List Name,שם רשימת החג
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,אופציות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
 DocType: Leave Application,Leave Application,החופשה Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,השאר הקצאת כלי
 DocType: Leave Block List,Leave Block List Dates,השאר תאריכי בלוק רשימה
 DocType: Company,If Monthly Budget Exceeded (for expense account),אם תקציב חודשי חריגה (לחשבון הוצאות)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,זמירה
 DocType: Workstation,Net Hour Rate,שערי שעה נטו
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,קבלת רכישת עלות נחתה
 DocType: Company,Default Terms,תנאי ברירת מחדל
 DocType: Packing Slip Item,Packing Slip Item,פריט Slip אריזה
 DocType: POS Profile,Cash/Bank Account,מזומנים / חשבון בנק
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,הגשה
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,דיסקונט
 DocType: Features Setup,Purchase Discounts,הנחות רכישה
 DocType: Workstation,Wages,שכר
@@ -897,7 +825,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Issue,Issue,נושא
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","תכונות לפריט גרסאות. למשל גודל, צבע וכו '"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,חשבון אינו תואם עם חברה
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","תכונות לפריט גרסאות. למשל גודל, צבע וכו '"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,מחסן WIP
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
 DocType: BOM Operation,Operation,מבצע
@@ -905,13 +834,13 @@
 DocType: Tax Rule,Shipping State,מדינת משלוח
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,הוצאות מכירה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,קנייה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,קנייה סטנדרטית
 DocType: GL Entry,Against,נגד
 DocType: Item,Default Selling Cost Center,מרכז עלות מכירת ברירת מחדל
 DocType: Sales Partner,Implementation Partner,שותף יישום
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
 DocType: Opportunity,Contact Info,יצירת קשר
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,מה שהופך את ערכי המלאי
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,מה שהופך את ערכי המלאי
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
 DocType: Item,Default Supplier,ספק ברירת מחדל
 DocType: Manufacturing Settings,Over Production Allowance Percentage,מעל אחוז ההפרשה הפקה
@@ -925,29 +854,27 @@
 DocType: Time Log Batch,updated via Time Logs,מעודכן באמצעות יומני זמן
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
 DocType: Opportunity,Your sales person who will contact the customer in future,איש המכירות שלך שייצור קשר עם הלקוח בעתיד
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,רשימה כמה מהספקים שלך. הם יכולים להיות ארגונים או יחידים.
 DocType: Company,Default Currency,מטבע ברירת מחדל
 DocType: Contact,Enter designation of this Contact,הזן ייעודו של איש קשר זה
-DocType: Contact Us Settings,Address,כתובת
 DocType: Expense Claim,From Employee,מעובדים
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
 DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,תחבורה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,תחבורה
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ושנה:
 DocType: Email Digest,Annual Expense,הוצאה שנתית
 DocType: SMS Center,Total Characters,"סה""כ תווים"
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,פרט C-טופס חשבונית
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,תשלום פיוס חשבונית
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,% תרומה
 DocType: Item,website page link,קישור לדף באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,בואו להכין את המערכת לשימוש ראשון.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,מספרי רישום חברה לעיונך. מספרי מס וכו '
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,בחר יומני זמן ושלח ליצור חשבונית מכירות חדשה.
@@ -967,14 +894,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,מכירות חשבונית מראש
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,שום דבר לא לבקש
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ניהול
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ניהול
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,סוגים של פעילויות לפחי זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ליהוק השקעות
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},כך או סכום חיוב או זיכוי נדרש עבור {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","זה יצורף לקוד הפריט של הגרסה. לדוגמא, אם הקיצור שלך הוא ""SM"", ואת קוד הפריט הוא ""T-shirt"", קוד הפריט של הגרסה יהיה ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,חבילת נקי (במילים) תהיה גלויה ברגע שאתה לשמור את תלוש המשכורת.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,פעיל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,כחול
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,כחול
 DocType: Purchase Invoice,Is Return,האם חזרה
 DocType: Price List Country,Price List Country,מחיר מחירון מדינה
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,צמתים נוספים ניתן ליצור אך ורק תחת צמתים הסוג 'הקבוצה'
@@ -984,50 +909,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},פרופיל קופה {0} כבר נוצר עבור משתמש: {1} והחברה {2}
 DocType: Purchase Order Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ייצור אובייקט רבודה
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,למתוח להרכיב
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,איש המכירות שלך יקבל תזכורת על מועד זה ליצור קשר עם הלקוח
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,מס וניכויי שכר אחרים.
 DocType: Lead,Lead,עופרת
 DocType: Email Digest,Payables,זכאי
 DocType: Account,Warehouse,מחסן
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
 ,Purchase Order Items To Be Billed,פריטים הזמנת רכש לחיוב
 DocType: Purchase Invoice Item,Net Rate,שיעור נטו
 DocType: Purchase Invoice Item,Purchase Invoice Item,לרכוש פריט החשבונית
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,פקודות יומן מניות וGL ערכים הם יפורסמו לקבלות הרכישה נבחרו
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,פריט 1
 DocType: Holiday,Holiday,החג
-DocType: Event,Saturday,יום שבת
 DocType: Leave Control Panel,Leave blank if considered for all branches,שאר ריק אם תיחשב לכל הסניפים
 ,Daily Time Log Summary,סיכום זמן יומן יומי
-DocType: DocField,Label,תווית
 DocType: Payment Reconciliation,Unreconciled Payment Details,פרטי תשלום לא מותאמים
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
 DocType: Lead,Call,שיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'הערכים' לא יכולים להיות ריקים
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,הגדרת עובדים
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","רשת """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,אנא בחר תחילה קידומת
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,מחקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,מחקר
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Contact,User ID,זיהוי משתמש
-DocType: Communication,Sent,נשלח
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,צפה לדג'ר
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
-DocType: Communication,Delivery Status,סטטוס משלוח
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 DocType: Production Order,Manufacture against Sales Order,ייצור נגד להזמין מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,שאר העולם
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
@@ -1038,13 +956,11 @@
 DocType: BOM Item,Item Description,תיאור פריט
 DocType: Payment Tool,Payment Mode,שיטת תשלום
 DocType: Purchase Invoice,Is Recurring,האם חוזר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,sintering לייזר ישיר מתכת
 DocType: Purchase Order,Supplied Items,פריטים שסופקו
 DocType: Production Order,Qty To Manufacture,כמות לייצור
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,לשמור על אותו קצב לאורך כל מחזור הרכישה
 DocType: Opportunity Item,Opportunity Item,פריט הזדמנות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,פתיחה זמנית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,עובד חופשת מאזן
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
 DocType: Address,Address Type,סוג הכתובת
@@ -1060,35 +976,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,קטן
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,קטן
 DocType: Employee,Employee Number,מספר עובדים
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},מקרה לא (ים) כבר בשימוש. נסה מקייס לא {0}
 ,Invoiced Amount (Exculsive Tax),סכום חשבונית (מס Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,פריט 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,ראש חשבון {0} נוצר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ירוק
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ירוק
 DocType: Item,Auto re-order,רכב מחדש כדי
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,"סה""כ הושג"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,"סה""כ הושג"
 DocType: Employee,Place of Issue,מקום ההנפקה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,חוזה
-DocType: Report,Disabled,נכים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,חוזה
+DocType: Email Digest,Add Quote,להוסיף ציטוט
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,חקלאות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,המוצרים או השירותים שלך
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,שם נדרש
 DocType: Purchase Invoice,Recurring Type,סוג חוזר
 DocType: Address,City/Town,עיר / יישוב
 DocType: Email Digest,Annual Income,הכנסה שנתית
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,פריט {0} חייב להיות פריט-נדבק Sub
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ציוד הון
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
@@ -1097,15 +1012,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},מעמד הזמנת ייצור הוא {0}
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה צפוי הוא פחותה ממועד המתוכנן התחל.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,לספקים
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,תאריך אספקה צפוי הוא פחותה ממועד המתוכנן התחל.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,"יוצא סה""כ"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","יכול להיות רק אחד משלוח כלל מצב עם 0 או ערך ריק עבור ""לשווי"""
 DocType: Authorization Rule,Transaction,עסקה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,שים לב: מרכז עלות זו קבוצה. לא יכול לעשות רישומים חשבונאיים כנגד קבוצות.
-apps/frappe/frappe/config/desk.py +7,Tools,כלים
 DocType: Item,Website Item Groups,קבוצות פריט באתר
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,מספר הזמנת ייצור הוא חובה לייצור מטרת כניסת המניה
 DocType: Purchase Invoice,Total (Company Currency),סה&quot;כ (חברת מטבע)
@@ -1113,24 +1027,22 @@
 DocType: Journal Entry,Journal Entry,יומן
 DocType: Workstation,Workstation Name,שם תחנת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
 DocType: Sales Partner,Target Distribution,הפצת יעד
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,תגובות
 DocType: Salary Slip,Bank Account No.,מס 'חשבון הבנק
 DocType: Naming Series,This is the number of the last created transaction with this prefix,זהו המספר של העסקה יצרה האחרונה עם קידומת זו
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},שערי הערכת שווי הנדרשים לפריט {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},שערי הערכת שווי הנדרשים לפריט {0}
 DocType: Quality Inspection Reading,Reading 8,קריאת 8
 DocType: Sales Partner,Agent,סוכן
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","סה&quot;כ {0} עבור כל הפריטים הוא אפס, אתה עלול צריך לשנות &quot;הפץ חיובים מבוסס על&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,חישוב מסים וחיובים
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,חומרה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,חומרה
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,אנא בחר חברה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,זכות Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,אין נתונים
 DocType: Appraisal Template Goal,Appraisal Template Goal,מטרת הערכת תבנית
 DocType: Salary Slip,Earning,להרוויח
 DocType: Payment Tool,Party Account Currency,מפלגת חשבון מטבע
@@ -1140,26 +1052,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,חפיפה בין תנאים מצאו:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,"ערך להזמין סה""כ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,מזון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,מזון
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,טווח הזדקנות 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,אתה יכול לעשות יומן זמן רק נגד הזמנת ייצור שהוגשה
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","עלונים לאנשי קשר, מוביל."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},מטבע של חשבון הסגירה חייב להיות {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},הסכום של נקודות לכל המטרות צריך להיות 100. זה {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,לא ניתן להשאיר את הפעילות ריקה.
 ,Delivered Items To Be Billed,פריטים נמסרו לחיוב
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,מחסן לא ניתן לשנות למס 'סידורי
-DocType: DocField,Description,תיאור
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
-DocType: Letter Head,Is Default,האם ברירת מחדל
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,חשבונאות
 DocType: Features Setup,Features Setup,הגדרת תכונות
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,מכתב הצעת צפה
-DocType: Communication,Communication,תקשורת
 DocType: Item,Is Service Item,האם פריט השירות
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
 DocType: Activity Cost,Projects,פרויקטים
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,אנא בחר שנת כספים
 DocType: BOM Operation,Operation Description,תיאור מבצע
@@ -1177,7 +1086,7 @@
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
 DocType: Leave Control Panel,Leave blank if considered for all designations,שאר ריק אם תיחשב לכל הכינויים
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},מקס: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,מDatetime
 DocType: Email Digest,For Company,לחברה
@@ -1187,7 +1096,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1201,28 +1110,25 @@
 DocType: HR Settings,Employee Settings,הגדרות עובד
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,כדי לעשות את רשימה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Apprentice
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,כמות שלילית אינה מותרת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Apprentice
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,כמות שלילית אינה מותרת
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",שולחן פירוט מס לכת מהפריט שני כמחרוזת ומאוחסן בתחום זה. משמש למסים וחיובים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,ננעץ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","אם החשבון הוא קפוא, ערכים מותרים למשתמשים מוגבלים."
 DocType: Email Digest,Bank Balance,עובר ושב
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,אין מבנה שכר פעיל נמצא עבור עובד {0} והחודש
 DocType: Job Opening,"Job profile, qualifications required etc.","פרופיל תפקיד, כישורים נדרשים וכו '"
 DocType: Journal Entry Account,Account Balance,יתרת חשבון
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,כלל מס לעסקות.
 DocType: Rename Tool,Type of document to rename.,סוג של מסמך כדי לשנות את השם.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,אנחנו קונים פריט זה
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,אנחנו קונים פריט זה
 DocType: Address,Billing,חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,לא נשלח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,נפץ יוצרים
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"סה""כ מסים וחיובים (מטבע חברה)"
 DocType: Shipping Rule,Shipping Account,חשבון משלוח
 DocType: Quality Inspection,Readings,קריאות
 DocType: Stock Entry,Total Additional Costs,עלויות נוספות סה&quot;כ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,הרכבות תת
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,הרכבות תת
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Supplier,Stock Manager,מניית מנהל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
@@ -1232,101 +1138,93 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,אנליסט
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום JV {2}
 DocType: Item,Inventory,מלאי
 DocType: Features Setup,"To enable ""Point of Sale"" view",כדי לאפשר &quot;נקודת מכירה&quot; תצוגה
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,תשלום לא יכול להתבצע על עגלה ריקה
 DocType: Item,Sales Details,פרטי מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,תולה
 DocType: Opportunity,With Items,עם פריטים
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,בכמות
 DocType: Notification Control,Expense Claim Rejected,תביעה נדחתה חשבון
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",התאריך שבו החשבונית הבאה תופק. הוא נוצר על שליחה.
 DocType: Item Attribute,Item Attribute,תכונה פריט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ממשלה
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,גרסאות פריט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ממשלה
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),"סה""כ ({0})"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),"סה""כ ({0})"
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 DocType: Sales Invoice,Source,מקור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,תאריך כספי לשנה שהתחל
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,תאריך כספי לשנה שהתחל
 DocType: Employee External Work History,Total Experience,"ניסיון סה""כ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip אריזה (ים) בוטל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Material Request Item,Sales Order No,להזמין ללא מכירות
 DocType: Item Group,Item Group Name,שם קבוצת פריט
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,לקחתי
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,העברת חומרים לייצור
 DocType: Pricing Rule,For Price List,למחירון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,חיפוש הנהלה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,חיפוש הנהלה
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","שער רכישה עבור פריט: {0} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
 DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: Purchase Invoice Item,Net Amount,סכום נטו
 DocType: Purchase Order Item Supplied,BOM Detail No,פרט BOM לא
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),סכום הנחה נוסף (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},שגיאה: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},שגיאה: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,צור חשבון חדש מתרשים של חשבונות.
 DocType: Maintenance Visit,Maintenance Visit,תחזוקה בקר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,לקוחות> קבוצת לקוחות> טריטוריה
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,אצווה זמין כמות במחסן
 DocType: Time Log Batch Detail,Time Log Batch Detail,פרט אצווה הזמן התחבר
-DocType: Workflow State,Tasks,משימות
 DocType: Landed Cost Voucher,Landed Cost Help,עזרה עלות נחתה
-DocType: Event,Tuesday,יום שלישי
 DocType: Leave Block List,Block Holidays on important days.,חגים בלוק בימים חשובים.
 ,Accounts Receivable Summary,חשבונות חייבים סיכום
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
 DocType: UOM,UOM Name,שם של אוני 'מישגן
-DocType: Top Bar Item,Target,יעד
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,סכום תרומה
 DocType: Sales Invoice,Shipping Address,כתובת למשלוח
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,כלי זה עוזר לך לעדכן או לתקן את הכמות והערכת שווי של המניה במערכת. הוא משמש בדרך כלל כדי לסנכרן את ערכי המערכת ומה בעצם קיים במחסנים שלך.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,במילים יהיו גלוי לאחר שתשמרו את תעודת המשלוח.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,אדון מותג.
-DocType: ToDo,Due Date,תאריך יעד
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,אדון מותג.
 DocType: Sales Invoice Item,Brand Name,שם מותג
 DocType: Purchase Receipt,Transporter Details,פרטי Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,תיבה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,הארגון
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,תיבה
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,הארגון
 DocType: Monthly Distribution,Monthly Distribution,בחתך חודשי
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,מקלט רשימה ריקה. אנא ליצור מקלט רשימה
 DocType: Production Plan Sales Order,Production Plan Sales Order,הפקת תכנית להזמין מכירות
 DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},כניסה לחשבונאות {0} יכולה להתבצע רק במטבע: {1}
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,חֵרוּק
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,בקשת חומר להזמנת רכש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,חשבונות בנק
 ,Bank Reconciliation Statement,הצהרת בנק פיוס
 DocType: Address,Lead Name,שם עופרת
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,יתרת מלאי פתיחה
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,יתרת מלאי פתיחה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} חייבים להופיע רק פעם אחת
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},אסור לי תשלומי העברה יותר {0} מ {1} נגד הזמנת רכש {2}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,אין פריטים לארוז
 DocType: Shipping Rule Condition,From Value,מערך
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,סכומים שלא באו לידי ביטוי בבנק
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,סכומים שלא באו לידי ביטוי בבנק
 DocType: Quality Inspection Reading,Reading 4,קריאת 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,תביעות לחשבון חברה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ליהוק צנטריפוגלי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,גמר סייע שדה מגנטי
 DocType: Company,Default Holiday List,ברירת מחדל רשימת Holiday
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,התחייבויות מניות
 DocType: Purchase Receipt,Supplier Warehouse,מחסן ספק
 DocType: Opportunity,Contact Mobile No,לתקשר נייד לא
 DocType: Production Planning Tool,Select Sales Orders,בחר הזמנות ומכירות
 ,Material Requests for which Supplier Quotations are not created,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,כדי לעקוב אחר פריטים באמצעות ברקוד. תוכל להיכנס לפריטים בתעודת משלוח וחשבונית מכירות על ידי סריקת הברקוד של פריט.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,סמן כנמסר
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,סמן כנמסר
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,הפוך הצעת מחיר
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
@@ -1334,31 +1232,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} צפה
 DocType: Salary Structure Deduction,Salary Structure Deduction,ניכוי שכר מבנה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,sintering לייזר סלקטיבי
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,יבוא מוצלח!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),גיל (ימים)
 DocType: Quotation Item,Quotation Item,פריט ציטוט
 DocType: Account,Account Name,שם חשבון
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,מתאריך לא יכול להיות גדול יותר מאשר תאריך
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,לא {0} כמות סידורי {1} לא יכולה להיות חלק
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,סוג ספק אמן.
 DocType: Purchase Order Item,Supplier Part Number,"ספק מק""ט"
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,להוסיף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,שער המרה לא יכול להיות 0 או 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} יבוטל או הפסיק
 DocType: Accounts Settings,Credit Controller,בקר אשראי
 DocType: Delivery Note,Vehicle Dispatch Date,תאריך שיגור רכב
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,קבלת רכישת {0} לא תוגש
 DocType: Company,Default Payable Account,חשבון זכאים ברירת מחדל
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","הגדרות לעגלת קניות מקוונות כגון כללי משלוח, מחירון וכו '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,התקנה מלאה
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% שחויבו
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,שמורות כמות
 DocType: Party Account,Party Account,חשבון המפלגה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,משאבי אנוש
 DocType: Lead,Upper Income,עליון הכנסה
 DocType: Journal Entry Account,Debit in Company Currency,חיוב בחברת מטבע
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,הנושאים שלי
@@ -1367,12 +1261,9 @@
 DocType: Company,Default Values,ערכי ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,שורת {0}: סכום לתשלום לא יכול להיות שלילי
 DocType: Expense Claim,Total Amount Reimbursed,הסכום כולל החזר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,ראוי לחץ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
 DocType: Payment Reconciliation,Payments,תשלומים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic החם לחיצה
-DocType: ToDo,Medium,בינוני
 DocType: Budget Detail,Budget Allocated,תקציב שהוקצה
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
@@ -1381,12 +1272,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,עדכון מועדי תשלום בנק עם כתבי עת.
 DocType: Quotation,Term Details,פרטי טווח
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
 DocType: Warranty Claim,Warranty Claim,הפעיל אחריות
 ,Lead Details,פרטי עופרת
-DocType: Authorization Rule,Approving User,משתמש אישור
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,זיוף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ציפוי
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
 DocType: Pricing Rule,Applicable For,ישים ל
 DocType: Bank Reconciliation,From Date,מתאריך
@@ -1408,64 +1296,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),הסכום ששולם (חברת מטבע)
 DocType: Purchase Invoice,Additional Discount,הנחה נוסף
 DocType: Selling Settings,Selling Settings,מכירת הגדרות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,מכירות פומביות באינטרנט
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,נא לציין גם כמות או דרגו את ההערכה או שניהם
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","חברה, חודש ושנת כספים הוא חובה"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,יחידה אחת של פריט.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',זמן יומן אצווה {0} חייב להיות 'הוגש'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,הפוך חשבונאות כניסה לכל מנית תנועה
 DocType: Leave Allocation,Total Leaves Allocated,"סה""כ עלים מוקצבות"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},מחסן נדרש בשורה לא {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,נא להזין פיננסית בתוקף השנה תאריכי ההתחלה וסיום
 DocType: Employee,Date Of Retirement,מועד הפרישה
 DocType: Upload Attendance,Get Template,קבל תבנית
 DocType: Address,Postal,דואר
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,כרייה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ליהוק שרף
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,אנא בחר {0} הראשון.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},טקסט {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},טקסט {0}
 DocType: Territory,Parent Territory,טריטורית הורה
 DocType: Quality Inspection Reading,Reading 2,קריאת 2
 DocType: Stock Entry,Material Receipt,קבלת חומר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,מוצרים
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,מוצרים
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},מפלגת סוג והמפלגה נדרש לבקל / חשבון זכאים {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","אם פריט זה יש גרסאות, אז זה לא יכול להיות שנבחר בהזמנות וכו &#39;"
 DocType: Lead,Next Contact By,לתקשר בא על ידי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},מחסן {0} לא ניתן למחוק ככמות קיימת עבור פריט {1}
 DocType: Quotation,Order Type,סוג להזמין
 DocType: Purchase Invoice,Notification Email Address,"כתובת דוא""ל להודעות"
 DocType: Payment Tool,Find Invoices to Match,מצא את חשבוניות להתאימו
 ,Item-wise Sales Register,פריט חכם מכירות הרשמה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","""הבנק הלאומי XYZ"" למשל"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","""הבנק הלאומי XYZ"" למשל"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,האם מס זה כלול ביסוד שיעור?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,"יעד סה""כ"
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,"יעד סה""כ"
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,סל קניות מופעל
 DocType: Job Applicant,Applicant for a Job,מועמד לעבודה
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,אין הזמנות ייצור שנוצרו
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,תלוש משכורת של עובד {0} כבר יצר לחודש זה
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,תלוש משכורת של עובד {0} כבר יצר לחודש זה
 DocType: Stock Reconciliation,Reconciliation JSON,הפיוס JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Sales Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ראשי
-DocType: DocPerm,Delete,מחק
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},חדש {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,לא ניתן לבטל הזמנה הפסיקה. מגופה כדי לבטל.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
 DocType: Sales Team,Contribution to Net Total,"תרומה לנטו סה""כ"
 DocType: Sales Invoice Item,Customer's Item Code,קוד הפריט של הלקוח
 DocType: Stock Reconciliation,Stock Reconciliation,מניית פיוס
@@ -1474,53 +1360,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,מועמד לעבודה.
 DocType: Purchase Order Item,Warehouse and Reference,מחסן והפניה
 DocType: Supplier,Statutory info and other general information about your Supplier,מידע סטטוטורי ומידע כללי אחר על הספק שלך
-DocType: Country,Country,מדינה
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,כתובות
-DocType: Communication,Received,קיבלתי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},לשכפל מספר סידורי נכנס לפריט {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,תנאי עבור כלל משלוח
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,פריט אינו מותר לי הזמנת ייצור.
-DocType: DocField,Attach Image,צרף תמונה
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),משקל נטו של חבילה זו. (מחושב באופן אוטומטי כסכום של משקל נטו של פריטים)
-DocType: Stock Reconciliation Item,Leave blank if no change,שאר ריק אם לא יחולו שינוי
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,יומני זמן לייצור.
 DocType: Item,Apply Warehouse-wise Reorder Level,החל המחסן-חכמה להזמנה חוזרת רמה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,זמן יומן למשימות.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,תשלום
 DocType: Production Order Operation,Actual Time and Cost,זמן ועלות בפועל
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},בקשת חומר של מקסימום {0} יכולה להתבצע עבור פריט {1} נגד להזמין מכירות {2}
 DocType: Employee,Salutation,שְׁאֵילָה
-DocType: Communication,Rejected,נדחה
 DocType: Pricing Rule,Brand,מותג
 DocType: Item,Will also apply for variants,תחול גם לגרסות
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Sales Order Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
 DocType: Quality Inspection Reading,Reading 10,קריאת 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","רשימת המוצרים שלך או שירותים שאתה לקנות או למכור. הקפד לבדוק את קבוצת הפריט, יחידת המידה ונכסים אחרים בעת ההפעלה."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","רשימת המוצרים שלך או שירותים שאתה לקנות או למכור. הקפד לבדוק את קבוצת הפריט, יחידת המידה ונכסים אחרים בעת ההפעלה."
 DocType: Hub Settings,Hub Node,רכזת צומת
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,אתה נכנס פריטים כפולים. אנא לתקן ונסה שוב.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ערך {0} לתכונת {1} אינו קיים ברשימת הפריט תקף ערכי תכונה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,חבר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,חבר
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,פריט {0} הוא לא פריט בהמשכים
 DocType: SMS Center,Create Receiver List,צור מקלט רשימה
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,פג תוקף
 DocType: Packing Slip,To Package No.,חבילת מס '
-DocType: DocType,System,מערכת
 DocType: Warranty Claim,Issue Date,תאריך הנפקה
 DocType: Activity Cost,Activity Cost,עלות פעילות
 DocType: Purchase Receipt Item Supplied,Consumed Qty,כמות הנצרכת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,תקשורת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,תקשורת
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),מציין כי החבילה היא חלק ממשלוח (רק טיוטה) זה
 DocType: Payment Tool,Make Payment Entry,הפוך כניסת תשלום
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},כמות לפריט {0} חייבת להיות פחות מ {1}
 ,Sales Invoice Trends,מגמות חשבונית מכירות
 DocType: Leave Application,Apply / Approve Leaves,החל / אישור עלים
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,בשביל ש
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"יכול להתייחס שורה רק אם סוג תשלום הוא 'בסכום הקודם שורה' או 'שורה סה""כ קודמת """
 DocType: Sales Order Item,Delivery Warehouse,מחסן אספקה
 DocType: Stock Settings,Allowance Percent,אחוז הקצבה
@@ -1532,33 +1413,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","מכירה חייבת להיבדק, אם לישים שנבחרה הוא {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,פריט הצעת המחיר של ספק
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,הפוך שכר מבנה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,גְזִיזָה
 DocType: Item,Has Variants,יש גרסאות
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,לחץ על כפתור 'הפוך מכירות חשבונית' כדי ליצור חשבונית מכירות חדשה.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,אריזה וסימון
 DocType: Monthly Distribution,Name of the Monthly Distribution,שמו של החתך החודשי
 DocType: Sales Person,Parent Sales Person,איש מכירות הורה
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,נא לציין מטבע ברירת מחדל בחברת מאסטר וברירות מחדלים גלובלית
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox גישה חשאי
 DocType: Purchase Invoice,Recurring Invoice,חשבונית חוזרת
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ניהול פרויקטים
 DocType: Supplier,Supplier of Goods or Services.,ספק של מוצרים או שירותים.
 DocType: Budget Detail,Fiscal Year,שנת כספים
 DocType: Cost Center,Budget,תקציב
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,הושג
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,הושג
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,שטח / לקוחות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,לדוגמא 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,לדוגמא 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,במילים יהיו גלוי ברגע שאתה לשמור את חשבונית המכירות.
 DocType: Item,Is Sales Item,האם פריט מכירות
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,פריט עץ הקבוצה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,פריט {0} הוא לא התקנה למס סידורי. בדוק אדון פריט
 DocType: Maintenance Visit,Maintenance Time,תחזוקת זמן
 ,Amount to Deliver,הסכום לאספקת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,מוצר או שירות
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,היו שגיאות.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,הקשה
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,מוצר או שירות
 DocType: Naming Series,Current Value,ערך נוכחי
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} נוצר
 DocType: Delivery Note Item,Against Sales Order,נגד להזמין מכירות
@@ -1570,15 +1446,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
 DocType: Website Item Group,Website Item Group,קבוצת פריט באתר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,חובות ומסים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,נא להזין את תאריך הפניה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,נא להזין את תאריך הפניה
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},לא יכולים להיות מסוננים {0} ערכי תשלום על ידי {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,שולחן לפריט שיוצג באתר אינטרנט
 DocType: Purchase Order Item Supplied,Supplied Qty,כמות שסופק
 DocType: Material Request Item,Material Request Item,פריט בקשת חומר
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,עץ של קבוצות פריט.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,עץ של קבוצות פריט.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
 ,Item-wise Purchase History,היסטוריה רכישת פריט-חכם
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,אדום
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,אדום
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
@@ -1587,11 +1463,10 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,שינוי של אוני 'מישגן לפריט.
 DocType: Quality Inspection Reading,Acceptance Criteria,קריטריונים לקבלה
 DocType: Item Attribute,Attribute Name,שם תכונה
 DocType: Item Group,Show In Website,הצג באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,קבוצה
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,קבוצה
 DocType: Task,Expected Time (in hours),זמן צפוי (בשעות)
 ,Qty to Order,כמות להזמנה
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","כדי לעקוב אחר מותג בהערה המסמכים הבאים משלוח, הזדמנות, בקשת חומר, פריט, הזמנת רכש, רכישת השובר, קבלת רוכש, הצעת המחיר, מכירות חשבונית, מוצרי Bundle, להזמין מכירות, מספר סידורי"
@@ -1600,78 +1475,67 @@
 DocType: Holiday List,Clear Table,לוח ברור
 DocType: Features Setup,Brands,מותגים
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,מהזמנת הרכש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,מהזמנת הרכש
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","השאר לא ניתן ליישם / בוטל לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
 DocType: Activity Cost,Costing Rate,דרג תמחיר
 ,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר
 DocType: Employee,Resignation Letter Date,תאריך מכתב התפטרות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,כללי תמחור מסוננים נוסף המבוססים על כמות.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,לא הוגדר
-DocType: Communication,Date,תאריך
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,הכנסות לקוח חוזרות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,לשבת בשקט בזמן שהמערכת שלך היא להיות הגדרה. זה עלול לקחת כמה רגעים.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) חייב להיות 'מאשר מהוצאות' תפקיד
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,זוג
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,זוג
 DocType: Bank Reconciliation Detail,Against Account,נגד חשבון
 DocType: Maintenance Schedule Detail,Actual Date,תאריך בפועל
 DocType: Item,Has Batch No,יש אצווה לא
 DocType: Delivery Note,Excise Page Number,בלו מספר העמוד
 DocType: Employee,Personal Details,פרטים אישיים
 ,Maintenance Schedules,לוחות זמנים תחזוקה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,הבלטות
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","כהפקה להזמין יכול להתבצע עבור פריט זה, זה חייב להיות פריט במלאי."
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,הצטרפות
-DocType: Authorization Rule,Above Value,מעל הערך
 ,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
 DocType: Purchase Order,Delivered,נמסר
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"התקנת שרת הנכנס לid הדוא""ל של מקומות עבודה. (למשל jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
 DocType: Journal Entry,Accounts Receivable,חשבונות חייבים
 ,Supplier-Wise Sales Analytics,ספק-Wise Analytics המכירות
 DocType: Address Template,This format is used if country specific format is not found,פורמט זה משמש אם פורמט ספציפי למדינה לא נמצא
-DocType: Custom Field,Custom,מותאם אישית
 DocType: Production Order,Use Multi-Level BOM,השתמש Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,הזרקה
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,עץ של חשבונות finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים
 DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ מבוסס על
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"חשבון {0} חייב להיות מסוג 'נכסים קבועים ""כפריט {1} הוא פריט רכוש"
 DocType: HR Settings,HR Settings,הגדרות HR
-apps/frappe/frappe/config/setup.py +130,Printing,הדפסה
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,היום (ים) שבו אתם פונים לקבלת חופשה הוא חופשה. אתה לא צריך להגיש בקשה לחופשה.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ו
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ספורט
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,"סה""כ בפועל"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,יחידה
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,אנא הגדר מקשי גישת Dropbox בconfig האתר שלך
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,יחידה
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,נא לציין את החברה
 ,Customer Acquisition and Loyalty,לקוחות רכישה ונאמנות
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,מחסן שבו אתה שומר מלאי של פריטים דחו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,השנה שלך הפיננסית מסתיימת ב
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,השנה שלך הפיננסית מסתיימת ב
 DocType: POS Profile,Price List,מחיר מחירון
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} הוא כעת ברירת מחדל שנת כספים. רענן את הדפדפן שלך כדי שהשינוי ייכנס לתוקף.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,תביעות חשבון
 DocType: Issue,Support,תמיכה
-DocType: Authorization Rule,Approving Role,אישור תפקיד
 ,BOM Search,חיפוש BOM
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,נא לציין את מטבע בחברה
 DocType: Workstation,Wages per hour,שכר לשעה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},איזון המניה בתצווה {0} יהפוך שלילי {1} לפריט {2} במחסן {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","תכונות הצג / הסתר כמו מס 'סידורי, וכו' קופה"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,בעקבות בקשות חומר הועלה באופן אוטומטי המבוסס על הרמה מחדש כדי של הפריט
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},תאריך חיסול לא יכול להיות לפני בדיקת תאריך בשורת {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},תאריך חיסול לא יכול להיות לפני בדיקת תאריך בשורת {0}
 DocType: Salary Slip,Deduction,ניכוי
 DocType: Address Template,Address Template,תבנית כתובת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
@@ -1683,76 +1547,68 @@
 DocType: Opportunity,Quotation,הצעת מחיר
 DocType: Salary Slip,Total Deduction,סך ניכוי
 DocType: Quotation,Maintenance User,משתמש תחזוקה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,עלות עדכון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,עלות עדכון
 DocType: Employee,Date of Birth,תאריך לידה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,פריט {0} הוחזר כבר
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** שנת כספים ** מייצגת שנת כספים. כל הרישומים החשבונאיים ועסקות גדולות אחרות מתבצעים מעקב נגד שנת כספים ** **.
 DocType: Opportunity,Customer / Lead Address,לקוחות / כתובת עופרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,תיאור התפקיד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,תיאור התפקיד
 DocType: Purchase Order Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,אנא בחר קובץ CSV תקף עם הנתונים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ציפוי
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","עקוב אחר מסעות פרסום מכירות. עקוב אחר הובלות, הצעות מחיר, להזמין מכירות וכו 'ממסעות הפרסום כדי לאמוד את ההחזר על השקעה."
 DocType: Expense Claim,Approver,מאשר
 ,SO Qty,SO כמות
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות את המחסן"
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Supplier Quotation,Manufacturing Manager,ייצור מנהל
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
-apps/erpnext/erpnext/hooks.py +84,Shipments,משלוחים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,דפוס טובלים
-DocType: Purchase Order,To be delivered to customer,שיימסר ללקוח
+apps/erpnext/erpnext/hooks.py +68,Shipments,משלוחים
+DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,סטטוס זמן יומן יש להגיש.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,הגדרה
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,# שורה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,# שורה
 DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע)
 DocType: Pricing Rule,Supplier,ספק
 DocType: C-Form,Quarter,רבעון
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,הוצאות שונות
 DocType: Global Defaults,Default Company,חברת ברירת מחדל
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
 DocType: Employee,Bank Name,שם בנק
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,משתמש {0} אינו זמין
 DocType: Leave Application,Total Leave Days,"ימי חופשה סה""כ"
-DocType: Journal Entry Account,Credit in Account Currency,אשראי במטבע חשבון
 DocType: Email Digest,Note: Email will not be sent to disabled users,הערה: דואר אלקטרוני לא יישלח למשתמשים בעלי מוגבלויות
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
-DocType: DocField,Name,שם
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,סכומים שלא באו לידי ביטוי במערכת
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},להזמין מכירות הנדרשים לפריט {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,סכומים שלא באו לידי ביטוי במערכת
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,אחרים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,אחרים
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.
 DocType: POS Profile,Taxes and Charges,מסים והיטלים ש
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","מוצר או שירות שהוא קנה, מכר או החזיק במלאי."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"לא ניתן לבחור סוג תשלום כ'בסכום שורה הקודם ""או"" בסך הכל שורה הקודם 'לשורה הראשונה"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,הושלם
-DocType: Web Form,Select DocType,DOCTYPE בחר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,קידוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,בנקאות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,בנקאות
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,אנא לחץ על 'צור לוח זמנים' כדי לקבל לוח זמנים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,מרכז עלות חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,מרכז עלות חדש
 DocType: Bin,Ordered Quantity,כמות מוזמנת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","לדוגמא: ""לבנות כלים לבונים"""
 DocType: Quality Inspection,In Process,בתהליך
 DocType: Authorization Rule,Itemwise Discount,Itemwise דיסקונט
 DocType: Purchase Order Item,Reference Document Type,התייחסות סוג המסמך
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
 DocType: Account,Fixed Asset,רכוש קבוע
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,מלאי בהמשכים
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,מלאי בהמשכים
 DocType: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 DocType: Time Log Batch,Total Billing Amount,סכום חיוב סה&quot;כ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,חשבון חייבים
@@ -1760,19 +1616,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,להזמין מכירות לתשלום
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,זמן יומנים שנוצרו:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Employee,Blood Group,קבוצת דם
 DocType: Purchase Invoice Item,Page Break,מעבר עמוד
 DocType: Production Order Operation,Pending,ממתין ל
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,משתמשים שיכולים לאשר בקשות החופשה של עובד ספציפי
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,אתה לא יכול לשנות את ברירת מחדל של יחידת מידת Variant. כדי לשנות יחידת מידת ברירת מחדל עבור יחידת מידת שינוי ברירת מחדל Variant של התבנית
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,ציוד משרדי
 DocType: Purchase Invoice Item,Qty,כמות
 DocType: Fiscal Year,Companies,חברות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,אלקטרוניקה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,אלקטרוניקה
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,להעלות בקשת חומר כאשר המלאי מגיע לרמה מחדש כדי
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,מתחזוקה לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,משרה מלאה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,משרה מלאה
 DocType: Purchase Invoice,Contact Details,פרטי
 DocType: C-Form,Received Date,תאריך קבלה
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
@@ -1784,14 +1640,15 @@
 DocType: Job Applicant,Job Opening,פתיחת עבודה
 DocType: Payment Reconciliation,Payment Reconciliation,פיוס תשלום
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,טכנולוגיה
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,טכנולוגיה
 DocType: Offer Letter,Offer Letter,להציע מכתב
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,צור בקשות חומר (MRP) והזמנות ייצור.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,"סה""כ חשבונית Amt"
 DocType: Time Log,To Time,לעת
+DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","כדי להוסיף צמתים ילד, לחקור עץ ולחץ על הצומת תחתיו ברצונך להוסיף עוד צמתים."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
 DocType: Production Order Operation,Completed Qty,כמות שהושלמה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
@@ -1801,12 +1658,10 @@
 DocType: Item,Customer Item Codes,קודי פריט לקוחות
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,צור ערכי תשלום כנגד הזמנות או חשבוניות.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ריתוך
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,החדש במלאי של אוני 'מישגן נדרש
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,כל הפריטים כבר בחשבונית
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',נא לציין חוקי 'מתיק מס' '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
 DocType: Features Setup,Item Serial Nos,מס 'סידורי פריט
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,משתמשים והרשאות
@@ -1816,15 +1671,13 @@
 DocType: Bin,Actual Quantity,כמות בפועל
 DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,מספר סידורי {0} לא נמצאו
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,הלקוחות שלך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,דפוס דחיסה
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,הלקוחות שלך
 DocType: Leave Block List Date,Block Date,תאריך בלוק
 DocType: Sales Order,Not Delivered,לא נמסר
 ,Bank Clearance Summary,סיכום עמילות בנק
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","יצירה וניהול של מעכל דוא""ל יומי, שבועית וחודשית."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,קוד פריט> קבוצת פריט> מותג
 DocType: Appraisal Goal,Appraisal Goal,מטרת הערכה
-DocType: Event,Friday,יום שישי
 DocType: Time Log,Costing Amount,סכום תמחיר
 DocType: Process Payroll,Submit Salary Slip,שלח שכר Slip
 DocType: Salary Structure,Monthly Earning & Deduction,צבירה וניכוי חודשי
@@ -1832,16 +1685,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,יבוא בתפזורת
 DocType: Sales Partner,Address & Contacts,כתובת ומגעים
 DocType: SMS Log,Sender Name,שם שולח
-DocType: Page,Title,כותרת
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,התאמה אישית של
 DocType: POS Profile,[Select],[בחר]
 DocType: SMS Log,Sent To,נשלח ל
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,הפוך מכירות חשבונית
 DocType: Company,For Reference Only.,לעיון בלבד.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},לא חוקי {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},לא חוקי {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,מראש הסכום
 DocType: Manufacturing Settings,Capacity Planning,תכנון קיבולת
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""מתאריך"" נדרש"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""מתאריך"" נדרש"
 DocType: Journal Entry,Reference Number,מספר ההתייחסות
 DocType: Employee,Employment Details,פרטי תעסוקה
 DocType: Employee,New Workplace,חדש במקום העבודה
@@ -1856,7 +1707,7 @@
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,נסיעות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,נסיעות
 DocType: Leave Block List,Allow Users,אפשר למשתמשים
 DocType: Purchase Order,Customer Mobile No,לקוחות ניידים לא
 DocType: Sales Invoice,Recurring,חוזר
@@ -1864,23 +1715,21 @@
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,לאפשר Stock שלילי
 DocType: Installation Note,Installation Note,הערה התקנה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,להוסיף מסים
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,להוסיף מסים
 ,Financial Analytics,Analytics הפיננסי
 DocType: Quality Inspection,Verified By,מאומת על ידי
 DocType: Address,Subsidiary,חברת בת
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","לא ניתן לשנות את ברירת המחדל של המטבע של החברה, כי יש עסקות קיימות. עסקות יש לבטל לשנות את מטבע ברירת המחדל."
 DocType: Quality Inspection,Purchase Receipt No,קבלת רכישה לא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,דְמֵי קְדִימָה
-DocType: System Settings,In Hours,בשעות
 DocType: Process Payroll,Create Salary Slip,צור שכר Slip
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,מאזן צפוי לפי בנק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,צִחצוּחַ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,מאזן צפוי לפי בנק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),מקור הכספים (התחייבויות)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
 DocType: Appraisal,Employee,עובד
@@ -1893,15 +1742,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,קבוצה על ידי שובר
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,הנדרש על
 DocType: Sales Invoice,Mass Mailing,תפוצה המונית
-DocType: Page,Standard,סטנדרטי
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,תשלומי הצג
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,גודל
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,לוח זמנים תחזוקת {0} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,תרופות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,תרופות
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,עלות של פריטים שנרכשו
 DocType: Selling Settings,Sales Order Required,סדר הנדרש מכירות
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,צור לקוח
@@ -1911,30 +1758,25 @@
 DocType: Quality Inspection Reading,Reading 9,קריאת 9
 DocType: Supplier,Is Frozen,האם קפוא
 DocType: Buying Settings,Buying Settings,הגדרות קנייה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,גמר המוני
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM מס לפריט טוב מוגמר
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),"התקנת שרת הנכנס לid הדוא""ל של מכירות. (למשל sales@example.com)"
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Tool,Payment Account,חשבון תשלומים
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,טיוטה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Off המפצה
 DocType: Quality Inspection Reading,Accepted,קיבלתי
-DocType: User,Female,נקבה
-DocType: Journal Entry Account,Debit in Account Currency,חיוב במטבע חשבון
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
-DocType: Print Settings,Modern,מודרני
-DocType: Communication,Replied,ענה
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
 DocType: Payment Tool,Total Payment Amount,"סכום תשלום סה""כ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 DocType: Newsletter,Test,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","כמו שיש עסקות מלאי קיימות עבור פריט זה, \ אתה לא יכול לשנות את הערכים של &#39;יש מספר סידורי&#39;, &#39;יש אצווה לא&#39;, &#39;האם פריט במלאי &quot;ו-&quot; שיטת הערכה &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,מהיר יומן
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
@@ -1942,17 +1784,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,התקנה מלאה
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","כניסת חשבונאות קפואה עד למועד זה, אף אחד לא יכול לעשות / לשנות כניסה מלבד התפקיד שיפורט להלן."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,סטטוס פרויקט
 DocType: UOM,Check this to disallow fractions. (for Nos),לבדוק את זה כדי לאסור שברים. (למס)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,רשימת תפוצה עלון
 DocType: Delivery Note,Transporter Name,שם Transporter
+DocType: Authorization Rule,Authorized Value,ערך מורשה
 DocType: Contact,Enter department to which this Contact belongs,הזן מחלקה שלקשר זה שייך
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,"סה""כ נעדר"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,יְחִידַת מִידָה
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,יְחִידַת מִידָה
 DocType: Fiscal Year,Year End Date,תאריך סיום שנה
 DocType: Task Depends On,Task Depends On,המשימה תלויה ב
 DocType: Lead,Opportunity,הזדמנות
@@ -1963,7 +1805,7 @@
 DocType: Email Digest,How frequently?,באיזו תדירות?
 DocType: Purchase Receipt,Get Current Stock,קבל המניה נוכחית
 apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,עץ של הצעת החוק של חומרים
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
 DocType: Production Order,Actual End Date,תאריך סיום בפועל
 DocType: Authorization Rule,Applicable To (Role),כדי ישים (תפקיד)
 DocType: Stock Entry,Purpose,מטרה
@@ -1973,16 +1815,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),שיעור בסיסי (כמו לכל מניית יחידת מידה)
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,פירסינג
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
 DocType: Customer Group,Has Child Node,יש ילד צומת
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","הזן הפרמטרים url סטטי כאן (לדוגמא. שולח = ERPNext, שם משתמש = ERPNext, סיסמא = 1234 וכו ')"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} לא בכל שנת כספים פעילה. לפרטים נוספים לבדוק {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,זה אתר דוגמא שנוצר אוטומטית מERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,טווח הזדקנות 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,עיבוד פוטו
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2004,11 +1845,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","תבנית מס סטנדרטית שיכול להיות מיושמת על כל עסקות הרכישה. תבנית זו יכולה להכיל רשימה של ראשי מס וגם ראשי חשבון אחרים כמו ""משלוח"", ""ביטוח"", ""טיפול ב"" וכו '#### הערה שיעור המס שאתה מגדיר כאן יהיה שיעור המס האחיד לכל פריטים ** * *. אם יש פריטים ** ** שיש לי שיעורים שונים, הם חייבים להיות הוסיפו במס הפריט ** ** שולחן ב** ** הפריט השני. #### תיאור של עמודות סוג חישוב 1.: - זה יכול להיות בסך הכל ** ** נטו (כלומר הסכום של סכום בסיסי). - ** בסך הכל / סכום השורה הקודמת ** (למסים או חיובים מצטברים). אם תבחר באפשרות זו, המס יחול כאחוז מהשורה הקודמת (בטבלת המס) הסכום כולל או. - ** ** בפועל (כאמור). 2. ראש חשבון: פנקס החשבון שתחתיו מס זה יהיה להזמין מרכז עלות 3.: אם המס / תשלום הוא הכנסה (כמו משלוח) או הוצאה שיש להזמין נגד מרכז עלות. 4. תיאור: תיאור של המס (שיודפס בחשבוניות / ציטוטים). 5. שיעור: שיעור מס. 6. סכום: סכום מס. 7. סך הכל: סך הכל מצטבר לנקודה זו. 8. הזן Row: אם המבוסס על ""שורה הקודמת סה""כ"" אתה יכול לבחור את מספר השורה שיילקח כבסיס לחישוב זה (ברירת מחדל היא השורה הקודמת). 9. קח מס או תשלום עבור: בחלק זה אתה יכול לציין אם המס / תשלום הוא רק עבור הערכת שווי (לא חלק מסך הכל) או רק לכולל (אינו מוסיף ערך לפריט) או לשניהם. 10. להוסיף או לנכות: בין אם ברצונך להוסיף או לנכות את המס."
-DocType: Note,Note,הערה
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
-DocType: Email Account,Email Ids,דוא&quot;ל המזהים
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -2016,40 +1855,36 @@
 DocType: Journal Entry,Credit Note,כְּתַב זְכוּיוֹת
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},כמות שהושלמה לא יכולה להיות יותר מ {0} לפעולת {1}
 DocType: Features Setup,Quality,איכות
-DocType: Contact Us Settings,Introduction,מבוא
 DocType: Warranty Claim,Service Address,כתובת שירות
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,לצילומי פיוס מקס 100 שורות.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,לצילומי פיוס מקס 100 שורות.
 DocType: Stock Entry,Manufacture,ייצור
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,אנא משלוח הערה ראשון
 DocType: Purchase Invoice,Currency and Price List,מטבע ומחיר מחירון
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם עופרת
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,תאריך חיסול לא הוזכר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,הפקה
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,תאריך חיסול לא הוזכר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,הפקה
 DocType: Item,Allow Production Order,לאפשר הפקה להזמין
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
 DocType: Installation Note Item,Installed Qty,כמות מותקנת
 DocType: Lead,Fax,פקס
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,הוגש
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,הכתובות שלי
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,אדון סניף ארגון.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,או
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,הוצאות שירות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-מעל
 DocType: Buying Settings,Default Buying Price List,מחיר מחירון קניית ברירת מחדל
-,Download Backups,גיבויים להורדה
 DocType: Notification Control,Sales Order Message,להזמין הודעת מכירות
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ערכי ברירת מחדל שנקבעו כמו חברה, מטבע, שנת כספים הנוכחית, וכו '"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,סוג תשלום
 DocType: Process Payroll,Select Employees,עובדים בחרו
 DocType: Bank Reconciliation,To Date,לתאריך
 DocType: Opportunity,Potential Sales Deal,דיל מכירות פוטנציאליות
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,פרטים
 DocType: Purchase Invoice,Total Taxes and Charges,"סה""כ מסים וחיובים"
 DocType: Employee,Emergency Contact,צור קשר עם חירום
 DocType: Item,Quality Parameters,מדדי איכות
@@ -2064,6 +1899,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,לא / אצווה סידוריים
 DocType: Product Bundle,Parent Item,פריט הורה
 DocType: Account,Account Type,סוג החשבון
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,השאר סוג {0} אינו יכולים להיות מועבר-לבצע
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
@@ -2071,32 +1907,27 @@
 DocType: Bin,Reserved Quantity,כמות שמורות
 DocType: Landed Cost Voucher,Purchase Receipt Items,פריטים קבלת רכישה
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,טפסי התאמה אישית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,חיתוך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,משטח
 DocType: Account,Income Account,חשבון הכנסות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,דפוס
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
 DocType: Item Reorder,Material Request Type,סוג בקשת חומר
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,שורת {0}: יחידת מידת המרת פקטור הוא חובה
-apps/frappe/frappe/desk/moduleview.py +61,Documents,מסמכים
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,"נ""צ"
 DocType: Cost Center,Cost Center,מרכז עלות
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,# שובר
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# שובר
 DocType: Notification Control,Purchase Order Message,הזמנת רכש Message
 DocType: Tax Rule,Shipping Country,מדינה משלוח
 DocType: Upload Attendance,Upload HTML,ההעלאה HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","מראש סה""כ ({0}) נגד להזמין {1} לא יכול להיות גדול \ מ Grand סה""כ ({2})"
 DocType: Employee,Relieving Date,תאריך להקלה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,מחסן ניתן לשנות רק באמצעות צילומים כניסה / תעודת משלוח / קבלת רכישה
 DocType: Employee Education,Class / Percentage,כיתה / אחוז
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ראש אגף השיווק ומכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,מס הכנסה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,לייזר מהונדס עיצוב נקי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ראש אגף השיווק ומכירות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,מס הכנסה
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","אם שלטון תמחור שנבחר הוא עשה עבור 'מחיר', זה יחליף את מחיר מחירון. מחיר כלל תמחור הוא המחיר הסופי, ולכן אין עוד הנחה צריכה להיות מיושמת. מכאן, בעסקות כמו מכירה להזמין, הזמנת רכש וכו ', זה יהיה הביא בשדה' דרג ', ולא בשדה' מחיר מחירון שערי '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,מסלול מוביל לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
@@ -2104,10 +1935,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
-DocType: User,Bio,ביו
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,שם מרכז העלות חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,שם מרכז העלות חדש
 DocType: Leave Control Panel,Leave Control Panel,השאר לוח הבקרה
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,אין תבנית כתובת ברירת מחדל מצאה. אנא ליצור אחד חדש מהגדרה> הדפסה ומיתוג> תבנית כתובת.
 DocType: Appraisal,HR User,משתמש HR
@@ -2119,45 +1949,38 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
 DocType: Supplier,Billing Currency,מטבע חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,גדול במיוחד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,גדול במיוחד
 ,Profit and Loss Statement,דוח רווח והפסד
 DocType: Bank Reconciliation Detail,Cheque Number,מספר המחאה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,לחיצה
 DocType: Payment Tool Detail,Payment Tool Detail,פרט כלי תשלום
 ,Sales Browser,דפדפן מכירות
 DocType: Journal Entry,Total Credit,"סה""כ אשראי"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,מקומי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),הלוואות ומקדמות (נכסים)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,חייבים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,גדול
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,אף עובדים מצא!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,גדול
 DocType: C-Form Invoice Detail,Territory,שטח
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
 DocType: Purchase Order,Customer Address Display,תצוגת כתובת הלקוח
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,פוליש
 DocType: Production Order Operation,Planned Start Time,מתוכנן זמן התחלה
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,גיליון קרוב מאזן ורווח או הפסד ספר.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","ברירת מחדל של יחידת מדידה לפריט {0} לא ניתן לשנות באופן ישיר משום \ יש לך כבר עשה כמה עסקה (ים) עם עוד יחידת מידה. כדי לשנות יחידת מידת ברירת מחדל, שימוש \ &#39;יחידת מידה החלף שירות&#39; כלי תחת מודול המלאי."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ציין שער חליפין להמיר מטבע אחד לעוד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ציטוט {0} יבוטל
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ציטוט {0} יבוטל
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,סכום חוב סך הכל
 DocType: Sales Partner,Targets,יעדים
 DocType: Price List,Price List Master,מחיר מחירון Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
 ,S.O. No.,SO מס '
 DocType: Production Order Operation,Make Time Log,הפוך זמן התחבר
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,אנא הגדר כמות הזמנה חוזרת
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,מחשבים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,אלקטרו-כימית שחיקה
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,מדובר בקבוצת לקוחות שורש ולא ניתן לערוך.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,אנא התקנת לוח החשבונות שלך לפני שאתה מתחיל רישומים חשבונאיים
 DocType: Purchase Invoice,Ignore Pricing Rule,התעלם כלל תמחור
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,בוטל
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,מתאריך בשכר מבנה לא יכול להיות פחותה מתאריך הצטרפות עובדים.
 DocType: Employee Education,Graduate,בוגר
 DocType: Leave Block List,Block Days,ימי בלוק
@@ -2182,7 +2005,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","בדקו אם חוזר חשבונית, בטלו להפסיק חוזר או לשים תאריך סיום הולם"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
 DocType: Packing Slip,If more than one package of the same type (for print),אם חבילה אחד או יותר מאותו הסוג (להדפסה)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,{0} שורות המרביות מוותרות
 DocType: C-Form Invoice Detail,Net Total,"סה""כ נקי"
 DocType: Bin,FCFS Rate,FCFS שערי
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),חיוב (חשבונית מכירות)
@@ -2199,20 +2021,19 @@
 DocType: Maintenance Visit,Purposes,מטרות
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","מבצע {0} יותר מכל שעות עבודה זמינות בתחנת העבודה {1}, לשבור את הפעולה לפעולות מרובות"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,עיבוד אלקטרוכימי
 ,Requested,ביקשתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,אין הערות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,איחור
 DocType: Account,Stock Received But Not Billed,המניה התקבלה אבל לא חויבה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,חשבון שורש חייב להיות קבוצה
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,"סכום ברוטו + חבילת חוֹב הסכום + encashment - ניכוי סה""כ"
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Features Setup,Sales and Purchase,מכירות ורכש
 DocType: Supplier Quotation Item,Material Request No,בקשת חומר לא
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,קצב שבו לקוחות של מטבע מומר למטבע הבסיס של החברה
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} היו מנויים בהצלחה מרשימה זו.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),שיעור נטו (חברת מטבע)
-apps/frappe/frappe/templates/base.html +134,Added,נוסף
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,ניהול עץ טריטוריה.
 DocType: Journal Entry Account,Sales Invoice,חשבונית מכירות
 DocType: Journal Entry Account,Party Balance,מאזן המפלגה
@@ -2226,11 +2047,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,שנת כספים {0} לא מצאה.
 DocType: Bank Reconciliation,Get Relevant Entries,קבל ערכים רלוונטיים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,כניסה לחשבונאות במלאי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,הַטבָּעָה
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
-apps/frappe/frappe/desk/query_report.py +136,Total,"סה""כ"
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
 DocType: Account,Root Type,סוג השורש
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},# השורה {0}: לא יכול לחזור יותר מ {1} לפריט {2}
@@ -2240,14 +2059,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),סכום מס לאחר סכום דיסקונט (חברת מטבע)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},מחסן היעד הוא חובה עבור שורת {0}
 DocType: Quality Inspection,Quality Inspection,איכות פיקוח
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ריסוס יוצרים
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,קטן במיוחד
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL או BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,רמת מלאי מינימאלית
 DocType: Stock Entry,Subcontract,בקבלנות משנה
@@ -2258,12 +2076,11 @@
 DocType: Item,Manufacturer Part Number,"מק""ט יצרן"
 DocType: Production Order Operation,Estimated Time and Cost,זמן ועלות משוערים
 DocType: Bin,Bin,סל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,מרחרח
 DocType: SMS Log,No of Sent SMS,לא של SMS שנשלח
 DocType: Account,Company,חברה
 DocType: Account,Expense Account,חשבון הוצאות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,תוכנה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,צבע
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,תוכנה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,צבע
 DocType: Maintenance Visit,Scheduled,מתוכנן
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,בחר בחתך חודשי להפיץ בצורה לא אחידה על פני מטרות חודשים.
@@ -2276,23 +2093,21 @@
 DocType: Installation Note Item,Against Document No,נגד מסמך לא
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,ניהול שותפי מכירות.
 DocType: Quality Inspection,Inspection Type,סוג הפיקוח
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},אנא בחר {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},אנא בחר {0}
 DocType: C-Form,C-Form No,C-טופס לא
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,חוקר
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,עדכון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,חוקר
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,אנא שמור עלון לפני השליחה
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,שם או דוא&quot;ל הוא חובה
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,בדיקת איכות נכנסת.
 DocType: Purchase Order Item,Returned Qty,כמות חזר
 DocType: Employee,Exit,יציאה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,סוג השורש הוא חובה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,סוג השורש הוא חובה
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,מספר סידורי {0} נוצר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,גמר רטט
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","לנוחות לקוחות, ניתן להשתמש בקודים אלה בפורמטי הדפסה כמו הערות חשבוניות ומשלוח"
 DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
 DocType: Sales Invoice,Advertisement,פרסומת
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,תקופת ניסיון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,תקופת ניסיון
 DocType: Customer Group,Only leaf nodes are allowed in transaction,רק צמתים עלה מותר בעסקה
 DocType: Expense Claim,Expense Approver,מאשר חשבון
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
@@ -2300,43 +2115,39 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,לDatetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,טחינה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,פסיכולוג גלישה
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,פעילויות ממתינות ל
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,אישר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ספק> סוג ספק
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,נא להזין את הקלת מועד.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,בחר שנת כספים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,התכה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,פרידה שכר על בסיס צבירה וניכוי.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,חשבון עם בלוטות ילד לא יכול להיות מומר לדג'ר
 DocType: Address,Preferred Shipping Address,כתובת למשלוח מועדף
 DocType: Purchase Receipt Item,Accepted Warehouse,מחסן מקובל
 DocType: Bank Reconciliation Detail,Posting Date,תאריך פרסום
 DocType: Item,Valuation Method,שיטת הערכת שווי
 DocType: Sales Invoice,Sales Team,צוות מכירות
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,כניסה כפולה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,כניסה כפולה
 DocType: Serial No,Under Warranty,במסגרת אחריות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,הון סיכון
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,הון סיכון
 DocType: UOM,Must be Whole Number,חייב להיות מספר שלם
 DocType: Leave Control Panel,New Leaves Allocated (In Days),עלים חדשים המוקצים (בימים)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,מספר סידורי {0} אינו קיימות
 DocType: Pricing Rule,Discount Percentage,אחוז הנחה
 DocType: Payment Reconciliation Invoice,Invoice Number,מספר חשבונית
-apps/erpnext/erpnext/hooks.py +70,Orders,הזמנות
+apps/erpnext/erpnext/hooks.py +54,Orders,הזמנות
 DocType: Leave Control Panel,Employee Type,סוג העובד
 DocType: Employee Leave Approver,Leave Approver,השאר מאשר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,חומר הועבר לייצור
 DocType: Expense Claim,"A user with ""Expense Approver"" role","משתמש עם תפקיד ""הוצאות מאשר"""
 ,Issued Items Against Production Order,פריטים שהוצאו נגד להזמין הפקה
@@ -2348,7 +2159,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,תקופה לא חוקית
 DocType: Customer,Credit Limit,מגבלת אשראי
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,בחר סוג העסקה
 DocType: GL Entry,Voucher No,שובר לא
@@ -2358,11 +2168,10 @@
 DocType: Customer,Address and Contact,כתובת ולתקשר
 DocType: Customer,Last Day of the Next Month,היום האחרון של החודש הבא
 DocType: Employee,Feedback,משוב
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,שימור. לוח זמנים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,עיבוד סילון שיוף
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,שימור. לוח זמנים
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
-DocType: Website Settings,Website Settings,הגדרות אתר
 DocType: Item,Reorder level based on Warehouse,רמת הזמנה חוזרת המבוסס על מחסן
 DocType: Activity Cost,Billing Rate,דרג חיוב
 ,Qty to Deliver,כמות לאספקה
@@ -2373,20 +2182,19 @@
 DocType: Material Request,Requested For,ביקש ל
 DocType: Quotation Item,Against Doctype,נגד Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,עקוב אחר תעודת משלוח זה נגד כל פרויקט
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,חשבון שורש לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,חשבון שורש לא ניתן למחוק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ערכי Stock הצג
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},# התייחסות {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ניהול כתובות
 DocType: Pricing Rule,Item Code,קוד פריט
 DocType: Production Planning Tool,Create Production Orders,צור הזמנות ייצור
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
-DocType: Communication,Phone,טלפון
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),"סגירה (ד""ר)"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),"סגירה (ד""ר)"
 DocType: Contact,Passive,פסיבי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,תבנית מס לעסקות מכירה.
@@ -2402,10 +2210,9 @@
 ,Billed Amount,סכום חיוב
 DocType: Bank Reconciliation,Bank Reconciliation,בנק פיוס
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,קבל עדכונים
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,הוסף כמה תקליטי מדגם
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,בקשת חומר {0} בוטלה או נעצרה
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,הוסף כמה תקליטי מדגם
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,השאר ניהול
-DocType: Event,Groups,קבוצות
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,קבוצה על ידי חשבון
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
 DocType: Lead,Lower Income,הכנסה נמוכה
@@ -2414,39 +2221,36 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,עזרה מהירה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
 DocType: Features Setup,Sales Extras,תוספות מכירות
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} תקציב לחשבון {1} נגד מרכז עלות {2} יעלה על ידי {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} תקציב לחשבון {1} נגד מרכז עלות {2} יעלה על ידי {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 DocType: Warranty Claim,From Company,מחברה
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ערך או כמות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,דקות
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,דקות
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
 ,Qty to Receive,כמות לקבלת
 DocType: Leave Block List,Leave Block List Allowed,השאר בלוק רשימת מחמד
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,גורם המרה לא יכול להיות שבברים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,תוכל להשתמש בו להתחברות
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,תוכל להשתמש בו להתחברות
 DocType: Sales Partner,Retailer,הקמעונאית
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,כל סוגי הספק
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,בנק משייך יתר חשבון
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,הפוך שכר Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,העיון BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,הלוואות מובטחות
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,מוצרים מדהים
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,מוצרים מדהים
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,הון עצמי יתרה פתיחה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,לא יכול לאשר חופשה כמו שאתה לא מוסמך לאשר עלים על תאריכי בלוק
 DocType: Appraisal,Appraisal,הערכה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ליהוק איבד-קצף
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ציור
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,התאריך חוזר על עצמו
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,מורשה חתימה
 DocType: Hub Settings,Seller Email,"דוא""ל מוכר"
 DocType: Project,Total Purchase Cost (via Purchase Invoice),עלות רכישה כוללת (באמצעות רכישת חשבונית)
 DocType: Workstation Working Hour,Start Time,זמן התחלה
@@ -2460,12 +2264,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),סכום נטו (חברת מטבע)
 DocType: BOM Operation,Hour Rate,שעה שערי
 DocType: Stock Settings,Item Naming By,פריט מתן שמות על ידי
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,מהצעת המחיר
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,מהצעת המחיר
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},עוד כניסת סגירת תקופת {0} נעשתה לאחר {1}
 DocType: Production Order,Material Transferred for Manufacturing,חומר הועבר לייצור
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,חשבון {0} אינו קיים
 DocType: Purchase Receipt Item,Purchase Order Item No,לרכוש פריט לא להזמין
-DocType: System Settings,System Settings,הגדרות מערכת
 DocType: Project,Project Type,סוג פרויקט
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,כך או סכום כמות היעד או המטרה הוא חובה.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,עלות של פעילויות שונות
@@ -2474,50 +2277,43 @@
 DocType: Purchase Invoice Item,PR Detail,פרט יחסי הציבור
 DocType: Sales Order,Fully Billed,שחויב במלואו
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,מזומן ביד
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},מחסן אספקה הנדרש לפריט המניה {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},מחסן אספקה הנדרש לפריט המניה {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),המשקל הכולל של החבילה. בדרך כלל משקל נטו + משקל חומרי אריזה. (להדפסה)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,משתמשים עם תפקיד זה מותר להגדיר חשבונות קפוא וליצור / לשנות רישומים חשבונאיים נגד חשבונות מוקפאים
 DocType: Serial No,Is Cancelled,האם בוטל
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,המשלוחים שלי
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,המשלוחים שלי
 DocType: Journal Entry,Bill Date,תאריך ביל
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Supplier,Supplier Details,פרטי ספק
-DocType: Communication,Recipients,מקבלי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,דופק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,סטטוס אישור
 DocType: Hub Settings,Publish Items to Hub,לפרסם פריטים לHub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},מהערך חייב להיות פחות משווי בשורת {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,העברה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,אנא בחר חשבון בנק
 DocType: Newsletter,Create and Send Newsletters,ידיעונים ליצור ולשלוח
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,מתאריך חייב להיות לפני תאריך כדי
 DocType: Sales Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Item Group,Check this if you want to show in website,לבדוק את זה אם אתה רוצה להראות באתר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ברוכים הבאים לERPNext
+,Welcome to ERPNext,ברוכים הבאים לERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,מספר פרטי שובר
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,להוביל להצעת המחיר
 DocType: Lead,From Customer,מלקוחות
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,שיחות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,שיחות
 DocType: Project,Total Costing Amount (via Time Logs),הסכום כולל תמחיר (דרך זמן יומנים)
 DocType: Purchase Order Item Supplied,Stock UOM,המניה של אוני 'מישגן
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
 ,Projected,צפוי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},מספר סידורי {0} אינו שייך למחסן {1}
-apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ועל-הזמנה לפריט {0} ככמות או כמות היא 0
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,הערה: מערכת לא תבדוק על-אספקה ועל-הזמנה לפריט {0} ככמות או כמות היא 0
 DocType: Notification Control,Quotation Message,הודעת ציטוט
 DocType: Issue,Opening Date,תאריך פתיחה
 DocType: Journal Entry,Remark,הערה
 DocType: Purchase Receipt Item,Rate and Amount,שיעור והסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,משעמם
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,מלהזמין מכירות
-DocType: Blog Category,Parent Website Route,הורה אתר כביש
 DocType: Sales Order,Not Billed,לא חויב
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,אין אנשי קשר הוסיפו עדיין.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,לא פעיל
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,הסכום שובר עלות נחתה
 DocType: Time Log,Batched for Billing,לכלך לחיוב
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,הצעות חוק שהועלה על ידי ספקים.
@@ -2525,19 +2321,16 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,סכום הנחה
 DocType: Purchase Invoice,Return Against Purchase Invoice,חזור נגד רכישת חשבונית
 DocType: Item,Warranty Period (in days),תקופת אחריות (בימים)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"למשל מע""מ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"למשל מע""מ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,פריט 4
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,גז מתכת חם להרכיב
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
 DocType: Sales Invoice Item,Delivered Qty,כמות נמסרה
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,מחסן {0}: החברה היא חובה
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",עבור לקבוצה המתאימה (בדרך כלל מקור כספים&gt; התחייבויות שוטפות&gt; מסים וחובות וליצור חשבון חדש (על ידי לחיצה על הוסף לילדים) של &quot;מס&quot; סוג ולעשות להזכיר את שיעור המס.
 ,Payment Period Based On Invoice Date,תקופת תשלום מבוסס בתאריך החשבונית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,חיתוך לייזר
-DocType: Event,Monday,יום שני
 DocType: Journal Entry,Stock Entry,מניית כניסה
 DocType: Account,Payable,משתלם
 DocType: Salary Slip,Arrear Amount,סכום חוֹב
@@ -2550,7 +2343,6 @@
 DocType: Lead,Address Desc,כתובת יורד
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast אחד למכור או לקנות יש לבחור
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,איפה פעולות ייצור מתבצעות.
-DocType: Page,All,כל
 DocType: Stock Entry Detail,Source Warehouse,מחסן מקור
 DocType: Installation Note,Installation Date,התקנת תאריך
 DocType: Employee,Confirmation Date,תאריך אישור
@@ -2558,9 +2350,8 @@
 DocType: Account,Sales User,משתמש מכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,דקות כמות לא יכולה להיות גדולה יותר מכמות מקס
 DocType: Stock Entry,Customer or Supplier Details,פרטי לקוח או ספק
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,הגדר
 DocType: Lead,Lead Owner,בעלי עופרת
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,המחסן נדרש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,המחסן נדרש
 DocType: Employee,Marital Status,מצב משפחתי
 DocType: Stock Settings,Auto Material Request,בקשת Auto חומר
 DocType: Time Log,Will be updated when billed.,יעודכן כאשר חיוב.
@@ -2574,43 +2365,39 @@
 DocType: Territory,Territory Targets,מטרות שטח
 DocType: Delivery Note,Transporter Info,Transporter מידע
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,לרכוש פריט להזמין מסופק
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,שם חברה לא יכול להיות חברה
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ראשי מכתב לתבניות הדפסה.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,כותרות לתבניות הדפסה למשל פרופורמה חשבונית.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
 DocType: POS Profile,Update Stock,בורסת עדכון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,אנא למשוך פריטים מתעודת המשלוח
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","שיא של כל התקשורת של דואר אלקטרוני מסוג, טלפון, צ&#39;אט, ביקור, וכו &#39;"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,נא לציין מרכז העלות לעגל בחברה
 DocType: Purchase Invoice,Terms,תנאים
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,צור חדש
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,צור חדש
 DocType: Buying Settings,Purchase Order Required,הזמנת רכש דרוש
 ,Item-wise Sales History,היסטוריה מכירות פריט-חכמה
 DocType: Expense Claim,Total Sanctioned Amount,"הסכום אושר סה""כ"
 ,Purchase Analytics,Analytics רכישה
 DocType: Sales Invoice Item,Delivery Note Item,פריט תעודת משלוח
 DocType: Expense Claim,Task,משימה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,גילוח
 DocType: Purchase Taxes and Charges,Reference Row #,# ההתייחסות Row
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},מספר אצווה הוא חובה עבור פריט {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,זה איש מכירות שורש ולא ניתן לערוך.
 ,Stock Ledger,המניה דג'ר
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},שיעור: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},שיעור: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ניכוי תלוש משכורת
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,הערות
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,בחר צומת קבוצה ראשונה.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,מלא את הטופס ולשמור אותו
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,הורד דוח המכיל את כל חומרי הגלם עם מצב המלאי האחרון שלהם
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,מול
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,פורום הקהילה
 DocType: Leave Application,Leave Balance Before Application,השאר מאזן לפני היישום
 DocType: SMS Center,Send SMS,שלח SMS
 DocType: Company,Default Letter Head,ברירת מחדל מכתב ראש
 DocType: Time Log,Billable,לחיוב
-DocType: Authorization Rule,This will be used for setting rule in HR module,זה ישמש לקביעת כלל במודול HR
 DocType: Account,Rate at which this tax is applied,קצב שבו מס זה מיושם
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,סדר מחדש כמות
 DocType: Company,Stock Adjustment Account,חשבון התאמת המניה
@@ -2621,12 +2408,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,הזדמנות אבודה
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","דיסקונט שדות יהיו זמינים בהזמנת רכש, קבלת רכישה, רכישת חשבונית"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,שם חשבון חדש. הערה: נא לא ליצור חשבונות ללקוחות וספקים
-DocType: Report,Report Type,סוג הדוח
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM החלף כלי
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,תבניות כתובת ברירת מחדל חכם ארץ
 DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,התפרקות מס הצג
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,נתוני יבוא ויצוא
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',אם כרוך בפעילות ייצור. מאפשר פריט 'מיוצר'
@@ -2636,16 +2421,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,אחוז ההקצאה צריכה להיות שווה ל- 100%
 DocType: Serial No,Out of AMC,מתוך AMC
 DocType: Purchase Order Item,Material Request Detail No,פרטי בקשת חומר לא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,מפנה קשה
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,הפוך תחזוקה בקר
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה צפויה של
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',נא להזין את 'תאריך אספקה צפויה של
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,תעודות משלוח {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,הסכום ששולם + לכתוב את הסכום לא יכול להיות גדול יותר מסך כולל
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} הוא לא מספר אצווה תקף לפריט {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","הערה: אם תשלום לא נעשה נגד כל התייחסות, להפוך את תנועת היומן ידני."
 DocType: Item,Supplier Items,פריטים ספק
 DocType: Opportunity,Opportunity Type,סוג ההזדמנות
@@ -2657,64 +2441,56 @@
 DocType: Hub Settings,Publish Availability,פרסם זמינים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,מניית הזדקנות
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' אינו זמין
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' אינו זמין
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,קבע כלהרחיב
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,"שלח דוא""ל אוטומטית למגעים על עסקות הגשת."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","שורת {0}: כמות לא avalable במחסן {1} על {2} {3}. כמות זמינה: {4}, העבר את הכמות: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,פריט 3
 DocType: Purchase Order,Customer Contact Email,דוא&quot;ל ליצירת קשר של לקוחות
-DocType: Event,Sunday,יום ראשון
 DocType: Sales Team,Contribution (%),תרומה (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,אחריות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"הערה: כניסת תשלום לא יצרה מאז ""מזומן או חשבון הבנק 'לא צוין"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,אחריות
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,נא להזין atleast חשבונית 1 בטבלה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,הוסף משתמשים
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,הוסף משתמשים
 DocType: Pricing Rule,Item Group,קבוצת פריט
 DocType: Task,Actual Start Date (via Time Logs),תאריך התחלה בפועל (באמצעות זמן יומנים)
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
 DocType: Item,Default BOM,BOM ברירת המחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
 DocType: Time Log Batch,Total Hours,"סה""כ שעות"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,רכב
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,הפריט נדרש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,הזרקת מתכת
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,רכב
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,מתעודת משלוח
 DocType: Time Log,From Time,מזמן
 DocType: Notification Control,Custom Message,הודעה מותאמת אישית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,בנקאות השקעות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","בחר את המדינה, אזור הזמן ומטבע"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,בנקאות השקעות
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
 DocType: Purchase Invoice,Price List Exchange Rate,מחיר מחירון שער חליפין
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,כְּבִישָׁה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,יציקות חול
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,גלוון
 DocType: Purchase Invoice Item,Rate,שיעור
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
-DocType: Newsletter,A Lead with this email id should exist," ליד עם  דוא""ל זה צריך להתקיים"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
+DocType: Newsletter,A Lead with this email id should exist,"ליד עם  דוא""ל זה צריך להתקיים"
 DocType: Stock Entry,From BOM,מBOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,בסיסי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,בסיסי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,לתאריך צריך להיות זהה מתאריך לחופשה חצי יום
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מ תאריך לידה
 DocType: Salary Structure,Salary Structure,שכר מבנה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","כלל מחיר מרובה קיים באותם קריטריונים, אנא לפתור \ סכסוך על ידי הקצאת עדיפות. כללי מחיר: {0}"
 DocType: Account,Bank,בנק
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,חומר נושא
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 DocType: Hub Settings,Access Token,גישת אסימון
@@ -2723,45 +2499,37 @@
 DocType: Item,Is Fixed Asset Item,האם פריט רכוש קבוע
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","אם יש לך פורמטי הדפסה ארוכים, תכונה זו יכולה לשמש כדי לפצל את הדף שיודפס על דפים רבים עם כל הכותרות העליונות והתחתונות בכל עמוד"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,כל השטחים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 DocType: Fiscal Year,Year Name,שם שנה
 DocType: Process Payroll,Process Payroll,שכר תהליך
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
 DocType: Purchase Invoice Item,Image View,צפה בתמונה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,גימור וגימור תעשייתי
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,קידוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ניפוח
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
 DocType: Tax Rule,Shipping City,משלוח עיר
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"פריט זה הנו נגזר של {0} (תבנית). תכונות תועתק על מהתבנית אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Account,Purchase User,משתמש רכישה
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,פטיש
-DocType: Web Page,Slideshow,מצגת
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,תבנית כתובת ברירת מחדל לא ניתן למחוק
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
 DocType: Journal Entry,Print Heading,כותרת הדפסה
 DocType: Quotation,Maintenance Manager,מנהל אחזקה
-DocType: Workflow State,Search,חיפוש
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,"סה""כ לא יכול להיות אפס"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,מספר הימים מההזמנה האחרונה 'חייב להיות גדול או שווה לאפס
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,הלחמה
 DocType: C-Form,Amended From,תוקן מ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,חומר גלם
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,חומר גלם
 DocType: Leave Application,Follow via Email,"עקוב באמצעות דוא""ל"
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,חשבון ילד קיים עבור חשבון זה. אתה לא יכול למחוק את החשבון הזה.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,כך או כמות היעד או סכום היעד היא חובה
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
 DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
@@ -2770,42 +2538,40 @@
 ,Produced,מיוצר
 DocType: Item,Item Code for Suppliers,קוד פריט לספקים
 DocType: Issue,Raised By (Email),"הועלה על ידי (דוא""ל)"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,כללי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,צרף מכתבים
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,כללי
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,צרף מכתבים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"לא ניתן לנכות כאשר לקטגוריה 'הערכה' או 'הערכה וסה""כ'"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#39;, הם צריכים להיות שמות ייחודיים) ושיעורי הסטנדרטים שלהם. זה יהיה ליצור תבנית סטנדרטית, שבו אתה יכול לערוך ולהוסיף עוד מאוחר יותר."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#39;, הם צריכים להיות שמות ייחודיים) ושיעורי הסטנדרטים שלהם. זה יהיה ליצור תבנית סטנדרטית, שבו אתה יכול לערוך ולהוסיף עוד מאוחר יותר."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
 DocType: Journal Entry,Bank Entry,בנק כניסה
 DocType: Authorization Rule,Applicable To (Designation),כדי ישים (ייעוד)
-DocType: Blog Post,Blog Post,בלוג הודעה
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,קבוצה על ידי
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,הפעלה / השבתה של מטבעות.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,הוצאות דואר
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),"סה""כ (AMT)"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,בידור ופנאי
 DocType: Purchase Order,The date on which recurring order will be stop,המועד שבו על מנת חוזר יהיה לעצור
 DocType: Quality Inspection,Item Serial No,מספר סידורי פריט
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} חייב להיות מופחת על ידי {1} או שאתה צריך להגדיל את סובלנות הגלישה
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,"הווה סה""כ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,שעה
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,שעה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,העברת חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,העברת חומר לספקים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,צור הצעת מחיר
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},יכול להיות מאושר על ידי {0}
 DocType: Shipping Rule,Shipping Rule Conditions,משלוח תנאי Rule
 DocType: BOM Replace Tool,The new BOM after replacement,BOM החדש לאחר החלפה
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,קרלינג
 DocType: Account,Tax,מס
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},השורה {0}: {1} היא לא חוקית {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,זיקוק
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},השורה {0}: {1} היא לא חוקית {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,מBundle המוצרים
 DocType: Production Planning Tool,Production Planning Tool,תכנון ייצור כלי
 DocType: Quality Inspection,Report Date,תאריך דוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ניתוב
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} מקבלי
@@ -2816,33 +2582,29 @@
 DocType: Stock Entry,Update Rate and Availability,עדכון תעריף וזמינות
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,אחוז מותר לך לקבל או למסור יותר נגד כל הכמות המוזמנת. לדוגמא: אם יש לך הורה 100 יחידות. והפרשה שלך הוא 10% אז אתה רשאי לקבל 110 יחידות.
 DocType: Pricing Rule,Customer Group,קבוצת לקוחות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: Item,Website Description,תיאור אתר
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
 DocType: Address,Plant,מפעל
-DocType: DocType,Setup,התקנה
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,אין שום דבר כדי לערוך.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,גלגול קר
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,אנא בחר לשאת קדימה אם אתה גם רוצה לכלול האיזון של שנת כספים הקודמת משאיר לשנה הפיסקלית
 DocType: GL Entry,Against Voucher Type,נגד סוג השובר
 DocType: Item,Attributes,תכונות
-DocType: Packing Slip,Get Items,קבל פריטים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,נא להזין לכתוב את החשבון
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,קבל פריטים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,נא להזין לכתוב את החשבון
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,התאריך אחרון סדר
-DocType: DocField,Image,תמונה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,הפוך בלו חשבונית
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
-DocType: Communication,Other,אחר
 DocType: C-Form,C-Form,C-טופס
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,זיהוי מבצע לא קבע
 DocType: Production Order,Planned Start Date,תאריך התחלה מתוכנן
 DocType: Serial No,Creation Document Type,סוג מסמך יצירה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,שימור. בקר ב
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,שימור. בקר ב
 DocType: Leave Type,Is Encash,האם encash
 DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Payment Tool,Make Journal Entry,הפוך יומן
@@ -2850,35 +2612,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,נתוני פרויקט-חכם אינם זמינים להצעת מחיר
 DocType: Project,Expected End Date,תאריך סיום צפוי
 DocType: Appraisal Template,Appraisal Template Title,הערכת תבנית כותרת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,מסחרי
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,מסחרי
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,פריט הורה {0} לא חייב להיות פריט במלאי
 DocType: Cost Center,Distribution Id,הפצת זיהוי
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,שירותים מדהים
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,כל המוצרים או שירותים.
 DocType: Purchase Invoice,Supplier Address,כתובת ספק
-DocType: Contact Us Settings,Address Line 2,שורת כתובת 2
-DocType: ToDo,Reference,התייחסות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,נְקִיבָה
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,סדרה היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,שירותים פיננסיים
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,שירותים פיננסיים
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} במרווחים של {3}
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,ברירת מחדל חשבונות חייבים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ניסור
 DocType: Tax Rule,Billing State,מדינת חיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,למינציה
 DocType: Item Reorder,Transfer,העברה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
 DocType: Supplier,Contact HTML,צור קשר עם HTML
@@ -2889,9 +2645,8 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,לקוח {0} אינו קיים
 DocType: Attendance,Absent,נעדר
-DocType: Product Bundle,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle מוצר
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ריסוק
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
 DocType: GL Entry,Remarks,הערות
@@ -2899,63 +2654,57 @@
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
 DocType: Features Setup,POS View,POS צפה
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,שיא התקנה למס 'סידורי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,יציקה רציפה
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,אנא ציין
 DocType: Offer Letter,Awaiting Response,ממתין לתגובה
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,מעל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,שינוי גודל קר
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,חשבון {0} אינו יכול להיות קבוצה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,אזור
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
 DocType: Holiday List,Weekly Off,Off השבועי
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","לדוגמה: 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),רווח / הפסד זמני (אשראי)
 DocType: Sales Invoice,Return Against Sales Invoice,חזור נגד חשבונית מכירות
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,פריט 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},אנא להגדיר את ערך ברירת מחדל {0} בחברת {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},אנא להגדיר את ערך ברירת מחדל {0} בחברת {1}
 DocType: Serial No,Creation Time,זמן יצירה
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,"סה""כ הכנסות"
 DocType: Sales Invoice,Product Bundle Help,מוצר Bundle עזרה
 ,Monthly Attendance Sheet,גיליון נוכחות חודשי
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,לא נמצא רשומה
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,חשבון {0} אינו פעיל
 DocType: GL Entry,Is Advance,האם Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,נוכחות מתאריך והנוכחות עד כה היא חובה
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"נא להזין את 'האם קבלן ""ככן או לא"
 DocType: Sales Team,Contact No.,מס 'לתקשר
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""רווח והפסד"" חשבון סוג {0} אסור בפתיחת כניסה"
-DocType: Workflow State,Time,זמן
 DocType: Features Setup,Sales Discounts,מבצעים מכירות
 DocType: Hub Settings,Seller Country,מדינה המוכרת
 DocType: Authorization Rule,Authorization Rule,כלל אישור
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,מסים מכירות וחיובי תבנית
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ביגוד ואביזרים
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ביגוד ואביזרים
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,מספר להזמין
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / אנר זה ייראה על החלק העליון של רשימת מוצרים.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ציין תנאים לחישוב סכום משלוח
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,הוסף לילדים
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,תפקיד רשאי לקבוע קפואים חשבונות ורשומים קפואים עריכה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,לא ניתן להמיר מרכז עלות לחשבונות שכן יש צמתים ילד
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,פקטור המרה נדרש
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,סידורי #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,עמלה על מכירות
 DocType: Offer Letter Term,Value / Description,ערך / תיאור
 DocType: Tax Rule,Billing Country,ארץ חיוב
 ,Customers Not Buying Since Long Time,לקוחות לא קונים מאז הרבה זמן
-DocType: Production Order,Expected Delivery Date,תאריך אספקה צפוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,בולט
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ליהוק אידוי-דפוס
+DocType: Production Order,Expected Delivery Date,תאריך אספקה צפוי
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,הוצאות בידור
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,מכירות חשבונית {0} יש לבטל לפני ביטול הזמנת מכירות זה
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,גיל
 DocType: Time Log,Billing Amount,סכום חיוב
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,כמות לא חוקית שצוינה עבור פריט {0}. כמות צריכה להיות גדולה מ -0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,בקשות לחופשה.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,חשבון עם עסקה הקיימת לא ניתן למחוק
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,הוצאות משפטיות
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","היום בחודש שבו על מנת אוטומטי ייווצר למשל 05, 28 וכו '"
 DocType: Sales Invoice,Posting Time,זמן פרסום
@@ -2969,26 +2718,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,הכנסות מלקוחות חדשות
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,הוצאות נסיעה
 DocType: Maintenance Visit,Breakdown,התפלגות
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,חשבון: {0} עם מטבע: {1} לא ניתן לבחור
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,השחזה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,מבחן
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
-DocType: Feed,Full Name,שם מלא
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,קטפתי
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,מבחן
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,מחסן ברירת מחדל הוא חובה עבור פריט המניה.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},תשלום השכר עבור החודש {0} ושנה {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,"סכום ששולם סה""כ"
 ,Transferred Qty,כמות שהועברה
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ניווט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,תכנון
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,תכנון
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,הפוך אצווה הזמן התחבר
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,הפיק
 DocType: Project,Total Billing Amount (via Time Logs),סכום חיוב כולל (דרך זמן יומנים)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,אנחנו מוכרים פריט זה
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,אנחנו מוכרים פריט זה
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ספק זיהוי
 DocType: Journal Entry,Cash Entry,כניסה במזומן
 DocType: Sales Partner,Contact Desc,לתקשר יורד
@@ -2997,18 +2743,16 @@
 DocType: Brand,Item Manager,מנהל פריט
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,להוסיף שורות להגדיר תקציבים שנתי על חשבונות.
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,חציבה
 DocType: Production Order,Total Operating Cost,"עלות הפעלה סה""כ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,הערה: פריט {0} נכנסה מספר פעמים
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,כל אנשי הקשר.
 DocType: Newsletter,Test Email Id,"דוא""ל מבחן זיהוי"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,קיצור חברה
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,קיצור חברה
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,אם אתם עוקבים איכות פיקוח. מאפשר פריט QA חובה וQA אין בקבלת רכישה
 DocType: GL Entry,Party Type,סוג המפלגה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,חומר גלם לא יכול להיות זהה לפריט עיקרי
 DocType: Item Attribute Value,Abbreviation,קיצור
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,לא authroized מאז {0} עולה על גבולות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,דפוס רוטציה
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,אדון תבנית שכר.
 DocType: Leave Type,Max Days Leave Allowed,מקס ימי חופשת מחמד
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,כלל מס שנקבע לעגלת קניות
@@ -3022,15 +2766,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,בכל קבוצות הלקוחות
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} הוא חובה. אולי שיא המרה לא נוצר עבור {1} ל {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,תבנית מס היא חובה.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,חשבון {0}: הורה חשבון {1} לא קיימת
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),מחיר מחירון שיעור (חברת מטבע)
 DocType: Account,Temporary,זמני
 DocType: Address,Preferred Billing Address,כתובת חיוב מועדפת
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,מזכיר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,מזכיר
 DocType: Serial No,Distinct unit of an Item,יחידה נפרדת של פריט
 DocType: Pricing Rule,Buying,קנייה
 DocType: HR Settings,Employee Records to be created by,רשומות עובדים שנוצרו על ידי
@@ -3043,42 +2787,37 @@
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
 DocType: Purchase Order Item,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,גיהוץ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} הוא הפסיק
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,אירועים קרובים
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,הלקוח נדרש
-DocType: Letter Head,Letter Head,מכתב ראש
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,כניסה מהירה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} הוא חובה עבור שבות
 DocType: Purchase Order,To Receive,לקבל
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,פסיכולוג הולם
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,הכנסות / הוצאות
 DocType: Employee,Personal Email,"דוא""ל אישי"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,סך שונה
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,סך שונה
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","אם מאופשר, המערכת תפרסם רישומים חשבונאיים עבור המלאי באופן אוטומטי."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,תיווך
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,תיווך
 DocType: Address,Postal Code,מיקוד
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","בדקות עדכון באמצעות 'יומן זמן """
 DocType: Customer,From Lead,מעופרת
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,הזמנות שוחררו לייצור.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Hub Settings,Name Token,שם אסימון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,הַקצָעָה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,מכירה סטנדרטית
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,מכירה סטנדרטית
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,נא להזין את ברירת מחדל של יחידת מדידה
 DocType: Purchase Invoice Item,Project Name,שם פרויקט
 DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
-DocType: Workflow State,Edit,עריכה
 DocType: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Features Setup,Item Batch Nos,אצווה פריט מס '
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
@@ -3086,13 +2825,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,תשלום פיוס תשלום
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,נכסי מסים
 DocType: BOM Item,BOM No,BOM לא
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM אשר יוחלף
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,החדש במלאי של אוני 'מישגן חייב להיות שונים משל אוני' מישגן המניה הנוכחי
 DocType: Account,Debit,חיוב
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,עלים חייבים להיות מוקצים בכפולות של 0.5
 DocType: Production Order,Operation Cost,עלות מבצע
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,העלה נוכחות מקובץ csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt מצטיין
@@ -3108,10 +2845,7 @@
 DocType: Project,Default Cost Center,מרכז עלות ברירת מחדל
 DocType: Purchase Invoice,End Date,תאריך סיום
 DocType: Employee,Internal Work History,היסטוריה עבודה פנימית
-DocType: DocField,Column Break,Break עמודה
-DocType: Event,Thursday,יום חמישי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,הון פרטי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,הפיכת
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,הון פרטי
 DocType: Maintenance Visit,Customer Feedback,לקוחות משוב
 DocType: Account,Expense,חשבון
 DocType: Sales Invoice,Exhibition,תערוכה
@@ -3124,31 +2858,30 @@
 DocType: Employee,Held On,במוחזק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,פריט ייצור
 ,Employee Information,מידע לעובדים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),שיעור (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),שיעור (%)
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,תאריך הפיננסי סוף השנה
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),להפחית צבירה לחופשה ללא תשלום (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},הערה: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,סיכום זה של השבוע
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} חייב להיות פריט שנרכש או-חוזה Sub בשורת {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,חשבון: {0} ניתן לעדכן רק דרך עסקות במלאי
 DocType: GL Entry,Party,מפלגה
 DocType: Sales Order,Delivery Date,תאריך לידה
-DocType: DocField,Currency,מטבע
 DocType: Opportunity,Opportunity Date,תאריך הזדמנות
 DocType: Purchase Receipt,Return Against Purchase Receipt,חזור כנגד קבלת רכישה
 DocType: Purchase Order,To Bill,להצעת החוק
 DocType: Material Request,% Ordered,% מסודר
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ממוצע. שיעור קנייה
 DocType: Task,Actual Time (in Hours),זמן בפועל (בשעות)
 DocType: Employee,History In Company,ההיסטוריה בחברה
@@ -3165,76 +2898,67 @@
 DocType: Opportunity,To Discuss,כדי לדון ב
 DocType: SMS Settings,SMS Settings,הגדרות SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,חשבונות זמניים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,שחור
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,שחור
 DocType: BOM Explosion Item,BOM Explosion Item,פריט פיצוץ BOM
 DocType: Account,Auditor,מבקר
 DocType: Purchase Order,End date of current order's period,תאריך סיום של התקופה של הצו הנוכחי
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,הפוך מכתב הצעת
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,חזור
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
-DocType: DocField,Fold,מקפלים
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,ברירת מחדל של יחידת מדידה ולריאנט חייבת להיות זהה לתבנית
 DocType: Production Order Operation,Production Order Operation,להזמין מבצע ייצור
 DocType: Pricing Rule,Disable,בטל
 DocType: Project Task,Pending Review,בהמתנה לבדיקה
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,אנא ציין
 DocType: Task,Total Expense Claim (via Expense Claim),תביעה סה&quot;כ הוצאות (באמצעות תביעת הוצאות)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,זהות לקוח
-DocType: Page,Page Name,שם דף
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,לזמן חייב להיות גדול מ מהזמן
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},מחסן {0}: הורה חשבון {1} לא Bolong לחברת {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,גמר ציר
 DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
 DocType: Account,Asset,נכס
 DocType: Project Task,Task ID,משימת זיהוי
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","לדוגמא: ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","לדוגמא: ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,המניה לא יכול להתקיים לפריט {0} שכן יש גרסאות
 ,Sales Person-wise Transaction Summary,סיכום עסקת איש מכירות-חכם
-DocType: System Settings,Time Zone,אזור הזמן
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,מחסן {0} אינו קיים
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,הירשם לHub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% מחומרים מועברים נגד תעודת משלוח זו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,הידוק
 DocType: Customer,Customer Details,פרטי לקוחות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,עיצוב
 DocType: Employee,Reports to,דיווחים ל
 DocType: SMS Settings,Enter url parameter for receiver nos,הזן פרמטר url למקלט nos
 DocType: Sales Invoice,Paid Amount,סכום ששולם
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',סגירת חשבון {0} חייבת להיות מהסוג 'אחריות'
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,הגדרת תבנית כתובת זו כברירת מחדל כפי שאין ברירת מחדל אחרת
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","יתרת חשבון כבר בחיוב, שאינך מורשים להגדרה 'יתרה חייבים להיות' כמו 'אשראי'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ניהול איכות
 DocType: Production Planning Tool,Filter based on customer,מסנן המבוסס על לקוחות
 DocType: Payment Tool Detail,Against Voucher No,נגד שובר לא
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
 DocType: Tax Rule,Purchase,רכישה
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,יתרת כמות
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,יתרת כמות
 DocType: Item Group,Parent Item Group,קבוצת פריט הורה
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,מרכזי עלות
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,מחסנים.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,מחסנים.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,קצב שבו ספק של מטבע מומר למטבע הבסיס של החברה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},# השורה {0}: קונפליקטים תזמונים עם שורת {1}
 DocType: Opportunity,Next Contact,לתקשר הבא
 DocType: Employee,Employment Type,סוג התעסוקה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,רכוש קבוע
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,תקופת יישום לא יכולה להיות על פני שתי רשומות alocation
 DocType: Item Group,Default Expense Account,חשבון הוצאות ברירת המחדל
 DocType: Employee,Notice (days),הודעה (ימים)
-DocType: Page,Yes,כן
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
 DocType: Employee,Encashment Date,תאריך encashment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","נגד שובר סוג חייב להיות אחד מהזמנת הרכש, רכש חשבונית או יומן"
 DocType: Account,Stock Adjustment,התאמת המניה
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
 DocType: Production Order,Planned Operating Cost,עלות הפעלה מתוכננת
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,חדש {0} שם
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},בבקשה למצוא מצורף {0} # {1}
 DocType: Job Applicant,Applicant Name,שם מבקש
 DocType: Authorization Rule,Customer / Item Name,לקוחות / שם פריט
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3247,7 +2971,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},מספר סידורי הוא חובה עבור פריט {0}
 DocType: Item Variant Attribute,Attribute,תכונה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,נא לציין מ / אל נעים
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,נוצר על-ידי
 DocType: Serial No,Under AMC,תחת AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,שיעור הערכת שווי פריט מחושב מחדש שוקל סכום שובר עלות נחת
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,הגדרות ברירת מחדל עבור עסקות מכירה.
@@ -3263,12 +2986,12 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,הסכום ששולם
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,שדר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,מנהל פרויקט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,הנחה מרבית המוותרת עבור פריט: {0} היא% {1}
 DocType: Customer,Default Taxes and Charges,מסים והיטלים שברירת מחדל
 DocType: Account,Receivable,חייבים
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
 DocType: Sales Invoice,Supplier Reference,הפניה ספק
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","אם מסומן, BOM לפריטים תת-הרכבה ייחשב להשגת חומרי גלם. אחרת, יטופלו כל הפריטים תת-ההרכבה כחומר גלם."
@@ -3276,8 +2999,8 @@
 DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
 DocType: Item Price,Item Price,פריט מחיר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture ווידאו
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,סבון וחומרי ניקוי
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture ווידאו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,הורה
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: Naming Series,Select Transaction,עסקה בחר
@@ -3286,7 +3009,6 @@
 DocType: BOM,Rate Of Materials Based On,שיעור חומרים הבוסס על
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics תמיכה
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},חברה חסרה במחסני {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,המניה של אוני 'מישגן החלף Utility
 DocType: POS Profile,Terms and Conditions,תנאים והגבלות
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},לתאריך צריך להיות בתוך שנת הכספים. בהנחה לתאריך = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","כאן אתה יכול לשמור על גובה, משקל, אלרגיות, בעיות רפואיות וכו '"
@@ -3298,7 +3020,7 @@
 DocType: Sales Order Item,For Production,להפקה
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,נא להזין את סדר מכירות בטבלה לעיל
 DocType: Project Task,View Task,צפה במשימה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,השנה שלך הפיננסית מתחילה ב
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,השנה שלך הפיננסית מתחילה ב
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,נא להזין את קבלות רכישה
 DocType: Sales Invoice,Get Advances Received,קבלו התקבלו מקדמות
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
@@ -3306,20 +3028,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"התקנת שרת הנכנס לid הדוא""ל של תמיכה. (למשל support@example.com)"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,צִחצוּחַ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'עד תאריך' נדרש
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע מספר חבילה, תוכן אריזה והמשקל שלה."
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'עד תאריך' נדרש
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע מספר חבילה, תוכן אריזה והמשקל שלה."
 DocType: Sales Invoice Item,Sales Order Item,פריט להזמין מכירות
 DocType: Salary Slip,Payment Days,ימי תשלום
 DocType: BOM,Manage cost of operations,ניהול עלות של פעולות
 DocType: Features Setup,Item Advanced,פריט מתקדם
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,גלגול חם
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
 DocType: Salary Slip,Net Pay,חבילת נקי
 DocType: Account,Account,חשבון
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,מספר סידורי {0} כבר קיבל
@@ -3328,35 +3048,28 @@
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,חופשת מחלה
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},לא חוקי {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,חופשת מחלה
 DocType: Email Digest,Email Digest,"תקציר דוא""ל"
 DocType: Delivery Note,Billing Address Name,שם כתובת לחיוב
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,חנויות כלבו
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,מאזן מערכת
-DocType: Workflow,Is Active,האם Active
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,מאזן מערכת
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,קיצור שינוי
-DocType: Workflow State,Primary,עיקרי
 DocType: Expense Claim Detail,Expense Date,תאריך הוצאה
 DocType: Item,Max Discount (%),מקס דיסקונט (%)
-DocType: Communication,More Information,מידע נוסף
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,סכום ההזמנה האחרונה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,פיצוץ
 DocType: Company,Warn,הזהר
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,הערכת שווי מעודכן פריט
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","כל דברים אחרים, מאמץ ראוי לציון שצריכה ללכת ברשומות."
 DocType: BOM,Manufacturing User,משתמש ייצור
 DocType: Purchase Order,Raw Materials Supplied,חומרי גלם הסופק
 DocType: Purchase Invoice,Recurring Print Format,פורמט הדפסה חוזר
-DocType: Communication,Series,סדרה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת הרכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,תאריך אספקה צפוי לא יכול להיות לפני תאריך הזמנת הרכש
 DocType: Appraisal,Appraisal Template,הערכת תבנית
-DocType: Communication,Email,"דוא""ל"
 DocType: Item Group,Item Classification,סיווג פריט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,מנהל פיתוח עסקי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,מנהל פיתוח עסקי
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,מטרת התחזוקה בקר
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,תקופה
 ,General Ledger,בכלל לדג'ר
@@ -3366,9 +3079,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,אנא בחר {0} ראשון
 DocType: Features Setup,To get Item Group in details table,כדי לקבל קבוצת פריט בטבלת פרטים
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,שרטוט
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,תחריט
 DocType: Sales Invoice,Commission,הוועדה
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3383,7 +3094,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<H4> תבנית ברירת מחדל </ h4> <p> שימושים </a> <a href=""http://jinja.pocoo.org/docs/templates/""> ג'ינג'ה בניית תבנית וכל תחומי כתובת (כוללים שדות מותאמים אישית אם בכלל) יהיה זמין </ p> <pre> <code> {{}} address_line1 & lt; br & gt; {% אם address_line2%} {{}} address_line2 & lt; br & gt; {% endif -%} {{העיר}} & lt; br & gt; {% אם% מדינת} {{המדינה}} & lt; br & gt; {% endif -%} {% אם% pincode} PIN: {{pincode}} & lt; br & gt; {% endif -%} {{ארץ}} & lt ; Br & gt; {% אם% טלפון} טלפון: {{טלפון}} & lt; br & gt; {% endif -%} {% אם פקס%} פקס: {{פקס}} & lt; br & gt; {% endif -%} {% אם email_id % דוא""ל}: {{}} email_id & lt; br & gt; {endif% -%} </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,סכום ברירת מחדל
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,מחסן לא נמצא במערכת
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,מחסן לא נמצא במערכת
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,סיכום של החודש
 DocType: Quality Inspection Reading,Quality Inspection Reading,איכות פיקוח קריאה
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
@@ -3402,13 +3113,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 DocType: Supplier,Address and Contacts,כתובת ומגעים
 DocType: UOM Conversion Detail,UOM Conversion Detail,פרט של אוני 'מישגן ההמרה
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
 DocType: Payment Tool,Get Outstanding Vouchers,קבל שוברים מצטיינים
 DocType: Warranty Claim,Resolved By,נפתר על ידי
 DocType: Appraisal,Start Date,תאריך ההתחלה
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ערך
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,להקצות עלים לתקופה.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,לחץ כאן כדי לאמת
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,חשבון {0}: לא ניתן להקצות את עצמו כחשבון אב
@@ -3418,55 +3128,43 @@
 DocType: Item,Average time taken by the supplier to deliver,הזמן הממוצע שנלקח על ידי הספק לספק
 DocType: Time Log,Hours,שעות
 DocType: Project,Expected Start Date,תאריך התחלה צפוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,מתגלגל
-DocType: ToDo,Priority,עדיפות
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,הסר פריט אם חיובים אינם ישימים לפריט ש
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox גישה מחמד
-DocType: Dropbox Backup,Weekly,שבועי
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,לדוגמא. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,קבל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,קבל
 DocType: Maintenance Visit,Fully Completed,הושלם במלואו
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,הכשרה חינוכית
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} נוספו בהצלחה לרשימת הדיוור שלנו.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,עיבוד אלומת אלקטרונים
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,דוחות עיקריים
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,מניית דג'ר ערכי יתרות מעודכנות
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,דוחות עיקריים
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Purchase Receipt Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,להוסיף מחירים / עריכה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,תרשים של מרכזי עלות
 ,Requested Items To Be Ordered,פריטים מבוקשים כדי להיות הורה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ההזמנות שלי
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ההזמנות שלי
 DocType: Price List,Price List Name,שם מחיר המחירון
 DocType: Time Log,For Manufacturing,לייצור
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,סיכומים
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,סיכומים
 DocType: BOM,Manufacturing,ייצור
 ,Ordered Items To Be Delivered,פריטים הורה שיימסרו
 DocType: Account,Income,הכנסה
-,Setup Wizard,אשף התקנה
 DocType: Industry Type,Industry Type,סוג התעשייה
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,משהו השתבש!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,תאריך סיום
 DocType: Purchase Invoice Item,Amount (Company Currency),הסכום (חברת מטבע)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ליהוק למות
-DocType: Email Alert,Reference Date,תאריך התייחסות
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,נא להזין nos תקף הנייד
 DocType: Budget Detail,Budget Detail,פרטי תקציב
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,נא להזין את ההודעה לפני השליחה
-DocType: Async Task,Status,סטטוס
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},המניה של אוני 'מישגן מעודכן לפריט {0}
-DocType: Company History,Year,שנה
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,נקודה-של-מכירת פרופיל
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,אנא עדכן את הגדרות SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,הזמן התחבר {0} כבר מחויב
@@ -3479,53 +3177,50 @@
 ,Serial No Service Contract Expiry,שירות סידורי חוזה תפוגה
 DocType: Item,Unit of Measure Conversion,יחידה של המרת מדד
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,העובד אינו ניתן לשינוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
 DocType: Naming Series,Help HTML,העזרה HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},הפרשה ליתר {0} חצה לפריט {1}
 DocType: Address,Name of person or organization that this address belongs to.,שמו של אדם או ארגון שכתובת זו שייכת ל.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,הספקים שלך
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,הספקים שלך
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,נוסף מבנה שכר {0} הוא פעיל לעובד {1}. בבקשה לעשות את מעמדה 'לא פעיל' כדי להמשיך.
 DocType: Purchase Invoice,Contact,צור קשר עם
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,התקבל מ
 DocType: Features Setup,Exports,יצוא
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 DocType: Issue,Content Type,סוג תוכן
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,מחשב
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,מחשב
 DocType: Item,List this Item in multiple groups on the website.,רשימת פריט זה במספר קבוצות באתר.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,פריט: {0} אינו קיים במערכת
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Cost Center,Budgets,תקציבים
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,עדכון
 DocType: Employee,Emergency Contact Details,פרטי יצירת קשר חירום
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,מה זה עושה?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,מה זה עושה?
 DocType: Delivery Note,To Warehouse,למחסן
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},חשבון {0} כבר נכנס יותר מפעם אחת בשנת הכספים {1}
 ,Average Commission Rate,העמלה ממוצעת שערי
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,עדכון עלויות נוספות לחישוב עלות נחתה של פריטים
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,חשמל
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},זיהוי משתמש לא נקבע לעובדים {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,מתביעת אחריות
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,לְחִיכָה
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ימים מאז להזמין אחרון
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ימים מאז להזמין אחרון
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
 DocType: Leave Block List,Leave Block List Name,השאר שם בלוק רשימה
-DocType: User,Enabled,מופעל
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,נכסים במלאי
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},האם אתה באמת רוצה להגיש את כל תלוש המשכורת עבור חודש {0} ושנה {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,מנויים יבוא
@@ -3533,19 +3228,18 @@
 DocType: Attendance,Present,הווה
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,תעודת משלוח {0} אסור תוגש
 DocType: Notification Control,Sales Invoice Message,מסר חשבונית מכירות
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 DocType: Authorization Rule,Based On,המבוסס על
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,צור תלושי שכר
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,"{0} אינו מזהה דוא""ל חוקי"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","קנייה יש לבדוק, אם לישים שנבחרה הוא {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
-DocType: ToDo,Low,נמוך
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ספינינג
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},אנא הגדר {0}
 DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
@@ -3567,7 +3261,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,שם מסע פרסום נדרש
 DocType: Maintenance Visit,Maintenance Date,תאריך תחזוקה
 DocType: Purchase Receipt Item,Rejected Serial No,מספר סידורי שנדחו
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ציור עמוק
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ניו עלון
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,מאזן הצג
@@ -3577,7 +3270,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,טווח הזדקנות 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,הסכום
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,מרתק
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
 ,Sales Analytics,Analytics מכירות
 DocType: Manufacturing Settings,Manufacturing Settings,הגדרות ייצור
@@ -3589,28 +3281,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,שם חשבון חדש
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,עלות חומרי גלם הסופק
 DocType: Selling Settings,Settings for Selling Module,הגדרות עבור מכירת מודול
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,שירות לקוחות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,שירות לקוחות
 DocType: Item,Thumbnail,תמונה ממוזערת
 DocType: Item Customer Detail,Item Customer Detail,פרט לקוחות פריט
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,אשר הדואר האלקטרוני שלך
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,מועמד הצעת עבודה.
 DocType: Notification Control,Prompt for Email on Submission of,"הנחיה לדוא""ל על הגשת"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,עלים שהוקצו סה&quot;כ יותר מ ימים בתקופה
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,פריט {0} חייב להיות פריט מניות
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,עבודה המוגדרת כברירת מחדל במחסן ההתקדמות
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,הגדרות ברירת מחדל עבור עסקות חשבונאיות.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} נדרש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,דפוס ואקום
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
-DocType: Contact Us Settings,City,עיר
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,עיבוד קולי
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,שגיאה: לא מזהה בתוקף?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,פריט {0} חייב להיות פריט מכירות
 DocType: Naming Series,Update Series Number,עדכון סדרת מספר
 DocType: Account,Equity,הון עצמי
 DocType: Sales Order,Printing Details,הדפסת פרטים
 DocType: Task,Closing Date,תאריך סגירה
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,מהנדס
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,מהנדס
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,הרכבות תת חיפוש
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
@@ -3618,7 +3306,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise דיסקונט
 DocType: Purchase Invoice,Against Expense Account,נגד חשבון הוצאות
 DocType: Production Order,Production Order,הזמנת ייצור
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,הערה התקנת {0} כבר הוגשה
 DocType: Quotation Item,Against Docname,נגד Docname
 DocType: SMS Center,All Employee (Active),כל העובד (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,צפה עכשיו
@@ -3626,26 +3314,24 @@
 DocType: BOM,Raw Material Cost,עלות חומרי גלם
 DocType: Item,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,תרשים גנט
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,סדרת עדכון
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,סוג הדוח הוא חובה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,סוג הדוח הוא חובה
 DocType: Item,Serial Number Series,סדרת מספר סידורי
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},המחסן הוא חובה עבור פריט המניה {0} בשורת {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,קמעונאות וסיטונאות
 DocType: Issue,First Responded On,הגיב בראשון
 DocType: Website Item Group,Cross Listing of Item in multiple groups,רישום צלב של פריט בקבוצות מרובות
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,המשתמש הראשון: אתה
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,המשתמש הראשון: אתה
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},שנת כספי תאריך ההתחלה ותאריך סיום שנת כספים כבר נקבעו בשנת הכספים {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,מפוייס בהצלחה
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,מפוייס בהצלחה
 DocType: Production Order,Planned End Date,תאריך סיום מתוכנן
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,איפה פריטים מאוחסנים.
 DocType: Tax Rule,Validity,תוקף
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,סכום חשבונית
 DocType: Attendance,Attendance,נוכחות
-DocType: Page,No,לא
 DocType: BOM,Materials,חומרים
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","אם לא בדק, הרשימה תצטרך להוסיף לכל מחלקה שבה יש ליישם."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,תאריך הפרסום ופרסום הזמן הוא חובה
@@ -3653,55 +3339,46 @@
 ,Item Prices,מחירי פריט
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
 DocType: Period Closing Voucher,Period Closing Voucher,שובר סגירת תקופה
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,אדון מחיר מחירון.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,אדון מחיר מחירון.
 DocType: Task,Review Date,תאריך סקירה
 DocType: Purchase Invoice,Advance Payments,תשלומים מראש
-DocType: DocPerm,Level,רמה
 DocType: Purchase Taxes and Charges,On Net Total,בסך הכל נטו
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,מחסן יעד בשורת {0} חייב להיות זהה להזמנת ייצור
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,כרסום
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,אין רשות להשתמש בכלי תשלום
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,מְכַּרסֵם
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,הוצאות הנהלה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ייעוץ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ייעוץ
 DocType: Customer Group,Parent Customer Group,קבוצת לקוחות הורה
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,שינוי
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","לדוגמא: ""החברה LLC שלי"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,תקופת הודעה
 DocType: Bank Reconciliation Detail,Voucher ID,זיהוי שובר
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,זהו שטח שורש ולא ניתן לערוך.
 DocType: Packing Slip,Gross Weight UOM,משקלים של אוני 'מישגן
 DocType: Email Digest,Receivables / Payables,חייבים / זכאי
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,הטבעה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 DocType: Task,Actual End Date (via Time Logs),תאריך סיום בפועל (באמצעות זמן יומנים)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,נא להזין מרכז עלות הורה
 DocType: Delivery Note,Print Without Amount,הדפסה ללא סכום
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"קטגוריה מס לא יכולה להיות ""הערכה"" או ""הערכה וסה""כ 'ככל הפריטים הם פריטים שאינם במלאי"
-DocType: User,Last Name,שם משפחה
-DocType: Web Page,Left,עזב
-DocType: Event,All Day,כל היום
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"קטגוריה מס לא יכולה להיות ""הערכה"" או ""הערכה וסה""כ 'ככל הפריטים הם פריטים שאינם במלאי"
 DocType: Issue,Support Team,צוות תמיכה
 DocType: Appraisal,Total Score (Out of 5),ציון כולל (מתוך 5)
-DocType: Contact Us Settings,State,מדינה
 DocType: Batch,Batch,אצווה
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,מאזן
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,מאזן
 DocType: Project,Total Expense Claim (via Expense Claims),תביעת הוצאות כוללת (באמצעות תביעות הוצאות)
-DocType: User,Gender,מין
 DocType: Journal Entry,Debit Note,הערה חיוב
 DocType: Stock Entry,As per Stock UOM,לפי צילומים של אוני 'מישגן
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,לא פג תוקף
@@ -3715,44 +3392,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","אם מסומן, אין סך הכל. של ימי עבודה יכלול חגים, וזה יקטין את הערך של יום בממוצע שכר"
 DocType: Purchase Invoice,Total Advance,"Advance סה""כ"
-DocType: Workflow State,User,משתמש
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,עיבוד שכר
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,קבע כאבוד
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,הערה קבלת תשלום
 DocType: Customer,Credit Days Based On,ימי אשראי לפי
 DocType: Tax Rule,Tax Rule,כלל מס
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,לשמור על שיעור זהה לכל אורך מחזור מכירות
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,מתכנן יומני זמן מחוץ לשעתי עבודה תחנת עבודה.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} כבר הוגש
 ,Items To Be Requested,פריטים להידרש
-DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Time Log,Billing Rate based on Activity Type (per hour),דרג חיוב המבוסס על סוג הפעילות (לשעה)
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","זיהוי חברת דוא""ל לא נמצא, ומכאן אלקטרוניים לא נשלח"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 DocType: Production Planning Tool,Filter based on item,מסנן המבוסס על פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Sales Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,לא יכול סמוי לקבוצה בגלל סוג חשבון הנבחר.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,לא יכול סמוי לקבוצה בגלל סוג חשבון הנבחר.
 DocType: Purchase Common,Purchase Common,רכישה משותפת
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} כבר שונה. אנא רענן.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,להפסיק ממשתמשים לבצע יישומי חופשה בימים שלאחר מכן.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,מהזדמנות
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,לתלייה
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
-DocType: DocField,Default,ברירת מחדל
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} מנויים הוסיפו
 DocType: Maintenance Schedule,Schedule,לוח זמנים
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","להגדיר תקציב עבור מרכז עלות זו. כדי להגדיר פעולת תקציב, ראה &quot;חברת רשימה&quot;"
@@ -3763,69 +3436,62 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Expense Claim,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","הבחירה ""כן"" ייתן זהות ייחודית לכל ישותו של פריט זה שניתן לראות בטור לא אדון."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,הערכת {0} נוצרה עבור עובדי {1} בטווח התאריכים נתון
 DocType: Employee,Education,חינוך
 DocType: Selling Settings,Campaign Naming By,Naming קמפיין ב
 DocType: Employee,Current Address Is,כתובת הנוכחית
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
 DocType: Address,Office,משרד
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,דוחות סטנדרטיים
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,כתב עת חשבונאות ערכים.
 DocType: Delivery Note Item,Available Qty at From Warehouse,כמות זמינה ממחסן
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,כדי ליצור חשבון מס
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,נא להזין את חשבון הוצאות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,המניה
 DocType: Employee,Current Address,כתובת נוכחית
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","אם פריט הנו נגזר של פריט נוסף לאחר מכן תיאור, תמונה, תמחור, וכו 'ייקבעו מסים מהתבנית אלא אם צוין במפורש"
 DocType: Serial No,Purchase / Manufacture Details,רכישה / פרטי ייצור
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,מלאי אצווה
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,מלאי אצווה
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Sales Order,Track this Sales Order against any Project,עקוב אחר הזמנת מכירות זה נגד כל פרויקט
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,הזמנות משיכה (תלויות ועומדות כדי לספק) המבוסס על הקריטריונים לעיל
-DocType: DocShare,Document Type,סוג המסמך
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,מהצעת המחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,מהצעת המחיר של ספק
 DocType: Deduction Type,Deduction Type,סוג הניכוי
 DocType: Attendance,Half Day,חצי יום
 DocType: Pricing Rule,Min Qty,דקות כמות
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",כדי לעקוב אחר פריטים במכירות ובמסמכי רכישה עם nos אצווה. &quot;תעשייה מועדפת: כימיקלים&quot;
 DocType: GL Entry,Transaction Date,תאריך עסקה
 DocType: Production Plan Item,Planned Qty,מתוכננת כמות
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,"מס סה""כ"
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,"מס סה""כ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,לכמות (מיוצר כמות) הוא חובה
 DocType: Stock Entry,Default Target Warehouse,מחסן יעד ברירת מחדל
 DocType: Purchase Invoice,Net Total (Company Currency),"סה""כ נקי (חברת מטבע)"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
 DocType: Notification Control,Purchase Receipt Message,מסר קבלת רכישה
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,עלים שהוקצו סה&quot;כ יותר מ תקופה
 DocType: Production Order,Actual Start Date,תאריך התחלה בפועל
 DocType: Sales Order,% of materials delivered against this Sales Order,% מחומרים מועברים נגד הזמנת מכירה זה
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,תנועת פריט שיא.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,עלון רשימה מנוי
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,שירות
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 ,Monthly Salary Register,חודשי שכר הרשמה
-apps/frappe/frappe/website/template.py +140,Next,הבא
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
 DocType: BOM Operation,BOM Operation,BOM מבצע
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,אלקטרו
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,נא להזין את סכום תשלום בatleast שורה אחת
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,נא להזין את סכום תשלום בatleast שורה אחת
 DocType: POS Profile,POS Profile,פרופיל קופה
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,השורה {0}: סכום תשלום לא יכול להיות גדולה מסכום חוב
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,סה&quot;כ שלא שולם
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,סה&quot;כ שלא שולם
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,זמן יומן הוא לא לחיוב
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,רוכש
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,רוכש
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,שכר נטו לא יכול להיות שלילי
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,נא להזין את השוברים נגד ידני
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,נא להזין את השוברים נגד ידני
 DocType: SMS Settings,Static Parameters,פרמטרים סטטיים
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
@@ -3834,14 +3500,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,שלח SMS המוני לאנשי הקשר שלך
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,שקול מס או תשלום עבור
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,הכמות בפועל היא חובה
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,צלב-מתגלגל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,כרטיס אשראי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,כרטיס אשראי
 DocType: BOM,Item to be manufactured or repacked,פריט שמיוצר או ארזה
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,הגדרות ברירת מחדל עבור עסקות מניות.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,הגדרות ברירת מחדל עבור עסקות מניות.
 DocType: Purchase Invoice,Next Date,התאריך הבא
 DocType: Employee Education,Major/Optional Subjects,נושאים עיקריים / אופציונליים
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,נא להזין את המסים והיטלים ש
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,עיבוד שבבי
 DocType: Sales Invoice Item,Drop Ship,זרוק משלוח
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","כאן אתה יכול לשמור על פרטים כמו שם וכיבוש של הורה, בן זוג וילדי משפחה"
 DocType: Hub Settings,Seller Name,שם מוכר
@@ -3851,47 +3515,44 @@
 DocType: Stock Entry,Repack,לארוז מחדש
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,עליך לשמור את הטופס לפני שתמשיך
 DocType: Item Attribute,Numeric Values,ערכים מספריים
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,צרף לוגו
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,לא ניתן לערוך את השורש.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,סכום שהוקצה לא יכול יותר מסכום unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,לא ניתן לערוך את השורש.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,סכום שהוקצה לא יכול יותר מסכום unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,לאפשר ייצור בחגים
 DocType: Sales Order,Customer's Purchase Order Date,תאריך הזמנת הרכש של הלקוח
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,מלאי הון
 DocType: Packing Slip,Package Weight Details,חבילת משקל פרטים
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,אנא בחר קובץ CSV
-DocType: Dropbox Backup,Send Backups to Dropbox,שלח גיבויים לDropbox
 DocType: Purchase Order,To Receive and Bill,כדי לקבל וביל
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,מעצב
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,מעצב
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,תבנית תנאים והגבלות
 DocType: Serial No,Delivery Details,פרטי משלוח
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ליצור באופן אוטומטי בקשת חומר אם כמות נופלת מתחת לרמה זו
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","כדי להגדיר רמת הזמנה חוזרת, פריט חייב להיות פריט רכישה או פריט ייצור"
 ,Supplier Addresses and Contacts,כתובות ספק ומגעים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +18,Project master.,אדון פרויקט.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(חצי יום)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,להוביל ימי זמן
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,הצעת חוק של חומרים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
-DocType: Dropbox Backup,Send Notifications To,לשלוח הודעות ל
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,תאריך אסמכתא
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,תאריך אסמכתא
 DocType: Employee,Reason for Leaving,סיבה להשארה
 DocType: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},שורת {0}: כניסת חיוב לא יכולה להיות מקושרת עם {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,חשבון {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,חשבון {0} אינו קיים
 DocType: Account,Cash,מזומנים
 DocType: Employee,Short biography for website and other publications.,ביוגרפיה קצרות באתר האינטרנט של ופרסומים אחרים.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},אנא ליצור מבנה שכר לעובד {0}

diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 6f312cb..f08d803 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,वेतन साधन
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","आप मौसम के आधार पर नज़र रखने के लिए चाहते हैं, तो मासिक वितरण चुनें।"
 DocType: Employee,Divorced,तलाकशुदा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,चेतावनी: एक ही मद कई बार दर्ज किया गया है।
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आइटम पहले से ही synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आइटम एक सौदे में कई बार जोड़े जाने की अनुमति दें
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,सामग्री भेंट {0} इस वारंटी का दावा रद्द करने से पहले रद्द
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,उपभोक्ता उत्पाद
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,पहले पार्टी के प्रकार का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,एनीलिंग
 DocType: Item,Customer Items,ग्राहक आइटम
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: माता पिता के खाते {1} एक खाता नहीं हो सकता
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करने के लिए आइटम प्रकाशित
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,अनुमोदकों छोड़ दो
 DocType: Sales Partner,Dealer,व्यापारी
 DocType: Employee,Rented,किराये पर
-DocType: About Us Settings,Website,वेबसाइट
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,संघनन से अधिक है sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* लेनदेन में गणना की जाएगी.
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,सामग्री अनुरोध से
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,सामग्री अनुरोध से
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ट्री
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,कोई और अधिक परिणाम है।
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,कानूनी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कानूनी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार टैक्स पंक्ति में आइटम की दर में शामिल नहीं किया जा सकता {0}
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,द्वारा आवश्यक
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,सिलाई
 DocType: Pricing Rule,Apply On,पर लागू होते हैं
 DocType: Item Price,Multiple Item prices.,एकाधिक आइटम कीमतों .
 ,Purchase Order Items To Be Received,खरीद आदेश प्राप्त किए जाने आइटम
 DocType: SMS Center,All Supplier Contact,सभी आपूर्तिकर्ता संपर्क
 DocType: Quality Inspection Reading,Parameter,प्राचल
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,नई छुट्टी के लिए अर्जी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर के रूप में ही किया जाना चाहिए {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,नई छुट्टी के लिए अर्जी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बैंक ड्राफ्ट
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. इस विकल्प का उपयोग ग्राहक वार आइटम कोड को बनाए रखने और कोड के आधार पर विकल्प खोज के लिए करे
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दिखाएँ वेरिएंट
-DocType: Sales Invoice Item,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,मात्रा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक में
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नई पीओएस प्रोफाइल बनाने
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भुगतान में देरी (दिन)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,बीजक
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ईमेल पता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,रक्षा
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ईमेल पता
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
 DocType: Company,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,पंक्ति # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,पंक्ति # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नहीं
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,मूल्य सूची का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लकड़ी
 DocType: Production Order Operation,Work In Progress,अर्धनिर्मित उत्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3 डी मुद्रण
 DocType: Employee,Holiday List,अवकाश सूची
 DocType: Time Log,Time Log,समय प्रवेश
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,मुनीम
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,मुनीम
 DocType: Cost Center,Stock User,शेयर उपयोगकर्ता
 DocType: Company,Phone No,कोई फोन
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","क्रियाएँ का प्रवेश, बिलिंग समय पर नज़र रखने के लिए इस्तेमाल किया जा सकता है कि कार्यों के खिलाफ उपयोगकर्ताओं द्वारा प्रदर्शन किया।"
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},नई {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},नई {0}: # {1}
 ,Sales Partners Commission,बिक्री पार्टनर्स आयोग
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,संक्षिप्त 5 से अधिक वर्ण की नहीं हो सकती
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",मूल्य {0} {1} मद के रूप वेरिएंट \ से हटाया नहीं जा सकता गुण इस विशेषता के साथ मौजूद हैं।
-DocType: Print Settings,Classic,क्लासिक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,इस रुट खाता है और संपादित नहीं किया जा सकता है .
 DocType: BOM,Operations,संचालन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},के लिए छूट के आधार पर प्राधिकरण सेट नहीं कर सकता {0}
 DocType: Bin,Quantity Requested for Purchase,मात्रा में खरीद करने के लिए अनुरोध
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दो कॉलम, पुराने नाम के लिए एक और नए नाम के लिए एक साथ .csv फ़ाइल संलग्न करें"
 DocType: Packed Item,Parent Detail docname,माता - पिता विस्तार docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,एक नौकरी के लिए खोलना.
 DocType: Item Attribute,Increment,वेतन वृद्धि
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,गोदाम का चयन करें ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,विज्ञापन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,विज्ञापन
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Employee,Married,विवाहित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराना
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बैंक एंट्री बनाओ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेंशन फंड
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,खाता प्रकार गोदाम है अगर वेयरहाउस अनिवार्य है
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","जाँचें आदेश आवर्ती अगर, आवर्ती रोक या उचित समाप्ति तिथि डाल करने अचयनित"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
 DocType: SMS Log,SMS Log,एसएमएस प्रवेश
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित मदों की लागत
-DocType: Blog Post,Guest,अतिथि
 DocType: Quality Inspection,Get Specification Details,विशिष्टता विवरण
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,सामग्री का बिल
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,प्रारंभिक
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,प्रारंभिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},से {0} को {1}
 DocType: Item,Copy From Item Group,आइटम समूह से कॉपी
 DocType: Journal Entry,Opening Entry,एंट्री खुलने
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} अनिवार्य है
 DocType: Stock Entry,Additional Costs,अतिरिक्त लागत
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
-DocType: Standard Reply,Owner,स्वामी
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहली कंपनी दाखिल करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,पहले कंपनी का चयन करें
 DocType: Employee Education,Under Graduate,पूर्व - स्नातक
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,योजनापूर्ण
 DocType: BOM,Total Cost,कुल लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,गतिविधि प्रवेश करें :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,रियल एस्टेट
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,रियल एस्टेट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,लेखा - विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,औषधीय
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
 DocType: Expense Claim Detail,Claim Amount,दावे की राशि
 DocType: Employee,Mr,श्री
-DocType: Custom Script,Client,ग्राहक
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
 DocType: Naming Series,Prefix,उपसर्ग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,उपभोज्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,उपभोज्य
 DocType: Upload Attendance,Import Log,प्रवेश करें आयात
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,भेजें
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक वेतन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक वेतन
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,शेयर व्यय
 DocType: Newsletter,Email Sent?,ईमेल भेजा है?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,शो टाइम लॉग्स
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
 DocType: Item,Supply Raw Materials for Purchase,आपूर्ति कच्चे माल की खरीद के लिए
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,आइटम {0} एक क्रय मद होना चाहिए
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  चयनित अवधि में सभी तिथियों और कर्मचारी संयोजन मौजूदा उपस्थिति रिकॉर्ड के साथ, टेम्पलेट में आ जाएगा"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,बिक्री चालान प्रस्तुत होने के बाद अद्यतन किया जाएगा.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","पंक्ति में कर शामिल करने के लिए {0} आइटम रेट में , पंक्तियों में करों {1} भी शामिल किया जाना चाहिए"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सीधे
 DocType: BOM Replace Tool,New BOM,नई बीओएम
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बैच बिलिंग के लिए टाइम लॉग करता है।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity कास्टिंग
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,समाचार पत्र के पहले ही भेज दिया गया है
 DocType: Lead,Request Type,अनुरोध प्रकार
 DocType: Leave Application,Reason,कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,निष्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,सिस्टम मैनेजर बन जाएगा पहले उपयोगकर्ता (आप इस पर बाद में बदल सकते हैं)।
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,निष्पादन
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,सिस्टम मैनेजर बन जाएगा पहले उपयोगकर्ता (आप इस पर बाद में बदल सकते हैं)।
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
 DocType: Serial No,Maintenance Status,रखरखाव स्थिति
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,आइटम और मूल्य निर्धारण
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,आइटम और मूल्य निर्धारण
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए. दिनांक से मान लिया जाये = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,जिसे तुम पैदा कर रहे हैं मूल्यांकन करने के लिए कर्मचारी का चयन करें.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},लागत केंद्र {0} से संबंधित नहीं है कंपनी {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,मूल्य सूची खरीदने या बेचने के लिए लागू किया जाना चाहिए
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},स्थापना दिनांक मद के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),मूल्य सूची दर पर डिस्काउंट (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
-DocType: User,First Name,प्रथम नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण मोल्ड कास्टिंग
 DocType: Offer Letter,Select Terms and Conditions,का चयन नियम और शर्तें
 DocType: Production Planning Tool,Sales Orders,बिक्री के आदेश
 DocType: Purchase Taxes and Charges,Valuation,मूल्याकंन
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,बैंक खाता
 DocType: Leave Type,Allow Negative Balance,ऋणात्मक शेष की अनुमति दें
 DocType: Selling Settings,Default Territory,Default टेरिटरी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,दूरदर्शन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log','टाइम प्रवेश' के माध्यम से अद्यतन
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी से संबंधित नहीं है {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
 DocType: Customer Group,Mention if non-standard receivable account applicable,मेंशन गैर मानक प्राप्य खाते यदि लागू हो
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,गोदाम की आवश्यकता है के लिए पहले जमा करें
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,प्राप्त हुआ
 DocType: Sales Partner,Reseller,पुनर्विक्रेता
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,कंपनी दाखिल करें
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
 DocType: Newsletter List,Total Subscribers,कुल ग्राहकों
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क का नाम
+,Contact Name,संपर्क का नाम
 DocType: Production Plan Item,SO Pending Qty,तो मात्रा लंबित
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरीद के लिए अनुरोध.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल आवास
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,प्रति वर्ष पत्तियां
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,प्रति वर्ष पत्तियां
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए सीरीज का नामकरण सेट करें
 DocType: Time Log,Will be updated when batched.,Batched जब अद्यतन किया जाएगा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,पंक्ति {0}: कृपया जाँच खाते के खिलाफ 'अग्रिम है' {1} यह एक अग्रिम प्रविष्टि है।
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},वेयरहाउस {0} से संबंधित नहीं है कंपनी {1}
-DocType: Bulk Email,Message,संदेश
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
-DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश कुंजी
 DocType: Payment Tool,Reference No,संदर्भ संक्या
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
 DocType: Material Request Item,Min Order Qty,न्यूनतम आदेश मात्रा
 DocType: Lead,Do Not Contact,संपर्क नहीं है
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सभी आवर्ती चालान पर नज़र रखने के लिए अद्वितीय पहचान. इसे प्रस्तुत करने पर उत्पन्न होता है.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेयर डेवलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेयर डेवलपर
 DocType: Item,Minimum Order Qty,न्यूनतम आदेश मात्रा
 DocType: Pricing Rule,Supplier Type,प्रदायक प्रकार
 DocType: Item,Publish in Hub,हब में प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,वायर ब्रशिंग
 DocType: Employee,Relation,संबंध
 DocType: Shipping Rule,Worldwide Shipping,दुनिया भर में शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहकों से आदेश की पुष्टि की है.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
 DocType: Maintenance Schedule,Generate Schedule,कार्यक्रम तय करें उत्पन्न
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,व्यय प्रमुख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,प्रभारी प्रकार पहले का चयन करें
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,नवीनतम
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,अधिकतम 5 अक्षर
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,अपनी भाषा का चयन
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,अधिकतम 5 अक्षर
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",उत्पादन के आदेश के खिलाफ समय लॉग का सृजन अक्षम करता है। संचालन उत्पादन आदेश के खिलाफ लगाया जा नहीं करेगा
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,के variant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,आइटम {0} सेवा आइटम होना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
-DocType: DocType,Administrator,प्रशासक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,लेजर ड्रिलिंग
-DocType: Stock UOM Replace Utility,New Stock UOM,नई स्टॉक UOM
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्र संदर्भ त्रुटि
-DocType: Communication,Closed,बंद
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,नौकरी प्रोफाइल
 DocType: Newsletter,Newsletter,न्यूज़लैटर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,गले मिलना
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,आइटम अद्यतन किया जाता है
-DocType: Async Task,System Manager,सिस्टम प्रबंधक
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
 DocType: Sales Invoice Item,Delivery Note,बिलटी
-DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स पहुँच की अनुमति
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,करों की स्थापना
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,माह और वर्ष का चयन करें
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,कंपनी ईमेल
 DocType: GL Entry,Debit Amount in Account Currency,खाते की मुद्रा में डेबिट राशि
 DocType: Shipping Rule,Valid for Countries,देशों के लिए मान्य
-DocType: Workflow State,Refresh,ताज़ा करना
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","मुद्रा , रूपांतरण दर , आयात कुल , आयात महायोग आदि जैसे सभी आयात संबंधित क्षेत्रों खरीद रसीद , प्रदायक कोटेशन , खरीद चालान , खरीद आदेश आदि में उपलब्ध हैं"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,माना कुल ऑर्डर
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,जिस पर दर ग्राहक की मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","बीओएम , डिलिवरी नोट , खरीद चालान , उत्पादन का आदेश , खरीद आदेश , खरीद रसीद , बिक्री चालान , बिक्री आदेश , स्टॉक एंट्री , timesheet में उपलब्ध"
 DocType: Item Tax,Tax Rate,कर की दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,वस्तु चुनें
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आइटम: {0} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरीद रसीद प्रस्तुत किया जाना चाहिए
-DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान स्टॉक UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,एक आइटम के बैच (बहुत).
 DocType: C-Form Invoice Detail,Invoice Date,चालान तिथि
 DocType: GL Entry,Debit Amount,निकाली गई राशि
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपका ईमेल पता
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,लगाव को देखने के लिए धन्यवाद
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,पानी जेट काटने
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,सेटअप पहले से ही पूरा !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,सेटअप पहले से ही पूरा !
 ,Finished Goods,निर्मित माल
 DocType: Delivery Note,Instructions,निर्देश
 DocType: Quality Inspection,Inspected By,द्वारा निरीक्षण किया
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,ग्राहकों और आपूर्तिकर्ताओं के लिए खाते नहीं बना करते। वे ग्राहक / आपूर्तिकर्ता के स्वामी से सीधे बनाई गई हैं।
 DocType: Currency Exchange,Currency Exchange,मुद्रा विनिमय
 DocType: Purchase Invoice Item,Item Name,मद का नाम
+DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य से ऊपर) उपयोगकर्ता का अनुमोदन
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,जमा शेष
 DocType: Employee,Widowed,विधवा
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",अनुमानित मात्रा और न्यूनतम आदेश मात्रा के आधार पर सभी गोदामों पर विचार करने के लिए अनुरोध किया जा आइटम जो &quot;स्टॉक से बाहर कर रहे हैं&quot;
@@ -380,22 +348,21 @@
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
 DocType: Workstation,Consumable Cost,उपभोज्य लागत
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,चिकित्सा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,खोने के लिए कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ट्यूब beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 DocType: Employee,Single,एक
 DocType: Issue,Attachment,आसक्ति
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,बजट समूह लागत केंद्र के लिए सेट नहीं किया जा सकता है
 DocType: Account,Cost of Goods Sold,बेच माल की लागत
 DocType: Purchase Invoice,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,लागत केंद्र दर्ज करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,लागत केंद्र दर्ज करें
 DocType: Journal Entry Account,Sales Order,बिक्री आदेश
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,औसत। बिक्री दर
 DocType: Purchase Order,Start date of current order's period,वर्तमान आदेश की अवधि के आरंभ तिथि
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},मात्रा पंक्ति में एक अंश नहीं किया जा सकता {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},मात्रा पंक्ति में एक अंश नहीं किया जा सकता {0}
 DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,पहले कंपनी का नाम दर्ज करें
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,समूह के
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वचालित रूप से फीफो पर आधारित नग सीरियल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक आपूर्तिकर्ता चालान संख्या अद्वितीयता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;प्रकरण नहीं करने के लिए&#39; &#39;केस नंबर से&#39; से कम नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,गैर लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,गैर लाभ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,शुरू नहीं
 DocType: Lead,Channel Partner,चैनल पार्टनर
 DocType: Account,Old Parent,पुरानी माता - पिता
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,अवकाश मास्टर .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शैल ढलाई
 DocType: Material Request Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,मद कोड दर्ज करें.
 DocType: BOM,Costing,लागत
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,कुल मात्रा
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,सीमा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,प्रतिभूति और जमाओं
 DocType: Features Setup,Imports,आयात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,चिपकने वाला संबंध
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Job Opening,Description of a Job Opening,एक नौकरी खोलने का विवरण
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,आज के लिए लंबित गतिविधियों
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,उपस्थिति रिकॉर्ड.
 DocType: Bank Reconciliation,Journal Entries,जर्नल प्रविष्टियां
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
-DocType: System Settings,Loading...,लोड हो रहा है ...
-DocType: DocField,Password,पासवर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,इनकार बयान मॉडलिंग
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
 DocType: Customer,Buyer of Goods and Services.,सामान और सेवाओं के खरीदार।
 DocType: Journal Entry,Accounts Payable,लेखा देय
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोड़ें
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" मौजूद नहीं है"
 DocType: Pricing Rule,Valid Upto,विधिमान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,प्रत्यक्ष आय
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासनिक अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासनिक अधिकारी
 DocType: Payment Tool,Received Or Paid,प्राप्त या भुगतान
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,कंपनी का चयन करें
 DocType: Stock Entry,Difference Account,अंतर खाता
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-DocType: DocField,Type,टाइप
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
-DocType: Communication,Subject,विषय
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 ,Serial No Warranty Expiry,धारावाहिक नहीं वारंटी समाप्ति
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,मद
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,प्रबंध उप
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नई UOM प्रकार पूर्ण संख्या का नहीं होना चाहिए
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,प्रबंध उप
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,फर्नीचर और जुड़नार
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,दर जिस पर मूल्य सूची मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,सामग्री की आवश्यकताएँ
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,आइटम {0} आइटम खरीद नहीं है
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'अधिसूचना \
  ईमेल पता' में एक अवैध ईमेल पता है"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,कुल बिलिंग इस साल:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,कुल बिलिंग इस साल:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","नहीं हटा सकते सीरियल नहीं {0}, यह शेयर लेनदेन में इस्तेमाल किया जाता है के रूप में"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),समापन (सीआर)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),समापन (सीआर)
 DocType: Serial No,Warranty Period (Days),वारंटी अवधि (दिन)
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 ,Pending Qty,विचाराधीन मात्रा
 DocType: Job Applicant,Thread HTML,धागा HTML
 DocType: Company,Ignore,उपेक्षा
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},एसएमएस निम्नलिखित संख्या के लिए भेजा: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
 DocType: Pricing Rule,Valid From,चुन
 DocType: Sales Invoice,Total Commission,कुल आयोग
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आप अपने कारोबार में मौसमी है तो आप महीने भर में अपने बजट को वितरित मदद करता है।
 
 , इस वितरण का उपयोग कर एक बजट वितरित ** लागत केंद्र में ** इस ** मासिक वितरण सेट करने के लिए **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
-DocType: About Us Settings,Website Manager,वेबसाइट प्रबंधक
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,वित्तीय वर्ष प्रारंभ तिथि वित्तीय वर्ष के अंत तिथि से बड़ा नहीं होना चाहिए
 DocType: Warranty Claim,Resolution,संकल्प
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},वितरित: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,बिलिंग और डिलिवरी स्थिति
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,पिछला
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,बिक्री लौटें
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,विक्रय आदेश का चयन करें जिसमें से आप उत्पादन के आदेश बनाना चाहते.
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,वेतन घटकों.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभावित ग्राहकों के लिए धन्यवाद.
+DocType: Authorization Rule,Customer or Item,ग्राहक या आइटम
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ग्राहक डेटाबेस.
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। आप एक अलग डिफ़ॉल्ट UoM का उपयोग करने के लिए एक नया आइटम बनाने की आवश्यकता होगी।
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
-DocType: Event,Wednesday,बुधवार
 DocType: Sales Invoice,Customer's Vendor,ग्राहक विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन का आदेश अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,एक और बिक्री व्यक्ति {0} एक ही कर्मचारी आईडी के साथ मौजूद है
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक स्टॉक त्रुटि ( {6} ) मद के लिए {0} गोदाम में {1} को {2} {3} में {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,वित्त वर्ष कंपनी
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,डिफ़ॉल्ट लागत दर
 DocType: Maintenance Schedule,Maintenance Schedule,रखरखाव अनुसूची
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","तो मूल्य निर्धारण नियमों ग्राहकों के आधार पर बाहर छान रहे हैं, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक प्रकार, अभियान, बिक्री साथी आदि"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ड्रॉपबॉक्स अजगर मॉड्यूल स्थापित करें
 DocType: Employee,Passport Number,पासपोर्ट नंबर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,खरीद रसीद से
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,मैनेजर
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,खरीद रसीद से
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
 DocType: SMS Settings,Receiver Parameter,रिसीवर पैरामीटर
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'पर आधारित ' और ' समूह द्वारा ' ही नहीं किया जा सकता है
 DocType: Sales Person,Sales Person Targets,बिक्री व्यक्ति लक्ष्य
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,को
-apps/frappe/frappe/templates/base.html +145,Please enter email address,ईमेल पता दर्ज करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,बनाने की समाप्ति ट्यूब
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,समूह के साथ परिवर्तित
 DocType: Activity Cost,Activity Type,गतिविधि प्रकार
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,निश्चित दिन
 DocType: Sales Invoice,Packing List,सूची पैकिंग
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,खरीद आपूर्तिकर्ताओं के लिए दिए गए आदेश.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,प्रकाशन
 DocType: Activity Cost,Projects User,परियोजनाओं उपयोगकर्ता
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,प्रयुक्त
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} चालान विवरण तालिका में नहीं मिला
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0} {1} चालान विवरण तालिका में नहीं मिला
 DocType: Company,Round Off Cost Center,लागत केंद्र बंद दौर
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,रखरखाव भेंट {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 DocType: Material Request,Material Transfer,सामग्री स्थानांतरण
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),उद्घाटन ( डॉ. )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग टाइमस्टैम्प के बाद होना चाहिए {0}
-apps/frappe/frappe/config/setup.py +59,Settings,सेटिंग्स
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरा लागत करों और शुल्कों
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: BOM Operation,Operation Time,संचालन समय
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,अधिक
 DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,नाम बदलें
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,झुका
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,उपयोगकर्ता की अनुमति
 DocType: Journal Entry,Bill No,विधेयक नहीं
 DocType: Purchase Invoice,Quarterly,त्रैमासिक
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आइटम विवरण दर्ज करें
 DocType: Purchase Receipt,Other Details,अन्य विवरण
 DocType: Account,Accounts,लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,विपणन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,सीधे बाल काटना
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,बिक्री और खरीद के दस्तावेजों के आधार पर उनके धारावाहिक नग में आइटम पर नज़र रखने के लिए. यह भी उत्पाद की वारंटी के विवरण को ट्रैक करने के लिए प्रयोग किया जाता है.
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,अस्वीकृत वेयरहाउस regected मद के खिलाफ अनिवार्य है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 DocType: Employee,Provide email id registered in company,कंपनी में पंजीकृत ईमेल आईडी प्रदान
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,पेड़ के प्रकार
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और वेयरहाउस
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","वाउचर के खिलाफ टाइप बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,विनिमय दर मिल करने में असमर्थ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,एयरोस्पेस
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपका स्वागत है
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एयरोस्पेस
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड एंट्री
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,कार्य विषय
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,माल आपूर्तिकर्ता से प्राप्त किया.
-DocType: Communication,Open,खुला
 DocType: Lead,Campaign Name,अभियान का नाम
 ,Reserved,आरक्षित
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} भंडार वस्तु नहीं है
 DocType: Mode of Payment Account,Default Account,डिफ़ॉल्ट खाता
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
-DocType: Contact Us Settings,Address Title,पता शीर्षक
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
 ,Sales Person Target Variance Item Group-Wise,बिक्री व्यक्ति लक्ष्य विचरण मद समूहवार
-DocType: Dropbox Backup,Daily,दैनिक
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,मौजूदा लेन - देन के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,मौजूदा लेन - देन के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक की खरीद आदेश नहीं
 DocType: Employee,Cell Number,सेल नंबर
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो सामग्री अनुरोध सृजित
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,खोया
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक वेतन बयान.
 DocType: Item Group,Website Specifications,वेबसाइट निर्दिष्टीकरण
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,नया खाता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,लेखांकन प्रविष्टियों पत्ती नोड्स के खिलाफ किया जा सकता है। समूहों के खिलाफ प्रविष्टियों की अनुमति नहीं है।
-DocType: ToDo,High,उच्च
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय या इसे अन्य BOMs के साथ जुड़ा हुआ है के रूप में बीओएम रद्द नहीं कर सकते
 DocType: Opportunity,Maintenance,रखरखाव
-DocType: User,Male,नर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},आइटम के लिए आवश्यक खरीद रसीद संख्या {0}
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,बिक्री अभियान .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,व्यक्तिगत
 DocType: Expense Claim Detail,Expense Claim Type,व्यय दावा प्रकार
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,शॉपिंग कार्ट के लिए डिफ़ॉल्ट सेटिंग्स
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रविष्टि {0} यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए अगर {1}, जाँच के आदेश के खिलाफ जुड़ा हुआ है।"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,जैव प्रौद्योगिकी
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रविष्टि {0} यह इस चालान में अग्रिम के रूप में निकाला जाना चाहिए अगर {1}, जाँच के आदेश के खिलाफ जुड़ा हुआ है।"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,जैव प्रौद्योगिकी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,कार्यालय रखरखाव का खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,हेमिंग
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Process Payroll,Send Email,ईमेल भेजें
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,अनुमति नहीं है
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},आइटम के माध्यम से वितरित नहीं कर रहे हैं क्योंकि &#39;अपडेट स्टॉक&#39; की जाँच नहीं की जा सकती {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ओपन स्कूल
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,ओपन स्कूल
 DocType: Item,Items with higher weightage will be shown higher,उच्च वेटेज के साथ आइटम उच्च दिखाया जाएगा
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बैंक सुलह विस्तार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,मेरा चालान
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,मेरा चालान
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नहीं मिला कर्मचारी
 DocType: Purchase Order,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;बिक्री के प्वाइंट&quot; सुविधाओं को सक्षम करने के लिए
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
-DocType: Comment,Reference Name,संदर्भ नाम
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य वेअरहाउस
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,उम्मीद की डिलीवरी की तारीख से पहले बिक्री आदेश तिथि नहीं हो सकता
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
 DocType: Production Order,Item To Manufacture,आइटम करने के लिए निर्माण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मोल्ड कास्टिंग
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिति {2} है
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 DocType: Sales Order Item,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
 DocType: Newsletter,Newsletter Manager,न्यूज़लैटर प्रबंधक
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उद्घाटन&#39;
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
 DocType: Expense Claim,Expenses,व्यय
 DocType: Item Variant Attribute,Item Variant Attribute,मद संस्करण गुण
 ,Purchase Receipt Trends,खरीद रसीद रुझान
 DocType: Appraisal,Select template from which you want to get the Goals,जो टेम्पलेट से आप लक्ष्यों को प्राप्त करना चाहते हैं का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,अनुसंधान एवं विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,अनुसंधान एवं विकास
 ,Amount to Bill,बिल राशि
 DocType: Company,Registration Details,पंजीकरण के विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,जताया
 DocType: Item,Re-Order Qty,पुन: आदेश मात्रा
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक सूची तिथि छोड़ दो
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},करने के लिए भेजने के लिए अनुसूचित {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,स्टॉक विवरण
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,परियोजना मूल्य
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,बिक्री केन्द्र
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},आगे नहीं ले जा सकता {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","खाते की शेष राशि पहले से ही क्रेडिट में है, कृपया आप शेष राशि को डेबिट के रूप में ही रखें "
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","खाते की शेष राशि पहले से ही क्रेडिट में है, कृपया आप शेष राशि को डेबिट के रूप में ही रखें"
 DocType: Account,Balance must be,बैलेंस होना चाहिए
 DocType: Hub Settings,Publish Pricing,मूल्य निर्धारण प्रकाशित करें
 DocType: Notification Control,Expense Claim Rejected Message,व्यय दावा संदेश अस्वीकृत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,श्रेष्ठ
 ,Available Qty,उपलब्ध मात्रा
 DocType: Purchase Taxes and Charges,On Previous Row Total,पिछली पंक्ति कुल पर
 DocType: Salary Slip,Working Days,कार्यकारी दिनों
 DocType: Serial No,Incoming Rate,आवक दर
 DocType: Packing Slip,Gross Weight,सकल भार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम ."
 DocType: HR Settings,Include holidays in Total no. of Working Days,कुल संख्या में छुट्टियों को शामिल करें. कार्य दिवस की
 DocType: Job Applicant,Hold,पकड़
 DocType: Employee,Date of Joining,शामिल होने की तिथि
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,देखें सदस्य
 DocType: Purchase Invoice Item,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,घर्षण नष्ट करना
 DocType: Employee,Ms,सुश्री
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
 DocType: Salary Slip,Leave Encashment Amount,नकदीकरण राशि छोड़ दो
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},धारावाहिक नहीं {0} मद से संबंधित नहीं है {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक मात्रा
 DocType: Bank Reconciliation,Total Amount,कुल राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन के आदेश
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शेष मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,बिक्री मूल्य सूची
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आइटम सिंक करने के लिए प्रकाशित करें
-DocType: GL Entry,Account Currency,खाता मुद्रा
+DocType: Bank Reconciliation,Account Currency,खाता मुद्रा
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,कंपनी में गोल ऑफ़ खाते का उल्लेख करें
 DocType: Purchase Receipt,Range,रेंज
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Features Setup,Item Barcode,आइटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Address,Shop,दुकान
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
 DocType: Employee,Permanent Address Is,स्थायी पता है
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन कितने तैयार माल के लिए पूरा?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रांड
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ब्रांड
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,भत्ता खत्म-{0} मद के लिए पार कर लिए {1}.
 DocType: Employee,Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें
 DocType: Item,Is Purchase Item,खरीद आइटम है
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,खरीद आदेश आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष आय
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,सेट भुगतान राशि = बकाया राशि
-DocType: Contact Us Settings,Address Line 1,पता पंक्ति 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,झगड़ा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी का नाम
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,झगड़ा
+,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,सभी की मदद वीडियो की एक सूची देखें
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,उपयोगकर्ता लेनदेन में मूल्य सूची दर को संपादित करने की अनुमति दें
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 DocType: Process Payroll,Select Payroll Year and Month,पेरोल वर्ष और महीने का चयन करें
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",उपयुक्त समूह (आम तौर पर फंड के लिए आवेदन&gt; वर्तमान एसेट्स&gt; बैंक खातों में जाओ और प्रकार की) चाइल्ड जोड़ने पर क्लिक करके (एक नया खाता बनाने के &quot;बैंक&quot;
 DocType: Workstation,Electricity Cost,बिजली की लागत
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
-DocType: Comment,Unsubscribed,आपकी सदस्यता समाप्त कर दी
 DocType: Opportunity,Walk In,में चलो
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial लागत केन्द्रों का पेड़ .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,तबादला
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,सफेद
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,सफेद
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपका चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,मेक
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपका चित्र संलग्न
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,मेक
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
-DocType: Workflow State,Stop,रोक
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,कोई त्रुटि हुई थी . एक संभावित कारण यह है कि आप प्रपत्र को बचाया नहीं किया है कि हो सकता है. यदि समस्या बनी रहती support@erpnext.com से संपर्क करें.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,मेरी गाड़ी
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},आदेश प्रकार का होना चाहिए {0}
 DocType: Lead,Next Contact Date,अगले संपर्क तिथि
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,खुलने मात्रा
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,पूँजी विकल्प
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,पूँजी विकल्प
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},के लिए मात्रा {0}
 DocType: Leave Application,Leave Application,छुट्टी की अर्ज़ी
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,आबंटन उपकरण छोड़ दो
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक सूची तिथियां छोड़ो
 DocType: Company,If Monthly Budget Exceeded (for expense account),"मासिक बजट (व्यय खाते के लिए) से अधिक है, तो"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ट्रिमिंग
 DocType: Workstation,Net Hour Rate,नेट घंटे की दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,आयातित माल की लागत खरीद रसीद
 DocType: Company,Default Terms,डिफ़ॉल्ट शर्तें
 DocType: Packing Slip Item,Packing Slip Item,पैकिंग स्लिप आइटम
 DocType: POS Profile,Cash/Bank Account,नकद / बैंक खाता
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,फाइलिंग
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,छूट
 DocType: Features Setup,Purchase Discounts,खरीद छूट
 DocType: Workstation,Wages,वेतन
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
 DocType: Issue,Issue,मुद्दा
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","आइटम वेरिएंट के लिए जिम्मेदार बताते हैं। जैसे आकार, रंग आदि"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,खाते कंपनी के साथ मेल नहीं खाता
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","आइटम वेरिएंट के लिए जिम्मेदार बताते हैं। जैसे आकार, रंग आदि"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP वेयरहाउस
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
 DocType: BOM Operation,Operation,ऑपरेशन
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,बिक्री व्यय
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,मानक खरीद
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,मानक खरीद
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,डिफ़ॉल्ट प्रदायक
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता प्रतिशत से अधिक
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,टाइम लॉग्स के माध्यम से अद्यतन
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,औसत आयु
 DocType: Opportunity,Your sales person who will contact the customer in future,अपनी बिक्री व्यक्ति जो भविष्य में ग्राहकों से संपर्क करेंगे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
 DocType: Company,Default Currency,डिफ़ॉल्ट मुद्रा
 DocType: Contact,Enter designation of this Contact,इस संपर्क के पद पर नियुक्ति दर्ज करें
-DocType: Contact Us Settings,Address,पता
 DocType: Expense Claim,From Employee,कर्मचारी से
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
 DocType: Journal Entry,Make Difference Entry,अंतर एंट्री
 DocType: Upload Attendance,Attendance From Date,दिनांक से उपस्थिति
 DocType: Appraisal Template Goal,Key Performance Area,परफ़ॉर्मेंस क्षेत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,परिवहन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,परिवहन
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,और वर्ष:
 DocType: Email Digest,Annual Expense,वार्षिक खर्च
 DocType: SMS Center,Total Characters,कुल वर्ण
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी - फार्म के चालान विस्तार
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भुगतान सुलह चालान
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,अंशदान%
 DocType: Item,website page link,वेबसाइट के पेज लिंक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,का पहला प्रयोग के लिए सिस्टम को तैयार करते हैं।
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,कंपनी अपने संदर्भ के लिए पंजीकरण संख्या. टैक्स आदि संख्या
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,समय लॉग्स का चयन करें और एक नया बिक्री चालान बनाने के लिए भेजें.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,बिक्री चालान अग्रिम
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,प्रबंधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,प्रबंधन
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,गतिविधियों के समय पत्रक के लिए प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,निवेश कास्टिंग
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},डेबिट या क्रेडिट राशि के लिए या तो आवश्यक है {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,शुद्ध वेतन (शब्दों में) दिखाई हो सकता है एक बार आप वेतन पर्ची बचाने के लिए होगा.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,सक्रिय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,नीला
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,नीला
 DocType: Purchase Invoice,Is Return,वापसी है
 DocType: Price List Country,Price List Country,मूल्य सूची देश
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,इसके अलावा नोड्स केवल ' समूह ' प्रकार नोड्स के तहत बनाया जा सकता है
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफ़ाइल {0} पहले से ही उपयोगकर्ता के लिए बनाया: {1} और कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,टुकड़े टुकड़े वस्तु विनिर्माण
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,प्रदायक डेटाबेस.
 DocType: Account,Balance Sheet,बैलेंस शीट
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,बनाने की मांसपेशियों
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,अपनी बिक्री व्यक्ति इस तिथि पर एक चेतावनी प्राप्त करने के लिए ग्राहकों से संपर्क करेंगे
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,टैक्स और अन्य वेतन कटौती.
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,गोदाम
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
 ,Purchase Order Items To Be Billed,बिल के लिए खरीद आदेश आइटम
 DocType: Purchase Invoice Item,Net Rate,असल दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चालान आइटम खरीद
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,स्टॉक लेजर प्रविष्टियां और जीएल प्रविष्टियां चयनित खरीद प्राप्ति के लिए पोस्ट कर रहे हैं
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,वस्तु 1
 DocType: Holiday,Holiday,छुट्टी
-DocType: Event,Saturday,शनिवार
 DocType: Leave Control Panel,Leave blank if considered for all branches,रिक्त छोड़ अगर सभी शाखाओं के लिए माना जाता है
 ,Daily Time Log Summary,दैनिक समय प्रवेश सारांश
-DocType: DocField,Label,लेबल
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled भुगतान विवरण
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी की स्थापना
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ग्रिड """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहले उपसर्ग का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,अनुसंधान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,अनुसंधान
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Contact,User ID,प्रयोक्ता आईडी
-DocType: Communication,Sent,भेजे गए
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,देखें खाता बही
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
-DocType: Communication,Delivery Status,डिलिवरी स्थिति
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 DocType: Production Order,Manufacture against Sales Order,बिक्री आदेश के खिलाफ निर्माण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,आइटम विवरण
 DocType: Payment Tool,Payment Mode,भुगतान का प्रकार
 DocType: Purchase Invoice,Is Recurring,आवर्ती है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,प्रत्यक्ष धातु लेजर sintering
 DocType: Purchase Order,Supplied Items,आपूर्ति आइटम
 DocType: Production Order,Qty To Manufacture,विनिर्माण मात्रा
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरीद चक्र के दौरान एक ही दर बनाए रखें
 DocType: Opportunity Item,Opportunity Item,अवसर आइटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,अस्थाई उद्घाटन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी लीव बैलेंस
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
 DocType: Address,Address Type,पता प्रकार
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,छोटा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,छोटा
 DocType: Employee,Employee Number,कर्मचारियों की संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {0}
 ,Invoiced Amount (Exculsive Tax),चालान राशि ( Exculsive टैक्स )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आइटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,लेखाशीर्ष {0} बनाया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ग्रीन
 DocType: Item,Auto re-order,ऑटो पुनः आदेश
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,कुल प्राप्त
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,कुल प्राप्त
 DocType: Employee,Place of Issue,जारी करने की जगह
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
-DocType: Report,Disabled,विकलांग
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,अनुबंध
+DocType: Email Digest,Add Quote,उद्धरण जोड़ें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषि
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,अपने उत्पादों या सेवाओं
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
 DocType: Journal Entry Account,Purchase Order,आदेश खरीद
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,नाम आवश्यक है
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
 DocType: Address,City/Town,शहर / नगर
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आइटम {0} एक उप अनुबंधित आइटम होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,राजधानी उपकरणों
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,उम्मीद की डिलीवरी की तिथि नियोजित प्रारंभ तिथि की तुलना में कम है।
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,कुल निवर्तमान
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","केवल "" मूल्य "" के लिए 0 या रिक्त मान के साथ एक शिपिंग शासन की स्थिति नहीं हो सकता"
 DocType: Authorization Rule,Transaction,लेन - देन
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,नोट : इस लागत केंद्र एक समूह है . समूहों के खिलाफ लेखांकन प्रविष्टियों नहीं कर सकता.
-apps/frappe/frappe/config/desk.py +7,Tools,उपकरण
 DocType: Item,Website Item Groups,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,उत्पादन क्रम संख्या स्टॉक प्रविष्टि उद्देश्य निर्माण के लिए अनिवार्य है
 DocType: Purchase Invoice,Total (Company Currency),कुल (कंपनी मुद्रा)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,जर्नल प्रविष्टि
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,टिप्पणियां
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
 DocType: Naming Series,This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},आइटम के लिए आवश्यक मूल्यांकन दर {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},आइटम के लिए आवश्यक मूल्यांकन दर {0}
 DocType: Quality Inspection Reading,Reading 8,8 पढ़ना
 DocType: Sales Partner,Agent,एजेंट
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए आप &#39;पर आधारित शुल्क वितरित करें&#39; बदलना चाहिए सकता है, शून्य है"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर और शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेयर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेयर
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,एक कंपनी का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,विशेषाधिकार छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,कोई डेटा नहीं
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन टेम्पलेट लक्ष्य
 DocType: Salary Slip,Earning,कमाई
 DocType: Payment Tool,Party Account Currency,पार्टी खाता मुद्रा
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,बीच पाया ओवरलैपिंग की स्थिति :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,कुल ऑर्डर मूल्य
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,भोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,भोजन
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,बूढ़े रेंज 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,आप केवल एक प्रस्तुत उत्पादन के आदेश के खिलाफ एक समय प्रवेश कर सकते हैं
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क करने के लिए समाचार पत्र, होता है."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,संचालन खाली नहीं छोड़ा जा सकता।
 ,Delivered Items To Be Billed,बिल के लिए दिया आइटम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
-DocType: DocField,Description,विवरण
 DocType: Authorization Rule,Average Discount,औसत छूट
-DocType: Letter Head,Is Default,डिफ़ॉल्ट है
 DocType: Address,Utilities,उपयोगिताएँ
 DocType: Purchase Invoice Item,Accounting,लेखांकन
 DocType: Features Setup,Features Setup,सुविधाएँ सेटअप
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,देखें पेशकश पत्र
-DocType: Communication,Communication,संचार
 DocType: Item,Is Service Item,सेवा आइटम
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
 DocType: Activity Cost,Projects,परियोजनाओं
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,वित्तीय वर्ष का चयन करें
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},से {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 DocType: Leave Control Panel,Leave blank if considered for all designations,रिक्त छोड़ अगर सभी पदनाम के लिए विचार
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिक्षु
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,शिक्षु
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,नकारात्मक मात्रा की अनुमति नहीं है
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","एक स्ट्रिंग के रूप में आइटम गुरु से दिलवाया है और इस क्षेत्र में संग्रहित कर विस्तार मेज।
  करों और शुल्कों के लिए प्रयुक्त"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाता जमे हुए है , तो प्रविष्टियों प्रतिबंधित उपयोगकर्ताओं की अनुमति है."
 DocType: Email Digest,Bank Balance,बैंक में जमा राशि
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,कर्मचारी {0} और महीने के लिए कोई सक्रिय वेतन ढांचे
 DocType: Job Opening,"Job profile, qualifications required etc.","आवश्यक काम प्रोफ़ाइल , योग्यता आदि"
 DocType: Journal Entry Account,Account Balance,खाते की शेष राशि
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
 DocType: Rename Tool,Type of document to rename.,नाम बदलने के लिए दस्तावेज का प्रकार.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,हम इस मद से खरीदें
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,हम इस मद से खरीदें
 DocType: Address,Billing,बिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,नहीं भेजा गया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,गठन विस्फोटक
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),कुल करों और शुल्कों (कंपनी मुद्रा)
 DocType: Shipping Rule,Shipping Account,नौवहन खाता
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} प्राप्तकर्ताओं को भेजने के लिए अनुसूचित
 DocType: Quality Inspection,Readings,रीडिंग
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,उप असेंबलियों
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,उप असेंबलियों
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Supplier,Stock Manager,शेयर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,कोई पता अभी तक जोड़ा।
 DocType: Workstation Working Hour,Workstation Working Hour,कार्य केंद्र घंटे काम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या जेवी राशि के बराबर होना चाहिए {2}
 DocType: Item,Inventory,इनवेंटरी
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;बिक्री के प्वाइंट&quot; सक्षम करने के लिए
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भुगतान खाली गाड़ी के लिए नहीं बनाया जा सकता
 DocType: Item,Sales Details,बिक्री विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,लगाए
 DocType: Opportunity,With Items,आइटम के साथ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,मात्रा में
 DocType: Notification Control,Expense Claim Rejected,व्यय दावे का खंडन किया
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
 DocType: Item Attribute,Item Attribute,आइटम गुण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,आइटम वेरिएंट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,आइटम वेरिएंट
 DocType: Company,Services,सेवाएं
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),कुल ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),कुल ({0})
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,वित्तीय वर्ष प्रारंभ दिनांक
 DocType: Employee External Work History,Total Experience,कुल अनुभव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,फ्रेट और अग्रेषण शुल्क
 DocType: Material Request Item,Sales Order No,बिक्री आदेश नहीं
 DocType: Item Group,Item Group Name,आइटम समूह का नाम
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,में ले ली
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,में ले ली
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,निर्माण के लिए हस्तांतरण सामग्री
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी खोज
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आइटम के लिए खरीद दर: {0} नहीं मिला, लेखा प्रविष्टि (व्यय) बुक करने के लिए आवश्यक है। एक खरीद मूल्य सूची के खिलाफ मद कीमत का उल्लेख करें।"
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त छूट राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटि: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},त्रुटि: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,खातों का चार्ट से नया खाता बनाने के लिए धन्यवाद.
 DocType: Maintenance Visit,Maintenance Visit,रखरखाव भेंट
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक> ग्राहक समूह> टेरिटरी
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,गोदाम में उपलब्ध बैच मात्रा
 DocType: Time Log Batch Detail,Time Log Batch Detail,समय प्रवेश बैच विस्तार
-DocType: Workflow State,Tasks,कार्यों
 DocType: Landed Cost Voucher,Landed Cost Help,उतरा लागत सहायता
-DocType: Event,Tuesday,मंगलवार
 DocType: Leave Block List,Block Holidays on important days.,महत्वपूर्ण दिन पर ब्लॉक छुट्टियाँ।
 ,Accounts Receivable Summary,लेखा प्राप्य सारांश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},पहले से ही अवधि के लिए कर्मचारी {1} के लिए आवंटित प्रकार {0} के लिए छोड़ देता {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
 DocType: UOM,UOM Name,UOM नाम
-DocType: Top Bar Item,Target,लक्ष्य
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,योगदान राशि
 DocType: Sales Invoice,Shipping Address,शिपिंग पता
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,यह उपकरण आपको अपडेट करने या सिस्टम में स्टॉक की मात्रा और मूल्य निर्धारण को ठीक करने में मदद करता है। यह आम तौर पर प्रणाली मूल्यों और क्या वास्तव में अपने गोदामों में मौजूद सिंक्रनाइज़ करने के लिए प्रयोग किया जाता है।
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,शब्दों में दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ब्रांड गुरु.
-DocType: ToDo,Due Date,नियत तारीख
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ब्रांड गुरु.
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,डिब्बा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,संगठन
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,डिब्बा
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,संगठन
 DocType: Monthly Distribution,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना बिक्री आदेश
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} के लिए लेखा प्रविष्टि केवल मुद्रा में बनाया जा सकता है: {1}
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,निशाना साधना
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बैंक खातों
 ,Bank Reconciliation Statement,बैंक समाधान विवरण
 DocType: Address,Lead Name,नाम लीड
 ,POS,पीओएस
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,खुलने का स्टॉक बैलेंस
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,खुलने का स्टॉक बैलेंस
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवल एक बार दिखाई देना चाहिए
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बैंक में परिलक्षित नहीं मात्रा में
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,बैंक में परिलक्षित नहीं मात्रा में
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी के खर्च के लिए दावा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,केन्द्रापसारक कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,चुंबकीय क्षेत्र की मदद से परिष्करण
 DocType: Company,Default Holiday List,छुट्टियों की सूची चूक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,शेयर देयताएं
 DocType: Purchase Receipt,Supplier Warehouse,प्रदायक वेअरहाउस
 DocType: Opportunity,Contact Mobile No,मोबाइल संपर्क नहीं
 DocType: Production Planning Tool,Select Sales Orders,विक्रय आदेश का चयन करें
 ,Material Requests for which Supplier Quotations are not created,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड का उपयोग करके आइटम्स ट्रैक. आप आइटम के बारकोड स्कैनिंग द्वारा डिलिवरी नोट और बिक्री चालान में आइटम दर्ज करने में सक्षम हो जाएगा.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क के रूप में दिया
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,मार्क के रूप में दिया
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन बनाओ
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 DocType: SMS Center,Receiver List,रिसीवर सूची
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} देखें
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कटौती
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,चयनित लेजर Sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,सफल आयात !
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),आयु (दिन)
 DocType: Quotation Item,Quotation Item,कोटेशन आइटम
 DocType: Account,Account Name,खाते का नाम
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,तिथि से आज तक से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,धारावाहिक नहीं {0} मात्रा {1} एक अंश नहीं हो सकता
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,प्रदायक प्रकार मास्टर .
 DocType: Purchase Order Item,Supplier Part Number,प्रदायक भाग संख्या
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,जोड़ना
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 या 1 नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} रद्द या बंद कर दिया है
 DocType: Accounts Settings,Credit Controller,क्रेडिट नियंत्रक
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन डिस्पैच तिथि
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,खरीद रसीद {0} प्रस्तुत नहीं किया गया है
 DocType: Company,Default Payable Account,डिफ़ॉल्ट देय खाता
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ऐसे शिपिंग नियम, मूल्य सूची आदि के रूप में ऑनलाइन शॉपिंग कार्ट के लिए सेटिंग"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूरा हुआ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,सुरक्षित मात्रा
 DocType: Party Account,Party Account,पार्टी खाता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,मानवीय संसाधन
 DocType: Lead,Upper Income,ऊपरी आय
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी मुद्रा में डेबिट
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,मेरे मुद्दों
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,डिफ़ॉल्ट मान
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,पंक्ति {0}: भुगतान राशि नकारात्मक नहीं हो सकता
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,प्रेस फिटिंग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 DocType: Payment Reconciliation,Payments,भुगतान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,दबाने गर्म isostatic
-DocType: ToDo,Medium,मध्यम
 DocType: Budget Detail,Budget Allocated,बजट आवंटित
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
 DocType: Quotation,Term Details,अवधि विवरण
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिन) के लिए क्षमता योजना
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
 DocType: Warranty Claim,Warranty Claim,वारंटी का दावा
 ,Lead Details,विवरण लीड
-DocType: Authorization Rule,Approving User,उपयोगकर्ता के स्वीकृति
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,फोर्जिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,चढ़ाना
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
 DocType: Pricing Rule,Applicable For,के लिए लागू
 DocType: Bank Reconciliation,From Date,दिनांक से
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन नीलामी
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,मात्रा या मूल्यांकन दर या दोनों निर्दिष्ट करें
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी , महीना और वित्तीय वर्ष अनिवार्य है"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,इस स्टॉक एंट्री बनाने के लिए इस्तेमाल सामग्री अनुरोध
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,एक आइटम के एकल इकाई.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',समय लॉग बैच {0} ' प्रस्तुत ' होना चाहिए
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,हर शेयर आंदोलन के लिए लेखा प्रविष्टि बनाओ
 DocType: Leave Allocation,Total Leaves Allocated,कुल पत्तियां आवंटित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},रो नहीं पर आवश्यक गोदाम {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,वैध वित्तीय वर्ष आरंभ और समाप्ति तिथियाँ दर्ज करें
 DocType: Employee,Date Of Retirement,सेवानिवृत्ति की तारीख
 DocType: Upload Attendance,Get Template,टेम्पलेट जाओ
 DocType: Address,Postal,डाक का
 DocType: Item,Weightage,महत्व
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राल कास्टिंग
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,पहला {0} का चयन करें.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},पाठ {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},पाठ {0}
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
 DocType: Stock Entry,Material Receipt,सामग्री प्राप्ति
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,उत्पाद
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,उत्पाद
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी का प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","इस मद वेरिएंट है, तो यह बिक्री के आदेश आदि में चयन नहीं किया जा सकता है"
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},मात्रा मद के लिए मौजूद वेयरहाउस {0} मिटाया नहीं जा सकता {1}
 DocType: Quotation,Order Type,आदेश प्रकार
 DocType: Purchase Invoice,Notification Email Address,सूचना ईमेल पता
 DocType: Payment Tool,Find Invoices to Match,मिलान करने के लिए चालान का पता लगाएं
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","उदाहरण के लिए ""एक्सवायजेड नेशनल बैंक """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","उदाहरण के लिए ""एक्सवायजेड नेशनल बैंक """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,इस टैक्स मूल दर में शामिल है?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,कुल लक्ष्य
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,कुल लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,खरीदारी की टोकरी में सक्षम हो जाता है
 DocType: Job Applicant,Applicant for a Job,एक नौकरी के लिए आवेदक
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,बनाया नहीं उत्पादन के आदेश
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,कर्मचारी के वेतन पर्ची {0} पहले से ही इस माह के लिए बनाए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,कर्मचारी के वेतन पर्ची {0} पहले से ही इस माह के लिए बनाए
 DocType: Stock Reconciliation,Reconciliation JSON,सुलह JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Sales Invoice Item,Batch No,कोई बैच
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,मुख्य
-DocType: DocPerm,Delete,हटाना
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,प्रकार
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नई {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,रूका आदेश को रद्द नहीं किया जा सकता . रद्द करने के लिए आगे बढ़ाना .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
 DocType: Sales Team,Contribution to Net Total,नेट कुल के लिए अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आइटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,स्टॉक सुलह
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,एक नौकरी के लिए आवेदक.
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
-DocType: Country,Country,देश
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पतों
-DocType: Communication,Received,प्राप्त
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},डुप्लीकेट सीरियल मद के लिए दर्ज किया गया {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक नौवहन नियम के लिए एक शर्त
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आइटम उत्पादन का आदेश दिया है करने के लिए अनुमति नहीं है।
-DocType: DocField,Attach Image,छवि संलग्न करें
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),इस पैकेज के शुद्ध वजन. (वस्तुओं का शुद्ध वजन की राशि के रूप में स्वतः गणना)
-DocType: Stock Reconciliation Item,Leave blank if no change,कोई परिवर्तन नहीं अगर खाली छोड़ दो
 DocType: Sales Order,To Deliver and Bill,उद्धार और बिल के लिए
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,विनिर्माण के लिए टाइम लॉग करता है।
 DocType: Item,Apply Warehouse-wise Reorder Level,गोदाम के लिहाज से पुनःक्रमित स्तर पर लागू करें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,कार्यों के लिए समय प्रवेश.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,भुगतान
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,भुगतान
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक समय और लागत
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},अधिकतम की सामग्री अनुरोध {0} मद के लिए {1} के खिलाफ किया जा सकता है बिक्री आदेश {2}
 DocType: Employee,Salutation,अभिवादन
-DocType: Communication,Rejected,अस्वीकृत
 DocType: Pricing Rule,Brand,ब्रांड
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
 DocType: Sales Order Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 पढ़ना
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",अपने उत्पादों या आप खरीदने या बेचने सेवाओं है कि सूची .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",अपने उत्पादों या आप खरीदने या बेचने सेवाओं है कि सूची .
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आप डुप्लिकेट आइटम दर्ज किया है . सुधारने और पुन: प्रयास करें .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,मूल्य {0} विशेषता के लिए {1} वैध आइटम की सूची में मौजूद नहीं है विशेषता मान
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,सहयोगी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहयोगी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,समय सीमा समाप्त
 DocType: Packing Slip,To Package No.,सं पैकेज
-DocType: DocType,System,प्रणाली
 DocType: Warranty Claim,Issue Date,जारी करने की तिथि
 DocType: Activity Cost,Activity Cost,गतिविधि लागत
 DocType: Purchase Receipt Item Supplied,Consumed Qty,खपत मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,दूरसंचार
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 DocType: Payment Tool,Make Payment Entry,भुगतान प्रवेश कर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
 ,Sales Invoice Trends,बिक्री चालान रुझान
 DocType: Leave Application,Apply / Approve Leaves,पत्तों को स्वीकृत / लागू करें
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,के लिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',प्रभारी प्रकार या ' पिछली पंक्ति कुल ' पिछली पंक्ति राशि पर ' तभी पंक्ति का उल्लेख कर सकते
 DocType: Sales Order Item,Delivery Warehouse,वितरण गोदाम
 DocType: Stock Settings,Allowance Percent,भत्ता प्रतिशत
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो बेचना, जाँच की जानी चाहिए {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,प्रदायक कोटेशन आइटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,वेतन संरचना बनाना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,बाल काटना
 DocType: Item,Has Variants,वेरिएंट है
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,एक नया बिक्री चालान बनाने के लिए बटन &#39;बिक्री चालान करें&#39; पर क्लिक करें.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पैकेजिंग और लेबलिंग
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,कंपनी मास्टर और वैश्विक मूलभूत में डिफ़ॉल्ट मुद्रा निर्दिष्ट करें
-DocType: Dropbox Backup,Dropbox Access Secret,ड्रॉपबॉक्स पहुँच गुप्त
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चालान
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,परियोजनाओं के प्रबंधन
 DocType: Supplier,Supplier of Goods or Services.,वस्तुओं या सेवाओं के आपूर्तिकर्ता है।
 DocType: Budget Detail,Fiscal Year,वित्तीय वर्ष
 DocType: Cost Center,Budget,बजट
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,हासिल
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,हासिल
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,टेरिटरी / ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,उदाहरणार्थ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या बकाया राशि चालान के बराबर होना चाहिए {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,उदाहरणार्थ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या बकाया राशि चालान के बराबर होना चाहिए {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,शब्दों में दिखाई हो सकता है एक बार आप बिक्री चालान बचाने के लिए होगा.
 DocType: Item,Is Sales Item,बिक्री आइटम है
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आइटम समूह ट्री
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग चेक आइटम गुरु के लिए सेटअप नहीं है
 DocType: Maintenance Visit,Maintenance Time,अनुरक्षण काल
 ,Amount to Deliver,राशि वितरित करने के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,उत्पाद या सेवा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,त्रुटियां थीं .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,दोहन
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,उत्पाद या सेवा
 DocType: Naming Series,Current Value,वर्तमान मान
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} बनाया
 DocType: Delivery Note Item,Against Sales Order,बिक्री के आदेश के खिलाफ
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
 DocType: Website Item Group,Website Item Group,वेबसाइट आइटम समूह
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,शुल्कों और करों
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तिथि दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तिथि दर्ज करें
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} भुगतान प्रविष्टियों द्वारा फिल्टर नहीं किया जा सकता है {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साइट में दिखाया जाएगा कि आइटम के लिए टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,आपूर्ति मात्रा
 DocType: Material Request Item,Material Request Item,सामग्री अनुरोध आइटम
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,आइटम समूहों के पेड़ .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,आइटम समूहों के पेड़ .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
 ,Item-wise Purchase History,आइटम के लिहाज से खरीदारी इतिहास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,लाल
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,पंक्ति # {0}: ऑपरेशन {1} उत्पादन में तैयार माल की {2} मात्रा के लिए पूरा नहीं है आदेश # {3}। टाइम लॉग्स के माध्यम से आपरेशन स्थिति अपडेट करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,एक आइटम के लिए UOM बदलें.
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृति मापदंड
 DocType: Item Attribute,Attribute Name,उत्तरदायी ठहराने के लिए नाम
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},आइटम {0} में बिक्री या सेवा आइटम होना चाहिए {1}
 DocType: Item Group,Show In Website,वेबसाइट में दिखाएँ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,समूह
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,समूह
 DocType: Task,Expected Time (in hours),(घंटे में) संभावित समय
 ,Qty to Order,मात्रा आदेश को
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","निम्नलिखित दस्तावेजों डिलिवरी नोट, अवसर, सामग्री अनुरोध, मद, खरीद आदेश, खरीद वाउचर, क्रेता रसीद, कोटेशन, बिक्री चालान, उत्पाद बंडल, बिक्री आदेश, सीरियल नहीं में ब्रांड नाम को ट्रैक करने के लिए"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,स्पष्ट मेज
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,कोई चालान
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरीद आदेश से
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,खरीद आदेश से
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है, के रूप में पहले {0} रद्द / लागू नहीं किया जा सकते हैं छोड़ दो {1}"
 DocType: Activity Cost,Costing Rate,लागत दर
 ,Customer Addresses And Contacts,ग्राहक के पते और संपर्क
 DocType: Employee,Resignation Letter Date,इस्तीफा पत्र दिनांक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नहीं
-DocType: Communication,Date,तारीख
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,दोहराने ग्राहक राजस्व
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"आपके सिस्टम सेटअप किया जा रहा है , जबकि ठीक से बैठो . इसमें कुछ समय लग सकता है."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,जोड़ा
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,जोड़ा
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बैच है नहीं
 DocType: Delivery Note,Excise Page Number,आबकारी पृष्ठ संख्या
 DocType: Employee,Personal Details,व्यक्तिगत विवरण
 ,Maintenance Schedules,रखरखाव अनुसूचियों
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,एम्बॉसिंग
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","उत्पादन का आदेश इस मद के लिए बनाया जा सकता है, यह एक शेयर मद होना चाहिए ."
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,एकजूट
-DocType: Authorization Rule,Above Value,ऊपर मूल्य
 ,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
 DocType: Purchase Order,Delivered,दिया गया
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),जॉब ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,कुल आवंटित पत्ते {0} कम नहीं हो सकता अवधि के लिए पहले से ही मंजूरी दे दी पत्ते {1} से
 DocType: Journal Entry,Accounts Receivable,लेखा प्राप्य
 ,Supplier-Wise Sales Analytics,प्रदायक वार बिक्री विश्लेषिकी
 DocType: Address Template,This format is used if country specific format is not found,"देश विशिष्ट प्रारूप नहीं मिला है, तो यह प्रारूप प्रयोग किया जाता है"
-DocType: Custom Field,Custom,रिवाज
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेवल बीओएम का उपयोग करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,इंजेक्शन मोल्डिंग
 DocType: Bank Reconciliation,Include Reconciled Entries,मेल मिलाप प्रविष्टियां शामिल करें
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खातों का पेड़ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,रिक्त छोड़ दो अगर सभी कर्मचारी प्रकार के लिए विचार
 DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आरोपों पर आधारित
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आइटम {1} एक एसेट आइटम के रूप में खाते {0} प्रकार की ' फिक्स्ड एसेट ' होना चाहिए
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
-apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,आप छुट्टी के लिए आवेदन कर रहे हैं जिस दिन (ओं ) अवकाश हैं . तुम्हें छोड़ के लिए लागू की जरूरत नहीं .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,और
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,खेल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक कुल
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,इकाई
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,आपकी साइट config में ड्रॉपबॉक्स का उपयोग चाबियां सेट करें
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,इकाई
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,कंपनी निर्दिष्ट करें
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,वेअरहाउस जहाँ आप को अस्वीकार कर दिया आइटम के शेयर को बनाए रखने रहे हैं
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
 DocType: POS Profile,Price List,कीमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
-DocType: Authorization Rule,Approving Role,रोल की स्वीकृति
 ,BOM Search,बीओएम खोज
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),समापन (+ योग खोलने)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
 DocType: Workstation,Wages per hour,प्रति घंटे मजदूरी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बैच में स्टॉक संतुलन {0} बन जाएगा नकारात्मक {1} गोदाम में आइटम {2} के लिए {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","आदि सीरियल ओपन स्कूल , स्थिति की तरह दिखाएँ / छिपाएँ सुविधाओं"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},क्लीयरेंस तारीख पंक्ति में चेक की तारीख से पहले नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},क्लीयरेंस तारीख पंक्ति में चेक की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Salary Slip,Deduction,कटौती
 DocType: Address Template,Address Template,पता खाका
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,उद्धरण
 DocType: Salary Slip,Total Deduction,कुल कटौती
 DocType: Quotation,Maintenance User,रखरखाव उपयोगकर्ता
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,मूल्य अपडेट
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,मूल्य अपडेट
 DocType: Employee,Date of Birth,जन्म तिथि
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आइटम {0} पहले से ही लौटा दिया गया है
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** वित्त वर्ष ** एक वित्तीय वर्ष का प्रतिनिधित्व करता है। सभी लेखा प्रविष्टियों और अन्य प्रमुख लेनदेन ** ** वित्त वर्ष के खिलाफ ट्रैक किए गए हैं।
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पता
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,नौकरी का विवरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,नौकरी का विवरण
 DocType: Purchase Order Item,Qty as per Stock UOM,मात्रा स्टॉक UOM के अनुसार
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,डेटा के साथ एक मान्य सीएसवी फाइल चुनें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,कोटिंग
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए। "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","बिक्री अभियान का ट्रैक रखें। बिक्रीसूत्र, कोटेशन का ट्रैक रखें, बिक्री आदेश आदि अभियानों से निवेश पर लौटें गेज करने के लिए।"
 DocType: Expense Claim,Approver,सरकारी गवाह
 ,SO Qty,अतः मात्रा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेयर प्रविष्टियों गोदाम के खिलाफ मौजूद {0}, इसलिए आप फिर से आवंटित करने या गोदाम को संशोधित नहीं कर सकते हैं"
 DocType: Appraisal,Calculate Total Score,कुल स्कोर की गणना
 DocType: Supplier Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
-apps/erpnext/erpnext/hooks.py +84,Shipments,लदान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,डुबकी मोल्डिंग
-DocType: Purchase Order,To be delivered to customer,ग्राहक के लिए दिया जाना
+apps/erpnext/erpnext/hooks.py +68,Shipments,लदान
+DocType: Purchase Order Item,To be delivered to customer,ग्राहक के लिए दिया जाना
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,समय लॉग स्थिति प्रस्तुत किया जाना चाहिए.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सीरियल नहीं {0} किसी भी गोदाम से संबंधित नहीं है
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,की स्थापना
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,पंक्ति #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,पंक्ति #
 DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा)
 DocType: Pricing Rule,Supplier,प्रदायक
 DocType: C-Form,Quarter,तिमाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,विविध व्यय
 DocType: Global Defaults,Default Company,Default कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
 DocType: Employee,Bank Name,बैंक का नाम
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,ऊपर
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,प्रयोक्ता {0} अक्षम है
 DocType: Leave Application,Total Leave Days,कुल छोड़ दो दिन
-DocType: Journal Entry Account,Credit in Account Currency,खाते की मुद्रा में ऋण
 DocType: Email Digest,Note: Email will not be sent to disabled users,नोट: ईमेल अक्षम उपयोगकर्ताओं के लिए नहीं भेजा जाएगा
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Currency Exchange,From Currency,मुद्रा से
-DocType: DocField,Name,नाम
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली में परिलक्षित नहीं मात्रा में
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आइटम के लिए आवश्यक बिक्री आदेश {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,प्रणाली में परिलक्षित नहीं मात्रा में
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,दूसरों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,दूसरों
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।
 DocType: POS Profile,Taxes and Charges,करों और प्रभार
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पाद या, खरीदा या बेचा स्टॉक में रखा जाता है कि एक सेवा।"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,पूरा
-DocType: Web Form,Select DocType,Doctype का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बैंकिंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बैंकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नई लागत केंद्र
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,नई लागत केंद्र
 DocType: Bin,Ordered Quantity,आदेशित मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",उदाहरणार्थ
 DocType: Quality Inspection,In Process,इस प्रक्रिया में
 DocType: Authorization Rule,Itemwise Discount,Itemwise डिस्काउंट
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तावेज़ प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
 DocType: Account,Fixed Asset,स्थायी परिसम्पत्ति
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,श्रृंखलाबद्ध इन्वेंटरी
 DocType: Activity Type,Default Billing Rate,डिफ़ॉल्ट बिलिंग दर
 DocType: Time Log Batch,Total Billing Amount,कुल बिलिंग राशि
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,प्राप्य खाता
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,टाइम लॉग्स बनाया:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Employee,Blood Group,रक्त वर्ग
 DocType: Purchase Invoice Item,Page Break,पृष्ठातर
 DocType: Production Order Operation,Pending,अपूर्ण
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,एक विशिष्ट कर्मचारी की छुट्टी आवेदनों को स्वीकृत कर सकते हैं जो प्रयोक्ता
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,आप संस्करण की डिफ़ॉल्ट UoM नहीं बदल सकते। टेम्पलेट के संस्करण परिवर्तन डिफ़ॉल्ट UoM के लिए डिफ़ॉल्ट UoM को बदलने के लिए
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,कार्यालय उपकरण
 DocType: Purchase Invoice Item,Qty,मात्रा
 DocType: Fiscal Year,Companies,कंपनियां
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,इलेक्ट्रानिक्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,इलेक्ट्रानिक्स
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,सामग्री अनुरोध उठाएँ जब शेयर पुनः आदेश के स्तर तक पहुँच
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,रखरखाव अनुसूची से
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,पूर्णकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,पूर्णकालिक
 DocType: Purchase Invoice,Contact Details,जानकारी के लिए संपर्क
 DocType: C-Form,Received Date,प्राप्त तिथि
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","आप बिक्री करों और शुल्कों टेम्पलेट में एक मानक टेम्पलेट बनाया है, एक को चुनें और नीचे दिए गए बटन पर क्लिक करें।"
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,नौकरी खोलने
 DocType: Payment Reconciliation,Payment Reconciliation,भुगतान सुलह
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,प्रौद्योगिकी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
 DocType: Offer Letter,Offer Letter,प्रस्ताव पत्र
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,सामग्री (एमआरपी) के अनुरोध और उत्पादन के आदेश उत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,कुल चालान किए गए राशि
 DocType: Time Log,To Time,समय के लिए
+DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य से ऊपर) भूमिका का अनुमोदन
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","बच्चे नोड्स जोड़ने के लिए, पेड़ लगाने और आप अधिक नोड्स जोड़ना चाहते हैं जिसके तहत नोड पर क्लिक करें."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
 DocType: Production Order Operation,Completed Qty,पूरी की मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,ग्राहक आइटम संहिताओं
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,आदेश या चालान के खिलाफ भुगतान प्रविष्टियों को बनाने।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नया स्टॉक UOM आवश्यक है
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;केस नंबर से&#39; एक वैध निर्दिष्ट करें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
 DocType: Features Setup,Item Serial Nos,आइटम सीरियल नं
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,वास्तविक मात्रा
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,अपने ग्राहकों
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,संपीड़न मोल्डिंग
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,अपने ग्राहकों
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
 DocType: Sales Order,Not Delivered,नहीं वितरित
 ,Bank Clearance Summary,बैंक क्लीयरेंस सारांश
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","बनाएँ और दैनिक, साप्ताहिक और मासिक ईमेल हज़म का प्रबंधन ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,मद कोड> मद समूह> ब्रांड
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
-DocType: Event,Friday,शुक्रवार
 DocType: Time Log,Costing Amount,लागत राशि
 DocType: Process Payroll,Submit Salary Slip,वेतनपर्ची सबमिट करें
 DocType: Salary Structure,Monthly Earning & Deduction,मासिक आय और कटौती
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,थोक में आयात
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
 DocType: SMS Log,Sender Name,प्रेषक का नाम
-DocType: Page,Title,शीर्षक
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,को मनपसंद
 DocType: POS Profile,[Select],[ चुनें ]
 DocType: SMS Log,Sent To,भेजा
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,बिक्री चालान बनाएं
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},अवैध {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,अग्रिम राशि
 DocType: Manufacturing Settings,Capacity Planning,क्षमता की योजना
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'तिथि से ' आवश्यक है
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'तिथि से ' आवश्यक है
 DocType: Journal Entry,Reference Number,संदर्भ संख्या
 DocType: Employee,Employment Details,रोजगार के विवरण
 DocType: Employee,New Workplace,नए कार्यस्थल
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
 DocType: Item,End of Life,जीवन का अंत
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,यात्रा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,यात्रा
 DocType: Leave Block List,Allow Users,उपयोगकर्ताओं को अनुमति दें
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,हस्तांतरण सामग्री
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
 DocType: Installation Note,Installation Note,स्थापना नोट
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,करों जोड़ें
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,करों जोड़ें
 ,Financial Analytics,वित्तीय विश्लेषिकी
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 DocType: Address,Subsidiary,सहायक
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
 DocType: Quality Inspection,Purchase Receipt No,रसीद खरीद नहीं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाना राशि
-DocType: System Settings,In Hours,घंटे में
 DocType: Process Payroll,Create Salary Slip,वेतनपर्ची बनाएँ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,बैंक के अनुसार अपेक्षित संतुलन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,बैंक के अनुसार अपेक्षित संतुलन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),धन के स्रोत (देनदारियों)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
 DocType: Appraisal,Employee,कर्मचारी
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,वाउचर द्वारा समूह
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Sales Invoice,Mass Mailing,मास मेलिंग
-DocType: Page,Standard,मानक
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,दिखाएँ भुगतान
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,रखरखाव अनुसूची {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,औषधि
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,औषधि
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरीदी गई वस्तुओं की लागत
 DocType: Selling Settings,Sales Order Required,बिक्री आदेश आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक बनाएँ
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 पढ़ना
 DocType: Supplier,Is Frozen,जम गया है
 DocType: Buying Settings,Buying Settings,सेटिंग्स ख़रीदना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,मास परिष्करण
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,एक समाप्त अच्छा आइटम के लिए बीओएम सं.
 DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),बिक्री ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे sales@example.com )
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Tool,Payment Account,भुगतान खाता
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसौदा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,प्रतिपूरक बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकार किया
-DocType: User,Female,महिला
-DocType: Journal Entry Account,Debit in Account Currency,खाते की मुद्रा में डेबिट
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
-DocType: Print Settings,Modern,आधुनिक
-DocType: Communication,Replied,उत्तर
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
 DocType: Payment Tool,Total Payment Amount,कुल भुगतान राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) की योजना बनाई quanitity से अधिक नहीं हो सकता है ({2}) उत्पादन में आदेश {3}
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
 DocType: Newsletter,Test,परीक्षण
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","मौजूदा स्टॉक लेनदेन आप के मूल्यों को बदल नहीं सकते \ इस मद के लिए वहाँ के रूप में &#39;सीरियल नहीं है&#39;, &#39;बैच है,&#39; नहीं &#39;शेयर मद है&#39; और &#39;मूल्यांकन पद्धति&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आइटम के लिए अनुरोध.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,अलग उत्पादन का आदेश प्रत्येक समाप्त अच्छा आइटम के लिए बनाया जाएगा.
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,पूरा सेटअप
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","इस तारीख तक कर जम लेखा प्रविष्टि, कोई नहीं / नीचे निर्दिष्ट भूमिका छोड़कर प्रविष्टि को संशोधित कर सकते हैं."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,रखरखाव अनुसूची पैदा करने से पहले दस्तावेज़ को बचाने के लिए धन्यवाद
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,परियोजना की स्थिति
 DocType: UOM,Check this to disallow fractions. (for Nos),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,न्यूज़लेटर मेलिंग सूची
 DocType: Delivery Note,Transporter Name,ट्रांसपोर्टर नाम
+DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: Contact,Enter department to which this Contact belongs,विभाग को जो इस संपर्क के अंतर्गत आता दर्ज करें
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,कुल अनुपस्थित
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,माप की इकाई
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,माप की इकाई
 DocType: Fiscal Year,Year End Date,वर्षांत तिथि
 DocType: Task Depends On,Task Depends On,काम पर निर्भर करता है
 DocType: Lead,Opportunity,अवसर
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),मूल दर (स्टॉक UoM के अनुसार)
 DocType: SMS Log,No of Requested SMS,अनुरोधित एसएमएस की संख्या
 DocType: Campaign,Campaign-.####,अभियान . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,छेदना
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग के लिए कंपनियों के उत्पादों को बेचता है एक तीसरे पक्ष जो वितरक / डीलर / कमीशन एजेंट / सहबद्ध / पुनर्विक्रेता।
 DocType: Customer Group,Has Child Node,बाल नोड है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","स्थैतिक यूआरएल यहाँ मानकों (Eg. प्रेषक = ERPNext, username = ERPNext, पासवर्ड = 1234 आदि) दर्ज करें"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} नहीं किसी भी सक्रिय वित्त वर्ष में। अधिक विवरण की जाँच के लिए {2}।
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,इस ERPNext से ऑटो उत्पन्न एक उदाहरण वेबसाइट है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,बूढ़े सीमा 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,प्रकाश-रसायनिक मशीनिंग
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8। दर्ज पंक्ति: ""पिछली पंक्ति कुल"" पर आधारित है तो आप इस गणना के लिए एक आधार (डिफ़ॉल्ट पिछली पंक्ति है) के रूप में ले जाया जाएगा जो पंक्ति संख्या का चयन कर सकते हैं।
  9। के लिए टैक्स या शुल्क पर विचार करें: टैक्स / प्रभारी मूल्यांकन के लिए ही है (कुल का नहीं एक हिस्सा) या केवल (आइटम के लिए मूल्य जोड़ नहीं है) कुल के लिए या दोनों के लिए अगर इस अनुभाग में आप निर्दिष्ट कर सकते हैं।
  10। जोड़ें या घटा देते हैं: आप जोड़ सकते हैं या कर कटौती करना चाहते हैं।"
-DocType: Note,Note,नोट
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
-DocType: Email Account,Email Ids,ईमेल आईडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,मुद्रा प्रतीक छुपाएँ
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,जमापत्र
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},पूरे किए मात्रा से अधिक नहीं हो सकता है {0} ऑपरेशन के लिए {1}
 DocType: Features Setup,Quality,गुणवत्ता
-DocType: Contact Us Settings,Introduction,परिचय
 DocType: Warranty Claim,Service Address,सेवा पता
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,शेयर सुलह के लिए अधिकतम 100 पंक्तियाँ।
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,शेयर सुलह के लिए अधिकतम 100 पंक्तियाँ।
 DocType: Stock Entry,Manufacture,उत्पादन
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,कृपया डिलिवरी नोट पहले
 DocType: Purchase Invoice,Currency and Price List,मुद्रा और मूल्य सूची
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाम
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,उत्पादन
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,उत्पादन का आदेश दें
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
 DocType: Lead,Fax,फैक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,पेश
 DocType: Salary Structure,Total Earning,कुल अर्जन
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,मेरे पते
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संगठन शाखा मास्टर .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,या
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयोगिता व्यय
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 से ऊपर
 DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
-,Download Backups,डाउनलोड बैकअप
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,भुगतान के प्रकार
 DocType: Process Payroll,Select Employees,चयन करें कर्मचारी
 DocType: Bank Reconciliation,To Date,तिथि करने के लिए
 DocType: Opportunity,Potential Sales Deal,संभावित बिक्री डील
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,विवरण
 DocType: Purchase Invoice,Total Taxes and Charges,कुल कर और शुल्क
 DocType: Employee,Emergency Contact,आपातकालीन संपर्क
 DocType: Item,Quality Parameters,गुणवत्ता के मानकों
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,धारावाहिक नहीं / बैच
 DocType: Product Bundle,Parent Item,मूल आइटम
 DocType: Account,Account Type,खाता प्रकार
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} ले अग्रेषित नहीं किया जा सकता प्रकार छोड़ दो
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
 DocType: Landed Cost Voucher,Purchase Receipt Items,रसीद वस्तुओं की खरीद
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,अनुकूलित प्रपत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,काटना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,सपाट
 DocType: Account,Income Account,आय खाता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ढलाई
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
-apps/frappe/frappe/desk/moduleview.py +61,Documents,दस्तावेज़
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ .......................
 DocType: Cost Center,Cost Center,लागत केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,वाउचर #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,वाउचर #
 DocType: Notification Control,Purchase Order Message,खरीद आदेश संदेश
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Upload Attendance,Upload HTML,HTML अपलोड
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","कुल अग्रिम ({0}) आदेश के खिलाफ {1} \
  अधिक से अधिक नहीं हो सकता महायोग से ({2})"
 DocType: Employee,Relieving Date,तिथि राहत
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस केवल स्टॉक एंट्री / डिलिवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Employee Education,Class / Percentage,/ कक्षा प्रतिशत
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,लेजर शुद्ध आकार देने इंजीनियर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","चयनित मूल्य निर्धारण नियम 'मूल्य' के लिए किया जाता है, यह मूल्य सूची लिख देगा। मूल्य निर्धारण नियम कीमत अंतिम कीमत है, ताकि आगे कोई छूट लागू किया जाना चाहिए। इसलिए, आदि बिक्री आदेश, खरीद आदेश तरह के लेनदेन में, बल्कि यह 'मूल्य सूची दर' क्षेत्र की तुलना में, 'दर' क्षेत्र में दिलवाया किया जाएगा।"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
-DocType: User,Bio,जैव
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,नए लागत केन्द्र का नाम
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,कोई डिफ़ॉल्ट पता खाका पाया. सेटअप> मुद्रण और ब्रांडिंग से एक नया एक> पता टेम्पलेट बनाने के लिए धन्यवाद.
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,एक्स्ट्रा लार्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,एक्स्ट्रा लार्ज
 ,Profit and Loss Statement,लाभ एवं हानि के विवरण
 DocType: Bank Reconciliation Detail,Cheque Number,चेक संख्या
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,दबाव
 DocType: Payment Tool Detail,Payment Tool Detail,भुगतान टूल विस्तार
 ,Sales Browser,बिक्री ब्राउज़र
 DocType: Journal Entry,Total Credit,कुल क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,स्थानीय
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ऋण और अग्रिम ( संपत्ति)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,देनदार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,बड़ा
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,कोई कर्मचारी पाया !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,बड़ा
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Purchase Order,Customer Address Display,ग्राहक पता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,चमकाने
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","आप पहले से ही एक और UoM के साथ कुछ लेन-देन (एस) बना दिया है क्योंकि \ मद के लिए माप की मूलभूत इकाई {0} सीधे नहीं बदला जा सकता। डिफ़ॉल्ट UoM को बदलने के लिए, \ उपयोग स्टॉक मॉड्यूल के तहत उपकरण &#39;UoM उपयोगिता बदलें&#39;।"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर दूसरे में एक मुद्रा में परिवर्तित करने के लिए निर्दिष्ट करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,कोटेशन {0} को रद्द कर दिया गया है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,कुल बकाया राशि
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,कर्मचारी {0} {1} को छुट्टी पर था . उपस्थिति को चिह्नित नहीं किया जा सकता .
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
 DocType: Production Order Operation,Make Time Log,समय लॉग बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,पुनःक्रमित मात्रा सेट करें
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,कंप्यूटर्स
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,विद्युत रासायनिक पीस
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,आप लेखांकन प्रविष्टियों शुरू होने से पहले सेटअप खातों की चार्ट कृपया
 DocType: Purchase Invoice,Ignore Pricing Rule,मूल्य निर्धारण नियम की अनदेखी
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,रद्द
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,वेतन ढांचे में दिनांक से कर्मचारी शामिल होने की तिथि से कम नहीं हो सकता।
 DocType: Employee Education,Graduate,परिवर्धित
 DocType: Leave Block List,Block Days,ब्लॉक दिन
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","आवर्ती चालान यदि जांच, अचयनित आवर्ती रोकने के लिए या उचित समाप्ति तिथि डाल"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,अधिकतम {0} पंक्तियों की अनुमति दी
 DocType: C-Form Invoice Detail,Net Total,शुद्ध जोड़
 DocType: Bin,FCFS Rate,FCFS दर
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),बिलिंग (सेल्स चालान)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,उद्देश्यों
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} कार्य केंद्र में किसी भी उपलब्ध काम के घंटे से अधिक समय तक {1}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,विद्युत मशीनिंग
 ,Requested,निवेदित
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,कोई टिप्पणी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,अतिदेय
 DocType: Account,Stock Received But Not Billed,स्टॉक प्राप्त लेकिन बिल नहीं
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,रूट खाते एक समूह होना चाहिए
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,सकल वेतन + बकाया राशि + नकदीकरण राशि कुल कटौती
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Features Setup,Sales and Purchase,बिक्री और खरीद
 DocType: Supplier Quotation Item,Material Request No,सामग्री अनुरोध नहीं
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,जिस पर दर ग्राहक की मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} इस सूची से सफलतापूर्वक सदस्यता वापस कर दिया गया है।
 DocType: Purchase Invoice Item,Net Rate (Company Currency),शुद्ध दर (कंपनी मुद्रा)
-apps/frappe/frappe/templates/base.html +134,Added,जोड़ा गया
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,टेरिटरी ट्री प्रबंधन .
 DocType: Journal Entry Account,Sales Invoice,बिक्री चालान
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,वित्त वर्ष {0} नहीं मिला।
 DocType: Bank Reconciliation,Get Relevant Entries,प्रासंगिक प्रविष्टियां प्राप्त करें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
-apps/frappe/frappe/desk/query_report.py +136,Total,संपूर्ण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त छूट पर लागू होते हैं
 DocType: Account,Root Type,जड़ के प्रकार
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},पंक्ति # {0}: अधिक से अधिक नहीं लौट सकते हैं {1} आइटम के लिए {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता निरीक्षण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,गठन स्प्रे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त छोटा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पी एल या बी एस
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,न्यूनतम सूची स्तर
 DocType: Stock Entry,Subcontract,उपपट्टा
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,निर्माता भाग संख्या
 DocType: Production Order Operation,Estimated Time and Cost,अनुमानित समय और लागत
 DocType: Bin,Bin,बिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,नाउज़िंग
 DocType: SMS Log,No of Sent SMS,भेजे गए एसएमएस की संख्या
 DocType: Account,Company,कंपनी
 DocType: Account,Expense Account,व्यय लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,सॉफ्टवेयर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,रंगीन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेयर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,रंगीन
 DocType: Maintenance Visit,Scheduled,अनुसूचित
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;नहीं&quot; और &quot;बिक्री मद है&quot; &quot;स्टॉक मद है&quot; कहाँ है &quot;हाँ&quot; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असमान महीने भर में लक्ष्य को वितरित करने के लिए मासिक वितरण चुनें।
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,आइटम पंक्ति {0}: {1} के ऊपर 'खरीद प्राप्तियां' तालिका में मौजूद नहीं है खरीद रसीद
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,परियोजना प्रारंभ दिनांक
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,जब तक
 DocType: Rename Tool,Rename Log,प्रवेश का नाम बदलें
 DocType: Installation Note Item,Against Document No,दस्तावेज़ के खिलाफ कोई
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,बिक्री भागीदारों की व्यवस्था करें.
 DocType: Quality Inspection,Inspection Type,निरीक्षण के प्रकार
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},कृपया चुनें {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,अनुसंधानकर्ता
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,अद्यतन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,अनुसंधानकर्ता
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,भेजने से पहले न्यूज़लेटर बचा लो
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,नाम या ईमेल अनिवार्य है
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,इनकमिंग गुणवत्ता निरीक्षण.
 DocType: Purchase Order Item,Returned Qty,लौटे मात्रा
 DocType: Employee,Exit,निकास
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,रूट प्रकार अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,रूट प्रकार अनिवार्य है
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,धारावाहिक नहीं {0} बनाया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,थरथानेवाला परिष्करण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ग्राहकों की सुविधा के लिए इन कोड प्रिंट स्वरूपों में चालान और वितरण नोट की तरह इस्तेमाल किया जा सकता है
 DocType: Employee,You can enter any date manually,आप किसी भी तारीख को मैन्युअल रूप से दर्ज कर सकते हैं
 DocType: Sales Invoice,Advertisement,विज्ञापन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,परिवीक्षाधीन अवधि
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,परिवीक्षाधीन अवधि
 DocType: Customer Group,Only leaf nodes are allowed in transaction,केवल पत्ता नोड्स के लेनदेन में की अनुमति दी जाती है
 DocType: Expense Claim,Expense Approver,व्यय अनुमोदनकर्ता
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
@@ -2385,55 +2200,51 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime करने के लिए
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,पिसाई
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,लपेटकर हटना
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,गतिविधियों में लंबित
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टि
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,प्रदायक> प्रदायक प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,राशि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,वित्तीय वर्ष का चयन करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,प्रगलन
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,वेतन गोलमाल अर्जन और कटौती पर आधारित है.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ खाता लेजर को परिवर्तित नहीं किया जा सकता है
 DocType: Address,Preferred Shipping Address,पसंदीदा शिपिंग पता
 DocType: Purchase Receipt Item,Accepted Warehouse,स्वीकार किए जाते हैं गोदाम
 DocType: Bank Reconciliation Detail,Posting Date,तिथि पोस्टिंग
 DocType: Item,Valuation Method,मूल्यन विधि
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} के लिए विनिमय दर मिल करने में असमर्थ {1}
 DocType: Sales Invoice,Sales Team,बिक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,प्रवेश डुप्लिकेट
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,प्रवेश डुप्लिकेट
 DocType: Serial No,Under Warranty,वारंटी के अंतर्गत
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[त्रुटि]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,शब्दों में दिखाई हो सकता है एक बार तुम बिक्री आदेश को बचाने के लिए होगा.
 ,Employee Birthday,कर्मचारी जन्मदिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,वेंचर कैपिटल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
 DocType: Pricing Rule,Discount Percentage,डिस्काउंट प्रतिशत
 DocType: Payment Reconciliation Invoice,Invoice Number,चालान क्रमांक
-apps/erpnext/erpnext/hooks.py +70,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,अनुमोदक छोड़ दो
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,सामग्री निर्माण के लिए हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""व्यय अनुमोदनकर्ता"" भूमिका के साथ एक उपयोगकर्ता"
 ,Issued Items Against Production Order,उत्पादन के आदेश के खिलाफ जारी किए गए आइटम
 DocType: Pricing Rule,Purchase Manager,खरीद प्रबंधक
 DocType: Payment Tool,Payment Tool,भुगतान टूल
 DocType: Target Detail,Target Detail,लक्ष्य विस्तार
-DocType: Sales Order,% of materials billed against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे बिल किया गया है
+DocType: Sales Order,% of materials billed against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे बिल किया गया है
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,अवधि समापन एंट्री
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अमान्य अवधि
 DocType: Customer,Credit Limit,साख सीमा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,लेन-देन प्रकार का चयन करें
 DocType: GL Entry,Voucher No,कोई वाउचर
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,पता और संपर्क
 DocType: Customer,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Employee,Feedback,प्रतिपुष्टि
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","पहले आवंटित नहीं किया जा सकता छोड़ दो {0}, छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है के रूप में {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint। अनुसूची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,घर्षण जेट मशीनिंग
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint। अनुसूची
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
-DocType: Website Settings,Website Settings,वेबसाइट सेटिंग
 DocType: Item,Reorder level based on Warehouse,गोदाम के आधार पर पुन: व्यवस्थित स्तर
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,उद्धार करने के लिए मात्रा
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,के लिए अनुरोध
 DocType: Quotation Item,Against Doctype,Doctype के खिलाफ
 DocType: Delivery Note,Track this Delivery Note against any Project,किसी भी परियोजना के खिलाफ इस डिलिवरी नोट हुए
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,रुट खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दिखाएँ स्टॉक प्रविष्टियां
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पतों का प्रबंधन
 DocType: Pricing Rule,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
-DocType: Communication,Phone,फ़ोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),समापन (डॉ.)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),समापन (डॉ.)
 DocType: Contact,Passive,निष्क्रिय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,लेनदेन को बेचने के लिए टैक्स टेम्पलेट .
@@ -2487,10 +2296,9 @@
 ,Billed Amount,बिल की राशि
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अपडेट प्राप्त करे
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द कर दिया है या बंद कर दिया गया है
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,प्रबंधन छोड़ दो
-DocType: Event,Groups,समूह
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाता द्वारा समूह
 DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
 DocType: Lead,Lower Income,कम आय
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,त्वरित मदद
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
 DocType: Features Setup,Sales Extras,बिक्री अतिरिक्त
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} खाते के लिए बजट {1} लागत केंद्र के खिलाफ {2} {3} से अधिक होगा
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} खाते के लिए बजट {1} लागत केंद्र के खिलाफ {2} {3} से अधिक होगा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य या मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,मिनट
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,मिनट
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 ,Qty to Receive,प्राप्त करने के लिए मात्रा
 DocType: Leave Block List,Leave Block List Allowed,छोड़ दो ब्लॉक सूची रख सकते है
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,रूपांतरण कारक भागों में नहीं किया जा सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,यदि आप लॉग इन करने के लिए इसका इस्तेमाल करेंगे
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,यदि आप लॉग इन करने के लिए इसका इस्तेमाल करेंगे
 DocType: Sales Partner,Retailer,खुदरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,वेतन पर्ची बनाओ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्जे
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,बहुत बढ़िया उत्पाद
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,बहुत बढ़िया उत्पाद
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं के रूप में छुट्टी स्वीकृत नहीं कर सकते
 DocType: Appraisal,Appraisal,मूल्यांकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,खोया-फोम कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ड्राइंग
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तिथि दोहराया है
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},छोड़ दो सरकारी गवाह से एक होना चाहिए {0}
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
 DocType: Workstation Working Hour,Start Time,समय शुरू
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
 DocType: BOM Operation,Hour Rate,घंटा दर
 DocType: Stock Settings,Item Naming By,द्वारा नामकरण आइटम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,से उद्धरण
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,से उद्धरण
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},अन्य समयावधि अंतिम लेखा {0} के बाद किया गया है {1}
 DocType: Production Order,Material Transferred for Manufacturing,सामग्री विनिर्माण के लिए स्थानांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाता {0} करता नहीं मौजूद है
 DocType: Purchase Receipt Item,Purchase Order Item No,आदेश आइटम नहीं खरीद
-DocType: System Settings,System Settings,सिस्टम सेटिंग्स
 DocType: Project,Project Type,परियोजना के प्रकार
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है .
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,विभिन्न गतिविधियों की लागत
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,रोकड़ शेष
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 DocType: Serial No,Is Cancelled,क्या Cancelled
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,मेरा लदान
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,मेरा लदान
 DocType: Journal Entry,Bill Date,बिल की तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
-DocType: Communication,Recipients,प्राप्तकर्ता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,पंगा लेना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,स्वीकृति स्थिति
 DocType: Hub Settings,Publish Items to Hub,हब के लिए आइटम प्रकाशित करें
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य से पंक्ति में मान से कम होना चाहिए {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर ट्रांसफर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बैंक खाते का चयन करें
 DocType: Newsletter,Create and Send Newsletters,बनाने और भेजने समाचार
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,दिनांक से पहले तिथि करने के लिए होना चाहिए
 DocType: Sales Order,Recurring Order,आवर्ती आदेश
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक समूह / ग्राहक
 DocType: Item Group,Check this if you want to show in website,यह जाँच लें कि आप वेबसाइट में दिखाना चाहते हैं
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext में आपका स्वागत है
+,Welcome to ERPNext,ERPNext में आपका स्वागत है
 DocType: Payment Reconciliation Payment,Voucher Detail Number,वाउचर विस्तार संख्या
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,कोटेशन के लिए लीड
 DocType: Lead,From Customer,ग्राहक से
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,कॉल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
 ,Projected,प्रक्षेपित
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},धारावाहिक नहीं {0} वेयरहाउस से संबंधित नहीं है {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,नोट : सिस्टम मद के लिए वितरण और अधिक से अधिक बुकिंग की जांच नहीं करेगा {0} मात्रा या राशि के रूप में 0 है
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,तिथि खुलने की
 DocType: Journal Entry,Remark,टिप्पणी
 DocType: Purchase Receipt Item,Rate and Amount,दर और राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,बोरिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,बिक्री आदेश से
-DocType: Blog Category,Parent Website Route,जनक वेबसाइट ट्रेन
 DocType: Sales Order,Not Billed,नहीं बिल
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,दोनों गोदाम एक ही कंपनी से संबंधित होना चाहिए
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,कोई संपर्क नहीं अभी तक जोड़ा।
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,सक्रिय नहीं
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,उतरा लागत वाउचर राशि
 DocType: Time Log,Batched for Billing,बिलिंग के लिए batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,विधेयकों आपूर्तिकर्ता द्वारा उठाए गए.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,छूट राशि
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,उदाहरणार्थ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आइटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,गठन गर्म धातु गैस
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
 DocType: Sales Invoice Item,Delivered Qty,वितरित मात्रा
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",टैक्स दर का उल्लेख उचित समूह (निधि&gt; मौजूदा देनदारियों&gt; करों और शुल्कों का आमतौर पर स्रोत पर जाएँ और प्रकार &#39;कर&#39; के) बाल जोड़ें पर क्लिक करके (एक नया खाता बनाने और करते हैं।
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,लेजर काटने
-DocType: Event,Monday,सोमवार
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Account,Payable,देय
 DocType: Salary Slip,Arrear Amount,बकाया राशि
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,जानकारी पता करने के लिए
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,बेचने या खरीदने का कम से कम एक का चयन किया जाना चाहिए
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,निर्माण कार्यों कहां किया जाता है।
-DocType: Page,All,सभी
 DocType: Stock Entry Detail,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
 DocType: Employee,Confirmation Date,पुष्टिकरण तिथि
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,बिक्री प्रयोक्ता
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,न्यूनतम मात्रा अधिकतम मात्रा से ज्यादा नहीं हो सकता
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,समूह
 DocType: Lead,Lead Owner,मालिक लीड
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,गोदाम की आवश्यकता है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,गोदाम की आवश्यकता है
 DocType: Employee,Marital Status,वैवाहिक स्थिति
 DocType: Stock Settings,Auto Material Request,ऑटो सामग्री अनुरोध
 DocType: Time Log,Will be updated when billed.,बिल भेजा जब अद्यतन किया जाएगा.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,खरीद आदेश आइटम की आपूर्ति
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,कंपनी का नाम कंपनी नहीं किया जा सकता
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट्स के लिए खिताब उदा प्रोफार्मा चालान .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ईमेल, फोन, चैट, यात्रा, आदि के सभी संचार के रिकार्ड"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,कंपनी में गोल लागत से केंद्र का उल्लेख करें
 DocType: Purchase Invoice,Terms,शर्तें
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,नई बनाएँ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,नई बनाएँ
 DocType: Buying Settings,Purchase Order Required,खरीदने के लिए आवश्यक आदेश
 ,Item-wise Sales History,आइटम के लिहाज से बिक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,कुल स्वीकृत राशि
 ,Purchase Analytics,खरीद विश्लेषिकी
 DocType: Sales Invoice Item,Delivery Note Item,डिलिवरी नोट आइटम
 DocType: Expense Claim,Task,कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,हजामत बनाने का काम
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बैच संख्या आइटम के लिए अनिवार्य है {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,यह एक रूट बिक्री व्यक्ति है और संपादित नहीं किया जा सकता है .
 ,Stock Ledger,स्टॉक लेजर
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},दर: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,वेतनपर्ची कटौती
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,नोट्स
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,पहले एक समूह नोड का चयन करें।
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,उनकी नवीनतम सूची की स्थिति के साथ सभी कच्चे माल युक्त रिपोर्ट डाउनलोड करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,सामना
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,सामुदायिक फोरम
 DocType: Leave Application,Leave Balance Before Application,आवेदन से पहले शेष छोड़ो
 DocType: SMS Center,Send SMS,एसएमएस भेजें
 DocType: Company,Default Letter Head,लेटर हेड चूक
 DocType: Time Log,Billable,बिल
-DocType: Authorization Rule,This will be used for setting rule in HR module,इस मॉड्यूल में मानव संसाधन सेटिंग शासन के लिए इस्तेमाल किया जाएगा
 DocType: Account,Rate at which this tax is applied,दर जिस पर इस कर को लागू किया जाता है
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder मात्रा
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,मौका खो दिया
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","डिस्काउंट फील्ड्स खरीद आदेश, खरीद रसीद, खरीद चालान में उपलब्ध हो जाएगा"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: ग्राहकों और आपूर्तिकर्ताओं के लिए खातों मत बनाएँ
-DocType: Report,Report Type,टाइप रिपोर्ट
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,लदान
 DocType: BOM Replace Tool,BOM Replace Tool,बीओएम बदलें उपकरण
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देश बुद्धिमान डिफ़ॉल्ट पता टेम्पलेट्स
 DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,शो कर तोड़-अप
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डाटा आयात और निर्यात
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',आप विनिर्माण गतिविधि में शामिल हैं .
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 DocType: Purchase Order Item,Material Request Detail No,सामग्री के लिए अनुरोध विस्तार नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,हार्ड मोड़
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,रखरखाव भेंट बनाओ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
 DocType: Company,Default Cash Account,डिफ़ॉल्ट नकद खाता
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","नोट: भुगतान किसी भी संदर्भ के खिलाफ नहीं बनाया गया है, तो मैन्युअल रूप जर्नल प्रविष्टि बनाते हैं।"
 DocType: Item,Supplier Items,प्रदायक आइटम
 DocType: Opportunity,Opportunity Type,अवसर प्रकार
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
 ,Stock Ageing,स्टॉक बूढ़े
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,भेजने से लेन-देन पर संपर्क करने के लिए स्वत: ईमेल भेजें।
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  उपलब्ध मात्रा: {4}, मात्रा स्थानांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
-DocType: Event,Sunday,रविवार
 DocType: Sales Team,Contribution (%),अंशदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जिम्मेदारियों
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,जिम्मेदारियों
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,तालिका में कम से कम 1 चालान दाखिल करें
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,उपयोगकर्ता जोड़ें
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,उपयोगकर्ता जोड़ें
 DocType: Pricing Rule,Item Group,आइटम समूह
 DocType: Task,Actual Start Date (via Time Logs),वास्तविक प्रारंभ तिथि (टाइम लॉग्स के माध्यम से)
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
 DocType: Item,Default BOM,Default बीओएम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
 DocType: Time Log Batch,Total Hours,कुल घंटे
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,मोटर वाहन
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आइटम आवश्यक है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,धातु इंजेक्शन मोल्डिंग
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिवरी नोट से
 DocType: Time Log,From Time,समय से
 DocType: Notification Control,Custom Message,कस्टम संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,निवेश बैंकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","अपने देश, समय क्षेत्र और मुद्रा का चयन करें"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,निवेश बैंकिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,नमकीन बनाना
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,सैंड कास्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,विद्युत
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,प्रशिक्षु
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,प्रशिक्षु
 DocType: Newsletter,A Lead with this email id should exist,इस ईमेल आईडी के साथ एक लीड मौजूद होना चाहिए
 DocType: Stock Entry,From BOM,बीओएम से
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,बुनियादी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,तिथि करने के लिए आधे दिन की छुट्टी के लिए तिथि से ही होना चाहिए
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
 DocType: Salary Structure,Salary Structure,वेतन संरचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","एकाधिक मूल्य नियम एक ही मापदंड के साथ मौजूद है, प्राथमिकता बताए द्वारा \
  संघर्ष का समाधान करें। मूल्य नियम: {0}"
 DocType: Account,Bank,बैंक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 DocType: Hub Settings,Access Token,एक्सेस टोकन
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,तय परिसंपत्ति मद है
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","यदि आप लंबे समय स्वरूपों मुद्रित किया है, इस सुविधा के लिए प्रत्येक पृष्ठ पर सभी हेडर और पाद लेख के साथ एकाधिक पृष्ठों पर मुद्रित विभाजित करने के लिए इस्तेमाल किया जा सकता है"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,सभी प्रदेशों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 DocType: Fiscal Year,Year Name,वर्ष नाम
 DocType: Process Payroll,Process Payroll,प्रक्रिया पेरोल
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
 DocType: Product Bundle Item,Product Bundle Item,उत्पाद बंडल आइटम
 DocType: Sales Partner,Sales Partner Name,बिक्री भागीदार नाम
 DocType: Purchase Invoice Item,Image View,छवि देखें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,फिनिशिंग और औद्योगिक परिष्करण
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,दिनांक से और
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,प्रतिभूति एवं कमोडिटी एक्सचेंजों
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,उड़ा ढलाई
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
 DocType: Tax Rule,Shipping City,शिपिंग शहर
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"इस मद {0} (खाका) का एक संस्करण है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक गुण टेम्पलेट से अधिक नकल की जाएगी"
 DocType: Account,Purchase User,क्रय उपयोगकर्ता
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,टंकण
-DocType: Web Page,Slideshow,स्लाइड शो
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,डिफ़ॉल्ट पता खाका हटाया नहीं जा सकता
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
 DocType: Journal Entry,Print Heading,शीर्षक प्रिंट
 DocType: Quotation,Maintenance Manager,रखरखाव प्रबंधक
-DocType: Workflow State,Search,खोजें
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,कुल शून्य नहीं हो सकते
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'आखिरी बिक्री आदेश को कितने दिन हुए' शून्य या उससे अधिक होना चाहिए 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,टांकना
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'आखिरी बिक्री आदेश को कितने दिन हुए' शून्य या उससे अधिक होना चाहिए
 DocType: C-Form,Amended From,से संशोधित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चे माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,कच्चे माल
 DocType: Leave Application,Follow via Email,ईमेल के माध्यम से पालन करें
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सबसे कम राशि के बाद टैक्स राशि
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,चाइल्ड खाता इस खाते के लिए मौजूद है. आप इस खाते को नष्ट नहीं कर सकते .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,लक्ष्य मात्रा या लक्ष्य राशि या तो अनिवार्य है
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
 DocType: Leave Control Panel,Carry Forward,आगे ले जाना
@@ -2862,45 +2631,44 @@
 ,Produced,उत्पादित
 DocType: Item,Item Code for Suppliers,आपूर्तिकर्ता के लिए आइटम कोड
 DocType: Issue,Raised By (Email),(ई) द्वारा उठाए गए
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,सामान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,लेटरहेड अटैच
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,सामान्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,लेटरहेड अटैच
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","अपने कर सिर सूची (जैसे वैट, सीमा शुल्क आदि, वे अद्वितीय नाम होना चाहिए) और उनके मानक दर। यह आप संपादित करें और अधिक बाद में जोड़ सकते हैं, जो एक मानक टेम्पलेट, पैदा करेगा।"
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","अपने कर सिर सूची (जैसे वैट, सीमा शुल्क आदि, वे अद्वितीय नाम होना चाहिए) और उनके मानक दर। यह आप संपादित करें और अधिक बाद में जोड़ सकते हैं, जो एक मानक टेम्पलेट, पैदा करेगा।"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
 DocType: Journal Entry,Bank Entry,बैंक एंट्री
 DocType: Authorization Rule,Applicable To (Designation),के लिए लागू (पद)
-DocType: Blog Post,Blog Post,ब्लॉग पोस्ट
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,समूह द्वारा
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ निष्क्रिय मुद्राओं सक्षम करें.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल व्यय
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राशि)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Purchase Order,The date on which recurring order will be stop,"आवर्ती आदेश रोक दिया जाएगा, जिस पर तारीख"
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} से कम किया जाना चाहिए या आप अतिप्रवाह सहिष्णुता में वृद्धि करनी चाहिए
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,कुल वर्तमान
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,घंटा
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,घंटा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन बनाएँ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,इन सभी मदों पहले से चालान कर दिया गया है
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} द्वारा अनुमोदित किया जा सकता
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
 DocType: BOM Replace Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
 DocType: Features Setup,Point of Sale,बिक्री के प्वाइंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,कर्लिंग
 DocType: Account,Tax,कर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},पंक्ति {0}: {1} एक मान्य नहीं है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,रिफाइनिंग
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},पंक्ति {0}: {1} एक मान्य नहीं है {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,उत्पाद बंडल से
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन योजना उपकरण
 DocType: Quality Inspection,Report Date,तिथि रिपोर्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,मार्ग
 DocType: C-Form,Invoices,चालान
 DocType: Job Opening,Job Title,कार्य शीर्षक
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} पहले से ही अवधि के लिए कर्मचारी {1} के लिए आवंटित {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} प्राप्तकर्ता
 DocType: Features Setup,Item Groups in Details,विवरण में आइटम समूह
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,अद्यतन दर और उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,आप मात्रा के खिलाफ और अधिक प्राप्त या वितरित करने के लिए अनुमति दी जाती प्रतिशत का आदेश दिया. उदाहरण के लिए: यदि आप 100 यूनिट का आदेश दिया है. और अपने भत्ता 10% तो आप 110 इकाइयों को प्राप्त करने के लिए अनुमति दी जाती है.
 DocType: Pricing Rule,Customer Group,ग्राहक समूह
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: Item,Website Description,वेबसाइट विवरण
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
 ,Sales Register,बिक्री रजिस्टर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
 DocType: Address,Plant,पौधा
-DocType: DocType,Setup,व्यवस्था
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,कोल्ड रोलिंग
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
 DocType: GL Entry,Against Voucher Type,वाउचर प्रकार के खिलाफ
 DocType: Item,Attributes,गुण
-DocType: Packing Slip,Get Items,आइटम पाने के लिए
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,आइटम पाने के लिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,पिछले आदेश की तिथि
-DocType: DocField,Image,छवि
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,उत्पाद शुल्क चालान बनाएं
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
-DocType: Communication,Other,अन्य
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आईडी सेट नहीं
 DocType: Production Order,Planned Start Date,नियोजित प्रारंभ दिनांक
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint। भेंट
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint। भेंट
 DocType: Leave Type,Is Encash,तुड़ाना है
 DocType: Purchase Invoice,Mobile No,नहीं मोबाइल
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रविष्टि बनाने
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,परियोजना के लिहाज से डेटा उद्धरण के लिए उपलब्ध नहीं है
 DocType: Project,Expected End Date,उम्मीद समाप्ति तिथि
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन टेम्पलेट शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,वाणिज्यिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,मूल आइटम {0} एक शेयर मद नहीं होना चाहिए
 DocType: Cost Center,Distribution Id,वितरण आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,बहुत बढ़िया सेवाएं
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,सभी उत्पादों या सेवाओं.
 DocType: Purchase Invoice,Supplier Address,प्रदायक पता
-DocType: Contact Us Settings,Address Line 2,पता पंक्ति 2
-DocType: ToDo,Reference,संदर्भ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,सीरीज अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} को {2} की वेतन वृद्धि में {3}
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,सीआर
 DocType: Customer,Default Receivable Accounts,प्राप्य लेखा चूक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,काटने का कार्य
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,हस्तांतरण
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,/ रिसी डी से भुगतान
 DocType: Naming Series,Setup Series,सेटअप सीरीज
 DocType: Supplier,Contact HTML,संपर्क HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,खुदरा
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} मौजूद नहीं है
 DocType: Attendance,Absent,अनुपस्थित
-DocType: Product Bundle,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,उत्पाद बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,क्रशिंग
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
 DocType: GL Entry,Remarks,टिप्पणियाँ
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
 DocType: Features Setup,POS View,स्थिति देखें
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,निरंतर ढलाई
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,कृपया बताएं एक
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ऊपर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,शीत नौकरशाही का आकार घटाने
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक समूह नहीं हो सकता
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
 DocType: Holiday List,Weekly Off,ऑफ साप्ताहिक
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","जैसे 2012, 2012-13 के लिए"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),अनंतिम लाभ / हानि (क्रेडिट)
 DocType: Sales Invoice,Return Against Sales Invoice,के खिलाफ बिक्री चालान लौटें
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,आइटम 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},कंपनी में डिफ़ॉल्ट मान {0} सेट करें {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},कंपनी में डिफ़ॉल्ट मान {0} सेट करें {1}
 DocType: Serial No,Creation Time,निर्माण का समय
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,कुल मुनाफा
 DocType: Sales Invoice,Product Bundle Help,उत्पाद बंडल सहायता
 ,Monthly Attendance Sheet,मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,कोई रिकॉर्ड पाया
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: लागत केंद्र मद के लिए अनिवार्य है {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,खाते {0} निष्क्रिय है
 DocType: GL Entry,Is Advance,अग्रिम है
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,तिथि करने के लिए तिथि और उपस्थिति से उपस्थिति अनिवार्य है
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,डालें हाँ या नहीं के रूप में ' subcontracted है '
 DocType: Sales Team,Contact No.,सं संपर्क
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' लाभ और हानि ' प्रकार खाते {0} एंट्री खुलने में अनुमति नहीं
-DocType: Workflow State,Time,समय
 DocType: Features Setup,Sales Discounts,बिक्री छूट
 DocType: Hub Settings,Seller Country,विक्रेता देश
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
 DocType: Sales Invoice,Terms and Conditions Details,नियमों और शर्तों के विवरण
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,बिक्री करों और शुल्कों खाका
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,परिधान और सहायक उपकरण
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,परिधान और सहायक उपकरण
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,आदेश की संख्या
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML बैनर / कि उत्पाद सूची के शीर्ष पर दिखाई देगा.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,शिपिंग राशि की गणना करने के लिए शर्तों को निर्दिष्ट
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,बाल जोड़ें
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका जमे लेखा एवं संपादित जमे प्रविष्टियां सेट करने की अनुमति
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,यह बच्चे नोड्स के रूप में खाता बही के लिए लागत केंद्र बदला नहीं जा सकता
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,रूपांतरण कारक की आवश्यकता है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,सीरियल #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,बिक्री पर कमीशन
 DocType: Offer Letter Term,Value / Description,मूल्य / विवरण
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,ग्राहकों को लंबे समय से खरीद नहीं
 DocType: Production Order,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,उभड़ा हुआ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीकरणीय पैटर्न कास्टिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,मनोरंजन खर्च
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,बिक्री चालान {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,बिक्री चालान {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,आयु
 DocType: Time Log,Billing Amount,बिलिंग राशि
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,आइटम के लिए निर्दिष्ट अमान्य मात्रा {0} . मात्रा 0 से अधिक होना चाहिए .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,छुट्टी के लिए आवेदन.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,मौजूदा लेन - देन के साथ खाता हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,विधि व्यय
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Sales Invoice,Posting Time,बार पोस्टिंग
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नया ग्राहक राजस्व
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,यात्रा व्यय
 DocType: Maintenance Visit,Breakdown,भंग
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,खाता: {0} मुद्रा के साथ: {1} चयनित नहीं किया जा सकता
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
-DocType: Feed,Full Name,पूरा नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,जकड़ना
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,परिवीक्षा
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,डिफ़ॉल्ट गोदाम स्टॉक मद के लिए अनिवार्य है .
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महीने के वेतन का भुगतान {0} और वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,कुल भुगतान की गई राशि
 ,Transferred Qty,मात्रा तबादला
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नेविगेट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,आयोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,आयोजन
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,समय लॉग बैच बनाना
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,जारी किया गया
 DocType: Project,Total Billing Amount (via Time Logs),कुल बिलिंग राशि (टाइम लॉग्स के माध्यम से)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,हम इस आइटम बेचने
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,हम इस आइटम बेचने
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,आपूर्तिकर्ता आईडी
 DocType: Journal Entry,Cash Entry,कैश एंट्री
 DocType: Sales Partner,Contact Desc,संपर्क जानकारी
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,आइटम प्रबंधक
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,पंक्तियाँ जोड़ें लेखा पर वार्षिक बजट निर्धारित.
 DocType: Buying Settings,Default Supplier Type,डिफ़ॉल्ट प्रदायक प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,उत्खनन
 DocType: Production Order,Total Operating Cost,कुल परिचालन लागत
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,नोट : आइटम {0} कई बार प्रवेश किया
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सभी संपर्क.
 DocType: Newsletter,Test Email Id,टेस्ट ईमेल आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी संक्षिप्त
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी संक्षिप्त
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,आप गुणवत्ता निरीक्षण का पालन करें .
 DocType: GL Entry,Party Type,पार्टी के प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,कच्चे माल के मुख्य मद के रूप में ही नहीं हो सकता
 DocType: Item Attribute Value,Abbreviation,संक्षिप्त
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} सीमा से अधिक के बाद से Authroized नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,घूर्णी ढलाई
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,वेतन टेम्पलेट मास्टर .
 DocType: Leave Type,Max Days Leave Allowed,अधिकतम दिन छोड़ने की अनुमति दी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,शॉपिंग कार्ट के लिए सेट कर नियम
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
 ,Territory Target Variance Item Group-Wise,क्षेत्र को लक्षित विचरण मद समूहवार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सभी ग्राहक समूहों
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,टैक्स खाका अनिवार्य है।
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: माता पिता के खाते {1} मौजूद नहीं है
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),मूल्य सूची दर (कंपनी मुद्रा)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंदीदा बिलिंग पता
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Serial No,Distinct unit of an Item,एक आइटम की अलग इकाई
 DocType: Pricing Rule,Buying,क्रय
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रिकॉर्ड्स द्वारा पैदा किए जाने की
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
 DocType: Purchase Order Item,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्री
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद कर दिया है
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,आगामी कार्यक्रम
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक की आवश्यकता है
-DocType: Letter Head,Letter Head,पत्रशीर्ष
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,त्वरित एंट्री
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} वापसी के लिए अनिवार्य है
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,फिटिंग हटना
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,आय / व्यय
 DocType: Employee,Personal Email,व्यक्तिगत ईमेल
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,कुल विचरण
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,कुल विचरण
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","यदि सक्रिय है, प्रणाली स्वतः सूची के लिए लेखांकन प्रविष्टियों के बाद होगा."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,दलाली
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
 DocType: Address,Postal Code,डाक कोड
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","मिनट में 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Hub Settings,Name Token,नाम टोकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,मानक बेच
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,मानक बेच
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 DocType: Serial No,Out of Warranty,वारंटी के बाहर
 DocType: BOM Replace Tool,Replace,बदलें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,उपाय की मूलभूत इकाई दर्ज करें
 DocType: Purchase Invoice Item,Project Name,इस परियोजना का नाम
 DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
-DocType: Workflow State,Edit,संपादित करें
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Features Setup,Item Batch Nos,आइटम बैच Nos
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भुगतान सुलह भुगतान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर संपत्ति
 DocType: BOM Item,BOM No,नहीं बीओएम
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रविष्टि {0} {1} या पहले से ही अन्य वाउचर के खिलाफ मिलान खाता नहीं है
 DocType: Item,Moving Average,चलायमान औसत
 DocType: BOM Replace Tool,The BOM which will be replaced,बीओएम जो प्रतिस्थापित किया जाएगा
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नया स्टॉक UOM मौजूदा स्टॉक UOM से अलग होना चाहिए
 DocType: Account,Debit,नामे
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,पत्तियां 0.5 के गुणकों में आवंटित किया जाना चाहिए
 DocType: Production Order,Operation Cost,संचालन लागत
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,. Csv फ़ाइल से उपस्थिति अपलोड करें
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बकाया राशि
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,डिफ़ॉल्ट लागत केंद्र
 DocType: Purchase Invoice,End Date,समाप्ति तिथि
 DocType: Employee,Internal Work History,आंतरिक कार्य इतिहास
-DocType: DocField,Column Break,स्तंभ विराम
-DocType: Event,Thursday,बृहस्पतिवार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,निजी इक्विटी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,टर्निंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
 DocType: Sales Invoice,Exhibition,प्रदर्शनी
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,पर Held
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आइटम
 ,Employee Information,कर्मचारी जानकारी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),दर (% )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),दर (% )
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),वेतन (LWP) के बिना छुट्टी लिए कमाई कम करें
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},नोट : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,इस सप्ताह की सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} पंक्ति में एक खरीदे या उप अनुबंधित आइटम होना चाहिए {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,प्रसव की तारीख
-DocType: DocField,Currency,मुद्रा
 DocType: Opportunity,Opportunity Date,अवसर तिथि
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरीद रसीद के खिलाफ लौटें
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% का आदेश दिया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ठेका
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ठेका
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,औसत। क्रय दर
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
 DocType: Employee,History In Company,कंपनी में इतिहास
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
 DocType: SMS Settings,SMS Settings,एसएमएस सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,अस्थाई लेखा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,काली
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Account,Auditor,आडिटर
 DocType: Purchase Order,End date of current order's period,वर्तमान आदेश की अवधि की समाप्ति की तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,प्रस्ताव पत्र बनाओ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,वापसी
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
-DocType: DocField,Fold,गुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,संस्करण के लिए उपाय की मूलभूत इकाई टेम्पलेट के रूप में ही किया जाना चाहिए
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,कृपया बताएं
 DocType: Task,Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आईडी
-DocType: Page,Page Name,पेज का नाम
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,समय समय से की तुलना में अधिक से अधिक होना चाहिए
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},वेयरहाउस {0}: माता पिता के खाते {1} कंपनी को Bolong नहीं है {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,तकला परिष्करण
 DocType: BOM,Last Purchase Rate,पिछले खरीद दर
 DocType: Account,Asset,संपत्ति
 DocType: Project Task,Task ID,टास्क आईडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",उदाहरणार्थ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",उदाहरणार्थ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आइटम के लिए मौजूद नहीं कर सकते स्टॉक {0} के बाद से वेरिएंट है
 ,Sales Person-wise Transaction Summary,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
-DocType: System Settings,Time Zone,समय क्षेत्र
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हब के लिए रजिस्टर
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण प्रतिशत
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को इस डिलिवरी नोट के सहारे सुपुर्द किया गया है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,स्टैपल
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को इस डिलिवरी नोट के सहारे सुपुर्द किया गया है
 DocType: Customer,Customer Details,ग्राहक विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,आकार देने
 DocType: Employee,Reports to,करने के लिए रिपोर्ट
 DocType: SMS Settings,Enter url parameter for receiver nos,रिसीवर ओपन स्कूल के लिए url पैरामीटर दर्ज करें
 DocType: Sales Invoice,Paid Amount,राशि भुगतान
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',खाते {0} समापन प्रकार की देयता ' का होना चाहिए
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","खाते की शेष राशि पहले से ही डेबिट में है, कृपया आप शेष राशि को क्रेडिट के रूप में ही रखें"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता प्रबंधन
 DocType: Production Planning Tool,Filter based on customer,ग्राहकों के आधार पर फ़िल्टर
 DocType: Payment Tool Detail,Against Voucher No,वाउचर नहीं अगेंस्ट
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 DocType: Tax Rule,Purchase,क्रय
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शेष मात्रा
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शेष मात्रा
 DocType: Item Group,Parent Item Group,माता - पिता आइटम समूह
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} के लिए {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,लागत केन्द्रों
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,गोदामों .
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,गोदामों .
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,दर जिस पर आपूर्तिकर्ता मुद्रा कंपनी के बेस मुद्रा में परिवर्तित किया जाता है
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},पंक्ति # {0}: पंक्ति के साथ स्थिति संघर्षों {1}
 DocType: Opportunity,Next Contact,अगले संपर्क
 DocType: Employee,Employment Type,रोजगार के प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थायी संपत्तियाँ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,आवेदन की अवधि दो alocation अभिलेखों के पार नहीं किया जा सकता
 DocType: Item Group,Default Expense Account,डिफ़ॉल्ट व्यय खाते
 DocType: Employee,Notice (days),सूचना (दिन)
-DocType: Page,Yes,हां
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
 DocType: Employee,Encashment Date,नकदीकरण तिथि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","वाउचर के खिलाफ प्रकार की खरीद के आदेश की एक, खरीद चालान या जर्नल प्रविष्टि होना चाहिए"
 DocType: Account,Stock Adjustment,शेयर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},डिफ़ॉल्ट गतिविधि लागत गतिविधि प्रकार के लिए मौजूद है - {0}
 DocType: Production Order,Planned Operating Cost,नियोजित परिचालन लागत
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,नई {0} नाम
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},मिल कृपया संलग्न {0} # {1}
 DocType: Job Applicant,Applicant Name,आवेदक के नाम
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / मद का नाम
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},सीरियल मद के लिए अनिवार्य है {0}
 DocType: Item Variant Attribute,Attribute,गुण
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,सीमा होती है / से निर्दिष्ट करें
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,द्वारा बनाया गया
 DocType: Serial No,Under AMC,एएमसी के तहत
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,आइटम वैल्यूएशन दर उतरा लागत वाउचर राशि पर विचार पुनर्गणना है
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,लेनदेन को बेचने के लिए डिफ़ॉल्ट सेटिंग्स .
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,न्यूनतम राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन तैयार माल
 DocType: Workstation,per hour,प्रति घंटा
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},सीरीज {0} पहले से ही प्रयोग किया जाता में {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,गोदाम ( सदा सूची ) के लिए खाते में इस खाते के तहत बनाया जाएगा .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,राशि का भुगतान
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,परियोजना प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
 DocType: Customer,Default Taxes and Charges,डिफ़ॉल्ट करों और शुल्कों
 DocType: Account,Receivable,प्राप्य
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
 DocType: Sales Invoice,Supplier Reference,प्रदायक संदर्भ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","अगर चेक्ड उप विधानसभा आइटम के लिए बीओएम कच्चे माल प्राप्त करने के लिए विचार किया जाएगा. अन्यथा, सभी उप विधानसभा वस्तुओं एक कच्चे माल के रूप में इलाज किया जाएगा."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,विक्रेता विवरण
 DocType: Employee Education,Qualification,योग्यता
 DocType: Item Price,Item Price,मद मूल्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,साबुन और डिटर्जेंट
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर और वीडियो
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी के गोदामों में याद आ रही है {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,स्टॉक UOM बदलें उपयोगिता
 DocType: POS Profile,Terms and Conditions,नियम और शर्तें
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तिथि वित्तीय वर्ष के भीतर होना चाहिए. तिथि करने के लिए मान लिया जाये = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","यहाँ आप ऊंचाई, वजन, एलर्जी, चिकित्सा चिंताओं आदि बनाए रख सकते हैं"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,उत्पादन के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
 DocType: Project Task,View Task,देखें टास्क
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,आपकी वित्तीय वर्ष को शुरू होता है
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,आपकी वित्तीय वर्ष को शुरू होता है
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,खरीद रसीद दर्ज करें
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),समर्थन ईमेल आईडी के लिए सेटअप आवक सर्वर . (जैसे support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,तिथि करने के लिए आवश्यक है
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,तिथि करने के लिए आवश्यक है
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित किए जाने के लिए निकल जाता है पैकिंग उत्पन्न करता है। पैकेज संख्या, पैकेज सामग्री और अपने वजन को सूचित किया।"
 DocType: Sales Invoice Item,Sales Order Item,बिक्री आदेश आइटम
 DocType: Salary Slip,Payment Days,भुगतान दिन
 DocType: BOM,Manage cost of operations,संचालन की लागत का प्रबंधन
 DocType: Features Setup,Item Advanced,आइटम उन्नत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,हॉट रोलिंग
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",", एक चेक किए गए लेनदेन के किसी भी &quot;प्रस्तुत कर रहे हैं&quot; पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में &quot;संपर्क&quot; के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,वैश्विक सेटिंग्स
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
 DocType: Salary Slip,Net Pay,शुद्ध वेतन
 DocType: Account,Account,खाता
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,धारावाहिक नहीं {0} पहले से ही प्राप्त हो गया है
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,बिक्री टीम विवरण
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,बीमारी छुट्टी
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},अमान्य {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,बीमारी छुट्टी
 DocType: Email Digest,Email Digest,ईमेल डाइजेस्ट
 DocType: Delivery Note,Billing Address Name,बिलिंग पता नाम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,विभाग के स्टोर
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,सिस्टम बैलेंस
-DocType: Workflow,Is Active,सक्रिय है
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग के स्टोर
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,सिस्टम बैलेंस
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहले दस्तावेज़ को सहेजें।
 DocType: Account,Chargeable,प्रभार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,बदले संक्षिप्त
-DocType: Workflow State,Primary,प्राथमिक
 DocType: Expense Claim Detail,Expense Date,व्यय तिथि
 DocType: Item,Max Discount (%),अधिकतम डिस्काउंट (%)
-DocType: Communication,More Information,अधिक जानकारी
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,अंतिम आदेश राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,नष्ट करना
 DocType: Company,Warn,चेतावनी देना
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,आइटम वैल्यूएशन अद्यतन
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
 DocType: BOM,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Order,Raw Materials Supplied,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट प्रारूप
-DocType: Communication,Series,कई
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
-DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यापार विकास प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यापार विकास प्रबंधक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,रखरखाव भेंट प्रयोजन
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,अवधि
 ,General Ledger,सामान्य खाता
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,पहला {0} का चयन करें
 DocType: Features Setup,To get Item Group in details table,विवरण तालिका में आइटम समूह
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,नक़्क़ाशी
 DocType: Sales Invoice,Commission,आयोग
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3203,7 @@
  {% अगर email_id%} ईमेल: {{email_id}} & lt; br & जी.टी. ; {% endif -%} 
  </ कोड> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,चूक की राशि
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,इस महीने की सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता निरीक्षण पढ़ना
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक उम्र रुक स्टॉक `% d दिनों से कम होना चाहिए .
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
 DocType: Payment Tool,Get Outstanding Vouchers,बकाया वाउचर जाओ
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
 DocType: Appraisal,Start Date,प्रारंभ दिनांक
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,मूल्य
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक अवधि के लिए पत्तियों का आवंटन .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करने के लिए यहां क्लिक करें
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,सप्लायर द्वारा लिया गया औसत समय देने के लिए
 DocType: Time Log,Hours,घंटे
 DocType: Project,Expected Start Date,उम्मीद प्रारंभ दिनांक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,रोलिंग
-DocType: ToDo,Priority,प्राथमिकता
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
-DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स उपयोग की अनुमति दी
-DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. एपीआई smsgateway.com / / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूरी तरह से पूरा
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षिक योग्यता
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} सफलतापूर्वक हमारे न्यूज़लेटर की सूची में जोड़ा गया है।
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम मशीनिंग
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,मुख्य रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,शेयर लेजर अद्यतन शेष प्रविष्टियों
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य रिपोर्ट
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,लागत केंद्र के चार्ट
 ,Requested Items To Be Ordered,आदेश दिया जा करने के लिए अनुरोध आइटम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,मेरे आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,मेरे आदेश
 DocType: Price List,Price List Name,मूल्य सूची का नाम
 DocType: Time Log,For Manufacturing,विनिर्माण के लिए
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,योग
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,योग
 DocType: BOM,Manufacturing,विनिर्माण
 ,Ordered Items To Be Delivered,हिसाब से दिया जा आइटम
 DocType: Account,Income,आय
-,Setup Wizard,सेटअप विज़ार्ड
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,कुछ गलत हो गया!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूरा करने की तिथि
 DocType: Purchase Invoice Item,Amount (Company Currency),राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,कास्टिंग मरो
-DocType: Email Alert,Reference Date,संदर्भ तिथि
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,वैध मोबाइल नंबर दर्ज करें
 DocType: Budget Detail,Budget Detail,बजट विस्तार
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,भेजने से पहले संदेश प्रविष्ट करें
-DocType: Async Task,Status,हैसियत
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},शेयर UOM आइटम के लिए अद्यतन {0}
-DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,एसएमएस सेटिंग को अपडेट करें
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,पहले से ही बिल भेजा टाइम प्रवेश {0}
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,धारावाहिक नहीं सेवा अनुबंध समाप्ति
 DocType: Item,Unit of Measure Conversion,उपाय रूपांतरण की इकाई
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदला नहीं जा सकता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
 DocType: Naming Series,Help HTML,HTML मदद
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},भत्ता खत्म-{0} मद के लिए पार कर लिए {1}
 DocType: Address,Name of person or organization that this address belongs to.,कि इस पते पर संबधित व्यक्ति या संगठन का नाम.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,अपने आपूर्तिकर्ताओं
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,अपने आपूर्तिकर्ताओं
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,एक और वेतन ढांचे {0} कर्मचारी के लिए सक्रिय है {1}। अपनी स्थिति को 'निष्क्रिय' आगे बढ़ने के लिए करें।
 DocType: Purchase Invoice,Contact,संपर्क
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,से प्राप्त
 DocType: Features Setup,Exports,निर्यात
 DocType: Lead,Converted,परिवर्तित
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} के लिए {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 DocType: Issue,Content Type,सामग्री प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,कंप्यूटर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आइटम: {0} सिस्टम में मौजूद नहीं है
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Cost Center,Budgets,बजट
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,अद्यतित
 DocType: Employee,Emergency Contact Details,आपातकालीन सम्पर्क करने का विवरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,यह क्या करता है?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,यह क्या करता है?
 DocType: Delivery Note,To Warehouse,गोदाम के लिए
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} अधिक वित्तीय वर्ष के लिए एक बार से अधिक दर्ज किया गया है {1}
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,विद्युत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,विद्युत
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},यूजर आईडी कर्मचारी के लिए सेट नहीं {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,वारंटी दावे से
 DocType: Stock Entry,Default Source Warehouse,डिफ़ॉल्ट स्रोत वेअरहाउस
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,दिनों से पिछले आदेश
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,दिनों से पिछले आदेश
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
-DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेयर एसेट्स
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},आप वास्तव में {0} और वर्ष {1} माह के लिए सभी वेतन पर्ची प्रस्तुत करना चाहते हैं
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,आयात सदस्य
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,पेश
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
 DocType: Notification Control,Sales Invoice Message,बिक्री चालान संदेश
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} समापन प्रकार दायित्व / इक्विटी का होना चाहिए
 DocType: Authorization Rule,Based On,के आधार पर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,परियोजना / कार्य कार्य.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,वेतन स्लिप्स उत्पन्न
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} एक मान्य ईमेल आईडी नहीं है
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","लागू करने के लिए के रूप में चुना जाता है तो खरीदना, जाँच की जानी चाहिए {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सबसे कम से कम 100 होना चाहिए
-DocType: ToDo,Low,निम्न
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,कताई
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,अभियान का नाम आवश्यक है
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Receipt Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,गहरी ड्राइंग
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नई न्यूज़लेटर
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,दिखाएँ बैलेंस
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,राशि
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
 ,Sales Analytics,बिक्री विश्लेषिकी
 DocType: Manufacturing Settings,Manufacturing Settings,विनिर्माण सेटिंग्स
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,नया खाता नाम
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चे माल की लागत की आपूर्ति
 DocType: Selling Settings,Settings for Selling Module,मॉड्यूल बेचना के लिए सेटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
 DocType: Item,Thumbnail,थंबनेल
 DocType: Item Customer Detail,Item Customer Detail,आइटम ग्राहक विस्तार
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,आपके ईमेल की पुष्टि करें
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ऑफर उम्मीदवार एक नौकरी।
 DocType: Notification Control,Prompt for Email on Submission of,प्रस्तुत करने पर ईमेल के लिए संकेत
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,कुल आवंटित पत्ते अवधि में दिनों की तुलना में अधिक कर रहे हैं
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगति गोदाम में डिफ़ॉल्ट वर्क
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} के लिए आवश्यक है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,वैक्यूम मोल्डिंग
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
-DocType: Contact Us Settings,City,शहर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,अल्ट्रासोनिक मशीनिंग
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटि: नहीं एक वैध पहचान?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आइटम {0} एक बिक्री आइटम होना चाहिए
 DocType: Naming Series,Update Series Number,अद्यतन सीरीज नंबर
 DocType: Account,Equity,इक्विटी
 DocType: Sales Order,Printing Details,मुद्रण विवरण
 DocType: Task,Closing Date,तिथि समापन
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,इंजीनियर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,इंजीनियर
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,खोज उप असेंबलियों
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
 DocType: Sales Partner,Partner Type,साथी के प्रकार
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise डिस्काउंट
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
 DocType: Production Order,Production Order,उत्पादन का आदेश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले से ही प्रस्तुत किया गया है
 DocType: Quotation Item,Against Docname,Docname खिलाफ
 DocType: SMS Center,All Employee (Active),सभी कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,अब देखें
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,कच्चे माल की लागत
 DocType: Item,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,सीरीज नवीनीकृत
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,रिपोर्ट प्रकार अनिवार्य है
 DocType: Item,Serial Number Series,सीरियल नंबर सीरीज
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},गोदाम स्टॉक मद के लिए अनिवार्य है {0} पंक्ति में {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,खुदरा और थोक
 DocType: Issue,First Responded On,पर पहले जवाब
 DocType: Website Item Group,Cross Listing of Item in multiple groups,कई समूहों में आइटम के क्रॉस लिस्टिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,पहले उपयोगकर्ता : आप
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,पहले उपयोगकर्ता : आप
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,सफलतापूर्वक राज़ी
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,सफलतापूर्वक राज़ी
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
 DocType: Tax Rule,Validity,वैधता
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,चालान राशि
 DocType: Attendance,Attendance,उपस्थिति
-DocType: Page,No,नहीं
 DocType: BOM,Materials,सामग्री
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","अगर जाँच नहीं किया गया है, इस सूची के लिए प्रत्येक विभाग है जहां इसे लागू किया गया है के लिए जोड़ा जा होगा."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,पोस्ट दिनांक और पोस्टिंग समय अनिवार्य है
@@ -3764,55 +3451,46 @@
 ,Item Prices,आइटम के मूल्य
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,शब्दों में दिखाई हो सकता है एक बार आप खरीद आदेश को बचाने के लिए होगा.
 DocType: Period Closing Voucher,Period Closing Voucher,अवधि समापन वाउचर
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,मूल्य सूची मास्टर .
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,मूल्य सूची मास्टर .
 DocType: Task,Review Date,तिथि की समीक्षा
 DocType: Purchase Invoice,Advance Payments,अग्रिम भुगतान
-DocType: DocPerm,Level,स्तर
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,पंक्ति में लक्ष्य गोदाम {0} के रूप में ही किया जाना चाहिए उत्पादन का आदेश
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,पिसाई
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोई अनुमति नहीं भुगतान उपकरण का उपयोग करने के लिए
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% की आवर्ती के लिए निर्दिष्ट नहीं 'सूचना ईमेल पते'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,मुद्रा कुछ अन्य मुद्रा का उपयोग प्रविष्टियों करने के बाद बदला नहीं जा सकता
 DocType: Company,Round Off Account,खाता बंद दौर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासन - व्यय
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,परामर्श
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,परामर्श
 DocType: Customer Group,Parent Customer Group,माता - पिता ग्राहक समूह
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,परिवर्तन
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदाहरणार्थ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदाहरणार्थ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,नोटिस की अवधि
 DocType: Bank Reconciliation Detail,Voucher ID,वाउचर आईडी
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,यह एक जड़ क्षेत्र है और संपादित नहीं किया जा सकता है .
 DocType: Packing Slip,Gross Weight UOM,सकल वजन UOM
 DocType: Email Digest,Receivables / Payables,प्राप्तियों / देय
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,मुद्रांकन
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 DocType: Task,Actual End Date (via Time Logs),वास्तविक अंत की तारीख (टाइम लॉग्स के माध्यम से)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,माता - पिता लागत केंद्र दर्ज करें
 DocType: Delivery Note,Print Without Amount,राशि के बिना प्रिंट
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
-DocType: User,Last Name,सरनेम
-DocType: Web Page,Left,वाम
-DocType: Event,All Day,सभी दिन
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
 DocType: Issue,Support Team,टीम का समर्थन
 DocType: Appraisal,Total Score (Out of 5),कुल स्कोर (5 से बाहर)
-DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बैच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,संतुलन
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,संतुलन
 DocType: Project,Total Expense Claim (via Expense Claims),कुल खर्च दावा (खर्च का दावा के माध्यम से)
-DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट नोट
 DocType: Stock Entry,As per Stock UOM,स्टॉक UOM के अनुसार
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,नहीं समाप्त हो
@@ -3826,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,मूल्यों पर आधारित लेनदेन को प्रतिबंधित करने के नियम बनाएँ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
 DocType: Purchase Invoice,Total Advance,कुल अग्रिम
-DocType: Workflow State,User,उपयोगकर्ता
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,प्रसंस्करण पेरोल
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,खोया के रूप में सेट करें
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भुगतान रसीद नोट
 DocType: Customer,Credit Days Based On,क्रेडिट दिनों पर आधारित
 DocType: Tax Rule,Tax Rule,टैक्स नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,बिक्री चक्र के दौरान एक ही दर बनाए रखें
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,कार्य केंद्र के कार्य के घंटे के बाहर समय लॉग्स की योजना बनाएँ।
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} पहले से ही प्रस्तुत किया गया है
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
-DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Time Log,Billing Rate based on Activity Type (per hour),गतिविधि प्रकार के आधार पर बिलिंग दर (प्रति घंटा)
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आईडी नहीं मिला , इसलिए नहीं भेजा मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 DocType: Production Planning Tool,Filter based on item,आइटम के आधार पर फ़िल्टर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
 DocType: Purchase Common,Purchase Common,आम खरीद
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} संशोधित किया गया है . ताज़ा करें.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,मौके से
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ब्लैंकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
-DocType: DocField,Default,चूक
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोड़े
 DocType: Maintenance Schedule,Schedule,अनुसूची
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","इस लागत केंद्र के लिए बजट को परिभाषित करें। बजट कार्रवाई निर्धारित करने के लिए, देखने के लिए &quot;कंपनी सूची&quot;"
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Expense Claim,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;हाँ&quot; का चयन जो कोई मास्टर सीरियल में देखा जा सकता है इस मद की प्रत्येक इकाई के लिए एक अद्वितीय पहचान दे देंगे.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
 DocType: Address,Office,कार्यालय
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक रिपोर्ट
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक टैक्स खाता बनाने के लिए
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,व्यय खाते में प्रवेश करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
 DocType: Employee,Current Address,वर्तमान पता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,बैच इन्वेंटरी
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,बैच इन्वेंटरी
 DocType: Employee,Contract End Date,अनुबंध समाप्ति तिथि
 DocType: Sales Order,Track this Sales Order against any Project,किसी भी परियोजना के खिलाफ हुए इस बिक्री आदेश
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,उपरोक्त मानदंडों के आधार पर बिक्री के आदेश (वितरित करने के लिए लंबित) खींचो
-DocType: DocShare,Document Type,दस्तावेज़ प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,प्रदायक से उद्धरण
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,प्रदायक से उद्धरण
 DocType: Deduction Type,Deduction Type,कटौती के प्रकार
 DocType: Attendance,Half Day,आधे दिन
 DocType: Pricing Rule,Min Qty,न्यूनतम मात्रा
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",बैच ओपन स्कूल के साथ बिक्री और खरीद के दस्तावेजों में आइटम को ट्रैक करने के लिए। &quot;पसंदीदा उद्योग: रसायन&quot;
 DocType: GL Entry,Transaction Date,लेनदेन की तारीख
 DocType: Production Plan Item,Planned Qty,नियोजित मात्रा
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,कुल कर
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,कुल कर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,मात्रा के लिए (मात्रा निर्मित) अनिवार्य है
 DocType: Stock Entry,Default Target Warehouse,डिफ़ॉल्ट लक्ष्य वेअरहाउस
 DocType: Purchase Invoice,Net Total (Company Currency),नेट कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
 DocType: Notification Control,Purchase Receipt Message,खरीद रसीद संदेश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,कुल आवंटित पत्ते अवधि की तुलना में अधिक कर रहे हैं
 DocType: Production Order,Actual Start Date,वास्तविक प्रारंभ दिनांक
-DocType: Sales Order,% of materials delivered against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे सुपुर्द किया गया है
+DocType: Sales Order,% of materials delivered against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे सुपुर्द किया गया है
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,आइटम आंदोलन रिकार्ड.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,न्यूज़लेटर सूची सब्सक्राइबर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 ,Monthly Salary Register,मासिक वेतन रेजिस्टर
-apps/frappe/frappe/website/template.py +140,Next,अगला
 DocType: Warranty Claim,If different than customer address,यदि ग्राहक पते से अलग
 DocType: BOM Operation,BOM Operation,बीओएम ऑपरेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,पिछली पंक्ति राशि पर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,कम से कम एक पंक्ति में भुगतान राशि दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,कम से कम एक पंक्ति में भुगतान राशि दर्ज करें
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,पंक्ति {0}: भुगतान की गई राशि बकाया राशि से अधिक नहीं हो सकता है
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,अवैतनिक कुल
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,अवैतनिक कुल
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,समय लॉग बिल नहीं है
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,खरीदार
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,खरीदार
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,शुद्ध भुगतान नकारात्मक नहीं हो सकता
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,मैन्युअल रूप खिलाफ वाउचर दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,मैन्युअल रूप खिलाफ वाउचर दर्ज करें
 DocType: SMS Settings,Static Parameters,स्टेटिक पैरामीटर
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,अपने संपर्कों के लिए बड़े पैमाने पर एसएमएस भेजें
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,टैक्स या प्रभार के लिए पर विचार
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,क्रॉस-रोलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या repacked
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,शेयर लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,शेयर लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: Purchase Invoice,Next Date,अगली तारीख
 DocType: Employee Education,Major/Optional Subjects,मेजर / वैकल्पिक विषय
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,करों और शुल्कों दर्ज करें
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,मशीनिंग
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","यहाँ आप परिवार और माता - पिता, पति या पत्नी और बच्चों के नाम, व्यवसाय की तरह बनाए रख सकते हैं"
 DocType: Hub Settings,Seller Name,विक्रेता का नाम
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आगे बढ़ने से पहले फार्म सहेजना चाहिए
 DocType: Item Attribute,Numeric Values,संख्यात्मक मान
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,लोगो अटैच
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,लोगो अटैच
 DocType: Customer,Commission Rate,आयोग दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,कार्ट खाली है
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,रूट संपादित नहीं किया जा सकता है .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,आवंटित राशि unadusted राशि से अधिक नहीं हो सकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,रूट संपादित नहीं किया जा सकता है .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,आवंटित राशि unadusted राशि से अधिक नहीं हो सकता
 DocType: Manufacturing Settings,Allow Production on Holidays,छुट्टियों पर उत्पादन की अनुमति
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहक की खरीद आदेश दिनांक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,शेयर पूंजी
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,एक csv फ़ाइल का चयन करें
-DocType: Dropbox Backup,Send Backups to Dropbox,ड्रॉपबॉक्स के लिए बैकअप भेजें
 DocType: Purchase Order,To Receive and Bill,प्राप्त करें और बिल के लिए
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिज़ाइनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
 DocType: Serial No,Delivery Details,वितरण विवरण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,मात्रा इस स्तर से नीचे गिरता है तो स्वतः सामग्री अनुरोध बनाने
 ,Item-wise Purchase Register,आइटम के लिहाज से खरीद पंजीकृत करें
 DocType: Batch,Expiry Date,समाप्ति दिनांक
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनःक्रमित स्तर सेट करने के लिए, आइटम एक क्रय मद या विनिर्माण आइटम होना चाहिए"
 ,Supplier Addresses and Contacts,प्रदायक पते और संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +18,Project master.,मास्टर परियोजना.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,सामग्री के बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
-DocType: Dropbox Backup,Send Notifications To,करने के लिए सूचनाएं भेजें
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,रेफरी की तिथि
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,रेफरी की तिथि
 DocType: Employee,Reason for Leaving,छोड़ने के लिए कारण
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है एक {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,खाते {0} मौजूद नहीं है
 DocType: Account,Cash,नकद
 DocType: Employee,Short biography for website and other publications.,वेबसाइट और अन्य प्रकाशनों के लिए लघु जीवनी.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी के लिए वेतन संरचना बनाने कृपया {0}

diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 92e20ea..9ba9f2a 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Plaća način
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Odaberite mjesečna distribucija, ako želite pratiti temelji na sezonalnost."
 DocType: Employee,Divorced,Rastavljen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozorenje: Isti predmet je ušao više puta.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Stavke već sinkronizirane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Odaberite Party Tip prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Prekaljivanje
 DocType: Item,Customer Items,Korisnički Stavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavi stavka to hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Osobe ovlaštene za odobrenje odsustva
 DocType: Sales Partner,Dealer,Trgovac
 DocType: Employee,Rented,Iznajmljeno
-DocType: About Us Settings,Website,Web stranica
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Priključci uz sinteriranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebno za Cjenika {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bit će izračunata u transakciji.
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od materijala zahtjev
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od materijala zahtjev
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Posao podnositelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nema više rezultata.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Stvarni tipa porez ne može biti uključen u stopu stavka u nizu {0}
 DocType: C-Form,Customer,Kupac
 DocType: Purchase Receipt Item,Required By,Potrebna Do
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija je uspješno ažurirana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivanje
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Višestruke cijene proizvoda.
 ,Purchase Order Items To Be Received,Proizvodi narudžbe kupnje - za zaprimiti
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
 DocType: Quality Inspection Reading,Parameter,Parametar
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Novi dopust Primjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Nacrt
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Za održavanje kupaca mudar Šifra i kako bi ih pretraživati na temelju svog koda koristiti ovu opciju
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaži varijante
-DocType: Sales Invoice Item,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Godina Prolazeći
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na lageru
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Napravite novi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Health Care
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 DocType: Purchase Invoice,Monthly,Mjesečno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kašnjenje u plaćanju (dani)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Red # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Red # {0}:
 DocType: Delivery Note,Vehicle No,Ne vozila
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Molimo odaberite Cjenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Stolarstvo
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ispis
 DocType: Employee,Holiday List,Turistička Popis
 DocType: Time Log,Time Log,Vrijeme Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Knjigovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Knjigovođa
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Company,Phone No,Telefonski broj
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zapis aktivnosti korisnika vezanih uz zadatke koji se mogu koristiti za praćenje vremena, naplate."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Novi {0}: #{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Novi {0}: #{1}
 ,Sales Partners Commission,Provizija prodajnih partnera
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kratica ne može imati više od 5 znakova
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Značajke Vrijednost {0} nije moguće ukloniti iz {1} kao točka varijante \ postoje s ovim atributom.
-DocType: Print Settings,Classic,Klasik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
 DocType: Bin,Quantity Requested for Purchase,Tražena količina za kupnju
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pričvrstite .csv datoteku s dva stupca, jedan za stari naziv i jedan za novim nazivom"
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Pomak
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Odaberite Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista tvrtka je ušao više od jednom
 DocType: Employee,Married,Oženjen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nije dopušteno {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 DocType: Payment Reconciliation,Reconcile,pomiriti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina prehrambenom robom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Provjerite banke unos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Mirovinski fondovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Mirovinski fondovi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Skladište je obavezno ako je Vrsta račun Skladište
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Provjerite je li se ponavlja red, isključite zaustaviti ponavljajući ili staviti ispravan datum završetka"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
 DocType: SMS Log,SMS Log,SMS Prijava
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
-DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Sastavnica
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je obavezno
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
 DocType: Lead,Product Enquiry,Upit
-DocType: Standard Reply,Owner,vlasnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Unesite tvrtka prva
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Odaberite tvrtka prvi
 DocType: Employee Education,Under Graduate,Pod diplomski
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Razvrtavanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nekretnine
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutske
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutske
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G.
-DocType: Custom Script,Client,Klijent
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,potrošni
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Poslati
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja plaća
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Godišnja plaća
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Troškovi
 DocType: Newsletter,Email Sent?,Je li e-mail poslan?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Pokaži Trupci vrijeme
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Item,Supply Raw Materials for Purchase,Nabava sirovine za kupnju
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Stavka {0} mora bitikupnja artikla
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Sve datume i zaposlenika kombinacija u odabranom razdoblju doći će u predlošku s postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Hoće li se obnavljaju nakon prodaje fakture je Prijavljen.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
 DocType: BOM Replace Tool,New BOM,Novi BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Vrijeme Trupci za naplatu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity lijevanje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bilten je već poslan
 DocType: Lead,Request Type,Zahtjev Tip
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radiodifuzija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,izvršenje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (možete promijeniti tome kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifuzija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,izvršenje
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi korisnik će postati System Manager (možete promijeniti tome kasnije).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
 DocType: Serial No,Maintenance Status,Status održavanja
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Stavke i cijene
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Odaberite zaposlenika za koga se stvara procjene.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Troška {0} ne pripada Tvrtka {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na Cjenik postotak (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,početak
-DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Cijeli plijesni lijevanje
 DocType: Offer Letter,Select Terms and Conditions,Odaberite Uvjeti
 DocType: Production Planning Tool,Sales Orders,Narudžbe kupca
 DocType: Purchase Taxes and Charges,Valuation,Procjena
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
 DocType: Selling Settings,Default Territory,Zadani teritorij
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada tvrtki {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primila je u
 DocType: Sales Partner,Reseller,Prodavač
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
 DocType: Newsletter List,Total Subscribers,Ukupno Pretplatnici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt ime
+,Contact Name,Kontakt ime
 DocType: Production Plan Item,SO Pending Qty,SO čekanju Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zahtjev za kupnju.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvostruko kućište
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja godišnje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Ostavlja godišnje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Molimo postavite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 DocType: Time Log,Will be updated when batched.,Hoće li biti ažurirani kada izmiješane.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
-DocType: Bulk Email,Message,Poruka
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox pristupni ključ
 DocType: Payment Tool,Reference No,Referentni broj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,godišnji
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
 DocType: Material Request Item,Min Order Qty,Min naručena kol
 DocType: Lead,Do Not Contact,Ne kontaktirati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Item,Publish in Hub,Objavi na Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &quot;sirovina nabavlja se &#39;stol narudžbenice {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Žica četkanje
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrđene narudžbe kupaca.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Rashodi voditelj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Odaberite Naknada za prvi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maksimalno 5 znakova
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Odaberite jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksimalno 5 znakova
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogućuje stvaranje vremenskih trupaca protiv radne naloge. Operacije neće biti praćeni protiv proizvodnje Reda
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Varijanta
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Stavka {0} mora biti usluga Stavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
-DocType: DocType,Administrator,Upravitelj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserski bušenje
-DocType: Stock UOM Replace Utility,New Stock UOM,Novi skladišni UOM
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski Povijest Posao
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kružni Referentna Greška
-DocType: Communication,Closed,Zatvoreno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Profil posla
 DocType: Newsletter,Newsletter,Bilten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Ljubakanje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
 DocType: Journal Entry,Multi Currency,Više valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Proizvod je obnovljen
-DocType: Async Task,System Manager,Sustav Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
 DocType: Sales Invoice Item,Delivery Note,Otpremnica
-DocType: Dropbox Backup,Allow Dropbox Access,Dopusti pristup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavljanje Porezi
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Ulazak Plaćanje je izmijenjen nakon što ga je izvukao. Ponovno izvucite ga.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Workstation,Rent Cost,Rent cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Molimo odaberite mjesec i godinu
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,tvrtka E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debitna Iznos u valuti računa
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-DocType: Workflow State,Refresh,Osvježi stranicu
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Svi uvoz srodnih područja poput valute , stopa pretvorbe , uvoz ukupno , uvoz sveukupnom itd su dostupni u Račun kupnje , dobavljač kotaciju , prilikom kupnje proizvoda, narudžbenice i sl."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Ukupno Naručite Smatra
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Dostupno u sastavnicama, otpremnicama, računu kupnje, nalogu za proizvodnju, narudžbi kupnje, primci, prodajnom računu, narudžbi kupca, ulaznog naloga i kontrolnoj kartici"
 DocType: Item Tax,Tax Rate,Porezna stopa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Odaberite stavku
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Odaberite stavku
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
  skladišta pomirenje, umjesto da koristite Stock unos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kupnja Potvrda mora biti podnesen
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni kataloški UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Mlaz vode rezanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Postavke su već kompletne!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Postavke su već kompletne!
 ,Finished Goods,Gotovi proizvodi
 DocType: Delivery Note,Instructions,Instrukcije
 DocType: Quality Inspection,Inspected By,Pregledati
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Molimo vas da ne stvaraju računi za kupce i dobavljače. Oni su stvorili izravno iz Kupac / Dobavljač majstora.
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
 DocType: Purchase Invoice Item,Item Name,Naziv proizvoda
+DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnik (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kreditna bilanca
 DocType: Employee,Widowed,Udovički
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Proizvodi se traži što su &quot;Out of Stock&quot; s obzirom na sve skladišta na temelju projicirane Qty i minimalne narudžbe Kol
@@ -380,22 +348,21 @@
 ,Purchase Register,Kupnja Registracija
 DocType: Landed Cost Item,Applicable Charges,Troškove u
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
 DocType: Purchase Receipt,Vehicle Date,Datum vozila
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Liječnički
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Liječnički
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog gubitka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube izvlačenja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 DocType: Employee,Single,Singl
 DocType: Issue,Attachment,Vezanost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun se ne može postaviti za grupe troška
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
 DocType: Journal Entry Account,Sales Order,Narudžba kupca
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,AVG. Prodajnom tečaju
 DocType: Purchase Order,Start date of current order's period,Datum razdoblja tekuće narudžbe Počnite
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Količina ne može biti dio u redku {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Količina ne može biti dio u redku {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,% Instalirano
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Unesite ime tvrtke prvi
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Je grupe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatski Postavljanje Serijski broj na temelju FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Za Predmet br' ne može biti manje od 'Od Predmeta br'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Neprofitno
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ne pokrenuto
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stari Roditelj
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
+DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Majstor za odmor .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ako je označeno, iznos poreza će se smatrati već uključena u Print Rate / Ispis Iznos"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
 DocType: Features Setup,Imports,Uvozi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lijepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Čekanju aktivnosti za danas
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Rekord gledanosti
 DocType: Bank Reconciliation,Journal Entries,Časopis upisi
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
-DocType: System Settings,Loading...,Učitavanje ...
-DocType: DocField,Password,Zaporka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused taloženje modeliranje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativi računi
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj Pretplatnici
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ne postoji"
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Izravni dohodak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrativni službenik
 DocType: Payment Tool,Received Or Paid,Primiti ili platiti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Odaberite tvrtke
 DocType: Stock Entry,Difference Account,Račun razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,kozmetika
-DocType: DocField,Type,Vrsta
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
-DocType: Communication,Subject,Predmet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 ,Serial No Warranty Expiry,Istek jamstva serijskog broja
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Proizvod
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje podugovaranje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Novi UOM ne mora biti cijeli broj
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje podugovaranje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Namještaj i susret
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Preduvjet za robu
 DocType: Company,Delete Company Transactions,Brisanje transakcije tvrtke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Proizvod {0} nije nabavni proizvod
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} je nevažeća e-mail adresu u ""Obavijest \
  e-mail adresa '"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Ukupno naplate ove godine:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ukupno naplate ove godine:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne možete izbrisati Serijski broj {0}, kao što se koristi na lageru transakcija"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zatvaranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zatvaranje (Cr)
 DocType: Serial No,Warranty Period (Days),Jamstveni period (dani)
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 ,Pending Qty,U tijeku Kom
 DocType: Job Applicant,Thread HTML,Temu HTML
 DocType: Company,Ignore,Ignorirati
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
 DocType: Pricing Rule,Valid From,vrijedi od
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
@@ -505,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Mjesečna distribucija** vam pomaže u raspodjeli proračuna po mjesecima, ako imate sezonalnost u svom poslovanju. Kako bi distribuirali proračun pomoću ove distribucije, postavite **Mjesečna distribucija** u **Troškovnom centru**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Žao nam je , Serial Nos ne mogu spojiti"
@@ -513,7 +472,6 @@
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
-DocType: About Us Settings,Website Manager,Web Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna godina Start Date ne bi trebao biti veći od Fiskalna godina End Date
 DocType: Warranty Claim,Resolution,Rezolucija
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Isporučuje se: {0}
@@ -521,25 +479,24 @@
 DocType: Sales Order,Billing and Delivery Status,Naplate i isporuke status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,prijašnji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Povrat robe
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Odaberite narudžbe iz kojih želite stvoriti radne naloge.
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponente plaće
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza potencijalnih kupaca.
+DocType: Authorization Rule,Customer or Item,Kupac ili predmeta
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza kupaca.
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Zadana mjerna jedinica za točke {0} se ne može mijenjati izravno, jer ste već napravili neke transakcije (e) s drugim UOM. Morat ćete stvoriti novu stavku za korištenje drugačiji Default UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logično Skladište protiv kojih su dionice unosi se.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
-DocType: Event,Wednesday,Srijeda
 DocType: Sales Invoice,Customer's Vendor,Kupca Prodavatelj
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodni nalog je obavezan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pisanje prijedlog
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna prodaja Osoba {0} postoji s istim ID zaposlenika
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativni lager - greška ( {6} ) za proizvod {0} u skladištu {1} na {2} {3} u {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
@@ -560,20 +517,16 @@
 DocType: Activity Type,Default Costing Rate,Zadana Obračun troškova stopa
 DocType: Maintenance Schedule,Maintenance Schedule,Raspored održavanja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Cjenovna pravila filtriraju se na temelju kupca, grupe kupaca, regije, dobavljača, proizvođača, kampanje, prodajnog partnera i sl."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Molimo instalirajte Dropbox piton modul
 DocType: Employee,Passport Number,Broj putovnice
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Račun kupnje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Isti predmet je ušao više puta.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Upravitelj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Račun kupnje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Isti predmet je ušao više puta.
 DocType: SMS Settings,Receiver Parameter,Prijemnik parametra
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Temelji se na' i 'Grupiranje po' ne mogu biti isti
 DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,za
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Molimo unesite e-mail adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Kraj cijevi tvore
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -581,25 +534,20 @@
 DocType: Customer,Fixed Days,Fiksni dana
 DocType: Sales Invoice,Packing List,Popis pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Kupnja naloge koje je dao dobavljače.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,objavljivanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,objavljivanje
 DocType: Activity Cost,Projects User,Projekti za korisnike
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konzumira
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nije pronađen u Pojedinosti dostavnice stolu
 DocType: Company,Round Off Cost Center,Zaokružiti troška
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Održavanje Posjetite {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Material Request,Material Transfer,Transfer robe
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otvaranje (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Postavke
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Porezi i pristojbe zavisnog troška
 DocType: Production Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Više
 DocType: Pricing Rule,Sales Manager,Sales Manager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenuj
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Savijanje
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dopusti korisnika
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Purchase Invoice,Quarterly,Tromjesečni
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
@@ -608,17 +556,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Purchase Receipt,Other Details,Ostali detalji
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Ravno šišanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Za praćenje stavke u prodaji i kupnji dokumenata na temelju njihovih serijskih br. To je također može koristiti za praćenje jamstvene podatke o proizvodu.
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odbijen Skladište je obavezno protiv regected stavku
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač Grad
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Stavka ima varijante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Stavka {0} nije pronađena
 DocType: Bin,Stock Value,Stock vrijednost
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -627,14 +574,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Protiv bon Tip mora biti jedan od prodajni nalog, prodaja Račun ili Temeljnica"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nije moguće pronaći tečaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Zračno-kosmički prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Zračno-kosmički prostor
 DocType: Journal Entry,Credit Card Entry,Credit Card Stupanje
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Zadatak Tema
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Roba dobijena od dobavljača.
-DocType: Communication,Open,Otvoreno
 DocType: Lead,Campaign Name,Naziv kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
@@ -643,29 +586,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nije skladišni proizvod
 DocType: Mode of Payment Account,Default Account,Zadani račun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
-DocType: Contact Us Settings,Address Title,Naziv adrese
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Pregled prometa po prodavaču i grupi proizvoda
-DocType: Dropbox Backup,Daily,Svakodnevno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Employee,Cell Number,Mobitel Broj
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: Item Group,Website Specifications,Web Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Novi račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} od {1} tipa
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Računovodstvo Prijave se mogu podnijeti protiv lisnih čvorova. Prijave protiv grupe nije dopušteno.
-DocType: ToDo,High,Visok
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Opportunity,Maintenance,Održavanje
-DocType: User,Male,Mužijak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne kampanje.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -697,7 +637,7 @@
 
  1. Vrsta Proračun: 
  - To može biti na ** Neto Ukupno ** (to je zbroj osnovnog iznosa).
- - ** U odnosu na prethodnu Row ukupno / Iznos ** (za kumulativne poreza ili troškova). Ako odaberete ovu opciju, porez će se primjenjivati postotak prethodnog reda (u poreznom sustavu) iznos ili ukupno.
+ - ** U odnosu na prethodnu Row ukupno / Iznos ** (za kumulativne poreza ili troškova). Ako odaberete ovu opciju, porez će se primjenjivati postotak prethodnog reda (u poreznom sustavu) iznos ili ukupno.
  - ** Stvarni ** (kao što je navedeno).
  2. Voditelj račun: knjiga računa pod kojima se ovaj porez će biti rezervirano 
  3. Trošak Centar: Ako porezni / naboj je prihod (kao što su utovar) i rashoda treba biti rezervirano protiv troška.
@@ -713,10 +653,9 @@
 DocType: Address,Personal,Osobno
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Zadane postavke za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Temeljnica {0} povezan protiv Red {1}, provjerite je li to trebalo biti izdvajali kao unaprijed u ovom računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Temeljnica {0} povezan protiv Red {1}, provjerite je li to trebalo biti izdvajali kao unaprijed u ovom računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Troškovi održavanja ureda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Okružuju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
@@ -724,14 +663,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Process Payroll,Send Email,Pošaljite e-poštu
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemate dopuštenje
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},Opcija 'Ažuriraj zalihe' nije dostupna jer stavke nisu dostavljene putem {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Kom
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Kom
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji Računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moji Računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nisu pronađeni zaposlenici
 DocType: Purchase Order,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
@@ -750,35 +690,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da biste omogućili &quot;prodajno mjesto&quot; značajke
 DocType: Bin,Moving Average Rate,Stopa prosječne ponderirane cijene
 DocType: Production Planning Tool,Select Items,Odaberite proizvode
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
-DocType: Comment,Reference Name,Referenca Ime
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljana galerija
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Očekuje se dostava Datum ne može biti prije prodajnog naloga Datum
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stalni kalupa za lijevanje
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Narudžbenica za plaćanje
 DocType: Sales Order Item,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Upravitelj
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otvaranje &#39;
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
 DocType: Expense Claim,Expenses,troškovi
 DocType: Item Variant Attribute,Item Variant Attribute,Stavka Varijanta Osobina
 ,Purchase Receipt Trends,Trend primki
 DocType: Appraisal,Select template from which you want to get the Goals,Odaberite predložak s kojeg želite dobiti ciljeva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Istraživanje i razvoj
 ,Amount to Bill,Iznositi Billa
 DocType: Company,Registration Details,Registracija Brodu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Iskolčenja
 DocType: Item,Re-Order Qty,Re-order Kom
 DocType: Leave Block List Date,Leave Block List Date,Datum popisa neodobrenih odsustava
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planirano za slanje na {0}
@@ -789,18 +726,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mjesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ne može se prenositi {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilanca mora biti
 DocType: Hub Settings,Publish Pricing,Objavi Cijene
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Prikucavanje
 ,Available Qty,Dostupno Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prethodni redak Ukupno
 DocType: Salary Slip,Working Days,Radnih dana
 DocType: Serial No,Incoming Rate,Dolazni Stopa
 DocType: Packing Slip,Gross Weight,Bruto težina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Uključi odmor u ukupnom. radnih dana
 DocType: Job Applicant,Hold,Zadrži
 DocType: Employee,Date of Joining,Datum pristupa
@@ -810,30 +745,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Pogledaj Pretplatnici
 DocType: Purchase Invoice Item,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Pjeskarenje
 DocType: Employee,Ms,Gospođa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Majstor valute .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} mora biti aktivna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktivna
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
 DocType: Salary Slip,Leave Encashment Amount,Iznos naplaćenog odsustva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet izdavaštvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vrijednost bilance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavi sinkronizirati stavke
-DocType: GL Entry,Account Currency,Valuta računa
+DocType: Bank Reconciliation,Account Currency,Valuta računa
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Molimo spomenuti zaokružiti račun u Društvu
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Features Setup,Item Barcode,Barkod proizvoda
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kupnja fakture Predujam
 DocType: Address,Shop,Dućan
@@ -842,7 +776,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatak za prekomjerno {0} prešao za točku {1}.
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
@@ -861,60 +795,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Narudžbenica predmet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Neizravni dohodak
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Postavi Iznos Plaćanje = Izvanredna Iznos
-DocType: Contact Us Settings,Address Line 1,Adresa - linija 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varijacija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Ime tvrtke
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varijacija
+,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Odaberite stavke za prijenos
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Pregled popisa svih pomoć videa
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Odaberite račun šefa banke gdje je ček bio pohranjen.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Dopustite korisniku uređivanje cjenika u transakcijama
 DocType: Pricing Rule,Max Qty,Maksimalna količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Red {0}: Plaćanje protiv prodaje / narudžbenice treba uvijek biti označena kao unaprijed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,kemijski
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,kemijski
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 DocType: Process Payroll,Select Payroll Year and Month,Odaberite Platne godina i mjesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idi na odgovarajućoj skupini (obično Application fondova&gt; kratkotrajne imovine&gt; bankovne račune i stvoriti novi račun (klikom na Dodaj dijete) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
-DocType: Comment,Unsubscribed,Pretplatu
 DocType: Opportunity,Walk In,Šetnja u
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drvo finanial troška .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenose
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bijela
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bijela
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Učvrstite svoju sliku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Napraviti
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Učvrstite svoju sliku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Napraviti
 DocType: Journal Entry,Total Amount in Words,Ukupan iznos riječima
-DocType: Workflow State,Stop,zaustaviti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Došlo je do pogreške . Jedan vjerojatan razlog bi mogao biti da niste spremili obrazac. Molimo kontaktirajte support@erpnext.com ako se problem ne riješi .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Moja košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Sljedeći datum kontakta
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Burzovnih opcija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Burzovnih opcija
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zahtjev za odsustvom
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Alat za raspodjelu odsustva
 DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ako Mjesečni proračun Prebačen (za reprezentaciju)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Podrezivanje
 DocType: Workstation,Net Hour Rate,Neto sat cijena
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Ulazni račun zavisnog troška
 DocType: Company,Default Terms,Zadani uvjeti
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: POS Profile,Cash/Bank Account,Novac / bankovni račun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podnošenje
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Kupnja Popusti
 DocType: Workstation,Wages,Plaće
@@ -931,7 +860,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara tvrtke
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 DocType: BOM Operation,Operation,Operacija
@@ -939,13 +869,13 @@
 DocType: Tax Rule,Shipping State,Državna dostava
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna kupnju
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna kupnju
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izrada Stock unose
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Izrada Stock unose
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Tijekom Postotak proizvodnje doplatku
@@ -960,29 +890,27 @@
 DocType: Time Log Batch,updated via Time Logs,ažurirati putem Vrijeme Trupci
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 DocType: Company,Default Currency,Zadana valuta
 DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
-DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od zaposlenika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Zona ključnih performansi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,promet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,promet
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i godina:
 DocType: Email Digest,Annual Expense,Godišnji rashodi
 DocType: SMS Center,Total Characters,Ukupno Likovi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-obrazac detalj računa
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pomirenje Plaćanje fakture
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Doprinos%
 DocType: Item,website page link,Poveznica web stranice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Idemo pripremiti sustav za prvu uporabu.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Tvrtka registracijski brojevi za svoju referencu. Porezni brojevi itd.
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodni nalog {0} mora biti poništen prije nego se poništi ova prodajna narudžba
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Odaberite vrijeme Evidencije i slanje stvoriti novi prodajni fakture.
@@ -1002,14 +930,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ništa za zatražiti
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Uprava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Uprava
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste aktivnosti za vrijeme listova
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Lijev
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ili debitna ili kreditna iznos potreban za {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Plava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Plava
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Cjenik Zemlja
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Daljnje čvorovi mogu se samo stvorio pod ""Grupa"" tipa čvorova"
@@ -1019,50 +945,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} je već stvoren za korisnika: {1} i društvo {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Višeslojno objekt proizvodnja
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Dobavljač baza podataka.
 DocType: Account,Balance Sheet,Završni račun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch oblikovanje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Porez i drugih isplata plaća.
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Plativ
 DocType: Account,Warehouse,Skladište
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kupnja fakture predmet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Upisi u glavnu knjigu i GL upisi su ponovno postavljeni za odabrane primke.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavka 1
 DocType: Holiday,Holiday,Odmor
-DocType: Event,Saturday,Subota
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako se odnosi na sve poslovnice
 ,Daily Time Log Summary,Dnevno vrijeme Log Profila
-DocType: DocField,Label,Oznaka
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
 DocType: Lead,Call,Poziv
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavljanje zaposlenika
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Odaberite prefiks prvi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Navedite barem jedan atribut u tablici Svojstva
 DocType: Contact,User ID,Korisnički ID
-DocType: Communication,Sent,Poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Pogledaj Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
-DocType: Communication,Delivery Status,Status isporuke
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 DocType: Production Order,Manufacture against Sales Order,Proizvodnja protiv prodaje Reda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostatak svijeta
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
@@ -1073,13 +992,11 @@
 DocType: BOM Item,Item Description,Opis proizvoda
 DocType: Payment Tool,Payment Mode,Način plaćanja
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajući
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Izravno metala laserom sinteriranje
 DocType: Purchase Order,Supplied Items,Isporučeni pribor
 DocType: Production Order,Qty To Manufacture,Količina za proizvodnju
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavaj istu stopu tijekom cijelog ciklusa kupnje
 DocType: Opportunity Item,Opportunity Item,Prilika proizvoda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Privremeni Otvaranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposlenik napuste balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
 DocType: Address,Address Type,Tip adrese
@@ -1095,35 +1012,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Kreiraj neplaćene račune
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mali
 DocType: Employee,Employee Number,Broj zaposlenika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Zaglavlje računa {0} stvoreno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelena
 DocType: Item,Auto re-order,Auto re-red
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Ukupno Ostvareno
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareno
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ugovor
-DocType: Report,Disabled,Ugašeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ugovor
+DocType: Email Digest,Add Quote,Dodaj ponudu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Vaši proizvodi ili usluge
 DocType: Mode of Payment,Mode of Payment,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ime je potrebno
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
 DocType: Address,City/Town,Grad / Mjesto
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Porezna stopa proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Stavka {0} mora bitisklopljen ugovor artikla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalni oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
@@ -1133,14 +1049,13 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očekivani isporuke Datum manji od planiranog početka Datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,za Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Postavljanje Vrsta računa pomaže u odabiru ovaj račun u prometu.
 DocType: Purchase Invoice,Grand Total (Company Currency),Sveukupno (valuta tvrtke)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Ukupno odlazni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troškovni centar je grupa. Nije moguće napraviti računovodstvene unose od grupe.
-apps/frappe/frappe/config/desk.py +7,Tools,Alati
 DocType: Item,Website Item Groups,Grupe proizvoda web stranice
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Broj proizvodnoga naloga je obvezan za proizvodnju ulazne robe
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
@@ -1148,24 +1063,22 @@
 DocType: Journal Entry,Journal Entry,Temeljnica
 DocType: Workstation,Workstation Name,Ime Workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentari
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Stopa vrednovanja potrebna za proizvod {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Stopa vrednovanja potrebna za proizvod {0}
 DocType: Quality Inspection Reading,Reading 8,Čitanje 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &quot;Podijeliti optužbi na temelju &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Radna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,HR menadžer
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Odaberite tvrtku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogućiti košaricu
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nema podataka
 DocType: Appraisal Template Goal,Appraisal Template Goal,Procjena Predložak cilja
 DocType: Salary Slip,Earning,Zarada
 DocType: Payment Tool,Party Account Currency,Strana valuta računa
@@ -1175,31 +1088,28 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Ukupna vrijednost narudžbe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Možete napraviti vremenski dnevnik samo od podnesenoga naloga za proizvodnju
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Bilteni za kontakte, potencijalne kupce."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbroj bodova svih ciljeva trebao biti 100. To je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije se ne može ostati prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije se ne može ostati prazno.
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
-DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Prosječni popust
-DocType: Letter Head,Is Default,Je zadani
 DocType: Address,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Knjigovodstvo
 DocType: Features Setup,Features Setup,Značajke postavki
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Pogledaj Ponuda Pismo
-DocType: Communication,Communication,Mail
 DocType: Item,Is Service Item,Je usluga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
 DocType: BOM Operation,Operation Description,Operacija Opis
-DocType: Item,Will also apply to variants,Također će se primjenjivati na varijanti
+DocType: Item,Will also apply to variants,Također će se primjenjivati na varijanti
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ne možete promijeniti fiskalnu godinu datum početka i datum završetka fiskalne godine kada Fiskalna godina se sprema.
 DocType: Quotation,Shopping Cart,Košarica
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Prosječni dnevni izlaz
@@ -1213,7 +1123,7 @@
 DocType: Item,Maintain Stock,Upravljanje zalihama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
@@ -1223,7 +1133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnog
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
@@ -1237,31 +1147,28 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Popis podsjetnika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativna količina nije dopuštena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,šegrt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porezna detalj Tablica preuzeta iz točke majstora kao string i pohranjeni u tom području.
  Koristi se za poreze i troškove"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ne aktivna Struktura plaća pronađenih zaposlenika {0} i mjesec
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Porezni Pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupili smo ovaj proizvod
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kupili smo ovaj proizvod
 DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Prirubljivanja
-DocType: Bulk Email,Not Sent,Ne poslano
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivna oblikovanje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planirano za slanje na {0} primatelja
 DocType: Quality Inspection,Readings,Očitanja
 DocType: Stock Entry,Total Additional Costs,Ukupno Dodatni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,pod skupštine
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Izvor skladište je obvezno za redom {0}
@@ -1271,105 +1178,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analitičar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analitičar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak iznosu JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da biste omogućili &quot;Point of Sale&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plaćanje ne može biti za prazan košaricu
 DocType: Item,Sales Details,Prodajni detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Zapinjanje
 DocType: Opportunity,With Items,S Stavke
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
 DocType: Item Attribute,Item Attribute,Stavka značajke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Stavka Varijante
 DocType: Company,Services,Usluge
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Ukupno ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Ukupno ({0})
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
 DocType: Sales Invoice,Source,Izvor
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Financijska godina - početni datum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Financijska godina - početni datum
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Upuštanje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Material Request Item,Sales Order No,Broj narudžbe kupca
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Prijenos Materijali za izradu
 DocType: Pricing Rule,For Price List,Za Cjeniku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kupnja stopa za stavke: {0} nije pronađena, koja je potrebna za rezervaciju knjiženje (trošak). Molimo spomenuti predmet cijenu od popisa za kupnju cijena."
 DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Pogreška : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Pogreška : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kupac> Grupa kupaca> Regija
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na skladištu
 DocType: Time Log Batch Detail,Time Log Batch Detail,Vrijeme Log Batch Detalj
-DocType: Workflow State,Tasks,poslovi
 DocType: Landed Cost Voucher,Landed Cost Help,Zavisni troškovi - Pomoć
-DocType: Event,Tuesday,Utorak
 DocType: Leave Block List,Block Holidays on important days.,Blok Odmor na važnim danima.
 ,Accounts Receivable Summary,Potraživanja Sažetak
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Ostavlja za vrstu {0} već dodijeljeno za zaposlenika {1} za vrijeme {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
 DocType: UOM,UOM Name,UOM Ime
-DocType: Top Bar Item,Target,Meta
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Doprinos iznos
 DocType: Sales Invoice,Shipping Address,Dostava Adresa
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ovaj alat pomaže vam da ažurirate ili popraviti količinu i vrijednost zaliha u sustavu. To se obično koristi za sinkronizaciju vrijednosti sustava i što se zapravo postoji u svojim skladištima.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Riječima će biti vidljivo nakon što spremite otpremnicu.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Glavni brend.
-DocType: ToDo,Due Date,Datum dospijeća
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Glavni brend.
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,kutija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,kutija
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mjesečna distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Ulaz za {0} može biti samo u valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Urezivanje
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
 DocType: Address,Lead Name,Ime potencijalnog kupca
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvaranje kataloški bilanca
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvaranje kataloški bilanca
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dopušteno Prenesite više {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema proizvoda za pakiranje
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Iznosi koji se ne ogleda u banci
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Iznosi koji se ne ogleda u banci
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalna lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetska polja pomoć oplemenjivanje
 DocType: Company,Default Holiday List,Default odmor List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Obveze
 DocType: Purchase Receipt,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 DocType: Production Planning Tool,Select Sales Orders,Odaberite narudžbe kupca
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za praćenje stavki pomoću barkod. Vi ćete biti u mogućnosti da unesete stavke u otpremnici i prodaje Računa skeniranjem barkod stavke.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kao Isporučeno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označi kao Isporučeno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Napravite citat
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 DocType: SMS Center,Receiver List,Prijemnik Popis
@@ -1377,31 +1275,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogledaj
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plaća Struktura Odbitak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sinteriranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspješan!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne smije biti veća od {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dani)
 DocType: Quotation Item,Quotation Item,Proizvod iz ponude
 DocType: Account,Account Name,Naziv računa
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datuma ne može biti veća od To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijski Ne {0} {1} količina ne može bitidio
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavljač Vrsta majstor .
 DocType: Purchase Order Item,Supplier Part Number,Dobavljač Broj dijela
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Dodaj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Stopa pretvorbe ne može biti 0 ili 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} otkazan ili zaustavljen
 DocType: Accounts Settings,Credit Controller,Kreditne kontroler
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Račun kupnje {0} nije podnesen
 DocType: Company,Default Payable Account,Zadana Plaća račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Postavke za online košarici, kao što su utovar pravila, cjenika i sl"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Postavljanje dovršeno
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Naplaćeno
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
 DocType: Journal Entry Account,Debit in Company Currency,Zaduženja tvrtke valuti
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moji problemi
@@ -1410,12 +1304,9 @@
 DocType: Company,Default Values,Zadane vrijednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Red {0}: Iznos uplate ne može biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Pritisnite dolikuje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
 DocType: Payment Reconciliation,Payments,Plaćanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Vruće izostatičko pritiskom
-DocType: ToDo,Medium,Srednji
 DocType: Budget Detail,Budget Allocated,Dodijeljeni proračun
 DocType: Journal Entry,Entry Type,Ulaz Tip
 ,Customer Credit Balance,Kupac saldo
@@ -1424,12 +1315,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 DocType: Quotation,Term Details,Oročeni Detalji
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planiranje kapaciteta za (dani)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
 DocType: Warranty Claim,Warranty Claim,Jamstvo Zatraži
 ,Lead Details,Detalji potenciajalnog kupca
-DocType: Authorization Rule,Approving User,Odobravanje korisnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pozlaćivanje
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1451,64 +1339,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukcije
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukcije
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Navedite ili količini ili vrednovanja Ocijenite ili oboje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Tvrtka , Mjesec i Fiskalna godina je obvezno"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jedna jedinica stavku.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Vrijeme Log Batch {0} mora biti "" Postavio '"
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladište potrebna u nizu br {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Unesite valjani financijske godine datum početka i kraja
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
 DocType: Address,Postal,Poštanski
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Smola lijevanje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Postoji grupa kupaca sa istim imenom. Promijenite naziv kupca ili naziv grupe kupaca.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Odaberite {0} na prvom mjestu.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Tekst {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Tekst {0}
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
 DocType: Stock Entry,Material Receipt,Potvrda primitka robe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Proizvodi
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Proizvodi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Tip i stranka je potrebna za potraživanja / obveze prema dobavljačima račun {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda to ne može biti izabran u prodajnim nalozima itd"
 DocType: Lead,Next Contact By,Sljedeći kontakt od
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima proizvod {1}
 DocType: Quotation,Order Type,Vrsta narudžbe
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 DocType: Payment Tool,Find Invoices to Match,Nađi račune kako bi se slagala
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","npr ""XYZ narodna banka """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","npr ""XYZ narodna banka """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Ukupno Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Ukupno Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica omogućeno
 DocType: Job Applicant,Applicant for a Job,Podnositelj zahtjeva za posao
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nema napravljenih proizvodnih naloga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Plaća Slip zaposlenika {0} već stvorena za ovaj mjesec
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Sales Invoice Item,Batch No,Broj serije
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Glavni
-DocType: DocPerm,Delete,Izbrisati
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varijanta
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Novi dokument {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zaustavljen nalog ne može prekinuti. Otpušiti otkazati .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Dodijeljeni iznos
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
@@ -1517,53 +1403,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Podnositelj prijave za posao.
 DocType: Purchase Order Item,Warehouse and Reference,Skladište i reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonska info i druge opće informacije o vašem Dobavljaču
-DocType: Country,Country,Zemlja
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-DocType: Communication,Received,primljen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupli serijski broj unešen za proizvod {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uvjet za pravilu dostava
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Stavka ne smije imati proizvodni nalog.
-DocType: DocField,Attach Image,Pričvrstite slike
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
-DocType: Stock Reconciliation Item,Leave blank if no change,Ostavite prazno ako nema promjene
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Vrijeme Trupci za proizvodnju.
 DocType: Item,Apply Warehouse-wise Reorder Level,Nanesite skladište mudar preuredili razine
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Vrijeme Prijava za zadatke.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Uplata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Uplata
 DocType: Production Order Operation,Actual Time and Cost,Stvarnog vremena i troškova
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Zahtjev za robom od maksimalnih {0} može biti napravljen za proizvod {1} od narudžbe kupca {2}
 DocType: Employee,Salutation,Pozdrav
-DocType: Communication,Rejected,Odbijen
 DocType: Pricing Rule,Brand,Brend
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
 DocType: Sales Order Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Čitanje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrijednost {0} za Osobina {1} ne postoji u popisu važeće točke vrijednosti atributa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,pomoćnik
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Istekla
 DocType: Packing Slip,To Package No.,Za Paket br
-DocType: DocType,System,Sustav
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 DocType: Activity Cost,Activity Cost,Aktivnost troškova
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 DocType: Payment Tool,Make Payment Entry,Napravi ulazno plaćanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
 ,Sales Invoice Trends,Trendovi prodajnih računa
 DocType: Leave Application,Apply / Approve Leaves,Nanesite / Odobri Lišće
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
 DocType: Stock Settings,Allowance Percent,Dodatak posto
@@ -1575,33 +1456,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodaje se mora provjeriti, ako je primjenjivo za odabrano kao {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Provjerite Plaća Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Smicanje
 DocType: Item,Has Variants,Je Varijante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Kliknite na &quot;Make prodaje Račun &#39;gumb za stvaranje nove prodaje fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje i označavanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox tajni pristup
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač dobara ili usluga.
 DocType: Budget Detail,Fiscal Year,Fiskalna godina
 DocType: Cost Center,Budget,Budžet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun se ne može dodijeliti protiv {0}, kao što je nije prihod ili rashod račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Ostvareno
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorij / Kupac
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primjer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,na primjer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
 DocType: Item,Is Sales Item,Je proizvod namijenjen prodaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Raspodjela grupa proizvoda
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Vrijeme održavanja
 ,Amount to Deliver,Iznos za isporuku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bilo je grešaka .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Kuckanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Proizvod ili usluga
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} stvorio
 DocType: Delivery Note Item,Against Sales Order,Protiv prodajnog naloga
@@ -1616,15 +1492,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
 DocType: Website Item Group,Website Item Group,Grupa proizvoda web stranice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Unesite Referentni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tablica za proizvode koji će biti prikazani na web stranici
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
 DocType: Material Request Item,Material Request Item,Zahtjev za robom - proizvod
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Stablo grupe proizvoda.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Stablo grupe proizvoda.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Crvena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Crvena
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1634,12 +1510,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Red # {0}: {1} Operacija nije završeno za {2} kom gotovih proizvoda u proizvodnji Naručite # {3}. Molimo ažurirati status rada preko Vrijeme Trupci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Promjena mjerne jedinice za neki proizvod.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriterij prihvaćanja
 DocType: Item Attribute,Attribute Name,Ime atributa
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Stavka {0} mora biti Prodaja ili usluga artikla u {1}
 DocType: Item Group,Show In Website,Pokaži na web stranici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupa
 DocType: Task,Expected Time (in hours),Očekivani vrijeme (u satima)
 ,Qty to Order,Količina za narudžbu
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Za praćenje robne marke u sljedećim dokumentima izdatnice, Prilika, materijala zahtjev, točke, narudžbenice, Kupnja bon, kupac primitka, citat, prodaja faktura, proizvoda Snop, prodajni nalog, serijski broj"
@@ -1648,78 +1523,67 @@
 DocType: Holiday List,Clear Table,Jasno Tablica
 DocType: Features Setup,Brands,Brendovi
 DocType: C-Form Invoice Detail,Invoice No,Račun br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narudžbenice
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 DocType: Activity Cost,Costing Rate,Obračun troškova stopa
 ,Customer Addresses And Contacts,Kupčeve adrese i kontakti
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nije postavljeno
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sjedi čvrsto , dok je vaš sustav se postava . To može potrajati nekoliko trenutaka ."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
 DocType: Employee,Personal Details,Osobni podaci
 ,Maintenance Schedules,Održavanja rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Utiskivanje
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Zaduženja računa mora biti Potraživanja račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kao Production Order može biti za tu stavku , to mora bitipredmet dionica ."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spajanje
-DocType: Authorization Rule,Above Value,Iznad vrijednosti
 ,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Postavke dolaznog servera za e-mail (npr. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno dodijeljeni lišće {0} ne može biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Journal Entry,Accounts Receivable,Potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
-DocType: Custom Field,Custom,Prilagođeno
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injection moulding
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drvo finanial račune .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Ostavite prazno ako se odnosi na sve tipove zaposlenika
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirati optužbi na temelju
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Račun {0} mora biti tipa 'Nepokretne imovine' kao što je proizvod {1} imovina proizvoda
 DocType: HR Settings,HR Settings,HR postavke
-apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Rashodi Tužba se čeka odobrenje . SamoRashodi Odobritelj može ažurirati status .
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dan (a ) na koji se prijavljujete za dopust su odmor . Ne trebaju podnijeti zahtjev za dopust .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne može biti prazno ili prostora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportovi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Ukupno Stvarni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,jedinica
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Molimo postaviti Dropbox pristupnih tipki u vašem web config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,jedinica
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Navedite tvrtke
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Skladište na kojem držite zalihe odbijenih proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaša financijska godina završava
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sada zadana fiskalna godina. Osvježi preglednik kako bi se promjene aktualizirale.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
-DocType: Authorization Rule,Approving Role,Odobravanje ulogu
 ,BOM Search,BOM Pretraživanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Navedite valutu u Društvu
 DocType: Workstation,Wages per hour,Satnice
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Prikaži / sakrij značajke kao što su serijski broj, prodajno mjesto i sl."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Valuta računa mora biti {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sljedeći materijal Zahtjevi su automatski podigli na temelju stavke razini ponovno narudžbi
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum rasprodaja ne može biti prije datuma check u redu {0}
 DocType: Salary Slip,Deduction,Odbitak
 DocType: Address Template,Address Template,Predložak adrese
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi
@@ -1731,76 +1595,68 @@
 DocType: Opportunity,Quotation,Ponuda
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 DocType: Quotation,Maintenance User,Korisnik održavanja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Trošak Ažurirano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Trošak Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Proizvod {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Fiskalna godina** predstavlja poslovnu godinu. Svi računovodstvene stavke i druge glavne transakcije su praćene od **Fiskalne godine**.
 DocType: Opportunity,Customer / Lead Address,Kupac / Olovo Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis Posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis Posla
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po skladišnom UOM-u
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Odaberite valjanu CSV datoteku s podacima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premazivanje
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock unosa postoje protiv skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati skladište"
 DocType: Appraisal,Calculate Total Score,Izračunajte ukupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Upravitelj proizvodnje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
-DocType: Purchase Order,To be delivered to customer,Da biste se dostaviti kupcu
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Vrijeme Log Status moraju biti dostavljeni.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Postavljanje
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Red #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Red #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Pricing Rule,Supplier,Dobavljač
 DocType: C-Form,Quarter,Četvrtina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne možete prekoračiti za proizvod {0} u redku {1} više od {2}. Kako bi omogućili prekoračenje, molimo promjenite u postavkama skladišta"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne možete prekoračiti za proizvod {0} u redku {1} više od {2}. Kako bi omogućili prekoračenje, molimo promjenite u postavkama skladišta"
 DocType: Employee,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Iznad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Korisnik {0} je onemogućen
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
-DocType: Journal Entry Account,Credit in Account Currency,Kredit u valuti računa
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan nepostojećim korisnicima
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Odaberite tvrtku ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako se odnosi na sve odjele
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Currency Exchange,From Currency,Od novca
-DocType: DocField,Name,Ime
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Iznosi koji se ne ogleda u sustav
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Odaberite Dodijeljeni iznos, Vrsta računa i broj računa u atleast jednom redu"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodajnog naloga potrebna za točke {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Iznosi koji se ne ogleda u sustav
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostali
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodao i zadržao na lageru."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dovršen
-DocType: Web Form,Select DocType,Odaberite DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Provlačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankarstvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novi trošak
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Novi trošak
 DocType: Bin,Ordered Quantity,Naručena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
 DocType: Quality Inspection,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
 DocType: Purchase Order Item,Reference Document Type,Referentna Tip dokumenta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serijaliziranom Inventar
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serijaliziranom Inventar
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
 DocType: Time Log Batch,Total Billing Amount,Ukupno naplate Iznos
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Potraživanja račun
@@ -1808,19 +1664,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Prodajnog naloga za plaćanje
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Vrijeme Evidencije stvorio:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Employee,Blood Group,Krvna grupa
 DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Production Order Operation,Pending,Na čekanju
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Korisnici koji može odobriti dopust aplikacije neke specifične zaposlenika
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Vi ne možete promijeniti zadanu UOM varijanti. Za promjenu zadanog UOM za Variant promjenu zadane UOM predloška
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Uredska oprema
 DocType: Purchase Invoice Item,Qty,Kol
 DocType: Fiscal Year,Companies,Tvrtke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od održavanje rasporeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Puno radno vrijeme
 DocType: Purchase Invoice,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste stvorili standardni predložak u prodaji poreze i troškove predložak, odaberite jednu i kliknite na gumb ispod."
@@ -1832,14 +1688,15 @@
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 DocType: Offer Letter,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Ukupno fakturirati Amt
 DocType: Time Log,To Time,Za vrijeme
+DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Da biste dodali djece čvorova , istražiti stablo i kliknite na čvoru pod kojima želite dodati više čvorova ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cjenik {0} je onemogućen
@@ -1849,12 +1706,10 @@
 DocType: Item,Customer Item Codes,Kupac Stavka Kodovi
 DocType: Opportunity,Lost Reason,Razlog gubitka
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Stvaranje unosa plaćanja protiv narudžbe ili fakture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zavarivanje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novi skldišni UOM je potreban
 DocType: Quality Inspection,Sample Size,Veličina uzorka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Svi proizvodi su već fakturirani
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Navedite važeću &#39;iz Predmet br&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Project,External,Vanjski
 DocType: Features Setup,Item Serial Nos,Serijski br proizvoda
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
@@ -1864,15 +1719,13 @@
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijski broj {0} nije pronađen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Prešanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Vaši klijenti
 DocType: Leave Block List Date,Block Date,Datum bloka
 DocType: Sales Order,Not Delivered,Ne isporučeno
 ,Bank Clearance Summary,Razmak banka Sažetak
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Šifra proizvoda> Grupa proizvoda> Brend
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
-DocType: Event,Friday,Petak
 DocType: Time Log,Costing Amount,Obračun troškova Iznos
 DocType: Process Payroll,Submit Salary Slip,Slanje plaće Slip
 DocType: Salary Structure,Monthly Earning & Deduction,Mjesečna zarada & odbitak
@@ -1880,16 +1733,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz u rasutom stanju
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
 DocType: SMS Log,Sender Name,Pošiljatelj Ime
-DocType: Page,Title,Naslov
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagodba
 DocType: POS Profile,[Select],[Odaberi]
 DocType: SMS Log,Sent To,Poslano Da
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Napravi prodajni račun
 DocType: Company,For Reference Only.,Za samo kao referenca.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Pogrešna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Pogrešna {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Iznos predujma
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Od datuma' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Od datuma' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novo radno mjesto
@@ -1904,7 +1755,7 @@
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,putovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,putovanje
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
 DocType: Sales Invoice,Recurring,Koji se vraća
@@ -1912,23 +1763,21 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prijenos materijala
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Navedite operacija, operativni troškovi i dati jedinstven radom najkasnije do svojih operacija ."
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Dodaj poreze
 ,Financial Analytics,Financijska analitika
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
 DocType: Quality Inspection,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
-DocType: System Settings,In Hours,U sati
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekivani Stanje na banke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Poliranje
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekivani Stanje na banke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposlenik
@@ -1941,15 +1790,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Sales Invoice,Mass Mailing,Grupno slanje mailova
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaži Plaćanja
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veličina
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Kreiraj kupca
@@ -1959,30 +1806,25 @@
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Kupnja postavke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Misa za završnu obradu
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 DocType: Upload Attendance,Attendance To Date,Gledanost do danas
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Postavke dolaznog servera za prodajni e-mail (npr. sales@example.com)
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Tool,Payment Account,Račun za plaćanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Navedite Tvrtka postupiti
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Nepotvrđeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,kompenzacijski Off
 DocType: Quality Inspection Reading,Accepted,Prihvaćeno
-DocType: User,Female,Ženski
-DocType: Journal Entry Account,Debit in Account Currency,Debitna u valuti računa
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Molimo provjerite da li stvarno želite izbrisati sve transakcije za ovu tvrtku. Vaši matični podaci će ostati kao što je to. Ova radnja se ne može poništiti.
-DocType: Print Settings,Modern,Moderno
-DocType: Communication,Replied,Odgovoreno
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Pogrešna referentni {0} {1}
 DocType: Payment Tool,Total Payment Amount,Ukupna plaćanja Iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u proizvodnom nalogu {3}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kao što već postoje dionice transakcija za tu stavku, \ ne možete mijenjati vrijednosti &#39;Je rednim&#39;, &#39;Je batch Ne&#39;, &#39;Je kataloški Stavka &quot;i&quot; Vrednovanje metoda&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Brzo Temeljnica
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
@@ -1990,17 +1832,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,kompletan Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bilten Mailing lista
 DocType: Delivery Note,Transporter Name,Transporter Ime
+DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
 DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Ukupno Odsutni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jedinica mjere
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
 DocType: Lead,Opportunity,Prilika
@@ -2021,16 +1863,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovna stopa (po burzi UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
 DocType: Campaign,Campaign-.####,Kampanja-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prodoran
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Treća strana distributer / trgovac / trgovački zastupnik / affiliate / prodavača koji prodaje tvrtki koje proizvode za proviziju.
 DocType: Customer Group,Has Child Node,Je li čvor dijete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nije bilo aktivne fiskalne godine. Za provjeru više detalja {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Raspon 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemijski obrada
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2061,7 +1902,7 @@
 
  1. Vrsta Proračun: 
  - To može biti na ** Neto Ukupno ** (to je zbroj osnovnog iznosa).
- - ** U odnosu na prethodnu Row ukupno / Iznos ** (za kumulativne poreza ili troškova). Ako odaberete ovu opciju, porez će se primjenjivati postotak prethodnog reda (u poreznom sustavu) iznos ili ukupno.
+ - ** U odnosu na prethodnu Row ukupno / Iznos ** (za kumulativne poreza ili troškova). Ako odaberete ovu opciju, porez će se primjenjivati postotak prethodnog reda (u poreznom sustavu) iznos ili ukupno.
  - ** Stvarni ** (kao što je navedeno).
  2. Voditelj račun: knjiga računa pod kojima se ovaj porez će biti rezervirano 
  3. Trošak Centar: Ako porezni / naboj je prihod (kao što su utovar) i rashoda treba biti rezervirano protiv troška.
@@ -2072,11 +1913,9 @@
  8. Unesite Row: Ako na temelju ""prethodnog retka Ukupno"" možete odabrati broj retka koji će se uzeti kao osnova za ovaj izračun (zadana je prethodni redak).
  9. Razmislite poreza ili naplatiti za: U ovom dijelu možete odrediti ako porezni / zadužen samo za vrednovanje (nije dio ukupno), ili samo za ukupno (ne dodaju vrijednost predmeta), ili za oboje.
  10. Dodavanje ili oduzimamo: Bilo da želite dodati ili oduzeti porez."
-DocType: Note,Note,Zabilješka
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
-DocType: Email Account,Email Ids,IDS e-pošte
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne može proizvesti više predmeta {0} od prodajnog naloga količina {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 DocType: Tax Rule,Billing City,Naplata Grad
 DocType: Global Defaults,Hide Currency Symbol,Sakrij simbol valute
@@ -2084,40 +1923,36 @@
 DocType: Journal Entry,Credit Note,Kreditne Napomena
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Završen Kol ne može biti više od {0} za rad {1}
 DocType: Features Setup,Quality,Kvaliteta
-DocType: Contact Us Settings,Introduction,Uvod
 DocType: Warranty Claim,Service Address,Usluga Adresa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Maksimalno 100 redaka za burze pomirenja.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Maksimalno 100 redaka za burze pomirenja.
 DocType: Stock Entry,Manufacture,Proizvodnja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Molimo Isporuka Napomena prvo
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
-DocType: Opportunity,Customer / Lead Name,Potencijalni kupac
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Razmak Datum nije spomenuo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
+DocType: Opportunity,Customer / Lead Name,Kupac / Potencijalni kupac
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Razmak Datum nije spomenuo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
 DocType: Item,Allow Production Order,Dopustite proizvodni nalog
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Installation Note Item,Installed Qty,Instalirana kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Potvrđeno
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adrese
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija grana majstor .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ili
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Iznad
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
-,Download Backups,Preuzmite Sigurnosne kopije
 DocType: Notification Control,Sales Order Message,Poruka narudžbe kupca
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Postavi zadane vrijednosti kao što su tvrtka, valuta, tekuća fiskalna godina, itd."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Vrsta plaćanja
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
 DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalji
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
 DocType: Employee,Emergency Contact,Kontakt hitne službe
 DocType: Item,Quality Parameters,Parametri kvalitete
@@ -2132,6 +1967,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 DocType: Product Bundle,Parent Item,Nadređeni proizvod
 DocType: Account,Account Type,Vrsta računa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} ne može nositi-proslijeđen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
@@ -2139,33 +1975,28 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagodba Obrasci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Ravnanje
 DocType: Account,Income Account,Račun prihoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Oblikovanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Cost Center,Cost Center,Troška
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,bon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,bon #
 DocType: Notification Control,Purchase Order Message,Poruka narudžbenice
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Ukupno unaprijed ({0}) protiv Red {1} ne može biti veća \
  od SVEUKUPNO ({2})"
 DocType: Employee,Relieving Date,Rasterećenje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Međuskladišnica / Otpremnica / Primka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laserski projektirana neto oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Voditelj marketinga i prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Porez na dohodak
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako odabrani Cijene Pravilo je napravljen za 'Cijena', to će prebrisati Cjenik. Cijene Pravilo cijena je konačna cijena, pa dalje popust treba primijeniti. Dakle, u prometu kao što su prodajni nalog, narudžbenica itd, to će biti preuzeta u 'Rate' polju, a ne 'Cjenik stopom' polju."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
@@ -2173,10 +2004,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novi naziv troškovnog centra
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ne zadana adresa Predložak pronađena. Molimo stvoriti novu s Setup> Tisak i Branding> adresu predložak.
 DocType: Appraisal,HR User,HR Korisnik
@@ -2188,31 +2018,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
 DocType: Supplier,Billing Currency,Naplata valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritisak
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Plaćanje Detail
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veliki
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nisu pronađeni zaposlenici!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veliki
 DocType: C-Form Invoice Detail,Territory,Teritorij
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Purchase Order,Customer Address Display,Kupac Adresa prikaz
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Zadana mjerna jedinica za točke {0} se ne može mijenjati, jer izravno \ ste već napravili neke transakcije (e) s drugim UOM. Za promjenu zadanog UOM, \ uporabu &#39;UOM Zamijenite Utility &quot;alat pod burzi modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Navedite Tečaj pretvoriti jedne valute u drugu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuda {0} je otkazana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupni iznos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Ciljevi
@@ -2220,14 +2044,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,N.K.br.
 DocType: Production Order Operation,Make Time Log,Napravi vrijeme prijave
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Molimo postavite naručivanja količinu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kemijske brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Molim postaviti svoj kontni plan prije nego što počnete računovodstvenih unosa
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Otkazano
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma u Struktura plaća ne može biti manja od zaposlenika Spajanje Datum.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Dani bloka
@@ -2264,7 +2087,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Provjerite je li ponavljajući fakture, poništite zaustaviti ponavljajući ili staviti odgovarajući datum završetka"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimalno {0} redaka je dopušteno
 DocType: C-Form Invoice Detail,Net Total,Osnovica
 DocType: Bin,FCFS Rate,FCFS Stopa
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Naplate (Prodaja fakture)
@@ -2281,20 +2103,19 @@
 DocType: Maintenance Visit,Purposes,Svrhe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast jedan predmet treba upisati s negativnim količinama u povratnom dokumentu
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više nego bilo raspoloživih radnih sati u radnom {1}, razbiti rad u više operacija"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemijska obrada
 ,Requested,Tražena
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nema primjedbi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Prezadužen
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Korijen računa mora biti grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Features Setup,Sales and Purchase,Prodaje i kupnje
 DocType: Supplier Quotation Item,Material Request No,Zahtjev za robom br.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je uspješno poništili pretplatu s ovog popisa.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Društvo valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Uredi teritorijalnu raspodjelu.
 DocType: Journal Entry Account,Sales Invoice,Prodajni račun
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
@@ -2308,11 +2129,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskalna godina {0} nije pronađen.
 DocType: Bank Reconciliation,Get Relevant Entries,Kreiraj relevantne ulaze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Knjiženje na skladištu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanja
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-apps/frappe/frappe/desk/query_report.py +136,Total,Ukupno
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Red # {0}: Ne može se vratiti više od {1} za točku {2}
@@ -2322,14 +2141,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Porezna Iznos Nakon Popust Iznos (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target skladište je obvezno za redom {0}
 DocType: Quality Inspection,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Sprej za formiranje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Dodatni Mali
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ili BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna zaliha Razina
 DocType: Stock Entry,Subcontract,Podugovor
@@ -2340,42 +2158,39 @@
 DocType: Item,Manufacturer Part Number,Proizvođačev broj dijela
 DocType: Production Order Operation,Estimated Time and Cost,Procijenjeno vrijeme i trošak
 DocType: Bin,Bin,Kanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Broj poslanih SMS-a
 DocType: Account,Company,Društvo
 DocType: Account,Expense Account,Rashodi račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,softver
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,softver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Boja
 DocType: Maintenance Visit,Scheduled,Planiran
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite stavku u kojoj &quot;Je kataloški Stavka&quot; je &quot;Ne&quot; i &quot;Je Prodaja Stavka&quot; &quot;Da&quot;, a ne postoji drugi bala proizvoda"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Odaberite mjesečna distribucija na nejednako distribuirati ciljeve diljem mjeseci.
 DocType: Purchase Invoice Item,Valuation Rate,Stopa vrednovanja
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cjenik valuta ne bira
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Stavka Red {0}: Kupnja Potvrda {1} ne postoji u gornjoj tablici 'kupiti primitaka'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
 DocType: Installation Note Item,Against Document No,Protiv dokumentu nema
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Uredi prodajne partnere.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Odaberite {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,istraživač
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ažuriraj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,istraživač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Molimo spremite Newsletter prije slanja
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ili e-mail je obavezno
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeno Kom
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Korijen Tip je obvezno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibracijski završna obrada
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
 DocType: Employee,You can enter any date manually,Možete ručno unijeti bilo koji datum
 DocType: Sales Invoice,Advertisement,Oglas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probni
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
@@ -2383,43 +2198,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Za datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Mljevenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Stisni omatanje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivnosti na čekanju
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrđen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavljač> proizvođač tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naziv adrese je obavezan.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Novinski izdavači
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Novinski izdavači
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Attendance,Attendance Date,Gledatelja Datum
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
 DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Datum objave
 DocType: Item,Valuation Method,Metoda vrednovanja
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nije moguće pronaći tečaj za {0} do {1}
 DocType: Sales Invoice,Sales Team,Prodajni tim
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dupli unos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dupli unos
 DocType: Serial No,Under Warranty,Pod jamstvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Greška]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendan zaposlenika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijski Ne {0} ne postoji
 DocType: Pricing Rule,Discount Percentage,Postotak popusta
 DocType: Payment Reconciliation Invoice,Invoice Number,Račun broj
-apps/erpnext/erpnext/hooks.py +70,Orders,Narudžbe
+apps/erpnext/erpnext/hooks.py +54,Orders,Narudžbe
 DocType: Leave Control Panel,Employee Type,Zaposlenik Tip
 DocType: Employee Leave Approver,Leave Approver,Osoba ovlaštena za odobrenje odsustva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materijal prenose Proizvodnja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Korisnik s ""Rashodi Odobritelj"" ulozi"
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
@@ -2431,7 +2243,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Pogrešna razdoblje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Odaberite tip transakcije
 DocType: GL Entry,Voucher No,Bon Ne
@@ -2441,11 +2252,10 @@
 DocType: Customer,Address and Contact,Kontakt
 DocType: Customer,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
 DocType: Employee,Feedback,Povratna veza
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Raspored
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brusni jet obrada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Raspored
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
-DocType: Website Settings,Website Settings,Postavke web stranice
 DocType: Item,Reorder level based on Warehouse,Razina redoslijeda na temelju Skladište
 DocType: Activity Cost,Billing Rate,Ocijenite naplate
 ,Qty to Deliver,Količina za otpremu
@@ -2456,20 +2266,19 @@
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Korijen račun ne može biti izbrisan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Korijen račun ne može biti izbrisan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaži ulaz robe
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje adrese
 DocType: Pricing Rule,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zatvaranje (DR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zatvaranje (DR)
 DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
@@ -2485,10 +2294,9 @@
 ,Billed Amount,Naplaćeni iznos
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nabavite ažuriranja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj nekoliko uzorak zapisa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Dodaj nekoliko uzorak zapisa
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Ostavite upravljanje
-DocType: Event,Groups,Grupe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niža primanja
@@ -2497,40 +2305,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Brza pomoć
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
 DocType: Features Setup,Sales Extras,Prodajni dodaci
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} od troška {2} premašit će po {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,"Vrijednost, ili Kol"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Odobreni popis neodobrenih odsustava
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor pretvorbe ne može biti u frakcijama
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Koristit ćete ga za prijavu
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Koristit ćete ga za prijavu
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Provjerite plaće slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,osigurani krediti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super proizvodi
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Početno stanje kapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Ne može odobriti dopust kako niste ovlašteni za odobravanje lišće o skupnom datume
 DocType: Appraisal,Appraisal,Procjena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljeno-pjena lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Crtanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponavlja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Workstation Working Hour,Start Time,Vrijeme početka
@@ -2544,12 +2349,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
 DocType: BOM Operation,Hour Rate,Cijena sata
 DocType: Stock Settings,Item Naming By,Proizvod imenovan po
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,od kotaciju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,od kotaciju
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drugi period Zatvaranje Stupanje {0} je postignut nakon {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materijal Preneseni za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne postoji
 DocType: Purchase Receipt Item,Purchase Order Item No,Narudžbenica Br.
-DocType: System Settings,System Settings,Postavke sustava
 DocType: Project,Project Type,Vrsta projekta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ili meta Količina ili ciljani iznos je obavezna .
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Troškovi raznih aktivnosti
@@ -2558,36 +2362,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 DocType: Supplier,Supplier Details,Dobavljač Detalji
-DocType: Communication,Recipients,Primatelji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vijak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavi artikle u Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Odaberite bankovni račun
 DocType: Newsletter,Create and Send Newsletters,Kreiraj i pošalji bilten
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti prije do danas
 DocType: Sales Order,Recurring Order,Ponavljajući narudžbe
 DocType: Company,Default Income Account,Zadani račun prihoda
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa kupaca / Kupac
 DocType: Item Group,Check this if you want to show in website,Označi ovo ako želiš prikazati na webu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli u ERPNext
+,Welcome to ERPNext,Dobrodošli u ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detalj broj
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dovesti do kotaciju
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Pozivi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
 ,Projected,Predviđeno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
@@ -2595,13 +2395,10 @@
 DocType: Issue,Opening Date,Datum otvaranja
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Dosadan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od prodajnog naloga
-DocType: Blog Category,Parent Website Route,Nadređeni put web stranice
 DocType: Sales Order,Not Billed,Nije naplaćeno
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Još uvijek nema dodanih kontakata.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nije aktivan
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Iznos naloga zavisnog troška
 DocType: Time Log,Batched for Billing,Izmiješane za naplatu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Mjenice podigao dobavljače.
@@ -2609,20 +2406,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Iznos popusta
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Vruće metala plin tvore
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Idi na odgovarajućoj skupini (obično izvor sredstava&gt; kratkoročnih obveza&gt; poreza i pristojbi te stvoriti novi račun (klikom na Dodaj dijete) tipa &quot;poreza&quot; i to spomenuti porezna stopa.
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Nedostaje Valuta za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersko rezanje
-DocType: Event,Monday,Ponedjeljak
 DocType: Journal Entry,Stock Entry,Međuskladišnica
 DocType: Account,Payable,Plativ
 DocType: Salary Slip,Arrear Amount,Iznos unatrag
@@ -2635,7 +2429,6 @@
 DocType: Lead,Address Desc,Adresa silazno
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Gdje se odvija proizvodni postupci.
-DocType: Page,All,Sve
 DocType: Stock Entry Detail,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
 DocType: Employee,Confirmation Date,potvrda Datum
@@ -2643,9 +2436,8 @@
 DocType: Account,Sales User,Prodaja Korisnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Minimalna količina ne može biti veća od maksimalne količine
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,set
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Skladište je potrebno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Skladište je potrebno
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Time Log,Will be updated when billed.,Hoće li biti promjena kada je naplaćeno.
@@ -2659,44 +2451,40 @@
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Ime tvrtke ne mogu biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za ispis predložaka, na primjer predračuna."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Molimo spomenuti zaokružiti troška u Društvu
 DocType: Purchase Invoice,Terms,Uvjeti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Kreiraj novi dokument
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Kreiraj novi dokument
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
 ,Item-wise Sales History,Pregled prometa po artiklu
 DocType: Expense Claim,Total Sanctioned Amount,Ukupno kažnjeni Iznos
 ,Purchase Analytics,Kupnja Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Otpremnica proizvoda
 DocType: Expense Claim,Task,Zadatak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Brijanje
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Glavna knjiga
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Ocijenite: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Ocijenite: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plaća proklizavanja Odbitak
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Zabilješke
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Odaberite grupu čvor na prvom mjestu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Svrha mora biti jedna od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Ispunite obrazac i spremite ga
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Preuzmite izvješće koje sadrži sve sirovine sa svojim najnovijim statusom inventara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Suočavanje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Bilanca odsustva prije predaje zahtjeva
 DocType: SMS Center,Send SMS,Pošalji SMS
 DocType: Company,Default Letter Head,Default Pismo Head
 DocType: Time Log,Billable,Naplativo
-DocType: Authorization Rule,This will be used for setting rule in HR module,To će se koristiti za postavljanje pravilu u HR modula
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Poredaj Kom
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
@@ -2708,12 +2496,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Razlog gubitka prilike
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust polja će biti dostupna u narudžbenici, primci i računu kupnje"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naziv novog računa. Napomena: Molimo vas da ne stvaraju račune za kupce i dobavljače
-DocType: Report,Report Type,Prijavi Vid
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Učitavanje
 DocType: BOM Replace Tool,BOM Replace Tool,BOM zamijeni alat
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država mudar zadana adresa predlošci
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Pokaži porez raspada
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ako uključiti u proizvodnom djelatnošću . Omogućuje stavci je proizveden '
@@ -2723,16 +2509,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Zahtjev za robom - broj detalja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tvrdi okretanje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Provjerite održavanja Posjetite
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,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 +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Napomena: Ukoliko uplata nije izvršena protiv bilo referencu, provjerite Temeljnica ručno."
 DocType: Item,Supplier Items,Dobavljač Stavke
 DocType: Opportunity,Opportunity Type,Tip prilike
@@ -2744,7 +2529,7 @@
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
 ,Stock Ageing,Starost skladišta
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' je onemogućen
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošaljite e-poštu automatski u imenik na podnošenje transakcija.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2752,59 +2537,51 @@
  Dostupno Količina: {4}, prijenos Kol: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Kupac Kontakt e
-DocType: Event,Sunday,Nedjelja
 DocType: Sales Team,Contribution (%),Doprinos (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Napomena : Stupanje Plaćanje neće biti izrađen od ' Gotovina ili bankovni račun ' nije naveden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj korisnicima
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Dodaj korisnicima
 DocType: Pricing Rule,Item Group,Grupa proizvoda
 DocType: Task,Actual Start Date (via Time Logs),Stvarni datum početka (putem Vrijeme Trupci)
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
 DocType: Item,Default BOM,Zadani BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Ukupni Amt
 DocType: Time Log Batch,Total Hours,Ukupno vrijeme
 DocType: Journal Entry,Printing Settings,Ispis Postavke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilska industrija
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Proizvod je potreban
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal injection moulding
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od otpremnici
 DocType: Time Log,From Time,S vremena
 DocType: Notification Control,Custom Message,Prilagođena poruka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Odaberite svoju zemlju, vremensku zonu i valutu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Stavljanje u turšiju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pijesak lijevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvansko
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,stažista
 DocType: Newsletter,A Lead with this email id should exist,Kontakt sa ovim e-mailom bi trebao postojati
 DocType: Stock Entry,From BOM,Od sastavnice
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 DocType: Salary Structure,Salary Structure,Plaća Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Višestruki Cijena postoji pravilo s istim kriterijima, molimo rješavanje sukoba \
  dodjeljivanjem prioriteta. Cijena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Izdavanje materijala
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,Datum ponude
 DocType: Hub Settings,Access Token,Pristup token
@@ -2813,45 +2590,37 @@
 DocType: Item,Is Fixed Asset Item,Je fiksne imovine stavku
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ako ste dugo ispis formata, ova značajka može se koristiti za podijeliti stranicu na koju se ispisuje više stranica sa svim zaglavljima i podnožjima na svakoj stranici"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod bala predmeta
 DocType: Sales Partner,Sales Partner Name,Naziv prodajnog partnera
 DocType: Purchase Invoice Item,Image View,Prikaz slike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Dovršavanje i industrijska oplemenjivanje
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od i Do datuma zahtijevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrijednosni papiri i robne razmjene
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Bušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Puhanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava Grad
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, osim ako je postavljen 'Ne Kopiraj'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, osim ako je postavljen 'Ne Kopiraj'"
 DocType: Account,Purchase User,Kupnja Korisnik
 DocType: Notification Control,Customize the Notification,Prilagodi obavijest
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Zakucavanje
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Journal Entry,Print Heading,Ispis naslova
 DocType: Quotation,Maintenance Manager,Upravitelj održavanja
-DocType: Workflow State,Search,Traži
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dani od posljednje narudžbe' mora biti veći ili jednak nuli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lemljenje
 DocType: C-Form,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ili meta Količina ili ciljani iznos je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
 DocType: Leave Control Panel,Carry Forward,Prenijeti
@@ -2860,45 +2629,44 @@
 ,Produced,Proizvedeno
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Opći
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pričvrstite zaglavljem
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Opći
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Pričvrstite zaglavljem
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Popis svoje porezne glave (npr PDV, carina itd, oni bi trebali imati jedinstvene nazive) i njihove standardne stope. To će stvoriti standardni predložak koji možete uređivati i dodavati više kasnije."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Popis svoje porezne glave (npr PDV, carina itd, oni bi trebali imati jedinstvene nazive) i njihove standardne stope. To će stvoriti standardni predložak koji možete uređivati i dodavati više kasnije."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 DocType: Journal Entry,Bank Entry,Bank Stupanje
 DocType: Authorization Rule,Applicable To (Designation),Odnosi se na (Oznaka)
-DocType: Blog Post,Blog Post,Blog članak
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupa Do
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogućiti / onemogućiti valute .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštanski troškovi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Purchase Order,The date on which recurring order will be stop,Datum na koji se ponavlja kako će biti zaustaviti
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mora biti smanjena za {1} ili bi trebali povećati overflow toleranciju
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Ukupno Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Sat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Sat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Napravi ponudu
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kovrčav
 DocType: Account,Tax,Porez
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Red {0}: {1} nije valjana {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinirajuæa
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Red {0}: {1} nije valjana {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle proizvoda
 DocType: Production Planning Tool,Production Planning Tool,Planiranje proizvodnje alat
 DocType: Quality Inspection,Report Date,Prijavi Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Usmjeravanje
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Titula
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Primatelji
 DocType: Features Setup,Item Groups in Details,Grupe proizvoda detaljno
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
@@ -2907,33 +2675,29 @@
 DocType: Stock Entry,Update Rate and Availability,Brzina ažuriranja i dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: Pricing Rule,Customer Group,Grupa kupaca
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: Item,Website Description,Opis web stranice
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
 ,Sales Register,Prodaja Registracija
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 DocType: Address,Plant,Biljka
-DocType: DocType,Setup,Postavke
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sažetak za ovaj mjesec i tijeku aktivnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Naziv grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Značajke
-DocType: Packing Slip,Get Items,Kreiraj proizvode
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Unesite otpis račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnje narudžbe Datum
-DocType: DocField,Image,Slika
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Provjerite trošarinske fakturu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
-DocType: Communication,Other,Drugi
 DocType: C-Form,C-Form,C-obrazac
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID nije postavljen
 DocType: Production Order,Planned Start Date,Planirani datum početka
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Posjetite
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Posjetite
 DocType: Leave Type,Is Encash,Je li unovčiti
 DocType: Purchase Invoice,Mobile No,Mobitel br
 DocType: Payment Tool,Make Journal Entry,Provjerite Temeljnica
@@ -2941,35 +2705,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,trgovački
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,trgovački
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 DocType: Cost Center,Distribution Id,ID distribucije
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super usluge
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Svi proizvodi i usluge.
 DocType: Purchase Invoice,Supplier Address,Dobavljač Adresa
-DocType: Contact Us Settings,Address Line 2,Adresa - linija 2
-DocType: ToDo,Reference,Upućivanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financijske usluge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrijednost za Osobina {0} mora biti u rasponu od {1} {2} u koracima od {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
 DocType: Leave Allocation,Unused leaves,Neiskorišteni lišće
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default receivable račune
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piljenje
 DocType: Tax Rule,Billing State,Državna naplate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Plastificiranje
 DocType: Item Reorder,Transfer,Prijenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteriranje
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2980,9 +2738,8 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-DocType: Product Bundle,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Porazan
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupnja poreze i pristojbe predloška
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: GL Entry,Remarks,Primjedbe
@@ -2990,48 +2747,44 @@
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Features Setup,POS View,Prodajno mjesto prikaz
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalacijski zapis za serijski broj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano lijevanje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iznad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Račun {0} ne može biti grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
 DocType: Holiday List,Weekly Off,Tjedni Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Privremeni dobit / gubitak (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Povratak protiv prodaje fakturu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Stavka 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Molimo postavite zadanu vrijednost {0} u Društvu {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Molimo postavite zadanu vrijednost {0} u Društvu {1}
 DocType: Serial No,Creation Time,vrijeme kreiranja
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ukupni prihodi
 DocType: Sales Invoice,Product Bundle Help,Proizvod bala Pomoć
 ,Monthly Attendance Sheet,Mjesečna lista posjećenosti
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nije pronađen zapis
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} nije aktivan
 DocType: GL Entry,Is Advance,Je Predujam
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Gledanost od datuma do datuma je obvezna
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Unesite ' Je podugovoren ' kao da ili ne
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Račun dobiti i gubitka' tip računa {0} nije dopušten u otvorenom ulazu
-DocType: Workflow State,Time,Vrijeme
 DocType: Features Setup,Sales Discounts,Prodajni popusti
 DocType: Hub Settings,Seller Country,Prodavač Država
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja Porezi i pristojbe Predložak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Broj narudžbe
-DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
+DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Navedite uvjete za izračunavanje iznosa dostave
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj dijete
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Uloga dopušteno postavljanje blokada računa i uređivanje Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ne može se pretvoriti troška za knjigu , kao da ima djece čvorova"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor pretvorbe je potrebno
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serijski #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodaju
 DocType: Offer Letter Term,Value / Description,Vrijednost / Opis
@@ -3039,15 +2792,13 @@
 ,Customers Not Buying Since Long Time,Kupci koji nisu kupili već dugo vremena
 DocType: Production Order,Expected Delivery Date,Očekivani rok isporuke
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Ispupčen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Isparenja-uzorak lijevanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Troškovi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Doba
 DocType: Time Log,Billing Amount,Naplata Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Prijave za odmor.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni troškovi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto kako bi se ostvarila npr 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Objavljivanje Vrijeme
@@ -3061,26 +2812,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novi prihod kupca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,putni troškovi
 DocType: Maintenance Visit,Breakdown,Slom
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kao i na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Brušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probni rad
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
-DocType: Feed,Full Name,Ime i prezime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Učvrstio
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probni rad
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Glavno skladište je obvezno za skladišni proizvod.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Isplata plaće za mjesec {0} i godina {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 ,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Kretanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planiranje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Napravi grupno vrijeme prijave
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdano
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodajemo ovaj proizvod
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Prodajemo ovaj proizvod
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Dobavljač
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
@@ -3089,18 +2837,16 @@
 DocType: Brand,Item Manager,Stavka Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Dodaj redak za izračun godišnjeg proračuna.
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Vađenje
 DocType: Production Order,Total Operating Cost,Ukupni trošak
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Svi kontakti.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica Društvo
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica Društvo
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ako slijedite kvalitete . Omogućuje predmet QA potrebno i QA Ne u Račun kupnje
 DocType: GL Entry,Party Type,Tip stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Vrtnje moulding
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plaća predložak majstor .
 DocType: Leave Type,Max Days Leave Allowed,Max Dani Ostavite dopuštenih
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Postavite Porezni Pravilo za košaricu
@@ -3114,15 +2860,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Porez Predložak je obavezno.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Account,Temporary,Privremen
 DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,tajnica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,tajnica
 DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku
 DocType: Pricing Rule,Buying,Kupnja
 DocType: HR Settings,Employee Records to be created by,Zaposlenik Records bi se stvorili
@@ -3135,24 +2881,21 @@
 ,Item-wise Price List Rate,Item-wise cjenik
 DocType: Purchase Order Item,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Glačanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zaustavljen
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
 DocType: Lead,Add to calendar on this date,Dodaj u kalendar na ovaj datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Nadolazeći događaji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
-DocType: Letter Head,Letter Head,Zaglavlje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Brzi Ulaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za povratak
 DocType: Purchase Order,To Receive,Primiti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Stisni dolikuje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodi / rashodi
 DocType: Employee,Personal Email,Osobni email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ukupne varijance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ukupne varijance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
 DocType: Address,Postal Code,poštanski broj
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","U nekoliko minuta 
@@ -3160,18 +2903,16 @@
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Narudžbe objavljen za proizvodnju.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Hub Settings,Name Token,Naziv tokena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Blanjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast jednom skladištu je obavezno
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Unesite zadanu jedinicu mjere
 DocType: Purchase Invoice Item,Project Name,Naziv projekta
 DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
-DocType: Workflow State,Edit,Uredi
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
 DocType: Features Setup,Item Batch Nos,Broj serije proizvoda
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3179,13 +2920,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
-DocType: Contact Us Settings,Pincode,Poštanski broj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novi skladišni UOM mora biti različit od trenutnog UOM-a
 DocType: Account,Debit,Zaduženje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Odsustva moraju biti dodijeljena kao višekratnici od 0,5"
 DocType: Production Order,Operation Cost,Operacija troškova
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prenesi dolazak iz. Csv datoteku
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izvanredna Amt
@@ -3201,10 +2940,7 @@
 DocType: Project,Default Cost Center,Zadana troškovnih centara
 DocType: Purchase Invoice,End Date,Datum završetka
 DocType: Employee,Internal Work History,Unutarnja Povijest Posao
-DocType: DocField,Column Break,Kolona Break
-DocType: Event,Thursday,Četvrtak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Tokarenje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
 DocType: Sales Invoice,Exhibition,Izložba
@@ -3217,31 +2953,30 @@
 DocType: Employee,Held On,Održanoj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodni proizvod
 ,Employee Information,Informacije o zaposleniku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Stopa ( % )
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Financijska godina - zadnji datum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Financijska godina - zadnji datum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Ne možete filtrirati na temelju vaučer No , ako grupirani po vaučer"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Smanjenje plaća za ostaviti bez plaće (lwp)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Napomena: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ovaj tjedan Sažetak
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora bitikupljen ili pod-ugovori stavka u nizu {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Datum prilike
 DocType: Purchase Receipt,Return Against Purchase Receipt,Povratak Protiv Račun kupnje
 DocType: Purchase Order,To Bill,Za Billa
 DocType: Material Request,% Ordered,% Ž
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Rad po komadu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG. Kupnja stopa
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
@@ -3258,77 +2993,68 @@
 DocType: Opportunity,To Discuss,Za Raspravljajte
 DocType: SMS Settings,SMS Settings,SMS postavke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Crna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Crna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Datum završetka razdoblja tekuće narudžbe
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Ponudu Pismo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Povratak
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
-DocType: DocField,Fold,Saviti
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Zadana mjerna jedinica za inačicom mora biti ista kao predložak
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
 DocType: Project Task,Pending Review,U tijeku pregled
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Navedite
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Korisnički ID
-DocType: Page,Page Name,Ime stranice
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Za vrijeme mora biti veći od od vremena
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vretena završna obrada
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","na primjer ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","na primjer ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati točkom {0} jer ima varijante
 ,Sales Person-wise Transaction Summary,Pregled prometa po prodavaču
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrirajte se za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni postotci distribucije
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% robe od ove otpremnice je isporučeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Klamanje
 DocType: Customer,Customer Details,Korisnički podaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Izvješća
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Sales Invoice,Paid Amount,Plaćeni iznos
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Zatvaranje računa {0} mora biti tipa ' odgovornosti '
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kvalitetom
 DocType: Production Planning Tool,Filter based on customer,Filtriranje prema kupcima
 DocType: Payment Tool Detail,Against Voucher No,Protiv Voucher br
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 DocType: Tax Rule,Purchase,Kupiti
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanca kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanca kol
 DocType: Item Group,Parent Item Group,Nadređena grupa proizvoda
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} od {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Troška
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Skladišta.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Skladišta.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Red # {0}: vremenu sukobi s redom {1}
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajne imovine
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Razdoblje zahtjev ne može biti preko dva alocation zapisa
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
 DocType: Employee,Notice (days),Obavijest (dani)
-DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
 DocType: Employee,Encashment Date,Encashment Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Protiv bon Tip mora biti jedan od narudžbenice, fakturi ili Temeljnica"
 DocType: Account,Stock Adjustment,Stock Podešavanje
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Zadana aktivnost Troškovi postoji Vrsta djelatnosti - {0}
 DocType: Production Order,Planned Operating Cost,Planirani operativni trošak
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Novo {0} ime
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},U prilogu {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},U prilogu {0} # {1}
 DocType: Job Applicant,Applicant Name,Podnositelj zahtjeva Ime
 DocType: Authorization Rule,Customer / Item Name,Kupac / Stavka Ime
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3341,7 +3067,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Navedite od / do rasponu
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Stvorio
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stopa predmeta vrednovanja preračunava obzirom sletio troškova iznos vaučera
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Zadane postavke za prodajne transakcije.
@@ -3353,17 +3078,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimalni iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update gotovih proizvoda
 DocType: Workstation,per hour,na sat
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} se već koristi u {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Zadani poreza i naknada
 DocType: Account,Receivable,potraživanja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
 DocType: Sales Invoice,Supplier Reference,Dobavljač Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ako je označeno, BOM za pod-zbor stavke će biti uzeti u obzir za dobivanje sirovine. Inače, sve pod-montaža stavke će biti tretirani kao sirovinu."
@@ -3371,8 +3095,8 @@
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena proizvoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
@@ -3381,7 +3105,6 @@
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Alat za zamjenu mjernih jedinica (UOM)
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Za datum mora biti unutar fiskalne godine. Pod pretpostavkom da bi datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ovdje možete održavati visina, težina, alergije, medicinske brige itd."
@@ -3393,7 +3116,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnju
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Unesite prodajnog naloga u gornjoj tablici
 DocType: Project Task,View Task,Pregled zadataka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaša financijska godina počinje
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaša financijska godina počinje
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Unesite Kupnja primici
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
@@ -3401,20 +3124,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Postavke dolaznog servera za e-mail podrške (npr. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Poliranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do datuma ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izradi pakiranje gaćice za pakete biti isporučena. Koristi se za obavijesti paket broj, sadržaj paketa i njegovu težinu."
 DocType: Sales Invoice Item,Sales Order Item,Naručeni proizvod - prodaja
 DocType: Salary Slip,Payment Days,Plaćanja Dana
 DocType: BOM,Manage cost of operations,Uredi troškove poslovanja
 DocType: Features Setup,Item Advanced,Proizvod - napredno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Vruće valjanje
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3423,35 +3144,28 @@
 DocType: Customer,Sales Team Details,Detalji prodnog tima
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencijalne prilike za prodaju.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Pogrešna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Robne kuće
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sustav Balance
-DocType: Workflow,Is Active,Je aktivan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sustav Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Promijeni naziv
-DocType: Workflow State,Primary,Osnovni
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Maksimalni popust (%)
-DocType: Communication,More Information,Više informacija
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Iznos zadnje narudžbe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranje
 DocType: Company,Warn,Upozoriti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vrednovanje proizvoda je izmijenjeno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Order,Raw Materials Supplied,Sirovine nabavlja
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajući Ispis formata
-DocType: Communication,Series,Serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Klasifikacija predmeta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Voditelj razvoja poslovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Voditelj razvoja poslovanja
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Razdoblje
 ,General Ledger,Glavna knjiga
@@ -3461,9 +3175,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Odaberite {0} Prvi
 DocType: Features Setup,To get Item Group in details table,Da biste dobili predmeta Group u tablici pojedinosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekrajanjem
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Radirung
 DocType: Sales Invoice,Commission,provizija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3489,7 +3201,7 @@
  {% ako email_id%} e: {{email_id}} & lt; br & gt {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Zadani iznos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Skladište nije pronađeno u sustavu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladište nije pronađeno u sustavu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ovomjesečnom Sažetak
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspekcija kvalitete - čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
@@ -3508,13 +3220,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
 DocType: Payment Tool,Get Outstanding Vouchers,Dobiti izvrsne Vaučeri
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Appraisal,Start Date,Datum početka
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrijednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodijeliti lišće za razdoblje .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite ovdje da biste potvrdili
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
@@ -3524,55 +3235,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme potrebno od strane dobavljača za isporuku
 DocType: Time Log,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Uklanjanje stavke ako troškovi se ne odnosi na tu stavku
-DocType: Dropbox Backup,Dropbox Access Allowed,Dozvoljen pristup Dropboxu
-DocType: Dropbox Backup,Weekly,Tjedni
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr.. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primite
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primite
 DocType: Maintenance Visit,Fully Completed,Potpuno Završeni
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Cijela
 DocType: Employee,Educational Qualification,Obrazovne kvalifikacije
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je uspješno dodana na popis Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronska zraka obrada
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupnja Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavno izvješće
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Upisi u glavnu knjigu su ažurirani
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavno izvješće
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi cijene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon troškovnih centara
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje narudžbe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje narudžbe
 DocType: Price List,Price List Name,Cjenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Ukupan rezultat
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
-,Setup Wizard,Čarobnjak za postavljanje
 DocType: Industry Type,Industry Type,Industrija Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nešto je pošlo po krivu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta tvrtke)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Lijev
-DocType: Email Alert,Reference Date,Referentni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
 DocType: Budget Detail,Budget Detail,Detalji proračuna
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM ažuriran točkom {0}
-DocType: Company History,Year,Godina
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-prodaju Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Vrijeme Prijavite {0} već naplaćeno
@@ -3585,55 +3284,52 @@
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
 DocType: Item,Unit of Measure Conversion,Mjerna jedinica pretvorbe
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaposlenik ne može se mijenjati
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
 DocType: Naming Series,Help HTML,HTML pomoć
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatak za prekomjerno {0} prešao za točku {1}
 DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši dobavljači
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Vaši dobavljači
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Još Struktura plaća {0} je aktivna djelatnika {1}. Molimo provjerite njegov status 'Neaktivan' za nastavak.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Primljeno od
 DocType: Features Setup,Exports,Izvoz
 DocType: Lead,Converted,Pretvoreno
 DocType: Item,Has Serial No,Ima serijski br
 DocType: Employee,Date of Issue,Datum izdavanja
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} od {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 DocType: Issue,Content Type,Vrsta sadržaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,računalo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
 DocType: Payment Reconciliation,Get Unreconciled Entries,Kreiraj neusklađene ulaze
 DocType: Cost Center,Budgets,Proračuni
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Obnovljeno
 DocType: Employee,Emergency Contact Details,Kontaktni podaci hitne službe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Što učiniti ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Što učiniti ?
 DocType: Delivery Note,To Warehouse,Za skladište
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je unešen više od jednom za fiskalnu godinu {1}
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ažuriranje dodatne troškove za izračun sletio trošak stavke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električna
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Korisnik ID nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od jamstvenog zahtjeva
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Preklapanje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dana od posljednje narudžbe
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dana od posljednje narudžbe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
-DocType: User,Enabled,Omogućeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Želite li zaista podnijeti sve klizne plaće za mjesec {0} i godinu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvoz Pretplatnici
@@ -3641,19 +3337,18 @@
 DocType: Attendance,Present,Sadašnje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
 DocType: Authorization Rule,Based On,Na temelju
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Razdoblje od razdoblja do datuma obvezna za ponavljajućih {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt aktivnost / zadatak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generiranje plaće gaćice
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nije ispravan id e-mail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba biti provjerena, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
-DocType: ToDo,Low,Nisko
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Predenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
@@ -3675,7 +3370,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Potreban je naziv kampanje
 DocType: Maintenance Visit,Maintenance Date,Datum održavanje
 DocType: Purchase Receipt Item,Rejected Serial No,Odbijen Serijski br
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Duboko uzdisanje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novi bilten
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Pokaži stanje
@@ -3686,7 +3380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Iznos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Zakivanje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
 ,Sales Analytics,Prodajna analitika
 DocType: Manufacturing Settings,Manufacturing Settings,Postavke proizvodnje
@@ -3698,28 +3391,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modula
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služba za korisnike
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdite vašu e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuda kandidata za posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Ukupno dodijeljeni Listovi su više od dana u razdoblju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuum moulding
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
-DocType: Contact Us Settings,City,Grad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvučno obrada
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Pogreška: Nije valjana id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Stavka {0} mora bitiProdaja artikla
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
 DocType: Sales Order,Printing Details,Ispis Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,inženjer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupštine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
 DocType: Sales Partner,Partner Type,Tip partnera
@@ -3727,7 +3416,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Protiv Rashodi račun
 DocType: Production Order,Production Order,Proizvodni nalog
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Napomena instalacije {0} je već potvrđena
 DocType: Quotation Item,Against Docname,Protiv Docname
 DocType: SMS Center,All Employee (Active),Svi zaposlenici (aktivni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Pogledaj sada
@@ -3735,26 +3424,24 @@
 DocType: BOM,Raw Material Cost,Troškova sirovine
 DocType: Item,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Privemeno (nepuno radno vrijeme)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija ažurirana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta izvješća je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prvo Korisnik : Vi
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prvo Korisnik : Vi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspješno Pomirio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspješno Pomirio
 DocType: Production Order,Planned End Date,Planirani datum završetka
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Tax Rule,Validity,Valjanost
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Dostavljeni iznos
 DocType: Attendance,Attendance,Pohađanje
-DocType: Page,No,Br
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
@@ -3762,55 +3449,46 @@
 ,Item Prices,Cijene proizvoda
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
 DocType: Period Closing Voucher,Period Closing Voucher,Razdoblje Zatvaranje bon
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Glavni cjenik.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Glavni cjenik.
 DocType: Task,Review Date,Recenzija Datum
 DocType: Purchase Invoice,Advance Payments,Avansima
-DocType: DocPerm,Level,Razina
 DocType: Purchase Taxes and Charges,On Net Total,VPC
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Glodanje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemate dopuštenje za korištenje platnih alata
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
 DocType: Company,Round Off Account,Zaokružiti račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grickanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni troškovi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,savjetodavni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,savjetodavni
 DocType: Customer Group,Parent Customer Group,Nadređena grupa kupaca
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Otkaznog roka
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","na primjer ""Moja tvrtka LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Otkaznog roka
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ovo je glavni teritorij i ne može se mijenjati.
 DocType: Packing Slip,Gross Weight UOM,Bruto težina UOM
 DocType: Email Digest,Receivables / Payables,Potraživanja / obveze
 DocType: Delivery Note Item,Against Sales Invoice,Protiv prodaje fakture
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaži nulte vrijednosti
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina proizvoda dobivena nakon proizvodnje / pakiranja od navedene količine sirovina
 DocType: Payment Reconciliation,Receivable / Payable Account,Potraživanja / Plaća račun
 DocType: Delivery Note Item,Against Sales Order Item,Protiv prodaje reda točkom
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 DocType: Task,Actual End Date (via Time Logs),Stvarni datum završetka (preko Vrijeme Trupci)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Unesite roditelj troška
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
-DocType: User,Last Name,Prezime
-DocType: Web Page,Left,Lijevo
-DocType: Event,All Day,Svaki dan
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: Issue,Support Team,Tim za podršku
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
-DocType: Contact Us Settings,State,Županija
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ravnoteža
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ravnoteža
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja)
-DocType: User,Gender,Rod
 DocType: Journal Entry,Debit Note,Rashodi - napomena
 DocType: Stock Entry,As per Stock UOM,Kao po burzi UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nije istekao
@@ -3824,44 +3502,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Napravi pravila za ograničavanje prometa na temelju vrijednosti.
 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"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-DocType: Workflow State,User,Korisnik
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Obračun plaća
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje Potvrda Napomena
 DocType: Customer,Credit Days Based On,Kreditne dana na temelju
 DocType: Tax Rule,Tax Rule,Porezni Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Održavaj istu stopu tijekom cijelog prodajnog ciklusa
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte vrijeme za rezanje izvan radne stanice radnog vremena.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je već poslan
 ,Items To Be Requested,Potraživani proizvodi
-DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Naplate stopa temelji se na vrsti aktivnosti (po satu)
 DocType: Company,Company Info,Podaci o tvrtki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Šavove
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Tvrtka E-mail ID nije pronađen , pa se ne mail poslan"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 DocType: Production Planning Tool,Filter based on item,Filtriranje prema proizvodima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Duguje račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zatamnjenja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Primanja zaposlenih
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Mjenice podignuta na kupce.
-DocType: DocField,Default,Zadano
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Dodao {0} pretplatnika
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Odredite proračun za ovu troška. Za postavljanje proračuna akcije, pogledajte &quot;Lista poduzeća&quot;"
@@ -3872,70 +3546,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cjenik nije pronađena ili onemogućena
 DocType: Expense Claim,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
 DocType: Address,Office,Ured
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardno izvješće
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Za stvaranje porezno
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Trenutna adresa
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Hrpa Inventar
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Hrpa Inventar
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Povucite prodajne naloge (na čekanju za isporuku) na temelju navedenih kriterija
-DocType: DocShare,Document Type,Tip dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavljača kotaciju
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavljača kotaciju
 DocType: Deduction Type,Deduction Type,Tip odbitka
 DocType: Attendance,Half Day,Pola dana
 DocType: Pricing Rule,Min Qty,Min kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za praćenje predmeta u prodaji i kupnji dokumenata s serije br. &quot;Radije Industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcija Datum
 DocType: Production Plan Item,Planned Qty,Planirani Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Ukupno porez
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Ukupno porez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Proizvedeno Kol) je obavezno
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Ukupno dodijeljeni Listovi su više nego razdoblje
 DocType: Production Order,Actual Start Date,Stvarni datum početka
 DocType: Sales Order,% of materials delivered against this Sales Order,% robe od ove narudžbe je isporučeno
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zabilježite stavku pokret.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bilten popis pretplatnika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,usluga
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 ,Monthly Salary Register,Mjesečna plaća Registracija
-apps/frappe/frappe/website/template.py +140,Next,Sljedeći
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
 DocType: BOM Operation,BOM Operation,BOM operacija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropoliranje
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prethodnu Row visini
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Unesite iznos otplate u atleast jednom redu
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Unesite iznos otplate u atleast jednom redu
 DocType: POS Profile,POS Profile,POS profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Red {0}: Plaćanje Iznos ne može biti veći od preostali iznos
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Ukupno Neplaćeni
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ukupno Neplaćeni
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Vrijeme Log nije naplatnih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupac
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupac
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plaća ne može biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Unesite protiv vaučera ručno
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Unesite protiv vaučera ručno
 DocType: SMS Settings,Static Parameters,Statički parametri
 DocType: Purchase Order,Advance Paid,Unaprijed plaćeni
 DocType: Item,Item Tax,Porez proizvoda
@@ -3944,14 +3611,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošalji grupne SMS poruke svojim kontaktima
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valjanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Proizvod će biti proizveden ili prepakiran
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i pristojbi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
 DocType: Hub Settings,Seller Name,Naziv prodavatelja
@@ -3961,47 +3626,44 @@
 DocType: Stock Entry,Repack,Prepakiraj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pričvrstite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Pričvrstite Logo
 DocType: Customer,Commission Rate,Komisija Stopa
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je prazna
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Korijen ne može se mijenjati .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Dodijeljeni iznos ne može veći od iznosa unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite proizvodnje na odmor
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapital
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Odaberite CSV datoteku
-DocType: Dropbox Backup,Send Backups to Dropbox,Pošalji sigurnosne kopije na Dropbox
 DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Imenovatelj
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatsko stvaranje materijala zahtjev ako količina padne ispod te razine
 ,Item-wise Purchase Register,Stavka-mudar Kupnja Registracija
 DocType: Batch,Expiry Date,Datum isteka
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Za postavljanje razine naručivanja točka mora biti Kupnja predmeta ili proizvodnja predmeta
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekt majstor.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
-DocType: Dropbox Backup,Send Notifications To,Slanje obavijesti
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: Expense Claim Detail,Sanctioned Amount,Iznos kažnjeni
 DocType: GL Entry,Is Opening,Je Otvaranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Račun {0} ne postoji
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za web stranice i drugih publikacija.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Molimo stvoriti Plaća Struktura za zaposlenika {0}

diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index ed025e6..bf2abe3 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Fizetés Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Válassza ki havi megoszlása, ha szeretné nyomon követni alapján a szezonalitás."
 DocType: Employee,Divorced,Elvált
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Figyelmeztetés: ugyanazt a tételt már többször jelenik meg.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Tételek már szinkronizálva
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Hagyjuk pont, hogy ki többször a tranzakció"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Mégsem Material látogatás {0} törlése előtt ezt a garanciális igény
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Kérjük, válasszon párt Type első"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Vásárlói elemek
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Account {0}: Parent véve {1} nem lehet a főkönyvi
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Hagyja Jóváhagyók
 DocType: Sales Partner,Dealer,Terjesztő
 DocType: Employee,Rented,Bérelt
-DocType: About Us Settings,Website,Weboldal
 DocType: POS Profile,Applicable for User,Alkalmazható Felhasználó
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállította a termelést rendelés nem törölhető, kidugaszol először, hogy megszünteti"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Tömörítő plusz szinterezés
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Árfolyam szükséges árlista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
 DocType: Purchase Order,Customer Contact,Ügyfélkapcsolati
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Az anyagi kérése
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Az anyagi kérése
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Fa
 DocType: Job Applicant,Job Applicant,Állásra pályázó
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nincs több eredményt.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Jogi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jogi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tényleges típusú adó nem lehet jogcím tartalmazza ráta sorban {0}
 DocType: C-Form,Customer,Vevő
 DocType: Purchase Receipt Item,Required By,Által előírt
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 perc
 DocType: Leave Type,Leave Type Name,Hagyja típus neve
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Sorozat sikeresen frissítve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Varrás
 DocType: Pricing Rule,Apply On,Alkalmazza
 DocType: Item Price,Multiple Item prices.,Több tétel árakat.
 ,Purchase Order Items To Be Received,Megrendelés tételek Kapott
 DocType: SMS Center,All Supplier Contact,Minden beszállító Kapcsolat
 DocType: Quality Inspection Reading,Parameter,Paraméter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet kevesebb, mint várható kezdési időpontja"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Ár kell egyeznie {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Új Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Ár kell egyeznie {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Új Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Ahhoz, hogy a megrendelő bölcs cikk-kód és kereshetővé tételéhez alapján kód Ezzel az opcióval"
 DocType: Mode of Payment Account,Mode of Payment Account,Mód Fizetési számla
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mutasd változatok
-DocType: Sales Invoice Item,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Mennyiség
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Hitelekkel (kötelezettségek)
 DocType: Employee Education,Year of Passing,Év Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Raktáron
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Szerezz új POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Egészségügyi ellátás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 DocType: Purchase Invoice,Monthly,Havi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Fizetési késedelem (nap)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email cím
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Védelem
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email cím
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Védelem
 DocType: Company,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Jármű No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Kérjük, válasszon árjegyzéke"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Faipari
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D nyomtatás
 DocType: Employee,Holiday List,Szabadnapok listája
 DocType: Time Log,Time Log,Időnapló
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Könyvelő
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Könyvelő
 DocType: Cost Center,Stock User,Stock Felhasználó
 DocType: Company,Phone No,Telefonszám
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bejelentkezés végzett tevékenységek, amelyeket a felhasználók ellen feladatok, melyek az adatok nyomon követhetők időt, számlázási."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Új {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Új {0}: # {1}
 ,Sales Partners Commission,Értékesítő partner jutaléka
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,"Rövidítése nem lehet több, mint 5 karakter"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.","Jellemző értéke {0} nem távolítható el {1}, mint Besorolás változatok \ létezni ezzel a tulajdonsággal."
-DocType: Print Settings,Classic,Klasszikus
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Ez a root fiók és nem lehet szerkeszteni.
 DocType: BOM,Operations,Művelet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nem lehet beállítani engedély alapján a kedvezmény {0}
 DocType: Bin,Quantity Requested for Purchase,Igényelt beszerzendő mennyiség
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Erősítse .csv fájlt két oszlopot, az egyik a régi nevet, a másik az új nevet"
 DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Nyitott állások
 DocType: Item Attribute,Increment,Növekmény
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Válassza Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Hirdetés
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hirdetés
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ugyanez a vállalat szerepel többször
 DocType: Employee,Married,Házas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nem engedélyezett {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nem lehet frissíteni ellen szállítólevél {0}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Élelmiszerbolt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Tedd Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Warehouse kötelező, ha figyelembe típus Warehouse"
 DocType: SMS Center,All Sales Person,Minden értékesítő
 DocType: Lead,Person Name,Személy Név
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Ellenőrizze, hogy a visszatérő érdekében, törölje megállítani visszatérő vagy tegye megfelelő End Date"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Órás sebesség / 60) * aktuális üzemidő
 DocType: SMS Log,SMS Log,SMS napló
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételek
-DocType: Blog Post,Guest,Vendég
 DocType: Quality Inspection,Get Specification Details,Get Specification Részletek
 DocType: Lead,Interested,Érdekelt
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Anyagjegyzék
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Nyílás
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Nyílás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Re {0} {1}
 DocType: Item,Copy From Item Group,Másolás jogcím-csoport
 DocType: Journal Entry,Opening Entry,Kezdő tétel
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} kötelező
 DocType: Stock Entry,Additional Costs,További költségek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Véve a meglévő ügylet nem konvertálható csoportot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Véve a meglévő ügylet nem konvertálható csoportot.
 DocType: Lead,Product Enquiry,Termék Érdeklődés
-DocType: Standard Reply,Owner,Tulajdonos
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Kérjük, adja cég első"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Kérjük, válasszon Társaság első"
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Cél On
 DocType: BOM,Total Cost,Összköltség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Dörzsárazás
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Tevékenység lista
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Elem {0} nem létezik a rendszerben, vagy lejárt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Ingatlan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Elem {0} nem létezik a rendszerben, vagy lejárt"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ingatlan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Statement of Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Követelés összege
 DocType: Employee,Mr,Úr
-DocType: Custom Script,Client,Ügyfél
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Szállító Type / szállító
 DocType: Naming Series,Prefix,Előtag
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Elhasználható
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Elhasználható
 DocType: Upload Attendance,Import Log,Importálás naplója
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Küldés
 DocType: Sales Invoice Item,Delivered By Supplier,Megérkezés a Szállító
 DocType: SMS Center,All Contact,Minden Kapcsolattartó
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Éves Fizetés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Éves Fizetés
 DocType: Period Closing Voucher,Closing Fiscal Year,Záró pénzügyi év
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock költségek
 DocType: Newsletter,Email Sent?,Emailt elküldeni?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Időnaplók mutatása
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuta
 DocType: Delivery Note,Installation Status,Telepítés állapota
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiség meg kell egyeznie a beérkezett mennyiséget tétel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply nyersanyag beszerzése
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elem {0} kell a vásárlást tétel
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Töltse le a sablont, töltse megfelelő adatokat és csatolja a módosított fájlt. Minden időpontot és a munkavállalói kombináció a kiválasztott időszakban jön a sablon, a meglévő jelenléti ívek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Elem {0} nem aktív, vagy az elhasználódott elérte"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Után felülvizsgálják Sales számla benyújtásának.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hogy tartalmazzák az adót a sorban {0} tétel mértéke, az adók sorokban {1} is fel kell venni"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Beállításait HR modul
 DocType: SMS Center,SMS Center,SMS Központ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Egyengető
 DocType: BOM Replace Tool,New BOM,Új anyagjegyzék
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Time Naplók számlázás.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Ellennyomásos öntés
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Hírlevél még nem küldték
 DocType: Lead,Request Type,Kérés típusa
 DocType: Leave Application,Reason,Ok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Végrehajtás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Az első felhasználó lesz a System Manager (meg lehet változtatni erről később).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Végrehajtás
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Az első felhasználó lesz a System Manager (meg lehet változtatni erről később).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Részletek az elvégzett műveleteket.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Tételek és árak
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Tételek és árak
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátum belül kell pénzügyi évben. Feltételezve A Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Válassza ki a munkavállaló, akit alkotsz az értékelésre."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Költséghely {0} nem tartozik Company {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlista kell alkalmazni vétele vagy eladása
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},A telepítés időpontja nem lehet korábbi szállítási határidő jogcím {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Kedvezmény a árjegyzéke ráta (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Vezetéknév
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-olvadéköntési
 DocType: Offer Letter,Select Terms and Conditions,Válassza ki Feltételek
 DocType: Production Planning Tool,Sales Orders,Vevőmegrendelés
 DocType: Purchase Taxes and Charges,Valuation,Értékelés
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankszámla
 DocType: Leave Type,Allow Negative Balance,Negatív egyenleg engedélyezése
 DocType: Selling Settings,Default Territory,Alapértelmezett terület
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televízió
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televízió
 DocType: Production Order Operation,Updated via 'Time Log',"Frissítve keresztül ""Idő Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Account {0} nem tartozik Company {1}
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Sales Invoice,Is Opening Entry,Ez nyitó tétel?
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Beszélve, ha nem szabványos követelés véve az alkalmazandó"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"Raktár van szükség, mielőtt beküldése"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Beérkezett
 DocType: Sales Partner,Reseller,Viszonteladó
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Kérjük, adja Társaság"
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési számlák Elem
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 DocType: Lead,Address & Contact,Cím és Kapcsolattartó
 DocType: Leave Allocation,Add unused leaves from previous allocations,Add fel nem használt leveleket a korábbi juttatások
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Next Ismétlődő {0} jön létre {1}
 DocType: Newsletter List,Total Subscribers,Összes előfizető
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kapcsolattartó neve
+,Contact Name,Kapcsolattartó neve
 DocType: Production Plan Item,SO Pending Qty,SO Folyamatban Mennyiség
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérlap létrehozása a fenti kritériumok alapján.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kérheti a vásárlást.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dupla ház
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Leave Jóváhagyó nyújthatják be ez a szabadság Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Levelek évente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Levelek évente
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Kérjük, állítsa elnevezése Series {0} a Setup&gt; Beállítások&gt; elnevezése Series"
 DocType: Time Log,Will be updated when batched.,"Frissíteni kell, ha kötegelt."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Kérjük ellenőrzés ""Advance"" ellen Account {1}, ha ez egy előre bejegyzést."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} nem tartozik a cég {1}
-DocType: Bulk Email,Message,Üzenet
 DocType: Item Website Specification,Item Website Specification,Az anyag weboldala
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Hivatkozási szám
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Hagyja Blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Éves
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Hagyja Blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Elem {0} elérte az élettartama végét {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Megbékélés Elem
 DocType: Stock Entry,Sales Invoice No,Értékesítési számlák No
 DocType: Material Request Item,Min Order Qty,Min. rendelési menny.
 DocType: Lead,Do Not Contact,Ne írj
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Az egyedi azonosítóval nyomon követi az összes visszatérő számlákat. Úgy keletkezett benyújtani.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Item,Publish in Hub,Közzéteszi Hub
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} elem törölve
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,{0} elem törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Frissítés Végső dátum
 DocType: Item,Purchase Details,Vásárlási adatok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Elem {0} nem található &quot;szállított alapanyagok&quot; táblázat Megrendelés {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drótkeféléshez
 DocType: Employee,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Világszerte Szállítási
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Visszaigazolt megrendelések ügyfelektől.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobiltelefon
 DocType: Maintenance Schedule,Generate Schedule,Ütemezés generálása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Igénylés fejléce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Kérjük, válasszon Charge Type első"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max. 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Nyelvválasztás
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 karakter
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első Leave Jóváhagyó a lista lesz-e az alapértelmezett Leave Jóváhagyó
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Kikapcsolja létrehozása időt naplóid gyártási megrendeléseket. Műveletek nem lehet nyomon követni ellenében rendelés
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Változata
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Elem {0} kell lennie Service Elem
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint ""Menny a Manufacture"""
-DocType: DocType,Administrator,Adminisztrátor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lézerfúrással
-DocType: Stock UOM Replace Utility,New Stock UOM,Új készlet mértékegysége
 DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
 DocType: Employee,External Work History,Külső munka története
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Körkörös hivatkozás Error
-DocType: Communication,Closed,Lezárva
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakban (Export) lesz látható, ha menteni a szállítólevélen."
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Hírlevél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Smárolás
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Értesítés e-mailben a létrehozása automatikus Material kérése
 DocType: Journal Entry,Multi Currency,Több pénznem
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Elem frissül
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
 DocType: Sales Invoice Item,Delivery Note,Szállítólevél
-DocType: Dropbox Backup,Allow Dropbox Access,Dropbox hozzáférés engedélyezése
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Beállítása Adók
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetési Entry módosításra került, miután húzta. Kérjük, húzza meg újra."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} belépett kétszer tétel adó
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Workstation,Rent Cost,Bérleti díj
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Kérjük, válasszon hónapot és évet"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Cég E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Tartozik Összeg fiók pénzneme
 DocType: Shipping Rule,Valid for Countries,Érvényes Országok
-DocType: Workflow State,Refresh,Frissítés
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Minden behozatali kapcsolódó területeken, mint valuta átváltási arányok, import teljes, import végösszeg stb állnak rendelkezésre a vásárláskor kapott nyugtát, Szállító Idézet, vásárlást igazoló számlát, megrendelés, stb"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel az a sablon, és nem lehet használni a tranzakciók. Elem attribútumok fognak kerülnek át a változatok, kivéve, ha ""No Copy"" van beállítva"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Teljes Megrendelés Tekinthető
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Munkavállalói kijelölése (pl vezérigazgató, igazgató stb)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Kérjük, írja be a ""Repeat a hónap napja"" mező értéke"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Kérjük, írja be a ""Repeat a hónap napja"" mező értéke"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amely Customer Valuta átalakul ügyfél alap deviza"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Elérhető a BOM, szállítólevél, beszerzési számla, gyártási utasítás, megrendelés, vásárlási nyugta, Értékesítési számlák, Vevői rendelés, Stock Entry, Időnyilvántartó"
 DocType: Item Tax,Tax Rate,Adókulcs
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Elem kiválasztása
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Elem kiválasztása
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Cikk: {0} sikerült szakaszos, nem lehet összeegyeztetni a \ Stock Megbékélés helyett használja Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Vásárlást igazoló számlát {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Batch Nem kell egyeznie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Átalakítás nem Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Vásárlási nyugta kell benyújtani
-DocType: Stock UOM Replace Utility,Current Stock UOM,Raktárkészlet UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Egy tétel sok mennyisége a köteg.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Betéti összeg
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ott csak 1 fiók per Társaság {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-mail címed
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Kérjük, olvassa mellékletet"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Kérjük, olvassa mellékletet"
 DocType: Purchase Order,% Received,% fogadva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vízsugaras vágás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Beállítás Már Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Beállítás Már Komplett !!
 ,Finished Goods,Készáru
 DocType: Delivery Note,Instructions,Utasítások
 DocType: Quality Inspection,Inspected By,Megvizsgálta
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Kérjük, ne hozzon létre ügyfélszámlák és beszállítók. Ők jönnek létre közvetlenül a vevői / szállítói mesterek."
 DocType: Currency Exchange,Currency Exchange,Valuta árfolyam
 DocType: Purchase Invoice Item,Item Name,Az elem neve
+DocType: Authorization Rule,Approving User  (above authorized value),Jóváhagyó felhasználó (a fenti engedélyezett érték)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Özvegy
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Tételek kért, amelyek ""Elfogyott"" figyelembe véve az összes raktárak alapján tervezett Menny és a minimális rendelési mennyiség"
@@ -378,22 +346,21 @@
 ,Purchase Register,Vásárlási Regisztráció
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
 DocType: Workstation,Consumable Cost,Fogyó költség
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) kell szerepet ""Leave Jóváhagyó"""
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Orvosi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Orvosi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Veszteség indoka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Cső gyöngyfűzés
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban per Nyaralás listája: {0}
 DocType: Employee,Single,Egyedülálló
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Költségvetést nem lehet beállítani Group Cost Center
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési
 DocType: Purchase Invoice,Yearly,Évi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Kérjük, adja Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Kérjük, adja Cost Center"
 DocType: Journal Entry Account,Sales Order,Értékesítési megrendelés
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Átlagos eladási ráta
 DocType: Purchase Order,Start date of current order's period,Kezdje napját az aktuális rendelés időszaka
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Mennyiség nem lehet egy frakciót sorában {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Mennyiség nem lehet egy frakciót sorában {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és ár
 DocType: Delivery Note,% Installed,% telepítve
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Kérjük adja meg a cégnevet első
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Csoport
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikusan beállítja Soros számú alapuló FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze Szállító Számla száma Egyediség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""A Case No."" nem lehet kevesebb, mint ""A Case No."""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nem kezdődött
 DocType: Lead,Channel Partner,Értékesítési partner
 DocType: Account,Old Parent,Régi szülő
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamat.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Képesség {0} kiválasztott többször attribútumok táblázat
+DocType: HR Settings,Employee record is created using selected field. ,Munkavállalói rekord jön létre a kiválasztott mező.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Nyaralás mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Héjformázás
 DocType: Material Request Item,Required Date,Szükséges dátuma
 DocType: Delivery Note,Billing Address,Számlázási cím
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Kérjük, adja tételkód."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Kérjük, adja tételkód."
 DocType: BOM,Costing,Költség
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ha be van jelölve, az adó összegét kell tekinteni, mint amelyek már szerepelnek a Print Ár / Print Összeg"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
 DocType: Features Setup,Imports,Importálások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ragasztás
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Összesen levelek kiosztott kötelező
 DocType: Job Opening,Description of a Job Opening,Leírása egy Állásajánlatok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Függő tevékenységek ma
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Részvételi rekord.
 DocType: Bank Reconciliation,Journal Entries,Könyvelési tételek
 DocType: Sales Order Item,Used for Production Plan,Használt termelési terv
-DocType: System Settings,Loading...,Betöltés...
-DocType: DocField,Password,Jelszó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Olvasztott leválasztás modellezés
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (percben)
 DocType: Customer,Buyer of Goods and Services.,Vevő az áruk és szolgáltatások.
 DocType: Journal Entry,Accounts Payable,Fizethető számlák
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Add előfizetők
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Nem létezik"
 DocType: Pricing Rule,Valid Upto,Érvényes eddig:
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Sorolja pár az ügyfelek. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Közvetlen jövedelemtámogatás
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nem tudja kiszűrni alapján Account, ha csoportosítva Account"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Igazgatási tisztviselő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Igazgatási tisztviselő
 DocType: Payment Tool,Received Or Paid,Kapott vagy fizetett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Kérjük, válasszon Társaság"
 DocType: Stock Entry,Difference Account,Különbség Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nem zárható feladata a függő feladat {0} nincs lezárva.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja Warehouse, amelyek anyaga kérés jelenik meg"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikum
-DocType: DocField,Type,Típus
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
-DocType: Communication,Subject,Tárgy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Egyesíteni, a következő tulajdonságokkal kell, hogy egyezzen mindkét tételek"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 ,Serial No Warranty Expiry,Sorozatszám garanciaidő lejárta
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Tétel
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Ügyvezető alvállalkozói munkák
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Új UOM TILOS típusú egész szám
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Ügyvezető alvállalkozói munkák
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Bútor és állvány
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amely Árlista valuta konvertálja a vállalkozás székhelyén pénznemben"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Account {0} nem tartozik a cég: {1}
@@ -480,29 +439,29 @@
 DocType: Production Planning Tool,Material Requirement,Anyagszükséglet
 DocType: Company,Delete Company Transactions,Törlés vállalkozásnak adott
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Elem {0} nem Purchase Elem
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} nem érvényes email címet 'Notification \ Email Address """
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Ebben az évben számlázva:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Ebben az évben számlázva:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nem lehet törölni a sorozatszám {0}, mivel ezt használja a részvény tranzakciók"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zárás (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zárás (Cr)
 DocType: Serial No,Warranty Period (Days),Garancia idő (nap)
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 ,Pending Qty,Folyamatban db
 DocType: Job Applicant,Thread HTML,HTML szál
 DocType: Company,Ignore,Mellőz
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Szállító Warehouse kötelező alvállalkozóknak vásárlási nyugta
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Szállító Warehouse kötelező alvállalkozóknak vásárlási nyugta
 DocType: Pricing Rule,Valid From,Érvényes innentől:
 DocType: Sales Invoice,Total Commission,Teljes Bizottság
 DocType: Pricing Rule,Sales Partner,Értékesítő partner
 DocType: Buying Settings,Purchase Receipt Required,Vásárlási Kötelező átvételi
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** A havi elosztási ** segít terjeszteni a költségvetési egész hónapban, ha a szezonalitás a te dolgod. Terjeszteni a költségvetési ezzel a forgalmazás, állítsa ezt ** havi megoszlása ** a ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** A havi elosztási ** segít terjeszteni a költségvetési egész hónapban, ha a szezonalitás a te dolgod. Terjeszteni a költségvetési ezzel a forgalmazás, állítsa ezt ** havi megoszlása ** a ** Cost Center **"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nincs bejegyzés találat a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Kérjük, válasszon Társaság és a Party Type első"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Serial Nos nem lehet összevonni,"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Projekt feladat
 ,Lead Id,Célpont ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
-DocType: About Us Settings,Website Manager,Weboldal menedzser
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Pénzügyi év kezdő dátuma nem lehet nagyobb, mint a pénzügyi év vége dátum"
 DocType: Warranty Claim,Resolution,Megoldás
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Szállított: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Számlázási és Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlóid
 DocType: Leave Control Panel,Allocate,Osztja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Előző
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Eladás visszaküldése
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Válassza ki Vevőmegrendelés ahonnan szeretne létrehozni gyártási megrendeléseket.
 DocType: Item,Delivered by Supplier (Drop Ship),Megérkezés a Szállító (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Fizetés alkatrészeket.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Adatbázist a potenciális vásárlók.
+DocType: Authorization Rule,Customer or Item,Ügyfél vagy jogcím
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Vevői adatbázis.
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Bukdácsoló
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegysége pont {0} nem lehet megváltoztatni közvetlenül, mert már tett néhány tranzakció (k) másik UOM. Szükséged lesz egy új tétel, hogy egy másik Alapértelmezett UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Warehouse amely ellen állomány bejegyzések történnek.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
-DocType: Event,Wednesday,Szerda
 DocType: Sales Invoice,Customer's Vendor,A Vevő szállítója
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Termelési rend Kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Pályázatírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Pályázatírás
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Sales Person {0} létezik az azonos dolgozói azonosító
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatív Stock Error ({6}) jogcím {0} Warehouse {1} a {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Alapértelmezett Költség Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Karbantartási ütemterv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Aztán árképzési szabályok szűrik ki alapul vevő, Customer Group, Territory, Szállító, Szállító Type, kampány, értékesítési partner stb"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Kérjük telepítse Dropbox python modul
 DocType: Employee,Passport Number,Útlevél száma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menedzser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,A vásárlástól átvétele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menedzser
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,A vásárlástól átvétele
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Ugyanazt a tételt már többször jelenik meg.
 DocType: SMS Settings,Receiver Parameter,Vevő Paraméter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,Az 'alapján' 'és a 'csoport szerint' nem lehet ugyanazon
 DocType: Sales Person,Sales Person Targets,Értékesítői célok
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,eddig
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Emailcím megadása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Vége csőformázó
 DocType: Production Order Operation,In minutes,Perceken
 DocType: Issue,Resolution Date,Megoldás dátuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Kérjük alapértelmezett Készpénz vagy bankszámlára Fizetési mód {0}
 DocType: Selling Settings,Customer Naming By,Vásárlói Elnevezése a
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Átalakítás Group
 DocType: Activity Cost,Activity Type,Tevékenység típusa
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Fix Napok
 DocType: Sales Invoice,Packing List,Csomagolási lista
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Megrendelések beszállítóknak.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Kiadás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Kiadás
 DocType: Activity Cost,Projects User,Projekt felhasználó
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Fogyasztott
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nem található a Számla részletek táblázatban
 DocType: Company,Round Off Cost Center,Fejezze ki Cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Karbantartás látogatás {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Material Request,Material Transfer,Anyag átrakása
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Megnyitó (Dr.)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},"Kiküldetés timestamp kell lennie, miután {0}"
-apps/frappe/frappe/config/setup.py +59,Settings,Beállítások
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
 DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Tovább
 DocType: Pricing Rule,Sales Manager,Sales Manager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Átnevezés
 DocType: Journal Entry,Write Off Amount,Leírt összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Hajlítás
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Felhasználó engedélyezése
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Negyedévenként
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Kérjük, adja Gift"
 DocType: Purchase Receipt,Other Details,Egyéb részletek
 DocType: Account,Accounts,Könyvelés
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Egyenes nyíró
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Hogy nyomon tétel az értékesítési és beszerzési dokumentumok alapján soros nos. Ez is használják a pálya garanciális részleteket a termék.
 DocType: Purchase Receipt Item Supplied,Current Stock,Raktárkészlet
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Elutasított Warehouse kötelező elleni regected elem
 DocType: Account,Expenses Included In Valuation,Költségekből Értékelési
 DocType: Employee,Provide email id registered in company,Adjon email id bejegyzett cég
 DocType: Hub Settings,Seller City,Eladó város
 DocType: Email Digest,Next email will be sent on:,A következő emailt küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlat Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elem {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Fa Típus
@@ -624,45 +571,38 @@
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Ellen utalvány típus közül kell Sales Order, eladást igazoló számla vagy Naplókönyvelés"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nem található árfolyama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Légtér
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Üdv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Légtér
 DocType: Journal Entry,Credit Card Entry,Hitelkártya Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Feladat Téma
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Áruk szállítóktól kapott.
-DocType: Communication,Open,Megnyitva
 DocType: Lead,Campaign Name,Kampány neve
 ,Reserved,Fenntartott
 DocType: Purchase Order,Supply Raw Materials,Supply nyersanyagok
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtani."
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Befektetett eszközök
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nem Stock tétel
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead kell állítani, ha Opportunity készült Lead"
-DocType: Contact Us Settings,Address Title,Cím címe
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Kérjük, válassza ki a heti egyszeri nap"
 DocType: Production Order Operation,Planned End Time,Tervezett End Time
 ,Sales Person Target Variance Item Group-Wise,Értékesítői Cél Variance tétel Group-Wise
-DocType: Dropbox Backup,Daily,Napi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Véve a meglévő tranzakciós nem lehet átalakítani főkönyvi
 DocType: Delivery Note,Customer's Purchase Order No,A Vevő rendelésének száma
 DocType: Employee,Cell Number,Mobilszám
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Anyag kéréseket
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tud belépni a jelenlegi utalványt ""Against Naplókönyvelés"" oszlopban"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Havi kimutatást.
 DocType: Item Group,Website Specifications,Honlapok
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,New Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A {0} típusú {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Könyvelési tételek nem lehet neki felróni az ágakat. Bejegyzés elleni csoportjai nem engedélyezettek.
-DocType: ToDo,High,Magas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni BOM mivel kapcsolódik más Darabjegyzékeket
 DocType: Opportunity,Maintenance,Karbantartás
-DocType: User,Male,Férfi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Vásárlási nyugta számát szükséges Elem {0}
 DocType: Item Attribute Value,Item Attribute Value,Elem Jellemző értéke
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Értékesítési kampányok.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Személyes
 DocType: Expense Claim Detail,Expense Claim Type,Béremelési igény típusa
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alapértelmezett beállítások Kosár
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Naplókönyvelés {0} kapcsolódik ellen Order {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnológia
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Naplókönyvelés {0} kapcsolódik ellen Order {1}, akkor esetleg meg kell húzni, mint előre ezen a számlán."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnológia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Irodai karbantartási költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Kérjük, adja tétel első"
 DocType: Account,Liability,Felelősség
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összege nem lehet nagyobb, mint igény összegéből sorában {0}."
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Process Payroll,Send Email,E-mail küldése
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nincs jogosultság
 DocType: Company,Default Bank Account,Alapértelmezett bankszámlaszám
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Kiszűrni alapuló párt, válasszuk a párt Írja első"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock&#39; nem lehet ellenőrizni, mert az elemek nem szállítják keresztül {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Megbékélés részlete
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Saját számlák
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Saját számlák
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Egyetlen dolgozó sem találtam
 DocType: Purchase Order,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba eladó
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features","Annak érdekében, hogy &quot;Point of Sale&quot; funkciók"
 DocType: Bin,Moving Average Rate,Mozgóátlag
 DocType: Production Planning Tool,Select Items,Válassza ki az elemeket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
-DocType: Comment,Reference Name,Hivatkozott tétel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ellen Bill {1} kelt {2}
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: Sales Invoice Item,Target Warehouse,Cél raktár
 DocType: Item,Allow over delivery or receipt upto this percent,Hagyjuk fölött szállítás vagy nyugtát Akár ezt a százalékos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,A Várható szállítás dátuma nem lehet korábbi mint a rendelés dátuma
 DocType: Upload Attendance,Import Attendance,Import Nézőszám
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Minden tétel Csoportok
 DocType: Process Payroll,Activity Log,Tevékenység
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Nettó nyereség / veszteség
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikusan üzenet írása benyújtása tranzakciókat.
 DocType: Production Order,Item To Manufacture,Anyag gyártáshoz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Állandó olvadéköntési
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} állapot {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Megrendelést Fizetés
 DocType: Sales Order Item,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
 DocType: Newsletter,Newsletter Manager,Hírlevél menedzser
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Elem Variant {0} már létezik azonos tulajdonságú
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Nyitás"""
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
 DocType: Expense Claim,Expenses,Költségek
 DocType: Item Variant Attribute,Item Variant Attribute,Elem Variant Képesség
 ,Purchase Receipt Trends,Vásárlási nyugta Trends
 DocType: Appraisal,Select template from which you want to get the Goals,"Válassza ki a sablont, amely azt szeretné, hogy a célok"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Kutatás és fejlesztés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Kutatás és fejlesztés
 ,Amount to Bill,Összeget számlázni
 DocType: Company,Registration Details,Regisztrációs adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Kockára
 DocType: Item,Re-Order Qty,Re-Order Mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Hagyja Block List dátuma
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Ütemezett küldeni a {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt érték
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Az értékesítés helyén
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nem lehet tovább folytatni {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Credit, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Tartozik"""
 DocType: Account,Balance must be,Egyensúlyt kell
 DocType: Hub Settings,Publish Pricing,Közzé Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Elutasított igény indoklása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Szegező
 ,Available Qty,Elérhető Mennyiség
 DocType: Purchase Taxes and Charges,On Previous Row Total,A korábbi Row Total
 DocType: Salary Slip,Working Days,Munkanap
 DocType: Serial No,Incoming Rate,Bejövő Rate
 DocType: Packing Slip,Gross Weight,Bruttó súly
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"A vállalat nevét, amelyikhez e rendszer kiépítésekor."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"A vállalat nevét, amelyikhez e rendszer kiépítésekor."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Közé ünnepek Total no. munkanapok
 DocType: Job Applicant,Hold,Tart
 DocType: Employee,Date of Joining,Belépés dátuma
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Kilátás előfizetők
 DocType: Purchase Invoice Item,Purchase Receipt,Vásárlási nyugta
 ,Received Items To Be Billed,Kapott elemek is fizetnie kell
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Szemcseszórás
 DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizaárfolyam mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Time Slot a következő {0} nap Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyagot részegységekre
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} aktívnak kell lennie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} aktívnak kell lennie
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát első"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Mégsem Material Látogatás {0} törlése előtt ezt a karbantartási látogatás
 DocType: Salary Slip,Leave Encashment Amount,Hagyja beváltása Összeg
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} nem tartozik Elem {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
 DocType: Bank Reconciliation,Total Amount,Összesen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Gyártási rendelések
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Érték
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Közzé szinkronizálni tételek
-DocType: GL Entry,Account Currency,A fiók pénzneme
+DocType: Bank Reconciliation,Account Currency,A fiók pénzneme
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Kérjük beszélve Round Off számla a cég
 DocType: Purchase Receipt,Range,Tartomány
 DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Employee {0} nem aktív, vagy nem létezik"
 DocType: Features Setup,Item Barcode,Elem vonalkódja
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Elem változatok {0} frissített
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Elem változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vásárlást igazoló számlát Advance
 DocType: Address,Shop,Bolt
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Cash fiók automatikusan frissített POS számla, ha ezt a módot választotta."
 DocType: Employee,Permanent Address Is,Állandó lakhelye
 DocType: Production Order Operation,Operation completed for how many finished goods?,Művelet befejeződött hány késztermékek?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Engedmény a túl- {0} keresztbe jogcím {1}.
 DocType: Employee,Exit Interview Details,Kilépési interjú részletei
 DocType: Item,Is Purchase Item,Beszerzendő tétel?
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Megrendelés Termék
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Közvetett jövedelem
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Állítsa fizetés összege = fennálló összeg
-DocType: Contact Us Settings,Address Line 1,1. cím sor
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variancia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Cég neve
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variancia
+,Company Name,Cég neve
 DocType: SMS Center,Total Message(s),Teljes üzenet (ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Válassza ki a tétel a Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Válassza ki a tétel a Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Listájának megtekintéséhez minden segítséget videók
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a fiók vezetője a bank, ahol check rakódott le."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lehetővé teszi a felhasználó szerkesztheti árjegyzéke Rate tranzakciókban
 DocType: Pricing Rule,Max Qty,Max Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Fizetés ellenében Sales / Megrendelés mindig fel kell tüntetni, előre"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Vegyi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Összes példány már átadott, erre a gyártási utasítás."
 DocType: Process Payroll,Select Payroll Year and Month,"Válassza bérszámfejtés év, hónap"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tovább a megfelelő csoportba (általában pénzeszközök felhasználása&gt; forgóeszközök&gt; bankszámlák és új fiók létrehozása (kattintva Add Child) típusú &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön dolgozói születésnapi emlékeztetőt
-DocType: Comment,Unsubscribed,Leiratkozott
 DocType: Opportunity,Walk In,Utcáról
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial költség központok.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,TRANSFERED
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Fehér
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Töltsd fel fejléces és logo. (Ezeket lehet szerkeszteni később).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Fehér
 DocType: SMS Center,All Lead (Open),Minden Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Arcképed csatolása
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Csinál
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Arcképed csatolása
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Csinál
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
-DocType: Workflow State,Stop,Megáll
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette formájában. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Kosár
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Megrendelni típusa közül kell {0}
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Nyitva Mennyiség
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Béremelési igény
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Mennyiség: {0}
 DocType: Leave Application,Leave Application,Szabadságok
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Szabadság Lefoglaló Eszköz
 DocType: Leave Block List,Leave Block List Dates,Hagyja Block List dátuma
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ha havi költségkeret túllépése (a költség számla)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimmelés
 DocType: Workstation,Net Hour Rate,Net órás sebesség
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Beszerzési költség vásárlási nyugta
 DocType: Company,Default Terms,Alapértelmezett feltételek
 DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás az
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attribútum tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attribútum tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Get Vevőmegrendelés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Benyújtás
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Kedvezmény
 DocType: Features Setup,Purchase Discounts,Árengedmények
 DocType: Workstation,Wages,Munkabér
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a lemezre. Kérjük, frissítse az ""Állapot"", és mentése"
 DocType: Serial No,Creation Document No,Creation Document No
 DocType: Issue,Issue,Probléma
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attribútumait tétel változatok. pl méret, szín stb"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Számla nem egyezik Társaság
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attribútumait tétel változatok. pl méret, szín stb"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} jelenleg karbantartás alatt áll szerződésben max {1}
 DocType: BOM Operation,Operation,Működés
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Szállítási állam
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Elemet kell hozzá az 'hogy elemeket vásárlása bevételek ""gombot"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Az értékesítési költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Normál vásárlás
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Normál vásárlás
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Vevői {0} {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Így Stock bejegyzések
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Így Stock bejegyzések
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
 DocType: Item,Default Supplier,Alapértelmezett beszállító
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Több mint Production juttatás aránya
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,keresztül frissíthető Time Naplók
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Átlagéletkor
 DocType: Opportunity,Your sales person who will contact the customer in future,"Az értékesítési személy, aki felveszi a kapcsolatot Önnel a jövőben"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány a szállítók. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány a szállítók. Ők lehetnek szervezetek vagy magánszemélyek.
 DocType: Company,Default Currency,Alapértelmezett pénznem
 DocType: Contact,Enter designation of this Contact,Adja kijelölése ennek Kapcsolat
-DocType: Contact Us Settings,Address,Cím
 DocType: Expense Claim,From Employee,Dolgozótól
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Figyelmeztetés: A rendszer nem ellenőrzi overbilling hiszen összeget tétel {0} {1} nulla
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
 DocType: Upload Attendance,Attendance From Date,Jelenléti Dátum
 DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Szállítás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Szállítás
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,év:
 DocType: Email Digest,Annual Expense,Éves költség
 DocType: SMS Center,Total Characters,Összesen karakterek
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Kérjük, válasszon BOM BOM területen jogcím {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Számla részlete
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fizetési Megbékélés Számla
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Hozzájárulás%
 DocType: Item,website page link,website oldal link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Nézzük előkészíti a rendszer első használat.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,A cég regisztrált adatai. Pl.: adószám; stb.
 DocType: Sales Partner,Distributor,Nagykereskedő
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Kosár Szállítási szabály
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelés {0} törölni kell lemondása előtt ezt a Vevői rendelés
 ,Ordered Items To Be Billed,Rendelt mennyiség számlázásra
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range kell lennie kisebb hatótávolsággal
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Válassza ki a Time Naplók és elküldése hogy hozzon létre egy új Értékesítési számlák.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Értékesítési számla előleg
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nincs kérni
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""A tényleges kezdési dátum"" nem lehet nagyobb, mint a ""tényleges záró dátum"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vezetés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vezetés
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Az Időtáblában szereplő tevékenységek típusai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Befektetési öntés
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Vagy terhelés és jóváírás összegét szükséges {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz fűzve az Item Code a variáns. Például, ha a rövidítés ""SM"", és az elem kód ""T-shirt"", a cikk-kód a variáns lesz ""feliratú pólót-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó Pay (szavakban) lesz látható, ha menteni a fizetés csúszik."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktív
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Kék
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Kék
 DocType: Purchase Invoice,Is Return,Van Return
 DocType: Price List Country,Price List Country,Árlista Ország
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"További csomópontok csak alatt létrehozott ""csoport"" típusú csomópontot"
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} már létrehozott felhasználói: {1} és a társaság {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverziós tényező
 DocType: Stock Settings,Default Item Group,Alapértelmezett árucsoport
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminált tárgy gyártás
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Beszállítói adatbázis.
 DocType: Account,Balance Sheet,Mérleg
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Költség Center For elem Elem Code """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch képező
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Az értékesítési személy kap egy emlékeztető Ezen a napon a kapcsolatot az ügyféllel,"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlák tehető alatt csoportjai, de bejegyzéseket lehet tenni ellene nem Csoportok"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Adó és egyéb levonások fizetést.
 DocType: Lead,Lead,Célpont
 DocType: Email Digest,Payables,Kötelezettségek
 DocType: Account,Warehouse,Raktár
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 ,Purchase Order Items To Be Billed,Megrendelés elemek is fizetnie kell
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
 DocType: Purchase Invoice Item,Purchase Invoice Item,Vásárlási számla tétel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger bejegyzések és GL A bejegyzések újra meghirdeti a kiválasztott vásárlás nyugtáinak
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1. tétel
 DocType: Holiday,Holiday,Szabadnap
-DocType: Event,Saturday,Szombat
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Hagyja üresen, ha figyelembe minden ágát"
 ,Daily Time Log Summary,Napi időnapló összesítő
-DocType: DocField,Label,Felirat
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nem egyeztetett fizetési részletek
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
 DocType: Lead,Call,Hívás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},A {0} duplikált sor azonos ezzel: {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Beállítása Alkalmazottak
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Kérjük, válasszon prefix első"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Kutatás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Kutatás
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Kérem adjon meg legalább egy attribútum a tulajdonságok táblázatban
 DocType: Contact,User ID,Felhasználó ID
-DocType: Communication,Sent,Elküldött
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Kilátás Ledger
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
-DocType: Communication,Delivery Status,Szállítás állapota
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel Group létezik azonos nevű, kérjük, változtassa meg az elem nevét, vagy nevezze át a tétel-csoportban"
 DocType: Production Order,Manufacture against Sales Order,Gyártás ellen Vevői
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Batch
 ,Budget Variance Report,Költségkeret Variance jelentés
 DocType: Salary Slip,Gross Pay,Bruttó fizetés
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Az anyag leírása
 DocType: Payment Tool,Payment Mode,Fizetési mód
 DocType: Purchase Invoice,Is Recurring,Ismétlődő
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Közvetlen fém lézeres szinterezés
 DocType: Purchase Order,Supplied Items,A mellékelt tartozékok
 DocType: Production Order,Qty To Manufacture,Menny. gyártáshoz
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Fenntartani azonos ütemben egész vásárlási ciklus
 DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Ideiglenes megnyitását
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Munkavállalói Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Mérlegek Account {0} mindig legyen {1}
 DocType: Address,Address Type,Cím típusa
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get kiváló számlák
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Vevői {0} nem érvényes
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sajnáljuk, a vállalatok nem lehet összevonni,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Kis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kis
 DocType: Employee,Employee Number,Munkavállalói száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case szám (ok) már használatban van. Próbálja a Case {0}
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2. pont
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Account fejét {0} létre
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zöld
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zöld
 DocType: Item,Auto re-order,Auto újra érdekében
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Összesen Elért
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Összesen Elért
 DocType: Employee,Place of Issue,Probléma helye
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Szerződés
-DocType: Report,Disabled,Tiltva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Szerződés
+DocType: Email Digest,Add Quote,Add Idézet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tényező szükséges UOM: {0} Cikk: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Menny kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Mezőgazdaság
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,A termékek vagy szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,A termékek vagy szolgáltatások
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoportban, és nem lehet szerkeszteni."
 DocType: Journal Entry Account,Purchase Order,Megrendelés
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Névre van szükség
 DocType: Purchase Invoice,Recurring Type,Gyakoriság
 DocType: Address,City/Town,Város/település
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Sorozatszám adatai
 DocType: Purchase Invoice Item,Item Tax Rate,Az anyag adójának mértéke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, csak jóváírásokat lehet kapcsolni a másik ellen terheléssel"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Szállítólevélen {0} nem nyújtják be
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elem {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Felszereltség
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabály először alapján kiválasztott ""Apply"" mezőben, ami lehet pont, pont-csoport vagy a márka."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Várható szállítási határidő kisebb, mint a tervezett kezdési dátum."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,A Szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,A Szállító
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Beállítás Account Type segít kiválasztani ezt a számlát a tranzakció.
 DocType: Purchase Invoice,Grand Total (Company Currency),Mindösszesen (Társaság Currency)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Összes kimenő
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Ott csak egyetlen szabály Szállítási állapot 0 vagy üres érték ""to value"""
 DocType: Authorization Rule,Transaction,Tranzakció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Megjegyzés: Ez a költséghely egy csoport. Nem tud könyvelési tételek csoportokkal szemben.
-apps/frappe/frappe/config/desk.py +7,Tools,Eszközök
 DocType: Item,Website Item Groups,Weboldal Elem Csoportok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Gyártási rendelési szám kötelező készletnövekedést célú gyártás
 DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Könyvelési tétel
 DocType: Workstation,Workstation Name,Munkaállomás neve
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nem tartozik Elem {1}
 DocType: Sales Partner,Target Distribution,Cél Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Hozzászólások
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ez az a szám, az utoljára létrehozott tranzakciós ilyen előtaggal"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Értékelési Rate szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Értékelési Rate szükséges Elem {0}
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,Ügynök
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Összesen {0} minden példány nulla, akkor meg kell változtatni &quot;Osszuk alapuló díjak&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Adók és költségek számítása
 DocType: BOM Operation,Workstation,Munkaállomás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardver
 DocType: Attendance,HR Manager,HR menedzser
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Kérjük, válasszon egy cég"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Akkor engedélyezze a kosárba
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nincs adat
 DocType: Appraisal Template Goal,Appraisal Template Goal,Teljesítmény értékelő sablon célja
 DocType: Salary Slip,Earning,Kereset
 DocType: Payment Tool,Party Account Currency,Fél számla pénzneme
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Átfedő feltételei között található:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már értékével szemben néhány más voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Teljes megrendelési érték
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Élelmiszer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing tartomány 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Tudod, hogy egy időben csak naplózás ellen benyújtott produkciós sorrendben"
 DocType: Maintenance Schedule Item,No of Visits,Nem a látogatások
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Hírlevelek kapcsolatoknak, vezetőknek"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Árfolyam a záró figyelembe kell {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Pontjainak összegeként az összes célokat kell 100. {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Műveletek nem maradt üresen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Műveletek nem maradt üresen.
 ,Delivered Items To Be Billed,Kiszállított anyag számlázásra
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
-DocType: DocField,Description,Leírás
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
-DocType: Letter Head,Is Default,Default
 DocType: Address,Utilities,Segédletek
 DocType: Purchase Invoice Item,Accounting,Könyvelés
 DocType: Features Setup,Features Setup,Funkciók beállítása
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ajánlat megtekintése Letter
-DocType: Communication,Communication,Kommunikáció
 DocType: Item,Is Service Item,A szolgáltatás Elem
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Jelentkezési határidő nem lehet kívülről szabadság kiosztási időszak
 DocType: Activity Cost,Projects,Projektek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Kérjük, válasszon pénzügyi év"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Re {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Fenntartani Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock bejegyzés már létrehozott termelési rendelés
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe valamennyi megjelölés"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Charge típusú ""közvetlen"" sorában {0} nem lehet jogcím tartalmazza Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Re Datetime
 DocType: Email Digest,For Company,A Társaságnak
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Számlatükör
 DocType: Material Request,Terms and Conditions Content,Általános szerződési feltételek tartalma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Elem {0} nem Stock tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Elem {0} nem Stock tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulaj
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,"Attól függ, fizetés nélküli szabadságon"
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Munkavállalói beállítások
 ,Batch-Wise Balance History,Szakaszos Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tennivalók listája
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ipari tanuló
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Ipari tanuló
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Adó részletesen táblázatban letöltésre a tételt mester, mint egy húr, és tárolja ezen a területen. Használt adók és illetékek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Munkavállaló nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések szabad korlátozni a felhasználók."
 DocType: Email Digest,Bank Balance,Bank mérleg
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Számviteli könyvelése {0}: {1} csak akkor lehet elvégezni a pénznem: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Számviteli könyvelése {0}: {1} csak akkor lehet elvégezni a pénznem: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Nem aktív bérszerkeztet talált munkavállalói {0} és a hónap
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Adó szabály tranzakciók.
 DocType: Rename Tool,Type of document to rename.,Dokumentum típusa átnevezni.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vásárolunk ezt a tárgyat
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vásárolunk ezt a tárgyat
 DocType: Address,Billing,Számlázás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Nincs elküldve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Robbanásveszélyes képező
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Összesen adók és illetékek (Társaság Currency)
 DocType: Shipping Rule,Shipping Account,Szállítási számla
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Ütemezett küldeni a {0} címzettek
 DocType: Quality Inspection,Readings,Olvasmányok
 DocType: Stock Entry,Total Additional Costs,Összesen További költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Részegységek
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Részegységek
 DocType: Shipping Rule Condition,To Value,Hogy Érték
 DocType: Supplier,Stock Manager,Stock menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Forrás raktárban kötelező sorban {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Az importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem címre hozzá még.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Elemző
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Elemző
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő JV összeget {2}"
 DocType: Item,Inventory,Leltár
 DocType: Features Setup,"To enable ""Point of Sale"" view","Annak érdekében, hogy &quot;Point of Sale&quot; nézet"
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Fizetés nem lehet üres Kosár
 DocType: Item,Sales Details,Értékesítés részletei
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,A tételek
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,A Menny
 DocType: Notification Control,Expense Claim Rejected,Béremelési igény elutasítva
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Az időpont, amikor a következő számlán kerül előállításra. Úgy keletkezett benyújtania."
 DocType: Item Attribute,Item Attribute,Elem Attribútum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Kormány
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Elem változatok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kormány
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Elem változatok
 DocType: Company,Services,Szolgáltatások
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Összesen ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Összesen ({0})
 DocType: Cost Center,Parent Cost Center,Szülő Cost Center
 DocType: Sales Invoice,Source,Forrás
 DocType: Leave Type,Is Leave Without Pay,A fizetés nélküli szabadságon
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Pénzügyi év kezdő dátuma
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nincs bejegyzés találat a fizetési táblázat
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Pénzügyi év kezdő dátuma
 DocType: Employee External Work History,Total Experience,Összesen Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Süllyesztés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding és díjak
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Anyagcsoport neve
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer anyagok gyártása
 DocType: Pricing Rule,For Price List,Ezen árlistán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Vételi árfolyamon a tétel: {0} nem található, ami szükséges könyv könyvelési tételt (ráfordítás). Kérjük beszélve tétel ára ellen felvásárlási árlistát."
 DocType: Maintenance Schedule,Schedules,Menetrendek
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Társaság Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hiba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hiba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új fiókot a számlatükör."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Vásárló > Vásárlói csoport > Terület
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Elérhető Batch Mennyiség a Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Időnapló gyűjtő adatai
-DocType: Workflow State,Tasks,Feladatok
 DocType: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
-DocType: Event,Tuesday,Kedd
 DocType: Leave Block List,Block Holidays on important days.,Blokk Holidays fontos napokon.
 ,Accounts Receivable Summary,VEVÔKÖVETELÉSEK Összefoglaló
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Elhagyja a {0} típusú már elkülönített Employee {1} időszakra {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa User ID mező alkalmazotti rekordot beállítani Employee szerepe"
 DocType: UOM,UOM Name,Mértékegység neve
-DocType: Top Bar Item,Target,Cél
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,A támogatás mértéke
 DocType: Sales Invoice,Shipping Address,Szállítási cím
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ez az eszköz segít frissíteni vagy kijavítani a mennyiséget és értékelési raktáron a rendszerben. Ez tipikusan szinkronizálja a rendszer értékei és mi valóban létezik a raktárakban.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"A szavak lesz látható, ha menteni a szállítólevélen."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Márka mester.
-DocType: ToDo,Due Date,Határidő
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Márka mester.
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Transporter Részletek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Doboz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,A Szervezet
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Doboz
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,A Szervezet
 DocType: Monthly Distribution,Monthly Distribution,Havi Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Vevő lista üres. Kérjük, hozzon létre Receiver listája"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Gyártási terv Vevői
 DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Számviteli könyvelése {0} csak akkor lehet elvégezni a pénznem: {1}
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Kivágó
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Anyag Kérelem Megrendelés
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
 ,Bank Reconciliation Statement,Bank Megbékélés nyilatkozat
 DocType: Address,Lead Name,Célpont neve
 ,POS,Értékesítési hely (POS)
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Nyitva Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Nyitva Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} kell csak egyszer jelenik meg
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad Tranfer több {0}, mint {1} ellen Megrendelés {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},A levelek foglalás sikeres {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomag
 DocType: Shipping Rule Condition,From Value,Értéktől
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Összegek nem tükröződik bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Összegek nem tükröződik bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Követelések cég költségén.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugális öntési
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Mágneses mező támogatott befejező
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Források
 DocType: Purchase Receipt,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 DocType: Production Planning Tool,Select Sales Orders,Válassza ki Vevőmegrendelés
 ,Material Requests for which Supplier Quotations are not created,"Anyag kérelmek, amelyek esetében Szállító idézetek nem jönnek létre"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság szabadság. Nem kell alkalmazni a szabadság."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Hogy nyomon elemeket használja vonalkód. Ön képes lesz arra, hogy belépjen elemek szállítólevél és Értékesítési számlák beolvasásával vonalkód pont."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark kézbesítettnek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark kézbesítettnek
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Tedd Idézet
 DocType: Dependent Task,Dependent Task,Függő Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 sorban {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},"Szabadság típusú {0} nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbálja Tervezési tevékenység X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Megállás Születésnapi emlékeztetők
 DocType: SMS Center,Receiver List,Vevő lista
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} megtekintése
 DocType: Salary Structure Deduction,Salary Structure Deduction,Bérszerkeztet levonása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Szelektív lézeres szinterezés
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import sikeres!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} adta meg többször a konverziós tényező táblázat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Költsége Kiadott elemek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Életkor (nap)
 DocType: Quotation Item,Quotation Item,Árajánlat tétele
 DocType: Account,Account Name,Számla név
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Dátum nem lehet nagyobb, mint dátuma"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} mennyiséget nem lehet egy töredéke
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Szállító Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Szállító rész száma
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Hozzáadás
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Konverziós arány nem lehet 0 vagy 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} törlik vagy megállt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Vásárlási nyugta {0} nem nyújtják be
 DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","A beállítások Online bevásárlókosár mint a hajózás szabályait, árlistát stb"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Telepítés befejezve
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% számlázott
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Mennyiség
 DocType: Party Account,Party Account,Párt Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Emberi erőforrások
 DocType: Lead,Upper Income,Felső jövedelmi
 DocType: Journal Entry Account,Debit in Company Currency,Tartozik a Társaság Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Saját kérdések
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Alapértelmezett értékek
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Fizetés összege nem lehet negatív
 DocType: Expense Claim,Total Amount Reimbursed,Megtérített teljes összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Présidomba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Ellen Szállító Számla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árjegyzék
 DocType: Payment Reconciliation,Payments,Kifizetések
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izosztatikus megnyomásával
-DocType: ToDo,Medium,Közepes
 DocType: Budget Detail,Budget Allocated,Lefoglalt költségkeret
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Customer Credit Balance
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Frissítse bank fizetési időpontokat folyóiratokkal.
 DocType: Quotation,Term Details,ÁSZF részletek
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés Az (nap)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,"Egyik példány bármilyen változás mennyisége, illetve értéke."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,"Egyik példány bármilyen változás mennyisége, illetve értéke."
 DocType: Warranty Claim,Warranty Claim,Jótállási igény
 ,Lead Details,Célpont adatai
-DocType: Authorization Rule,Approving User,Jóváhagyó Felhasználó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovácsolás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanizálás
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszaka
 DocType: Pricing Rule,Applicable For,Alkalmazható
 DocType: Bank Reconciliation,From Date,Dátumtól
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Befizetett összeg (Társaság Currency)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online aukciók
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg sem mennyiség vagy Értékelési Rate, vagy mindkettő"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukciók
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg sem mennyiség vagy Értékelési Rate, vagy mindkettő"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Cég, hónap és költségvetési évben kötelező"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Elem Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súly említik, \ nKérlek beszélve ""Súly UOM"" túl"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyaga Request használják e Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Egy darab anyag.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"A(z) {0} időnapló gyűjtőt be kell ""Küldeni"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tedd számviteli könyvelése minden Készletmozgás
 DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött szabadság
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse szükség Row {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse szükség Row {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Adjon meg egy érvényes költségvetési év kezdetének és befejezésének időpontjai
 DocType: Employee,Date Of Retirement,A nyugdíjazás
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postai
 DocType: Item,Weightage,Súlyozás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Bányászati
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Gyanta casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az ügyfélszolgálati csoport létezik azonos nevű kérjük, változtassa meg az Ügyfél nevét vagy nevezze át a Vásárlói csoport"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Kérjük, válassza ki a {0} először."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Szülő Terület
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Anyag bevételezése
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Termékek
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Termékek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Párt típusa és fél köteles a követelések / kötelezettségek figyelembe {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek az elemnek a változatokat, akkor nem lehet kiválasztani a vevői rendelések stb"
 DocType: Lead,Next Contact By,Next Kapcsolat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Szükséges mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Szükséges mennyiséget tétel {0} sorban {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} nem lehet törölni, mint a mennyiség létezik tétel {1}"
 DocType: Quotation,Order Type,Rendelés típusa
 DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
 DocType: Payment Tool,Find Invoices to Match,Számlák keresése egyezésig
 ,Item-wise Sales Register,Elem-bölcs Sales Regisztráció
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","pl. ""XYZ Nemzeti Bank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez adó az árban Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Összes célpont
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Összes célpont
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Kosár engedélyezve
 DocType: Job Applicant,Applicant for a Job,Kérelmező számára a Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nem gyártási megrendelések létre
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Fizetés Slip munkavállalói {0} már létrehozott ebben a hónapban
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Fizetés Slip munkavállalói {0} már létrehozott ebben a hónapban
 DocType: Stock Reconciliation,Reconciliation JSON,Megbékélés JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Sales Invoice Item,Batch No,Kötegszám
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Hogy több értékesítési megrendelések ellen ügyfél Megrendelés
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Legfontosabb
-DocType: DocPerm,Delete,Törlés
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variáns
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Új {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Előtagja a számozás sorozat a tranzakciók
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Megállt érdekében nem lehet törölni. Kidugaszol törölni.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablon"
 DocType: Employee,Leave Encashed?,Hagyja beváltásának módjáról?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség A mező kitöltése kötelező
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Beszerzési rendelés készítése
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Beszerzési rendelés készítése
 DocType: SMS Center,Send To,Címzett
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nincs elég szabadság mérlege Leave Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
 DocType: Sales Team,Contribution to Net Total,Hozzájárulás a Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Vevő cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kérelmező a munkát.
 DocType: Purchase Order Item,Warehouse and Reference,Raktár és Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Törvényes info és más általános információkat közöl Szállító
-DocType: Country,Country,Ország
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Címek
-DocType: Communication,Received,Kapott
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik páratlan {1} bejegyzést
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplikált sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Ennek feltétele a szállítási szabály
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,"Elem nem engedjük, hogy a gyártási rendelés."
-DocType: DocField,Attach Image,Kép csatolása
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),A nettó súlya ennek a csomagnak. (Automatikusan kiszámítja összege nettó tömege tételek)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Hagyja üresen, ha nincs változás"
 DocType: Sales Order,To Deliver and Bill,Szállítani és Bill
 DocType: GL Entry,Credit Amount in Account Currency,A hitel összege a számla pénzneme
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Naplók gyártás.
 DocType: Item,Apply Warehouse-wise Reorder Level,Alkalmazni Warehouse-bölcs Reorder Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} kell benyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} kell benyújtani
 DocType: Authorization Control,Authorization Control,Felhatalmazásvezérlés
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,A feladatok időnaplói.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Fizetés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Fizetés
 DocType: Production Order Operation,Actual Time and Cost,Tényleges idő és költség
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Anyag kérésére legfeljebb {0} tehető jogcím {1} ellen Vevői {2}
 DocType: Employee,Salutation,Megszólítás
-DocType: Communication,Rejected,Elutasítva
 DocType: Pricing Rule,Brand,Márka
 DocType: Item,Will also apply for variants,Kell alkalmazni a változatok
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle tételek idején eladó.
 DocType: Sales Order Item,Actual Qty,Aktuális db.
 DocType: Sales Invoice Item,References,Referenciák
 DocType: Quality Inspection Reading,Reading 10,Olvasás 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sorolja fel termékeket vagy szolgáltatásokat vásárol vagy eladni. Ügyeljen arra, hogy a tétel Group, mértékegység és egyéb tulajdonságait, amikor elkezdi."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sorolja fel termékeket vagy szolgáltatásokat vásárol vagy eladni. Ügyeljen arra, hogy a tétel Group, mértékegység és egyéb tulajdonságait, amikor elkezdi."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Megadta ismétlődő elemek. Kérjük orvosolja, és próbálja újra."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Érték {0} Képesség {1} nem létezik a listát az érvényes jogcím attribútum értékek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Társult
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Társult
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Elem {0} nem folytatásos tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Lejárt
 DocType: Packing Slip,To Package No.,A csomag No.
-DocType: DocType,System,Rendszer
 DocType: Warranty Claim,Issue Date,Probléma dátuma
 DocType: Activity Cost,Activity Cost,Activity költség
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Fogyasztott Mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Távközlési
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Távközlési
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállítási (Csak tervezet)"
 DocType: Payment Tool,Make Payment Entry,Fizess Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},"Mennyiség jogcím {0} kisebbnek kell lennie, mint {1}"
 ,Sales Invoice Trends,Értékesítési számlák Trends
 DocType: Leave Application,Apply / Approve Leaves,Jelentkezés / jóváhagyása Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,A
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Utalhat sorban csak akkor, ha a vád típus ""On előző sor Összeg"" vagy ""Előző Row Összesen"""
 DocType: Sales Order Item,Delivery Warehouse,Szállítási Warehouse
 DocType: Stock Settings,Allowance Percent,Juttatás Percent
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Ajánló ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tétel
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Tedd bérszerkeztet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nyírás
 DocType: Item,Has Variants,Van-e változatok
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Kattints a ""Tedd Értékesítési számlák"" gombra, hogy egy új Értékesítési számlák."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Csomagolás és címkézés
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nevét az havi megoszlása
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítői
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Kérjük, adja meg alapértelmezett pénzneme a Társaság Mester és globális alapértékeit"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Projektek irányítása
 DocType: Supplier,Supplier of Goods or Services.,Szállító az áruk vagy szolgáltatások.
 DocType: Budget Detail,Fiscal Year,Pénzügyi év
 DocType: Cost Center,Budget,Költségkeret
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet rendelni ellen {0}, mivel ez nem egy bevétel vagy ráfordítás figyelembe"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Elért
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Terület / Ügyfél
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,pl. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,pl. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Row {0}: elkülönített összege {1} kisebbnek kell lennie, vagy egyenlő számlázni fennálló összeg {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,A szavak lesz látható mentése után a kereskedelmi számla.
 DocType: Item,Is Sales Item,Eladható tétel?
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Elem {0} nem beállítás Serial Nos. Ellenőrizze tétel mester
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Összeget Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Egy termék vagy szolgáltatás
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Voltak hibák.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Egy termék vagy szolgáltatás
 DocType: Naming Series,Current Value,Jelenlegi érték
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal Termék Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Vámok és adók
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Kérjük, adja Hivatkozási dátum"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat a tétel, amely megjelenik a Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Mellékelt Mennyiség
 DocType: Material Request Item,Material Request Item,Anyagigénylés tétel
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Fája Elem Csoportok.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Fája Elem Csoportok.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni sor száma nagyobb vagy egyenlő, mint aktuális sor számát erre a Charge típusú"
 ,Item-wise Purchase History,Elem-bölcs Vásárlási előzmények
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Piros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Piros
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy hozza Serial No hozzá jogcím {0}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nem fejeződik be a {2} Mennyiség késztermékek a gyártási utasítás # {3}. Kérjük, frissítse az operációs státuszt keresztül Time Naplók"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Megváltoztatni mértékegysége egy elemet.
 DocType: Quality Inspection Reading,Acceptance Criteria,Elfogadási határ
 DocType: Item Attribute,Attribute Name,Jellemző neve
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Elem {0} kell lennie értékesítési vagy szolgáltatási tétel a {1}
 DocType: Item Group,Show In Website,Weboldalon megjelenjen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Csoport
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Csoport
 DocType: Task,Expected Time (in hours),Várható idő (óra)
 ,Qty to Order,Mennyiség Rendelés
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Hogy nyomon márkanév a következő dokumentumokat szállítólevél, Opportunity, Material kérése, pont, Megrendelés, vásárlás utalvány, Vevő átvétele, idézet, Sales számlán, a termék Bundle, Vevői rendelés, Serial No"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Tábla törlése
 DocType: Features Setup,Brands,Márkák
 DocType: C-Form Invoice Detail,Invoice No,Számlát nem
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Tól Megrendelés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Tól Megrendelés
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Hagyja nem alkalmazható / lemondás előtt {0}, mint szabadság egyensúlya már carry-továbbította a jövőben szabadság elosztása rekordot {1}"
 DocType: Activity Cost,Costing Rate,Költségszámítás Rate
 ,Customer Addresses And Contacts,Vevő címek és kapcsolatok
 DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább leszűrjük alapján mennyiséget.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nincs megadva
-DocType: Communication,Date,Dátum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,A törzsvásárlói Revenue
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Ülj miközben a rendszer a telepítés. Ez eltarthat néhány pillanatig.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) kell szerepet költségére Jóváhagyó """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
 DocType: Maintenance Schedule Detail,Actual Date,Tényleges dátuma
 DocType: Item,Has Batch No,Lesz kötegszáma?
 DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
 DocType: Employee,Personal Details,Személyes adatai
 ,Maintenance Schedules,Karbantartási ütemezések
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Domborító
 ,Quotation Trends,Idézet Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Elem Csoport nem említett elem mestere jogcím {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Megterhelése figyelembe kell venni a követelések között
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Mivel a termelés Megrendelni lehet ezt az elemet, meg kell egy állomány elemet."
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Összefogás
-DocType: Authorization Rule,Above Value,Feletti érték
 ,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
 DocType: Purchase Order,Delivered,Kiszállítva
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Beállítás bejövő kiszolgáló munkahelyek email id. (Pl jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát fognak megállítani"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Összes elkülönített levelek {0} nem lehet kevesebb, mint a már jóváhagyott levelek {1} időszakra"
 DocType: Journal Entry,Accounts Receivable,VEVÔKÖVETELÉSEK
 ,Supplier-Wise Sales Analytics,Beszállítói Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Ezt a formátumot használják, ha ország-specifikus formátumban nem található"
-DocType: Custom Field,Custom,Egyedi
 DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Fröccsöntés
 DocType: Bank Reconciliation,Include Reconciled Entries,Közé Egyeztetett bejegyzések
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Fája finanial számlák.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Hagyja üresen, ha figyelembe munkavállalói típusok"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Terjesztheti alapuló díjak
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Account {0} típusú legyen ""Fixed Asset"" tételként {1} egy eszköz tétele"
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
-apps/frappe/frappe/config/setup.py +130,Printing,Nyomtatás
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Költségén Követelés jóváhagyására vár. Csak a költség Jóváhagyó frissítheti állapotát.
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"A nap (ok) on, amelyre pályázik a szabadság ünnep. Nem kell alkalmazni a szabadság."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,és
 DocType: Leave Block List Allow,Leave Block List Allow,Hagyja Block List engedélyezése
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Rövidített nem lehet üres vagy hely
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Összesen Aktuális
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Egység
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Kérjük, állítsa Dropbox kisegítő billentyűk webhely config"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Egység
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Kérem adja meg a Cég nevét
 ,Customer Acquisition and Loyalty,Ügyfélszerzés és hűség
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol fenntartják állomány visszautasított tételek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,A pénzügyi év vége on
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,A pénzügyi év vége on
 DocType: POS Profile,Price List,Árlista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} most az alapértelmezett pénzügyi évben. Kérjük, frissítse böngészőjét, hogy a változtatások életbe léptetéséhez."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Költségtérítési igényeket
 DocType: Issue,Support,Támogatás
-DocType: Authorization Rule,Approving Role,Jóváhagyó szerepe
 ,BOM Search,BOM Keresés
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zárás (nyitás + összesítések)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Kérjük, adja valuta Társaság"
 DocType: Workstation,Wages per hour,Bérek óránként
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},"Stock egyensúly Batch {0} negatívvá válik {1} jogcím {2} a raktárunkban, {3}"
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide funkciók, mint a Serial Nos, POS stb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Következő Anyag kérések merültek fel alapján automatikusan Termék újra, hogy szinten"
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Fiók {0} érvénytelen. A fiók pénzneme legyen {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM átváltási arányra is szükség sorában {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Távolság dátum nem lehet a bejelentkezés előtt időpont sorában {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Távolság dátum nem lehet a bejelentkezés előtt időpont sorában {0}
 DocType: Salary Slip,Deduction,Levonás
 DocType: Address Template,Address Template,Címlista sablon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Kérjük, adja Alkalmazott Id e üzletkötő"
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Árajánlat
 DocType: Salary Slip,Total Deduction,Összesen levonása
 DocType: Quotation,Maintenance User,Karbantartás Felhasználó
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Költség Frissítve
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Költség Frissítve
 DocType: Employee,Date of Birth,Születési idő
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Elem {0} már visszatért
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** az adott pénzügyi évben. Minden könyvelési tétel, és más jelentős tranzakciókat nyomon elleni ** pénzügyi év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Célpont címe
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány mellékletet {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Munkaleírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Munkaleírás
 DocType: Purchase Order Item,Qty as per Stock UOM,Mennyiség mint egy Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Válasszon egy érvényes csv file adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Bevonat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek kivételével ""-"", ""#"", ""."" és a ""/"" nem engedélyezett elnevezési sorozat"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányok. Kövesse nyomon az érdeklődők, idézetek, vevői rendelés, stb a kampányok felmérni Return on Investment."
 DocType: Expense Claim,Approver,Jóváhagyó
 ,SO Qty,SO Mennyiség
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stock bejegyzések létezéséről ellen raktárban {0}, így nem lehet újra rendelhet, illetve módosíthatja Warehouse"
 DocType: Appraisal,Calculate Total Score,Számolja ki Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Gyártási menedzser
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} még garanciális max {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Osztott szállítólevél csomagokat.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Szállítások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip öntés
-DocType: Purchase Order,To be delivered to customer,Be kell nyújtani az ügyfél
+apps/erpnext/erpnext/hooks.py +68,Shipments,Szállítások
+DocType: Purchase Order Item,To be delivered to customer,Be kell nyújtani az ügyfél
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Idő Log Status kell benyújtani.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Soros {0} nem tartozik semmilyen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Beállítása
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Sor #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Sor #
 DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében)
 DocType: Pricing Rule,Supplier,Beszállító
 DocType: C-Form,Quarter,Negyed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Egyéb ráfordítások
 DocType: Global Defaults,Default Company,Alapértelmezett cég
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Költség vagy Difference számla kötelező tétel {0} kifejtett hatása miatt teljes állomány értéke
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem overbill jogcím {0} sorban {1} több mint {2}. Ahhoz, hogy overbilling, kérjük beállított Stock Beállítások"
 DocType: Employee,Bank Name,Bank neve
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Felett
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,A(z) {0} felhasználó tiltva
 DocType: Leave Application,Total Leave Days,Teljes szabadság napjait
-DocType: Journal Entry Account,Credit in Account Currency,Hitel fiók pénzneme
 DocType: Email Digest,Note: Email will not be sent to disabled users,Megjegyzés: E-mail nem lesz elküldve a fogyatékkal élő felhasználók számára
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Válassza ki Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha venni valamennyi szervezeti egység"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Típusú foglalkoztatás (munkaidős, szerződéses, gyakornok stb)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} kötelező tétel {1}
 DocType: Currency Exchange,From Currency,Deviza-
-DocType: DocField,Name,Név
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Vevői szükséges Elem {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Összegek nem tükröződik rendszer
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Kérjük, válasszon odaítélt összeg, Számla típusa és számlaszámra adni legalább egy sorban"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Vevői szükséges Elem {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Összegek nem tükröződik rendszer
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Egyéb
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Egyéb
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik érték {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nem lehet kiválasztani a felelős típusú ""On előző sor Összeg"" vagy ""On előző sor Total"" az első sorban"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Befejezve
-DocType: Web Form,Select DocType,Válassza ki DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Átvarratott
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a ""Létrehoz Menetrend"", hogy menetrend"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Új költségközpont
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Új költségközpont
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Kedvezmény
 DocType: Purchase Order Item,Reference Document Type,Referencia Dokumentum típus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ellen Vevői {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ellen Vevői {1}
 DocType: Account,Fixed Asset,Az állóeszköz-
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventory
 DocType: Activity Type,Default Billing Rate,Alapértelmezett díjszabás
 DocType: Time Log Batch,Total Billing Amount,Összesen Számlázási összeg
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Követelések Account
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Vevői rendelés Fizetési
 DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Naplók létre:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
 DocType: Item,Weight UOM,Súly mértékegysége
 DocType: Employee,Blood Group,Vércsoport
 DocType: Purchase Invoice Item,Page Break,Oldaltörés
 DocType: Production Order Operation,Pending,Függő
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"A felhasználók, akik engedélyt egy bizonyos munkavállalói szabadság alkalmazások"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nem lehet megváltoztatni az alapértelmezett mértékegysége változat. Ha módosítani alapértelmezett mértékegysége Variant változás alapértelmezett mértékegysége a Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Irodai berendezések
 DocType: Purchase Invoice Item,Qty,Menny.
 DocType: Fiscal Year,Companies,Cégek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Emelje Material kérése, amikor állomány eléri újra, hogy szinten"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Re Karbantartási ütemterv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Teljes munkaidőben
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Teljes munkaidőben
 DocType: Purchase Invoice,Contact Details,Kapcsolattartó részletei
 DocType: C-Form,Received Date,Kapott dátuma
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ha már készítettünk egy szabványos sablon értékesítéshez kapcsolódó adók és díjak sablon, válasszon egyet és kattintson az alábbi gombra."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Állásajánlatok
 DocType: Payment Reconciliation,Payment Reconciliation,Fizetési Megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Kérjük, válasszon incharge személy nevét"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technológia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
 DocType: Offer Letter,Offer Letter,Ajánlat Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Létrehoz Material kérelmeket (MRP) és a gyártási megrendeléseket.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Teljes kiszámlázott Amt
 DocType: Time Log,To Time,Az Idő
+DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó szerepe (a fenti engedélyezett érték)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Hozzáadni a gyermek csomópontok, felfedezni fát, és kattintson a csomópont, amely alapján a felvenni kívánt több csomópontban."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hitel figyelembe kell venni a fizetendő
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzív: {0} nem lehet a szülő vagy a gyermek {2}
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, csak betéti számlák köthető másik ellen jóváírás"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Árlista {0} van tiltva
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Vásárlói pont kódok
 DocType: Opportunity,Lost Reason,Elveszett Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Hozzon létre Fizetési bejegyzés ellen megrendelések vagy számlák.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Hegesztés
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Új készlet mértékegységre szükség van
 DocType: Quality Inspection,Sample Size,A minta mérete
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Összes példány már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Összes példány már kiszámlázott
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Kérem adjon meg egy érvényes 'A Case No. """
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,További költség központok tehető alatt Csoportok de bejegyzéseket lehet tenni ellene nem Csoportok
 DocType: Project,External,Külső
 DocType: Features Setup,Item Serial Nos,Anyag-sorozatszámok
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Tényleges Mennyiség
 DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nem található
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Az ügyfelek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Sajtolóporokat
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Az ügyfelek
 DocType: Leave Block List Date,Block Date,Blokk dátuma
 DocType: Sales Order,Not Delivered,Nem szállított
 ,Bank Clearance Summary,Bank Végső összefoglaló
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Hozhat létre napi, heti és havi e-mail digest."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Tételkód> Elem Group> Brand
 DocType: Appraisal Goal,Appraisal Goal,Teljesítmény értékelés célja
-DocType: Event,Friday,Péntek
 DocType: Time Log,Costing Amount,Költségszámítás Összeg
 DocType: Process Payroll,Submit Salary Slip,Bérlap küldés
 DocType: Salary Structure,Monthly Earning & Deduction,Havi kereseti & levonása
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import ömlesztett
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
-DocType: Page,Title,Cím
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Testreszabás
 DocType: POS Profile,[Select],[Válasszon]
 DocType: SMS Log,Sent To,Elküldve
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Értékesítési számla készítése
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Érvénytelen {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Érvénytelen {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Előleg
 DocType: Manufacturing Settings,Capacity Planning,Kapacitástervezés
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátumtól"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátumtól"" szükséges"
 DocType: Journal Entry,Reference Number,Referencia szám
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing alapszik
 DocType: Item,End of Life,Felhasználhatósági idő
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Utazási
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Utazási
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vásárlói Mobile Nem
 DocType: Sales Invoice,Recurring,Ismétlődő
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Anyag újrarendelés
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer anyag
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a működését, a működési költségek, és hogy egy egyedi Operation nem a műveleteket."
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználó mindig válassza
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
 DocType: Installation Note,Installation Note,Telepítési feljegyzés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Add adók
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Add adók
 ,Financial Analytics,Pénzügyi analitika
 DocType: Quality Inspection,Verified By,Ellenőrizte
 DocType: Address,Subsidiary,Leányvállalat
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nem lehet megváltoztatni cég alapértelmezett valuta, mert már vannak tranzakciókat. Tranzakciók törölni kell változtatni az alapértelmezett pénznem."
 DocType: Quality Inspection,Purchase Receipt No,Vásárlási nyugta nincs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Keresett pénz
-DocType: System Settings,In Hours,Órában
 DocType: Process Payroll,Create Salary Slip,Bérlap létrehozása
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Várható egyenleg bankonként
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Lehúzóbetét
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Várható egyenleg bankonként
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pénzeszközök forrását (Források)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiség sorban {0} ({1}) meg kell egyeznie a gyártott mennyiség {2}
 DocType: Appraisal,Employee,Munkavállaló
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Utalvány által csoportosítva
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Sales Invoice,Mass Mailing,Tömeges email
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fájl átnevezése
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Rendelési szám szükséges Elem {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mutass Kifizetések
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Méret
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Meghatározott BOM {0} nem létezik jogcím {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Karbantartási ütemterv {0} törölni kell lemondása előtt ezt a Vevői rendelés
 DocType: Notification Control,Expense Claim Approved,Béremelési igény jóváhagyva
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,A vásárolt tételek
 DocType: Selling Settings,Sales Order Required,Értékesítési sorrendbe
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Készítsen Customer
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Olvasás 9
 DocType: Supplier,Is Frozen,Van fagyasztva
 DocType: Buying Settings,Buying Settings,Beszerzési Beállítások
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass befejező
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. egy kész jó pont
 DocType: Upload Attendance,Attendance To Date,Részvétel a dátum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Beállítás bejövő kiszolgáló értékesítési email id. (Pl sales@example.com)
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Tool,Payment Account,Fizetési számla
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Kérjük, adja Társaság a folytatáshoz"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Vázlat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzációs Off
 DocType: Quality Inspection Reading,Accepted,Elfogadva
-DocType: User,Female,Nő
-DocType: Journal Entry Account,Debit in Account Currency,Tartozik a fiók pénzneme
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadatok marad, ahogy van. Ez a művelet nem vonható vissza."
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Megválaszolt
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Érvénytelen hivatkozás {0} {1}
 DocType: Payment Tool,Total Payment Amount,Teljes összeg kiegyenlítéséig
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a tervezett quanitity ({2}) a gyártási utasítás {3}"
 DocType: Shipping Rule,Shipping Rule Label,Szállítási lehetőség címkéi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
 DocType: Newsletter,Test,Teszt
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mivel már meglévő részvény tranzakciók ezt az elemet, \ nem tudja megváltoztatni az értékeket &quot;Has Serial No&quot;, &quot;a kötegelt Nem&quot;, &quot;Úgy Stock pont&quot; és &quot;értékelési módszer&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Gyors Naplókönyvelés
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni mértéke, ha BOM említett Against olyan tétel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mert Mennyiség
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adja Tervezett Mennyiség jogcím {0} sorban {1}"
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kérelmek tételek.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön termelési érdekében jön létre minden kész a jó elemet.
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Teljes beállítás
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt befagyva, hogy ez az időpont, senkinek nincs joga / módosítani bejegyzést kivéve szerepet az alábbiak szerint."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, utána karbantartási ütemterv"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze frakciók. (A számok)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Hírlevél levelezőlista
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
+DocType: Authorization Rule,Authorized Value,Megengedett érték
 DocType: Contact,Enter department to which this Contact belongs,"Adja egysége, ahova a kapcsolattartónak tartozik"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Összesen Hiány
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Elem vagy raktár sorban {0} nem egyezik Material kérése
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mértékegység
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat tőle függ:
 DocType: Lead,Opportunity,Lehetőség
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (a per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nem kért SMS
 DocType: Campaign,Campaign-.####,Kampány -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint Csatlakozás dátuma"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A harmadik fél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki eladja a vállalatok termékek a jutalék."
 DocType: Customer Group,Has Child Node,Lesz gyerek bejegyzése?
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ellen Megrendelés {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} sem aktív pénzügyi évben. További részletekért ellenőrizze {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ez egy példa honlapján automatikusan generált a ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing tartomány 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokémiai megmunkálás
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Normál adó sablont, hogy lehet alkalmazni, hogy minden vásárlási tranzakciókat. Ez a sablon tartalmazhat listáját adó fejek és egyéb ráfordítások fejek, mint a ""Shipping"", ""biztosítás"", ""kezelés"" stb #### Megjegyzés Az adó mértéke határozná meg itt lesz az adó normál kulcsának minden ** elemek * *. Ha vannak ** ** elemek, amelyek különböző mértékben, akkor hozzá kell adni a ** Elem Tax ** asztalra a ** Elem ** mester. #### Leírása oszlopok 1. Számítási típus: - Ez lehet a ** Teljes nettó ** (vagyis az összege alapösszeg). - ** Az előző sor Total / Összeg ** (kumulatív adók vagy díjak). Ha ezt a lehetőséget választja, az adó fogják alkalmazni százalékában az előző sor (az adótábla) mennyisége vagy teljes. - ** A tényleges ** (mint említettük). 2. Account Head: A fiók főkönyvi, amelyek szerint ez az adó könyvelik 3. Cost Center: Ha az adó / díj olyan jövedelem (például a szállítás), vagy költségkímélő kell foglalni ellen Cost Center. 4. Leírás: Leírás az adó (amely lehet nyomtatott számlák / idézetek). 5. Rate: adókulcs. 6. Összeg: Adó összege. 7. Teljes: Összesített összesen ebben a kérdésben. 8. Adja Row: Ha alapuló ""Előző Row Total"" kiválaszthatja a sor számát veszik, mint a bázis ezt a számítást (alapértelmezett az előző sor). 9. fontolják meg az adózási vagy illeték: Ebben a részben megadhatja, ha az adó / díj abban az értékelésben (nem része összesen), vagy kizárólag a teljes (nem hozzáadott értéket az elem), vagy mindkettő. 10. Adjon vagy le lehet vonni: Akár akarjuk adni vagy le lehet vonni az adóból."
-DocType: Note,Note,Jegyzet
 DocType: Purchase Receipt Item,Recd Quantity,RecD Mennyiség
-DocType: Email Account,Email Ids,E-mail azonosítók
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet még több tétel {0}, mint Sales Rendelési mennyiség {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,"Stock Entry {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 DocType: Tax Rule,Billing City,Számlázási város
 DocType: Global Defaults,Hide Currency Symbol,Pénznem szimbólumának elrejtése
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Jóváírási értesítő
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},"Befejezett Menny nem lehet több, mint {0} művelet {1}"
 DocType: Features Setup,Quality,Minőség
-DocType: Contact Us Settings,Introduction,Bevezetés
 DocType: Warranty Claim,Service Address,Szerviz címe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 sorok Stock Megbékélés.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 sorok Stock Megbékélés.
 DocType: Stock Entry,Manufacture,Gyártás
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Kérjük, szállítólevél első"
 DocType: Purchase Invoice,Currency and Price List,Pénznem és árlista
 DocType: Opportunity,Customer / Lead Name,Vevő / Célpont neve
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Távolság dátuma nem szerepel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Termelés
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Távolság dátuma nem szerepel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Termelés
 DocType: Item,Allow Production Order,Gyártási rendelés engedélyezése
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen (db)
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Elküldve
 DocType: Salary Structure,Total Earning,Összesen Earning
 DocType: Purchase Receipt,Time at which materials were received,Időpontja anyagok érkezett
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Saját címek
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Szervezet ága mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vagy
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Közműben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 felett
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzéke
-,Download Backups,Letöltés mentések
 DocType: Notification Control,Sales Order Message,Vevői Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a társaság, Valuta, folyó pénzügyi évben, stb"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Fizetési mód
 DocType: Process Payroll,Select Employees,Válassza ki a munkavállalók
 DocType: Bank Reconciliation,To Date,Dátumig
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Részletek
 DocType: Purchase Invoice,Total Taxes and Charges,Összes adók és költségek
 DocType: Employee,Emergency Contact,Sürgősségi Kapcsolat
 DocType: Item,Quality Parameters,Minőségi paraméterek
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Szülőelem
 DocType: Account,Account Type,Számla típus
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Hagyja típusa {0} nem carry-továbbítani
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem keletkezik az összes elem. Kérjük, kattintson a ""Létrehoz Menetrend"""
 ,To Produce,Termelni
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","A sorban {0} {1}. Márpedig a {2} jogcímben ráta, sorok {3} is fel kell venni"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Mennyiség fenntartva
 DocType: Landed Cost Voucher,Purchase Receipt Items,Vásárlási nyugta elemek
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Testreszabása Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Vágás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Összelapulás
 DocType: Account,Income Account,Jövedelem számla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Öntvény
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lásd az 'Anyagköltség számítás módja' a Költség részben
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumentumok
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Költségközpont
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Utalvány #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Utalvány #
 DocType: Notification Control,Purchase Order Message,Megrendelés Message
 DocType: Tax Rule,Shipping Country,Szállítási Ország
 DocType: Upload Attendance,Upload HTML,HTML feltöltése
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Előleg teljes ({0}) ellen Order {1} nem lehet nagyobb, \ mint a Grand Total ({2})"
 DocType: Employee,Relieving Date,Tehermentesítő dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Árképzési szabály készül felülírni árjegyzéke / határozza kedvezmény százalékos, néhány olyan feltétel alapján."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse csak akkor lehet megváltoztatni keresztül Stock Entry / szállítólevél / vásárlási nyugta
 DocType: Employee Education,Class / Percentage,Osztály / Százalékos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Marketing és Értékesítés vezetője
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser megtervezett net alakítására
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Marketing és Értékesítés vezetője
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Jövedelemadó
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ha a kiválasztott árképzési szabály készül az ""Ár"", az felülírja árlista. Árképzési szabály ár a végleges ár, így további kedvezményt kellene alkalmazni. Ezért a tranzakciók, mint a vevői rendelés, megrendelés, stb, akkor kerül letöltésre a ""Rate"" mezőbe, ahelyett, hogy ""árjegyzéke Rate"" mezőben."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,A pálya vezet az ipar típusa.
 DocType: Item Supplier,Item Supplier,Anyagbeszállító
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Minden címek.
 DocType: Company,Stock Settings,Készlet beállítások
-DocType: User,Bio,Életrajz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,A vevői csoport fa.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Új költségközpont neve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Új költségközpont neve
 DocType: Leave Control Panel,Leave Control Panel,Hagyja Vezérlőpult
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Nincs alapértelmezett Címsablon találhatók. Kérjük, hozzon létre egy újat a Setup> Nyomtatás és Branding> Címsablon."
 DocType: Appraisal,HR User,HR Felhasználó
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség Miután a tranzakciós
 ,Pending SO Items For Purchase Request,Függőben lévő SO elemek vásárolható kérése
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Nagy
 ,Profit and Loss Statement,Az eredmény-kimutatás
 DocType: Bank Reconciliation Detail,Cheque Number,Csekk száma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nyomás
 DocType: Payment Tool Detail,Payment Tool Detail,Fizetési eszköz Detail
 ,Sales Browser,Értékesítési Browser
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik elleni készletnövekedést {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Adósok
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Nagy
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nem alkalmazottja találta!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Nagy
 DocType: C-Form Invoice Detail,Territory,Terület
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Kérjük beszélve nincs ellenőrzés szükséges
 DocType: Purchase Order,Customer Address Display,Ügyfél Cím megjelenítése
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polírozás
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bezár Mérleg és a könyv nyereség vagy veszteség.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Alapértelmezett mértékegysége pont {0} nem módosítható közvetlenül, mert \ már tett néhány tranzakció (k) másik UOM. Ha módosítani alapértelmezett mértékegysége, \ use UOM Cserélje Utility &quot;eszköz keretében Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja árfolyam átalakítani egy pénznem egy másik
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0} ajánlat törölve
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,{0} ajánlat törölve
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló összege
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
 DocType: Sales Partner,Targets,Célok
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakciók lehet címkézett ellen több ** értékesítők ** így, és kövesse nyomon célokat."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Legyen ideje Bejelentkezés
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Kérjük, állítsa újrarendezésből mennyiség"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Kérjük, hozzon létre Ügyfél a Lead {0}"
 DocType: Price List,Applicable for Countries,Alkalmazható Országok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Számítógépek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokémiai köszörülés
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Ez egy gyökér vevőkör, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Kérjük, állítsa össze a számlatükör mielőtt elkezdi könyvelési tételek"
 DocType: Purchase Invoice,Ignore Pricing Rule,Figyelmen kívül hagyja árképzési szabály
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Törölve
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Dátum-tól a fizetési struktúra nem lehet kisebb, mint Employee Összefogás napja."
 DocType: Employee Education,Graduate,Diplomás
 DocType: Leave Block List,Block Days,Blokk Napok
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Ellenőrizze, hogy az ismétlődő számlát, törölje megállítani visszatérő vagy tegye megfelelő End Date"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,A {0} munkavállaló már megjelölt a jelenlétin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomagot azonos típusú (nyomtatási)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maximum {0} sorok megengedett
 DocType: C-Form Invoice Detail,Net Total,Nettó összesen
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Számlázás (Eladási számla)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Célok
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast egy tételt kell beírni a negatív mennyiség cserébe dokumentum
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő munkaállomás {1}, lebontják a művelet a több művelet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokémiai megmunkálás
 ,Requested,Kért
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nincs megjegyzés
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Lejárt
 DocType: Account,Stock Received But Not Billed,"Stock érkezett, de nem számlázzák"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttó bér + hátralékot összeg + beváltása Összeg - Total levonása
 DocType: Monthly Distribution,Distribution Name,Nagykereskedelem neve
 DocType: Features Setup,Sales and Purchase,Értékesítés és beszerzés
 DocType: Supplier Quotation Item,Material Request No,Anyagigénylés száma
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Minőség-ellenőrzési szükséges Elem {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amely ügyfél deviza átalakul cég bázisvalutaként"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} óta sikeresen megszüntette a listából.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Társaság Currency)
-apps/frappe/frappe/templates/base.html +134,Added,Hozzáadott
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Kezelése Terület fa.
 DocType: Journal Entry Account,Sales Invoice,Eladási számla
 DocType: Journal Entry Account,Party Balance,Párt Balance
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,A {0} pénzügyi év nem található.
 DocType: Bank Reconciliation,Get Relevant Entries,Get vonatkozó bejegyzései
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Számviteli könyvelése Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Elem {0} nem létezik
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Elem {0} nem létezik
 DocType: Sales Invoice,Customer Address,Vevő címe
-apps/frappe/frappe/desk/query_report.py +136,Total,Összesen
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazza További kedvezmény
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Sor # {0}: Nem lehet vissza több mint {1} jogcím {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege után kedvezmény összege (Társaság Currency)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Cél raktárban kötelező sorban {0}
 DocType: Quality Inspection,Quality Inspection,Minőségvizsgálat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray képező
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag kért Mennyiség kevesebb, mint Minimális rendelési menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Account {0} lefagyott
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi személy / leányvállalat külön számlatükör tartozó Szervezet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vagy BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Egyszerre csak fizetés ellenében nem számlázott {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum készletszint
 DocType: Stock Entry,Subcontract,Alvállalkozói
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Gyártó cikkszáma
 DocType: Production Order Operation,Estimated Time and Cost,Becsült idő és költség
 DocType: Bin,Bin,Láda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Ütköző
 DocType: SMS Log,No of Sent SMS,Nem az elküldött SMS-
 DocType: Account,Company,Cég
 DocType: Account,Expense Account,Áfás számlát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Szoftver
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Szín
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Szoftver
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Szín
 DocType: Maintenance Visit,Scheduled,Ütemezett
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Kérjük, válasszon pont, ahol &quot;Is Stock tétel&quot; &quot;Nem&quot; és &quot;Van Sales Termék&quot; &quot;Igen&quot;, és nincs más termék Bundle"
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása egyenlőtlen osztja célok hónapok között.
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Válassza ki havi megoszlása egyenlőtlen osztja célok hónapok között.
 DocType: Purchase Invoice Item,Valuation Rate,Becsült érték
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Árlista Ki nem választott
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Elem Row {0}: vásárlási nyugta {1} nem létezik a fent 'Vásárlás bevételek ""tábla"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} már jelentkezett {1} között {2} és {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Míg
 DocType: Rename Tool,Rename Log,Átnevezési napló
 DocType: Installation Note Item,Against Document No,Ellen Document No
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Kezelje a forgalmazókkal.
 DocType: Quality Inspection,Inspection Type,Vizsgálat típusa
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Kérjük, válassza ki a {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Kérjük, válassza ki a {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Kutató
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Frissítés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Kutató
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Kérjük, őrizze meg a hírlevél küldés előtt"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Név vagy e-mail kötelező
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Bejövő minőségi ellenőrzés.
 DocType: Purchase Order Item,Returned Qty,Visszatért db
 DocType: Employee,Exit,Kilépés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type kötelező
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type kötelező
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} sorozatszám létrehozva
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrációs befejező
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A könnyebb ügyfelek, ezek a kódok használhatók a nyomtatási formátumok, mint számlákon és a szállítóleveleken"
 DocType: Employee,You can enter any date manually,Megadhat bármilyen dátum kézi
 DocType: Sales Invoice,Advertisement,Hirdetés
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Próbaidő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Próbaidő
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak az ágakat engedélyezettek a tranzakciós
 DocType: Expense Claim,Expense Approver,Költségén Jóváhagyó
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Vásárlási nyugta mellékelt tételek
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Hogy Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Rönk fenntartása sms szállítási állapot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Őrlés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zsugorfóliázó
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Függő Tevékenységek
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Megerősített
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Szállító> Szállító Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Kérjük, adja enyhíti a dátumot."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Csak Hagyd alkalmazások állapotát ""Elfogadott"" lehet benyújtani"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Address Cím kötelező.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg nevét kampányt, ha a forrása a vizsgálódás kampány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Válassza ki Fiscal Year
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Attendance,Attendance Date,Jelenléti dátuma
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés szakítás alapján a kereseti és levonás.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Számlát a gyermek csomópontok nem lehet átalakítani főkönyvi
 DocType: Address,Preferred Shipping Address,Ez legyen a szállítási cím is
 DocType: Purchase Receipt Item,Accepted Warehouse,Elfogadott raktár
 DocType: Bank Reconciliation Detail,Posting Date,Rögzítés dátuma
 DocType: Item,Valuation Method,Készletérték számítása
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nem található árfolyam {0} {1}
 DocType: Sales Invoice,Sales Team,Értékesítő csapat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Ismétlődő bejegyzés
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Ismétlődő bejegyzés
 DocType: Serial No,Under Warranty,Garanciaidőn belül
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Hiba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavak lesz látható, ha menteni a Vevői rendelés."
 ,Employee Birthday,Munkavállaló születésnapja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új szabadság lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,A {0} sorozatszám nem létezik
 DocType: Pricing Rule,Discount Percentage,Kedvezmény százaléka
 DocType: Payment Reconciliation Invoice,Invoice Number,Számla száma
-apps/erpnext/erpnext/hooks.py +70,Orders,Rendelés
+apps/erpnext/erpnext/hooks.py +54,Orders,Rendelés
 DocType: Leave Control Panel,Employee Type,Munkaviszony típusa
 DocType: Employee Leave Approver,Leave Approver,Szabadság jóváhagyó
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyaga átadott gyártása
 DocType: Expense Claim,"A user with ""Expense Approver"" role","A felhasználó ""Költség Jóváhagyó"" szerepét"
 ,Issued Items Against Production Order,Gyártás rendelést akadályozó problémák
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Költség Center meglévő tranzakciók nem lehet átalakítani, hogy csoportban"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Értékcsökkenés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Szállító (k)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Érvénytelen időszakban
 DocType: Customer,Credit Limit,Credit Limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Tranzakció kiválasztása
 DocType: GL Entry,Voucher No,Bizonylatszám
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Cím és kapcsolattartási
 DocType: Customer,Last Day of the Next Month,Last Day of a következő hónapban
 DocType: Employee,Feedback,Visszajelzés
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Szabadság nem kell elosztani {0}, mint szabadság egyensúlya már carry-továbbította a jövőben szabadság elosztása rekordot {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Mivel / Referencia dátum meghaladja a megengedett ügyfél hitel nap {0} nap (ok)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Karba. Menetrend
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazív vízsugaras megmunkálás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Karba. Menetrend
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
-DocType: Website Settings,Website Settings,Weboldal beállítások
 DocType: Item,Reorder level based on Warehouse,Reorder szinten alapuló Warehouse
 DocType: Activity Cost,Billing Rate,Díjszabás
 ,Qty to Deliver,Mennyiség cselekedni!
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Igényelt
 DocType: Quotation Item,Against Doctype,Ellen Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Kövesse nyomon ezt a szállítólevél ellen Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root fiók nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root fiók nem törölhető
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mutasd Stock bejegyzések
 ,Is Primary Address,Van Elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Work in progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referencia # {0} dátuma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Kezelje címek
 DocType: Pricing Rule,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,A munkavállaló cégen belüli mozgása
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zárás (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zárás (Dr)
 DocType: Contact,Passive,Passzív
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} nincs raktáron
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Adó sablon eladási ügyleteket.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Számlázott összeg
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Megbékélés
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get frissítések
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Adjunk hozzá néhány mintát bejegyzések
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Hagyja Management
-DocType: Event,Groups,Csoportok
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
 DocType: Sales Order,Fully Delivered,Teljesen szállítva
 DocType: Lead,Lower Income,Alacsonyabb jövedelmű
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Gyors súgó
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Forrás és cél raktárban nem lehet azonos sorban {0}
 DocType: Features Setup,Sales Extras,Értékesítési Extrák
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} költségvetés Account {1} ellen Cost Center {2} meg fogja haladni a {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség Figyelembe kell lennie Eszköz / Forrás típusú számla, mivel ez a Stock Megbékélés egy Nyitva Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Megrendelés számát szükséges Elem {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" a ""Dátumig"" után kell állnia"
 ,Stock Projected Qty,Stock kivetített Mennyiség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Vásárlói {0} nem tartozik a projekt {1}
 DocType: Sales Order,Customer's Purchase Order,Ügyfél Megrendelés
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Érték vagy menny
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Perc
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Perc
 DocType: Purchase Invoice,Purchase Taxes and Charges,Adókat és díjakat
 ,Qty to Receive,Mennyiség fogadáshoz
 DocType: Leave Block List,Leave Block List Allowed,Hagyja Block List hozhatja
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverziós faktor nem lehet a frakciók
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Fogod használni a belépéshez
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Fogod használni a belépéshez
 DocType: Sales Partner,Retailer,Kiskereskedő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hitel figyelembe kell egy Mérlegszámla
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Minden beszállító típusok
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Elem kód megadása kötelező, mert pont nincs automatikusan számozott"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Idézet {0} nem type {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Idézet {0} nem type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó eszköz
 DocType: Sales Order,%  Delivered,% kiszállítva
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Folyószámlahitel Account
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bérlap készítése
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Keressen BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zálogkölcsön
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Döbbenetes termékek
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Döbbenetes termékek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Nyitó egyenleg Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nem tudja jóváhagyni szabadság akkor Ön nem jogosult jóváhagyni levelek blokkolása dátuma
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-hab öntés
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rajz
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dátum megismétlődik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Az aláírásra jogosult
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Hagyja jóváhagyóhoz közül kell {0}
 DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költségének (via vásárlást igazoló számlát)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság Currency)
 DocType: BOM Operation,Hour Rate,Órás sebesség
 DocType: Stock Settings,Item Naming By,Elem elnevezés típusa
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Árajánlat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Árajánlat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Egy újabb pont a nevezési határidő {0} azután tette {1}
 DocType: Production Order,Material Transferred for Manufacturing,Anyag átrakva gyártáshoz
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Account {0} nem létezik
 DocType: Purchase Receipt Item,Purchase Order Item No,Megrendelés tétel
-DocType: System Settings,System Settings,Rendszer beállításai
 DocType: Project,Project Type,Projekt típusa
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Vagy target Menny vagy előirányzott összeg kötelező.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Költségek különböző tevékenységek
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR részlete
 DocType: Sales Order,Fully Billed,Teljesen számlázott
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,A készpénz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Szállítási raktárban szükséges állomány elem {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A bruttó tömeg a csomag. Általában a nettó tömeg + csomagolóanyag súlyát. (Nyomtatási)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a szereppel megengedett, hogy a befagyasztott számlák és létrehozza / módosítja könyvelési tételek ellen befagyasztott számlák"
 DocType: Serial No,Is Cancelled,ez törölve
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Saját szállítások
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Saját szállítások
 DocType: Journal Entry,Bill Date,Bill dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Még ha több árképzési szabályok kiemelten, akkor a következő belső prioritások kerülnek alkalmazásra:"
 DocType: Supplier,Supplier Details,Beszállító részletei
-DocType: Communication,Recipients,Címzettek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Csavarozás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzé tételek Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Re kisebb legyen, mint az értéket sorban {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Banki átutalás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Kérjük, válasszon Bank Account"
 DocType: Newsletter,Create and Send Newsletters,Létrehozása és küldése hírlevelek
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"Dátum kell, mielőtt To Date"
 DocType: Sales Order,Recurring Order,Ismétlődő rendelés
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vásárlói csoport / Ügyfélszolgálat
 DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy megmutassa a honlapon"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Üdvözöl az ERPNext
+,Welcome to ERPNext,Üdvözöl az ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Utalvány Részlet száma
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Vezethet Idézet
 DocType: Lead,From Customer,Az Ügyfél
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Hívások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Hívások
 DocType: Project,Total Costing Amount (via Time Logs),Összesen Költség Összeg (via Idő Napló)
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Megrendelés {0} nem nyújtják be
 ,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nem tartozik Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi túlteljesítés és over-foglalás jogcím {0}, mint a mennyiség vagy összeg 0"
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Kezdési dátum
 DocType: Journal Entry,Remark,Megjegyzés
 DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Unalmas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Áthozás értékesítési megrendelésből
-DocType: Blog Category,Parent Website Route,Szülő Weboldal Route
 DocType: Sales Order,Not Billed,Nem számlázott
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nem szerepel partner még.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nem aktív
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Beszerzési költség utalvány összege
 DocType: Time Log,Batched for Billing,Kötegelt a számlázással
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills által felvetett Szállítók.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Kedvezmény összege
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against vásárlási számla
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,pl. ÁFA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. pont
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
 DocType: Shopping Cart Settings,Quotation Series,Idézet Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Egy elem létezik azonos nevű ({0}), kérjük, változtassa meg a tételt csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Forró fém gázt előállító
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Cég kötelező
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Tovább a megfelelő csoportba (általában forrása alapok&gt; Rövid lejáratú kötelezettségek&gt; Adók és Illetékek és hozzon létre egy új fiók (kattintva Add Child) típusú &quot;adó&quot;, és nem beszélve az adókulcs."
 ,Payment Period Based On Invoice Date,Fizetési határidő számla alapján dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hiányzó valutaárfolyamok: {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lézeres vágás
-DocType: Event,Monday,Hétfő
 DocType: Journal Entry,Stock Entry,Készlet mozgás
 DocType: Account,Payable,Kifizetendő
 DocType: Salary Slip,Arrear Amount,Hátralék összege
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Cím leírása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast egyik elad vagy vesz ki kell választani
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végzik.
-DocType: Page,All,Minden
 DocType: Stock Entry Detail,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
 DocType: Employee,Confirmation Date,Visszaigazolás
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Értékesítési Felhasználó
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Min Menny nem lehet nagyobb, mint Max Mennyiség"
 DocType: Stock Entry,Customer or Supplier Details,Ügyfél vagy beszállító Részletek
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Célpont tulajdonosa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse van szükség
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Warehouse van szükség
 DocType: Employee,Marital Status,Családi állapot
 DocType: Stock Settings,Auto Material Request,Automata anyagrendelés
 DocType: Time Log,Will be updated when billed.,Frissítésre kerül kiszámlázásra.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Területi célpontok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Megrendelés mellékelt tételek
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,A cég neve nem lehet Társaság
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejek a nyomtatási sablonok.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címeket nyomtatási sablonok pl Pro forma számla.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Értékelés típusú költségeket nem lehet megjelölni Inclusive
 DocType: POS Profile,Update Stock,Készlet frissítése
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Szuperfiniselési
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegysége elemek, az helytelen (Total) Nettó súly értéket. Győződjön meg arról, hogy a nettó tömege egyes tételek ugyanabban UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Kérjük, húzza elemeket szállítólevél"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord minden kommunikáció típusú e-mail, telefon, chat, látogatás, stb"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Kérjük beszélve Round Off Cost Center Company
 DocType: Purchase Invoice,Terms,Feltételek
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Új létrehozása
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Új létrehozása
 DocType: Buying Settings,Purchase Order Required,Megrendelés Kötelező
 ,Item-wise Sales History,Elem-bölcs értékesítési történelem
 DocType: Expense Claim,Total Sanctioned Amount,Összesen Jóváhagyott összeg
 ,Purchase Analytics,Vásárlási Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Szállítólevél tétel
 DocType: Expense Claim,Task,Feladat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Borotválkozás
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch szám kötelező tétel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Ez egy gyökér értékesítő személyt, és nem lehet szerkeszteni."
 ,Stock Ledger,Készlet könyvelés
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Fizetés Slip levonása
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Jegyzetek
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Válasszon egy csoportot csomópont először.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Ezen célok közül kell választani: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Töltse le a jelentést, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapot"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Szembenézni
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
 DocType: Leave Application,Leave Balance Before Application,Hagyja Balance alkalmazása előtt
 DocType: SMS Center,Send SMS,SMS küldése
 DocType: Company,Default Letter Head,Alapértelmezett levélfejléc
 DocType: Time Log,Billable,Számlázható
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ez lesz használva beállítására szabály HR modulban
 DocType: Account,Rate at which this tax is applied,"Arány, amely ezt az adót alkalmaznak"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Újra rendelendő mennyiség
 DocType: Company,Stock Adjustment Account,Stock korrekció számla
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Elveszített lehetőség
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Kedvezmény Fields lesz kapható Megrendelés, vásárlási nyugta, vásárlási számla"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nevét az új fiók. Megjegyzés: Kérjük, ne hozzon létre ügyfélszámlák és Szolgáltatók"
-DocType: Report,Report Type,Report Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Betöltés
 DocType: BOM Replace Tool,BOM Replace Tool,Anyagjegyzék cserélő eszköz
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Országonként eltérő címlista sablonok
 DocType: Sales Order Item,Supplier delivers to Customer,Szállító szállít az Ügyfél
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mutass adókedvezmény-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mutass adókedvezmény-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},A határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Az adatok importálása és exportálása
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Ha bevonják a gyártási tevékenység. Engedélyezi tétel ""gyártják"""
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 DocType: Purchase Order Item,Material Request Detail No,Anyag kérése Részlet No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Keményesztergálást
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Karbantartási látogatás készítése
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználónak, akik Sales mester menedzser {0} szerepe"
 DocType: Company,Default Cash Account,Alapértelmezett pénzforgalmi számlát
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Cég (nem ügyfél vagy szállító) mestere.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Kérjük, írja be a ""szülés várható időpontja"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Szállítólevelek {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Befizetett összeg + Írja egyszeri összeg nem lehet nagyobb, mint a Grand Total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Batch Number jogcím {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég szabadság mérlege Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Megjegyzés: Ha a fizetés nem történik ellen utalást, hogy Naplókönyvelés kézzel."
 DocType: Item,Supplier Items,Szállító elemek
 DocType: Opportunity,Opportunity Type,Lehetőség Type
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Közzé Elérhetőség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Születési idő nem lehet nagyobb, mint ma."
 ,Stock Ageing,Készlet öregedés
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,"{0} ""{1}"" le van tiltva"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Beállítás Nyílt
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Küldd automatikus e-maileket Kapcsolatok benyújtásával tranzakciókat.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Menny nem avalable raktárban {1} a {2} {3}. Elérhető Mennyiség: {4}, Transzfer Mennyiség: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. pont
 DocType: Purchase Order,Customer Contact Email,Vásárlói Email
-DocType: Event,Sunday,Vasárnap
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mert ""Készpénz vagy bankszámláját"" nem volt megadva"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Felelősségek
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sablon
 DocType: Sales Person,Sales Person Name,Értékesítő neve
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adja atleast 1 számlát a táblázatban"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Felhasználók hozzáadása
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Felhasználók hozzáadása
 DocType: Pricing Rule,Item Group,Anyagcsoport
 DocType: Task,Actual Start Date (via Time Logs),Tényleges kezdési dátum (via Idő Napló)
 DocType: Stock Reconciliation Item,Before reconciliation,Mielőtt megbékélés
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadása (a cég pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Elem Tax Row {0} kell figyelembe típusú adót vagy bevételként vagy ráfordításként vagy fizetős
 DocType: Sales Order,Partly Billed,Részben számlázott
 DocType: Item,Default BOM,Alapértelmezett BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Kérjük ismíteld cég nevét, hogy erősítse"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló Amt
 DocType: Time Log Batch,Total Hours,Össz óraszám
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elem szükséges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Fém fröccsöntés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Összesen Betéti kell egyeznie az összes Credit. A különbség az, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Áthozás fuvarlevélből
 DocType: Time Log,From Time,Időtől
 DocType: Notification Control,Custom Message,Egyedi üzenet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Válassza ki az országot, időzóna és a pénznem"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámlára kötelező a fizetés bejegyzés
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista árfolyam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pácolás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Homoköntésnél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Arány
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Egy célpont ezzel az email címmel már létezik
 DocType: Stock Entry,From BOM,Anyagjegyzékből
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Alapvető
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Részvény tranzakciók előtt {0} befagyasztották
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Kérjük, kattintson a ""Létrehoz Menetrend"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,El kellene megegyezik Dátum fél napra szabadságra
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátum"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,A belépés dátumának nagyobbnak kell lennie a születési dátumnál
 DocType: Salary Structure,Salary Structure,Bérrendszer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Többszörös Ár szabály létezik azonos kritériumok, kérjük, oldja \ konfliktus elsőbbséget. Ár Szabályok: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Légitársaság
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kérdés Anyag
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Légitársaság
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Kérdés Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátum
 DocType: Hub Settings,Access Token,Access Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,A befektetett eszközök tételeire
 DocType: Stock Entry,Including items for sub assemblies,Beleértve elemek részegységek
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ha hosszú a nyomtatási formátumot, ez a funkció is használható szét a nyomtatandó oldal több oldalon az összes fejléc és lábléc minden oldalon"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Minden Területek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Minden Területek
 DocType: Purchase Invoice,Items,Tételek
 DocType: Fiscal Year,Year Name,Év Név
 DocType: Process Payroll,Process Payroll,Bérszámfejtéséhez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,"Jelenleg több, mint a szabadság munkanapon ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Termék Bundle pont
 DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
 DocType: Purchase Invoice Item,Image View,Kép megtekintése
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Befejező &amp; ipari feldolgozása
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és időpontok megadása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdén
 DocType: Shipping Rule,Calculate Based On,A számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Fúrás
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Flakonfúvó
 DocType: Purchase Taxes and Charges,Valuation and Total,Értékelési és Total
 DocType: Tax Rule,Shipping City,Szállítási Város
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ez pont egy változata {0} (Template). Attribútumok kerülnek másolásra át a sablont, kivéve, ha ""No Copy"" van beállítva"
 DocType: Account,Purchase User,Vásárlási Felhasználó
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kalapálás
-DocType: Web Page,Slideshow,Diabemutató
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Alapértelmezett Címsablon nem lehet törölni
 DocType: Sales Invoice,Shipping Rule,Szállítási lehetőség
 DocType: Journal Entry,Print Heading,Nyomtatás címsor
 DocType: Quotation,Maintenance Manager,Karbantartási vezető
-DocType: Workflow State,Search,Keresés
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Összesen nem lehet nulla
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Az utolsó rendelés óta eltelt napok""-nak nagyobbnak vagy egyenlőnek kell lennie nullával"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,Módosított től
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nyersanyag
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege után kedvezmény összege
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Gyermek fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy target Menny vagy előirányzott összeg kötelező
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Nincs alapértelmezett BOM létezik tétel {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátum első"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Nyitva Dátum kell, mielőtt zárónapja"
 DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
@@ -2801,44 +2570,43 @@
 ,Produced,Készült
 DocType: Item,Item Code for Suppliers,Elem Code for Ellátó
 DocType: Issue,Raised By (Email),Felvetette (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Általános
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Levélfejléc csatolása
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Általános
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Levélfejléc csatolása
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a ""Értékelési"" vagy ""Értékelési és Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Sorolja fel az adó fejek (például ÁFA, vám stb rendelkezniük kell egyedi neveket) és a normál áron. Ez létre fog hozni egy szokásos sablon, amely lehet szerkeszteni, és adjunk hozzá még később."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Sorolja fel az adó fejek (például ÁFA, vám stb rendelkezniük kell egyedi neveket) és a normál áron. Ez létre fog hozni egy szokásos sablon, amely lehet szerkeszteni, és adjunk hozzá még később."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Szükséges a Serialized tétel {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Alkalmazandó (elnevezését)
-DocType: Blog Post,Blog Post,Blog bejegyzés
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Csoportosítva
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Engedélyezése / tiltása a pénznemnek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Postai költségek
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Purchase Order,The date on which recurring order will be stop,"Az időpont, amikor az ismétlődő rend lesz megállítani"
 DocType: Quality Inspection,Item Serial No,Anyag-sorozatszám
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} vagy növelnie kell overflow tolerancia
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} csökkenteni kell {1} vagy növelnie kell overflow tolerancia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Összesen Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Óra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Óra
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Elem {0} nem lehet frissíteni \ felhasználásával Stock Megbékélés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Át az anyagot szállító
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Át az anyagot szállító
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új Serial No nem lehet Warehouse. Warehouse kell beállítani Stock Entry vagy vásárlási nyugta
 DocType: Lead,Lead Type,Célpont típusa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Hozzon létre Idézet
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Mindezen tételek már kiszámlázott
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ön nem jogosult jóváhagyni levelek blokkolása időpontjai
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Mindezen tételek már kiszámlázott
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Lehet jóvá {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az anyagjegyzék, amire le lesz cserélve mindenhol"
 DocType: Features Setup,Point of Sale,Értékesítési hely
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Bodorítás
 DocType: Account,Tax,Adó
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Finomítás
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} nem érvényes {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,A Termék Bundle
 DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
 DocType: Quality Inspection,Report Date,Jelentés dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Számlák
 DocType: Job Opening,Job Title,Állás megnevezése
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} már elkülönített Employee {1} időszakra {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} címzettek
 DocType: Features Setup,Item Groups in Details,Az anyagcsoport részletei
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Mennyiség hogy Előállítás nagyobbnak kell lennie, mint 0."
@@ -2847,34 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Frissítési gyakoriság és a szabad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Százalékos Ön lehet kapni, vagy adja tovább ellen a megrendelt mennyiség. Például: Ha Ön által megrendelt 100 egység. és a juttatás 10%, akkor Ön lehet kapni 110 egység."
 DocType: Pricing Rule,Customer Group,Vevő csoport
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Költség számla kötelező elem {0}
 DocType: Item,Website Description,Weboldal leírása
-DocType: Serial No,AMC Expiry Date,"Éves karbantartási szerződés lejárati dátuma
-"
+DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
 ,Sales Register,Értékesítési Regisztráció
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
 DocType: Address,Plant,Növény
-DocType: DocType,Setup,Beállítás
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkeszteni.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,"Összefoglaló ebben a hónapban, és folyamatban lévő tevékenységek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hideghengerléséhez
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Töröld a számla {0} a C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válasszon átviszi, ha Ön is szeretné közé előző pénzügyi év mérlege hagyja a költségvetési évben"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Attribútumok
-DocType: Packing Slip,Get Items,Tételek áthozása
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Kérjük, adja leírni Account"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Tételek áthozása
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Kérjük, adja leírni Account"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Utolsó rendelési dátum
-DocType: DocField,Image,Kép
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Tedd Jövedéki számla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Account {0} nem tartozik a cég {1}
-DocType: Communication,Other,Egyéb
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID nincs beállítva
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Karba. Látogassa
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Karba. Látogassa
 DocType: Leave Type,Is Encash,A behajt
 DocType: Purchase Invoice,Mobile No,Mobiltelefon
 DocType: Payment Tool,Make Journal Entry,Tedd Naplókönyvelés
@@ -2882,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project-bölcs adatok nem állnak rendelkezésre árajánlat
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kereskedelmi
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kereskedelmi
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Szülőelem {0} nem lehet Stock pont
 DocType: Cost Center,Distribution Id,Nagykereskedelem azonosító
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Döbbenetes szolgáltatások
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Minden termék és szolgáltatás.
 DocType: Purchase Invoice,Supplier Address,Beszállító címe
-DocType: Contact Us Settings,Address Line 2,2. cím sor
-DocType: ToDo,Reference,Kapcsolat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforáló
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Mennyiség
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sorozat kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Érték Képesség {0} kell tartományon belül a {1} {2} a lépésekben {3}
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse szükséges Stock tétel {0}
 DocType: Leave Allocation,Unused leaves,A fel nem használt levelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Default Követelés számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Fűrészelés
 DocType: Tax Rule,Billing State,Számlázási állam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Átutalás
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Hozz robbant BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Növekménye Képesség {0} nem lehet 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Szinterezés
 DocType: Journal Entry,Pay To / Recd From,Fizetni / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás beállítása
 DocType: Supplier,Contact HTML,Kapcsolattartó HTML leírása
@@ -2921,9 +2678,8 @@
 DocType: Company,Retail,Kiskereskedelem
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Vásárlói {0} nem létezik
 DocType: Attendance,Absent,Hiányzik
-DocType: Product Bundle,Product Bundle,Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Termék Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zúzó
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vásároljon adók és illetékek Template
 DocType: Upload Attendance,Download Template,Sablon letöltése
 DocType: GL Entry,Remarks,Megjegyzések
@@ -2931,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Írja Off alapuló
 DocType: Features Setup,POS View,POS megtekintése
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Telepítés rekordot a Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Folyamatos öntés
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Kérem adjon meg egy
 DocType: Offer Letter,Awaiting Response,Várom a választ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hideg méretezés
 DocType: Salary Slip,Earning & Deduction,Kereset és levonás
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Account {0} nem lehet Group
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Régió
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,"Opcionális. Ez a beállítás kell használni, a különböző tranzakciókat."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatív értékelési Rate nem megengedett
 DocType: Holiday List,Weekly Off,Heti Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pl 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Ideiglenes nyereség / veszteség (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Return Against Értékesítési számlák
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,5. pont
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Kérjük alapértelmezett értéke {0} Company {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Kérjük alapértelmezett értéke {0} Company {1}
 DocType: Serial No,Creation Time,Létrehozás ideje
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Összes bevétel
 DocType: Sales Invoice,Product Bundle Help,Termék Bundle Súgó
 ,Monthly Attendance Sheet,Havi jelenléti ív
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nem található bejegyzés
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center kötelező tétel {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Hogy elemeket Termék Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Account {0} inaktív
 DocType: GL Entry,Is Advance,Ez előleg?
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Jelenléti Dátum és jelenlét a mai napig kötelező
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a ""alvállalkozói"", mint Igen vagy Nem"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a ""alvállalkozói"", mint Igen vagy Nem"
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Eredménykimutatás"" típusú számla {0} nem engedélyezett Nyitó Bejegyzés"
-DocType: Workflow State,Time,Idő
 DocType: Features Setup,Sales Discounts,Értékesítési Kedvezmények
 DocType: Hub Settings,Seller Country,Eladó Ország
 DocType: Authorization Rule,Authorization Rule,Jóváhagyási szabály
 DocType: Sales Invoice,Terms and Conditions Details,Általános szerződési feltételek részletei
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és költségek sablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Ruházat és kiegészítők
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ruházat és kiegészítők
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Számú rendelés
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner hogy megjelenik a tetején termékek listáját.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Adja feltételek kiszámításához a szállítási költség,"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Add Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Szerepe lehet élesíteni befagyasztott számlák és szerkesztése Frozen bejegyzések
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nem lehet átalakítani költséghely főkönyvi hiszen a gyermek csomópontok
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Átváltási arányra is szükség
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Eladási jutalékok
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
@@ -2980,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Az ügyfelek nem vásárolnak hosszú idő óta
 DocType: Production Order,Expected Delivery Date,Várható szállítás dátuma
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Terhelés és jóváírás nem egyenlő a {0} # {1}. Különbség van {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Domború
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,A párolgási-minta casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Reprezentációs költségek
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Értékesítési számlák {0} törölni kell lemondása előtt ezt a Vevői rendelés
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Életkor
 DocType: Time Log,Billing Amount,Számlázási Összeg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Érvénytelen mennyiséget megadott elem {0}. A mennyiség nagyobb, mint 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,A pályázatokat a szabadság.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Véve a meglévő ügylet nem törölhető
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Jogi költségek
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","A hónap napja, amelyen auto érdekében jön létre pl 05, 28 stb"
 DocType: Sales Invoice,Posting Time,Rögzítés ideje
@@ -3002,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Új Vásárló Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Utazási költségek
 DocType: Maintenance Visit,Breakdown,Üzemzavar
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Fiók: {0} pénznem: {1} nem választható
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: Parent véve {1} nem tartozik a cég: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi ügylet a vállalattal kapcsolatos!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hónolás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
-DocType: Feed,Full Name,Teljes név
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Mezőnyében
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Próbaidő
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Alapértelmezett Warehouse kötelező Stock tétel.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Kifizetését fizetése a hónap {0} és az év {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert árjegyzéke mértéke, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Teljes befizetett összeg
 ,Transferred Qty,Át Mennyiség
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigálás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Tervezés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Tervezés
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Legyen ideje Bejelentkezés Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Kiadott
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázási összeg (via Idő Napló)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Az általunk forgalmazott ezt a tárgyat
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Az általunk forgalmazott ezt a tárgyat
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Szállító Id
 DocType: Journal Entry,Cash Entry,Készpénz Entry
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
@@ -3030,18 +2777,16 @@
 DocType: Brand,Item Manager,Elem menedzser
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Add sorok beállítani éves költségvetésekben számlák.
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kőfejtés
 DocType: Production Order,Total Operating Cost,Teljes működési költség
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Megjegyzés: Elem {0} többször jelenik meg
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Minden Kapcsolattartó.
 DocType: Newsletter,Test Email Id,Teszt email azonosítója
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Cég rövidítése
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Cég rövidítése
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Ha követed Minőség-ellenőrzési. Lehetővé teszi a tétel QA szükség, és QA Nem a vásárláskor kapott nyugtát"
 DocType: GL Entry,Party Type,Párt Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Alapanyag nem lehet ugyanaz, mint a fő elem"
 DocType: Item Attribute Value,Abbreviation,Rövidítés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem authroized hiszen {0} meghaladja határértékek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotációs öntés
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Fizetés sablon mester.
 DocType: Leave Type,Max Days Leave Allowed,Max nap szabadságra hozhatja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Állítsa adózási szabály az bevásárlókosár
@@ -3055,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Idézetek a vezetéket vagy ügyfelek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Zárolt készlet szerkesztésének engedélyezése ennek a beosztásnak
 ,Territory Target Variance Item Group-Wise,Terület Cél Variance tétel Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Minden vásárlói csoport
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán Pénzváltó rekord nem teremtett {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Adó Sablon kötelező.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Account {0}: Parent véve {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista Rate (Társaság Currency)
 DocType: Account,Temporary,Ideiglenes
 DocType: Address,Preferred Billing Address,Ez legyen a számlázási cím is
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Titkár
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Titkár
 DocType: Serial No,Distinct unit of an Item,Különálló egység Egy tétel
 DocType: Pricing Rule,Buying,Beszerzés
 DocType: HR Settings,Employee Records to be created by,Munkavállalói Records által létrehozandó
@@ -3076,42 +2821,37 @@
 ,Item-wise Price List Rate,Elem-bölcs árjegyzéke Rate
 DocType: Purchase Order Item,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavak lesz látható, ha menteni a stringet."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Vasalás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} megállt
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
 DocType: Lead,Add to calendar on this date,Hozzáadás a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Közelgő események
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ügyfél köteles
-DocType: Letter Head,Letter Head,Levél fejléc
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Gyors bevitel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező Return
 DocType: Purchase Order,To Receive,Kapni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink szerelés
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Bevételek / ráfordítások
 DocType: Employee,Personal Email,Személyes emailcím
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ha engedélyezve van, a rendszer küldeni könyvelési tételek a leltár automatikusan."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Ügynöki jutalék
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Ügynöki jutalék
 DocType: Address,Postal Code,Irányítószám
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","percben Frissítve keresztül ""Idő Log"""
 DocType: Customer,From Lead,Célponttól
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Megrendelések bocsátott termelés.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Válassza ki Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil köteles a POS Entry
 DocType: Hub Settings,Name Token,Név Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Gyalulás
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Normál Ajánló
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Normál Ajánló
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Adni legalább egy raktárban kötelező
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ellen Értékesítési számlák {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Kérjük, adja alapértelmezett mértékegység"
 DocType: Purchase Invoice Item,Project Name,Projekt neve
 DocType: Supplier,Mention if non-standard receivable account,"Beszélve, ha nem szabványos követelések számla"
-DocType: Workflow State,Edit,Szerkesztés
 DocType: Journal Entry Account,If Income or Expense,Ha bevételként vagy ráfordításként
 DocType: Features Setup,Item Batch Nos,Anyag kötegszáma
 DocType: Stock Ledger Entry,Stock Value Difference,Stock értékkülönbözet
@@ -3119,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetési Megbékélés Fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Adó eszközök
 DocType: BOM Item,BOM No,Anyagjegyzék száma
-DocType: Contact Us Settings,Pincode,PIN-kód
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nem veszik {1} vagy már párba utalvány
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami le lesz cserélve mindenhol"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM különböznie kell a jelenlegi állomány UOM
 DocType: Account,Debit,Tartozás
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"A levelek kell felosztani többszörösei 0,5"
 DocType: Production Order,Operation Cost,Üzemeltetési költségek
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Töltsd fel látogatottsága a CSV-fájl
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Kiemelkedő Amt
@@ -3141,10 +2879,7 @@
 DocType: Project,Default Cost Center,Alapértelmezett költségközpont
 DocType: Purchase Invoice,End Date,Határidő
 DocType: Employee,Internal Work History,Belső munka története
-DocType: DocField,Column Break,Oszloptörés
-DocType: Event,Thursday,Csütörtök
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Fordítás
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
 DocType: Sales Invoice,Exhibition,Kiállítás
@@ -3157,31 +2892,30 @@
 DocType: Employee,Held On,Tartott
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Gyártási tétel
 ,Employee Information,Munkavállalói adatok
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ráta (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Ráta (%)
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Üzleti év végén dátuma
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Üzleti év végén dátuma
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja kiszűrni alapján utalvány No, ha csoportosítva utalvány"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Beszállítói ajánlat készítése
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Beszállítói ajánlat készítése
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Csökkentse Megszerezte a fizetés nélküli szabadságon (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Add felhasználók számára, hogy a szervezet, más mint te"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Add felhasználók számára, hogy a szervezet, más mint te"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Alkalmi szabadság
 DocType: Batch,Batch ID,Köteg ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Megjegyzés: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevélen Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ezen a héten összefoglalója
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} kell egy megvásárolt vagy alvállalkozásba tétel sorában {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Fiók: {0} csak akkor lehet frissíteni keresztül részvény tranzakciók
 DocType: GL Entry,Party,Fél
 DocType: Sales Order,Delivery Date,Szállítási dátum
-DocType: DocField,Currency,Pénznem
 DocType: Opportunity,Opportunity Date,Lehetőség dátuma
 DocType: Purchase Receipt,Return Against Purchase Receipt,Return Against vásárlási nyugtát
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Rendezett%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Darabszámra fizetett munka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Darabszámra fizetett munka
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Átlagos vásárlási ráta
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
@@ -3198,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Megvitatni
 DocType: SMS Settings,SMS Settings,SMS beállítások
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Ideiglenes számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Fekete
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Robbanás Elem
 DocType: Account,Auditor,Könyvvizsgáló
 DocType: Purchase Order,End date of current order's period,A befejezés dátuma az aktuális rendelés időszaka
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Tedd Ajánlatot Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Visszatérés
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
-DocType: DocField,Fold,Fold
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Alapértelmezett mértékegysége Variant meg kell egyeznie a Template
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés Operation
 DocType: Pricing Rule,Disable,Tiltva
 DocType: Project Task,Pending Review,Ellenőrzésre vár
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Kérjük, adja meg"
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (via költségelszámolás benyújtás)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Az ügyfél Id
-DocType: Page,Page Name,Oldal név
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Az Idő nagyobbnak kell lennie, mint a Time"
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Vevői {0} nem nyújtják be
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent véve {1} nem Bolong a cég {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Orsó befejező
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","pl. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","pl. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Állomány nem létezik tétel {0} óta van változatok
 ,Sales Person-wise Transaction Summary,Sales Person-bölcs Tranzakciós összefoglalása
-DocType: System Settings,Time Zone,Időzóna
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} nem létezik
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Distribution százalékok
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,A kiválasztott elem nem lehet Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Anyagokat szállított ellen szállítólevél
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Tűzést
 DocType: Customer,Customer Details,Vevő részletek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formálás
 DocType: Employee,Reports to,Jelentések
 DocType: SMS Settings,Enter url parameter for receiver nos,Adja url paraméter vevő nos
 DocType: Sales Invoice,Paid Amount,Fizetett összeg
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Záró Account {0} típusú legyen ""Felelősség"""
 ,Available Stock for Packing Items,Elérhető készlet a csomagoláshoz
 DocType: Item Variant,Item Variant,Elem Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már terhelés, akkor nem szabad beállítani ""egyensúlyt kell"", mint ""Credit"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,A szűrő ügyfélen alapul
 DocType: Payment Tool Detail,Against Voucher No,Ellen betétlapjának
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget tétel {0}"
 DocType: Employee External Work History,Employee External Work History,A munkavállaló korábbi munkahelyei
 DocType: Tax Rule,Purchase,Vásárlás
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Mennyiség
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Mennyiség
 DocType: Item Group,Parent Item Group,Szülőelem Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Költség Centers
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Raktárak.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Raktárak.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Arány, amely szállító valuta konvertálja a vállalkozás székhelyén pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings konfliktusok sora {1}
 DocType: Opportunity,Next Contact,Következő Kapcsolat
 DocType: Employee,Employment Type,Dolgozó típusa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Befektetett eszközök
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Jelentkezési határidő nem lehet az egész két alocation bejegyzések
 DocType: Item Group,Default Expense Account,Alapértelmezett áfás számlát
 DocType: Employee,Notice (days),Figyelmeztetés (nap)
-DocType: Page,Yes,Igen
 DocType: Tax Rule,Sales Tax Template,Forgalmi adó Template
 DocType: Employee,Encashment Date,Beváltás dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanoplasztika
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ellen utalvány típus közül kell Megrendelés, vásárlást igazoló számla vagy Naplókönyvelés"
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Alapértelmezett Tevékenység Költség létezik tevékenység típusa - {0}
 DocType: Production Order,Planned Operating Cost,Tervezett üzemeltetési költség
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Új {0} neve
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Mellékeljük {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Mellékeljük {0} # {1}
 DocType: Job Applicant,Applicant Name,Kérelmező neve
 DocType: Authorization Rule,Customer / Item Name,Vevő / cikknév
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3281,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial No kötelező tétel {0}
 DocType: Item Variant Attribute,Attribute,Tulajdonság
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Kérem adjon meg / a tartomány
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Létrehozta
 DocType: Serial No,Under AMC,ÉKSz időn belül
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Elem értékelési kamatlábat újraszámolják tekintve landolt költsége utalvány összegét
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Alapértelmezett beállítások eladási tranzakciókat.
@@ -3293,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimális összeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Késztermék frissítése
 DocType: Workstation,per hour,óránként
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},{0} sorszám már használva van itt: {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Véve a raktárban (Perpetual Inventory) jön létre e számla.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktár nem lehet törölni a készletek főkönyvi bejegyzés létezik erre a raktárban.
 DocType: Company,Distribution,Nagykereskedelem
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kifizetett Összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekt menedzser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
 DocType: Customer,Default Taxes and Charges,Alapértelmezett adók és illetékek
 DocType: Account,Receivable,Követelés
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Sor # {0}: nem szabad megváltoztatni szállító Megrendelés már létezik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Sor # {0}: nem szabad megváltoztatni szállító Megrendelés már létezik
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Szerepet, amely lehetővé tette, hogy nyújtson be tranzakciók, amelyek meghaladják hitel határértékeket."
 DocType: Sales Invoice,Supplier Reference,Beszállító ajánlása
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ha be van jelölve, BOM a részegység napirendi pontokat a szerzés nyersanyag. Ellenkező esetben minden részegység elemek fogják kezelni, mint a nyersanyag."
@@ -3311,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Eladó Leírás
 DocType: Employee Education,Qualification,Képesítés
 DocType: Item Price,Item Price,Elem ár
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Mosószer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Mosószer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Rendezett
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válassza a Tranzakció
@@ -3321,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Cég hiányát raktárakban {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Készlet mértékegység cserélő
 DocType: POS Profile,Terms and Conditions,Általános Szerződési Feltételek
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},El kellene belüli pénzügyi évben. Feltételezve To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tart fenn magasság, súly, allergia, egészségügyi problémák stb"
@@ -3333,7 +3055,7 @@
 DocType: Sales Order Item,For Production,Termelés
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Kérjük, adja értékesítés érdekében a fenti táblázatban"
 DocType: Project Task,View Task,Kilátás Feladat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,A pénzügyi év kezdete
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,A pénzügyi év kezdete
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Kérjük, adja vásárlás nyugtáinak"
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Hozzáadása / eltávolítása címzettek
@@ -3341,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani a költségvetési évben alapértelmezettként, kattintson a ""Beállítás alapértelmezettként"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Beállítás bejövő kiszolgáló támogatási email id. (Pl support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Hiány Mennyiség
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Elem változat {0} létezik azonos tulajdonságokkal
 DocType: Salary Slip,Salary Slip,Bérlap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Palástcsiszoló
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Időpontig"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Időpontig"" szükséges"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Létrehoz csomagolás kombiné a csomagokat szállítani. Használt értesíteni csomag számát, a doboz tartalma, és a súlya."
 DocType: Sales Invoice Item,Sales Order Item,Vevői Elem
 DocType: Salary Slip,Payment Days,Fizetési Napok
 DocType: BOM,Manage cost of operations,Kezelje a működési költségeket
 DocType: Features Setup,Item Advanced,Elem Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Meleghengerléséhez
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ha bármelyik ellenőrzött tranzakciók ""Beküldő"", egy e-mailt pop-up automatikusan nyílik, hogy küldjön egy e-mailt a kapcsolódó ""Kapcsolat"" hogy ezen ügyletben az ügylet mellékletként. A felhasználó lehet, hogy nem küld e-mailt."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globális beállítások
 DocType: Employee Education,Employee Education,Munkavállaló képzése
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Erre azért van szükség, hogy hozza Termék részletek."
 DocType: Salary Slip,Net Pay,Nettó fizetés
 DocType: Account,Account,Számla
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} már beérkezett
@@ -3363,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Értékesítő csapat részletei
 DocType: Expense Claim,Total Claimed Amount,Összesen követelt összeget
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,A potenciális értékesítési lehetőségeinek.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,A betegszabadság
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Érvénytelen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,A betegszabadság
 DocType: Email Digest,Email Digest,Összefoglaló email
 DocType: Delivery Note,Billing Address Name,Számlázási cím neve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Áruházak
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Rendszer Balance
-DocType: Workflow,Is Active,Aktív?
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Áruházak
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Rendszer Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárak
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Change rövidítése
-DocType: Workflow State,Primary,Elsődleges
 DocType: Expense Claim Detail,Expense Date,Igénylés dátuma
 DocType: Item,Max Discount (%),Max. engedmény (%)
-DocType: Communication,More Information,Több információ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Utolsó megrendelés összege
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Robbantás
 DocType: Company,Warn,Figyelmeztet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Elem értékelési frissítve
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Egyéb megjegyzések, említésre méltó erőfeszítés, hogy menjen a nyilvántartásban."
 DocType: BOM,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Order,Raw Materials Supplied,Szállított alapanyagok
 DocType: Purchase Invoice,Recurring Print Format,Ismétlődő Print Format
-DocType: Communication,Series,Sorszám
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,A Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Elem osztályozás
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Időszak
 ,General Ledger,Főkönyvi számla
@@ -3401,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Ajánlott Reorder Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Kérjük, válassza ki a {0} első"
 DocType: Features Setup,To get Item Group in details table,"Ahhoz, hogy pont csoport adatait tartalmazó táblázatban"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Újrarajzoláskor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} pont {1} lejárt.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Rézkarc
 DocType: Sales Invoice,Commission,Jutalék
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3418,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<H4> Default template </ h4> <p> a <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja-sablonok </a> és valamennyi területen Cím (Custom Fields ha van ilyen) lesz elérhető </ p> <pre> <code> {{address_line1}} & lt; br & gt; {% If address_line2%} {{address_line2}} & lt; br & gt; {% endif -%} {{city}} & lt; br & gt; {%, Ha az állami%} {{állapotban}} & lt; br & gt; {% endif -%} {% if PIN%} PIN: {{PIN}} & lt; br & gt; {% endif -%} {{country}} & lt ; br & gt; {%, Ha telefonon%} Telefon: {{telefonon}} & lt; br & gt; {% endif -%} {% faxon%} Fax: {{Fax}} & lt; br & gt; {% endif -%} {% if email_id %} E-mail: {{email_id}} & lt; br & gt; {% endif -%} </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Alapértelmezett Összeg
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Raktár nem található a rendszerben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Raktár nem található a rendszerben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ebben a hónapban összefoglalója
 DocType: Quality Inspection Reading,Quality Inspection Reading,Minőség-ellenőrzési Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint' kisebbnek kell lennie, mint a nap %-a."
@@ -3437,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Működési idő nagyobbnak kell lennie, mint 0 Operation {0}"
 DocType: Supplier,Address and Contacts,Cím és Kapcsolatok
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Tartsa web barátságos 900px (w) által 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Tartsa web barátságos 900px (w) által 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Termelési hogy nem lehet ellen emelt elemsablont
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtát az olyan áru
 DocType: Payment Tool,Get Outstanding Vouchers,Kiemelkedő utalványok
 DocType: Warranty Claim,Resolved By,Megoldotta
 DocType: Appraisal,Start Date,Kezdés dátuma
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Érték
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Osztja levelek időszakra.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kattintson ide, hogy ellenőrizze"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Account {0}: Nem rendelhet magának szülői fiók
@@ -3453,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő a szállító által szállítani
 DocType: Time Log,Hours,Óra
 DocType: Project,Expected Start Date,Várható indulás dátuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Gördülő
-DocType: ToDo,Priority,Prioritás
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Vegye ki az elemet, ha terheket nem adott elemre alkalmazandó"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox hozzáférés engedélyezve
-DocType: Dropbox Backup,Weekly,Heti
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pl. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Kaphat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Kaphat
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
 DocType: Workstation,Operating Costs,A működési költségek
 DocType: Employee Leave Approver,Employee Leave Approver,Munkavállalói Leave Jóváhagyó
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} sikeresen hozzáadva a hírlevél listán.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nem jelenthetjük, mint elveszett, mert Idézet történt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronsugaras megmunkálás
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Vásárlási mester menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Gyártási rendelés {0} kell benyújtani
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végének dátumát jogcím {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Főbb jelentések
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger bejegyzések egyenlegek frissítve
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Főbb jelentések
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A mai napig nem lehet, mielőtt a dátumot"
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Add / Edit árak
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Add / Edit árak
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Költséghelyek listája
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Saját rendelések
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Saját rendelések
 DocType: Price List,Price List Name,Árlista neve
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Az összesítések
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Az összesítések
 DocType: BOM,Manufacturing,Gyártás
 ,Ordered Items To Be Delivered,Rendelt mennyiség szállításra
 DocType: Account,Income,Jövedelem
-,Setup Wizard,Beállítás varázsló
 DocType: Industry Type,Industry Type,Iparág
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Valami hiba történt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Figyelmeztetés: Hagyjon kérelem tartalmazza a következő blokk húsz óra
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Értékesítési számlák {0} már benyújtott
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Teljesítési dátum
 DocType: Purchase Invoice Item,Amount (Company Currency),Összeg (Társaság Currency)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die Casting
-DocType: Email Alert,Reference Date,Referencia dátuma
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Szervezeti egység (osztály) mestere.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Adjon meg egy érvényes mobil nos
 DocType: Budget Detail,Budget Detail,Költségkeret részlete
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Kérjük, adja üzenet elküldése előtt"
-DocType: Async Task,Status,Állapot
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM frissített jogcím {0}
-DocType: Company History,Year,Év
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Kérjük, frissítsd SMS beállítások"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,A(z) {0} időnapló már számlázva van
@@ -3514,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Sorozatszám karbantartási szerződés lejárati ideje
 DocType: Item,Unit of Measure Conversion,Mértékegység átváltás
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nem változtatható meg a munkavállaló
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
 DocType: Naming Series,Help HTML,Súgó HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen weightage kijelölt kell 100%. Ez {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Engedmény a túl- {0} keresztbe jogcím {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ezt a címet tartozik."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ön Szállítók
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Ön Szállítók
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani elveszett Sales elrendelése esetén.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Egy másik bérszerkeztet {0} aktív munkavállalói {1}. Kérjük, hogy az állapota ""inaktív"" a folytatáshoz."
 DocType: Purchase Invoice,Contact,Kapcsolat
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Feladó
 DocType: Features Setup,Exports,Export
 DocType: Lead,Converted,Átalakított
 DocType: Item,Has Serial No,Lesz sorozatszáma?
 DocType: Employee,Date of Issue,Probléma dátuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A {0} az {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Sor # {0}: Állítsa Szállító jogcím {1}
 DocType: Issue,Content Type,Tartalom típusa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Számítógép
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezt a tárgyat több csoportban a honlapon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze Több pénznem opciót, hogy számláikat más pénznemben"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Cikk: {0} nem létezik a rendszerben
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ön nem jogosult a beállított értéket Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Nem egyeztetett bejegyzés
 DocType: Cost Center,Budgets,Költségvetési
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Frissítve
 DocType: Employee,Emergency Contact Details,Sürgősségi Elérhetőségek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Mit csinál?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Mit csinál?
 DocType: Delivery Note,To Warehouse,Raktárba
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Account {0} adta meg többször költségvetési évben {1}
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Jelenlétit nem lehet megjelölni a jövőbeli időpontokban
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Frissítse többletköltségek kiszámítására landolt bekerülési
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
-DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Out - A)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektromos
+DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Out - A)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Sor {0}: árfolyam kötelező
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Felhasználói azonosító nem állította be az Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kikalapálás
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Re jótállási igény
 DocType: Stock Entry,Default Source Warehouse,Alapértelmezett raktár
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Születésnapi emlékeztető {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lappolás
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Napok óta utolsó rendelés
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Napok óta utolsó rendelés
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Megterhelése figyelembe kell egy Mérlegszámla
 DocType: Buying Settings,Naming Series,Sorszámozási csoport
 DocType: Leave Block List,Leave Block List Name,Hagyja Block List név
-DocType: User,Enabled,Engedélyezve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Eszközök
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Szeretné benyújtani minden fizetés Slip a hónapban {0} és az év {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import előfizetők
@@ -3570,19 +3265,18 @@
 DocType: Attendance,Present,Jelen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Szállítólevélen {0} nem kell benyújtani
 DocType: Notification Control,Sales Invoice Message,Értékesítési számlák Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záró számla {0} típusú legyen kötelezettség / saját tőke
 DocType: Authorization Rule,Based On,Alapuló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Elem {0} van tiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Elem {0} van tiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Közötti időszakra, és időszakról kilenc óra kötelező visszatérő {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekt feladatok és tevékenységek.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Bérlap generálása
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nem érvényes e-mail id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Vásárlási ellenőrizni kell, amennyiben alkalmazható a kiválasztott {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"A kedvezménynek kisebbnek kell lennie, mint 100"
-DocType: ToDo,Low,Alacsony
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Kérjük, állítsa {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
@@ -3604,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampány név szükséges
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Receipt Item,Rejected Serial No,Elutasított sorozatszám
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Mélyhúzó
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Új hírlevél
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Kezdési időpont kisebbnek kell lennie, mint végső dátumát tétel {0}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mutasd Balance
@@ -3614,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mennyiség van szükség
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing tartomány 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Összeg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Szegecselő
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék cserélve
 ,Sales Analytics,Értékesítési analítika
 DocType: Manufacturing Settings,Manufacturing Settings,Gyártás Beállítások
@@ -3626,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
 DocType: Selling Settings,Settings for Selling Module,Beállítások Értékesítés modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Ügyfélszolgálat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Ügyfélszolgálat
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Az elem vevőjének részletei
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Erősítse Ön e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ajánlat jelölt munkát.
 DocType: Notification Control,Prompt for Email on Submission of,Kérjen Email benyújtása
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Összes elkülönített levelek több mint nap közötti időszakban
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elem {0} kell lennie Stock tétel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett a Folyamatban Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Alapértelmezett beállításokat számviteli tranzakciók.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} szükséges
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vákuum öntés
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Várható időpontja nem lehet korábbi Material igénylés dátuma
-DocType: Contact Us Settings,City,Város
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrahangos megmunkálás
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hiba: Nem érvényes id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elem {0} kell lennie Sales tétel
 DocType: Naming Series,Update Series Number,Sorszám frissítése
 DocType: Account,Equity,Méltányosság
 DocType: Sales Order,Printing Details,Nyomtatási Részletek
 DocType: Task,Closing Date,Benyújtási határidő
 DocType: Sales Order Item,Produced Quantity,"A termelt mennyiség,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mérnök
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mérnök
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Keresés részegységek
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Tételkód szükség Row {0}
 DocType: Sales Partner,Partner Type,Partner típusa
@@ -3655,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Kedvezmény
 DocType: Purchase Invoice,Against Expense Account,Ellen áfás számlát
 DocType: Production Order,Production Order,Gyártásrendelés
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Telepítési feljegyzés {0} már benyújtott
 DocType: Quotation Item,Against Docname,Ellen Docname
 DocType: SMS Center,All Employee (Active),Minden dolgozó (Aktív)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Tekintse meg most
@@ -3663,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Nyersanyagköltsége
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Adja tételek és tervezett Mennyiség amelynek meg szeretné emelni a gyártási megrendeléseket, vagy töltse le a nyersanyagok elemzésre."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Részidős
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Részidős
 DocType: Employee,Applicable Holiday List,Alkalmazható Nyaralás listája
 DocType: Employee,Cheque,Csekk
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Sorozat Frissítve
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type kötelező
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Sorozatszám sorozat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse kötelező Stock tétel {0} sorban {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása Elem több csoportban
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Az első felhasználó: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Az első felhasználó: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátuma és a pénzügyi év vége dátum már meghatározták Fiscal Year {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Sikeresen Egyeztetett
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Production Order,Planned End Date,Tervezett befejezési dátuma
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Tax Rule,Validity,Érvényességi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Számlázott összeg
 DocType: Attendance,Attendance,Jelenléti
-DocType: Page,No,Nem
 DocType: BOM,Materials,Anyagok
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
@@ -3690,55 +3376,46 @@
 ,Item Prices,Elem árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,A szavak lesz látható mentése után a megrendelés.
 DocType: Period Closing Voucher,Period Closing Voucher,Időszak lezárása utalvány
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Árlista mester.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Árlista mester.
 DocType: Task,Review Date,Vélemény dátuma
 DocType: Purchase Invoice,Advance Payments,Előzetes kifizetések
-DocType: DocPerm,Level,Szint
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Cél raktár sorban {0} meg kell egyeznie a gyártási utasítás
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődő% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Marás
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nincs joga felhasználni fizetési eszköz
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődő% s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Valuta nem lehet változtatni, miután bejegyzések segítségével más pénznemben"
 DocType: Company,Round Off Account,Fejezze ki Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Harapni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Igazgatási költségek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tanácsadó
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tanácsadó
 DocType: Customer Group,Parent Customer Group,Szülő Vásárlói csoport
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Változás
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Felmondási idő
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","pl. ""Cégem Kft."""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Felmondási idő
 DocType: Bank Reconciliation Detail,Voucher ID,Utalvány ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"Ez egy gyökér területén, és nem lehet szerkeszteni."
 DocType: Packing Slip,Gross Weight UOM,Bruttó tömeg mértékegysége
 DocType: Email Digest,Receivables / Payables,Követelések / Kötelezettségek
 DocType: Delivery Note Item,Against Sales Invoice,Ellen Értékesítési számlák
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Bélyegzés
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Hitelszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mutasd a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség pont után kapott gyártási / visszacsomagolásánál a megadott alapanyagok mennyiségét,"
 DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Account
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői Elem
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Kérjük, adja Jellemző értéke az attribútum {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 DocType: Task,Actual End Date (via Time Logs),Tényleges End Date (via Idő Napló)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet rendelni ellen Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Kérjük, adja szülő költséghely"
 DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Adó kategóriák nem lehet az ""Értékelés"" vagy ""Értékelési és Total"", mint az összes elem nincsenek raktáron tételek"
-DocType: User,Last Name,Keresztnév
-DocType: Web Page,Left,Elment
-DocType: Event,All Day,Minden nap
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Adó kategóriák nem lehet az ""Értékelés"" vagy ""Értékelési és Total"", mint az összes elem nincsenek raktáron tételek"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
-DocType: Contact Us Settings,State,Állapot
 DocType: Batch,Batch,Köteg
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Egyensúly
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Egyensúly
 DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (via költségtérítési igényeket)
-DocType: User,Gender,Neme
 DocType: Journal Entry,Debit Note,Terhelési értesítő
 DocType: Stock Entry,As per Stock UOM,Mivel a per Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nem járt le
@@ -3752,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Készítse szabályok korlátozzák ügyletek alapján értékek.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a Total sem. munkanapok tartalmazza ünnepek, és ez csökkenti az értékét Fizetés Per Day"
 DocType: Purchase Invoice,Total Advance,Összesen Advance
-DocType: Workflow State,User,Használó
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Feldolgozás bérszámfejtés
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,A hitel összege
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Beállítás Elveszett
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Fizetési átvétele Megjegyzés
 DocType: Customer,Credit Days Based On,"Hitel napokon, attól függően"
 DocType: Tax Rule,Tax Rule,Adójogszabály-
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Fenntartani azonos ütemben Egész értékesítési ciklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Tervezze idő naplók kívül Workstation munkaidő.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} már benyújtott
 ,Items To Be Requested,Tételek kell kérni
-DocType: Purchase Order,Get Last Purchase Rate,Kap Utolsó Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Díjszabás alapján tevékenység típusa (óránként)
 DocType: Company,Company Info,Cégadatok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Szegélyterület
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Cég E-mail ID nem található, így a levél nem ment"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),A vagyon (eszközök)
 DocType: Production Planning Tool,Filter based on item,A szűrő cikken alapul
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Betéti Számla
 DocType: Fiscal Year,Year Start Date,Év Start Date
 DocType: Attendance,Employee Name,Munkavállalói név
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nem burkolt csoporthoz, mert Account Type választja."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nem burkolt csoporthoz, mert Account Type választja."
 DocType: Purchase Common,Purchase Common,Vásárlási Közös
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Állj felhasználók abban, hogy Leave Alkalmazások következő napokon."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,A lehetőségektől
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Kivágó
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Munkavállalói juttatások
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiséget kell egyezniük a mennyiséget tétel {0} sorban {1}
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills emelte az ügyfelek számára.
-DocType: DocField,Default,Alapértelmezett
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt azonosító
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} előfizetők hozzá
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Adjuk költségvetés erre a költséghely. Beállításához költségvetésű akció, lásd a &quot;Társaság List&quot;"
@@ -3800,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,"Árlista nem található, vagy a fogyatékkal"
 DocType: Expense Claim,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Munkavállalói megkönnyebbült {0} kell beállítani -Bal-
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Igen"" ad egy egyedi azonosító, hogy minden entitás ez a tétel, amely megtekinthető a Serial No mester."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Értékelési {0} létre Employee {1} az adott időpontban tartományban
 DocType: Employee,Education,Oktatás
 DocType: Selling Settings,Campaign Naming By,Kampány Elnevezése a
 DocType: Employee,Current Address Is,Jelenlegi cím
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznem, ha nincs megadva."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznem, ha nincs megadva."
 DocType: Address,Office,Iroda
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Általános jelentések
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Számviteli naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a raktárról
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Kérjük, válassza ki a dolgozó Record első."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Party / fiók nem egyezik {1} / {2} a {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Hogy hozzon létre egy adószámlára
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Kérjük, adja áfás számlát"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Kérjük, adja áfás számlát"
 DocType: Account,Stock,Készlet
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha az elem egy változata egy másik elemet, majd leírás, kép, árképzés, adók stb lesz állítva a sablont Ha kifejezetten nincs"
 DocType: Serial No,Purchase / Manufacture Details,Vásárlás / gyártása Részletek
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,A szerződés End Date
 DocType: Sales Order,Track this Sales Order against any Project,Kövesse nyomon ezt a Vevői ellen Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull megrendelések (folyamatban szállítani) alapján a fenti kritériumok
-DocType: DocShare,Document Type,Dokumentum típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,A beszállító Idézet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,A beszállító Idézet
 DocType: Deduction Type,Deduction Type,Levonás típusa
 DocType: Attendance,Half Day,Félnapos
 DocType: Pricing Rule,Min Qty,Min. menny.
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Hogy nyomon tételek értékesítési és beszerzési dokumentumok kötegelt nos. &quot;Előnyben Ipar: Vegyi&quot;
 DocType: GL Entry,Transaction Date,Ügylet dátuma
 DocType: Production Plan Item,Planned Qty,Tervezett Mennyiség
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Összes adó
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Összes adó
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Mert Mennyiség (gyártott db) kötelező
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (a cég pénznemében)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party típusa és fél csak akkor alkalmazható elleni követelések / fiók
 DocType: Notification Control,Purchase Receipt Message,Vásárlási nyugta Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Összes elkülönített levelek több mint időszakban
 DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Anyagokat szállított ellen Vevői
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record elem mozgását.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Hírlevél előfizető
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Csaplyukvéső
-DocType: Email Account,Service,Szolgáltatás
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,A bruttó árrés %
 DocType: BOM,With Operations,Műveletek is
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént készpénzzel {0} {1} cég. Kérjük, válasszon járó vagy fizetendő számla valuta {0}."
 ,Monthly Salary Register,Havi fizetés Regisztráció
-apps/frappe/frappe/website/template.py +140,Next,Következő
 DocType: Warranty Claim,If different than customer address,"Ha más, mint megrendelő címét"
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolírozás
 DocType: Purchase Taxes and Charges,On Previous Row Amount,On előző sor összege
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Kérjük, adja fizetési összeget adni legalább egy sorban"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Kérjük, adja fizetési összeget adni legalább egy sorban"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezésekor, célok stb"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Row {0}: kifizetés összege nem lehet nagyobb, mint fennálló összeg"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Összesen Kifizetetlen
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Összesen Kifizetetlen
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Időnapló nem számlázható
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Elem {0} egy olyan sablon, kérjük, válasszon variánsai"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Vásárló
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Vásárló
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettó fizetés nem lehet negatív
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Kérjük, adja meg Against utalványok kézzel"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Kérjük, adja meg Against utalványok kézzel"
 DocType: SMS Settings,Static Parameters,Statikus paraméterek
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Az anyag adójának típusa
@@ -3872,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Küldd tömeges SMS-ben a kapcsolatot
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fontolja adó vagy illeték
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség kötelező
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Határon gördülő
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Hitelkártya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Hitelkártya
 DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciók.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciók.
 DocType: Purchase Invoice,Next Date,Következő dátum
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja adók és illetékek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Megmunkálás
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tart fenn a családi részleteket, mint a neve és foglalkozása szülő, házastárs és a gyermekek"
 DocType: Hub Settings,Seller Name,Értékesítő neve
@@ -3889,47 +3553,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Meg kell menteni a formában a folytatás előtt
 DocType: Item Attribute,Numeric Values,Numerikus értékek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo csatolása
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Logo csatolása
 DocType: Customer,Commission Rate,Jutalék mértéke
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Győződjön Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blokk szabadság alkalmazások osztály.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,A kosár üres
 DocType: Production Order,Actual Operating Cost,Tényleges működési költség
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root nem lehet szerkeszteni.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,"Az elkülönített összeg nem lehet nagyobb, mint a kiigazítatlan összeg"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nem lehet szerkeszteni.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,"Az elkülönített összeg nem lehet nagyobb, mint a kiigazítatlan összeg"
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése ünnepnapokon
 DocType: Sales Order,Customer's Purchase Order Date,A Vevő rendelésének dátuma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Válasszon egy csv fájlt
-DocType: Dropbox Backup,Send Backups to Dropbox,Küldje Biztonsági mentés Dropbox
 DocType: Purchase Order,To Receive and Bill,Fogadására és Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Tervező
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tervező
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Költség Center szükséges sorában {0} adók táblázat típusú {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikusan létrehozza Anyag kérése esetén mennyiséget megadott szint alá esik
 ,Item-wise Purchase Register,Elem-bölcs vásárlása Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Beállításához újrarendezésből szinten elemet kell a vásárlást pont vagy a gyártási tétel
 ,Supplier Addresses and Contacts,Szállító Címek és Kapcsolatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Kérjük, válasszon Kategória első"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem mutatnak szimbólum, mint $$ etc mellett valuták."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Credit Napok
 DocType: Leave Type,Is Carry Forward,Van átviszi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Elemek áthozása Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Elemek áthozása Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Átfutási idő napokban
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Darabjegyzékben
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party típusa és fél köteles a követelések / fiók {1}
-DocType: Dropbox Backup,Send Notifications To,Értesítést küld
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref dátuma
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref dátuma
 DocType: Employee,Reason for Leaving,Kilépés indoka
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Nyit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Account {0} nem létezik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Account {0} nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz honlap és egyéb kiadványok.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Kérjük, hozzon létre bérszerkeztet munkavállalói {0}"

diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index bb03017..5a4f036 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modus Gaji
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Pilih Distribusi Bulanan, jika Anda ingin melacak berdasarkan musim."
 DocType: Employee,Divorced,Bercerai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Peringatan: Sama item telah memasuki beberapa kali.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item yang sudah disinkronkan
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Barang yang akan ditambahkan beberapa kali dalam suatu transaksi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produk Konsumen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Konsumen
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Silakan pilih Partai Jenis pertama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Anil
 DocType: Item,Customer Items,Produk Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
 DocType: Item,Publish Item to hub.erpnext.com,Publikasikan Item untuk hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Tinggalkan yang menyetujui
 DocType: Sales Partner,Dealer,Dealer (Pelaku)
 DocType: Employee,Rented,Sewaan
-DocType: About Us Settings,Website,Situs Web
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Orde Produksi tidak dapat dibatalkan, unstop pertama untuk membatalkan"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Pemadatan ditambah sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
 DocType: Purchase Order,Customer Contact,Kontak Pelanggan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Dari Material Permintaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Dari Material Permintaan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Pemohon Job
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tidak ada lagi hasil.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Hukum
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Hukum
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Jenis pajak yang sebenarnya tidak dapat dimasukkan dalam tingkat Barang berturut-turut {0}
 DocType: C-Form,Customer,Layanan Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan Oleh
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Bawaan 10 menit
 DocType: Leave Type,Leave Type Name,Tinggalkan Type Nama
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Diperbarui Berhasil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Jahitan
 DocType: Pricing Rule,Apply On,Terapkan Pada
 DocType: Item Price,Multiple Item prices.,Multiple Item harga.
 ,Purchase Order Items To Be Received,Purchase Order Items Akan Diterima
 DocType: SMS Center,All Supplier Contact,Kontak semua pemasok
 DocType: Quality Inspection Reading,Parameter,{0}Para{/0}{1}me{/1}{0}ter{/0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Tinggalkan Aplikasi Baru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Tinggalkan Aplikasi Baru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.5. Untuk menjaga pelanggan bijaksana kode barang dan membuat mereka dicari berdasarkan penggunaan kode mereka pilihan ini
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Rekening Pembayaran
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Tampilkan Varian
-DocType: Sales Invoice Item,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kuantitas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Dalam Persediaan
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Rencana Produksi Barang
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Membuat baru Profil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Perawatan Kesehatan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Perawatan Kesehatan
 DocType: Purchase Invoice,Monthly,Bulanan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Keterlambatan pembayaran (Hari)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Masa haid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Alamat Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Pertahanan
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Company,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Kendaraan yang
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Silakan pilih Daftar Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Woodworking
 DocType: Production Order Operation,Work In Progress,Bekerja In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Pencetakan 3D
 DocType: Employee,Holiday List,Liburan List
 DocType: Time Log,Time Log,Waktu Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Akuntan
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Akuntan
 DocType: Cost Center,Stock User,Bursa Pengguna
 DocType: Company,Phone No,Telepon yang
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Kegiatan yang dilakukan oleh pengguna terhadap Tugas yang dapat digunakan untuk waktu pelacakan, penagihan."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Baru {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Baru {0}: # {1}
 ,Sales Partners Commission,Penjualan Mitra Komisi
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Singkatan tidak dapat melebihi 5 karakter
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribut Nilai {0} tidak dapat dihapus dari {1} sebagai Barang Varian \ eksis dengan Atribut ini.
-DocType: Print Settings,Classic,Klasik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Ini adalah account root dan tidak dapat diedit.
 DocType: BOM,Operations,Operasi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak dapat mengatur otorisasi atas dasar Diskon untuk {0}
 DocType: Bin,Quantity Requested for Purchase,Kuantitas Diminta Pembelian
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Melampirkan file .csv dengan dua kolom, satu untuk nama lama dan satu untuk nama baru"
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Membuka untuk Job.
 DocType: Item Attribute,Increment,Kenaikan
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Pilih Gudang ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Periklanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Periklanan
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Perusahaan yang sama dimasukkan lebih dari sekali
 DocType: Employee,Married,Belum Menikah
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak diizinkan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Toko bahan makanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko bahan makanan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Membuat Bank Masuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Dana pensiun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis account adalah Gudang
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Periksa apakah urutan berulang, hapus centang untuk menghentikan berulang atau meletakkan tepat Tanggal Berakhir"
@@ -118,50 +113,45 @@
 DocType: Account,Credit,Piutang
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Silahkan pengaturan Penamaan Sistem Karyawan di Sumber Daya Manusia> Pengaturan SDM
 DocType: POS Profile,Write Off Cost Center,Menulis Off Biaya Pusat
-DocType: Warehouse,Warehouse Detail,Detil Gudang 
+DocType: Warehouse,Warehouse Detail,Detil Gudang
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk pelanggan {0} {1} / {2}
 DocType: Tax Rule,Tax Type,Jenis pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
 DocType: Item,Item Image (if not slideshow),Barang Gambar (jika tidak slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Sebuah Pelanggan ada dengan nama yang sama
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Nilai per Jam / 60) * Waktu Operasi Sebenarnya
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif per Jam / 60) * Waktu Operasi Sebenarnya
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Biaya Produk Disampaikan
-DocType: Blog Post,Guest,Tamu
 DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Detail
 DocType: Lead,Interested,Tertarik
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} ke {1}
 DocType: Item,Copy From Item Group,Salin Dari Barang Grup
 DocType: Journal Entry,Opening Entry,Membuka Entri
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} adalah wajib
 DocType: Stock Entry,Additional Costs,Biaya tambahan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Lead,Product Enquiry,Enquiry Produk
-DocType: Standard Reply,Owner,Pemilik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Silahkan masukkan perusahaan pertama
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Silakan pilih Perusahaan pertama
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran On
 DocType: BOM,Total Cost,Total Biaya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktivitas:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Pernyataan Rekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
 DocType: Expense Claim Detail,Claim Amount,Klaim Jumlah
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,Client (Nasabah)
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Pemasok Type / Pemasok
 DocType: Naming Series,Prefix,Awalan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumable
 DocType: Upload Attendance,Import Log,Impor Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Kirim
 DocType: Sales Invoice Item,Delivered By Supplier,Disampaikan Oleh Pemasok
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Beban saham
 DocType: Newsletter,Email Sent?,Email Terkirim?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Log
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
 DocType: Delivery Note,Installation Status,Status Instalasi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Bahan pasokan baku untuk Pembelian
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} harus Pembelian Barang
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Semua tanggal dan karyawan kombinasi dalam jangka waktu yang dipilih akan datang dalam template, dengan catatan kehadiran yang ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan diperbarui setelah Faktur Penjualan yang Dikirim.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Barang, pajak dalam baris {1} juga harus disertakan"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Meluruskan
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Waktu Log untuk Penagihan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Pengecoran Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter telah terkirim
 DocType: Lead,Request Type,Permintaan Type
 DocType: Leave Application,Reason,Alasan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Penyiaran
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Eksekusi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pengguna pertama akan menjadi System Manager (Anda dapat mengubah ini nanti).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Eksekusi
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pengguna pertama akan menjadi System Manager (Anda dapat mengubah ini nanti).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Rincian operasi yang dilakukan.
 DocType: Serial No,Maintenance Status,Status pemeliharaan
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Item dan Harga
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Item dan Harga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Pilih Karyawan untuk siapa Anda menciptakan Appraisal.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Biaya Pusat {0} bukan milik Perusahaan {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Harga List harus berlaku untuk Membeli atau Jual
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Tanggal instalasi tidak bisa sebelum tanggal pengiriman untuk Item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Diskon Harga Daftar Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Mulai
-DocType: User,First Name,Nama Depan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pengecoran penuh cetakan
 DocType: Offer Letter,Select Terms and Conditions,Pilih Syarat dan Ketentuan
 DocType: Production Planning Tool,Sales Orders,Penjualan Pesanan
 DocType: Purchase Taxes and Charges,Valuation,Valuation
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Bank Account/Rekening Bank
 DocType: Leave Type,Allow Negative Balance,Izinkan Saldo Negatif
 DocType: Selling Settings,Default Territory,Wilayah standar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisi
 DocType: Production Order Operation,Updated via 'Time Log',Diperbarui melalui 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akun {0} bukan milik Perusahaan {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Sales Invoice,Is Opening Entry,Apakah Masuk Membuka
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika non-standar piutang yang berlaku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Pada diterima
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Masukkan Perusahaan
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Penjualan Faktur Barang
 ,Production Orders in Progress,Pesanan produksi di Progress
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak terpakai dari alokasi sebelumnya
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
 DocType: Newsletter List,Total Subscribers,Jumlah Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nama Kontak
+,Contact Name,Nama Kontak
 DocType: Production Plan Item,SO Pending Qty,SO Pending Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Permintaan pembelian.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Perumahan ganda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Daun per Tahun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Daun per Tahun
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Silakan set Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Penamaan Seri
 DocType: Time Log,Will be updated when batched.,Akan diperbarui bila batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
-DocType: Bulk Email,Message,Pesan
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referensi Tidak
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Tinggalkan Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Tahunan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Tinggalkan Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Barang
 DocType: Stock Entry,Sales Invoice No,Penjualan Faktur ada
 DocType: Material Request Item,Min Order Qty,Min Order Qty
 DocType: Lead,Do Not Contact,Jangan Hubungi
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id yang unik untuk melacak semua tagihan berulang. Hal ini dihasilkan di submit.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Pemasok Type
 DocType: Item,Publish in Hub,Publikasikan di Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
 DocType: Item,Purchase Details,Rincian pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam &#39;Bahan Baku Disediakan&#39; tabel dalam Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Kawat menyikat
 DocType: Employee,Relation,Hubungan
 DocType: Shipping Rule,Worldwide Shipping,Pengiriman seluruh dunia
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Dikonfirmasi pesanan dari pelanggan.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Ponsel Nomor
 DocType: Maintenance Schedule,Generate Schedule,Menghasilkan Jadwal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Beban Kepala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Silakan pilih Mengisi Tipe pertama
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terbaru
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Pilih Bahasa Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karakter
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti pertama dalam daftar akan ditetapkan sebagai default Tinggalkan Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Menonaktifkan penciptaan log waktu terhadap Pesanan Produksi. Operasi tidak akan dilacak terhadap Orde Produksi
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Varian Of
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} harus Layanan Barang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Industri'
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Pengeboran Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Menutup Akun Kepala
 DocType: Employee,External Work History,Eksternal Sejarah Kerja
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Referensi Kesalahan melingkar
-DocType: Communication,Closed,Tertutup
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Kata-kata (Ekspor) akan terlihat sekali Anda menyimpan Delivery Note.
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profil Job
 DocType: Newsletter,Newsletter,Laporan berkala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui Email pada penciptaan Permintaan Bahan otomatis
 DocType: Journal Entry,Multi Currency,Multi Currency
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item diperbarui
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Invoice Type
 DocType: Sales Invoice Item,Delivery Note,Pengiriman Note
-DocType: Dropbox Backup,Allow Dropbox Access,Izinkan Akses Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menyiapkan Pajak
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Masuk pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Masuk pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Workstation,Rent Cost,Sewa Biaya
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Silakan pilih bulan dan tahun
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Perusahaan Email
 DocType: GL Entry,Debit Amount in Account Currency,Jumlah debit di Akun Mata Uang
 DocType: Shipping Rule,Valid for Countries,Berlaku untuk Negara
-DocType: Workflow State,Refresh,Segarkan
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Semua data berkaitan dengan impor seperti mata uang, nilai tukar, total ekspor, nilai total ekspor dll. terdapat di Nota Pengiriman, POS, Penawaran Quotation, Fatkur Penjualan, Order Penjualan, dll."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total Orde Dianggap
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Masukkan 'Ulangi pada Hari Bulan' nilai bidang
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Masukkan 'Ulangi pada Hari Bulan' nilai bidang
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Pelanggan Mata Uang dikonversi ke mata uang dasar pelanggan
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tersedia dalam BOM, Pengiriman Catatan, Purchase Invoice, Pesanan Produksi, Purchase Order, Penerimaan Pembelian, Faktur Penjualan, Sales Order, Stock Masuk, Timesheet"
 DocType: Item Tax,Tax Rate,Tarif Pajak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Pilih Barang
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Pilih Barang
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} berhasil batch-bijaksana, tidak dapat didamaikan dengan menggunakan \
  Stock Rekonsiliasi, bukan menggunakan Stock Masuk"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Purchase Invoice {0} sudah disampaikan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pembelian Penerimaan harus diserahkan
-DocType: Stock UOM Replace Utility,Current Stock UOM,Stok saat ini UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat email Anda
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Silakan lihat lampiran
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Air jet cutting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Pengaturan Sudah Selesai!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Pengaturan Sudah Selesai!!
 ,Finished Goods,Barang Jadi
 DocType: Delivery Note,Instructions,Instruksi
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Mohon TIDAK membuat Account untuk Pelanggan dan Pemasok. Mereka dibuat langsung dari Nasabah / Pemasok master.
 DocType: Currency Exchange,Currency Exchange,Kurs Mata Uang
 DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Authorization Rule,Approving User  (above authorized value),Menyetujui Pengguna (di atas nilai yang berwenang)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredit
 DocType: Employee,Widowed,Janda
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Item harus diminta yang ""Out of Stock"" mengingat semua gudang berdasarkan qty diproyeksikan dan pesanan minimum qty"
@@ -380,22 +348,21 @@
 ,Purchase Register,Pembelian Register
 DocType: Landed Cost Item,Applicable Charges,Biaya yang berlaku
 DocType: Workstation,Consumable Cost,Biaya Consumable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
 DocType: Purchase Receipt,Vehicle Date,Kendaraan Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medis
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Alasan untuk kehilangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tabung manik-manik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Liburan Daftar: {0}
 DocType: Employee,Single,Tunggal
 DocType: Issue,Attachment,Lampiran
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Anggaran tidak dapat ditetapkan untuk kelompok Biaya Pusat
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
 DocType: Purchase Invoice,Yearly,Tahunan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Masukkan Biaya Pusat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Masukkan Biaya Pusat
 DocType: Journal Entry Account,Sales Order,Sales Order
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Jual Tingkat
 DocType: Purchase Order,Start date of current order's period,Tanggal periode pesanan saat ini mulai
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Kuantitas tidak bisa menjadi fraksi di baris {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Kuantitas tidak bisa menjadi fraksi di baris {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Jumlah dan Tingkat
 DocType: Delivery Note,% Installed,% Terpasang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Silahkan masukkan nama perusahaan pertama
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Apakah Grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatis Set Serial Nos berdasarkan FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa Pemasok Faktur Nomor Keunikan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Menggorok
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Sampai Kasus No.' tidak bisa kurang dari 'Dari Kasus No.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Tidak Dimulai
 DocType: Lead,Channel Partner,Mitra Channel
 DocType: Account,Old Parent,Induk tua
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master Holiday.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Masukkan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Masukkan Item Code.
 DocType: BOM,Costing,Biaya
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika dicentang, jumlah pajak akan dianggap sebagai sudah termasuk dalam Jumlah Tingkat Cetak / Print"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Berkisar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek dan Deposit
 DocType: Features Setup,Imports,Impor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ikatan perekat
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah daun dialokasikan adalah wajib
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Kegiatan tertunda untuk hari ini
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Catatan kehadiran.
 DocType: Bank Reconciliation,Journal Entries,Entries Journal
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
-DocType: System Settings,Loading...,Memuat...
-DocType: DocField,Password,Kata sandi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Pemodelan deposisi menyatu
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu Antara Operasi (di menit)
 DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Jasa.
 DocType: Journal Entry,Accounts Payable,Hutang
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tambahkan Pelanggan
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Tidak ada"
 DocType: Pricing Rule,Valid Upto,Valid Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan Anda. Mereka bisa menjadi organisasi atau individu.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Penghasilan Langsung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Petugas Administrasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Petugas Administrasi
 DocType: Payment Tool,Received Or Paid,Diterima Atau Dibayar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry,Difference Account,Perbedaan Akun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Masukkan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Biaya Operasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetik
-DocType: DocField,Type,Jenis
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
-DocType: Communication,Subject,Perihal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Darurat Telepon
 ,Serial No Warranty Expiry,Serial No Garansi kadaluarsa
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Barang
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Mengelola Subkontrak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM TIDAK harus dari jenis Whole Number
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Mengelola Subkontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Furniture dan Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} tidak Pembelian Barang
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} adalah alamat email yang tidak valid dalam 'Pemberitahuan \
  Alamat Email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Total Penagihan Tahun ini:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total Penagihan Tahun ini:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Purchase Invoice,Supplier Invoice No,Pemasok Faktur ada
 DocType: Territory,For reference,Untuk referensi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat menghapus Serial ada {0}, seperti yang digunakan dalam transaksi saham"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Penutup (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Penutup (Cr)
 DocType: Serial No,Warranty Period (Days),Masa Garansi (Hari)
 DocType: Installation Note Item,Installation Note Item,Instalasi Catatan Barang
 ,Pending Qty,Tertunda Qty
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Mengabaikan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pemasok Gudang wajib untuk Pembelian Penerimaan sub-kontrak
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pemasok Gudang wajib untuk Pembelian Penerimaan sub-kontrak
 DocType: Pricing Rule,Valid From,Valid Dari
 DocType: Sales Invoice,Total Commission,Jumlah Komisi
 DocType: Pricing Rule,Sales Partner,Penjualan Mitra
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribusi Bulanan ** membantu Anda mendistribusikan anggaran di bulan jika Anda memiliki musiman dalam bisnis Anda.
 
  Untuk mendistribusikan anggaran menggunakan distribusi ini, mengatur Distribusi Bulanan ** ini ** di ** Biaya Pusat **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Keuangan / akuntansi tahun.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Proyek Tugas
 ,Lead Id,Timbal Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun Anggaran Tanggal Mulai tidak boleh lebih besar dari Fiscal Year End Tanggal
 DocType: Warranty Claim,Resolution,Resolusi
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Disampaikan: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Penagihan dan Pengiriman Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulangi Pelanggan
 DocType: Leave Control Panel,Allocate,Alokasi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Sebelumnya
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Penjualan Kembali
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Pilih Penjualan Pesanan dari mana Anda ingin membuat Pesanan Produksi.
 DocType: Item,Delivered by Supplier (Drop Ship),Disampaikan oleh Pemasok (Drop Kapal)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponen gaji.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database pelanggan potensial.
+DocType: Authorization Rule,Customer or Item,Pelanggan atau Barang
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database pelanggan.
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Tengah
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena Anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru menggunakan default UOM berbeda.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 DocType: Purchase Order Item,Billed Amt,Jumlah tagihan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri saham yang dibuat.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
-DocType: Event,Wednesday,Rabu
 DocType: Sales Invoice,Customer's Vendor,Penjual Nasabah
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksi Order adalah Wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Proposal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Proposal
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Lain Penjualan Person {0} ada dengan id Karyawan yang sama
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Kesalahan Stock negatif ({6}) untuk Item {0} Gudang {1} di {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskal Tahun Perusahaan
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Standar Biaya Tingkat
 DocType: Maintenance Schedule,Maintenance Schedule,Jadwal pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Kemudian Pricing Aturan disaring berdasarkan Pelanggan, Kelompok Pelanggan, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Silakan instal modul python dropbox
 DocType: Employee,Passport Number,Nomor Paspor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manajer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Dari Penerimaan Pembelian
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manajer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Dari Penerimaan Pembelian
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
 DocType: Sales Person,Sales Person Targets,Target Penjualan Orang
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,untuk
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Masukkan alamat email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tabung akhir membentuk
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Resolusi Tanggal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 DocType: Selling Settings,Customer Naming By,Penamaan Pelanggan Dengan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konversikan ke Grup
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Hari Tetap
 DocType: Sales Invoice,Packing List,Packing List
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pembelian Pesanan yang diberikan kepada Pemasok.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Penerbitan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
 DocType: Activity Cost,Projects User,Proyek Pengguna
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Dikonsumsi
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak ditemukan dalam tabel Rincian Tagihan
 DocType: Company,Round Off Cost Center,Bulat Off Biaya Pusat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Pemeliharaan Kunjungan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp harus setelah {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Pengaturan
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Mendarat Pajak Biaya dan Biaya
 DocType: Production Order Operation,Actual Start Time,Realisasi Waktu Mulai
 DocType: BOM Operation,Operation Time,Operasi Waktu
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Lanjut
 DocType: Pricing Rule,Sales Manager,Sales Manager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Ubah nama
 DocType: Journal Entry,Write Off Amount,Menulis Off Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Pembengkokan
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Izinkan Pengguna
 DocType: Journal Entry,Bill No,Bill ada
 DocType: Purchase Invoice,Quarterly,Triwulanan
 DocType: Selling Settings,Delivery Note Required,Pengiriman Note Diperlukan
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Masukkan detil item
 DocType: Purchase Receipt,Other Details,Detail lainnya
 DocType: Account,Accounts,Akun / Rekening
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Geser lurus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Untuk melacak item dalam penjualan dan dokumen pembelian berdasarkan nos serial mereka. Hal ini juga dapat digunakan untuk melacak rincian garansi produk.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang Ditolak adalah wajib terhadap barang regected
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk Dalam Penilaian
 DocType: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Penjual Kota
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Item memiliki varian.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} tidak ditemukan
 DocType: Bin,Stock Value,Nilai saham
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Jenis Pohon
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Terhadap Voucher Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Masuk"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Tidak dapat menemukan nilai tukar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Selamat Datang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kartu kredit Masuk
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tugas Subjek
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barang yang diterima dari pemasok.
-DocType: Communication,Open,Buka
 DocType: Lead,Campaign Name,Nama Promosi
 ,Reserved,Reserved
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} bukan merupakan barang persediaan
 DocType: Mode of Payment Account,Default Account,Standar Akun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Timbal harus diatur jika Peluang terbuat dari Timbal
-DocType: Contact Us Settings,Address Title,Judul Alamat
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Production Order Operation,Planned End Time,Rencana Akhir Waktu
 ,Sales Person Target Variance Item Group-Wise,Penjualan Orang Sasaran Variance Barang Group-Wise
-DocType: Dropbox Backup,Daily,Sehari-hari
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
 DocType: Delivery Note,Customer's Purchase Order No,Nasabah Purchase Order No
 DocType: Employee,Cell Number,Nomor Cell
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan Auto Generated Material
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tersesat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Pernyataan gaji bulanan.
 DocType: Item Group,Website Specifications,Website Spesifikasi
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Akun baru
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Entri akuntansi dapat dilakukan terhadap node daun. Entri terhadap Grup tidak diperbolehkan.
-DocType: ToDo,High,Tinggi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Opportunity,Maintenance,Pemeliharaan
-DocType: User,Male,Laki-laki
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nomor Penerimaan Pembelian diperlukan untuk Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribut Nilai
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kampanye penjualan.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Pribadi
 DocType: Expense Claim Detail,Expense Claim Type,Beban Klaim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Pengaturan default untuk Belanja
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entri {0} dihubungkan terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entri {0} dihubungkan terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Beban Pemeliharaan Kantor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Masukkan Barang pertama
 DocType: Account,Liability,Kewajiban
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Process Payroll,Send Email,Kirim Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tidak ada Izin
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik pertama"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Update Stock' tidak dapat diperiksa karena item tidak dikirim melalui {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Update Stok' tidak dapat diperiksa karena item tidak dikirim melalui {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faktur saya
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Faktur saya
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Purchase Order,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk mengaktifkan &quot;Point of Sale&quot; fitur
 DocType: Bin,Moving Average Rate,Moving Average Tingkat
 DocType: Production Planning Tool,Select Items,Pilih Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
-DocType: Comment,Reference Name,Referensi Nama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: Sales Invoice Item,Target Warehouse,Target Gudang
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Sales Order Tanggal
 DocType: Upload Attendance,Import Attendance,Impor Kehadiran
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Grup Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Laba / Rugi
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
 DocType: Production Order,Item To Manufacture,Barang Untuk Industri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pengecoran cetakan permanen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Status adalah {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Pembelian Order untuk Pembayaran
 DocType: Sales Order Item,Projected Qty,Proyeksi Jumlah
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
 DocType: Newsletter,Newsletter Manager,Newsletter Manajer
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Pembukaan&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Awal'
 DocType: Notification Control,Delivery Note Message,Pengiriman Note Pesan
 DocType: Expense Claim,Expenses,Beban
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varian Atribut
 ,Purchase Receipt Trends,Tren Penerimaan Pembelian
 DocType: Appraisal,Select template from which you want to get the Goals,Pilih template dari mana Anda ingin mendapatkan Goals
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Penelitian & Pengembangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penelitian & Pengembangan
 ,Amount to Bill,Sebesar Bill
 DocType: Company,Registration Details,Detail Pendaftaran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Mengintai
 DocType: Item,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Block List Tanggal
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadwalkan untuk mengirim ke {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Detail saham
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Titik penjualan
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Tidak bisa meneruskan {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
 DocType: Account,Balance must be,Saldo harus
 DocType: Hub Settings,Publish Pricing,Publikasikan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Beban Klaim Ditolak Pesan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Baik sekali
 ,Available Qty,Jumlah Tersedia
 DocType: Purchase Taxes and Charges,On Previous Row Total,Pada Sebelumnya Row Jumlah
 DocType: Salary Slip,Working Days,Hari Kerja
 DocType: Serial No,Incoming Rate,Tingkat yang masuk
 DocType: Packing Slip,Gross Weight,Berat Kotor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Sertakan liburan di total no. dari Hari Kerja
 DocType: Job Applicant,Hold,Memegang
 DocType: Employee,Date of Joining,Tanggal Bergabung
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Lihat Pelanggan
 DocType: Purchase Invoice Item,Purchase Receipt,Penerimaan Pembelian
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Peledakan abrasive
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menguasai nilai tukar mata uang.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Bahan rencana sub-rakitan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} harus aktif
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} harus aktif
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Silakan pilih jenis dokumen pertama
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
 DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Pencairan Jumlah
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Barang {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
 DocType: Bank Reconciliation,Total Amount,Jumlah Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Penerbitan Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Pesanan Produksi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikasikan untuk sinkronisasi item
-DocType: GL Entry,Account Currency,Akun Mata Uang
+DocType: Bank Reconciliation,Account Currency,Akun Mata Uang
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Sebutkan Putaran Off Akun di Perusahaan
 DocType: Purchase Receipt,Range,Jarak
 DocType: Supplier,Default Payable Accounts,Standar Account Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Features Setup,Item Barcode,Item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pembelian Faktur Muka
 DocType: Address,Shop,Toko
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standar rekening Bank / Cash akan secara otomatis diperbarui di POS Invoice saat mode ini dipilih.
 DocType: Employee,Permanent Address Is,Alamat permanen Apakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak barang jadi?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Merek
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Merek
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Penyisihan over-{0} menyeberang untuk Item {1}.
 DocType: Employee,Exit Interview Details,Detail Exit Interview
 DocType: Item,Is Purchase Item,Apakah Pembelian Barang
@@ -856,67 +790,62 @@
 DocType: Payment Tool,Paid,Dibayar
 DocType: Salary Slip,Total in words,Jumlah kata
 DocType: Material Request Item,Lead Time Date,Timbal Waktu Tanggal
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin catatan Kurs Mata Uang tidak diciptakan untuk
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,Wajib diisi. Mungkin Kurs Mata Uang tidak dibuat untuk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk &#39;Produk Bundle&#39; item, Gudang, Serial No dan Batch ada akan dianggap dari &#39;Packing List&#39; meja. Jika Gudang dan Batch ada yang sama untuk semua item kemasan untuk setiap item &#39;Produk Bundle&#39;, nilai-nilai dapat dimasukkan dalam tabel Barang utama, nilai akan disalin ke &#39;Packing List&#39; meja."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Pengiriman ke pelanggan.
 DocType: Purchase Invoice Item,Purchase Order Item,Purchase Order Barang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Penghasilan tidak langsung
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Mengatur Jumlah Pembayaran = Outstanding Jumlah
-DocType: Contact Us Settings,Address Line 1,Alamat Baris 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Perbedaan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Company Name
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Perbedaan
+,Company Name,Company Name
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Pilih item untuk transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat daftar semua bantuan video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala rekening bank mana cek diendapkan.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Izinkan user/pengguna untuk mengubah rate daftar harga di dalam transaksi
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Baris {0}: Pembayaran terhadap Penjualan / Purchase Order harus selalu ditandai sebagai muka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Pesanan Produksi ini.
 DocType: Process Payroll,Select Payroll Year and Month,Pilih Payroll Tahun dan Bulan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke kelompok yang sesuai (biasanya Penerapan Dana&gt; Aset Lancar&gt; Account Bank dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Biaya Listrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan mengirim Karyawan Ulang Tahun Pengingat
-DocType: Comment,Unsubscribed,Berhenti berlangganan
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pohon Pusat Biaya finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Ditransfer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Putih
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Putih
 DocType: SMS Center,All Lead (Open),Semua Prospektus (Open)
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pasang Gambar Anda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Membuat
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pasang Gambar Anda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Membuat
 DocType: Journal Entry,Total Amount in Words,Jumlah Total Kata
-DocType: Workflow State,Stop,berhenti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Cart saya
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Pesanan Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Berikutnya Hubungi Tanggal
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
 DocType: Holiday List,Holiday List Name,Nama Libur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Persediaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Persediaan
 DocType: Journal Entry Account,Expense Claim,Beban Klaim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Jumlah untuk {0}
 DocType: Leave Application,Leave Application,Tinggalkan Aplikasi
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Tinggalkan Alokasi Alat
 DocType: Leave Block List,Leave Block List Dates,Tinggalkan Block List Tanggal
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jika Anggaran Bulanan Melebihi (untuk akun beban)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Hiasan
 DocType: Workstation,Net Hour Rate,Tingkat Jam Bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Biaya Penerimaan Pembelian
 DocType: Company,Default Terms,Persyaratan standar
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip Barang
 DocType: POS Profile,Cash/Bank Account,Rekening Kas / Bank
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Pesanan Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Pengajuan
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskon
 DocType: Features Setup,Purchase Discounts,Membeli Diskon
 DocType: Workstation,Wages,Upah
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver Beban untuk record ini. Silakan Update 'Status' dan Simpan
 DocType: Serial No,Creation Document No,Penciptaan Dokumen Tidak
 DocType: Issue,Issue,Isu
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akun tidak cocok dengan Perusahaan
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
 DocType: BOM Operation,Operation,Operasi
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Pengiriman Negara
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Beban Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Membeli
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Membeli
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jual Biaya Pusat
 DocType: Sales Partner,Implementation Partner,Implementasi Mitra
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Membuat Entri Stock
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Membuat Entri Stock
 DocType: Packing Slip,Net Weight UOM,Berat Bersih UOM
 DocType: Item,Default Supplier,Standar Pemasok
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Selama Penyisihan Produksi Persentase
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,diperbarui melalui Waktu Log
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
 DocType: Opportunity,Your sales person who will contact the customer in future,Sales Anda yang akan menghubungi pelanggan di masa depan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa pemasok Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa pemasok Anda. Mereka bisa menjadi organisasi atau individu.
 DocType: Company,Default Currency,Currency Default
 DocType: Contact,Enter designation of this Contact,Masukkan penunjukan Kontak ini
-DocType: Contact Us Settings,Address,Alamat
 DocType: Expense Claim,From Employee,Dari Karyawan
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
 DocType: Journal Entry,Make Difference Entry,Membuat Perbedaan Entri
 DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tanggal
 DocType: Appraisal Template Goal,Key Performance Area,Key Bidang Kinerja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportasi
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
 DocType: Email Digest,Annual Expense,Beban tahunan
 DocType: SMS Center,Total Characters,Jumlah Karakter
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktur Detil
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Rekonsiliasi Pembayaran Faktur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Kontribusi%
 DocType: Item,website page link,tautan halaman situs web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Mari kita mempersiapkan sistem untuk penggunaan pertama.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nomor registrasi perusahaan untuk referensi Anda. Nomor pajak dll
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Belanja Pengiriman Aturan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pesanan produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
 ,Ordered Items To Be Billed,Memerintahkan Items Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Waktu Log dan Kirim untuk membuat Faktur Penjualan baru.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktur Penjualan Muka
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tidak ada yang meminta
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Manajemen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Manajemen
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis kegiatan untuk Waktu Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investasi casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Entah debit atau jumlah kredit diperlukan untuk {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktif
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Biru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Biru
 DocType: Purchase Invoice,Is Return,Apakah Kembali
 DocType: Price List Country,Price List Country,Harga Daftar Negara
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Node lebih lanjut dapat hanya dibuat di bawah tipe node 'Grup'
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} sudah dibuat untuk pengguna: {1} dan perusahaan {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Faktor Konversi
 DocType: Stock Settings,Default Item Group,Default Item Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminated manufaktur objek
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Database Supplier.
 DocType: Account,Balance Sheet,Neraca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Biaya Center For Barang dengan Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch membentuk
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi pelanggan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Pajak dan pemotongan gaji lainnya.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Hutang
 DocType: Account,Warehouse,Gudang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
 DocType: Purchase Invoice Item,Net Rate,Tingkat Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Purchase Invoice Barang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Bursa Ledger Entries dan GL Entri ulang untuk Pembelian Penerimaan yang dipilih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Item 1
 DocType: Holiday,Holiday,Liburan
-DocType: Event,Saturday,Sabtu
 DocType: Leave Control Panel,Leave blank if considered for all branches,Biarkan kosong jika dipertimbangkan untuk semua cabang
 ,Daily Time Log Summary,Harian Waktu Log Summary
-DocType: DocField,Label,Label
 DocType: Payment Reconciliation,Unreconciled Payment Details,Rincian Pembayaran Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Rounded Jumlah
 DocType: Lead,Call,Panggilan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' tidak boleh kosong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entries' tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menyiapkan Karyawan
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Silakan pilih awalan pertama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Penelitian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Penelitian
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Silakan tentukan setidaknya satu atribut dalam tabel Atribut
 DocType: Contact,User ID,ID Pemakai
-DocType: Communication,Sent,Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terlama
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
-DocType: Communication,Delivery Status,Status Pengiriman
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok barang"
 DocType: Production Order,Manufacture against Sales Order,Industri melawan Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Istirahat Of The World
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Istirahat Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Gross Bayar
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Item Description
 DocType: Payment Tool,Payment Mode,Modus Pembayaran
 DocType: Purchase Invoice,Is Recurring,Apakah Berulang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Logam langsung Laser sintering
 DocType: Purchase Order,Supplied Items,Disediakan Produk
 DocType: Production Order,Qty To Manufacture,Qty Untuk Industri
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mempertahankan tingkat yang sama sepanjang siklus pembelian
 DocType: Opportunity Item,Opportunity Item,Peluang Barang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pembukaan sementara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Cuti Karyawan Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
 DocType: Address,Address Type,Tipe Alamat
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Posisi Faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} tidak valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
 DocType: Employee,Employee Number,Jumlah Karyawan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kepala akun {0} telah dibuat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Hijau
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Hijau
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Dicapai
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Dicapai
 DocType: Employee,Place of Issue,Tempat Issue
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrak
-DocType: Report,Disabled,Dinonaktifkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
+DocType: Email Digest,Add Quote,Add Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produk atau Jasa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kelompok barang akar dan tidak dapat diedit.
 DocType: Journal Entry Account,Purchase Order,Purchase Order
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nama dibutuhkan
 DocType: Purchase Invoice,Recurring Type,Berulang Type
 DocType: Address,City/Town,Kota / Kota
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Serial Tidak Detail
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Barang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Pengiriman Note {0} tidak disampaikan
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} harus Item Sub-kontrak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga pertama dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Barang, Barang Grup atau Merek."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Mengedit Keterangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Diharapkan Pengiriman Tanggal adalah lebih rendah daripada Tanggal Rencana Start.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Untuk Pemasok
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Mengatur Tipe Akun membantu dalam memilih Akun ini dalam transaksi.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Hanya ada satu Peraturan Pengiriman Kondisi dengan nilai kosong atau 0 untuk ""To Nilai"""
 DocType: Authorization Rule,Transaction,Transaksi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Catatan: Biaya Pusat ini adalah Group. Tidak bisa membuat entri akuntansi terhadap kelompok-kelompok.
-apps/frappe/frappe/config/desk.py +7,Tools,Alat-alat
 DocType: Item,Website Item Groups,Situs Barang Grup
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Nomor pesanan produksi adalah wajib untuk pembuatan tujuan masuk stok
 DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,Jurnal Entri
 DocType: Workstation,Workstation Name,Workstation Nama
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} bukan milik Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentar
 DocType: Salary Slip,Bank Account No.,Rekening Bank No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini adalah jumlah transaksi yang diciptakan terakhir dengan awalan ini
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Penilaian Tingkat diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Penilaian Tingkat diperlukan untuk Item {0}
 DocType: Quality Inspection Reading,Reading 8,Membaca 8
 DocType: Sales Partner,Agent,Agen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Mendistribusikan Biaya Berdasarkan&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Pajak dan Biaya Perhitungan
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Perangkat keras
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perangkat keras
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Silakan pilih sebuah Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pemasok Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Tidak ada data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Template Penilaian Pencapaian
 DocType: Salary Slip,Earning,Earning
 DocType: Payment Tool,Party Account Currency,Partai Akun Mata Uang
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kondisi Tumpang Tindih ditemukan antara:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Jurnal Entri {0} sudah disesuaikan terhadap beberapa voucher lainnya
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Nilai Total Pesanan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Makanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Penuaan Rentang 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Anda dapat membuat log waktu hanya terhadap produksi pesanan dikirimkan
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletter ke kontak, memimpin."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata uang dari Rekening Penutupan harus {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah poin untuk semua tujuan harus 100. Ini adalah {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasi tidak dapat dibiarkan kosong.
 ,Delivered Items To Be Billed,Produk Disampaikan Akan Ditagih
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
-DocType: DocField,Description,Deskripsi
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
-DocType: Letter Head,Is Default,Apakah default
 DocType: Address,Utilities,Keperluan
 DocType: Purchase Invoice Item,Accounting,Akuntansi
 DocType: Features Setup,Features Setup,Fitur Pengaturan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Lihat Penawaran Surat
-DocType: Communication,Communication,Komunikasi
 DocType: Item,Is Service Item,Apakah Layanan Barang
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Silahkan pilih Tahun Anggaran
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,Menjaga Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Saham Entries sudah dibuat untuk Pesanan Produksi
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Chart of Account
 DocType: Material Request,Terms and Conditions Content,Syarat dan Ketentuan Konten
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Item {0} bukan merupakan saham Barang
 DocType: Maintenance Visit,Unscheduled,Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 ,Batch-Wise Balance History,Batch-Wise Balance Sejarah
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Magang
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Magang
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Rinci tabel pajak diambil dari master barang sebagai string dan disimpan dalam bidang ini.
  Digunakan untuk Pajak dan Biaya"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Masuk akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Masuk akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Tidak ada Struktur Gaji aktif yang ditemukan untuk karyawan {0} dan bulan
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Rekening
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Aturan pajak untuk transaksi.
 DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk mengubah nama.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kami membeli item ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kami membeli item ini
 DocType: Address,Billing,Penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Tidak Terkirim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosive membentuk
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Pajak dan Biaya (Perusahaan Mata Uang)
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dijadwalkan untuk mengirim ke {0} penerima
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Untuk Menghargai
 DocType: Supplier,Stock Manager,Bursa Manajer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tidak ada alamat belum ditambahkan.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan jumlah JV {2}
 DocType: Item,Inventory,Inventarisasi
 DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk mengaktifkan &quot;Point of Sale&quot; tampilan
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak dapat dibuat untuk keranjang kosong
 DocType: Item,Sales Details,Detail Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Menjepit
 DocType: Opportunity,With Items,Dengan Produk
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Qty
 DocType: Notification Control,Expense Claim Rejected,Beban Klaim Ditolak
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
 DocType: Item Attribute,Item Attribute,Item Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,pemerintahan
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,pemerintahan
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varian
 DocType: Company,Services,Layanan
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Jumlah ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Jumlah ({0})
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
 DocType: Sales Invoice,Source,Sumber
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Bayar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Tahun Buku Tanggal mulai
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Buku Tanggal mulai
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Material Request Item,Sales Order No,Sales Order No
 DocType: Item Group,Item Group Name,Nama Item Grup
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Diambil
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Material untuk Industri
 DocType: Pricing Rule,For Price List,Untuk Daftar Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Pencarian eksekutif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Pencarian eksekutif
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tingkat pembelian untuk item: {0} tidak ditemukan, yang diperlukan untuk buku akuntansi entri (beban). Sebutkan harga barang terhadap daftar harga beli."
 DocType: Maintenance Schedule,Schedules,Jadwal Pelajaran
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Tambahan Jumlah Diskon (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kesalahan: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Kesalahan: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
 DocType: Maintenance Visit,Maintenance Visit,Pemeliharaan Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan> Grup Pelanggan> Wilayah
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tersedia Batch Qty di Gudang
 DocType: Time Log Batch Detail,Time Log Batch Detail,Waktu Log Batch Detil
-DocType: Workflow State,Tasks,tugas
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Biaya Bantuan
-DocType: Event,Tuesday,Selasa
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays pada hari-hari penting.
 ,Accounts Receivable Summary,Account Summary Piutang
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Daun untuk jenis {0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
 DocType: UOM,UOM Name,Nama UOM
-DocType: Top Bar Item,Target,Sasaran
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Jumlah kontribusi
 DocType: Sales Invoice,Shipping Address,Alamat Pengiriman
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Alat ini membantu Anda untuk memperbarui atau memperbaiki kuantitas dan valuasi saham di sistem. Hal ini biasanya digunakan untuk menyinkronkan sistem nilai-nilai dan apa yang benar-benar ada di gudang Anda.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Delivery Note.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Master merek.
-DocType: ToDo,Due Date,Tanggal Jatuh Tempo
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Master merek.
 DocType: Sales Invoice Item,Brand Name,Merek Nama
 DocType: Purchase Receipt,Transporter Details,Detail transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kotak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisasi
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kotak
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisasi
 DocType: Monthly Distribution,Monthly Distribution,Distribusi bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List kosong. Silakan membuat Receiver List
 DocType: Production Plan Sales Order,Production Plan Sales Order,Rencana Produksi Sales Order
 DocType: Sales Partner,Sales Partner Target,Penjualan Mitra Sasaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Masuk akuntansi untuk {0} hanya dapat dilakukan dalam mata uang: {1}
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Bentukan
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Pembelian Pesanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Barang {1} tidak ada dalam {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
 ,Bank Reconciliation Statement,Pernyataan Rekonsiliasi Bank
 DocType: Address,Lead Name,Timbal Nama
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Membuka Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Membuka Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} harus muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak diizinkan untuk tranfer lebih {0} dari {1} terhadap Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Daun Dialokasikan Berhasil untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tidak ada item untuk berkemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufaktur Kuantitas adalah wajib
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Jumlah yang tidak tercermin di bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Jumlah yang tidak tercermin di bank
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Klaim untuk biaya perusahaan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Pengecoran sentrifugal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetik lapangan dibantu menyelesaikan
 DocType: Company,Default Holiday List,Standar Hotel Daftar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Kewajiban saham
 DocType: Purchase Receipt,Supplier Warehouse,Pemasok Gudang
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Pilih Pesanan Penjualan
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Pemasok Kutipan tidak diciptakan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Untuk melacak item menggunakan barcode. Anda akan dapat memasukkan item dalam Pengiriman Note dan Faktur Penjualan dengan memindai barcode barang.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Tandai sebagai Disampaikan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Tandai sebagai Disampaikan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Quotation
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Tinggalkan jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Berhenti Ulang Tahun Pengingat
 DocType: SMS Center,Receiver List,Receiver Daftar
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Gaji Pengurangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Laser sintering selektif
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Impor Sukses!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
 DocType: Quotation Item,Quotation Item,Quotation Barang
 DocType: Account,Account Name,Nama Akun
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tanggal tidak dapat lebih besar dari To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial ada {0} kuantitas {1} tak bisa menjadi pecahan
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Pemasok Type induk.
 DocType: Purchase Order Item,Supplier Part Number,Pemasok Part Number
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Tambahkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Tingkat konversi tidak bisa 0 atau 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
 DocType: Accounts Settings,Credit Controller,Kontroler Kredit
 DocType: Delivery Note,Vehicle Dispatch Date,Kendaraan Dispatch Tanggal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Penerimaan Pembelian {0} tidak disampaikan
 DocType: Company,Default Payable Account,Standar Hutang Akun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Pengaturan untuk keranjang belanja online seperti aturan pengiriman, daftar harga dll"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Pengaturan Selesai
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Ditagih
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Daya Manusia
 DocType: Lead,Upper Income,Atas Penghasilan
 DocType: Journal Entry Account,Debit in Company Currency,Debit di Perusahaan Mata
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Masalah saya
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Nilai Default
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Baris {0}: Jumlah pembayaran tidak boleh negatif
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tekan pas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pemasok Faktur {0} tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
 DocType: Payment Reconciliation,Payments,2. Payment (Pembayaran)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic menekan
-DocType: ToDo,Medium,Sedang
 DocType: Budget Detail,Budget Allocated,Anggaran Dialokasikan
 DocType: Journal Entry,Entry Type,Entri Type
 ,Customer Credit Balance,Saldo Kredit Pelanggan
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
 DocType: Quotation,Term Details,Rincian Term
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perencanaan Kapasitas Untuk (Hari)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
 DocType: Warranty Claim,Warranty Claim,Garansi Klaim
 ,Lead Details,Detail Timbal
-DocType: Authorization Rule,Approving User,Menyetujui Pengguna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Penempaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
 DocType: Pricing Rule,Applicable For,Berlaku Untuk
 DocType: Bank Reconciliation,From Date,Dari Tanggal
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Diskon tambahan
 DocType: Selling Settings,Selling Settings,Jual Pengaturan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Lelang Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelang Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Perusahaan, Bulan dan Tahun Anggaran adalah wajib"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Item Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat Masuk Bursa ini
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Waktu Log Batch {0} harus 'Dikirim'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Dialokasikan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Gudang diperlukan pada Row ada {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Masukkan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
 DocType: Employee,Date Of Retirement,Tanggal Of Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
 DocType: Address,Postal,Pos
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Pertambangan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Pengecoran resin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Pelanggan sudah ada dengan nama yang sama, silakan mengubah nama Pelanggan atau mengubah nama Grup Pelanggan"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Silahkan pilih {0} pertama.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},teks {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teks {0}
 DocType: Territory,Parent Territory,Wilayah Induk
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
 DocType: Stock Entry,Material Receipt,Material Receipt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produk
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produk
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika item ini memiliki varian, maka tidak dapat dipilih dalam order penjualan dll"
 DocType: Lead,Next Contact By,Berikutnya Contact By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus sebagai kuantitas ada untuk Item {1}
 DocType: Quotation,Order Type,Pesanan Type
 DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat Email
 DocType: Payment Tool,Find Invoices to Match,Cari Faktur Match
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","misalnya ""XYZ Bank Nasional """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","misalnya ""XYZ Bank Nasional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Jumlah Sasaran
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Jumlah Sasaran
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Daftar Belanja diaktifkan
 DocType: Job Applicant,Applicant for a Job,Pemohon untuk Job
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Tidak ada Pesanan Produksi dibuat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Slip Gaji karyawan {0} sudah diciptakan untuk bulan ini
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Slip Gaji karyawan {0} sudah diciptakan untuk bulan ini
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Sales Invoice Item,Batch No,No. Batch
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan Penjualan beberapa Pesanan terhadap Purchase Order Nasabah
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
-DocType: DocPerm,Delete,Hapus
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variasi
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Agar Berhenti tidak dapat dibatalkan. Unstop untuk membatalkan.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Tinggalkan dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari bidang wajib
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Membuat Purchase Order
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Membuat Purchase Order
 DocType: SMS Center,Send To,Kirim Ke
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang dialokasikan
 DocType: Sales Team,Contribution to Net Total,Kontribusi terhadap Net Jumlah
 DocType: Sales Invoice Item,Customer's Item Code,Nasabah Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Rekonsiliasi
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Pemohon untuk pekerjaan.
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Referensi
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutory dan informasi umum lainnya tentang Pemasok Anda
-DocType: Country,Country,Negara
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
-DocType: Communication,Received,Diterima
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Jurnal Entri {0} tidak memiliki tertandingi {1} entri
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Gandakan Serial ada dimasukkan untuk Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sebuah kondisi untuk Aturan Pengiriman
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item tidak diperbolehkan untuk memiliki Orde Produksi.
-DocType: DocField,Attach Image,Pasang Gambar
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih package ini. (Dihitung secara otomatis sebagai jumlah berat bersih item)
-DocType: Stock Reconciliation Item,Leave blank if no change,Kosongkan jika tidak ada perubahan
 DocType: Sales Order,To Deliver and Bill,Untuk Memberikan dan Bill
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Waktu Log untuk manufaktur.
 DocType: Item,Apply Warehouse-wise Reorder Level,Terapkan Gudang-bijaksana Susun ulang Tingkat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} harus diserahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendalian Otorisasi
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Waktu Log untuk tugas-tugas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pembayaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pembayaran
 DocType: Production Order Operation,Actual Time and Cost,Waktu aktual dan Biaya
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimal {0} dapat dibuat untuk Item {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Salam
-DocType: Communication,Rejected,Ditolak
 DocType: Pricing Rule,Brand,Merek
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundel item pada saat penjualan.
 DocType: Sales Order Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
 DocType: Quality Inspection Reading,Reading 10,Membaca 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Nilai {0} untuk Atribut {1} tidak ada dalam daftar valid Barang Atribut Nilai
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Rekan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Rekan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} bukan merupakan Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
 DocType: Packing Slip,To Package No.,Untuk Paket No
-DocType: DocType,System,Sistem
 DocType: Warranty Claim,Issue Date,Tanggal dibuat
 DocType: Activity Cost,Activity Cost,Kegiatan Biaya
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Dikonsumsi Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 DocType: Payment Tool,Make Payment Entry,Membuat Entri Pembayaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
 ,Sales Invoice Trends,Faktur Penjualan Trends
 DocType: Leave Application,Apply / Approve Leaves,Terapkan / Menyetujui Daun
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
 DocType: Sales Order Item,Delivery Warehouse,Pengiriman Gudang
 DocType: Stock Settings,Allowance Percent,Penyisihan Persen
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Jual harus diperiksa, jika Berlaku Untuk dipilih sebagai {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Pemasok Barang Quotation
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Membuat Struktur Gaji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Pencukuran
 DocType: Item,Has Variants,Memiliki Varian
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik 'Buat Sales Invoice' tombol untuk membuat Faktur Penjualan baru.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Kemasan dan pelabelan
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 DocType: Sales Person,Parent Sales Person,Penjualan Induk Orang
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Silakan tentukan Currency Default dalam Perseroan Guru dan Default global
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Rahasia
 DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Mengelola Proyek
 DocType: Supplier,Supplier of Goods or Services.,Pemasok Barang atau Jasa.
 DocType: Budget Detail,Fiscal Year,Tahun Fiskal
 DocType: Cost Center,Budget,Anggaran belanja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Anggaran tidak dapat ditugaskan terhadap {0}, karena itu bukan Penghasilan atau Beban akun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dicapai
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dicapai
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,misalnya 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,misalnya 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Faktur Penjualan.
 DocType: Item,Is Sales Item,Apakah Penjualan Barang
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Grup Pohon
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Barang {0} tidak setup untuk Serial Nos Periksa Barang induk
 DocType: Maintenance Visit,Maintenance Time,Pemeliharaan Waktu
 ,Amount to Deliver,Jumlah yang Memberikan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produk atau Jasa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ada kesalahan.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Penyadapan
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Produk atau Jasa
 DocType: Naming Series,Current Value,Nilai saat ini
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dibuat
 DocType: Delivery Note Item,Against Sales Order,Terhadap Order Penjualan
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Pajak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Harap masukkan tanggal Referensi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Harap masukkan tanggal Referensi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri pembayaran tidak dapat disaring oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabel untuk Item yang akan ditampilkan di Situs Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Disediakan Qty
 DocType: Material Request Item,Material Request Item,Material Permintaan Barang
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pohon Item Grup.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Pohon Item Grup.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
 ,Item-wise Purchase History,Barang-bijaksana Riwayat Pembelian
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Merah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Merah
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Pesanan terbuka Produksi
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak selesai untuk {2} qty barang jadi di Produksi Orde # {3}. Silakan update status operasi via Waktu Log
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Mengubah UOM untuk Item.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
 DocType: Item Attribute,Attribute Name,Nama Atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} harus Penjualan atau Jasa Barang di {1}
 DocType: Item Group,Show In Website,Tampilkan Di Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
 DocType: Task,Expected Time (in hours),Waktu yang diharapkan (dalam jam)
 ,Qty to Order,Qty to Order
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Untuk melacak nama merek dalam dokumen-dokumen berikut Pengiriman Catatan, Peluang, Permintaan Bahan, Barang, Purchase Order, Voucher Pembelian, Pembeli Penerimaan, Quotation, Faktur Penjualan, Produk Bundle, Sales Order, Serial No"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Jelas Table
 DocType: Features Setup,Brands,Merek
 DocType: C-Form Invoice Detail,Invoice No,Faktur ada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Dari Purchase Order
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Dari Purchase Order
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Biaya Tingkat
 ,Customer Addresses And Contacts,Alamat Pelanggan Dan Kontak
 DocType: Employee,Resignation Letter Date,Surat Pengunduran Diri Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Tidak Diatur
-DocType: Communication,Date,Tanggal
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulangi Pendapatan Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Duduk diam sementara sistem anda sedang setup. Ini mungkin memerlukan beberapa saat.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pasangkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pasangkan
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
 DocType: Item,Has Batch No,Memiliki Batch ada
 DocType: Delivery Note,Excise Page Number,Jumlah Cukai Halaman
 DocType: Employee,Personal Details,Data Pribadi
 ,Maintenance Schedules,Jadwal pemeliharaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master barang untuk item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Seperti Orde Produksi dapat dibuat untuk item ini, itu harus menjadi barang saham."
 DocType: Shipping Rule Condition,Shipping Amount,Pengiriman Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bergabung
-DocType: Authorization Rule,Above Value,Nilai di atas
 ,Pending Amount,Pending Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
 DocType: Purchase Order,Delivered,Disampaikan
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Pengaturan server masuk untuk pekerjaan email id. (Misalnya jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Jumlah kendaraan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah daun dialokasikan {0} tidak bisa kurang dari daun yang telah disetujui {1} untuk periode
 DocType: Journal Entry,Accounts Receivable,Piutang
 ,Supplier-Wise Sales Analytics,Pemasok-Wise Penjualan Analytics
 DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format khusus negara tidak ditemukan
-DocType: Custom Field,Custom,Disesuaikan
 DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injection molding
 DocType: Bank Reconciliation,Include Reconciled Entries,Sertakan Entri Berdamai
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pohon rekening finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Biarkan kosong jika dipertimbangkan untuk semua jenis karyawan
 DocType: Landed Cost Voucher,Distribute Charges Based On,Mendistribusikan Biaya Berdasarkan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akun {0} harus bertipe 'Aset Tetap' dikarenakan Barang {1} adalah merupakan sebuah Aset Tetap
 DocType: HR Settings,HR Settings,Pengaturan HR
-apps/frappe/frappe/config/setup.py +130,Printing,Pencetakan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
 DocType: Purchase Invoice,Additional Discount Amount,Tambahan Jumlah Diskon
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Hari (s) yang Anda lamar untuk cuti adalah liburan. Anda tidak perlu mengajukan cuti.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,Dan
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Block List Izinkan
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau ruang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Olahraga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Aktual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Satuan
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Silakan set tombol akses Dropbox di situs config Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Satuan
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Silakan tentukan Perusahaan
 ,Customer Acquisition and Loyalty,Akuisisi Pelanggan dan Loyalitas
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda mempertahankan stok item ditolak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Tahun keuangan Anda berakhir pada
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tahun keuangan Anda berakhir pada
 DocType: POS Profile,Price List,Daftar Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran default. Silahkan me-refresh browser Anda agar perubahan dapat terwujud
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Klaim Beban
 DocType: Issue,Support,Mendukung
-DocType: Authorization Rule,Approving Role,Menyetujui Peran
 ,BOM Search,BOM Cari
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutupan (Membuka Total +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
 DocType: Workstation,Wages per hour,Upah per jam
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo saham di Batch {0} akan menjadi negatif {1} untuk Item {2} di Gudang {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Tampilkan / Sembunyikan fitur seperti Serial Nos, POS dll"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata harus {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Berikut Permintaan Bahan telah dibesarkan secara otomatis berdasarkan tingkat re-order Item
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata harus {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Tanggal clearance tidak bisa sebelum tanggal check-in baris {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Tanggal clearance tidak bisa sebelum tanggal check-in baris {0}
 DocType: Salary Slip,Deduction,Deduksi
 DocType: Address Template,Address Template,Template Alamat
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan penjualan orang ini
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,Kutipan
 DocType: Salary Slip,Total Deduction,Jumlah Pengurangan
 DocType: Quotation,Maintenance User,Pemeliharaan Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Biaya Diperbarui
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Biaya Diperbarui
 DocType: Employee,Date of Birth,Tanggal Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} telah dikembalikan
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Anggaran ** mewakili Tahun Keuangan. Semua entri akuntansi dan transaksi besar lainnya dilacak terhadap Tahun Anggaran ** **.
 DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
 DocType: Production Order Operation,Actual Operation Time,Realisasi Waktu Operasi
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Mengurangi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Job Description
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty per Saham UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Silakan pilih file csv dengan data yang valid
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Lapisan
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Kutipan, Sales Order dll dari Kampanye untuk mengukur Return on Investment. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Kutipan, Sales Order dll dari Kampanye untuk mengukur Return on Investment."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entri saham ada terhadap gudang {0}, maka Anda tidak dapat menetapkan kembali atau memodifikasi Gudang"
 DocType: Appraisal,Calculate Total Score,Hitung Total Skor
 DocType: Supplier Quotation,Manufacturing Manager,Manufaktur Manajer
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pengiriman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
-DocType: Purchase Order,To be delivered to customer,Yang akan dikirimkan ke pelanggan
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pengiriman
+DocType: Purchase Order Item,To be delivered to customer,Yang akan dikirimkan ke pelanggan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Waktu Log Status harus Dikirim.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Pengaturan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang)
 DocType: Pricing Rule,Supplier,Pemasok
 DocType: C-Form,Quarter,Perempat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Beban atau Selisih akun adalah wajib untuk Item {0} karena dampak keseluruhan nilai saham
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan mark up, atur di Bursa Pengaturan"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan mark up, atur di Bursa Pengaturan"
 DocType: Employee,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Di Atas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Pengguna {0} dinonaktifkan
 DocType: Leave Application,Total Leave Days,Jumlah Cuti Hari
-DocType: Journal Entry Account,Credit in Account Currency,Kredit di Akun Mata Uang
 DocType: Email Digest,Note: Email will not be sent to disabled users,Catatan: Email tidak akan dikirim ke pengguna cacat
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Pilih Perusahaan ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Currency Exchange,From Currency,Dari Mata
-DocType: DocField,Name,Nama
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Jumlah yang tidak tercermin dalam sistem
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Silakan pilih Jumlah Alokasi, Faktur Jenis dan Faktur Nomor di minimal satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Jumlah yang tidak tercermin dalam sistem
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Lainnya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lainnya
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Pajak dan Biaya
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Sebuah Produk atau Jasa yang dibeli, dijual atau disimpan di gudang."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris pertama
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Selesai
-DocType: Web Form,Select DocType,Pilih DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Menggerek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Perbankan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Biaya Pusat baru
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Biaya Pusat baru
 DocType: Bin,Ordered Quantity,Memerintahkan Kuantitas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
 DocType: Quality Inspection,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskon
 DocType: Purchase Order Item,Reference Document Type,Dokumen referensi Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} terhadap Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Sales Order {1}
 DocType: Account,Fixed Asset,Fixed Asset
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Persediaan serial
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Persediaan serial
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
 DocType: Time Log Batch,Total Billing Amount,Jumlah Total Tagihan
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Piutang
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order untuk Pembayaran
 DocType: Expense Claim Detail,Expense Claim Detail,Beban Klaim Detil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Waktu Log dibuat:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Silakan pilih akun yang benar
 DocType: Item,Weight UOM,Berat UOM
 DocType: Employee,Blood Group,Golongan darah
 DocType: Purchase Invoice Item,Page Break,Halaman Istirahat
 DocType: Production Order Operation,Pending,Menunggu
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang dapat menyetujui aplikasi cuti karyawan tertentu yang
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Anda tidak dapat mengubah UOM default Varian. Untuk mengubah UOM default untuk Variant UOM perubahan default Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Peralatan Kantor
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Angkat Permintaan Bahan ketika saham mencapai tingkat re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dari Pemeliharaan Jadwal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Full-time
 DocType: Purchase Invoice,Contact Details,Kontak Detail
 DocType: C-Form,Received Date,Diterima Tanggal
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika Anda telah membuat template standar dalam Penjualan Pajak dan Biaya Template, pilih salah satu dan klik pada tombol di bawah ini."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Pembukaan Job
 DocType: Payment Reconciliation,Payment Reconciliation,Rekonsiliasi Pembayaran
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Silahkan pilih nama Incharge Orang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Menawarkan Surat
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Menghasilkan Permintaan Material (MRP) dan Pesanan Produksi.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Jumlah tagihan Amt
 DocType: Time Log,To Time,Untuk Waktu
+DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Untuk menambahkan node anak, mengeksplorasi pohon dan klik pada node di mana Anda ingin menambahkan lebih banyak node."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 DocType: Production Order Operation,Completed Qty,Selesai Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,Pelanggan Barang Kode
 DocType: Opportunity,Lost Reason,Kehilangan Alasan
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Entri Pembayaran terhadap Pesanan atau Faktur.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Pengelasan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM diperlukan
 DocType: Quality Inspection,Sample Size,Ukuran Sampel
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Semua Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 DocType: Project,External,Eksternal
 DocType: Features Setup,Item Serial Nos,Item Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,Kuantitas Aktual
 DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} tidak ditemukan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Pelanggan Anda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompresi molding
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Pelanggan Anda
 DocType: Leave Block List Date,Block Date,Blokir Tanggal
 DocType: Sales Order,Not Delivered,Tidak Disampaikan
 ,Bank Clearance Summary,Izin Bank Summary
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Membuat dan mengelola harian, mingguan dan bulanan mencerna email."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code> Barang Grup> Merek
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Pencapaian
-DocType: Event,Friday,Jum'at
 DocType: Time Log,Costing Amount,Biaya Jumlah
 DocType: Process Payroll,Submit Salary Slip,Kirim Slip Gaji
 DocType: Salary Structure,Monthly Earning & Deduction,Bulanan Pendapatan & Pengurangan
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Impor di Massal
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
 DocType: SMS Log,Sender Name,Pengirim Nama
-DocType: Page,Title,Judul
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Sesuaikan
 DocType: POS Profile,[Select],[Pilihan]
 DocType: SMS Log,Sent To,Dikirim Ke
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Membuat Sales Invoice
 DocType: Company,For Reference Only.,Untuk referensi saja.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Valid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Valid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Jumlah Uang Muka
 DocType: Manufacturing Settings,Capacity Planning,Perencanaan Kapasitas
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Dari Tanggal' diperlukan
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dari Tanggal' diperlukan
 DocType: Journal Entry,Reference Number,Nomor Referensi
 DocType: Employee,Employment Details,Rincian Pekerjaan
 DocType: Employee,New Workplace,Kerja baru
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
 DocType: Item,End of Life,Akhir Kehidupan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Pelanggan Seluler ada
 DocType: Sales Invoice,Recurring,Berulang
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Rename Alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Pembaruan Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkan Bursa Negatif
 DocType: Installation Note,Installation Note,Instalasi Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Tambahkan Pajak
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Tambahkan Pajak
 ,Financial Analytics,Analytics keuangan
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 DocType: Address,Subsidiary,Anak Perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak dapat mengubah mata uang default perusahaan, karena ada transaksi yang ada. Transaksi harus dibatalkan untuk mengubah mata uang default."
 DocType: Quality Inspection,Purchase Receipt No,Penerimaan Pembelian ada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
-DocType: System Settings,In Hours,Pada Jam
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Saldo diharapkan sebagai per bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Saldo diharapkan sebagai per bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
 DocType: Appraisal,Employee,Karyawan
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Group by Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan On
 DocType: Sales Invoice,Mass Mailing,Mailing massa
-DocType: Page,Standard,Standar
 DocType: Rename Tool,File to Rename,File untuk Ganti nama
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nomor pesanan purchse diperlukan untuk Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Tampilkan Pembayaran
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Ukuran
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Notification Control,Expense Claim Approved,Beban Klaim Disetujui
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Selling Settings,Sales Order Required,Sales Order Diperlukan
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
 DocType: Supplier,Is Frozen,Membeku
 DocType: Buying Settings,Buying Settings,Setting Pembelian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finishing massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM untuk Barang Jadi
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Pengaturan server masuk untuk email penjualan id. (Misalnya sales@example.com)
 DocType: Warranty Claim,Raised By,Dibesarkan Oleh
 DocType: Payment Tool,Payment Account,Akun Pembayaran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Konsep
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensasi Off
 DocType: Quality Inspection Reading,Accepted,Diterima
-DocType: User,Female,Perempuan
-DocType: Journal Entry Account,Debit in Account Currency,Debit dalam Rekening Mata Uang
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Menjawab
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referensi yang tidak valid {0} {1}
 DocType: Payment Tool,Total Payment Amount,Jumlah Total Pembayaran
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Pesanan Produksi {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
 DocType: Newsletter,Test,tes
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Karena ada transaksi saham yang ada untuk item ini, \ Anda tidak dapat mengubah nilai-nilai &#39;Memiliki Serial No&#39;, &#39;Apakah Batch Tidak&#39;, &#39;Apakah Stok Item&#39; dan &#39;Metode Penilaian&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Cepat Journal Masuk
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap barang
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Masukkan Planned Qty untuk Item {0} pada baris {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Permintaan untuk item.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Order produksi yang terpisah akan dibuat untuk setiap item barang jadi.
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pengaturan Lengkap
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nama
+DocType: Authorization Rule,Authorized Value,Nilai resmi
 DocType: Contact,Enter department to which this Contact belongs,Memasukkan departemen yang Kontak ini milik
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Absen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Satuan Ukur
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Satuan Ukur
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
 DocType: Lead,Opportunity,Kesempatan
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tingkat dasar (seperti per Saham UOM)
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
 DocType: Campaign,Campaign-.####,Promosi-.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Tajam
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang distributor pihak ketiga / agen / komisi agen / affiliate / reseller yang menjual produk-produk perusahaan untuk komisi.
 DocType: Customer Group,Has Child Node,Memiliki Anak Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statis di sini (Misalnya pengirim = ERPNext, username = ERPNext, password = 1234 dll)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Anggaran aktif. Untuk lebih jelasnya lihat {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Fiskal aktif. Untuk lebih jelasnya lihat {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Penuaan Rentang 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Mesin fotokimia
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. Masukkan Row: Jika berdasarkan ""Sebelumnya Row Jumlah"" Anda dapat memilih nomor baris yang akan diambil sebagai dasar untuk perhitungan ini (default adalah baris sebelumnya).
  9. Pertimbangkan Pajak atau Biaya untuk: Pada bagian ini Anda dapat menentukan apakah pajak / biaya hanya untuk penilaian (bukan bagian dari total) atau hanya total (tidak menambah nilai barang) atau keduanya.
  10. Menambah atau Dikurangi: Apakah Anda ingin menambah atau mengurangi pajak."
-DocType: Note,Note,Catatan
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantitas
-DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Barang {0} daripada kuantitas Sales Order {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Masuk Bursa {0} tidak disampaikan
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 DocType: Tax Rule,Billing City,Penagihan Kota
 DocType: Global Defaults,Hide Currency Symbol,Sembunyikan Currency Symbol
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Nota Kredit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Selesai Qty tidak bisa lebih dari {0} untuk operasi {1}
 DocType: Features Setup,Quality,Kualitas
-DocType: Contact Us Settings,Introduction,Pendahuluan
 DocType: Warranty Claim,Service Address,Layanan Alamat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 baris Saham Rekonsiliasi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 baris Saham Rekonsiliasi.
 DocType: Stock Entry,Manufacture,Pembuatan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Silakan Pengiriman Catatan pertama
 DocType: Purchase Invoice,Currency and Price List,Mata Uang dan Daftar Harga
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Lead Nama
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produksi
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksi
 DocType: Item,Allow Production Order,Izinkan Pesanan Produksi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Dikirim
 DocType: Salary Structure,Total Earning,Total Penghasilan
 DocType: Purchase Receipt,Time at which materials were received,Waktu di mana bahan yang diterima
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Alamat saya
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Cabang master organisasi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,atau
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ke atas
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
-,Download Backups,Download Backup
 DocType: Notification Control,Sales Order Message,Sales Order Pesan
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Jenis Pembayaran
 DocType: Process Payroll,Select Employees,Pilih Karyawan
 DocType: Bank Reconciliation,To Date,Untuk Tanggal
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Penjelasan
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Pajak dan Biaya
 DocType: Employee,Emergency Contact,Darurat Kontak
 DocType: Item,Quality Parameters,Parameter kualitas
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Induk Barang
 DocType: Account,Account Type,Jenis Account
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak dapat membawa-diteruskan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
 ,To Produce,Untuk Menghasilkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Reserved Kuantitas
 DocType: Landed Cost Voucher,Purchase Receipt Items,Penerimaan Pembelian Produk
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Menyesuaikan Bentuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Pemotongan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Perataan
 DocType: Account,Income Account,Akun Penghasilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Pengecoran
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Docuements
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Biaya Pusat
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Pesan Purchase Order
 DocType: Tax Rule,Shipping Country,Pengiriman Negara
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Total muka ({0}) terhadap Orde {1} tidak bisa lebih besar daripada \
  Grand Total ({2})"
 DocType: Employee,Relieving Date,Menghilangkan Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule harga dibuat untuk menimpa Daftar Harga / mendefinisikan persentase diskon, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya dapat diubah melalui Bursa Masuk / Delivery Note / Penerimaan Pembelian
 DocType: Employee Education,Class / Percentage,Kelas / Persentase
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Pajak Penghasilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser direkayasa membentuk jaring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Pajak Penghasilan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika Aturan Harga yang dipilih dibuat untuk 'Harga', itu akan menimpa Daftar Harga. Harga Rule harga adalah harga akhir, sehingga tidak ada diskon lebih lanjut harus diterapkan. Oleh karena itu, dalam transaksi seperti Sales Order, Purchase Order dll, maka akan diambil di lapangan 'Tingkat', daripada lapangan 'Daftar Harga Tingkat'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Melacak Memimpin menurut Industri Type.
 DocType: Item Supplier,Item Supplier,Item Pemasok
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan saham
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage Group Pelanggan Pohon.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Baru Nama Biaya Pusat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tidak ada Alamat bawaan Template ditemukan. Harap membuat yang baru dari Pengaturan> Percetakan dan Branding> Template Alamat.
 DocType: Appraisal,HR User,HR Pengguna
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
 DocType: Supplier,Billing Currency,Penagihan Mata Uang
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Besar
 ,Profit and Loss Statement,Laba Rugi
 DocType: Bank Reconciliation Detail,Cheque Number,Nomor Cek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Mendesak
 DocType: Payment Tool Detail,Payment Tool Detail,Alat Pembayaran Detil
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Besar
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Tidak ada karyawan ditemukan!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
 DocType: C-Form Invoice Detail,Territory,Wilayah
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Purchase Order,Customer Address Display,Alamat Pelanggan Tampilan
 DocType: Stock Settings,Default Valuation Method,Metode standar Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poles
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standar Satuan Ukur untuk Item {0} tidak dapat diubah secara langsung karena \ Anda telah membuat beberapa transaksi (s) dengan UOM lain. Untuk mengubah UOM default, \ penggunaan &#39;UOM Ganti Utility&#39; alat di bawah modul Stock."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tentukan Nilai Tukar untuk mengkonversi satu mata uang ke yang lain
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Quotation {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Quotation {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Total Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Karyawan {0} sedang cuti pada {1}. Tidak bisa menandai kehadiran.
 DocType: Sales Partner,Targets,Target
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
 ,S.O. No.,SO No
 DocType: Production Order Operation,Make Time Log,Membuat Waktu Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Silahkan mengatur kuantitas menyusun ulang
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Silakan membuat pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimia grinding
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ini adalah kelompok pelanggan akar dan tidak dapat diedit.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Silakan pengaturan grafik Anda account sebelum Anda mulai Entries Akuntansi
 DocType: Purchase Invoice,Ignore Pricing Rule,Abaikan Aturan Harga
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Dibatalkan
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tanggal Struktur Gaji tidak bisa lebih rendah dari karyawan Bergabung Tanggal.
 DocType: Employee Education,Graduate,Lulusan
 DocType: Leave Block List,Block Days,Blokir Hari
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Periksa apakah berulang faktur, hapus centang untuk menghentikan berulang atau menempatkan tepat Tanggal Akhir"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih dari satu paket dari jenis yang sama (untuk mencetak)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} baris diperbolehkan
 DocType: C-Form Invoice Detail,Net Total,Jumlah Bersih
 DocType: Bin,FCFS Rate,FCFS Tingkat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Penagihan (Faktur Penjualan)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast satu item harus dimasukkan dengan kuantitas negatif dalam dokumen kembali
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Mesin elektrokimia
 ,Requested,Diminta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Tidak ada Keterangan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Terlambat
 DocType: Account,Stock Received But Not Billed,Stock Diterima Tapi Tidak Ditagih
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Akar Rekening harus kelompok
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + + Pencairan tunggakan Jumlah Jumlah - Total Pengurangan
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Features Setup,Sales and Purchase,Penjualan dan Pembelian
 DocType: Supplier Quotation Item,Material Request No,Permintaan Material yang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tingkat di mana mata uang pelanggan dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} telah berhasil berhenti berlangganan dari daftar ini.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tingkat Net (Perusahaan Mata Uang)
-apps/frappe/frappe/templates/base.html +134,Added,Ditambahkan
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Kelola Wilayah Pohon.
 DocType: Journal Entry Account,Sales Invoice,Faktur Penjualan
 DocType: Journal Entry Account,Party Balance,Saldo Partai
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak ditemukan.
 DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entries Relevan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Masuk akuntansi Saham
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat pelanggan
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
 DocType: Account,Root Type,Akar Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak dapat kembali lebih dari {1} untuk Item {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Jumlah pajak Setelah Diskon Jumlah (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target gudang adalah wajib untuk baris {0}
 DocType: Quality Inspection,Quality Inspection,Inspeksi Kualitas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Semprot membentuk
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ekstra Kecil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Persediaan Tingkat Minimum
 DocType: Stock Entry,Subcontract,Kontrak tambahan
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,Produsen Part Number
 DocType: Production Order Operation,Estimated Time and Cost,Perkiraan Waktu dan Biaya
 DocType: Bin,Bin,Tong Sampah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Tidak ada dari Sent SMS
 DocType: Account,Company,Perusahaan
 DocType: Account,Expense Account,Beban Akun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Perangkat lunak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perangkat lunak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Warna
 DocType: Maintenance Visit,Scheduled,Dijadwalkan
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Silakan pilih item mana &quot;Apakah Stock Item&quot; adalah &quot;Tidak&quot;, dan &quot;Apakah Penjualan Item&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lainnya"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Distribusi bulanan untuk merata mendistribusikan target di bulan.
 DocType: Purchase Invoice Item,Valuation Rate,Tingkat Penilaian
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: Penerimaan Pembelian {1} tidak ada dalam tabel di atas 'Pembelian Penerimaan'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proyek Tanggal Mulai
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sampai Sampai
 DocType: Rename Tool,Rename Log,Rename Log
 DocType: Installation Note Item,Against Document No,Terhadap Dokumen No.
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Mengelola Penjualan Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksi Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Silahkan pilih {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Peneliti
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Perbarui
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Peneliti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Harap menyimpan Newsletter sebelum dikirim
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nama atau Email adalah wajib
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Pemeriksaan mutu yang masuk.
 DocType: Purchase Order Item,Returned Qty,Kembali Qty
 DocType: Employee,Exit,Keluar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Akar Type adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Akar Type adalah wajib
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial ada {0} dibuat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Getaran finishing
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan pelanggan, kode ini dapat digunakan dalam format cetak seperti Faktur dan Pengiriman Catatan"
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
 DocType: Sales Invoice,Advertisement,iklan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Masa percobaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Masa percobaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node daun yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Beban Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Penerimaan Pembelian Barang Disediakan
@@ -2385,44 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Penggilingan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Kecilkan membungkus
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Tertunda Kegiatan
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Dikonfirmasi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Pemasok> Pemasok Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Aplikasi status 'Disetujui' dapat diajukan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,"Wajib masukan Judul Alamat.
-"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Aplikasi status 'Disetujui' dapat diajukan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Wajib masukan Judul Alamat.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kampanye jika sumber penyelidikan adalah kampanye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Koran Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Koran Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Fiskal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Peleburan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Susun ulang Tingkat
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 DocType: Address,Preferred Shipping Address,Disukai Alamat Pengiriman
 DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Tanggal Posting
 DocType: Item,Valuation Method,Metode Penilaian
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Tidak dapat menemukan tukar untuk {0} ke {1}
 DocType: Sales Invoice,Sales Team,Tim Penjualan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Gandakan entri
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Gandakan entri
 DocType: Serial No,Under Warranty,Berdasarkan Jaminan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Kesalahan]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Sales Order.
 ,Employee Birthday,Ulang Tahun Karyawan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Modal Ventura
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Ventura
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial ada {0} tidak ada
 DocType: Pricing Rule,Discount Percentage,Persentase Diskon
 DocType: Payment Reconciliation Invoice,Invoice Number,Nomor Faktur
-apps/erpnext/erpnext/hooks.py +70,Orders,Pesanan
+apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
 DocType: Leave Control Panel,Employee Type,Tipe Karyawan
 DocType: Employee Leave Approver,Leave Approver,Tinggalkan Approver
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Ditransfer untuk Industri
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Seorang pengguna dengan ""Beban Approver"" Peran"
 ,Issued Items Against Production Order,Tahun Produk Terhadap Orde Produksi
@@ -2434,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pemasok (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periode yang tidak valid
 DocType: Customer,Credit Limit,Batas Kredit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
 DocType: GL Entry,Voucher No,Voucher Tidak ada
@@ -2444,11 +2254,10 @@
 DocType: Customer,Address and Contact,Alamat dan Kontak
 DocType: Customer,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Employee,Feedback,Umpan balik
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit pelanggan dengan {0} hari (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Susunan acara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Mesin jet abrasif
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Susunan acara
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
-DocType: Website Settings,Website Settings,Pengaturan situs web
 DocType: Item,Reorder level based on Warehouse,Tingkat pemesanan ulang berdasarkan Gudang
 DocType: Activity Cost,Billing Rate,Tingkat penagihan
 ,Qty to Deliver,Qty untuk Menyampaikan
@@ -2459,20 +2268,19 @@
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Melacak Pengiriman ini Catatan terhadap Proyek apapun
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Account root tidak bisa dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Account root tidak bisa dihapus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Tampilkan Entries Bursa
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Kerja-in Progress-Gudang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referensi # {0} tanggal {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengelola Alamat
 DocType: Pricing Rule,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Produksi
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
-DocType: Communication,Phone,Telepon
 DocType: Employee Internal Work History,Employee Internal Work History,Karyawan Kerja internal Sejarah
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Penutup (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Penutup (Dr)
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial ada {0} bukan dalam stok
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template Pajak menjual transaksi.
@@ -2488,10 +2296,9 @@
 ,Billed Amount,Jumlah Tagihan
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Update
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Tambahkan beberapa catatan sampel
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Tambahkan beberapa catatan sampel
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Manajemen
-DocType: Event,Groups,Grup
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group by Akun
 DocType: Sales Order,Fully Delivered,Sepenuhnya Disampaikan
 DocType: Lead,Lower Income,Penghasilan rendah
@@ -2500,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Bantuan Cepat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Sumber dan target gudang tidak bisa sama untuk baris {0}
 DocType: Features Setup,Sales Extras,Penjualan Ekstra
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},"{0} anggaran untuk Akun {1} terhadap ""Cost Center"" {2} akan melebihi oleh {3}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Masuk Pembukaan"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},"{0} anggaran untuk Akun {1} terhadap ""Cost Center"" {2} akan melebihi oleh {3}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Masuk Pembukaan"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
 DocType: Sales Order,Customer's Purchase Order,Purchase Order pelanggan
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Menit
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Menit
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
 ,Qty to Receive,Qty untuk Menerima
 DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Block List Diizinkan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konversi tidak dapat di fraksi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Anda akan menggunakannya untuk Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
 DocType: Sales Partner,Retailer,Pengecer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis pemasok
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Barang
 DocType: Sales Order,%  Delivered,% Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cerukan Bank Akun
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Aman
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Mengagumkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Saldo pembukaan Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Tidak dapat menyetujui cuti karena Anda tidak berwenang untuk menyetujui daun di Blok Dates
 DocType: Appraisal,Appraisal,Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pengecoran hilang-busa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Gambar
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tanggal diulang
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang sah
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Tinggalkan approver harus menjadi salah satu {0}
 DocType: Hub Settings,Seller Email,Penjual Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Workstation Working Hour,Start Time,Waktu Mulai
@@ -2547,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 DocType: BOM Operation,Hour Rate,Tingkat Jam
 DocType: Stock Settings,Item Naming By,Item Penamaan Dengan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Dari Quotation
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Dari Quotation
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Lain Periode Pendaftaran penutupan {0} telah dibuat setelah {1}
 DocType: Production Order,Material Transferred for Manufacturing,Bahan Ditransfer untuk Manufaktur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Akun {0} tidak ada
 DocType: Purchase Receipt Item,Purchase Order Item No,Purchase Order Item No
-DocType: System Settings,System Settings,Pengaturan Sistem
 DocType: Project,Project Type,Jenis proyek
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Entah Target qty atau jumlah target adalah wajib.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Biaya berbagai kegiatan
@@ -2561,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detil
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item saham {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Pengiriman saya
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Pengiriman saya
 DocType: Journal Entry,Bill Date,Bill Tanggal
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Bahkan jika ada beberapa Aturan Harga dengan prioritas tertinggi, kemudian mengikuti prioritas internal diterapkan:"
 DocType: Supplier,Supplier Details,Pemasok Rincian
-DocType: Communication,Recipients,Penerima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Meniduri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status Persetujuan
 DocType: Hub Settings,Publish Items to Hub,Publikasikan Produk untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai harus kurang dari nilai dalam baris {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Silakan pilih Rekening Bank
 DocType: Newsletter,Create and Send Newsletters,Membuat dan Kirim Nawala
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Dari Tanggal harus sebelum To Date
 DocType: Sales Order,Recurring Order,Berulang Order
 DocType: Company,Default Income Account,Akun Pendapatan standar
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kelompok Pelanggan / Pelanggan
 DocType: Item Group,Check this if you want to show in website,Periksa ini jika Anda ingin menunjukkan di website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Selamat Datang di ERPNext
+,Welcome to ERPNext,Selamat Datang di ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Nomor Detil
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Menyebabkan Quotation
 DocType: Lead,From Customer,Dari Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Panggilan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Total Biaya (via Waktu Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} tidak disampaikan
 ,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
@@ -2598,13 +2397,10 @@
 DocType: Issue,Opening Date,Tanggal pembukaan
 DocType: Journal Entry,Remark,Komentar
 DocType: Purchase Receipt Item,Rate and Amount,Rate dan Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Membosankan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Dari Sales Order
-DocType: Blog Category,Parent Website Route,Parent Situs Route
 DocType: Sales Order,Not Billed,Tidak Ditagih
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Tidak ada kontak belum ditambahkan.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Tidak aktif
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Biaya mendarat Jumlah Voucher
 DocType: Time Log,Batched for Billing,Batched untuk Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Bills diajukan oleh Pemasok.
@@ -2612,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah Diskon
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,misalnya PPN
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,misalnya PPN
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Masuk Rekening Journal
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok barang atau mengubah nama item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas logam panas membentuk
 DocType: Sales Order Item,Sales Order Date,Sales Order Tanggal
 DocType: Sales Invoice Item,Delivered Qty,Disampaikan Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pergi ke kelompok yang sesuai (biasanya Sumber Dana&gt; Kewajiban Lancar&gt; Pajak dan Tugas dan membuat Akun baru (dengan mengklik Tambahkan Anak) tipe &quot;Pajak&quot; dan melakukan menyebutkan tingkat pajak.
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser cutting
-DocType: Event,Monday,Senin
 DocType: Journal Entry,Stock Entry,Stock Entri
 DocType: Account,Payable,Hutang
 DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
@@ -2635,10 +2428,9 @@
 DocType: Bank Reconciliation Detail,Clearance Date,Izin Tanggal
 DocType: Newsletter,Newsletter List,Daftar Newsletter
 DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Periksa apakah Anda ingin mengirim Slip gaji mail ke setiap karyawan saat mengirimkan Slip gaji
-DocType: Lead,Address Desc,Deskripsi Alamat 
+DocType: Lead,Address Desc,Deskripsi Alamat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Dimana operasi manufaktur dilakukan.
-DocType: Page,All,Semua
 DocType: Stock Entry Detail,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
@@ -2646,9 +2438,8 @@
 DocType: Account,Sales User,Penjualan Pengguna
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Qty tidak dapat lebih besar dari Max Qty
 DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pemasok Detail
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Tetapkan
 DocType: Lead,Lead Owner,Timbal Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Gudang diperlukan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Gudang diperlukan
 DocType: Employee,Marital Status,Status Perkawinan
 DocType: Stock Settings,Auto Material Request,Permintaan Material Otomatis
 DocType: Time Log,Will be updated when billed.,Akan diperbarui saat ditagih.
@@ -2662,44 +2453,40 @@
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Barang Disediakan
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nama perusahaan tidak dapat perusahaan
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Surat Kepala untuk mencetak template.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Judul untuk mencetak template misalnya Proforma Invoice.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda untuk item akan menyebabkan salah (Total) Nilai Berat Bersih. Pastikan Berat Bersih dari setiap item di UOM sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Catatan dari semua komunikasi email jenis, telepon, chatting, kunjungan, dll"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Sebutkan Putaran Off Biaya Pusat di Perusahaan
 DocType: Purchase Invoice,Terms,Istilah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Buat New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Buat New
 DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
 ,Item-wise Sales History,Item-wise Penjualan Sejarah
 DocType: Expense Claim,Total Sanctioned Amount,Jumlah Total Disahkan
 ,Purchase Analytics,Pembelian Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Pengiriman Barang Note
 DocType: Expense Claim,Task,Tugas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Cukur
 DocType: Purchase Taxes and Charges,Reference Row #,Referensi Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang penjualan akar dan tidak dapat diedit.
 ,Stock Ledger,Bursa Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Tingkat: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Tingkat: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Slip Gaji Pengurangan
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Catatan
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Pilih simpul kelompok pertama.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi formulir dan menyimpannya
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download laporan yang berisi semua bahan baku dengan status persediaan terbaru mereka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Menghadapi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Komunitas
 DocType: Leave Application,Leave Balance Before Application,Tinggalkan Saldo Sebelum Aplikasi
 DocType: SMS Center,Send SMS,Kirim SMS
 DocType: Company,Default Letter Head,Standar Surat Kepala
 DocType: Time Log,Billable,Dapat ditagih
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ini akan digunakan untuk menetapkan aturan dalam modul HR
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Susun ulang Qty
 DocType: Company,Stock Adjustment Account,Penyesuaian Stock Akun
@@ -2711,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Peluang Hilang
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Diskon Fields akan tersedia dalam Purchase Order, Penerimaan Pembelian, Purchase Invoice"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Jangan membuat account untuk Pelanggan dan Pemasok
-DocType: Report,Report Type,Jenis Laporan
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Memuat
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
 DocType: Sales Order Item,Supplier delivers to Customer,Pemasok memberikan kepada Nasabah
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Tampilkan pajak break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Impor dan Ekspor
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Jika Anda terlibat dalam aktivitas manufaktur. Memungkinkan Barang 'Apakah Diproduksi'
@@ -2726,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
 DocType: Serial No,Out of AMC,Dari AMC
 DocType: Purchase Order Item,Material Request Detail No,Permintaan Detil Material ada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Keras balik
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Membuat Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
 DocType: Company,Default Cash Account,Standar Rekening Kas
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Perusahaan (tidak Pelanggan atau Pemasok) Master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Masukkan 'Diharapkan Pengiriman Tanggal'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk barang {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Catatan: Jika pembayaran tidak dilakukan terhadap setiap referensi, membuat Journal Masuk manual."
 DocType: Item,Supplier Items,Pemasok Produk
 DocType: Opportunity,Opportunity Type,Peluang Type
@@ -2747,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Stock Penuaan
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Kirim email otomatis ke Kontak transaksi Mengirimkan.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2755,59 +2539,51 @@
  Qty Tersedia: {4}, Transfer Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
 DocType: Purchase Order,Customer Contact Email,Email Kontak Pelanggan
-DocType: Event,Sunday,Minggu
 DocType: Sales Team,Contribution (%),Kontribusi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening Bank tidak ditentukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggung Jawab
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Masukkan minimal 1 faktur dalam tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Tambahkan Pengguna
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Tambahkan Pengguna
 DocType: Pricing Rule,Item Group,Item Grup
 DocType: Task,Actual Start Date (via Time Logs),Sebenarnya Tanggal Mulai (via Waktu Log)
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
 DocType: Item,Default BOM,Standar BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Time Log Batch,Total Hours,Jumlah Jam
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotif
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item diperlukan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Logam injection molding
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotif
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Delivery Note
 DocType: Time Log,From Time,Dari Waktu
 DocType: Notification Control,Custom Message,Custom Pesan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Perbankan Investasi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Pilih Negara Anda, Time Zone dan Mata Uang"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pengawetan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pengecoran pasir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Menilai
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Menginternir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Menginternir
 DocType: Newsletter,A Lead with this email id should exist,Sebuah Lead dengan id email ini harus ada
 DocType: Stock Entry,From BOM,Dari BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Dasar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Untuk tanggal harus sama dengan Dari Tanggal untuk cuti Half Day
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
 DocType: Salary Structure,Salary Structure,Struktur Gaji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silakan menyelesaikan \
  konflik dengan menetapkan prioritas. Harga Aturan: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Isu Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Isu Material
 DocType: Material Request Item,For Warehouse,Untuk Gudang
 DocType: Employee,Offer Date,Penawaran Tanggal
 DocType: Hub Settings,Access Token,Akses Token
@@ -2816,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,Apakah Fixed Asset Barang
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Jika Anda memiliki format cetak yang panjang, fitur ini dapat digunakan untuk membagi halaman yang akan dicetak pada beberapa halaman dengan semua header dan footer pada setiap halaman"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Barang
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
 DocType: Purchase Invoice Item,Image View,Citra Tampilan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; menyelesaikan industri
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Efek & Bursa Komoditi
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Pengeboran
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
 DocType: Tax Rule,Shipping City,Pengiriman Kota
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Barang ini adalah Varian dari {0} (Template). Atribut akan disalin dari template kecuali 'No Copy' diatur
 DocType: Account,Purchase User,Pembelian Pengguna
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Tempa
-DocType: Web Page,Slideshow,Rangkai Salindia
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
 DocType: Journal Entry,Print Heading,Cetak Pos
 DocType: Quotation,Maintenance Manager,Manajer Pemeliharaan
-DocType: Workflow State,Search,Pencarian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh nol
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Hari Sejak Pemesanan terakhir' harus lebih besar dari atau sama dengan nol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Mematri
 DocType: C-Form,Amended From,Diubah Dari
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Bahan Baku
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Entah sasaran qty atau jumlah target adalah wajib
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Silakan pilih Posting Tanggal pertama
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
@@ -2863,45 +2631,44 @@
 ,Produced,Diproduksi
 DocType: Item,Item Code for Suppliers,Item Code untuk Pemasok
 DocType: Issue,Raised By (Email),Dibesarkan Oleh (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Umum
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Lampirkan Surat
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Umum
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Lampirkan Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Daftar kepala pajak Anda (misalnya PPN, Bea Cukai dll, mereka harus memiliki nama yang unik) dan tarif standar mereka. Ini akan membuat template standar, yang dapat Anda edit dan menambahkan lagi nanti."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Daftar kepala pajak Anda (misalnya PPN, Bea Cukai dll, mereka harus memiliki nama yang unik) dan tarif standar mereka. Ini akan membuat template standar, yang dapat Anda edit dan menambahkan lagi nanti."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Barang {0}
 DocType: Journal Entry,Bank Entry,Bank Masuk
 DocType: Authorization Rule,Applicable To (Designation),Berlaku Untuk (Penunjukan)
-DocType: Blog Post,Blog Post,Posting Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Kelompok Dengan
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Mengaktifkan / menonaktifkan mata uang.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Beban pos
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Purchase Order,The date on which recurring order will be stop,Tanggal perintah berulang akan berhenti
 DocType: Quality Inspection,Item Serial No,Item Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} harus dikurangi oleh {1} atau Anda harus meningkatkan toleransi overflow
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Hadir
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Jam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Jam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Baru Serial ada tidak dapat memiliki Gudang. Gudang harus diatur oleh Bursa Masuk atau Penerimaan Pembelian
 DocType: Lead,Lead Type,Timbal Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Quotation
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui daun di Blok Tanggal
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang tersebut telah ditagih
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Keriting
 DocType: Account,Tax,PPN
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Baris {0}: {1} tidak valid {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Pengilangan
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Baris {0}: {1} tidak valid {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Dari Bundle Produk
 DocType: Production Planning Tool,Production Planning Tool,Alat Perencanaan Produksi
 DocType: Quality Inspection,Report Date,Tanggal Laporan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Rute
 DocType: C-Form,Invoices,Faktur
 DocType: Job Opening,Job Title,Jabatan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
 DocType: Features Setup,Item Groups in Details,Item Grup dalam Rincian
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Industri harus lebih besar dari 0.
@@ -2910,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,Update Rate dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Persentase Anda diijinkan untuk menerima atau memberikan lebih terhadap kuantitas memerintahkan. Misalnya: Jika Anda telah memesan 100 unit. dan Tunjangan Anda adalah 10% maka Anda diperbolehkan untuk menerima 110 unit.
 DocType: Pricing Rule,Customer Group,Kelompok Pelanggan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: Item,Website Description,Website Description
 DocType: Serial No,AMC Expiry Date,AMC Tanggal Berakhir
 ,Sales Register,Daftar Penjualan
 DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
 DocType: Address,Plant,Tanaman
-DocType: DocType,Setup,Pengaturan
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Cold rolling
 DocType: Customer Group,Customer Group Name,Nama Kelompok Pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya daun tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Item,Attributes,Atribut
-DocType: Packing Slip,Get Items,Dapatkan Produk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Cukup masukkan Write Off Akun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Dapatkan Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pesanan terakhir Tanggal
-DocType: DocField,Image,Gambar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Membuat Cukai Faktur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akun {0} tidak milik perusahaan {1}
-DocType: Communication,Other,Lain-lain
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operasi tidak diatur
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Kunjungan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Kunjungan
 DocType: Leave Type,Is Encash,Apakah menjual
 DocType: Purchase Invoice,Mobile No,Ponsel Tidak ada
 DocType: Payment Tool,Make Journal Entry,Membuat Jurnal Entri
@@ -2944,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komersial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komersial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Induk Barang {0} tidak harus menjadi Stok Item
 DocType: Cost Center,Distribution Id,Id Distribusi
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Layanan mengagumkan
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Semua Produk atau Jasa.
 DocType: Purchase Invoice,Supplier Address,Pemasok Alamat
-DocType: Contact Us Settings,Address Line 2,Alamat Baris 2
-DocType: ToDo,Reference,Referensi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Qty
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series adalah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Jasa Keuangan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan sebesar {3}
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Dasar Jumlah
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Barang {0}
 DocType: Leave Allocation,Unused leaves,Daun terpakai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standar Piutang Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Menggergaji
 DocType: Tax Rule,Billing State,Negara penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
 DocType: Supplier,Contact HTML,Hubungi HTML
@@ -2983,9 +2740,8 @@
 DocType: Company,Retail,Eceran
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak ada
 DocType: Attendance,Absent,Absen
-DocType: Product Bundle,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Penghancuran
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Keterangan
@@ -2993,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 DocType: Features Setup,POS View,Lihat POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Catatan instalasi untuk No Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Pengecoran kontinu
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Silakan tentukan
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Di atas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Dingin
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Akun {0} tidak dapat menjadi akun Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Daerah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk misalnya 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Laba Provisional / Rugi (Kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Penjualan Faktur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Butir 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Silakan set nilai default {0} di Perusahaan {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Silakan set nilai default {0} di Perusahaan {1}
 DocType: Serial No,Creation Time,Waktu Pembuatan
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Pendapatan
 DocType: Sales Invoice,Product Bundle Help,Produk Bundle Bantuan
 ,Monthly Attendance Sheet,Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Tidak ada catatan ditemukan
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dapatkan Produk dari Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akun {0} tidak aktif
 DocType: GL Entry,Is Advance,Apakah Muka
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tanggal dan Kehadiran Sampai Tanggal adalah wajib
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Masukkan 'Apakah subkontrak' sebagai Ya atau Tidak
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Masukkan 'Apakah subkontrak' sebagai Ya atau Tidak
 DocType: Sales Team,Contact No.,Hubungi Nomor
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Pembukaan
-DocType: Workflow State,Time,Durasi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Tipe akun 'Laba Rugi' {0} tidak diperbolehkan dalam Entri Saldo Awal
 DocType: Features Setup,Sales Discounts,Penjualan Diskon
 DocType: Hub Settings,Seller Country,Penjual Negara
 DocType: Authorization Rule,Authorization Rule,Regulasi Autorisasi
 DocType: Sales Invoice,Terms and Conditions Details,Syarat dan Ketentuan Detail
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Penjualan Pajak dan Biaya Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Jumlah Pesanan
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bagian atas daftar produk.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Tentukan kondisi untuk menghitung jumlah pengiriman
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peran Diizinkan Set Beku Account & Edit Frozen Entri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak dapat mengkonversi Biaya Center untuk buku karena memiliki node anak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktor konversi diperlukan
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisi Penjualan
 DocType: Offer Letter Term,Value / Description,Nilai / Keterangan
@@ -3042,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,Pelanggan Tidak Membeli Sejak Long Time
 DocType: Production Order,Expected Delivery Date,Diharapkan Pengiriman Tanggal
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Menonjol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Menguapkan-pola pengecoran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Beban Hiburan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Usia
 DocType: Time Log,Billing Amount,Penagihan Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantitas tidak valid untuk item {0}. Jumlah harus lebih besar dari 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikasi untuk cuti.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Beban Legal
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari bulan yang urutan otomatis akan dihasilkan misalnya 05, 28 dll"
 DocType: Sales Invoice,Posting Time,Posting Waktu
@@ -3064,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Pendapatan Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Biaya Perjalanan
 DocType: Maintenance Visit,Breakdown,Rincian
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata: {1} tidak dapat dipilih
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata: {1} tidak dapat dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mengasah
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Percobaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
-DocType: Feed,Full Name,Nama Lengkap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Meraih
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percobaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standar Warehouse adalah wajib bagi saham Barang.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Total Dibayar
 ,Transferred Qty,Ditransfer Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Menjelajahi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Perencanaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Perencanaan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Membuat Waktu Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Diterbitkan
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Kami menjual item ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Kami menjual item ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Pemasok Id
 DocType: Journal Entry,Cash Entry,Masuk Kas
 DocType: Sales Partner,Contact Desc,Contact Info
@@ -3092,18 +2839,16 @@
 DocType: Brand,Item Manager,Item Manajer
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambahkan baris untuk mengatur akun anggaran tahunan.
 DocType: Buying Settings,Default Supplier Type,Standar Pemasok Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Penggalian
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Catatan: Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kontak.
 DocType: Newsletter,Test Email Id,Uji Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Singkatan Perusahaan
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Perusahaan
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Jika Anda mengikuti Inspeksi Kualitas. Memungkinkan Barang QA Diperlukan dan QA ada di Penerimaan Pembelian
 DocType: GL Entry,Party Type,Type Partai
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Bahan baku tidak bisa sama dengan Butir utama
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Molding rotasi
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Master Gaji Template.
 DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti Diizinkan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Peraturan Pajak untuk keranjang belanja
@@ -3117,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Harga untuk Memimpin atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit saham beku
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Barang Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Grup Pelanggan
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template pajak adalah wajib.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
 DocType: Account,Temporary,Sementara
 DocType: Address,Preferred Billing Address,Disukai Alamat Penagihan
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretaris
 DocType: Serial No,Distinct unit of an Item,Unit berbeda Item
 DocType: Pricing Rule,Buying,Pembelian
 DocType: HR Settings,Employee Records to be created by,Rekaman Karyawan yang akan dibuat oleh
@@ -3138,24 +2883,21 @@
 ,Item-wise Price List Rate,Barang-bijaksana Daftar Harga Tingkat
 DocType: Purchase Order Item,Supplier Quotation,Pemasok Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Setrika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} dihentikan
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
 DocType: Lead,Add to calendar on this date,Tambahkan ke kalender pada tanggal ini
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara Mendatang
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan diwajibkan
-DocType: Letter Head,Letter Head,Surat Kepala
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entri Cepat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Kembali
 DocType: Purchase Order,To Receive,Menerima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Kecilkan pas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Penghasilan / Beban
 DocType: Employee,Personal Email,Email Pribadi
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan posting entri akuntansi untuk persediaan otomatis."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Memperantarai
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Memperantarai
 DocType: Address,Postal Code,kode Pos
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","di Menit 
@@ -3163,18 +2905,16 @@
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pesanan dirilis untuk produksi.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Masuk
 DocType: Hub Settings,Name Token,Nama Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Perencanaan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Jual
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Jual
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Setidaknya satu gudang adalah wajib
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Masukkan Satuan default Ukur
 DocType: Purchase Invoice Item,Project Name,Nama Proyek
 DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
-DocType: Workflow State,Edit,Ubah
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Features Setup,Item Batch Nos,Item Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbedaan
@@ -3182,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rekonsiliasi Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset pajak
 DocType: BOM Item,BOM No,No. BOM
-DocType: Contact Us Settings,Pincode,Kode PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM yang akan diganti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM harus berbeda dari UOM saham saat ini
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Daun harus dialokasikan dalam kelipatan 0,5"
 DocType: Production Order,Operation Cost,Biaya Operasi
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload kehadiran dari file csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Posisi Amt
@@ -3204,10 +2942,7 @@
 DocType: Project,Default Cost Center,Standar Biaya Pusat
 DocType: Purchase Invoice,End Date,Tanggal Berakhir
 DocType: Employee,Internal Work History,Sejarah Kerja internal
-DocType: DocField,Column Break,Kolom Istirahat
-DocType: Event,Thursday,Kamis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Putar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Pelanggan Umpan
 DocType: Account,Expense,Biaya
 DocType: Sales Invoice,Exhibition,Pameran
@@ -3220,31 +2955,30 @@
 DocType: Employee,Held On,Diadakan Pada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksi Barang
 ,Employee Information,Informasi Karyawan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Tahun Keuangan Akhir Tanggal
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Tahun Keuangan Akhir Tanggal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangi Produktif untuk Tinggalkan Tanpa Bayar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Menambahkan pengguna ke organisasi Anda, selain diri Anda"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Menambahkan pengguna ke organisasi Anda, selain diri Anda"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Santai Cuti
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Catatan: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan minggu ini
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} harus merupakan barang yang dibeli atau barang sub-kontrak di baris {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} hanya dapat diperbarui melalui Transaksi Bursa
 DocType: GL Entry,Party,Pihak
 DocType: Sales Order,Delivery Date,Tanggal Pengiriman
-DocType: DocField,Currency,Mata uang
 DocType: Opportunity,Opportunity Date,Peluang Tanggal
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Pembelian Penerimaan
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Memerintahkan%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tingkat Membeli
 DocType: Task,Actual Time (in Hours),Waktu yang sebenarnya (di Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
@@ -3261,77 +2995,68 @@
 DocType: Opportunity,To Discuss,Untuk Diskusikan
 DocType: SMS Settings,SMS Settings,Pengaturan SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Akun sementara
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Hitam
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Ledakan Barang
 DocType: Account,Auditor,Akuntan
 DocType: Purchase Order,End date of current order's period,Tanggal akhir periode orde berjalan
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Penawaran Surat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kembali
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
-DocType: DocField,Fold,Melipat
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standar Satuan Ukur untuk Varian harus sama dengan Template
 DocType: Production Order Operation,Production Order Operation,Pesanan Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
 DocType: Project Task,Pending Review,Pending Ulasan
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Silakan tentukan
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Pelanggan Id
-DocType: Page,Page Name,Nama Halaman
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk waktu harus lebih besar dari Dari Waktu
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} tidak disampaikan
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finishing Spindle
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Tugas ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","misalnya ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","misalnya ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak bisa eksis untuk Item {0} karena memiliki varian
 ,Sales Person-wise Transaction Summary,Penjualan Orang-bijaksana Rangkuman Transaksi
-DocType: System Settings,Time Zone,"Zona Waktu: GMT +2; CET +1, dan EST (AS-Timur) +7"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Gudang {0} tidak ada
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Untuk mendaftar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Persentase Distribusi bulanan
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Dari materi yang disampaikan terhadap Pengiriman ini Note
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapel
 DocType: Customer,Customer Details,Rincian pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Membentuk
 DocType: Employee,Reports to,Laporan untuk
 DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
 DocType: Sales Invoice,Paid Amount,Dibayar Jumlah
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Menutup Akun {0} harus bertipe 'Kewajiban'
 ,Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Manajemen Kualitas
 DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
 DocType: Payment Tool Detail,Against Voucher No,Terhadap Voucher Tidak ada
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
 DocType: Tax Rule,Purchase,Pembelian
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Jumlah Saldo
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Jumlah Saldo
 DocType: Item Group,Parent Item Group,Induk Barang Grup
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Pusat biaya
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Gudang.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Gudang.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tingkat di mana mata uang pemasok dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik Timing dengan baris {1}
 DocType: Opportunity,Next Contact,Hubungi Berikutnya
 DocType: Employee,Employment Type,Jenis Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aktiva Tetap
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periode aplikasi tidak bisa di dua catatan alokasi
 DocType: Item Group,Default Expense Account,Beban standar Akun
 DocType: Employee,Notice (days),Notice (hari)
-DocType: Page,Yes,Ya
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
 DocType: Employee,Encashment Date,Pencairan Tanggal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Terhadap Voucher Type harus menjadi salah satu Purchase Order, Purchase Invoice atau Journal Masuk"
 DocType: Account,Stock Adjustment,Penyesuaian Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standar Kegiatan Biaya ada untuk Jenis Kegiatan - {0}
 DocType: Production Order,Planned Operating Cost,Direncanakan Biaya Operasi
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Baru {0} Nama
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Silakan menemukan terlampir {0} # {1}
 DocType: Job Applicant,Applicant Name,Nama Pemohon
 DocType: Authorization Rule,Customer / Item Name,Pelanggan / Item Nama
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3344,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial ada adalah wajib untuk Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Silakan tentukan dari / ke berkisar
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Dibuat Oleh
 DocType: Serial No,Under AMC,Di bawah AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Tingkat penilaian Item dihitung ulang mengingat mendarat biaya jumlah voucher
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Pengaturan default untuk menjual transaksi.
@@ -3356,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Barang pembaruan Selesai
 DocType: Workstation,per hour,per jam
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seri {0} sudah digunakan dalam {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
 DocType: Company,Distribution,Distribusi
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Jumlah Dibayar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager Project
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Pajak default dan Biaya
 DocType: Account,Receivable,Piutang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Pemasok sebagai Purchase Order sudah ada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Pemasok sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
 DocType: Sales Invoice,Supplier Reference,Pemasok Referensi
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Jika dicentang, BOM untuk item sub-assembly akan dipertimbangkan untuk mendapatkan bahan baku. Jika tidak, semua item sub-assembly akan diperlakukan sebagai bahan baku."
@@ -3374,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,Penjual Deskripsi
 DocType: Employee Education,Qualification,Kualifikasi
 DocType: Item Price,Item Price,Item Price
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
 DocType: Warehouse,Warehouse Name,Gudang Nama
 DocType: Naming Series,Select Transaction,Pilih Transaksi
@@ -3384,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Dukungan Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Perusahaan hilang di gudang {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Ganti Utilitas
 DocType: POS Profile,Terms and Conditions,Syarat dan Ketentuan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Untuk tanggal harus dalam Tahun Anggaran. Dengan asumsi To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini Anda dapat mempertahankan tinggi, berat, alergi, masalah medis dll"
@@ -3396,7 +3118,7 @@
 DocType: Sales Order Item,For Production,Untuk Produksi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Masukkan order penjualan pada tabel di atas
 DocType: Project Task,View Task,Lihat Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Tahun pembukuan Anda dimulai
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tahun pembukuan Anda dimulai
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Cukup masukkan Pembelian Penerimaan
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
@@ -3404,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Pengaturan server masuk untuk email dukungan id. (Misalnya support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Salary Slip,Salary Slip,Slip Gaji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Sampai Tanggal' harus diisi
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Sampai Tanggal' harus diisi
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menghasilkan kemasan slip paket yang akan dikirimkan. Digunakan untuk memberitahu nomor paket, isi paket dan berat."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Barang
 DocType: Salary Slip,Payment Days,Hari Pembayaran
 DocType: BOM,Manage cost of operations,Mengelola biaya operasional
 DocType: Features Setup,Item Advanced,Item Lanjutan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot bergulir
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ketika salah satu transaksi yang diperiksa ""Dikirim"", email pop-up secara otomatis dibuka untuk mengirim email ke terkait ""Kontak"" dalam transaksi itu, dengan transaksi sebagai lampiran. Pengguna mungkin atau mungkin tidak mengirim email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Pengaturan global
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Akun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial ada {0} telah diterima
@@ -3426,35 +3146,28 @@
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potensi peluang untuk menjual.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Valid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Nama Alamat Penagihan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departmen Store
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Balance
-DocType: Workflow,Is Active,Aktif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departmen Store
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistem Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Simpan dokumen pertama.
 DocType: Account,Chargeable,Dibebankan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ubah Singkatan
-DocType: Workflow State,Primary,Utama
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
 DocType: Item,Max Discount (%),Max Diskon (%)
-DocType: Communication,More Information,Informasi lebih
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Pesanan terakhir Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Peledakan
 DocType: Company,Warn,Memperingatkan
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Item penilaian diperbarui
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
 DocType: BOM,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Order,Raw Materials Supplied,Disediakan Bahan Baku
 DocType: Purchase Invoice,Recurring Print Format,Berulang Print Format
-DocType: Communication,Series,Seri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Purchase Order Tanggal
 DocType: Appraisal,Appraisal Template,Template Penilaian
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikasi Barang
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Pemeliharaan Visit Tujuan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,General Ledger
@@ -3464,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Silahkan pilih {0} pertama
 DocType: Features Setup,To get Item Group in details table,Untuk mendapatkan Barang Group di tabel rincian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Menggambar ulang
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsa
 DocType: Sales Invoice,Commission,Komisi
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3492,7 +3203,7 @@
  {% jika email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Jumlah standar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ringkasan ini Bulan ini
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspeksi Kualitas Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
@@ -3511,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Simpan web 900px ramah (w) oleh 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Pesanan produksi tidak dapat diajukan terhadap Template Barang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Biaya diperbarui dalam Pembelian Penerimaan terhadap setiap item
 DocType: Payment Tool,Get Outstanding Vouchers,Dapatkan Posisi Voucher
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
 DocType: Appraisal,Start Date,Tanggal Mulai
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Nilai
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk memverifikasi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
@@ -3527,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Rata-rata waktu yang dibutuhkan oleh pemasok untuk memberikan
 DocType: Time Log,Hours,Jam
 DocType: Project,Expected Start Date,Diharapkan Tanggal Mulai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Bergulir
-DocType: ToDo,Priority,Prioritas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Diizinkan
-DocType: Dropbox Backup,Weekly,Mingguan
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Menerima
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Menerima
 DocType: Maintenance Visit,Fully Completed,Sepenuhnya Selesai
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
 DocType: Employee,Educational Qualification,Kualifikasi Pendidikan
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Employee Leave Approver,Employee Leave Approver,Karyawan Tinggalkan Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berhasil ditambahkan ke daftar Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron beam mesin
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Guru Manajer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Pesanan produksi {0} harus diserahkan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Laporan Utama
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Bursa Ledger entri saldo diperbarui
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tambah / Edit Harga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Bagan Pusat Biaya
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Pesanan saya
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Pesanan saya
 DocType: Price List,Price List Name,Daftar Harga Nama
 DocType: Time Log,For Manufacturing,Untuk Manufaktur
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Total
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Total
 DocType: BOM,Manufacturing,Manufaktur
 ,Ordered Items To Be Delivered,Memerintahkan Items Akan Disampaikan
 DocType: Account,Income,Penghasilan
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Jenis Industri
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ada yang salah!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Peringatan: Tinggalkan aplikasi berisi tanggal blok berikut
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah disampaikan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tanggal Penyelesaian
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die pengecoran
-DocType: Email Alert,Reference Date,Referensi Tanggal
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Masukkan nos ponsel yang valid
 DocType: Budget Detail,Budget Detail,Rincian Anggaran
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Masukkan pesan sebelum mengirimnya
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Bursa UOM diperbarui untuk Item {0}
-DocType: Company History,Year,Tahun
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Silahkan Perbarui Pengaturan SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Waktu Log {0} sudah ditagih
@@ -3588,55 +3286,52 @@
 ,Serial No Service Contract Expiry,Serial No Layanan Kontrak kadaluarsa
 DocType: Item,Unit of Measure Conversion,Unit Konversi Ukur
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Karyawan tidak dapat diubah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Penyisihan over-{0} menyeberang untuk Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini milik.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Pemasok Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Pemasok Anda
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Lain Struktur Gaji {0} aktif untuk karyawan {1}. Silakan membuat statusnya 'aktif' untuk melanjutkan.
 DocType: Purchase Invoice,Contact,Kontak
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Diterima dari
 DocType: Features Setup,Exports,Ekspor
 DocType: Lead,Converted,Dikonversi
 DocType: Item,Has Serial No,Memiliki Serial No
 DocType: Employee,Date of Issue,Tanggal Issue
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Pemasok untuk item {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Barang ini dalam beberapa kelompok di website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
 DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan Entries Unreconciled
 DocType: Cost Center,Budgets,Anggaran
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Diperbarui
 DocType: Employee,Emergency Contact Details,Detail Darurat Kontak
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Apa gunanya?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa gunanya?
 DocType: Delivery Note,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akun {0} telah dimasukkan lebih dari sekali untuk tahun fiskal {1}
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-persediaan"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Memiliki Nomor Serial' tidak bisa 'dipilih' untuk item non-stok"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Memperbarui biaya tambahan untuk menghitung biaya mendarat item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Listrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Listrik
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID tidak ditetapkan untuk Karyawan {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Garansi Klaim
 DocType: Stock Entry,Default Source Warehouse,Sumber standar Gudang
 DocType: Item,Customer Code,Kode Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder untuk {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Memukul-mukul
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Hari Sejak Orde terakhir
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Hari Sejak Orde terakhir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Penamaan Series
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Block List
-DocType: User,Enabled,Diaktifkan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Apakah Anda benar-benar ingin Menyerahkan semua Slip Gaji untuk bulan {0} dan tahun {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Pelanggan impor
@@ -3644,19 +3339,18 @@
 DocType: Attendance,Present,ada
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh disampaikan
 DocType: Notification Control,Sales Invoice Message,Penjualan Faktur Pesan
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Rekening {0} harus dari jenis Kewajiban / Ekuitas
 DocType: Authorization Rule,Based On,Berdasarkan
 DocType: Sales Order Item,Ordered Qty,Memerintahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Dari dan Untuk Periode tanggal wajib bagi berulang {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Kegiatan proyek / tugas.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Menghasilkan Gaji Slips
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} bukan id email yang valid
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
-DocType: ToDo,Low,Rendah
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Menulis Off Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Pemintalan
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Biaya mendarat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Silakan set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
@@ -3678,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nama Promosi diperlukan
 DocType: Maintenance Visit,Maintenance Date,Pemeliharaan Tanggal
 DocType: Purchase Receipt Item,Rejected Serial No,Ditolak Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dalam menggambar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Baru Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Tampilkan Balance
@@ -3689,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Penuaan Rentang 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Menarik
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
 ,Sales Analytics,Penjualan Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Pengaturan manufaktur
@@ -3701,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Biaya Bahan Baku Disediakan
 DocType: Selling Settings,Settings for Selling Module,Pengaturan untuk Jual Modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Layanan Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Layanan Pelanggan
 DocType: Item,Thumbnail,Kuku ibu jari
 DocType: Item Customer Detail,Item Customer Detail,Barang Pelanggan Detil
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Konfirmasi Email Anda
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Penawaran calon Ayub.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt untuk Email pada Penyampaian
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Jumlah daun dialokasikan lebih dari hari pada periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} harus stok Barang
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Kerja In Progress Gudang
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} harus diperlukan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuum molding
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Diharapkan Tanggal tidak bisa sebelum Material Request Tanggal
-DocType: Contact Us Settings,City,Kota
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic mesin
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kesalahan: Tidak id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} harus Item Penjualan
 DocType: Naming Series,Update Series Number,Pembaruan Series Number
 DocType: Account,Equity,Modal
 DocType: Sales Order,Printing Details,Percetakan Detail
 DocType: Task,Closing Date,Closing Date
 DocType: Sales Order Item,Produced Quantity,Diproduksi Jumlah
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Insinyur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Insinyur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cari Sub Sidang
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
 DocType: Sales Partner,Partner Type,Mitra Type
@@ -3730,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Diskon
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
 DocType: Production Order,Production Order,Pesanan Produksi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalasi Catatan {0} telah disampaikan
 DocType: Quotation Item,Against Docname,Terhadap Docname
 DocType: SMS Center,All Employee (Active),Semua Karyawan (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
@@ -3738,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,Biaya Bahan Baku
 DocType: Item,Re-Order Level,Re-order Tingkat
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty direncanakan untuk yang Anda ingin meningkatkan pesanan produksi atau download bahan baku untuk analisis.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Bagan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Daftar hari libur yang berlaku
 DocType: Employee,Cheque,Cek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seri Diperbarui
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Jenis Laporan adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Barang {0} berturut-turut {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Grosir
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Pertama Menanggapi On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pengguna Pertama: Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tanggal Mulai dan Akhir Tahun Fiskal Tanggal sudah ditetapkan pada Tahun Anggaran {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Berhasil Berdamai
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berhasil Berdamai
 DocType: Production Order,Planned End Date,Direncanakan Tanggal Berakhir
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dimana item disimpan.
 DocType: Tax Rule,Validity,Keabsahan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Faktur Jumlah
 DocType: Attendance,Attendance,Kehadiran
-DocType: Page,No,Nomor
 DocType: BOM,Materials,bahan materi
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak diperiksa, daftar harus ditambahkan ke setiap departemen di mana itu harus diterapkan."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
@@ -3765,55 +3451,46 @@
 ,Item Prices,Harga Barang
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Purchase Order.
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher Periode penutupan
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Daftar harga Master.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Daftar harga Master.
 DocType: Task,Review Date,Ulasan Tanggal
 DocType: Purchase Invoice,Advance Payments,Uang Muka
-DocType: DocPerm,Level,Level
 DocType: Purchase Taxes and Charges,On Net Total,Pada Bersih Jumlah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notifikasi Alamat Email' tidak ditentukan untuk nota langganan %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Penggilingan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tidak ada izin untuk menggunakan Alat Pembayaran
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notifikasi Alamat Email' tidak ditentukan untuk nota langganan %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
 DocType: Company,Round Off Account,Bulat Off Akun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Menggigit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Beban Administrasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultasi
 DocType: Customer Group,Parent Customer Group,Induk Pelanggan Grup
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Email Kontak
 DocType: Appraisal Goal,Score Earned,Skor Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Pemberitahuan Masa
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","misalnya ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Pemberitahuan Masa
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak dapat diedit.
 DocType: Packing Slip,Gross Weight UOM,Berat Kotor UOM
 DocType: Email Digest,Receivables / Payables,Piutang / Hutang
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Pencetakan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Landed Biaya Barang
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Barang
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 DocType: Task,Actual End Date (via Time Logs),Sebenarnya Tanggal Akhir (via Waktu Log)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Masukkan pusat biaya orang tua
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-saham
-DocType: User,Last Name,Nama Belakang
-DocType: Web Page,Left,Waktu tersisa
-DocType: Event,All Day,Semua Hari
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-saham
 DocType: Issue,Support Team,Dukungan Tim
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
-DocType: Contact Us Settings,State,Propinsi
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Keseimbangan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Keseimbangan
 DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban)
-DocType: User,Gender,Jenis Kelamin
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Per Saham UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Tidak Kedaluwarsa
@@ -3827,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Buat aturan untuk membatasi transaksi berdasarkan nilai-nilai.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika dicentang, total ada. dari Hari Kerja akan mencakup libur, dan ini akan mengurangi nilai Gaji Per Hari"
 DocType: Purchase Invoice,Total Advance,Jumlah Uang Muka
-DocType: Workflow State,User,Pengguna
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Pengolahan Payroll
 DocType: Opportunity Item,Basic Rate,Harga Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Set as Hilang
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Catatan
 DocType: Customer,Credit Days Based On,Hari Kredit Berdasarkan
 DocType: Tax Rule,Tax Rule,Aturan pajak
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menjaga Tingkat Sama Sepanjang Siklus Penjualan
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rencana waktu log luar Jam Kerja Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
 ,Items To Be Requested,Items Akan Diminta
-DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tingkat penagihan berdasarkan Jenis Kegiatan (per jam)
 DocType: Company,Company Info,Info Perusahaan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Perusahaan Email ID tidak ditemukan, maka surat tidak terkirim"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 DocType: Production Planning Tool,Filter based on item,Filter berdasarkan pada item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Akun Debit
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
 DocType: Purchase Common,Purchase Common,Pembelian Umum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} telah dimodifikasi. Silahkan me-refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Karyawan
 DocType: Sales Invoice,Is POS,Apakah POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Diproduksi Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantitas Diterima
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bills diajukan ke Pelanggan.
-DocType: DocField,Default,Dfault
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proyek Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan telah ditambahkan
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Anggaran untuk Biaya Pusat ini. Untuk mengatur aksi anggaran, lihat &quot;Daftar Perusahaan&quot;"
@@ -3875,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Expense Claim,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Memilih ""Ya"" akan memberikan identitas unik untuk setiap entitas dari produk ini yang dapat dilihat dalam Serial No guru."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 DocType: Employee,Education,Pendidikan
 DocType: Selling Settings,Campaign Naming By,Penamaan Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
 DocType: Address,Office,Kantor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Laporan standar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Silakan pilih Rekam Karyawan pertama.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akun Pajak
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Masukkan Beban Akun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Masukkan Beban Akun
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Industri
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Persediaan
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Persediaan
 DocType: Employee,Contract End Date,Tanggal Kontrak End
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Pesanan Penjualan ini terhadap Proyek apapun
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tarik pesanan penjualan (pending untuk memberikan) berdasarkan kriteria di atas
-DocType: DocShare,Document Type,Jenis Dokumen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Dari Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Dari Pemasok Quotation
 DocType: Deduction Type,Deduction Type,Pengurangan Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Untuk melacak item dalam penjualan dan dokumen pembelian dengan nos batch. &quot;Industri yang dipilih: Kimia&quot;
 DocType: GL Entry,Transaction Date,Transaction Tanggal
 DocType: Production Plan Item,Planned Qty,Rencana Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Pajak
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Pajak
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Untuk Quantity (Diproduksi Qty) adalah wajib
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
 DocType: Notification Control,Purchase Receipt Message,Penerimaan Pembelian Pesan
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Jumlah daun dialokasikan lebih dari periode
 DocType: Production Order,Actual Start Date,Tanggal Mulai Aktual
 DocType: Sales Order,% of materials delivered against this Sales Order,% Dari materi yang disampaikan terhadap Sales Order ini
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gerakan barang Rekam.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Daftar Pelanggan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Layanan
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 ,Monthly Salary Register,Gaji Bulanan Daftar
-apps/frappe/frappe/website/template.py +140,Next,Berikutnya
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat pelanggan
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Sebelumnya Row Jumlah
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Cukup masukkan Jumlah Pembayaran minimal satu baris
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Cukup masukkan Jumlah Pembayaran minimal satu baris
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Baris {0}: Jumlah Pembayaran tidak dapat lebih besar dari Jumlah Posisi
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Jumlah Tunggakan
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Jumlah Tunggakan
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Waktu Log tidak dapat ditagih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Pembeli
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Pembeli
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Gaji bersih yang belum dapat negatif
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Silahkan masukkan Terhadap Voucher manual
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Silahkan masukkan Terhadap Voucher manual
 DocType: SMS Settings,Static Parameters,Parameter Statis
 DocType: Purchase Order,Advance Paid,Muka Dibayar
 DocType: Item,Item Tax,Pajak Barang
@@ -3947,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Kirim SMS massal ke kontak Anda
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Pajak atau Biaya untuk
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Realisasi Jumlah wajib
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-bergulir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kartu Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kartu Kredit
 DocType: BOM,Item to be manufactured or repacked,Item yang akan diproduksi atau dikemas ulang
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Pengaturan default untuk transaksi saham.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Pengaturan default untuk transaksi saham.
 DocType: Purchase Invoice,Next Date,Berikutnya Tanggal
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Cukup masukkan Pajak dan Biaya
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Kapal
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
 DocType: Hub Settings,Seller Name,Penjual Nama
@@ -3964,47 +3628,44 @@
 DocType: Stock Entry,Repack,Dipak
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda harus menyimpan formulir sebelum melanjutkan
 DocType: Item Attribute,Numeric Values,Nilai numerik
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pasang Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Pasang Logo
 DocType: Customer,Commission Rate,Komisi Tingkat
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Cart adalah Kosong
 DocType: Production Order,Actual Operating Cost,Realisasi Biaya Operasi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root tidak dapat diedit.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan tidak boleh lebih besar dari sisa jumlah 
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root tidak dapat diedit.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Jumlah yang dialokasikan tidak boleh lebih besar dari sisa jumlah
 DocType: Manufacturing Settings,Allow Production on Holidays,Biarkan Produksi di hari libur
 DocType: Sales Order,Customer's Purchase Order Date,Nasabah Purchase Order Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Modal
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Silakan pilih file csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Kirim Backup ke Dropbox
 DocType: Purchase Order,To Receive and Bill,Untuk Menerima dan Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Perancang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Perancang
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Secara otomatis membuat Bahan Permintaan jika kuantitas turun di bawah tingkat ini
 ,Item-wise Purchase Register,Barang-bijaksana Pembelian Register
 DocType: Batch,Expiry Date,Tanggal Berakhir
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk mengatur tingkat pemesanan ulang, barang harus Item Pembelian atau Manufacturing Barang"
 ,Supplier Addresses and Contacts,Pemasok Alamat dan Kontak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Silahkan pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Menguasai proyek.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dapatkan item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Memimpin Waktu Hari
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Material
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
-DocType: Dropbox Backup,Send Notifications To,Kirim Pemberitahuan Untuk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tanggal
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Tanggal
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: Expense Claim Detail,Sanctioned Amount,Jumlah sanksi
 DocType: GL Entry,Is Opening,Apakah Membuka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Akun {0} tidak ada
 DocType: Account,Cash,kas
 DocType: Employee,Short biography for website and other publications.,Biografi singkat untuk website dan publikasi lainnya.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Silakan membuat Struktur Gaji untuk karyawan {0}

diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 69b70b5..b61f18f 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modalità di stipendio
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selezionare distribuzione mensile, se si desidera tenere traccia sulla base di stagionalità."
 DocType: Employee,Divorced,Divorced
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Attenzione: Lo stesso articolo è stato inserito più volte.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementi già sincronizzati
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetterà che l&#39;articolo da aggiungere più volte in una transazione
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Prodotti di consumo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Prodotti di consumo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleziona il Partito Tipo primo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Ricottura
 DocType: Item,Customer Items,Articoli clienti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
 DocType: Item,Publish Item to hub.erpnext.com,Pubblicare Item a hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Lascia Approvatori
 DocType: Sales Partner,Dealer,Rivenditore
 DocType: Employee,Rented,Affittato
-DocType: About Us Settings,Website,Sito Web
 DocType: POS Profile,Applicable for User,Applicabile per utente
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compattazione più sinterizzazione
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Da Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Da Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Albero
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Imposta tipo effettivo non può essere incluso nel prezzo dell&#39;oggetto in riga {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Richiesto da
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie Aggiornato con successo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Stitching
 DocType: Pricing Rule,Apply On,applicare On
 DocType: Item Price,Multiple Item prices.,Molteplici i prezzi articolo.
 ,Purchase Order Items To Be Received,Ordine di Acquisto Oggetti da ricevere
 DocType: SMS Center,All Supplier Contact,Tutti i Contatti Fornitori
 DocType: Quality Inspection Reading,Parameter,Parametro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nuovo Lascia Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nuovo Lascia Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Assegno Bancario
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Per mantenere il codice cliente e renderli ricercabili in base al loro codice usare questa opzione
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostra Varianti
-DocType: Sales Invoice Item,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantità
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Prestiti (passività )
 DocType: Employee Education,Year of Passing,Anni dal superamento
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Giacenza
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Crea Nuovo Profilo POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Assistenza Sanitaria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 DocType: Purchase Invoice,Monthly,Mensile
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ritardo nel pagamento (Giorni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Indirizzo E-Mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Difesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Indirizzo E-Mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Veicolo No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Seleziona Listino Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lavorazione del legno
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Stampa 3D
 DocType: Employee,Holiday List,Elenco Vacanza
 DocType: Time Log,Time Log,Tempo di Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Ragioniere
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Ragioniere
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Company,Phone No,N. di telefono
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log delle attività svolte dagli utenti contro le attività che possono essere utilizzati per il monitoraggio in tempo, la fatturazione."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuova {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nuova {0}: # {1}
 ,Sales Partners Commission,Vendite Partners Commissione
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Le abbreviazioni non possono avere più di 5 caratteri
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
-						exist with this Attribute.",Attributo Valore {0} non può essere rimosso dal {1} come Voce Varianti \ esiste con questo attributo.
-DocType: Print Settings,Classic,Classico
+						exist with this Attribute.",Attributo Valore {0} non può essere rimosso dal {1} come Voce Varianti \ esiste con questo attributo.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Questo è un account di root e non può essere modificato .
 DocType: BOM,Operations,Operazioni
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossibile impostare autorizzazione sulla base di Sconto per {0}
 DocType: Bin,Quantity Requested for Purchase,Quantità a fini di acquisto
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Allega file .csv con due colonne, una per il vecchio nome e uno per il nuovo nome"
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura di un lavoro.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Seleziona Magazzino ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,pubblicità
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,pubblicità
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La stessa azienda viene inserito più di una volta
 DocType: Employee,Married,Sposato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non consentito per {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,drogheria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Crea Voce Banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondi Pensione
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse è obbligatoria se il tipo di conto è Warehouse
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Lead,Person Name,Nome Person
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Controllare se l'ordine ricorrenti, deselezionare per fermare ricorrenti o mettere Data fine corretta"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo di oggetti consegnati
-DocType: Blog Post,Guest,Ospite
 DocType: Quality Inspection,Get Specification Details,Ottieni Specifiche Dettagli
 DocType: Lead,Interested,Interessati
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Da {0} a {1}
 DocType: Item,Copy From Item Group,Copiare da elemento Gruppo
 DocType: Journal Entry,Opening Entry,Apertura Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} è obbligatorio
 DocType: Stock Entry,Additional Costs,Costi aggiuntivi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Conto con transazione esistente non può essere convertito al gruppo .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Conto con transazione esistente non può essere convertito al gruppo .
 DocType: Lead,Product Enquiry,Prodotto Inchiesta
-DocType: Standard Reply,Owner,Proprietario
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Inserisci prima azienda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Seleziona prima azienda
 DocType: Employee Education,Under Graduate,Sotto Laurea
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alesaggio
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro attività :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Immobiliare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estratto conto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
-DocType: Custom Script,Client,Intestatario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
 DocType: Naming Series,Prefix,Prefisso
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Log Importazione
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Invia
 DocType: Sales Invoice Item,Delivered By Supplier,Consegnato da parte del fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Stipendio Annuo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Stipendio Annuo
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Spese Giacenza
 DocType: Newsletter,Email Sent?,E-mail Inviata?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Mostra Logs Tempo
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
 DocType: Delivery Note,Installation Status,Stato di installazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accettato + Respinto quantità deve essere uguale al quantitativo ricevuto per la voce {0}
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,L'articolo {0} deve essere un'Articolo da Acquistare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Tutti date e dipendente combinazione nel periodo selezionato arriverà nel modello, con record di presenze esistenti"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Saranno aggiornate dopo fattura di vendita sia presentata.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Raddrizzare
 DocType: BOM Replace Tool,New BOM,Nuova Distinta Base
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch registri di tempo per la fatturazione.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity colata
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter già inviata
 DocType: Lead,Request Type,Tipo di richiesta
 DocType: Leave Application,Reason,Motivo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,emittente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,esecuzione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Il primo utente diventerà il System Manager (è possibile cambiare in seguito).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,esecuzione
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Il primo utente diventerà il System Manager (è possibile cambiare in seguito).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Oggetti e prezzi
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Oggetti e prezzi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selezionare il dipendente per il quale si sta creando la valutazione.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro di costo {0} non appartiene alla società {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Sconto Listino Tasso (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Inizio
-DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-stampo di fusione
 DocType: Offer Letter,Select Terms and Conditions,Selezionare i Termini e Condizioni
 DocType: Production Planning Tool,Sales Orders,Ordini di vendita
 DocType: Purchase Taxes and Charges,Valuation,Valorizzazione
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Conto Bancario
 DocType: Leave Type,Allow Negative Balance,Consentire Bilancio Negativo
 DocType: Selling Settings,Default Territory,Territorio Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tranciatura
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisione
 DocType: Production Order Operation,Updated via 'Time Log',Aggiornato con 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Il Conto {0} non appartiene alla società {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Sales Invoice,Is Opening Entry,Sta aprendo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menzione se conto credito non standard applicabile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Per è necessario Warehouse prima Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ricevuto On
 DocType: Sales Partner,Reseller,Rivenditore
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Inserisci Società
 DocType: Delivery Note Item,Against Sales Invoice Item,Contro fattura di vendita dell'oggetto
 ,Production Orders in Progress,Ordini di produzione in corso
 DocType: Lead,Address & Contact,Indirizzo e Contatto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
 DocType: Newsletter List,Total Subscribers,Totale Iscritti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome Contatto
+,Contact Name,Nome Contatto
 DocType: Production Plan Item,SO Pending Qty,SO attesa Qtà
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Richiesta di acquisto.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Custodia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Solo il selezionato Lascia Approver può presentare questo Leave applicazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lascia per Anno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lascia per Anno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Impostare Naming Series per {0} via Impostazione&gt; Impostazioni&gt; Serie Naming
 DocType: Time Log,Will be updated when batched.,Verrà aggiornato quando dosati.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene a società {1}
-DocType: Bulk Email,Message,Messaggio
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
-DocType: Dropbox Backup,Dropbox Access Key,Chiave Accesso Dropbox
 DocType: Payment Tool,Reference No,Di riferimento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,annuale
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura Commerciale No
 DocType: Material Request Item,Min Order Qty,Qtà Minima Ordine
 DocType: Lead,Do Not Contact,Non Contattaci
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;ID univoco per il monitoraggio tutte le fatture ricorrenti. Si è generato su submit.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Item,Publish in Hub,Pubblicare in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Richiesta Materiale 
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Richiesta Materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
 DocType: Item,Purchase Details,"Acquisto, i dati"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Spazzolatura Wire
 DocType: Employee,Relation,Relazione
 DocType: Shipping Rule,Worldwide Shipping,Spedizione in tutto il mondo
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Ordini Confermati da Clienti.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 DocType: Maintenance Schedule,Generate Schedule,Genera Programma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Capo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Seleziona il tipo di carica prima
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ultimo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caratteri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleziona la tua lingua
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caratteri
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Lascia il primo responsabile approvazione della lista sarà impostato come predefinito Lascia Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Disabilita la creazione di registri di tempo contro gli ordini di produzione. Le operazioni non sono soggetti a controllo contro ordine di produzione
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Variante di
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,L'Articolo {0} deve essere un Servizio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
-DocType: DocType,Administrator,Amministratore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Foratura laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nuovo UOM Archivio
 DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario
 DocType: Employee,External Work History,Storia del lavoro esterno
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Reference
-DocType: Communication,Closed,Chiuso
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Parole (Export) sarà visibile una volta che si salva il DDT.
 DocType: Lead,Industry,Industria
 DocType: Employee,Job Profile,Profilo di lavoro
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Idroformatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
 DocType: Journal Entry,Multi Currency,Multi valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,L'articolo è aggiornato
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
 DocType: Sales Invoice Item,Delivery Note,Nota Consegna
-DocType: Dropbox Backup,Allow Dropbox Access,Consentire Accesso DropBox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Impostazione Tasse
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Pagamento ingresso è stato modificato dopo l'tirato. Si prega di tirare di nuovo.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Workstation,Rent Cost,Affitto Costo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Si prega di selezionare mese e anno
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,azienda Email
 DocType: GL Entry,Debit Amount in Account Currency,Importo Debito Account Valuta
 DocType: Shipping Rule,Valid for Countries,Valido per paesi
-DocType: Workflow State,Refresh,Refresh
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tutti i campi correlati importati come valuta, il tasso di conversione , totale, ecc, sono disponibili nella Ricevuta d'Acquisto, nel Preventivo Fornitore, nella Fattura d'Acquisto , ordine d'Acquisto , ecc."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Totale ordine Considerato
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (ad esempio amministratore delegato , direttore , ecc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Inserisci ' Ripetere il giorno del mese ' valore di campo
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Inserisci ' Ripetere il giorno del mese ' valore di campo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Velocità con cui valuta Cliente viene convertito in valuta di base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibile in distinta , bolla di consegna , fattura di acquisto , ordine di produzione , ordine di acquisto , ricevuta d'acquisto , fattura di vendita , ordini di vendita , dell'entrata Stock , Timesheet"
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Seleziona elemento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Seleziona elemento
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Voce: {0} gestito non può conciliarsi con \
  della Riconciliazione, utilizzare invece dell'entrata Stock saggio-batch,"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Acquisto ricevuta deve essere presentata
-DocType: Stock UOM Replace Utility,Current Stock UOM,Giacenza Corrente (UdM)
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotto di un articolo
 DocType: C-Form Invoice Detail,Invoice Date,Data fattura
 DocType: GL Entry,Debit Amount,Importo Debito
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Il tuo indirizzo email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Si prega di vedere allegato
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Taglio a getto d&#39;acqua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup già completo !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup già completo !
 ,Finished Goods,Beni finiti
 DocType: Delivery Note,Instructions,Istruzione
 DocType: Quality Inspection,Inspected By,Verifica a cura di
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Si prega di non creare account per clienti e fornitori. Essi vengono creati direttamente dai maestri cliente / fornitore.
 DocType: Currency Exchange,Currency Exchange,Cambio Valuta
 DocType: Purchase Invoice Item,Item Name,Nome dell&#39;articolo
+DocType: Authorization Rule,Approving User  (above authorized value),Approvazione utente (sopra il valore autorizzato)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance Credit
 DocType: Employee,Widowed,Vedovo
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Articoli da richieste che sono &quot;out of stock&quot; considerando tutti i magazzini in base qty proiettata e qty minimo di ordine
@@ -380,22 +348,21 @@
 ,Purchase Register,Acquisto Registrati
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 DocType: Workstation,Consumable Cost,Costo consumabili
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
 DocType: Purchase Receipt,Vehicle Date,Veicolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo per Perdere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo bordatura
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation è chiuso nei seguenti giorni secondo l'elenco di vacanza: {0}
 DocType: Employee,Single,Singolo
 DocType: Issue,Attachment,Attaccamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bilancio non può essere impostato per Gruppo centro di costo
 DocType: Account,Cost of Goods Sold,Costo del venduto
 DocType: Purchase Invoice,Yearly,Annuale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Inserisci Centro di costo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Inserisci Centro di costo
 DocType: Journal Entry Account,Sales Order,Ordine di vendita
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Tasso di vendita
 DocType: Purchase Order,Start date of current order's period,Data di termine di ordine corrente Avviare
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Quantità non può essere una frazione in riga {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Quantità non può essere una frazione in riga {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
 DocType: Delivery Note,% Installed,% Installato
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Inserisci il nome della società prima
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Taglio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','A Case N.' non puo essere minore di 'Da Case N.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Non Iniziato
 DocType: Lead,Channel Partner,Canale Partner
 DocType: Account,Old Parent,Vecchio genitore
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati Fino
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestro di vacanza .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Stampaggio Shell
 DocType: Material Request Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Inserisci il codice dell'articolo.
 DocType: BOM,Costing,Valutazione Costi
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selezionato, l&#39;importo della tassa sarà considerata già inclusa nel Stampa Valuta / Stampa Importo"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Per Intervallo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
 DocType: Features Setup,Imports,Importazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Incollaggio
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Job Opening,Description of a Job Opening,Descrizione di una apertura di lavoro
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Attività di attesa per oggi
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Archivio Presenze
 DocType: Bank Reconciliation,Journal Entries,Prime note
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
-DocType: System Settings,Loading...,Caricamento in corso ...
-DocType: DocField,Password,Parola d&#39;ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition Modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
 DocType: Customer,Buyer of Goods and Services.,Durante l'acquisto di beni e servizi.
 DocType: Journal Entry,Accounts Payable,Conti pagabili
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Aggiungi abbonati
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Non esiste"
 DocType: Pricing Rule,Valid Upto,Valido Fino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,reddito diretta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,responsabile amministrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,responsabile amministrativo
 DocType: Payment Tool,Received Or Paid,Ricevuto o pagato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selezionare prego
 DocType: Stock Entry,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di funzionamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,cosmetici
-DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
-DocType: Communication,Subject,Oggetto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 ,Serial No Warranty Expiry,Serial No Garanzia di scadenza
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Articolo
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestione Subfornitura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,La nuova unità di misura NON deve essere di tipo numero intero
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestione Subfornitura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobili e Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasso al quale Listino valuta viene convertita in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,L'articolo {0} non è un'Articolo da Acquistare
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} non è un indirizzo email valido in 'Notifica \
  Indirizzo email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Fatturato totale dell'anno:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Fatturato totale dell'anno:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare Tasse e Costi
 DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
 DocType: Territory,For reference,Per riferimento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Impossibile eliminare N. di serie {0}, come si usa in transazioni di borsa"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Chiusura (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Chiusura (Cr)
 DocType: Serial No,Warranty Period (Days),Periodo di garanzia (Giorni)
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 ,Pending Qty,In attesa Quantità
 DocType: Job Applicant,Thread HTML,HTML Discussione
 DocType: Company,Ignore,Ignora
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
 DocType: Pricing Rule,Valid From,valido dal
 DocType: Sales Invoice,Total Commission,Commissione Totale
 DocType: Pricing Rule,Sales Partner,Partner di vendita
@@ -505,7 +464,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","La **distribuzione mensile** aiuta a distribuire il budget attraverso mesi se si dispone di stagionalità nel vostro business. Per distribuire un budget con questa distribuzione, impostare questa **Distribuzione mensile** nel **Centro di costo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Siamo spiacenti , Serial Nos non può essere fusa"
@@ -513,7 +472,6 @@
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id Contatto
 DocType: C-Form Invoice Detail,Grand Total,Totale Generale
-DocType: About Us Settings,Website Manager,Sito web manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anno fiscale Data di inizio non deve essere maggiore di Data Fine dell'anno fiscale
 DocType: Warranty Claim,Resolution,Risoluzione
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Consegna: {0}
@@ -521,25 +479,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fatturazione e di condizione di consegna
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,precedente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Ritorno di vendite
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selezionare gli ordini di vendita da cui si desidera creare gli ordini di produzione.
 DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componenti stipendio.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database Potenziali Clienti.
+DocType: Authorization Rule,Customer or Item,Cliente o Voce
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Database Cliente.
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Importo concesso non può essere negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unità di misura predefinita per la voce {0} non può essere modificato direttamente perché si è già fatto qualche operazione (s) con un altro UOM. Sarà necessario creare una nuova voce per utilizzare un diverso UOM predefinito.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Importo concesso non può essere negativo
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Deposito logica a fronte del quale sono calcolate le scorte.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
-DocType: Event,Wednesday,Mercoledì
 DocType: Sales Invoice,Customer's Vendor,Fornitore del Cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordine di produzione è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Scrivere proposta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Scrivere proposta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un&#39;altra Sales Person {0} esiste con lo stesso ID Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Archivio Error ( {6} ) per la voce {0} in Magazzino {1} su {2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
@@ -560,20 +517,16 @@
 DocType: Activity Type,Default Costing Rate,Tasso Costing Predefinito
 DocType: Maintenance Schedule,Maintenance Schedule,Programma di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Si prega di installare dropbox modulo python
 DocType: Employee,Passport Number,Numero di passaporto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Da Ricevuta di Acquisto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Da Ricevuta di Acquisto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
 DocType: SMS Settings,Receiver Parameter,Ricevitore Parametro
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basato Su' e 'Raggruppato Per' non può essere lo stesso
 DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,a
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Si prega di inserire l'indirizzo email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tubo End formando
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Tipo Attività
@@ -581,25 +534,20 @@
 DocType: Customer,Fixed Days,Giorni fissi
 DocType: Sales Invoice,Packing List,Lista di imballaggio
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,editoria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,editoria
 DocType: Activity Cost,Projects User,Progetti utente
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumato
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} non trovato in tabella Dettagli Fattura
 DocType: Company,Round Off Cost Center,Arrotondamento Centro di costo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenzione Visita {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Distacco timestamp deve essere successiva {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Impostazioni
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Tasse Landed Cost e oneri
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Più
 DocType: Pricing Rule,Sales Manager,Direttore Delle Vendite
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,rinominare
 DocType: Journal Entry,Write Off Amount,Scrivi Off Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Curvatura
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Consentire Utente
 DocType: Journal Entry,Bill No,Fattura N.
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Nota Consegna Richiesta
@@ -608,17 +556,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Inserisci il dettaglio articolo
 DocType: Purchase Receipt,Other Details,Altri dettagli
 DocType: Account,Accounts,Conti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Taglio dritto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Per tenere traccia di voce in documenti di vendita e di acquisto in base alle loro n ° di serie. Questo è può anche usato per rintracciare informazioni sulla garanzia del prodotto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse Respinto è obbligatoria alla voce regected
 DocType: Account,Expenses Included In Valuation,Spese incluse nella Valutazione
 DocType: Employee,Provide email id registered in company,Fornire id-mail registrato in azienda
 DocType: Hub Settings,Seller City,Città Venditore
 DocType: Email Digest,Next email will be sent on:,La prossimo Email verrà inviato:
 DocType: Offer Letter Term,Offer Letter Term,Offerta Lettera Termine
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Articolo ha varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolo {0} non trovato
 DocType: Bin,Stock Value,Valore Giacenza
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,albero Type
@@ -627,14 +574,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantità e Magazzino
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contro Voucher tipo deve essere uno dei Sales Order, Fattura o diario"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Impossibile trovare il tasso di cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aerospaziale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,benvenuto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aerospaziale
 DocType: Journal Entry,Credit Card Entry,Entry Carta di Credito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Oggetto Attività
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Merci ricevute dai fornitori.
-DocType: Communication,Open,Aperto
 DocType: Lead,Campaign Name,Nome Campagna
 ,Reserved,riservato
 DocType: Purchase Order,Supply Raw Materials,Fornire Materie Prime
@@ -643,29 +586,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} non è un articolo in scorta
 DocType: Mode of Payment Account,Default Account,Account Predefinito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
-DocType: Contact Us Settings,Address Title,Titolo indirizzo
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person target Varianza articolo Group- Wise
-DocType: Dropbox Backup,Daily,Giornaliero
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Conto con transazione esistente non può essere convertito in contabilità
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Conto con transazione esistente non può essere convertito in contabilità
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Employee,Cell Number,Numero di Telefono
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Richieste Materiale Auto generata
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile immettere buono attuale in 'Against Journal Entry' colonna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Busta Paga Mensile.
 DocType: Item Group,Website Specifications,Website Specifiche
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nuovo Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Le voci di contabilità può essere fatta contro nodi foglia. Non sono ammesse le voci contro gruppi.
-DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
 DocType: Opportunity,Maintenance,Manutenzione
-DocType: User,Male,Maschio
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campagne di vendita .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -713,10 +653,9 @@
 DocType: Address,Personal,Personale
 DocType: Expense Claim Detail,Expense Claim Type,Tipo Rimborso Spese
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Impostazioni predefinite per Carrello
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diario {0} è legata contro Order {1}, controllare se deve essere tirato come anticipo in questa fattura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diario {0} è legata contro Order {1}, controllare se deve essere tirato come anticipo in questa fattura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Spese Manutenzione Ufficio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Inserisci articolo prima
 DocType: Account,Liability,responsabilità
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
@@ -724,14 +663,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Process Payroll,Send Email,Invia Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nessuna autorizzazione
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Aggiorna Scorte' non può essere selezionato perché gli articoli non vengono recapitati tramite {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Le mie fatture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Le mie fatture
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nessun dipendente trovato
 DocType: Purchase Order,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
@@ -750,35 +690,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Per attivare la &quot;Point of Sale&quot; caratteristiche
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contro Bill {1} in data {2}
-DocType: Comment,Reference Name,Nome di riferimento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contro Bill {1} in data {2}
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: Sales Invoice Item,Target Warehouse,Obiettivo Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data prevista di consegna non può essere precedente Sales Order Data
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tutti i gruppi di articoli
 DocType: Process Payroll,Activity Log,Log Attività
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Utile / Perdita
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
 DocType: Production Order,Item To Manufacture,Articolo per la fabbricazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Colata in conchiglia
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stato è {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
 DocType: Sales Order Item,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Apertura'
 DocType: Notification Control,Delivery Note Message,Nota Messaggio Consegna
 DocType: Expense Claim,Expenses,Spese
 DocType: Item Variant Attribute,Item Variant Attribute,Prodotto Modello attributo
 ,Purchase Receipt Trends,Acquisto Tendenze Receipt
 DocType: Appraisal,Select template from which you want to get the Goals,Selezionare modello da cui si desidera ottenere gli Obiettivi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Ricerca & Sviluppo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Ricerca & Sviluppo
 ,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di registrazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Picchettamento
 DocType: Item,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programmato per inviare {0}
@@ -789,18 +726,16 @@
 DocType: Sales Invoice Item,Stock Details,Dettagli della
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punto vendita
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Non è possibile portare avanti {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo del conto già in credito, non sei autorizzato a impostare 'saldo deve essere' come 'Debito'"
 DocType: Account,Balance must be,Saldo deve essere
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Chiodatrici
 ,Available Qty,Disponibile Quantità
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sul Fila Indietro totale
 DocType: Salary Slip,Working Days,Giorni lavorativi
 DocType: Serial No,Incoming Rate,Tasso in ingresso
 DocType: Packing Slip,Gross Weight,Peso Lordo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Il nome della vostra azienda per la quale si sta configurando questo sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Il nome della vostra azienda per la quale si sta configurando questo sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includi vacanze in totale n. dei giorni lavorativi
 DocType: Job Applicant,Hold,Trattieni
 DocType: Employee,Date of Joining,Data Adesione
@@ -810,30 +745,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Visualizza abbonati
 DocType: Purchase Invoice Item,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sabbiatura
 DocType: Employee,Ms,Sig.ra
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} deve essere attivo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} deve essere attivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annulla Visite Materiale {0} prima di annullare questa visita di manutenzione
 DocType: Salary Slip,Leave Encashment Amount,Lascia Incasso Importo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantità richiesta
 DocType: Bank Reconciliation,Total Amount,Totale Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Ordini di produzione
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valore Saldo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Pubblica sincronizzare gli elementi
-DocType: GL Entry,Account Currency,Conto Valuta
+DocType: Bank Reconciliation,Account Currency,Conto Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Si prega di citare Arrotondamento account in azienda
 DocType: Purchase Receipt,Range,Intervallo
 DocType: Supplier,Default Payable Accounts,Debiti default
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Features Setup,Item Barcode,Barcode articolo
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
 DocType: Address,Shop,Negozio
@@ -842,7 +776,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conto predefinito Banca / Contante  aggiornato automaticamente in Fatture POS quando selezioni questo metodo
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,La Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Indennità per over-{0} attraversato per la voce {1}.
 DocType: Employee,Exit Interview Details,Uscire Dettagli Intervista
 DocType: Item,Is Purchase Item,È Acquisto Voce
@@ -861,60 +795,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell&#39;oggetto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Proventi indiretti
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set di Pagamento = debito residuo
-DocType: Contact Us Settings,Address Line 1,"Indirizzo, riga 1"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varianza
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome Azienda
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varianza
+,Company Name,Nome Azienda
 DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selezionare la voce per il trasferimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visualizzare un elenco di tutti i video di aiuto
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selezionare conto capo della banca in cui assegno è stato depositato.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Consenti all&#39;utente di modificare Listino cambio nelle transazioni
 DocType: Pricing Rule,Max Qty,Qtà max
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Riga {0}: Pagamento contro vendite / ordine di acquisto deve essere sempre contrassegnato come anticipo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,chimico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di produzione.
 DocType: Process Payroll,Select Payroll Year and Month,Selezionare Payroll Anno e mese
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vai al gruppo appropriato (solitamente Applicazione dei fondi&gt; Attività correnti&gt; conti bancari e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Banca&quot;
 DocType: Workstation,Electricity Cost,Costo Elettricità
 DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipendente Birthday Reminders
-DocType: Comment,Unsubscribed,Sottoscritte
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Criteri di ispezione
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Albero dei centri di costo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Trasferiti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bianco
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto)
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Allega la tua foto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fare
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Allega la tua foto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fare
 DocType: Journal Entry,Total Amount in Words,Importo totale in parole
-DocType: Workflow State,Stop,stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Il mio carrello
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Successivo Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
 DocType: Holiday List,Holiday List Name,Nome Elenco Vacanza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Quantità per {0}
 DocType: Leave Application,Leave Application,Lascia Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lascia strumento Allocazione
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se Budget Mensile superato (per conto spese)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Guarnizione
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
 DocType: Company,Default Terms,Predefinito Termini
 DocType: Packing Slip Item,Packing Slip Item,Distinta di imballaggio articolo
 DocType: POS Profile,Cash/Bank Account,Conto Cassa/Banca
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementi rimossi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Limatura
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sconto
 DocType: Features Setup,Purchase Discounts,Acquisto Sconti
 DocType: Workstation,Wages,Salari
@@ -931,7 +860,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione di spesa per questo record . Si prega di aggiornare il 'Stato' e Save
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Issue,Issue,Questione
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per Voce Varianti. ad esempio Taglia, colore etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conto non corrisponde con la Società
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per Voce Varianti. ad esempio Taglia, colore etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
 DocType: BOM Operation,Operation,Operazione
@@ -939,13 +869,13 @@
 DocType: Tax Rule,Shipping State,Stato Spedizione
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Spese di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Comprare standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Comprare standard
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Rendere le entrate nelle scorte
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Rendere le entrate nelle scorte
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
 DocType: Item,Default Supplier,Fornitore Predefinito
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nel corso di produzione Allowance Percentuale
@@ -960,29 +890,27 @@
 DocType: Time Log Batch,updated via Time Logs,aggiornato via Logs Tempo
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: Opportunity,Your sales person who will contact the customer in future,Il vostro agente di commercio che si metterà in contatto il cliente in futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
 DocType: Company,Default Currency,Valuta Predefinita
 DocType: Contact,Enter designation of this Contact,Inserisci designazione di questo contatto
-DocType: Contact Us Settings,Address,Indirizzo
 DocType: Expense Claim,From Employee,Da Dipendente
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
 DocType: Journal Entry,Make Difference Entry,Crea Voce Differenza
 DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data
 DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Trasporto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Trasporto
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e anno:
 DocType: Email Digest,Annual Expense,Spesa annua
 DocType: SMS Center,Total Characters,Totale Personaggi
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detagli Fattura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagamento Riconciliazione fattura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contributo%
 DocType: Item,website page link,sito web link alla pagina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Prepariamo il sistema per il primo utilizzo.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numeri di registrazione dell'azienda per il vostro riferimento. numero Tassa, ecc"
 DocType: Sales Partner,Distributor,Distributore
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordine di produzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selezionare Time Diari e Invia per creare una nuova fattura di vendita.
@@ -1002,14 +930,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niente da chiedere
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gestione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gestione
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipi di attività per i fogli Tempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Microfusione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},È obbligatorio debito o importo del credito per {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Netto (in lettere) sarà visibile una volta che si salva la busta paga.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Attivo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blu
 DocType: Purchase Invoice,Is Return,È Return
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ulteriori nodi possono essere creati solo sotto i nodi di tipo ' Gruppo '
@@ -1019,50 +945,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profilo {0} già creato per l&#39;utente: {1} e società {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Fattore di Conversione UOM
 DocType: Stock Settings,Default Item Group,Gruppo elemento Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabbricazione oggetti in laminato
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banca dati dei fornitori.
 DocType: Account,Balance Sheet,bilancio patrimoniale
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore avrà un ricordo in questa data per contattare il cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscale e di altre deduzioni salariali.
 DocType: Lead,Lead,Contatto
 DocType: Email Digest,Payables,Debiti
 DocType: Account,Warehouse,magazzino
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 ,Purchase Order Items To Be Billed,Ordine di Acquisto Articoli da fatturare
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Acquisto Articolo Fattura
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Inserimenti Inventario e Libro Mastro sono aggiornati per le Ricevute di Acquisto selezionate
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Articolo 1
 DocType: Holiday,Holiday,Vacanza
-DocType: Event,Saturday,Sabato
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lasciare vuoto se considerato per tutti i rami
 ,Daily Time Log Summary,Registro Giornaliero Tempo
-DocType: DocField,Label,Etichetta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Particolari di pagamento
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
 DocType: Lead,Call,Chiama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'le voci' non possono essere vuote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'le voci' non possono essere vuote
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Impostazione dipendenti
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Si prega di selezionare il prefisso prima
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ricerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ricerca
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Specifica almeno un attributo nella tabella Attributi
 DocType: Contact,User ID,ID utente
-DocType: Communication,Sent,Inviati
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,vista Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
-DocType: Communication,Delivery Status,Stato Consegna
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Un gruppo di elementi esiste con lo stesso nome , si prega di cambiare il nome della voce o rinominare il gruppo di articoli"
 DocType: Production Order,Manufacture against Sales Order,Produzione contro Ordine di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Batch
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Retribuzione lorda
@@ -1073,13 +992,11 @@
 DocType: BOM Item,Item Description,Descrizione Articolo
 DocType: Payment Tool,Payment Mode,Modalità di pagamento
 DocType: Purchase Invoice,Is Recurring,È ricorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Sinterizzazione laser metal diretto
 DocType: Purchase Order,Supplied Items,Elementi in dotazione
 DocType: Production Order,Qty To Manufacture,Qtà da Fabbricare
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenere la stessa velocità per tutto il ciclo di acquisto
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura temporanea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo per conto {0} deve essere sempre {1}
 DocType: Address,Address Type,Tipo di indirizzo
@@ -1095,35 +1012,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Ottieni fatture non saldate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} non è valido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Piccolo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Piccolo
 DocType: Employee,Employee Number,Numero Dipendente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
 ,Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Articolo 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Il Conto Testa {0} creato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto riordino
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totale Raggiunto
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totale Raggiunto
 DocType: Employee,Place of Issue,Luogo di emissione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contratto
-DocType: Report,Disabled,Disabilitato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contratto
+DocType: Email Digest,Add Quote,Aggiungere Citazione
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,agricoltura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,I vostri prodotti o servizi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,I vostri prodotti o servizi
 DocType: Mode of Payment,Mode of Payment,Modalità di Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
 DocType: Warehouse,Warehouse Contact Info,Magazzino contatto
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Il nome è obbligatorio
 DocType: Purchase Invoice,Recurring Type,Tipo ricorrente
 DocType: Address,City/Town,Città/Paese
 DocType: Email Digest,Annual Income,Reddito annuo
 DocType: Serial No,Serial No Details,Serial No Dettagli
 DocType: Purchase Invoice Item,Item Tax Rate,Articolo Tax Rate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,L'Articolo {0} deve essere di un sub-contratto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Attrezzature Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
@@ -1133,14 +1049,13 @@
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data prevista di consegna è minore del previsto Data inizio.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,per Fornitore
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Impostazione Tipo di account aiuta nella scelta questo account nelle transazioni.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totale generale (valuta Azienda)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Uscita totale
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Ci può essere una sola regola spedizione Circostanza con 0 o il valore vuoto per "" To Value """
 DocType: Authorization Rule,Transaction,Transazioni
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota : Questo centro di costo è un gruppo . Non può fare scritture contabili contro i gruppi .
-apps/frappe/frappe/config/desk.py +7,Tools,Strumenti
 DocType: Item,Website Item Groups,Sito gruppi di articoli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numero ordine di produzione è obbligatoria per magazzino entry fabbricazione scopo
 DocType: Purchase Invoice,Total (Company Currency),Totale (Società Valuta)
@@ -1148,24 +1063,22 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Nome workstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Commenti
 DocType: Salary Slip,Bank Account No.,Conto Bancario N.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Questo è il numero dell&#39;ultimo transazione creata con questo prefisso
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasso di valutazione richiesti per l'articolo {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Tasso di valutazione richiesti per l'articolo {0}
 DocType: Quality Inspection Reading,Reading 8,Lettura 8
 DocType: Sales Partner,Agent,Agente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totale {0} per tutte le voci è pari a zero, potrebbe si dovrebbe cambiare &#39;Distribuire Spese Based On&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Tasse e le spese di calcolo
 DocType: BOM Operation,Workstation,Stazione di lavoro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleziona una società
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Lascia Privilege
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Lascia Privilege
 DocType: Purchase Invoice,Supplier Invoice Date,Fornitore Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,È necessario abilitare Carrello
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Dati Assenti
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
 DocType: Salary Slip,Earning,Rendimento
 DocType: Payment Tool,Party Account Currency,Partito Conto Valuta
@@ -1175,26 +1088,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale valore di ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,cibo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,È possibile effettuare una registrazione dei tempi solo contro un ordine di produzione presentato
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter per contatti (leads).
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta del Conto di chiusura deve essere {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somma dei punti per tutti gli obiettivi dovrebbero essere 100. E &#39;{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Le operazioni non possono essere lasciati vuoti.
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
-DocType: DocField,Description,Descrizione
 DocType: Authorization Rule,Average Discount,Sconto Medio
-DocType: Letter Head,Is Default,È Default
 DocType: Address,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Features Setup,Features Setup,Configurazione Funzioni
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Offerte Lettera
-DocType: Communication,Communication,Comunicazione
 DocType: Item,Is Service Item,È il servizio Voce
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Si prega di selezionare l'anno fiscale
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Da {0} | {1} {2}
@@ -1213,7 +1123,7 @@
 DocType: Item,Maintain Stock,Mantenere Scorta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
@@ -1223,7 +1133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafico dei Conti
 DocType: Material Request,Terms and Conditions Content,Termini e condizioni contenuti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
@@ -1237,31 +1147,28 @@
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 ,Batch-Wise Balance History,Cronologia Bilanciamento Lotti-Wise
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,apprendista
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Quantità negative non è consentito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,apprendista
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Quantità negative non è consentito
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Dettaglio Tax tavolo prelevato dalla voce principale come una stringa e memorizzati in questo campo.
  Utilizzato per imposte e oneri"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilità ingresso per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilità ingresso per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Nessuna struttura retributiva attivo trovato per dipendente {0} e il mese
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo del lavoro , qualifiche richieste ecc"
-DocType: Journal Entry Account,Account Balance,Il Conto Bilancio 
+DocType: Journal Entry Account,Account Balance,Il Conto Bilancio
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regola fiscale per le operazioni.
 DocType: Rename Tool,Type of document to rename.,Tipo di documento da rinominare.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compriamo questo articolo
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Compriamo questo articolo
 DocType: Address,Billing,Fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flangiatura
-DocType: Bulk Email,Not Sent,Non Inviato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Esplosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale tasse e spese (Azienda valuta)
 DocType: Shipping Rule,Shipping Account,Account Spedizione
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programmato per inviare {0} destinatari
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,sub Assemblies
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Supplier,Stock Manager,Manager di Giacenza
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
@@ -1271,105 +1178,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nessun indirizzo ancora aggiunto.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ore di lavoro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a JV importo {2}
 DocType: Item,Inventory,Inventario
 DocType: Features Setup,"To enable ""Point of Sale"" view",Per attivare la &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Il pagamento non può essere effettuato per carrello vuoto
 DocType: Item,Sales Details,Dettagli di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Con gli articoli
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtà
 DocType: Notification Control,Expense Claim Rejected,Rimborso Spese Rifiutato
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La data in cui viene generato prossima fattura. Viene generato su Invia.
 DocType: Item Attribute,Item Attribute,Attributo Articolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianti Voce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Varianti Voce
 DocType: Company,Services,Servizi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totale ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Totale ({0})
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Esercizio Data di inizio
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Esercizio Data di inizio
 DocType: Employee External Work History,Total Experience,Esperienza totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Svasatura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Material Request Item,Sales Order No,Ordine di vendita No
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Preso
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Trasferimento Materiali per Produzione
 DocType: Pricing Rule,For Price List,Per Listino Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Tasso di acquisto per la voce: {0} non trovato, che è necessario per prenotare l'ingresso contabilità (oneri). Si prega di indicare prezzi contro un listino prezzi di acquisto."
 DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,DIBA Dettagli N.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Errore: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Errore: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Si prega di creare un nuovo account dal Piano dei conti .
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Clienti> Gruppi clienti> Territorio
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponibile Quantità Batch in magazzino
 DocType: Time Log Batch Detail,Time Log Batch Detail,Ora Dettaglio Batch Log
-DocType: Workflow State,Tasks,compiti
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
-DocType: Event,Tuesday,Martedì
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 ,Accounts Receivable Summary,Contabilità Sommario Crediti
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Parte per il tipo {0} già stanziato per Employee {1} per il periodo {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
 DocType: UOM,UOM Name,UOM Nome
-DocType: Top Bar Item,Target,Obiettivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contributo Importo
 DocType: Sales Invoice,Shipping Address,Indirizzo di spedizione
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Questo strumento consente di aggiornare o correggere la quantità e la valutazione delle azioni nel sistema. Viene tipicamente utilizzato per sincronizzare i valori di sistema e ciò che esiste realmente in vostri magazzini.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,In parole saranno visibili una volta che si salva il DDT.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marchio Originale.
-DocType: ToDo,Due Date,Data di scadenza
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Marchio Originale.
 DocType: Sales Invoice Item,Brand Name,Nome Marca
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Scatola
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,L'Organizzazione
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Scatola
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,L'Organizzazione
 DocType: Monthly Distribution,Monthly Distribution,Distribuzione Mensile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista Receiver è vuoto . Si prega di creare List Ricevitore
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produzione Piano di ordini di vendita
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Ingresso contabile per {0} può essere fatta solo in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Tranciatrice
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conti bancari
 ,Bank Reconciliation Statement,Prospetto di Riconciliazione Banca
 DocType: Address,Lead Name,Nome Contatto
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Apertura della Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Apertura della Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve apparire una sola volta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non è consentito trasferire più {0} di {1} per Ordine d'Acquisto {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Foglie allocata con successo per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Non ci sono elementi per il confezionamento
 DocType: Shipping Rule Condition,From Value,Da Valore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Produzione La quantità è obbligatoria
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Gli importi non riflette in banca
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Gli importi non riflette in banca
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Reclami per spese dell'azienda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Colata centrifuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Finitura campo magnetico assistita
 DocType: Company,Default Holiday List,Predefinito List vacanze
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Receipt,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
 DocType: Production Planning Tool,Select Sales Orders,Selezionare Ordini di vendita
 ,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Il giorno (s) in cui si stanno applicando per ferie sono le vacanze. Non è necessario chiedere un permesso.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Per tenere traccia di elementi con codice a barre. Si sarà in grado di inserire articoli nel DDT e fattura di vendita attraverso la scansione del codice a barre del prodotto.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Segna come Consegnato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Segna come Consegnato
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Crea Preventivo
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 DocType: SMS Center,Receiver List,Lista Ricevitore
@@ -1377,31 +1275,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struttura salariale Deduzione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizzazione laser selettiva
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importazione Corretta!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stato inserito più di una volta Factor Tabella di conversione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Età (Giorni)
 DocType: Quotation Item,Quotation Item,Preventivo Articolo
 DocType: Account,Account Name,Nome Conto
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dalla data non può essere maggiore di A Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} {1} quantità non può essere una frazione
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornitore Tipo master.
 DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Aggiungi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} viene cancellato o fermato
 DocType: Accounts Settings,Credit Controller,Controllare Credito
 DocType: Delivery Note,Vehicle Dispatch Date,Veicolo Spedizione Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Acquisto Ricevuta {0} non è presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,installazione completa
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fatturato
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account partito
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Risorse Umane
 DocType: Lead,Upper Income,Reddito superiore
 DocType: Journal Entry Account,Debit in Company Currency,Debito in Società Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,I miei problemi
@@ -1410,12 +1304,9 @@
 DocType: Company,Default Values,Valori Predefiniti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Riga {0}: Importo del pagamento non può essere negativo
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press raccordo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
 DocType: Payment Reconciliation,Payments,Pagamenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot pressatura isostatica
-DocType: ToDo,Medium,Media
 DocType: Budget Detail,Budget Allocated,Budget Assegnato
 DocType: Journal Entry,Entry Type,Tipo voce
 ,Customer Credit Balance,Balance Credit clienti
@@ -1424,12 +1315,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
 DocType: Quotation,Term Details,Dettagli termine
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
 DocType: Warranty Claim,Warranty Claim,Richiesta di Garanzia
 ,Lead Details,Dettagli Contatto
-DocType: Authorization Rule,Approving User,Utente Certificatore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forgiatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placcatura
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
 DocType: Pricing Rule,Applicable For,applicabile per
 DocType: Bank Reconciliation,From Date,Da Data
@@ -1451,64 +1339,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Importo versato (Società valuta)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
 DocType: Selling Settings,Selling Settings,Vendere Impostazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aste online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aste online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Società , mese e anno fiscale è obbligatoria"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usato per fare questo Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unità singola di un articolo.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Lotto {0} deve essere ' inoltrata '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fai Entry Accounting per ogni Archivio Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazzino richiesto al Fila No {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Si prega di inserire valido Esercizio inizio e di fine
 DocType: Employee,Date Of Retirement,Data di Pensionamento
 DocType: Upload Attendance,Get Template,Ottieni Modulo
 DocType: Address,Postal,Postale
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Colata di resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Esiste un Gruppo Clienti con lo stesso nome, per favore cambiare il nome del Cliente o rinominare il Gruppo Clienti"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Si prega di selezionare {0} prima.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
 DocType: Stock Entry,Material Receipt,Materiale Ricevuta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,prodotti
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,prodotti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partito Tipo e partito è richiesto per Crediti / Debiti conto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se questa voce ha varianti, allora non può essere selezionata in ordini di vendita, ecc"
 DocType: Lead,Next Contact By,Successivo Contatto Con
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} non può essere soppresso in quanto esiste la quantità per articolo {1}
 DocType: Quotation,Order Type,Tipo di ordine
 DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
 DocType: Payment Tool,Find Invoices to Match,Trova Fatture per incontri
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ad esempio ""XYZ Banca nazionale """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ad esempio ""XYZ Banca nazionale """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Obiettivo totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Obiettivo totale
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrello è abilitato
 DocType: Job Applicant,Applicant for a Job,Richiedente per un lavoro
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ordini di Produzione non creati
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salario Slip of dipendente {0} già creato per questo mese
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Salario Slip of dipendente {0} già creato per questo mese
 DocType: Stock Reconciliation,Reconciliation JSON,Riconciliazione JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 DocType: Sales Invoice Item,Batch No,Lotto N.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Consentire a più ordini di vendita contro ordine di acquisto di un cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principale
-DocType: DocPerm,Delete,Elimina
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nuovo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Arrestato ordine non può essere cancellato . Stappare per annullare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Crea Ordine d'Acquisto
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Crea Ordine d'Acquisto
 DocType: SMS Center,Send To,Invia a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Somma stanziata
 DocType: Sales Team,Contribution to Net Total,Contributo sul totale netto
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Riconciliazione Giacenza
@@ -1517,53 +1403,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Richiedente per Lavoro.
 DocType: Purchase Order Item,Warehouse and Reference,Magazzino e di riferimento
 DocType: Supplier,Statutory info and other general information about your Supplier,Sindaco informazioni e altre informazioni generali sulla tua Fornitore
-DocType: Country,Country,Nazione
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Indirizzi
-DocType: Communication,Received,Ricevuto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Inserito Numero di Serie duplicato per l'articolo {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condizione per una regola di trasporto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,L'articolo non può avere Ordine di Produzione.
-DocType: DocField,Attach Image,Allega immagine
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Il peso netto di questo pacchetto. (Calcolato automaticamente come somma del peso netto delle partite)
-DocType: Stock Reconciliation Item,Leave blank if no change,Lasciare vuoto se nessun cambiamento
 DocType: Sales Order,To Deliver and Bill,Per Consegnare e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registri di tempo per la produzione.
 DocType: Item,Apply Warehouse-wise Reorder Level,Usa le informazioni di Magazziono per determinare livello di riordino
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} deve essere presentata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve essere presentata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo di log per le attività.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Versamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Versamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo reale e costi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Richiesta materiale di massimo {0} può essere fatto per la voce {1} contro Sales Order {2}
 DocType: Employee,Salutation,Appellativo
-DocType: Communication,Rejected,Rifiutato
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
 DocType: Sales Order Item,Actual Qty,Q.tà Reale
 DocType: Sales Invoice Item,References,Riferimenti
 DocType: Quality Inspection Reading,Reading 10,Lettura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito gli elementi duplicati . Si prega di correggere e riprovare .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valore {0} per attributo {1} non esiste nella lista della voce validi i valori degli attributi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Scaduto
 DocType: Packing Slip,To Package No.,A Pacchetto no
-DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Data di Emissione
 DocType: Activity Cost,Activity Cost,Attività Costo
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Q.tà Consumata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicazioni
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicazioni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 DocType: Payment Tool,Make Payment Entry,Crea Voce Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
 ,Sales Invoice Trends,Fattura di vendita Tendenze
 DocType: Leave Application,Apply / Approve Leaves,Applicare / Approva Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Può riferirsi fila solo se il tipo di carica è 'On Fila Indietro Importo ' o ' Indietro totale riga '
 DocType: Sales Order Item,Delivery Warehouse,Magazzino di consegna
 DocType: Stock Settings,Allowance Percent,Tolleranza Percentuale
@@ -1575,33 +1456,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Vendita deve essere controllato, se applicabile per è selezionato come {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Preventivo Articolo Fornitore
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Crea Struttura Salariale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tosatura
 DocType: Item,Has Variants,Ha Varianti
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clicca sul pulsante 'Crea Fattura Vendita' per creare una nuova Fattura di Vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Imballaggi ed etichettatura
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Siete pregati di specificare Valuta predefinita in azienda Maestro e predefiniti globali
-DocType: Dropbox Backup,Dropbox Access Secret,Accesso Segreto Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gestione Progetti
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 DocType: Budget Detail,Fiscal Year,Anno Fiscale
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bilancio non può essere assegnato contro {0}, in quanto non è un conto entrate o uscite"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Raggiunto
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorio / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ad esempio 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,ad esempio 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In parole saranno visibili una volta che si salva la fattura di vendita.
 DocType: Item,Is Sales Item,È Voce vendite
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppi Articoli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
 DocType: Maintenance Visit,Maintenance Time,Tempo di Manutenzione
 ,Amount to Deliver,Importo da consegnare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un prodotto o servizio
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ci sono stati degli errori .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Toccando
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un prodotto o servizio
 DocType: Naming Series,Current Value,Valore Corrente
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creato
 DocType: Delivery Note Item,Against Sales Order,Contro Sales Order
@@ -1616,15 +1492,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dazi e tasse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Inserisci Data di riferimento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Inserisci Data di riferimento
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} voci di pagamento non possono essere filtrate per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tavolo per la voce che verrà mostrato in Sito Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
 DocType: Material Request Item,Material Request Item,Materiale Richiesta articolo
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Albero di gruppi di articoli .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Albero di gruppi di articoli .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rosso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rosso
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
 DocType: Account,Frozen,Congelato
 ,Open Production Orders,Aprire ordini di produzione
@@ -1634,12 +1510,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operazione {1} non è completato per {2} qty di prodotti finiti in ordine di produzione # {3}. Si prega di aggiornare lo stato di funzionamento tramite registri Tempo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Cambia UOM per l'articolo.
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterio  di accettazione
 DocType: Item Attribute,Attribute Name,Nome Attributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},L'Articolo {0} deve essere un'Articolo in Vendita o un Servizio in {1}
 DocType: Item Group,Show In Website,Mostra Nel Sito Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppo
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Gruppo
 DocType: Task,Expected Time (in hours),Tempo previsto (in ore)
 ,Qty to Order,Qtà da Ordinare
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Per tenere traccia di marca nei seguenti documenti DDT, Opportunità, Richiesta materiale, punto, ordine di acquisto, Buono Acquisto, l&#39;Acquirente Scontrino fiscale, Quotazione, Fattura, Product Bundle, ordini di vendita, Numero di serie"
@@ -1648,78 +1523,67 @@
 DocType: Holiday List,Clear Table,Pulisci Tabella
 DocType: Features Setup,Brands,Marche
 DocType: C-Form Invoice Detail,Invoice No,Fattura n
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordine di Acquisto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordine di Acquisto
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 DocType: Activity Cost,Costing Rate,Costing Tasso
 ,Customer Addresses And Contacts,Indirizzi e Contatti Cliente
 DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Non Impostato
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Tenere duro mentre il sistema è in corso di installazione . Questa operazione potrebbe richiedere alcuni minuti .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,coppia
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,coppia
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 DocType: Maintenance Schedule Detail,Actual Date,Stato Corrente
 DocType: Item,Has Batch No,Ha Lotto N.
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
 DocType: Employee,Personal Details,Dettagli personali
 ,Maintenance Schedules,Programmi di manutenzione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Goffratura
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debito Per account deve essere un account di Credito
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Come ordine di produzione può essere fatta per questo articolo , deve essere un elemento di magazzino ."
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Accoppiamento
-DocType: Authorization Rule,Above Value,Sopra Valore
 ,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
 DocType: Purchase Order,Delivered,Consegnato
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurazione del server in arrivo per i lavori di id-mail . ( ad esempio jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui fattura ricorrente sarà ferma
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
 DocType: Journal Entry,Accounts Receivable,Conti esigibili
 ,Supplier-Wise Sales Analytics,Fornitore - Wise vendita Analytics
 DocType: Address Template,This format is used if country specific format is not found,Questo formato viene utilizzato se il formato specifico per il Paese non viene trovata
-DocType: Custom Field,Custom,Personalizzato
 DocType: Production Order,Use Multi-Level BOM,Utilizzare BOM Multi-Level
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Stampaggio ad iniezione
 DocType: Bank Reconciliation,Include Reconciled Entries,Includi Voci riconciliati
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Albero dei conti finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lasciare vuoto se considerato per tutti i tipi dipendenti
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuire oneri corrispondenti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Il Conto {0} deve essere di tipo ' Asset fisso ' come voce {1} è un Asset articolo
 DocType: HR Settings,HR Settings,Impostazioni HR
-apps/frappe/frappe/config/setup.py +130,Printing,Stampa
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Claim è in attesa di approvazione . Solo il Responsabile approvazione spesa può aggiornare lo stato .
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Il giorno ( s ) in cui si stanno applicando per ferie sono vacanze . Non c'è bisogno di domanda per il congedo .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Sigla non può essere vuoto o spazio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,sportivo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totale Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unità
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Si prega di impostare tasti di accesso Dropbox nel tuo sito config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unità
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Si prega di specificare Azienda
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazzino dove si conservano Giacenze di Articoli Rifiutati
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Il tuo anno finanziario termina il
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Il tuo anno finanziario termina il
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Sostenere
-DocType: Authorization Rule,Approving Role,Regola Approvazione
 ,BOM Search,BOM Ricerca
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Chiusura (apertura + totali)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Si prega di specificare la valuta in azienda
 DocType: Workstation,Wages per hour,Salari all'ora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostra / Nascondi caratteristiche come Serial Nos, POS ecc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Account {0} non è valido. Conto valuta deve essere {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Account {0} non è valido. Conto valuta deve essere {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data di Liquidazione non può essere prima della data di arrivo in riga {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data di Liquidazione non può essere prima della data di arrivo in riga {0}
 DocType: Salary Slip,Deduction,Deduzioni
 DocType: Address Template,Address Template,Indirizzo Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Inserisci ID dipendente di questa persona di vendite
@@ -1731,76 +1595,68 @@
 DocType: Opportunity,Quotation,Quotazione
 DocType: Salary Slip,Total Deduction,Deduzione totale
 DocType: Quotation,Maintenance User,Manutenzione utente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Aggiornato
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Costo Aggiornato
 DocType: Employee,Date of Birth,Data Compleanno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e altre operazioni importanti sono tracciati per **Anno Fiscale**.
-DocType: Opportunity,Customer / Lead Address, Indirizzo Cliente / Contatto
+DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Contatto
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo di funzionamento
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrizione Del Lavoro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrizione Del Lavoro
 DocType: Purchase Order Item,Qty as per Stock UOM,Quantità come da UOM Archivio
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Selezionare un file csv valido con i dati
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Rivestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Tenere traccia delle campagne di vendita. Tenere traccia di Contatti, Preventivi, Ordini ecc da campagne per misurare il ritorno sull'investimento."
 DocType: Expense Claim,Approver,Certificatore
 ,SO Qty,SO Quantità
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Esistono voci Immagini contro warehouse {0}, quindi non è possibile riassegnare o modificare Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcolare il punteggio totale
 DocType: Supplier Quotation,Manufacturing Manager,Manager Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Spedizioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Stampaggio Dip
-DocType: Purchase Order,To be delivered to customer,Da consegnare al cliente
+apps/erpnext/erpnext/hooks.py +68,Shipments,Spedizioni
+DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Stato deve essere presentata.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,N. di serie {0} non appartiene ad alcun magazzino
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Impostazione
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
 DocType: Pricing Rule,Supplier,Fornitore
 DocType: C-Form,Quarter,Trimestrale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Spesa o Differenza conto è obbligatorio per la voce {0} come impatti valore azionario complessivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Impossibile overbill per la voce {0} in riga {1} più {2}. Per consentire fatturazione eccessiva, impostare in Impostazioni archivio"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Impossibile overbill per la voce {0} in riga {1} più {2}. Per consentire fatturazione eccessiva, impostare in Impostazioni archivio"
 DocType: Employee,Bank Name,Nome Banca
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sopra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utente {0} è disattivato
 DocType: Leave Application,Total Leave Days,Totale Lascia Giorni
-DocType: Journal Entry Account,Credit in Account Currency,Credit Account Valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: E-mail non sarà inviata agli utenti disabilitati
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleziona Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lasciare vuoto se considerato per tutti i reparti
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Currency Exchange,From Currency,Da Valuta
-DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Gli importi non riflette nel sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Seleziona importo assegnato, Tipo fattura e fattura numero in almeno uno di fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Gli importi non riflette nel sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Tariffa (Valuta Azienda)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altri
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in Giacenza."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completato
-DocType: Web Form,Select DocType,Selezionare DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brocciatura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancario
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancario
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nuovo Centro di costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nuovo Centro di costo
 DocType: Bin,Ordered Quantity,Ordinato Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ad esempio "" Costruire strumenti per i costruttori """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ad esempio "" Costruire strumenti per i costruttori """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Riferimento Tipo di documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contro Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contro Sales Order {1}
 DocType: Account,Fixed Asset,Asset fisso
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Inventario
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Inventario
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
 DocType: Time Log Batch,Total Billing Amount,Importo totale di fatturazione
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Conto Crediti
@@ -1808,19 +1664,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ordine di vendita a pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tempo Logs creato:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Seleziona account corretto
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Gruppo Discendenza
 DocType: Purchase Invoice Item,Page Break,Interruzione di pagina
 DocType: Production Order Operation,Pending,In attesa
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gli utenti che possono approvare le applicazioni lasciare un specifico del dipendente
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Non è possibile modificare UM predefinito Variant. Per cambiare UOM predefinita per la variante UM cambiamento di default del modello
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Attrezzature Ufficio
 DocType: Purchase Invoice Item,Qty,Qtà
 DocType: Fiscal Year,Companies,Aziende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elettronica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elettronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Crea un Richiesta Materiale quando la scorta raggiunge il livello di riordino
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dal Programma di manutenzione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tempo pieno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tempo pieno
 DocType: Purchase Invoice,Contact Details,Dettagli Contatto
 DocType: C-Form,Received Date,Data Received
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se è stato creato un modello standard di imposte delle entrate e oneri modello, selezionare uno e fare clic sul pulsante qui sotto."
@@ -1832,14 +1688,15 @@
 DocType: Job Applicant,Job Opening,Apertura di lavoro
 DocType: Payment Reconciliation,Payment Reconciliation,Pagamento Riconciliazione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Lettera Di Offerta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generare richieste di materiali (MRP) e ordini di produzione.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totale fatturato Amt
 DocType: Time Log,To Time,Per Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Approvazione di ruolo (di sopra del valore autorizzato)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Per aggiungere nodi figlio , esplorare albero e fare clic sul nodo in cui si desidera aggiungere più nodi ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsione : {0} non può essere genitore o figlio di {2}
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prezzo di listino {0} è disattivato
@@ -1849,12 +1706,10 @@
 DocType: Item,Customer Item Codes,Codici Voce clienti
 DocType: Opportunity,Lost Reason,Perso Motivo
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creare voci di pagamento nei confronti di ordini o fatture.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldatura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nuovo Archivio UOM è necessaria
 DocType: Quality Inspection,Sample Size,Dimensione del campione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Si prega di specificare una valida &#39;Dalla sentenza n&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 DocType: Project,External,Esterno
 DocType: Features Setup,Item Serial Nos,Voce n ° di serie
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e autorizzazioni
@@ -1864,15 +1719,13 @@
 DocType: Bin,Actual Quantity,Quantità Reale
 DocType: Shipping Rule,example: Next Day Shipping,esempio: Next Day spedizione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} non trovato
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,I vostri clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Stampaggio a compressione
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,I vostri clienti
 DocType: Leave Block List Date,Block Date,Data Blocco
 DocType: Sales Order,Not Delivered,Non Consegnati
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Codice Articolo> Gruppo Articolo > Marchio
 DocType: Appraisal Goal,Appraisal Goal,Obiettivo di Valutazione
-DocType: Event,Friday,Venerdì
 DocType: Time Log,Costing Amount,Costing Importo
 DocType: Process Payroll,Submit Salary Slip,Invia Stipendio slittamento
 DocType: Salary Structure,Monthly Earning & Deduction,Guadagno & Deduzione Mensili
@@ -1880,16 +1733,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importazione Collettiva
 DocType: Sales Partner,Address & Contacts,Indirizzi & Contatti
 DocType: SMS Log,Sender Name,Nome mittente
-DocType: Page,Title,Titolo
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalizza
 DocType: POS Profile,[Select],[Seleziona]
 DocType: SMS Log,Sent To,Inviato A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Crea Fattura di Vendita
 DocType: Company,For Reference Only.,Per riferimento soltanto.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Non valido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Importo Anticipo
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Dalla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dalla Data' è obbligatorio
 DocType: Journal Entry,Reference Number,Numero di riferimento
 DocType: Employee,Employment Details,Dettagli Dipendente
 DocType: Employee,New Workplace,Nuovo posto di lavoro
@@ -1904,7 +1755,7 @@
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
 DocType: Item,End of Life,Fine Vita
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viaggi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viaggi
 DocType: Leave Block List,Allow Users,Consentire Utenti
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 DocType: Sales Invoice,Recurring,Periodico
@@ -1912,23 +1763,21 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,aggiornamento dei costi
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specificare le operazioni, costi operativi e dare una gestione unica di no a vostre operazioni."
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Consentire Scorte Negative
 DocType: Installation Note,Installation Note,Nota Installazione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Aggiungi Imposte
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Aggiungi Imposte
 ,Financial Analytics,Analisi Finanziaria
 DocType: Quality Inspection,Verified By,Verificato da
 DocType: Address,Subsidiary,Sussidiario
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Non è possibile cambiare la valuta di default dell'azienda , perché ci sono le transazioni esistenti . Le operazioni devono essere cancellate per cambiare la valuta di default ."
 DocType: Quality Inspection,Purchase Receipt No,RICEVUTA No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,caparra
-DocType: System Settings,In Hours,In Ore
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilibrio previsto come da banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Lucidatura
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilibrio previsto come da banca
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
 DocType: Appraisal,Employee,Dipendente
@@ -1941,15 +1790,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppo da Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Sales Invoice,Mass Mailing,Mailing di massa
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,File da rinominare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostra Pagamenti
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Taglia
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmaceutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Selling Settings,Sales Order Required,Ordine di vendita richiesto
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crea clienti
@@ -1959,30 +1806,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lettura 9
 DocType: Supplier,Is Frozen,È Congelato
 DocType: Buying Settings,Buying Settings,Impostazioni Acquisto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finitura di massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,DiBa N. per un buon articolo finito
 DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurazione del server per la posta elettronica in entrata vendite id . ( ad esempio sales@example.com )
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Tool,Payment Account,Conto di Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Si prega di specificare Società di procedere
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Bozza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensativa Off
 DocType: Quality Inspection Reading,Accepted,Accettato
-DocType: User,Female,Femmina
-DocType: Journal Entry Account,Debit in Account Currency,Debito Account Valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com&#39;è. Questa azione non può essere annullata.
-DocType: Print Settings,Modern,Moderna
-DocType: Communication,Replied,Ha risposto
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Riferimento non valido {0} {1}
 DocType: Payment Tool,Total Payment Amount,Importo totale Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore a quantità pianificata ({2}) in ordine di produzione {3}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
 DocType: Newsletter,Test,Prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Siccome ci sono transazioni di magazzino per questo articolo, \ non è possibile modificare i valori di 'Ha Numero Seriale', 'Ha Numero Lotto', 'presente in Scorta' e 'il metodo di valutazione'"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve diario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Non è possibile modificare tariffa se BOM menzionato agianst tutto l'articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
@@ -1990,17 +1832,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Le richieste di articoli.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordine di produzione separata verrà creato per ogni buon prodotto finito.
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,installazione completa
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Elenco Indirizzi per Newsletter
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
+DocType: Authorization Rule,Authorized Value,Valore Autorizzato
 DocType: Contact,Enter department to which this Contact belongs,Inserisci reparto a cui appartiene questo contatto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totale Assente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unità di Misura
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unità di Misura
 DocType: Fiscal Year,Year End Date,Data di Fine Anno
 DocType: Task Depends On,Task Depends On,Attività dipende
 DocType: Lead,Opportunity,Opportunità
@@ -2021,16 +1863,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tasso di base (come da UOM Archivio)
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
 DocType: Campaign,Campaign-.####,Campagna . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Penetrante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distributore di terze parti / rivenditore / commissionario / affiliate / rivenditore che vende i prodotti delle aziende per una commissione.
 DocType: Customer Group,Has Child Node,Ha un Nodo Figlio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} non è in alcun anno fiscale attivo. Per maggiori dettagli si veda {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamma invecchiamento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Lavorazione fotochimica
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2072,11 +1913,9 @@
  8. Inserisci Row: se sulla base di ""Previous totale riga"" è possibile selezionare il numero di riga che sarà preso come base per il calcolo (di default è la riga precedente).
  9. Considerare fiscale o Charge per: In questa sezione è possibile specificare se l'imposta / tassa è solo per la valutazione (non una parte del totale) o solo per totale (non aggiunge valore al prodotto) o per entrambi.
  10. Aggiungi o dedurre: Se si desidera aggiungere o detrarre l'imposta."
-DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
-DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Giacenza {0} non inserita
 DocType: Payment Reconciliation,Bank / Cash Account,Banca / Account Cash
 DocType: Tax Rule,Billing City,Fatturazione Città
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
@@ -2084,40 +1923,36 @@
 DocType: Journal Entry,Credit Note,Nota Credito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Completato Quantità non può essere superiore a {0} per il funzionamento {1}
 DocType: Features Setup,Quality,Qualità
-DocType: Contact Us Settings,Introduction,Presentazione
 DocType: Warranty Claim,Service Address,Service Indirizzo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 righe per la Riconciliazione Fotografici.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 righe per la Riconciliazione Fotografici.
 DocType: Stock Entry,Manufacture,Fabbricazione
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Si prega di Consegna Nota prima
 DocType: Purchase Invoice,Currency and Price List,Valuta e Lista Prezzi
 DocType: Opportunity,Customer / Lead Name,Nome Cliente / Contatto
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Liquidazione data non menzionato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,produzione
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Liquidazione data non menzionato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produzione
 DocType: Item,Allow Production Order,Consentire Ordine Produzione
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Installation Note Item,Installed Qty,Qtà installata
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Inserito
 DocType: Salary Structure,Total Earning,Guadagnare totale
 DocType: Purchase Receipt,Time at which materials were received,Ora in cui sono stati ricevuti i materiali
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,I miei indirizzi
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramo Organizzazione master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,oppure
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Spese Utility
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Sopra
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
-,Download Backups,Scarica Backup
 DocType: Notification Control,Sales Order Message,Sales Order Messaggio
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Impostare i valori predefiniti , come Società , valuta , corrente anno fiscale , ecc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo di pagamento
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Bank Reconciliation,To Date,A Data
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Dettagli
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
 DocType: Employee,Emergency Contact,Contatto di emergenza
 DocType: Item,Quality Parameters,Parametri di Qualità
@@ -2132,6 +1967,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial n / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo Conto
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lascia tipo {0} non può essere trasmessa carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non viene generato per tutte le voci . Si prega di cliccare su ' Generate Schedule '
 ,To Produce,per produrre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
@@ -2139,33 +1975,28 @@
 DocType: Bin,Reserved Quantity,Riservato Quantità
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acquistare oggetti Receipt
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizzazione dei moduli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Taglio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Appiattimento
 DocType: Account,Income Account,Conto Proventi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modanatura
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Recapito
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere &quot;tasso di materiali a base di&quot; in Costing Sezione
 DocType: Appraisal Goal,Key Responsibility Area,Area Chiave Responsabilità
 DocType: Item Reorder,Material Request Type,Materiale Tipo di richiesta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Rif
 DocType: Cost Center,Cost Center,Centro di Costo
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ordine di acquisto Message
 DocType: Tax Rule,Shipping Country,Spedizione Nazione
 DocType: Upload Attendance,Upload HTML,Carica HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Anticipo Totale ({0}) contro Order {1} non può essere maggiore \
  del Grand Total ({2})"
 DocType: Employee,Relieving Date,Alleviare Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazzino può essere modificato solo tramite Inserimento Giagenza / Bolla / Ricevuta d'Acquisto
 DocType: Employee Education,Class / Percentage,Classe / Percentuale
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsabile Marketing e Vendite
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Tassazione Proventi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser progettato shaping netto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Responsabile Marketing e Vendite
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tassazione Proventi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regola tariffaria selezionato è fatta per 'prezzo', che sovrascriverà Listino. Prezzo Regola Il prezzo è il prezzo finale, in modo che nessun ulteriore sconto deve essere applicato. Quindi, in operazioni come ordine di vendita, ordine di acquisto, ecc, che viene prelevato in campo 'Tasso', piuttosto che il campo 'Listino Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Traccia Contatti per settore Type.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
@@ -2173,10 +2004,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestire Organizzazione Gruppi Clienti
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nuovo Centro di costo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nuovo Centro di costo Nome
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nessun valore predefinito Indirizzo Template trovato. Si prega di crearne uno nuovo da Setup> Stampa e Branding> Indirizzo Template.
 DocType: Appraisal,HR User,HR utente
@@ -2188,31 +2018,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà Reale dopo la Transazione
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
 DocType: Supplier,Billing Currency,Fatturazione valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Conto Economico
 DocType: Bank Reconciliation Detail,Cheque Number,Numero Assegno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Urgente
 DocType: Payment Tool Detail,Payment Tool Detail,Dettaglio strumento di pagamento
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nessun dipendente trovato!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
 DocType: Purchase Order,Customer Address Display,Indirizzo cliente display
 DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lucidatura
 DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unità di misura predefinita per la voce {0} non può essere modificato direttamente, perché \ hai già fatto qualche operazione (s) con un altro UOM. Per cambiare UOM predefinita, \ uso &#39;UOM Sostituire Utility&#39; strumento sotto modulo Fotografici."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificare Tasso di cambio per convertire una valuta in un'altra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Preventivo {0} è annullato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Preventivo {0} è annullato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} era in aspettativa per {1} . Impossibile segnare presenze .
 DocType: Sales Partner,Targets,Obiettivi
@@ -2220,14 +2044,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Crea Log Tempo
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Si prega di impostare la quantità di riordino
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Si prega di creare Cliente da Contatto {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,computer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elettrochimica rettifica
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Si prega di configurare il piano dei conti prima di iniziare scritture contabili
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora regola tariffaria
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Annullato
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La data della struttura salariale non può essere inferiore a quella di assunzione del dipendente.
 DocType: Employee Education,Graduate,Laureato:
 DocType: Leave Block List,Block Days,Giorno Blocco
@@ -2264,7 +2087,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Seleziona se fattura ricorrente, deseleziona per fermare ricorrenti o mettere corretta Data di Fine"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
 DocType: Packing Slip,If more than one package of the same type (for print),Se più di un pacchetto dello stesso tipo (per la stampa)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Massimo {0} righe ammesse
 DocType: C-Form Invoice Detail,Net Total,Totale Netto
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fatturazione (fattura di vendita)
@@ -2281,20 +2103,19 @@
 DocType: Maintenance Visit,Purposes,Scopi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast un elemento deve essere introdotto con quantità negativa nel documento ritorno
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più di tutte le ore di lavoro disponibili a workstation {1}, abbattere l&#39;operazione in più operazioni"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Lavorazione elettrochimica
 ,Requested,richiesto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nessun Commento
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,In ritardo
 DocType: Account,Stock Received But Not Billed,Giacenza Ricevuta ma non Fatturata
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Account root deve essere un gruppo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,retribuzione lorda + Importo posticipata + Importo incasso - Deduzione totale
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Features Setup,Sales and Purchase,Vendita e Acquisto
 DocType: Supplier Quotation Item,Material Request No,Materiale Richiesta No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasso al quale la valuta del cliente viene convertito in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,La sottoscrizione di {0} è stata rimossa da questo elenco.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasso Netto (Valuta Azienda)
-apps/frappe/frappe/templates/base.html +134,Added,Aggiunti
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gestire Organizzazione Territorio.
 DocType: Journal Entry Account,Sales Invoice,Fattura Commerciale
 DocType: Journal Entry Account,Party Balance,Balance Partito
@@ -2308,11 +2129,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anno {0} fiscale non trovato.
 DocType: Bank Reconciliation,Get Relevant Entries,Prendi le voci rilevanti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Voce contabilità per scorta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coniatura
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
-apps/frappe/frappe/desk/query_report.py +136,Total,Totale
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
 DocType: Account,Root Type,Root Tipo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
@@ -2322,14 +2141,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Fiscale Ammontare Dopo Ammontare Sconto (Società valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Magazzino di destinazione è obbligatoria per riga {0}
 DocType: Quality Inspection,Quality Inspection,Controllo Qualità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formando
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Livello Minimo di Inventario
 DocType: Stock Entry,Subcontract,Subappaltare
@@ -2340,42 +2158,39 @@
 DocType: Item,Manufacturer Part Number,Codice Produttore
 DocType: Production Order Operation,Estimated Time and Cost,Tempo e Costo Stimato
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Num. di SMS Inviati
 DocType: Account,Company,Azienda
 DocType: Account,Expense Account,Conto uscite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Colore
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Colore
 DocType: Maintenance Visit,Scheduled,Pianificate
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Si prega di selezionare la voce dove &quot;è articolo di&quot; è &quot;No&quot; e &quot;Is Voce di vendita&quot; è &quot;Sì&quot;, e non c&#39;è nessun altro pacchetto di prodotti"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selezionare distribuzione mensile per distribuire in modo non uniforme obiettivi attraverso mesi.
 DocType: Purchase Invoice Item,Valuation Rate,Tasso Valutazione
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Listino Prezzi Valuta non selezionati
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Voce Riga {0}: Acquisto Ricevuta {1} non esiste nella tabella di cui sopra 'ricevute di acquisto'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
 DocType: Installation Note Item,Against Document No,Per Documento N
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gestire Partners Commerciali.
 DocType: Quality Inspection,Inspection Type,Tipo di ispezione
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Si prega di selezionare {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ricercatore
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aggiornare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ricercatore
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Si prega di salvare la Newsletter prima di inviare
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome o e-mail è obbligatorio
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Controllo di qualità in arrivo.
 DocType: Purchase Order Item,Returned Qty,Tornati Quantità
 DocType: Employee,Exit,Esci
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type è obbligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrofinitrice
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e bolle di consegna"
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
 DocType: Sales Invoice,Advertisement,Pubblicità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Periodo Di Prova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periodo Di Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Expense Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
@@ -2383,43 +2198,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Per Data Ora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Rettifica
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink wrapping
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Attività in sospeso
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confermato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornitore> Fornitore Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titolo Indirizzo è obbligatorio.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editori Giornali
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editori Giornali
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selezionare l'anno fiscale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Fusione
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Attendance,Attendance Date,Data Presenza
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Conto con nodi figlio non può essere convertito in contabilità
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Conto con nodi figlio non può essere convertito in contabilità
 DocType: Address,Preferred Shipping Address,Preferito Indirizzo spedizione
 DocType: Purchase Receipt Item,Accepted Warehouse,Magazzino Accettato
 DocType: Bank Reconciliation Detail,Posting Date,Data di registrazione
 DocType: Item,Valuation Method,Metodo di Valutazione
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Impossibile trovare il tasso di cambio per {0} a {1}
 DocType: Sales Invoice,Sales Team,Team di vendita
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
 DocType: Serial No,Under Warranty,Sotto Garanzia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Errore]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In parole saranno visibili una volta che si salva l&#39;ordine di vendita.
 ,Employee Birthday,Compleanno Dipendente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,capitale a rischio
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capitale a rischio
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove foglie attribuiti (in giorni)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} non esiste
 DocType: Pricing Rule,Discount Percentage,Percentuale di sconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Numero di fattura
-apps/erpnext/erpnext/hooks.py +70,Orders,Ordini
+apps/erpnext/erpnext/hooks.py +54,Orders,Ordini
 DocType: Leave Control Panel,Employee Type,Tipo Dipendente
 DocType: Employee Leave Approver,Leave Approver,Lascia Approvatore
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Rastremazione
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale trasferito per Produzione
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utente con ""Expense Approver"" ruolo"
 ,Issued Items Against Production Order,Articoli emesso contro Ordine di produzione
@@ -2431,7 +2243,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periodo non valido
 DocType: Customer,Credit Limit,Limite Credito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleziona il tipo di operazione
 DocType: GL Entry,Voucher No,Voucher No
@@ -2441,11 +2252,10 @@
 DocType: Customer,Address and Contact,Indirizzo e contatto
 DocType: Customer,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Employee,Feedback,Riscontri
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ferie non possono essere assegnati prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tabella di marcia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Lavorazione a getto abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tabella di marcia
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
-DocType: Website Settings,Website Settings,Impostazioni Sito
 DocType: Item,Reorder level based on Warehouse,Livello di riordino sulla base di Magazzino
 DocType: Activity Cost,Billing Rate,Fatturazione Tasso
 ,Qty to Deliver,Qtà di Consegna
@@ -2456,20 +2266,19 @@
 DocType: Material Request,Requested For,richiesto Per
 DocType: Quotation Item,Against Doctype,Per Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Sottoscrivi questa bolla di consegna contro ogni progetto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Account root non può essere eliminato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Account root non può essere eliminato
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostra Immagini Entries
 ,Is Primary Address,È primario Indirizzo
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Riferimento # {0} datato {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestire Indirizzi
 DocType: Pricing Rule,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
 DocType: Journal Entry,User Remark,Osservazioni utenti
 DocType: Lead,Market Segment,Segmento di Mercato
-DocType: Communication,Phone,Telefono
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Chiusura (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Chiusura (Dr)
 DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modello fiscale per la vendita di transazioni.
@@ -2485,10 +2294,9 @@
 ,Billed Amount,importo fatturato
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Ricevi aggiornamenti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Aggiungere un paio di record di esempio
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Richiesta materiale {0} viene annullato o interrotto
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Aggiungere un paio di record di esempio
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lascia Gestione
-DocType: Event,Groups,Gruppi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Raggruppa per conto
 DocType: Sales Order,Fully Delivered,Completamente Consegnato
 DocType: Lead,Lower Income,Reddito più basso
@@ -2497,40 +2305,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Guida rapida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Origine e magazzino target non possono essere uguali per riga {0}
 DocType: Features Setup,Sales Extras,Extra di vendita
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget per conto {1} contro il centro di costo {2} supererà da {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget per conto {1} contro il centro di costo {2} supererà da {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valore o Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
 ,Qty to Receive,Qtà da Ricevere
 DocType: Leave Block List,Leave Block List Allowed,Lascia Block List ammessi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fattore di conversione non può essere in frazioni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Si utilizzerà per il login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Si utilizzerà per il login
 DocType: Sales Partner,Retailer,Dettagliante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tutti i tipi di fornitori
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programma di manutenzione Voce
 DocType: Sales Order,%  Delivered,%  Consegnato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Scoperto di conto bancario
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Crea Busta Paga
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Sfoglia BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Prestiti garantiti
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Prodotti di punta
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Prodotti di punta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Apertura Balance Equità
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Non può approvare congedo in quanto non si è autorizzati ad approvare foglie su Date Block
 DocType: Appraisal,Appraisal,Valutazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,-Foam perso colata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Disegno
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,La Data si Ripete
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firma autorizzata
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Lascia dell'approvazione deve essere uno dei {0}
 DocType: Hub Settings,Seller Email,Venditore Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Workstation Working Hour,Start Time,Ora di inizio
@@ -2544,12 +2349,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
 DocType: BOM Operation,Hour Rate,Rapporto Orario
 DocType: Stock Settings,Item Naming By,Articolo Naming By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,da Preventivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,da Preventivo
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Un'altra voce periodo di chiusura {0} è stato fatto dopo {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale trasferito for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Il Conto {0} non esiste
 DocType: Purchase Receipt Item,Purchase Order Item No,Acquisto fig
-DocType: System Settings,System Settings,Impostazioni di sistema
 DocType: Project,Project Type,Tipo di progetto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Sia qty destinazione o importo obiettivo è obbligatoria .
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costo di varie attività
@@ -2558,36 +2362,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Dettaglio
 DocType: Sales Order,Fully Billed,Completamente Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 DocType: Serial No,Is Cancelled,È Annullato
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Le mie spedizioni
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Le mie spedizioni
 DocType: Journal Entry,Bill Date,Data Fattura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 DocType: Supplier,Supplier Details,Fornitore Dettagli
-DocType: Communication,Recipients,Destinatari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Avvitamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Zigrinatura
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bonifico bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Seleziona conto bancario
 DocType: Newsletter,Create and Send Newsletters,Creare e inviare newsletter
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Da Data deve essere prima di A Data
 DocType: Sales Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto Predefinito Entrate
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Benvenuti a ERPNext
+,Welcome to ERPNext,Benvenuti a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Number Dettaglio
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Contatto per Preventivo
 DocType: Lead,From Customer,Da Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chiamate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chiamate
 DocType: Project,Total Costing Amount (via Time Logs),Importo totale Costing (via Time Diari)
 DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
 ,Projected,proiettata
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
@@ -2595,13 +2395,10 @@
 DocType: Issue,Opening Date,Data di apertura
 DocType: Journal Entry,Remark,Osservazioni
 DocType: Purchase Receipt Item,Rate and Amount,Aliquota e importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Noioso
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordine di Vendita
-DocType: Blog Category,Parent Website Route,Parent Sito Percorso
 DocType: Sales Order,Not Billed,Non Fatturata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Entrambi Warehouse deve appartenere alla stessa Società
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nessun contatto ancora aggiunto.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Non attivo
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
 DocType: Time Log,Batched for Billing,Raggruppati per la Fatturazione
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Fatture sollevate dai fornitori.
@@ -2609,20 +2406,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ad esempio IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,ad esempio IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gas metalli a caldo
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
 DocType: Sales Invoice Item,Delivered Qty,Q.tà Consegnata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Società è obbligatoria
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Vai al gruppo appropriato (solitamente fonte di fondi&gt; passività correnti&gt; Tasse e imposte e creare un nuovo account (facendo clic su Add Child) di tipo &quot;Tax&quot; e fare parlare del Tax rate.
 ,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manca valuta Tassi di cambio in {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Taglio laser
-DocType: Event,Monday,Lunedi
 DocType: Journal Entry,Stock Entry,Inserimento Giacenza
 DocType: Account,Payable,pagabile
 DocType: Salary Slip,Arrear Amount,Importo posticipata
@@ -2635,7 +2429,6 @@
 DocType: Lead,Address Desc,Desc. indirizzo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,", Almeno una delle vendere o acquistare deve essere selezionata"
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Dove si svolgono le operazioni di fabbricazione.
-DocType: Page,All,Tutto
 DocType: Stock Entry Detail,Source Warehouse,Fonte Warehouse
 DocType: Installation Note,Installation Date,Data di installazione
 DocType: Employee,Confirmation Date,conferma Data
@@ -2643,11 +2436,10 @@
 DocType: Account,Sales User,User vendite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min quantità non può essere maggiore di Max Qtà
 DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,set
 DocType: Lead,Lead Owner,Responsabile Contatto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,È richiesta Magazzino
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,È richiesta Magazzino
 DocType: Employee,Marital Status,Stato civile
-DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale 
+DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale
 DocType: Time Log,Will be updated when billed.,Verrà aggiornato quando fatturati.
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibile Quantità batch a partire Warehouse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
@@ -2659,44 +2451,40 @@
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ordine di acquisto Articolo inserito
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nome azienda non può essere azienda
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Lettera Teste per modelli di stampa .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titoli di modelli di stampa ad esempio Fattura Proforma .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinitura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Diverso UOM per gli elementi porterà alla non corretta ( Total) Valore di peso netto . Assicurarsi che il peso netto di ogni articolo è nella stessa UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrazione di tutte le comunicazioni di tipo e-mail, telefono, chat, visita, ecc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Si prega di citare Arrotondamento centro di costo in azienda
 DocType: Purchase Invoice,Terms,Termini
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Crea nuovo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Crea nuovo
 DocType: Buying Settings,Purchase Order Required,Ordine di Acquisto Obbligatorio
 ,Item-wise Sales History,Articolo-saggio Storia Vendite
 DocType: Expense Claim,Total Sanctioned Amount,Totale importo sanzionato
 ,Purchase Analytics,Acquisto Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Nota articolo Consegna
 DocType: Expense Claim,Task,Attività
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rasatura
 DocType: Purchase Taxes and Charges,Reference Row #,Riferimento Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numero di lotto è obbligatoria per la voce {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Si tratta di una persona di vendita di root e non può essere modificato .
 ,Stock Ledger,Inventario
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Vota: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Vota: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Stipendio slittamento Deduzione
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Note
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selezionare un nodo primo gruppo.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopo deve essere uno dei {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Compila il modulo e salvarlo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Scaricare un report contenete tutte le materie prime con il loro recente stato di inventario
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Di fronte
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Lascia equilibrio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
 DocType: Company,Default Letter Head,Predefinito Lettera Capo
 DocType: Time Log,Billable,Addebitabile
-DocType: Authorization Rule,This will be used for setting rule in HR module,Questo verrà utilizzato per regola impostazione nel modulo HR
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Riordina Quantità
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
@@ -2708,12 +2496,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Occasione persa
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Il Campo Sconto sarà abilitato in Ordine di acquisto, ricevuta di acquisto, Fattura Acquisto"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: Si prega di non creare account per Clienti e Fornitori
-DocType: Report,Report Type,Tipo di rapporto
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Caricamento
 DocType: BOM Replace Tool,BOM Replace Tool,DiBa Sostituire Strumento
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
 DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mostra fiscale break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importare e Esportare Dati
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se si coinvolgono in attività di produzione . Abilita Voce ' è prodotto '
@@ -2723,16 +2509,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
 DocType: Serial No,Out of AMC,Fuori di AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiale richiesta dettaglio No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Tornitura dura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Crea Visita Manutenzione
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
 DocType: Company,Default Cash Account,Conto Monete predefinito
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} non è un numero di lotto valido per la voce {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se il pagamento non viene effettuato nei confronti di qualsiasi riferimento, fare manualmente Journal Entry."
 DocType: Item,Supplier Items,Fornitore Articoli
 DocType: Opportunity,Opportunity Type,Tipo di Opportunità
@@ -2744,7 +2529,7 @@
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
 ,Stock Ageing,Invecchiamento Archivio
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' è disabilitato
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica di contatti su operazioni Invio.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2752,59 +2537,51 @@
  Disponibile Quantità: {4}, Qty trasferimento: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Articolo 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
-DocType: Event,Sunday,Domenica
 DocType: Sales Team,Contribution (%),Contributo (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : non verrà creato il pagamento poiché non è stato specificato 'conto bancario o fido'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilità
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelli
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Inserisci atleast 1 fattura nella tabella
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Aggiungi utenti
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Aggiungi utenti
 DocType: Pricing Rule,Item Group,Gruppo Articoli
 DocType: Task,Actual Start Date (via Time Logs),Actual Data di inizio (via Time Diari)
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
 DocType: Item,Default BOM,BOM Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Si prega di digitare nuovamente il nome della società per confermare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totale ore
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,L'Articolo è richiesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Iniezione di metallo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Da Nota di Consegna
 DocType: Time Log,From Time,Da Periodo
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleziona il tuo Paese, fuso orario e valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapaggio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Colata in sabbia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanotecnica
 DocType: Purchase Invoice Item,Rate,Tariffa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stagista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stagista
 DocType: Newsletter,A Lead with this email id should exist,Un potenziale cliente (lead) con questa e-mail dovrebbe esistere
 DocType: Stock Entry,From BOM,Da Distinta Base
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,di base
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,di base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ad esempio Kg, unità, nn, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","ad esempio Kg, unità, nn, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Structure,Salary Structure,Struttura salariale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multipla Regola Prezzo esiste con stessi criteri, si prega di risolvere \
  conflitto assegnando priorità. Regole Prezzo: {0}"
 DocType: Account,Bank,Banca
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
 DocType: Hub Settings,Access Token,Token di accesso
@@ -2813,45 +2590,37 @@
 DocType: Item,Is Fixed Asset Item,È Asset fisso Voce
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se si è a lungo stampare formati, questa funzione può essere usato per dividere la pagina da stampare su più pagine con tutte le intestazioni e piè di pagina in ogni pagina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,tutti i Territori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
 DocType: Fiscal Year,Year Name,Anno Nome
 DocType: Process Payroll,Process Payroll,Processo Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ci sono più feste di giorni di lavoro di questo mese .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Ci sono più feste di giorni di lavoro di questo mese .
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Vendite Partner Nome
 DocType: Purchase Invoice Item,Image View,Visualizza immagine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finitura &amp; finitura industriale
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data Inizio e Fine sono obbligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & borse merci
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perforazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Soffiaggio
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
 DocType: Tax Rule,Shipping City,Spedizione Città
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Questo Articolo è una variante di {0} (Modello). Gli attributi vengono copiati dal modello solo se si imposta 'No Copy'
 DocType: Account,Purchase User,Acquisto utente
 DocType: Notification Control,Customize the Notification,Personalizzare Notifica
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Martellamento
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Journal Entry,Print Heading,Stampa Rubrica
 DocType: Quotation,Maintenance Manager,Manager Manutenzione
-DocType: Workflow State,Search,Cerca
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totale non può essere zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Giorni dall'ultimo Ordine' deve essere maggiore o uguale a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brasatura
 DocType: C-Form,Amended From,Corretto da
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sia qty destinazione o importo obiettivo è obbligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Seleziona Data Pubblicazione primo
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
 DocType: Leave Control Panel,Carry Forward,Portare Avanti
@@ -2860,45 +2629,44 @@
 ,Produced,prodotto
 DocType: Item,Item Code for Suppliers,Codice Articolo per Fornitori
 DocType: Issue,Raised By (Email),Sollevata da (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Allega intestata
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generale
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Allega intestata
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inserisci il tuo capo fiscali (ad esempio IVA, dogana ecc, che devono avere nomi univoci) e le loro tariffe standard. Questo creerà un modello standard, che è possibile modificare e aggiungere più tardi."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Inserisci il tuo capo fiscali (ad esempio IVA, dogana ecc, che devono avere nomi univoci) e le loro tariffe standard. Questo creerà un modello standard, che è possibile modificare e aggiungere più tardi."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
-DocType: Blog Post,Blog Post,Articolo Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Raggruppa Per
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Abilitare / disabilitare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,spese postali
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Purchase Order,The date on which recurring order will be stop,La data in cui ordine ricorrente sarà ferma
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve essere ridotto di {1} o si dovrebbe aumentare la tolleranza di superamento soglia
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente totale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Ora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Trasferire il materiale al Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Trasferire il materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No non può avere Warehouse . Warehouse deve essere impostato da dell'entrata Stock o ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Contatto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Crea Preventivo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Spedizione condizioni regola
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
 DocType: Features Setup,Point of Sale,Punto di vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Tassa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Riga {0}: {1} non è un valido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinazione
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Riga {0}: {1} non è un valido {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Da Bundle prodotto
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Data Segnala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fatture
 DocType: Job Opening,Job Title,Professione
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} già stanziato per Employee {1} per il periodo {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Gruppi di articoli in Dettagli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
@@ -2907,33 +2675,29 @@
 DocType: Stock Entry,Update Rate and Availability,Frequenza di aggiornamento e disponibilità
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentuale si è permesso di ricevere o consegnare di più contro la quantità ordinata. Per esempio: Se avete ordinato 100 unità. e il vostro assegno è 10% poi si è permesso di ricevere 110 unità.
 DocType: Pricing Rule,Customer Group,Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: Item,Website Description,Descrizione del sito
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
 ,Sales Register,Commerciale Registrati
 DocType: Quotation,Quotation Lost Reason,Motivo Preventivo Perso
 DocType: Address,Plant,Impianto
-DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Riepilogo per questo mese e le attività in corso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminazione a freddo
 DocType: Customer Group,Customer Group Name,Nome Gruppo Cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
 DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
 DocType: Item,Attributes,Attributi
-DocType: Packing Slip,Get Items,Ottieni articoli
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Inserisci Scrivi Off conto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Ottieni articoli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Data
-DocType: DocField,Image,Immagine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Crea Fattura Accise (bolla)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
-DocType: Communication,Other,Altro
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operazione non impostato
 DocType: Production Order,Planned Start Date,Data prevista di inizio
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Visita
 DocType: Leave Type,Is Encash,È incassare
 DocType: Purchase Invoice,Mobile No,Num. Cellulare
 DocType: Payment Tool,Make Journal Entry,Crea Voce Diario
@@ -2941,35 +2705,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
 DocType: Project,Expected End Date,Data prevista di fine
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commerciale
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,commerciale
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 DocType: Cost Center,Distribution Id,ID di Distribuzione
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servizi di punta
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Purchase Invoice,Supplier Address,Fornitore Indirizzo
-DocType: Contact Us Settings,Address Line 2,"Indirizzo, riga 2"
-DocType: ToDo,Reference,Riferimento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforazione
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantità
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series è obbligatorio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servizi finanziari
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Rapporto qualità-attributo {0} deve essere compresa tra {1} a {2} nei incrementi di {3}
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
 DocType: Leave Allocation,Unused leaves,Foglie non utilizzati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Predefinito Contabilità clienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Segare
 DocType: Tax Rule,Billing State,Stato di fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminazione
 DocType: Item Reorder,Transfer,Trasferimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterizzazione
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Supplier,Contact HTML,Contatto HTML
@@ -2980,9 +2738,8 @@
 DocType: Company,Retail,Vendita al dettaglio
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,{0} non esiste clienti
 DocType: Attendance,Absent,Assente
-DocType: Product Bundle,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Frantumazione
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Acquistare Tasse e spese Template
 DocType: Upload Attendance,Download Template,Scarica Modello
 DocType: GL Entry,Remarks,Osservazioni
@@ -2990,48 +2747,44 @@
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Record di installazione per un numero di serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Colata continua
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Si prega di specificare una
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sopra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento a freddo
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Il Conto {0} non può essere un gruppo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regione
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
 DocType: Holiday List,Weekly Off,Settimanale Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per es. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Risultato provvisorio / Perdita (credito)
 DocType: Sales Invoice,Return Against Sales Invoice,Di ritorno contro fattura di vendita
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Articolo 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Si prega di impostare il valore predefinito {0} in azienda {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Si prega di impostare il valore predefinito {0} in azienda {1}
 DocType: Serial No,Creation Time,Tempo di creazione
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Entrate totali
 DocType: Sales Invoice,Product Bundle Help,Prodotto Bundle Aiuto
 ,Monthly Attendance Sheet,Foglio Presenze Mensile
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nessun record trovato
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Il Conto {0} è inattivo
 DocType: GL Entry,Is Advance,È Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Inizio e Fine data della frequenza soo obbligatori
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Si prega di inserire ' è appaltata ' come Yes o No
 DocType: Sales Team,Contact No.,Contatto N.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Il tipo di conto {0} 'Profitti e Perdite' non consentito nella voce di apertura
-DocType: Workflow State,Time,Tempo
 DocType: Features Setup,Sales Discounts,Sconti di vendita
 DocType: Hub Settings,Seller Country,Vendita Paese
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Tasse di vendita e spese dei modelli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numero di ordinazione
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner verrà mostrato sulla parte superiore della lista dei prodotti.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificare le condizioni per determinare il valore di spedizione
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Aggiungi ai bambini
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Ruolo permesso di impostare conti congelati e modificare le voci congelati
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Impossibile convertire centro di costo a registro come ha nodi figlio
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,È necessario fattore di conversione
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
@@ -3039,15 +2792,13 @@
 ,Customers Not Buying Since Long Time,Clienti non acquisto da molto tempo
 DocType: Production Order,Expected Delivery Date,Data prevista di consegna
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Sporgente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporazione-modello colata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Spese di rappresentanza
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fattura di vendita {0} deve essere cancellato prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Età
 DocType: Time Log,Billing Amount,Fatturazione Importo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantità non valido specificato per l'elemento {0}. La quantità dovrebbe essere maggiore di 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Richieste di Ferie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Conto con transazione esistente non può essere cancellato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Spese legali
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Il giorno del mese su cui ordine automatica verrà generato ad esempio 05, 28 ecc"
 DocType: Sales Invoice,Posting Time,Tempo Distacco
@@ -3061,26 +2812,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nuovi Ricavi Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Spese di viaggio
 DocType: Maintenance Visit,Breakdown,Esaurimento
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Il Conto {0}: conto derivato{1} non appartiene alla società: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Levigatura
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,prova
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
-DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinciatura
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,prova
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Magazino predefinito necessario per articolo in Giacenza.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Il pagamento dello stipendio del mese {0} e l'anno {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
 ,Transferred Qty,Quantità trasferito
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigazione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,pianificazione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,pianificazione
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Crea Lotto log Tempo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Rilasciato
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendiamo questo articolo
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vendiamo questo articolo
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornitore Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Desc Contatto
@@ -3089,18 +2837,16 @@
 DocType: Brand,Item Manager,Manager del'Articolo
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Aggiungere righe per impostare i budget annuali sui conti.
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Estrazione
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tutti i contatti.
 DocType: Newsletter,Test Email Id,Prova Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abbreviazione Società
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abbreviazione Società
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se si seguono Controllo Qualità . Abilita Voce QA necessari e QA No in Acquisto Ricevuta
 DocType: GL Entry,Party Type,Tipo partito
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima non può essere lo stesso come voce principale
 DocType: Item Attribute Value,Abbreviation,Abbreviazione
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Stampaggio rotazionale
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Modello Stipendio master.
 DocType: Leave Type,Max Days Leave Allowed,Max giorni di ferie domestici
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set di regole fiscali per carrello della spesa
@@ -3114,15 +2860,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Preventivo a clienti o contatti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Tax modello è obbligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Il Conto {0}: conto derivato {1} non esiste
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Account,Temporary,Temporaneo
 DocType: Address,Preferred Billing Address,Preferito Indirizzo di fatturazione
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,segretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,segretario
 DocType: Serial No,Distinct unit of an Item,Un'unità distinta di un elemento
 DocType: Pricing Rule,Buying,Acquisti
 DocType: HR Settings,Employee Records to be created by,Informazioni del dipendenti da creare a cura di
@@ -3135,42 +2881,37 @@
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
 DocType: Purchase Order Item,Supplier Quotation,Preventivo Fornitore
 DocType: Quotation,In Words will be visible once you save the Quotation.,In parole saranno visibili una volta che si salva il preventivo.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stiratura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} è fermato
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
 DocType: Lead,Add to calendar on this date,Aggiungi al calendario in questa data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prossimi eventi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Il Cliente è tenuto
-DocType: Letter Head,Letter Head,Carta intestata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Inserimento rapido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} è obbligatorio per Return
 DocType: Purchase Order,To Receive,Ricevere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink raccordo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Proventi / Spese
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Varianza totale
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Varianza totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se abilitato, il sistema pubblicherà le scritture contabili per l&#39;inventario automatico."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,mediazione
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,mediazione
 DocType: Address,Postal Code,Codice Postale
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Aggiornato da pochi minuti tramite 'Time Log'
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Gli ordini rilasciati per la produzione.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Hub Settings,Name Token,Nome Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Progettazione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Selling standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Selling standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Almeno un Magazzino è obbligatorio
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contro Fattura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contro Fattura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Inserisci unità di misura predefinita
 DocType: Purchase Invoice Item,Project Name,Nome del progetto
 DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
-DocType: Workflow State,Edit,Modifica
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
 DocType: Features Setup,Item Batch Nos,Numeri Lotto Articolo
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
@@ -3178,13 +2919,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento Riconciliazione di pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Attività fiscali
 DocType: BOM Item,BOM No,N. DiBa
-DocType: Contact Us Settings,Pincode,PINCODE
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
 DocType: Item,Moving Average,Media Mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La distinta base che sarà sostituito
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nuovo Archivio UOM deve essere diverso da stock attuale UOM
 DocType: Account,Debit,Debito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Le foglie devono essere assegnati in multipli di 0,5"
 DocType: Production Order,Operation Cost,Operazione Costo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carica presenze da un file. Csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Eccezionale Amt
@@ -3200,10 +2939,7 @@
 DocType: Project,Default Cost Center,Centro di costo predefinito
 DocType: Purchase Invoice,End Date,Data di Fine
 DocType: Employee,Internal Work History,Storia di lavoro interni
-DocType: DocField,Column Break,Interruzione Colonna
-DocType: Event,Thursday,Giovedì
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Svolta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,private Equity
 DocType: Maintenance Visit,Customer Feedback,Opinione Cliente
 DocType: Account,Expense,Spesa
 DocType: Sales Invoice,Exhibition,Esposizione
@@ -3216,31 +2952,30 @@
 DocType: Employee,Held On,Held On
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produzione Voce
 ,Employee Information,Informazioni Dipendente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tasso ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Tasso ( % )
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data di Esercizio di fine
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data di Esercizio di fine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Non è possibile filtrare sulla base di Voucher No , se raggruppati per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Crea Quotazione Fornitore
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Crea Quotazione Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (esploso)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ridurre Guadagnare in aspettativa senza assegni (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,ID Lotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Sintesi di questa settimana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve essere un articolo acquistato o in subappalto in riga {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conto: {0} può essere aggiornato solo tramite transazioni di magazzino
 DocType: GL Entry,Party,Partito
 DocType: Sales Order,Delivery Date,Data Consegna
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Data Opportunità
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Ordinato%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,lavoro a cottimo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia Aziendale
@@ -3257,77 +2992,68 @@
 DocType: Opportunity,To Discuss,Da Discutere
 DocType: SMS Settings,SMS Settings,Impostazioni SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Conti provvisori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Nero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,DIBA Articolo Esploso
 DocType: Account,Auditor,Uditore
 DocType: Purchase Order,End date of current order's period,Data di fine del periodo di fine corso
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Crea una Lettera d'Offerta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Ritorno
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
-DocType: DocField,Fold,Piega
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unità di misura predefinita per la variante deve essere lo stesso come modello
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
 DocType: Project Task,Pending Review,In attesa recensione
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Si prega di specificare
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id cliente
-DocType: Page,Page Name,Nome pagina
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Per ora deve essere maggiore di From Time
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} non è presentata
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} non è presentata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: conto Parent {1} non Bolong alla società {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finitura mandrino
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
 DocType: Account,Asset,attività
 DocType: Project Task,Task ID,ID attività
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ad esempio "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ad esempio "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock non può esistere per la voce {0} dal ha varianti
 ,Sales Person-wise Transaction Summary,Sales Person-saggio Sintesi dell&#39;Operazione
-DocType: System Settings,Time Zone,Fuso Orario
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} non esiste
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrati ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentuali Distribuzione Mensile
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,La voce selezionata non può avere Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dei materiali consegnati di questa Bolla di Consegna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Pinzatura
 DocType: Customer,Customer Details,Dettagli Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Relazioni al
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Sales Invoice,Paid Amount,Importo pagato
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Chiusura del conto {0} deve essere di tipo ' responsabilità '
 ,Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
 DocType: Item Variant,Item Variant,Elemento Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del conto già in debito, non ti è permesso di impostare 'saldo deve essere' come 'credito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del conto già in debito, non ti è permesso di impostare 'saldo deve essere' come 'credito'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestione della qualità
 DocType: Production Planning Tool,Filter based on customer,Filtro basato sul cliente
 DocType: Payment Tool Detail,Against Voucher No,Contro Voucher No
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
 DocType: Tax Rule,Purchase,Acquisto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,equilibrio Quantità
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,equilibrio Quantità
 DocType: Item Group,Parent Item Group,Capogruppo Voce
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} per {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centri di costo
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Magazzini.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Magazzini.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasso al quale la valuta del fornitore viene convertito in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitti Timings con riga {1}
 DocType: Opportunity,Next Contact,Successivo Contattaci
 DocType: Employee,Employment Type,Tipo Dipendente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,immobilizzazioni
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periodo di applicazione non può essere tra due record alocation
 DocType: Item Group,Default Expense Account,Account Spese Predefinito
 DocType: Employee,Notice (days),Avviso ( giorni )
-DocType: Page,Yes,Sì
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Data Incasso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elettroformatura
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contro Voucher tipo deve essere uno di Ordine di Acquisto, Acquisto fattura o diario"
 DocType: Account,Stock Adjustment,Regolazione della
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Esiste di default Attività Costo per il tipo di attività - {0}
 DocType: Production Order,Planned Operating Cost,Planned Cost operativo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nuova {0} Nome
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},In allegato {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},In allegato {0} # {1}
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome voce
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3340,7 +3066,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Numero d'ordine è obbligatorio per la voce {0}
 DocType: Item Variant Attribute,Attribute,Attributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Si prega di specificare da / a gamma
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creato da
 DocType: Serial No,Under AMC,Sotto AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Voce tasso di valutazione viene ricalcolato considerando atterrato importo buono costo
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
@@ -3352,17 +3077,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Importo Minimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Merci aggiornamento finiti
 DocType: Workstation,per hour,all'ora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} già utilizzata in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conto per il magazzino ( Perpetual Inventory) verrà creato con questo account .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
 DocType: Company,Distribution,Distribuzione
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Importo pagato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Tasse predefinite e oneri
 DocType: Account,Receivable,Ricevibile
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
 DocType: Sales Invoice,Supplier Reference,Fornitore di riferimento
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se selezionato, distinta per gli elementi sub-assemblaggio sarà considerato per ottenere materie prime. In caso contrario, tutti gli elementi sub-assemblaggio saranno trattati come materia prima."
@@ -3370,8 +3094,8 @@
 DocType: Hub Settings,Seller Description,Venditore Descrizione
 DocType: Employee Education,Qualification,Qualifica
 DocType: Item Price,Item Price,Articolo Prezzo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
 DocType: Warehouse,Warehouse Name,Magazzino Nome
 DocType: Naming Series,Select Transaction,Selezionare Transaction
@@ -3380,7 +3104,6 @@
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics supporto
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Azienda è presente nei magazzini {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Strumento sostituzione UdM Giacenza
 DocType: POS Profile,Terms and Conditions,Termini e Condizioni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},'A Data' deve essere entro l'anno fiscale. Assumendo A Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Qui è possibile mantenere l'altezza, il peso, le allergie, le preoccupazioni mediche ecc"
@@ -3392,7 +3115,7 @@
 DocType: Sales Order Item,For Production,Per la produzione
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Inserisci ordine di vendita nella tabella sopra
 DocType: Project Task,View Task,Vista Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Il tuo anno finanziario comincia
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Il tuo anno finanziario comincia
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Inserisci acquisto Receipts
 DocType: Sales Invoice,Get Advances Received,ottenere anticipo Ricevuto
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
@@ -3400,20 +3123,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurazione del server in arrivo per il supporto e-mail id . ( ad esempio support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Salary Slip,Salary Slip,Stipendio slittamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Brunitura
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Alla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Alla Data' è obbligatorio
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generare documenti di trasporto per i pacchetti da consegnare. Utilizzato per comunicare il numero del pacchetto, contenuto della confezione e il suo peso."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Item
 DocType: Salary Slip,Payment Days,Giorni di Pagamento
 DocType: BOM,Manage cost of operations,Gestire costi delle operazioni
 DocType: Features Setup,Item Advanced,Articolo Avanzato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminazione a caldo
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando una qualsiasi delle operazioni controllate sono &quot;inviati&quot;, una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati &quot;Contatto&quot; in tale operazione, con la transazione come allegato. L&#39;utente può o non può inviare l&#39;e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni globali
 DocType: Employee Education,Employee Education,Istruzione Dipendente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Conto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3422,35 +3143,28 @@
 DocType: Customer,Sales Team Details,Vendite team Dettagli
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenziali opportunità di vendita.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sick Leave
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Non valido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sick Leave
 DocType: Email Digest,Email Digest,Email di Sintesi
 DocType: Delivery Note,Billing Address Name,Nome Indirizzo Fatturazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Grandi magazzini
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistema Balance
-DocType: Workflow,Is Active,È attivo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grandi magazzini
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistema Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salvare il documento prima.
 DocType: Account,Chargeable,Addebitabile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Change Abbreviazione
-DocType: Workflow State,Primary,Primaria
 DocType: Expense Claim Detail,Expense Date,Data Spesa
 DocType: Item,Max Discount (%),Sconto Max (%)
-DocType: Communication,More Information,Maggiori informazioni
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Amount
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sabbiatura
 DocType: Company,Warn,Avvisa
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valutazione Articolo aggiornato
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
 DocType: BOM,Manufacturing User,Utente Produzione
 DocType: Purchase Order,Raw Materials Supplied,Materie prime fornite
 DocType: Purchase Invoice,Recurring Print Format,Formato di Stampa Ricorrente
-DocType: Communication,Series,serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data prevista di consegna non può essere un ordine di acquisto Data
 DocType: Appraisal,Appraisal Template,Valutazione Modello
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificazione Articolo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Development Business Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Development Business Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Visita di manutenzione Scopo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periodo
 ,General Ledger,Libro mastro generale
@@ -3460,9 +3174,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Si prega di selezionare {0} prima
 DocType: Features Setup,To get Item Group in details table,Per ottenere Gruppo di elementi in dettaglio tabella
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Ridisegnare
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lotto {0} di {1} Voce è scaduto.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Acquaforte
 DocType: Sales Invoice,Commission,Commissione
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3488,7 +3200,7 @@
  {% se email_id%} E-mail: {{email_id}} & lt; br & gt ; {endif% -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Importo Predefinito
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse non trovato nel sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse non trovato nel sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Sommario di questo mese
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lettura Controllo Qualità
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
@@ -3507,13 +3219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (larg) per 100px (altez)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (larg) per 100px (altez)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
 DocType: Payment Tool,Get Outstanding Vouchers,Get eccezionali Buoni
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
 DocType: Appraisal,Start Date,Data di inizio
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valore
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Allocare le foglie per un periodo .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clicca qui per verificare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Il Conto {0}: Non è possibile assegnare stesso come conto principale
@@ -3523,55 +3234,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo medio impiegato dal fornitore di consegnare
 DocType: Time Log,Hours,Ore
 DocType: Project,Expected Start Date,Data prevista di inizio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rotolamento
-DocType: ToDo,Priority,Priorità
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Rimuovere articolo se le spese non è applicabile a tale elemento
-DocType: Dropbox Backup,Dropbox Access Allowed,Consentire accesso Dropbox
-DocType: Dropbox Backup,Weekly,Settimanale
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ad es. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ricevere
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Ricevere
 DocType: Maintenance Visit,Fully Completed,Debitamente compilato
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Employee Leave Approver,Employee Leave Approver,Approvatore Congedo Dipendente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} è stato aggiunto alla nostra lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lavorazione a fascio di elettroni
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Scegliere una data di inizio e di fine per la voce {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapporti principali
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Saldi aggiornati per voci di Inventario
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapporti principali
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Aggiungi / Modifica prezzi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafico Centro di Costo
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,I Miei Ordini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,I Miei Ordini
 DocType: Price List,Price List Name,Prezzo di listino Nome
 DocType: Time Log,For Manufacturing,Per Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totali
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totali
 DocType: BOM,Manufacturing,Produzione
 ,Ordered Items To Be Delivered,Articoli ordinati da consegnare
 DocType: Account,Income,Proventi
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Tipo Industria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Qualcosa è andato storto!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,{0} è già stato presentato fattura di vendita
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Completamento
 DocType: Purchase Invoice Item,Amount (Company Currency),Importo (Valuta Azienda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Pressofusione
-DocType: Email Alert,Reference Date,Data di riferimento
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Inserisci nos mobili validi
 DocType: Budget Detail,Budget Detail,Dettaglio Budget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Inserisci il messaggio prima di inviarlo
-DocType: Async Task,Status,Stato
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},UdM Giacenza aggiornata per l'Articolo {0}
-DocType: Company History,Year,Anno
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Si prega di aggiornare le impostazioni SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo log {0} già fatturati
@@ -3584,55 +3283,52 @@
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
 DocType: Item,Unit of Measure Conversion,Unità di Conversione di misura
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Il dipendente non può essere modificato
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
 DocType: Naming Series,Help HTML,Aiuto HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100 % . E ' {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Indennità per over-{0} incrociate per la voce {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,I vostri fornitori
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,I vostri fornitori
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Un'altra struttura Stipendio {0} è attivo per dipendente {1}. Si prega di fare il suo status di 'Inattivo' per procedere.
 DocType: Purchase Invoice,Contact,Contatto
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Ricevuto da
 DocType: Features Setup,Exports,Esportazioni
 DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha Serial No
 DocType: Employee,Date of Issue,Data Pubblicazione
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Da {0} per {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
 DocType: Issue,Content Type,Tipo Contenuto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore Congelato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore Congelato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get non riconciliati Entries
 DocType: Cost Center,Budgets,I bilanci
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aggiornato
 DocType: Employee,Emergency Contact Details,Dettagli Contatto Emergenza
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Che cosa fa ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Che cosa fa ?
 DocType: Delivery Note,To Warehouse,A Magazzino
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Il Conto {0} è stato inserito più di una volta per l'anno fiscale {1}
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: Purchase Taxes and Charges,Account Head,Conto Capo
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aggiornare costi aggiuntivi per calcolare il costo sbarcato di articoli
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elettrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elettrico
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non è impostato per Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Pallinatura
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Da Richiesta di Garanzia
 DocType: Stock Entry,Default Source Warehouse,Magazzino Origine Predefinito
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Promemoria Compleanno per {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Sciabordio
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Giorni dall'ultimo ordine
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Giorni dall'ultimo ordine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
-DocType: User,Enabled,Attivato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vuoi davvero a presentare tutti foglio paga per il mese {0} e l'anno {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importa Abbonati
@@ -3640,19 +3336,18 @@
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Consegna Note {0} non deve essere presentata
 DocType: Notification Control,Sales Invoice Message,Fattura Messaggio
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Chiusura account {0} deve essere di tipo Responsabilità / Patrimonio netto
 DocType: Authorization Rule,Based On,Basato su
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periodo Dal periodo e per date obbligatorie per ricorrenti {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Attività / attività del progetto.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generare buste paga
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} non è un id di email valido
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se applicabile per è selezionato come {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
-DocType: ToDo,Low,Basso
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Filatura
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Impostare {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
@@ -3674,7 +3369,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome Campagna obbligatorio
 DocType: Maintenance Visit,Maintenance Date,Manutenzione Data
 DocType: Purchase Receipt Item,Rejected Serial No,Rifiutato Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Imbutitura
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuova Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostra Balance
@@ -3684,7 +3378,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e produzione quantità sono necessari
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Importo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Avvincente
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,DiBa Sostituire
 ,Sales Analytics,Analisi dei dati di vendita
 DocType: Manufacturing Settings,Manufacturing Settings,Impostazioni di Produzione
@@ -3696,28 +3389,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nuovo Nome Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo Fornitura Materie Prime
 DocType: Selling Settings,Settings for Selling Module,Impostazioni per la vendita di moduli
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servizio clienti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servizio clienti
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Dettaglio articolo cliente
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Conferma La Tua Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offerta candidato un lavoro.
 DocType: Notification Control,Prompt for Email on Submission of,Richiedi Email su presentazione di
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totale foglie assegnati sono più di giorni nel periodo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Work In Progress Magazzino di default
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} è richiesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Stampaggio sotto vuoto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista non può essere precedente Material Data richiesta
-DocType: Contact Us Settings,City,Città
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Lavorazione ad ultrasuoni
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Errore: Non è un documento di identità valido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,L'articolo {0} deve essere un'Articolo in Vendita
 DocType: Naming Series,Update Series Number,Aggiornamento Numero di Serie
 DocType: Account,Equity,equità
 DocType: Sales Order,Printing Details,Dettagli stampa
 DocType: Task,Closing Date,Data Chiusura
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingegnere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingegnere
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cerca Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
 DocType: Sales Partner,Partner Type,Tipo di partner
@@ -3725,7 +3414,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sconto Cliente saggio
 DocType: Purchase Invoice,Against Expense Account,Per Spesa Conto
 DocType: Production Order,Production Order,Ordine di produzione
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Nota Installazione {0} già inserita
 DocType: Quotation Item,Against Docname,Per Nome Doc
 DocType: SMS Center,All Employee (Active),Tutti Dipendenti (Attivi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Guarda ora
@@ -3733,26 +3422,24 @@
 DocType: BOM,Raw Material Cost,Costo Materie Prime
 DocType: Item,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagramma di Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,A tempo parziale
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,serie Aggiornato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo di rapporto è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo di rapporto è obbligatoria
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Il Primo Utente : Tu
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Il Primo Utente : Tu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Anno fiscale Data di inizio e Data Fine dell'anno fiscale sono già impostati nel Fiscal Year {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Riconciliati con successo
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Riconciliati con successo
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Tax Rule,Validity,Validità
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Importo fatturato
 DocType: Attendance,Attendance,Presenze
-DocType: Page,No,No
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se non controllati, la lista dovrà essere aggiunto a ciascun Dipartimento dove deve essere applicato."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
@@ -3760,55 +3447,46 @@
 ,Item Prices,Voce Prezzi
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In parole saranno visibili una volta che si salva di Acquisto.
 DocType: Period Closing Voucher,Period Closing Voucher,Periodo di chiusura Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Maestro listino prezzi.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Maestro listino prezzi.
 DocType: Task,Review Date,Data di revisione
 DocType: Purchase Invoice,Advance Payments,Pagamenti anticipati
-DocType: DocPerm,Level,Livello
 DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresatura
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Non autorizzato a utilizzare lo Strumento di Pagamento
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
 DocType: Company,Round Off Account,Arrotondamento Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Brucatura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Spese Amministrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Gruppo clienti
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Cambiamento
 DocType: Purchase Invoice,Contact Email,Email Contatto
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ad esempio ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Periodo Di Preavviso
 DocType: Bank Reconciliation Detail,Voucher ID,ID Voucher
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
 DocType: Packing Slip,Gross Weight UOM,Peso Lordo UOM
 DocType: Email Digest,Receivables / Payables,Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Invoice,Per Fattura Vendita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stampigliatura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostra valori zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantità di prodotto ottenuto dopo la produzione / reimballaggio da determinati quantitativi di materie prime
 DocType: Payment Reconciliation,Receivable / Payable Account,Conto Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 DocType: Task,Actual End Date (via Time Logs),Data di fine effettiva (via Time Diari)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Inserisci il centro di costo genitore
 DocType: Delivery Note,Print Without Amount,Stampare senza Importo
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria Tasse non può essere 'valutazione' o ' Totale e Valutazione', come tutti gli articoli non in Giacenza"
-DocType: User,Last Name,Cognome
-DocType: Web Page,Left,Sinistra
-DocType: Event,All Day,Intera giornata
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria Tasse non può essere 'valutazione' o ' Totale e Valutazione', come tutti gli articoli non in Giacenza"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Punteggio totale (i 5)
-DocType: Contact Us Settings,State,Stato
 DocType: Batch,Batch,Lotto
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Saldo
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Saldo
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese)
-DocType: User,Gender,Genere
 DocType: Journal Entry,Debit Note,Nota Debito
 DocType: Stock Entry,As per Stock UOM,Come per scorte UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Non Scaduto
@@ -3822,44 +3500,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Creare regole per limitare le transazioni in base ai valori .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se selezionato, non totale. di giorni lavorativi includerà vacanze, e questo ridurrà il valore di salario per ogni giorno"
 DocType: Purchase Invoice,Total Advance,Totale Advance
-DocType: Workflow State,User,Utente
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Elaborazione paghe
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Imposta come persa
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ricevuta di pagamento Nota
 DocType: Customer,Credit Days Based On,Giorni di credito in funzione
 DocType: Tax Rule,Tax Rule,Regola fiscale
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantenere la stessa velocità per tutto il ciclo di vendita
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Pianificare i registri di tempo al di fuori dell&#39;orario di lavoro Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} è già stata presentata
 ,Items To Be Requested,Articoli da richiedere
-DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Fatturazione tariffa si basa su Tipo Attività (per ora)
 DocType: Company,Company Info,Info Azienda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Azienda Email ID non trovato , quindi posta non inviato"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 DocType: Production Planning Tool,Filter based on item,Filtro basato sul articolo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conto di addebito
 DocType: Fiscal Year,Year Start Date,Anno Data di inizio
 DocType: Attendance,Employee Name,Nome Dipendente
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrotondato (Azienda valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
 DocType: Purchase Common,Purchase Common,Comuni di acquisto
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare Lascia le applicazioni in giorni successivi.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,da Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Soppressione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefici per i dipendenti
 DocType: Sales Invoice,Is POS,È POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fatture sollevate dai Clienti.
-DocType: DocField,Default,Predefinito
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Progetto Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abbonati aggiunti
 DocType: Maintenance Schedule,Schedule,Pianificare
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definire bilancio per questo centro di costo. Per impostare l&#39;azione di bilancio, vedere &quot;Elenco Società&quot;"
@@ -3870,70 +3544,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Expense Claim,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selezionando &quot;Sì&quot; darà una identità unica di ciascun soggetto di questa voce che può essere visualizzato nel Serial Nessun maestro.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
 DocType: Employee,Education,Educazione
 DocType: Selling Settings,Campaign Naming By,Campagna di denominazione
 DocType: Employee,Current Address Is,Indirizzo attuale è
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
 DocType: Address,Office,Ufficio
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapporti standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Per creare un Account Tax
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Inserisci il Conto uscite
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Azione
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventario
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventario
 DocType: Employee,Contract End Date,Data fine Contratto
 DocType: Sales Order,Track this Sales Order against any Project,Traccia questo ordine di vendita nei confronti di qualsiasi progetto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirare ordini di vendita (in attesa di consegnare) sulla base dei criteri di cui sopra
-DocType: DocShare,Document Type,Tipo di documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Da Preventivo del Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Da Preventivo del Fornitore
 DocType: Deduction Type,Deduction Type,Tipo Deduzione
 DocType: Attendance,Half Day,Mezza Giornata
 DocType: Pricing Rule,Min Qty,Qtà Min
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Per tenere traccia articoli in documenti di vendita e di acquisto con nn batch. &quot;Settore preferito: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transaction Data
 DocType: Production Plan Item,Planned Qty,Qtà Planned
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Totale IVA
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totale IVA
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Per quantità (Quantità Prodotto) è obbligatorio
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
 DocType: Notification Control,Purchase Receipt Message,RICEVUTA Messaggio
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totale foglie assegnati sono più di periodo
 DocType: Production Order,Actual Start Date,Data Inizio Effettivo
 DocType: Sales Order,% of materials delivered against this Sales Order,% dei materiali consegnati su questo Ordine di Vendita
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Registrare il movimento dell&#39;oggetto.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Elenco utenti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,servizio
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine Lordo %
 DocType: BOM,With Operations,Con operazioni
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 ,Monthly Salary Register,Registro Stipendio Mensile
-apps/frappe/frappe/website/template.py +140,Next,Successivo
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,DiBa Operazione
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elettrolucidatura
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul Fila Indietro Importo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Inserisci il pagamento Importo in almeno uno di fila
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Inserisci il pagamento Importo in almeno uno di fila
 DocType: POS Profile,POS Profile,POS Profilo
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Riga {0}: Importo pagamento non può essere maggiore di consistenze
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Totale non pagato
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totale non pagato
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Il tempo log non è fatturabile
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Acquirente
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Acquirente
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Retribuzione netta non può essere negativa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Si prega di inserire manualmente il Against Buoni
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Si prega di inserire manualmente il Against Buoni
 DocType: SMS Settings,Static Parameters,Parametri statici
 DocType: Purchase Order,Advance Paid,Anticipo versato
 DocType: Item,Item Tax,Tax articolo
@@ -3942,14 +3609,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Invia SMS di massa ai tuoi contatti
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Cnsidera Tasse o Cambio per
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Actual Qty è obbligatoria
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,carta di credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,carta di credito
 DocType: BOM,Item to be manufactured or repacked,Voce da fabbricati o nuovamente imballati
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Impostazioni predefinite per le transazioni di magazzino .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Impostazioni predefinite per le transazioni di magazzino .
 DocType: Purchase Invoice,Next Date,Successiva Data
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Inserisci Tasse e spese
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Lavorazione a macchina
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Qui è possibile mantenere i dettagli della famiglia come il nome e l'occupazione del genitore, coniuge e figli"
 DocType: Hub Settings,Seller Name,Venditore Nome
@@ -3959,47 +3624,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,È necessario Salvare il modulo prima di procedere
 DocType: Item Attribute,Numeric Values,Valori numerici
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Allega Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Allega Logo
 DocType: Customer,Commission Rate,Tasso Commissione
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Fai Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocco domande uscita da ufficio.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrello è Vuoto
 DocType: Production Order,Actual Operating Cost,Actual Cost operativo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root non può essere modificato .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Importo concesso può non superiore all'importo unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root non può essere modificato .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Importo concesso può non superiore all'importo unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Data ordine acquisto Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capitale Sociale
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Seleziona un file csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Invia backup di Dropbox
 DocType: Purchase Order,To Receive and Bill,Per ricevere e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Creazione automatica di materiale richiesta se la quantità scende al di sotto di questo livello
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Per impostare il livello di riordino, elemento deve essere un acquisto dell&#39;oggetto o Produzione Voce"
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Progetto Master.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni Tempo di Esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Distinta materiali
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
-DocType: Dropbox Backup,Send Notifications To,Inviare notifiche ai
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Data Rif
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Data Rif
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: Expense Claim Detail,Sanctioned Amount,Importo sanzionato
 DocType: GL Entry,Is Opening,Sta aprendo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Il Conto {0} non esiste
 DocType: Account,Cash,Contante
 DocType: Employee,Short biography for website and other publications.,Breve biografia per il sito web e altre pubblicazioni.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Si prega di creare struttura salariale per dipendente {0}

diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 2e90bc5..79b45be 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,給与モード
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",シーズンを基準に追跡する場合、「月次配分」を選択してください
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,注意：同じ項目が複数回入力されています
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,すでに同期されたアイテム
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,取引内でのアイテムの複数回追加を許可
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,この保証請求をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消費者製品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費者製品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,先に当事者タイプを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,焼きなまし
 DocType: Item,Customer Items,顧客アイテム
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,アカウント{0}：親勘定{1}は元帳にすることができません
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.comにアイテムを発行
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,休暇承認者
 DocType: Sales Partner,Dealer,ディーラー
 DocType: Employee,Rented,賃貸
-DocType: About Us Settings,Website,ウェブサイト
 DocType: POS Profile,Applicable for User,ユーザーに適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,圧縮焼結
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},価格表{0}には通貨が必要です
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,※取引内で計算されます。
 DocType: Purchase Order,Customer Contact,顧客の連絡先
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,資材要求元
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,資材要求元
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}ツリー
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,これ以上、結果はありません。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法務
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},「実際」タイプの税は行{0}内のアイテム額に含めることはできません
 DocType: C-Form,Customer,顧客
 DocType: Purchase Receipt Item,Required By,要求元
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,シリーズを正常に更新しました
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,スティッチング
 DocType: Pricing Rule,Apply On,適用
 DocType: Item Price,Multiple Item prices.,複数のアイテム価格
 ,Purchase Order Items To Be Received,受領予定発注アイテム
 DocType: SMS Center,All Supplier Contact,全てのサプライヤー連絡先
 DocType: Quality Inspection Reading,Parameter,パラメータ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新しい休暇申請
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：単価は {1}と同じである必要があります：{2}（{3} / {4}）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新しい休暇申請
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行為替手形
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . 顧客ごとのアイテムコードを維持し、コードで検索を可能にするためには、このオプションを使用します。
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,バリエーションを表示
-DocType: Sales Invoice Item,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ローン（負債）
 DocType: Employee Education,Year of Passing,経過年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,在庫中
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,生産計画アイテム
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,新しいPOSプロファイルを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,健康管理
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
 DocType: Purchase Invoice,Monthly,月次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),支払いの遅延（日）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,請求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防御
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,メールアドレス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
 DocType: Company,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行 {0}：
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行 {0}：
 DocType: Delivery Note,Vehicle No,車両番号
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,価格表を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,進行中の作業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Dプリント
 DocType: Employee,Holiday List,休日のリスト
 DocType: Time Log,Time Log,時間ログ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,会計士
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,会計士
 DocType: Cost Center,Stock User,在庫ユーザー
 DocType: Company,Phone No,電話番号
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",行動ログは、タスク（時間・請求の追跡に使用）に対してユーザーが実行します。
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},新しい{0}：＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},新しい{0}：＃{1}
 ,Sales Partners Commission,販売パートナー手数料
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,略語は5字以上使用することができません
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",この属性にはアイテムバリエーションが存在するため、属性値 {0} を {1} から削除することができません
-DocType: Print Settings,Classic,クラシック
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,ルートアカウントなので編集することができません
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0}の割引に基づく承認を設定することはできません
 DocType: Bin,Quantity Requested for Purchase,仕入要求数
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",古い名前、新しい名前の計2列となっている.csvファイルを添付してください
 DocType: Packed Item,Parent Detail docname,親詳細文書名
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,欠員
 DocType: Item Attribute,Increment,増分
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,倉庫を選択...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,広告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,広告
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Employee,Married,結婚してる
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0}のために許可されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 DocType: Payment Reconciliation,Reconcile,照合
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,食料品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,銀行エントリを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,年金基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,アカウントタイプが「倉庫」の場合、倉庫が必須です
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Lead,Person Name,人名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",注文が定期的な場合にはチェックをオンにしし、繰り返しを停止する場合はチェックをオフにするか適切な終了日を指定してください
@@ -119,7 +114,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,人事＞人事設定から社員名をセットアップしてください
 DocType: POS Profile,Write Off Cost Center,償却コストセンター
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2} 
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
 DocType: Tax Rule,Tax Type,税タイプ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: Item,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
 DocType: SMS Log,SMS Log,SMSログ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
-DocType: Blog Post,Guest,ゲスト
 DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
 DocType: Lead,Interested,関心あり
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,部品表
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,期首
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,期首
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0}から{1}へ
 DocType: Item,Copy From Item Group,項目グループからコピーする
 DocType: Journal Entry,Opening Entry,エントリーを開く
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}は必須です
 DocType: Stock Entry,Additional Costs,追加費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
 DocType: Lead,Product Enquiry,製品のお問い合わせ
-DocType: Standard Reply,Owner,所有者
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,最初の「会社」を入力してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,会社を選択してください
 DocType: Employee Education,Under Graduate,在学生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標
 DocType: BOM,Total Cost,費用合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,リーマー加工
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動ログ：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,不動産
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,不動産
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,決算報告
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,医薬品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
 DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Employee,Mr,氏
-DocType: Custom Script,Client,クライアント
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
 DocType: Naming Series,Prefix,接頭辞
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,消耗品
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,消耗品
 DocType: Upload Attendance,Import Log,インポートログ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,送信
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーで配信
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年俸
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年俸
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,在庫経費
 DocType: Newsletter,Email Sent?,メール送信済み？
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,時間ログを表示
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
 DocType: Delivery Note,Installation Status,設置ステータス
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
 DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,アイテム{0}は仕入アイテムでなければなりません
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
 選択した期間内のすべての日付と従業員の組み合わせは、既存の出勤記録と一緒に、テンプレートに入ります"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,請求書を提出すると更新されます。
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",アイテム料金の行{0}に税を含めるには、行{1}の税も含まれていなければなりません
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,曲り矯正
 DocType: BOM Replace Tool,New BOM,新しい部品表
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,請求用時間ログバッチ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鋳造
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ニュースレターはすでに送信されています
 DocType: Lead,Request Type,要求タイプ
 DocType: Leave Application,Reason,理由
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,放送
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,実行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,最初のユーザーは、システムマネージャとなります。（後で変更できます）
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,放送
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,実行
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,最初のユーザーは、システムマネージャとなります。（後で変更できます）
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,作業遂行の詳細
 DocType: Serial No,Maintenance Status,メンテナンスステータス
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,アイテムと価格
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,アイテムと価格
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は当会計年度内にする必要があります。（もしかして：開始日= {0}）
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,査定を作成する従業員を選択してください。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},コストセンター{0}は会社{1}に属していません
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,価格表は売買に適用可能でなければなりません
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},設置日は、アイテム{0}の納品日より前にすることはできません
 DocType: Pricing Rule,Discount on Price List Rate (%),価格表での割引率（％）
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
-DocType: User,First Name,お名前（名）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,フルモールド鋳造
 DocType: Offer Letter,Select Terms and Conditions,規約を選択
 DocType: Production Planning Tool,Sales Orders,受注
 DocType: Purchase Taxes and Charges,Valuation,評価
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,銀行口座
 DocType: Leave Type,Allow Negative Balance,マイナス残高を許可
 DocType: Selling Settings,Default Territory,デフォルト地域
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,TV
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,ギャッシュ加工
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',「時間ログ」から更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},アカウント{0}は会社{1}に属していません
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
 DocType: Customer Group,Mention if non-standard receivable account applicable,非標準的な売掛金が適応可能な場合に記載
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,提出前に必要とされる倉庫用
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,上で受信
 DocType: Sales Partner,Reseller,リセラー
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,「会社」を入力してください
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割り当てから未使用の葉を追加
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
 DocType: Newsletter List,Total Subscribers,総登録者数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,担当者名
+,Contact Name,担当者名
 DocType: Production Plan Item,SO Pending Qty,受注保留数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,上記の基準の給与伝票を作成します。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,仕入要求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ダブルハウジング
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,年次休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,年次休暇
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,セットアップ＞設定＞命名シリーズから、{0} に命名シリーズを設定してください
 DocType: Time Log,Will be updated when batched.,バッチ処理されると更新されます。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：前払エントリである場合、アカウント{1}に対する「前払」をご確認ください
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},倉庫{0}は会社{1}に属していません
-DocType: Bulk Email,Message,メッセージ
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
-DocType: Dropbox Backup,Dropbox Access Key,Dropboxのアクセスキー
 DocType: Payment Tool,Reference No,参照番号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,年次
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
 DocType: Material Request Item,Min Order Qty,最小注文数量
 DocType: Lead,Do Not Contact,コンタクト禁止
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,定期的な請求書を全て追跡するための一意のIDで、提出時に生成されます
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ソフトウェア開発者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ソフトウェア開発者
 DocType: Item,Minimum Order Qty,最小注文数量
 DocType: Pricing Rule,Supplier Type,サプライヤータイプ
 DocType: Item,Publish in Hub,ハブに公開
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ワイヤーブラッシング
 DocType: Employee,Relation,関連
 DocType: Shipping Rule,Worldwide Shipping,全世界出荷
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,お客様からのご注文確認。
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
 DocType: Maintenance Schedule,Generate Schedule,スケジュールを生成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,ハブ加工
 DocType: Purchase Invoice Item,Expense Head,経費科目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,請求タイプを最初に選択してください
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,新着
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最大5文字
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,言語を選択
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最大5文字
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",製造指示に対する時間ログの作成を無効にします。製造指示に対する操作は追跡されなくなります
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,バリエーション元
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,アイテム{0}はサービスアイテムでなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
-DocType: DocType,Administrator,管理者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,レーザードリル加工
-DocType: Stock UOM Replace Utility,New Stock UOM,新しい在庫単位
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環参照エラー
-DocType: Communication,Closed,クローズ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
 DocType: Lead,Industry,業種
 DocType: Employee,Job Profile,職務内容
 DocType: Newsletter,Newsletter,ニュースレター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,ハイドロフォーミング
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,ネッキング加工
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
 DocType: Journal Entry,Multi Currency,複数通貨
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,アイテムを更新しました
-DocType: Async Task,System Manager,システム管理者
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
 DocType: Sales Invoice Item,Delivery Note,納品書
-DocType: Dropbox Backup,Allow Dropbox Access,Dropboxのアクセスを許可
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,税設定
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Workstation,Rent Cost,地代・賃料
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,月と年を選択してください
@@ -330,34 +300,31 @@
 DocType: Employee,Company Email,会社の電子メール
 DocType: GL Entry,Debit Amount in Account Currency,アカウント通貨での借方金額
 DocType: Shipping Rule,Valid for Countries,有効な国
-DocType: Workflow State,Refresh,再読込
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",通貨、変換レート、輸入総輸入総計などのような全ての輸入に関連するフィールドは、領収書、サプライヤー見積、請求書、発注書などでご利用いただけます
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
 「コピーしない」が設定されていない限り、アイテムの属性は、バリエーションにコピーされます"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,検討された注文合計
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,フィールド値「毎月繰り返し」を入力してください
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,フィールド値「毎月繰り返し」を入力してください
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,顧客通貨が顧客の基本通貨に換算されるレート
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",部品表、納品書、請求書、製造指示、発注、仕入領収書、納品書、受注、在庫エントリー、タイムシートで利用可能
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,アイテムを選択
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,アイテムを選択
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","アイテム：{0}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,仕入時の領収書を提出しなければなりません
-DocType: Stock UOM Replace Utility,Current Stock UOM,現在の在庫数量単位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,アイテムのバッチ（ロット）
 DocType: C-Form Invoice Detail,Invoice Date,請求日付
 DocType: GL Entry,Debit Amount,借方金額
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,あなたのメール アドレス
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,添付ファイルを参照してください
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ウォータージェット切断
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,セットアップはすでに完了しています！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,セットアップはすでに完了しています！
 ,Finished Goods,完成品
 DocType: Delivery Note,Instructions,説明書
 DocType: Quality Inspection,Inspected By,検査担当
@@ -372,6 +339,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,顧客やサプライヤーのためにアカウントを作成しないでください。これらは、顧客/サプライヤのマスターから直接作成されます。
 DocType: Currency Exchange,Currency Exchange,為替
 DocType: Purchase Invoice Item,Item Name,アイテム名
+DocType: Authorization Rule,Approving User  (above authorized value),（許可された値以上の）ユーザーの承認
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,貸方残高
 DocType: Employee,Widowed,死別
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",要求されるアイテム（計画数量と最小注文数量に基づきすべての倉庫を考慮して「在庫切れ」とされたもの）
@@ -381,22 +349,21 @@
 ,Purchase Register,仕入帳
 DocType: Landed Cost Item,Applicable Charges,適用料金
 DocType: Workstation,Consumable Cost,消耗品費
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,検診
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,検診
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,失敗の原因
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ビーディング加工
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 DocType: Employee,Single,シングル
 DocType: Issue,Attachment,添付
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,予算はグループコストセンターに設定することができません
 DocType: Account,Cost of Goods Sold,売上原価
 DocType: Purchase Invoice,Yearly,毎年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,「コストセンター」を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,「コストセンター」を入力してください
 DocType: Journal Entry Account,Sales Order,受注
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,平均販売レート
 DocType: Purchase Order,Start date of current order's period,注文期限の開始日
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},行{0}の数は少数にできません
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},行{0}の数は少数にできません
 DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
 DocType: Delivery Note,% Installed,％インストール
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,最初の「会社」名を入力してください
@@ -406,10 +373,8 @@
 DocType: Account,Is Group,グループ
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,先入先出法（FIFO）によりシリアル番号を自動的に設定
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,サプライヤー請求番号が一意であることを確認してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,熱成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,スリッティング
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',「終了事例番号」は「開始事例番号」より前にはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非営利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非営利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未開始
 DocType: Lead,Channel Partner,チャネルパートナー
 DocType: Account,Old Parent,古い親
@@ -418,13 +383,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,休日マスター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,シェルモールド鋳造
 DocType: Material Request Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,アイテムコードを入力してください
 DocType: BOM,Costing,原価計算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,合計数量
@@ -434,35 +399,30 @@
 DocType: Item Attribute,To Range,範囲対象
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,有価証券および預金
 DocType: Features Setup,Imports,インポート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,接着
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Job Opening,Description of a Job Opening,求人の説明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,今日のために保留中の活動
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,出勤レコード
 DocType: Bank Reconciliation,Journal Entries,仕訳
 DocType: Sales Order Item,Used for Production Plan,生産計画に使用
-DocType: System Settings,Loading...,読み込んでいます...
-DocType: DocField,Password,パスワード
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熱溶解積層法
 DocType: Manufacturing Settings,Time Between Operations (in mins),操作の間の時間（分単位）
 DocType: Customer,Buyer of Goods and Services.,物品・サービスのバイヤー
 DocType: Journal Entry,Accounts Payable,買掛金
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,登録者を追加
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""が存在しません"
 DocType: Pricing Rule,Valid Upto,有効（〜まで）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接利益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,管理担当者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,管理担当者
 DocType: Payment Tool,Received Or Paid,受領済または支払済
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,会社を選択してください
 DocType: Stock Entry,Difference Account,差損益
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化粧品
-DocType: DocField,Type,タイプ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
-DocType: Communication,Subject,タイトル
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,シリアル番号（保証期限）
@@ -470,8 +430,7 @@
 DocType: Purchase Invoice Item,Item,アイテム
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,業務委託管理
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新しい単位は、全体数タイプにはできません
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,業務委託管理
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,什器・備品
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,価格表の通貨が会社の基本通貨に換算されるレート
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
@@ -483,21 +442,21 @@
 DocType: Production Planning Tool,Material Requirement,資材所要量
 DocType: Company,Delete Company Transactions,会社の取引を削除
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,アイテム{0}は仕入アイテムではありません
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} は「通知メールアドレス」として無効なメールアドレスです
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,請求合計／年：
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,請求合計／年：
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",それは株式取引で使用されているように、{0}シリアル番号を削除することはできません
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),（貸方）を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),（貸方）を閉じる
 DocType: Serial No,Warranty Period (Days),保証期間（日数）
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 ,Pending Qty,保留中の数量
 DocType: Job Applicant,Thread HTML,スレッドHTML
 DocType: Company,Ignore,無視
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},次の番号に送信されたSMS：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
 DocType: Pricing Rule,Valid From,有効（〜から）
 DocType: Sales Invoice,Total Commission,手数料合計
 DocType: Pricing Rule,Sales Partner,販売パートナー
@@ -506,7 +465,7 @@
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","「月次配分」は、ビジネスに季節性がある場合、月間で予算を配分するのに使用できます。
 配分を行なう場合には、「コストセンター」にこの「月次配分」を設定してください。"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
@@ -514,7 +473,6 @@
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
-DocType: About Us Settings,Website Manager,Webサイトマネージャー
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,会計年度の開始日は終了日より後にはできません
 DocType: Warranty Claim,Resolution,課題解決
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},配送済：{0}
@@ -522,25 +480,24 @@
 DocType: Sales Order,Billing and Delivery Status,請求と配達の状況
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,前
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,販売返品
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,作成した製造指示から受注を選択します。
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤー（ドロップ船）で配信
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,給与コンポーネント
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在顧客データベース
+DocType: Authorization Rule,Customer or Item,お客様またはアイテム
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,顧客データベース
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,割当額をマイナスにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,タンブリング
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,すでに別の測定単位でいくつかのトランザクションを行っているので、項目のデフォルトの単位は、{0}を直接変更することはできません。あなたは、異なるデフォルトのUOMを使用する新しいアイテムを作成する必要があります。
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,割当額をマイナスにすることはできません
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
-DocType: Event,Wednesday,水曜日
 DocType: Sales Invoice,Customer's Vendor,顧客のベンダー
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,製造指示は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案の作成
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案の作成
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,他の営業担当者 {0} が同じ従業員IDとして存在します
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},マイナス在庫エラー（{6}）アイテム {0} 倉庫 {1}の {4} {5} 内 {2} {3}
 DocType: Fiscal Year Company,Fiscal Year Company,会計年度（会社）
@@ -561,20 +518,16 @@
 DocType: Activity Type,Default Costing Rate,デフォルト原価
 DocType: Maintenance Schedule,Maintenance Schedule,メンテナンス予定
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",価格設定ルールは、顧客、顧客グループ、地域、サプライヤー、サプライヤータイプ、キャンペーン、販売パートナーなどに基づいて抽出されます
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,PythonのDropBoxモジュールをインストールしてください
 DocType: Employee,Passport Number,パスポート番号
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,マネージャー
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,参照元仕入領収書
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,同じアイテムが複数回入力されています
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,マネージャー
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,参照元仕入領収書
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,同じアイテムが複数回入力されています
 DocType: SMS Settings,Receiver Parameter,受領者パラメータ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,「参照元」と「グループ元」は同じにすることはできません
 DocType: Sales Person,Sales Person Targets,営業担当者の目標
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,To
-apps/frappe/frappe/templates/base.html +145,Please enter email address,メールアドレスを入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,管端成形
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 DocType: Selling Settings,Customer Naming By,顧客名設定
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,グループへの変換
 DocType: Activity Cost,Activity Type,活動タイプ
@@ -582,25 +535,20 @@
 DocType: Customer,Fixed Days,期日
 DocType: Sales Invoice,Packing List,梱包リスト
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,サプライヤーに与えられた発注
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,公開
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,公開
 DocType: Activity Cost,Projects User,プロジェクトユーザー
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費済
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：{1}は請求書詳細テーブルに存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}：{1}は請求書詳細テーブルに存在しません
 DocType: Company,Round Off Cost Center,丸め誤差コストセンター
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス訪問 {0} をキャンセルしなければなりません
 DocType: Material Request,Material Transfer,資材移送
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開く（借方）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},投稿のタイムスタンプは、{0}の後でなければなりません
-apps/frappe/frappe/config/setup.py +59,Settings,設定
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,陸揚費用租税公課
 DocType: Production Order Operation,Actual Start Time,実際の開始時間
 DocType: BOM Operation,Operation Time,作業時間
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,続き
 DocType: Pricing Rule,Sales Manager,営業部長
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,名称変更
 DocType: Journal Entry,Write Off Amount,償却額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,曲げ加工
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ユーザを許可
 DocType: Journal Entry,Bill No,請求番号
 DocType: Purchase Invoice,Quarterly,4半期ごと
 DocType: Selling Settings,Delivery Note Required,納品書必須
@@ -609,17 +557,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,アイテムの詳細を入力してください
 DocType: Purchase Receipt,Other Details,その他の詳細
 DocType: Account,Accounts,アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,マーケティング
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直状せん断
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,シリアル番号に基づき販売と仕入書類からアイテムを追跡します。製品の保証詳細を追跡するのにも使えます。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,マーケティング
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,シリアル番号に基づき販売と仕入書類からアイテムを追跡します。製品の保証詳細を追跡するのにも使えます。
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒否されたアイテムに対しては拒否された倉庫が必須です
 DocType: Account,Expenses Included In Valuation,評価中経費
 DocType: Employee,Provide email id registered in company,会社に登録されたメールアドレスを提供
 DocType: Hub Settings,Seller City,販売者の市区町村
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ツリー型
@@ -628,14 +575,10 @@
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",対伝票タイプは受注・納品書・仕訳のいずれかでなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,バイオマシニング
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,為替レートを見つけることができません。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航空宇宙
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ようこそ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航空宇宙
 DocType: Journal Entry,Credit Card Entry,クレジットカードエントリ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,タスクの件名
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,サプライヤーから受け取った商品。
-DocType: Communication,Open,オープン
 DocType: Lead,Campaign Name,キャンペーン名
 ,Reserved,予約済
 DocType: Purchase Order,Supply Raw Materials,原材料供給
@@ -644,29 +587,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0}は在庫アイテムではありません
 DocType: Mode of Payment Account,Default Account,デフォルトアカウント
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
-DocType: Contact Us Settings,Address Title,住所タイトル
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,週休日を選択してください
 DocType: Production Order Operation,Planned End Time,計画終了時間
 ,Sales Person Target Variance Item Group-Wise,（アイテムグループごとの）各営業ターゲット差違
-DocType: Dropbox Backup,Daily,日次
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,既存の取引を持つアカウントは、元帳に変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,既存の取引を持つアカウントは、元帳に変換することはできません
 DocType: Delivery Note,Customer's Purchase Order No,顧客の発注番号
 DocType: Employee,Cell Number,携帯電話の番号
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,生成される自動材料要求
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,失われた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,エネルギー
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月次給与計算書。
 DocType: Item Group,Website Specifications,ウェブサイトの仕様
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新しいアカウント
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：タイプ{1}の{0}から
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,会計エントリはリーフノードに対して行うことができます。グループに対するエントリは許可されていません。
-DocType: ToDo,High,高
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
-DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},アイテム{0}には領収書番号が必要です
 DocType: Item Attribute Value,Item Attribute Value,アイテムの属性値
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,販売キャンペーン。
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -721,10 +661,9 @@
 DocType: Address,Personal,個人情報
 DocType: Expense Claim Detail,Expense Claim Type,経費請求タイプ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ショッピングカートのデフォルト設定
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",仕訳 {0} が注文 {1} にリンクされていますが、この請求内で前受金として引かれるべきか、確認してください。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,バイオテクノロジー
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",仕訳 {0} が注文 {1} にリンクされていますが、この請求内で前受金として引かれるべきか、確認してください。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,バイオテクノロジー
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,事務所維持費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,縁曲げ加工
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,最初のアイテムを入力してください
 DocType: Account,Liability,負債
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
@@ -732,14 +671,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Process Payroll,Send Email,メールを送信
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},警告：不正な添付ファイル{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},アイテムが{0}経由で配送されていないため、「在庫更新」はチェックできません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,番号
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,番号
 DocType: Item,Items with higher weightage will be shown higher,高い比重を持つアイテムはより高く表示されます
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行勘定調整詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,自分の請求書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,自分の請求書
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,従業員が見つかりません
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
@@ -758,35 +698,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",POS機能を有効にする
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
-DocType: Comment,Reference Name,参照名
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: Sales Invoice Item,Target Warehouse,ターゲット倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,納品予定日は受注日より前にすることはできません
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
 DocType: Production Order,Item To Manufacture,製造するアイテム
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,金型鋳造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}状態は{2}です
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,発注からの支払
 DocType: Sales Order Item,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
 DocType: Newsletter,Newsletter Manager,ニュースレターマネージャー
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',「オープニング」
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
 DocType: Expense Claim,Expenses,経費
 DocType: Item Variant Attribute,Item Variant Attribute,アイテムバリエーション属性
 ,Purchase Receipt Trends,領収書傾向
 DocType: Appraisal,Select template from which you want to get the Goals,ゴールを取得する元となるテンプレートを選択
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究開発
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究開発
 ,Amount to Bill,支払額
 DocType: Company,Registration Details,登録の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ステーキング加工
 DocType: Item,Re-Order Qty,再オーダー数量
 DocType: Leave Block List Date,Leave Block List Date,休暇リスト日付
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0}に送信するようにスケジュールしました
@@ -797,18 +734,16 @@
 DocType: Sales Invoice Item,Stock Details,在庫詳細
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,プロジェクトの価値
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,POS
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},繰越はできません{0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",口座残高がすで貸方に存在しており、「残高仕訳先」を「借方」に設定することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",口座残高がすで貸方に存在しており、「残高仕訳先」を「借方」に設定することはできません
 DocType: Account,Balance must be,残高仕訳先
 DocType: Hub Settings,Publish Pricing,価格設定を公開
 DocType: Notification Control,Expense Claim Rejected Message,経費請求拒否されたメッセージ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,釘打ち
 ,Available Qty,利用可能な数量
 DocType: Purchase Taxes and Charges,On Previous Row Total,前の行の合計
 DocType: Salary Slip,Working Days,勤務日
 DocType: Serial No,Incoming Rate,収入レート
 DocType: Packing Slip,Gross Weight,総重量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,このシステムを設定する会社の名前
 DocType: HR Settings,Include holidays in Total no. of Working Days,営業日数に休日を含む
 DocType: Job Applicant,Hold,保留
 DocType: Employee,Date of Joining,入社日
@@ -818,30 +753,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,登録者表示
 DocType: Purchase Invoice Item,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,エアーブラスト
 DocType: Employee,Ms,女史
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,為替レートマスター
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,部品表{0}はアクティブでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,部品表{0}はアクティブでなければなりません
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
 DocType: Salary Slip,Leave Encashment Amount,休暇現金化量
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},アイテム {1} に関連付けが無いシリアル番号 {0}
 DocType: Purchase Receipt Item Supplied,Required Qty,必要な数量
 DocType: Bank Reconciliation,Total Amount,合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,インターネット出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,インターネット出版
 DocType: Production Planning Tool,Production Orders,製造指示
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,価格のバランス
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,販売価格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,同期アイテムを公開
-DocType: GL Entry,Account Currency,アカウント通貨
+DocType: Bank Reconciliation,Account Currency,アカウント通貨
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,会社の丸め誤差アカウントを指定してください
 DocType: Purchase Receipt,Range,幅
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Features Setup,Item Barcode,アイテムのバーコード
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Address,Shop,店
@@ -850,7 +784,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,このモードを選択した場合、デフォルトの銀行口座／現金勘定がPOS請求書内で自動的に更新されます。
 DocType: Employee,Permanent Address Is,本籍地
 DocType: Production Order Operation,Operation completed for how many finished goods?,作業完了時の完成品数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ブランド
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ブランド
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0}以上の引当金は、アイテム {1}と相殺されています。
 DocType: Employee,Exit Interview Details,インタビュー詳細を終了
 DocType: Item,Is Purchase Item,仕入アイテム
@@ -869,35 +803,32 @@
 DocType: Purchase Invoice Item,Purchase Order Item,発注アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接収入
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,設定支払額＝残高
-DocType: Contact Us Settings,Address Line 1,住所 1行目
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,差違
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,（会社名）
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,差違
+,Company Name,（会社名）
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,配送のためのアイテムを選択
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,すべてのヘルプの動画のリストを見ます
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,小切手が預けられた銀行の勘定科目を選択してください
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ユーザーに取引の価格表単価の編集を許可
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 DocType: Process Payroll,Select Payroll Year and Month,賃金台帳 年と月を選択
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",適切なグループ（通常は資金運用＞流動資産＞銀行口座）に移動し、新しい「銀行」アカウント（クリックして子要素を追加します）を作成してください。
 DocType: Workstation,Electricity Cost,電気代
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
-DocType: Comment,Unsubscribed,購読解除
 DocType: Opportunity,Walk In,立入
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,財務コストセンターのツリー
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,移転済
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ホワイト
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ホワイト
 DocType: SMS Center,All Lead (Open),全リード（オープン）
 DocType: Purchase Invoice,Get Advances Paid,立替金を取得
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,あなたの写真を添付
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,作成
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,あなたの写真を添付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,作成
 DocType: Journal Entry,Total Amount in Words,合計の文字表記
-DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"エラーが発生しました。
 フォームを保存していないことが原因だと考えられます。
 問題が解決しない場合はsupport@erpnext.comにお問い合わせください。"
@@ -906,25 +837,23 @@
 DocType: Lead,Next Contact Date,次回連絡日
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,数量を開く
 DocType: Holiday List,Holiday List Name,休日リストの名前
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ストックオプション
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ストックオプション
 DocType: Journal Entry Account,Expense Claim,経費請求
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0}用数量
 DocType: Leave Application,Leave Application,休暇申請
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,休暇割当ツール
 DocType: Leave Block List,Leave Block List Dates,休暇リスト日付
-DocType: Company,If Monthly Budget Exceeded (for expense account),毎月の予算（費用勘定のため）を超えた場合
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,トリミング
+DocType: Company,If Monthly Budget Exceeded (for expense account),毎月の予算（費用勘定のため）を超えた場合
 DocType: Workstation,Net Hour Rate,時給総計
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,輸入費用領収書
 DocType: Company,Default Terms,デフォルト規約
 DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
 DocType: POS Profile,Cash/Bank Account,現金/銀行口座
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ファイリング
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,割引
 DocType: Features Setup,Purchase Discounts,仕入割引
 DocType: Workstation,Wages,賃金
@@ -941,7 +870,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメントNo
 DocType: Issue,Issue,課題
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,アカウントは、当社と一致しません
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,作業中倉庫
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
 DocType: BOM Operation,Operation,作業
@@ -949,13 +879,13 @@
 DocType: Tax Rule,Shipping State,出荷状態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,販売費
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,標準購入
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,標準購入
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,在庫エントリを作成
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
 DocType: Item,Default Supplier,デフォルトサプライヤー
 DocType: Manufacturing Settings,Over Production Allowance Percentage,製造割当率超過
@@ -970,29 +900,27 @@
 DocType: Time Log Batch,updated via Time Logs,時間ログ経由で更新
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
 DocType: Opportunity,Your sales person who will contact the customer in future,顧客を訪問する営業担当者
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
 DocType: Company,Default Currency,デフォルトの通貨
 DocType: Contact,Enter designation of this Contact,この連絡先の肩書を入力してください
-DocType: Contact Us Settings,Address,住所
 DocType: Expense Claim,From Employee,社員から
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
 DocType: Journal Entry,Make Difference Entry,差違エントリを作成
 DocType: Upload Attendance,Attendance From Date,出勤開始日
 DocType: Appraisal Template Goal,Key Performance Area,重要実行分野
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,輸送
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,輸送
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,＆年：
 DocType: Email Digest,Annual Expense,年間経費
 DocType: SMS Center,Total Characters,文字数合計
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-フォーム請求書の詳細
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,支払照合 請求
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,貢献％
 DocType: Item,website page link,ウェブサイトのページリンク
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,システムを準備して使い始めましょう
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,参照用の会社登録番号（例：税番号など）
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,タイムログを選択し、新しい請求書を作成し提出してください。
@@ -1012,68 +940,58 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,前払金
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,要求するものがありません
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,マネジメント
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,マネジメント
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,タイムシート用活動タイプ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,インベストメント鋳造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},{0}には借方計・貸方計のどちらかが必要です
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,アクティブ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,青
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,青
 DocType: Purchase Invoice,Is Return,返品
 DocType: Price List Country,Price List Country,価格表内の国
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,これ以上のノードは「グループ」タイプのノードの下にのみ作成することができます
 DocType: Item,UOMs,数量単位
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0} 
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,アイテムコードはシリアル番号に付け替えることができません
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POSプロファイル {0} はユーザー：{1} ・会社 {2} で作成済です
 DocType: Purchase Order Item,UOM Conversion Factor,数量単位の変換係数
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,被ラミネート体の製造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,サプライヤーデータベース
 DocType: Account,Balance Sheet,貸借対照表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ストレッチフォーミング
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,営業担当者には、顧客訪問日にリマインドが表示されます。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税その他給与控除
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
 ,Purchase Order Items To Be Billed,支払予定発注アイテム
 DocType: Purchase Invoice Item,Net Rate,正味単価
 DocType: Purchase Invoice Item,Purchase Invoice Item,仕入請求アイテム
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,選択された領収書のために在庫元帳エントリと総勘定元帳エントリが再投稿されます
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,アイテム1
 DocType: Holiday,Holiday,休日
-DocType: Event,Saturday,土曜日 
 DocType: Leave Control Panel,Leave blank if considered for all branches,全支店が対象の場合は空白のままにします
 ,Daily Time Log Summary,日次時間ログの概要
-DocType: DocField,Label,ラベル
 DocType: Payment Reconciliation,Unreconciled Payment Details,未照合支払いの詳細
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
 DocType: Lead,Call,電話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,「エントリ」は空にできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,「エントリ」は空にできません
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,従業員設定
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","グリッド """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,接頭辞を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,リサーチ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,リサーチ
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Contact,User ID,ユーザー ID
-DocType: Communication,Sent,送信済
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,"元帳の表示
-"
-DocType: File,Lft,左
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,元帳の表示
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
-DocType: Communication,Delivery Status,納品ステータス
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 DocType: Production Order,Manufacture against Sales Order,受注に対する製造
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,その他の地域
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
@@ -1084,13 +1002,11 @@
 DocType: BOM Item,Item Description,アイテム説明
 DocType: Payment Tool,Payment Mode,支払いモード
 DocType: Purchase Invoice,Is Recurring,繰り返し
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金属レーザー焼結
 DocType: Purchase Order,Supplied Items,サプライヤー供給アイテム
 DocType: Production Order,Qty To Manufacture,製造数
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,仕入サイクル全体で同じレートを維持
 DocType: Opportunity Item,Opportunity Item,機会アイテム
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,仮勘定期首
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,低温圧延
 ,Employee Leave Balance,従業員の残休暇数
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
 DocType: Address,Address Type,住所タイプ
@@ -1106,35 +1022,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,受注{0}は有効ではありません
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",企業はマージできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,S
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,S
 DocType: Employee,Employee Number,従業員番号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
 ,Invoiced Amount (Exculsive Tax),請求額（外税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,アイテム2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,勘定科目{0}を作成しました
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,グリーン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,グリーン
 DocType: Item,Auto re-order,自動再注文
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,達成計
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,達成計
 DocType: Employee,Place of Issue,発生場所
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,契約書
-DocType: Report,Disabled,無効
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,契約書
+DocType: Email Digest,Add Quote,引用を追加
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接経費
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,あなたの製品またはサービス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
 DocType: Journal Entry Account,Purchase Order,発注
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名前が必要です
 DocType: Purchase Invoice,Recurring Type,繰り返しタイプ
 DocType: Address,City/Town,市町村
 DocType: Email Digest,Annual Income,年間所得
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,アイテム{0}は下請けアイテムでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
@@ -1144,14 +1059,13 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,配送予定日が計画開始日よりも前に指定されています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計（会社通貨）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出費総額
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",「値へ」を0か空にする送料ルール条件しかありません
 DocType: Authorization Rule,Transaction,取引
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：このコストセンターはグループです。グループに対する会計エントリーを作成することはできません。
-apps/frappe/frappe/config/desk.py +7,Tools,ツール
 DocType: Item,Website Item Groups,ウェブサイトのアイテムグループ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,在庫エントリー目的の製造には製造指示番号が必須です
 DocType: Purchase Invoice,Total (Company Currency),計（会社通貨）
@@ -1159,24 +1073,22 @@
 DocType: Journal Entry,Journal Entry,仕訳
 DocType: Workstation,Workstation Name,作業所名
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,コメント
 DocType: Salary Slip,Bank Account No.,銀行口座番号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},アイテム{0}に評価額が必要です
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},アイテム{0}に評価額が必要です
 DocType: Quality Inspection Reading,Reading 8,報告要素8
 DocType: Sales Partner,Agent,エージェント
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",全てのアイテムの合計{0}がゼロです。「支払按分参照元」を変更してください
 DocType: Purchase Invoice,Taxes and Charges Calculation,租税公課計算
 DocType: BOM Operation,Workstation,作業所
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ハードウェア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ハードウェア
 DocType: Attendance,HR Manager,人事マネージャー
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,会社を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特別休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,データがありません
 DocType: Appraisal Template Goal,Appraisal Template Goal,査定テンプレート目標
 DocType: Salary Slip,Earning,収益
 DocType: Payment Tool,Party Account Currency,当事者アカウント通貨
@@ -1186,26 +1098,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,次の条件が重複しています：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,注文価値合計
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食べ物
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,食べ物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,時間ログは提出済の製造指示に対してのみ作成できます
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",連絡先・リードへのニュースレター
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},閉じるアカウントの通貨がでなければなりません{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,作業は空白にできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,作業は空白にできません
 ,Delivered Items To Be Billed,未入金の納品済アイテム
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
-DocType: DocField,Description,説明
 DocType: Authorization Rule,Average Discount,平均割引
-DocType: Letter Head,Is Default,デフォルト
 DocType: Address,Utilities,ユーティリティー
 DocType: Purchase Invoice Item,Accounting,会計
 DocType: Features Setup,Features Setup,機能設定
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,雇用契約書を表示
-DocType: Communication,Communication,コミュニケーション
 DocType: Item,Is Service Item,サービスアイテム
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,受付期間は、外部休暇割当期間にすることはできません
 DocType: Activity Cost,Projects,プロジェクト
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,会計年度を選択してください
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0}から | {1} {2}
@@ -1224,7 +1133,7 @@
 DocType: Item,Maintain Stock,在庫維持
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 DocType: Leave Control Panel,Leave blank if considered for all designations,全ての肩書を対象にする場合は空白のままにします
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,開始日時
 DocType: Email Digest,For Company,会社用
@@ -1234,7 +1143,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,無給休暇に依存
@@ -1248,31 +1157,28 @@
 DocType: HR Settings,Employee Settings,従業員の設定
 ,Batch-Wise Balance History,バッチごとの残高履歴
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,やることリスト
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,見習
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,マイナスの数量は許可されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,見習
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,マイナスの数量は許可されていません
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","文字列としてアイテムマスタから取得され、このフィールドに格納されている税詳細テーブル。
 租税公課のために使用されます"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,切り込み加工
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",会計が凍結されている場合、エントリは限られたユーザーに許可されています。
 DocType: Email Digest,Bank Balance,銀行残高
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,従業員{0}と月が見つかりませアクティブ給与構造ません
 DocType: Job Opening,"Job profile, qualifications required etc.",必要な業務内容、資格など
 DocType: Journal Entry Account,Account Balance,口座残高
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,取引のための税ルール
 DocType: Rename Tool,Type of document to rename.,名前を変更するドキュメント型
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,このアイテムを購入する
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,このアイテムを購入する
 DocType: Address,Billing,請求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,フランジ加工
-DocType: Bulk Email,Not Sent,送信されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆発成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),租税公課合計（報告通貨）
 DocType: Shipping Rule,Shipping Account,出荷アカウント
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0}の受信者に送信するようにスケジュールしました
 DocType: Quality Inspection,Readings,報告要素
 DocType: Stock Entry,Total Additional Costs,追加費用合計
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,組立部品
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,組立部品
 DocType: Shipping Rule Condition,To Value,値
 DocType: Supplier,Stock Manager,在庫マネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
@@ -1282,107 +1188,98 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,アナリスト
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：割り当て額{1}は仕訳伝票額{2}以下でなければなりません
 DocType: Item,Inventory,在庫
 DocType: Features Setup,"To enable ""Point of Sale"" view",POS画面を有効にする
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,空のカートに支払はできません
 DocType: Item,Sales Details,販売明細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ピンニング
 DocType: Opportunity,With Items,関連アイテム
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,数量中
 DocType: Notification Control,Expense Claim Rejected,経費請求が拒否
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",次の請求書が生成される日付。これは提出時に生成されます。
 DocType: Item Attribute,Item Attribute,アイテム属性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,アイテムバリエーション
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,アイテムバリエーション
 DocType: Company,Services,サービス
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),計（{0}）
 DocType: Cost Center,Parent Cost Center,親コストセンター
 DocType: Sales Invoice,Source,ソース
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,支払テーブルにレコードが見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,会計年度の開始日
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,支払テーブルにレコードが見つかりません
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,会計年度の開始日
 DocType: Employee External Work History,Total Experience,実績合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,座繰り
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,運送・転送料金
 DocType: Material Request Item,Sales Order No,受注番号
 DocType: Item Group,Item Group Name,アイテムグループ名
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,売上高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,売上高
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,製造用資材配送
 DocType: Pricing Rule,For Price List,価格表用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ヘッドハンティング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","アイテム{0}の仕入額が見つかりません、会計エントリ（費用）を記帳するために必要とされています。
 仕入価格表に対するアイテム価格を記載してください。"
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),追加割引額（会社通貨）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},エラー：{0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},エラー：{0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,勘定科目表から新しいアカウントを作成してください
 DocType: Maintenance Visit,Maintenance Visit,メンテナンスのための訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,顧客>顧客グループ>地域
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,倉庫での利用可能なバッチ数量
 DocType: Time Log Batch Detail,Time Log Batch Detail,時間ログバッチの詳細
-DocType: Workflow State,Tasks,タスク
 DocType: Landed Cost Voucher,Landed Cost Help,陸揚費用ヘルプ
-DocType: Event,Tuesday,火曜日
 DocType: Leave Block List,Block Holidays on important days.,年次休暇（記念日休暇）
 ,Accounts Receivable Summary,売掛金概要
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},すでに期間の従業員{1}のために割り当てられたタイプ{0}のために葉{2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
 DocType: UOM,UOM Name,数量単位名
-DocType: Top Bar Item,Target,ターゲット
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,貢献額
 DocType: Sales Invoice,Shipping Address,発送先
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"このツールを使用すると、システム内の在庫の数量と評価額を更新・修正するのに役立ちます。
 これは通常、システムの値と倉庫に実際に存在するものを同期させるために使用されます。"
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,納品書を保存すると表示される表記内。
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ブランドのマスター。
-DocType: ToDo,Due Date,期日
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ブランドのマスター。
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,組織
 DocType: Monthly Distribution,Monthly Distribution,月次配分
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
 DocType: Production Plan Sales Order,Production Plan Sales Order,製造計画受注
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}の勘定科目は通貨{1}でのみ作成可能です
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ノッチング
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,仕入注文のための資材要求
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返品アイテム {1} は {2} {3}に存在しません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行口座
 ,Bank Reconciliation Statement,銀行勘定調整表
 DocType: Address,Lead Name,リード名
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期首在庫残高
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期首在庫残高
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}が重複しています
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,製造数量は必須です
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,銀行に反映されていない金額
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,銀行に反映されていない金額
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,会社経費の請求
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,遠心鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁気研磨
 DocType: Company,Default Holiday List,デフォルト休暇リスト
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,在庫負債
 DocType: Purchase Receipt,Supplier Warehouse,サプライヤー倉庫
 DocType: Opportunity,Contact Mobile No,連絡先携帯番号
 DocType: Production Planning Tool,Select Sales Orders,受注を選択
 ,Material Requests for which Supplier Quotations are not created,サプライヤー見積が作成されていない資材要求
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,バーコードを使用してアイテムを追跡します。アイテムのバーコードをスキャンすることによって、納品書や請求書にアイテムを入力することができます。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,配信としてマーク
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,配信としてマーク
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,見積を作成
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
 DocType: SMS Center,Receiver List,受領者リスト
@@ -1390,31 +1287,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}ビュー
 DocType: Salary Structure Deduction,Salary Structure Deduction,給与体系（控除）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選択的レーザー焼結
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,インポート成功！
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量は{0}以下でなければなりません
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),期間（日）
 DocType: Quotation Item,Quotation Item,見積項目
 DocType: Account,Account Name,アカウント名
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,開始日は終了日より後にすることはできません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,シリアル番号 {0}は量{1}の割合にすることはできません
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,サプライヤータイプマスター
 DocType: Purchase Order Item,Supplier Part Number,サプライヤー部品番号
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,追加
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,変換率は0か1にすることはできません
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}はキャンセルまたは停止しています
 DocType: Accounts Settings,Credit Controller,与信管理
 DocType: Delivery Note,Vehicle Dispatch Date,配車日
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,領収書{0}は提出されていません
 DocType: Company,Default Payable Account,デフォルト買掛金勘定
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",オンラインショッピングカート設定（出荷ルール・価格表など）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,セットアップ完了
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％支払済
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,予約数量
 DocType: Party Account,Party Account,当事者アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人事
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人事
 DocType: Lead,Upper Income,高収益
 DocType: Journal Entry Account,Debit in Company Currency,会社通貨での借方
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,自分の課題
@@ -1423,12 +1316,9 @@
 DocType: Company,Default Values,デフォルト値
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：支払額は負にすることはできません
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,圧入
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 DocType: Payment Reconciliation,Payments,支払
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,熱間等静圧圧縮成形
-DocType: ToDo,Medium,普通
 DocType: Budget Detail,Budget Allocated,割当予算
 DocType: Journal Entry,Entry Type,エントリタイプ
 ,Customer Credit Balance,顧客貸方残高
@@ -1437,12 +1327,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,銀行支払日と履歴を更新
 DocType: Quotation,Term Details,用語解説
 DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング（日数）
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
 DocType: Warranty Claim,Warranty Claim,保証請求
 ,Lead Details,リード詳細
-DocType: Authorization Rule,Approving User,承認ユーザー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,鍛造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,メッキ
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
 DocType: Pricing Rule,Applicable For,適用可能なもの
 DocType: Bank Reconciliation,From Date,開始日
@@ -1465,65 +1352,63 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,オンラインオークション
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,オンラインオークション
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,数量または評価レートのいずれか、または両方を指定してください
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",会社、月と年度は必須です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,アイテムの１単位
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',時間ログバッチ{0}は「提出済」でなければなりません
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,各在庫の動きを会計処理のエントリとして作成
 DocType: Leave Allocation,Total Leaves Allocated,休暇割当合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},行番号{0}には倉庫が必要です
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,有効な会計年度開始日と終了日を入力してください
 DocType: Employee,Date Of Retirement,退職日
 DocType: Upload Attendance,Get Template,テンプレートを取得
 DocType: Address,Postal,郵便
 DocType: Item,Weightage,重み付け
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,鉱業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,レジンキャスト
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,最初の{0}を選択してください
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},テキスト{0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},テキスト{0}
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
 DocType: Stock Entry,Material Receipt,資材領収書
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,商品
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,商品
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},売掛金／買掛金勘定{0}には当事者タイプと当事者が必要です。
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",このアイテムにバリエーションがある場合、受注などで選択することができません
 DocType: Lead,Next Contact By,次回連絡
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},アイテム{1}が存在するため倉庫{0}を削除することができません
 DocType: Quotation,Order Type,注文タイプ
 DocType: Purchase Invoice,Notification Email Address,通知メールアドレス
 DocType: Payment Tool,Find Invoices to Match,一致する請求書を探す
 ,Item-wise Sales Register,アイテムごとの販売登録
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","例えば ""XYZ銀行 """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","例えば ""XYZ銀行 """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,ターゲット合計
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,ターゲット合計
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,ショッピングカートが有効になっています
 DocType: Job Applicant,Applicant for a Job,求職者
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,製造指示が作成されていません
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,この月の従業員{0}の給与明細は作成済です
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,この月の従業員{0}の給与明細は作成済です
 DocType: Stock Reconciliation,Reconciliation JSON,照合 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Sales Invoice Item,Batch No,バッチ番号
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,メイン
-DocType: DocPerm,Delete,削除
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,バリエーション
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新しい{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,停止された注文はキャンセルできません。キャンセルするには停止解除してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Item,Variants,バリエーション
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+DocType: Payment Reconciliation Payment,Allocated amount,割当額
 DocType: Sales Team,Contribution to Net Total,合計額への貢献
 DocType: Sales Invoice Item,Customer's Item Code,顧客のアイテムコード
 DocType: Stock Reconciliation,Stock Reconciliation,在庫棚卸
@@ -1532,53 +1417,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,求職者
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
-DocType: Country,Country,国
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,住所
-DocType: Communication,Received,受領
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},アイテム{0}に入力されたシリアル番号は重複しています
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,出荷ルールの条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,アイテムは製造指示を持つことができません
-DocType: DocField,Attach Image,画像を添付
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),この梱包の正味重量。 （自動にアイテムの正味重量の合計が計算されます。）
-DocType: Stock Reconciliation Item,Leave blank if no change,変更しない場合は空白のままにします
 DocType: Sales Order,To Deliver and Bill,配送・請求する
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,製造用の時間ログ
 DocType: Item,Apply Warehouse-wise Reorder Level,倉庫ごとの再発注レベルを適用
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,タスクの時間ログ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,支払
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,支払
 DocType: Production Order Operation,Actual Time and Cost,実際の時間とコスト
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},資材要求の最大値{0}は、注{2}に対するアイテム{1}から作られます
 DocType: Employee,Salutation,敬称（例：Mr. Ms.）
-DocType: Communication,Rejected,拒否
 DocType: Pricing Rule,Brand,ブランド
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,販売時に商品をまとめる
 DocType: Sales Order Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
 DocType: Quality Inspection Reading,Reading 10,報告要素10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",あなたが購入または売却する製品やサービスの一覧を表示します。あなたが起動したときに項目グループ、測定およびその他のプロパティの単位を確認してください。
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",あなたが購入または売却する製品やサービスの一覧を表示します。あなたが起動したときに項目グループ、測定およびその他のプロパティの単位を確認してください。
 DocType: Hub Settings,Hub Node,ハブノード
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,同じ商品が重複入力されました。修正してやり直してください
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,属性 {1} の値 {0} は有効なアイテム属性値リストに存在しません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,同僚
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,同僚
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,期限切れ
 DocType: Packing Slip,To Package No.,対象梱包番号
-DocType: DocType,System,システム
 DocType: Warranty Claim,Issue Date,課題日
 DocType: Activity Cost,Activity Cost,活動費用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消費数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,通信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,通信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
 DocType: Payment Tool,Make Payment Entry,支払いエントリを作成
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
 ,Sales Invoice Trends,請求の傾向
 DocType: Leave Application,Apply / Approve Leaves,休暇を承認／適用
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ための
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',料金タイプが「前行の額」か「前行の合計」である場合にのみ、行を参照することができます
 DocType: Sales Order Item,Delivery Warehouse,配送倉庫
 DocType: Stock Settings,Allowance Percent,割合率
@@ -1590,33 +1470,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",「適用先」に{0}が選択された場合、「販売」にチェックを入れる必要があります
 DocType: Purchase Order Item,Supplier Quotation Item,サプライヤー見積アイテム
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,給与体系を作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,シアリング
 DocType: Item,Has Variants,バリエーションあり
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,新しい売上請求書を作成するために「請求書を作成」ボタンをクリックしてください。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
 DocType: Sales Person,Parent Sales Person,親販売担当者
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,会社マスタ・共通デフォルト設定で「デフォルト通貨」を指定してください
-DocType: Dropbox Backup,Dropbox Access Secret,Dropboxのアクセスの秘密
 DocType: Purchase Invoice,Recurring Invoice,定期的な請求
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,プロジェクト管理
 DocType: Supplier,Supplier of Goods or Services.,物品やサービスのサプライヤー
 DocType: Budget Detail,Fiscal Year,会計年度
 DocType: Cost Center,Budget,予算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",それは損益勘定ではないよう予算は、{0}に対して割り当てることができません
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,達成
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,達成
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,地域／顧客
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例「5」
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：割り当て額 {1} は未払請求額{2}以下である必要があります。
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,例「5」
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：割り当て額 {1} は未払請求額{2}以下である必要があります。
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,請求書を保存すると表示される表記内。
 DocType: Item,Is Sales Item,販売アイテム
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,アイテムグループツリー
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,アイテム{0}にはシリアル番号が設定されていません。アイテムマスタを確認してください。
 DocType: Maintenance Visit,Maintenance Time,メンテナンス時間
 ,Amount to Deliver,配送額
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,製品またはサービス
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,エラーが発生しました。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,タップ加工
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,製品またはサービス
 DocType: Naming Series,Current Value,現在の値
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 作成
 DocType: Delivery Note Item,Against Sales Order,対受注書
@@ -1630,15 +1505,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
 DocType: Website Item Group,Website Item Group,ウェブサイトの項目グループ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,関税と税金
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,基準日を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,基準日を入力してください
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Webサイトに表示されたアイテムの表
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
 DocType: Material Request Item,Material Request Item,資材要求アイテム
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,アイテムグループのツリー
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,アイテムグループのツリー
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
 ,Item-wise Purchase History,アイテムごとの仕入履歴
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,レッド
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,レッド
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
@@ -1649,92 +1524,80 @@
 時間ログから作業ステータスを更新してください"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,課題解決詳細
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,アイテムの数量単位を変更
 DocType: Quality Inspection Reading,Acceptance Criteria,合否基準
 DocType: Item Attribute,Attribute Name,属性名
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},アイテム{0}は{1}での販売またはサービスでなければなりません
 DocType: Item Group,Show In Website,ウェブサイトで表示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,グループ
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,グループ
 DocType: Task,Expected Time (in hours),予定時間（時）
 ,Qty to Order,注文数
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",ブランド名を追跡するための次の文書：納品書、機会、資材要求、アイテム、仕入発注、購入伝票、納品書、見積、請求、製品付属品、受注、シリアル番号
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",ブランド名を追跡するための次の文書：納品書、機会、資材要求、アイテム、仕入発注、購入伝票、納品書、見積、請求、製品付属品、受注、シリアル番号
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,すべてのタスクのガントチャート
 DocType: Appraisal,For Employee Name,従業員名用
 DocType: Holiday List,Clear Table,テーブルを消去
 DocType: Features Setup,Brands,ブランド
 DocType: C-Form Invoice Detail,Invoice No,請求番号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,参照元発注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,参照元発注
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように、前に{0}キャンセル/適用することができないままに{1}
 DocType: Activity Cost,Costing Rate,原価計算単価
 ,Customer Addresses And Contacts,顧客の住所と連絡先
 DocType: Employee,Resignation Letter Date,辞表提出日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,設定されていません
-DocType: Communication,Date,日付
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,リピート顧客の収益
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,システムがセットアップされている間お待ちください。しばらく時間がかかる場合があります。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,組
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,組
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 DocType: Maintenance Schedule Detail,Actual Date,実際の日付
 DocType: Item,Has Batch No,バッチ番号あり
 DocType: Delivery Note,Excise Page Number,物品税ページ番号
 DocType: Employee,Personal Details,個人情報詳細
 ,Maintenance Schedules,メンテナンス予定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,エンボス加工
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",このアイテムに製造指示を出すには、在庫アイテムでなければなりません。
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,入社
-DocType: Authorization Rule,Above Value,値を上回る
 ,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
 DocType: Purchase Order,Delivered,納品済
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ジョブメールを受信するサーバのメールIDをセットアップします。（例 jobs@example.com）
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,総割り当てられた葉{0}の期間のために既に承認された葉{1}より小さくすることはできません
 DocType: Journal Entry,Accounts Receivable,売掛金
 ,Supplier-Wise Sales Analytics,サプライヤーごとのセールス分析
 DocType: Address Template,This format is used if country specific format is not found,国別の書式が無い場合は、この書式が使用されます
-DocType: Custom Field,Custom,カスタム
 DocType: Production Order,Use Multi-Level BOM,マルチレベルの部品表を使用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,射出成形
 DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,財務アカウントのツリー
 DocType: Leave Control Panel,Leave blank if considered for all employee types,全従業員タイプを対象にする場合は空白のままにします
 DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,アイテム{1}が資産アイテムである場合、アカウントアイテム{0}は「固定資産」でなければなりません
 DocType: HR Settings,HR Settings,人事設定
-apps/frappe/frappe/config/setup.py +130,Printing,印刷
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,休暇を申請している日は休日です。申請の必要はありません。
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,＆
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,スポーツ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,実費計
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,単位
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,サイト設定でDropboxのアクセスキーを設定してください
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,単位
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,会社を指定してください
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,会計年度終了日
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,会計年度終了日
 DocType: POS Profile,Price List,価格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,経費請求
 DocType: Issue,Support,サポート
-DocType: Authorization Rule,Approving Role,承認役割
 ,BOM Search,部品表（BOM）検索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),期末（期首＋合計）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,会社に通貨を指定してください
 DocType: Workstation,Wages per hour,時間あたり賃金
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",シリアル番号、POSなどの表示/非表示機能
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下の資料の要求は、アイテムの再オーダーレベルに基づいて自動的に提起されています
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},決済日付は行{0}の小切手日付より前にすることはできません
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},決済日付は行{0}の小切手日付より前にすることはできません
 DocType: Salary Slip,Deduction,控除
 DocType: Address Template,Address Template,住所テンプレート
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
@@ -1746,76 +1609,68 @@
 DocType: Opportunity,Quotation,見積
 DocType: Salary Slip,Total Deduction,控除合計
 DocType: Quotation,Maintenance User,メンテナンスユーザー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,費用更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,費用更新
 DocType: Employee,Date of Birth,生年月日
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,アイテム{0}はすでに返品されています
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,「会計年度」は、会計年度を表します。すべての会計記帳および他の主要な取引は、「会計年度」に対して記録されます。
 DocType: Opportunity,Customer / Lead Address,顧客／リード住所
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：添付ファイル{0}に無効なSSL証明書
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,仕事内容
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,仕事内容
 DocType: Purchase Order Item,Qty as per Stock UOM,在庫単位ごとの数量
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,有効なCSVファイルを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,コーティング
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",セールスキャンペーンを追跡します。投資収益率を測定するために、キャンペーンから受注、見積、リードなどを追跡します。
 DocType: Expense Claim,Approver,承認者
 ,SO Qty,受注数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",倉庫{0}に対して在庫エントリが存在するため、倉庫の再割り当てや変更ができません
 DocType: Appraisal,Calculate Total Score,合計スコアを計算
 DocType: Supplier Quotation,Manufacturing Manager,製造マネージャー
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,梱包ごとに納品書を分割
-apps/erpnext/erpnext/hooks.py +84,Shipments,出荷
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ディップ成形
-DocType: Purchase Order,To be delivered to customer,顧客に配信します
+apps/erpnext/erpnext/hooks.py +68,Shipments,出荷
+DocType: Purchase Order Item,To be delivered to customer,顧客に配信します
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間ログのステータスが提出されなければなりません
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,シリアル番号は{0}任意の倉庫にも属していません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,セットアップ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨）
 DocType: Pricing Rule,Supplier,サプライヤー
 DocType: C-Form,Quarter,四半期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雑費
 DocType: Global Defaults,Default Company,デフォルトの会社
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{2}以上超過請求することはできません。超過請求を許可するには「在庫設定」で設定してください
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{2}以上超過請求することはできません。超過請求を許可するには「在庫設定」で設定してください
 DocType: Employee,Bank Name,銀行名
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ユーザー{0}無効になっています
 DocType: Leave Application,Total Leave Days,総休暇日数
-DocType: Journal Entry Account,Credit in Account Currency,アカウント通貨の貸方
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：ユーザーを無効にするとメールは送信されなくなります
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Currency Exchange,From Currency,通貨から
-DocType: DocField,Name,名前
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},受注に必要な項目{0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,システムに反映されていない金額
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},受注に必要な項目{0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,システムに反映されていない金額
 DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,その他
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,その他
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。
 DocType: POS Profile,Taxes and Charges,租税公課
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",製品またはサービスは、購入・販売あるいは在庫です。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,完了
-DocType: Web Form,Select DocType,文書タイプを選択
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,ブローチ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業務
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新しいコストセンター
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,新しいコストセンター
 DocType: Bin,Ordered Quantity,注文数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例「ビルダーのためのツール構築」
 DocType: Quality Inspection,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
 DocType: Purchase Order Item,Reference Document Type,リファレンスドキュメントの種類
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},受注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},受注{1}に対する{0}
 DocType: Account,Fixed Asset,固定資産
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,シリアル番号を付与した目録
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,シリアル番号を付与した目録
 DocType: Activity Type,Default Billing Rate,デフォルト請求単価
 DocType: Time Log Batch,Total Billing Amount,総請求額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,売掛金勘定
@@ -1823,19 +1678,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,受注からの支払
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間ログを作成しました：
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Employee,Blood Group,血液型
 DocType: Purchase Invoice Item,Page Break,改ページ
 DocType: Production Order Operation,Pending,保留
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,特定の従業員の休暇申請を承認することができるユーザー
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,バリエーションのデフォルト数量単位（UOM）を変更することはできません。変更する場合、テンプレートのデフォルト数量単位（UOM）を変更します
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,OA機器
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,電子機器
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,電子機器
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,在庫が再注文レベルに達したときに原材料要求を挙げる
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,メンテナンス予定から
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,フルタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,フルタイム
 DocType: Purchase Invoice,Contact Details,連絡先の詳細
 DocType: C-Form,Received Date,受信日
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",販売租税公課テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください
@@ -1847,14 +1702,15 @@
 DocType: Job Applicant,Job Opening,求人
 DocType: Payment Reconciliation,Payment Reconciliation,支払照合
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,担当者名を選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 DocType: Offer Letter,Offer Letter,雇用契約書
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,資材要求（MRP）と製造指示を生成
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,請求額合計
 DocType: Time Log,To Time,終了時間
+DocType: Authorization Rule,Approving Role (above authorized value),（許可された値以上の）役割を承認
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",子ノードを追加するには、ツリーを展開し、増やしたいノードの下をクリックしてください
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
 DocType: Production Order Operation,Completed Qty,完成した数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,価格表{0}は無効になっています
@@ -1864,12 +1720,10 @@
 DocType: Item,Customer Item Codes,顧客アイテムコード
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,注文または請求書に対する支払エントリを作成
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,溶接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新しい在庫単位が必要です
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,全てのアイテムはすでに請求済みです
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',有効な「参照元ケース番号」を指定してください
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,アイテムシリアル番号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限
@@ -1879,15 +1733,13 @@
 DocType: Bin,Actual Quantity,実際の数量
 DocType: Shipping Rule,example: Next Day Shipping,例：翌日発送
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,シリアル番号 {0} は見つかりません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,あなたの顧客
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,圧縮成形
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,あなたの顧客
 DocType: Leave Block List Date,Block Date,ブロック日付
 DocType: Sales Order,Not Delivered,未納品
 ,Bank Clearance Summary,銀行決済の概要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",日次・週次・月次のメールダイジェストを作成・管理
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,アイテムコード>アイテムグループ>ブランド
 DocType: Appraisal Goal,Appraisal Goal,査定目標
-DocType: Event,Friday,金曜日
 DocType: Time Log,Costing Amount,原価計算額
 DocType: Process Payroll,Submit Salary Slip,給与伝票を提出
 DocType: Salary Structure,Monthly Earning & Deduction,月次収益＆控除
@@ -1895,16 +1747,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,一括でインポート
 DocType: Sales Partner,Address & Contacts,住所・連絡先
 DocType: SMS Log,Sender Name,送信者名
-DocType: Page,Title,タイトル
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,カスタマイズ
 DocType: POS Profile,[Select],[選択]
 DocType: SMS Log,Sent To,送信先
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,納品書を作成
 DocType: Company,For Reference Only.,参考用
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},無効な{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},無効な{0}：{1}
 DocType: Sales Invoice Advance,Advance Amount,前払額
 DocType: Manufacturing Settings,Capacity Planning,キャパシティプランニング
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,「開始日」が必要です
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,「開始日」が必要です
 DocType: Journal Entry,Reference Number,参照番号
 DocType: Employee,Employment Details,雇用の詳細
 DocType: Employee,New Workplace,新しい職場
@@ -1919,7 +1769,7 @@
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
 DocType: Item,End of Life,提供終了
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,移動
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,移動
 DocType: Leave Block List,Allow Users,ユーザーを許可
 DocType: Purchase Order,Customer Mobile No,お客様の携帯電話はありません
 DocType: Sales Invoice,Recurring,繰り返し
@@ -1927,13 +1777,13 @@
 DocType: Rename Tool,Rename Tool,ツール名称変更
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,資材配送
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
 DocType: Installation Note,Installation Note,設置票
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,税金を追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,税金を追加
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,検証者
 DocType: Address,Subsidiary,子会社
@@ -1941,10 +1791,8 @@
 デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
 DocType: Quality Inspection,Purchase Receipt No,領収書番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,手付金
-DocType: System Settings,In Hours,時間内
 DocType: Process Payroll,Create Salary Slip,給与伝票を作成する
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,銀行口座ごとの予想残高
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,バフ研磨加工
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,銀行口座ごとの予想残高
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金源泉（負債）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}（{1}）で製造量{2}と同じでなければなりません
 DocType: Appraisal,Employee,従業員
@@ -1957,15 +1805,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,伝票によるグループ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Sales Invoice,Mass Mailing,大量送付
-DocType: Page,Standard,標準
 DocType: Rename Tool,File to Rename,名前を変更するファイル
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,支払いを表示
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,サイズ
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医薬品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,医薬品
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,仕入アイテムの費用
 DocType: Selling Settings,Sales Order Required,受注必須
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,顧客を作成
@@ -1975,30 +1821,25 @@
 DocType: Quality Inspection Reading,Reading 9,報告要素9
 DocType: Supplier,Is Frozen,凍結
 DocType: Buying Settings,Buying Settings,購入設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,バレル研磨
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,完成品アイテムの部品表番号
 DocType: Upload Attendance,Attendance To Date,出勤日
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),営業メールを受信するサーバのメールIDをセットアップします。 （例 sales@example.com）
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Tool,Payment Account,支払勘定
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,続行する会社を指定してください
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,下書き
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,代償オフ
 DocType: Quality Inspection Reading,Accepted,承認済
-DocType: User,Female,女性
-DocType: Journal Entry Account,Debit in Account Currency,アカウントの通貨での借方
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
-DocType: Print Settings,Modern,モダン
-DocType: Communication,Replied,返答
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無効な参照{0} {1}
 DocType: Payment Tool,Total Payment Amount,支払額合計
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）は製造指示{3}において計画数量（{2}）より大きくすることはできません
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料は空白にできません。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料は空白にできません。
 DocType: Newsletter,Test,テスト
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",このアイテムには在庫取引が存在するため、「シリアル番号あり」「バッチ番号あり」「ストックアイテム」「評価方法」の値を変更することはできません。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,クイック仕訳
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
@@ -2006,17 +1847,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,アイテム要求
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,各完成品それぞれに独立した製造指示が作成されます。
 DocType: Purchase Invoice,Terms and Conditions1,規約１
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完全セットアップ
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会計エントリーはこの日から凍結され、以下の役割を除いて実行／変更できません。
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,プロジェクトステータス
 DocType: UOM,Check this to disallow fractions. (for Nos),数に小数を許可しない場合チェック
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,ニュースレターメーリングリスト
 DocType: Delivery Note,Transporter Name,輸送者名
+DocType: Authorization Rule,Authorized Value,認定値
 DocType: Contact,Enter department to which this Contact belongs,この連絡先の所属部署を入力してください
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,欠席計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,数量単位
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,数量単位
 DocType: Fiscal Year,Year End Date,年終日
 DocType: Task Depends On,Task Depends On,依存するタスク
 DocType: Lead,Opportunity,機会
@@ -2037,16 +1878,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本単価（在庫数量単位ごと）
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ピアシング
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,コミッションのための企業の製品を販売している第三者の代理店/ディーラー/コミッションエージェント/アフィリエイト/リセラー。
 DocType: Customer Group,Has Child Node,子ノードあり
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},発注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","静的なURLパラメータを入力してください（例：sender=ERPNext, username=ERPNext, password=1234 など）"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}は有効な会計年度内にありません。詳細については{2}を確認してください。
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,これはERPNextの自動生成ウェブサイトの例です。
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,エイジングレンジ１
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化学加工
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2095,11 +1935,9 @@
 このセクションでは、税／支払の算定のみ（合計の一部ではありません）か、合計のみ（アイテムには値が加算されません）か、両方かを指定することができます。
 10. 追加／控除：
 追加か控除かを選択します"
-DocType: Note,Note,ノート
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
-DocType: Email Account,Email Ids,メールアドレス
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 DocType: Tax Rule,Billing City,請求先の市
 DocType: Global Defaults,Hide Currency Symbol,通貨記号を非表示にする
@@ -2107,40 +1945,36 @@
 DocType: Journal Entry,Credit Note,貸方票
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},完成数量は作業{1}において{0}を超えることはできません
 DocType: Features Setup,Quality,品質
-DocType: Contact Us Settings,Introduction,はじめに
 DocType: Warranty Claim,Service Address,所在地
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,在庫棚卸の最大行は100です
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,在庫棚卸の最大行は100です
 DocType: Stock Entry,Manufacture,製造
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,まず納品書が先です
 DocType: Purchase Invoice,Currency and Price List,通貨と価格表
 DocType: Opportunity,Customer / Lead Name,顧客／リード名
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,決済日が記入されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,製造
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,決済日が記入されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,製造
 DocType: Item,Allow Production Order,製造指示を許可
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
 DocType: Installation Note Item,Installed Qty,設置済数量
 DocType: Lead,Fax,FAX
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,提出済
 DocType: Salary Structure,Total Earning,収益合計
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,自分の住所
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織支部マスター。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,または
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,水道光熱費
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
-,Download Backups,バックアップダウンロード
 DocType: Notification Control,Sales Order Message,受注メッセージ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,支払タイプ
 DocType: Process Payroll,Select Employees,従業員を選択
 DocType: Bank Reconciliation,To Date,日付
 DocType: Opportunity,Potential Sales Deal,潜在的販売取引
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,詳細
 DocType: Purchase Invoice,Total Taxes and Charges,租税公課計
 DocType: Employee,Emergency Contact,緊急連絡先
 DocType: Item,Quality Parameters,品質パラメータ
@@ -2155,6 +1989,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,シリアル番号／バッチ
 DocType: Product Bundle,Parent Item,親アイテム
 DocType: Account,Account Type,アカウントタイプ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0}キャリー転送できないタイプを残します
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
@@ -2162,32 +1997,27 @@
 DocType: Bin,Reserved Quantity,予約数量
 DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,フォームのカスタマイズ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切断
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,平面加工
 DocType: Account,Income Account,収益勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,鋳造
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
 DocType: Item Reorder,Material Request Type,資材要求タイプ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}：数量単位（UOM）換算係数は必須です
-apps/frappe/frappe/desk/moduleview.py +61,Documents,文書
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参照
 DocType: Cost Center,Cost Center,コストセンター
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,伝票番号
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,伝票番号
 DocType: Notification Control,Purchase Order Message,発注メッセージ
 DocType: Tax Rule,Shipping Country,出荷先の国
 DocType: Upload Attendance,Upload HTML,HTMLアップロード
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",注文{1}に対する前受金計（{0}）は総計（{2}）より大きくすることはできません
 DocType: Employee,Relieving Date,退職日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
 DocType: Employee Education,Class / Percentage,クラス/パーセンテージ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,マーケティングおよび販売部長
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得税
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,LENS
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,マーケティングおよび販売部長
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得税
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",選択した価格設定ルールが「価格」のために作られている場合は、価格表が上書きされます。価格設定ルールの価格は最終的な価格なので、以降は割引が適用されるべきではありません。したがって、受注、発注書などのような取引内では「価格表レート」フィールドよりも「レート」フィールドで取得されます。
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,業種によってリードを追跡
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
@@ -2195,10 +2025,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
-DocType: User,Bio,自己紹介
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,顧客グループツリーを管理します。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新しいコストセンター名
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,デフォルトの住所テンプレートが見つかりませんでした。設定> 印刷とブランディング>住所テンプレートから新しく作成してください。
 DocType: Appraisal,HR User,人事ユーザー
@@ -2210,31 +2039,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
 DocType: Supplier,Billing Currency,請求通貨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,XL
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,XL
 ,Profit and Loss Statement,損益計算書
 DocType: Bank Reconciliation Detail,Cheque Number,小切手番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,プレス
 DocType: Payment Tool Detail,Payment Tool Detail,支払ツールの詳細
 ,Sales Browser,販売ブラウザ
 DocType: Journal Entry,Total Credit,貸方合計
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,現地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ローンと貸付金（資産）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務者
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,L
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,従業員が見つかりません！
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,L
 DocType: C-Form Invoice Detail,Territory,地域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Purchase Order,Customer Address Display,顧客の住所の表示
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,研磨
 DocType: Production Order Operation,Planned Start Time,計画開始時間
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",アイテム {0} のデフォルト数量単位（UOM）は、別の数量単位が取引内で使用されているため、直接変更することはできません。デフォルト数量単位を変更するには、在庫モジュール内の「数量単位置換ユーティリティ」ツールを使用してください。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,別通貨に変換するための為替レートを指定
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,見積{0}はキャンセルされました
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,見積{0}はキャンセルされました
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,残高合計
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,従業員は{0} {1}に休暇中でした。出勤とすることはできません。
 DocType: Sales Partner,Targets,ターゲット
@@ -2242,18 +2065,17 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
 DocType: Production Order Operation,Make Time Log,時間ログを作成
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,再注文数量を設定してください
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 DocType: Price List,Applicable for Countries,国に適用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,コンピュータ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,電解研削
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,会計エントリーを開始する前に、勘定科目を設定してください
 DocType: Purchase Invoice,Ignore Pricing Rule,価格設定ルールを無視
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,キャンセル
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,給与体系内の開始日は従業員の入社日よりも前にはできません
 DocType: Employee Education,Graduate,大卒
 DocType: Leave Block List,Block Days,ブロック日数
-DocType: Journal Entry,Excise Entry,消費税エントリ
+DocType: Journal Entry,Excise Entry,消費税エントリ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：受注 {0} は受注 {1} に既に存在します
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
@@ -2285,7 +2107,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",請求が定期的な場合にはチェックをオンにし、繰り返しを停止する場合はチェックをオフにするか適切な終了日を指定してください
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
 DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合（印刷用）
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,最大 {0} 行許容
 DocType: C-Form Invoice Detail,Net Total,差引計
 DocType: Bin,FCFS Rate,FCFSレート
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),請求書
@@ -2302,20 +2123,19 @@
 DocType: Maintenance Visit,Purposes,目的
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,電解加工
 ,Requested,要求済
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,備考がありません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,期限超過
 DocType: Account,Stock Received But Not Billed,記帳前在庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,rootアカウントは、グループにする必要があります
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,給与総額+滞納額+現金化金額 - 合計控除
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Features Setup,Sales and Purchase,販売と仕入
 DocType: Supplier Quotation Item,Material Request No,資材要求番号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,顧客の通貨が会社の基本通貨に換算されるレート
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,このリストから{0}を正常に解除しました。
 DocType: Purchase Invoice Item,Net Rate (Company Currency),正味単価（会社通貨）
-apps/frappe/frappe/templates/base.html +134,Added,追加済
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,地域ツリーを管理
 DocType: Journal Entry Account,Sales Invoice,請求書
 DocType: Journal Entry Account,Party Balance,当事者残高
@@ -2329,11 +2149,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,会計年度{0}が見つかりません
 DocType: Bank Reconciliation,Get Relevant Entries,関連するエントリを取得
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,在庫の会計エントリー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,コイニング
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
-apps/frappe/frappe/desk/query_report.py +136,Total,計
 DocType: Purchase Invoice,Apply Additional Discount On,追加割引に適用
 DocType: Account,Root Type,ルートタイプ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：アイテム {2} では {1} 以上を返すことはできません
@@ -2343,14 +2161,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),割引後税額（会社通貨）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},{0}行にターゲット倉庫が必須です。
 DocType: Quality Inspection,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,XS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,溶射成形
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,XS
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL・BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最小在庫レベル
 DocType: Stock Entry,Subcontract,下請
@@ -2361,42 +2178,39 @@
 DocType: Item,Manufacturer Part Number,メーカー品番
 DocType: Production Order Operation,Estimated Time and Cost,推定所要時間と費用
 DocType: Bin,Bin,保管場所
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ノージング
 DocType: SMS Log,No of Sent SMS,送信されたSMSの数
 DocType: Account,Company,会社
 DocType: Account,Expense Account,経費科目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ソフトウェア
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,カラー
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ソフトウェア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,カラー
 DocType: Maintenance Visit,Scheduled,スケジュール設定済
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,月をまたがってターゲットを不均等に配分するには、「月次配分」を選択してください
 DocType: Purchase Invoice Item,Valuation Rate,評価額
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,価格表の通貨が選択されていません
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,アイテムの行{0}：領収書{1}は上記の「領収書」テーブルに存在しません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,プロジェクト開始日
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,まで
 DocType: Rename Tool,Rename Log,ログ名称変更
 DocType: Installation Note Item,Against Document No,文書番号に対して
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,セールスパートナーを管理します。
 DocType: Quality Inspection,Inspection Type,検査タイプ
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},{0}を選択してください
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,リサーチャー
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,リサーチャー
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,送信する前にニュースレターを保存してください
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,名前またはメールアドレスが必須です
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,収入品質検査。
 DocType: Purchase Order Item,Returned Qty,返品数量
 DocType: Employee,Exit,終了
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ルートタイプが必須です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ルートタイプが必須です
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,シリアル番号 {0}を作成しました
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,振動仕上げ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",これらのコードは、顧客の便宜のために、請求書および納品書等の印刷形式で使用することができます
 DocType: Employee,You can enter any date manually,手動で日付を入力することができます
 DocType: Sales Invoice,Advertisement,広告宣伝
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,試用期間
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期間
 DocType: Customer Group,Only leaf nodes are allowed in transaction,取引にはリーフノードのみ許可されています
 DocType: Expense Claim,Expense Approver,経費承認者
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
@@ -2404,43 +2218,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,終了日時
 DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,研削
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,シュリンクラップ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,保留中の活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認済
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,サプライヤー>サプライヤータイプ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,量／額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,新聞社
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,新聞社
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,会計年度を選択
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,精錬
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Attendance,Attendance Date,出勤日
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
 DocType: Address,Preferred Shipping Address,優先出荷住所
 DocType: Purchase Receipt Item,Accepted Warehouse,承認済み倉庫
 DocType: Bank Reconciliation Detail,Posting Date,転記日付
 DocType: Item,Valuation Method,評価方法
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} {1}への為替レートを見つけることができません。
 DocType: Sales Invoice,Sales Team,営業チーム
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,エントリーを複製
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,エントリーを複製
 DocType: Serial No,Under Warranty,保証期間中
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[エラー]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
 ,Employee Birthday,従業員の誕生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ベンチャーキャピタル
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,シリアル番号 {0}は存在しません
 DocType: Pricing Rule,Discount Percentage,割引率
 DocType: Payment Reconciliation Invoice,Invoice Number,請求番号
-apps/erpnext/erpnext/hooks.py +70,Orders,注文
+apps/erpnext/erpnext/hooks.py +54,Orders,注文
 DocType: Leave Control Panel,Employee Type,従業員タイプ
 DocType: Employee Leave Approver,Leave Approver,休暇承認者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,スウェージング加工
 DocType: Manufacturing Settings,Material Transferred for Manufacture,製造用移送資材
 DocType: Expense Claim,"A user with ""Expense Approver"" role",「経費承認者」の役割を持つユーザー
 ,Issued Items Against Production Order,製造指示に対して発行されたアイテム
@@ -2452,7 +2263,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無効期間
 DocType: Customer,Credit Limit,与信限度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,取引タイプを選択
 DocType: GL Entry,Voucher No,伝票番号
@@ -2462,11 +2272,10 @@
 DocType: Customer,Address and Contact,住所・連絡先
 DocType: Customer,Last Day of the Next Month,次月末日
 DocType: Employee,Feedback,フィードバック
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",前に割り当てることができないままに、{0}、休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように{1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,メンテナンススケジュール
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,アブレイシブジェット加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,メンテナンススケジュール
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
-DocType: Website Settings,Website Settings,Webサイト設定
 DocType: Item,Reorder level based on Warehouse,倉庫ごとの再注文レベル
 DocType: Activity Cost,Billing Rate,請求単価
 ,Qty to Deliver,配送数
@@ -2477,20 +2286,19 @@
 DocType: Material Request,Requested For,要求対象
 DocType: Quotation Item,Against Doctype,対文書タイプ
 DocType: Delivery Note,Track this Delivery Note against any Project,任意のプロジェクトに対してこの納品書を追跡します
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,rootアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,rootアカウントを削除することはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,在庫エントリー表示
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参照＃{0} 日付{1}　
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参照＃{0} 日付{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,住所管理
 DocType: Pricing Rule,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
-DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),（借方）を閉じる
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),（借方）を閉じる
 DocType: Contact,Passive,消極的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,販売取引用の税のテンプレート
@@ -2506,10 +2314,9 @@
 ,Billed Amount,請求金額
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,アップデートを入手
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,いくつかのサンプルレコードを追加
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,資材要求{0}はキャンセルまたは停止されています
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,いくつかのサンプルレコードを追加
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,休暇管理
-DocType: Event,Groups,グループ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,勘定によるグループ
 DocType: Sales Order,Fully Delivered,全て納品済
 DocType: Lead,Lower Income,低収益
@@ -2518,40 +2325,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,クイックヘルプ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},出庫元／入庫先を同じ行{0}に入れることはできません
 DocType: Features Setup,Sales Extras,試供
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},コストセンター{2}に対するアカウント{1}の予算{0}が {3}により超えてしまいます
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,値または数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,分
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
 ,Qty to Receive,受領数
 DocType: Leave Block List,Leave Block List Allowed,許可済休暇リスト
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,換算係数は分数にすることができません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ログインに使用します
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ログインに使用します
 DocType: Sales Partner,Retailer,小売業者
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,全てのサプライヤータイプ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,％納品済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行当座貸越口座
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,給与伝票を作成
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,担保ローン
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,素晴らしい製品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,開始残高 資本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,該当期間の休暇申請を承認する権限がありません
 DocType: Appraisal,Appraisal,査定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ロストフォーム鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,図
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日付が繰り返されます
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,署名権者
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},休暇承認者は{0}のいずれかである必要があります
 DocType: Hub Settings,Seller Email,販売者のメール
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
 DocType: Workstation Working Hour,Start Time,開始時間
@@ -2565,12 +2369,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額（会社通貨）
 DocType: BOM Operation,Hour Rate,時給
 DocType: Stock Settings,Item Naming By,アイテム命名
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,見積から
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,見積から
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},別の期間の決算仕訳 {0} が {1} の後に作成されています
 DocType: Production Order,Material Transferred for Manufacturing,製造用移設資材
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,アカウント{0}が存在しません
 DocType: Purchase Receipt Item,Purchase Order Item No,発注アイテム番号
-DocType: System Settings,System Settings,システム設定
 DocType: Project,Project Type,プロジェクトタイプ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ターゲット数量や目標量のどちらかが必須です。
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,様々な活動の費用
@@ -2579,36 +2382,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR詳細
 DocType: Sales Order,Fully Billed,全て記帳済
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手持ちの現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
 DocType: Serial No,Is Cancelled,キャンセル済
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,自分の出荷
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,自分の出荷
 DocType: Journal Entry,Bill Date,ビル日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
 DocType: Supplier,Supplier Details,サプライヤー詳細
-DocType: Communication,Recipients,受信者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ねじ切り
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,ローレット加工
 DocType: Expense Claim,Approval Status,承認ステータス
 DocType: Hub Settings,Publish Items to Hub,ハブにアイテムを公開
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}の値以下の値でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電信振込
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,電信振込
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,銀行口座を選択してください
 DocType: Newsletter,Create and Send Newsletters,ニュースレターの作成・送信
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,開始日は終了日より前でなければなりません
 DocType: Sales Order,Recurring Order,定期的な注文
 DocType: Company,Default Income Account,デフォルト損益勘定
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,顧客グループ／顧客
 DocType: Item Group,Check this if you want to show in website,ウェブサイトに表示したい場合チェック
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNextへようこそ
+,Welcome to ERPNext,ERPNextへようこそ
 DocType: Payment Reconciliation Payment,Voucher Detail Number,伝票詳細番号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,見積へのリード
 DocType: Lead,From Customer,顧客から
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,電話
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
 DocType: Project,Total Costing Amount (via Time Logs),総原価額（時間ログ経由）
 DocType: Purchase Order Item Supplied,Stock UOM,在庫単位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,発注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,発注{0}は提出されていません
 ,Projected,予想
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},倉庫 {1} に存在しないシリアル番号 {0}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：アイテム{0}の数量が0であるため、システムは超過納品や超過注文をチェックしません。
@@ -2616,13 +2415,10 @@
 DocType: Issue,Opening Date,日付を開く
 DocType: Journal Entry,Remark,備考
 DocType: Purchase Receipt Item,Rate and Amount,割合と量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ボーリング加工
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,受注から
-DocType: Blog Category,Parent Website Route,親サイトルート
 DocType: Sales Order,Not Billed,未記帳
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,両方の倉庫は同じ会社に属している必要があります
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,連絡先がまだ追加されていません
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,アクティブではありません
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,陸揚費用伝票額
 DocType: Time Log,Batched for Billing,請求の一括処理
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,サプライヤーからの請求
@@ -2630,20 +2426,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,割引額
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間（日数）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例「付加価値税（VAT）」
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,例「付加価値税（VAT）」
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,アイテム4
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,熱間ガスフォーミング
 DocType: Sales Order Item,Sales Order Date,受注日
 DocType: Sales Invoice Item,Delivered Qty,納品済数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",適切なグループ（通常は資金源＞流動負債＞租税公課）に移動し、新しい「税」アカウント（クリックして子要素を追加します）を作成して、税率を記載してください。
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,レーザー切断
-DocType: Event,Monday,月曜日
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Account,Payable,買掛
 DocType: Salary Slip,Arrear Amount,滞納額
@@ -2656,7 +2449,6 @@
 DocType: Lead,Address Desc,住所種別
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,製造作業が行なわれる場所
-DocType: Page,All,すべて
 DocType: Stock Entry Detail,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
 DocType: Employee,Confirmation Date,確定日
@@ -2664,9 +2456,8 @@
 DocType: Account,Sales User,販売ユーザー
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小個数は最大個数を超えることはできません
 DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,設定
 DocType: Lead,Lead Owner,リード所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,倉庫が必要です
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,倉庫が必要です
 DocType: Employee,Marital Status,配偶者の有無
 DocType: Stock Settings,Auto Material Request,自動資材要求
 DocType: Time Log,Will be updated when billed.,記帳時に更新されます。
@@ -2680,44 +2471,40 @@
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,発注アイテム供給済
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,会社名は、当社にすることはできません
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,印刷テンプレートのレターヘッド。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,印刷テンプレートのタイトル（例：「見積送り状」）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超仕上げ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,納品書からアイテムを抽出してください
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",電子メール、電話、チャット、訪問等すべてのやりとりの記録
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,会社の丸め誤差コストセンターを指定してください
 DocType: Purchase Invoice,Terms,規約
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,新規作成
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,新規作成
 DocType: Buying Settings,Purchase Order Required,発注が必要です
 ,Item-wise Sales History,アイテムごとの販売履歴
 DocType: Expense Claim,Total Sanctioned Amount,認可額合計
 ,Purchase Analytics,仕入分析
 DocType: Sales Invoice Item,Delivery Note Item,納品書アイテム
 DocType: Expense Claim,Task,タスク
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,シェービング
 DocType: Purchase Taxes and Charges,Reference Row #,参照行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},項目{0}にバッチ番号が必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,ルート（大元の）営業担当者なので編集できません
 ,Stock Ledger,在庫元帳
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},レート：{0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},レート：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,給与控除明細
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ノート
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,はじめにグループノードを選択してください
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,フォームに入力して保存します
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,最新の在庫状況とのすべての原材料を含むレポートをダウンロード
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,フェーシング加工
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,コミュニティフォーラム
 DocType: Leave Application,Leave Balance Before Application,申請前休暇残数
 DocType: SMS Center,Send SMS,SMSを送信
 DocType: Company,Default Letter Head,デフォルトレターヘッド
 DocType: Time Log,Billable,請求可能
-DocType: Authorization Rule,This will be used for setting rule in HR module,人事モジュールで規則を設定するために使用されます
 DocType: Account,Rate at which this tax is applied,この税金が適用されるレート
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再注文数量
 DocType: Company,Stock Adjustment Account,在庫調整勘定
@@ -2729,12 +2516,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,機会損失
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",割引フィールドが発注書、領収書、請求書に利用できるようになります
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウント名。注：顧客やサプライヤーのためにアカウントを作成しないでください
-DocType: Report,Report Type,レポートタイプ
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,読み込み中
 DocType: BOM Replace Tool,BOM Replace Tool,部品表交換ツール
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国ごとのデフォルトのアドレステンプレート
 DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーは、お客様に提供します
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,表示減税アップ
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,データインポート・エクスポート
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',製造活動に関与する場合、アイテムを「製造済」にすることができます
@@ -2744,16 +2529,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
 DocType: Serial No,Out of AMC,年間保守契約外
 DocType: Purchase Order Item,Material Request Detail No,資材要求の詳細番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,高硬度鋼旋削加工
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,メンテナンス訪問を作成
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
 DocType: Company,Default Cash Account,デフォルトの現金勘定
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意：支払が任意の参照に対して行われていない場合は、手動で仕訳を作成します
 DocType: Item,Supplier Items,サプライヤーアイテム
 DocType: Opportunity,Opportunity Type,機会タイプ
@@ -2765,66 +2549,58 @@
 DocType: Hub Settings,Publish Availability,公開可用性
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
 ,Stock Ageing,在庫エイジング
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'は無効になっています
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,取引を処理した時に連絡先に自動メールを送信
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}",行{0}：{2} {3} の倉庫 {1} で可能な数量ではありません（可能な数量 {4}／移転数量 {5}）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
 DocType: Purchase Order,Customer Contact Email,お客様の連絡先メールアドレス
-DocType: Event,Sunday,日曜日
 DocType: Sales Team,Contribution (%),寄与度（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,責任
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,責任
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,表に少なくとも1件の請求書を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ユーザー追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,ユーザー追加
 DocType: Pricing Rule,Item Group,アイテムグループ
 DocType: Task,Actual Start Date (via Time Logs),実際の開始日（時間ログ経由）
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
 DocType: Item,Default BOM,デフォルト部品表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,確認のため会社名を再入力してください
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
 DocType: Time Log Batch,Total Hours,時間合計
 DocType: Journal Entry,Printing Settings,印刷設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,自動車
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,アイテムが必要です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属射出成形
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,納品書から
 DocType: Time Log,From Time,開始時間
 DocType: Notification Control,Custom Message,カスタムメッセージ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",国、時間帯、通貨を選択
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗処理
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型鋳造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,電気めっき
 DocType: Purchase Invoice Item,Rate,単価／率
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,インターン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,インターン
 DocType: Newsletter,A Lead with this email id should exist,このメールアドレスを持つリードが必要です
 DocType: Stock Entry,From BOM,参照元部品表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,半日休暇の開始日と終了日は同日でなければなりません
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",例「kg」「単位」「個数」「m」
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",例「kg」「単位」「個数」「m」
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
 DocType: Salary Structure,Salary Structure,給与体系
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","同じ抽出条件に複数の価格ルールが存在しますので、優先順位を設定して衝突を解決してください。
 価格ルール：{0}"
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,資材課題
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 DocType: Hub Settings,Access Token,アクセストークン
@@ -2833,45 +2609,37 @@
 DocType: Item,Is Fixed Asset Item,固定資産アイテム
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",長いプリント形式を使用している場合、この機能は、各ページのすべてのヘッダーとフッターに複数のページに印刷されるページを分割するために使用することができます
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,歯切り加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,全ての領域
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 DocType: Fiscal Year,Year Name,年の名前
 DocType: Process Payroll,Process Payroll,給与支払
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,休日数が月営業日数を上回っています
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,休日数が月営業日数を上回っています
 DocType: Product Bundle Item,Product Bundle Item,製品付属品アイテム
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
 DocType: Purchase Invoice Item,Image View,画像を見る
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,仕上＆工業仕上
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,期間日付が必要です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,証券・商品取引所
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,穴あけ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ブロー成形
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
 DocType: Tax Rule,Shipping City,出荷先の市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,この商品は、{0}（テンプレート）のバリエーションです。「コピーしない」が設定されていない限り、属性は、テンプレートからコピーされます
 DocType: Account,Purchase User,仕入ユーザー
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ハンマリング
-DocType: Web Page,Slideshow,スライドショー
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,デフォルトのアドレステンプレートを削除することはできません
 DocType: Sales Invoice,Shipping Rule,出荷ルール
 DocType: Journal Entry,Print Heading,印刷見出し
 DocType: Quotation,Maintenance Manager,メンテナンスマネージャー
-DocType: Workflow State,Search,検索
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,合計はゼロにすることはできません
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,「最終受注からの日数」はゼロ以上でなければなりません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,ろう付け
 DocType: C-Form,Amended From,修正元
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原材料
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,原材料
 DocType: Leave Application,Follow via Email,メール経由でフォロー
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,割引後の税額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,このアカウントには子アカウントが存在しています。このアカウントを削除することはできません。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ターゲット数量や目標量のどちらかが必須です
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,最初の転記日付を選択してください
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,日付を開くと、日付を閉じる前にすべきです
 DocType: Leave Control Panel,Carry Forward,繰り越す
@@ -2880,44 +2648,43 @@
 ,Produced,生産
 DocType: Item,Item Code for Suppliers,サプライヤーのためのアイテムコード
 DocType: Issue,Raised By (Email),提起元メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,レターヘッドを添付
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,レターヘッドを添付
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",あなたの税のヘッドリスト（例えば付加価値税、関税などを、彼らは一意の名前を持つべきである）、およびそれらの標準速度。これは、あなたが編集して、より後に追加することができ、標準的なテンプレートを作成します。
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",あなたの税のヘッドリスト（例えば付加価値税、関税などを、彼らは一意の名前を持つべきである）、およびそれらの標準速度。これは、あなたが編集して、より後に追加することができ、標準的なテンプレートを作成します。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
 DocType: Journal Entry,Bank Entry,銀行取引記帳
 DocType: Authorization Rule,Applicable To (Designation),（肩書）に適用
-DocType: Blog Post,Blog Post,ブログの投稿
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,グループ化
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,通貨の有効／無効を切り替え
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵便経費
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計（数）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Purchase Order,The date on which recurring order will be stop,繰り返し注文停止予定日
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}は {1}より減少させなければならないか、オーバーフロー許容値を増やす必要があります
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,総現在価値
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,時
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,時
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,サプライヤーに資材を配送
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,サプライヤーに資材を配送
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,見積を登録
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,これら全アイテムはすでに請求済みです
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,あなたがブロック日付の葉を承認する権限がありません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,これら全アイテムはすでに請求済みです
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}によって承認することができます
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
 DocType: BOM Replace Tool,The new BOM after replacement,交換後の新しい部品表
 DocType: Features Setup,Point of Sale,POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,カーリング加工
 DocType: Account,Tax,税
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}は有効な{2}ではありません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精錬
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}：{1}は有効な{2}ではありません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,製品バンドルから
 DocType: Production Planning Tool,Production Planning Tool,製造計画ツール
 DocType: Quality Inspection,Report Date,レポート日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ルーティング
 DocType: C-Form,Invoices,請求
 DocType: Job Opening,Job Title,職業名
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}はすでに期間の従業員{1}のために割り当てられた{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}受信者
 DocType: Features Setup,Item Groups in Details,アイテムグループ詳細
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
@@ -2926,33 +2693,29 @@
 DocType: Stock Entry,Update Rate and Availability,単価と残量をアップデート
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,注文数に対して受領または提供が許可されている割合。例：100単位の注文を持っている状態で、割当が10％だった場合、110単位の受領を許可されます。
 DocType: Pricing Rule,Customer Group,顧客グループ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: Item,Website Description,ウェブサイトの説明
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
 ,Sales Register,販売登録
 DocType: Quotation,Quotation Lost Reason,失注理由
 DocType: Address,Plant,プラント
-DocType: DocType,Setup,セットアップ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,今月と保留中の活動の概要
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷間圧延
 DocType: Customer Group,Customer Group Name,顧客グループ名
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
 DocType: GL Entry,Against Voucher Type,対伝票タイプ
 DocType: Item,Attributes,属性
-DocType: Packing Slip,Get Items,項目を取得
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,償却勘定を入力してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,項目を取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最終注文日
-DocType: DocField,Image,画像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,消費税請求書を作成
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
-DocType: Communication,Other,その他
 DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作IDが設定されていません
 DocType: Production Order,Planned Start Date,計画開始日
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,メンテナンス訪問
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,メンテナンス訪問
 DocType: Leave Type,Is Encash,現金化済
 DocType: Purchase Invoice,Mobile No,携帯番号
 DocType: Payment Tool,Make Journal Entry,仕訳を作成
@@ -2960,35 +2723,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,プロジェクトごとのデータは、引用符は使用できません
 DocType: Project,Expected End Date,終了予定日
 DocType: Appraisal Template,Appraisal Template Title,査定テンプレートタイトル
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,営利企業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,営利企業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,親項目 {0} は在庫アイテムにはできません
 DocType: Cost Center,Distribution Id,配布ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,素晴らしいサービス
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,全ての製品またはサービス。
 DocType: Purchase Invoice,Supplier Address,サプライヤー住所
-DocType: Contact Us Settings,Address Line 2,住所2行目
-DocType: ToDo,Reference,リファレンス
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,穿孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,出量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,シリーズは必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融サービス
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融サービス
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},属性 {0} の値は、{3}の単位で {1} から {2}の範囲内でなければなりません
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の葉
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,貸方
 DocType: Customer,Default Receivable Accounts,デフォルト売掛金勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,ソーイング
 DocType: Tax Rule,Billing State,請求状況
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ラミネート
 DocType: Item Reorder,Transfer,移転
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,焼結
 DocType: Journal Entry,Pay To / Recd From,支払先／受領元
 DocType: Naming Series,Setup Series,シリーズ設定
 DocType: Supplier,Contact HTML,連絡先HTML
@@ -2999,9 +2756,8 @@
 DocType: Company,Retail,小売
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,顧客{0}は存在しません
 DocType: Attendance,Absent,欠勤
-DocType: Product Bundle,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,製品付属品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無効参照{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,つぶし加工
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
 DocType: GL Entry,Remarks,備考
@@ -3009,48 +2765,44 @@
 DocType: Journal Entry,Write Off Based On,償却基準
 DocType: Features Setup,POS View,POS表示
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,シリアル番号の設置レコード
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連続鋳造
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,指定してください
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,上記
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷間サイジング
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,アカウント{0}はグループにすることはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,地域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
 DocType: Holiday List,Weekly Off,週休
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","例：2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),暫定損益（貸方）
 DocType: Sales Invoice,Return Against Sales Invoice,請求書に対する返品
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,アイテム5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},会社{1}のデフォルト値{0}を設定してください
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},会社{1}のデフォルト値{0}を設定してください
 DocType: Serial No,Creation Time,作成時間
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,総収入
 DocType: Sales Invoice,Product Bundle Help,製品付属品ヘルプ
 ,Monthly Attendance Sheet,月次勤務表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,レコードが見つかりません
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,製品バンドルからアイテムを取得します。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,アカウント{0}はアクティブではありません
 DocType: GL Entry,Is Advance,前払金
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,出勤開始日と出勤日は必須です
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,「下請」にはYesかNoを入力してください
 DocType: Sales Team,Contact No.,連絡先番号
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,開いているエントリでは「損益」タイプアカウント{0}は許可されていません
-DocType: Workflow State,Time,時間
 DocType: Features Setup,Sales Discounts,販売割引
 DocType: Hub Settings,Seller Country,販売者所在国
 DocType: Authorization Rule,Authorization Rule,認証ルール
 DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,販売租税公課テンプレート
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服飾
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服飾
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,注文数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,製品リストの一番上に表示されるHTML／バナー
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,出荷数量を算出する条件を指定
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,子を追加
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,アカウントの凍結と凍結エントリの編集が許可された役割
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,子ノードがあるため、コストセンターを元帳に変換することはできません
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,変換係数が必要です
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,シリアル番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,販売手数料
 DocType: Offer Letter Term,Value / Description,値／説明
@@ -3058,15 +2810,13 @@
 ,Customers Not Buying Since Long Time,長期間受注の無い顧客
 DocType: Production Order,Expected Delivery Date,配送予定日
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,バルジ加工
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,消失模型鋳造法
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,交際費
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、請求書{0}がキャンセルされていなければなりません
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,年齢
 DocType: Time Log,Billing Amount,請求額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,アイテム{0}に無効な量が指定されています。数量は0以上でなければなりません。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,休暇申請
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,既存の取引を持つアカウントを削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,訴訟費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",自動注文を生成する日付（例：05、28など）
 DocType: Sales Invoice,Posting Time,投稿時間
@@ -3080,26 +2830,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新規顧客の収益
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,旅費交通費
 DocType: Maintenance Visit,Breakdown,故障
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,アカウント：{0} で通貨：{1}を選択することはできません
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ホーニング加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,試用
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
-DocType: Feed,Full Name,氏名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,クリンチ加工
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,試用
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,在庫アイテムにはデフォルト倉庫が必須です。
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月の給与支払
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,支出額合計
 ,Transferred Qty,移転数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ナビゲート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,計画
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,計画
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,時間ログバッチを作成
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,課題
 DocType: Project,Total Billing Amount (via Time Logs),総請求金額（時間ログ経由）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,このアイテムを売る
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,このアイテムを売る
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,サプライヤーID
 DocType: Journal Entry,Cash Entry,現金エントリー
 DocType: Sales Partner,Contact Desc,連絡先説明
@@ -3108,18 +2855,16 @@
 DocType: Brand,Item Manager,アイテムマネージャ
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,アカウントの年間予算を設定するために行を追加
 DocType: Buying Settings,Default Supplier Type,デフォルトサプライヤータイプ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,営業費合計
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注：アイテム{0}が複数回入力されています
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,全ての連絡先。
 DocType: Newsletter,Test Email Id,テスト用メールアドレス
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,会社略称
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,会社略称
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,品質検査に従う場合、アイテムの品質保証が必要となり領収書の品質保証番号が有効になります
 DocType: GL Entry,Party Type,当事者タイプ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,原材料は、メインアイテムと同じにすることはできません
 DocType: Item Attribute Value,Abbreviation,略語
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0}の限界を超えているので認証されません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,回転成形
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,給与テンプレートマスター
 DocType: Leave Type,Max Days Leave Allowed,休暇割当最大日数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,ショッピングカート用の税ルールを設定
@@ -3133,15 +2878,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
 ,Territory Target Variance Item Group-Wise,地域ターゲット差違（アイテムグループごと）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,全ての顧客グループ
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}は必須です。おそらく{1}から {2}のための通貨変換レコードが作成されていません
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税テンプレートは必須です
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,アカウント{0}：親アカウント{1}が存在しません
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),価格表単価（会社通貨）
 DocType: Account,Temporary,仮勘定
 DocType: Address,Preferred Billing Address,優先請求先住所
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘書
 DocType: Serial No,Distinct unit of an Item,アイテムの明確な単位
 DocType: Pricing Rule,Buying,購入
 DocType: HR Settings,Employee Records to be created by,従業員レコード作成元
@@ -3154,42 +2899,37 @@
 ,Item-wise Price List Rate,アイテムごとの価格表単価
 DocType: Purchase Order Item,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,しごき加工
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}は停止しています
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,送料を追加するためのルール
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,今後のイベント
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です
-DocType: Letter Head,Letter Head,レターヘッド
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,クイック入力
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です
 DocType: Purchase Order,To Receive,受領する
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,焼き嵌め
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,収益/費用
 DocType: Employee,Personal Email,個人メールアドレス
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,派生の合計
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,派生の合計
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",有効にすると、システムは自動的に在庫の会計エントリーを投稿します
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,証券仲介
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,証券仲介
 DocType: Address,Postal Code,郵便番号
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",「時間ログ」からアップデートされた分数
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,製造の指示
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Hub Settings,Name Token,名前トークン
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,プレーニング
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,標準販売
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,標準販売
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,倉庫は少なくとも1つ必須です
 DocType: Serial No,Out of Warranty,保証外
 DocType: BOM Replace Tool,Replace,置き換え
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},納品書{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},納品書{1}に対する{0}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,デフォルトの単位を入力してください
 DocType: Purchase Invoice Item,Project Name,プロジェクト名
 DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
-DocType: Workflow State,Edit,編集
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Features Setup,Item Batch Nos,アイテムバッチ番号
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
@@ -3197,13 +2937,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,支払照合 支払
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,税金資産
 DocType: BOM Item,BOM No,部品表番号
-DocType: Contact Us Settings,Pincode,郵便番号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,仕訳{0}は、勘定{1}が無いか、既に他の伝票に照合されています
 DocType: Item,Moving Average,移動平均
 DocType: BOM Replace Tool,The BOM which will be replaced,交換される部品表
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新しい在庫単位は現在の在庫単位とは異なる必要があります
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,休暇は0.5の倍数で割り当てられなければなりません
 DocType: Production Order,Operation Cost,作業費用
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,CSVファイルで出勤アップロード
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,未払額
@@ -3220,10 +2958,7 @@
 DocType: Project,Default Cost Center,デフォルトコストセンター
 DocType: Purchase Invoice,End Date,終了日
 DocType: Employee,Internal Work History,内部作業履歴
-DocType: DocField,Column Break,列区切り
-DocType: Event,Thursday,木曜日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,未公開株式
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ターニング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,未公開株式
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
 DocType: Sales Invoice,Exhibition,展示会
@@ -3236,31 +2971,30 @@
 DocType: Employee,Held On,開催
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生産アイテム
 ,Employee Information,従業員の情報
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),割合（％）
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),割合（％）
 DocType: Stock Entry Detail,Additional Cost,追加費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,会計年度終了日
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),無給休暇（LWP）の所得減
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,臨時休暇
 DocType: Batch,Batch ID,バッチID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注：{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,今週のまとめ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}の{0}は仕入または下請アイテムでなければなりません
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
 DocType: GL Entry,Party,当事者
 DocType: Sales Order,Delivery Date,納期
-DocType: DocField,Currency,通貨
 DocType: Opportunity,Opportunity Date,機会日付
 DocType: Purchase Receipt,Return Against Purchase Receipt,領収書に対する返品
 DocType: Purchase Order,To Bill,請求先
 DocType: Material Request,% Ordered,％注文済
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,出来高制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,出来高制
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均購入レート
 DocType: Task,Actual Time (in Hours),実際の時間（時）
 DocType: Employee,History In Company,会社での履歴
@@ -3277,77 +3011,68 @@
 DocType: Opportunity,To Discuss,連絡事項
 DocType: SMS Settings,SMS Settings,SMS設定
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,仮勘定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Account,Auditor,監査人
 DocType: Purchase Order,End date of current order's period,現在の注文の期間の終了日
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,雇用契約書を作成
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,返品
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
-DocType: DocField,Fold,フォールド
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,バリエーションのデフォルトの数量単位はテンプレートと同じでなければなりません
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
 DocType: Project Task,Pending Review,レビュー待ち
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,指定してください
 DocType: Task,Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,顧客ID
-DocType: Page,Page Name,ページ名
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,終了時間は開始時間より大きくなければなりません
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,受注{0}は提出されていません
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：親口座{1}は会社{2}に属していません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,スピンドル仕上げ
 DocType: BOM,Last Purchase Rate,最新の仕入料金
 DocType: Account,Asset,資産
 DocType: Project Task,Task ID,タスクID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例「MC」
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例「MC」
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,バリエーションを有しているのでアイテム{0}の在庫は存在させることができません
 ,Sales Person-wise Transaction Summary,各営業担当者の取引概要
-DocType: System Settings,Time Zone,時間帯
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,倉庫{0}は存在しません
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hubに登録する
 DocType: Monthly Distribution,Monthly Distribution Percentages,月次配分割合
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,選択した項目はバッチを持てません
 DocType: Delivery Note,% of materials delivered against this Delivery Note,％の資材が納品済（この納品書を対象）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,ステープリング
 DocType: Customer,Customer Details,顧客の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,形削り
 DocType: Employee,Reports to,レポート先
 DocType: SMS Settings,Enter url parameter for receiver nos,受信者番号にURLパラメータを入力してください
 DocType: Sales Invoice,Paid Amount,支払金額
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',決算{0}はタイプ「負債」でなければなりません
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",口座残高がすでに借方に存在しており、「残高仕訳先」を「貸方」に設定することはできません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,顧客に基づくフィルター
 DocType: Payment Tool Detail,Against Voucher No,対伝票番号
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 DocType: Tax Rule,Purchase,仕入
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,残高数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,残高数量
 DocType: Item Group,Parent Item Group,親項目グループ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for  {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,コストセンター
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,倉庫。
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,倉庫。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,サプライヤの通貨が会社の基本通貨に換算されるレート
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行 {0}：行{1}と時間が衝突しています
 DocType: Opportunity,Next Contact,次の連絡先
 DocType: Employee,Employment Type,雇用の種類
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資産
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,アプリケーション期間は2 alocationレコードを横断することはできません
 DocType: Item Group,Default Expense Account,デフォルト経費
 DocType: Employee,Notice (days),お知らせ（日）
-DocType: Page,Yes,はい
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
 DocType: Employee,Encashment Date,現金化日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,電鋳
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",対伝票タイプは発注・請求書・仕訳のいずれかでなければなりません
 DocType: Account,Stock Adjustment,在庫調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},デフォルトの活動コストが活動タイプ -  {0} に存在します
 DocType: Production Order,Planned Operating Cost,予定営業費用
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,新しい{0}の名前
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},添付{0} を確認してください ＃{1}
 DocType: Job Applicant,Applicant Name,申請者名
 DocType: Authorization Rule,Customer / Item Name,顧客／アイテム名
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3360,7 +3085,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},アイテム{0}にはシリアル番号が必須です
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,範囲の開始／終了を指定してください
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,によって作成された
 DocType: Serial No,Under AMC,AMC（年間保守契約）下
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価額は陸揚費用の伝票額を考慮して再計算されています
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,販売取引のデフォルト設定
@@ -3372,17 +3096,16 @@
 DocType: Payment Reconciliation,Minimum Amount,最低額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,完成品更新
 DocType: Workstation,per hour,毎時
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},シリーズは、{0}はすでに{1}で使用されています
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,倉庫（継続記録）のアカウントは、このアカウントの下に作成されます。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,支払額
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,発送
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,プロジェクトマネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％
 DocType: Customer,Default Taxes and Charges,デフォルト租税公課
 DocType: Account,Receivable,売掛金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
 DocType: Sales Invoice,Supplier Reference,サプライヤーリファレンス
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",チェックすると、部分組立品アイテムの「部品表」に原材料が組み込まれます。そうでなければ、全ての部分組立品アイテムが原材料として扱われます。
@@ -3390,8 +3113,8 @@
 DocType: Hub Settings,Seller Description,販売者の説明
 DocType: Employee Education,Qualification,資格
 DocType: Item Price,Item Price,アイテム価格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,石鹸＆洗剤
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,映画＆ビデオ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,石鹸＆洗剤
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,映画＆ビデオ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
@@ -3400,7 +3123,6 @@
 DocType: BOM,Rate Of Materials Based On,資材単価基準
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,サポート分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},倉庫{0}に「会社」がありません
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,在庫単位置換ユーティリティ
 DocType: POS Profile,Terms and Conditions,規約
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},開始日は会計年度内でなければなりません（もしかして：{0}）
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",ここでは、身長、体重、アレルギー、医療問題などを保持することができます
@@ -3412,7 +3134,7 @@
 DocType: Sales Order Item,For Production,生産用
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,上記の表に受注を入力してください
 DocType: Project Task,View Task,タスク表示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,会計年度開始日
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,会計年度開始日
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,領収書を入力してください
 DocType: Sales Invoice,Get Advances Received,前受金を取得
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
@@ -3420,20 +3142,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),サポートメールを受信するサーバのメールIDをセットアップします。 （例 support@example.com）
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Salary Slip,Salary Slip,給料明細
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,バニシング加工
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,「終了日」が必要です
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,「終了日」が必要です
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",納品する梱包の荷造伝票を生成します。パッケージ番号、内容と重量を通知するために使用します。
 DocType: Sales Invoice Item,Sales Order Item,受注項目
 DocType: Salary Slip,Payment Days,支払日
 DocType: BOM,Manage cost of operations,作業費用を管理
 DocType: Features Setup,Item Advanced,アイテム詳細設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,熱間圧延
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",チェックされた取引を「送信済」にすると、取引に関連付けられた「連絡先」あてのメールが、添付ファイル付きで、画面にポップアップします。ユーザーはメールを送信するか、キャンセルするかを選ぶことが出来ます。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,共通設定
 DocType: Employee Education,Employee Education,従業員教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
 DocType: Salary Slip,Net Pay,給与総計
 DocType: Account,Account,アカウント
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,シリアル番号{0}はすでに受領されています
@@ -3442,35 +3162,28 @@
 DocType: Customer,Sales Team Details,営業チームの詳細
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,潜在的販売機会
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病欠
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},無効な{0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,病欠
 DocType: Email Digest,Email Digest,メールダイジェスト
 DocType: Delivery Note,Billing Address Name,請求先住所の名前
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,デパート
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,システム残高
-DocType: Workflow,Is Active,アクティブ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,デパート
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,システム残高
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,先に文書を保存してください
 DocType: Account,Chargeable,請求可能
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,グレイニング
 DocType: Company,Change Abbreviation,略語を変更
-DocType: Workflow State,Primary,プライマリー
 DocType: Expense Claim Detail,Expense Date,経費日付
 DocType: Item,Max Discount (%),最大割引（％）
-DocType: Communication,More Information,詳細
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,最新の注文額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ブラスト加工
 DocType: Company,Warn,警告する
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,アイテムの評価を更新しました
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
 DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Order,Raw Materials Supplied,原材料供給
 DocType: Purchase Invoice,Recurring Print Format,繰り返し用印刷フォーマット
-DocType: Communication,Series,シリーズ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,納品予定日は発注日より前にすることはできません
 DocType: Appraisal,Appraisal Template,査定テンプレート
-DocType: Communication,Email,メール
 DocType: Item Group,Item Classification,アイテム分類
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ビジネス開発マネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ビジネス開発マネージャー
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,メンテナンス訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期間
 ,General Ledger,総勘定元帳
@@ -3480,9 +3193,7 @@
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,{0}を選択してください
 DocType: Features Setup,To get Item Group in details table,詳細テーブルのアイテムグループを取得する
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,再描画
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,エッチング
 DocType: Sales Invoice,Commission,歩合
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3508,7 +3219,7 @@
  {％email_id％}電子メールの場合：{{email_id}}＆LT; BRの＆GT ; {％endifの - ％} 
  </ code>を</ PRE>"
 DocType: Salary Slip Deduction,Default Amount,デフォルト額
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,システムに倉庫がありません。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,システムに倉庫がありません。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,今月の概要
 DocType: Quality Inspection Reading,Quality Inspection Reading,品質検査報告要素
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
@@ -3527,13 +3238,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 DocType: Supplier,Address and Contacts,住所・連絡先
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます
 DocType: Payment Tool,Get Outstanding Vouchers,未払伝票を取得
 DocType: Warranty Claim,Resolved By,課題解決者
 DocType: Appraisal,Start Date,開始日
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,値
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,期間に休暇を割り当てる。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,クリックして認証
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
@@ -3543,55 +3253,43 @@
 DocType: Item,Average time taken by the supplier to deliver,サプライヤー配送平均時間
 DocType: Time Log,Hours,時間
 DocType: Project,Expected Start Date,開始予定日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,圧延
-DocType: ToDo,Priority,優先度
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,料金がそのアイテムに適用できない場合は、アイテムを削除する
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropboxのアクセス許可
-DocType: Dropbox Backup,Weekly,毎週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例「smsgateway.com/api/send_sms.cgi」
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,受信
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,受信
 DocType: Maintenance Visit,Fully Completed,全て完了
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完了
 DocType: Employee,Educational Qualification,学歴
 DocType: Workstation,Operating Costs,営業費用
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} はニュースレターのリストに正常に追加されました
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子ビーム加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,メインレポート
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,在庫元帳エントリ残高を更新しました
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,メインレポート
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,価格の追加/編集
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,コストセンターの表
 ,Requested Items To Be Ordered,発注予定の要求アイテム
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,自分の注文
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,自分の注文
 DocType: Price List,Price List Name,価格表名称
 DocType: Time Log,For Manufacturing,製造用
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,合計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,合計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,納品予定の注文済アイテム
 DocType: Account,Income,収入
-,Setup Wizard,セットアップウィザード
 DocType: Industry Type,Industry Type,業種タイプ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,問題発生！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完了日
 DocType: Purchase Invoice Item,Amount (Company Currency),額（会社通貨）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ダイカスト
-DocType: Email Alert,Reference Date,参照日
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,組織単位（部門）マスター。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,有効な携帯電話番号を入力してください
 DocType: Budget Detail,Budget Detail,予算の詳細
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,メッセージを入力してください
-DocType: Async Task,Status,ステータス
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},アイテム{0}の在庫数量単位を更新しました
-DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,POSプロフィール
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMSの設定を更新してください
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,時間ログ{0}は請求済です
@@ -3604,55 +3302,52 @@
 ,Serial No Service Contract Expiry,シリアル番号（サービス契約の有効期限）
 DocType: Item,Unit of Measure Conversion,数量単位変換
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,従業員を変更することはできません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
 DocType: Naming Series,Help HTML,HTMLヘルプ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0}以上の引当金は、アイテム {1}と相殺されています
 DocType: Address,Name of person or organization that this address belongs to.,このアドレスが所属する個人または組織の名前。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,サプライヤー
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,サプライヤー
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,従業員{1}のための別の給与体系{0}がアクティブです。ステータスを「非アクティブ」にして続行してください。
 DocType: Purchase Invoice,Contact,連絡先
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,から受け取りました
 DocType: Features Setup,Exports,エクスポート
 DocType: Lead,Converted,変換済
 DocType: Item,Has Serial No,シリアル番号あり
 DocType: Employee,Date of Issue,発行日
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}： {1}のための{0}から
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：項目の設定サプライヤー{1}
 DocType: Issue,Content Type,コンテンツタイプ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,コンピュータ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,アイテム：{0}はシステムに存在しません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Cost Center,Budgets,予算
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,更新済
 DocType: Employee,Emergency Contact Details,緊急連絡先の詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,これは何？
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,これは何？
 DocType: Delivery Note,To Warehouse,倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},アカウント{0}は会計年度の{1}を複数回入力されました
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電気
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,電気
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},従業員{0}のユーザーIDが未設定です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,ピーニング
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,保証請求元
 DocType: Stock Entry,Default Source Warehouse,デフォルトの出庫元倉庫
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}のための誕生日リマインダー
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,ラッピング
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,最新注文からの日数
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
-DocType: User,Enabled,有効
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,在庫資産
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},{0}年{1}の月のすべての給与伝票を登録しますか？
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,登録者インポート
@@ -3660,19 +3355,18 @@
 DocType: Attendance,Present,出勤
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,納品書{0}は提出済にすることはできません
 DocType: Notification Control,Sales Invoice Message,請求書メッセージ
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,アカウント{0}を閉じると、型責任/エクイティのものでなければなりません
 DocType: Authorization Rule,Based On,参照元
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,項目{0}が無効になっています
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,項目{0}が無効になっています
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},からと期間、繰り返しのために必須の日付までの期間{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,プロジェクト活動／タスク
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,給与明細を生成
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}は有効なメールアドレスではありません
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",適用のためには次のように選択されている場合の購入は、チェックする必要があります{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,割引は100未満でなければなりません
-DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,スピニング加工
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
@@ -3694,7 +3388,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,キャンペーン名が必要です
 DocType: Maintenance Visit,Maintenance Date,メンテナンス日
 DocType: Purchase Receipt Item,Rejected Serial No,拒否されたシリアル番号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深絞り
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新しいニュースレター
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,残高表示
@@ -3706,7 +3399,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,リベット
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
 ,Sales Analytics,販売分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -3718,28 +3410,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新しいアカウント名
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原材料供給費用
 DocType: Selling Settings,Settings for Selling Module,販売モジュール設定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顧客サービス
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顧客サービス
 DocType: Item,Thumbnail,サムネイル
 DocType: Item Customer Detail,Item Customer Detail,アイテム顧客詳細
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,メール確認
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,雇用候補者
 DocType: Notification Control,Prompt for Email on Submission of,提出するメールの指定
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,総割り当てられた葉は期間中の日数以上のもの
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,デフォルト作業中倉庫
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,会計処理のデフォルト設定。
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0}が必要です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成形
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
-DocType: Contact Us Settings,City,都市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超音波加工
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,エラー：有効なIDではない？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,アイテム{0}は販売アイテムでなければなりません
 DocType: Naming Series,Update Series Number,シリーズ番号更新
 DocType: Account,Equity,株式
 DocType: Sales Order,Printing Details,印刷詳細
 DocType: Task,Closing Date,締切日
 DocType: Sales Order Item,Produced Quantity,生産数量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,エンジニア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,エンジニア
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,組立部品を検索
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
 DocType: Sales Partner,Partner Type,パートナーの種類
@@ -3747,35 +3435,32 @@
 DocType: Authorization Rule,Customerwise Discount,顧客ごと割引
 DocType: Purchase Invoice,Against Expense Account,対経費
 DocType: Production Order,Production Order,製造指示
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,設置票{0}はすでに提出されています
 DocType: Quotation Item,Against Docname,文書名に対して
 DocType: SMS Center,All Employee (Active),全ての従業員（アクティブ）
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,"表示
-"
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,表示
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,請求書が自動的に生成される期間を選択
 DocType: BOM,Raw Material Cost,原材料費
 DocType: Item,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ガントチャート
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,シリーズ更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,レポートタイプは必須です
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,レポートタイプは必須です
 DocType: Item,Serial Number Series,シリアル番号シリーズ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},列{1}の在庫アイテム{0}には倉庫が必須です。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,小売・卸売
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,最初のユーザー：あなたです。
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,最初のユーザー：あなたです。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,照合完了
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,照合完了
 DocType: Production Order,Planned End Date,計画終了日
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,アイテムが保存される場所
 DocType: Tax Rule,Validity,正当性
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,請求された額
 DocType: Attendance,Attendance,出勤
-DocType: Page,No,いいえ
 DocType: BOM,Materials,資材
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",チェックされていない場合、リストを適用先の各カテゴリーに追加しなくてはなりません
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,転記日時は必須です
@@ -3783,55 +3468,46 @@
 ,Item Prices,アイテム価格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,発注を保存すると表示される表記内。
 DocType: Period Closing Voucher,Period Closing Voucher,決算伝票
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,価格表マスター
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,価格表マスター
 DocType: Task,Review Date,レビュー日
 DocType: Purchase Invoice,Advance Payments,前払金
-DocType: DocPerm,Level,レベル
 DocType: Purchase Taxes and Charges,On Net Total,差引計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0}列のターゲット倉庫は製造注文と同じでなければなりません。
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,支払ツールを使用する権限がありません
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,フライス加工
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,支払ツールを使用する権限がありません
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,%s の繰り返しに「通知メールアドレス」が指定されていません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,他の通貨を使用してエントリーを作成した後には通貨を変更することができません
 DocType: Company,Round Off Account,丸め誤差アカウント
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,ニブリング加工
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,一般管理費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,コンサルティング
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,コンサルティング
 DocType: Customer Group,Parent Customer Group,親顧客グループ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,変更
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 DocType: Appraisal Goal,Score Earned,スコア獲得
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例「マイカンパニーLLC」
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期間
 DocType: Bank Reconciliation Detail,Voucher ID,伝票ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,ルート（大元の）地域なので編集できません
 DocType: Packing Slip,Gross Weight UOM,総重量数量単位
 DocType: Email Digest,Receivables / Payables,売掛／買掛
 DocType: Delivery Note Item,Against Sales Invoice,対納品書
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,スタンピング成形
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用取引
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造／再梱包した後に得られたアイテムの数量
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 DocType: Task,Actual End Date (via Time Logs),実際の終了日（時間ログ経由）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,親コストセンターを入力してください
 DocType: Delivery Note,Print Without Amount,金額なしで印刷
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
-DocType: User,Last Name,お名前（姓）
-DocType: Web Page,Left,退職
-DocType: Event,All Day,一日中
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
 DocType: Issue,Support Team,サポートチーム
 DocType: Appraisal,Total Score (Out of 5),総得点（5点満点）
-DocType: Contact Us Settings,State,状態
 DocType: Batch,Batch,バッチ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,残高
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,残高
 DocType: Project,Total Expense Claim (via Expense Claims),総経費請求（経費請求経由）
-DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,借方票
 DocType: Stock Entry,As per Stock UOM,在庫の数量単位ごと
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,有効期限が切れていません
@@ -3845,44 +3521,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,値に基づいて取引を制限するルールを作成
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
 DocType: Purchase Invoice,Total Advance,前払金計
-DocType: Workflow State,User,ユーザー
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,給与計算
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,失注として設定
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,支払領収書の注意
 DocType: Customer,Credit Days Based On,与信日数基準
 DocType: Tax Rule,Tax Rule,税ルール
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,販売サイクル全体で同じレートを維持
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの労働時間外のタイムログを計画します。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}は提出済です
 ,Items To Be Requested,要求されるアイテム
-DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Time Log,Billing Rate based on Activity Type (per hour),行動タイプ（毎時）に基づく請求単価
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,シーミング
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",会社メールアドレスが見つかなかったため、送信されませんでした。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 DocType: Production Planning Tool,Filter based on item,項目に基づくフィルター
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,デビットアカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Sales Invoice,Rounded Total (Company Currency),合計（四捨五入）（会社通貨）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,会計タイプが選択されているため、グループに変換することはできません
 DocType: Purchase Common,Purchase Common,仕入（共通）
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}が変更されています。画面を更新してください。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,以下の日にはユーザーからの休暇申請を受け付けない
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,機会から
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,剪断
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,従業員給付
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},梱包済数量は、行{1}のアイテム{0}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}は存在しません
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,顧客あて請求
-DocType: DocField,Default,初期値
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}登録者追加済
 DocType: Maintenance Schedule,Schedule,スケジュール
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",このコストセンターの予算を定義します。予算のアクションを設定するには、「会社リスト」を参照してください
@@ -3893,70 +3565,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Expense Claim,Approved,承認済
 DocType: Pricing Rule,Price,価格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",「はい」を選択すると、シリアル番号のマスターで表示することができます。このアイテムの各内容に固有のIDを提供します。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
 DocType: Address,Office,事務所
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準レポート
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫からの利用可能な数量
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,先に従業員レコードを選択してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,税勘定を作成
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,経費勘定を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
 DocType: Employee,Current Address,現住所
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入／製造の詳細
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,バッチ目録
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,バッチ目録
 DocType: Employee,Contract End Date,契約終了日
 DocType: Sales Order,Track this Sales Order against any Project,任意のプロジェクトに対して、この受注を追跡します
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,上記の基準に基づいて（配送するために保留中の）受注を取り込む
-DocType: DocShare,Document Type,文書タイプ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,サプライヤー見積から
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,サプライヤー見積から
 DocType: Deduction Type,Deduction Type,控除の種類
 DocType: Attendance,Half Day,半日
 DocType: Pricing Rule,Min Qty,最小数量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",バッチ番号とともに販売・購入文書内のアイテムを追跡します。 「優先業種：化学」
 DocType: GL Entry,Transaction Date,取引日
 DocType: Production Plan Item,Planned Qty,計画数量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,税合計
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,税合計
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,数量（製造数量）が必須です
 DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),差引計（会社通貨）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金勘定に対してのみ適用されます
 DocType: Notification Control,Purchase Receipt Message,領収書のメッセージ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,総割り当てられた葉は期間以上あります
 DocType: Production Order,Actual Start Date,実際の開始日
 DocType: Sales Order,% of materials delivered against this Sales Order,％の資材が納品済（この受注を対象）
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,レコードアイテムの移動
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ニュースレターリスト購読者
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,ホゾ穴加工
-DocType: Email Account,Service,サービス
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリは、すでに同社{1}の通貨{0}で行われています。通貨{0}と債権又は債務のアカウントを選択してください。
 ,Monthly Salary Register,月給登録
-apps/frappe/frappe/website/template.py +140,Next,次
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
 DocType: BOM Operation,BOM Operation,部品表の操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解研磨
 DocType: Purchase Taxes and Charges,On Previous Row Amount,前行の額
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,支払額は少なくとも1行入力してください
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,支払額は少なくとも1行入力してください
 DocType: POS Profile,POS Profile,POSプロフィール
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：支払金額は残高を超えることはできません
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,未払合計
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,未払合計
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間ログは請求できません
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,購入者
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,購入者
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,給与をマイナスにすることはできません
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,伝票を入力してください
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,伝票を入力してください
 DocType: SMS Settings,Static Parameters,静的パラメータ
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
@@ -3965,14 +3630,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,連絡先にまとめてSMSを送信
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,税金・料金を考慮
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,クロス圧延加工
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,クレジットカード
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,クレジットカード
 DocType: BOM,Item to be manufactured or repacked,製造または再梱包するアイテム
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,在庫取引のデフォルト設定
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,在庫取引のデフォルト設定
 DocType: Purchase Invoice,Next Date,次の日
 DocType: Employee Education,Major/Optional Subjects,大手/オプション科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,租税公課を入力してください
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,機械加工
 DocType: Sales Invoice Item,Drop Ship,ドロップシップ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ここでは、親、配偶者や子供の名前と職業などの家族の詳細を保持することができます
 DocType: Hub Settings,Seller Name,販売者名
@@ -3982,47 +3645,44 @@
 DocType: Stock Entry,Repack,再梱包
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,続行する前に、フォームを保存してください
 DocType: Item Attribute,Numeric Values,数値
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ロゴを添付
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,ロゴを添付
 DocType: Customer,Commission Rate,手数料率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,部門別休暇申請
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,カートは空です
 DocType: Production Order,Actual Operating Cost,実際の営業費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ルートを編集することはできません
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,割当額を未調整額より多くすることはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ルートを編集することはできません
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,割当額を未調整額より多くすることはできません
 DocType: Manufacturing Settings,Allow Production on Holidays,休日に製造を許可
 DocType: Sales Order,Customer's Purchase Order Date,顧客の発注日
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,株式資本
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,csvファイルを選択してください
-DocType: Dropbox Backup,Send Backups to Dropbox,Dropboxにバックアップを送信
 DocType: Purchase Order,To Receive and Bill,受領・請求する
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,デザイナー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,デザイナー
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,規約のテンプレート
 DocType: Serial No,Delivery Details,納品詳細
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Item,Automatically create Material Request if quantity falls below this level,量がこのレベルを下回った場合、自動的に資材要求を作成します
 ,Item-wise Purchase Register,アイテムごとの仕入登録
 DocType: Batch,Expiry Date,有効期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",再注文のレベルを設定するには、アイテムは、購買アイテムや製造項目でなければなりません
 ,Supplier Addresses and Contacts,サプライヤー住所・連絡先
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +18,Project master.,プロジェクトマスター
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,部品表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
-DocType: Dropbox Backup,Send Notifications To,通知送信先
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参照日付
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,参照日付
 DocType: Employee,Reason for Leaving,退職理由
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,アカウント{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,アカウント{0}は存在しません
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,ウェブサイトや他の出版物のための略歴
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},従業員{0}の給与構造を作成してください

diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index fefe8ce..023fc5c 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv

@@ -1,597 +1,536 @@
-DocType: Employee,Salary Mode,របៀបប្រាក់បៀវត្ស
-DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ជ្រើសចែកចាយប្រចាំខែ, ប្រសិនបើអ្នកចង់តាមដានដោយផ្អែកលើរដូវកាល។"
-DocType: Employee,Divorced,លែងលះគ្នា
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ព្រមាន &amp; ‧;: ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ធាតុដែលបានធ្វើសមកាលកម្មរួចទៅហើយ
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,អនុញ្ញាតឱ្យធាតុនឹងត្រូវបានបន្ថែមជាច្រើនដងនៅក្នុងប្រតិបត្តិការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ផលិតផលទំនិញប្រើប្រាស់
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,សូមជ្រើសប្រភេទបក្សទីមួយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
-DocType: Item,Customer Items,ធាតុអតិថិជន
-DocType: Item,Publish Item to hub.erpnext.com,បោះពុម្ពផ្សាយធាតុទៅ hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ការជូនដំណឹងអ៊ីមែល
-DocType: Item,Default Unit of Measure,អង្គភាពលំនាំដើមនៃវិធានការ
-DocType: SMS Center,All Sales Partner Contact,ទាំងអស់ដៃគូទំនាក់ទំនងលក់
-DocType: Employee,Leave Approvers,ទុកឱ្យការអនុម័ត
-DocType: Sales Partner,Dealer,អ្នកចែកបៀ
+DocType: Employee,Salary Mode,របៀបប្រាក់បៀវត្ស
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ជ្រើសចែកចាយប្រចាំខែ, ប្រសិនបើអ្នកចង់តាមដានដោយផ្អែកលើរដូវកាល។"
+DocType: Employee,Divorced,លែងលះគ្នា
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,ព្រមាន &amp; ‧;: ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ធាតុដែលបានធ្វើសមកាលកម្មរួចទៅហើយ
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,អនុញ្ញាតឱ្យធាតុនឹងត្រូវបានបន្ថែមជាច្រើនដងនៅក្នុងប្រតិបត្តិការ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ផលិតផលទំនិញប្រើប្រាស់
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,សូមជ្រើសប្រភេទបក្សទីមួយ
+DocType: Item,Customer Items,ធាតុអតិថិជន
+DocType: Item,Publish Item to hub.erpnext.com,បោះពុម្ពផ្សាយធាតុទៅ hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,ការជូនដំណឹងអ៊ីមែល
+DocType: Item,Default Unit of Measure,អង្គភាពលំនាំដើមនៃវិធានការ
+DocType: SMS Center,All Sales Partner Contact,ទាំងអស់ដៃគូទំនាក់ទំនងលក់
+DocType: Employee,Leave Approvers,ទុកឱ្យការអនុម័ត
+DocType: Sales Partner,Dealer,អ្នកចែកបៀ
 DocType: Employee,Rented,ជួល
-DocType: About Us Settings,Website,វេបសាយ
-DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,បង្រួមបូក sintering
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
-DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ពីសម្ភារៈស្នើសុំ
-DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
-apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,មិនមានលទ្ធផលជាច្រើនទៀត។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ផ្នែកច្បាប់
+DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
+DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ពីសម្ភារៈស្នើសុំ
+DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,មិនមានលទ្ធផលជាច្រើនទៀត។
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ផ្នែកច្បាប់
 DocType: C-Form,Customer,អតិថិជន
-DocType: Purchase Receipt Item,Required By,ដែលបានទាមទារដោយ
-DocType: Delivery Note,Return Against Delivery Note,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការផ្តល់ចំណាំ
+DocType: Purchase Receipt Item,Required By,ដែលបានទាមទារដោយ
+DocType: Delivery Note,Return Against Delivery Note,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការផ្តល់ចំណាំ
 DocType: Department,Department,នាយកដ្ឋាន
 DocType: Purchase Order,% Billed,% billed
-DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ទាក់ទងនឹងការនាំចេញទាំងអស់គ្នាប្រៀបដូចជាវាលរូបិយប័ណ្ណអត្រានៃការប្តូសរុបនៃការនាំចេញការនាំចេញលសរុបគឺមាននៅក្នុងការចំណាំដឹកជញ្ជូនម៉ាស៊ីនឆូតកាត, សម្រង់, ការលក់វិក័យប័ត្រ, ការលក់លំដាប់ល"
-DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ក្បាល (ឬក្រុម) ប្រឆាំងនឹងធាតុគណនេយ្យនិងតុល្យភាពត្រូវបានធ្វើឡើងត្រូវបានរក្សា។
-DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
-DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ការ stitches
-DocType: Pricing Rule,Apply On,អនុវត្តនៅលើ
-DocType: Item Price,Multiple Item prices.,តម្លៃធាតុជាច្រើន។
-,Purchase Order Items To Be Received,ការបញ្ជាទិញធាតុដែលនឹងត្រូវទទួលបាន
-DocType: SMS Center,All Supplier Contact,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
+DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ទាក់ទងនឹងការនាំចេញទាំងអស់គ្នាប្រៀបដូចជាវាលរូបិយប័ណ្ណអត្រានៃការប្តូសរុបនៃការនាំចេញការនាំចេញលសរុបគឺមាននៅក្នុងការចំណាំដឹកជញ្ជូនម៉ាស៊ីនឆូតកាត, សម្រង់, ការលក់វិក័យប័ត្រ, ការលក់លំដាប់ល"
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ក្បាល (ឬក្រុម) ប្រឆាំងនឹងធាតុគណនេយ្យនិងតុល្យភាពត្រូវបានធ្វើឡើងត្រូវបានរក្សា។
+DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
+DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
+DocType: Pricing Rule,Apply On,អនុវត្តនៅលើ
+DocType: Item Price,Multiple Item prices.,តម្លៃធាតុជាច្រើន។
+,Purchase Order Items To Be Received,ការបញ្ជាទិញធាតុដែលនឹងត្រូវទទួលបាន
+DocType: SMS Center,All Supplier Contact,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
 DocType: Quality Inspection Reading,Parameter,ប៉ារ៉ាម៉ែត្រ
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,ចាកចេញកម្មវិធីថ្មី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តីព្រាងធនាគារ
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ដើម្បីរក្សាអតិថិជនលេខកូដធាតុដែលមានប្រាជ្ញានិងដើម្បីធ្វើឱ្យពួកគេអាចស្វែងរកដោយផ្អែកលើការប្រើប្រាស់កូដរបស់ពួកគេជម្រើសនេះ
-DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
-apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
-DocType: Sales Invoice Item,Quantity,បរិមាណដែលត្រូវទទួលទាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,ចាកចេញកម្មវិធីថ្មី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,សេចក្តីព្រាងធនាគារ
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. ដើម្បីរក្សាអតិថិជនលេខកូដធាតុដែលមានប្រាជ្ញានិងដើម្បីធ្វើឱ្យពួកគេអាចស្វែងរកដោយផ្អែកលើការប្រើប្រាស់កូដរបស់ពួកគេជម្រើសនេះ
+DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
 DocType: Employee Education,Year of Passing,ឆ្នាំ Pass
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,នៅក្នុងផ្សារ
-DocType: Designation,Designation,ការរចនា
-DocType: Production Plan Item,Production Plan Item,ផលិតកម្មធាតុផែនការ
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ទម្រង់ម៉ាស៊ីនឆូតកាតថ្មីបានធ្វើឱ្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ការថែទាំសុខភាព
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,នៅក្នុងផ្សារ
+DocType: Designation,Designation,ការរចនា
+DocType: Production Plan Item,Production Plan Item,ផលិតកម្មធាតុផែនការ
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ទម្រង់ម៉ាស៊ីនឆូតកាតថ្មីបានធ្វើឱ្យ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 DocType: Purchase Invoice,Monthly,ប្រចាំខែ
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,វិក័យប័ត្រ
-DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,អាសយដ្ឋានអ៊ីម៉ែល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ការពារជាតិ
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,វិក័យប័ត្រ
+DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,អាសយដ្ឋានអ៊ីម៉ែល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារជាតិ
 DocType: Company,Abbr,Abbr
-DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5)
-DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
-apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,សូមជ្រើសតារាងតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,woodworking
-DocType: Production Order Operation,Work In Progress,ការងារក្នុងវឌ្ឍនភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,ការបោះពុម្ព 3D
-DocType: Employee,Holiday List,បញ្ជីថ្ងៃឈប់សម្រាក
-DocType: Time Log,Time Log,កំណត់ហេតុម៉ោង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,គណនេយ្យករ
-DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
-DocType: Company,Phone No,គ្មានទូរស័ព្ទ
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","កំណត់ហេតុនៃសកម្មភាពអនុវត្តដោយអ្នកប្រើប្រឆាំងនឹងភារកិច្ចដែលអាចត្រូវបានប្រើសម្រាប់តាមដានពេលវេលា, វិក័យប័ត្រ។"
-,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
-apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
-DocType: Print Settings,Classic,បុរាណ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,នេះគឺជាគណនី root និងមិនអាចត្រូវបានកែសម្រួល។
-DocType: BOM,Operations,ប្រតិបត្ដិការ
-DocType: Bin,Quantity Requested for Purchase,បរិមាណដែលបានស្នើសម្រាប់ការទិញ
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ភ្ជាប់ឯកសារ .csv ដែលមានជួរឈរពីរសម្រាប់ឈ្មោះចាស់និងមួយសម្រាប់ឈ្មោះថ្មី
-DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,គីឡូក្រាម
-apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,បើកសម្រាប់ការងារ។
-DocType: Item Attribute,Increment,ចំនួនបន្ថែម
-apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ជ្រើសឃ្លាំង ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ការផ្សព្វផ្សាយពាណិជ្ជកម្ម
-DocType: Employee,Married,រៀបការជាមួយ
-DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,គ្រឿងទេស
-DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ធ្វើឱ្យធាតុរបស់ធនាគារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ឃ្លាំងគឺជាចាំបាច់បើសិនជាប្រភេទគណនីគឺឃ្លាំង
-DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
-DocType: Lead,Person Name,ឈ្មោះបុគ្គល
-DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ពិនិត្យមើលប្រសិនបើកើតឡើងលំដាប់, ដោះធីកដើម្បីបញ្ឈប់ការកើតឡើងឬដាក់កាលបរិច្ឆេទបញ្ចប់ឱ្យបានត្រឹមត្រូវ"
-DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
+DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5)
+DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,សូមជ្រើសតារាងតម្លៃ
+DocType: Production Order Operation,Work In Progress,ការងារក្នុងវឌ្ឍនភាព
+DocType: Employee,Holiday List,បញ្ជីថ្ងៃឈប់សម្រាក
+DocType: Time Log,Time Log,កំណត់ហេតុម៉ោង
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,គណនេយ្យករ
+DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
+DocType: Company,Phone No,គ្មានទូរស័ព្ទ
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","កំណត់ហេតុនៃសកម្មភាពអនុវត្តដោយអ្នកប្រើប្រឆាំងនឹងភារកិច្ចដែលអាចត្រូវបានប្រើសម្រាប់តាមដានពេលវេលា, វិក័យប័ត្រ។"
+,Sales Partners Commission,គណៈកម្មាធិការលក់ដៃគូ
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,អក្សរកាត់មិនអាចមានច្រើនជាង 5 តួអក្សរ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,នេះគឺជាគណនី root និងមិនអាចត្រូវបានកែសម្រួល។
+DocType: BOM,Operations,ប្រតិបត្ដិការ
+DocType: Bin,Quantity Requested for Purchase,បរិមាណដែលបានស្នើសម្រាប់ការទិញ
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ភ្ជាប់ឯកសារ .csv ដែលមានជួរឈរពីរសម្រាប់ឈ្មោះចាស់និងមួយសម្រាប់ឈ្មោះថ្មី
+DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,គីឡូក្រាម
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,បើកសម្រាប់ការងារ។
+DocType: Item Attribute,Increment,ចំនួនបន្ថែម
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ជ្រើសឃ្លាំង ...
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ការផ្សព្វផ្សាយពាណិជ្ជកម្ម
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុមហ៊ុនដូចគ្នាត្រូវបានបញ្ចូលច្រើនជាងម្ដង
+DocType: Employee,Married,រៀបការជាមួយ
+DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
+DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ធ្វើឱ្យធាតុរបស់ធនាគារ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,ឃ្លាំងគឺជាចាំបាច់បើសិនជាប្រភេទគណនីគឺឃ្លាំង
+DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
+DocType: Lead,Person Name,ឈ្មោះបុគ្គល
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ពិនិត្យមើលប្រសិនបើកើតឡើងលំដាប់, ដោះធីកដើម្បីបញ្ឈប់ការកើតឡើងឬដាក់កាលបរិច្ឆេទបញ្ចប់ឱ្យបានត្រឹមត្រូវ"
+DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
 DocType: Account,Credit,ឥណទាន
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,សូមរៀបចំរបស់បុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធធនធានមនុស្ស&gt; ករកំណត់ធនធានមនុស្ស
-DocType: POS Profile,Write Off Cost Center,បិទការសរសេរមជ្ឈមណ្ឌលថ្លៃដើម
-DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
-DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
-DocType: Item,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
-DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
-DocType: Blog Post,Guest,អ្នកទស្សនា
-DocType: Quality Inspection,Get Specification Details,ទទួលបានព័ត៌មានលម្អិតជាក់លាក់
-DocType: Lead,Interested,មានការចាប់អារម្មណ៍
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,វិក័យប័ត្រនៃសម្ភារៈ
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ពិធីបើក
-DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
-DocType: Journal Entry,Opening Entry,ការបើកចូល
-DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
-DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
-DocType: Standard Reply,Owner,ម្ចាស់
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
-DocType: Employee Education,Under Graduate,នៅក្រោមបញ្ចប់ការសិក្សា
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,គោលដៅនៅលើ
-DocType: BOM,Total Cost,ការចំណាយសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,កំណត់ហេតុសកម្មភាព:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,អចលនទ្រព្យ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,សេចក្តីថ្លែងការណ៍របស់គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ឱសថ
-DocType: Expense Claim Detail,Claim Amount,ចំនួនពាក្យបណ្តឹង
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,សូមរៀបចំរបស់បុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធធនធានមនុស្ស&gt; ករកំណត់ធនធានមនុស្ស
+DocType: POS Profile,Write Off Cost Center,បិទការសរសេរមជ្ឈមណ្ឌលថ្លៃដើម
+DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
+DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
+DocType: Item,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
+DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
+DocType: Quality Inspection,Get Specification Details,ទទួលបានព័ត៌មានលម្អិតជាក់លាក់
+DocType: Lead,Interested,មានការចាប់អារម្មណ៍
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,វិក័យប័ត្រនៃសម្ភារៈ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ពិធីបើក
+DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
+DocType: Journal Entry,Opening Entry,ការបើកចូល
+DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
+DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
+DocType: Employee Education,Under Graduate,នៅក្រោមបញ្ចប់ការសិក្សា
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,គោលដៅនៅលើ
+DocType: BOM,Total Cost,ការចំណាយសរុប
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,កំណត់ហេតុសកម្មភាព:
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,អចលនទ្រព្យ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,សេចក្តីថ្លែងការណ៍របស់គណនី
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
+DocType: Expense Claim Detail,Claim Amount,ចំនួនពាក្យបណ្តឹង
 DocType: Employee,Mr,លោក
-DocType: Custom Script,Client,ម៉ាស៊ីនភ្ញៀវ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
 DocType: Naming Series,Prefix,បុព្វបទ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,អ្នកប្រើប្រាស់
-DocType: Upload Attendance,Import Log,នាំចូលចូល
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,អ្នកប្រើប្រាស់
+DocType: Upload Attendance,Import Log,នាំចូលចូល
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ផ្ញើ
-DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
-DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
-DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ការចំណាយភាគហ៊ុន
-DocType: Newsletter,Email Sent?,អ៊ីម៉ែល?
+DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
+DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
+DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ការចំណាយភាគហ៊ុន
+DocType: Newsletter,Email Sent?,អ៊ីម៉ែល?
 DocType: Journal Entry,Contra Entry,ចូល contra
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,បង្ហាញកំណត់ហេតុម៉ោង
-DocType: Journal Entry Account,Credit in Company Currency,ឥណទានក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
-DocType: Delivery Note,Installation Status,ស្ថានភាពនៃការដំឡើង
-DocType: Item,Supply Raw Materials for Purchase,ការផ្គត់ផ្គង់សម្ភារៈសម្រាប់ការទិញសាច់ឆៅ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,បង្ហាញកំណត់ហេតុម៉ោង
+DocType: Journal Entry Account,Credit in Company Currency,ឥណទានក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
+DocType: Delivery Note,Installation Status,ស្ថានភាពនៃការដំឡើង
+DocType: Item,Supply Raw Materials for Purchase,ការផ្គត់ផ្គង់សម្ភារៈសម្រាប់ការទិញសាច់ឆៅ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records",ទាញយកទំព័រគំរូបំពេញទិន្នន័យត្រឹមត្រូវហើយភ្ជាប់ឯកសារដែលបានកែប្រែ។ កាលបរិច្ឆេទនិងបុគ្គលិកទាំងអស់រួមបញ្ចូលគ្នានៅក្នុងរយៈពេលដែលបានជ្រើសនឹងមកនៅក្នុងពុម្ពដែលមានស្រាប់ជាមួយនឹងកំណត់ត្រាវត្តមាន
-DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,នឹងត្រូវបានបន្ថែមបន្ទាប់ពីមានវិក័យប័ត្រលក់ត្រូវបានដាក់ស្នើ។
-apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
-DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,straightening
-DocType: BOM Replace Tool,New BOM,Bom ដែលថ្មី
-apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,កំណត់ហេតុជាបាច់សម្រាប់វិក័យប័ត្រវេលាម៉ោង។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity សម្ដែង
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ព្រឹត្តិប័ត្រព័ត៌មានត្រូវបានផ្ញើទៅ
-DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
+All dates and employee combination in the selected period will come in the template, with existing attendance records",ទាញយកទំព័រគំរូបំពេញទិន្នន័យត្រឹមត្រូវហើយភ្ជាប់ឯកសារដែលបានកែប្រែ។ កាលបរិច្ឆេទនិងបុគ្គលិកទាំងអស់រួមបញ្ចូលគ្នានៅក្នុងរយៈពេលដែលបានជ្រើសនឹងមកនៅក្នុងពុម្ពដែលមានស្រាប់ជាមួយនឹងកំណត់ត្រាវត្តមាន
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,នឹងត្រូវបានបន្ថែមបន្ទាប់ពីមានវិក័យប័ត្រលក់ត្រូវបានដាក់ស្នើ។
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
+DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
+DocType: BOM Replace Tool,New BOM,Bom ដែលថ្មី
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,កំណត់ហេតុជាបាច់សម្រាប់វិក័យប័ត្រវេលាម៉ោង។
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ព្រឹត្តិប័ត្រព័ត៌មានត្រូវបានផ្ញើទៅ
+DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
 DocType: Leave Application,Reason,ហេតុផល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ការប្រតិបត្តិ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,អ្នកប្រើដំបូងនឹងក្លាយជាអ្នកគ្រប់គ្រងប្រព័ន្ធ (អ្នកអាចផ្លាស់ប្តូរនៅពេលក្រោយនេះ) ។
-apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
-DocType: Serial No,Maintenance Status,ស្ថានភាពថែទាំ
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ធាតុនិងតម្លៃ
-DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,ជ្រើសនិយោជិតដែលអ្នកកំពុងបង្កើតវាយតម្លៃនេះ។
-DocType: Customer,Individual,បុគគល
-apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
-DocType: SMS Settings,Enter url parameter for message,បញ្ចូលប៉ារ៉ាម៉ែត្រ URL សម្រាប់សារ
-apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,ក្បួនសម្រាប់ការដាក់ពាក្យសុំការកំណត់តម្លៃនិងការបញ្ចុះតម្លៃ។
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជីតម្លៃត្រូវតែមានការអនុវត្តសម្រាប់ទិញឬលក់
-DocType: Pricing Rule,Discount on Price List Rate (%),ការបញ្ចុះតំលៃលើតំលៃអត្រាបញ្ជី (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ការចាប់ផ្តើម
-DocType: User,First Name,ឈ្មោះជាលើកដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ការសម្ដែងពេញផ្សិត
-DocType: Offer Letter,Select Terms and Conditions,ជ្រើសលក្ខខណ្ឌ
-DocType: Production Planning Tool,Sales Orders,ការបញ្ជាទិញការលក់
-DocType: Purchase Taxes and Charges,Valuation,ការវាយតម្លៃ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,កំណត់ជាលំនាំដើម
-,Purchase Order Trends,ទិញលំដាប់និន្នាការ
-apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,បម្រុងទុកស្លឹកសម្រាប់ឆ្នាំនេះ។
-DocType: Earning Type,Earning Type,ប្រភេទការរកប្រាក់ចំណូល
-DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,បិទការធ្វើផែនការតាមដានម៉ោងសមត្ថភាពនិង
-DocType: Bank Reconciliation,Bank Account,គណនីធនាគារ
-DocType: Leave Type,Allow Negative Balance,អនុញ្ញាតឱ្យមានតុល្យភាពអវិជ្ជមាន
-DocType: Selling Settings,Default Territory,ដែនដីលំនាំដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ទូរទស្សន៏
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
-DocType: Production Order Operation,Updated via 'Time Log',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
-DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
-DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
-DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,សម្រាប់ឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
-DocType: Sales Partner,Reseller,លក់បន្ត
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
-DocType: Delivery Note Item,Against Sales Invoice Item,ការប្រឆាំងនឹងការធាតុលក់វិក័យប័ត្រ
-,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
-DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
-DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
-DocType: Newsletter List,Total Subscribers,អតិថិជនសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ឈ្មោះទំនាក់ទំនង
-DocType: Production Plan Item,SO Pending Qty,សូដែលមិនទាន់បាន Qty
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
-apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,លំនៅដ្ឋានបានកើនទ្វេរដង
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ស្លឹកមួយឆ្នាំ
-DocType: Time Log,Will be updated when batched.,នឹងត្រូវបានបន្ថែមពេល batched ។
-DocType: Bulk Email,Message,សារស្វាគមន៍
-DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox គន្លឹះចូលដំណើរការ
-DocType: Payment Tool,Reference No,សេចក្តីយោងគ្មាន
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,ប្រចាំឆ្នាំ
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
-DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,ការប្រតិបត្តិ
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,អ្នកប្រើដំបូងនឹងក្លាយជាអ្នកគ្រប់គ្រងប្រព័ន្ធ (អ្នកអាចផ្លាស់ប្តូរនៅពេលក្រោយនេះ) ។
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
+DocType: Serial No,Maintenance Status,ស្ថានភាពថែទាំ
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ធាតុនិងតម្លៃ
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,ជ្រើសនិយោជិតដែលអ្នកកំពុងបង្កើតវាយតម្លៃនេះ។
+DocType: Customer,Individual,បុគគល
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
+DocType: SMS Settings,Enter url parameter for message,បញ្ចូលប៉ារ៉ាម៉ែត្រ URL សម្រាប់សារ
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,ក្បួនសម្រាប់ការដាក់ពាក្យសុំការកំណត់តម្លៃនិងការបញ្ចុះតម្លៃ។
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជីតម្លៃត្រូវតែមានការអនុវត្តសម្រាប់ទិញឬលក់
+DocType: Pricing Rule,Discount on Price List Rate (%),ការបញ្ចុះតំលៃលើតំលៃអត្រាបញ្ជី (%)
+DocType: Offer Letter,Select Terms and Conditions,ជ្រើសលក្ខខណ្ឌ
+DocType: Production Planning Tool,Sales Orders,ការបញ្ជាទិញការលក់
+DocType: Purchase Taxes and Charges,Valuation,ការវាយតម្លៃ
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,កំណត់ជាលំនាំដើម
+,Purchase Order Trends,ទិញលំដាប់និន្នាការ
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,បម្រុងទុកស្លឹកសម្រាប់ឆ្នាំនេះ។
+DocType: Earning Type,Earning Type,ប្រភេទការរកប្រាក់ចំណូល
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,បិទការធ្វើផែនការតាមដានម៉ោងសមត្ថភាពនិង
+DocType: Bank Reconciliation,Bank Account,គណនីធនាគារ
+DocType: Leave Type,Allow Negative Balance,អនុញ្ញាតឱ្យមានតុល្យភាពអវិជ្ជមាន
+DocType: Selling Settings,Default Territory,ដែនដីលំនាំដើម
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ទូរទស្សន៏
+DocType: Production Order Operation,Updated via 'Time Log',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
+DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
+DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
+DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,សម្រាប់ឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ទទួលបាននៅលើ
+DocType: Sales Partner,Reseller,លក់បន្ត
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,សូមបញ្ចូលក្រុមហ៊ុន
+DocType: Delivery Note Item,Against Sales Invoice Item,ការប្រឆាំងនឹងការធាតុលក់វិក័យប័ត្រ
+,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
+DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
+DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
+DocType: Newsletter List,Total Subscribers,អតិថិជនសរុប
+,Contact Name,ឈ្មោះទំនាក់ទំនង
+DocType: Production Plan Item,SO Pending Qty,សូដែលមិនទាន់បាន Qty
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ស្លឹកមួយឆ្នាំ
+DocType: Time Log,Will be updated when batched.,នឹងត្រូវបានបន្ថែមពេល batched ។
+DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
+DocType: Payment Tool,Reference No,សេចក្តីយោងគ្មាន
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,ប្រចាំឆ្នាំ
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
+DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
 DocType: Material Request Item,Min Order Qty,លោក Min លំដាប់ Qty
-DocType: Lead,Do Not Contact,កុំទំនាក់ទំនង
-DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,លេខសម្គាល់តែមួយគត់សម្រាប់ការតាមដានវិក័យប័ត្រកើតឡើងទាំងអស់។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
-DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ Qty
-DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
+DocType: Lead,Do Not Contact,កុំទំនាក់ទំនង
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,លេខសម្គាល់តែមួយគត់សម្រាប់ការតាមដានវិក័យប័ត្រកើតឡើងទាំងអស់។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
+DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ Qty
+DocType: Pricing Rule,Supplier Type,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 ,Terretory,Terretory
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,សម្ភារៈស្នើសុំ
-DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
-DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ដុសធ្មេញខ្សែ
-DocType: Employee,Relation,ការទំនាក់ទំនង
-DocType: Shipping Rule,Worldwide Shipping,ការដឹកជញ្ជូននៅទូទាំងពិភពលោក
-apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ការបញ្ជាទិញបានបញ្ជាក់អះអាងពីអតិថិជន។
-DocType: Purchase Receipt Item,Rejected Quantity,បរិមាណដែលត្រូវបានច្រានចោល
-DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","វាលដែលមាននៅក្នុងការចំណាំដឹកជញ្ជូនសម្រង់, ការលក់វិក័យប័ត្រ, សណ្តាប់ធ្នាប់ការលក់"
-DocType: SMS Settings,SMS Sender Name,ឈ្មោះរបស់អ្នកផ្ញើសារជាអក្សរ
-DocType: Contact,Is Primary Contact,តើការទំនាក់ទំនងបឋមសិក្សា
-DocType: Notification Control,Notification Control,សេចក្តីជូនដំណឹងស្តីពីការត្រួតពិនិត្យ
-DocType: Lead,Suggestions,ការផ្តល់យោបល់
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ធាតុសំណុំថវិកាគ្រុបប្រាជ្ញានៅលើទឹកដីនេះ។ អ្នកក៏អាចរួមបញ្ចូលរដូវកាលដោយការកំណត់ការចែកចាយនេះ។
-DocType: Supplier,Address HTML,អាសយដ្ឋានរបស់ HTML
-DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
-DocType: Maintenance Schedule,Generate Schedule,បង្កើតកាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
-DocType: Purchase Invoice Item,Expense Head,ប្រមុខការចំណាយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,សូមជ្រើសប្រភេទទទួលបន្ទុកជាលើកដំបូង
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មានចុងក្រោយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,អតិបរមា 5 តួអក្សរ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,ជ្រើសភាសារបស់អ្នក
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,សម្ភារៈស្នើសុំ
+DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
+DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
+DocType: Employee,Relation,ការទំនាក់ទំនង
+DocType: Shipping Rule,Worldwide Shipping,ការដឹកជញ្ជូននៅទូទាំងពិភពលោក
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ការបញ្ជាទិញបានបញ្ជាក់អះអាងពីអតិថិជន។
+DocType: Purchase Receipt Item,Rejected Quantity,បរិមាណដែលត្រូវបានច្រានចោល
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","វាលដែលមាននៅក្នុងការចំណាំដឹកជញ្ជូនសម្រង់, ការលក់វិក័យប័ត្រ, សណ្តាប់ធ្នាប់ការលក់"
+DocType: SMS Settings,SMS Sender Name,ឈ្មោះរបស់អ្នកផ្ញើសារជាអក្សរ
+DocType: Contact,Is Primary Contact,តើការទំនាក់ទំនងបឋមសិក្សា
+DocType: Notification Control,Notification Control,សេចក្តីជូនដំណឹងស្តីពីការត្រួតពិនិត្យ
+DocType: Lead,Suggestions,ការផ្តល់យោបល់
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,ធាតុសំណុំថវិកាគ្រុបប្រាជ្ញានៅលើទឹកដីនេះ។ អ្នកក៏អាចរួមបញ្ចូលរដូវកាលដោយការកំណត់ការចែកចាយនេះ។
+DocType: Supplier,Address HTML,អាសយដ្ឋានរបស់ HTML
+DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
+DocType: Maintenance Schedule,Generate Schedule,បង្កើតកាលវិភាគ
+DocType: Purchase Invoice Item,Expense Head,ប្រមុខការចំណាយ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,សូមជ្រើសប្រភេទទទួលបន្ទុកជាលើកដំបូង
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មានចុងក្រោយ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,អតិបរមា 5 តួអក្សរ
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
-Operations shall not be tracked against Production Order",អនុញ្ញាតការបង្កើតនៃការកំណត់ហេតុពេលវេលាដែលប្រឆាំងនឹងការបញ្ជាទិញផលិតផល។ ប្រតិបត្ដិការនឹងមិនត្រូវបានតាមដានប្រឆាំងនឹងដីកាសម្រេចរបស់ផលិតកម្ម
-DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
-DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
-apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
-DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
-DocType: DocType,Administrator,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,ការខួងឡាស៊ែរ
-DocType: Stock UOM Replace Utility,New Stock UOM,ញូហ៊ុន UOM
-DocType: Period Closing Voucher,Closing Account Head,បិទនាយកគណនី
-DocType: Employee,External Work History,ការងារខាងក្រៅប្រវត្តិ
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
-DocType: Communication,Closed,បានបិទ
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅក្នុងពាក្យ (នាំចេញ) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
-DocType: Lead,Industry,វិស័យឧស្សាហកម្ម
-DocType: Employee,Job Profile,ទម្រង់ការងារ
-DocType: Newsletter,Newsletter,ព្រឹត្តិប័ត្រព័ត៌មាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
-DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,ធាតុនេះត្រូវបានធ្វើឱ្យទាន់សម័យ
-DocType: Async Task,System Manager,ប្រព័ន្ធអ្នកគ្រប់គ្រង
-DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
-DocType: Sales Invoice Item,Delivery Note,ដឹកជញ្ជូនចំណាំ
-DocType: Dropbox Backup,Allow Dropbox Access,អនុញ្ញាតឱ្យចូលដំណើរការ Dropbox
-apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ការរៀបចំពន្ធ
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
-DocType: Workstation,Rent Cost,ការចំណាយជួល
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,សូមជ្រើសខែនិងឆ្នាំ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, វិក័យប័ត្រដែលនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
-DocType: Employee,Company Email,ក្រុមហ៊ុនអ៊ីម៉ែល
-DocType: GL Entry,Debit Amount in Account Currency,ចំនួនឥណពន្ធរូបិយប័ណ្ណគណនី
-DocType: Shipping Rule,Valid for Countries,សុពលភាពសម្រាប់បណ្តាប្រទេស
-DocType: Workflow State,Refresh,ធ្វើឱ្យស្រស់
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ទាក់ទងនឹងការនាំចូលទាំងអស់គ្នាប្រៀបដូចជាវាលរូបិយប័ណ្ណអត្រានៃការប្តូសរុបការនាំចូល, ការនាំចូលលសរុបគឺមាននៅក្នុងបង្កាន់ដៃទិញ, សម្រង់ហាងទំនិញ, ការទិញវិក័យប័ត្រ, ការទិញលំដាប់ល"
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ដែលមាននៅក្នុង Bom, ដឹកជញ្ជូនចំណាំ, ការទិញវិក័យប័ត្រ, ការបញ្ជាទិញផលិតផល, ការទិញលំដាប់, ទទួលទិញ, លក់វិក័យប័ត្រ, ការលក់លំដាប់, ហ៊ុនធាតុ, Timesheet"
-DocType: Item Tax,Tax Rate,អត្រាអាករ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ជ្រើសធាតុ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួលទិញត្រូវតែត្រូវបានដាក់ជូន
-DocType: Stock UOM Replace Utility,Current Stock UOM,នាពេលបច្ចុប្បន្នហ៊ុន UOM
-apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
-DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
-DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,អាសយដ្ឋានអ៊ីម៉ែលរបស់អ្នក
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,សូមមើលឯកសារភ្ជាប់
-DocType: Purchase Order,% Received,% បានទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,កាត់យន្តហោះទឹក
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
-,Finished Goods,ទំនិញបានបញ្ចប់
-DocType: Delivery Note,Instructions,សេចក្តីណែនាំ
-DocType: Quality Inspection,Inspected By,បានត្រួតពិនិត្យដោយ
-DocType: Maintenance Visit,Maintenance Type,ប្រភេទថែទាំ
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ធាតុគុណភាពអធិការកិច្ចប៉ារ៉ាម៉ែត្រ
-DocType: Leave Application,Leave Approver Name,ទុកឱ្យឈ្មោះការអនុម័ត
-,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
+Operations shall not be tracked against Production Order",អនុញ្ញាតការបង្កើតនៃការកំណត់ហេតុពេលវេលាដែលប្រឆាំងនឹងការបញ្ជាទិញផលិតផល។ ប្រតិបត្ដិការនឹងមិនត្រូវបានតាមដានប្រឆាំងនឹងដីកាសម្រេចរបស់ផលិតកម្ម
+DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,គ្រប់គ្រងការលក់បុគ្គលដើមឈើ។
+DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
+DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
+DocType: Period Closing Voucher,Closing Account Head,បិទនាយកគណនី
+DocType: Employee,External Work History,ការងារខាងក្រៅប្រវត្តិ
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅក្នុងពាក្យ (នាំចេញ) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
+DocType: Lead,Industry,វិស័យឧស្សាហកម្ម
+DocType: Employee,Job Profile,ទម្រង់ការងារ
+DocType: Newsletter,Newsletter,ព្រឹត្តិប័ត្រព័ត៌មាន
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
+DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
+DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
+DocType: Sales Invoice Item,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ការរៀបចំពន្ធ
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+DocType: Workstation,Rent Cost,ការចំណាយជួល
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,សូមជ្រើសខែនិងឆ្នាំ
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, វិក័យប័ត្រដែលនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
+DocType: Employee,Company Email,ក្រុមហ៊ុនអ៊ីម៉ែល
+DocType: GL Entry,Debit Amount in Account Currency,ចំនួនឥណពន្ធរូបិយប័ណ្ណគណនី
+DocType: Shipping Rule,Valid for Countries,សុពលភាពសម្រាប់បណ្តាប្រទេស
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ទាក់ទងនឹងការនាំចូលទាំងអស់គ្នាប្រៀបដូចជាវាលរូបិយប័ណ្ណអត្រានៃការប្តូសរុបការនាំចូល, ការនាំចូលលសរុបគឺមាននៅក្នុងបង្កាន់ដៃទិញ, សម្រង់ហាងទំនិញ, ការទិញវិក័យប័ត្រ, ការទិញលំដាប់ល"
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ដែលមាននៅក្នុង Bom, ដឹកជញ្ជូនចំណាំ, ការទិញវិក័យប័ត្រ, ការបញ្ជាទិញផលិតផល, ការទិញលំដាប់, ទទួលទិញ, លក់វិក័យប័ត្រ, ការលក់លំដាប់, ហ៊ុនធាតុ, Timesheet"
+DocType: Item Tax,Tax Rate,អត្រាអាករ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ទទួលទិញត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
+DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
+DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,អាសយដ្ឋានអ៊ីម៉ែលរបស់អ្នក
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,សូមមើលឯកសារភ្ជាប់
+DocType: Purchase Order,% Received,% បានទទួល
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
+,Finished Goods,ទំនិញបានបញ្ចប់
+DocType: Delivery Note,Instructions,សេចក្តីណែនាំ
+DocType: Quality Inspection,Inspected By,បានត្រួតពិនិត្យដោយ
+DocType: Maintenance Visit,Maintenance Type,ប្រភេទថែទាំ
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,ធាតុគុណភាពអធិការកិច្ចប៉ារ៉ាម៉ែត្រ
+DocType: Leave Application,Leave Approver Name,ទុកឱ្យឈ្មោះការអនុម័ត
+,Schedule Date,កាលបរិច្ឆេទកាលវិភាគ
 DocType: Packed Item,Packed Item,ធាតុ packed
-apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,ការកំណត់លំនាំដើមសម្រាប់ការទិញប្រតិបត្តិការ។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់។ ពួកគេត្រូវបានបង្កើតឡើងដោយផ្ទាល់ពីម្ចាស់របស់អតិថិជន / អ្នកផ្គត់ផ្គង់។
-DocType: Currency Exchange,Currency Exchange,ការផ្លាស់ប្តូររូបិយវត្ថុ
-DocType: Purchase Invoice Item,Item Name,ឈ្មោះធាតុ
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,សមតុល្យឥណទាន
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,ការកំណត់លំនាំដើមសម្រាប់ការទិញប្រតិបត្តិការ។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់។ ពួកគេត្រូវបានបង្កើតឡើងដោយផ្ទាល់ពីម្ចាស់របស់អតិថិជន / អ្នកផ្គត់ផ្គង់។
+DocType: Currency Exchange,Currency Exchange,ការផ្លាស់ប្តូររូបិយវត្ថុ
+DocType: Purchase Invoice Item,Item Name,ឈ្មោះធាតុ
+DocType: Authorization Rule,Approving User  (above authorized value),ការអនុម័តអ្នកប្រើ (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,សមតុល្យឥណទាន
 DocType: Employee,Widowed,មេម៉ាយ
-DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",ធាតុដែលនឹងត្រូវបានស្នើរសុំដែលជា &quot;ចេញពីហ៊ុន&quot; ពិចារណាឃ្លាំងទាំងអស់ដែលមានមូលដ្ឋានលើការព្យាករ qty និង qty អប្បរមាការបញ្ជាទិញ
-DocType: Workstation,Working Hours,ម៉ោងធ្វើការ
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
-,Purchase Register,ទិញចុះឈ្មោះ
-DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
-DocType: Workstation,Consumable Cost,ការចំណាយរបស់អតិថិជនបាន
-DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,អងា្កំបំពង់
-DocType: Employee,Single,នៅលីវ
-DocType: Issue,Attachment,ឯកសារភ្ជាប់
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ថវិកាដែលមិនអាចត្រូវបានកំណត់សម្រាប់មជ្ឈមណ្ឌលថ្លៃដើមគ្រុប
-DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
-DocType: Purchase Invoice,Yearly,រាល់ឆ្នាំ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
-DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
-DocType: Purchase Order,Start date of current order's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការបញ្ជាទិញនាពេលបច្ចុប្បន្នរបស់រយៈពេល
-DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
-DocType: Delivery Note,% Installed,% ដែលបានដំឡើង
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",ធាតុដែលនឹងត្រូវបានស្នើរសុំដែលជា &quot;ចេញពីហ៊ុន&quot; ពិចារណាឃ្លាំងទាំងអស់ដែលមានមូលដ្ឋានលើការព្យាករ qty និង qty អប្បរមាការបញ្ជាទិញ
+DocType: Workstation,Working Hours,ម៉ោងធ្វើការ
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
+,Purchase Register,ទិញចុះឈ្មោះ
+DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
+DocType: Workstation,Consumable Cost,ការចំណាយរបស់អតិថិជនបាន
+DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ពេទ្យ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+DocType: Employee,Single,នៅលីវ
+DocType: Issue,Attachment,ឯកសារភ្ជាប់
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ថវិកាដែលមិនអាចត្រូវបានកំណត់សម្រាប់មជ្ឈមណ្ឌលថ្លៃដើមគ្រុប
+DocType: Account,Cost of Goods Sold,តម្លៃនៃការលក់ទំនិញ
+DocType: Purchase Invoice,Yearly,រាល់ឆ្នាំ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
+DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
+DocType: Purchase Order,Start date of current order's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការបញ្ជាទិញនាពេលបច្ចុប្បន្នរបស់រយៈពេល
+DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
+DocType: Delivery Note,% Installed,% ដែលបានដំឡើង
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: BOM,Item Desription,Desription ធាតុ
-DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូមអានសៀវភៅដៃ ERPNext
-DocType: Account,Is Group,គឺជាក្រុម
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,កំណត់សម្គាល់ Nos ដោយស្វ័យប្រវត្តិដោយផ្អែកលើ FIFO &amp; ‧;
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ពិនិត្យហាងទំនិញវិក័យប័ត្រលេខពិសេស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,រន្ធ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;ដើម្បីសំណុំរឿងលេខ &quot; មិនអាចតិចជាងពីសំណុំរឿងលេខ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,មិនរកប្រាក់ចំណេញ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,មិនបានចាប់ផ្តើម
-DocType: Lead,Channel Partner,ឆានែលដៃគូ
-DocType: Account,Old Parent,ឪពុកម្តាយចាស់
-DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ប្ដូរតាមបំណងអត្ថបទណែនាំដែលទៅជាផ្នែកមួយនៃអ៊ីម៉ែលមួយ។ ប្រតិបត្តិការគ្នាមានអត្ថបទណែនាំមួយដាច់ដោយឡែក។
-DocType: Sales Taxes and Charges Template,Sales Master Manager,កម្មវិធីគ្រប់គ្រងលោកគ្រូការលក់
-apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
-DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
-DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ការអប់រំរបស់ក្រុមហ៊ុន Shell
-DocType: Material Request Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
-DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
-DocType: BOM,Costing,ចំណាយថវិកាអស់
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
+DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូមអានសៀវភៅដៃ ERPNext
+DocType: Account,Is Group,គឺជាក្រុម
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,កំណត់សម្គាល់ Nos ដោយស្វ័យប្រវត្តិដោយផ្អែកលើ FIFO &amp; ‧;
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ពិនិត្យហាងទំនិញវិក័យប័ត្រលេខពិសេស
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;ដើម្បីសំណុំរឿងលេខ &quot; មិនអាចតិចជាងពីសំណុំរឿងលេខ &quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,មិនរកប្រាក់ចំណេញ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,មិនបានចាប់ផ្តើម
+DocType: Lead,Channel Partner,ឆានែលដៃគូ
+DocType: Account,Old Parent,ឪពុកម្តាយចាស់
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ប្ដូរតាមបំណងអត្ថបទណែនាំដែលទៅជាផ្នែកមួយនៃអ៊ីម៉ែលមួយ។ ប្រតិបត្តិការគ្នាមានអត្ថបទណែនាំមួយដាច់ដោយឡែក។
+DocType: Sales Taxes and Charges Template,Sales Master Manager,កម្មវិធីគ្រប់គ្រងលោកគ្រូការលក់
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
+DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
+DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
+DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
+DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
+DocType: Material Request Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
+DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+DocType: BOM,Costing,ចំណាយថវិកាអស់
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,សរុប Qty
-DocType: Employee,Health Concerns,ការព្រួយបារម្ភសុខភាព
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,គ្មានប្រាក់ខែ
-DocType: Packing Slip,From Package No.,ពីលេខកញ្ចប់
-DocType: Item Attribute,To Range,ដើម្បីជួរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
-DocType: Features Setup,Imports,ការនាំចូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ភ្ជាប់ adhesive
-DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
-apps/erpnext/erpnext/config/hr.py +28,Attendance record.,កំណត់ត្រាចូលរួម។
-DocType: Bank Reconciliation,Journal Entries,ធាតុទិនានុប្បវត្តិ
-DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
-DocType: System Settings,Loading...,កំពុងផ្ទុក ...
-DocType: DocField,Password,ពាក្យសម្ងាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,ការបង្ហាញម៉ូតកំណជាប់គ្នា
-DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
-DocType: Customer,Buyer of Goods and Services.,អ្នកទិញទំនិញនិងសេវាកម្ម។
-DocType: Journal Entry,Accounts Payable,គណនីទូទាត់
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,បន្ថែមអតិថិជន
-apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",«មិនដែលមាន
-DocType: Pricing Rule,Valid Upto,រីករាយជាមួយនឹងមានសុពលភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,មន្រ្តីរដ្ឋបាល
-DocType: Payment Tool,Received Or Paid,ទទួលបានការឬបង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
-DocType: Stock Entry,Difference Account,គណនីមានភាពខុសគ្នា
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
-DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-DocType: DocField,Type,ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
-DocType: Communication,Subject,ប្រធានបទ
-DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
-DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
-,Serial No Warranty Expiry,គ្មានផុតកំណត់ការធានាសៀរៀល
-DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
+DocType: Employee,Health Concerns,ការព្រួយបារម្ភសុខភាព
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,គ្មានប្រាក់ខែ
+DocType: Packing Slip,From Package No.,ពីលេខកញ្ចប់
+DocType: Item Attribute,To Range,ដើម្បីជួរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,មូលបត្រនិងប្រាក់បញ្ញើ
+DocType: Features Setup,Imports,ការនាំចូល
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
+DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,កំណត់ត្រាចូលរួម។
+DocType: Bank Reconciliation,Journal Entries,ធាតុទិនានុប្បវត្តិ
+DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
+DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
+DocType: Customer,Buyer of Goods and Services.,អ្នកទិញទំនិញនិងសេវាកម្ម។
+DocType: Journal Entry,Accounts Payable,គណនីទូទាត់
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,បន្ថែមអតិថិជន
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",«មិនដែលមាន
+DocType: Pricing Rule,Valid Upto,រីករាយជាមួយនឹងមានសុពលភាព
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ប្រាក់ចំណូលដោយផ្ទាល់
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,មន្រ្តីរដ្ឋបាល
+DocType: Payment Tool,Received Or Paid,ទទួលបានការឬបង់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
+DocType: Stock Entry,Difference Account,គណនីមានភាពខុសគ្នា
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
+DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
+,Serial No Warranty Expiry,គ្មានផុតកំណត់ការធានាសៀរៀល
+DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
-DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ញូ UOM ត្រូវតែមិនមានប្រភេទលេខទាំងមូល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,គ្រឿងសង្ហារឹមនិងសម្ភារៈ
-DocType: Quotation,Rate at which Price list currency is converted to company's base currency,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
-DocType: Selling Settings,Default Customer Group,លំនាំដើមគ្រុបអតិថិជន
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើការបិទវាល &quot;សរុបមូល&quot; នឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
-DocType: BOM,Operating Cost,ចំណាយប្រតិបត្តិការ
-,Gross Profit,ប្រាក់ចំណេញដុល
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
-DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
-DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,វិក័យប័ត្រសរុបនៅឆ្នាំនេះ:
-DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
-DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
-DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),បិទ (Cr)
-DocType: Serial No,Warranty Period (Days),រយៈពេលធានា (ថ្ងៃ)
-DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
-,Pending Qty,ដំណើ Qty
-DocType: Job Applicant,Thread HTML,HTML ដែលខ្សែស្រឡាយ
-DocType: Company,Ignore,មិនអើពើ
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
-DocType: Pricing Rule,Valid From,មានសុពលភាពពី
-DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
-DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
-DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
+DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
+DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,គ្រឿងសង្ហារឹមនិងសម្ភារៈ
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
+DocType: Selling Settings,Default Customer Group,លំនាំដើមគ្រុបអតិថិជន
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើការបិទវាល &quot;សរុបមូល&quot; នឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
+DocType: BOM,Operating Cost,ចំណាយប្រតិបត្តិការ
+,Gross Profit,ប្រាក់ចំណេញដុល
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
+DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
+DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,វិក័យប័ត្រសរុបនៅឆ្នាំនេះ:
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
+DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
+DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),បិទ (Cr)
+DocType: Serial No,Warranty Period (Days),រយៈពេលធានា (ថ្ងៃ)
+DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
+,Pending Qty,ដំណើ Qty
+DocType: Job Applicant,Thread HTML,HTML ដែលខ្សែស្រឡាយ
+DocType: Company,Ignore,មិនអើពើ
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
+DocType: Pricing Rule,Valid From,មានសុពលភាពពី
+DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
+DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
+DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** ចែកចាយប្រចាំខែ ** អាចជួយអ្នកបានចែកចាយថវិការបស់អ្នកនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវនៅក្នុងអាជីវកម្មរបស់អ្នក។ ដើម្បីចែកចាយថវិការដោយប្រើការចែកចាយការនេះកំណត់ការចែកចាយប្រចាំខែ ** ** នៅក្នុងមជ្ឈមណ្ឌលនេះបាន ** ** ចំនាយ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
-apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
-DocType: Project Task,Project Task,គម្រោងការងារ
-,Lead Id,ការនាំមុខលេខសម្គាល់
-DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
-DocType: About Us Settings,Website Manager,កម្មវិធីគ្រប់គ្រងវែបសាយ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
-DocType: Warranty Claim,Resolution,ការដោះស្រាយ
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,គណនីត្រូវបង់
-DocType: Sales Order,Billing and Delivery Status,វិក័យប័ត្រនិងការដឹកជញ្ជូនស្ថានភាព
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
-DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,មុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ត្រឡប់មកវិញការលក់
-DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ជ្រើសការបញ្ជាទិញលក់ដែលអ្នកចង់បង្កើតការបញ្ជាទិញផលិតកម្ម។
-DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
-apps/erpnext/erpnext/config/hr.py +120,Salary components.,សមាសភាគប្រាក់បៀវត្ស។
-apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជនសក្តានុពល។
-apps/erpnext/erpnext/config/crm.py +17,Customer database.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជន។
-DocType: Quotation,Quotation To,សម្រង់ដើម្បី
-DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ធ្លាក់ចុះ
-DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,មួយឃ្លាំងសមប្រឆាំងនឹងធាតុដែលភាគហ៊ុនត្រូវបានធ្វើឡើង។
-DocType: Event,Wednesday,ថ្ងៃពុធ
-DocType: Sales Invoice,Customer's Vendor,អតិថិជនរបស់អ្នកលក់
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ផលិតកម្មលំដាប់គឺចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,ការសរសេរសំណើរ
-DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
-DocType: Packing Slip Item,DN Detail,ពត៌មានលំអិត DN
-DocType: Time Log,Billed,ផ្សព្វផ្សាយ
-DocType: Batch,Batch Description,បាច់ការពិពណ៌នាសង្ខេប
-DocType: Delivery Note,Time at which items were delivered from warehouse,ពេលវេលាដែលធាតុត្រូវបានបញ្ជូនពីឃ្លាំង
-DocType: Sales Invoice,Sales Taxes and Charges,ពន្ធលក់និងការចោទប្រកាន់
-DocType: Employee,Organization Profile,ពត៌មានរបស់អង្គការ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,សូមរៀបចំការចំនួនស៊េរីសម្រាប់ការចូលរួមតាមរយៈការរៀបចំ&gt; លេខរៀងកម្រងឯកសារ
-DocType: Employee,Reason for Resignation,ហេតុផលសម្រាប់ការលាលែងពីតំណែង
-apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,ការវាយតម្លៃការងារសម្រាប់ពុម្ព។
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,វិក័យប័ត្រ / ធាតុទិនានុប្បវត្តិពត៌មានលំអិត
-DocType: Buying Settings,Settings for Buying Module,ម៉ូឌុលការកំណត់សម្រាប់ការទិញ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,សូមបញ្ចូលបង្កាន់ដៃទិញលើកដំបូង
-DocType: Buying Settings,Supplier Naming By,ដាក់ឈ្មោះអ្នកផ្គត់ផ្គង់ដោយ
-DocType: Activity Type,Default Costing Rate,អត្រាផ្សារលំនាំដើម
-DocType: Maintenance Schedule,Maintenance Schedule,កាលវិភាគថែទាំ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,សូមដំឡើងម៉ូឌុលពស់ថ្លាន់ Dropbox
-DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធីគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ពីការទទួលទិញ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
-DocType: SMS Settings,Receiver Parameter,អ្នកទទួលប៉ារ៉ាម៉ែត្រ
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ដោយផ្អែកលើ &quot;និង&quot; ក្រុមតាម&#39; មិនអាចជាដូចគ្នា
-DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ដើម្បី
-apps/frappe/frappe/templates/base.html +145,Please enter email address,សូមបញ្ចូលអាសយដ្ឋានអ៊ីម៉ែល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,បំពង់បញ្ចប់ការបង្កើត
-DocType: Production Order Operation,In minutes,នៅក្នុងនាទី
-DocType: Issue,Resolution Date,ការដោះស្រាយកាលបរិច្ឆេទ
-DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,បម្លែងទៅជាក្រុម
-DocType: Activity Cost,Activity Type,ប្រភេទសកម្មភាព
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,ចំនួនទឹកប្រាក់ដែលបានបញ្ជូន
-DocType: Customer,Fixed Days,ថ្ងៃថេរ
-DocType: Sales Invoice,Packing List,បញ្ជីវេចខ្ចប់
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ការបញ្ជាទិញដែលបានផ្ដល់ទៅឱ្យអ្នកផ្គត់ផ្គង់។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,បោះពុម្ពផ្សាយ
-DocType: Activity Cost,Projects User,គម្រោងការរបស់អ្នកប្រើ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ប្រើប្រាស់
-DocType: Company,Round Off Cost Center,បិទការប្រកួតជុំមជ្ឈមណ្ឌលការចំណាយ
-DocType: Material Request,Material Transfer,សម្ភារៈសេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ពិធីបើក (លោកបណ្ឌិត)
-apps/frappe/frappe/config/setup.py +59,Settings,ការកំណត់
-DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ពន្ធទូកចោទប្រកាន់ចំនាយ
-DocType: Production Order Operation,Actual Start Time,ជាក់ស្តែងពេលវេលាចាប់ផ្ដើម
-DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ច្រើនទៀត
-DocType: Pricing Rule,Sales Manager,ប្រធានផ្នែកលក់
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ប្តូរឈ្មោះ
-DocType: Journal Entry,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ពត់កោង
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,អនុញ្ញាតឱ្យអ្នកប្រើ
-DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
-DocType: Purchase Invoice,Quarterly,ប្រចាំត្រីមាស
-DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
-DocType: Sales Order Item,Basic Rate (Company Currency),អត្រាការប្រាក់មូលដ្ឋាន (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
-DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",** ចែកចាយប្រចាំខែ ** អាចជួយអ្នកបានចែកចាយថវិការបស់អ្នកនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវនៅក្នុងអាជីវកម្មរបស់អ្នក។ ដើម្បីចែកចាយថវិការដោយប្រើការចែកចាយការនេះកំណត់ការចែកចាយប្រចាំខែ ** ** នៅក្នុងមជ្ឈមណ្ឌលនេះបាន ** ** ចំនាយ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
+DocType: Project Task,Project Task,គម្រោងការងារ
+,Lead Id,ការនាំមុខលេខសម្គាល់
+DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ឆ្នាំសារពើពន្ធកាលបរិច្ឆេទចាប់ផ្តើមមិនគួរត្រូវបានធំជាងថ្ងៃខែឆ្នាំបញ្ចប់សារពើពន្ធ
+DocType: Warranty Claim,Resolution,ការដោះស្រាយ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,គណនីត្រូវបង់
+DocType: Sales Order,Billing and Delivery Status,វិក័យប័ត្រនិងការដឹកជញ្ជូនស្ថានភាព
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
+DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ត្រឡប់មកវិញការលក់
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ជ្រើសការបញ្ជាទិញលក់ដែលអ្នកចង់បង្កើតការបញ្ជាទិញផលិតកម្ម។
+DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,សមាសភាគប្រាក់បៀវត្ស។
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជនសក្តានុពល។
+DocType: Authorization Rule,Customer or Item,អតិថិជនឬធាតុ
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,មូលដ្ឋានទិន្នន័យរបស់អតិថិជន។
+DocType: Quotation,Quotation To,សម្រង់ដើម្បី
+DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ពិធីបើក (Cr)
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
+DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,មួយឃ្លាំងសមប្រឆាំងនឹងធាតុដែលភាគហ៊ុនត្រូវបានធ្វើឡើង។
+DocType: Sales Invoice,Customer's Vendor,អតិថិជនរបស់អ្នកលក់
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ផលិតកម្មលំដាប់គឺចាំបាច់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,ការសរសេរសំណើរ
+DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
+DocType: Packing Slip Item,DN Detail,ពត៌មានលំអិត DN
+DocType: Time Log,Billed,ផ្សព្វផ្សាយ
+DocType: Batch,Batch Description,បាច់ការពិពណ៌នាសង្ខេប
+DocType: Delivery Note,Time at which items were delivered from warehouse,ពេលវេលាដែលធាតុត្រូវបានបញ្ជូនពីឃ្លាំង
+DocType: Sales Invoice,Sales Taxes and Charges,ពន្ធលក់និងការចោទប្រកាន់
+DocType: Employee,Organization Profile,ពត៌មានរបស់អង្គការ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,សូមរៀបចំការចំនួនស៊េរីសម្រាប់ការចូលរួមតាមរយៈការរៀបចំ&gt; លេខរៀងកម្រងឯកសារ
+DocType: Employee,Reason for Resignation,ហេតុផលសម្រាប់ការលាលែងពីតំណែង
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,ការវាយតម្លៃការងារសម្រាប់ពុម្ព។
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,វិក័យប័ត្រ / ធាតុទិនានុប្បវត្តិពត៌មានលំអិត
+DocType: Buying Settings,Settings for Buying Module,ម៉ូឌុលការកំណត់សម្រាប់ការទិញ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,សូមបញ្ចូលបង្កាន់ដៃទិញលើកដំបូង
+DocType: Buying Settings,Supplier Naming By,ដាក់ឈ្មោះអ្នកផ្គត់ផ្គង់ដោយ
+DocType: Activity Type,Default Costing Rate,អត្រាផ្សារលំនាំដើម
+DocType: Maintenance Schedule,Maintenance Schedule,កាលវិភាគថែទាំ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
+DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,កម្មវិធីគ្រប់គ្រង
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ពីការទទួលទិញ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
+DocType: SMS Settings,Receiver Parameter,អ្នកទទួលប៉ារ៉ាម៉ែត្រ
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;ដោយផ្អែកលើ &quot;និង&quot; ក្រុមតាម&#39; មិនអាចជាដូចគ្នា
+DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
+DocType: Production Order Operation,In minutes,នៅក្នុងនាទី
+DocType: Issue,Resolution Date,ការដោះស្រាយកាលបរិច្ឆេទ
+DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,បម្លែងទៅជាក្រុម
+DocType: Activity Cost,Activity Type,ប្រភេទសកម្មភាព
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,ចំនួនទឹកប្រាក់ដែលបានបញ្ជូន
+DocType: Customer,Fixed Days,ថ្ងៃថេរ
+DocType: Sales Invoice,Packing List,បញ្ជីវេចខ្ចប់
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ការបញ្ជាទិញដែលបានផ្ដល់ទៅឱ្យអ្នកផ្គត់ផ្គង់។
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,បោះពុម្ពផ្សាយ
+DocType: Activity Cost,Projects User,គម្រោងការរបស់អ្នកប្រើ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ប្រើប្រាស់
+DocType: Company,Round Off Cost Center,បិទការប្រកួតជុំមជ្ឈមណ្ឌលការចំណាយ
+DocType: Material Request,Material Transfer,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ពិធីបើក (លោកបណ្ឌិត)
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ពន្ធទូកចោទប្រកាន់ចំនាយ
+DocType: Production Order Operation,Actual Start Time,ជាក់ស្តែងពេលវេលាចាប់ផ្ដើម
+DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
+DocType: Pricing Rule,Sales Manager,ប្រធានផ្នែកលក់
+DocType: Journal Entry,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
+DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
+DocType: Purchase Invoice,Quarterly,ប្រចាំត្រីមាស
+DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
+DocType: Sales Order Item,Basic Rate (Company Currency),អត្រាការប្រាក់មូលដ្ឋាន (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
+DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
 DocType: Account,Accounts,គណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,ទីផ្សារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ត្រង់កាត់
-DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ដើម្បីតាមដានធាតុនៅក្នុងការលក់និងទិញដោយផ្អែកលើឯកសារសម្គាល់របស់ពួកគេ NOS ។ នេះក៏អាចត្រូវបានគេប្រើដើម្បីតាមដានព័ត៌មានលម្អិតធានានៃផលិតផល។
-DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ឃ្លាំងបានច្រានចោលការប្រឆាំងនឹងធាតុគឺចាំបាច់ regected
-DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
-DocType: Employee,Provide email id registered in company,ផ្តល់ជូននូវលេខសម្គាល់នៅក្នុងក្រុមហ៊ុនអ៊ីម៉ែលដែលបានចុះឈ្មោះ
-DocType: Hub Settings,Seller City,ទីក្រុងអ្នកលក់
-DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
-DocType: Offer Letter Term,Offer Letter Term,ផ្តល់ជូននូវលិខិតអាណត្តិ
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
-DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទដើមឈើ
-DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើប្រាស់ក្នុងមួយឯកតា
-DocType: Serial No,Warranty Expiry Date,ការធានាកាលបរិច្ឆេទផុតកំណត់
-DocType: Material Request Item,Quantity and Warehouse,បរិមាណនិងឃ្លាំង
-DocType: Sales Invoice,Commission Rate (%),អត្រាប្រាក់កំរៃ (%)
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ប្រឆាំងនឹងប្រភេទត្រូវតែមានប័ណ្ណមួយនៃការលក់សណ្តាប់ធ្នាប់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,មិនអាចរកឃើញអត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,អវកាស
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,សូមស្វាគមន៏
-DocType: Journal Entry,Credit Card Entry,ចូលកាតឥណទាន
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ភារកិច្ចប្រធានបទ
-apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ទំនិញទទួលបានពីការផ្គត់ផ្គង់។
-DocType: Communication,Open,បើកទូលាយ
-DocType: Lead,Campaign Name,ឈ្មោះយុទ្ធនាការឃោសនា
-,Reserved,បម្រុងទុក
-DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ទ្រព្យនាពេលបច្ចុប្បន្ន
-DocType: Mode of Payment Account,Default Account,គណនីលំនាំដើម
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
-DocType: Contact Us Settings,Address Title,អាសយដ្ឋានចំណងជើង
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
-DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
-,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-DocType: Dropbox Backup,Daily,ជារៀងរាល់ថ្ងៃ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
-DocType: Delivery Note,Customer's Purchase Order No,ការទិញរបស់អតិថិជនលំដាប់គ្មាន
-DocType: Employee,Cell Number,លេខទូរស័ព្ទ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ថាមពល
-DocType: Opportunity,Opportunity From,ឱកាសការងារពី
-apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
-DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,គណនីថ្មី
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,ធាតុគណនេយ្យអាចត្រូវបានធ្វើប្រឆាំងនឹងការថ្នាំងស្លឹក។ ធាតុប្រឆាំងនឹងក្រុមដែលមិនត្រូវបានអនុញ្ញាត។
-DocType: ToDo,High,ឧត្តម
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
-DocType: Opportunity,Maintenance,ការថែរក្សា
-DocType: User,Male,ឈ្មោល
-DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
-apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,យុទ្ធនាការលក់។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ទីផ្សារ
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ដើម្បីតាមដានធាតុនៅក្នុងការលក់និងទិញដោយផ្អែកលើឯកសារសម្គាល់របស់ពួកគេ NOS ។ នេះក៏អាចត្រូវបានគេប្រើដើម្បីតាមដានព័ត៌មានលម្អិតធានានៃផលិតផល។
+DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ឃ្លាំងបានច្រានចោលការប្រឆាំងនឹងធាតុគឺចាំបាច់ regected
+DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
+DocType: Employee,Provide email id registered in company,ផ្តល់ជូននូវលេខសម្គាល់នៅក្នុងក្រុមហ៊ុនអ៊ីម៉ែលដែលបានចុះឈ្មោះ
+DocType: Hub Settings,Seller City,ទីក្រុងអ្នកលក់
+DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
+DocType: Offer Letter Term,Offer Letter Term,ផ្តល់ជូននូវលិខិតអាណត្តិ
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ប្រភេទដើមឈើ
+DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើប្រាស់ក្នុងមួយឯកតា
+DocType: Serial No,Warranty Expiry Date,ការធានាកាលបរិច្ឆេទផុតកំណត់
+DocType: Material Request Item,Quantity and Warehouse,បរិមាណនិងឃ្លាំង
+DocType: Sales Invoice,Commission Rate (%),អត្រាប្រាក់កំរៃ (%)
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ប្រឆាំងនឹងប្រភេទត្រូវតែមានប័ណ្ណមួយនៃការលក់សណ្តាប់ធ្នាប់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,អវកាស
+DocType: Journal Entry,Credit Card Entry,ចូលកាតឥណទាន
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ភារកិច្ចប្រធានបទ
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ទំនិញទទួលបានពីការផ្គត់ផ្គង់។
+DocType: Lead,Campaign Name,ឈ្មោះយុទ្ធនាការឃោសនា
+,Reserved,បម្រុងទុក
+DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,ទ្រព្យនាពេលបច្ចុប្បន្ន
+DocType: Mode of Payment Account,Default Account,គណនីលំនាំដើម
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
+DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
+,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
+DocType: Delivery Note,Customer's Purchase Order No,ការទិញរបស់អតិថិជនលំដាប់គ្មាន
+DocType: Employee,Cell Number,លេខទូរស័ព្ទ
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,សម្ភារៈដោយស្វ័យប្រវត្តិសំណើបង្កើត
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ការបាត់បង់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ថាមពល
+DocType: Opportunity,Opportunity From,ឱកាសការងារពី
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
+DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,គណនីថ្មី
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,ធាតុគណនេយ្យអាចត្រូវបានធ្វើប្រឆាំងនឹងការថ្នាំងស្លឹក។ ធាតុប្រឆាំងនឹងក្រុមដែលមិនត្រូវបានអនុញ្ញាត។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
+DocType: Opportunity,Maintenance,ការថែរក្សា
+DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,យុទ្ធនាការលក់។
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -611,1175 +550,1073 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","ពុម្ពស្តង់ដារដែលអាចពន្ធលើត្រូវបានអនុវត្តទៅលក់ទាំងអស់។ ពុម្ពនេះអាចផ្ទុកបញ្ជីនៃក្បាលពន្ធនិងការចំណាយលើក្បាល / ប្រាក់ចំណូលផងដែរផ្សេងទៀតដូចជា &quot;ការដឹកជញ្ជូន&quot;, &quot;ការធានារ៉ាប់រង&quot;, &quot;គ្រប់គ្រង&quot; ល #### ចំណាំអត្រាពន្ធដែលអ្នកបានកំណត់នៅទីនេះនឹងមានអត្រាស្តង់ដារសម្រាប់ទាំងអស់ ** ធាតុ ** ។ ប្រសិនបើមានធាតុ ** ** ដែលមានអត្រាការប្រាក់ខុសគ្នា, ពួកគេត្រូវតែត្រូវបានបន្ថែមនៅក្នុងការប្រមូលពន្ធលើធាតុ ** ** នៅ ** តារាងធាតុចៅហ្វាយ ** ។ #### ការពិពណ៌នាសង្ខេបនៃជួរឈរ 1. ប្រភេទគណនា: - នេះអាចមាននៅលើ ** សុទ្ធសរុប ** (នោះគឺជាការបូកនៃចំនួនទឹកប្រាក់ជាមូលដ្ឋាន) ។ - ** នៅលើជួរដេកមុនសរុប / ចំនួន ** (សម្រាប់ការបង់ពន្ធកើនឡើងឬការចោទប្រកាន់) ។ ប្រសិនបើអ្នកជ្រើសជម្រើសនេះ, ពន្ធនេះនឹងត្រូវបានអនុវត្តជាភាគរយនៃជួរដេកពីមុន (ក្នុងតារាងពន្ធនេះ) ចំនួនឬសរុប។ - ** ជាក់ស្តែង ** (ដូចដែលបានរៀបរាប់) ។ 2. ប្រមុខគណនី: សៀវភៅគណនីក្រោមដែលការបង់ពន្ធនេះនឹងត្រូវបានកក់មជ្ឈមណ្ឌលចំនាយ 3: បើពន្ធ / ការទទួលខុសត្រូវគឺជាប្រាក់ចំណូលមួយ (ដូចជាការដឹកជញ្ជូន) ឬចំវាត្រូវការដើម្បីត្រូវបានកក់ប្រឆាំងនឹងការចំណាយផងដែរ។ 4. ការពិពណ៌នាសង្ខេប: ការពិពណ៌នាសង្ខេបនៃការបង់ពន្ធនេះ (ដែលនឹងត្រូវបានបោះពុម្ពនៅក្នុងវិក័យប័ត្រ / សញ្ញាសម្រង់) ។ 5. អត្រាការប្រាក់: អត្រាពន្ធ។ 6. ចំនួន: ចំនួនប្រាក់ពន្ធ។ 7. សរុប: ចំនួនសរុបកើនដល់ចំណុចនេះ។ 8. បញ្ចូលជួរដេក: បើផ្អែកទៅលើ &quot;ជួរដេកពីមុនសរុប&quot; អ្នកអាចជ្រើសចំនួនជួរដេកដែលនឹងត្រូវបានយកជាមូលដ្ឋានមួយសម្រាប់ការគណនានេះ (លំនាំដើមគឺជួរដេកមុន) ។ 9. តើពន្ធលើនេះបានរួមបញ្ចូលនៅអត្រាមូលដ្ឋាន ?: ប្រសិនបើអ្នកធីកនេះ, វាមានន័យថាពន្ធនេះនឹងមិនត្រូវបានបង្ហាញខាងក្រោមតារាងធាតុ, ប៉ុន្តែវានឹងត្រូវបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃជាមូលដ្ឋានក្នុងតារាងធាតុដ៏សំខាន់របស់អ្នក។ នេះគឺជាការមានប្រយោជន៍ជាកន្លែងដែលអ្នកចង់ផ្ដល់ឱ្យអ្នកនូវតម្លៃមួយផ្ទះល្វែង (រួមបញ្ចូលទាំងពន្ធអាករ) តម្លៃដល់អតិថិជន។"
-DocType: Employee,Bank A/C No.,"Bank A / C, លេខ"
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","ពុម្ពស្តង់ដារដែលអាចពន្ធលើត្រូវបានអនុវត្តទៅលក់ទាំងអស់។ ពុម្ពនេះអាចផ្ទុកបញ្ជីនៃក្បាលពន្ធនិងការចំណាយលើក្បាល / ប្រាក់ចំណូលផងដែរផ្សេងទៀតដូចជា &quot;ការដឹកជញ្ជូន&quot;, &quot;ការធានារ៉ាប់រង&quot;, &quot;គ្រប់គ្រង&quot; ល #### ចំណាំអត្រាពន្ធដែលអ្នកបានកំណត់នៅទីនេះនឹងមានអត្រាស្តង់ដារសម្រាប់ទាំងអស់ ** ធាតុ ** ។ ប្រសិនបើមានធាតុ ** ** ដែលមានអត្រាការប្រាក់ខុសគ្នា, ពួកគេត្រូវតែត្រូវបានបន្ថែមនៅក្នុងការប្រមូលពន្ធលើធាតុ ** ** នៅ ** តារាងធាតុចៅហ្វាយ ** ។ #### ការពិពណ៌នាសង្ខេបនៃជួរឈរ 1. ប្រភេទគណនា: - នេះអាចមាននៅលើ ** សុទ្ធសរុប ** (នោះគឺជាការបូកនៃចំនួនទឹកប្រាក់ជាមូលដ្ឋាន) ។ - ** នៅលើជួរដេកមុនសរុប / ចំនួន ** (សម្រាប់ការបង់ពន្ធកើនឡើងឬការចោទប្រកាន់) ។ ប្រសិនបើអ្នកជ្រើសជម្រើសនេះ, ពន្ធនេះនឹងត្រូវបានអនុវត្តជាភាគរយនៃជួរដេកពីមុន (ក្នុងតារាងពន្ធនេះ) ចំនួនឬសរុប។ - ** ជាក់ស្តែង ** (ដូចដែលបានរៀបរាប់) ។ 2. ប្រមុខគណនី: សៀវភៅគណនីក្រោមដែលការបង់ពន្ធនេះនឹងត្រូវបានកក់មជ្ឈមណ្ឌលចំនាយ 3: បើពន្ធ / ការទទួលខុសត្រូវគឺជាប្រាក់ចំណូលមួយ (ដូចជាការដឹកជញ្ជូន) ឬចំវាត្រូវការដើម្បីត្រូវបានកក់ប្រឆាំងនឹងការចំណាយផងដែរ។ 4. ការពិពណ៌នាសង្ខេប: ការពិពណ៌នាសង្ខេបនៃការបង់ពន្ធនេះ (ដែលនឹងត្រូវបានបោះពុម្ពនៅក្នុងវិក័យប័ត្រ / សញ្ញាសម្រង់) ។ 5. អត្រាការប្រាក់: អត្រាពន្ធ។ 6. ចំនួន: ចំនួនប្រាក់ពន្ធ។ 7. សរុប: ចំនួនសរុបកើនដល់ចំណុចនេះ។ 8. បញ្ចូលជួរដេក: បើផ្អែកទៅលើ &quot;ជួរដេកពីមុនសរុប&quot; អ្នកអាចជ្រើសចំនួនជួរដេកដែលនឹងត្រូវបានយកជាមូលដ្ឋានមួយសម្រាប់ការគណនានេះ (លំនាំដើមគឺជួរដេកមុន) ។ 9. តើពន្ធលើនេះបានរួមបញ្ចូលនៅអត្រាមូលដ្ឋាន ?: ប្រសិនបើអ្នកធីកនេះ, វាមានន័យថាពន្ធនេះនឹងមិនត្រូវបានបង្ហាញខាងក្រោមតារាងធាតុ, ប៉ុន្តែវានឹងត្រូវបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃជាមូលដ្ឋានក្នុងតារាងធាតុដ៏សំខាន់របស់អ្នក។ នេះគឺជាការមានប្រយោជន៍ជាកន្លែងដែលអ្នកចង់ផ្ដល់ឱ្យអ្នកនូវតម្លៃមួយផ្ទះល្វែង (រួមបញ្ចូលទាំងពន្ធអាករ) តម្លៃដល់អតិថិជន។"
+DocType: Employee,Bank A/C No.,"Bank A / C, លេខ"
 DocType: Expense Claim,Project,គម្រោង
-DocType: Quality Inspection Reading,Reading 7,ការអាន 7
+DocType: Quality Inspection Reading,Reading 7,ការអាន 7
 DocType: Address,Personal,ផ្ទាល់ខ្លួន
-DocType: Expense Claim Detail,Expense Claim Type,ការចំណាយប្រភេទពាក្យបណ្តឹង
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,ការកំណត់លំនាំដើមសម្រាប់កន្រ្តកទំនិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ជីវបច្ចេកវិទ្យា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
+DocType: Expense Claim Detail,Expense Claim Type,ការចំណាយប្រភេទពាក្យបណ្តឹង
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,ការកំណត់លំនាំដើមសម្រាប់កន្រ្តកទំនិញ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,ជីវបច្ចេកវិទ្យា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
-DocType: Company,Default Cost of Goods Sold Account,តម្លៃលំនាំដើមនៃគណនីទំនិញលក់
-apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
-DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
-DocType: Process Payroll,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,គ្មានសិទ្ធិ
-DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
-DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រកមិនឃើញបុគ្គលិក
+DocType: Company,Default Cost of Goods Sold Account,តម្លៃលំនាំដើមនៃគណនីទំនិញលក់
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
+DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
+DocType: Process Payroll,Send Email,ផ្ញើអ៊ីមែល
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,គ្មានសិទ្ធិ
+DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,nos
+DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,វិកិយប័ត្ររបស់ខ្ញុំ
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Purchase Order,Stopped,បញ្ឈប់
-DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
-apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,ការចាប់ផ្តើមជ្រើស Bom
-DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
-apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើឥឡូវ
-,Support Analytics,ការគាំទ្រវិភាគ
-DocType: Item,Website Warehouse,វេបសាយឃ្លាំង
-DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុត្រូវតែតិចជាងឬស្មើនឹង 5
-apps/erpnext/erpnext/config/accounts.py +169,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
-apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
-DocType: Email Digest,Email Digest Settings,ការកំណត់សង្ខេបអ៊ីម៉ែល
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ការគាំទ្រសំណួរពីអតិថិជន។
-DocType: Features Setup,"To enable ""Point of Sale"" features",ដើម្បីបើកការ«ចំណុចនៃការលក់ &quot;លក្ខណៈពិសេស
-DocType: Bin,Moving Average Rate,ការផ្លាស់ប្តូរអត្រាការប្រាក់ជាមធ្យម
-DocType: Production Planning Tool,Select Items,ជ្រើសធាតុ
-DocType: Comment,Reference Name,ឈ្មោះឯកសារយោង
-DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
-DocType: Sales Invoice Item,Target Warehouse,គោលដៅឃ្លាំង
-DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការលក់លំដាប់កាលបរិច្ឆេទ
-DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុមធាតុទាំងអស់
-DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
-apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
-DocType: Production Order,Item To Manufacture,ធាតុដើម្បីផលិត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ការសម្ដែងផ្សិតអចិន្រ្តៃយ៍
-apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
-DocType: Sales Order Item,Projected Qty,ការព្យាករ Qty
-DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
-DocType: Newsletter,Newsletter Manager,កម្មវិធីគ្រប់គ្រងព្រឹត្តិប័ត្រព័ត៌មាន
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ការបើក&quot;
-DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
-DocType: Expense Claim,Expenses,ការចំណាយ
-DocType: Item Variant Attribute,Item Variant Attribute,ធាតុគុណលក្ខណៈវ៉ារ្យង់
-,Purchase Receipt Trends,និន្នាការបង្កាន់ដៃទិញ
-DocType: Appraisal,Select template from which you want to get the Goals,ជ្រើសពុម្ពដែលអ្នកចង់បានដើម្បីទទួលបានគោលដៅនេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
-,Amount to Bill,ចំនួនទឹកប្រាក់ដែលលោក Bill
-DocType: Company,Registration Details,ពត៌មានលំអិតការចុះឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ទឹកប្រាក់ដើម
+DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,ការចាប់ផ្តើមជ្រើស Bom
+DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,ផ្ញើឥឡូវ
+,Support Analytics,ការគាំទ្រវិភាគ
+DocType: Item,Website Warehouse,វេបសាយឃ្លាំង
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ពិន្ទុត្រូវតែតិចជាងឬស្មើនឹង 5
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
+DocType: Email Digest,Email Digest Settings,ការកំណត់សង្ខេបអ៊ីម៉ែល
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,ការគាំទ្រសំណួរពីអតិថិជន។
+DocType: Features Setup,"To enable ""Point of Sale"" features",ដើម្បីបើកការ«ចំណុចនៃការលក់ &quot;លក្ខណៈពិសេស
+DocType: Bin,Moving Average Rate,ការផ្លាស់ប្តូរអត្រាការប្រាក់ជាមធ្យម
+DocType: Production Planning Tool,Select Items,ជ្រើសធាតុ
+DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
+DocType: Sales Invoice Item,Target Warehouse,គោលដៅឃ្លាំង
+DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការលក់លំដាប់កាលបរិច្ឆេទ
+DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ក្រុមធាតុទាំងអស់
+DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
+DocType: Production Order,Item To Manufacture,ធាតុដើម្បីផលិត
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
+DocType: Sales Order Item,Projected Qty,ការព្យាករ Qty
+DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
+DocType: Newsletter,Newsletter Manager,កម្មវិធីគ្រប់គ្រងព្រឹត្តិប័ត្រព័ត៌មាន
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ការបើក&quot;
+DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
+DocType: Expense Claim,Expenses,ការចំណាយ
+DocType: Item Variant Attribute,Item Variant Attribute,ធាតុគុណលក្ខណៈវ៉ារ្យង់
+,Purchase Receipt Trends,និន្នាការបង្កាន់ដៃទិញ
+DocType: Appraisal,Select template from which you want to get the Goals,ជ្រើសពុម្ពដែលអ្នកចង់បានដើម្បីទទួលបានគោលដៅនេះ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
+,Amount to Bill,ចំនួនទឹកប្រាក់ដែលលោក Bill
+DocType: Company,Registration Details,ពត៌មានលំអិតការចុះឈ្មោះ
 DocType: Item,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
-DocType: Leave Block List Date,Leave Block List Date,ទុកឱ្យបញ្ជីប្លុកកាលបរិច្ឆេទ
-DocType: Pricing Rule,Price or Discount,ថ្លៃឬការបញ្ចុះតម្លៃ
-DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
-DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
-apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,វាយតម្លៃការអនុវត្ត។
-DocType: Sales Invoice Item,Stock Details,ភាគហ៊ុនលំអិត
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,តម្លៃគម្រោង
-apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,ចំណុចនៃការលក់
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
-DocType: Account,Balance must be,មានតុល្យភាពត្រូវតែមាន
-DocType: Hub Settings,Publish Pricing,តម្លៃបោះពុម្ពផ្សាយ
-DocType: Notification Control,Expense Claim Rejected Message,សារពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,ក្រចក
-,Available Qty,ដែលអាចប្រើបាន Qty
-DocType: Purchase Taxes and Charges,On Previous Row Total,នៅលើជួរដេកសរុបមុន
-DocType: Salary Slip,Working Days,ថ្ងៃធ្វើការ
-DocType: Serial No,Incoming Rate,អត្រាការមកដល់
-DocType: Packing Slip,Gross Weight,ទំងន់សរុបបាន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ឈ្មោះរបស់ក្រុមហ៊ុនរបស់អ្នកដែលអ្នកកំពុងបង្កើតប្រព័ន្ធនេះ។
-DocType: HR Settings,Include holidays in Total no. of Working Days,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងការសរុបទេ។ នៃថ្ងៃធ្វើការ
+DocType: Leave Block List Date,Leave Block List Date,ទុកឱ្យបញ្ជីប្លុកកាលបរិច្ឆេទ
+DocType: Pricing Rule,Price or Discount,ថ្លៃឬការបញ្ចុះតម្លៃ
+DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
+DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,វាយតម្លៃការអនុវត្ត។
+DocType: Sales Invoice Item,Stock Details,ភាគហ៊ុនលំអិត
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,តម្លៃគម្រោង
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,ចំណុចនៃការលក់
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
+DocType: Account,Balance must be,មានតុល្យភាពត្រូវតែមាន
+DocType: Hub Settings,Publish Pricing,តម្លៃបោះពុម្ពផ្សាយ
+DocType: Notification Control,Expense Claim Rejected Message,សារពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
+,Available Qty,ដែលអាចប្រើបាន Qty
+DocType: Purchase Taxes and Charges,On Previous Row Total,នៅលើជួរដេកសរុបមុន
+DocType: Salary Slip,Working Days,ថ្ងៃធ្វើការ
+DocType: Serial No,Incoming Rate,អត្រាការមកដល់
+DocType: Packing Slip,Gross Weight,ទំងន់សរុបបាន
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ឈ្មោះរបស់ក្រុមហ៊ុនរបស់អ្នកដែលអ្នកកំពុងបង្កើតប្រព័ន្ធនេះ។
+DocType: HR Settings,Include holidays in Total no. of Working Days,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងការសរុបទេ។ នៃថ្ងៃធ្វើការ
 DocType: Job Applicant,Hold,សង្កត់
-DocType: Employee,Date of Joining,កាលបរិច្ឆេទនៃការចូលរួម
-DocType: Naming Series,Update Series,កម្រងឯកសារធ្វើឱ្យទាន់សម័យ
-DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
-DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,មើលអតិថិជន
-DocType: Purchase Invoice Item,Purchase Receipt,បង្កាន់ដៃទិញ
-,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ការបំផ្ទុះសំណឹក
+DocType: Employee,Date of Joining,កាលបរិច្ឆេទនៃការចូលរួម
+DocType: Naming Series,Update Series,កម្រងឯកសារធ្វើឱ្យទាន់សម័យ
+DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
+DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,មើលអតិថិជន
+DocType: Purchase Invoice Item,Purchase Receipt,បង្កាន់ដៃទិញ
+,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 DocType: Employee,Ms,លោកស្រី
-apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
-DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
-DocType: Salary Slip,Leave Encashment Amount,ទុកឱ្យ Encashment ចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
+DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
+DocType: Salary Slip,Leave Encashment Amount,ទុកឱ្យ Encashment ចំនួនទឹកប្រាក់
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
-DocType: Bank Reconciliation,Total Amount,ចំនួនសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ការបោះពុម្ពអ៊ីធឺណិត
-DocType: Production Planning Tool,Production Orders,ការបញ្ជាទិញ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,តម្លៃឱ្យមានតុល្យភាព
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃការលក់
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ធ្វើសមកាលកម្មធាតុបោះពុម្ពផ្សាយ
-DocType: GL Entry,Account Currency,រូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,សូមនិយាយពីគណនីបិទជុំទីក្នុងក្រុមហ៊ុន
+DocType: Bank Reconciliation,Total Amount,ចំនួនសរុប
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ការបោះពុម្ពអ៊ីធឺណិត
+DocType: Production Planning Tool,Production Orders,ការបញ្ជាទិញ
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,តម្លៃឱ្យមានតុល្យភាព
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,តារាងតម្លៃការលក់
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ធ្វើសមកាលកម្មធាតុបោះពុម្ពផ្សាយ
+DocType: Bank Reconciliation,Account Currency,រូបិយប័ណ្ណគណនី
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,សូមនិយាយពីគណនីបិទជុំទីក្នុងក្រុមហ៊ុន
 DocType: Purchase Receipt,Range,ជួរ
-DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
-DocType: Features Setup,Item Barcode,កូដផលិតផលធាតុ
-DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
-DocType: Address,Shop,ហាងលក់
-DocType: Hub Settings,Sync Now,ធ្វើសមកាលកម្មឥឡូវ
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,លំនាំដើមគណនីធនាគារ / សាច់ប្រាក់នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយស្វ័យប្រវត្តិក្នុងម៉ាស៊ីនឆូតកាតវិក្កយបត្រពេលអ្នកប្រើរបៀបនេះត្រូវបានជ្រើស។
-DocType: Employee,Permanent Address Is,អាសយដ្ឋានគឺជាអចិន្រ្តៃយ៍
-DocType: Production Order Operation,Operation completed for how many finished goods?,ប្រតិបត្ដិការបានបញ្ចប់សម្រាប់ទំនិញដែលបានបញ្ចប់តើមានមនុស្សប៉ុន្មាន?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ម៉ាកនេះ
-DocType: Employee,Exit Interview Details,ពត៌មានលំអិតចេញពីការសម្ភាសន៍
-DocType: Item,Is Purchase Item,តើមានធាតុទិញ
-DocType: Journal Entry Account,Purchase Invoice,ការទិញវិក័យប័ត្រ
-DocType: Stock Ledger Entry,Voucher Detail No,ពត៌មានលំអិតកាតមានទឹកប្រាក់គ្មាន
-DocType: Stock Entry,Total Outgoing Value,តម្លៃចេញសរុប
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
-DocType: Lead,Request for Information,សំណើសុំព័ត៌មាន
+DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
+DocType: Features Setup,Item Barcode,កូដផលិតផលធាតុ
+DocType: Quality Inspection Reading,Reading 6,ការអាន 6
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
+DocType: Address,Shop,ហាងលក់
+DocType: Hub Settings,Sync Now,ធ្វើសមកាលកម្មឥឡូវ
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,លំនាំដើមគណនីធនាគារ / សាច់ប្រាក់នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយស្វ័យប្រវត្តិក្នុងម៉ាស៊ីនឆូតកាតវិក្កយបត្រពេលអ្នកប្រើរបៀបនេះត្រូវបានជ្រើស។
+DocType: Employee,Permanent Address Is,អាសយដ្ឋានគឺជាអចិន្រ្តៃយ៍
+DocType: Production Order Operation,Operation completed for how many finished goods?,ប្រតិបត្ដិការបានបញ្ចប់សម្រាប់ទំនិញដែលបានបញ្ចប់តើមានមនុស្សប៉ុន្មាន?
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ម៉ាកនេះ
+DocType: Employee,Exit Interview Details,ពត៌មានលំអិតចេញពីការសម្ភាសន៍
+DocType: Item,Is Purchase Item,តើមានធាតុទិញ
+DocType: Journal Entry Account,Purchase Invoice,ការទិញវិក័យប័ត្រ
+DocType: Stock Ledger Entry,Voucher Detail No,ពត៌មានលំអិតកាតមានទឹកប្រាក់គ្មាន
+DocType: Stock Entry,Total Outgoing Value,តម្លៃចេញសរុប
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
+DocType: Lead,Request for Information,សំណើសុំព័ត៌មាន
 DocType: Payment Tool,Paid,Paid
-DocType: Salary Slip,Total in words,សរុបនៅក្នុងពាក្យ
-DocType: Material Request Item,Lead Time Date,កាលបរិច្ឆេទពេលវេលានាំមុខ
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណដែលមិនត្រូវបានបង្កើតឡើងសម្រាប់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
-apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ការនាំចេញទៅកាន់អតិថិជន។
-DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ចំណូលប្រយោល
-DocType: Payment Tool,Set Payment Amount = Outstanding Amount,កំណត់ចំនួនការទូទាត់ = ចំនួនទឹកប្រាក់ឆ្នើម
-DocType: Contact Us Settings,Address Line 1,អាសយដ្ឋានបន្ទាត់ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,អថេរ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ឈ្មោះក្រុមហ៊ុន
-DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
-DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាតឱ្យអ្នកប្រើដើម្បីកែសម្រួលអត្រាតំលៃបញ្ជីនៅក្នុងប្រតិបត្តិការ
+DocType: Salary Slip,Total in words,សរុបនៅក្នុងពាក្យ
+DocType: Material Request Item,Lead Time Date,កាលបរិច្ឆេទពេលវេលានាំមុខ
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,គឺជាចាំបាច់។ ប្រហែលជាកំណត់ត្រាប្តូររូបិយប័ណ្ណដែលមិនត្រូវបានបង្កើតឡើងសម្រាប់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","សម្រាប់ធាតុ &quot;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,ការនាំចេញទៅកាន់អតិថិជន។
+DocType: Purchase Invoice Item,Purchase Order Item,ទិញធាតុលំដាប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ចំណូលប្រយោល
+DocType: Payment Tool,Set Payment Amount = Outstanding Amount,កំណត់ចំនួនការទូទាត់ = ចំនួនទឹកប្រាក់ឆ្នើម
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,អថេរ
+,Company Name,ឈ្មោះក្រុមហ៊ុន
+DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,មើលបញ្ជីនៃការជួយវីដេអូទាំងអស់
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,អនុញ្ញាតឱ្យអ្នកប្រើដើម្បីកែសម្រួលអត្រាតំលៃបញ្ជីនៅក្នុងប្រតិបត្តិការ
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,គីមី
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
-DocType: Process Payroll,Select Payroll Year and Month,ជ្រើសបើកប្រាក់បៀវត្សឆ្នាំនិងខែ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពាក្យស្នើសុំរបស់មូលនិធិ&gt; ទ្រព្យបច្ចុប្បន្ន&gt; គណនីធនាគារនិងបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;ធនាគារ&quot;
-DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
-DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
-DocType: Comment,Unsubscribed,ជាវ
-DocType: Opportunity,Walk In,ដើរក្នុង
-DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
-apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយ finanial ។
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,សេត
-DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
-DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ភ្ជាប់រូបភាពរបស់អ្នក
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ធ្វើឱ្យ
-DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
-DocType: Workflow State,Stop,បញ្ឈប់
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មានកំហុស។ ហេតុផលមួយដែលអាចនឹងត្រូវបានប្រហែលជាដែលអ្នកមិនបានរក្សាទុកសំណុំបែបបទ។ សូមទាក់ទង support@erpnext.com ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
-apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
-DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
+DocType: Process Payroll,Select Payroll Year and Month,ជ្រើសបើកប្រាក់បៀវត្សឆ្នាំនិងខែ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពាក្យស្នើសុំរបស់មូលនិធិ&gt; ទ្រព្យបច្ចុប្បន្ន&gt; គណនីធនាគារនិងបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;ធនាគារ&quot;
+DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
+DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
+DocType: Opportunity,Walk In,ដើរក្នុង
+DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយ finanial ។
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ផ្ទេរប្រាក់
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,សេត
+DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
+DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ភ្ជាប់រូបភាពរបស់អ្នក
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ធ្វើឱ្យ
+DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មានកំហុស។ ហេតុផលមួយដែលអាចនឹងត្រូវបានប្រហែលជាដែលអ្នកមិនបានរក្សាទុកសំណុំបែបបទ។ សូមទាក់ទង support@erpnext.com ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
+apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,កន្ត្រកទំនិញរបស់ខ្ញុំ
+DocType: Lead,Next Contact Date,ទំនាក់ទំនងបន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,បើក Qty
-DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ជម្រើសភាគហ៊ុន
-DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
-DocType: Leave Application,Leave Application,ការឈប់សម្រាករបស់កម្មវិធី
-apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
-DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
-DocType: Company,If Monthly Budget Exceeded (for expense account),ប្រសិនបើមានថវិកាប្រចាំខែលើសពី (សម្រាប់គណនីដែលការចំណាយ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ការកាត់បន្ថយ
-DocType: Workstation,Net Hour Rate,អត្រាហួរសុទ្ធ
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ទទួលទិញការចំណាយបានចុះចត
-DocType: Company,Default Terms,លក្ខខណ្ឌលំនាំដើម
-DocType: Packing Slip Item,Packing Slip Item,វេចខ្ចប់ធាតុគ្រូពេទ្យប្រហែលជា
-DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
-DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
-DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ការដាក់លិខិត
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,បញ្ចុះតំលៃ
-DocType: Features Setup,Purchase Discounts,ការបញ្ចុះតម្លៃទិញ
-DocType: Workstation,Wages,ប្រាក់ឈ្នួល
-DocType: Time Log,Will be updated only if Time Log is 'Billable',នឹងត្រូវបានធ្វើឱ្យទាន់សម័យតែប៉ុណ្ណោះប្រសិនបើកំណត់ហេតុពេលវេលាគឺ &quot;Billable&quot;
+DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ជម្រើសភាគហ៊ុន
+DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
+DocType: Leave Application,Leave Application,ការឈប់សម្រាករបស់កម្មវិធី
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
+DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
+DocType: Company,If Monthly Budget Exceeded (for expense account),ប្រសិនបើមានថវិកាប្រចាំខែលើសពី (សម្រាប់គណនីដែលការចំណាយ)
+DocType: Workstation,Net Hour Rate,អត្រាហួរសុទ្ធ
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ទទួលទិញការចំណាយបានចុះចត
+DocType: Company,Default Terms,លក្ខខណ្ឌលំនាំដើម
+DocType: Packing Slip Item,Packing Slip Item,វេចខ្ចប់ធាតុគ្រូពេទ្យប្រហែលជា
+DocType: POS Profile,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
+DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,បញ្ចុះតំលៃ
+DocType: Features Setup,Purchase Discounts,ការបញ្ចុះតម្លៃទិញ
+DocType: Workstation,Wages,ប្រាក់ឈ្នួល
+DocType: Time Log,Will be updated only if Time Log is 'Billable',នឹងត្រូវបានធ្វើឱ្យទាន់សម័យតែប៉ុណ្ណោះប្រសិនបើកំណត់ហេតុពេលវេលាគឺ &quot;Billable&quot;
 DocType: Project,Internal,ផ្ទៃក្នុង
 DocType: Task,Urgent,បន្ទាន់
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ចូរទៅផ្ទៃតុហើយចាប់ផ្តើមដោយការប្រើ ERPNext
-DocType: Item,Manufacturer,ក្រុមហ៊ុនផលិត
-DocType: Landed Cost Item,Purchase Receipt Item,ធាតុបង្កាន់ដៃទិញ
-DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ចំនួនលក់
-apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,ម៉ោងកំណត់ហេតុ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នកគឺជាអ្នកដែលមានការយល់ព្រមចំណាយសម្រាប់កំណត់ត្រានេះ។ សូមធ្វើឱ្យទាន់សម័យនេះ &#39;ស្ថានភាព&#39; និងរក្សាទុក
-DocType: Serial No,Creation Document No,ការបង្កើតឯកសារគ្មាន
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ចូរទៅផ្ទៃតុហើយចាប់ផ្តើមដោយការប្រើ ERPNext
+DocType: Item,Manufacturer,ក្រុមហ៊ុនផលិត
+DocType: Landed Cost Item,Purchase Receipt Item,ធាតុបង្កាន់ដៃទិញ
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,ចំនួនលក់
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,ម៉ោងកំណត់ហេតុ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នកគឺជាអ្នកដែលមានការយល់ព្រមចំណាយសម្រាប់កំណត់ត្រានេះ។ សូមធ្វើឱ្យទាន់សម័យនេះ &#39;ស្ថានភាព&#39; និងរក្សាទុក
+DocType: Serial No,Creation Document No,ការបង្កើតឯកសារគ្មាន
 DocType: Issue,Issue,បញ្ហា
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",គុណលក្ខណៈសម្រាប់ធាតុវ៉ារ្យ៉ង់។ ឧទាហរណ៍ដូចជាទំហំពណ៌ល
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,គណនីមិនត្រូវគ្នាជាមួយក្រុមហ៊ុន
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",គុណលក្ខណៈសម្រាប់ធាតុវ៉ារ្យ៉ង់។ ឧទាហរណ៍ដូចជាទំហំពណ៌ល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ឃ្លាំង WIP
-DocType: BOM Operation,Operation,ប្រតិបត្ដិការ
-DocType: Lead,Organization Name,ឈ្មោះអង្គភាព
-DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ចំណាយការលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ទិញស្ដង់ដារ
-DocType: GL Entry,Against,ប្រឆាំងនឹងការ
-DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
-DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
-DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
-DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
-DocType: Item,Default Supplier,ហាងទំនិញលំនាំដើម
-DocType: Manufacturing Settings,Over Production Allowance Percentage,លើសពីភាគរយសំវិធានធនផលិតកម្ម
-DocType: Shipping Rule Condition,Shipping Rule Condition,លក្ខខណ្ឌវិធានការដឹកជញ្ជូន
+DocType: BOM Operation,Operation,ប្រតិបត្ដិការ
+DocType: Lead,Organization Name,ឈ្មោះអង្គភាព
+DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ចំណាយការលក់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ទិញស្ដង់ដារ
+DocType: GL Entry,Against,ប្រឆាំងនឹងការ
+DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
+DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
+DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
+DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
+DocType: Item,Default Supplier,ហាងទំនិញលំនាំដើម
+DocType: Manufacturing Settings,Over Production Allowance Percentage,លើសពីភាគរយសំវិធានធនផលិតកម្ម
+DocType: Shipping Rule Condition,Shipping Rule Condition,លក្ខខណ្ឌវិធានការដឹកជញ្ជូន
 DocType: Features Setup,Miscelleneous,Miscelleneous
-DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
-DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,លោកបណ្ឌិត
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
-DocType: Time Log Batch,updated via Time Logs,ធ្វើឱ្យទាន់សម័យតាមរយៈពេលកំណត់ហេតុ
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
-DocType: Opportunity,Your sales person who will contact the customer in future,ការលក់ផ្ទាល់ខ្លួនរបស់អ្នកដែលនឹងទាក់ទងអតិថិជននៅថ្ងៃអនាគត
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,រាយមួយចំនួននៃការផ្គត់ផ្គង់របស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
-DocType: Company,Default Currency,រូបិយប័ណ្ណលំនាំដើម
-DocType: Contact,Enter designation of this Contact,បញ្ចូលការរចនានៃទំនាក់ទំនងនេះ
-DocType: Contact Us Settings,Address,អាសយដ្ឋាន
-DocType: Expense Claim,From Employee,ពីបុគ្គលិក
-DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
-DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
-DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ការដឹកជញ្ជូន
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,និងឆ្នាំ:
-DocType: Email Digest,Annual Expense,ចំណាយប្រចាំឆ្នាំ
-DocType: SMS Center,Total Characters,តួអក្សរសរុប
-DocType: C-Form Invoice Detail,C-Form Invoice Detail,ពត៌មានវិក័យប័ត្ររបស់ C-សំណុំបែបបទ
-DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការទូទាត់វិក័យប័ត្រផ្សះផ្សានិងយុត្តិធម៌
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,ការចូលរួមចំណែក%
-DocType: Item,website page link,តំណភ្ជាប់ទំព័រវេបសាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ចូរយើងរៀបចំប្រព័ន្ធសម្រាប់ការប្រើប្រាស់ជាលើកដំបូង។
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,លេខចុះបញ្ជីក្រុមហ៊ុនសម្រាប់ជាឯកសារយោងរបស់អ្នក។ ចំនួនពន្ធល
+DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
+DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,លោកបណ្ឌិត
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
+DocType: Time Log Batch,updated via Time Logs,ធ្វើឱ្យទាន់សម័យតាមរយៈពេលកំណត់ហេតុ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
+DocType: Opportunity,Your sales person who will contact the customer in future,ការលក់ផ្ទាល់ខ្លួនរបស់អ្នកដែលនឹងទាក់ទងអតិថិជននៅថ្ងៃអនាគត
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,រាយមួយចំនួននៃការផ្គត់ផ្គង់របស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
+DocType: Company,Default Currency,រូបិយប័ណ្ណលំនាំដើម
+DocType: Contact,Enter designation of this Contact,បញ្ចូលការរចនានៃទំនាក់ទំនងនេះ
+DocType: Expense Claim,From Employee,ពីបុគ្គលិក
+DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
+DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
+DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,និងឆ្នាំ:
+DocType: Email Digest,Annual Expense,ចំណាយប្រចាំឆ្នាំ
+DocType: SMS Center,Total Characters,តួអក្សរសរុប
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,ពត៌មានវិក័យប័ត្ររបស់ C-សំណុំបែបបទ
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ការទូទាត់វិក័យប័ត្រផ្សះផ្សានិងយុត្តិធម៌
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,ការចូលរួមចំណែក%
+DocType: Item,website page link,តំណភ្ជាប់ទំព័រវេបសាយ
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,លេខចុះបញ្ជីក្រុមហ៊ុនសម្រាប់ជាឯកសារយោងរបស់អ្នក។ ចំនួនពន្ធល
 DocType: Sales Partner,Distributor,ចែកចាយ
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
-,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ជ្រើសកំណត់ហេតុនិងការដាក់ស្នើវេលាម៉ោងដើម្បីបង្កើតវិក័យប័ត្រលក់ថ្មី។
-DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
-DocType: Salary Slip,Deductions,ការកាត់
-DocType: Purchase Invoice,Start date of current invoice's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានផ្សព្វផ្សាយ។
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,បង្កើតឱកាសការងារ
-DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
+,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ជ្រើសកំណត់ហេតុនិងការដាក់ស្នើវេលាម៉ោងដើម្បីបង្កើតវិក័យប័ត្រលក់ថ្មី។
+DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
+DocType: Salary Slip,Deductions,ការកាត់
+DocType: Purchase Invoice,Start date of current invoice's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានផ្សព្វផ្សាយ។
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,បង្កើតឱកាសការងារ
+DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
 DocType: Supplier,Communications,ទំនាក់ទំនង
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
-,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
-DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
-DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
-apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,បើកសមតុល្យគណនី
-DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ការគ្រប់គ្រង
-apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,ប្រភេទនៃសកម្មភាពសម្រាប់សន្លឹកម៉ោង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ការសម្ដែងការវិនិយោគ
-DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
-DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,សកម្ម
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ពណ៌ខៀវ
-DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
-DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,ថ្នាំងបន្ថែមទៀតអាចត្រូវបានបង្កើតក្រោមការថ្នាំងប្រភេទ &#39;ក្រុម
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
+DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
+DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,បើកសមតុល្យគណនី
+DocType: Sales Invoice Advance,Sales Invoice Advance,ការលក់វិក័យប័ត្រជាមុន
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ការគ្រប់គ្រង
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,ប្រភេទនៃសកម្មភាពសម្រាប់សន្លឹកម៉ោង
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ពណ៌ខៀវ
+DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
+DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,ថ្នាំងបន្ថែមទៀតអាចត្រូវបានបង្កើតក្រោមការថ្នាំងប្រភេទ &#39;ក្រុម
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ក្រមធាតុមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
-DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
-DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,រោងចក្រផលិតវត្ថុ laminated
-apps/erpnext/erpnext/config/buying.py +13,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
-DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,stretch បង្កើត
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,មនុស្សម្នាក់ដែលលក់របស់អ្នកនឹងទទួលបាននូវការរំលឹកមួយនៅលើកាលបរិច្ឆេទនេះដើម្បីទាក់ទងអតិថិជន
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
-apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ពន្ធនិងការកាត់ប្រាក់ខែផ្សេងទៀត។
-DocType: Lead,Lead,ការនាំមុខ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,ក្រមធាតុមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
+DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
+DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
+DocType: Account,Balance Sheet,តារាងតុល្យការ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,មនុស្សម្នាក់ដែលលក់របស់អ្នកនឹងទទួលបាននូវការរំលឹកមួយនៅលើកាលបរិច្ឆេទនេះដើម្បីទាក់ទងអតិថិជន
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ពន្ធនិងការកាត់ប្រាក់ខែផ្សេងទៀត។
+DocType: Lead,Lead,ការនាំមុខ
 DocType: Email Digest,Payables,បង់
 DocType: Account,Warehouse,ឃ្លាំង
-,Purchase Order Items To Be Billed,ការបញ្ជាទិញធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
-DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
-DocType: Purchase Invoice Item,Purchase Invoice Item,ទិញទំនិញវិក័យប័ត្រ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ភាគហ៊ុនរបស់ក្រុម GL ធាតុសៀវភៅធាតុត្រូវបាននិងសម្រាប់បង្កាន់ដៃ reposted ទិញបានជ្រើសរើស
+,Purchase Order Items To Be Billed,ការបញ្ជាទិញធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
+DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
+DocType: Purchase Invoice Item,Purchase Invoice Item,ទិញទំនិញវិក័យប័ត្រ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ភាគហ៊ុនរបស់ក្រុម GL ធាតុសៀវភៅធាតុត្រូវបាននិងសម្រាប់បង្កាន់ដៃ reposted ទិញបានជ្រើសរើស
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ធាតុ 1
-DocType: Holiday,Holiday,ថ្ងៃឈប់សម្រាក
-DocType: Event,Saturday,ថ្ងៃសៅរ៍
-DocType: Leave Control Panel,Leave blank if considered for all branches,ទុកទទេប្រសិនបើអ្នកចាត់ទុកថាជាសាខាទាំងអស់
-,Daily Time Log Summary,ជារៀងរាល់ថ្ងៃពេលវេលាកំណត់ហេតុសង្ខេប
-DocType: DocField,Label,ស្លាក
-DocType: Payment Reconciliation,Unreconciled Payment Details,ពត៌មានលំអិតការទូទាត់ Unreconciled
-DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
-DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
-DocType: Lead,Call,ការហៅ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
-,Trial Balance,អង្គជំនុំតុល្យភាព
-apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ការរៀបចំបុគ្គលិក
-apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡាចត្រង្គ &quot;
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ស្រាវជ្រាវ
-DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
-apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
-DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
-DocType: Communication,Sent,ដែលបានផ្ញើ
-apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,មើលសៀវភៅ
-DocType: File,Lft,Lft
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
-DocType: Communication,Delivery Status,ស្ថានភាពដឹកជញ្ជូន
-DocType: Production Order,Manufacture against Sales Order,ផលិតប្រឆាំងនឹងការលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,នៅសល់នៃពិភពលោក
-,Budget Variance Report,របាយការណ៍អថេរថវិការ
-DocType: Salary Slip,Gross Pay,បង់សរុបបាន
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភបង់ប្រាក់
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,គណនេយ្យសៀវភៅធំ
-DocType: Stock Reconciliation,Difference Amount,ចំនួនទឹកប្រាក់ដែលមានភាពខុសគ្នា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
-DocType: BOM Item,Item Description,ធាតុការពិពណ៌នាសង្ខេប
-DocType: Payment Tool,Payment Mode,របៀបទូទាត់ប្រាក់
-DocType: Purchase Invoice,Is Recurring,តើការកើតឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,sintering ឡាស៊ែរលោហៈដោយផ្ទាល់
-DocType: Purchase Order,Supplied Items,ធាតុដែលបានផ្គត់ផ្គង់
-DocType: Production Order,Qty To Manufacture,qty ដើម្បីផលិត
-DocType: Buying Settings,Maintain same rate throughout purchase cycle,រក្សាអត្រាការប្រាក់ដូចគ្នាពេញមួយវដ្តនៃការទិញ
-DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
-,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
-DocType: Address,Address Type,ប្រភេទអាសយដ្ឋាន
-DocType: Purchase Receipt,Rejected Warehouse,ឃ្លាំងច្រានចោល
-DocType: GL Entry,Against Voucher,ប្រឆាំងនឹងប័ណ្ណ
-DocType: Item,Default Buying Cost Center,មជ្ឈមណ្ឌលការចំណាយទិញលំនាំដើម
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ដើម្បីទទួលបានប្រយោជន៍ច្រើនបំផុតក្នុង ERPNext យើងផ្ដល់អនុសាសន៍ថាអ្នកបានយកពេលវេលាមួយចំនួននិងមើលវីដេអូបានជំនួយទាំងនេះ។
+DocType: Holiday,Holiday,ថ្ងៃឈប់សម្រាក
+DocType: Leave Control Panel,Leave blank if considered for all branches,ទុកទទេប្រសិនបើអ្នកចាត់ទុកថាជាសាខាទាំងអស់
+,Daily Time Log Summary,ជារៀងរាល់ថ្ងៃពេលវេលាកំណត់ហេតុសង្ខេប
+DocType: Payment Reconciliation,Unreconciled Payment Details,ពត៌មានលំអិតការទូទាត់ Unreconciled
+DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
+DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
+DocType: Lead,Call,ការហៅ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
+,Trial Balance,អង្គជំនុំតុល្យភាព
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ការរៀបចំបុគ្គលិក
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ក្រឡាចត្រង្គ &quot;
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ស្រាវជ្រាវ
+DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
+apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
+DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,មើលសៀវភៅ
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
+DocType: Production Order,Manufacture against Sales Order,ផលិតប្រឆាំងនឹងការលក់សណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,នៅសល់នៃពិភពលោក
+,Budget Variance Report,របាយការណ៍អថេរថវិការ
+DocType: Salary Slip,Gross Pay,បង់សរុបបាន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,ភាគលាភបង់ប្រាក់
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,គណនេយ្យសៀវភៅធំ
+DocType: Stock Reconciliation,Difference Amount,ចំនួនទឹកប្រាក់ដែលមានភាពខុសគ្នា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
+DocType: BOM Item,Item Description,ធាតុការពិពណ៌នាសង្ខេប
+DocType: Payment Tool,Payment Mode,របៀបទូទាត់ប្រាក់
+DocType: Purchase Invoice,Is Recurring,តើការកើតឡើង
+DocType: Purchase Order,Supplied Items,ធាតុដែលបានផ្គត់ផ្គង់
+DocType: Production Order,Qty To Manufacture,qty ដើម្បីផលិត
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,រក្សាអត្រាការប្រាក់ដូចគ្នាពេញមួយវដ្តនៃការទិញ
+DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ពិធីបើកបណ្តោះអាសន្ន
+,Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យភាព
+DocType: Address,Address Type,ប្រភេទអាសយដ្ឋាន
+DocType: Purchase Receipt,Rejected Warehouse,ឃ្លាំងច្រានចោល
+DocType: GL Entry,Against Voucher,ប្រឆាំងនឹងប័ណ្ណ
+DocType: Item,Default Buying Cost Center,មជ្ឈមណ្ឌលការចំណាយទិញលំនាំដើម
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",ដើម្បីទទួលបានប្រយោជន៍ច្រើនបំផុតក្នុង ERPNext យើងផ្ដល់អនុសាសន៍ថាអ្នកបានយកពេលវេលាមួយចំនួននិងមើលវីដេអូបានជំនួយទាំងនេះ។
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,ដើម្បី
-DocType: Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
-,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
-DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
-apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ខ្នាតតូច
-DocType: Employee,Employee Number,ចំនួនបុគ្គលិក
-,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
+DocType: Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
+,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
+DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ខ្នាតតូច
+DocType: Employee,Employee Number,ចំនួនបុគ្គលិក
+,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ពណ៌បៃតង
-DocType: Item,Auto re-order,ការបញ្ជាទិញជាថ្មីម្តងទៀតដោយស្វ័យប្រវត្តិ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,សរុបសម្រេច
-DocType: Employee,Place of Issue,ទីកន្លែងបញ្ហា
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ការចុះកិច្ចសន្យា
-DocType: Report,Disabled,ជនពិការ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ការចំណាយដោយប្រយោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,កសិកម្ម
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
-DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
-DocType: Journal Entry Account,Purchase Order,ការបញ្ជាទិញ
-DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ឈ្មោះត្រូវបានទាមទារ
-DocType: Purchase Invoice,Recurring Type,ប្រភេទកើតឡើង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ពណ៌បៃតង
+DocType: Item,Auto re-order,ការបញ្ជាទិញជាថ្មីម្តងទៀតដោយស្វ័យប្រវត្តិ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,សរុបសម្រេច
+DocType: Employee,Place of Issue,ទីកន្លែងបញ្ហា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ការចុះកិច្ចសន្យា
+DocType: Email Digest,Add Quote,បន្ថែមសម្រង់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ការចំណាយដោយប្រយោល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
+DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
+DocType: Journal Entry Account,Purchase Order,ការបញ្ជាទិញ
+DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
+DocType: Purchase Invoice,Recurring Type,ប្រភេទកើតឡើង
 DocType: Address,City/Town,ទីក្រុង / ក្រុង
-DocType: Email Digest,Annual Income,ប្រាក់ចំណូលប្រចាំឆ្នាំ
-DocType: Serial No,Serial No Details,គ្មានព័ត៌មានលំអិតសៀរៀល
-DocType: Purchase Invoice Item,Item Tax Rate,អត្រាអាករធាតុ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ឧបករណ៍រាជធានី
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
-DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
-apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
-DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
-DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,សម្រាប់ផ្គត់ផ្គង់
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
-DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ចេញសរុប
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",មានតែអាចជាលក្ខខណ្ឌមួយដែលមានការដឹកជញ្ជូនវិធាន 0 ឬតម្លៃវានៅទទេសម្រាប់ &quot;ឱ្យតម្លៃ&quot;
-DocType: Authorization Rule,Transaction,ប្រតិបត្តិការ
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ចំណាំ: មជ្ឈមណ្ឌលនេះជាការចំណាយក្រុម។ មិនអាចធ្វើឱ្យការបញ្ចូលគណនីប្រឆាំងនឹងក្រុម។
-apps/frappe/frappe/config/desk.py +7,Tools,ឧបករណ៍
-DocType: Item,Website Item Groups,ក្រុមធាតុវេបសាយ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,លេខលំដាប់របស់ផលិតកម្មជាការចាំបាច់សម្រាប់ធាតុភាគហ៊ុនផលិតគោលបំណង
-DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Journal Entry,Journal Entry,ធាតុទិនានុប្បវត្តិ
-DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
-DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,យោបល់
-DocType: Salary Slip,Bank Account No.,លេខគណនីធនាគារ
-DocType: Naming Series,This is the number of the last created transaction with this prefix,នេះជាចំនួននៃការប្រតិបត្តិការបង្កើតចុងក្រោយជាមួយបុព្វបទនេះ
-DocType: Quality Inspection Reading,Reading 8,ការអាន 8
+DocType: Email Digest,Annual Income,ប្រាក់ចំណូលប្រចាំឆ្នាំ
+DocType: Serial No,Serial No Details,គ្មានព័ត៌មានលំអិតសៀរៀល
+DocType: Purchase Invoice Item,Item Tax Rate,អត្រាអាករធាតុ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ឧបករណ៍រាជធានី
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
+DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
+DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
+DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,គេរំពឹងថាកាលបរិច្ឆេទដឹកជញ្ជូនគឺតិចជាងចាប់ផ្ដើមគំរោងកាលបរិច្ឆេទ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
+DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ចេញសរុប
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",មានតែអាចជាលក្ខខណ្ឌមួយដែលមានការដឹកជញ្ជូនវិធាន 0 ឬតម្លៃវានៅទទេសម្រាប់ &quot;ឱ្យតម្លៃ&quot;
+DocType: Authorization Rule,Transaction,ប្រតិបត្តិការ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ចំណាំ: មជ្ឈមណ្ឌលនេះជាការចំណាយក្រុម។ មិនអាចធ្វើឱ្យការបញ្ចូលគណនីប្រឆាំងនឹងក្រុម។
+DocType: Item,Website Item Groups,ក្រុមធាតុវេបសាយ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,លេខលំដាប់របស់ផលិតកម្មជាការចាំបាច់សម្រាប់ធាតុភាគហ៊ុនផលិតគោលបំណង
+DocType: Purchase Invoice,Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Journal Entry,Journal Entry,ធាតុទិនានុប្បវត្តិ
+DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
+DocType: Sales Partner,Target Distribution,ចែកចាយគោលដៅ
+DocType: Salary Slip,Bank Account No.,លេខគណនីធនាគារ
+DocType: Naming Series,This is the number of the last created transaction with this prefix,នេះជាចំនួននៃការប្រតិបត្តិការបង្កើតចុងក្រោយជាមួយបុព្វបទនេះ
+DocType: Quality Inspection Reading,Reading 8,ការអាន 8
 DocType: Sales Partner,Agent,ភ្នាក់ងារ
-DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធនិងការចោទប្រកាន់ពីការគណនា
-DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែករឹង
-DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ឯកសិទ្ធិចាកចេញ
-DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,គ្មានទិន្នន័យ
-DocType: Appraisal Template Goal,Appraisal Template Goal,គោលដៅវាយតម្លៃទំព័រគំរូ
-DocType: Salary Slip,Earning,រកប្រាក់ចំណូល
-DocType: Payment Tool,Party Account Currency,គណបក្សគណនីរូបិយប័ណ្ណ
-,BOM Browser,កម្មវិធីរុករក Bom
-DocType: Purchase Taxes and Charges,Add or Deduct,បន្ថែមឬកាត់កង
-DocType: Company,If Yearly Budget Exceeded (for expense account),ប្រសិនបើមានថវិកាប្រចាំឆ្នាំលើសពី (សម្រាប់គណនីដែលការចំណាយ)
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,លក្ខខណ្ឌត្រួតស៊ីគ្នាបានរកឃើញរវាង:
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,តម្លៃលំដាប់សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,អាហារ
+DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធនិងការចោទប្រកាន់ពីការគណនា
+DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ផ្នែករឹង
+DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
+apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,ឯកសិទ្ធិចាកចេញ
+DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
+DocType: Appraisal Template Goal,Appraisal Template Goal,គោលដៅវាយតម្លៃទំព័រគំរូ
+DocType: Salary Slip,Earning,រកប្រាក់ចំណូល
+DocType: Payment Tool,Party Account Currency,គណបក្សគណនីរូបិយប័ណ្ណ
+,BOM Browser,កម្មវិធីរុករក Bom
+DocType: Purchase Taxes and Charges,Add or Deduct,បន្ថែមឬកាត់កង
+DocType: Company,If Yearly Budget Exceeded (for expense account),ប្រសិនបើមានថវិកាប្រចាំឆ្នាំលើសពី (សម្រាប់គណនីដែលការចំណាយ)
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,លក្ខខណ្ឌត្រួតស៊ីគ្នាបានរកឃើញរវាង:
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,តម្លៃលំដាប់សរុប
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,អាហារ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ជួរ Ageing 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,អ្នកអាចធ្វើឱ្យពេលវេលាជាគ្រាន់តែជាកំណត់ហេតុប្រឆាំងទៅនឹងគោលបំណងផលិតកម្មដែលបានដាក់ជូន
-DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
-DocType: File,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",ការពិពណ៌នាទៅទំនាក់ទំនងនាំ។
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ។
-,Delivered Items To Be Billed,ធាតុដែលបានផ្តល់ជូននឹងត្រូវបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
-DocType: DocField,Description,ការពិពណ៌នាសង្ខេប
-DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
-DocType: Letter Head,Is Default,ជាលំនាំដើម
-DocType: Address,Utilities,ឧបករណ៍ប្រើប្រាស់
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,អ្នកអាចធ្វើឱ្យពេលវេលាជាគ្រាន់តែជាកំណត់ហេតុប្រឆាំងទៅនឹងគោលបំណងផលិតកម្មដែលបានដាក់ជូន
+DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",ការពិពណ៌នាទៅទំនាក់ទំនងនាំ។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ។
+,Delivered Items To Be Billed,ធាតុដែលបានផ្តល់ជូននឹងត្រូវបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
+DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
+DocType: Address,Utilities,ឧបករណ៍ប្រើប្រាស់
 DocType: Purchase Invoice Item,Accounting,គណនេយ្យ
-DocType: Features Setup,Features Setup,ការរៀបចំលក្ខណៈពិសេស
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,មើលលិខិតផ្តល់ជូន
-DocType: Communication,Communication,ការទំនាក់ទំនង
-DocType: Item,Is Service Item,តើមានធាតុសេវា
-DocType: Activity Cost,Projects,គម្រោងការ
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,សូមជ្រើសរើសឆ្នាំសារពើពន្ធ
-DocType: BOM Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
-DocType: Item,Will also apply to variants,ក៏នឹងអនុវត្តទៅវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
-DocType: Quotation,Shopping Cart,កន្រ្តកទំនិញ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ជាមធ្យមប្រចាំថ្ងៃចេញ
-DocType: Pricing Rule,Campaign,យុទ្ធនាការឃោសនា
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
+DocType: Features Setup,Features Setup,ការរៀបចំលក្ខណៈពិសេស
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,មើលលិខិតផ្តល់ជូន
+DocType: Item,Is Service Item,តើមានធាតុសេវា
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
+DocType: Activity Cost,Projects,គម្រោងការ
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,សូមជ្រើសរើសឆ្នាំសារពើពន្ធ
+DocType: BOM Operation,Operation Description,ប្រតិបត្ដិការពិពណ៌នាសង្ខេប
+DocType: Item,Will also apply to variants,ក៏នឹងអនុវត្តទៅវ៉ារ្យ៉ង់
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរការចាប់ផ្តើមឆ្នាំសារពើពន្ធឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទនៅពេលដែលកាលបរិច្ឆេទបញ្ចប់ឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
+DocType: Quotation,Shopping Cart,កន្រ្តកទំនិញ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ជាមធ្យមប្រចាំថ្ងៃចេញ
+DocType: Pricing Rule,Campaign,យុទ្ធនាការឃោសនា
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
 DocType: Purchase Invoice,Contact Person,ទំនាក់ទំនង
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
-DocType: Holiday List,Holidays,ថ្ងៃឈប់សម្រាក
-DocType: Sales Order Item,Planned Quantity,បរិមាណដែលបានគ្រោងទុក
-DocType: Purchase Invoice Item,Item Tax Amount,ចំនួនទឹកប្រាក់ពន្ធលើធាតុ
-DocType: Item,Maintain Stock,ការរក្សាហ៊ុន
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
-DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
-apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,ចាប់ពី Datetime
-DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
-apps/erpnext/erpnext/config/support.py +38,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
-DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
-apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,គំនូសតាងគណនី
-DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,មិនអាចជាធំជាង 100
-DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
-DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
-DocType: Salary Slip Deduction,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
-DocType: Pricing Rule,"Higher the number, higher the priority","ខ្ពស់ជាងចំនួន, ខ្ពស់ជាងអាទិភាព"
-,Purchase Invoice Trends,ទិញវិក័យប័ត្រនិន្នាការ
-DocType: Employee,Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន
-DocType: Appraisal,Goals,គ្រាប់បាល់បញ្ចូលទី
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
+DocType: Holiday List,Holidays,ថ្ងៃឈប់សម្រាក
+DocType: Sales Order Item,Planned Quantity,បរិមាណដែលបានគ្រោងទុក
+DocType: Purchase Invoice Item,Item Tax Amount,ចំនួនទឹកប្រាក់ពន្ធលើធាតុ
+DocType: Item,Maintain Stock,ការរក្សាហ៊ុន
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
+DocType: Leave Control Panel,Leave blank if considered for all designations,ប្រសិនបើអ្នកទុកវាឱ្យទទេសម្រាប់ការរចនាទាំងអស់បានពិចារណាថា
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,ចាប់ពី Datetime
+DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
+apps/erpnext/erpnext/config/support.py +38,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
+DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,គំនូសតាងគណនី
+DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,មិនអាចជាធំជាង 100
+DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
+DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
+DocType: Pricing Rule,"Higher the number, higher the priority","ខ្ពស់ជាងចំនួន, ខ្ពស់ជាងអាទិភាព"
+,Purchase Invoice Trends,ទិញវិក័យប័ត្រនិន្នាការ
+DocType: Employee,Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន
+DocType: Appraisal,Goals,គ្រាប់បាល់បញ្ចូលទី
 DocType: Warranty Claim,Warranty / AMC Status,ការធានា / ស្ថានភាព AMC
-,Accounts Browser,កម្មវិធីរុករកគណនី
+,Accounts Browser,កម្មវិធីរុករកគណនី
 DocType: GL Entry,GL Entry,ចូល GL ដើម
-DocType: HR Settings,Employee Settings,ការកំណត់បុគ្គលិក
-,Batch-Wise Balance History,ប្រាជ្ញាតុល្យភាពបាច់ប្រវត្តិ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ដើម្បីធ្វើបញ្ជី
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,សិស្ស
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+DocType: HR Settings,Employee Settings,ការកំណត់បុគ្គលិក
+,Batch-Wise Balance History,ប្រាជ្ញាតុល្យភាពបាច់ប្រវត្តិ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ដើម្បីធ្វើបញ្ជី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,សិស្ស
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,បរិមាណដែលត្រូវទទួលទានអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
-Used for Taxes and Charges",តារាងពន្ធលើការដែលបានទៅយកពីព័ត៌មានលម្អិតធាតុដែលម្ចាស់ជាខ្សែអក្សរមួយនិងបានរក្សាទុកនៅក្នុងវាលនេះ។ ត្រូវបានប្រើសម្រាប់ការបង់ពន្ធនិងបន្ទុក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
-DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
-DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
-DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
-apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
-DocType: Rename Tool,Type of document to rename.,ប្រភេទនៃឯកសារដែលបានប្ដូរឈ្មោះ។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,យើងទិញធាតុនេះ
-DocType: Address,Billing,វិក័យប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,គែម
-DocType: Bulk Email,Not Sent,មិនបានផ្ញើរ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ផ្ទុះការបង្កើត
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ពន្ធសរុបនិងការចោទប្រកាន់ (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
-DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
+Used for Taxes and Charges",តារាងពន្ធលើការដែលបានទៅយកពីព័ត៌មានលម្អិតធាតុដែលម្ចាស់ជាខ្សែអក្សរមួយនិងបានរក្សាទុកនៅក្នុងវាលនេះ។ ត្រូវបានប្រើសម្រាប់ការបង់ពន្ធនិងបន្ទុក
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
+DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
+DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
+DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
+DocType: Rename Tool,Type of document to rename.,ប្រភេទនៃឯកសារដែលបានប្ដូរឈ្មោះ។
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,យើងទិញធាតុនេះ
+DocType: Address,Billing,វិក័យប័ត្រ
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ពន្ធសរុបនិងការចោទប្រកាន់ (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
+DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
 DocType: Quality Inspection,Readings,អាន
-DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,សភាអនុ
-DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
-DocType: Supplier,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ការិយាល័យសំរាប់ជួល
-apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
-apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,គ្មានអាសយដ្ឋានបន្ថែមនៅឡើយទេ។
-DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយការងារការងារហួរ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,អ្នកវិភាគ
-DocType: Item,Inventory,សារពើភ័ណ្ឌ
-DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បីបើកការ«ចំណុចនៃការលក់«ទស្សនៈ
-apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ការទូទាត់មិនអាចត្រូវបានធ្វើឡើងសម្រាប់រទេះទទេ
-DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,pinning
-DocType: Opportunity,With Items,ជាមួយនឹងការធាតុ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,នៅក្នុង qty
-DocType: Notification Control,Expense Claim Rejected,ពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
+DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,សភាអនុ
+DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
+DocType: Supplier,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,ការិយាល័យសំរាប់ជួល
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,គ្មានអាសយដ្ឋានបន្ថែមនៅឡើយទេ។
+DocType: Workstation Working Hour,Workstation Working Hour,ស្ថានីយការងារការងារហួរ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,អ្នកវិភាគ
+DocType: Item,Inventory,សារពើភ័ណ្ឌ
+DocType: Features Setup,"To enable ""Point of Sale"" view",ដើម្បីបើកការ«ចំណុចនៃការលក់«ទស្សនៈ
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ការទូទាត់មិនអាចត្រូវបានធ្វើឡើងសម្រាប់រទេះទទេ
+DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
+DocType: Opportunity,With Items,ជាមួយនឹងការធាតុ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,នៅក្នុង qty
+DocType: Notification Control,Expense Claim Rejected,ពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
-",កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
-DocType: Item Attribute,Item Attribute,គុណលក្ខណៈធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,រដ្ឋាភិបាល
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,វ៉ារ្យ៉ង់ធាតុ
-DocType: Company,Services,ការផ្តល់សេវា
-DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
+",កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
+DocType: Item Attribute,Item Attribute,គុណលក្ខណៈធាតុ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,រដ្ឋាភិបាល
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,វ៉ារ្យ៉ង់ធាតុ
+DocType: Company,Services,ការផ្តល់សេវា
+DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
 DocType: Sales Invoice,Source,ប្រភព
-DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,កាលបរិច្ឆេទចាប់ផ្តើមក្នុងឆ្នាំហិរញ្ញវត្ថុ
-DocType: Employee External Work History,Total Experience,បទពិសោធន៍សរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
-DocType: Material Request Item,Sales Order No,គ្មានការលក់សណ្តាប់ធ្នាប់
-DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,គេយក
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
-DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
+DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,កាលបរិច្ឆេទចាប់ផ្តើមក្នុងឆ្នាំហិរញ្ញវត្ថុ
+DocType: Employee External Work History,Total Experience,បទពិសោធន៍សរុប
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ការចោទប្រកាន់ការដឹកជញ្ជូននិងការបញ្ជូនបន្ត
+DocType: Material Request Item,Sales Order No,គ្មានការលក់សណ្តាប់ធ្នាប់
+DocType: Item Group,Item Group Name,ធាតុឈ្មោះក្រុម
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,គេយក
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
+DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
-DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
-DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
-apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,សូមបង្កើតគណនីថ្មីមួយពីតារាងនៃគណនី។
-DocType: Maintenance Visit,Maintenance Visit,ថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,អតិថិជន&gt; គ្រុបអតិថិជន&gt; ដែនដី
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,បាច់អាចរកបាន Qty នៅឃ្លាំង
-DocType: Time Log Batch Detail,Time Log Batch Detail,ពត៌មានលំអិតបាច់កំណត់ហេតុម៉ោង
-DocType: Workflow State,Tasks,ភារកិច្ច
-DocType: Landed Cost Voucher,Landed Cost Help,ជំនួយការចំណាយបានចុះចត
-DocType: Event,Tuesday,កាលពីថ្ងៃអង្គារ
-DocType: Leave Block List,Block Holidays on important days.,ប្រតិទិនឈប់សម្រាកនៅថ្ងៃដ៏សំខាន់ប្លុក។
-,Accounts Receivable Summary,គណនីសង្ខេបទទួល
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
+DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
+DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម (រូបិយប័ណ្ណរបស់ក្រុមហ៊ុន)
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,សូមបង្កើតគណនីថ្មីមួយពីតារាងនៃគណនី។
+DocType: Maintenance Visit,Maintenance Visit,ថែទាំទស្សនកិច្ច
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,អតិថិជន&gt; គ្រុបអតិថិជន&gt; ដែនដី
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,បាច់អាចរកបាន Qty នៅឃ្លាំង
+DocType: Time Log Batch Detail,Time Log Batch Detail,ពត៌មានលំអិតបាច់កំណត់ហេតុម៉ោង
+DocType: Landed Cost Voucher,Landed Cost Help,ជំនួយការចំណាយបានចុះចត
+DocType: Leave Block List,Block Holidays on important days.,ប្រតិទិនឈប់សម្រាកនៅថ្ងៃដ៏សំខាន់ប្លុក។
+,Accounts Receivable Summary,គណនីសង្ខេបទទួល
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
 DocType: UOM,UOM Name,ឈ្មោះ UOM
-DocType: Top Bar Item,Target,គោលដៅ
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,ចំនួនទឹកប្រាក់ចំែណក
-DocType: Sales Invoice,Shipping Address,ការដឹកជញ្ជូនអាសយដ្ឋាន
-DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,ឧបករណ៍នេះអាចជួយអ្នកក្នុងការធ្វើឱ្យទាន់សម័យឬជួសជុលបរិមាណនិងតម្លៃនៃភាគហ៊ុននៅក្នុងប្រព័ន្ធ។ វាត្រូវបានប្រើដើម្បីធ្វើសមកាលកម្មតម្លៃប្រព័ន្ធនិងអ្វីដែលជាការពិតមាននៅក្នុងឃ្លាំងរបស់អ្នក។
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ចៅហ្វាយម៉ាក។
-DocType: ToDo,Due Date,កាលបរិច្ឆេទដល់កំណត់
-DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
-DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,ប្រអប់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,អង្គការ
-DocType: Monthly Distribution,Monthly Distribution,ចែកចាយប្រចាំខែ
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
-DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
-DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
-DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ស្នាមចោះ
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,គណនីធនាគារ
-,Bank Reconciliation Statement,សេចក្តីថ្លែងការរបស់ធនាគារការផ្សះផ្សា
-DocType: Address,Lead Name,ការនាំមុខឈ្មោះ
-,POS,ម៉ាស៊ីនឆូតកាត
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ការបើកផ្សារហ៊ុនតុល្យភាព
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មានធាតុខ្ចប់
-DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងធនាគារ
-DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
-apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ការសម្ដែង centrifugal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,បញ្ចប់វាលជំនួយម៉ាញេទិច
-DocType: Company,Default Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកលំនាំដើម
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,បំណុលភាគហ៊ុន
-DocType: Purchase Receipt,Supplier Warehouse,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនងទូរស័ព្ទគ្មាន
-DocType: Production Planning Tool,Select Sales Orders,ជ្រើសការបញ្ជាទិញលក់
-,Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
-DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ដើម្បីតាមដានធាតុដែលបានប្រើប្រាស់លេខកូដ។ អ្នកនឹងអាចចូលទៅក្នុងធាតុនៅក្នុងការចំណាំដឹកជញ្ជូននិងការលក់វិក័យប័ត្រដោយការស្កេនលេខកូដនៃធាតុ។
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,សម្គាល់ថាបានដឹកនាំ
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ចូរធ្វើសម្រង់
-DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
-DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
-DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
-DocType: Payment Tool Detail,Payment Amount,ចំនួនទឹកប្រាក់ការទូទាត់
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
-DocType: Salary Structure Deduction,Salary Structure Deduction,ការកាត់រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,sintering ឡាស៊ែរជ្រើសរើស
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,ការនាំចូលដែលទទួលបានជោគជ័យ!
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),អាយុ (ថ្ងៃ)
-DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
-DocType: Account,Account Name,ឈ្មោះគណនី
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
-DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,បន្ថែម
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
-DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
-DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
-DocType: Company,Default Payable Account,គណនីទូទាត់លំនាំដើម
-apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",ការកំណត់សម្រាប់រទេះដើរទិញឥវ៉ាន់អនឡាញដូចជាវិធានការដឹកជញ្ជូនបញ្ជីតម្លៃល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,រៀបចំការបំពេញ
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,ចំនួនទឹកប្រាក់ចំែណក
+DocType: Sales Invoice,Shipping Address,ការដឹកជញ្ជូនអាសយដ្ឋាន
+DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,ឧបករណ៍នេះអាចជួយអ្នកក្នុងការធ្វើឱ្យទាន់សម័យឬជួសជុលបរិមាណនិងតម្លៃនៃភាគហ៊ុននៅក្នុងប្រព័ន្ធ។ វាត្រូវបានប្រើដើម្បីធ្វើសមកាលកម្មតម្លៃប្រព័ន្ធនិងអ្វីដែលជាការពិតមាននៅក្នុងឃ្លាំងរបស់អ្នក។
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ចៅហ្វាយម៉ាក។
+DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
+DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,ប្រអប់
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,អង្គការ
+DocType: Monthly Distribution,Monthly Distribution,ចែកចាយប្រចាំខែ
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
+DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
+DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
+DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,គណនីធនាគារ
+,Bank Reconciliation Statement,សេចក្តីថ្លែងការរបស់ធនាគារការផ្សះផ្សា
+DocType: Address,Lead Name,ការនាំមុខឈ្មោះ
+,POS,ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ការបើកផ្សារហ៊ុនតុល្យភាព
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,គ្មានធាតុខ្ចប់
+DocType: Shipping Rule Condition,From Value,ពីតម្លៃ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងធនាគារ
+DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
+DocType: Company,Default Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកលំនាំដើម
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,បំណុលភាគហ៊ុន
+DocType: Purchase Receipt,Supplier Warehouse,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Opportunity,Contact Mobile No,ទំនាក់ទំនងទូរស័ព្ទគ្មាន
+DocType: Production Planning Tool,Select Sales Orders,ជ្រើសការបញ្ជាទិញលក់
+,Material Requests for which Supplier Quotations are not created,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ដើម្បីតាមដានធាតុដែលបានប្រើប្រាស់លេខកូដ។ អ្នកនឹងអាចចូលទៅក្នុងធាតុនៅក្នុងការចំណាំដឹកជញ្ជូននិងការលក់វិក័យប័ត្រដោយការស្កេនលេខកូដនៃធាតុ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,សម្គាល់ថាបានដឹកនាំ
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ចូរធ្វើសម្រង់
+DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
+DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
+DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
+DocType: Payment Tool Detail,Payment Amount,ចំនួនទឹកប្រាក់ការទូទាត់
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
+DocType: Salary Structure Deduction,Salary Structure Deduction,ការកាត់រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),អាយុ (ថ្ងៃ)
+DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
+DocType: Account,Account Name,ឈ្មោះគណនី
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,ពីកាលបរិច្ឆេទមិនអាចមានចំនួនច្រើនជាងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ប្រភេទផ្គត់ផ្គង់គ្រូ។
+DocType: Purchase Order Item,Supplier Part Number,ក្រុមហ៊ុនផ្គត់ផ្គង់ផ្នែកមួយចំនួន
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,អត្រានៃការប្រែចិត្តជឿមិនអាចជា 0 ឬ 1
+DocType: Accounts Settings,Credit Controller,ឧបករណ៍ត្រួតពិនិត្យឥណទាន
+DocType: Delivery Note,Vehicle Dispatch Date,កាលបរិច្ឆេទបញ្ជូនយានយន្ត
+DocType: Company,Default Payable Account,គណនីទូទាត់លំនាំដើម
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",ការកំណត់សម្រាប់រទេះដើរទិញឥវ៉ាន់អនឡាញដូចជាវិធានការដឹកជញ្ជូនបញ្ជីតម្លៃល
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,រក្សា Qty
-DocType: Party Account,Party Account,គណនីគណបក្ស
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
-DocType: Lead,Upper Income,ផ្នែកខាងលើប្រាក់ចំណូល
-DocType: Journal Entry Account,Debit in Company Currency,ឥណពន្ធក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
-apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,បញ្ហារបស់ខ្ញុំ
+DocType: Party Account,Party Account,គណនីគណបក្ស
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ធនធានមនុស្ស
+DocType: Lead,Upper Income,ផ្នែកខាងលើប្រាក់ចំណូល
+DocType: Journal Entry Account,Debit in Company Currency,ឥណពន្ធក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,បញ្ហារបស់ខ្ញុំ
 DocType: BOM Item,BOM Item,ធាតុ Bom
-DocType: Appraisal,For Employee,សម្រាប់បុគ្គលិក
-DocType: Company,Default Values,តម្លៃលំនាំដើម
-DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,សារពត៌មានដែលសម
-DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-DocType: Payment Reconciliation,Payments,ការទូទាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic ក្តៅចុច
-DocType: ToDo,Medium,មធ្យម
-DocType: Budget Detail,Budget Allocated,ថវិកាដែលបានត្រៀមបម្រុងទុក
-DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
-,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,សូមផ្ទៀងផ្ទាត់លេខសម្គាល់អ៊ីមែលរបស់អ្នក
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',អតិថិជនដែលបានទាមទារសម្រាប់ &#39;បញ្ចុះតម្លៃ Customerwise &quot;
-apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
-DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
-DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
-DocType: Warranty Claim,Warranty Claim,បណ្តឹងធានា
-,Lead Details,ពត៌មានលំអិតនាំមុខ
-DocType: Authorization Rule,Approving User,ការអនុម័តរបស់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ក្លែងបន្លំ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ចាន
-DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
-DocType: Pricing Rule,Applicable For,កម្មវិធីសម្រាប់
-DocType: Bank Reconciliation,From Date,ពីកាលបរិច្ឆេទ
-DocType: Shipping Rule Country,Shipping Rule Country,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
-DocType: Maintenance Visit,Partially Completed,បានបញ្ចប់ដោយផ្នែក
-DocType: Leave Type,Include holidays within leaves as leaves,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងស្លឹកជាស្លឹក
+DocType: Appraisal,For Employee,សម្រាប់បុគ្គលិក
+DocType: Company,Default Values,តម្លៃលំនាំដើម
+DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
+DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
+DocType: Payment Reconciliation,Payments,ការទូទាត់
+DocType: Budget Detail,Budget Allocated,ថវិកាដែលបានត្រៀមបម្រុងទុក
+DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
+,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,សូមផ្ទៀងផ្ទាត់លេខសម្គាល់អ៊ីមែលរបស់អ្នក
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',អតិថិជនដែលបានទាមទារសម្រាប់ &#39;បញ្ចុះតម្លៃ Customerwise &quot;
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
+DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
+DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
+DocType: Warranty Claim,Warranty Claim,បណ្តឹងធានា
+,Lead Details,ពត៌មានលំអិតនាំមុខ
+DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
+DocType: Pricing Rule,Applicable For,កម្មវិធីសម្រាប់
+DocType: Bank Reconciliation,From Date,ពីកាលបរិច្ឆេទ
+DocType: Shipping Rule Country,Shipping Rule Country,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
+DocType: Maintenance Visit,Partially Completed,បានបញ្ចប់ដោយផ្នែក
+DocType: Leave Type,Include holidays within leaves as leaves,រួមបញ្ចូលថ្ងៃឈប់សម្រាកនៅក្នុងស្លឹកជាស្លឹក
 DocType: Sales Invoice,Packed Items,ធាតុ packed
-apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,ពាក្យបណ្តឹងប្រឆាំងនឹងលេខសៀរៀលធានា
-DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","ជំនួសជាក់លាក់ Bom ក្នុង BOMs ផ្សេងទៀតទាំងអស់ដែលជាកន្លែងដែលវាត្រូវបានគេប្រើ។ វានឹងជំនួសតំណ Bom អាយុ, ធ្វើឱ្យទាន់សម័យការចំណាយនិងការរីកលូតលាស់ឡើងវិញ &quot;ធាតុផ្ទុះ Bom&quot; តារាងជាមួយ Bom ថ្មី"
-DocType: Shopping Cart Settings,Enable Shopping Cart,បើកការកន្រ្តកទំនិញ
-DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),កាត់បន្ថយការកាត់ស្នើសុំការអនុញ្ញាតដោយគ្មានប្រាក់ខែ (LWP)
-DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
-DocType: Delivery Note Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
-DocType: Sales Invoice,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
-DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ក្រុមហ៊ុន, ខែនិងឆ្នាំសារពើពន្ធចាំបាច់"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ចំណាយទីផ្សារ
-,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើឱ្យធាតុគណនេយ្យសម្រាប់គ្រប់ចលនាហ៊ុន
-DocType: Leave Allocation,Total Leaves Allocated,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក
-DocType: Employee,Date Of Retirement,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍
-DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
-DocType: Address,Postal,ប្រៃសណីយ
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,ពាក្យបណ្តឹងប្រឆាំងនឹងលេខសៀរៀលធានា
+DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","ជំនួសជាក់លាក់ Bom ក្នុង BOMs ផ្សេងទៀតទាំងអស់ដែលជាកន្លែងដែលវាត្រូវបានគេប្រើ។ វានឹងជំនួសតំណ Bom អាយុ, ធ្វើឱ្យទាន់សម័យការចំណាយនិងការរីកលូតលាស់ឡើងវិញ &quot;ធាតុផ្ទុះ Bom&quot; តារាងជាមួយ Bom ថ្មី"
+DocType: Shopping Cart Settings,Enable Shopping Cart,បើកការកន្រ្តកទំនិញ
+DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),កាត់បន្ថយការកាត់ស្នើសុំការអនុញ្ញាតដោយគ្មានប្រាក់ខែ (LWP)
+DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
+DocType: Delivery Note Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
+DocType: Sales Invoice,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
+DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,សូមបរិមាណឬអត្រាវាយតម្លៃឬទាំងពីរបានបញ្ជាក់
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ក្រុមហ៊ុន, ខែនិងឆ្នាំសារពើពន្ធចាំបាច់"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ចំណាយទីផ្សារ
+,Item Shortage Report,របាយការណ៍កង្វះធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើឱ្យធាតុគណនេយ្យសម្រាប់គ្រប់ចលនាហ៊ុន
+DocType: Leave Allocation,Total Leaves Allocated,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,សូមបញ្ចូលឆ្នាំដែលមានសុពលភាពហិរញ្ញវត្ថុកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់
+DocType: Employee,Date Of Retirement,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍
+DocType: Upload Attendance,Get Template,ទទួលបានទំព័រគំរូ
+DocType: Address,Postal,ប្រៃសណីយ
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ការរុករករ៉ែ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ជ័រសម្ដែង
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
-DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
-DocType: Quality Inspection Reading,Reading 2,ការអាន 2
-DocType: Stock Entry,Material Receipt,សម្ភារៈបង្កាន់ដៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ផលិតផល
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ប្រសិនបើមានធាតុនេះមានវ៉ារ្យ៉ង់, បន្ទាប់មកវាមិនអាចត្រូវបានជ្រើសនៅក្នុងការបញ្ជាទិញការលក់ល"
-DocType: Lead,Next Contact By,ទំនាក់ទំនងបន្ទាប់ដោយ
-DocType: Quotation,Order Type,ប្រភេទលំដាប់
-DocType: Purchase Invoice,Notification Email Address,សេចក្តីជូនដំណឹងស្តីពីអាសយដ្ឋានអ៊ីម៉ែល
-DocType: Payment Tool,Find Invoices to Match,សែ្វងរកវិក័យប័ត្រឱ្យស្មើភាពគ្នារវាង
-,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",ឧទាហរណ៏ &quot;XYZ របស់ធនាគារជាតិ&quot;
-DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើការប្រមូលពន្ធលើនេះបានរួមបញ្ចូលក្នុងអត្រាជាមូលដ្ឋាន?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,គោលដៅសរុប
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,កន្រ្តកទំនិញត្រូវបានអនុញ្ញាត
-DocType: Job Applicant,Applicant for a Job,កម្មវិធីសម្រាប់ការងារ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
-DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
-apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
-DocType: Sales Invoice Item,Batch No,បាច់គ្មាន
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
-apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ដើមចម្បង
-DocType: DocPerm,Delete,លុប
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,វ៉ារ្យ៉ង់
-DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,គោលបំណងបញ្ឈប់ការដែលមិនអាចត្រូវបានលុបចោល។ ឮដើម្បីលុបចោល។
-DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
-DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
-DocType: SMS Center,Send To,បញ្ជូនទៅ
-DocType: Sales Team,Contribution to Net Total,ការចូលរួមចំណែកក្នុងការសុទ្ធសរុប
-DocType: Sales Invoice Item,Customer's Item Code,ក្រមធាតុរបស់អតិថិជន
-DocType: Stock Reconciliation,Stock Reconciliation,ភាគហ៊ុនការផ្សះផ្សា
-DocType: Territory,Territory Name,ឈ្មោះទឹកដី
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
-apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
-DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
-DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
-DocType: Country,Country,ប្រទេស
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
+DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
+DocType: Quality Inspection Reading,Reading 2,ការអាន 2
+DocType: Stock Entry,Material Receipt,សម្ភារៈបង្កាន់ដៃ
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,ផលិតផល
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ប្រសិនបើមានធាតុនេះមានវ៉ារ្យ៉ង់, បន្ទាប់មកវាមិនអាចត្រូវបានជ្រើសនៅក្នុងការបញ្ជាទិញការលក់ល"
+DocType: Lead,Next Contact By,ទំនាក់ទំនងបន្ទាប់ដោយ
+DocType: Quotation,Order Type,ប្រភេទលំដាប់
+DocType: Purchase Invoice,Notification Email Address,សេចក្តីជូនដំណឹងស្តីពីអាសយដ្ឋានអ៊ីម៉ែល
+DocType: Payment Tool,Find Invoices to Match,សែ្វងរកវិក័យប័ត្រឱ្យស្មើភាពគ្នារវាង
+,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",ឧទាហរណ៏ &quot;XYZ របស់ធនាគារជាតិ&quot;
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើការប្រមូលពន្ធលើនេះបានរួមបញ្ចូលក្នុងអត្រាជាមូលដ្ឋាន?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,គោលដៅសរុប
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,កន្រ្តកទំនិញត្រូវបានអនុញ្ញាត
+DocType: Job Applicant,Applicant for a Job,កម្មវិធីសម្រាប់ការងារ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,គ្មានការបញ្ជាទិញផលិតផលដែលបានបង្កើត
+DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
+DocType: Sales Invoice Item,Batch No,បាច់គ្មាន
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ដើមចម្បង
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,វ៉ារ្យ៉ង់
+DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,គោលបំណងបញ្ឈប់ការដែលមិនអាចត្រូវបានលុបចោល។ ឮដើម្បីលុបចោល។
+DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
+DocType: Item,Variants,វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+DocType: SMS Center,Send To,បញ្ជូនទៅ
+DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
+DocType: Sales Team,Contribution to Net Total,ការចូលរួមចំណែកក្នុងការសុទ្ធសរុប
+DocType: Sales Invoice Item,Customer's Item Code,ក្រមធាតុរបស់អតិថិជន
+DocType: Stock Reconciliation,Stock Reconciliation,ភាគហ៊ុនការផ្សះផ្សា
+DocType: Territory,Territory Name,ឈ្មោះទឹកដី
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
+DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
+DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,អាសយដ្ឋាន
-DocType: Communication,Received,ទទួលបាន
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ធាតុមិនត្រូវបានអនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល។
-DocType: DocField,Attach Image,ភ្ជាប់រូបភាព
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាផលបូកនៃទម្ងន់សុទ្ធនៃធាតុ)
-DocType: Stock Reconciliation Item,Leave blank if no change,ទុកឱ្យវានៅទទេបើគ្មានការផ្លាស់ប្តូរ
-DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
-DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,កំណត់ហេតុសម្រាប់ការផលិតវេលាម៉ោង។
-DocType: Item,Apply Warehouse-wise Reorder Level,អនុវត្តឃ្លាំងប្រាជ្ញារៀបចំកំរិត
-DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
-apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,កំណត់ហេតុពេលវេលាសម្រាប់ការងារ។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,ការទូទាត់
-DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
-DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
-DocType: Communication,Rejected,ច្រានចោល
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,លក្ខខណ្ឌមួយសម្រាប់វិធានការដឹកជញ្ជូនមួយ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ធាតុមិនត្រូវបានអនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល។
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាផលបូកនៃទម្ងន់សុទ្ធនៃធាតុ)
+DocType: Sales Order,To Deliver and Bill,ដើម្បីផ្តល់និង Bill
+DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,កំណត់ហេតុសម្រាប់ការផលិតវេលាម៉ោង។
+DocType: Item,Apply Warehouse-wise Reorder Level,អនុវត្តឃ្លាំងប្រាជ្ញារៀបចំកំរិត
+DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,កំណត់ហេតុពេលវេលាសម្រាប់ការងារ។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ការទូទាត់
+DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
+DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
 DocType: Pricing Rule,Brand,ម៉ាក
-DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
-DocType: Sales Order Item,Actual Qty,ជាក់ស្តែ Qty
+DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
+DocType: Sales Order Item,Actual Qty,ជាក់ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
-DocType: Quality Inspection Reading,Reading 10,ការអាន 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",រាយបញ្ជីផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។ ធ្វើឱ្យប្រាកដថាដើម្បីពិនិត្យមើលធាតុ Group ដែលជាឯកតារង្វាស់និងលក្ខណៈសម្បត្តិផ្សេងទៀតនៅពេលដែលអ្នកចាប់ផ្តើម។
-DocType: Hub Settings,Hub Node,ហាប់ថ្នាំង
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,រង
-DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ផុតកំណត់
-DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
-DocType: DocType,System,របស់ប្រព័ន្ធ
-DocType: Warranty Claim,Issue Date,បញ្ហាកាលបរិច្ឆេទ
-DocType: Activity Cost,Activity Cost,ការចំណាយសកម្មភាព
-DocType: Purchase Receipt Item Supplied,Consumed Qty,ប្រើប្រាស់ Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
-DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
-DocType: Payment Tool,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
-,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
-DocType: Leave Application,Apply / Approve Leaves,អនុវត្ត / អនុម័តស្លឹក
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
-DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
-DocType: Stock Settings,Allowance Percent,ភាគរយសំវិធានធន
-DocType: SMS Settings,Message Parameter,ប៉ារ៉ាម៉ែត្រសារដែលបាន
-DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ទទួលបានធាតុពីបង្កាន់ដៃទិញ
-DocType: Serial No,Creation Date,កាលបរិច្ឆេទបង្កើត
-DocType: Purchase Order Item,Supplier Quotation Item,ធាតុសម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ធ្វើឱ្យរចនាសម្ព័ន្ធប្រាក់ខែ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,កាត់
-DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ចុចលើប៊ូតុង &quot;ធ្វើឱ្យការលក់វិក័យប័ត្រក្នុងការបង្កើតវិក័យប័ត្រលក់ថ្មី។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,វេចខ្ចប់ស្លាកនិង
-DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
-DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
-apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,សូមបញ្ជាក់រូបិយប័ណ្ណលំនាំដើមក្នុងក្រុមហ៊ុន Master និងលំនាំដើមជាសកល
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox ចូលដំណើរការសម្ងាត់
-DocType: Purchase Invoice,Recurring Invoice,វិក័យប័ត្រកើតឡើង
-apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ការគ្រប់គ្រងគម្រោង
-DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុនផ្គត់ផ្គង់ទំនិញឬសេវា។
-DocType: Budget Detail,Fiscal Year,ឆ្នាំសារពើពន្ធ
-DocType: Cost Center,Budget,ថវិការ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,សម្រេចបាន
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,ទឹកដី / អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ឧ 5
-DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកវិក័យប័ត្រលក់។
-DocType: Item,Is Sales Item,តើមានធាតុលក់
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ធាតុគ្រុបដើមឈើមួយដើម
-DocType: Maintenance Visit,Maintenance Time,ថែទាំម៉ោង
-,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ផលិតផលឬសេវាកម្ម
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,មានកំហុស។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ការប្រើប្រាស់
-DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
-DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
-,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,តារាងធាតុមិនអាចទទេ
+DocType: Quality Inspection Reading,Reading 10,ការអាន 10
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",រាយបញ្ជីផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។ ធ្វើឱ្យប្រាកដថាដើម្បីពិនិត្យមើលធាតុ Group ដែលជាឯកតារង្វាស់និងលក្ខណៈសម្បត្តិផ្សេងទៀតនៅពេលដែលអ្នកចាប់ផ្តើម។
+DocType: Hub Settings,Hub Node,ហាប់ថ្នាំង
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,អ្នកបានបញ្ចូលធាតុស្ទួន។ សូមកែតម្រូវនិងព្យាយាមម្ដងទៀត។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,រង
+DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ផុតកំណត់
+DocType: Packing Slip,To Package No.,ខ្ចប់លេខ
+DocType: Warranty Claim,Issue Date,បញ្ហាកាលបរិច្ឆេទ
+DocType: Activity Cost,Activity Cost,ការចំណាយសកម្មភាព
+DocType: Purchase Receipt Item Supplied,Consumed Qty,ប្រើប្រាស់ Qty
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ទូរគមនាគមន៍
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),បង្ហាញថាកញ្ចប់នេះគឺជាផ្នែកមួយនៃរឿងនេះការចែកចាយ (មានតែសេចក្តីព្រាង)
+DocType: Payment Tool,Make Payment Entry,ធ្វើឱ្យធាតុទូទាត់ប្រាក់
+,Sales Invoice Trends,ការលក់វិក័យប័ត្រនិន្នាការ
+DocType: Leave Application,Apply / Approve Leaves,អនុវត្ត / អនុម័តស្លឹក
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ចំពោះ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
+DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
+DocType: Stock Settings,Allowance Percent,ភាគរយសំវិធានធន
+DocType: SMS Settings,Message Parameter,ប៉ារ៉ាម៉ែត្រសារដែលបាន
+DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,ទទួលបានធាតុពីបង្កាន់ដៃទិញ
+DocType: Serial No,Creation Date,កាលបរិច្ឆេទបង្កើត
+DocType: Purchase Order Item,Supplier Quotation Item,ធាតុសម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ធ្វើឱ្យរចនាសម្ព័ន្ធប្រាក់ខែ
+DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ចុចលើប៊ូតុង &quot;ធ្វើឱ្យការលក់វិក័យប័ត្រក្នុងការបង្កើតវិក័យប័ត្រលក់ថ្មី។
+DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
+DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,សូមបញ្ជាក់រូបិយប័ណ្ណលំនាំដើមក្នុងក្រុមហ៊ុន Master និងលំនាំដើមជាសកល
+DocType: Purchase Invoice,Recurring Invoice,វិក័យប័ត្រកើតឡើង
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ការគ្រប់គ្រងគម្រោង
+DocType: Supplier,Supplier of Goods or Services.,ក្រុមហ៊ុនផ្គត់ផ្គង់ទំនិញឬសេវា។
+DocType: Budget Detail,Fiscal Year,ឆ្នាំសារពើពន្ធ
+DocType: Cost Center,Budget,ថវិការ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,សម្រេចបាន
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,ទឹកដី / អតិថិជន
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,ឧ 5
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកវិក័យប័ត្រលក់។
+DocType: Item,Is Sales Item,តើមានធាតុលក់
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ធាតុគ្រុបដើមឈើមួយដើម
+DocType: Maintenance Visit,Maintenance Time,ថែទាំម៉ោង
+,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,ផលិតផលឬសេវាកម្ម
+DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
+DocType: Delivery Note Item,Against Sales Order,ប្រឆាំងនឹងដីកាលក់
+,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,តារាងធាតុមិនអាចទទេ
 DocType: Pricing Rule,Selling,លក់
-DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
-DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
-apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
-DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ភារកិច្ចនិងពន្ធ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាងសម្រាប់ធាតុដែលនឹងត្រូវបានបង្ហាញនៅក្នុងវ៉ិបសាយ
-DocType: Purchase Order Item Supplied,Supplied Qty,ការផ្គត់ផ្គង់ Qty
-DocType: Material Request Item,Material Request Item,ការស្នើសុំសម្ភារៈធាតុ
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,មែកធាងនៃក្រុមធាតុ។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
-,Item-wise Purchase History,ប្រវត្តិទិញប្រាជ្ញាធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ពណ៌ក្រហម
+DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
+DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+DocType: Website Item Group,Website Item Group,វេបសាយធាតុគ្រុប
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ភារកិច្ចនិងពន្ធ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាងសម្រាប់ធាតុដែលនឹងត្រូវបានបង្ហាញនៅក្នុងវ៉ិបសាយ
+DocType: Purchase Order Item Supplied,Supplied Qty,ការផ្គត់ផ្គង់ Qty
+DocType: Material Request Item,Material Request Item,ការស្នើសុំសម្ភារៈធាតុ
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,មែកធាងនៃក្រុមធាតុ។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
+,Item-wise Purchase History,ប្រវត្តិទិញប្រាជ្ញាធាតុ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ពណ៌ក្រហម
 DocType: Account,Frozen,ទឹកកក
-,Open Production Orders,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
-DocType: Installation Note,Installation Time,ពេលដំឡើង
-DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ការវិនិយោគ
-DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,ការផ្លាស់ប្តូរ UOM សម្រាប់ធាតុមួយ។
-DocType: Quality Inspection Reading,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
-DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
-DocType: Item Group,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ជាក្រុម
-DocType: Task,Expected Time (in hours),ពេលវេលាដែលគេរំពឹងថា (គិតជាម៉ោង)
-,Qty to Order,qty ម៉ង់ទិញ
-DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","ដើម្បីតាមដានឈ្មោះយីហោក្នុងឯកសារចំណាំដឹកជញ្ជូនឱកាសសម្ភារៈស្នើសុំ, ធាតុ, ការទិញសណ្តាប់ធ្នាប់, ការទិញប័ណ្ណ, ទទួលទិញសម្រង់, ការលក់វិក័យប័ត្រ, ផលិតផលកញ្ចប់, ការលក់សណ្តាប់ធ្នាប់, សៀរៀល, គ្មាន"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,គំនូសតាង Gantt ភារកិច្ចទាំងអស់។
-DocType: Appraisal,For Employee Name,សម្រាប់ឈ្មោះបុគ្គលិក
-DocType: Holiday List,Clear Table,ជម្រះការតារាង
-DocType: Features Setup,Brands,ផលិតផលម៉ាក
-DocType: C-Form Invoice Detail,Invoice No,គ្មានវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,បានមកពីការទិញសណ្តាប់ធ្នាប់
-DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
-,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
-DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,មិនបានកំណត់
-DocType: Communication,Date,កាលបរិច្ឆេទ
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់ចំណូលគយបានធ្វើម្តងទៀត
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,ចូរអង្គុយយ៉ាងតឹងខណៈពេលដែលប្រព័ន្ធរបស់អ្នកត្រូវបានរៀបចំ។ វាអាចចំណាយពេលមួយស្របក់។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,គូ
-DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
-DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
-DocType: Item,Has Batch No,មានបាច់គ្មាន
-DocType: Delivery Note,Excise Page Number,រដ្ឋាករលេខទំព័រ
-DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
-,Maintenance Schedules,កាលវិភាគថែរក្សា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ក្រឡោត
-,Quotation Trends,សម្រង់និន្នាការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ខណៈពេលដែលការបញ្ជាទិញផលិតផលអាចត្រូវបានធ្វើសម្រាប់ធាតុនេះវាត្រូវតែជាធាតុភាគហ៊ុន។
-DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ការចូលរួម
-DocType: Authorization Rule,Above Value,តម្លៃខាងលើ
-,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
-DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
-DocType: Purchase Order,Delivered,បានបញ្ជូន
-apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់ការងារអ៊ីមែល។ (ឧ jobs@example.com)
-DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
-DocType: Journal Entry,Accounts Receivable,គណនីអ្នកទទួល
-,Supplier-Wise Sales Analytics,ក្រុមហ៊ុនផ្គត់ផ្គង់ប្រាជ្ញាលក់វិភាគ
-DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយនេះត្រូវបានប្រើប្រសិនបើទ្រង់ទ្រាយជាក់លាក់គឺមិនត្រូវបានរកឃើញថាប្រទេស
-DocType: Custom Field,Custom,ផ្ទាល់ខ្លួន
-DocType: Production Order,Use Multi-Level BOM,ប្រើពហុកម្រិត Bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ការចាក់ផ្សិត
-DocType: Bank Reconciliation,Include Reconciled Entries,រួមបញ្ចូលធាតុសំរុះសំរួល
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,មែកធាងនៃគណនីរបស់ finanial ។
-DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិនបើអ្នកទុកវាឱ្យទទេអស់ទាំងប្រភេទពិចារណាសម្រាប់បុគ្គលិក
-DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់
-DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
-apps/frappe/frappe/config/setup.py +130,Printing,ការបោះពុម្ព
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
-DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការមិនអនុវត្តការឈប់សម្រាក។
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,និង
-DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,កីឡា
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,សរុបជាក់ស្តែង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,អង្គភាព
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,សូមកំណត់កូនសោកំណត់រចនាសម្ព័ន្ធការចូលដំណើរការ Dropbox ក្នុងតំបន់របស់អ្នក
-apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
-,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
-DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,ឃ្លាំងដែលជាកន្លែងដែលអ្នកត្រូវបានរក្សាឱ្យបាននូវភាគហ៊ុនរបស់ធាតុដែលបានច្រានចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកនឹងបញ្ចប់នៅថ្ងៃ
+,Open Production Orders,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
+DocType: Installation Note,Installation Time,ពេលដំឡើង
+DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ការវិនិយោគ
+DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
+DocType: Quality Inspection Reading,Acceptance Criteria,លក្ខណៈវិនិច្ឆ័យក្នុងការទទួលយក
+DocType: Item Attribute,Attribute Name,ឈ្មោះគុណលក្ខណៈ
+DocType: Item Group,Show In Website,បង្ហាញនៅក្នុងវេបសាយ
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,ជាក្រុម
+DocType: Task,Expected Time (in hours),ពេលវេលាដែលគេរំពឹងថា (គិតជាម៉ោង)
+,Qty to Order,qty ម៉ង់ទិញ
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","ដើម្បីតាមដានឈ្មោះយីហោក្នុងឯកសារចំណាំដឹកជញ្ជូនឱកាសសម្ភារៈស្នើសុំ, ធាតុ, ការទិញសណ្តាប់ធ្នាប់, ការទិញប័ណ្ណ, ទទួលទិញសម្រង់, ការលក់វិក័យប័ត្រ, ផលិតផលកញ្ចប់, ការលក់សណ្តាប់ធ្នាប់, សៀរៀល, គ្មាន"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,គំនូសតាង Gantt ភារកិច្ចទាំងអស់។
+DocType: Appraisal,For Employee Name,សម្រាប់ឈ្មោះបុគ្គលិក
+DocType: Holiday List,Clear Table,ជម្រះការតារាង
+DocType: Features Setup,Brands,ផលិតផលម៉ាក
+DocType: C-Form Invoice Detail,Invoice No,គ្មានវិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,បានមកពីការទិញសណ្តាប់ធ្នាប់
+DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
+,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
+DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់ចំណូលគយបានធ្វើម្តងទៀត
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,គូ
+DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
+DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
+DocType: Item,Has Batch No,មានបាច់គ្មាន
+DocType: Delivery Note,Excise Page Number,រដ្ឋាករលេខទំព័រ
+DocType: Employee,Personal Details,ពត៌មានលំអិតផ្ទាល់ខ្លួន
+,Maintenance Schedules,កាលវិភាគថែរក្សា
+,Quotation Trends,សម្រង់និន្នាការ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
+,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
+DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
+DocType: Purchase Order,Delivered,បានបញ្ជូន
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់ការងារអ៊ីមែល។ (ឧ jobs@example.com)
+DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
+DocType: Journal Entry,Accounts Receivable,គណនីអ្នកទទួល
+,Supplier-Wise Sales Analytics,ក្រុមហ៊ុនផ្គត់ផ្គង់ប្រាជ្ញាលក់វិភាគ
+DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយនេះត្រូវបានប្រើប្រសិនបើទ្រង់ទ្រាយជាក់លាក់គឺមិនត្រូវបានរកឃើញថាប្រទេស
+DocType: Production Order,Use Multi-Level BOM,ប្រើពហុកម្រិត Bom
+DocType: Bank Reconciliation,Include Reconciled Entries,រួមបញ្ចូលធាតុសំរុះសំរួល
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,មែកធាងនៃគណនីរបស់ finanial ។
+DocType: Leave Control Panel,Leave blank if considered for all employee types,ប្រសិនបើអ្នកទុកវាឱ្យទទេអស់ទាំងប្រភេទពិចារណាសម្រាប់បុគ្គលិក
+DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់
+DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
+DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
+DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,សរុបជាក់ស្តែង
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,អង្គភាព
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
+,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,ឃ្លាំងដែលជាកន្លែងដែលអ្នកត្រូវបានរក្សាឱ្យបាននូវភាគហ៊ុនរបស់ធាតុដែលបានច្រានចោល
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកនឹងបញ្ចប់នៅថ្ងៃ
 DocType: POS Profile,Price List,តារាងតម្លៃ
-apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
-DocType: Issue,Support,ការគាំទ្រ
-DocType: Authorization Rule,Approving Role,ការអនុម័តតួនាទី
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ប្តឹងទាមទារសំណងលើការចំណាយ
+DocType: Issue,Support,ការគាំទ្រ
 ,BOM Search,ស្វែងរក Bom
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប)
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
-DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
-apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",បង្ហាញ / លាក់លក្ខណៈពិសេសដូចជាសៀរៀល NOS លោកម៉ាស៊ីនឆូតកាតជាដើម
-DocType: Salary Slip,Deduction,ការដក
-DocType: Address Template,Address Template,អាសយដ្ឋានទំព័រគំរូ
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
-DocType: Territory,Classification of Customers by region,ចំណាត់ថ្នាក់នៃអតិថិជនដោយតំបន់
-DocType: Project,% Tasks Completed,% ភារកិច្ចបានបញ្ចប់
-DocType: Project,Gross Margin,ប្រាក់ចំណេញដុល
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,អ្នកប្រើដែលបានបិទ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),បិទ (បើក + + សរុប)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
+DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",បង្ហាញ / លាក់លក្ខណៈពិសេសដូចជាសៀរៀល NOS លោកម៉ាស៊ីនឆូតកាតជាដើម
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
+DocType: Salary Slip,Deduction,ការដក
+DocType: Address Template,Address Template,អាសយដ្ឋានទំព័រគំរូ
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
+DocType: Territory,Classification of Customers by region,ចំណាត់ថ្នាក់នៃអតិថិជនដោយតំបន់
+DocType: Project,% Tasks Completed,% ភារកិច្ចបានបញ្ចប់
+DocType: Project,Gross Margin,ប្រាក់ចំណេញដុល
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,អ្នកប្រើដែលបានបិទ
 DocType: Opportunity,Quotation,សម្រង់
-DocType: Salary Slip,Total Deduction,ការកាត់សរុប
-DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ការចំណាយបន្ទាន់សម័យ
-DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
-DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
-DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
-DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
+DocType: Salary Slip,Total Deduction,ការកាត់សរុប
+DocType: Quotation,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,ការចំណាយបន្ទាន់សម័យ
+DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ឆ្នាំសារពើពន្ធឆ្នាំ ** តំណាងឱ្យហិរញ្ញវត្ថុ។ ការបញ្ចូលគណនីទាំងអស់និងប្រតិបត្តិការដ៏ធំមួយផ្សេងទៀតត្រូវបានតាមដានការប្រឆាំងនឹងឆ្នាំសារពើពន្ធ ** ** ។
+DocType: Opportunity,Customer / Lead Address,អតិថិជន / អ្នកដឹកនាំការអាសយដ្ឋាន
+DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
+DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,ការពិពណ៌នាការងារ
-DocType: Purchase Order Item,Qty as per Stock UOM,qty ដូចជាក្នុងមួយហ៊ុន UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,សូមជ្រើសឯកសារ CSV ដែលមានសុពលភាពជាមួយនឹងទិន្នន័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ថ្នាំកូត
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","រក្សាដាននៃការលក់យុទ្ធនាការ។ រក្សាដាននៃការនាំមុខ, សម្រង់សម្តី, ការលក់លំដាប់លពីយុទ្ធនាការដើម្បីវាស់ស្ទង់ត្រឡប់ទៅលើការវិនិយោគ។"
-DocType: Expense Claim,Approver,ការអនុម័ត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,ការពិពណ៌នាការងារ
+DocType: Purchase Order Item,Qty as per Stock UOM,qty ដូចជាក្នុងមួយហ៊ុន UOM
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","រក្សាដាននៃការលក់យុទ្ធនាការ។ រក្សាដាននៃការនាំមុខ, សម្រង់សម្តី, ការលក់លំដាប់លពីយុទ្ធនាការដើម្បីវាស់ស្ទង់ត្រឡប់ទៅលើការវិនិយោគ។"
+DocType: Expense Claim,Approver,ការអនុម័ត
 ,SO Qty,សូ Qty
-DocType: Appraisal,Calculate Total Score,គណនាពិន្ទុសរុប
-DocType: Supplier Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
-apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
-apps/erpnext/erpnext/hooks.py +84,Shipments,ការនាំចេញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ផ្សិតដង
-DocType: Purchase Order,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាពកំណត់ហេតុម៉ោងត្រូវជូន។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ការដំឡើង
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ជួរដេក #
-DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Pricing Rule,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: C-Form,Quarter,ត្រីមាស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ការចំណាយនានា
-DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
-DocType: Employee,Bank Name,ឈ្មោះធនាគារ
+DocType: Appraisal,Calculate Total Score,គណនាពិន្ទុសរុប
+DocType: Supplier Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
+apps/erpnext/erpnext/hooks.py +68,Shipments,ការនាំចេញ
+DocType: Purchase Order Item,To be delivered to customer,ត្រូវបានបញ្ជូនទៅកាន់អតិថិជន
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ស្ថានភាពកំណត់ហេតុម៉ោងត្រូវជូន។
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ជួរដេក #
+DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Pricing Rule,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: C-Form,Quarter,ត្រីមាស
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ការចំណាយនានា
+DocType: Global Defaults,Default Company,ក្រុមហ៊ុនលំនាំដើម
+DocType: Employee,Bank Name,ឈ្មោះធនាគារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
-DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
-DocType: Journal Entry Account,Credit in Account Currency,ឥណទានរូបិយប័ណ្ណគណនី
-DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ជ្រើសក្រុមហ៊ុន ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
-apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
-DocType: DocField,Name,ឈ្មោះ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងប្រព័ន្ធ
-DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,អ្នកផ្សេងទៀត
-DocType: POS Profile,Taxes and Charges,ពន្ធនិងការចោទប្រកាន់
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ផលិតផលឬសេវាកម្មដែលត្រូវបានទិញលក់ឬទុកនៅក្នុងភាគហ៊ុន។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,បានបញ្ចប់
-DocType: Web Form,Select DocType,ជ្រើសចង្អុលបង្ហាញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,វិស័យធនាគារ
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,មជ្ឈមណ្ឌលការចំណាយថ្មីមួយ
-DocType: Bin,Ordered Quantity,បរិមាណដែលត្រូវបានបញ្ជាឱ្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
-DocType: Quality Inspection,In Process,ក្នុងដំណើរការ
-DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះតំលៃ
-DocType: Purchase Order Item,Reference Document Type,សេចក្តីយោងប្រភេទឯកសារ
-DocType: Account,Fixed Asset,ទ្រព្យសកម្មថេរ
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
-DocType: Activity Type,Default Billing Rate,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
-DocType: Time Log Batch,Total Billing Amount,ចំនួនទឹកប្រាក់សរុបវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,គណនីត្រូវទទួល
-,Stock Balance,តុល្យភាពភាគហ៊ុន
-apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
-DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,កំណត់ហេតុបង្កើតឡើងវេលាម៉ោង:
-DocType: Item,Weight UOM,ទំងន់ UOM
-DocType: Employee,Blood Group,ក្រុមឈាម
-DocType: Purchase Invoice Item,Page Break,ការបំបែកទំព័រ
-DocType: Production Order Operation,Pending,ឡុងេពល
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នកប្រើដែលអាចអនុម័តកម្មវិធីដែលបានឈប់សម្រាកជាក់លាក់របស់បុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,អ្នកមិនអាចផ្លាស់ប្តូរលំនាំដើមនៃវ៉ារ្យង់ UOM ។ ដើម្បីផ្លាស់ប្តូរ UOM វ៉ារ្យង់ UOM លំនាំដើមសម្រាប់ការផ្លាស់ប្តូរលំនាំដើមនៃពុម្ព
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,សម្ភារៈការិយាល័យ
+DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
+DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ជ្រើសក្រុមហ៊ុន ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
+DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,មានចំនួនមិនបានឆ្លុះបញ្ចាំងនៅក្នុងប្រព័ន្ធ
+DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,អ្នកផ្សេងទៀត
+DocType: POS Profile,Taxes and Charges,ពន្ធនិងការចោទប្រកាន់
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",ផលិតផលឬសេវាកម្មដែលត្រូវបានទិញលក់ឬទុកនៅក្នុងភាគហ៊ុន។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,វិស័យធនាគារ
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,មជ្ឈមណ្ឌលការចំណាយថ្មីមួយ
+DocType: Bin,Ordered Quantity,បរិមាណដែលត្រូវបានបញ្ជាឱ្យ
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
+DocType: Quality Inspection,In Process,ក្នុងដំណើរការ
+DocType: Authorization Rule,Itemwise Discount,Itemwise បញ្ចុះតំលៃ
+DocType: Purchase Order Item,Reference Document Type,សេចក្តីយោងប្រភេទឯកសារ
+DocType: Account,Fixed Asset,ទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,សារពើភ័ណ្ឌស៊េរី
+DocType: Activity Type,Default Billing Rate,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
+DocType: Time Log Batch,Total Billing Amount,ចំនួនទឹកប្រាក់សរុបវិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,គណនីត្រូវទទួល
+,Stock Balance,តុល្យភាពភាគហ៊ុន
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
+DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,កំណត់ហេតុបង្កើតឡើងវេលាម៉ោង:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+DocType: Item,Weight UOM,ទំងន់ UOM
+DocType: Employee,Blood Group,ក្រុមឈាម
+DocType: Purchase Invoice Item,Page Break,ការបំបែកទំព័រ
+DocType: Production Order Operation,Pending,ឡុងេពល
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,អ្នកប្រើដែលអាចអនុម័តកម្មវិធីដែលបានឈប់សម្រាកជាក់លាក់របស់បុគ្គលិក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,សម្ភារៈការិយាល័យ
 DocType: Purchase Invoice Item,Qty,qty
-DocType: Fiscal Year,Companies,មានក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,ឡិចត្រូនិច
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ចូរលើកសំណើសុំនៅពេលដែលភាគហ៊ុនសម្ភារៈឈានដល់កម្រិតបញ្ជាទិញឡើងវិញ
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,ពីការថែទាំកាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ពេញម៉ោង
-DocType: Purchase Invoice,Contact Details,ពត៌មានទំនាក់ទំនង
-DocType: C-Form,Received Date,កាលបរិច្ឆេទទទួលបាន
-DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","បើអ្នកបានបង្កើតពុម្ពដែលស្ដង់ដារក្នុងការលក់និងការចោទប្រកាន់ពីពន្ធគំរូ, ជ្រើសយកមួយនិងចុចលើប៊ូតុងខាងក្រោម។"
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,សូមបញ្ជាក់ជាប្រទេសមួយសម្រាប់វិធានការដឹកជញ្ជូននេះឬពិនិត្យមើលការដឹកជញ្ជូននៅទូទាំងពិភពលោក
-DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
-DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
-DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
-DocType: Job Applicant,Job Opening,ពិធីបើកការងារ
-DocType: Payment Reconciliation,Payment Reconciliation,ការផ្សះផ្សាការទូទាត់
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,បច្ចេកវិទ្យា
-DocType: Offer Letter,Offer Letter,ផ្តល់ជូននូវលិខិត
-apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,បង្កើតសម្ភារៈសំណើរ (MRP) និងការបញ្ជាទិញផលិតផល។
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,សរុបវិក័យប័ត្រ AMT
-DocType: Time Log,To Time,ទៅពេល
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ដើម្បីបន្ថែមថ្នាំងកុមារស្វែងយល់ពីដើមឈើហើយចុចលើថ្នាំងក្រោមដែលអ្នកចង់បន្ថែមថ្នាំងបន្ថែមទៀត។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
-DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
-DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
-DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
-DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
-DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
-apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,បង្កើតការប្រឆាំងនឹងការបញ្ជាទិញប្រាក់បង់ធាតុវិកិយប័ត្រឬ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ផ្សារដែក
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ញូហ៊ុន UOM ត្រូវបានទាមទារ
-DocType: Quality Inspection,Sample Size,ទំហំគំរូ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូមបញ្ជាក់ត្រឹមត្រូវមួយ &quot;ពីសំណុំរឿងលេខ&quot;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
+DocType: Fiscal Year,Companies,មានក្រុមហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ឡិចត្រូនិច
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ចូរលើកសំណើសុំនៅពេលដែលភាគហ៊ុនសម្ភារៈឈានដល់កម្រិតបញ្ជាទិញឡើងវិញ
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,ពីការថែទាំកាលវិភាគ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ពេញម៉ោង
+DocType: Purchase Invoice,Contact Details,ពត៌មានទំនាក់ទំនង
+DocType: C-Form,Received Date,កាលបរិច្ឆេទទទួលបាន
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","បើអ្នកបានបង្កើតពុម្ពដែលស្ដង់ដារក្នុងការលក់និងការចោទប្រកាន់ពីពន្ធគំរូ, ជ្រើសយកមួយនិងចុចលើប៊ូតុងខាងក្រោម។"
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,សូមបញ្ជាក់ជាប្រទេសមួយសម្រាប់វិធានការដឹកជញ្ជូននេះឬពិនិត្យមើលការដឹកជញ្ជូននៅទូទាំងពិភពលោក
+DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
+DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
+DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
+DocType: Job Applicant,Job Opening,ពិធីបើកការងារ
+DocType: Payment Reconciliation,Payment Reconciliation,ការផ្សះផ្សាការទូទាត់
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,បច្ចេកវិទ្យា
+DocType: Offer Letter,Offer Letter,ផ្តល់ជូននូវលិខិត
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,បង្កើតសម្ភារៈសំណើរ (MRP) និងការបញ្ជាទិញផលិតផល។
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,សរុបវិក័យប័ត្រ AMT
+DocType: Time Log,To Time,ទៅពេល
+DocType: Authorization Rule,Approving Role (above authorized value),ការអនុម័តតួនាទី (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ដើម្បីបន្ថែមថ្នាំងកុមារស្វែងយល់ពីដើមឈើហើយចុចលើថ្នាំងក្រោមដែលអ្នកចង់បន្ថែមថ្នាំងបន្ថែមទៀត។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
+DocType: Production Order Operation,Completed Qty,Qty បានបញ្ចប់
+DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
+DocType: Stock Reconciliation Item,Current Valuation Rate,អត្រាវាយតម្លៃនាពេលបច្ចុប្បន្ន
+DocType: Item,Customer Item Codes,កូដធាតុអតិថិជន
+DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,បង្កើតការប្រឆាំងនឹងការបញ្ជាទិញប្រាក់បង់ធាតុវិកិយប័ត្រឬ។
+DocType: Quality Inspection,Sample Size,ទំហំគំរូ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',សូមបញ្ជាក់ត្រឹមត្រូវមួយ &quot;ពីសំណុំរឿងលេខ&quot;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Project,External,ខាងក្រៅ
-DocType: Features Setup,Item Serial Nos,ធាតុសៀរៀល Nos
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នកប្រើនិងសិទ្ធិ
+DocType: Features Setup,Item Serial Nos,ធាតុសៀរៀល Nos
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នកប្រើនិងសិទ្ធិ
 DocType: Branch,Branch,សាខា
-apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,គ្មានប័ណ្ណប្រាក់បៀវត្សដែលបានរកឃើញក្នុងខែ:
-DocType: Bin,Actual Quantity,បរិមាណដែលត្រូវទទួលទានពិតប្រាកដ
-DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍: ថ្ងៃបន្ទាប់ការដឹកជញ្ជូន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,អតិថិជនរបស់អ្នក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,ផ្សិតបង្ហាប់
-DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
-DocType: Sales Order,Not Delivered,មិនបានផ្តល់
-,Bank Clearance Summary,ធនាគារសង្ខេបបោសសំអាត
-apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,ក្រមធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
-DocType: Appraisal Goal,Appraisal Goal,គោលដៅវាយតម្លៃ
-DocType: Event,Friday,ថ្ងៃសុក្រ
-DocType: Time Log,Costing Amount,ចំនួនទឹកប្រាក់ដែលចំណាយថវិកាអស់
-DocType: Process Payroll,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-DocType: Salary Structure,Monthly Earning & Deduction,ការរកប្រាក់ចំណូលប្រចាំខែនិងការកាត់កង
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,នាំចូលក្នុងក្រុម
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,គ្មានប័ណ្ណប្រាក់បៀវត្សដែលបានរកឃើញក្នុងខែ:
+DocType: Bin,Actual Quantity,បរិមាណដែលត្រូវទទួលទានពិតប្រាកដ
+DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍: ថ្ងៃបន្ទាប់ការដឹកជញ្ជូន
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,អតិថិជនរបស់អ្នក
+DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
+DocType: Sales Order,Not Delivered,មិនបានផ្តល់
+,Bank Clearance Summary,ធនាគារសង្ខេបបោសសំអាត
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",បង្កើតនិងគ្រប់គ្រងការរំលាយអាហារបានអ៊ីម៉ែលជារៀងរាល់ថ្ងៃប្រចាំសប្តាហ៍និងប្រចាំខែ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,ក្រមធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
+DocType: Appraisal Goal,Appraisal Goal,គោលដៅវាយតម្លៃ
+DocType: Time Log,Costing Amount,ចំនួនទឹកប្រាក់ដែលចំណាយថវិកាអស់
+DocType: Process Payroll,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+DocType: Salary Structure,Monthly Earning & Deduction,ការរកប្រាក់ចំណូលប្រចាំខែនិងការកាត់កង
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,នាំចូលក្នុងក្រុម
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន &amp; ទំនាក់ទំនង
-DocType: SMS Log,Sender Name,ឈ្មោះរបស់អ្នកផ្ញើ
-DocType: Page,Title,ចំណងជើង
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ប្ដូរតាមបំណង
-DocType: POS Profile,[Select],[ជ្រើស]
-DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
-DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
-DocType: Sales Invoice Advance,Advance Amount,មុនចំនួនទឹកប្រាក់
-DocType: Manufacturing Settings,Capacity Planning,ផែនការការកសាងសមត្ថភាព
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;ពីកាលបរិច្ឆេទ &#39;ត្រូវបានទាមទារ
-DocType: Journal Entry,Reference Number,សេចក្តីយោងលេខ
-DocType: Employee,Employment Details,ព័ត៌មានការងារ
-DocType: Employee,New Workplace,ញូការងារ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ដែលបានកំណត់ជាបិទ
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 0
-DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,ប្រសិនបើអ្នកមានក្រុមលក់និងដៃគូលក់ (ឆានែលដៃគូរ) ពួកគេអាចត្រូវបានដាក់ស្លាកនិងរក្សាបាននូវការចូលរួមចំណែករបស់គេនៅក្នុងសកម្មភាពនៃការលក់
-DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
-DocType: Item,"Allow in Sales Order of type ""Service""",អនុញ្ញាតឱ្យនៅក្នុងការលក់សណ្តាប់ធ្នាប់នៃប្រភេទ &quot;សេវា&quot;
-apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ហាងលក់
-DocType: Time Log,Projects Manager,ការគ្រប់គ្រងគម្រោង
-DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
-DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ការធ្វើដំណើរ
-DocType: Leave Block List,Allow Users,អនុញ្ញាតឱ្យអ្នកប្រើ
-DocType: Purchase Order,Customer Mobile No,គ្មានគយចល័ត
+DocType: SMS Log,Sender Name,ឈ្មោះរបស់អ្នកផ្ញើ
+DocType: POS Profile,[Select],[ជ្រើស]
+DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
+DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
+DocType: Sales Invoice Advance,Advance Amount,មុនចំនួនទឹកប្រាក់
+DocType: Manufacturing Settings,Capacity Planning,ផែនការការកសាងសមត្ថភាព
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;ពីកាលបរិច្ឆេទ &#39;ត្រូវបានទាមទារ
+DocType: Journal Entry,Reference Number,សេចក្តីយោងលេខ
+DocType: Employee,Employment Details,ព័ត៌មានការងារ
+DocType: Employee,New Workplace,ញូការងារ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,ដែលបានកំណត់ជាបិទ
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 0
+DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,ប្រសិនបើអ្នកមានក្រុមលក់និងដៃគូលក់ (ឆានែលដៃគូរ) ពួកគេអាចត្រូវបានដាក់ស្លាកនិងរក្សាបាននូវការចូលរួមចំណែករបស់គេនៅក្នុងសកម្មភាពនៃការលក់
+DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
+DocType: Item,"Allow in Sales Order of type ""Service""",អនុញ្ញាតឱ្យនៅក្នុងការលក់សណ្តាប់ធ្នាប់នៃប្រភេទ &quot;សេវា&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,ហាងលក់
+DocType: Time Log,Projects Manager,ការគ្រប់គ្រងគម្រោង
+DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
+DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ការធ្វើដំណើរ
+DocType: Leave Block List,Allow Users,អនុញ្ញាតឱ្យអ្នកប្រើ
+DocType: Purchase Order,Customer Mobile No,គ្មានគយចល័ត
 DocType: Sales Invoice,Recurring,កើតឡើង
-DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,តាមដានចំណូលដាច់ដោយឡែកនិងចំសម្រាប់បញ្ឈរផលិតផលឬការបែកបាក់។
-DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
-DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
-DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
-DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
-DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
-DocType: Installation Note,Installation Note,ចំណាំការដំឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,បន្ថែមពន្ធ
-,Financial Analytics,វិភាគហិរញ្ញវត្ថុ
-DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
-DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
-DocType: Quality Inspection,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,តាមដានចំណូលដាច់ដោយឡែកនិងចំសម្រាប់បញ្ឈរផលិតផលឬការបែកបាក់។
+DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
+DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
+DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
+DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
+DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
+DocType: Installation Note,Installation Note,ចំណាំការដំឡើង
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,បន្ថែមពន្ធ
+,Financial Analytics,វិភាគហិរញ្ញវត្ថុ
+DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
+DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
+DocType: Quality Inspection,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ប្រាក់ Earnest បាន
-DocType: System Settings,In Hours,ក្នុងម៉ោងធ្វើការ
-DocType: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,តុល្យភាពគេរំពឹងទុកថាជាមួយធនាគារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,ធ្វើឱ្យរលោង
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ប្រភពមូលនិធិ (បំណុល)
+DocType: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,តុល្យភាពគេរំពឹងទុកថាជាមួយធនាគារ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ប្រភពមូលនិធិ (បំណុល)
 DocType: Appraisal,Employee,បុគ្គលិក
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,នាំចូលអ៊ីមែលពី
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,អញ្ជើញជាអ្នកប្រើប្រាស់
-DocType: Features Setup,After Sale Installations,បន្ទាប់ពីការដំឡើងលក់
-DocType: Workstation Working Hour,End Time,ពេលវេលាបញ្ចប់
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,លក្ខខណ្ឌនៃកិច្ចសន្យាស្តង់ដាមួយសម្រាប់ការលក់ឬទិញ។
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
-DocType: Sales Invoice,Mass Mailing,អភិបូជាសំបុត្ររួម
-DocType: Page,Standard,ស្ដង់ដារ
-DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,បង្ហាញការទូទាត់
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ទំហំ
-DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ឱសថ
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,តម្លៃនៃធាតុដែលបានទិញ
-DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,បង្កើតអតិថិជន
-DocType: Purchase Invoice,Credit To,ការផ្តល់ឥណទានដល់
-DocType: Employee Education,Post Graduate,ភ្នំពេញប៉ុស្តិ៍បានបញ្ចប់
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ពត៌មានកាលវិភាគថែទាំ
-DocType: Quality Inspection Reading,Reading 9,ការអាន 9
-DocType: Supplier,Is Frozen,ត្រូវបានជាប់គាំង
-DocType: Buying Settings,Buying Settings,ការកំណត់ការទិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,បញ្ចប់អភិបូជា
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,លេខ Bom សម្រាប់ធាតុល្អបានបញ្ចប់
-DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់ការលក់អ៊ីមែល។ (ឧ sales@example.com)
-DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
-DocType: Payment Tool,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,សេចក្តីព្រាងច្បាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់បិទ
-DocType: Quality Inspection Reading,Accepted,បានទទួលយក
-DocType: User,Female,ស្រី
-DocType: Journal Entry Account,Debit in Account Currency,ឥណពន្ធវីសារូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
-DocType: Print Settings,Modern,សម័យទំនើប
-DocType: Communication,Replied,ឆ្លើយតបថា:
-DocType: Payment Tool,Total Payment Amount,ចំនួនទឹកប្រាក់សរុប
-DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-DocType: Newsletter,Test,ការធ្វើតេស្ត
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ដូចដែលមានប្រតិបតិ្តការភាគហ៊ុនដែលមានស្រាប់សម្រាប់ធាតុនេះ \ អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ &quot;គ្មានសៀរៀល &#39;,&#39; មានជំនាន់ទីគ្មាន &#39;,&#39; គឺជាធាតុហ៊ុន&quot; និង &quot;វិធីសាស្រ្តវាយតម្លៃ&quot;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
-DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,នាំចូលអ៊ីមែលពី
+apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,អញ្ជើញជាអ្នកប្រើប្រាស់
+DocType: Features Setup,After Sale Installations,បន្ទាប់ពីការដំឡើងលក់
+DocType: Workstation Working Hour,End Time,ពេលវេលាបញ្ចប់
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,លក្ខខណ្ឌនៃកិច្ចសន្យាស្តង់ដាមួយសម្រាប់ការលក់ឬទិញ។
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ក្រុមតាមប័ណ្ណ
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
+DocType: Sales Invoice,Mass Mailing,អភិបូជាសំបុត្ររួម
+DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,បង្ហាញការទូទាត់
+DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,ឱសថ
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,តម្លៃនៃធាតុដែលបានទិញ
+DocType: Selling Settings,Sales Order Required,ការលក់លំដាប់ដែលបានទាមទារ
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,បង្កើតអតិថិជន
+DocType: Purchase Invoice,Credit To,ការផ្តល់ឥណទានដល់
+DocType: Employee Education,Post Graduate,ភ្នំពេញប៉ុស្តិ៍បានបញ្ចប់
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ពត៌មានកាលវិភាគថែទាំ
+DocType: Quality Inspection Reading,Reading 9,ការអាន 9
+DocType: Supplier,Is Frozen,ត្រូវបានជាប់គាំង
+DocType: Buying Settings,Buying Settings,ការកំណត់ការទិញ
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,លេខ Bom សម្រាប់ធាតុល្អបានបញ្ចប់
+DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់ការលក់អ៊ីមែល។ (ឧ sales@example.com)
+DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
+DocType: Payment Tool,Payment Account,គណនីទូទាត់ប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ទូទាត់បិទ
+DocType: Quality Inspection Reading,Accepted,បានទទួលយក
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
+DocType: Payment Tool,Total Payment Amount,ចំនួនទឹកប្រាក់សរុប
+DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
+DocType: Newsletter,Test,ការធ្វើតេស្ត
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ដូចដែលមានប្រតិបតិ្តការភាគហ៊ុនដែលមានស្រាប់សម្រាប់ធាតុនេះ \ អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ &quot;គ្មានសៀរៀល &#39;,&#39; មានជំនាន់ទីគ្មាន &#39;,&#39; គឺជាធាតុហ៊ុន&quot; និង &quot;វិធីសាស្រ្តវាយតម្លៃ&quot;"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
+DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
 DocType: Stock Entry,For Quantity,ចប់
-apps/erpnext/erpnext/config/stock.py +18,Requests for items.,សំណើសម្រាប់ធាតុ។
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោលបំណងផលិតដោយឡែកពីគ្នានឹងត្រូវបានបង្កើតសម្រាប់ធាតុដ៏ល្អគ្នាបានបញ្ចប់។
-DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ការរៀបចំពេញលេញ
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ធាតុគណនេយ្យកករហូតដល់កាលបរិច្ឆេទនេះគ្មាននរណាម្នាក់អាចធ្វើ / កែប្រែធាតុមួយលើកលែងតែជាតួនាទីដែលបានបញ្ជាក់ខាងក្រោម។
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
-DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
-apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,បញ្ជីសំបុត្ររួមព្រឹត្តិប័ត្រព័ត៌មាន
-DocType: Delivery Note,Transporter Name,ឈ្មោះដឹកជញ្ជូន
-DocType: Contact,Enter department to which this Contact belongs,បញ្ចូលនាយកដ្ឋានដែលទំនាក់ទំនងនេះជាកម្មសិទ្ធិរបស់
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,សរុបអវត្តមាន
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,ឯកតារង្វាស់
-DocType: Fiscal Year,Year End Date,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទ
-DocType: Task Depends On,Task Depends On,ភារកិច្ចអាស្រ័យលើ
-DocType: Lead,Opportunity,ឱកាសការងារ
-DocType: Salary Structure Earning,Salary Structure Earning,ការរកប្រាក់ចំណូលបានប្រាក់ខែរចនាសម្ព័ន្ធ
-,Completed Production Orders,បានបញ្ចប់លើការបញ្ជាទិញផលិតកម្ម
-DocType: Operation,Default Workstation,ស្ថានីយការងារលំនាំដើម
-DocType: Notification Control,Expense Claim Approved Message,សារពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
-DocType: Email Digest,How frequently?,តើធ្វើដូចម្តេចឱ្យបានញឹកញាប់?
-DocType: Purchase Receipt,Get Current Stock,ទទួលបានភាគហ៊ុននាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,មែកធាងនៃលោក Bill នៃសម្ភារៈ
-DocType: Production Order,Actual End Date,ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់
-DocType: Authorization Rule,Applicable To (Role),ដែលអាចអនុវត្តទៅ (តួនាទី)
-DocType: Stock Entry,Purpose,គោលបំណង
-DocType: Item,Will also apply for variants unless overrridden,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់បានទេលុះត្រាតែ overrridden
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,សំណើសម្រាប់ធាតុ។
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,គោលបំណងផលិតដោយឡែកពីគ្នានឹងត្រូវបានបង្កើតសម្រាប់ធាតុដ៏ល្អគ្នាបានបញ្ចប់។
+DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ធាតុគណនេយ្យកករហូតដល់កាលបរិច្ឆេទនេះគ្មាននរណាម្នាក់អាចធ្វើ / កែប្រែធាតុមួយលើកលែងតែជាតួនាទីដែលបានបញ្ជាក់ខាងក្រោម។
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
+DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,បញ្ជីសំបុត្ររួមព្រឹត្តិប័ត្រព័ត៌មាន
+DocType: Delivery Note,Transporter Name,ឈ្មោះដឹកជញ្ជូន
+DocType: Authorization Rule,Authorized Value,តម្លៃដែលបានអនុញ្ញាត
+DocType: Contact,Enter department to which this Contact belongs,បញ្ចូលនាយកដ្ឋានដែលទំនាក់ទំនងនេះជាកម្មសិទ្ធិរបស់
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,សរុបអវត្តមាន
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,ឯកតារង្វាស់
+DocType: Fiscal Year,Year End Date,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទ
+DocType: Task Depends On,Task Depends On,ភារកិច្ចអាស្រ័យលើ
+DocType: Lead,Opportunity,ឱកាសការងារ
+DocType: Salary Structure Earning,Salary Structure Earning,ការរកប្រាក់ចំណូលបានប្រាក់ខែរចនាសម្ព័ន្ធ
+,Completed Production Orders,បានបញ្ចប់លើការបញ្ជាទិញផលិតកម្ម
+DocType: Operation,Default Workstation,ស្ថានីយការងារលំនាំដើម
+DocType: Notification Control,Expense Claim Approved Message,សារពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
+DocType: Email Digest,How frequently?,តើធ្វើដូចម្តេចឱ្យបានញឹកញាប់?
+DocType: Purchase Receipt,Get Current Stock,ទទួលបានភាគហ៊ុននាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,មែកធាងនៃលោក Bill នៃសម្ភារៈ
+DocType: Production Order,Actual End Date,ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់
+DocType: Authorization Rule,Applicable To (Role),ដែលអាចអនុវត្តទៅ (តួនាទី)
+DocType: Stock Entry,Purpose,គោលបំណង
+DocType: Item,Will also apply for variants unless overrridden,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់បានទេលុះត្រាតែ overrridden
 DocType: Purchase Invoice,Advances,បុ
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ការអនុម័តរបស់អ្នកប្រើមិនអាចជាដូចគ្នាទៅនឹងអ្នកប្រើច្បាប់នេះត្រូវបានអនុវត្ត
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),អត្រាការប្រាក់មូលដ្ឋាន (ដូចជាក្នុងមួយហ៊ុន UOM)
-DocType: SMS Log,No of Requested SMS,គ្មានសារជាអក្សរដែលបានស្នើ
-DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ះ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ការចែកចាយរបស់ភាគីទីបី / អ្នកចែកបៀ / គណៈកម្មការរបស់ភ្នាក់ងារ / បុត្រសម្ព័ន្ធ / លក់បន្តដែលលក់ផលិតផលរបស់ក្រុមហ៊ុនសម្រាប់គណៈកម្មាការមួយ។
-DocType: Customer Group,Has Child Node,មានថ្នាំងកុមារ
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","បញ្ចូលប៉ារ៉ាម៉ែត្រ URL ឋិតិវន្តនៅទីនេះ (ឧ។ អ្នកផ្ញើ = ERPNext, ឈ្មោះអ្នកប្រើ = ERPNext ពាក្យសម្ងាត់ = 1234 ល)"
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ការអនុម័តរបស់អ្នកប្រើមិនអាចជាដូចគ្នាទៅនឹងអ្នកប្រើច្បាប់នេះត្រូវបានអនុវត្ត
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),អត្រាការប្រាក់មូលដ្ឋាន (ដូចជាក្នុងមួយហ៊ុន UOM)
+DocType: SMS Log,No of Requested SMS,គ្មានសារជាអក្សរដែលបានស្នើ
+DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហានបន្ទាប់
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ការចែកចាយរបស់ភាគីទីបី / អ្នកចែកបៀ / គណៈកម្មការរបស់ភ្នាក់ងារ / បុត្រសម្ព័ន្ធ / លក់បន្តដែលលក់ផលិតផលរបស់ក្រុមហ៊ុនសម្រាប់គណៈកម្មាការមួយ។
+DocType: Customer Group,Has Child Node,មានថ្នាំងកុមារ
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","បញ្ចូលប៉ារ៉ាម៉ែត្រ URL ឋិតិវន្តនៅទីនេះ (ឧ។ អ្នកផ្ញើ = ERPNext, ឈ្មោះអ្នកប្រើ = ERPNext ពាក្យសម្ងាត់ = 1234 ល)"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,នេះត្រូវបានគេហទំព័រជាឧទាហរណ៍មួយបង្កើតដោយស្វ័យប្រវត្តិពី ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ជួរ Ageing 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ម៉ាស៊ីន Photochemical
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1800,147 +1637,131 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","ពុម្ពស្តង់ដារដែលអាចពន្ធលើត្រូវបានអនុវត្តទៅប្រតិបត្តិការទិញទាំងអស់។ ពុម្ពនេះអាចផ្ទុកបញ្ជីនៃក្បាលពន្ធនិងក្បាលដទៃទៀតដែរដូចជាការការចំណាយ &quot;ការដឹកជញ្ជូន&quot;, &quot;ការធានារ៉ាប់រង&quot;, &quot;គ្រប់គ្រង&quot; ល #### ចំណាំអត្រាពន្ធដែលអ្នកបានកំណត់នៅទីនេះនឹងមានអត្រាស្តង់ដារសម្រាប់ទាំងអស់ ** ធាតុ * * ។ ប្រសិនបើមានធាតុ ** ** ដែលមានអត្រាការប្រាក់ខុសគ្នា, ពួកគេត្រូវតែត្រូវបានបន្ថែមនៅក្នុងការប្រមូលពន្ធលើធាតុ ** ** នៅ ** តារាងធាតុចៅហ្វាយ ** ។ #### ការពិពណ៌នាសង្ខេបនៃជួរឈរ 1. ប្រភេទគណនា: - នេះអាចមាននៅលើ ** សុទ្ធសរុប ** (នោះគឺជាការបូកនៃចំនួនទឹកប្រាក់ជាមូលដ្ឋាន) ។ - ** នៅលើជួរដេកមុនសរុប / ចំនួន ** (សម្រាប់ការបង់ពន្ធកើនឡើងឬការចោទប្រកាន់) ។ ប្រសិនបើអ្នកជ្រើសជម្រើសនេះ, ពន្ធនេះនឹងត្រូវបានអនុវត្តជាភាគរយនៃជួរដេកពីមុន (ក្នុងតារាងពន្ធនេះ) ចំនួនឬសរុប។ - ** ជាក់ស្តែង ** (ដូចដែលបានរៀបរាប់) ។ 2. ប្រមុខគណនី: សៀវភៅគណនីក្រោមដែលការបង់ពន្ធនេះនឹងត្រូវបានកក់មជ្ឈមណ្ឌលចំនាយ 3: បើពន្ធ / ការទទួលខុសត្រូវគឺជាប្រាក់ចំណូលមួយ (ដូចជាការដឹកជញ្ជូន) ឬចំវាត្រូវការដើម្បីត្រូវបានកក់ប្រឆាំងនឹងការចំណាយផងដែរ។ 4. ការពិពណ៌នាសង្ខេប: ការពិពណ៌នាសង្ខេបនៃការបង់ពន្ធនេះ (ដែលនឹងត្រូវបានបោះពុម្ពនៅក្នុងវិក័យប័ត្រ / សញ្ញាសម្រង់) ។ 5. អត្រាការប្រាក់: អត្រាពន្ធ។ 6. ចំនួន: ចំនួនប្រាក់ពន្ធ។ 7. សរុប: ចំនួនសរុបកើនដល់ចំណុចនេះ។ 8. បញ្ចូលជួរដេក: បើផ្អែកទៅលើ &quot;ជួរដេកពីមុនសរុប&quot; អ្នកអាចជ្រើសចំនួនជួរដេកដែលនឹងត្រូវបានយកជាមូលដ្ឋានមួយសម្រាប់ការគណនានេះ (លំនាំដើមគឺជួរដេកមុន) ។ 9 សូមពិចារណាអំពីការប្រមូលពន្ធលើឬការចោទប្រកាន់ចំពោះ: នៅក្នុងផ្នែកនេះអ្នកអាចបញ្ជាក់ប្រសិនបើពន្ធ / ការចោទប្រកាន់គឺសម្រាប់តែការវាយតម្លៃ (មិនមែនជាផ្នែកមួយនៃចំនួនសរុប) ឬសម្រាប់តែសរុប (មិនបានបន្ថែមតម្លៃដល់ធាតុ) ឬសម្រាប់ទាំងពីរ។ 10. បន្ថែមឬកាត់កង: តើអ្នកចង់បន្ថែមឬកាត់ពន្ធ។"
-DocType: Note,Note,ចំណាំ
-DocType: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
-DocType: Email Account,Email Ids,អ៊ីម៉ែលលេខសម្គាល់
-DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
-DocType: Tax Rule,Billing City,ទីក្រុងវិក័យប័ត្រ
-DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណនិមិត្តសញ្ញាលាក់
-apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
-DocType: Journal Entry,Credit Note,ឥណទានចំណាំ
-DocType: Features Setup,Quality,ដែលមានគុណភាព
-DocType: Contact Us Settings,Introduction,សេចក្តីផ្តើម
-DocType: Warranty Claim,Service Address,សេវាអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,អតិបរមា 100 ជួរដេកសម្រាប់ហ៊ុនផ្សះផ្សា។
+10. Add or Deduct: Whether you want to add or deduct the tax.","ពុម្ពស្តង់ដារដែលអាចពន្ធលើត្រូវបានអនុវត្តទៅប្រតិបត្តិការទិញទាំងអស់។ ពុម្ពនេះអាចផ្ទុកបញ្ជីនៃក្បាលពន្ធនិងក្បាលដទៃទៀតដែរដូចជាការការចំណាយ &quot;ការដឹកជញ្ជូន&quot;, &quot;ការធានារ៉ាប់រង&quot;, &quot;គ្រប់គ្រង&quot; ល #### ចំណាំអត្រាពន្ធដែលអ្នកបានកំណត់នៅទីនេះនឹងមានអត្រាស្តង់ដារសម្រាប់ទាំងអស់ ** ធាតុ * * ។ ប្រសិនបើមានធាតុ ** ** ដែលមានអត្រាការប្រាក់ខុសគ្នា, ពួកគេត្រូវតែត្រូវបានបន្ថែមនៅក្នុងការប្រមូលពន្ធលើធាតុ ** ** នៅ ** តារាងធាតុចៅហ្វាយ ** ។ #### ការពិពណ៌នាសង្ខេបនៃជួរឈរ 1. ប្រភេទគណនា: - នេះអាចមាននៅលើ ** សុទ្ធសរុប ** (នោះគឺជាការបូកនៃចំនួនទឹកប្រាក់ជាមូលដ្ឋាន) ។ - ** នៅលើជួរដេកមុនសរុប / ចំនួន ** (សម្រាប់ការបង់ពន្ធកើនឡើងឬការចោទប្រកាន់) ។ ប្រសិនបើអ្នកជ្រើសជម្រើសនេះ, ពន្ធនេះនឹងត្រូវបានអនុវត្តជាភាគរយនៃជួរដេកពីមុន (ក្នុងតារាងពន្ធនេះ) ចំនួនឬសរុប។ - ** ជាក់ស្តែង ** (ដូចដែលបានរៀបរាប់) ។ 2. ប្រមុខគណនី: សៀវភៅគណនីក្រោមដែលការបង់ពន្ធនេះនឹងត្រូវបានកក់មជ្ឈមណ្ឌលចំនាយ 3: បើពន្ធ / ការទទួលខុសត្រូវគឺជាប្រាក់ចំណូលមួយ (ដូចជាការដឹកជញ្ជូន) ឬចំវាត្រូវការដើម្បីត្រូវបានកក់ប្រឆាំងនឹងការចំណាយផងដែរ។ 4. ការពិពណ៌នាសង្ខេប: ការពិពណ៌នាសង្ខេបនៃការបង់ពន្ធនេះ (ដែលនឹងត្រូវបានបោះពុម្ពនៅក្នុងវិក័យប័ត្រ / សញ្ញាសម្រង់) ។ 5. អត្រាការប្រាក់: អត្រាពន្ធ។ 6. ចំនួន: ចំនួនប្រាក់ពន្ធ។ 7. សរុប: ចំនួនសរុបកើនដល់ចំណុចនេះ។ 8. បញ្ចូលជួរដេក: បើផ្អែកទៅលើ &quot;ជួរដេកពីមុនសរុប&quot; អ្នកអាចជ្រើសចំនួនជួរដេកដែលនឹងត្រូវបានយកជាមូលដ្ឋានមួយសម្រាប់ការគណនានេះ (លំនាំដើមគឺជួរដេកមុន) ។ 9 សូមពិចារណាអំពីការប្រមូលពន្ធលើឬការចោទប្រកាន់ចំពោះ: នៅក្នុងផ្នែកនេះអ្នកអាចបញ្ជាក់ប្រសិនបើពន្ធ / ការចោទប្រកាន់គឺសម្រាប់តែការវាយតម្លៃ (មិនមែនជាផ្នែកមួយនៃចំនួនសរុប) ឬសម្រាប់តែសរុប (មិនបានបន្ថែមតម្លៃដល់ធាតុ) ឬសម្រាប់ទាំងពីរ។ 10. បន្ថែមឬកាត់កង: តើអ្នកចង់បន្ថែមឬកាត់ពន្ធ។"
+DocType: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
+DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
+DocType: Tax Rule,Billing City,ទីក្រុងវិក័យប័ត្រ
+DocType: Global Defaults,Hide Currency Symbol,រូបិយប័ណ្ណនិមិត្តសញ្ញាលាក់
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","ឧធនាគារសាច់ប្រាក់, កាតឥណទាន"
+DocType: Journal Entry,Credit Note,ឥណទានចំណាំ
+DocType: Features Setup,Quality,ដែលមានគុណភាព
+DocType: Warranty Claim,Service Address,សេវាអាសយដ្ឋាន
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,អតិបរមា 100 ជួរដេកសម្រាប់ហ៊ុនផ្សះផ្សា។
 DocType: Stock Entry,Manufacture,ការផលិត
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ជាដំបូងសូមចំណាំដឹកជញ្ជូន
-DocType: Purchase Invoice,Currency and Price List,រូបិយប័ណ្ណនិងតារាងតម្លៃ
-DocType: Opportunity,Customer / Lead Name,អតិថិជននាំឱ្យឈ្មោះ /
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ផលិតកម្ម
-DocType: Item,Allow Production Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
-DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ជាដំបូងសូមចំណាំដឹកជញ្ជូន
+DocType: Purchase Invoice,Currency and Price List,រូបិយប័ណ្ណនិងតារាងតម្លៃ
+DocType: Opportunity,Customer / Lead Name,អតិថិជននាំឱ្យឈ្មោះ /
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ផលិតកម្ម
+DocType: Item,Allow Production Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញផលិតផល
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
+DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
 DocType: Lead,Fax,ទូរសារ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ផ្តល់ជូន
-DocType: Salary Structure,Total Earning,ប្រាក់ចំណូលសរុប
-DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
-apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,អាសយដ្ឋានរបស់ខ្ញុំ
-DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
-apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ឬ
-DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ខាងលើ
-DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម &amp; ‧;
-,Download Backups,ទាញយកឯកសារបម្រុងទុក
-DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ប្រភេទការទូទាត់
-DocType: Process Payroll,Select Employees,ជ្រើសបុគ្គលិក
-DocType: Bank Reconciliation,To Date,ដើម្បីកាលបរិច្ឆេទ
-DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះការលក់មានសក្តានុពល
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,ពត៌មានលំអិត
-DocType: Purchase Invoice,Total Taxes and Charges,ពន្ធសរុបនិងការចោទប្រកាន់
-DocType: Employee,Emergency Contact,ទំនាក់ទំនងសង្រ្គោះបន្ទាន់
-DocType: Item,Quality Parameters,ប៉ារ៉ាម៉ែត្រដែលមានគុណភាព
-DocType: Target Detail,Target  Amount,គោលដៅចំនួនទឹកប្រាក់
-DocType: Shopping Cart Settings,Shopping Cart Settings,ការកំណត់កន្រ្តកទំនិញ
-DocType: Journal Entry,Accounting Entries,ធាតុគណនេយ្យ
+DocType: Salary Structure,Total Earning,ប្រាក់ចំណូលសរុប
+DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,អាសយដ្ឋានរបស់ខ្ញុំ
+DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ឬ
+DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ខាងលើ
+DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម &amp; ‧;
+DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ប្រភេទការទូទាត់
+DocType: Process Payroll,Select Employees,ជ្រើសបុគ្គលិក
+DocType: Bank Reconciliation,To Date,ដើម្បីកាលបរិច្ឆេទ
+DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះការលក់មានសក្តានុពល
+DocType: Purchase Invoice,Total Taxes and Charges,ពន្ធសរុបនិងការចោទប្រកាន់
+DocType: Employee,Emergency Contact,ទំនាក់ទំនងសង្រ្គោះបន្ទាន់
+DocType: Item,Quality Parameters,ប៉ារ៉ាម៉ែត្រដែលមានគុណភាព
+DocType: Target Detail,Target  Amount,គោលដៅចំនួនទឹកប្រាក់
+DocType: Shopping Cart Settings,Shopping Cart Settings,ការកំណត់កន្រ្តកទំនិញ
+DocType: Journal Entry,Accounting Entries,ធាតុគណនេយ្យ
 DocType: Purchase Order,Ref SQ,យោង SQ
-apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,ជំនួសធាតុ / Bom ក្នុង BOMs ទាំងអស់
-DocType: Purchase Order Item,Received Qty,ទទួលបានការ Qty
-DocType: Stock Entry Detail,Serial No / Batch,សៀរៀលគ្មាន / បាច់
-DocType: Product Bundle,Parent Item,ធាតុមេ
-DocType: Account,Account Type,ប្រភេទគណនី
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,ជំនួសធាតុ / Bom ក្នុង BOMs ទាំងអស់
+DocType: Purchase Order Item,Received Qty,ទទួលបានការ Qty
+DocType: Stock Entry Detail,Serial No / Batch,សៀរៀលគ្មាន / បាច់
+DocType: Product Bundle,Parent Item,ធាតុមេ
+DocType: Account,Account Type,ប្រភេទគណនី
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,To Produce,ផលិត
-DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
-DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
-DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
-apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់តាមបំណង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,កាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,វាយកម្ទេច
-DocType: Account,Income Account,គណនីប្រាក់ចំណូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ការអប់រំ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ការដឹកជញ្ជូន
-DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
-DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
-DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
-DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
-apps/frappe/frappe/desk/moduleview.py +61,Documents,ឯកសារ
+DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
+DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
+DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់តាមបំណង
+DocType: Account,Income Account,គណនីប្រាក់ចំណូល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ការដឹកជញ្ជូន
+DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
+DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
+DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,យោង
-DocType: Cost Center,Cost Center,មជ្ឈមណ្ឌលការចំណាយ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,# កាតមានទឹកប្រាក់
-DocType: Notification Control,Purchase Order Message,ទិញសារលំដាប់
-DocType: Tax Rule,Shipping Country,ការដឹកជញ្ជូនក្នុងប្រទេស
-DocType: Upload Attendance,Upload HTML,ផ្ទុកឡើងរបស់ HTML
-DocType: Employee,Relieving Date,កាលបរិច្ឆេទបន្ថយ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចផ្លាស់ប្តូរបានតែតាមរយៈហ៊ុនចូល / ដឹកជញ្ជូនចំណាំបង្កាន់ដៃ / ការទិញ
+DocType: Cost Center,Cost Center,មជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,# កាតមានទឹកប្រាក់
+DocType: Notification Control,Purchase Order Message,ទិញសារលំដាប់
+DocType: Tax Rule,Shipping Country,ការដឹកជញ្ជូនក្នុងប្រទេស
+DocType: Upload Attendance,Upload HTML,ផ្ទុកឡើងរបស់ HTML
+DocType: Employee,Relieving Date,កាលបរិច្ឆេទបន្ថយ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចផ្លាស់ប្តូរបានតែតាមរយៈហ៊ុនចូល / ដឹកជញ្ជូនចំណាំបង្កាន់ដៃ / ការទិញ
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ពន្ធលើប្រាក់ចំណូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,ឡាស៊ែរ engineered រាងសុទ្ធ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","បើសិនជាវិធានតម្លៃដែលបានជ្រើសត្រូវបានបង្កើតឡើងសម្រាប់ &quot;តំលៃ&quot; វានឹងសរសេរជាន់លើបញ្ជីតម្លៃ។ តម្លៃដែលកំណត់តម្លៃគឺជាតម្លៃវិធានចុងក្រោយនេះបានបញ្ចុះតម្លៃបន្ថែមទៀតដូច្នេះមិនមានគួរត្រូវបានអនុវត្ត។ ហេតុនេះហើយបានជានៅក្នុងប្រតិបត្តិការដូចជាការលក់សណ្តាប់ធ្នាប់, ការទិញលំដាប់លនោះវានឹងត្រូវបានទៅយកនៅក្នុងវិស័យ &#39;អត្រា&#39; ជាជាងវាល &quot;តំលៃអត្រាបញ្ជី។"
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
-DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/config/selling.py +33,All Addresses.,អាសយដ្ឋានទាំងអស់។
-DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
-DocType: User,Bio,ជីវប្រវត្តិ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
-apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
-DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
-apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,រកមិនឃើញទំព័រគំរូលំនាំដើមអាសយដ្ឋាន។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងយីហោ&gt; អាស័យពុម្ព។
-DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
-DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,បញ្ហានានា
-DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
-DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
-,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
-DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
-,Profit and Loss Statement,សេចក្តីថ្លែងការណ៍ប្រាក់ចំណេញនិងការបាត់បង់
-DocType: Bank Reconciliation Detail,Cheque Number,លេខមូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ការចុច
-DocType: Payment Tool Detail,Payment Tool Detail,ពត៌មាននៃឧបករណ៍ទូទាត់ប្រាក់
-,Sales Browser,កម្មវិធីរុករកការលក់
-DocType: Journal Entry,Total Credit,ឥណទានសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ក្នុងតំបន់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាននិងបុរេប្រទាន (ទ្រព្យសម្បត្តិ)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់បំណុល
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ដែលមានទំហំធំ
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,គ្មាននិយោជិតរកឃើញ!
-DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
-DocType: Purchase Order,Customer Address Display,អាសយដ្ឋានអតិថិជនបង្ហាញ
-DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ខាត់
-DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
-apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់អត្រាប្តូរប្រាក់ដើម្បីបម្លែងរូបិយប័ណ្ណមួយទៅមួយផ្សេងទៀត
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ចំនួនសរុប
-DocType: Sales Partner,Targets,គោលដៅ
-DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
-,S.O. No.,សូលេខ
-DocType: Production Order Operation,Make Time Log,ធ្វើឱ្យការកំណត់ហេតុម៉ោង
-DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,កុំព្យូទ័រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,អគ្គិសនីគីមីកិន
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,សូមរៀបចំការគំនូសតាងរបស់អ្នកគណនីរបស់អ្នកមុនពេលអ្នកចាប់ផ្តើមធាតុគណនេយ្យ
-DocType: Purchase Invoice,Ignore Pricing Rule,មិនអើពើវិធានតម្លៃ
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,លុបចោល
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,ពីកាលបរិច្ឆេទក្នុងរចនាសម្ព័ន្ធប្រាក់ខែមិនអាចមានតិចជាងបុគ្គលិកកាលបរិច្ឆេទការចូលរួម។
-DocType: Employee Education,Graduate,បានបញ្ចប់ការសិក្សា
-DocType: Leave Block List,Block Days,ប្លុកថ្ងៃ
-DocType: Journal Entry,Excise Entry,ចូលរដ្ឋាករកម្ពុជា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ពន្ធលើប្រាក់ចំណូល
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","បើសិនជាវិធានតម្លៃដែលបានជ្រើសត្រូវបានបង្កើតឡើងសម្រាប់ &quot;តំលៃ&quot; វានឹងសរសេរជាន់លើបញ្ជីតម្លៃ។ តម្លៃដែលកំណត់តម្លៃគឺជាតម្លៃវិធានចុងក្រោយនេះបានបញ្ចុះតម្លៃបន្ថែមទៀតដូច្នេះមិនមានគួរត្រូវបានអនុវត្ត។ ហេតុនេះហើយបានជានៅក្នុងប្រតិបត្តិការដូចជាការលក់សណ្តាប់ធ្នាប់, ការទិញលំដាប់លនោះវានឹងត្រូវបានទៅយកនៅក្នុងវិស័យ &#39;អត្រា&#39; ជាជាងវាល &quot;តំលៃអត្រាបញ្ជី។"
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
+DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,អាសយដ្ឋានទាំងអស់។
+DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
+DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,រកមិនឃើញទំព័រគំរូលំនាំដើមអាសយដ្ឋាន។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងយីហោ&gt; អាស័យពុម្ព។
+DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
+DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,បញ្ហានានា
+DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
+DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
+,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
+DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
+,Profit and Loss Statement,សេចក្តីថ្លែងការណ៍ប្រាក់ចំណេញនិងការបាត់បង់
+DocType: Bank Reconciliation Detail,Cheque Number,លេខមូលប្បទានប័ត្រ
+DocType: Payment Tool Detail,Payment Tool Detail,ពត៌មាននៃឧបករណ៍ទូទាត់ប្រាក់
+,Sales Browser,កម្មវិធីរុករកការលក់
+DocType: Journal Entry,Total Credit,ឥណទានសរុប
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ក្នុងតំបន់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ឥណទាននិងបុរេប្រទាន (ទ្រព្យសម្បត្តិ)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ជំពាក់បំណុល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ដែលមានទំហំធំ
+DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
+DocType: Purchase Order,Customer Address Display,អាសយដ្ឋានអតិថិជនបង្ហាញ
+DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
+DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,បញ្ជាក់អត្រាប្តូរប្រាក់ដើម្បីបម្លែងរូបិយប័ណ្ណមួយទៅមួយផ្សេងទៀត
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ចំនួនសរុប
+DocType: Sales Partner,Targets,គោលដៅ
+DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
+,S.O. No.,សូលេខ
+DocType: Production Order Operation,Make Time Log,ធ្វើឱ្យការកំណត់ហេតុម៉ោង
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,សូមកំណត់បរិមាណការរៀបចំ
+DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,កុំព្យូទ័រ
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,សូមរៀបចំការគំនូសតាងរបស់អ្នកគណនីរបស់អ្នកមុនពេលអ្នកចាប់ផ្តើមធាតុគណនេយ្យ
+DocType: Purchase Invoice,Ignore Pricing Rule,មិនអើពើវិធានតម្លៃ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,ពីកាលបរិច្ឆេទក្នុងរចនាសម្ព័ន្ធប្រាក់ខែមិនអាចមានតិចជាងបុគ្គលិកកាលបរិច្ឆេទការចូលរួម។
+DocType: Employee Education,Graduate,បានបញ្ចប់ការសិក្សា
+DocType: Leave Block List,Block Days,ប្លុកថ្ងៃ
+DocType: Journal Entry,Excise Entry,ចូលរដ្ឋាករកម្ពុជា
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
@@ -1953,1074 +1774,962 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 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: Attendance,Leave Type,ប្រភេទការឈប់សម្រាក
-DocType: Account,Accounts User,គណនីអ្នកប្រើប្រាស់
-DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",ពិនិត្យមើលប្រសិនបើកើតឡើងវិក័យប័ត្រដោះធីកដើម្បីបញ្ឈប់ការកើតឡើងឬដាក់កាលបរិច្ឆេទបញ្ចប់ឱ្យបានត្រឹមត្រូវ
-DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
+1. Address and Contact of your Company.","លក្ខខណ្ឌក្នុងស្ដង់ដារនិងលក្ខខណ្ឌដែលអាចត្រូវបានបន្ថែមទៅការលក់និងការទិញ។ ឧទាហរណ៏: 1. សុពលភាពនៃការផ្តល់ជូននេះ។ 1. លក្ខខណ្ឌក្នុងការទូទាត់ (មុន, នៅលើឥណទានដែលជាផ្នែកមួយមុនល) ។ 1. តើអ្វីជាការបន្ថែម (ឬបង់ដោយអតិថិជន) ។ 1. សុវត្ថិភាពការព្រមាន / ការប្រើប្រាស់។ 1. ការធានាប្រសិនបើមាន។ 1. ត្រឡប់គោលនយោបាយ។ 1. ល័ក្ខខ័ណ្ឌលើការដឹកជញ្ជូន, បើអនុវត្តបាន។ 1. វិធីនៃការដោះស្រាយវិវាទសំណងការទទួលខុសត្រូវជាដើម 1. អាសយដ្ឋាននិងទំនាក់ទំនងរបស់ក្រុមហ៊ុនរបស់អ្នក។"
+DocType: Attendance,Leave Type,ប្រភេទការឈប់សម្រាក
+DocType: Account,Accounts User,គណនីអ្នកប្រើប្រាស់
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",ពិនិត្យមើលប្រសិនបើកើតឡើងវិក័យប័ត្រដោះធីកដើម្បីបញ្ឈប់ការកើតឡើងឬដាក់កាលបរិច្ឆេទបញ្ចប់ឱ្យបានត្រឹមត្រូវ
+DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
 DocType: C-Form Invoice Detail,Net Total,សរុប
 DocType: Bin,FCFS Rate,អត្រា FCFS
-apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),វិក័យប័ត្រ (វិក័យប័ត្រលក់)
-DocType: Payment Reconciliation Invoice,Outstanding Amount,ចំនួនទឹកប្រាក់ដ៏ឆ្នើម
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),វិក័យប័ត្រ (វិក័យប័ត្រលក់)
+DocType: Payment Reconciliation Invoice,Outstanding Amount,ចំនួនទឹកប្រាក់ដ៏ឆ្នើម
 DocType: Project Task,Working,ការងារ
-DocType: Stock Ledger Entry,Stock Queue (FIFO),ភាគហ៊ុនជួរ (FIFO)
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,សូមជ្រើសម៉ោងកំណត់ហេតុ។
-DocType: Account,Round Off,បិទការប្រកួតជុំទី
-,Requested Qty,បានស្នើរសុំ Qty
-DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
-DocType: BOM Item,Scrap %,សំណល់អេតចាយ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
-DocType: Maintenance Visit,Purposes,គោលបំនង
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ម៉ាស៊ីន Electrochemical
-,Requested,បានស្នើរសុំ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,គ្មានសុន្ទរកថា
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ហួសកាលកំណត់
-DocType: Account,Stock Received But Not Billed,ភាគហ៊ុនបានទទួលប៉ុន្តែមិនបានផ្សព្វផ្សាយ
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ចំនួនសរុបបានចំនួនទឹកប្រាក់ប្រាក់ខែ + + + + Encashment បំណុល - ការកាត់សរុប
-DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
-DocType: Features Setup,Sales and Purchase,ការលក់និងទិញ
-DocType: Supplier Quotation Item,Material Request No,សម្ភារៈគ្មានសំណើរ
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណអតិថិជនដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
-DocType: Purchase Invoice Item,Net Rate (Company Currency),អត្រាការប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/frappe/frappe/templates/base.html +134,Added,បានបន្ថែម
-apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
-DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រការលក់
-DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
-DocType: Sales Invoice Item,Time Log Batch,កំណត់ហេតុម៉ោងបាច់
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
-DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
-DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
-DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
-DocType: Bank Reconciliation,Get Relevant Entries,ទទួលបានធាតុពាក់ព័ន្ធ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,coining
-DocType: Sales Invoice,Sales Team1,Team1 ការលក់
-DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
-apps/frappe/frappe/desk/query_report.py +136,Total,ចំនួនសរុប
-DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
-DocType: Account,Root Type,ប្រភេទជា Root
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,ចំណែកដី
-DocType: Item Group,Show this slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយនេះនៅកំពូលនៃទំព័រ
+DocType: Stock Ledger Entry,Stock Queue (FIFO),ភាគហ៊ុនជួរ (FIFO)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,សូមជ្រើសម៉ោងកំណត់ហេតុ។
+DocType: Account,Round Off,បិទការប្រកួតជុំទី
+,Requested Qty,បានស្នើរសុំ Qty
+DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
+DocType: BOM Item,Scrap %,សំណល់អេតចាយ%
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
+DocType: Maintenance Visit,Purposes,គោលបំនង
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
+,Requested,បានស្នើរសុំ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,គ្មានសុន្ទរកថា
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ហួសកាលកំណត់
+DocType: Account,Stock Received But Not Billed,ភាគហ៊ុនបានទទួលប៉ុន្តែមិនបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,គណនី root ត្រូវតែជាក្រុមមួយ
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ចំនួនសរុបបានចំនួនទឹកប្រាក់ប្រាក់ខែ + + + + Encashment បំណុល - ការកាត់សរុប
+DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
+DocType: Features Setup,Sales and Purchase,ការលក់និងទិញ
+DocType: Supplier Quotation Item,Material Request No,សម្ភារៈគ្មានសំណើរ
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណអតិថិជនដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
+DocType: Purchase Invoice Item,Net Rate (Company Currency),អត្រាការប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
+DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រការលក់
+DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
+DocType: Sales Invoice Item,Time Log Batch,កំណត់ហេតុម៉ោងបាច់
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
+DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
+DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
+DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
+DocType: Bank Reconciliation,Get Relevant Entries,ទទួលបានធាតុពាក់ព័ន្ធ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
+DocType: Sales Invoice,Sales Team1,Team1 ការលក់
+DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
+DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
+DocType: Account,Root Type,ប្រភេទជា Root
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,ចំណែកដី
+DocType: Item Group,Show this slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយនេះនៅកំពូលនៃទំព័រ
 DocType: BOM,Item UOM,ធាតុ UOM
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Quality Inspection,Quality Inspection,ពិនិត្យគុណភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,បន្ថែមទៀតខ្នាតតូច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,បាញ់បង្កើត
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
-DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,: PL ឬពាណិជ្ជកម្ម BS
-apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,កម្រិតសារពើភ័ណ្ឌអប្បបរិមា
-DocType: Stock Entry,Subcontract,របបម៉ៅការ
-DocType: Production Planning Tool,Get Items From Sales Orders,ទទួលបានការបញ្ជាលក់ពីធាតុ
-DocType: Production Order Operation,Actual End Time,ជាក់ស្តែងពេលវេលាបញ្ចប់
-DocType: Production Planning Tool,Download Materials Required,ទាញយកឯកសារដែលត្រូវការ
-DocType: Item,Manufacturer Part Number,ក្រុមហ៊ុនផលិតផ្នែកមួយចំនួន
-DocType: Production Order Operation,Estimated Time and Cost,ការប៉ាន់ប្រមាណនិងការចំណាយពេលវេលា
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Quality Inspection,Quality Inspection,ពិនិត្យគុណភាព
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,បន្ថែមទៀតខ្នាតតូច
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,: PL ឬពាណិជ្ជកម្ម BS
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,កម្រិតសារពើភ័ណ្ឌអប្បបរិមា
+DocType: Stock Entry,Subcontract,របបម៉ៅការ
+DocType: Production Planning Tool,Get Items From Sales Orders,ទទួលបានការបញ្ជាលក់ពីធាតុ
+DocType: Production Order Operation,Actual End Time,ជាក់ស្តែងពេលវេលាបញ្ចប់
+DocType: Production Planning Tool,Download Materials Required,ទាញយកឯកសារដែលត្រូវការ
+DocType: Item,Manufacturer Part Number,ក្រុមហ៊ុនផលិតផ្នែកមួយចំនួន
+DocType: Production Order Operation,Estimated Time and Cost,ការប៉ាន់ប្រមាណនិងការចំណាយពេលវេលា
 DocType: Bin,Bin,bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ច្រមុះ
-DocType: SMS Log,No of Sent SMS,គ្មានសារដែលបានផ្ញើ
-DocType: Account,Company,កេុមហ៊ុន
-DocType: Account,Expense Account,ចំណាយតាមគណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,កម្មវិធីសម្រាប់បញ្ចូលកុំព្យូទ័រ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,ពណ៌
-DocType: Maintenance Visit,Scheduled,កំណត់ពេលវេលា
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
-DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
-apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ការចាប់ផ្តើមគម្រោងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,រហូតមកដល់
-DocType: Rename Tool,Rename Log,ប្តូរឈ្មោះចូល
-DocType: Installation Note Item,Against Document No,ប្រឆាំងនឹងការ Document No
-apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
-DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
-DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
+DocType: SMS Log,No of Sent SMS,គ្មានសារដែលបានផ្ញើ
+DocType: Account,Company,កេុមហ៊ុន
+DocType: Account,Expense Account,ចំណាយតាមគណនី
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,កម្មវិធីសម្រាប់បញ្ចូលកុំព្យូទ័រ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,ពណ៌
+DocType: Maintenance Visit,Scheduled,កំណត់ពេលវេលា
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ជ្រើសដើម្បីមិនស្មើគ្នាចែកចាយប្រចាំខែគោលដៅនៅទូទាំងខែចែកចាយ។
+DocType: Purchase Invoice Item,Valuation Rate,អត្រាការវាយតម្លៃ
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ការចាប់ផ្តើមគម្រោងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,រហូតមកដល់
+DocType: Rename Tool,Rename Log,ប្តូរឈ្មោះចូល
+DocType: Installation Note Item,Against Document No,ប្រឆាំងនឹងការ Document No
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
+DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
+DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,អ្នកស្រាវជ្រាវ
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,ធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,សូមរក្សាទុកព្រឹត្តិប័ត្រព័ត៌មានមុនពេលបញ្ជូន
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,ឈ្មោះឬអ៊ីម៉ែលចាំបាច់
-apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ការត្រួតពិនិត្យដែលមានគុណភាពចូល។
-DocType: Purchase Order Item,Returned Qty,ត្រឡប់មកវិញ Qty
-DocType: Employee,Exit,ការចាកចេញ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ប្រភេទជា Root គឺជាចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,បញ្ចប់ Vibratory
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
-DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
-DocType: Sales Invoice,Advertisement,ការផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,រយៈពេលសាកល្បង
-DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
-DocType: Expense Claim,Expense Approver,ការអនុម័តការចំណាយ
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុបង្កាន់ដៃទិញសហការី
-apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,បង់ប្រាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,អ្នកស្រាវជ្រាវ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,សូមរក្សាទុកព្រឹត្តិប័ត្រព័ត៌មានមុនពេលបញ្ជូន
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,ឈ្មោះឬអ៊ីម៉ែលចាំបាច់
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ការត្រួតពិនិត្យដែលមានគុណភាពចូល។
+DocType: Purchase Order Item,Returned Qty,ត្រឡប់មកវិញ Qty
+DocType: Employee,Exit,ការចាកចេញ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ប្រភេទជា Root គឺជាចាំបាច់
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ចំពោះភាពងាយស្រួលនៃអតិថិជន, កូដទាំងនេះអាចត្រូវបានប្រើនៅក្នុងទ្រង់ទ្រាយបោះពុម្ពដូចជាការវិកិយប័ត្រនិងដឹកជញ្ជូនចំណាំ"
+DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
+DocType: Sales Invoice,Advertisement,ការផ្សព្វផ្សាយ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,រយៈពេលសាកល្បង
+DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែថ្នាំងស្លឹកត្រូវបានអនុញ្ញាតក្នុងប្រតិបត្តិការ
+DocType: Expense Claim,Expense Approver,ការអនុម័តការចំណាយ
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុបង្កាន់ដៃទិញសហការី
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,បង់ប្រាក់
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,ដើម្បី Datetime
-DocType: SMS Settings,SMS Gateway URL,URL ដែលបានសារ SMS Gateway
-apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,កិន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,បង្រួញរុំ
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,បានបញ្ជាក់ថា
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
+DocType: SMS Settings,SMS Gateway URL,URL ដែលបានសារ SMS Gateway
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,បានបញ្ជាក់ថា
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,កាសែតបោះពុម្ពផ្សាយ
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើសឆ្នាំសារពើពន្ធ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,រំលាយ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំវគ្គ
-DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការបែកបាក់គ្នាដោយផ្អែកលើការរកប្រាក់ចំណូលបានប្រាក់ខែនិងការកាត់។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
-DocType: Address,Preferred Shipping Address,ការដឹកជញ្ជូនអាសយដ្ឋានដែលពេញចិត្ត
-DocType: Purchase Receipt Item,Accepted Warehouse,ឃ្លាំងទទួលយក
-DocType: Bank Reconciliation Detail,Posting Date,ការប្រកាសកាលបរិច្ឆេទ
-DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
-DocType: Sales Invoice,Sales Team,ការលក់ក្រុមការងារ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,ធាតុស្ទួន
-DocType: Serial No,Under Warranty,នៅក្រោមការធានា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[កំហុសក្នុងការ]
-DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាសណ្តាប់ធ្នាប់ការលក់។
-,Employee Birthday,បុគ្គលិកខួបកំណើត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,យ្រប
-DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
-DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
-DocType: Pricing Rule,Discount Percentage,ភាគរយបញ្ចុះតំលៃ
-DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
-apps/erpnext/erpnext/hooks.py +70,Orders,ការបញ្ជាទិញ
-DocType: Leave Control Panel,Employee Type,ប្រភេទបុគ្គលិក
-DocType: Employee Leave Approver,Leave Approver,ទុកឱ្យការអនុម័ត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
-DocType: Manufacturing Settings,Material Transferred for Manufacture,សម្ភារៈផ្ទេរសម្រាប់ការផលិត
-DocType: Expense Claim,"A user with ""Expense Approver"" role",អ្នកប្រើដែលមាន &quot;ការចំណាយការអនុម័ត&quot; តួនាទីមួយ
-,Issued Items Against Production Order,ធាតុដែលបានចេញដីកាបង្គាប់របស់ផលិតកម្មប្រឆាំងនឹង
-DocType: Pricing Rule,Purchase Manager,កម្មវិធីគ្រប់គ្រងការទិញ
-DocType: Payment Tool,Payment Tool,ឧបករណ៍ទូទាត់ប្រាក់
-DocType: Target Detail,Target Detail,ពត៌មានលំអិតគោលដៅ
-DocType: Sales Order,% of materials billed against this Sales Order,% នៃសមា្ភារៈ billed នឹងដីកាសម្រេចការលក់នេះ
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ចូលរយៈពេលបិទ
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,កាសែតបោះពុម្ពផ្សាយ
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើសឆ្នាំសារពើពន្ធ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំវគ្គ
+DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ការបែកបាក់គ្នាដោយផ្អែកលើការរកប្រាក់ចំណូលបានប្រាក់ខែនិងការកាត់។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,គណនីជាមួយថ្នាំងជាកុមារមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
+DocType: Address,Preferred Shipping Address,ការដឹកជញ្ជូនអាសយដ្ឋានដែលពេញចិត្ត
+DocType: Purchase Receipt Item,Accepted Warehouse,ឃ្លាំងទទួលយក
+DocType: Bank Reconciliation Detail,Posting Date,ការប្រកាសកាលបរិច្ឆេទ
+DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
+DocType: Sales Invoice,Sales Team,ការលក់ក្រុមការងារ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ធាតុស្ទួន
+DocType: Serial No,Under Warranty,នៅក្រោមការធានា
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[កំហុសក្នុងការ]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាសណ្តាប់ធ្នាប់ការលក់។
+,Employee Birthday,បុគ្គលិកខួបកំណើត
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
+DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
+DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
+DocType: Pricing Rule,Discount Percentage,ភាគរយបញ្ចុះតំលៃ
+DocType: Payment Reconciliation Invoice,Invoice Number,លេខវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/hooks.py +54,Orders,ការបញ្ជាទិញ
+DocType: Leave Control Panel,Employee Type,ប្រភេទបុគ្គលិក
+DocType: Employee Leave Approver,Leave Approver,ទុកឱ្យការអនុម័ត
+DocType: Manufacturing Settings,Material Transferred for Manufacture,សម្ភារៈផ្ទេរសម្រាប់ការផលិត
+DocType: Expense Claim,"A user with ""Expense Approver"" role",អ្នកប្រើដែលមាន &quot;ការចំណាយការអនុម័ត&quot; តួនាទីមួយ
+,Issued Items Against Production Order,ធាតុដែលបានចេញដីកាបង្គាប់របស់ផលិតកម្មប្រឆាំងនឹង
+DocType: Pricing Rule,Purchase Manager,កម្មវិធីគ្រប់គ្រងការទិញ
+DocType: Payment Tool,Payment Tool,ឧបករណ៍ទូទាត់ប្រាក់
+DocType: Target Detail,Target Detail,ពត៌មានលំអិតគោលដៅ
+DocType: Sales Order,% of materials billed against this Sales Order,% នៃសមា្ភារៈ billed នឹងដីកាសម្រេចការលក់នេះ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,ចូលរយៈពេលបិទ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,រំលស់
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,រយៈពេលមិនត្រឹមត្រូវ
-DocType: Customer,Credit Limit,ដែនកំណត់ឥណទាន
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ជ្រើសប្រភេទនៃការប្រតិបត្តិការ
-DocType: GL Entry,Voucher No,កាតមានទឹកប្រាក់គ្មាន
-DocType: Leave Allocation,Leave Allocation,ទុកឱ្យការបម្រុងទុក
-apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
-DocType: Customer,Address and Contact,អាស័យដ្ឋាននិងទំនាក់ទំនង
-DocType: Customer,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
-DocType: Employee,Feedback,មតិអ្នក
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ។ កាលវិភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ម៉ាស៊ីនយន្តហោះសំណឹក
-DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
-DocType: Website Settings,Website Settings,ការកំណត់វេបសាយ
-DocType: Item,Reorder level based on Warehouse,កម្រិតនៃការរៀបចំដែលមានមូលដ្ឋានលើឃ្លាំង
-DocType: Activity Cost,Billing Rate,អត្រាវិក័យប័ត្រ
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
+DocType: Customer,Credit Limit,ដែនកំណត់ឥណទាន
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ជ្រើសប្រភេទនៃការប្រតិបត្តិការ
+DocType: GL Entry,Voucher No,កាតមានទឹកប្រាក់គ្មាន
+DocType: Leave Allocation,Leave Allocation,ទុកឱ្យការបម្រុងទុក
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
+DocType: Customer,Address and Contact,អាស័យដ្ឋាននិងទំនាក់ទំនង
+DocType: Customer,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
+DocType: Employee,Feedback,មតិអ្នក
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint ។ កាលវិភាគ
+DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
+DocType: Item,Reorder level based on Warehouse,កម្រិតនៃការរៀបចំដែលមានមូលដ្ឋានលើឃ្លាំង
+DocType: Activity Cost,Billing Rate,អត្រាវិក័យប័ត្រ
 ,Qty to Deliver,qty សង្គ្រោះ
 DocType: Monthly Distribution Percentage,Month,ខែ
-,Stock Analytics,ភាគហ៊ុនវិភាគ
-DocType: Installation Note Item,Against Document Detail No,ពត៌មានលំអិតរបស់ឯកសារគ្មានការប្រឆាំងនឹងការ
+,Stock Analytics,ភាគហ៊ុនវិភាគ
+DocType: Installation Note Item,Against Document Detail No,ពត៌មានលំអិតរបស់ឯកសារគ្មានការប្រឆាំងនឹងការ
 DocType: Quality Inspection,Outgoing,ចេញ
-DocType: Material Request,Requested For,ស្នើសម្រាប់
-DocType: Quotation Item,Against Doctype,ប្រឆាំងនឹងការ DOCTYPE
-DocType: Delivery Note,Track this Delivery Note against any Project,តាមដានការដឹកជញ្ជូនចំណាំនេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,គណនី root មិនអាចត្រូវបានលុប
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,បង្ហាញធាតុហ៊ុន
-,Is Primary Address,គឺជាអាសយដ្ឋានបឋមសិក្សា
-DocType: Production Order,Work-in-Progress Warehouse,ការងារក្នុងវឌ្ឍនភាពឃ្លាំង
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,គ្រប់គ្រងអាសយដ្ឋាន
-DocType: Pricing Rule,Item Code,ក្រមធាតុ
-DocType: Production Planning Tool,Create Production Orders,បង្កើតការបញ្ជាទិញផលិតកម្ម
-DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
-DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
-DocType: Lead,Market Segment,ចំណែកទីផ្សារ
-DocType: Communication,Phone,ទូរស័ព្ទ
-DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),បិទ (លោកបណ្ឌិត)
-DocType: Contact,Passive,អកម្ម
-apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ពុម្ពពន្ធលើការលក់ការធ្វើប្រតិបត្តិការ។
-DocType: Sales Invoice,Write Off Outstanding Amount,បិទការសរសេរចំនួនទឹកប្រាក់ដ៏ឆ្នើម
-DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",សូមពិនិត្យមើលប្រសិនបើអ្នកត្រូវការវិក័យប័ត្រកើតឡើងដោយស្វ័យប្រវត្តិ។ បន្ទាប់ពីការដាក់ស្នើវិក័យប័ត្រណាមួយការលក់ព្យាបាលផ្នែកនឹងត្រូវបានមើលឃើញ។
-DocType: Account,Accounts Manager,ការគ្រប់គ្រងគណនី
-DocType: Stock Settings,Default Stock UOM,លំនាំដើមហ៊ុន UOM
-DocType: Time Log,Costing Rate based on Activity Type (per hour),អត្រាការប្រាក់ដែលមានមូលដ្ឋានលើមានតម្លៃប្រភេទសកម្មភាព (ក្នុងមួយម៉ោង)
-DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
+DocType: Material Request,Requested For,ស្នើសម្រាប់
+DocType: Quotation Item,Against Doctype,ប្រឆាំងនឹងការ DOCTYPE
+DocType: Delivery Note,Track this Delivery Note against any Project,តាមដានការដឹកជញ្ជូនចំណាំនេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,គណនី root មិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,បង្ហាញធាតុហ៊ុន
+,Is Primary Address,គឺជាអាសយដ្ឋានបឋមសិក្សា
+DocType: Production Order,Work-in-Progress Warehouse,ការងារក្នុងវឌ្ឍនភាពឃ្លាំង
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,គ្រប់គ្រងអាសយដ្ឋាន
+DocType: Pricing Rule,Item Code,ក្រមធាតុ
+DocType: Production Planning Tool,Create Production Orders,បង្កើតការបញ្ជាទិញផលិតកម្ម
+DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
+DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
+DocType: Lead,Market Segment,ចំណែកទីផ្សារ
+DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),បិទ (លោកបណ្ឌិត)
+DocType: Contact,Passive,អកម្ម
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ពុម្ពពន្ធលើការលក់ការធ្វើប្រតិបត្តិការ។
+DocType: Sales Invoice,Write Off Outstanding Amount,បិទការសរសេរចំនួនទឹកប្រាក់ដ៏ឆ្នើម
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.",សូមពិនិត្យមើលប្រសិនបើអ្នកត្រូវការវិក័យប័ត្រកើតឡើងដោយស្វ័យប្រវត្តិ។ បន្ទាប់ពីការដាក់ស្នើវិក័យប័ត្រណាមួយការលក់ព្យាបាលផ្នែកនឹងត្រូវបានមើលឃើញ។
+DocType: Account,Accounts Manager,ការគ្រប់គ្រងគណនី
+DocType: Stock Settings,Default Stock UOM,លំនាំដើមហ៊ុន UOM
+DocType: Time Log,Costing Rate based on Activity Type (per hour),អត្រាការប្រាក់ដែលមានមូលដ្ឋានលើមានតម្លៃប្រភេទសកម្មភាព (ក្នុងមួយម៉ោង)
+DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
 DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
-DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
-,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
-DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,បន្ថែមកំណត់ត្រាគំរូមួយចំនួនដែល
-apps/erpnext/erpnext/config/hr.py +210,Leave Management,ទុកឱ្យការគ្រប់គ្រង
-DocType: Event,Groups,ក្រុមអ្នក
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុមតាមគណនី
-DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
-DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ក្បាលត្រូវស្ថិតក្រោមការទទួលខុសត្រូវមានគណនី, ដែលក្នុងនោះប្រាក់ចំនេញ / ការបាត់បង់នឹងត្រូវបានកក់"
-DocType: Payment Tool,Against Vouchers,ប្រឆាំងនឹងប័ណ្ណទូទាត់
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ជំនួយរហ័ស
-DocType: Features Setup,Sales Extras,ការលក់បន្ថែម
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
-,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
-DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,តំលៃឬ Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,នាទី
-DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
+DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
+,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
+DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,បន្ថែមកំណត់ត្រាគំរូមួយចំនួនដែល
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,ទុកឱ្យការគ្រប់គ្រង
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុមតាមគណនី
+DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
+DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","ក្បាលត្រូវស្ថិតក្រោមការទទួលខុសត្រូវមានគណនី, ដែលក្នុងនោះប្រាក់ចំនេញ / ការបាត់បង់នឹងត្រូវបានកក់"
+DocType: Payment Tool,Against Vouchers,ប្រឆាំងនឹងប័ណ្ណទូទាត់
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ជំនួយរហ័ស
+DocType: Features Setup,Sales Extras,ការលក់បន្ថែម
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
+,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
+DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
+DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,តំលៃឬ Qty
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,នាទី
+DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 ,Qty to Receive,qty ទទួល
-DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,កត្តាការប្រែចិត្តជឿមិនអាចមាននៅក្នុងការប្រភាគ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,អ្នកនឹងប្រើវាដើម្បីកត់ត្រាចូល
-DocType: Sales Partner,Retailer,ការលក់រាយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
-apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
+DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,អ្នកនឹងប្រើវាដើម្បីកត់ត្រាចូល
+DocType: Sales Partner,Retailer,ការលក់រាយ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ធនាគាររូបារូប
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ធ្វើឱ្យប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,រកមើល Bom
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ផលិតផលដែលប្រសើរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,មិនអាចអនុម័តលើការឈប់សម្រាកដូចដែលអ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ធនាគាររូបារូប
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ធ្វើឱ្យប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,រកមើល Bom
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ផលិតផលដែលប្រសើរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,បាត់បង់ស្នោសម្ដែង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,គំនូរ
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
-DocType: Hub Settings,Seller Email,អ្នកលក់អ៊ីម៉ែល
-DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
-DocType: Workstation Working Hour,Start Time,ពេលវេលាចាប់ផ្ដើម
-DocType: Item Price,Bulk Import Help,ជំនួយភាគច្រើននាំចូល
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,ជ្រើសបរិមាណ
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,អនុម័តតួនាទីមិនអាចជាដូចគ្នាទៅនឹងតួនាទីរបស់ច្បាប់ត្រូវបានអនុវត្ត
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,សារដែលបានផ្ញើ
-DocType: Production Plan Sales Order,SO Date,កាលបរិច្ឆេទសូ
-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: BOM Operation,Hour Rate,ហួរអត្រា
-DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ចាប់ពីសម្រង់
-DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈផ្ទេរសម្រាប់កម្មន្តសាល
-DocType: Purchase Receipt Item,Purchase Order Item No,ទិញធាតុលំដាប់គ្មាន
-DocType: System Settings,System Settings,កំណត់ប្រព័ន្ធ
-DocType: Project,Project Type,ប្រភេទគម្រោង
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ទាំង qty គោលដៅឬគោលដៅចំនួនទឹកប្រាក់គឺជាចាំបាច់។
-apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,ការចំណាយនៃសកម្មភាពនានា
-DocType: Item,Inspection Required,អធិការកិច្ចដែលបានទាមទារ
-DocType: Purchase Invoice Item,PR Detail,ពត៌មាននៃការិយាល័យទទួលជំនួយផ្ទាល់
-DocType: Sales Order,Fully Billed,ផ្សព្វផ្សាយឱ្យបានពេញលេញ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,សាច់ប្រាក់ក្នុងដៃ
-DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីរបស់ទឹកកកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីជាទឹកកក
-DocType: Serial No,Is Cancelled,ត្រូវបានលុបចោល
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ការនាំចេញរបស់យើង
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
+DocType: Hub Settings,Seller Email,អ្នកលក់អ៊ីម៉ែល
+DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
+DocType: Workstation Working Hour,Start Time,ពេលវេលាចាប់ផ្ដើម
+DocType: Item Price,Bulk Import Help,ជំនួយភាគច្រើននាំចូល
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,ជ្រើសបរិមាណ
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,អនុម័តតួនាទីមិនអាចជាដូចគ្នាទៅនឹងតួនាទីរបស់ច្បាប់ត្រូវបានអនុវត្ត
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,សារដែលបានផ្ញើ
+DocType: Production Plan Sales Order,SO Date,កាលបរិច្ឆេទសូ
+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: BOM Operation,Hour Rate,ហួរអត្រា
+DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,ចាប់ពីសម្រង់
+DocType: Production Order,Material Transferred for Manufacturing,សម្ភារៈផ្ទេរសម្រាប់កម្មន្តសាល
+DocType: Purchase Receipt Item,Purchase Order Item No,ទិញធាតុលំដាប់គ្មាន
+DocType: Project,Project Type,ប្រភេទគម្រោង
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ទាំង qty គោលដៅឬគោលដៅចំនួនទឹកប្រាក់គឺជាចាំបាច់។
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,ការចំណាយនៃសកម្មភាពនានា
+DocType: Item,Inspection Required,អធិការកិច្ចដែលបានទាមទារ
+DocType: Purchase Invoice Item,PR Detail,ពត៌មាននៃការិយាល័យទទួលជំនួយផ្ទាល់
+DocType: Sales Order,Fully Billed,ផ្សព្វផ្សាយឱ្យបានពេញលេញ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,សាច់ប្រាក់ក្នុងដៃ
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីរបស់ទឹកកកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីជាទឹកកក
+DocType: Serial No,Is Cancelled,ត្រូវបានលុបចោល
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ការនាំចេញរបស់យើង
 DocType: Journal Entry,Bill Date,លោក Bill កាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើទោះបីជាមានច្បាប់តម្លៃច្រើនដែលមានអាទិភាពខ្ពស់បំផុតបន្ទាប់មកបន្ទាប់ពីមានអាទិភាពផ្ទៃក្នុងត្រូវបានអនុវត្ត:
-DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: Communication,Recipients,អ្នកទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,មូល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
-DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
-DocType: Hub Settings,Publish Items to Hub,បោះពុម្ពផ្សាយធាតុហាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ការផ្ទេរខ្សែ
-apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,សូមជ្រើសរើសគណនីធនាគារ
-DocType: Newsletter,Create and Send Newsletters,បង្កើតនិងផ្ញើការពិពណ៌នា
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ចាប់ពីកាលបរិច្ឆេទត្រូវតែជាកាលបរិច្ឆេទមុន
-DocType: Sales Order,Recurring Order,លំដាប់កើតឡើង
-DocType: Company,Default Income Account,គណនីចំណូលលំនាំដើម
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
-DocType: Item Group,Check this if you want to show in website,ធីកប្រអប់នេះបើអ្នកចង់បង្ហាញនៅក្នុងគេហទំព័រ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,សូមស្វាគមន៍មកកាន់ ERPNext
-DocType: Payment Reconciliation Payment,Voucher Detail Number,ពត៌មានលំអិតកាតមានទឹកប្រាក់ចំនួន
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,នាំឱ្យមានការសម្រង់
-DocType: Lead,From Customer,ពីអតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,ការហៅទូរស័ព្ទ
-DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
-DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
-,Projected,ការព្យាករ
-DocType: Notification Control,Quotation Message,សារសម្រង់
-DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើទោះបីជាមានច្បាប់តម្លៃច្រើនដែលមានអាទិភាពខ្ពស់បំផុតបន្ទាប់មកបន្ទាប់ពីមានអាទិភាពផ្ទៃក្នុងត្រូវបានអនុវត្ត:
+DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Expense Claim,Approval Status,ស្ថានភាពការអនុម័ត
+DocType: Hub Settings,Publish Items to Hub,បោះពុម្ពផ្សាយធាតុហាប់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ការផ្ទេរខ្សែ
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,សូមជ្រើសរើសគណនីធនាគារ
+DocType: Newsletter,Create and Send Newsletters,បង្កើតនិងផ្ញើការពិពណ៌នា
+DocType: Sales Order,Recurring Order,លំដាប់កើតឡើង
+DocType: Company,Default Income Account,គណនីចំណូលលំនាំដើម
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
+DocType: Item Group,Check this if you want to show in website,ធីកប្រអប់នេះបើអ្នកចង់បង្ហាញនៅក្នុងគេហទំព័រ
+,Welcome to ERPNext,សូមស្វាគមន៍មកកាន់ ERPNext
+DocType: Payment Reconciliation Payment,Voucher Detail Number,ពត៌មានលំអិតកាតមានទឹកប្រាក់ចំនួន
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,នាំឱ្យមានការសម្រង់
+DocType: Lead,From Customer,ពីអតិថិជន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ការហៅទូរស័ព្ទ
+DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
+DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
+,Projected,ការព្យាករ
+DocType: Notification Control,Quotation Message,សារសម្រង់
+DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
 DocType: Journal Entry,Remark,សំគាល់
-DocType: Purchase Receipt Item,Rate and Amount,អត្រាការប្រាក់និងចំនួន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,គួរឱ្យធុញ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ពីការលក់សណ្តាប់ធ្នាប់
-DocType: Blog Category,Parent Website Route,ផ្លូវរបស់ឪពុកម្តាយគេហទំព័រ
-DocType: Sales Order,Not Billed,មិនបានផ្សព្វផ្សាយ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,គ្មានទំនាក់ទំនងបានបន្ថែមនៅឡើយទេ។
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,មិនសកម្ម
-DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ចំនួនប័ណ្ណការចំណាយបានចុះចត
-DocType: Time Log,Batched for Billing,Batched សម្រាប់វិក័យប័ត្រ
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,វិក័យប័ត្រដែលបានលើកឡើងដោយអ្នកផ្គត់ផ្គង់។
-DocType: POS Profile,Write Off Account,បិទការសរសេរគណនី
-apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ចំនួនការបញ្ចុះតំលៃ
-DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
-DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ឧអាករលើតម្លៃបន្ថែម
+DocType: Purchase Receipt Item,Rate and Amount,អត្រាការប្រាក់និងចំនួន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ពីការលក់សណ្តាប់ធ្នាប់
+DocType: Sales Order,Not Billed,មិនបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ឃ្លាំងទាំងពីរត្រូវតែជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុនដូចគ្នា
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,គ្មានទំនាក់ទំនងបានបន្ថែមនៅឡើយទេ។
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ចំនួនប័ណ្ណការចំណាយបានចុះចត
+DocType: Time Log,Batched for Billing,Batched សម្រាប់វិក័យប័ត្រ
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,វិក័យប័ត្រដែលបានលើកឡើងដោយអ្នកផ្គត់ផ្គង់។
+DocType: POS Profile,Write Off Account,បិទការសរសេរគណនី
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ចំនួនការបញ្ចុះតំលៃ
+DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
+DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,ឧអាករលើតម្លៃបន្ថែម
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ធាតុ 4
-DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
-DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ឧស្ម័នលោហៈក្តៅបង្កើត
-DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
+DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
+DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
+DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
 DocType: Sales Invoice Item,Delivered Qty,ប្រគល់ Qty
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពីប្រភពមូលនិធិ&gt; បំណុលបច្ចុប្បន្ន&gt; ពន្ធនិងភារៈកិច្ចនិងការបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;អាករ&quot; និងធ្វើការនិយាយពីអត្រាពន្ធនេះ។
-,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,កាត់ឡាស៊ែរ
-DocType: Event,Monday,កាលពីថ្ងៃចន្ទ
-DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",សូមចូលទៅកាន់ក្រុមដែលសមស្រប (ជាធម្មតាពីប្រភពមូលនិធិ&gt; បំណុលបច្ចុប្បន្ន&gt; ពន្ធនិងភារៈកិច្ចនិងការបង្កើតគណនីថ្មីមួយ (ដោយចុចលើ Add កុមារ) នៃប្រភេទ &quot;អាករ&quot; និងធ្វើការនិយាយពីអត្រាពន្ធនេះ។
+,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
+DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Account,Payable,បង់
-DocType: Salary Slip,Arrear Amount,បំណុលហួសកាលកំណត់ចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
-DocType: Appraisal Goal,Weightage (%),Weightage (%)
-DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
-DocType: Newsletter,Newsletter List,បញ្ជីព្រឹត្តិប័ត្រព័ត៌មាន
-DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,ពិនិត្យមើលប្រសិនបើអ្នកចង់ផ្ញើប័ណ្ណប្រាក់បៀវត្សក្នុងសំបុត្រទៅបុគ្គលិកគ្នាខណៈពេលដែលការដាក់ស្នើប័ណ្ណប្រាក់បៀវត្ស
+DocType: Salary Slip,Arrear Amount,បំណុលហួសកាលកំណត់ចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
+DocType: Appraisal Goal,Weightage (%),Weightage (%)
+DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
+DocType: Newsletter,Newsletter List,បញ្ជីព្រឹត្តិប័ត្រព័ត៌មាន
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,ពិនិត្យមើលប្រសិនបើអ្នកចង់ផ្ញើប័ណ្ណប្រាក់បៀវត្សក្នុងសំបុត្រទៅបុគ្គលិកគ្នាខណៈពេលដែលការដាក់ស្នើប័ណ្ណប្រាក់បៀវត្ស
 DocType: Lead,Address Desc,អាសយដ្ឋាន DESC
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
-apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
-DocType: Page,All,ទាំងអស់
-DocType: Stock Entry Detail,Source Warehouse,ឃ្លាំងប្រភព
-DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
-DocType: Employee,Confirmation Date,ការអះអាងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
+DocType: Stock Entry Detail,Source Warehouse,ឃ្លាំងប្រភព
+DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
+DocType: Employee,Confirmation Date,ការអះអាងកាលបរិច្ឆេទ
 DocType: C-Form,Total Invoiced Amount,ចំនួន invoiced សរុប
-DocType: Account,Sales User,ការលក់របស់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,លោក Min Qty មិនអាចជាធំជាងអតិបរមា Qty
-DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,កំណត់
-DocType: Lead,Lead Owner,ការនាំមុខម្ចាស់
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ឃ្លាំងត្រូវបានទាមទារ
-DocType: Employee,Marital Status,ស្ថានភាពគ្រួសារ
-DocType: Stock Settings,Auto Material Request,សម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
-DocType: Time Log,Will be updated when billed.,នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅពេលដែលបានផ្សព្វផ្សាយ។
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty បាច់អាចរកបាននៅពីឃ្លាំង
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ននិងថ្មី Bom មិនអាចជាដូចគ្នា
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
-DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
-DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
-DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ដីកាបង្គាប់របស់សហការីការទិញធាតុ
-apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
-apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការផ្តល់ប័ណ្ណសម្រាប់ពុម្ពដែលបោះពុម្ពឧ Proforma វិក័យប័ត្រ។
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
-DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
+DocType: Account,Sales User,ការលក់របស់អ្នកប្រើប្រាស់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,លោក Min Qty មិនអាចជាធំជាងអតិបរមា Qty
+DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
+DocType: Lead,Lead Owner,ការនាំមុខម្ចាស់
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,ឃ្លាំងត្រូវបានទាមទារ
+DocType: Employee,Marital Status,ស្ថានភាពគ្រួសារ
+DocType: Stock Settings,Auto Material Request,សម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
+DocType: Time Log,Will be updated when billed.,នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅពេលដែលបានផ្សព្វផ្សាយ។
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty បាច់អាចរកបាននៅពីឃ្លាំង
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Bom បច្ចុប្បន្ននិងថ្មី Bom មិនអាចជាដូចគ្នា
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,កាលបរិច្ឆេទនៃការចូលនិវត្តន៍ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
+DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
+DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ដីកាបង្គាប់របស់សហការីការទិញធាតុ
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,ឈ្មោះក្រុមហ៊ុនមិនអាចត្រូវបានក្រុមហ៊ុន
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការផ្តល់ប័ណ្ណសម្រាប់ពុម្ពដែលបោះពុម្ពឧ Proforma វិក័យប័ត្រ។
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
+DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,អត្រា Bom
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","កំណត់ហេតុនៃការទំនាក់ទំនងទាំងអស់នៃប្រភេទអ៊ីមែលទូរស័ព្ទជជែកកំសាន្ត, ដំណើរទស្សនកិច្ច, ល"
-apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,សូមនិយាយពីមជ្ឈមណ្ឌលការចំណាយមូលបិទក្នុងក្រុមហ៊ុន
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","កំណត់ហេតុនៃការទំនាក់ទំនងទាំងអស់នៃប្រភេទអ៊ីមែលទូរស័ព្ទជជែកកំសាន្ត, ដំណើរទស្សនកិច្ច, ល"
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,សូមនិយាយពីមជ្ឈមណ្ឌលការចំណាយមូលបិទក្នុងក្រុមហ៊ុន
 DocType: Purchase Invoice,Terms,លក្ខខណ្ឌ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,បង្កើតថ្មី
-DocType: Buying Settings,Purchase Order Required,ទិញលំដាប់ដែលបានទាមទារ
-,Item-wise Sales History,ប្រវត្តិលក់ធាតុប្រាជ្ញា
-DocType: Expense Claim,Total Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាតសរុប
-,Purchase Analytics,វិភាគទិញ
-DocType: Sales Invoice Item,Delivery Note Item,ធាតុចំណាំដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,បង្កើតថ្មី
+DocType: Buying Settings,Purchase Order Required,ទិញលំដាប់ដែលបានទាមទារ
+,Item-wise Sales History,ប្រវត្តិលក់ធាតុប្រាជ្ញា
+DocType: Expense Claim,Total Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាតសរុប
+,Purchase Analytics,វិភាគទិញ
+DocType: Sales Invoice Item,Delivery Note Item,ធាតុចំណាំដឹកជញ្ជូន
 DocType: Expense Claim,Task,ភារកិច្ច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,កោរ
-DocType: Purchase Taxes and Charges,Reference Row #,សេចក្តីយោងជួរដេក #
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,នេះគឺជាការលក់មនុស្សម្នាក់ជា root និងមិនអាចត្រូវបានកែសម្រួល។
-,Stock Ledger,ភាគហ៊ុនសៀវភៅ
-DocType: Salary Slip Deduction,Salary Slip Deduction,ការកាត់គ្រូពេទ្យប្រហែលជាប្រាក់បៀវត្ស
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,កំណត់ត្រា
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ជ្រើសថ្នាំងជាក្រុមមួយជាលើកដំបូង។
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
-DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ទាញយករបាយការណ៍ដែលមានវត្ថុធាតុដើមទាំងអស់ដែលមានស្ថានភាពសារពើភ័ណ្ឌចុងក្រោយបំផុតរបស់ពួកគេ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ប្រឈមមុខនឹងការ
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,វេទិកាសហគមន៍
-DocType: Leave Application,Leave Balance Before Application,ទុកឱ្យតុល្យភាពមុនពេលដាក់ពាក្យស្នើសុំ
-DocType: SMS Center,Send SMS,ផ្ញើសារជាអក្សរ
-DocType: Company,Default Letter Head,លំនាំដើមលិខិតនាយក
+DocType: Purchase Taxes and Charges,Reference Row #,សេចក្តីយោងជួរដេក #
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,នេះគឺជាការលក់មនុស្សម្នាក់ជា root និងមិនអាចត្រូវបានកែសម្រួល។
+,Stock Ledger,ភាគហ៊ុនសៀវភៅ
+DocType: Salary Slip Deduction,Salary Slip Deduction,ការកាត់គ្រូពេទ្យប្រហែលជាប្រាក់បៀវត្ស
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ជ្រើសថ្នាំងជាក្រុមមួយជាលើកដំបូង។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ទាញយករបាយការណ៍ដែលមានវត្ថុធាតុដើមទាំងអស់ដែលមានស្ថានភាពសារពើភ័ណ្ឌចុងក្រោយបំផុតរបស់ពួកគេ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,វេទិកាសហគមន៍
+DocType: Leave Application,Leave Balance Before Application,ទុកឱ្យតុល្យភាពមុនពេលដាក់ពាក្យស្នើសុំ
+DocType: SMS Center,Send SMS,ផ្ញើសារជាអក្សរ
+DocType: Company,Default Letter Head,លំនាំដើមលិខិតនាយក
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,ការនេះនឹងត្រូវបានប្រើសម្រាប់ការកំណត់ក្បួននៅក្នុងម៉ូឌុលធនធានមនុស្ស
-DocType: Account,Rate at which this tax is applied,អត្រាដែលពន្ធនេះត្រូវបានអនុវត្ត
+DocType: Account,Rate at which this tax is applied,អត្រាដែលពន្ធនេះត្រូវបានអនុវត្ត
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,រៀបចំ Qty
-DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
-DocType: Journal Entry,Write Off,បិទការសរសេរ
-DocType: Time Log,Operation ID,លេខសម្គាល់ការប្រតិបត្ដិការ
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",អ្នកប្រើប្រព័ន្ធ (ចូល) លេខសម្គាល់។ ប្រសិនបើអ្នកបានកំណត់វានឹងក្លាយជាលំនាំដើមសម្រាប់ទម្រង់ធនធានមនុស្សទាំងអស់។
+DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
+DocType: Journal Entry,Write Off,បិទការសរសេរ
+DocType: Time Log,Operation ID,លេខសម្គាល់ការប្រតិបត្ដិការ
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",អ្នកប្រើប្រព័ន្ធ (ចូល) លេខសម្គាល់។ ប្រសិនបើអ្នកបានកំណត់វានឹងក្លាយជាលំនាំដើមសម្រាប់ទម្រង់ធនធានមនុស្សទាំងអស់។
 DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,ការបាត់បង់ឱកាសការងារ
-DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","វាលបញ្ចុះតម្លៃនឹងមាននៅក្នុងការទិញលំដាប់, ទទួលទិញ, ទិញវិក័យប័ត្រ"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
-DocType: Report,Report Type,ប្រភេទរបាយការណ៍
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,កំពុងផ្ទុក
-DocType: BOM Replace Tool,BOM Replace Tool,Bom ជំនួសឧបករណ៍
-apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេសអាស័យដ្ឋានពុម្ពលំនាំដើមរបស់អ្នកមានប្រាជ្ញា
-DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
-DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',ប្រសិនបើលោកអ្នកមានការចូលរួមក្នុងសកម្មភាពផលិតកម្ម។ អនុញ្ញាតឱ្យមានធាតុ &quot;ត្រូវបានផលិត&quot;
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,កាលបរិច្ឆេទវិក្ក័យប័ត្រ
-DocType: Sales Invoice,Rounded Total,សរុបមានរាងមូល
-DocType: Product Bundle,List items that form the package.,ធាតុបញ្ជីដែលបង្កើតជាកញ្ចប់។
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែកគួរតែស្មើជាភាគរយទៅ 100%
-DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
-DocType: Purchase Order Item,Material Request Detail No,ពត៌មាននៃការស្នើសុំសម្ភារៈគ្មាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,របត់ការលំបាក
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
-DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
-apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ចំណាំ: ប្រសិនបើការទូទាត់មិនត្រូវបានធ្វើប្រឆាំងនឹងឯកសារយោងណាមួយដែលធ្វើឱ្យធាតុទិនានុប្បវត្តិដោយដៃ។
-DocType: Item,Supplier Items,ក្រុមហ៊ុនផ្គត់ផ្គង់ធាតុ
-DocType: Opportunity,Opportunity Type,ប្រភេទឱកាសការងារ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,ក្រុមហ៊ុនថ្មី
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,តិបត្តិការអាចលុបបានតែដោយអ្នកបង្កើតក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,លេខមិនត្រឹមត្រូវនៃធាតុសៀវភៅទូទៅបានរកឃើញ។ អ្នកប្រហែលជាបានជ្រើសគណនីខុសក្នុងប្រតិបត្តិការនេះ។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,ដើម្បីបង្កើតគណនីធនាគារ
-DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
-,Stock Ageing,ភាគហ៊ុន Ageing
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,ការបាត់បង់ឱកាសការងារ
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","វាលបញ្ចុះតម្លៃនឹងមាននៅក្នុងការទិញលំដាប់, ទទួលទិញ, ទិញវិក័យប័ត្រ"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះនៃគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
+DocType: BOM Replace Tool,BOM Replace Tool,Bom ជំនួសឧបករណ៍
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ប្រទេសអាស័យដ្ឋានពុម្ពលំនាំដើមរបស់អ្នកមានប្រាជ្ញា
+DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',ប្រសិនបើលោកអ្នកមានការចូលរួមក្នុងសកម្មភាពផលិតកម្ម។ អនុញ្ញាតឱ្យមានធាតុ &quot;ត្រូវបានផលិត&quot;
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,កាលបរិច្ឆេទវិក្ក័យប័ត្រ
+DocType: Sales Invoice,Rounded Total,សរុបមានរាងមូល
+DocType: Product Bundle,List items that form the package.,ធាតុបញ្ជីដែលបង្កើតជាកញ្ចប់។
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែកគួរតែស្មើជាភាគរយទៅ 100%
+DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
+DocType: Purchase Order Item,Material Request Detail No,ពត៌មាននៃការស្នើសុំសម្ភារៈគ្មាន
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
+DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",ចំណាំ: ប្រសិនបើការទូទាត់មិនត្រូវបានធ្វើប្រឆាំងនឹងឯកសារយោងណាមួយដែលធ្វើឱ្យធាតុទិនានុប្បវត្តិដោយដៃ។
+DocType: Item,Supplier Items,ក្រុមហ៊ុនផ្គត់ផ្គង់ធាតុ
+DocType: Opportunity,Opportunity Type,ប្រភេទឱកាសការងារ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,ក្រុមហ៊ុនថ្មី
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,តិបត្តិការអាចលុបបានតែដោយអ្នកបង្កើតក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,លេខមិនត្រឹមត្រូវនៃធាតុសៀវភៅទូទៅបានរកឃើញ។ អ្នកប្រហែលជាបានជ្រើសគណនីខុសក្នុងប្រតិបត្តិការនេះ។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,ដើម្បីបង្កើតគណនីធនាគារ
+DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
+,Stock Ageing,ភាគហ៊ុន Ageing
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ផ្ញើអ៊ីម៉ែលដោយស្វ័យប្រវត្តិទៅទំនាក់ទំនងនៅលើដាក់ស្នើប្រតិបត្តិការ។
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
-DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
-DocType: Event,Sunday,កាលពីថ្ងៃអាទិត្យ
-DocType: Sales Team,Contribution (%),ចំែណក (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ការទទួលខុសត្រូវ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ទំព័រគំរូ
-DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,សូមបញ្ចូលយ៉ាងហោចណាស់ 1 វិក័យប័ត្រក្នុងតារាង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,បន្ថែមអ្នកប្រើ
-DocType: Pricing Rule,Item Group,ធាតុគ្រុប
-DocType: Task,Actual Start Date (via Time Logs),ជាក់ស្តែកាលបរិច្ឆេទចាប់ផ្តើម (តាមរយៈម៉ោងកំណត់ហេតុ)
-DocType: Stock Reconciliation Item,Before reconciliation,មុនពេលការផ្សះផ្សាជាតិ
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Sales Order,Partly Billed,ផ្សព្វផ្សាយមួយផ្នែក
-DocType: Item,Default BOM,Bom លំនាំដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
-apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,សរុបឆ្នើម AMT
-DocType: Time Log Batch,Total Hours,ម៉ោងសរុប
-DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,រថយន្ដ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ធាតុត្រូវបានទាមទារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ចាក់ថ្នាំធ្វើពីដែកផ្សិត
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
-DocType: Time Log,From Time,ចាប់ពីពេលវេលា
-DocType: Notification Control,Custom Message,សារផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ធនាគារវិនិយោគ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","ជ្រើសប្រទេស, ម៉ោងក្នុងតំបន់និងរូបិយវត្ថុរបស់អ្នក"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
-DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ការសម្ដែងការបូមខ្សាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
-DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,ហាត់ការ
-DocType: Newsletter,A Lead with this email id should exist,អ្នកដឹកនាំដែលមានលេខសម្គាល់អ៊ីមែលនេះគួរតែមាន
-DocType: Stock Entry,From BOM,ចាប់ពី Bom
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ជាមូលដ្ឋាន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,គួរមានកាលបរិច្ឆេទដូចគ្នាជាពីកាលបរិច្ឆេទការឈប់ពាក់កណ្តាលថ្ងៃ
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
-DocType: Salary Structure,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
+DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
+DocType: Sales Team,Contribution (%),ចំែណក (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ការទទួលខុសត្រូវ
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ទំព័រគំរូ
+DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,សូមបញ្ចូលយ៉ាងហោចណាស់ 1 វិក័យប័ត្រក្នុងតារាង
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,បន្ថែមអ្នកប្រើ
+DocType: Pricing Rule,Item Group,ធាតុគ្រុប
+DocType: Task,Actual Start Date (via Time Logs),ជាក់ស្តែកាលបរិច្ឆេទចាប់ផ្តើម (តាមរយៈម៉ោងកំណត់ហេតុ)
+DocType: Stock Reconciliation Item,Before reconciliation,មុនពេលការផ្សះផ្សាជាតិ
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Sales Order,Partly Billed,ផ្សព្វផ្សាយមួយផ្នែក
+DocType: Item,Default BOM,Bom លំនាំដើម
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,សរុបឆ្នើម AMT
+DocType: Time Log Batch,Total Hours,ម៉ោងសរុប
+DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
+DocType: Time Log,From Time,ចាប់ពីពេលវេលា
+DocType: Notification Control,Custom Message,សារផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ធនាគារវិនិយោគ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
+DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
+DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ហាត់ការ
+DocType: Newsletter,A Lead with this email id should exist,អ្នកដឹកនាំដែលមានលេខសម្គាល់អ៊ីមែលនេះគួរតែមាន
+DocType: Stock Entry,From BOM,ចាប់ពី Bom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ជាមូលដ្ឋាន
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,គួរមានកាលបរិច្ឆេទដូចគ្នាជាពីកាលបរិច្ឆេទការឈប់ពាក់កណ្តាលថ្ងៃ
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
+DocType: Salary Structure,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,សម្ភារៈបញ្ហា
-DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
-DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
-DocType: Hub Settings,Access Token,ការចូលដំណើរការ Token
-DocType: Sales Invoice Item,Serial No,សៀរៀលគ្មាន
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
-DocType: Item,Is Fixed Asset Item,តើមានធាតុទ្រព្យសកម្មថេរ
-DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
-DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",ប្រសិនបើអ្នកមានទ្រង់ទ្រាយបោះពុម្ពជាយូរមកហើយដោយលក្ខណៈពិសេសនេះអាចត្រូវបានប្រើដើម្បីបំបែកទំព័រដែលត្រូវបោះពុម្ពលើទំព័រច្រើនដែលមានបឋមកថានិងបាតកថានៅលើទំព័រទាំងអស់គ្នា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ទឹកដីទាំងអស់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,សម្ភារៈបញ្ហា
+DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
+DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
+DocType: Hub Settings,Access Token,ការចូលដំណើរការ Token
+DocType: Sales Invoice Item,Serial No,សៀរៀលគ្មាន
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
+DocType: Item,Is Fixed Asset Item,តើមានធាតុទ្រព្យសកម្មថេរ
+DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",ប្រសិនបើអ្នកមានទ្រង់ទ្រាយបោះពុម្ពជាយូរមកហើយដោយលក្ខណៈពិសេសនេះអាចត្រូវបានប្រើដើម្បីបំបែកទំព័រដែលត្រូវបោះពុម្ពលើទំព័រច្រើនដែលមានបឋមកថានិងបាតកថានៅលើទំព័រទាំងអស់គ្នា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
-DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
-DocType: Process Payroll,Process Payroll,បើកប្រាក់បៀវត្សដំណើរការ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
-DocType: Product Bundle Item,Product Bundle Item,ផលិតផលធាតុកញ្ចប់
-DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូការលក់
-DocType: Purchase Invoice Item,Image View,មើលរូបភាព
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,បញ្ចប់និងបញ្ចប់កម្មឧស្សាហកម្ម
-DocType: Issue,Opening Time,ម៉ោងបើក
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
-DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
-DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ការខួង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ផ្សិតខកចិត្ត
-DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
-DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
-DocType: Account,Purchase User,អ្នកប្រើប្រាស់ទិញ
-DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ញញួរ
-DocType: Web Page,Slideshow,ការបញ្ចាំងស្លាយ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
-DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
-DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
-DocType: Quotation,Maintenance Manager,កម្មវិធីគ្រប់គ្រងថែទាំ
-DocType: Workflow State,Search,ស្វែងរក
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,សរុបមិនអាចជាសូន្យ
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ &#39;ត្រូវតែធំជាងឬស្មើសូន្យ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
-DocType: C-Form,Amended From,ធ្វើវិសោធនកម្មពី
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,វត្ថុធាតុដើម
-DocType: Leave Application,Follow via Email,សូមអនុវត្តតាមរយៈអ៊ីម៉ែល
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,គណនីកុមារដែលមានសម្រាប់គណនីនេះ។ អ្នកមិនអាចលុបគណនីនេះ។
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
-DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
-DocType: Department,Days for which Holidays are blocked for this department.,ថ្ងៃដែលថ្ងៃឈប់សម្រាកត្រូវបានបិទសម្រាប់នាយកដ្ឋាននេះ។
-,Produced,រថយន្តនេះផលិត
-DocType: Item,Item Code for Suppliers,ក្រមធាតុសម្រាប់អ្នកផ្គត់ផ្គង់
-DocType: Issue,Raised By (Email),បានលើកឡើងដោយ (អ៊ីម៉ែល)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ទូទៅ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ភ្ជាប់ក្បាលលិខិត
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",រាយបញ្ជីក្បាលពន្ធរបស់អ្នក (ឧទាហរណ៍អាករលើតម្លៃបន្ថែមពន្ធគយលពួកគេគួរតែមានឈ្មោះតែមួយគត់) និងអត្រាការស្ដង់ដាររបស់ខ្លួន។ ការនេះនឹងបង្កើតគំរូស្តង់ដាដែលអ្នកអាចកែសម្រួលនិងបន្ថែមច្រើនទៀតនៅពេលក្រោយ។
-DocType: Journal Entry,Bank Entry,ចូលធនាគារ
-DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
-DocType: Blog Post,Blog Post,ភ្នំពេញប៉ុស្តិ៍កំណត់ហេតុបណ្ដាញ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ក្រុមតាម
-apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ចំណាយប្រៃសណីយ៍
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
-DocType: Purchase Order,The date on which recurring order will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងតាមលំដាប់បញ្ឈប់ការ
-DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,បច្ចុប្បន្នសរុប
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ហួរ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ផ្ទេរសម្ភារៈដើម្បីផ្គត់ផ្គង់
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
-DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,បង្កើតសម្រង់
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
-DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
-DocType: BOM Replace Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
-DocType: Features Setup,Point of Sale,ចំណុចនៃការលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,ចម្ងាយ
-DocType: Account,Tax,ការបង់ពន្ធ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,រោងចក្រចម្រាញ់ប្រេង
-DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍ផែនការផលិតកម្ម
-DocType: Quality Inspection,Report Date,របាយការណ៍ស្តីពីកាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,បញ្ជូន
-DocType: C-Form,Invoices,វិក័យប័ត្រ
-DocType: Job Opening,Job Title,ចំណងជើងការងារ
-DocType: Features Setup,Item Groups in Details,ក្រុមធាតុនៅក្នុងពត៌មានលំអិត
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ចំណុចចាប់ផ្តើមនៃការលក់ (ម៉ាស៊ីនឆូតកាត)
-apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,សូមចូលទស្សនារបាយការណ៍សម្រាប់ការហៅថែទាំ។
-DocType: Stock Entry,Update Rate and Availability,អត្រាធ្វើឱ្យទាន់សម័យនិងអាចរកបាន
-DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ចំនួនភាគរយដែលអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបានច្រើនជាងការប្រឆាំងនឹងឬផ្តល់នូវបរិមាណបញ្ជាឱ្យ។ ឧទាហរណ៍: ប្រសិនបើអ្នកបានបញ្ជាឱ្យបាន 100 គ្រឿង។ និងអនុញ្ញាតឱ្យរបស់អ្នកគឺ 10% បន្ទាប់មកលោកអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបាន 110 គ្រឿង។
-DocType: Pricing Rule,Customer Group,ក្រុមផ្ទាល់ខ្លួន
-DocType: Item,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
+DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
+DocType: Process Payroll,Process Payroll,បើកប្រាក់បៀវត្សដំណើរការ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
+DocType: Product Bundle Item,Product Bundle Item,ផលិតផលធាតុកញ្ចប់
+DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូការលក់
+DocType: Purchase Invoice Item,Image View,មើលរូបភាព
+DocType: Issue,Opening Time,ម៉ោងបើក
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ពីនិងដើម្បីកាលបរិច្ឆេទដែលបានទាមទារ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ផ្លាស់ប្តូរទំនិញនិងមូលបត្រ
+DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
+DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
+DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
+DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
+DocType: Account,Purchase User,អ្នកប្រើប្រាស់ទិញ
+DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,អាសយដ្ឋានលំនាំដើមទំព័រគំរូមិនអាចត្រូវបានលុប
+DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
+DocType: Journal Entry,Print Heading,បោះពុម្ពក្បាល
+DocType: Quotation,Maintenance Manager,កម្មវិធីគ្រប់គ្រងថែទាំ
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,សរុបមិនអាចជាសូន្យ
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ &#39;ត្រូវតែធំជាងឬស្មើសូន្យ
+DocType: C-Form,Amended From,ធ្វើវិសោធនកម្មពី
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,វត្ថុធាតុដើម
+DocType: Leave Application,Follow via Email,សូមអនុវត្តតាមរយៈអ៊ីម៉ែល
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,គណនីកុមារដែលមានសម្រាប់គណនីនេះ។ អ្នកមិនអាចលុបគណនីនេះ។
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
+DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
+DocType: Department,Days for which Holidays are blocked for this department.,ថ្ងៃដែលថ្ងៃឈប់សម្រាកត្រូវបានបិទសម្រាប់នាយកដ្ឋាននេះ។
+,Produced,រថយន្តនេះផលិត
+DocType: Item,Item Code for Suppliers,ក្រមធាតុសម្រាប់អ្នកផ្គត់ផ្គង់
+DocType: Issue,Raised By (Email),បានលើកឡើងដោយ (អ៊ីម៉ែល)
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ទូទៅ
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,ភ្ជាប់ក្បាលលិខិត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",រាយបញ្ជីក្បាលពន្ធរបស់អ្នក (ឧទាហរណ៍អាករលើតម្លៃបន្ថែមពន្ធគយលពួកគេគួរតែមានឈ្មោះតែមួយគត់) និងអត្រាការស្ដង់ដាររបស់ខ្លួន។ ការនេះនឹងបង្កើតគំរូស្តង់ដាដែលអ្នកអាចកែសម្រួលនិងបន្ថែមច្រើនទៀតនៅពេលក្រោយ។
+DocType: Journal Entry,Bank Entry,ចូលធនាគារ
+DocType: Authorization Rule,Applicable To (Designation),ដែលអាចអនុវត្តទៅ (រចនា)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ក្រុមតាម
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,អនុញ្ញាត / មិនអនុញ្ញាតឱ្យរូបិយប័ណ្ណ។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ចំណាយប្រៃសណីយ៍
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
+DocType: Purchase Order,The date on which recurring order will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងតាមលំដាប់បញ្ឈប់ការ
+DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,បច្ចុប្បន្នសរុប
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ហួរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ផ្ទេរសម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
+DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,បង្កើតសម្រង់
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
+DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
+DocType: BOM Replace Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
+DocType: Features Setup,Point of Sale,ចំណុចនៃការលក់
+DocType: Account,Tax,ការបង់ពន្ធ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ចាប់ពីកញ្ចប់ផលិតផល
+DocType: Production Planning Tool,Production Planning Tool,ឧបករណ៍ផែនការផលិតកម្ម
+DocType: Quality Inspection,Report Date,របាយការណ៍ស្តីពីកាលបរិច្ឆេទ
+DocType: C-Form,Invoices,វិក័យប័ត្រ
+DocType: Job Opening,Job Title,ចំណងជើងការងារ
+DocType: Features Setup,Item Groups in Details,ក្រុមធាតុនៅក្នុងពត៌មានលំអិត
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),ចំណុចចាប់ផ្តើមនៃការលក់ (ម៉ាស៊ីនឆូតកាត)
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,សូមចូលទស្សនារបាយការណ៍សម្រាប់ការហៅថែទាំ។
+DocType: Stock Entry,Update Rate and Availability,អត្រាធ្វើឱ្យទាន់សម័យនិងអាចរកបាន
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ចំនួនភាគរយដែលអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបានច្រើនជាងការប្រឆាំងនឹងឬផ្តល់នូវបរិមាណបញ្ជាឱ្យ។ ឧទាហរណ៍: ប្រសិនបើអ្នកបានបញ្ជាឱ្យបាន 100 គ្រឿង។ និងអនុញ្ញាតឱ្យរបស់អ្នកគឺ 10% បន្ទាប់មកលោកអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបាន 110 គ្រឿង។
+DocType: Pricing Rule,Customer Group,ក្រុមផ្ទាល់ខ្លួន
+DocType: Item,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
-,Sales Register,ការលក់ចុះឈ្មោះ
-DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
-DocType: Address,Plant,រោងចក្រ
-DocType: DocType,Setup,ការដំឡើង
-apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,រំកិលមត្រជាក់
-DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
-DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
-DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
+,Sales Register,ការលក់ចុះឈ្មោះ
+DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
+DocType: Address,Plant,រោងចក្រ
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
+DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,សូមជ្រើសយកការទៅមុខផងដែរប្រសិនបើអ្នកចង់រួមបញ្ចូលតុល្យភាពឆ្នាំមុនសារពើពន្ធរបស់ទុកនឹងឆ្នាំសារពើពន្ធនេះ
+DocType: GL Entry,Against Voucher Type,ប្រឆាំងនឹងប្រភេទប័ណ្ណ
 DocType: Item,Attributes,គុណលក្ខណៈ
-DocType: Packing Slip,Get Items,ទទួលបានធាតុ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
-DocType: DocField,Image,រូបភាព
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ធ្វើឱ្យរដ្ឋាករវិក័យប័ត្រ
-DocType: Communication,Other,ផ្សេងទៀត
-DocType: C-Form,C-Form,C-សំណុំបែបបទ
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,លេខសម្គាល់ការប្រតិបត្ដិការមិនបានកំណត់
-DocType: Production Order,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
-DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint ។ ដំណើរទស្សនកិច្ច
-DocType: Leave Type,Is Encash,តើការ Encash
-DocType: Purchase Invoice,Mobile No,គ្មានទូរស័ព្ទដៃ
-DocType: Payment Tool,Make Journal Entry,ធ្វើឱ្យធាតុទិនានុប្បវត្តិ
-DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
-apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
-DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
-DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ពាណិជ្ជ
-DocType: Cost Center,Distribution Id,លេខសម្គាល់ការចែកចាយ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវាសេវាល្អមែនទែន
-apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ផលិតផលឬសេវាកម្មទាំងអស់។
-DocType: Purchase Invoice,Supplier Address,ក្រុមហ៊ុនផ្គត់ផ្គង់អាសយដ្ឋាន
-DocType: Contact Us Settings,Address Line 2,អាសយដ្ឋានបន្ទាត់ទី 2
-DocType: ToDo,Reference,ឯកសារយោង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ទទួលបានធាតុ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ធ្វើឱ្យរដ្ឋាករវិក័យប័ត្រ
+DocType: C-Form,C-Form,C-សំណុំបែបបទ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,លេខសម្គាល់ការប្រតិបត្ដិការមិនបានកំណត់
+DocType: Production Order,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
+DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint ។ ដំណើរទស្សនកិច្ច
+DocType: Leave Type,Is Encash,តើការ Encash
+DocType: Purchase Invoice,Mobile No,គ្មានទូរស័ព្ទដៃ
+DocType: Payment Tool,Make Journal Entry,ធ្វើឱ្យធាតុទិនានុប្បវត្តិ
+DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ទិន្នន័យគម្រោងប្រាជ្ញាគឺមិនអាចប្រើបានសម្រាប់សម្រង់
+DocType: Project,Expected End Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់
+DocType: Appraisal Template,Appraisal Template Title,ការវាយតម្លៃទំព័រគំរូចំណងជើង
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ពាណិជ្ជ
+DocType: Cost Center,Distribution Id,លេខសម្គាល់ការចែកចាយ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,សេវាសេវាល្អមែនទែន
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ផលិតផលឬសេវាកម្មទាំងអស់។
+DocType: Purchase Invoice,Supplier Address,ក្រុមហ៊ុនផ្គត់ផ្គង់អាសយដ្ឋាន
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ចេញ Qty
-apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,កម្រងឯកសារចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
-DocType: Tax Rule,Sales,ការលក់
-DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
-DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,កម្រងឯកសារចាំបាច់
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
+DocType: Tax Rule,Sales,ការលក់
+DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
+DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
-DocType: Customer,Default Receivable Accounts,លំនាំដើមគណនីអ្នកទទួល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,sawing
-DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,laminate
-DocType: Item Reorder,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
-DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
-apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
-DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
-DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
-DocType: Supplier,Contact HTML,ការទំនាក់ទំនងរបស់ HTML
-DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
-DocType: Payment Reconciliation,Maximum Amount,ចំនួនទឹកប្រាក់អតិបរមា
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
-DocType: Quality Inspection,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
-DocType: Company,Retail,ការលក់រាយ
+DocType: Customer,Default Receivable Accounts,លំនាំដើមគណនីអ្នកទទួល
+DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
+DocType: Item Reorder,Transfer,សេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
+DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
+DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
+DocType: Supplier,Contact HTML,ការទំនាក់ទំនងរបស់ HTML
+DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
+DocType: Payment Reconciliation,Maximum Amount,ចំនួនទឹកប្រាក់អតិបរមា
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
+DocType: Quality Inspection,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
+DocType: Company,Retail,ការលក់រាយ
 DocType: Attendance,Absent,អវត្តមាន
-DocType: Product Bundle,Product Bundle,កញ្ចប់ផលិតផល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,កម្ទេច
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
-DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,កញ្ចប់ផលិតផល
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
+DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
 DocType: GL Entry,Remarks,សុន្ទរកថា
-DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
-DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
-DocType: Features Setup,POS View,ម៉ាស៊ីនឆូតកាតមើល
-apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ការសម្ដែងជាបន្ត
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,សូមបញ្ជាក់
-DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ខាងលើ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ទំហំមត្រជាក់
-DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,តំបន់
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
-DocType: Holiday List,Weekly Off,បិទប្រចាំសប្តាហ៍
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍ៈឆ្នាំ 2012, 2012-13"
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
-DocType: Sales Invoice,Return Against Sales Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការលក់វិក័យប័ត្រ
+DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
+DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
+DocType: Features Setup,POS View,ម៉ាស៊ីនឆូតកាតមើល
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,សូមបញ្ជាក់
+DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ខាងលើ
+DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
+DocType: Holiday List,Weekly Off,បិទប្រចាំសប្តាហ៍
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","ឧទាហរណ៍ៈឆ្នាំ 2012, 2012-13"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),ប្រាក់ចំនេញជាបណ្តោះអាសន្ន / បាត់បង់ (ឥណទាន)
+DocType: Sales Invoice,Return Against Sales Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការលក់វិក័យប័ត្រ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ធាតុ 5
-DocType: Serial No,Creation Time,ពេលវេលាបង្កើត
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,ប្រាក់ចំណូលសរុប
-DocType: Sales Invoice,Product Bundle Help,កញ្ចប់ជំនួយផលិតផល
-,Monthly Attendance Sheet,សន្លឹកវត្តមានប្រចាំខែ
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បានរកឃើញថាគ្មានកំណត់ត្រា
-DocType: GL Entry,Is Advance,តើការជាមុន
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ការចូលរួមពីកាលបរិច្ឆេទនិងចូលរួមកាលបរិច្ឆេទគឺជាចាំបាច់
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
-DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
-DocType: Workflow State,Time,ម៉ោង
-DocType: Features Setup,Sales Discounts,ការបញ្ចុះតម្លៃការលក់
-DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
-DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
-DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌពត៌មានលំអិត
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ពន្ធលក់និងការចោទប្រកាន់ពីទំព័រគំរូ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,សម្លៀកបំពាក់និងគ្រឿងបន្លាស់
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ចំនួននៃលំដាប់
-DocType: Item Group,HTML / Banner that will show on the top of product list.,ជា HTML / បដាដែលនឹងបង្ហាញនៅលើកំពូលនៃបញ្ជីផលិតផល។
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,បញ្ជាក់លក្ខខណ្ឌដើម្បីគណនាចំនួនប្រាក់លើការដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,បន្ថែមកុមារ
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីទឹកកកកែសម្រួលធាតុទឹកកក
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,មិនអាចបម្លែងទៅក្នុងសៀវភៅរបស់មជ្ឈមណ្ឌលដែលជាការចំនាយវាមានថ្នាំងរបស់កុមារ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,កត្តាការប្រែចិត្តជឿត្រូវបានទាមទារ
+DocType: Serial No,Creation Time,ពេលវេលាបង្កើត
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,ប្រាក់ចំណូលសរុប
+DocType: Sales Invoice,Product Bundle Help,កញ្ចប់ជំនួយផលិតផល
+,Monthly Attendance Sheet,សន្លឹកវត្តមានប្រចាំខែ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បានរកឃើញថាគ្មានកំណត់ត្រា
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+DocType: GL Entry,Is Advance,តើការជាមុន
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ការចូលរួមពីកាលបរិច្ឆេទនិងចូលរួមកាលបរិច្ឆេទគឺជាចាំបាច់
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,សូមបញ្ចូល &lt;តើកិច្ចសន្យាបន្ដ &#39;ជាបាទឬទេ
+DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
+DocType: Features Setup,Sales Discounts,ការបញ្ចុះតម្លៃការលក់
+DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
+DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
+DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌពត៌មានលំអិត
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ពន្ធលក់និងការចោទប្រកាន់ពីទំព័រគំរូ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,សម្លៀកបំពាក់និងគ្រឿងបន្លាស់
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ចំនួននៃលំដាប់
+DocType: Item Group,HTML / Banner that will show on the top of product list.,ជា HTML / បដាដែលនឹងបង្ហាញនៅលើកំពូលនៃបញ្ជីផលិតផល។
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,បញ្ជាក់លក្ខខណ្ឌដើម្បីគណនាចំនួនប្រាក់លើការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,បន្ថែមកុមារ
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីទឹកកកកែសម្រួលធាតុទឹកកក
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,មិនអាចបម្លែងទៅក្នុងសៀវភៅរបស់មជ្ឈមណ្ឌលដែលជាការចំនាយវាមានថ្នាំងរបស់កុមារ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,# សៀរៀល
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,គណៈកម្មការលើការលក់
-DocType: Offer Letter Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
-DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
-,Customers Not Buying Since Long Time,អតិថិជនមិនទិញតាំងពីលោកឡុងពេល
-DocType: Production Order,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,bulging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ហួតលំនាំសម្ដែង
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ចំណាយកំសាន្ត
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ដែលមានអាយុ
-DocType: Time Log,Billing Amount,ចំនួនវិក័យប័ត្រ
-apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,កម្មវិធីសម្រាប់ការឈប់សម្រាក។
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ការចំណាយផ្នែកច្បាប់
-DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលការបញ្ជាទិញនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិរបស់ឧ 05, 28 ល"
-DocType: Sales Invoice,Posting Time,ម៉ោងប្រកាស
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,គណៈកម្មការលើការលក់
+DocType: Offer Letter Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
+DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
+,Customers Not Buying Since Long Time,អតិថិជនមិនទិញតាំងពីលោកឡុងពេល
+DocType: Production Order,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ចំណាយកំសាន្ត
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ដែលមានអាយុ
+DocType: Time Log,Billing Amount,ចំនួនវិក័យប័ត្រ
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,កម្មវិធីសម្រាប់ការឈប់សម្រាក។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ការចំណាយផ្នែកច្បាប់
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលការបញ្ជាទិញនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិរបស់ឧ 05, 28 ល"
+DocType: Sales Invoice,Posting Time,ម៉ោងប្រកាស
 DocType: Sales Order,% Amount Billed,% ចំនួន billed
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,ការចំណាយតាមទូរស័ព្ទ
 DocType: Sales Partner,Logo,រូបសញ្ញា
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ការជូនដំណឹងបើកទូលាយ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ការចំណាយដោយផ្ទាល់
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់ចំណូលអតិថិជនថ្មី
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ការចំណាយការធ្វើដំណើរ
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,ការជូនដំណឹងបើកទូលាយ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,ការចំណាយដោយផ្ទាល់
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ប្រាក់ចំណូលអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ការចំណាយការធ្វើដំណើរ
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
-DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូចជានៅលើកាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing ដោយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ឃ្លាំងលំនាំដើមគឺចាំបាច់សម្រាប់ធាតុភាគហ៊ុន។
-DocType: Feed,Full Name,ឈ្មោះពេញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ឈ្នះ
-DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
+DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូចជានៅលើកាលបរិច្ឆេទ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ការសាកល្បង
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ឃ្លាំងលំនាំដើមគឺចាំបាច់សម្រាប់ធាតុភាគហ៊ុន។
+DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 ,Transferred Qty,ផ្ទេរ Qty
-apps/erpnext/erpnext/config/learn.py +11,Navigating,ការរុករក
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,ការធ្វើផែនការ
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,ធ្វើឱ្យបាច់កំណត់ហេតុម៉ោង
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ចេញផ្សាយ
-DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,យើងលក់ធាតុនេះ
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
-DocType: Journal Entry,Cash Entry,ចូលជាសាច់ប្រាក់
-DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
-apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
-DocType: Email Digest,Send regular summary reports via Email.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
-DocType: Brand,Item Manager,កម្មវិធីគ្រប់គ្រងធាតុ
-DocType: Cost Center,Add rows to set annual budgets on Accounts.,បន្ថែមជួរដេកដើម្បីកំណត់ថវិកាប្រចាំឆ្នាំនៅលើគណនី។
-DocType: Buying Settings,Default Supplier Type,ប្រភេទហាងទំនិញលំនាំដើម
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,កន្លែងយកថ្ម
-DocType: Production Order,Total Operating Cost,ថ្លៃប្រតិបត្តិការ
-apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ទំនាក់ទំនងទាំងអស់។
-DocType: Newsletter,Test Email Id,ការធ្វើតេស្តអ៊ីម៉ែលលេខសម្គាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,អក្សរកាត់របស់ក្រុមហ៊ុន
-DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,បើសិនជាអ្នកធ្វើតាមការត្រួតពិនិត្យគុណភាព។ អនុញ្ញាតឱ្យមានធាតុ QA បានទាមទារនិងបង្កាន់ដៃ QA គ្មានក្នុងការទិញ
-DocType: GL Entry,Party Type,ប្រភេទគណបក្ស
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,វត្ថុធាតុដើមមិនអាចជាដូចគ្នាដូចដែលធាតុដ៏សំខាន់
+apps/erpnext/erpnext/config/learn.py +11,Navigating,ការរុករក
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,ការធ្វើផែនការ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,ធ្វើឱ្យបាច់កំណត់ហេតុម៉ោង
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ចេញផ្សាយ
+DocType: Project,Total Billing Amount (via Time Logs),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,យើងលក់ធាតុនេះ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
+DocType: Journal Entry,Cash Entry,ចូលជាសាច់ប្រាក់
+DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
+DocType: Email Digest,Send regular summary reports via Email.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
+DocType: Brand,Item Manager,កម្មវិធីគ្រប់គ្រងធាតុ
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,បន្ថែមជួរដេកដើម្បីកំណត់ថវិកាប្រចាំឆ្នាំនៅលើគណនី។
+DocType: Buying Settings,Default Supplier Type,ប្រភេទហាងទំនិញលំនាំដើម
+DocType: Production Order,Total Operating Cost,ថ្លៃប្រតិបត្តិការ
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ទំនាក់ទំនងទាំងអស់។
+DocType: Newsletter,Test Email Id,ការធ្វើតេស្តអ៊ីម៉ែលលេខសម្គាល់
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,អក្សរកាត់របស់ក្រុមហ៊ុន
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,បើសិនជាអ្នកធ្វើតាមការត្រួតពិនិត្យគុណភាព។ អនុញ្ញាតឱ្យមានធាតុ QA បានទាមទារនិងបង្កាន់ដៃ QA គ្មានក្នុងការទិញ
+DocType: GL Entry,Party Type,ប្រភេទគណបក្ស
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,វត្ថុធាតុដើមមិនអាចជាដូចគ្នាដូចដែលធាតុដ៏សំខាន់
 DocType: Item Attribute Value,Abbreviation,អក្សរកាត់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,ការអប់រំការបង្វិល
-apps/erpnext/erpnext/config/hr.py +115,Salary template master.,ចៅហ្វាយពុម្ពប្រាក់បៀវត្ស។
-DocType: Leave Type,Max Days Leave Allowed,អតិបរមាដែលបានអនុញ្ញាតទុកថ្ងៃ
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,កំណត់ច្បាប់ពន្ធសម្រាប់រទេះដើរទិញឥវ៉ាន់
-DocType: Payment Tool,Set Matching Amounts,កំណត់ចំនួនផ្គូផ្គង
-DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
-,Sales Funnel,ការប្រមូលផ្តុំការលក់
-apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,ចៅហ្វាយពុម្ពប្រាក់បៀវត្ស។
+DocType: Leave Type,Max Days Leave Allowed,អតិបរមាដែលបានអនុញ្ញាតទុកថ្ងៃ
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,កំណត់ច្បាប់ពន្ធសម្រាប់រទេះដើរទិញឥវ៉ាន់
+DocType: Payment Tool,Set Matching Amounts,កំណត់ចំនួនផ្គូផ្គង
+DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
+,Sales Funnel,ការប្រមូលផ្តុំការលក់
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,រទេះ
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,សូមអរគុណចំពោះការចាប់អារម្មណ៍របស់អ្នកក្នុងការធ្វើឱ្យទាន់សម័យជាវរបស់យើង
-,Qty to Transfer,qty ដើម្បីផ្ទេរ
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
-DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
-,Territory Target Variance Item Group-Wise,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Account,Temporary,ជាបណ្តោះអាសន្ន
-DocType: Address,Preferred Billing Address,វិក័យប័ត្រអាសយដ្ឋានដែលពេញចិត្ត
-DocType: Monthly Distribution Percentage,Percentage Allocation,ការបម្រុងទុកជាភាគរយ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,លេខាធិការ
-DocType: Serial No,Distinct unit of an Item,អង្គភាពផ្សេងគ្នានៃធាតុ
-DocType: Pricing Rule,Buying,ការទិញ
-DocType: HR Settings,Employee Records to be created by,កំណត់ត្រាបុគ្គលិកដែលនឹងត្រូវបានបង្កើតឡើងដោយ
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានលុបចោល។
-,Reqd By Date,Reqd តាមកាលបរិច្ឆេទ
-DocType: Salary Slip Earning,Salary Slip Earning,ទទួលបានប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ម្ចាស់បំណុល
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
-,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
-DocType: Purchase Order Item,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ជាតិដែក
-DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
-apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍ជិតមកដល់
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជនគឺត្រូវបានទាមទារ
-DocType: Letter Head,Letter Head,លិខិតនាយក
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ធាតុរហ័ស
-DocType: Purchase Order,To Receive,ដើម្បីទទួលបាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,បង្រួញការសម
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
-DocType: Email Digest,Income / Expense,ប្រាក់ចំណូល / ចំណាយ
-DocType: Employee,Personal Email,អ៊ីម៉ែលផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,អថេរចំនួនសរុប
-DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើអនុញ្ញាតប្រព័ន្ធនេះនឹងផ្តល់ការបញ្ចូលគណនីសម្រាប់ការដោយស្វ័យប្រវត្តិ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ឈ្មួញកណ្តាល
-DocType: Address,Postal Code,លេខកូដប្រៃសណីយ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,សូមអរគុណចំពោះការចាប់អារម្មណ៍របស់អ្នកក្នុងការធ្វើឱ្យទាន់សម័យជាវរបស់យើង
+,Qty to Transfer,qty ដើម្បីផ្ទេរ
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
+DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
+,Territory Target Variance Item Group-Wise,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ទំព័រគំរូពន្ធលើគឺជាចាំបាច់។
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),បញ្ជីតម្លៃដែលអត្រា (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Account,Temporary,ជាបណ្តោះអាសន្ន
+DocType: Address,Preferred Billing Address,វិក័យប័ត្រអាសយដ្ឋានដែលពេញចិត្ត
+DocType: Monthly Distribution Percentage,Percentage Allocation,ការបម្រុងទុកជាភាគរយ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,លេខាធិការ
+DocType: Serial No,Distinct unit of an Item,អង្គភាពផ្សេងគ្នានៃធាតុ
+DocType: Pricing Rule,Buying,ការទិញ
+DocType: HR Settings,Employee Records to be created by,កំណត់ត្រាបុគ្គលិកដែលនឹងត្រូវបានបង្កើតឡើងដោយ
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,នេះបាច់កំណត់ហេតុម៉ោងត្រូវបានលុបចោល។
+,Reqd By Date,Reqd តាមកាលបរិច្ឆេទ
+DocType: Salary Slip Earning,Salary Slip Earning,ទទួលបានប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,ម្ចាស់បំណុល
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
+,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
+DocType: Purchase Order Item,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
+DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ព្រឹត្តិការណ៍ជិតមកដល់
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជនគឺត្រូវបានទាមទារ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ធាតុរហ័ស
+DocType: Purchase Order,To Receive,ដើម្បីទទួលបាន
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
+DocType: Email Digest,Income / Expense,ប្រាក់ចំណូល / ចំណាយ
+DocType: Employee,Personal Email,អ៊ីម៉ែលផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,អថេរចំនួនសរុប
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើអនុញ្ញាតប្រព័ន្ធនេះនឹងផ្តល់ការបញ្ចូលគណនីសម្រាប់ការដោយស្វ័យប្រវត្តិ។
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ឈ្មួញកណ្តាល
+DocType: Address,Postal Code,លេខកូដប្រៃសណីយ
 DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'",បានបន្ទាន់សម័យតាមរយៈការនៅនាទី &quot;ពេលវេលាកំណត់ហេតុ &#39;
-DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
-apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
-apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
-DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,ផែនការជនជាតិ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ស្តង់ដាលក់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
-DocType: Serial No,Out of Warranty,ចេញពីការធានា
+Updated via 'Time Log'",បានបន្ទាន់សម័យតាមរយៈការនៅនាទី &quot;ពេលវេលាកំណត់ហេតុ &#39;
+DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ស្តង់ដាលក់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,យ៉ាងហោចណាស់មានម្នាក់ឃ្លាំងគឺជាចាំបាច់
+DocType: Serial No,Out of Warranty,ចេញពីការធានា
 DocType: BOM Replace Tool,Replace,ជំនួស
-apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
-DocType: Purchase Invoice Item,Project Name,ឈ្មោះគម្រោង
-DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
-DocType: Workflow State,Edit,កែសម្រួល
-DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
-DocType: Features Setup,Item Batch Nos,បាច់ធាតុ Nos
-DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,សូមបញ្ចូលលំនាំដើមវិធានការអង្គភាព
+DocType: Purchase Invoice Item,Project Name,ឈ្មោះគម្រោង
+DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
+DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
+DocType: Features Setup,Item Batch Nos,បាច់ធាតុ Nos
+DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/config/learn.py +204,Human Resource,ធនធានមនុស្ស
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការទូទាត់ការផ្សះផ្សាការទូទាត់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ការទូទាត់ការផ្សះផ្សាការទូទាត់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ការប្រមូលពន្ធលើទ្រព្យសម្បត្តិ
 DocType: BOM Item,BOM No,Bom គ្មាន
-DocType: Contact Us Settings,Pincode,Pincode
-DocType: Item,Moving Average,ជាមធ្យមការផ្លាស់ប្តូរ
-DocType: BOM Replace Tool,The BOM which will be replaced,Bom ដែលនឹងត្រូវបានជំនួស
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ញូហ៊ុន UOM ត្រូវតែមានភាពខុសគ្នាពី UOM សន្និធិបច្ចុប្បន្ន
+DocType: Item,Moving Average,ជាមធ្យមការផ្លាស់ប្តូរ
+DocType: BOM Replace Tool,The BOM which will be replaced,Bom ដែលនឹងត្រូវបានជំនួស
 DocType: Account,Debit,ឥណពន្ធ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"ស្លឹកត្រូវតែត្រូវបានបម្រុងទុកនៅក្នុង 0,5 ច្រើន"
-DocType: Production Order,Operation Cost,ប្រតិបត្ដិការចំណាយ
-apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ការចូលរួមពីឯកសារដែលបានផ្ទុកឡើង .csv មួយ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"ស្លឹកត្រូវតែត្រូវបានបម្រុងទុកនៅក្នុង 0,5 ច្រើន"
+DocType: Production Order,Operation Cost,ប្រតិបត្ដិការចំណាយ
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ការចូលរួមពីឯកសារដែលបានផ្ទុកឡើង .csv មួយ
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ឆ្នើម AMT
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធាតុសំណុំក្រុមគោលដៅប្រាជ្ញាសម្រាប់ការនេះការលក់បុគ្គល។
-DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",ដើម្បីកំណត់ពីបញ្ហានេះប្រើប៊ូតុង &quot;កំណត់&quot; នៅក្នុងរបារចំហៀង។
-DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុនបង្កកចាស់ជាង [ថ្ងៃ]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើសិនជាវិធានតម្លៃពីរឬច្រើនត្រូវបានរកឃើញដោយផ្អែកលើលក្ខខណ្ឌខាងលើអាទិភាពត្រូវបានអនុវត្ត។ អាទិភាពគឺជាលេខរវាង 0 ទៅ 20 ខណៈពេលតម្លៃលំនាំដើមគឺសូន្យ (ទទេ) ។ ចំនួនខ្ពស់មានន័យថាវានឹងយកអាទិភាពប្រសិនបើមិនមានវិធានតម្លៃច្រើនដែលមានស្ថានភាពដូចគ្នា។
-DocType: Currency Exchange,To Currency,ដើម្បីរូបិយប័ណ្ណ
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,អនុញ្ញាតឱ្យអ្នកប្រើដូចខាងក្រោមដើម្បីអនុម័តកម្មវិធីសុំច្បាប់សម្រាកសម្រាប់ថ្ងៃប្លុក។
-apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,ប្រភេទនៃការទាមទារសំណងថ្លៃ។
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធាតុសំណុំក្រុមគោលដៅប្រាជ្ញាសម្រាប់ការនេះការលក់បុគ្គល។
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",ដើម្បីកំណត់ពីបញ្ហានេះប្រើប៊ូតុង &quot;កំណត់&quot; នៅក្នុងរបារចំហៀង។
+DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុនបង្កកចាស់ជាង [ថ្ងៃ]
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើសិនជាវិធានតម្លៃពីរឬច្រើនត្រូវបានរកឃើញដោយផ្អែកលើលក្ខខណ្ឌខាងលើអាទិភាពត្រូវបានអនុវត្ត។ អាទិភាពគឺជាលេខរវាង 0 ទៅ 20 ខណៈពេលតម្លៃលំនាំដើមគឺសូន្យ (ទទេ) ។ ចំនួនខ្ពស់មានន័យថាវានឹងយកអាទិភាពប្រសិនបើមិនមានវិធានតម្លៃច្រើនដែលមានស្ថានភាពដូចគ្នា។
+DocType: Currency Exchange,To Currency,ដើម្បីរូបិយប័ណ្ណ
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,អនុញ្ញាតឱ្យអ្នកប្រើដូចខាងក្រោមដើម្បីអនុម័តកម្មវិធីសុំច្បាប់សម្រាកសម្រាប់ថ្ងៃប្លុក។
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,ប្រភេទនៃការទាមទារសំណងថ្លៃ។
 DocType: Item,Taxes,ពន្ធ
-DocType: Project,Default Cost Center,មជ្ឈមណ្ឌលតម្លៃលំនាំដើម
-DocType: Purchase Invoice,End Date,កាលបរិច្ឆេទបញ្ចប់
-DocType: Employee,Internal Work History,ប្រវត្តិការងារផ្ទៃក្នុង
-DocType: DocField,Column Break,ការបំបែកជួរឈរ
-DocType: Event,Thursday,ថ្ងៃព្រហស្បតិ៍
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,សមធម៌ឯកជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ងាក
-DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
-DocType: Account,Expense,ការចំណាយ
-DocType: Sales Invoice,Exhibition,ការតាំងពិព័រណ៍
-DocType: Item Attribute,From Range,ពីជួរ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
+DocType: Project,Default Cost Center,មជ្ឈមណ្ឌលតម្លៃលំនាំដើម
+DocType: Purchase Invoice,End Date,កាលបរិច្ឆេទបញ្ចប់
+DocType: Employee,Internal Work History,ប្រវត្តិការងារផ្ទៃក្នុង
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,សមធម៌ឯកជន
+DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
+DocType: Account,Expense,ការចំណាយ
+DocType: Sales Invoice,Exhibition,ការតាំងពិព័រណ៍
+DocType: Item Attribute,From Range,ពីជួរ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,ដាក់ស្នើសម្រាប់ដំណើរការបន្ថែមផលិតកម្មលំដាប់នេះ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
 DocType: Company,Domain,ដែន
-,Sales Order Trends,ការលក់លំដាប់និន្នាការ
-DocType: Employee,Held On,ប្រារព្ធឡើងនៅថ្ងៃទី
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ផលិតកម្មធាតុ
-,Employee Information,ព័ត៌មានបុគ្គលិក
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),អត្រាការប្រាក់ (%)
-DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,កាលបរិច្ឆេទឆ្នាំហិរញ្ញវត្ថុបញ្ចប់
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
-DocType: Quality Inspection,Incoming,មកដល់
-DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
-DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់បន្ថយរកស្នើសុំការអនុញ្ញាតដោយគ្មានការបង់ (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",បន្ថែមអ្នកប្រើប្រាស់ក្នុងអង្គការរបស់អ្នកក្រៅពីខ្លួនអ្នកផ្ទាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ចាកចេញធម្មតា
-DocType: Batch,Batch ID,លេខសម្គាល់បាច់
-,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
+,Sales Order Trends,ការលក់លំដាប់និន្នាការ
+DocType: Employee,Held On,ប្រារព្ធឡើងនៅថ្ងៃទី
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ផលិតកម្មធាតុ
+,Employee Information,ព័ត៌មានបុគ្គលិក
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),អត្រាការប្រាក់ (%)
+DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,កាលបរិច្ឆេទឆ្នាំហិរញ្ញវត្ថុបញ្ចប់
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+DocType: Quality Inspection,Incoming,មកដល់
+DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),កាត់បន្ថយរកស្នើសុំការអនុញ្ញាតដោយគ្មានការបង់ (LWP)
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",បន្ថែមអ្នកប្រើប្រាស់ក្នុងអង្គការរបស់អ្នកក្រៅពីខ្លួនអ្នកផ្ទាល់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ចាកចេញធម្មតា
+DocType: Batch,Batch ID,លេខសម្គាល់បាច់
+,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
 DocType: GL Entry,Party,គណបក្ស
-DocType: Sales Order,Delivery Date,ដឹកជញ្ជូនកាលបរិច្ឆេទ
-DocType: DocField,Currency,រូបិយប័ណ្ណ
-DocType: Opportunity,Opportunity Date,កាលបរិច្ឆេទឱកាសការងារ
-DocType: Purchase Receipt,Return Against Purchase Receipt,ការវិលត្រឡប់ពីការប្រឆាំងនឹងបង្កាន់ដៃទិញ
+DocType: Sales Order,Delivery Date,ដឹកជញ្ជូនកាលបរិច្ឆេទ
+DocType: Opportunity,Opportunity Date,កាលបរិច្ឆេទឱកាសការងារ
+DocType: Purchase Receipt,Return Against Purchase Receipt,ការវិលត្រឡប់ពីការប្រឆាំងនឹងបង្កាន់ដៃទិញ
 DocType: Purchase Order,To Bill,លោក Bill
 DocType: Material Request,% Ordered,% លំដាប់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,ម៉ៅការ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
-DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
-DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,ម៉ៅការ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ជាមធ្យម។ អត្រាទិញ
+DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
+DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
 apps/erpnext/erpnext/config/crm.py +151,Newsletters,ព្រឹត្តិបត្រ
-DocType: Address,Shipping,ការដឹកជញ្ជូន
-DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគហ៊ុនធាតុសៀវភៅ
-DocType: Department,Leave Block List,ទុកឱ្យបញ្ជីប្លុក
-DocType: Customer,Tax ID,លេខសម្គាល់ការប្រមូលពន្ធលើ
-DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
-DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,រោងចក្រនិងគ្រឿងម៉ាស៊ីន
-DocType: Sales Partner,Partner's Website,គេហទំព័រដៃគូ
-DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
-DocType: SMS Settings,SMS Settings,កំណត់ការផ្ញើសារជាអក្សរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,គណនីបណ្តោះអាសន្ន
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ពណ៌ខ្មៅ
-DocType: BOM Explosion Item,BOM Explosion Item,ធាតុផ្ទុះ Bom
+DocType: Address,Shipping,ការដឹកជញ្ជូន
+DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគហ៊ុនធាតុសៀវភៅ
+DocType: Department,Leave Block List,ទុកឱ្យបញ្ជីប្លុក
+DocType: Customer,Tax ID,លេខសម្គាល់ការប្រមូលពន្ធលើ
+DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
+DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,រោងចក្រនិងគ្រឿងម៉ាស៊ីន
+DocType: Sales Partner,Partner's Website,គេហទំព័រដៃគូ
+DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
+DocType: SMS Settings,SMS Settings,កំណត់ការផ្ញើសារជាអក្សរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,គណនីបណ្តោះអាសន្ន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ពណ៌ខ្មៅ
+DocType: BOM Explosion Item,BOM Explosion Item,ធាតុផ្ទុះ Bom
 DocType: Account,Auditor,សវនករ
-DocType: Purchase Order,End date of current order's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលការបញ្ជាទិញនាពេលបច្ចុប្បន្នរបស់
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ធ្វើឱ្យការផ្តល់ជូនលិខិត
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ត្រឡប់មកវិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ឯកតាលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ត្រូវតែមានដូចគ្នាជាពុម្ព
-DocType: DocField,Fold,បោះបង់ចោល
-DocType: Production Order Operation,Production Order Operation,ផលិតកម្មលំដាប់ប្រតិបត្តិការ
-DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
-DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,សូមបញ្ជាក់
-DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,លេខសម្គាល់អតិថិជន
-DocType: Page,Page Name,ឈ្មោះទំព័រ
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ទៅពេលត្រូវតែធំជាងពីពេលវេលា
-DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,បញ្ចប់ spindle
-DocType: BOM,Last Purchase Rate,អត្រាទិញចុងក្រោយ
-DocType: Account,Asset,ទ្រព្យសកម្ម
-DocType: Project Task,Task ID,ភារកិច្ចលេខសម្គាល់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",ឧទាហរណ៏ &quot;ពិធីករ&quot;
-,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
-DocType: System Settings,Time Zone,តំបន់ពេលវេលា
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះសម្រាប់ហាប់ ERPNext
-DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួនភាគរយចែកចាយប្រចាំខែ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
-DocType: Delivery Note,% of materials delivered against this Delivery Note,សមា្ភារៈបានបញ្ជូន% នៃការប្រឆាំងនឹងការផ្តល់ចំណាំនេះ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,អាហារមានជាតិ
-DocType: Customer,Customer Details,ពត៌មានលំអិតរបស់អតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,រាង
-DocType: Employee,Reports to,របាយការណ៍ទៅ
-DocType: SMS Settings,Enter url parameter for receiver nos,បញ្ចូល URL សម្រាប់ការទទួលប៉ារ៉ាម៉ែត្រ NOS
-DocType: Sales Invoice,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
-,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
-DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,គ្រប់គ្រងគុណភាព
-DocType: Production Planning Tool,Filter based on customer,តម្រងផ្អែកលើការអតិថិជន
-DocType: Payment Tool Detail,Against Voucher No,ប្រឆាំងនឹងប័ណ្ណគ្មាន
-DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
-DocType: Tax Rule,Purchase,ការទិញ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,មានតុល្យភាព Qty
-DocType: Item Group,Parent Item Group,ធាតុមេគ្រុប
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,មជ្ឈមណ្ឌលការចំណាយ
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ឃ្លាំង។
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណក្រុមហ៊ុនផ្គត់ផ្គង់ដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
-DocType: Opportunity,Next Contact,ទំនាក់ទំនងបន្ទាប់
-DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ទ្រព្យសកម្មថេរ
-DocType: Item Group,Default Expense Account,ចំណាយតាមគណនីលំនាំដើម
-DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
-DocType: Page,Yes,បាទ
-DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
+DocType: Purchase Order,End date of current order's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលការបញ្ជាទិញនាពេលបច្ចុប្បន្នរបស់
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ធ្វើឱ្យការផ្តល់ជូនលិខិត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ត្រឡប់មកវិញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,ឯកតាលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ត្រូវតែមានដូចគ្នាជាពុម្ព
+DocType: Production Order Operation,Production Order Operation,ផលិតកម្មលំដាប់ប្រតិបត្តិការ
+DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
+DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
+DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,លេខសម្គាល់អតិថិជន
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ទៅពេលត្រូវតែធំជាងពីពេលវេលា
+DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
+DocType: BOM,Last Purchase Rate,អត្រាទិញចុងក្រោយ
+DocType: Account,Asset,ទ្រព្យសកម្ម
+DocType: Project Task,Task ID,ភារកិច្ចលេខសម្គាល់
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",ឧទាហរណ៏ &quot;ពិធីករ&quot;
+,Sales Person-wise Transaction Summary,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ចុះឈ្មោះសម្រាប់ហាប់ ERPNext
+DocType: Monthly Distribution,Monthly Distribution Percentages,ចំនួនភាគរយចែកចាយប្រចាំខែ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
+DocType: Delivery Note,% of materials delivered against this Delivery Note,សមា្ភារៈបានបញ្ជូន% នៃការប្រឆាំងនឹងការផ្តល់ចំណាំនេះ
+DocType: Customer,Customer Details,ពត៌មានលំអិតរបស់អតិថិជន
+DocType: Employee,Reports to,របាយការណ៍ទៅ
+DocType: SMS Settings,Enter url parameter for receiver nos,បញ្ចូល URL សម្រាប់ការទទួលប៉ារ៉ាម៉ែត្រ NOS
+DocType: Sales Invoice,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
+,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
+DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,គ្រប់គ្រងគុណភាព
+DocType: Production Planning Tool,Filter based on customer,តម្រងផ្អែកលើការអតិថិជន
+DocType: Payment Tool Detail,Against Voucher No,ប្រឆាំងនឹងប័ណ្ណគ្មាន
+DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
+DocType: Tax Rule,Purchase,ការទិញ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,មានតុល្យភាព Qty
+DocType: Item Group,Parent Item Group,ធាតុមេគ្រុប
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,មជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ឃ្លាំង។
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,អត្រារូបិយប័ណ្ណក្រុមហ៊ុនផ្គត់ផ្គង់ដែលត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់ក្រុមហ៊ុន
+DocType: Opportunity,Next Contact,ទំនាក់ទំនងបន្ទាប់
+DocType: Employee,Employment Type,ប្រភេទការងារធ្វើ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,រយៈពេលប្រើប្រាស់មិនអាចមាននៅទូទាំងកំណត់ត្រា alocation ទាំងពីរនាក់
+DocType: Item Group,Default Expense Account,ចំណាយតាមគណនីលំនាំដើម
+DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
+DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ប្រឆាំងនឹងប្រភេទត្រូវតែមានប័ណ្ណមួយនៃការទិញសណ្តាប់ធ្នាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
-DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
-DocType: Production Order,Planned Operating Cost,ចំណាយប្រតិបត្តិការដែលបានគ្រោងទុក
-DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
-DocType: Authorization Rule,Customer / Item Name,អតិថិជន / ធាតុឈ្មោះ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ប្រឆាំងនឹងប្រភេទត្រូវតែមានប័ណ្ណមួយនៃការទិញសណ្តាប់ធ្នាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
+DocType: Production Order,Planned Operating Cost,ចំណាយប្រតិបត្តិការដែលបានគ្រោងទុក
+DocType: Job Applicant,Applicant Name,ឈ្មោះកម្មវិធី
+DocType: Authorization Rule,Customer / Item Name,អតិថិជន / ធាតុឈ្មោះ
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
 
 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
 
 For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
 
-Note: BOM = Bill of Materials","ក្រុមការសរុបនៃធាតុ ** ** ចូលទៅក្នុងធាតុ ** ផ្សេងទៀត ** ។ នេះមានប្រយោជន៍ប្រសិនបើអ្នកកំពុង bundling ធាតុ ** ជាក់លាក់ ** ទៅក្នុងកញ្ចប់មួយហើយអ្នករក្សាភាគហ៊ុនរបស់ packed ** ធាតុ ** និងមិនសរុប ** ធាតុ ** ។ កញ្ចប់ ** ធាតុ ** នឹងមាន«តើធាតុហ៊ុន &quot;ជា&quot; ទេ &quot;ហើយ&quot; តើធាតុលក់ &quot;ជា&quot; បាទ &quot;។ ឧទាហរណ៍: ប្រសិនបើអ្នកត្រូវការលក់កុំព្យូទ័រយួរដៃនិងកាតាបស្ពាយដោយឡែកពីគ្នានិងមានតម្លៃពិសេសប្រសិនបើអតិថិជនទិញទាំងពីរ, បន្ទាប់មកភ្ញៀវទេសចរសម្ពាយកុំព្យូទ័រយួរដៃបូកនឹងមានធាតុកញ្ចប់ផលិតផលថ្មីមួយ។ ចំណាំ: Bom = លោក Bill នៃសម្ភារៈ"
+Note: BOM = Bill of Materials","ក្រុមការសរុបនៃធាតុ ** ** ចូលទៅក្នុងធាតុ ** ផ្សេងទៀត ** ។ នេះមានប្រយោជន៍ប្រសិនបើអ្នកកំពុង bundling ធាតុ ** ជាក់លាក់ ** ទៅក្នុងកញ្ចប់មួយហើយអ្នករក្សាភាគហ៊ុនរបស់ packed ** ធាតុ ** និងមិនសរុប ** ធាតុ ** ។ កញ្ចប់ ** ធាតុ ** នឹងមាន«តើធាតុហ៊ុន &quot;ជា&quot; ទេ &quot;ហើយ&quot; តើធាតុលក់ &quot;ជា&quot; បាទ &quot;។ ឧទាហរណ៍: ប្រសិនបើអ្នកត្រូវការលក់កុំព្យូទ័រយួរដៃនិងកាតាបស្ពាយដោយឡែកពីគ្នានិងមានតម្លៃពិសេសប្រសិនបើអតិថិជនទិញទាំងពីរ, បន្ទាប់មកភ្ញៀវទេសចរសម្ពាយកុំព្យូទ័រយួរដៃបូកនឹងមានធាតុកញ្ចប់ផលិតផលថ្មីមួយ។ ចំណាំ: Bom = លោក Bill នៃសម្ភារៈ"
 DocType: Item Variant Attribute,Attribute,គុណលក្ខណៈ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,សូមបញ្ជាក់ពី / ទៅរាប់
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,បានបង្កើតដោយ
-DocType: Serial No,Under AMC,នៅក្រោម AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,អត្រាការប្រាក់ត្រូវបានគណនាឡើងវិញបើធាតុតម្លៃបានពិចារណាពីចំនួនទឹកប្រាក់ដែលទឹកប្រាក់ចំណាយបានចុះចត
-apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ការកំណត់លំនាំដើមសម្រាប់លក់ប្រតិបត្តិការ។
-DocType: BOM Replace Tool,Current BOM,Bom នាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,បន្ថែមគ្មានសៀរៀល
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,សូមបញ្ជាក់ពី / ទៅរាប់
+DocType: Serial No,Under AMC,នៅក្រោម AMC
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,អត្រាការប្រាក់ត្រូវបានគណនាឡើងវិញបើធាតុតម្លៃបានពិចារណាពីចំនួនទឹកប្រាក់ដែលទឹកប្រាក់ចំណាយបានចុះចត
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ការកំណត់លំនាំដើមសម្រាប់លក់ប្រតិបត្តិការ។
+DocType: BOM Replace Tool,Current BOM,Bom នាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,បន្ថែមគ្មានសៀរៀល
 DocType: Production Order,Warehouses,ឃ្លាំង
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,បោះពុម្ពនិងស្ថានី
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ថ្នាំងគ្រុប
-DocType: Payment Reconciliation,Minimum Amount,ចំនួនទឹកប្រាក់អប្បបរមា
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ធ្វើឱ្យទាន់សម័យបានបញ្ចប់ផលិតផល
-DocType: Workstation,per hour,ក្នុងមួយម៉ោង
-DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនីសម្រាប់ឃ្លាំង (សារពើភ័ណ្ឌងូត) នឹងត្រូវបានបង្កើតឡើងក្រោមគណនីនេះ។
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,បោះពុម្ពនិងស្ថានី
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,ថ្នាំងគ្រុប
+DocType: Payment Reconciliation,Minimum Amount,ចំនួនទឹកប្រាក់អប្បបរមា
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ធ្វើឱ្យទាន់សម័យបានបញ្ចប់ផលិតផល
+DocType: Workstation,per hour,ក្នុងមួយម៉ោង
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,គណនីសម្រាប់ឃ្លាំង (សារពើភ័ណ្ឌងូត) នឹងត្រូវបានបង្កើតឡើងក្រោមគណនីនេះ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 DocType: Company,Distribution,ចែកចាយ
-apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
-DocType: Customer,Default Taxes and Charges,ពន្ធលំនាំដើមនិងការចោទប្រកាន់
-DocType: Account,Receivable,អ្នកទទួល
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-DocType: Sales Invoice,Supplier Reference,យោងក្រុមហ៊ុនផ្គត់ផ្គង់
-DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","ប្រសិនបើបានធីក Bom សម្រាប់ធាតុការជួបប្រជុំថ្នាក់ក្រោមនឹងត្រូវបានចាត់ទុកថាជាសម្រាប់ការទទួលវត្ថុធាតុដើម។ បើមិនដូច្នោះទេ, ធាតុទាំងអស់ដែលរងការជួបប្រជុំគ្នានេះនឹងត្រូវបានចាត់ទុកជាវត្ថុធាតុដើម។"
-DocType: Material Request,Material Issue,សម្ភារៈបញ្ហា
-DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,បញ្ជូន
+DocType: Customer,Default Taxes and Charges,ពន្ធលំនាំដើមនិងការចោទប្រកាន់
+DocType: Account,Receivable,អ្នកទទួល
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
+DocType: Sales Invoice,Supplier Reference,យោងក្រុមហ៊ុនផ្គត់ផ្គង់
+DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","ប្រសិនបើបានធីក Bom សម្រាប់ធាតុការជួបប្រជុំថ្នាក់ក្រោមនឹងត្រូវបានចាត់ទុកថាជាសម្រាប់ការទទួលវត្ថុធាតុដើម។ បើមិនដូច្នោះទេ, ធាតុទាំងអស់ដែលរងការជួបប្រជុំគ្នានេះនឹងត្រូវបានចាត់ទុកជាវត្ថុធាតុដើម។"
+DocType: Material Request,Material Issue,សម្ភារៈបញ្ហា
+DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
 DocType: Employee Education,Qualification,គុណវុឌ្ឍិ
-DocType: Item Price,Item Price,ថ្លៃទំនិញ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ដុំនិងសាប៊ូម្ស៉ៅ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
-DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
-DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,សូមបញ្ចូលអនុម័តតួនាទីឬការអនុម័តរបស់អ្នកប្រើប្រាស់
-DocType: Journal Entry,Write Off Entry,បិទសរសេរធាតុ
-DocType: BOM,Rate Of Materials Based On,អត្រានៃសម្ភារៈមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ការគាំទ្រ Analtyics
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,ភាគហ៊ុន UOM ជំនួសឧបករណ៍
+DocType: Item Price,Item Price,ថ្លៃទំនិញ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ដុំនិងសាប៊ូម្ស៉ៅ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
+DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
+DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,សូមបញ្ចូលអនុម័តតួនាទីឬការអនុម័តរបស់អ្នកប្រើប្រាស់
+DocType: Journal Entry,Write Off Entry,បិទសរសេរធាតុ
+DocType: BOM,Rate Of Materials Based On,អត្រានៃសម្ភារៈមូលដ្ឋាននៅលើ
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ការគាំទ្រ Analtyics
 DocType: POS Profile,Terms and Conditions,លក្ខខណ្ឌ
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
-DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
-DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
-DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
-DocType: Sales Order Item,For Production,ចំពោះផលិតកម្ម
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,សូមបញ្ចូលគោលបំណងលក់នៅក្នុងតារាងខាងលើ
-DocType: Project Task,View Task,មើលការងារ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកចាប់ផ្តើមនៅ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,សូមបញ្ចូលបង្កាន់ដៃទិញ
-DocType: Sales Invoice,Get Advances Received,ទទួលបុរេប្រទានបានទទួល
-DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់អ្នកគាំទ្រអ៊ីម៉ែល។ (ឧ support@example.com)
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,កង្វះខាត Qty
-DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",បង្កើតវេចខ្ចប់គ្រូពេទ្យប្រហែលជាសម្រាប់កញ្ចប់ត្រូវបានបញ្ជូន។ ត្រូវបានប្រើដើម្បីជូនដំណឹងដល់ចំនួនដែលកញ្ចប់មាតិកាកញ្ចប់និងទំងន់របស់ខ្លួន។
-DocType: Sales Invoice Item,Sales Order Item,ធាតុលំដាប់ការលក់
-DocType: Salary Slip,Payment Days,ថ្ងៃការទូទាត់
-DocType: BOM,Manage cost of operations,គ្រប់គ្រងការចំណាយប្រតិបត្តិការ
-DocType: Features Setup,Item Advanced,ធាតុកម្រិតខ្ពស់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,រំកិលក្តៅ
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",នៅពេលណាដែលប្រតិបត្តិការដែលបានធីកត្រូវបាន &quot;ផ្តល់ជូន&quot; ដែលជាការលេចឡើងអ៊ីម៉ែលដែលបានបើកដោយស្វ័យប្រវត្តិដើម្បីផ្ញើអ៊ីមែលទៅជាប់ទាក់ទង &quot;ទំនាក់ទំនង&quot; នៅក្នុងប្រតិបត្តិការនោះដោយមានប្រតិបត្តិការជាមួយការភ្ជាប់នេះ។ អ្នកប្រើដែលអាចឬមិនអាចផ្ញើអ៊ីមែល។
-apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការកំណត់សកល
-DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
-DocType: Salary Slip,Net Pay,ប្រាក់ចំណេញសុទ្ធ
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","នៅទីនេះអ្នកអាចរក្សាកម្ពស់, ទម្ងន់, អាឡែស៊ី, មានការព្រួយបារម្ភវេជ្ជសាស្រ្តល"
+DocType: Leave Block List,Applies to Company,អនុវត្តទៅក្រុមហ៊ុន
+DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
+DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
+DocType: Sales Order Item,For Production,ចំពោះផលិតកម្ម
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,សូមបញ្ចូលគោលបំណងលក់នៅក្នុងតារាងខាងលើ
+DocType: Project Task,View Task,មើលការងារ
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកចាប់ផ្តើមនៅ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,សូមបញ្ចូលបង្កាន់ដៃទិញ
+DocType: Sales Invoice,Get Advances Received,ទទួលបុរេប្រទានបានទទួល
+DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),រៀបចំម៉ាស៊ីនបម្រើចូលមកសម្រាប់លេខសម្គាល់អ្នកគាំទ្រអ៊ីម៉ែល។ (ឧ support@example.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,កង្វះខាត Qty
+DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",បង្កើតវេចខ្ចប់គ្រូពេទ្យប្រហែលជាសម្រាប់កញ្ចប់ត្រូវបានបញ្ជូន។ ត្រូវបានប្រើដើម្បីជូនដំណឹងដល់ចំនួនដែលកញ្ចប់មាតិកាកញ្ចប់និងទំងន់របស់ខ្លួន។
+DocType: Sales Invoice Item,Sales Order Item,ធាតុលំដាប់ការលក់
+DocType: Salary Slip,Payment Days,ថ្ងៃការទូទាត់
+DocType: BOM,Manage cost of operations,គ្រប់គ្រងការចំណាយប្រតិបត្តិការ
+DocType: Features Setup,Item Advanced,ធាតុកម្រិតខ្ពស់
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",នៅពេលណាដែលប្រតិបត្តិការដែលបានធីកត្រូវបាន &quot;ផ្តល់ជូន&quot; ដែលជាការលេចឡើងអ៊ីម៉ែលដែលបានបើកដោយស្វ័យប្រវត្តិដើម្បីផ្ញើអ៊ីមែលទៅជាប់ទាក់ទង &quot;ទំនាក់ទំនង&quot; នៅក្នុងប្រតិបត្តិការនោះដោយមានប្រតិបត្តិការជាមួយការភ្ជាប់នេះ។ អ្នកប្រើដែលអាចឬមិនអាចផ្ញើអ៊ីមែល។
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការកំណត់សកល
+DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+DocType: Salary Slip,Net Pay,ប្រាក់ចំណេញសុទ្ធ
 DocType: Account,Account,គណនី
-,Requested Items To Be Transferred,ធាតុដែលបានស្នើសុំឱ្យគេបញ្ជូន
-DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
-DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
-DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ស្លឹកឈឺ
-DocType: Email Digest,Email Digest,អ៊ីម៉ែលសង្ខេប
-DocType: Delivery Note,Billing Address Name,វិក័យប័ត្រឈ្មោះអាសយដ្ឋាន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ហាងលក់នាយកដ្ឋាន
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,តុល្យភាពរបស់ប្រព័ន្ធ
-DocType: Workflow,Is Active,គឺជាសកម្ម
-apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
-apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
+,Requested Items To Be Transferred,ធាតុដែលបានស្នើសុំឱ្យគេបញ្ជូន
+DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
+DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
+DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,ស្លឹកឈឺ
+DocType: Email Digest,Email Digest,អ៊ីម៉ែលសង្ខេប
+DocType: Delivery Note,Billing Address Name,វិក័យប័ត្រឈ្មោះអាសយដ្ឋាន
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ហាងលក់នាយកដ្ឋាន
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,តុល្យភាពរបស់ប្រព័ន្ធ
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,រក្សាទុកឯកសារជាលើកដំបូង។
 DocType: Account,Chargeable,បន្ទុក
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
-DocType: Company,Change Abbreviation,ការផ្លាស់ប្តូរអក្សរកាត់
-DocType: Workflow State,Primary,បឋមសិក្សា
-DocType: Expense Claim Detail,Expense Date,ការចំណាយកាលបរិច្ឆេទ
-DocType: Item,Max Discount (%),អតិបរមាការបញ្ចុះតម្លៃ (%)
-DocType: Communication,More Information,ពត៌មានបន្ថែម
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,ចំនួនទឹកប្រាក់លំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,បំផ្ទុះ
+DocType: Company,Change Abbreviation,ការផ្លាស់ប្តូរអក្សរកាត់
+DocType: Expense Claim Detail,Expense Date,ការចំណាយកាលបរិច្ឆេទ
+DocType: Item,Max Discount (%),អតិបរមាការបញ្ចុះតម្លៃ (%)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,ចំនួនទឹកប្រាក់លំដាប់ចុងក្រោយ
 DocType: Company,Warn,ព្រមាន
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ការវាយតម្លៃធាតុបានធ្វើឱ្យទាន់សម័យ
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
-DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
-DocType: Purchase Order,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
-DocType: Purchase Invoice,Recurring Print Format,កើតឡើងទ្រង់ទ្រាយបោះពុម្ព
-DocType: Communication,Series,កម្រងឯកសារ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការទិញលំដាប់កាលបរិច្ឆេទ
-DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
-DocType: Communication,Email,អ៊ីម៉ែល
-DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,គោលបំណងថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,រយៈពេល
-,General Ledger,ទូទៅសៀវភៅ
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,មើលតែងតែនាំឱ្យមាន
-DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
-,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
-DocType: Features Setup,To get Item Group in details table,ដើម្បីទទួលបានធាតុ Group ក្នុងតារាងពត៌មានលំអិត
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ធ្វើការផ្លាស់ប្តូ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ឆ្លាក់
-DocType: Sales Invoice,Commission,គណៈកម្មការ
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
+DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
+DocType: Purchase Order,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
+DocType: Purchase Invoice,Recurring Print Format,កើតឡើងទ្រង់ទ្រាយបោះពុម្ព
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការទិញលំដាប់កាលបរិច្ឆេទ
+DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
+DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ប្រធានផ្នែកអភិវឌ្ឍន៍ពាណិជ្ជកម្ម
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,គោលបំណងថែទាំទស្សនកិច្ច
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,រយៈពេល
+,General Ledger,ទូទៅសៀវភៅ
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,មើលតែងតែនាំឱ្យមាន
+DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
+,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
+DocType: Features Setup,To get Item Group in details table,ដើម្បីទទួលបានធាតុ Group ក្នុងតារាងពត៌មានលំអិត
+DocType: Sales Invoice,Commission,គណៈកម្មការ
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
 <pre><code>{{ address_line1 }}&lt;br&gt;
@@ -3032,461 +2741,413 @@
 {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
 {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> ទំព័រគំរូលំនាំដើម </h4><p> ប្រើ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja ពុម្ព</a> និងវាលទាំងអស់នៃអាសយដ្ឋាន (រួមទាំងវាលផ្ទាល់ខ្លួនបើមាន) នឹងអាចរកបាន </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
-DocType: Salary Slip Deduction,Default Amount,ចំនួនលំនាំដើម
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,សង្ខេបខែនេះ
-DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
-DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
-,Project wise Stock Tracking,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
-DocType: Stock Entry Detail,Actual Qty (at source/target),ជាក់ស្តែ Qty (នៅប្រភព / គោលដៅ)
-DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,កំណត់ត្រាបុគ្គលិក។
-DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
-apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
-apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,លំដាប់ទីកន្លែង
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ជា root មិនអាចមានការកណ្តាលចំណាយឪពុកម្តាយ
-apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ជ្រើសម៉ាក ...
-DocType: Sales Invoice,C-Form Applicable,C-ទម្រង់ពាក្យស្នើសុំ
-DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
-DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),រក្សាវាបណ្ដាញ 900px មិត្តភាព (សរសេរ) ដោយ 100px (ម៉ោង)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
-DocType: Payment Tool,Get Outstanding Vouchers,ទទួលបានប័ណ្ណឆ្នើម
-DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
-DocType: Appraisal,Start Date,ថ្ងៃចាប់ផ្តើម
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,គុណតម្លៃ
-apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,បម្រុងទុកស្លឹកសម្រាប់រយៈពេល។
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,សូមចុចទីនេះដើម្បីផ្ទៀងផ្ទាត់
-DocType: Purchase Invoice Item,Price List Rate,តម្លៃការវាយតម្លៃបញ្ជី
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",បង្ហាញតែការ &quot;នៅក្នុងផ្សារហ៊ុន»ឬ«មិនមែននៅក្នុងផ្សារ&quot; ដោយផ្អែកលើតម្លៃភាគហ៊ុនដែលអាចរកបាននៅក្នុងឃ្លាំងនេះ។
-apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),វិក័យប័ត្រនៃសម្ភារៈ (Bom)
-DocType: Item,Average time taken by the supplier to deliver,ពេលមធ្យមដែលថតដោយអ្នកផ្គត់ផ្គង់ដើម្បីរំដោះ
-DocType: Time Log,Hours,ម៉ោងធ្វើការ
-DocType: Project,Expected Start Date,គេរំពឹងថានឹងចាប់ផ្តើមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,រំកិល
-DocType: ToDo,Priority,អាទិភាព
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox បានអនុញ្ញាតការចូលដំណើរការ
-DocType: Dropbox Backup,Weekly,ប្រចាំសប្តាហ៍
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧទាហរណ៏។ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ទទួលបាន
-DocType: Maintenance Visit,Fully Completed,បានបញ្ចប់យ៉ាងពេញលេញ
-DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
-DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
-DocType: Employee Leave Approver,Employee Leave Approver,ទុកឱ្យការអនុម័តបុគ្គលិក
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ម៉ាស៊ីនរត់អេឡិចត្រុង
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,របាយការណ៏ដ៏សំខាន់
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,ធាតុភាគហ៊ុនសៀវភៅសមតុល្យធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
-DocType: Purchase Receipt Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ
-,Requested Items To Be Ordered,ធាតុដែលបានស្នើដើម្បីឱ្យបានលំដាប់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ការបញ្ជាទិញរបស់ខ្ញុំ
-DocType: Price List,Price List Name,ឈ្មោះតារាងតម្លៃ
-DocType: Time Log,For Manufacturing,សម្រាប់អ្នកផលិត
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,សរុប
+</code></pre>","<h4> ទំព័រគំរូលំនាំដើម </h4><p> ប្រើ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja ពុម្ព</a> និងវាលទាំងអស់នៃអាសយដ្ឋាន (រួមទាំងវាលផ្ទាល់ខ្លួនបើមាន) នឹងអាចរកបាន </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+DocType: Salary Slip Deduction,Default Amount,ចំនួនលំនាំដើម
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,សង្ខេបខែនេះ
+DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
+DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
+,Project wise Stock Tracking,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
+DocType: Stock Entry Detail,Actual Qty (at source/target),ជាក់ស្តែ Qty (នៅប្រភព / គោលដៅ)
+DocType: Item Customer Detail,Ref Code,យោងលេខកូដ
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,កំណត់ត្រាបុគ្គលិក។
+DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
+apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,លំដាប់ទីកន្លែង
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,ជា root មិនអាចមានការកណ្តាលចំណាយឪពុកម្តាយ
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,ជ្រើសម៉ាក ...
+DocType: Sales Invoice,C-Form Applicable,C-ទម្រង់ពាក្យស្នើសុំ
+DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
+DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),រក្សាវាបណ្ដាញ 900px មិត្តភាព (សរសេរ) ដោយ 100px (ម៉ោង)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
+DocType: Payment Tool,Get Outstanding Vouchers,ទទួលបានប័ណ្ណឆ្នើម
+DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
+DocType: Appraisal,Start Date,ថ្ងៃចាប់ផ្តើម
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,បម្រុងទុកស្លឹកសម្រាប់រយៈពេល។
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,សូមចុចទីនេះដើម្បីផ្ទៀងផ្ទាត់
+DocType: Purchase Invoice Item,Price List Rate,តម្លៃការវាយតម្លៃបញ្ជី
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",បង្ហាញតែការ &quot;នៅក្នុងផ្សារហ៊ុន»ឬ«មិនមែននៅក្នុងផ្សារ&quot; ដោយផ្អែកលើតម្លៃភាគហ៊ុនដែលអាចរកបាននៅក្នុងឃ្លាំងនេះ។
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),វិក័យប័ត្រនៃសម្ភារៈ (Bom)
+DocType: Item,Average time taken by the supplier to deliver,ពេលមធ្យមដែលថតដោយអ្នកផ្គត់ផ្គង់ដើម្បីរំដោះ
+DocType: Time Log,Hours,ម៉ោងធ្វើការ
+DocType: Project,Expected Start Date,គេរំពឹងថានឹងចាប់ផ្តើមកាលបរិច្ឆេទ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ឧទាហរណ៏។ smsgateway.com/api/send_sms.cgi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,ទទួលបាន
+DocType: Maintenance Visit,Fully Completed,បានបញ្ចប់យ៉ាងពេញលេញ
+DocType: Employee,Educational Qualification,គុណវុឌ្ឍិអប់រំ
+DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
+DocType: Employee Leave Approver,Employee Leave Approver,ទុកឱ្យការអនុម័តបុគ្គលិក
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,របាយការណ៏ដ៏សំខាន់
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
+DocType: Purchase Receipt Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ
+,Requested Items To Be Ordered,ធាតុដែលបានស្នើដើម្បីឱ្យបានលំដាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ការបញ្ជាទិញរបស់ខ្ញុំ
+DocType: Price List,Price List Name,ឈ្មោះតារាងតម្លៃ
+DocType: Time Log,For Manufacturing,សម្រាប់អ្នកផលិត
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,សរុប
 DocType: BOM,Manufacturing,កម្មន្តសាល
-,Ordered Items To Be Delivered,ធាតុបញ្ជាឱ្យនឹងត្រូវបានបញ្ជូន
-DocType: Account,Income,ប្រាក់ចំណូល
-,Setup Wizard,អ្នកជំនួយការដំឡើង
-DocType: Industry Type,Industry Type,ប្រភេទវិស័យឧស្សាហកម្ម
-apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,អ្វីមួយដែលខុស!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,កាលបរិច្ឆេទបញ្ចប់
-DocType: Purchase Invoice Item,Amount (Company Currency),ចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ការសម្ដែងស្លាប់
-DocType: Email Alert,Reference Date,សេចក្តីយោងកាលបរិច្ឆេទ
-apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,សូមបញ្ចូល NOS ទូរស័ព្ទដៃដែលមានសុពលភាព
-DocType: Budget Detail,Budget Detail,ពត៌មានថវិការ
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,សូមបញ្ចូលសារមុនពេលផ្ញើ
-DocType: Async Task,Status,ស្ថានភាព
-DocType: Company History,Year,កាលពីឆ្នាំ
-apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,សូមធ្វើឱ្យទាន់សម័យការកំណត់ការផ្ញើសារជាអក្សរ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
-DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
-DocType: Maintenance Schedule Detail,Scheduled Date,កាលបរិច្ឆេទដែលបានកំណត់ពេល
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,សរុបបង់ AMT
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,សារដែលបានធំជាង 160 តួអក្សរដែលនឹងត្រូវចែកចេញជាសារច្រើន
-DocType: Purchase Receipt Item,Received and Accepted,បានទទួលនិងទទួលយក
-,Serial No Service Contract Expiry,គ្មានសេវាកិច្ចសន្យាសៀរៀលផុតកំណត់
-DocType: Item,Unit of Measure Conversion,ឯកតានៃការប្រែចិត្តជឿវិធានការ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,និយោជិតមិនអាចត្រូវបានផ្លាស់ប្តូ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
+,Ordered Items To Be Delivered,ធាតុបញ្ជាឱ្យនឹងត្រូវបានបញ្ជូន
+DocType: Account,Income,ប្រាក់ចំណូល
+DocType: Industry Type,Industry Type,ប្រភេទវិស័យឧស្សាហកម្ម
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,អ្វីមួយដែលខុស!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,កាលបរិច្ឆេទបញ្ចប់
+DocType: Purchase Invoice Item,Amount (Company Currency),ចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,សូមបញ្ចូល NOS ទូរស័ព្ទដៃដែលមានសុពលភាព
+DocType: Budget Detail,Budget Detail,ពត៌មានថវិការ
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,សូមបញ្ចូលសារមុនពេលផ្ញើ
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,សូមធ្វើឱ្យទាន់សម័យការកំណត់ការផ្ញើសារជាអក្សរ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
+DocType: Cost Center,Cost Center Name,ឈ្មោះមជ្ឈមណ្ឌលចំណាយអស់
+DocType: Maintenance Schedule Detail,Scheduled Date,កាលបរិច្ឆេទដែលបានកំណត់ពេល
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,សរុបបង់ AMT
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,សារដែលបានធំជាង 160 តួអក្សរដែលនឹងត្រូវចែកចេញជាសារច្រើន
+DocType: Purchase Receipt Item,Received and Accepted,បានទទួលនិងទទួលយក
+,Serial No Service Contract Expiry,គ្មានសេវាកិច្ចសន្យាសៀរៀលផុតកំណត់
+DocType: Item,Unit of Measure Conversion,ឯកតានៃការប្រែចិត្តជឿវិធានការ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,និយោជិតមិនអាចត្រូវបានផ្លាស់ប្តូ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
 DocType: Naming Series,Help HTML,ជំនួយ HTML
-DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះរបស់មនុស្សម្នាក់ឬអង្គការមួយដែលមានអាស័យដ្ឋានជារបស់វា។
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
-DocType: Purchase Invoice,Contact,ការទំនាក់ទំនង
-DocType: Features Setup,Exports,ការនាំចេញ
-DocType: Lead,Converted,ប្រែចិត្តជឿ
-DocType: Item,Has Serial No,គ្មានសៀរៀល
-DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
-DocType: Issue,Content Type,ប្រភេទមាតិការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,កុំព្យូទ័រ
-DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
-DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
+DocType: Address,Name of person or organization that this address belongs to.,ឈ្មោះរបស់មនុស្សម្នាក់ឬអង្គការមួយដែលមានអាស័យដ្ឋានជារបស់វា។
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
+DocType: Purchase Invoice,Contact,ការទំនាក់ទំនង
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ទទួលបានពី
+DocType: Features Setup,Exports,ការនាំចេញ
+DocType: Lead,Converted,ប្រែចិត្តជឿ
+DocType: Item,Has Serial No,គ្មានសៀរៀល
+DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
+DocType: Issue,Content Type,ប្រភេទមាតិការ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,កុំព្យូទ័រ
+DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
+DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Cost Center,Budgets,ថវិកា
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,ធ្វើឱ្យទាន់សម័យ
-DocType: Employee,Emergency Contact Details,ពត៌មានទំនាក់ទំនងសង្រ្គោះបន្ទាន់
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,តើធ្វើដូចម្ដេច?
-DocType: Delivery Note,To Warehouse,ដើម្បីឃ្លាំង
-,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
-DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
-DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
-apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ធ្វើឱ្យទាន់សម័យការចំណាយបន្ថែមទៀតដើម្បីគណនាការចំណាយចុះចតនៃធាតុ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,អគ្គិសនី
-DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
-apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,មកពីបណ្តឹងធានា
-DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
-DocType: Item,Customer Code,លេខកូដអតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,ចូលរួមធ្វើការប្រកួតប្រជែង
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
-DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
-DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
-DocType: User,Enabled,បានបើក
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,នាំចូលអតិថិជន
-DocType: Target Detail,Target Qty,គោលដៅ Qty
-DocType: Attendance,Present,នាពេលបច្ចុប្បន្ន
-DocType: Notification Control,Sales Invoice Message,វិក័យប័ត្រការលក់សារ
-DocType: Authorization Rule,Based On,ដោយផ្អែកលើការ
-DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
-apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
-DocType: ToDo,Low,កម្រិតទាប
-DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ការវិល
-DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
-DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
-DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
-DocType: Offer Letter,Offer Letter Terms,ផ្តល់ជូននូវលក្ខខណ្ឌលិខិត
-DocType: Features Setup,To track any installation or commissioning related work after sales,ដើម្បីតាមដានការដំឡើងណាមួយឬធ្វើការការងារដែលទាក់ទងបន្ទាប់ពីការលក់
+DocType: Employee,Emergency Contact Details,ពត៌មានទំនាក់ទំនងសង្រ្គោះបន្ទាន់
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,តើធ្វើដូចម្ដេច?
+DocType: Delivery Note,To Warehouse,ដើម្បីឃ្លាំង
+,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
+DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
+DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ធ្វើឱ្យទាន់សម័យការចំណាយបន្ថែមទៀតដើម្បីគណនាការចំណាយចុះចតនៃធាតុ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,អគ្គិសនី
+DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,មកពីបណ្តឹងធានា
+DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
+DocType: Item,Customer Code,លេខកូដអតិថិជន
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
+DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ភាគហ៊ុនទ្រព្យសកម្ម
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,នាំចូលអតិថិជន
+DocType: Target Detail,Target Qty,គោលដៅ Qty
+DocType: Attendance,Present,នាពេលបច្ចុប្បន្ន
+DocType: Notification Control,Sales Invoice Message,វិក័យប័ត្រការលក់សារ
+DocType: Authorization Rule,Based On,ដោយផ្អែកលើការ
+DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
+DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ការបញ្ចុះតម្លៃត្រូវតែមានតិចជាង 100
+DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
+DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
+DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
+DocType: Offer Letter,Offer Letter Terms,ផ្តល់ជូននូវលក្ខខណ្ឌលិខិត
+DocType: Features Setup,To track any installation or commissioning related work after sales,ដើម្បីតាមដានការដំឡើងណាមួយឬធ្វើការការងារដែលទាក់ទងបន្ទាប់ពីការលក់
 DocType: Project,Estimated Costing,តំលៃ
-DocType: Purchase Invoice Advance,Journal Entry Detail No,ធាតុទិនានុប្បវត្តិមិនមានពត៌មានលំអិត
-DocType: Employee External Work History,Salary,ប្រាក់បៀវត្ស
-DocType: Serial No,Delivery Document Type,ដឹកជញ្ជូនប្រភេទឯកសារ
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,ដាក់ស្នើគ្រូពេទ្យប្រហែលជាបានប្រាក់ខែទាំងអស់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
-DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
-DocType: Sales Invoice,Existing Customer,អតិថិជនដែលមានស្រាប់
-DocType: Email Digest,Receivables,អ្នកទទួល
-DocType: Customer,Additional information regarding the customer.,ពត៍មានបន្ថែមទាក់ទងនឹងការអតិថិជន។
-DocType: Quality Inspection Reading,Reading 5,ការអាន 5
-DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, លំដាប់នេះនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ឈ្មោះត្រូវបានទាមទារយុទ្ធនាការឃោសនា
-DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
-DocType: Purchase Receipt Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,គំនូរដ៏ជ្រៅ
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ព្រឹត្តិប័ត្រព័ត៌មានថ្មីមួយ
-apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,បង្ហាញតុល្យភាព
+DocType: Purchase Invoice Advance,Journal Entry Detail No,ធាតុទិនានុប្បវត្តិមិនមានពត៌មានលំអិត
+DocType: Employee External Work History,Salary,ប្រាក់បៀវត្ស
+DocType: Serial No,Delivery Document Type,ដឹកជញ្ជូនប្រភេទឯកសារ
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,ដាក់ស្នើគ្រូពេទ្យប្រហែលជាបានប្រាក់ខែទាំងអស់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
+DocType: Sales Order,Partly Delivered,ផ្តល់មួយផ្នែក
+DocType: Sales Invoice,Existing Customer,អតិថិជនដែលមានស្រាប់
+DocType: Email Digest,Receivables,អ្នកទទួល
+DocType: Customer,Additional information regarding the customer.,ពត៍មានបន្ថែមទាក់ទងនឹងការអតិថិជន។
+DocType: Quality Inspection Reading,Reading 5,ការអាន 5
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, លំដាប់នេះនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ឈ្មោះត្រូវបានទាមទារយុទ្ធនាការឃោសនា
+DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
+DocType: Purchase Receipt Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ព្រឹត្តិប័ត្រព័ត៌មានថ្មីមួយ
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,បង្ហាញតុល្យភាព
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ឧទាហរណ៍: ។ ABCD ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
-DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ឧទាហរណ៍: ។ ABCD ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
+DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,riveting
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បានជំនួស
-,Sales Analytics,វិភាគការលក់
-DocType: Manufacturing Settings,Manufacturing Settings,ការកំណត់កម្មន្តសាល
-apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ការបង្កើតអ៊ីម៉ែ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
-DocType: Stock Entry Detail,Stock Entry Detail,ពត៌មាននៃភាគហ៊ុនចូល
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ឈ្មោះគណនីថ្មី
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការចំណាយវត្ថុធាតុដើមការី
-DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុលការកំណត់សម្រាប់លក់
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,សេវាបំរើអតិថិជន
-DocType: Item,Thumbnail,កូនរូបភាព
-DocType: Item Customer Detail,Item Customer Detail,ពត៌មានរបស់អតិថិជនធាតុ
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,បញ្ជាក់ការម៉ែលរបស់អ្នក
-apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
-DocType: Notification Control,Prompt for Email on Submission of,ប្រអប់បញ្ចូលអ៊ីមែលនៅលើការដាក់
-DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
-apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ផ្សិតសុញ្ញកាស
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
-DocType: Contact Us Settings,City,ទីក្រុង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ម៉ាស៊ីន Ultrasonic
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,កំហុស: មិនមានអត្តសញ្ញាណប័ណ្ណដែលមានសុពលភាព?
-DocType: Naming Series,Update Series Number,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បានជំនួស
+,Sales Analytics,វិភាគការលក់
+DocType: Manufacturing Settings,Manufacturing Settings,ការកំណត់កម្មន្តសាល
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,ការបង្កើតអ៊ីម៉ែ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,សូមបញ្ចូលរូបិយប័ណ្ណលំនាំដើមនៅក្នុងក្រុមហ៊ុនអនុបណ្ឌិត
+DocType: Stock Entry Detail,Stock Entry Detail,ពត៌មាននៃភាគហ៊ុនចូល
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ឈ្មោះគណនីថ្មី
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ការចំណាយវត្ថុធាតុដើមការី
+DocType: Selling Settings,Settings for Selling Module,ម៉ូឌុលការកំណត់សម្រាប់លក់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,សេវាបំរើអតិថិជន
+DocType: Item,Thumbnail,កូនរូបភាព
+DocType: Item Customer Detail,Item Customer Detail,ពត៌មានរបស់អតិថិជនធាតុ
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,បញ្ជាក់ការម៉ែលរបស់អ្នក
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,បេក្ខជនផ្ដល់ការងារ។
+DocType: Notification Control,Prompt for Email on Submission of,ប្រអប់បញ្ចូលអ៊ីមែលនៅលើការដាក់
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ស្លឹកដែលបានបម្រុងទុកសរុបគឺមានច្រើនជាងថ្ងៃក្នុងអំឡុងពេលនេះ
+DocType: Manufacturing Settings,Default Work In Progress Warehouse,ការងារលំនាំដើមនៅក្នុងឃ្លាំងវឌ្ឍនភាព
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
+DocType: Naming Series,Update Series Number,កម្រងឯកសារលេខធ្វើឱ្យទាន់សម័យ
 DocType: Account,Equity,សមធម៌
-DocType: Sales Order,Printing Details,សេចក្ដីលម្អិតការបោះពុម្ព
-DocType: Task,Closing Date,ថ្ងៃផុតកំណត់
-DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,វិស្វករ
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,សភាអនុស្វែងរក
-DocType: Sales Partner,Partner Type,ប្រភេទជាដៃគូ
-DocType: Purchase Taxes and Charges,Actual,ពិតប្រាកដ
-DocType: Authorization Rule,Customerwise Discount,Customerwise បញ្ចុះតំលៃ
-DocType: Purchase Invoice,Against Expense Account,ប្រឆាំងនឹងការចំណាយតាមគណនី
-DocType: Production Order,Production Order,ផលិតកម្មលំដាប់
-DocType: Quotation Item,Against Docname,ប្រឆាំងនឹងការ Docname
-DocType: SMS Center,All Employee (Active),ទាំងអស់និយោជិត (សកម្ម)
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,មើលឥឡូវ
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ជ្រើសអំឡុងពេលដែលវិក័យប័ត្រដែលនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
-DocType: BOM,Raw Material Cost,វត្ថុធាតុដើមដែលការចំណាយ
-DocType: Item,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូលធាតុនិងការដែលបានគ្រោងទុក qty ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,គំនូសតាង Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ពេញម៉ោង
-DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
+DocType: Sales Order,Printing Details,សេចក្ដីលម្អិតការបោះពុម្ព
+DocType: Task,Closing Date,ថ្ងៃផុតកំណត់
+DocType: Sales Order Item,Produced Quantity,បរិមាណដែលបានផលិត
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,វិស្វករ
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,សភាអនុស្វែងរក
+DocType: Sales Partner,Partner Type,ប្រភេទជាដៃគូ
+DocType: Purchase Taxes and Charges,Actual,ពិតប្រាកដ
+DocType: Authorization Rule,Customerwise Discount,Customerwise បញ្ចុះតំលៃ
+DocType: Purchase Invoice,Against Expense Account,ប្រឆាំងនឹងការចំណាយតាមគណនី
+DocType: Production Order,Production Order,ផលិតកម្មលំដាប់
+DocType: Quotation Item,Against Docname,ប្រឆាំងនឹងការ Docname
+DocType: SMS Center,All Employee (Active),ទាំងអស់និយោជិត (សកម្ម)
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,មើលឥឡូវ
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,ជ្រើសអំឡុងពេលដែលវិក័យប័ត្រដែលនឹងត្រូវបានបង្កើតដោយស្វ័យប្រវត្តិ
+DocType: BOM,Raw Material Cost,វត្ថុធាតុដើមដែលការចំណាយ
+DocType: Item,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូលធាតុនិងការដែលបានគ្រោងទុក qty ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ពេញម៉ោង
+DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,បានបន្ទាន់សម័យស៊េរី
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,របាយការណ៏ចាំបាច់ប្រភេទ
-DocType: Item,Serial Number Series,កម្រងឯកសារលេខសៀរៀល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ការលក់រាយលក់ដុំនិងចែកចាយ
-DocType: Issue,First Responded On,ជាលើកដំបូងបានឆ្លើយតបនៅលើ
-DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,អ្នកប្រើដំបូង: អ្នក
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
-DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
-apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,បានបន្ទាន់សម័យស៊េរី
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,របាយការណ៏ចាំបាច់ប្រភេទ
+DocType: Item,Serial Number Series,កម្រងឯកសារលេខសៀរៀល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ការលក់រាយលក់ដុំនិងចែកចាយ
+DocType: Issue,First Responded On,ជាលើកដំបូងបានឆ្លើយតបនៅលើ
+DocType: Website Item Group,Cross Listing of Item in multiple groups,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,អ្នកប្រើដំបូង: អ្នក
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ផ្សះផ្សាដោយជោគជ័យ
+DocType: Production Order,Planned End Date,កាលបរិច្ឆេទបញ្ចប់ការគ្រោងទុក
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
 DocType: Tax Rule,Validity,សុពលភាព
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ចំនួន invoiced
-DocType: Attendance,Attendance,ការចូលរួម
-DocType: Page,No,គ្មាន
-DocType: BOM,Materials,សមា្ភារៈ
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិនបើមិនបានធីកបញ្ជីនេះនឹងត្រូវបានបន្ថែមទៅកាន់ក្រសួងគ្នាដែលជាកន្លែងដែលវាត្រូវបានអនុវត្ត។
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
-apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
-,Item Prices,តម្លៃធាតុ
-DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
-DocType: Period Closing Voucher,Period Closing Voucher,ប័ណ្ណបិទរយៈពេល
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,ចៅហ្វាយបញ្ជីតម្លៃ។
-DocType: Task,Review Date,ពិនិត្យឡើងវិញកាលបរិច្ឆេទ
-DocType: Purchase Invoice,Advance Payments,ការទូទាត់ជាមុន
-DocType: DocPerm,Level,កំរិត
-DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,មិនមានការអនុញ្ញាតឱ្យប្រើឧបករណ៍ការទូទាត់
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% s ដែលកើតឡើង
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,កិន
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
-DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,nibbling
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ចំណាយរដ្ឋបាល
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ការប្រឹក្សាយោបល់
-DocType: Customer Group,Parent Customer Group,ឪពុកម្តាយដែលជាក្រុមអតិថិជន
-apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ការផ្លាស់ប្តូរ
-DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
-DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ឧទាហរណ៍ដូចជារឿង &quot;My ក្រុមហ៊ុន LLC បាន&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,រយៈពេលជូនដំណឹង
-DocType: Bank Reconciliation Detail,Voucher ID,លេខសម្គាល់កាតមានទឹកប្រាក់
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,នេះគឺជាទឹកដីជា root និងមិនអាចត្រូវបានកែសម្រួល។
-DocType: Packing Slip,Gross Weight UOM,សរុបបានទំ UOM
+DocType: Attendance,Attendance,ការចូលរួម
+DocType: BOM,Materials,សមា្ភារៈ
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិនបើមិនបានធីកបញ្ជីនេះនឹងត្រូវបានបន្ថែមទៅកាន់ក្រសួងគ្នាដែលជាកន្លែងដែលវាត្រូវបានអនុវត្ត។
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ប្រកាសកាលបរិច្ឆេទនិងពេលវេលាជាការចាំបាច់បង្ហោះ
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,ពុម្ពពន្ធលើការទិញប្រតិបត្តិការ។
+,Item Prices,តម្លៃធាតុ
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
+DocType: Period Closing Voucher,Period Closing Voucher,ប័ណ្ណបិទរយៈពេល
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,ចៅហ្វាយបញ្ជីតម្លៃ។
+DocType: Task,Review Date,ពិនិត្យឡើងវិញកាលបរិច្ឆេទ
+DocType: Purchase Invoice,Advance Payments,ការទូទាត់ជាមុន
+DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,មិនមានការអនុញ្ញាតឱ្យប្រើឧបករណ៍ការទូទាត់
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% s ដែលកើតឡើង
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរបន្ទាប់ពីធ្វើការធាតុប្រើប្រាស់រូបិយប័ណ្ណផ្សេងទៀតមួយចំនួន
+DocType: Company,Round Off Account,បិទការប្រកួតជុំទីគណនី
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ចំណាយរដ្ឋបាល
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ការប្រឹក្សាយោបល់
+DocType: Customer Group,Parent Customer Group,ឪពុកម្តាយដែលជាក្រុមអតិថិជន
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ការផ្លាស់ប្តូរ
+DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
+DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ឧទាហរណ៍ដូចជារឿង &quot;My ក្រុមហ៊ុន LLC បាន&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,រយៈពេលជូនដំណឹង
+DocType: Bank Reconciliation Detail,Voucher ID,លេខសម្គាល់កាតមានទឹកប្រាក់
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,នេះគឺជាទឹកដីជា root និងមិនអាចត្រូវបានកែសម្រួល។
+DocType: Packing Slip,Gross Weight UOM,សរុបបានទំ UOM
 DocType: Email Digest,Receivables / Payables,ទទួល / បង់
-DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងការវិក័យប័ត្រលក់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ការបង្ក្រាប
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,គណនីឥណទាន
-DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,បង្ហាញតម្លៃសូន្យ
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
-DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
-DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
-DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
-DocType: Task,Actual End Date (via Time Logs),ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់ (តាមរយៈពេលកំណត់ហេតុ)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
-DocType: Delivery Note,Print Without Amount,បោះពុម្ពដោយគ្មានការចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទពន្ធលើមិនអាចជា &quot;វាយតម្លៃ &#39;ឬ&#39; វាយតម្លៃនិងសរុប &#39;ជាធាតុទាំងអស់នេះគឺជាធាតុដែលមិនមានភាគហ៊ុន
-DocType: User,Last Name,ឈ្មោះចុងក្រោយ
-DocType: Web Page,Left,ពីឆ្វេង
-DocType: Event,All Day,ថ្ងៃទាំងអស់
-DocType: Issue,Support Team,ក្រុមគាំទ្រ
-DocType: Appraisal,Total Score (Out of 5),ពិន្ទុសរុប (ក្នុងចំណោម 5)
-DocType: Contact Us Settings,State,រដ្ឋ
-DocType: Batch,Batch,ជំនាន់ទី
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,មានតុល្យភាព
-DocType: Project,Total Expense Claim (via Expense Claims),ពាក្យបណ្តឹងលើការចំណាយសរុប (តាមរយៈការប្តឹងទាមទារសំណងលើការចំណាយ)
-DocType: User,Gender,យែនឌ័រ
-DocType: Journal Entry,Debit Note,ចំណាំឥណពន្ធ
-DocType: Stock Entry,As per Stock UOM,ដូចជាក្នុងមួយហ៊ុន UOM
-apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,មិនទាន់ផុតកំណត់
-DocType: Journal Entry,Total Debit,ឥណពន្ធសរុប
-DocType: Manufacturing Settings,Default Finished Goods Warehouse,ឃ្លាំងទំនិញលំនាំដើមបានបញ្ចប់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,ការលក់បុគ្គល
-DocType: Sales Invoice,Cold Calling,ហៅត្រជាក់
-DocType: SMS Parameter,SMS Parameter,ផ្ញើសារជាអក្សរប៉ារ៉ាម៉ែត្រ
-DocType: Maintenance Schedule Item,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
-DocType: Lead,Blog Subscriber,អតិថិជនកំណត់ហេតុបណ្ដាញ
-apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,បង្កើតច្បាប់ដើម្បីរឹតបន្តឹងការធ្វើប្រតិបត្តិការដោយផ្អែកលើតម្លៃ។
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ប្រសិនបើបានធីកនោះទេសរុប។ នៃថ្ងៃធ្វើការនឹងរួមបញ្ចូលទាំងថ្ងៃឈប់សម្រាក, ហើយនេះនឹងកាត់បន្ថយតម្លៃនៃប្រាក់ខែក្នុងមួយថ្ងៃនោះ"
-DocType: Purchase Invoice,Total Advance,ជាមុនសរុប
-DocType: Workflow State,User,របស់អ្នកប្រើ
-apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
-DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
-DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
-DocType: Customer,Credit Days Based On,ថ្ងៃដោយផ្អែកលើការផ្តល់ឥណទាន
-DocType: Tax Rule,Tax Rule,ច្បាប់ពន្ធ
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,រក្សាអត្រាការវដ្តនៃការលក់ពេញមួយដូចគ្នា
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,គម្រោងការកំណត់ហេតុពេលវេលាដែលនៅក្រៅម៉ោងស្ថានីយការងារការងារ។
-,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
-DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
-DocType: Time Log,Billing Rate based on Activity Type (per hour),អត្រាការប្រាក់វិក័យប័ត្រដែលមានមូលដ្ឋានលើប្រភេទសកម្មភាព (ក្នុងមួយម៉ោង)
-DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ស៊ា
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",រកមិនឃើញអ៊ីម៉ែលដែលជាក្រុមហ៊ុនលេខសម្គាល់ដូចនេះ mail មិនបានចាត់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
-DocType: Production Planning Tool,Filter based on item,តម្រងមានមូលដ្ឋានលើធាតុ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,គណនីឥណពន្ធវីសា
-DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
-DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
-DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
-DocType: Purchase Common,Purchase Common,ទិញទូទៅ
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ពីឱកាស
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,កំពុងធ្វើឱ្យទទេ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
-DocType: Sales Invoice,Is POS,តើមានម៉ាស៊ីនឆូតកាត
-DocType: Production Order,Manufactured Qty,បានផលិត Qty
-DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
-apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
-DocType: DocField,Default,លំនាំដើម
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
+DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងការវិក័យប័ត្រលក់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,គណនីឥណទាន
+DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,បង្ហាញតម្លៃសូន្យ
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
+DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
+DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
+DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
+DocType: Task,Actual End Date (via Time Logs),ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់ (តាមរយៈពេលកំណត់ហេតុ)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
+DocType: Delivery Note,Print Without Amount,បោះពុម្ពដោយគ្មានការចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ប្រភេទពន្ធលើមិនអាចជា &quot;វាយតម្លៃ &#39;ឬ&#39; វាយតម្លៃនិងសរុប &#39;ជាធាតុទាំងអស់នេះគឺជាធាតុដែលមិនមានភាគហ៊ុន
+DocType: Issue,Support Team,ក្រុមគាំទ្រ
+DocType: Appraisal,Total Score (Out of 5),ពិន្ទុសរុប (ក្នុងចំណោម 5)
+DocType: Batch,Batch,ជំនាន់ទី
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,មានតុល្យភាព
+DocType: Project,Total Expense Claim (via Expense Claims),ពាក្យបណ្តឹងលើការចំណាយសរុប (តាមរយៈការប្តឹងទាមទារសំណងលើការចំណាយ)
+DocType: Journal Entry,Debit Note,ចំណាំឥណពន្ធ
+DocType: Stock Entry,As per Stock UOM,ដូចជាក្នុងមួយហ៊ុន UOM
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,មិនទាន់ផុតកំណត់
+DocType: Journal Entry,Total Debit,ឥណពន្ធសរុប
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,ឃ្លាំងទំនិញលំនាំដើមបានបញ្ចប់
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,ការលក់បុគ្គល
+DocType: Sales Invoice,Cold Calling,ហៅត្រជាក់
+DocType: SMS Parameter,SMS Parameter,ផ្ញើសារជាអក្សរប៉ារ៉ាម៉ែត្រ
+DocType: Maintenance Schedule Item,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
+DocType: Lead,Blog Subscriber,អតិថិជនកំណត់ហេតុបណ្ដាញ
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,បង្កើតច្បាប់ដើម្បីរឹតបន្តឹងការធ្វើប្រតិបត្តិការដោយផ្អែកលើតម្លៃ។
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ប្រសិនបើបានធីកនោះទេសរុប។ នៃថ្ងៃធ្វើការនឹងរួមបញ្ចូលទាំងថ្ងៃឈប់សម្រាក, ហើយនេះនឹងកាត់បន្ថយតម្លៃនៃប្រាក់ខែក្នុងមួយថ្ងៃនោះ"
+DocType: Purchase Invoice,Total Advance,ជាមុនសរុប
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
+DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
+DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ការទូទាត់វិក័យប័ត្រចំណាំ
+DocType: Customer,Credit Days Based On,ថ្ងៃដោយផ្អែកលើការផ្តល់ឥណទាន
+DocType: Tax Rule,Tax Rule,ច្បាប់ពន្ធ
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,រក្សាអត្រាការវដ្តនៃការលក់ពេញមួយដូចគ្នា
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,គម្រោងការកំណត់ហេតុពេលវេលាដែលនៅក្រៅម៉ោងស្ថានីយការងារការងារ។
+,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
+DocType: Time Log,Billing Rate based on Activity Type (per hour),អត្រាការប្រាក់វិក័យប័ត្រដែលមានមូលដ្ឋានលើប្រភេទសកម្មភាព (ក្នុងមួយម៉ោង)
+DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",រកមិនឃើញអ៊ីម៉ែលដែលជាក្រុមហ៊ុនលេខសម្គាល់ដូចនេះ mail មិនបានចាត់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
+DocType: Production Planning Tool,Filter based on item,តម្រងមានមូលដ្ឋានលើធាតុ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,គណនីឥណពន្ធវីសា
+DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
+DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
+DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
+DocType: Purchase Common,Purchase Common,ទិញទូទៅ
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ពីឱកាស
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
+DocType: Sales Invoice,Is POS,តើមានម៉ាស៊ីនឆូតកាត
+DocType: Production Order,Manufactured Qty,បានផលិត Qty
+DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
 DocType: Maintenance Schedule,Schedule,កាលវិភាគ
-DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",កំណត់ថវិកាសម្រាប់មជ្ឈមណ្ឌលតម្លៃនេះ។ ដើម្បីកំណត់សកម្មភាពជាថវិកាបានមើលឃើញថា &quot;ក្រុមហ៊ុនបញ្ជី&quot;
-DocType: Account,Parent Account,គណនីមាតាឬបិតា
-DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
+DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",កំណត់ថវិកាសម្រាប់មជ្ឈមណ្ឌលតម្លៃនេះ។ ដើម្បីកំណត់សកម្មភាពជាថវិកាបានមើលឃើញថា &quot;ក្រុមហ៊ុនបញ្ជី&quot;
+DocType: Account,Parent Account,គណនីមាតាឬបិតា
+DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
-DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
-DocType: Expense Claim,Approved,បានអនុម័ត
-DocType: Pricing Rule,Price,តំលៃលក់
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស &quot;បាទ&quot; នឹងផ្តល់ឱ្យអត្តសញ្ញាណតែមួយគត់ដើម្បីឱ្យអង្គភាពគ្នានៃធាតុដែលអាចត្រូវបានមើលនៅក្នុងស៊េរីចៅហ្វាយគ្មាននេះ។
-DocType: Employee,Education,ការអប់រំ
-DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
-DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
+DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+DocType: Expense Claim,Approved,បានអនុម័ត
+DocType: Pricing Rule,Price,តំលៃលក់
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស &quot;បាទ&quot; នឹងផ្តល់ឱ្យអត្តសញ្ញាណតែមួយគត់ដើម្បីឱ្យអង្គភាពគ្នានៃធាតុដែលអាចត្រូវបានមើលនៅក្នុងស៊េរីចៅហ្វាយគ្មាននេះ។
+DocType: Employee,Education,ការអប់រំ
+DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
+DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
 DocType: Address,Office,ការិយាល័យ
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,របាយការណ៏ស្ដង់ដារ
-apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
-DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ដើម្បីបង្កើតគណនីអាករ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
-DocType: Account,Stock,ភាគហ៊ុន
-DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
-DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,សារពើភ័ណ្ឌបាច់
-DocType: Employee,Contract End Date,កាលបរិច្ឆេទការចុះកិច្ចសន្យាបញ្ចប់
-DocType: Sales Order,Track this Sales Order against any Project,តាមដានការបញ្ជាទិញលក់នេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ការបញ្ជាទិញការលក់ទាញ (ដែលមិនទាន់សម្រេចបាននូវការផ្តល់) ដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យដូចខាងលើនេះ
-DocType: DocShare,Document Type,ប្រភេទឯកសារ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ចាប់ពីសម្រង់ផ្គត់ផ្គង់
-DocType: Deduction Type,Deduction Type,ប្រភេទកាត់កង
-DocType: Attendance,Half Day,ពាក់កណ្តាលថ្ងៃ
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
+DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ដើម្បីបង្កើតគណនីអាករ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
+DocType: Account,Stock,ភាគហ៊ុន
+DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
+DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,សារពើភ័ណ្ឌបាច់
+DocType: Employee,Contract End Date,កាលបរិច្ឆេទការចុះកិច្ចសន្យាបញ្ចប់
+DocType: Sales Order,Track this Sales Order against any Project,តាមដានការបញ្ជាទិញលក់នេះប្រឆាំងនឹងគម្រោងណាមួយឡើយ
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ការបញ្ជាទិញការលក់ទាញ (ដែលមិនទាន់សម្រេចបាននូវការផ្តល់) ដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យដូចខាងលើនេះ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ចាប់ពីសម្រង់ផ្គត់ផ្គង់
+DocType: Deduction Type,Deduction Type,ប្រភេទកាត់កង
+DocType: Attendance,Half Day,ពាក់កណ្តាលថ្ងៃ
 DocType: Pricing Rule,Min Qty,លោក Min Qty
-DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ដើម្បីតាមដានធាតុនៅក្នុងការលក់និងឯកសារទិញដោយមាន NOS បាច់។ &quot;ឧស្សាហកម្មពេញចិត្ត: គីមី&quot;
-DocType: GL Entry,Transaction Date,ប្រតិបត្តិការកាលបរិច្ឆេទ
-DocType: Production Plan Item,Planned Qty,បានគ្រោងទុក Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ការប្រមូលពន្ធលើចំនួនសរុប
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
-DocType: Stock Entry,Default Target Warehouse,ឃ្លាំងគោលដៅលំនាំដើម
-DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Notification Control,Purchase Receipt Message,សារបង្កាន់ដៃទិញ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ស្លឹកដែលបានបម្រុងទុកសរុបគឺមានច្រើនជាងសម័យ
-DocType: Production Order,Actual Start Date,កាលបរិច្ឆេទពិតប្រាកដចាប់ផ្តើម
-DocType: Sales Order,% of materials delivered against this Sales Order,សមា្ភារៈបានបញ្ជូន% នៃការលក់នេះបានប្រឆាំងទៅនឹងសណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/config/stock.py +23,Record item movement.,ចលនាធាតុកំណត់ត្រា។
-DocType: Newsletter List Subscriber,Newsletter List Subscriber,បញ្ជីព្រឹត្តិប័ត្រព័ត៌មានអតិថិជន
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,សេវាកម្ម
-DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
-DocType: Project,Gross Margin %,រឹម% សរុបបាន
-DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
-,Monthly Salary Register,ប្រចាំខែប្រាក់ខែចុះឈ្មោះ
-apps/frappe/frappe/website/template.py +140,Next,បន្ទាប់
-DocType: Warranty Claim,If different than customer address,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
+DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ដើម្បីតាមដានធាតុនៅក្នុងការលក់និងឯកសារទិញដោយមាន NOS បាច់។ &quot;ឧស្សាហកម្មពេញចិត្ត: គីមី&quot;
+DocType: GL Entry,Transaction Date,ប្រតិបត្តិការកាលបរិច្ឆេទ
+DocType: Production Plan Item,Planned Qty,បានគ្រោងទុក Qty
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ការប្រមូលពន្ធលើចំនួនសរុប
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ចប់ (ផលិត Qty) គឺជាចាំបាច់
+DocType: Stock Entry,Default Target Warehouse,ឃ្លាំងគោលដៅលំនាំដើម
+DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Notification Control,Purchase Receipt Message,សារបង្កាន់ដៃទិញ
+DocType: Production Order,Actual Start Date,កាលបរិច្ឆេទពិតប្រាកដចាប់ផ្តើម
+DocType: Sales Order,% of materials delivered against this Sales Order,សមា្ភារៈបានបញ្ជូន% នៃការលក់នេះបានប្រឆាំងទៅនឹងសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,ចលនាធាតុកំណត់ត្រា។
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,បញ្ជីព្រឹត្តិប័ត្រព័ត៌មានអតិថិជន
+DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
+DocType: Project,Gross Margin %,រឹម% សរុបបាន
+DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
+,Monthly Salary Register,ប្រចាំខែប្រាក់ខែចុះឈ្មោះ
+DocType: Warranty Claim,If different than customer address,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
 DocType: BOM Operation,BOM Operation,Bom ប្រតិបត្តិការ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
-DocType: Purchase Taxes and Charges,On Previous Row Amount,នៅថ្ងៃទីចំនួនជួរដេកមុន
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលបង់យ៉ាងហោចណាស់មួយជួរដេក
-DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,សរុបគ្មានប្រាក់ខែ
-apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,កំណត់ហេតុពេលវេលាគឺមិន billable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,អ្នកទិញ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមាន
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,សូមបញ្ចូលប័ណ្ណដោយដៃប្រឆាំងនឹង
-DocType: SMS Settings,Static Parameters,ប៉ារ៉ាម៉ែត្រឋិតិវន្ត
-DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
-DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
-apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ផ្ញើសារជាអក្សរដ៏ធំមួយដើម្បីទំនាក់ទំនងរបស់អ្នក
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,សូមពិចារណាឬបន្ទុកសម្រាប់ពន្ធលើ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,កាកបាទរំកិល
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,កាតឥណទាន
-DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ repacked
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការភាគហ៊ុន។
-DocType: Purchase Invoice,Next Date,កាលបរិច្ឆេទបន្ទាប់
-DocType: Employee Education,Major/Optional Subjects,ដ៏ធំប្រធានបទ / ស្រេចចិត្ត
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,សូមបញ្ចូលពន្ធនិងការចោទប្រកាន់
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ការឆ្នៃប្រឌិត
-DocType: Sales Invoice Item,Drop Ship,ទម្លាក់នាវា
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",នៅទីនេះអ្នកអាចរក្សាបាននូវព័ត៌មានលម្អិតសម្រាប់ក្រុមគ្រួសារដូចជាឈ្មោះនិងមុខរបររបស់ឪពុកម្តាយប្តីប្រពន្ធនិងកូន
-DocType: Hub Settings,Seller Name,ឈ្មោះអ្នកលក់
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធនិងការចោទប្រកាន់កាត់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
-DocType: Item Group,General Settings,ការកំណត់ទូទៅ
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,ចាប់ពីរូបិយវត្ថុនិងដើម្បីរូបិយវត្ថុមិនអាចជាដូចគ្នា
+DocType: Purchase Taxes and Charges,On Previous Row Amount,នៅថ្ងៃទីចំនួនជួរដេកមុន
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,សូមបញ្ចូលចំនួនទឹកប្រាក់ដែលបង់យ៉ាងហោចណាស់មួយជួរដេក
+DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,សរុបគ្មានប្រាក់ខែ
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,កំណត់ហេតុពេលវេលាគឺមិន billable
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,អ្នកទិញ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,សូមបញ្ចូលប័ណ្ណដោយដៃប្រឆាំងនឹង
+DocType: SMS Settings,Static Parameters,ប៉ារ៉ាម៉ែត្រឋិតិវន្ត
+DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
+DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
+DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,បំណុលនាពេលបច្ចុប្បន្ន
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ផ្ញើសារជាអក្សរដ៏ធំមួយដើម្បីទំនាក់ទំនងរបស់អ្នក
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,សូមពិចារណាឬបន្ទុកសម្រាប់ពន្ធលើ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,កាតឥណទាន
+DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ repacked
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការភាគហ៊ុន។
+DocType: Purchase Invoice,Next Date,កាលបរិច្ឆេទបន្ទាប់
+DocType: Employee Education,Major/Optional Subjects,ដ៏ធំប្រធានបទ / ស្រេចចិត្ត
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,សូមបញ្ចូលពន្ធនិងការចោទប្រកាន់
+DocType: Sales Invoice Item,Drop Ship,ទម្លាក់នាវា
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",នៅទីនេះអ្នកអាចរក្សាបាននូវព័ត៌មានលម្អិតសម្រាប់ក្រុមគ្រួសារដូចជាឈ្មោះនិងមុខរបររបស់ឪពុកម្តាយប្តីប្រពន្ធនិងកូន
+DocType: Hub Settings,Seller Name,ឈ្មោះអ្នកលក់
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធនិងការចោទប្រកាន់កាត់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Item Group,General Settings,ការកំណត់ទូទៅ
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,ចាប់ពីរូបិយវត្ថុនិងដើម្បីរូបិយវត្ថុមិនអាចជាដូចគ្នា
 DocType: Stock Entry,Repack,Repack
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,អ្នកត្រូវតែរក្សាទុកសំណុំបែបបទមុនពេលដំណើរការសវនាការ
-DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ភ្ជាប់រូបសញ្ញា
-DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
-apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
-apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,រទេះទទេ
-DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ជា root មិនអាចត្រូវបានកែសម្រួល។
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចធំជាងចំនួនសរុប unadusted
-DocType: Manufacturing Settings,Allow Production on Holidays,ផលិតកម្មនៅលើថ្ងៃឈប់សម្រាកអនុញ្ញាតឱ្យ
-DocType: Sales Order,Customer's Purchase Order Date,របស់អតិថិជនទិញលំដាប់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,រាជធានីហ៊ុន
-DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,សូមជ្រើសឯកសារ csv
-DocType: Dropbox Backup,Send Backups to Dropbox,ផ្ញើការបម្រុងទុកទៅ Dropbox
-DocType: Purchase Order,To Receive and Bill,ដើម្បីទទួលបាននិង Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,អ្នករចនា
-apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
-DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
-DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិបើបរិមាណធ្លាក់នៅក្រោមកម្រិតនេះ
-,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
-DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
-,Supplier Addresses and Contacts,អាសយដ្ឋានក្រុមហ៊ុនផ្គត់ផ្គង់និងទំនាក់ទំនង
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
-apps/erpnext/erpnext/config/projects.py +18,Project master.,ចៅហ្វាយគម្រោង។
-DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំបង្ហាញនិមិត្តរូបដូចជា $ លណាមួយដែលជាប់នឹងរូបិយប័ណ្ណ។
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
-DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
-DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,ទទួលបានធាតុពី Bom
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
-DocType: Dropbox Backup,Send Notifications To,ផ្ញើការជូនដំណឹងដើម្បី
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,យោងកាលបរិច្ឆេទ
-DocType: Employee,Reason for Leaving,ហេតុផលសម្រាប់ការចាកចេញ
-DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
-DocType: GL Entry,Is Opening,តើការបើក
-DocType: Account,Cash,ជាសាច់ប្រាក់
-DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,អ្នកត្រូវតែរក្សាទុកសំណុំបែបបទមុនពេលដំណើរការសវនាការ
+DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,ភ្ជាប់រូបសញ្ញា
+DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
+apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
+apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,រទេះទទេ
+DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ជា root មិនអាចត្រូវបានកែសម្រួល។
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចធំជាងចំនួនសរុប unadusted
+DocType: Manufacturing Settings,Allow Production on Holidays,ផលិតកម្មនៅលើថ្ងៃឈប់សម្រាកអនុញ្ញាតឱ្យ
+DocType: Sales Order,Customer's Purchase Order Date,របស់អតិថិជនទិញលំដាប់កាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,រាជធានីហ៊ុន
+DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,សូមជ្រើសឯកសារ csv
+DocType: Purchase Order,To Receive and Bill,ដើម្បីទទួលបាននិង Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,អ្នករចនា
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
+DocType: Serial No,Delivery Details,ពត៌មានលំអិតដឹកជញ្ជូន
+DocType: Item,Automatically create Material Request if quantity falls below this level,បង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិបើបរិមាណធ្លាក់នៅក្រោមកម្រិតនេះ
+,Item-wise Purchase Register,ចុះឈ្មោះទិញធាតុប្រាជ្ញា
+DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",ដើម្បីកំណត់កម្រិតការរៀបចំធាតុត្រូវតែជាធាតុទិញឬធាតុកម្មន្តសាល
+,Supplier Addresses and Contacts,អាសយដ្ឋានក្រុមហ៊ុនផ្គត់ផ្គង់និងទំនាក់ទំនង
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
+apps/erpnext/erpnext/config/projects.py +18,Project master.,ចៅហ្វាយគម្រោង។
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំបង្ហាញនិមិត្តរូបដូចជា $ លណាមួយដែលជាប់នឹងរូបិយប័ណ្ណ។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
+DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,យោងកាលបរិច្ឆេទ
+DocType: Employee,Reason for Leaving,ហេតុផលសម្រាប់ការចាកចេញ
+DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
+DocType: GL Entry,Is Opening,តើការបើក
+DocType: Account,Cash,ជាសាច់ប្រាក់
+DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។

diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index ed9a950..f179409 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,ಸಂಬಳ ಫ್ಯಾಷನ್
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","ನೀವು ಋತುಗಳು ಆಧರಿಸಿ ಟ್ರ್ಯಾಕ್ ಬಯಸಿದರೆ, ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ."
 DocType: Employee,Divorced,ವಿವಾಹವಿಚ್ಛೇದಿತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,ಎಚ್ಚರಿಕೆ: ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,ಎಚ್ಚರಿಕೆ: ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸಿಂಕ್
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ಐಟಂ ಒಂದು ವ್ಯವಹಾರದಲ್ಲಿ ಅನೇಕ ಬಾರಿ ಸೇರಿಸಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ಮೆಟೀರಿಯಲ್ ಭೇಟಿ {0} ಈ ಖಾತರಿ ಹಕ್ಕು ರದ್ದು ಮೊದಲು ರದ್ದು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ಗ್ರಾಹಕ ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,ಮೊದಲ ಪಕ್ಷದ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,ಹದಗೊಳಿಸುವಿಕೆ
 DocType: Item,Customer Items,ಗ್ರಾಹಕ ವಸ್ತುಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಒಂದು ಲೆಡ್ಜರ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com ಗೆ ಐಟಂ ಪ್ರಕಟಿಸಿ
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Approvers ಬಿಡಿ
 DocType: Sales Partner,Dealer,ವ್ಯಾಪಾರಿ
 DocType: Employee,Rented,ಬಾಡಿಗೆ
-DocType: About Us Settings,Website,ವೆಬ್ಸೈಟ್
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,ಒತ್ತಡದಿಂದ ಜೊತೆಗೆ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ಟ್ರೀ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ಹೆಚ್ಚು ಫಲಿತಾಂಶಗಳು.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ಕಾನೂನಿನ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ಕಾನೂನಿನ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ನಿಜವಾದ ರೀತಿಯ ತೆರಿಗೆ ಸತತವಾಗಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: C-Form,Customer,ಗಿರಾಕಿ
 DocType: Purchase Receipt Item,Required By,ಅಗತ್ಯವಿರುತ್ತದೆ
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ಹೊಲಿಗೆ
 DocType: Pricing Rule,Apply On,ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Item Price,Multiple Item prices.,ಬಹು ಐಟಂ ಬೆಲೆಗಳು .
 ,Purchase Order Items To Be Received,ಸ್ವೀಕರಿಸಬೇಕು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂಗಳು
 DocType: SMS Center,All Supplier Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
 DocType: Quality Inspection Reading,Parameter,ನಿಯತಾಂಕ
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ರೋ # {0}: ದರ ಅದೇ ಇರಬೇಕು {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 ಬುದ್ಧಿವಂತ ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ ನಿರ್ವಹಿಸಲು ಮತ್ತು ತಮ್ಮ ಕೋಡ್ ಬಳಕೆ ಈ ಆಯ್ಕೆಯನ್ನು ಆಧರಿಸಿ ಅವುಗಳನ್ನು ಹುಡುಕಲು ಸುಲಭವಾಗುವಂತೆ
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
-DocType: Sales Invoice Item,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ಹೊಸ ಪಿಓಎಸ್ ವಿವರ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 DocType: Purchase Invoice,Monthly,ಮಾಸಿಕ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ರಕ್ಷಣೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ಇಮೇಲ್ ವಿಳಾಸ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
 DocType: Company,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ರೋ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ರೋ # {0}:
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,ಬೆಲೆ ಪಟ್ಟಿ ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,ಮರಗೆಲಸ
 DocType: Production Order Operation,Work In Progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಕೆಲಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ಮುದ್ರಣ
 DocType: Employee,Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Time Log,Time Log,ಟೈಮ್ ಲಾಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,ಅಕೌಂಟೆಂಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,ಅಕೌಂಟೆಂಟ್
 DocType: Cost Center,Stock User,ಸ್ಟಾಕ್ ಬಳಕೆದಾರ
 DocType: Company,Phone No,ದೂರವಾಣಿ ಸಂಖ್ಯೆ
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ಚಟುವಟಿಕೆಗಳು ಲಾಗ್, ಬಿಲ್ಲಿಂಗ್ ಸಮಯ ಟ್ರ್ಯಾಕ್ ಬಳಸಬಹುದಾದ ಕಾರ್ಯಗಳು ಬಳಕೆದಾರರ ನಡೆಸಿದ."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},ಹೊಸ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},ಹೊಸ {0}: # {1}
 ,Sales Partners Commission,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಆಯೋಗ
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,ಸಂಕ್ಷೇಪಣ ಹೆಚ್ಚು 5 ಪಾತ್ರಗಳು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",ಮೌಲ್ಯ {0} {1} ಐಟಂ ಎಂದು ಮಾರ್ಪಾಟುಗಳು \ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾರಣವಾಗಿದ್ದು ಈ ತಳಿಗೆ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ.
-DocType: Print Settings,Classic,ಅತ್ಯುತ್ಕೃಷ್ಟ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಖಾತೆಯನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: BOM,Operations,ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ರಿಯಾಯಿತಿ ಆಧಾರದ ಮೇಲೆ ಅಧಿಕಾರ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ {0}
 DocType: Bin,Quantity Requested for Purchase,ಖರೀದಿ ಮನವಿ ಪ್ರಮಾಣ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ಎರಡು ಕಾಲಮ್ಗಳು, ಹಳೆಯ ಹೆಸರು ಒಂದು ಮತ್ತು ಹೆಸರು ಒಂದು CSV ಕಡತ ಲಗತ್ತಿಸಿ"
 DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವರ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,ಕೆಜಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,ಕೆಜಿ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Employee,Married,ವಿವಾಹಿತರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ದಿನಸಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,ಖಾತೆಯನ್ನು ರೀತಿಯ ವೇರ್ಹೌಸ್ ವೇಳೆ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","ಪರಿಶೀಲಿಸಿ ಸಲುವಾಗಿ ಮರುಕಳಿಸುವ ವೇಳೆ, ಮರುಕಳಿಸುವ ನಿಲ್ಲಿಸಲು ಅಥವಾ ಸರಿಯಾದ ಅಂತಿಮ ದಿನಾಂಕ ಹಾಕಲು ಗುರುತಿಸಬೇಡಿ"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
 DocType: SMS Log,SMS Log,ಎಸ್ಎಂಎಸ್ ಲಾಗಿನ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ತಲುಪಿಸುವುದಾಗಿರುತ್ತದೆ ವೆಚ್ಚ
-DocType: Blog Post,Guest,ಅತಿಥಿ
 DocType: Quality Inspection,Get Specification Details,ವಿಶಿಷ್ಟ ವಿವರಗಳನ್ನು ಪಡೆಯಲು
 DocType: Lead,Interested,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ಮೆಟೀರಿಯಲ್ ಬಿಲ್
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ಆರಂಭಿಕ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ಆರಂಭಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ಗೆ {0} ಗೆ {1}
 DocType: Item,Copy From Item Group,ಐಟಂ ಗುಂಪಿನಿಂದ ನಕಲಿಸಿ
 DocType: Journal Entry,Opening Entry,ಎಂಟ್ರಿ ತೆರೆಯುವ
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} ಕಡ್ಡಾಯ
 DocType: Stock Entry,Additional Costs,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
-DocType: Standard Reply,Owner,ಒಡೆಯ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee Education,Under Graduate,ಸ್ನಾತಕಪೂರ್ವ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,ಟಾರ್ಗೆಟ್ ರಂದು
 DocType: BOM,Total Cost,ಒಟ್ಟು ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,ಸ್ಥಿರಾಸ್ತಿ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,ಖಾತೆ ಹೇಳಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
 DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು
 DocType: Employee,Mr,ಶ್ರೀ
-DocType: Custom Script,Client,ಕಕ್ಷಿಗಾರ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
 DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,ಉಪಭೋಗ್ಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Upload Attendance,Import Log,ಆಮದು ಲಾಗ್
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ಕಳುಹಿಸು
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 DocType: Newsletter,Email Sent?,ಕಳುಹಿಸಲಾದ ಇಮೇಲ್ ?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,ಟೈಮ್ ತೋರಿಸಿ ದಾಖಲೆಗಳು
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
 DocType: Item,Supply Raw Materials for Purchase,ಪೂರೈಕೆ ಕಚ್ಚಾ ವಸ್ತುಗಳ ಖರೀದಿ
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,ಐಟಂ {0} ಖರೀದಿಸಿ ಐಟಂ ಇರಬೇಕು
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  ಆಯ್ಕೆ ಅವಧಿಯಲ್ಲಿ ಎಲ್ಲ ದಿನಾಂಕಗಳು ಮತ್ತು ನೌಕರ ಸಂಯೋಜನೆಯನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಹಾಜರಾತಿ ದಾಖಲೆಗಳು, ಟೆಂಪ್ಲೇಟ್ ಬರುತ್ತದೆ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಲ್ಲಿಸಿದ ನಂತರ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","ಸತತವಾಗಿ ತೆರಿಗೆ ಸೇರಿಸಲು {0} ಐಟಂ ಪ್ರಮಾಣದಲ್ಲಿ , ಸಾಲುಗಳಲ್ಲಿ ತೆರಿಗೆ {1} , ಎಂದು ಸೇರಿಸಲೇಬೇಕು"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ನೇರವಾಗಿ
 DocType: BOM Replace Tool,New BOM,ಹೊಸ BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ಬ್ಯಾಚ್ ಬಿಲ್ಲಿಂಗ್ ಟೈಮ್ ದಾಖಲೆಗಳು.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity ಎರಕದ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,ಸುದ್ದಿಪತ್ರ ಈಗಾಗಲೇ ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
 DocType: Leave Application,Reason,ಕಾರಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ವ್ಯವಸ್ಥೆ ನಿರ್ವಾಹಕರಾಗುತ್ತೀರಿ ಮೊದಲ ಬಳಕೆದಾರ (ನೀವು ನಂತರ ಬದಲಾಯಿಸಬಹುದು).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ವ್ಯವಸ್ಥೆ ನಿರ್ವಾಹಕರಾಗುತ್ತೀರಿ ಮೊದಲ ಬಳಕೆದಾರ (ನೀವು ನಂತರ ಬದಲಾಯಿಸಬಹುದು).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
 DocType: Serial No,Maintenance Status,ನಿರ್ವಹಣೆ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ಐಟಂಗಳನ್ನು ಮತ್ತು ಬೆಲೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,ಧಿಡೀರನೆ ನೀವು ಅಪ್ರೈಸಲ್ ರಚಿಸುತ್ತಿರುವ ನೌಕರರ ಆಯ್ಕೆ .
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},ವೆಚ್ಚ ಸೆಂಟರ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟದ ಜ ಇರಬೇಕು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ ಐಟಂ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ದರ ಪಟ್ಟಿ ದರ ರಿಯಾಯಿತಿ (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,ಪ್ರಾರಂಭ
-DocType: User,First Name,ಮೊದಲ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,ಪೂರ್ಣ ಅಚ್ಚು ಎರಕದ
 DocType: Offer Letter,Select Terms and Conditions,ಆಯ್ಕೆ ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 DocType: Production Planning Tool,Sales Orders,ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ
 DocType: Purchase Taxes and Charges,Valuation,ಬೆಲೆಕಟ್ಟುವಿಕೆ
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,ಠೇವಣಿ ವಿವರ
 DocType: Leave Type,Allow Negative Balance,ನಕಾರಾತ್ಮಕ ಬ್ಯಾಲೆನ್ಸ್ ಅನುಮತಿಸಿ
 DocType: Selling Settings,Default Territory,ಡೀಫಾಲ್ಟ್ ಪ್ರದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ಟೆಲಿವಿಷನ್
 DocType: Production Order Operation,Updated via 'Time Log','ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ಅನ್ವಯಿಸಿದರೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,ವೇರ್ಹೌಸ್ ಬೇಕಾಗುತ್ತದೆ ಮೊದಲು ಸಲ್ಲಿಸಿ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ಪಡೆಯುವಂತಹ
 DocType: Sales Partner,Reseller,ಮರುಮಾರಾಟ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
 DocType: Newsletter List,Total Subscribers,ಒಟ್ಟು ಚಂದಾದಾರರು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
+,Contact Name,ಸಂಪರ್ಕಿಸಿ ಹೆಸರು
 DocType: Production Plan Item,SO Pending Qty,ಆದ್ದರಿಂದ ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ಡಬಲ್ ವಸತಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಹೊಂದಿಸಿ
 DocType: Time Log,Will be updated when batched.,Batched ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ಸಾಲು {0}: ಪರಿಶೀಲಿಸಿ ಖಾತೆ ವಿರುದ್ಧ 'ಅಡ್ವಾನ್ಸ್ ಈಸ್' {1} ಈ ಮುಂಗಡ ಪ್ರವೇಶ ವೇಳೆ.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},ವೇರ್ಹೌಸ್ {0} ಸೇರುವುದಿಲ್ಲ ಕಂಪನಿ {1}
-DocType: Bulk Email,Message,ಸಂದೇಶ
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
-DocType: Dropbox Backup,Dropbox Access Key,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ ಕೀ
 DocType: Payment Tool,Reference No,ಉಲ್ಲೇಖ ಯಾವುದೇ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,ವಾರ್ಷಿಕ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Material Request Item,Min Order Qty,ಮಿನ್ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Lead,Do Not Contact,ಸಂಪರ್ಕಿಸಿ ಇಲ್ಲ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ಎಲ್ಲಾ ಮರುಕಳಿಸುವ ಇನ್ವಾಯ್ಸ್ ಟ್ರ್ಯಾಕ್ ಅನನ್ಯ ID . ಇದು ಸಲ್ಲಿಸಲು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,ಸಾಫ್ಟ್ವೇರ್ ಡೆವಲಪರ್
 DocType: Item,Minimum Order Qty,ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Pricing Rule,Supplier Type,ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ವೈರ್ ಹಲ್ಲುಜ್ಜುವುದು
 DocType: Employee,Relation,ರಿಲೇಶನ್
 DocType: Shipping Rule,Worldwide Shipping,ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ಗ್ರಾಹಕರಿಂದ ಕನ್ಫರ್ಮ್ಡ್ ಆದೇಶಗಳನ್ನು .
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Maintenance Schedule,Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,ಖರ್ಚು ಹೆಡ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,ಮೊದಲ ಬ್ಯಾಚ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ಇತ್ತೀಚಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,ನಿಮ್ಮ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,ಮ್ಯಾಕ್ಸ್ 5 ಪಾತ್ರಗಳು
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶದ ವಿರುದ್ಧ ಸಮಯ ದಾಖಲೆಗಳು ಸೃಷ್ಟಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. ಕಾರ್ಯಾಚರಣೆ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಟ್ರ್ಯಾಕ್ ಸಾಧ್ಯವಿಲ್ಲ ಹಾಗಿಲ್ಲ
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,ಭಿನ್ನ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,ಐಟಂ {0} ಸೇವೆ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
-DocType: DocType,Administrator,ನಿರ್ವಾಹಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,ಲೇಸರ್ ಕೊರೆಯುವ
-DocType: Stock UOM Replace Utility,New Stock UOM,ಹೊಸ ಸ್ಟಾಕ್ UOM
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
-DocType: Communication,Closed,ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Lead,Industry,ಇಂಡಸ್ಟ್ರಿ
 DocType: Employee,Job Profile,ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು
 DocType: Newsletter,Newsletter,ಸುದ್ದಿಪತ್ರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,ನೆಕ್ಕಿಂಗ್
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,ಐಟಂ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
-DocType: Async Task,System Manager,ವ್ಯವಸ್ಥೆ ಮ್ಯಾನೇಜರ್
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
 DocType: Sales Invoice Item,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
-DocType: Dropbox Backup,Allow Dropbox Access,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಅನುಮತಿಸಬಹುದು
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,ಕಂಪನಿ ಇಮೇಲ್
 DocType: GL Entry,Debit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಡೆಬಿಟ್ ಪ್ರಮಾಣ
 DocType: Shipping Rule,Valid for Countries,ದೇಶಗಳಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
-DocType: Workflow State,Refresh,ರಿಫ್ರೆಶ್
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ಕರೆನ್ಸಿ , ಪರಿವರ್ತನೆ ದರ , ಒಟ್ಟು ಆಮದು , ಆಮದು grandtotal ಇತ್ಯಾದಿ ಎಲ್ಲಾ ಆಮದು ಸಂಬಂಧಿಸಿದ ಜಾಗ ಇತ್ಯಾದಿ ಖರೀದಿ ರಸೀತಿ , ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ , ಖರೀದಿ ಸರಕುಪಟ್ಟಿ , ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಲಭ್ಯವಿದೆ"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM , ಡೆಲಿವರಿ ನೋಟ್, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ , ಉತ್ಪಾದನೆ ಆರ್ಡರ್ , ಆರ್ಡರ್ ಖರೀದಿಸಿ , ಖರೀದಿ ರಸೀತಿ , ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ , ಮಾರಾಟದ ಆರ್ಡರ್ , ಸ್ಟಾಕ್ ಎಂಟ್ರಿ , timesheet ಲಭ್ಯವಿದೆ"
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,ಆಯ್ಕೆ ಐಟಂ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ಐಟಂ: {0} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ಸಲ್ಲಿಸಬೇಕು
-DocType: Stock UOM Replace Utility,Current Stock UOM,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ನಿಮ್ಮ ಈಮೇಲ್ ವಿಳಾಸ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ನೀರಿನ ಜೆಟ್ ತುಂಡರಿಸುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
 ,Finished Goods,ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Delivery Note,Instructions,ಸೂಚನೆಗಳು
 DocType: Quality Inspection,Inspected By,ಪರಿಶೀಲನೆ
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು. ಅವರು ಗ್ರಾಹಕ / ಸರಬರಾಜುದಾರ ಮಾಸ್ಟರ್ಸ್ ನೇರವಾಗಿ ರಚಿಸಲಾಗಿದೆ.
 DocType: Currency Exchange,Currency Exchange,ಕರೆನ್ಸಿ ವಿನಿಮಯ
 DocType: Purchase Invoice Item,Item Name,ಐಟಂ ಹೆಸರು
+DocType: Authorization Rule,Approving User  (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಬಳಕೆದಾರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ಸಾಲ ಬಾಕಿ
 DocType: Employee,Widowed,ಒಂಟಿಯಾದ
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",""" ಸ್ಟಾಕ್ ಔಟ್ "" ಇವು ವಿನಂತಿಸಿದ ಐಟಂಗಳನ್ನು ಯೋಜಿತ ಪ್ರಮಾಣ ಮತ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಆಧರಿಸಿ ಎಲ್ಲಾ ಗೋದಾಮುಗಳು ಪರಿಗಣಿಸಿ"
@@ -380,22 +348,21 @@
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
 DocType: Workstation,Consumable Cost,ಉಪಭೋಗ್ಯ ವೆಚ್ಚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ವೈದ್ಯಕೀಯ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ಸೋತ ಕಾರಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ಟ್ಯೂಬ್ ಮಣಿ ಪೋಣಿಸುವುದುಎಂದು
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 DocType: Employee,Single,ಏಕೈಕ
 DocType: Issue,Attachment,ಲಗತ್ತು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ಬಜೆಟ್ ಗ್ರೂಪ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Account,Cost of Goods Sold,ಮಾರಿದ ವಸ್ತುಗಳ ಬೆಲೆ
 DocType: Purchase Invoice,Yearly,ವಾರ್ಷಿಕ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
 DocType: Journal Entry Account,Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
 DocType: Purchase Order,Start date of current order's period,ಪ್ರಸ್ತುತ ಸಲುವಾಗಿ ನ ಅವಧಿಯಲ್ಲಿ ದಿನಾಂಕ ಪ್ರಾರಂಭಿಸಿ
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},ಪ್ರಮಾಣ ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},ಪ್ರಮಾಣ ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
 DocType: Delivery Note,% Installed,% ಅನುಸ್ಥಾಪಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,ಗ್ರೂಪ್
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ಸ್ವಯಂಚಾಲಿತವಾಗಿ FIFO ಆಧರಿಸಿ ನಾವು ಸೀರಿಯಲ್ ಹೊಂದಿಸಿ
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ಚೆಕ್ ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ವೈಶಿಷ್ಟ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,ಥರ್ಮೋಫಾರ್ಮಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',' ನಂ ಪ್ರಕರಣಕ್ಕೆ . ' ' ಕೇಸ್ ನಂ ಗೆ . ' ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ಲಾಭಾಪೇಕ್ಷೆಯಿಲ್ಲದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ಲಾಭಾಪೇಕ್ಷೆಯಿಲ್ಲದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,ಪ್ರಾರಂಭವಾಗಿಲ್ಲ
 DocType: Lead,Channel Partner,ಚಾನೆಲ್ ಸಂಗಾತಿ
 DocType: Account,Old Parent,ಓಲ್ಡ್ ಪೋಷಕ
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ಶೆಲ್ ಸೂರು
 DocType: Material Request Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
 DocType: BOM,Costing,ಕಾಸ್ಟಿಂಗ್
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
 DocType: Features Setup,Imports,ಆಮದುಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ಅಂಟುವ ಬಂಧದ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Job Opening,Description of a Job Opening,ಒಂದು ಉದ್ಯೋಗಾವಕಾಶದ ವಿವರಣೆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,ಹಾಜರಾತಿ .
 DocType: Bank Reconciliation,Journal Entries,ಜರ್ನಲ್ ನಮೂದುಗಳು
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
-DocType: System Settings,Loading...,ಲೋಡ್ ಆಗುತ್ತಿದೆ ...
-DocType: DocField,Password,ಪಾಸ್ವರ್ಡ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,ಬೆಸೆದುಕೊಂಡ ಶೇಖರಣೆ ಮಾಡೆಲಿಂಗ್
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
 DocType: Customer,Buyer of Goods and Services.,ಸರಕು ಮತ್ತು ಸೇವೆಗಳ ಖರೀದಿದಾರನ.
 DocType: Journal Entry,Accounts Payable,ಖಾತೆಗಳನ್ನು ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,ಚಂದಾದಾರರು ಸೇರಿಸಿ
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 DocType: Pricing Rule,Valid Upto,ಮಾನ್ಯ ವರೆಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,ನಿಮ್ಮ ಗ್ರಾಹಕರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,ನೇರ ಆದಾಯ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 DocType: Payment Tool,Received Or Paid,ಪಡೆದಾಗ ಅಥವಾ ಪಾವತಿಸಿದಾಗ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Stock Entry,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-DocType: DocField,Type,ದರ್ಜೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
-DocType: Communication,Subject,ವಿಷಯ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 ,Serial No Warranty Expiry,ಸೀರಿಯಲ್ ಭರವಸೆಯಿಲ್ಲ ಅಂತ್ಯ
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ಹೊಸ UOM ಇಡೀ ಸಂಖ್ಯೆ ಇರಬಾರದು
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ಪೀಠೋಪಕರಣಗಳು ಮತ್ತು ಫಿಕ್ಸ್ಚರ್
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,ಮೆಟೀರಿಯಲ್ ಅವಶ್ಯಕತೆ
 DocType: Company,Delete Company Transactions,ಕಂಪನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,ಐಟಂ {0} ಐಟಂ ಖರೀದಿ ಇಲ್ಲ
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'ಅಧಿಸೂಚನೆ \
  ಇಮೇಲ್ ವಿಳಾಸ' ಅಸಿಂಧುವಾದ ಇಮೇಲ್ ವಿಳಾಸ"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಈ ವರ್ಷ:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಈ ವರ್ಷ:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ಅಳಿಸಿಹಾಕಲಾಗದು ಸೀರಿಯಲ್ ಯಾವುದೇ {0}, ಇದು ಸ್ಟಾಕ್ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುತ್ತದೆ"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),ಮುಚ್ಚುವ (ಸಿಆರ್)
 DocType: Serial No,Warranty Period (Days),ಖಾತರಿ ಕಾಲ (ದಿನಗಳು)
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 ,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Job Applicant,Thread HTML,ಥ್ರೆಡ್ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Company,Ignore,ಕಡೆಗಣಿಸು
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Pricing Rule,Valid From,ಮಾನ್ಯ
 DocType: Sales Invoice,Total Commission,ಒಟ್ಟು ಆಯೋಗ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ನೀವು ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ನಿಮ್ಮ ಬಜೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
 
 , ಈ ವಿತರಣಾ ಬಳಸಿಕೊಂಡು ಒಂದು ಬಜೆಟ್ ವಿತರಿಸಲು ** ವೆಚ್ಚ ಕೇಂದ್ರದಲ್ಲಿ ** ಈ ** ಮಾಸಿಕ ವಿತರಣೆ ಹೊಂದಿಸಲು **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
-DocType: About Us Settings,Website Manager,ವೆಬ್ಸೈಟ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಮಾಡಬಾರದು
 DocType: Warranty Claim,Resolution,ವಿಶ್ಲೇಷಣ
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},ತಲುಪಿಸಲಾಗಿದೆ: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,ಬಿಲ್ಲಿಂಗ್ ಮತ್ತು ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ಹಿಂದಿನ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು ಬಯಸುವ ಆಯ್ಕೆ ಮಾರಾಟ ಆದೇಶಗಳನ್ನು .
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,ಸಂಬಳ ಘಟಕಗಳನ್ನು .
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ಸಂಭಾವ್ಯ ಗ್ರಾಹಕರು ಡೇಟಾಬೇಸ್ .
+DocType: Authorization Rule,Customer or Item,ಗ್ರಾಹಕ ಅಥವಾ ಐಟಂ
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ಗ್ರಾಹಕ ಡೇಟಾಬೇಸ್ .
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ಉರುಳುವ
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿರುವ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಬೇರೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬಳಸಲು ಹೊಸ ಐಟಂ ರಚಿಸಬೇಕಾಗಿದೆ.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
-DocType: Event,Wednesday,ಬುಧವಾರ
 DocType: Sales Invoice,Customer's Vendor,ಗ್ರಾಹಕರ ಮಾರಾಟಗಾರರ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ಮತ್ತೊಂದು ಮಾರಾಟಗಾರನ {0} ಅದೇ ನೌಕರರ ಐಡಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ನಿರಾಕರಣೆಗಳು ಸ್ಟಾಕ್ ದೋಷ ( {6} ) ಐಟಂ {0} ಮೇಲೆ {1} ವೇರ್ಹೌಸ್ {2} {3} ಗೆ {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,ಡೀಫಾಲ್ಟ್ ಕಾಸ್ಟಿಂಗ್ ದರ
 DocType: Maintenance Schedule,Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ನಂತರ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಗ್ರಾಹಕ ಆಧಾರಿತ ಸೋಸುತ್ತವೆ, ಗ್ರಾಹಕ ಗುಂಪಿನ, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರ, ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ, ಪ್ರಚಾರ, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿ"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ಡ್ರಾಪ್ಬಾಕ್ಸ್ pythonModule ಅನುಸ್ಥಾಪಿಸಲು ದಯವಿಟ್ಟು
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ಖರೀದಿ ಸ್ವೀಕರಿಸಿದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ಖರೀದಿ ಸ್ವೀಕರಿಸಿದ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
 DocType: SMS Settings,Receiver Parameter,ಸ್ವೀಕರಿಸುವವರ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Sales Person,Sales Person Targets,ಮಾರಾಟಗಾರನ ಗುರಿ
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ಗೆ
-apps/frappe/frappe/templates/base.html +145,Please enter email address,ದಯವಿಟ್ಟು ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,ರೂಪಿಸುವ ಎಂಡ್ ಟ್ಯೂಬ್
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ವಿಧ
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,ಸ್ಥಿರ ಡೇಸ್
 DocType: Sales Invoice,Packing List,ಪ್ಯಾಕಿಂಗ್ ಪಟ್ಟಿ
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ಪೂರೈಕೆದಾರರು givenName ಗೆ ಆದೇಶಗಳನ್ನು ಖರೀದಿಸಲು .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,ಪಬ್ಲಿಷಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,ಪಬ್ಲಿಷಿಂಗ್
 DocType: Activity Cost,Projects User,ಯೋಜನೆಗಳು ಬಳಕೆದಾರ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ಸೇವಿಸುವ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ಸರಕುಪಟ್ಟಿ ವಿವರಗಳು ಟೇಬಲ್ ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ಸರಕುಪಟ್ಟಿ ವಿವರಗಳು ಟೇಬಲ್ ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Company,Round Off Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್ ಆಫ್ ಸುತ್ತ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ಭೇಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 DocType: Material Request,Material Transfer,ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ತೆರೆಯುತ್ತಿದೆ ( ಡಾ )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},ಪೋಸ್ಟ್ ಸಮಯಮುದ್ರೆಗೆ ನಂತರ ಇರಬೇಕು {0}
-apps/frappe/frappe/config/setup.py +59,Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ಇಳಿಯಿತು ವೆಚ್ಚ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Production Order Operation,Actual Start Time,ನಿಜವಾದ ಟೈಮ್
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ಇನ್ನಷ್ಟು
 DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ಹೊಸ ಹೆಸರಿಡು
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ಬಾಗುವುದು
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,ಬಳಕೆದಾರ ಅನುಮತಿಸಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
 DocType: Purchase Invoice,Quarterly,ತ್ರೈಮಾಸಿಕ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ನೇರ ಕತ್ತರಿಸುವ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ಅವರ ಸರಣಿ ಸೂಲ ಆಧರಿಸಿ ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ದಾಖಲೆಗಳನ್ನು ಐಟಂ ಅನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು . ಆದ್ದರಿಂದ ಉತ್ಪನ್ನದ ಖಾತರಿ ವಿವರಗಳು ಪತ್ತೆಹಚ್ಚಲು ಬಳಸಲಾಗುತ್ತದೆ ಮಾಡಬಹುದು ಇದೆ .
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ವೇರ್ಹೌಸ್ regected ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Employee,Provide email id registered in company,ಕಂಪನಿಗಳು ನೋಂದಣಿ ಇಮೇಲ್ ಐಡಿ ಒದಗಿಸಿ
 DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
 DocType: Sales Invoice,Commission Rate (%),ಕಮಿಷನ್ ದರ ( % )
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ಚೀಟಿ ವಿರುದ್ಧ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ವಿನಿಮಯ ದರ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ಏರೋಸ್ಪೇಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ಸ್ವಾಗತ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ಏರೋಸ್ಪೇಸ್
 DocType: Journal Entry,Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ಕೆಲಸವನ್ನು ವಿಷಯ
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ಗೂಡ್ಸ್ ವಿತರಕರಿಂದ ಪಡೆದ .
-DocType: Communication,Open,ತೆರೆದ
 DocType: Lead,Campaign Name,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
 ,Reserved,ಮೀಸಲಿಟ್ಟ
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Mode of Payment Account,Default Account,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
-DocType: Contact Us Settings,Address Title,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
 ,Sales Person Target Variance Item Group-Wise,ಮಾರಾಟಗಾರನ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-DocType: Dropbox Backup,Daily,ಪ್ರತಿದಿನ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Delivery Note,Customer's Purchase Order No,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ನಂ
 DocType: Employee,Cell Number,ಸೆಲ್ ಸಂಖ್ಯೆ
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ಆಟೋ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ಲಾಸ್ಟ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ಶಕ್ತಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
 DocType: Item Group,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,ಹೊಸ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಲೀಫ್ ನೋಡ್ಗಳು ವಿರುದ್ಧ ಮಾಡಬಹುದು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ನಮೂದುಗಳು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
-DocType: ToDo,High,ಎತ್ತರದ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
-DocType: User,Male,ಪುರುಷ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಖರೀದಿ ರಸೀತಿ ಸಂಖ್ಯೆ {0}
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಮೌಲ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,ಮಾರಾಟದ ಶಿಬಿರಗಳನ್ನು .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,ದೊಣ್ಣೆ
 DocType: Expense Claim Detail,Expense Claim Type,ಖರ್ಚು ClaimType
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} ಇದು ಈ ಸರಕುಪಟ್ಟಿ ಮುಂದುವರಿಸಿ ಎಂದು ನಿಲ್ಲಿಸಲು ಮಾಡಬೇಕು ವೇಳೆ {1}, ಪರಿಶೀಲಿಸಿ ಆರ್ಡರ್ ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ಬಯೋಟೆಕ್ನಾಲಜಿ
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} ಇದು ಈ ಸರಕುಪಟ್ಟಿ ಮುಂದುವರಿಸಿ ಎಂದು ನಿಲ್ಲಿಸಲು ಮಾಡಬೇಕು ವೇಳೆ {1}, ಪರಿಶೀಲಿಸಿ ಆರ್ಡರ್ ವಿರುದ್ಧ ಲಿಂಕ್ ಇದೆ."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,ಬಯೋಟೆಕ್ನಾಲಜಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Process Payroll,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},ಐಟಂಗಳನ್ನು ಮೂಲಕ ವಿತರಿಸಲಾಯಿತು ಏಕೆಂದರೆ &#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,ಸೂಲ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,ಸೂಲ
 DocType: Item,Items with higher weightage will be shown higher,ಹೆಚ್ಚಿನ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಹೊಂದಿರುವ ಐಟಂಗಳು ಹೆಚ್ಚಿನ ತೋರಿಸಲಾಗುತ್ತದೆ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ನನ್ನ ಇನ್ವಾಯ್ಸ್ಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Purchase Order,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;ಮಾರಾಟದ&quot; ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಲು
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
-DocType: Comment,Reference Name,ರೆಫರೆನ್ಸ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: Sales Invoice Item,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,ನಿರೀಕ್ಷಿತ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
 DocType: Production Order,Item To Manufacture,ತಯಾರಿಸಲು ಐಟಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,ಶಾಶ್ವತ ಅಚ್ಚು ಎರಕದ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} ಸ್ಥಿತಿ {2} ಆಗಿದೆ
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Sales Order Item,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
 DocType: Newsletter,Newsletter Manager,ಸುದ್ದಿಪತ್ರ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
 DocType: Expense Claim,Expenses,ವೆಚ್ಚಗಳು
 DocType: Item Variant Attribute,Item Variant Attribute,ಐಟಂ ಭಿನ್ನ ಲಕ್ಷಣ
 ,Purchase Receipt Trends,ಖರೀದಿ ರಸೀತಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Appraisal,Select template from which you want to get the Goals,ನೀವು ಗೋಲುಗಳನ್ನು ಪಡೆಯಲು ಬಯಸುವ ಟೆಂಪ್ಲೇಟ್ ಆಯ್ಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
 ,Amount to Bill,ಬಿಲ್ ಪ್ರಮಾಣ
 DocType: Company,Registration Details,ನೋಂದಣಿ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ನೇತುಹಾಕಿದಾಗ ರಕ್ತವು ಹೊರಗೆ
 DocType: Item,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Leave Block List Date,Leave Block List Date,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},ಕಳುಹಿಸಿದನು ಪರಿಶಿಷ್ಟ {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,ಸ್ಟಾಕ್ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ಪ್ರಾಜೆಕ್ಟ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ಸಾಧ್ಯವಿಲ್ಲ carryforward {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ಖಾತೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ರೆಡಿಟ್, ನೀವು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ 'ಡೆಬಿಟ್' ಎಂದು 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಲೇಬೇಕು'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","ಖಾತೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ರೆಡಿಟ್, ನೀವು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ 'ಡೆಬಿಟ್' ಎಂದು 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಲೇಬೇಕು'"
 DocType: Account,Balance must be,ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು
 DocType: Hub Settings,Publish Pricing,ಬೆಲೆ ಪ್ರಕಟಿಸಿ
 DocType: Notification Control,Expense Claim Rejected Message,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು ಸಂದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,ಉತ್ಕೃಷ್ಟವಾದ
 ,Available Qty,ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ
 DocType: Purchase Taxes and Charges,On Previous Row Total,ಹಿಂದಿನ ಸಾಲು ಒಟ್ಟು ರಂದು
 DocType: Salary Slip,Working Days,ಕೆಲಸ ದಿನಗಳ
 DocType: Serial No,Incoming Rate,ಒಳಬರುವ ದರ
 DocType: Packing Slip,Gross Weight,ಒಟ್ಟು ತೂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .
 DocType: HR Settings,Include holidays in Total no. of Working Days,ಒಟ್ಟು ರಜಾದಿನಗಳು ಸೇರಿಸಿ ಕೆಲಸ ದಿನಗಳ ಯಾವುದೇ
 DocType: Job Applicant,Hold,ಹಿಡಿ
 DocType: Employee,Date of Joining,ಸೇರುವ ದಿನಾಂಕ
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ವೀಕ್ಷಿಸಿ ಚಂದಾದಾರರು
 DocType: Purchase Invoice Item,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ಅಪಘರ್ಷಕ ಸ್ಪೋಟವನ್ನು
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
 DocType: Salary Slip,Leave Encashment Amount,ನಗದೀಕರಣ ಪ್ರಮಾಣ ಬಿಡಿ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ಅಗತ್ಯವಿದೆ ಪ್ರಮಾಣ
 DocType: Bank Reconciliation,Total Amount,ಒಟ್ಟು ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
 DocType: Production Planning Tool,Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ಬ್ಯಾಲೆನ್ಸ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ಮಾರಾಟ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ಐಟಂಗಳನ್ನು ಸಿಂಕ್ ಪ್ರಕಟಿಸಿ
-DocType: GL Entry,Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ
+DocType: Bank Reconciliation,Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ಖಾತೆ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ
 DocType: Purchase Receipt,Range,ಶ್ರೇಣಿ
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Features Setup,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Address,Shop,ಅಂಗಡಿ
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 DocType: Employee,Permanent Address Is,ಖಾಯಂ ವಿಳಾಸ ಈಸ್
 DocType: Production Order Operation,Operation completed for how many finished goods?,ಆಪರೇಷನ್ ಎಷ್ಟು ಸಿದ್ಧಪಡಿಸಿದ ವಸ್ತುಗಳನ್ನು ಪೂರ್ಣಗೊಂಡಿತು?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ಬ್ರ್ಯಾಂಡ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ಬ್ರ್ಯಾಂಡ್
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}.
 DocType: Employee,Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,ಪರೋಕ್ಷ ಆದಾಯ
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ಹೊಂದಿಸಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು = ಬಾಕಿ ಮೊತ್ತದ
-DocType: Contact Us Settings,Address Line 1,ಲೈನ್ 1 ವಿಳಾಸ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ಕಂಪನಿ ಹೆಸರು
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
+,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ಎಲ್ಲಾ ಸಹಾಯ ವೀಡಿಯೊಗಳನ್ನು ಪಟ್ಟಿಯನ್ನು ವೀಕ್ಷಿಸಿ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ಬಳಕೆದಾರ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬೆಲೆ ಪಟ್ಟಿ ದರ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಿ
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Process Payroll,Select Payroll Year and Month,ವೇತನದಾರರ ವರ್ಷ ಮತ್ತು ತಿಂಗಳು ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ಸೂಕ್ತ ಗುಂಪು (ಸಾಮಾನ್ಯವಾಗಿ ಫಂಡ್ಸ್ ಅಪ್ಲಿಕೇಶನ್&gt; ಪ್ರಸಕ್ತ ಆಸ್ತಿಪಾಸ್ತಿಗಳು&gt; ಬ್ಯಾಂಕ್ ಖಾತೆಗಳ ಹೋಗಿ ರೀತಿಯ) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ &quot;ಬ್ಯಾಂಕ್&quot;
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
-DocType: Comment,Unsubscribed,ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್
 DocType: Opportunity,Walk In,ವಲ್ಕ್
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial ವೆಚ್ಚ ಕೇಂದ್ರದ ಟ್ರೀ .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,ವರ್ಗಾವಣೆಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ಬಿಳಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ಬಿಳಿ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,ನಿಮ್ಮ ಚಿತ್ರ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ಮಾಡಿ
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
-DocType: Workflow State,Stop,ನಿಲ್ಲಿಸಲು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ . ನೀವು ಉಳಿಸಿಲ್ಲ ಮಾಡಲಿಲ್ಲ ಒಂದು ಸಂಭಾವ್ಯ ಕಾರಣ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ support@erpnext.com ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,ನನ್ನ ಕಾರ್ಟ್
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ಆರ್ಡರ್ ಪ್ರಕಾರ ಒಂದು ಇರಬೇಕು {0}
 DocType: Lead,Next Contact Date,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,ಆರಂಭಿಕ ಪ್ರಮಾಣ
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},ಫಾರ್ ಪ್ರಮಾಣ {0}
 DocType: Leave Application,Leave Application,ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ಅಲೋಕೇಶನ್ ಉಪಕರಣ ಬಿಡಿ
 DocType: Leave Block List,Leave Block List Dates,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 DocType: Company,If Monthly Budget Exceeded (for expense account),ಮಾಸಿಕ ಬಜೆಟ್ (ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಗೆ) ಮೀರಿದ್ದಲ್ಲಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,ಚೂರನ್ನು
 DocType: Workstation,Net Hour Rate,ನೆಟ್ ಅವರ್ ದರ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ವೆಚ್ಚ ಖರೀದಿ ರಸೀತಿ ಇಳಿಯಿತು
 DocType: Company,Default Terms,ಡೀಫಾಲ್ಟ್ ನಿಯಮಗಳು
 DocType: Packing Slip Item,Packing Slip Item,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ ಐಟಂ
 DocType: POS Profile,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ಫೈಲಿಂಗ್
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ರಿಯಾಯಿತಿ
 DocType: Features Setup,Purchase Discounts,ರಿಯಾಯಿತಿಯು ಖರೀದಿಸಿ
 DocType: Workstation,Wages,ವೇತನ
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Issue,Issue,ಸಂಚಿಕೆ
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,ಖಾತೆ ಕಂಪನಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ವಿಪ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
 DocType: BOM Operation,Operation,ಆಪರೇಷನ್
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಬೈಯಿಂಗ್
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
 DocType: Item,Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ಪ್ರೊಡಕ್ಷನ್ ಸೇವನೆ ಶೇಕಡಾವಾರು ಓವರ್
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ಸರಾಸರಿ ವಯಸ್ಸು
 DocType: Opportunity,Your sales person who will contact the customer in future,ಭವಿಷ್ಯದಲ್ಲಿ ಗ್ರಾಹಕ ಸಂಪರ್ಕಿಸಿ ಯಾರು ನಿಮ್ಮ ಮಾರಾಟಗಾರನ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರ ಕೆಲವು ಪಟ್ಟಿ. ಅವರು ಸಂಸ್ಥೆಗಳು ಅಥವಾ ವ್ಯಕ್ತಿಗಳು ಆಗಿರಬಹುದು .
 DocType: Company,Default Currency,ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ
 DocType: Contact,Enter designation of this Contact,ಈ ಸಂಪರ್ಕಿಸಿ ಅಂಕಿತವನ್ನು ಯನ್ನು
-DocType: Contact Us Settings,Address,ವಿಳಾಸ
 DocType: Expense Claim,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
 DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate
 DocType: Appraisal Template Goal,Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,ಸಾರಿಗೆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ಸಾರಿಗೆ
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
 DocType: Email Digest,Annual Expense,ವಾರ್ಷಿಕ ಖರ್ಚು
 DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,ಸಿ ಆಕಾರ ಸರಕುಪಟ್ಟಿ ವಿವರ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ಪಾವತಿ ಸಾಮರಸ್ಯ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,ಕೊಡುಗೆ%
 DocType: Item,website page link,ವೆಬ್ಸೈಟ್ ಪುಟ ಲಿಂಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ಮೊದಲ ಬಳಕೆಗೆ ವ್ಯವಸ್ಥೆಯ ತಯಾರು ಮಾಡೋಣ.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,ನಿಮ್ಮ ಉಲ್ಲೇಖ ಕಂಪನಿ ನೋಂದಣಿ ಸಂಖ್ಯೆಗಳು . ತೆರಿಗೆ ಸಂಖ್ಯೆಗಳನ್ನು ಇತ್ಯಾದಿ
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,ಟೈಮ್ ದಾಖಲೆಗಳು ಆಯ್ಕೆ ಮತ್ತು ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ಸಲ್ಲಿಸಿ .
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಡ್ವಾನ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,ಮನವಿ ನಥಿಂಗ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,ಆಡಳಿತ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,ಆಡಳಿತ
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,ಟೈಮ್ ಹಾಳೆಗಳು ಚಟುವಟಿಕೆಗಳು ವಿಧಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ಹೂಡಿಕೆ ಎರಕದ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},ಡೆಬಿಟ್ ಅಥವಾ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣದ ಒಂದೋ ಅಗತ್ಯವಿದೆ {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,ಕ್ರಿಯಾಶೀಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ಬ್ಲೂ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ಬ್ಲೂ
 DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
 DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,ಮತ್ತಷ್ಟು ಗ್ರಂಥಿಗಳು ಮಾತ್ರ ' ಗ್ರೂಪ್ ' ರೀತಿಯ ನೋಡ್ಗಳನ್ನು ಅಡಿಯಲ್ಲಿ ರಚಿಸಬಹುದಾಗಿದೆ
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} ಈಗಾಗಲೇ ಬಳಕೆದಾರ ದಾಖಲಿಸಿದವರು: {1} ಮತ್ತು ಕಂಪನಿ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ಹೊದಿಸಿ ವಸ್ತು ತಯಾರಿಕಾ
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ರೂಪಿಸುವ ಸ್ಟ್ರೆಚ್
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ನಿಮ್ಮ ಮಾರಾಟಗಾರ ಗ್ರಾಹಕ ಸಂಪರ್ಕಿಸಿ ಈ ದಿನಾಂಕದಂದು ನೆನಪಿಸುವ ಪಡೆಯುತ್ತಾನೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ತೆರಿಗೆ ಮತ್ತು ಇತರ ಸಂಬಳ ನಿರ್ಣಯಗಳಿಂದ .
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
 DocType: Account,Warehouse,ಮಳಿಗೆ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 ,Purchase Order Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಖರೀದಿ ಆದೇಶವನ್ನು ಐಟಂಗಳು
 DocType: Purchase Invoice Item,Net Rate,ನೆಟ್ ದರ
 DocType: Purchase Invoice Item,Purchase Invoice Item,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಐಟಂ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಜಿಎಲ್ ನಮೂದುಗಳು ಆಯ್ಕೆ ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ಫಾರ್ ವರದಿ ಮಾಡಿದ್ದರೆ ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ಐಟಂ 1
 DocType: Holiday,Holiday,ಹಾಲಿಡೇ
-DocType: Event,Saturday,ಶನಿವಾರ
 DocType: Leave Control Panel,Leave blank if considered for all branches,ಎಲ್ಲಾ ಶಾಖೆಗಳನ್ನು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 ,Daily Time Log Summary,ದೈನಂದಿನ ಸಮಯ ಲಾಗಿನ್ ಸಾರಾಂಶ
-DocType: DocField,Label,ಚೀಟಿ
 DocType: Payment Reconciliation,Unreconciled Payment Details,ರಾಜಿಯಾಗದ ಪಾವತಿ ವಿವರಗಳು
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Lead,Call,ಕರೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ಗ್ರಿಡ್ """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ರಿಸರ್ಚ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ರಿಸರ್ಚ್
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Contact,User ID,ಬಳಕೆದಾರ ID
-DocType: Communication,Sent,ಕಳುಹಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
-DocType: Communication,Delivery Status,ಡೆಲಿವರಿ ಸ್ಥಿತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 DocType: Production Order,Manufacture against Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ತಯಾರಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,ಐಟಂ ವಿವರಣೆ
 DocType: Payment Tool,Payment Mode,ಪಾವತಿ ಮೋಡ್
 DocType: Purchase Invoice,Is Recurring,ಮರುಕಳಿಸುವ ಆಗಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,ನೇರ ಲೋಹದ ಲೇಸರ್ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 DocType: Purchase Order,Supplied Items,ವಿತರಿಸಿದ ವಸ್ತುಗಳನ್ನು
 DocType: Production Order,Qty To Manufacture,ತಯಾರಿಸಲು ಪ್ರಮಾಣ
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ಖರೀದಿ ಪ್ರಕ್ರಿಯೆಯ ಉದ್ದಕ್ಕೂ ಅದೇ ದರವನ್ನು ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Opportunity Item,Opportunity Item,ಅವಕಾಶ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ತಾತ್ಕಾಲಿಕ ಉದ್ಘಾಟನಾ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
 DocType: Address,Address Type,ವಿಳಾಸ ಪ್ರಕಾರ
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,ಸಣ್ಣ
 DocType: Employee,Employee Number,ನೌಕರರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ಕೇಸ್ ಇಲ್ಲ (ಗಳು) ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಪ್ರಕರಣ ಸಂಖ್ಯೆ ನಿಂದ ಪ್ರಯತ್ನಿಸಿ {0}
 ,Invoiced Amount (Exculsive Tax),ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ ( ತೆರಿಗೆ Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ಐಟಂ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,ಖಾತೆ ತಲೆ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ಹಸಿರು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ಹಸಿರು
 DocType: Item,Auto re-order,ಆಟೋ ಪುನಃ ಸಲುವಾಗಿ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,ಒಟ್ಟು ಸಾಧಿಸಿದ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,ಒಟ್ಟು ಸಾಧಿಸಿದ
 DocType: Employee,Place of Issue,ಸಂಚಿಕೆ ಪ್ಲೇಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
-DocType: Report,Disabled,ಅಂಗವಿಕಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ಒಪ್ಪಂದ
+DocType: Email Digest,Add Quote,ಉದ್ಧರಣ ಸೇರಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Journal Entry Account,Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ಹೆಸರು ಅಗತ್ಯವಿದೆ
 DocType: Purchase Invoice,Recurring Type,ಮರುಕಳಿಸುವ ಪ್ರಕಾರ
 DocType: Address,City/Town,ನಗರ / ಪಟ್ಟಣ
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,ಐಟಂ {0} ಒಂದು ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,ಸಲಕರಣಾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪ್ಲಾನ್ಡ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ಸರಬರಾಜುದಾರನ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ AccountType ವ್ಯವಹಾರಗಳಲ್ಲಿ ಈ ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡುತ್ತದೆ .
 DocType: Purchase Invoice,Grand Total (Company Currency),ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ಒಟ್ಟು ಹೊರಹೋಗುವ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","ಕೇವಲ "" ಮೌಲ್ಯವನ್ನು "" 0 ಅಥವಾ ಖಾಲಿ ಮೌಲ್ಯದೊಂದಿಗೆ ಒಂದು ಹಡಗು ರೂಲ್ ಕಂಡಿಶನ್ ಇಡಬಹುದು"
 DocType: Authorization Rule,Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ಗಮನಿಸಿ: ಈ ವೆಚ್ಚ ಸೆಂಟರ್ ಒಂದು ಗುಂಪು. ಗುಂಪುಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.
-apps/frappe/frappe/config/desk.py +7,Tools,ಪರಿಕರಗಳು
 DocType: Item,Website Item Groups,ವೆಬ್ಸೈಟ್ ಐಟಂ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶ ಸಂಖ್ಯೆ ಸ್ಟಾಕ್ ಪ್ರವೇಶ ಉದ್ದೇಶಕ್ಕಾಗಿ ತಯಾರಿಕೆಯಲ್ಲಿ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Total (Company Currency),ಒಟ್ಟು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
 DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ ಹೆಸರು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,ಪ್ರತಿಕ್ರಿಯೆಗಳು
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
 DocType: Quality Inspection Reading,Reading 8,8 ಓದುವಿಕೆ
 DocType: Sales Partner,Agent,ಏಜೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ನೀವು ಆಧರಿಸಿದೆ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು ಶೂನ್ಯವಾಗಿರುತ್ತದೆ
 DocType: Purchase Invoice,Taxes and Charges Calculation,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಲೆಕ್ಕಾಚಾರ
 DocType: BOM Operation,Workstation,ಕಾರ್ಯಸ್ಥಾನ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ಹಾರ್ಡ್ವೇರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ಡೇಟಾ ಇಲ್ಲ
 DocType: Appraisal Template Goal,Appraisal Template Goal,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಗೋಲ್
 DocType: Salary Slip,Earning,ಗಳಿಕೆ
 DocType: Payment Tool,Party Account Currency,ಪಕ್ಷದ ಖಾತೆ ಕರೆನ್ಸಿ
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,ನಡುವೆ ಕಂಡುಬರುವ ಅತಿಕ್ರಮಿಸುವ ಪರಿಸ್ಥಿತಿಗಳು :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,ಒಟ್ಟು ಆರ್ಡರ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,ಆಹಾರ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,ಆಹಾರ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,ನೀವು ಕೇವಲ ಒಂದು ಸಲ್ಲಿಸಿದ ಉತ್ಪಾದನೆ ಸಲುವಾಗಿ ವಿರುದ್ಧ ದಾಖಲೆ ಮಾಡಬಹುದು
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","ಸಂಪರ್ಕಗಳಿಗೆ ಸುದ್ದಿಪತ್ರಗಳು , ಕಾರಣವಾಗುತ್ತದೆ ."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ.
 ,Delivered Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ವಿತರಿಸಲಾಯಿತು ಐಟಂಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
-DocType: DocField,Description,ವಿವರಣೆ
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
-DocType: Letter Head,Is Default,ಡೀಫಾಲ್ಟ್
 DocType: Address,Utilities,ಉಪಯುಕ್ತತೆಗಳನ್ನು
 DocType: Purchase Invoice Item,Accounting,ಲೆಕ್ಕಪರಿಶೋಧಕ
 DocType: Features Setup,Features Setup,ವೈಶಿಷ್ಟ್ಯಗಳು ಸೆಟಪ್
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ವೀಕ್ಷಿಸಿ ಆಫರ್ ಲೆಟರ್
-DocType: Communication,Communication,ಸಂವಹನ
 DocType: Item,Is Service Item,ಸೇವೆ ಐಟಂ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Activity Cost,Projects,ಯೋಜನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},ಗೆ {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Leave Control Panel,Leave blank if considered for all designations,ಎಲ್ಲಾ ಅಂಕಿತಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,ಪಟ್ಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,ಹೊಸಗಸುಬಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,ಹೊಸಗಸುಬಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ಸ್ಟ್ರಿಂಗ್ ಐಟಂ ಮಾಸ್ಟರ್ ರಿಂದ ಗಳಿಸಿತು ಮತ್ತು ಈ ಕ್ಷೇತ್ರದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ತೆರಿಗೆ ವಿವರ ಟೇಬಲ್.
  ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಉಪಯೋಗಿಸಿದ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆ ಹೆಪ್ಪುಗಟ್ಟಿರುವ ವೇಳೆ , ನಮೂದುಗಳನ್ನು ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ಅವಕಾಶವಿರುತ್ತದೆ ."
 DocType: Email Digest,Bank Balance,ಬ್ಯಾಂಕ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,ಉದ್ಯೋಗಿ {0} ಮತ್ತು ತಿಂಗಳ ಕಂಡುಬಂದಿಲ್ಲ ಸಕ್ರಿಯ ಸಂಬಳ ರಚನೆ
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು , ಅಗತ್ಯ ವಿದ್ಯಾರ್ಹತೆಗಳು , ಇತ್ಯಾದಿ"
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
 DocType: Rename Tool,Type of document to rename.,ಬದಲಾಯಿಸಲು ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ .
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
 DocType: Address,Billing,ಬಿಲ್ಲಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,ಕಳುಹಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ರೂಪಿಸುವ ಸ್ಫೋಟಕ
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} ಸ್ವೀಕರಿಸುವವರಿಗೆ ಕಳುಹಿಸಲು ಪರಿಶಿಷ್ಟ
 DocType: Quality Inspection,Readings,ರೀಡಿಂಗ್ಸ್
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Supplier,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ವಿಶ್ಲೇಷಕ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಜಂಟಿ ಉದ್ಯಮ ಪ್ರಮಾಣದ ಸಮ ಮಾಡಬೇಕು {2}
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Features Setup,"To enable ""Point of Sale"" view",ವೀಕ್ಷಿಸಿ &quot;ಮಾರಾಟದ&quot; ಶಕ್ತಗೊಳಿಸಲು
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ಪಾವತಿ ಖಾಲಿ ಕಾರ್ಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ಪಿನ್ನಿಂಗ್
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ಸೇರಿಸಿ ಪ್ರಮಾಣ
 DocType: Notification Control,Expense Claim Rejected,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
 DocType: Item Attribute,Item Attribute,ಐಟಂ ಲಕ್ಷಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,ಸರ್ಕಾರ
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
 DocType: Company,Services,ಸೇವೆಗಳು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),ಒಟ್ಟು ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),ಒಟ್ಟು ({0})
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Invoice,Source,ಮೂಲ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ಹಣಕಾಸು ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Employee External Work History,Total Experience,ಒಟ್ಟು ಅನುಭವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ಸರಕು ಮತ್ತು ಸಾಗಣೆಯನ್ನು ಚಾರ್ಜಸ್
 DocType: Material Request Item,Sales Order No,ಮಾರಾಟದ ಆದೇಶ ಸಂಖ್ಯೆ
 DocType: Item Group,Item Group Name,ಐಟಂ ಗುಂಪು ಹೆಸರು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ಟೇಕನ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ಟೇಕನ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,ತಯಾರಿಕೆಗೆ ವರ್ಗಾವಣೆ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ಐಟಂ ಖರೀದಿ ದರ: {0} ಕಂಡುಬಂದಿಲ್ಲ, ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ (ಹೊಣೆಗಾರಿಕೆ) ಪುಸ್ತಕ ಬೇಕಾಗಿತ್ತು. ಒಂದು ಖರೀದಿಸುವ ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಐಟಂ ಬೆಲೆ ನೀಡಿರಿ."
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ದೋಷ : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ದೋಷ : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ಖಾತೆಗಳ ಚಾರ್ಟ್ ಹೊಸ ಖಾತೆಯನ್ನು ರಚಿಸಿ.
 DocType: Maintenance Visit,Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ಗ್ರಾಹಕ> ಗ್ರಾಹಕ ಗುಂಪಿನ> ಪ್ರದೇಶ
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 DocType: Time Log Batch Detail,Time Log Batch Detail,ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ವಿವರ
-DocType: Workflow State,Tasks,ಕಾರ್ಯಗಳನ್ನು
 DocType: Landed Cost Voucher,Landed Cost Help,ಇಳಿಯಿತು ವೆಚ್ಚ ಸಹಾಯ
-DocType: Event,Tuesday,ಮಂಗಳವಾರ
 DocType: Leave Block List,Block Holidays on important days.,ಪ್ರಮುಖ ದಿನಗಳಲ್ಲಿ ಬ್ಲಾಕ್ ರಜಾದಿನಗಳು.
 ,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ಈಗಾಗಲೇ ಅವಧಿಗೆ ನೌಕರರ {1} ಇರುವ ರೀತಿಯ {0} ಎಲೆಗಳು {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
 DocType: UOM,UOM Name,UOM ಹೆಸರು
-DocType: Top Bar Item,Target,ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,ಕೊಡುಗೆ ಪ್ರಮಾಣ
 DocType: Sales Invoice,Shipping Address,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,ಈ ಉಪಕರಣವನ್ನು ಅಪ್ಡೇಟ್ ಅಥವಾ ವ್ಯವಸ್ಥೆಯಲ್ಲಿ ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಮತ್ತು ಮೌಲ್ಯಮಾಪನ ಸರಿಪಡಿಸಲು ಸಹಾಯ. ಇದು ಸಾಮಾನ್ಯವಾಗಿ ವ್ಯವಸ್ಥೆಯ ಮೌಲ್ಯಗಳು ಮತ್ತು ವಾಸ್ತವವಾಗಿ ನಿಮ್ಮ ಗೋದಾಮುಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಸಿಂಕ್ರೊನೈಸ್ ಬಳಸಲಾಗುತ್ತದೆ.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ಫೈರ್ ಮಾಸ್ಟರ್ .
-DocType: ToDo,Due Date,ಕಾರಣ ದಿನಾಂಕ
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ಫೈರ್ ಮಾಸ್ಟರ್ .
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,ಪೆಟ್ಟಿಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,ಸಂಸ್ಥೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,ಪೆಟ್ಟಿಗೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,ಸಂಸ್ಥೆ
 DocType: Monthly Distribution,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
 DocType: Production Plan Sales Order,Production Plan Sales Order,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {1}
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ರೋ # {0}: ರಿಟರ್ನ್ಡ ಐಟಂ {1} ಅಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ಬ್ಯಾಂಕ್ ಖಾತೆಗಳು
 ,Bank Reconciliation Statement,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ಹೇಳಿಕೆ
 DocType: Address,Lead Name,ಲೀಡ್ ಹೆಸರು
 ,POS,ಪಿಓಎಸ್
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ಒಮ್ಮೆ ಮಾತ್ರ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ಹೆಚ್ಚು ವರ್ಗಾಯಿಸುವುದೇ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ {0} ಹೆಚ್ಚು {1} ಆರ್ಡರ್ ಖರೀದಿಸಿ ವಿರುದ್ಧ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},ಎಲೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ನಿಗದಿ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ಪ್ಯಾಕ್ ಯಾವುದೇ ಐಟಂಗಳು
 DocType: Shipping Rule Condition,From Value,FromValue
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ಬ್ಯಾಂಕ್ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ಬ್ಯಾಂಕ್ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,ಕೇಂದ್ರಾಪಗಾಮಿ ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,ಕಾಂತಕ್ಷೇತ್ರ ನೆರವಿನ ಸ್ಥಾನ
 DocType: Company,Default Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,ಸ್ಟಾಕ್ ಭಾದ್ಯತೆಗಳನ್ನು
 DocType: Purchase Receipt,Supplier Warehouse,ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
 DocType: Opportunity,Contact Mobile No,ಸಂಪರ್ಕಿಸಿ ಮೊಬೈಲ್ ನಂ
 DocType: Production Planning Tool,Select Sales Orders,ಆಯ್ಕೆ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್
 ,Material Requests for which Supplier Quotations are not created,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,ಬಾರ್ಕೋಡ್ ಐಟಂಗಳನ್ನು ಟ್ರ್ಯಾಕ್ . ನೀವು ಐಟಂ ಬಾರ್ಸಂಕೇತವನ್ನು ಸ್ಕ್ಯಾನ್ ಮೂಲಕ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಮತ್ತು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿ ಸಾಧ್ಯವಾಗುತ್ತದೆ .
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,ಮಾರ್ಕ್ ತಲುಪಿಸಿದರು
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ವೀಕ್ಷಿಸಿ
 DocType: Salary Structure Deduction,Salary Structure Deduction,ಸಂಬಳ ರಚನೆ ಕಳೆಯುವುದು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,ಆಯ್ದ ಲೇಸರ್ ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,ಯಶಸ್ವಿಯಾಗಿ ಆಮದು !
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
 DocType: Quotation Item,Quotation Item,ನುಡಿಮುತ್ತುಗಳು ಐಟಂ
 DocType: Account,Account Name,ಖಾತೆ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,ದಿನಾಂಕದಿಂದ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಪ್ರಮಾಣ {1} ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ಸರಬರಾಜುದಾರ ಟೈಪ್ ಮಾಸ್ಟರ್ .
 DocType: Purchase Order Item,Supplier Part Number,ಸರಬರಾಜುದಾರ ಭಾಗ ಸಂಖ್ಯೆ
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,ಸೇರಿಸು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,ಪರಿವರ್ತನೆ ದರವು 0 ಅಥವಾ 1 ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
 DocType: Accounts Settings,Credit Controller,ಕ್ರೆಡಿಟ್ ನಿಯಂತ್ರಕ
 DocType: Delivery Note,Vehicle Dispatch Date,ವಾಹನ ಡಿಸ್ಪ್ಯಾಚ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,ಖರೀದಿ ರಸೀತಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Company,Default Payable Account,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ಉದಾಹರಣೆಗೆ ಹಡಗು ನಿಯಮಗಳು, ಬೆಲೆ ಪಟ್ಟಿ ಇತ್ಯಾದಿ ಆನ್ಲೈನ್ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,ಸೆಟಪ್ ಕಂಪ್ಲೀಟ್
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Party Account,Party Account,ಪಕ್ಷದ ಖಾತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Lead,Upper Income,ಮೇಲ್ ವರಮಾನ
 DocType: Journal Entry Account,Debit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಡೆಬಿಟ್
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ನನ್ನ ತೊಂದರೆಗಳು
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,ಪ್ರೆಸ್ ಬಿಗಿಯಾದ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Payments,ಪಾವತಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,ಒತ್ತುವ ಬಿಸಿ ಸಮಸ್ಥಿತಿಯ
-DocType: ToDo,Medium,ಮಧ್ಯಮ
 DocType: Budget Detail,Budget Allocated,ನಿಗದಿ ಮಾಡಿದ ಮುಂಗಡಪತ್ರ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
 DocType: Quotation,Term Details,ಟರ್ಮ್ ವಿವರಗಳು
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ದಿನಗಳು) ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
 DocType: Warranty Claim,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 ,Lead Details,ಲೀಡ್ ವಿವರಗಳು
-DocType: Authorization Rule,Approving User,ಅಂಗೀಕಾರಕ್ಕಾಗಿ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ಮುನ್ನುಗ್ಗುತ್ತಿವೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,ಲೋಹಲೇಪ
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Pricing Rule,Applicable For,ಜ
 DocType: Bank Reconciliation,From Date,Fromdate
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ಆನ್ಲೈನ್ ಹರಾಜಿನಲ್ಲಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯಾಂಕನ ದರ ಅಥವಾ ಎರಡೂ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ಕಂಪನಿ , ತಿಂಗಳ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷ ಕಡ್ಡಾಯ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ {0} ' ಸಲ್ಲಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ಪ್ರತಿ ಸ್ಟಾಕ್ ಚಳುವಳಿ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Leave Allocation,Total Leaves Allocated,ನಿಗದಿ ಒಟ್ಟು ಎಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},ರೋ ಯಾವುದೇ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,ಮಾನ್ಯ ಹಣಕಾಸು ವರ್ಷದ ಆರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕ ನಮೂದಿಸಿ
 DocType: Employee,Date Of Retirement,ನಿವೃತ್ತಿ ದಿನಾಂಕ
 DocType: Upload Attendance,Get Template,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
 DocType: Address,Postal,ಅಂಚೆಯ
 DocType: Item,Weightage,weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,ಮೈನಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ರಾಳದ ಎರಕದ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ಪಠ್ಯ {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},ಪಠ್ಯ {0}
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
 DocType: Stock Entry,Material Receipt,ಮೆಟೀರಿಯಲ್ ರಸೀತಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ಉತ್ಪನ್ನಗಳು
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ಈ ಐಟಂ ವೇರಿಯಂಟ್, ಅದು ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಇತ್ಯಾದಿ ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Lead,Next Contact By,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},ಪ್ರಮಾಣ ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ {0} ಅಳಿಸಲಾಗಿಲ್ಲ {1}
 DocType: Quotation,Order Type,ಆರ್ಡರ್ ಪ್ರಕಾರ
 DocType: Purchase Invoice,Notification Email Address,ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು
 DocType: Payment Tool,Find Invoices to Match,ಪಂದ್ಯಕ್ಕೆ ಇನ್ವಾಯ್ಸ್ಗಳು ಹುಡುಕಿ
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ಉದಾಹರಣೆಗೆ ""XYZ ನ್ಯಾಷನಲ್ ಬ್ಯಾಂಕ್ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ಉದಾಹರಣೆಗೆ ""XYZ ನ್ಯಾಷನಲ್ ಬ್ಯಾಂಕ್ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ಈ ಮೂಲ ದರದ ತೆರಿಗೆ ಒಳಗೊಂಡಿದೆ?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಲಾಗುವುದು
 DocType: Job Applicant,Applicant for a Job,ಒಂದು ಜಾಬ್ ಅರ್ಜಿದಾರರ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,ದಾಖಲಿಸಿದವರು ಯಾವುದೇ ನಿರ್ಮಾಣ ಆದೇಶಗಳನ್ನು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ಉದ್ಯೋಗಿ ಸಂಬಳದ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ತಿಂಗಳ ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,ಉದ್ಯೋಗಿ ಸಂಬಳದ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ತಿಂಗಳ ದಾಖಲಿಸಿದವರು
 DocType: Stock Reconciliation,Reconciliation JSON,ಸಾಮರಸ್ಯ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Sales Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,ಮುಖ್ಯ
-DocType: DocPerm,Delete,ಅಳಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ಭಿನ್ನ
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ಹೊಸ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ನಿಲ್ಲಿಸಿತು ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ . ರದ್ದು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
 DocType: Sales Team,Contribution to Net Total,ನೆಟ್ ಒಟ್ಟು ಕೊಡುಗೆ
 DocType: Sales Invoice Item,Customer's Item Code,ಗ್ರಾಹಕರ ಐಟಂ ಕೋಡ್
 DocType: Stock Reconciliation,Stock Reconciliation,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,ಕೆಲಸ ಸಂ .
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
-DocType: Country,Country,ದೇಶ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ವಿಳಾಸಗಳು
-DocType: Communication,Received,ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ಐಟಂ ಪ್ರವೇಶಿಸಿತು ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ನಕಲು {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ಒಂದು ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ಸ್ಥಿತಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,ಐಟಂ ಪ್ರೊಡಕ್ಷನ್ ಕ್ರಮಕ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
-DocType: DocField,Attach Image,ಚಿತ್ರ ಲಗತ್ತಿಸಿ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ಈ ಪ್ಯಾಕೇಜ್ ನಿವ್ವಳ ತೂಕ . ( ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲ ಐಟಂಗಳನ್ನು ನಿವ್ವಳ ತೂಕ ಮೊತ್ತ ಎಂದು )
-DocType: Stock Reconciliation Item,Leave blank if no change,ಯಾವುದೇ ಬದಲಾವಣೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 DocType: Sales Order,To Deliver and Bill,ತಲುಪಿಸಿ ಮತ್ತು ಬಿಲ್
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ಉತ್ಪಾದನೆ ಸಮಯ ದಾಖಲೆಗಳು.
 DocType: Item,Apply Warehouse-wise Reorder Level,ವೇರ್ಹೌಸ್ ಬಲ್ಲ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಅರ್ಜಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,ಕಾರ್ಯಗಳಿಗಾಗಿ ಟೈಮ್ ಲಾಗ್ .
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ಪಾವತಿ
 DocType: Production Order Operation,Actual Time and Cost,ನಿಜವಾದ ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ಗರಿಷ್ಠ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ಐಟಂ {1} {2} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Employee,Salutation,ವಂದನೆ
-DocType: Communication,Rejected,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
 DocType: Pricing Rule,Brand,ಬೆಂಕಿ
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
 DocType: Sales Order Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
 DocType: Quality Inspection Reading,Reading 10,10 ಓದುವಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಸೇವೆಗಳು ಪಟ್ಟಿ .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟ ಸೇವೆಗಳು ಪಟ್ಟಿ .
 DocType: Hub Settings,Hub Node,ಹಬ್ ನೋಡ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,ನೀವು ನಕಲಿ ಐಟಂಗಳನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ನಿವಾರಿಸಿಕೊಳ್ಳಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,ಮೌಲ್ಯ {0} ವೈಶಿಷ್ಟ್ಯದ {1} ಮಾನ್ಯ ಐಟಂ ಪಟ್ಟಿಯಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ವೈಶಿಷ್ಟ್ಯದ ಮೌಲ್ಯಗಳನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,ಜತೆಗೂಡಿದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ಜತೆಗೂಡಿದ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,ಅವಧಿ
 DocType: Packing Slip,To Package No.,ನಂ ಕಟ್ಟಿನ
-DocType: DocType,System,ವ್ಯವಸ್ಥೆ
 DocType: Warranty Claim,Issue Date,ಸಂಚಿಕೆ ದಿನಾಂಕ
 DocType: Activity Cost,Activity Cost,ಚಟುವಟಿಕೆ ವೆಚ್ಚ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ಸೇವಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ದೂರಸಂಪರ್ಕ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ದೂರಸಂಪರ್ಕ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 DocType: Payment Tool,Make Payment Entry,ಪಾವತಿ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
 ,Sales Invoice Trends,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Leave Application,Apply / Approve Leaves,ಎಲೆಗಳು ಅನುಮೋದಿಸಿ / ಅನ್ವಯಿಸು
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ಫಾರ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ಬ್ಯಾಚ್ ಮಾದರಿ ಅಥವಾ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ' ' ಹಿಂದಿನ ರೋ ಪ್ರಮಾಣ ರಂದು ' ಮಾತ್ರ ಸಾಲು ಉಲ್ಲೇಖಿಸಬಹುದು
 DocType: Sales Order Item,Delivery Warehouse,ಡೆಲಿವರಿ ವೇರ್ಹೌಸ್
 DocType: Stock Settings,Allowance Percent,ಭತ್ಯೆ ಪರ್ಸೆಂಟ್
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ವಿಕ್ರಯ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಐಟಂ
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ಸಂಬಳ ರಚನೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ಕತ್ತರಿಸುವುದು
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ರಚಿಸಲು ' ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ ' ಗುಂಡಿಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ಪ್ಯಾಕೇಜ್ ಮತ್ತು ಲೇಬಲಿಂಗ್
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,ಕಂಪನಿ ಮಾಸ್ಟರ್ ಮತ್ತು ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
-DocType: Dropbox Backup,Dropbox Access Secret,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ ಸೀಕ್ರೆಟ್
 DocType: Purchase Invoice,Recurring Invoice,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Supplier,Supplier of Goods or Services.,ಸರಕುಗಳು ಅಥವಾ ಸೇವೆಗಳ ಪೂರೈಕೆದಾರ.
 DocType: Budget Detail,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Cost Center,Budget,ಮುಂಗಡಪತ್ರ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,ಸಾಧಿಸಿದ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ಸಾಧಿಸಿದ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ಇ ಜಿ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಬಾಕಿ ಮೊತ್ತದ ಸರಕುಪಟ್ಟಿ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,ಇ ಜಿ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಬಾಕಿ ಮೊತ್ತದ ಸರಕುಪಟ್ಟಿ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ನೀವು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Item,Is Sales Item,ಮಾರಾಟದ ಐಟಂ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,ಐಟಂ ಗುಂಪು ಟ್ರೀ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಐಟಂ ಮಾಸ್ಟರ್ ಪರಿಶೀಲಿಸಿ
 DocType: Maintenance Visit,Maintenance Time,ನಿರ್ವಹಣೆ ಟೈಮ್
 ,Amount to Deliver,ಪ್ರಮಾಣವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ ಸೇವೆ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,ದೋಷಗಳು ಇದ್ದವು.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ಟ್ಯಾಪಿಂಗ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ ಸೇವೆ
 DocType: Naming Series,Current Value,ಪ್ರಸ್ತುತ ಮೌಲ್ಯ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ದಾಖಲಿಸಿದವರು
 DocType: Delivery Note Item,Against Sales Order,ಮಾರಾಟದ ಆದೇಶದ ವಿರುದ್ಧ
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Website Item Group,Website Item Group,ಐಟಂ ಗ್ರೂಪ್ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ಪಾವತಿ ನಮೂದುಗಳನ್ನು ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ವೆಬ್ ಸೈಟ್ ತೋರಿಸಲಾಗುತ್ತದೆ ಎಂದು ಐಟಂ ಟೇಬಲ್
 DocType: Purchase Order Item Supplied,Supplied Qty,ಸರಬರಾಜು ಪ್ರಮಾಣ
 DocType: Material Request Item,Material Request Item,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಐಟಂ
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,ಐಟಂ ಗುಂಪುಗಳು ಟ್ರೀ .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,ಐಟಂ ಗುಂಪುಗಳು ಟ್ರೀ .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 ,Item-wise Purchase History,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ಕೆಂಪು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ಕೆಂಪು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ರೋ # {0}: ಆಪರೇಷನ್ {1} ಉತ್ಪಾದನೆ ತಯಾರಾದ ಸರಕುಗಳ {2} ಪ್ರಮಾಣ ಫಾರ್ ಪೂರ್ಣಗೊಳಿಸಿಲ್ಲ ಆರ್ಡರ್ # {3}. ಟೈಮ್ ದಾಖಲೆಗಳು ಮೂಲಕ ಕಾರ್ಯಾಚರಣೆ ಸ್ಥಿತಿ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,ಐಟಂ UOM ಬದಲಿಸಿ .
 DocType: Quality Inspection Reading,Acceptance Criteria,ಒಪ್ಪಿಕೊಳ್ಳುವ ಅಳತೆಗೋಲುಗಳನ್ನು
 DocType: Item Attribute,Attribute Name,ಹೆಸರು ಕಾರಣವಾಗಿದ್ದು
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},ಐಟಂ {0} ನಲ್ಲಿ ಮಾರಾಟ ಅಥವಾ ಸೇವೆ ಐಟಂ ಇರಬೇಕು {1}
 DocType: Item Group,Show In Website,ವೆಬ್ಸೈಟ್ ಹೋಗಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,ಗುಂಪು
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,ಗುಂಪು
 DocType: Task,Expected Time (in hours),(ಗಂಟೆಗಳಲ್ಲಿ) ನಿರೀಕ್ಷಿತ ಸಮಯ
 ,Qty to Order,ಪ್ರಮಾಣ ಆರ್ಡರ್
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","ಕೆಳಗಿನ ದಾಖಲೆಗಳನ್ನು ಡೆಲಿವರಿ ಗಮನಿಸಿ, ಅವಕಾಶ, ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ, ಐಟಂ, ಆರ್ಡರ್ ಖರೀದಿಸಿ, ಖರೀದಿ ಚೀಟಿ, ಖರೀದಿದಾರ ರಸೀತಿ, ಉದ್ಧರಣ, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ, ಉತ್ಪನ್ನ ಕಟ್ಟು, ಮಾರಾಟದ ಆರ್ಡರ್, ಸೀರಿಯಲ್ ಯಾವುದೇ ಬ್ರ್ಯಾಂಡ್ ಹೆಸರಿನ ಟ್ರ್ಯಾಕ್"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,ತೆರವುಗೊಳಿಸಿ ಟೇಬಲ್
 DocType: Features Setup,Brands,ಬ್ರಾಂಡ್ಸ್
 DocType: C-Form Invoice Detail,Invoice No,ಸರಕುಪಟ್ಟಿ ನಂ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಗೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ, ಮೊದಲು {0} ರದ್ದು / ಅನ್ವಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {1}"
 DocType: Activity Cost,Costing Rate,ಕಾಸ್ಟಿಂಗ್ ದರ
 ,Customer Addresses And Contacts,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: Employee,Resignation Letter Date,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ಹೊಂದಿಸಿ
-DocType: Communication,Date,ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ಪುನರಾವರ್ತಿತ ಗ್ರಾಹಕ ಕಂದಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಸೆಟಪ್ ಬಂದಿದ್ದರೂ ಜಾಗ್ರತರಾಗಿ . ಈ ಜೂನ್ ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,ಜೋಡಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,ಜೋಡಿ
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 DocType: Maintenance Schedule Detail,Actual Date,ನಿಜವಾದ ದಿನಾಂಕ
 DocType: Item,Has Batch No,ಬ್ಯಾಚ್ ನಂ ಹೊಂದಿದೆ
 DocType: Delivery Note,Excise Page Number,ಅಬಕಾರಿ ಪುಟ ಸಂಖ್ಯೆ
 DocType: Employee,Personal Details,ವೈಯಕ್ತಿಕ ವಿವರಗಳು
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ಉಬ್ಬು
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈ ಐಟಂ ಮಾಡಬಹುದು ಎಂದು, ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು ."
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ಸೇರುವ
-DocType: Authorization Rule,Above Value,ಮೌಲ್ಯದ ಮೇಲೆ
 ,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
 DocType: Purchase Order,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),ಉದ್ಯೋಗಗಳು ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು {0} ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು {1} ಹೆಚ್ಚು
 DocType: Journal Entry,Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು
 ,Supplier-Wise Sales Analytics,ಸರಬರಾಜುದಾರ ವೈಸ್ ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Address Template,This format is used if country specific format is not found,ದೇಶದ ನಿರ್ದಿಷ್ಟ ಸ್ವರೂಪ ದೊರೆಯಲಿಲ್ಲ ವೇಳೆ ಈ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿದಾಗ
-DocType: Custom Field,Custom,ಪದ್ಧತಿ
 DocType: Production Order,Use Multi-Level BOM,ಬಹು ಮಟ್ಟದ BOM ಬಳಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ಅಚ್ಚೊತ್ತುವಿಕೆ
 DocType: Bank Reconciliation,Include Reconciled Entries,ಮರುಕೌನ್ಸಿಲ್ ನಮೂದುಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial ಖಾತೆಗಳ ಟ್ರೀ .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,ಎಲ್ಲಾ ನೌಕರ ರೀತಿಯ ಪರಿಗಣಿಸಲಾಗಿದೆ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲು ಆರೋಪಗಳ ಮೇಲೆ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,ಐಟಂ {1} ಆಸ್ತಿ ಐಟಂ ಖಾತೆ {0} ಬಗೆಯ ' ಸ್ಥಿರ ಆಸ್ತಿ ' ಇರಬೇಕು
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/frappe/frappe/config/setup.py +130,Printing,ಮುದ್ರಣ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾ ಇವೆ . ನೀವು ಬಿಟ್ಟು ಅರ್ಜಿ ಅಗತ್ಯವಿದೆ .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ಮತ್ತು
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,ಕ್ರೀಡೆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,ಘಟಕ
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,ನಿಮ್ಮ ಸೈಟ್ ಸಂರಚನಾ ಡ್ರಾಪ್ಬಾಕ್ಸ್ accesskeys ಸೆಟ್ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,ಘಟಕ
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 ,Customer Acquisition and Loyalty,ಗ್ರಾಹಕ ಸ್ವಾಧೀನ ಮತ್ತು ನಿಷ್ಠೆ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,ನೀವು ತಿರಸ್ಕರಿಸಿದರು ಐಟಂಗಳ ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು ಅಲ್ಲಿ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
 DocType: POS Profile,Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
-DocType: Authorization Rule,Approving Role,ಅಂಗೀಕಾರಕ್ಕಾಗಿ ಪಾತ್ರ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
 DocType: Workstation,Wages per hour,ಗಂಟೆಗೆ ವೇತನ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},ಬ್ಯಾಚ್ ಸ್ಟಾಕ್ ಸಮತೋಲನ {0} ಪರಿಣಮಿಸುತ್ತದೆ ಋಣಾತ್ಮಕ {1} ಕೋಠಿಯಲ್ಲಿ ಐಟಂ {2} ಫಾರ್ {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","ಇತ್ಯಾದಿ ಸೀರಿಯಲ್ ಸೂಲ , ಪಿಓಎಸ್ ಹಾಗೆ ತೋರಿಸು / ಮರೆಮಾಡು ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ದಿನಾಂಕ ಸತತವಾಗಿ ಚೆಕ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ದಿನಾಂಕ ಸತತವಾಗಿ ಚೆಕ್ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Salary Slip,Deduction,ವ್ಯವಕಲನ
 DocType: Address Template,Address Template,ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,ಉದ್ಧರಣ
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Quotation,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,ಐಟಂ {0} ಈಗಾಗಲೇ ಮರಳಿದರು
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ಹಣಕಾಸಿನ ವರ್ಷ ** ಒಂದು ಹಣಕಾಸು ವರ್ಷದ ಪ್ರತಿನಿಧಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಲೆಕ್ಕ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಇತರ ಪ್ರಮುಖ ವ್ಯವಹಾರಗಳ ** ** ಹಣಕಾಸಿನ ವರ್ಷ ವಿರುದ್ಧ ಕಂಡುಕೊಳ್ಳಲಾಯಿತು.
 DocType: Opportunity,Customer / Lead Address,ಗ್ರಾಹಕ / ಲೀಡ್ ವಿಳಾಸ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,ಜಾಬ್ ವಿವರಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,ಜಾಬ್ ವಿವರಣೆ
 DocType: Purchase Order Item,Qty as per Stock UOM,ಪ್ರಮಾಣ ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,ದತ್ತಾಂಶ ಮಾನ್ಯ CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,ಲೇಪನ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ. 
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ಮಾರಾಟದ ಶಿಬಿರಗಳು ಟ್ರ್ಯಾಕ್. ಲೀಡ್ಸ್ ಉಲ್ಲೇಖಗಳು ಜಾಡನ್ನು ಮಾರಾಟದ ಆರ್ಡರ್ ಇತ್ಯಾದಿ ಶಿಬಿರಗಳು ರಿಂದ ಹೂಡಿಕೆ ಮೇಲೆ ರಿಟರ್ನ್ ಅಳೆಯುವ.
 DocType: Expense Claim,Approver,ಅನಪುಮೋದಕ
 ,SO Qty,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಗೋದಾಮಿನ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ {0}, ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ವೇರ್ಹೌಸ್ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Appraisal,Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ
 DocType: Supplier Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
-apps/erpnext/erpnext/hooks.py +84,Shipments,ಸಾಗಣೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,ಅದ್ದು ಸೂರು
-DocType: Purchase Order,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
+apps/erpnext/erpnext/hooks.py +68,Shipments,ಸಾಗಣೆಗಳು
+DocType: Purchase Order Item,To be delivered to customer,ಗ್ರಾಹಕನಿಗೆ ನೀಡಬೇಕಾಗಿದೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ಟೈಮ್ ಲಾಗ್ ಸ್ಥಿತಿ ಸಲ್ಲಿಸಬೇಕು.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ಸೀರಿಯಲ್ ಯಾವುದೇ {0} ಯಾವುದೇ ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ರೋ #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ರೋ #
 DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ
 DocType: Pricing Rule,Supplier,ಸರಬರಾಜುದಾರ
 DocType: C-Form,Quarter,ಕಾಲು ಭಾಗ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ವಿವಿಧ ಖರ್ಚುಗಳು
 DocType: Global Defaults,Default Company,ಡೀಫಾಲ್ಟ್ ಕಂಪನಿ
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
 DocType: Employee,Bank Name,ಬ್ಯಾಂಕ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ಬಳಕೆದಾರ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Leave Application,Total Leave Days,ಒಟ್ಟು ರಜೆಯ ದಿನಗಳಲ್ಲಿ
-DocType: Journal Entry Account,Credit in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Email Digest,Note: Email will not be sent to disabled users,ಗಮನಿಸಿ : ಇಮೇಲ್ ಅಂಗವಿಕಲ ಬಳಕೆದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
-DocType: DocField,Name,ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,ವ್ಯವಸ್ಥೆಯ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,ವ್ಯವಸ್ಥೆಯ ಕಾಣಿಸಿಕೊಂಡಿಲ್ಲ ಪ್ರಮಾಣದ
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,ಇತರೆ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ಒಂದು ಉತ್ಪನ್ನ ಅಥವಾ, ಖರೀದಿಸಿತು ಮಾರಾಟ ಅಥವಾ ಸ್ಟಾಕ್ ಇಟ್ಟುಕೊಂಡು ಒಂದು ಸೇವೆ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,ಪೂರ್ಣಗೊಂಡಿದೆ
-DocType: Web Form,Select DocType,ಆಯ್ಕೆ doctype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,ವೇಳಾಪಟ್ಟಿ ಪಡೆಯಲು ' ರಚಿಸಿ ವೇಳಾಪಟ್ಟಿ ' ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Bin,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
 DocType: Quality Inspection,In Process,ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ
 DocType: Authorization Rule,Itemwise Discount,Itemwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Order Item,Reference Document Type,ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: Account,Fixed Asset,ಸ್ಥಿರಾಸ್ತಿ
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,ಧಾರಾವಾಹಿಯಾಗಿ ಇನ್ವೆಂಟರಿ
 DocType: Activity Type,Default Billing Rate,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
 DocType: Time Log Batch,Total Billing Amount,ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,ಟೈಮ್ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Employee,Blood Group,ರಕ್ತ ಗುಂಪು
 DocType: Purchase Invoice Item,Page Break,ಪುಟ ಬ್ರೇಕ್
 DocType: Production Order Operation,Pending,ಬಾಕಿ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ನಿರ್ದಿಷ್ಟ ನೌಕರನ ರಜೆ ಅನ್ವಯಗಳನ್ನು ಒಪ್ಪಿಗೆ ಬಳಕೆದಾರರು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,ನೀವು ಭಿನ್ನ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಿಸಲಾಗುವುದಿಲ್ಲ. ಟೆಂಪ್ಲೇಟು ಭಿನ್ನ ಬದಲಾವಣೆ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಾಯಿಸಲು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,ಕಚೇರಿ ಉಪಕರಣ
 DocType: Purchase Invoice Item,Qty,ಪ್ರಮಾಣ
 DocType: Fiscal Year,Companies,ಕಂಪನಿಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,ಇಲೆಕ್ಟ್ರಾನಿಕ್ ಶಾಸ್ತ್ರ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,ಇಲೆಕ್ಟ್ರಾನಿಕ್ ಶಾಸ್ತ್ರ
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ಸ್ಟಾಕ್ ಮತ್ತೆ ಸಲುವಾಗಿ ಮಟ್ಟ ತಲುಪಿದಾಗ ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ರೈಸ್
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,ಪೂರ್ಣ ಬಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,ಪೂರ್ಣ ಬಾರಿ
 DocType: Purchase Invoice,Contact Details,ಸಂಪರ್ಕ ವಿವರಗಳು
 DocType: C-Form,Received Date,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ದಿನಾಂಕ
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","ನೀವು ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಮಾದರಿಯಲ್ಲಿ ಸೃಷ್ಟಿಸಿದ್ದರೆ, ಒಂದು ಆಯ್ಕೆ ಮತ್ತು ಕೆಳಗಿನ ಬಟನ್ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,ಉದ್ಯೋಗಾವಕಾಶದ
 DocType: Payment Reconciliation,Payment Reconciliation,ಪಾವತಿ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
 DocType: Offer Letter,Offer Letter,ಪತ್ರ ನೀಡಲು
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ( MRP ) ಮತ್ತು ಉತ್ಪಾದನೆ ಮುಖಾಂತರವೇ .
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
 DocType: Time Log,To Time,ಸಮಯ
+DocType: Authorization Rule,Approving Role (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಪಾತ್ರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","ChildNodes ಸೇರಿಸಲು, ಮರ ಅನ್ವೇಷಿಸಲು ಮತ್ತು ನೀವು ಹೆಚ್ಚು ಗ್ರಂಥಿಗಳು ಸೇರಿಸಲು ಬಯಸುವ ಯಾವ ನೋಡ್ ಅನ್ನು ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Production Order Operation,Completed Qty,ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,ಗ್ರಾಹಕ ಐಟಂ ಕೋಡ್ಸ್
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ಆದೇಶ ಅಥವಾ ಇನ್ವಾಯ್ಸ್ ವಿರುದ್ಧ ಪಾವತಿ ನಮೂದುಗಳು ರಚಿಸಿ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ವೆಲ್ಡಿಂಗ್
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,ಹೊಸ ಸ್ಟಾಕ್ UOM ಅಗತ್ಯವಿದೆ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ಮಾನ್ಯ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು ' ಕೇಸ್ ನಂ ಗೆ . '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
 DocType: Features Setup,Item Serial Nos,ಐಟಂ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,ಸಂಕೋಚನ ಸೂರು
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
 ,Bank Clearance Summary,ಬ್ಯಾಂಕ್ ಕ್ಲಿಯರೆನ್ಸ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","ರಚಿಸಿ ಮತ್ತು , ದೈನಂದಿನ ಸಾಪ್ತಾಹಿಕ ಮತ್ತು ಮಾಸಿಕ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ನಿರ್ವಹಿಸಿ ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,ಐಟಂ ಕೋಡ್> ಐಟಂ ಗುಂಪು> ಬ್ರ್ಯಾಂಡ್
 DocType: Appraisal Goal,Appraisal Goal,ಅಪ್ರೇಸಲ್ ಗೋಲ್
-DocType: Event,Friday,ಶುಕ್ರವಾರ
 DocType: Time Log,Costing Amount,ವೆಚ್ಚದ ಪ್ರಮಾಣ
 DocType: Process Payroll,Submit Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ
 DocType: Salary Structure,Monthly Earning & Deduction,ಮಾಸಿಕ ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ದೊಡ್ಡ ಆಮದು
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: SMS Log,Sender Name,ಹೆಸರು
-DocType: Page,Title,ಶೀರ್ಷಿಕೆ
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ಕಸ್ಟಮೈಸ್
 DocType: POS Profile,[Select],[ ಆರಿಸಿರಿ ]
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣ
 DocType: Manufacturing Settings,Capacity Planning,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
 DocType: Journal Entry,Reference Number,ಉಲ್ಲೇಖ ಸಂಖ್ಯೆ
 DocType: Employee,Employment Details,ಉದ್ಯೋಗದ ವಿವರಗಳು
 DocType: Employee,New Workplace,ಹೊಸ ಕೆಲಸದ
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ಓಡಾಡು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ಓಡಾಡು
 DocType: Leave Block List,Allow Users,ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ
 DocType: Purchase Order,Customer Mobile No,ಗ್ರಾಹಕ ಮೊಬೈಲ್ ಯಾವುದೇ
 DocType: Sales Invoice,Recurring,ಮರುಕಳಿಸುವ
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
 DocType: Installation Note,Installation Note,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
 ,Financial Analytics,ಹಣಕಾಸು ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 DocType: Address,Subsidiary,ಸಹಕಾರಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
 DocType: Quality Inspection,Purchase Receipt No,ಖರೀದಿ ರಸೀತಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ಅರ್ನೆಸ್ಟ್ ಮನಿ
-DocType: System Settings,In Hours,ಗಂಟೆಗಳ
 DocType: Process Payroll,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ಬ್ಯಾಂಕ್ ಪ್ರಕಾರ ನಿರೀಕ್ಷಿಸಲಾಗಿದೆ ಸಮತೋಲನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ಬ್ಯಾಂಕ್ ಪ್ರಕಾರ ನಿರೀಕ್ಷಿಸಲಾಗಿದೆ ಸಮತೋಲನ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ಗಳಂತಹವು ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
 DocType: Appraisal,Employee,ನೌಕರರ
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ಚೀಟಿ ಮೂಲಕ ಗುಂಪು
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Sales Invoice,Mass Mailing,ಸಾಮೂಹಿಕ ಮೇಲಿಂಗ್
-DocType: Page,Standard,ಸ್ಟ್ಯಾಂಡರ್ಡ್
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ಶೋ ಪಾವತಿಗಳು
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ಗಾತ್ರ
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ಔಷಧೀಯ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,ಔಷಧೀಯ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ಖರೀದಿಸಿದ ವಸ್ತುಗಳ ವೆಚ್ಚ
 DocType: Selling Settings,Sales Order Required,ಮಾರಾಟದ ಆದೇಶ ಅಗತ್ಯವಿರುವ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ಗ್ರಾಹಕ ರಚಿಸಿ
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 ಓದುವಿಕೆ
 DocType: Supplier,Is Frozen,ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Buying Settings,Buying Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖರೀದಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ಮಾಸ್ ಸ್ಥಾನ
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ಯಾವುದೇ BOM . ಒಂದು ಮುಕ್ತಾಯಗೊಂಡ ಗುಡ್ ಐಟಂ
 DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),ಮಾರಾಟ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ sales@example.com )
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Tool,Payment Account,ಪಾವತಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ಡ್ರಾಫ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Quality Inspection Reading,Accepted,Accepted
-DocType: User,Female,ಹೆಣ್ಣು
-DocType: Journal Entry Account,Debit in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಡೆಬಿಟ್
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
-DocType: Print Settings,Modern,ಆಧುನಿಕ
-DocType: Communication,Replied,ಉತ್ತರಿಸಿದರು
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
 DocType: Payment Tool,Total Payment Amount,ಒಟ್ಟು ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ಯೋಜನೆ quanitity ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2}) ಉತ್ಪಾದನೆಯಲ್ಲಿನ ಆರ್ಡರ್ {3}
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 DocType: Newsletter,Test,ಟೆಸ್ಟ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ನಿಮಗೆ ಮೌಲ್ಯಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಈ ಐಟಂ, ಇವೆ ಎಂದು &#39;ಸೀರಿಯಲ್ ಯಾವುದೇ ಹೊಂದಿದೆ&#39;, &#39;ಬ್ಯಾಚ್ ಹೊಂದಿದೆ ಇಲ್ಲ&#39;, &#39;ಸ್ಟಾಕ್ ಐಟಂ&#39; ಮತ್ತು &#39;ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
 DocType: Stock Entry,For Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ಐಟಂಗಳನ್ನು ವಿನಂತಿಗಳು .
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,ಪ್ರತ್ಯೇಕ ಉತ್ಪಾದನಾ ಸಲುವಾಗಿ ಪ್ರತಿ ಸಿದ್ಧಪಡಿಸಿದ ಉತ್ತಮ ಐಟಂ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ .
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,ಕಂಪ್ಲೀಟ್ ಸೆಟಪ್
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ ಈ ದಿನಾಂಕ ಫ್ರೀಜ್ , ಯಾರೂ / ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ಪಾತ್ರವನ್ನು ಹೊರತುಪಡಿಸಿ ಪ್ರವೇಶ ಮಾರ್ಪಡಿಸಲು ಮಾಡಬಹುದು ."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ಸ್ಥಿತಿ
 DocType: UOM,Check this to disallow fractions. (for Nos),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,ಸುದ್ದಿಪತ್ರ ಮೇಲ್ ಪಟ್ಟಿ
 DocType: Delivery Note,Transporter Name,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ಹೆಸರು
+DocType: Authorization Rule,Authorized Value,ಅಧಿಕೃತ ಮೌಲ್ಯ
 DocType: Contact,Enter department to which this Contact belongs,ಯಾವ ಇಲಾಖೆ ಯನ್ನು ಈ ಸಂಪರ್ಕಿಸಿ ಸೇರುತ್ತದೆ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,ಅಳತೆಯ ಘಟಕ
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,ಅಳತೆಯ ಘಟಕ
 DocType: Fiscal Year,Year End Date,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 DocType: Task Depends On,Task Depends On,ಟಾಸ್ಕ್ ಅವಲಂಬಿಸಿರುತ್ತದೆ
 DocType: Lead,Opportunity,ಅವಕಾಶ
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ಮೂಲ ದರದ (ಸ್ಟಾಕ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪ್ರಕಾರ)
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,ಚುಚ್ಚುವ
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ನಿಯೋಜನೆಗಾಗಿ ಕಂಪನಿಗಳು ಉತ್ಪನ್ನಗಳನ್ನು ಮಾರುತ್ತದೆ ಒಬ್ಬ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ವಿತರಕ / ಡೀಲರ್ / ಆಯೋಗದ ಏಜೆಂಟ್ / ಅಂಗ / ಮರುಮಾರಾಟಗಾರರ.
 DocType: Customer Group,Has Child Node,ಮಗುವಿನ ನೋಡ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ಇಲ್ಲಿ ಸ್ಥಿರ URL ನಿಯತಾಂಕಗಳನ್ನು ನಮೂದಿಸಲು ( ಉದಾ. ಕಳುಹಿಸುವವರ = ERPNext , ಬಳಕೆದಾರಹೆಸರು = ERPNext , ಪಾಸ್ವರ್ಡ್ = 1234 , ಇತ್ಯಾದಿ )"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ಯಾವುದೇ ಸಕ್ರಿಯ ವರ್ಷದಲ್ಲಿ. ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ಚೆಕ್ {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ಈ ERPNext ನಿಂದ ಸ್ವಯಂ ರಚಿತವಾದ ಒಂದು ಉದಾಹರಣೆ ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ಏಜಿಂಗ್ ರೇಂಜ್ 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,ದ್ಯುತಿರಾಸಾಯನಿಕ ಯಂತ್ರ
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. ನಮೂದಿಸಿ ಸಾಲು: ""ಹಿಂದಿನ ರೋ ಒಟ್ಟು"" ಆಧರಿಸಿ ನೀವು ಈ ಲೆಕ್ಕ ಬೇಸ್ (ಡೀಫಾಲ್ಟ್ ಹಿಂದಿನ ಸಾಲನ್ನು ಹೊಂದಿದೆ) ಎಂದು ತೆಗೆದುಕೊಳ್ಳಲಾಗುವುದು ಸಾಲು ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಬಹುದು.
  9. ತೆರಿಗೆ ಅಥವಾ ಚಾರ್ಜ್ ಪರಿಗಣಿಸಿ: ತೆರಿಗೆ / ಚಾರ್ಜ್ ಮೌಲ್ಯಮಾಪನ ಮಾತ್ರ (ಒಟ್ಟು ಭಾಗವಾಗಿರದ) ಅಥವಾ ಮಾತ್ರ (ಐಟಂ ಮೌಲ್ಯವನ್ನು ಸೇರಿಸಲು ಮಾಡುವುದಿಲ್ಲ) ಒಟ್ಟು ಅಥವಾ ಎರಡೂ ವೇಳೆ ಈ ವಿಭಾಗದಲ್ಲಿ ನೀವು ಸೂಚಿಸಬಹುದು.
  10. ಸೇರಿಸಿ ಅಥವಾ ಕಡಿತಗೊಳಿಸದಿರುವುದರ: ನೀವು ಸೇರಿಸಲು ಅಥವಾ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸುವ ಬಯಸುವ ಎಂದು."
-DocType: Note,Note,ನೋಡು
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
-DocType: Email Account,Email Ids,ಇಮೇಲ್ ಐಡಿಗಳನ್ನು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 DocType: Tax Rule,Billing City,ಬಿಲ್ಲಿಂಗ್ ನಗರ
 DocType: Global Defaults,Hide Currency Symbol,ಕರೆನ್ಸಿ ಸಂಕೇತ ಮರೆಮಾಡಿ
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,ಕ್ರೆಡಿಟ್ ಸ್ಕೋರ್
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} ಕಾರ್ಯಾಚರಣೆಗೆ {1}
 DocType: Features Setup,Quality,ಗುಣಮಟ್ಟ
-DocType: Contact Us Settings,Introduction,ಪರಿಚಯ
 DocType: Warranty Claim,Service Address,ಸೇವೆ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಮ್ಯಾಕ್ಸ್ 100 ಸಾಲುಗಳನ್ನು.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಮ್ಯಾಕ್ಸ್ 100 ಸಾಲುಗಳನ್ನು.
 DocType: Stock Entry,Manufacture,ಉತ್ಪಾದನೆ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ದಯವಿಟ್ಟು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಮೊದಲ
 DocType: Purchase Invoice,Currency and Price List,ಕರೆನ್ಸಿ ಮತ್ತು ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Opportunity,Customer / Lead Name,ಗ್ರಾಹಕ / ಲೀಡ್ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ಉತ್ಪಾದನೆ
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ಉತ್ಪಾದನೆ
 DocType: Item,Allow Production Order,ಅನುಮತಿಸಿ ಉತ್ಪಾದನೆ ಆರ್ಡರ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
 DocType: Lead,Fax,ಫ್ಯಾಕ್ಸ್
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,ಒಪ್ಪಿಸಿದ
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ದುಡಿಯುತ್ತಿದ್ದ
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ನನ್ನ ವಿಳಾಸಗಳು
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ಅಥವಾ
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 ಮೇಲೆ
 DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
-,Download Backups,ಡೌನ್ಲೋಡ್ ಬ್ಯಾಕ್ಅಪ್ಗಳು
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
 DocType: Process Payroll,Select Employees,ಆಯ್ಕೆ ನೌಕರರು
 DocType: Bank Reconciliation,To Date,ದಿನಾಂಕ
 DocType: Opportunity,Potential Sales Deal,ಸಂಭಾವ್ಯ ಮಾರಾಟ ಡೀಲ್
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,ವಿವರಗಳು
 DocType: Purchase Invoice,Total Taxes and Charges,ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Employee,Emergency Contact,ತುರ್ತು ಸಂಪರ್ಕ
 DocType: Item,Quality Parameters,ಗುಣಮಟ್ಟದ ಮಾನದಂಡಗಳು
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,ಯಾವುದೇ ಸೀರಿಯಲ್ / ಬ್ಯಾಚ್
 DocType: Product Bundle,Parent Item,ಪೋಷಕ ಐಟಂ
 DocType: Account,Account Type,ಖಾತೆ ಪ್ರಕಾರ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} ಸಾಗಿಸುವ-ಫಾರ್ವರ್ಡ್ ಸಾಧ್ಯವಿಲ್ಲ ಕೌಟುಂಬಿಕತೆ ಬಿಡಿ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ಖರೀದಿ ರಸೀತಿ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಫಾರ್ಮ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ಕಟಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ದುರ್ಬಲಗೊಳ್ಳುವ
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,ರೂಪಣೆಯ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
-apps/frappe/frappe/desk/moduleview.py +61,Documents,ಡಾಕ್ಯುಮೆಂಟ್ಸ್
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,ತೀರ್ಪುಗಾರ
 DocType: Cost Center,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ಚೀಟಿ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ಚೀಟಿ #
 DocType: Notification Control,Purchase Order Message,ಖರೀದಿ ಆದೇಶವನ್ನು ಸಂದೇಶವನ್ನು
 DocType: Tax Rule,Shipping Country,ಶಿಪ್ಪಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Upload Attendance,Upload HTML,ಅಪ್ಲೋಡ್ ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","ಒಟ್ಟು ಮುಂಚಿತವಾಗಿ ({0}) ಆರ್ಡರ್ ವಿರುದ್ಧ {1} \
  ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು ({2})"
 DocType: Employee,Relieving Date,ದಿನಾಂಕ ನಿವಾರಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ವೇರ್ಹೌಸ್ ಮಾತ್ರ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ಸೂಚನೆ / ರಸೀತಿ ಖರೀದಿ ಮೂಲಕ ಬದಲಾಯಿಸಬಹುದು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ವರಮಾನ ತೆರಿಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,ಲೇಸರ್ ನಿವ್ವಳ ಆಕಾರ ವಿನ್ಯಾಸ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ವರಮಾನ ತೆರಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ಆಯ್ಕೆ ಬೆಲೆ ರೂಲ್ 'ಬೆಲೆ' ತಯಾರಿಸಲಾಗುತ್ತದೆ, ಅದು ಬೆಲೆ ಪಟ್ಟಿ ಬದಲಿಸಿ. ಬೆಲೆ ರೂಲ್ ಬೆಲೆ ಅಂತಿಮ ಬೆಲೆ, ಆದ್ದರಿಂದ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸಬಹುದಾಗಿದೆ. ಆದ್ದರಿಂದ, ಇತ್ಯಾದಿ ಮಾರಾಟದ ಆರ್ಡರ್, ಆರ್ಡರ್ ಖರೀದಿಸಿ ರೀತಿಯ ವ್ಯವಹಾರಗಳಲ್ಲಿ, ಇದು ಬದಲಿಗೆ 'ಬೆಲೆ ಪಟ್ಟಿ ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಹೆಚ್ಚು, 'ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ತರಲಾಗಿದೆ ನಡೆಯಲಿದೆ."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
-DocType: User,Bio,ಬಯೋ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ಸೆಟಪ್> ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್ ಒಂದು ಹೊಸ> ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ರಚಿಸಿ.
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,ದೊಡ್ಡದು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,ದೊಡ್ಡದು
 ,Profit and Loss Statement,ಲಾಭ ಮತ್ತು ನಷ್ಟ ಹೇಳಿಕೆ
 DocType: Bank Reconciliation Detail,Cheque Number,ಚೆಕ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ಒತ್ತುವುದರಿಂದ
 DocType: Payment Tool Detail,Payment Tool Detail,ಪಾವತಿ ಉಪಕರಣ ವಿವರ
 ,Sales Browser,ಮಾರಾಟದ ಬ್ರೌಸರ್
 DocType: Journal Entry,Total Credit,ಒಟ್ಟು ಕ್ರೆಡಿಟ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ಸ್ಥಳೀಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ಸಾಲ ಮತ್ತು ಅಡ್ವಾನ್ಸಸ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ಸಾಲಗಾರರು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,ಯಾವುದೇ ನೌಕರ ಕಂಡು !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ದೊಡ್ಡದು
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Purchase Order,Customer Address Display,ಗ್ರಾಹಕ ವಿಳಾಸ ಪ್ರದರ್ಶನ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ಹೊಳಪು
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","ನೀವು ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಕೆಲವು ವ್ಯವಹಾರ (ರು) ಮಾಡಿದ \ ಕಾರಣ ಐಟಂ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ {0} ನೇರವಾಗಿ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಡೀಫಾಲ್ಟ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಬದಲಾಯಿಸಲು, \ ಬಳಕೆ ಸ್ಟಾಕ್ ಘಟಕ ಅಡಿಯಲ್ಲಿ ಸಾಧನ &#39;ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಯುಟಿಲಿಟಿ ಬದಲಾಯಿಸಿ&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ವಿನಿಮಯ ದರ ಇನ್ನೊಂದು ಒಂದು ಕರೆನ್ಸಿ ಪರಿವರ್ತಿಸಲು ಸೂಚಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ನುಡಿಮುತ್ತುಗಳು {0} ರದ್ದು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ಒಟ್ಟು ಬಾಕಿ ಮೊತ್ತದ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ನೌಕರರ {0} ಮೇಲೆ ರಜೆ ಮೇಲೆ {1} . ಹಾಜರಾತಿ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Sales Partner,Targets,ಗುರಿ
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
 DocType: Production Order Operation,Make Time Log,ದಾಖಲೆ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ಕಂಪ್ಯೂಟರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,ವಿದ್ಯುತ್-ರಾಸಾಯನಿಕ ರುಬ್ಬುವ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,ನೀವು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು ಆರಂಭಿಸುವ ಮುನ್ನ ಸೆಟಪ್ ಖಾತೆಗಳ ನಿಮ್ಮ ಚಾರ್ಟ್ ಪ್ಲೀಸ್
 DocType: Purchase Invoice,Ignore Pricing Rule,ಬೆಲೆ ರೂಲ್ ನಿರ್ಲಕ್ಷಿಸು
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,ಸಂಬಳ ರಚನೆ ದಿನಾಂಕದಿಂದ ನೌಕರರ ಸೇರುವ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Employee Education,Graduate,ಪದವೀಧರ
 DocType: Leave Block List,Block Days,ಬ್ಲಾಕ್ ಡೇಸ್
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","ಸರಕುಪಟ್ಟಿ ಮರುಕಳಿಸುವ ವೇಳೆ ಪರಿಶೀಲಿಸಿ , ಮರುಕಳಿಸುವ ನಿಲ್ಲಿಸಲು ಅಥವಾ ಸರಿಯಾದ ಎಂಡ್ ದಿನಾಂಕ ಹಾಕಲು ಗುರುತಿಸಬೇಡಿ"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Packing Slip,If more than one package of the same type (for print),ವೇಳೆ ( ಮುದ್ರಣ ) ಅದೇ ರೀತಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಪ್ಯಾಕೇಜ್
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,{0} ಸಾಲುಗಳ ಗರಿಷ್ಠ ಅವಕಾಶ
 DocType: C-Form Invoice Detail,Net Total,ನೆಟ್ ಒಟ್ಟು
 DocType: Bin,FCFS Rate,FCFS ದರ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),ಬಿಲ್ಲಿಂಗ್ (ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,ಉದ್ದೇಶಗಳಿಗಾಗಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಆಪರೇಷನ್ {0} ಕಾರ್ಯಸ್ಥಳ ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಕೆಲಸದ ಹೆಚ್ಚು {1}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,ವಿದ್ಯುದ್ರಾಸಾಯನಿಕ ಯಂತ್ರ
 ,Requested,ವಿನಂತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,ಮಿತಿಮೀರಿದ
 DocType: Account,Stock Received But Not Billed,ಸ್ಟಾಕ್ ಪಡೆದರು ಆದರೆ ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ಗ್ರಾಸ್ ಪೇ + ನಗದೀಕರಣ ಬಾಕಿ ಪ್ರಮಾಣ ಪ್ರಮಾಣ - ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Features Setup,Sales and Purchase,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ
 DocType: Supplier Quotation Item,Material Request No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ನಂ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ಗ್ರಾಹಕ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ಈ ಪಟ್ಟಿಯಿಂದ ಯಶಸ್ವಿಯಾಗಿ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್ ಮಾಡಲಾಗಿದೆ.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),ನೆಟ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/frappe/frappe/templates/base.html +134,Added,ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,ಪ್ರದೇಶ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಟ್ರೀ .
 DocType: Journal Entry Account,Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Bank Reconciliation,Get Relevant Entries,ಸಂಬಂಧಿತ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,ರೂಪಿಸಲ್ಪಟ್ಟ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
-apps/frappe/frappe/desk/query_report.py +136,Total,ಒಟ್ಟು
 DocType: Purchase Invoice,Apply Additional Discount On,ಹೆಚ್ಚುವರಿ ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
 DocType: Account,Root Type,ರೂಟ್ ಪ್ರಕಾರ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},ರೋ # {0}: ಹೆಚ್ಚು ಮರಳಲು ಸಾಧ್ಯವಿಲ್ಲ {1} ಐಟಂ {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 DocType: Quality Inspection,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ರೂಪಿಸುವ ಸ್ಪ್ರೇ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ಪಿಎಲ್ ಅಥವಾ ಬಿಎಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ಕನಿಷ್ಠ ಇನ್ವೆಂಟರಿ ಮಟ್ಟ
 DocType: Stock Entry,Subcontract,subcontract
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,ತಯಾರಿಸುವರು ಭಾಗ ಸಂಖ್ಯೆ
 DocType: Production Order Operation,Estimated Time and Cost,ಅಂದಾಜು ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 DocType: Bin,Bin,ಬಿನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,ದುಂಡುಮಾಡಿದ ಏಣು
 DocType: SMS Log,No of Sent SMS,ಕಳುಹಿಸಲಾಗಿದೆ ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆ
 DocType: Account,Company,ಕಂಪನಿ
 DocType: Account,Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,ಬಣ್ಣದ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ತಂತ್ರಾಂಶ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,ಬಣ್ಣದ
 DocType: Maintenance Visit,Scheduled,ಪರಿಶಿಷ್ಟ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಮಾರಾಟ ಐಟಂ&quot; &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot; ಅಲ್ಲಿ &quot;ಹೌದು&quot; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ಅಸಮಾನವಾಗಿ ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಗುರಿಗಳನ್ನು ವಿತರಿಸಲು ಮಾಸಿಕ ವಿತರಣೆ ಆಯ್ಕೆ.
 DocType: Purchase Invoice Item,Valuation Rate,ಮೌಲ್ಯಾಂಕನ ದರ
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,ಐಟಂ ಸಾಲು {0}: {1} ಮೇಲೆ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು' ಟೇಬಲ್ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,ರವರೆಗೆ
 DocType: Rename Tool,Rename Log,ಲಾಗ್ ಮರುಹೆಸರಿಸು
 DocType: Installation Note Item,Against Document No,ಡಾಕ್ಯುಮೆಂಟ್ ನಂ ವಿರುದ್ಧ
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ನಿರ್ವಹಿಸಿ.
 DocType: Quality Inspection,Inspection Type,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ಸಂಶೋಧಕ
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,ಅಪ್ಡೇಟ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ಸಂಶೋಧಕ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,ಕಳುಹಿಸುವ ಮೊದಲು ಸುದ್ದಿಪತ್ರವನ್ನು ಉಳಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,ಹೆಸರು ಅಥವಾ ಇಮೇಲ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,ಒಳಬರುವ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ .
 DocType: Purchase Order Item,Returned Qty,ಮರಳಿದರು ಪ್ರಮಾಣ
 DocType: Employee,Exit,ನಿರ್ಗಮನ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,ಕಂಪನದ ಸ್ಥಾನ
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ಗ್ರಾಹಕರ ಅನುಕೂಲಕ್ಕಾಗಿ, ಪ್ರಬಂಧ ಸಂಕೇತಗಳು ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು ರೀತಿಯ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಬಳಸಬಹುದು"
 DocType: Employee,You can enter any date manually,ನೀವು ಕೈಯಾರೆ ಯಾವುದೇ ದಿನಾಂಕ ನಮೂದಿಸಬಹುದು
 DocType: Sales Invoice,Advertisement,ಜಾಹೀರಾತು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ಮಾತ್ರ ಲೀಫ್ ನೋಡ್ಗಳು ವ್ಯವಹಾರದಲ್ಲಿ ಅವಕಾಶ
 DocType: Expense Claim,Expense Approver,ವೆಚ್ಚದಲ್ಲಿ ಅನುಮೋದಕ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ಖರೀದಿ ರಸೀತಿ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime ಗೆ
 DocType: SMS Settings,SMS Gateway URL,SMS ಗೇಟ್ವೇ URL ಅನ್ನು
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ಗ್ರೈಂಡಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ಸುತ್ತಿ ಸಂಕೋಚನ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ದೃಢಪಡಿಸಿದರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ಸರಬರಾಜುದಾರ> ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,ಮೊತ್ತ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ಕರಗಿಸುವ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ಸಂಬಳ ವಿಘಟನೆಯ ಸಂಪಾದಿಸಿದ ಮತ್ತು ಕಳೆಯುವುದು ಆಧರಿಸಿ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Address,Preferred Shipping Address,ಮೆಚ್ಚಿನ ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ
 DocType: Purchase Receipt Item,Accepted Warehouse,ಅಕ್ಸೆಪ್ಟೆಡ್ ವೇರ್ಹೌಸ್
 DocType: Bank Reconciliation Detail,Posting Date,ದಿನಾಂಕ ಪೋಸ್ಟ್
 DocType: Item,Valuation Method,ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} ಗೆ ವಿನಿಮಯ ದರದ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ {1}
 DocType: Sales Invoice,Sales Team,ಮಾರಾಟದ ತಂಡ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
 DocType: Serial No,Under Warranty,ವಾರಂಟಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ದೋಷ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Pricing Rule,Discount Percentage,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು
 DocType: Payment Reconciliation Invoice,Invoice Number,ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/hooks.py +70,Orders,ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/hooks.py +54,Orders,ಆರ್ಡರ್ಸ್
 DocType: Leave Control Panel,Employee Type,ನೌಕರರ ಪ್ರಕಾರ
 DocType: Employee Leave Approver,Leave Approver,ಅನುಮೋದಕ ಬಿಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ವಸ್ತು ತಯಾರಿಕೆಗೆ ವರ್ಗಾಯಿಸಲಾಯಿತು
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""ಖರ್ಚು ಅನುಮೋದಕ"" ಪಾತ್ರವನ್ನು ಒಂದು ಬಳಕೆದಾರ"
 ,Issued Items Against Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ನೀಡಲ್ಪಟ್ಟ ಐಟಂಗಳು
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ಅಮಾನ್ಯವಾದ ಅವಧಿಯಲ್ಲಿ
 DocType: Customer,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,ವ್ಯವಹಾರದ ಪ್ರಕಾರವನ್ನುಆರಿಸಿ
 DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Customer,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Employee,Feedback,ಪ್ರತ್ಯಾದಾನ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ಮೊದಲು ಹಂಚಿಕೆ ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {0}, ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ಅಪಘರ್ಷಕ ಜೆಟ್ ಯಂತ್ರ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,ಮಾಹಿತಿ ಗಾತ್ರ. ವೇಳಾಪಟ್ಟಿ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
-DocType: Website Settings,Website Settings,ಸೈಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Item,Reorder level based on Warehouse,ವೇರ್ಹೌಸ್ ಆಧರಿಸಿ ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ
 DocType: Activity Cost,Billing Rate,ಬಿಲ್ಲಿಂಗ್ ದರ
 ,Qty to Deliver,ಡೆಲಿವರ್ ಪ್ರಮಾಣ
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,ಮನವಿ
 DocType: Quotation Item,Against Doctype,DOCTYPE ವಿರುದ್ಧ
 DocType: Delivery Note,Track this Delivery Note against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಟ್ರ್ಯಾಕ್
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,ಮೂಲ ಖಾತೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,ಪ್ರದರ್ಶನ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Pricing Rule,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
-DocType: Communication,Phone,ದೂರವಾಣಿ
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Contact,Passive,ನಿಷ್ಕ್ರಿಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ .
@@ -2487,10 +2296,9 @@
 ,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ರದ್ದು ಅಥವಾ ನಿಲ್ಲಿಸಿದಾಗ
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
-DocType: Event,Groups,ಗುಂಪುಗಳು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ಖಾತೆ ಗುಂಪು
 DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
 DocType: Lead,Lower Income,ಕಡಿಮೆ ವರಮಾನ
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ತ್ವರಿತ ಸಹಾಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Features Setup,Sales Extras,ಮಾರಾಟದ ಪರಿಕರಗಳು
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ವೆಚ್ಚ ಸೆಂಟರ್ ವಿರುದ್ಧ ಬಜೆಟ್ {0} {1} ಖಾತೆಗೆ {2} {3} ಮೂಲಕ ಮೀರುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},ವೆಚ್ಚ ಸೆಂಟರ್ ವಿರುದ್ಧ ಬಜೆಟ್ {0} {1} ಖಾತೆಗೆ {2} {3} ಮೂಲಕ ಮೀರುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' ದಿನಾಂಕದಿಂದ ' ' ದಿನಾಂಕ ' ನಂತರ ಇರಬೇಕು
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,ಮಿನಿಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,ಮಿನಿಟ್
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 ,Qty to Receive,ಸ್ವೀಕರಿಸುವ ಪ್ರಮಾಣ
 DocType: Leave Block List,Leave Block List Allowed,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ಪರಿವರ್ತಿಸುವುದರ ಭಿನ್ನರಾಶಿಗಳನ್ನು ಇರುವುದಿಲ್ಲವೋ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,ನೀವು ಲಾಗಿನ್ ಅದನ್ನು ಬಳಸುತ್ತದೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,ನೀವು ಲಾಗಿನ್ ಅದನ್ನು ಬಳಸುತ್ತದೆ
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಮಾಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ಆಕರ್ಷಕ ಉತ್ಪನ್ನಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ಆಕರ್ಷಕ ಉತ್ಪನ್ನಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳಂದು ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ ರಜೆ ಅನುಮೋದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ಲಾಸ್ಟ್-ಫೋಮ್ ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ಡ್ರಾಯಿಂಗ್
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},ಬಿಡಿ ಅನುಮೋದಕ ಒಂದು ಇರಬೇಕು {0}
 DocType: Hub Settings,Seller Email,ಮಾರಾಟಗಾರ ಇಮೇಲ್
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
 DocType: Workstation Working Hour,Start Time,ಟೈಮ್
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: BOM Operation,Hour Rate,ಅವರ್ ದರ
 DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವ ಮೂಲಕ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,ನುಡಿಮುತ್ತುಗಳು ಗೆ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},ಮತ್ತೊಂದು ಅವಧಿ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ {0} ನಂತರ ಮಾಡಲಾಗಿದೆ {1}
 DocType: Production Order,Material Transferred for Manufacturing,ವಸ್ತು ಉತ್ಪಾದನೆ ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,ಖಾತೆ {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Purchase Receipt Item,Purchase Order Item No,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ ಸಂಖ್ಯೆ
-DocType: System Settings,System Settings,ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 DocType: Project,Project Type,ಪ್ರಾಜೆಕ್ಟ್ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,ಅನೇಕ ಚಟುವಟಿಕೆಗಳ ವೆಚ್ಚ
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,ಕೈಯಲ್ಲಿ ನಗದು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
 DocType: Serial No,Is Cancelled,ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ನನ್ನ ಸಾಗಾಣಿಕೆಯಲ್ಲಿ
 DocType: Journal Entry,Bill Date,ಬಿಲ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
-DocType: Communication,Recipients,ಸ್ವೀಕೃತದಾರರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,ತಿರುಗಿಸದೇ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,ಅನುಮೋದನೆ ಸ್ಥಿತಿ
 DocType: Hub Settings,Publish Items to Hub,ಹಬ್ ಐಟಂಗಳು ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},ಮೌಲ್ಯದಿಂದ ಸತತವಾಗಿ ಮೌಲ್ಯಕ್ಕೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ಬ್ಯಾಂಕ್ ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ
 DocType: Newsletter,Create and Send Newsletters,ರಚಿಸಿ ಮತ್ತು ಕಳುಹಿಸಿ ಸುದ್ದಿಪತ್ರಗಳು
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,ದಿನಾಂಕ ಇಲ್ಲಿಯವರೆಗೆ ಮೊದಲು ಇರಬೇಕು
 DocType: Sales Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
 DocType: Item Group,Check this if you want to show in website,ನೀವು ವೆಬ್ಸೈಟ್ ತೋರಿಸಲು ಬಯಸಿದರೆ ಈ ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext ಸ್ವಾಗತ
+,Welcome to ERPNext,ERPNext ಸ್ವಾಗತ
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ಚೀಟಿ ವಿವರ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,ಉದ್ಧರಣ ದಾರಿ
 DocType: Lead,From Customer,ಗ್ರಾಹಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,ಕರೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ಕರೆಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 ,Projected,ಯೋಜಿತ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವೇರ್ಹೌಸ್ ಸೇರುವುದಿಲ್ಲ {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ಗಮನಿಸಿ : ಸಿಸ್ಟಮ್ ಐಟಂ ಡೆಲಿವರಿ ಮೇಲೆ ಮತ್ತು ಅತಿ ಬುಕಿಂಗ್ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ {0} ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣದ 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
 DocType: Journal Entry,Remark,ಟೀಕಿಸು
 DocType: Purchase Receipt Item,Rate and Amount,ದರ ಮತ್ತು ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ಬೋರಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್ ಗೆ
-DocType: Blog Category,Parent Website Route,ಪೋಷಕ ಸೈಟ್ ಮಾರ್ಗ
 DocType: Sales Order,Not Billed,ಖ್ಯಾತವಾದ ಮಾಡಿರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ಎರಡೂ ಗೋದಾಮಿನ ಅದೇ ಕಂಪನಿ ಸೇರಿರಬೇಕು
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,ಯಾವುದೇ ಸಂಪರ್ಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,ಸಕ್ರಿಯವಾಗಿಲ್ಲ
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣ
 DocType: Time Log,Batched for Billing,ಬಿಲ್ಲಿಂಗ್ Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ಪೂರೈಕೆದಾರರು ಬೆಳೆಸಿದರು ಬಿಲ್ಲುಗಳನ್ನು .
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,ಇ ಜಿ ವ್ಯಾಟ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,ಐಟಂ 4
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ರೂಪಿಸುವ ಬಿಸಿ ಲೋಹದ ಅನಿಲ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
 DocType: Sales Invoice Item,Delivered Qty,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",ತೆರಿಗೆ ಪ್ರಮಾಣ ಬಗ್ಗೆ ಸೂಕ್ತ ಗುಂಪು (ನಿಧಿಗಳು&gt; ಪ್ರಸಕ್ತ ಹಣಕಾಸಿನ ಹೊಣೆಗಾರಿಕೆಗಳು&gt; ತೆರಿಗೆಗಳು ಮತ್ತು ಕರ್ತವ್ಯಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಮೂಲ ಹೋಗಿ ರೀತಿಯ &quot;ತೆರಿಗೆ&quot;) ಮಕ್ಕಳ ಸೇರಿಸಿ ಕ್ಲಿಕ್ಕಿಸಿ (ಒಂದು ಹೊಸ ಖಾತೆ ರಚಿಸಿ ಮತ್ತು ಮಾಡಲು.
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,ಲೇಸರ್ ಕತ್ತರಿಸುವ
-DocType: Event,Monday,ಸೋಮವಾರ
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
 DocType: Salary Slip,Arrear Amount,ಬಾಕಿ ಪ್ರಮಾಣ
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,DESC ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿ ಆಫ್ ಕನಿಷ್ಠ ಒಂದು ಆಯ್ಕೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,ಉತ್ಪಾದನಾ ಕಾರ್ಯಗಳ ಅಲ್ಲಿ ನಿರ್ವಹಿಸುತ್ತಾರೆ.
-DocType: Page,All,ಎಲ್ಲಾ
 DocType: Stock Entry Detail,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
 DocType: Employee,Confirmation Date,ದೃಢೀಕರಣ ದಿನಾಂಕ
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,ಮಾರಾಟ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,ಮಿನ್ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ಸೆಟ್
 DocType: Lead,Lead Owner,ಲೀಡ್ ಮಾಲೀಕ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,ವೇರ್ಹೌಸ್ ಅಗತ್ಯವಿದೆ
 DocType: Employee,Marital Status,ವೈವಾಹಿಕ ಸ್ಥಿತಿ
 DocType: Stock Settings,Auto Material Request,ಆಟೋ ಉತ್ಪನ್ನ ವಿನಂತಿ
 DocType: Time Log,Will be updated when billed.,ಕೊಕ್ಕಿನ ಮಾಡಿದಾಗ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,ಕಂಪೆನಿ ಹೆಸರು ಕಂಪನಿ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು letterheads .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ಮುದ್ರಣ ಶೀರ್ಷಿಕೆ ಇ ಜಿ ಟೆಂಪ್ಲೇಟ್ಗಳು Proforma ಸರಕುಪಟ್ಟಿ .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: POS Profile,Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ಐಟಂಗಳನ್ನು ವಿವಿಧ UOM ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","ಮಾದರಿ ಇಮೇಲ್, ಫೋನ್, ಚಾಟ್, ಭೇಟಿ, ಇತ್ಯಾದಿ ಎಲ್ಲಾ ಸಂವಹನ ರೆಕಾರ್ಡ್"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,ಕಂಪನಿಯಲ್ಲಿ ರೌಂಡ್ ಆಫ್ ವೆಚ್ಚ ಸೆಂಟರ್ ಬಗ್ಗೆ ದಯವಿಟ್ಟು
 DocType: Purchase Invoice,Terms,ನಿಯಮಗಳು
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,ಹೊಸ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,ಹೊಸ ರಚಿಸಿ
 DocType: Buying Settings,Purchase Order Required,ಆದೇಶ ಅಗತ್ಯವಿರುವ ಖರೀದಿಸಿ
 ,Item-wise Sales History,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ಇತಿಹಾಸ
 DocType: Expense Claim,Total Sanctioned Amount,ಒಟ್ಟು ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 ,Purchase Analytics,ಖರೀದಿ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Sales Invoice Item,Delivery Note Item,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂ
 DocType: Expense Claim,Task,ಟಾಸ್ಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,ಶೇವಿಂಗ್
 DocType: Purchase Taxes and Charges,Reference Row #,ರೆಫರೆನ್ಸ್ ರೋ #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಮಾರಾಟಗಾರ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 ,Stock Ledger,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},ದರ: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},ದರ: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,ಸಂಬಳದ ಸ್ಲಿಪ್ ಕಳೆಯುವುದು
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,ಟಿಪ್ಪಣಿಗಳು
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ಮೊದಲ ಗುಂಪು ನೋಡ್ ಆಯ್ಕೆ.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ಅವರ ಇತ್ತೀಚಿನ ದಾಸ್ತಾನು ಸ್ಥಿತಿಯನ್ನು ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಹೊಂದಿದ ಒಂದು ವರದಿಯನ್ನು ಡೌನ್ಲೋಡ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,ಎದುರಿಸುತ್ತಿರುವ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ಸಮುದಾಯ ವೇದಿಕೆ
 DocType: Leave Application,Leave Balance Before Application,ಅಪ್ಲಿಕೇಶನ್ ಮೊದಲು ಬ್ಯಾಲೆನ್ಸ್ ಬಿಡಿ
 DocType: SMS Center,Send SMS,ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ
 DocType: Company,Default Letter Head,ಪತ್ರ ಹೆಡ್ ಡೀಫಾಲ್ಟ್
 DocType: Time Log,Billable,ಬಿಲ್ ಮಾಡಬಹುದಾದ
-DocType: Authorization Rule,This will be used for setting rule in HR module,ಈ ಮಾನವ ಸಂಪನ್ಮೂಲ ಭಾಗದಲ್ಲಿ ನಿಯಮ ಸ್ಥಾಪನೆಗೆ ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Account,Rate at which this tax is applied,ದರ ಈ ತೆರಿಗೆ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ ನಲ್ಲಿ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,ಕಳೆದುಕೊಂಡ ಅವಕಾಶ
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ರಿಯಾಯಿತಿ ಫೀಲ್ಡ್ಸ್ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ , ಖರೀದಿ ರಸೀತಿ , ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಲಭ್ಯವಾಗುತ್ತದೆ"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆ ಶಾಲೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ಗ್ರಾಹಕರ ಹಾಗೂ ವಿತರಕರ ಖಾತೆಗಳನ್ನು ರಚಿಸಲು ದಯವಿಟ್ಟು
-DocType: Report,Report Type,ವರದಿ ಪ್ರಕಾರ
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,ಲೋಡ್
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ಬದಲಿಗೆ ಸಾಧನ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,ದೇಶದ ಬುದ್ಧಿವಂತ ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ಗಳು
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',ನೀವು ಉತ್ಪಾದನಾ ಚಟುವಟಿಕೆ ಒಳಗೊಂಡಿರುತ್ತವೆ ವೇಳೆ . ಐಟಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ ' ತಯಾರಿಸುತ್ತದೆ '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 DocType: Purchase Order Item,Material Request Detail No,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ವಿವರ ನಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ಹಾರ್ಡ್ ತಿರುವು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
 DocType: Company,Default Cash Account,ಡೀಫಾಲ್ಟ್ ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","ಗಮನಿಸಿ: ಪಾವತಿ ಯಾವುದೇ ಉಲ್ಲೇಖ ವಿರುದ್ಧ ಹೋದರೆ, ಕೈಯಾರೆ ಜರ್ನಲ್ ನಮೂದನ್ನು ಮಾಡಲು."
 DocType: Item,Supplier Items,ಪೂರೈಕೆದಾರ ಐಟಂಗಳು
 DocType: Opportunity,Opportunity Type,ಅವಕಾಶ ಪ್ರಕಾರ
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
 ,Stock Ageing,ಸ್ಟಾಕ್ ಏಜಿಂಗ್
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸಂಪರ್ಕಗಳು ಸ್ವಯಂಚಾಲಿತ ಕಳುಹಿಸು.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ: {4}, ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಿ: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
-DocType: Event,Sunday,ಭಾನುವಾರ
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
 DocType: Pricing Rule,Item Group,ಐಟಂ ಗುಂಪು
 DocType: Task,Actual Start Date (via Time Logs),ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ಗೆ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Time Log Batch,Total Hours,ಒಟ್ಟು ಅವರ್ಸ್
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,ಐಟಂ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,ಮೆಟಲ್ ಅಚ್ಚೊತ್ತುವಿಕೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Time Log,From Time,ಸಮಯದಿಂದ
 DocType: Notification Control,Custom Message,ಕಸ್ಟಮ್ ಸಂದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","ನಿಮ್ಮ ದೇಶ, ಕಾಲವಲಯವನ್ನು ಮತ್ತು ಕರೆನ್ಸಿ ಆಯ್ಕೆ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ ಬ್ಯಾಂಕಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ಉಪ್ಪಿನಕಾಯಿ ಹಾಕುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ಮರಳು ಎರಕದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,ವಿದ್ಯುಲ್ಲೇಪಿಸುವಿಕೆಯನ್ನು
 DocType: Purchase Invoice Item,Rate,ದರ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,ಆಂತರಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,ಆಂತರಿಕ
 DocType: Newsletter,A Lead with this email id should exist,ಈ ಇಮೇಲ್ ಐಡಿ Shoulderstand ಒಂದು ಪ್ರಮುಖ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ
 DocType: Stock Entry,From BOM,BOM ಗೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
 DocType: Salary Structure,Salary Structure,ಸಂಬಳ ರಚನೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","ಬಹು ಬೆಲೆ ರೂಲ್ ಅದೇ ಮಾನದಂಡವನ್ನು ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ, ಪ್ರಾಶಸ್ತ್ಯವನ್ನು ನಿಗದಿಪಡಿಸಬೇಕು \
  ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ದಯವಿಟ್ಟು. ಬೆಲೆ ನಿಯಮಗಳು: {0}"
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 DocType: Hub Settings,Access Token,ಪ್ರವೇಶ ಟೋಕನ್
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","ನೀವು ದೀರ್ಘ ಮುದ್ರಣ ಸ್ವರೂಪಗಳು ಹೊಂದಿದ್ದರೆ, ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಎಲ್ಲಾ ಪ್ರತಿ ಪುಟದಲ್ಲಿ ಶೀರ್ಷಿಕೆಗಳು ಮತ್ತು ಅಡಿಟಿಪ್ಪಣಿಗಳು ಬಹು ಪುಟಗಳನ್ನು ಮೇಲೆ ಮುದ್ರಿತ ಪುಟ ಬೇರ್ಪಡಿಸಲು ಬಳಸಬಹುದಾಗಿದೆ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
 DocType: Process Payroll,Process Payroll,ಪ್ರಕ್ರಿಯೆ ವೇತನದಾರರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
 DocType: Product Bundle Item,Product Bundle Item,ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
 DocType: Purchase Invoice Item,Image View,ImageView
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,ಸ್ಥಾನ ಮತ್ತು ಕೈಗಾರಿಕಾ ಸ್ಥಾನ
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ಸರಕು ವಿನಿಮಯ
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ಕೊರೆಯುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ಊದು ಅಚ್ಚೊತ್ತುವಿಕೆ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
 DocType: Tax Rule,Shipping City,ಶಿಪ್ಪಿಂಗ್ ನಗರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಭೇದ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಲಕ್ಷಣಗಳು ಟೆಂಪ್ಲೇಟ್ ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Account,Purchase User,ಖರೀದಿ ಬಳಕೆದಾರ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ಬಡಿಯುವಿಕೆಯಿಂದ
-DocType: Web Page,Slideshow,ಸ್ಲೈಡ್ಶೋ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಅಳಿಸಲಾಗಿಲ್ಲ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 DocType: Journal Entry,Print Heading,ಪ್ರಿಂಟ್ ಶಿರೋನಾಮೆ
 DocType: Quotation,Maintenance Manager,ನಿರ್ವಹಣೆ ಮ್ಯಾನೇಜರ್
-DocType: Workflow State,Search,ಹುಡುಕು
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,ಒಟ್ಟು ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,' ಕೊನೆಯ ಆರ್ಡರ್ ರಿಂದ ಡೇಸ್ ' ಹೆಚ್ಚು ಅಥವಾ ಶೂನ್ಯಕ್ಕೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,ಗೆ ತಿದ್ದುಪಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,ಮೂಲಸಾಮಗ್ರಿ
 DocType: Leave Application,Follow via Email,ಇಮೇಲ್ ಮೂಲಕ ಅನುಸರಿಸಿ
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,ಮಗುವಿನ ಖಾತೆಗೆ ಈ ಖಾತೆಗಾಗಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ . ನೀವು ಈ ಖಾತೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ಗುರಿ ಪ್ರಮಾಣ ಅಥವಾ ಗುರಿ ಪ್ರಮಾಣವನ್ನು ಒಂದೋ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
 DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
@@ -2862,45 +2631,44 @@
 ,Produced,ನಿರ್ಮಾಣ
 DocType: Item,Item Code for Suppliers,ಪೂರೈಕೆದಾರರು ಐಟಂ ಕೋಡ್
 DocType: Issue,Raised By (Email),( ಇಮೇಲ್ ) ಬೆಳೆಸಿದರು
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ಜನರಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,ತಲೆಬರಹ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ಜನರಲ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,ತಲೆಬರಹ ಲಗತ್ತಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","ನಿಮ್ಮ ತೆರಿಗೆ ತಲೆ ಪಟ್ಟಿ (ಉದಾ ವ್ಯಾಟ್ ಕಸ್ಟಮ್ಸ್ ಇತ್ಯಾದಿ; ಅವರು ಅನನ್ಯ ಹೆಸರುಗಳು ಇರಬೇಕು) ಮತ್ತು ತಮ್ಮ ಗುಣಮಟ್ಟದ ದರಗಳು. ನೀವು ಸಂಪಾದಿಸಲು ಮತ್ತು ಹೆಚ್ಚು ನಂತರ ಸೇರಿಸಬಹುದು ಇದರಲ್ಲಿ ಮಾದರಿಯಲ್ಲಿ, ರಚಿಸುತ್ತದೆ."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","ನಿಮ್ಮ ತೆರಿಗೆ ತಲೆ ಪಟ್ಟಿ (ಉದಾ ವ್ಯಾಟ್ ಕಸ್ಟಮ್ಸ್ ಇತ್ಯಾದಿ; ಅವರು ಅನನ್ಯ ಹೆಸರುಗಳು ಇರಬೇಕು) ಮತ್ತು ತಮ್ಮ ಗುಣಮಟ್ಟದ ದರಗಳು. ನೀವು ಸಂಪಾದಿಸಲು ಮತ್ತು ಹೆಚ್ಚು ನಂತರ ಸೇರಿಸಬಹುದು ಇದರಲ್ಲಿ ಮಾದರಿಯಲ್ಲಿ, ರಚಿಸುತ್ತದೆ."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
 DocType: Journal Entry,Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
 DocType: Authorization Rule,Applicable To (Designation),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಹುದ್ದೆ )
-DocType: Blog Post,Blog Post,ಬ್ಲಾಗ್ ಪೋಸ್ಟ್
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,ಗುಂಪಿನ
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಕರೆನ್ಸಿಗಳ ಸಕ್ರಿಯಗೊಳಿಸಿ .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ಅಂಚೆ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆಮ್ಟ್)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Purchase Order,The date on which recurring order will be stop,ಮರುಕಳಿಸುವ ಸಲುವಾಗಿ ನಿಲ್ಲಿಸಲು ಯಾವ ದಿನಾಂಕ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} ಕಡಿಮೆ ಮಾಡಬೇಕು ಅಥವಾ ನೀವು ಉಕ್ಕಿ ಸಹನೆ ಹೆಚ್ಚಾಗಬೇಕು
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ಗಂಟೆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ಗಂಟೆ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,ಉದ್ಧರಣ ರಚಿಸಿ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,ಈ ಎಲ್ಲಾ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ಅನುಮೋದನೆ ಮಾಡಬಹುದು
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: BOM Replace Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
 DocType: Features Setup,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,ಕರ್ಲಿಂಗ್
 DocType: Account,Tax,ತೆರಿಗೆ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ಸಾಲು {0}: {1} ಒಂದು ಮಾನ್ಯವಾಗಿಲ್ಲ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,ಸಂಸ್ಕರಣೆ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ಸಾಲು {0}: {1} ಒಂದು ಮಾನ್ಯವಾಗಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 DocType: Production Planning Tool,Production Planning Tool,ತಯಾರಿಕಾ ಯೋಜನೆ ಉಪಕರಣ
 DocType: Quality Inspection,Report Date,ವರದಿಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,ರೂಟಿಂಗ್
 DocType: C-Form,Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ಈಗಾಗಲೇ ಅವಧಿಗೆ ನೌಕರರ {1} ಇರುವ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ಪಡೆದವರು
 DocType: Features Setup,Item Groups in Details,ವಿವರಗಳನ್ನು ಐಟಂ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,ಅಪ್ಡೇಟ್ ದರ ಮತ್ತು ಲಭ್ಯತೆ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ನೀವು ಪ್ರಮಾಣ ವಿರುದ್ಧ ಹೆಚ್ಚು ಸ್ವೀಕರಿಸಲು ಅಥವಾ ತಲುಪಿಸಲು ಅವಕಾಶ ಶೇಕಡಾವಾರು ಆದೇಶ . ಉದಾಹರಣೆಗೆ : ನೀವು 100 ಘಟಕಗಳು ಆದೇಶ ಇದ್ದರೆ . ನಿಮ್ಮ ಸೇವನೆ ನೀವು 110 ಘಟಕಗಳು ಸ್ವೀಕರಿಸಲು 10% ಅವಕಾಶವಿರುತ್ತದೆ ಇದೆ .
 DocType: Pricing Rule,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
 DocType: Address,Plant,ಗಿಡ
-DocType: DocType,Setup,ಸೆಟಪ್
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,ಶೀತಲ ಸುರುಳಿ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: GL Entry,Against Voucher Type,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
 DocType: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
-DocType: Packing Slip,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
-DocType: DocField,Image,ಚಿತ್ರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
-DocType: Communication,Other,ಇತರ
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ಆಪರೇಷನ್ ಐಡಿ ಹೊಂದಿಸಿಲ್ಲ
 DocType: Production Order,Planned Start Date,ಯೋಜನೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,ಮಾಹಿತಿ ಗಾತ್ರ. ಭೇಟಿ
 DocType: Leave Type,Is Encash,ಮುರಿಸು ಇದೆ
 DocType: Purchase Invoice,Mobile No,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Payment Tool,Make Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮಾಡಿ
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ಪ್ರಾಜೆಕ್ಟ್ ಬಲ್ಲ ದಶಮಾಂಶ ಉದ್ಧರಣ ಲಭ್ಯವಿಲ್ಲ
 DocType: Project,Expected End Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Appraisal Template,Appraisal Template Title,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ವ್ಯಾಪಾರದ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ಪೋಷಕ ಐಟಂ {0} ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಇರಬಾರದು
 DocType: Cost Center,Distribution Id,ವಿತರಣೆ ಸಂ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,ಆಕರ್ಷಕ ಸೇವೆಗಳು
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳು ಅಥವಾ ಸೇವೆಗಳ .
 DocType: Purchase Invoice,Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ
-DocType: Contact Us Settings,Address Line 2,ಲೈನ್ 2 ವಿಳಾಸ
-DocType: ToDo,Reference,ರೆಫರೆನ್ಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,ರಂಧ್ರಕೊರೆಯುವಿಕೆ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} ಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ಗೆ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3}
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,ಕೋಟಿ
 DocType: Customer,Default Receivable Accounts,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಡೀಫಾಲ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ಲ್ಯಾಮಿನೇಟ್
 DocType: Item Reorder,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,ಹೆಪ್ಪುಗಟ್ಟಿಸಿ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
 DocType: Supplier,Contact HTML,ಸಂಪರ್ಕಿಸಿ ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ಗ್ರಾಹಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
-DocType: Product Bundle,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ಹಿಂಡುವಿಕೆ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: GL Entry,Remarks,ರಿಮಾರ್ಕ್ಸ್
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Features Setup,POS View,ಪಿಓಎಸ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,ನಿರಂತರ ಎರಕದ
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,ಒಂದು ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ಮೇಲೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ಶೀತಲ ಗಾತ್ರ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,ಖಾತೆ {0} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ಪ್ರದೇಶ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Holiday List,Weekly Off,ಸಾಪ್ತಾಹಿಕ ಆಫ್
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಇ ಜಿ ಫಾರ್ 2012 , 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),ಹಂಗಾಮಿ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
 DocType: Sales Invoice,Return Against Sales Invoice,ವಿರುದ್ಧ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ಐಟಂ 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು {0} ಸೆಟ್ ದಯವಿಟ್ಟು {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು {0} ಸೆಟ್ ದಯವಿಟ್ಟು {1}
 DocType: Serial No,Creation Time,ಸೃಷ್ಟಿ ಟೈಮ್
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,ಒಟ್ಟು ಕಂದಾಯ
 DocType: Sales Invoice,Product Bundle Help,ಉತ್ಪನ್ನ ಕಟ್ಟು ಸಹಾಯ
 ,Monthly Attendance Sheet,ಮಾಸಿಕ ಹಾಜರಾತಿ ಹಾಳೆ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ಯಾವುದೇ ದಾಖಲೆ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,ಖಾತೆ {0} ನಿಷ್ಕ್ರಿಯ
 DocType: GL Entry,Is Advance,ಮುಂಗಡ ಹೊಂದಿದೆ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ಅಟೆಂಡೆನ್ಸ್ ಹಾಜರಿದ್ದ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,ನಮೂದಿಸಿ ಹೌದು ಅಥವಾ ಇಲ್ಲ ಎಂದು ' subcontracted ಈಸ್'
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' ಲಾಭ ಮತ್ತು ನಷ್ಟ ' ಮಾದರಿ ಖಾತೆಯನ್ನು {0} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿ ಇಲ್ಲ
-DocType: Workflow State,Time,ಟೈಮ್
 DocType: Features Setup,Sales Discounts,ಮಾರಾಟದ ರಿಯಾಯಿತಿಯು
 DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
 DocType: Sales Invoice,Terms and Conditions Details,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿವರಗಳು
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ಬಟ್ಟೆಬರೆ ಮತ್ತು ಭಾಗಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ಬಟ್ಟೆಬರೆ ಮತ್ತು ಭಾಗಗಳು
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ಆರ್ಡರ್ ಸಂಖ್ಯೆ
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ಉತ್ಪನ್ನದ ಪಟ್ಟಿ ಮೇಲೆ ತೋರಿಸಿ thatwill ಎಚ್ಟಿಎಮ್ಎಲ್ / ಬ್ಯಾನರ್ .
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕ ಪರಿಸ್ಥಿತಿಗಳು ಸೂಚಿಸಿ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ಮಕ್ಕಳ ಸೇರಿಸಿ
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,ಪಾತ್ರವನ್ನು ಘನೀಕೃತ ಖಾತೆಗಳು & ಸಂಪಾದಿಸಿ ಘನೀಕೃತ ನಮೂದುಗಳು ಹೊಂದಿಸಲು ಅನುಮತಿಸಲಾದ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ಆಲ್ಡ್ವಿಚ್ childNodes ಲೆಡ್ಜರ್ ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಪರಿವರ್ತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ಪರಿವರ್ತಿಸುವುದರ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,ಸರಣಿ #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,ಮಾರಾಟದ ಮೇಲೆ ಕಮಿಷನ್
 DocType: Offer Letter Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,ಗ್ರಾಹಕರು ರಿಂದ ಲಾಂಗ್ ಟೈಮ್ ಖರೀದಿ ಇಲ್ಲ
 DocType: Production Order,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ಉಬ್ಬುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ಆವಿಗೊಳಿಸುವ ಚಿತ್ತಾರ ಎರಕದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ಮನೋರಂಜನೆ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,ವಯಸ್ಸು
 DocType: Time Log,Billing Amount,ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ಐಟಂ ನಿಗದಿತ ಅಮಾನ್ಯ ಪ್ರಮಾಣ {0} . ಪ್ರಮಾಣ 0 ಹೆಚ್ಚಿರಬೇಕು
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ರಜೆ ಅಪ್ಲಿಕೇಷನ್ಗಳಿಗೆ .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಅಳಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ಕಾನೂನು ವೆಚ್ಚ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸಲುವಾಗಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Sales Invoice,Posting Time,ಟೈಮ್ ಪೋಸ್ಟ್
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,ಹೊಸ ಗ್ರಾಹಕ ಕಂದಾಯ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ಪ್ರಯಾಣ ವೆಚ್ಚ
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,ಖಾತೆ: {0} ಕರೆನ್ಸಿಗೆ: {1} ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,ಸಾಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
-DocType: Feed,Full Name,ಪೂರ್ಣ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,ತೆಕ್ಕೆಗೆ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,ಪರೀಕ್ಷಣೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಪಾವತಿ {0} {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 ,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ನ್ಯಾವಿಗೇಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,ಯೋಜನೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,ಯೋಜನೆ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,ಟೈಮ್ ಲಾಗ್ ಬ್ಯಾಚ್ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ಬಿಡುಗಡೆ
 DocType: Project,Total Billing Amount (via Time Logs),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,ನಾವು ಈ ಐಟಂ ಮಾರಾಟ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ಪೂರೈಕೆದಾರ ಐಡಿ
 DocType: Journal Entry,Cash Entry,ನಗದು ಎಂಟ್ರಿ
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,ಐಟಂ ಮ್ಯಾನೇಜರ್
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,ಖಾತೆಗಳ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಹೊಂದಿಸಲು ಸಾಲುಗಳನ್ನು ಸೇರಿಸಿ .
 DocType: Buying Settings,Default Supplier Type,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,ಕಲ್ಲುಗಣಿಗಾರಿಕೆ
 DocType: Production Order,Total Operating Cost,ಒಟ್ಟು ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,ರೇಟಿಂಗ್ : ಐಟಂ {0} ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು .
 DocType: Newsletter,Test Email Id,ಟೆಸ್ಟ್ ಮಿಂಚಂಚೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,ನೀವು ಗುಣಮಟ್ಟ ತಪಾಸಣೆ ಅನುಸರಿಸಿದರೆ . ಖರೀದಿ ರಸೀದಿಯಲ್ಲಿ ಐಟಂ ಅಗತ್ಯವಿದೆ QA ಮತ್ತು ಗುಣಮಟ್ಟ ಖಾತರಿ ನಂ ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ
 DocType: GL Entry,Party Type,ಪಕ್ಷದ ಪ್ರಕಾರ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,ಕಚ್ಚಾ ವಸ್ತು ಮುಖ್ಯ ಐಟಂ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item Attribute Value,Abbreviation,ಸಂಕ್ಷೇಪಣ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ ರಿಂದ authroized ಮಾಡಿರುವುದಿಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,ಆವರ್ತನದ ಸೂರು
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,ಸಂಬಳ ಮಾಸ್ಟರ್ ಟೆಂಪ್ಲೆಟ್ .
 DocType: Leave Type,Max Days Leave Allowed,ಮ್ಯಾಕ್ಸ್ ಡೇಸ್ ಹೊರಹೋಗಲು ಆಸ್ಪದ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ತೆರಿಗೆಯ ರೂಲ್
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
 ,Territory Target Variance Item Group-Wise,ಪ್ರದೇಶ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಕಡ್ಡಾಯವಾಗಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),ಬೆಲೆ ಪಟ್ಟಿ ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Account,Temporary,ತಾತ್ಕಾಲಿಕ
 DocType: Address,Preferred Billing Address,ಮೆಚ್ಚಿನ ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,ಕಾರ್ಯದರ್ಶಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,ಕಾರ್ಯದರ್ಶಿ
 DocType: Serial No,Distinct unit of an Item,ಐಟಂ ವಿಶಿಷ್ಟ ಘಟಕವಾಗಿದೆ
 DocType: Pricing Rule,Buying,ಖರೀದಿ
 DocType: HR Settings,Employee Records to be created by,ನೌಕರರ ದಾಖಲೆಗಳು ದಾಖಲಿಸಿದವರು
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
 DocType: Purchase Order Item,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,ಇಸ್ತ್ರಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ನಿಲ್ಲಿಸಿದಾಗ
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,ಮುಂಬರುವ ಕಾರ್ಯಕ್ರಮಗಳು
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ಗ್ರಾಹಕ ಅಗತ್ಯವಿದೆ
-DocType: Letter Head,Letter Head,ತಲೆಬರಹ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,ತ್ವರಿತ ಪ್ರವೇಶ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ರಿಟರ್ನ್ ಕಡ್ಡಾಯ
 DocType: Purchase Order,To Receive,ಪಡೆಯಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,ಬಿಗಿಯಾದ ಸಂಕೋಚನ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,ಆದಾಯ / ಖರ್ಚು
 DocType: Employee,Personal Email,ಸ್ಟಾಫ್ ಇಮೇಲ್
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ , ಗಣಕವು ದಾಸ್ತಾನು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಪೋಸ್ಟ್ ಕಾಣಿಸುತ್ತದೆ ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
 DocType: Address,Postal Code,ಅಂಚೆ ಕೋಡ್
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","ನಿಮಿಷಗಳಲ್ಲಿ 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,ಪ್ಲ್ಯಾನಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,ಕನಿಷ್ಠ ಒಂದು ಗೋದಾಮಿನ ಕಡ್ಡಾಯ
 DocType: Serial No,Out of Warranty,ಖಾತರಿ ಹೊರಗೆ
 DocType: BOM Replace Tool,Replace,ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ನಮೂದಿಸಿ
 DocType: Purchase Invoice Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
-DocType: Workflow State,Edit,ಸಂಪಾದಿಸು
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Features Setup,Item Batch Nos,ಐಟಂ ಬ್ಯಾಚ್ ಸೂಲ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
@@ -3181,19 +2922,17 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ಪಾವತಿ ರಾಜಿ ಪಾವತಿಗೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,ತೆರಿಗೆ ಸ್ವತ್ತುಗಳು
 DocType: BOM Item,BOM No,ಯಾವುದೇ BOM
-DocType: Contact Us Settings,Pincode,ಪಿನ್ ಕೋಡ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,ಹೊಸ ಸ್ಟಾಕ್ UOM ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್ UOM ಭಿನ್ನವಾಗಿದೆ ಇರಬೇಕು
 DocType: Account,Debit,ಡೆಬಿಟ್
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ಎಲೆಗಳು ಹಂಚಿಕೆ 0.5 ಗುಣಾತ್ಮಕವಾಗಿ ಇರಬೇಕು
 DocType: Production Order,Operation Cost,ಆಪರೇಷನ್ ವೆಚ್ಚ
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ಒಂದು . CSV ಕಡತ ಹಾಜರಾತಿ ಅಪ್ಲೋಡ್
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ಸೆಟ್ ಗುರಿಗಳನ್ನು ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಈ ಮಾರಾಟ ವ್ಯಕ್ತಿಗೆ .
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","ಈ ಸಮಸ್ಯೆಯನ್ನು ನಿಯೋಜಿಸಲು ಸೈಡ್ಬಾರ್ನಲ್ಲಿ "" ನಿಯೋಜನೆ "" ಗುಂಡಿಯನ್ನು ಬಳಸಿ."
-DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
+DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ಎರಡು ಅಥವಾ ಹೆಚ್ಚು ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲೆ ಆಧರಿಸಿ ಕಂಡುಬರದಿದ್ದಲ್ಲಿ, ಆದ್ಯತಾ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ (ಖಾಲಿ) ಹಾಗೆಯೇ ಆದ್ಯತಾ 20 0 ನಡುವೆ ಸಂಖ್ಯೆ. ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ ಅದೇ ಪರಿಸ್ಥಿತಿಗಳು ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಅದು ಪ್ರಾಧಾನ್ಯತೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ ಅರ್ಥ."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,ಹಣಕಾಸಿನ ವರ್ಷ: {0} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Currency Exchange,To Currency,ಕರೆನ್ಸಿ
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Purchase Invoice,End Date,ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Employee,Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
-DocType: DocField,Column Break,ಕಾಲಮ್ ಬ್ರೇಕ್
-DocType: Event,Thursday,ಗುರುವಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,ಟರ್ನಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
 DocType: Sales Invoice,Exhibition,ಪ್ರದರ್ಶನ
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,ನಡೆದ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ಪ್ರೊಡಕ್ಷನ್ ಐಟಂ
 ,Employee Information,ನೌಕರರ ಮಾಹಿತಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),ದರ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),ದರ (%)
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ವೇತನ ಇಲ್ಲದೆ ರಜೆ ದುಡಿಯುತ್ತಿದ್ದ ಕಡಿಮೆ ( LWP )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},ರೇಟಿಂಗ್ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} ಸತತವಾಗಿ ಖರೀದಿಸಲಾದ ಅಥವಾ ಉಪ ಒಪ್ಪಂದ ಐಟಂ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
 DocType: GL Entry,Party,ಪಕ್ಷ
 DocType: Sales Order,Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕ
-DocType: DocField,Currency,ಕರೆನ್ಸಿ
 DocType: Opportunity,Opportunity Date,ಅವಕಾಶ ದಿನಾಂಕ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ವಿರುದ್ಧ ಪುನರಾಗಮನ
 DocType: Purchase Order,To Bill,ಬಿಲ್
 DocType: Material Request,% Ordered,% ಆದೇಶ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ಆವರೇಜ್. ಬೈಯಿಂಗ್ ದರ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
 DocType: SMS Settings,SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,ತಾತ್ಕಾಲಿಕ ಖಾತೆಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ಬ್ಲಾಕ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ಬ್ಲಾಕ್
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ಸ್ಫೋಟ ಐಟಂ
 DocType: Account,Auditor,ಆಡಿಟರ್
 DocType: Purchase Order,End date of current order's period,ಪ್ರಸ್ತುತ ಸಲುವಾಗಿ ನ ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ಆಫರ್ ಲೆಟರ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ರಿಟರ್ನ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
-DocType: DocField,Fold,ಪಟ್ಟು
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,ಸೂಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Task,Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ಗ್ರಾಹಕ ಗುರುತು
-DocType: Page,Page Name,ಪುಟ ಹೆಸರು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,ಟೈಮ್ ಟೈಮ್ ಗೆ ಹೆಚ್ಚು ಇರಬೇಕು ಗೆ
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ವೇರ್ಹೌಸ್ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿಗೆ ಸದಸ್ಯ ಮಾಡುವುದಿಲ್ಲ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ಸ್ಪಿಂಡಲ್ ಸ್ಥಾನ
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
 DocType: Project Task,Task ID,ಟಾಸ್ಕ್ ಐಡಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ಇ ಜಿ "" ಎಂಸಿ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ಇ ಜಿ "" ಎಂಸಿ """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್ {0} ರಿಂದ ವೇರಿಯಂಟ್
 ,Sales Person-wise Transaction Summary,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
-DocType: System Settings,Time Zone,ಕಾಲವಲಯವನ್ನು
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext ಹಬ್ ನೋಂದಣಿ
 DocType: Monthly Distribution,Monthly Distribution Percentages,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,ತಂತಿಗಳಿಂದ
 DocType: Customer,Customer Details,ಗ್ರಾಹಕ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,ಆಕಾರ
 DocType: Employee,Reports to,ಗೆ ವರದಿಗಳು
 DocType: SMS Settings,Enter url parameter for receiver nos,ರಿಸೀವರ್ ಸೂಲ URL ಅನ್ನು ನಿಯತಾಂಕ ಯನ್ನು
 DocType: Sales Invoice,Paid Amount,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',ಖಾತೆ {0} ಕ್ಲೋಸಿಂಗ್ ಮಾದರಿ ' ಹೊಣೆಗಾರಿಕೆ ' ಇರಬೇಕು
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ಈಗಾಗಲೇ ಡೆಬಿಟ್ ರಲ್ಲಿ ಖಾತೆ ಸಮತೋಲನ, ನೀವು 'ಕ್ರೆಡಿಟ್' 'ಬ್ಯಾಲೆನ್ಸ್ ಇರಬೇಕು ಹೊಂದಿಸಲು ಅನುಮತಿ ಇಲ್ಲ"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
 DocType: Production Planning Tool,Filter based on customer,ಫಿಲ್ಟರ್ ಗ್ರಾಹಕ ಆಧಾರಿತ
 DocType: Payment Tool Detail,Against Voucher No,ಚೀಟಿ ಯಾವುದೇ ವಿರುದ್ಧ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Tax Rule,Purchase,ಖರೀದಿ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
 DocType: Item Group,Parent Item Group,ಪೋಷಕ ಐಟಂ ಗುಂಪು
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ಫಾರ್ {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ವೆಚ್ಚ ಕೇಂದ್ರಗಳು
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ಗೋದಾಮುಗಳು .
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ಗೋದಾಮುಗಳು .
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ಯಾವ ಸರಬರಾಜುದಾರರ ಕರೆನ್ಸಿ ದರ ಕಂಪನಿಯ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ರೋ # {0}: ಸಾಲು ಸಮಯ ಘರ್ಷಣೆಗಳು {1}
 DocType: Opportunity,Next Contact,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ
 DocType: Employee,Employment Type,ಉದ್ಯೋಗ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿಗಳ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಎರಡು alocation ದಾಖಲೆಗಳನ್ನು ಅಡ್ಡಲಾಗಿ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item Group,Default Expense Account,ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಖಾತೆ
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
-DocType: Page,Yes,ಹೌದು
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ಚೀಟಿ ವಿರುದ್ಧ ಕೌಟುಂಬಿಕತೆ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ಡೀಫಾಲ್ಟ್ ಚಟುವಟಿಕೆ ವೆಚ್ಚ ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ - {0}
 DocType: Production Order,Planned Operating Cost,ಯೋಜನೆ ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,ಹೊಸ {0} ಹೆಸರು
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},ಪತ್ತೆ ಮಾಡಿ ಲಗತ್ತಿಸಲಾದ {0} # {1}
 DocType: Job Applicant,Applicant Name,ಅರ್ಜಿದಾರರ ಹೆಸರು
 DocType: Authorization Rule,Customer / Item Name,ಗ್ರಾಹಕ / ಐಟಂ ಹೆಸರು
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item Variant Attribute,Attribute,ಲಕ್ಷಣ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,ವ್ಯಾಪ್ತಿ / ರಿಂದ ಸೂಚಿಸಿ
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,ದಾಖಲಿಸಿದವರು
 DocType: Serial No,Under AMC,ಎಎಂಸಿ ಅಂಡರ್
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ದರ ಬಂದಿಳಿದ ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಿ recalculated ಇದೆ
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,ಕನಿಷ್ಠ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ಅಪ್ಡೇಟ್ ಪೂರ್ಣಗೊಂಡ ಸರಕನ್ನು
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ಸರಣಿ {0} ಈಗಾಗಲೇ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ಗೋದಾಮಿನ ( ಸಾರ್ವಕಾಲಿಕ ದಾಸ್ತಾನು ) ಖಾತೆ ಈ ಖಾತೆಯ ಅಡಿಯಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
 DocType: Customer,Default Taxes and Charges,ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Account,Receivable,ಲಭ್ಯ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
 DocType: Sales Invoice,Supplier Reference,ಸರಬರಾಜುದಾರ ರೆಫರೆನ್ಸ್
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","ಪರಿಶೀಲಿಸಿದರೆ, ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂಗಳನ್ನು BOM ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಪಡೆಯುವ ಪರಿಗಣಿಸಲಾಗುವುದು . ಇಲ್ಲದಿದ್ದರೆ, ಎಲ್ಲಾ ಉಪ ಅಸೆಂಬ್ಲಿ ಐಟಂಗಳನ್ನು ಕಚ್ಚಾವಸ್ತುಗಳನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು ."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
 DocType: Employee Education,Qualification,ಅರ್ಹತೆ
 DocType: Item Price,Item Price,ಐಟಂ ಬೆಲೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ಸಾಬೂನು ಹಾಗೂ ಮಾರ್ಜಕ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,ಚಲನಚಿತ್ರ ಮತ್ತು ವೀಡಿಯೊ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ಬೆಂಬಲ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ಕಂಪನಿ ಗೋದಾಮುಗಳು ಕಾಣೆಯಾಗಿದೆ {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,ಸ್ಟಾಕ್ UOM ಯುಟಿಲಿಟಿ ಬದಲಾಯಿಸಿ
 DocType: POS Profile,Terms and Conditions,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},ದಿನಾಂಕ ಹಣಕಾಸಿನ ವರ್ಷದ ಒಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕ ಭಾವಿಸಿಕೊಂಡು = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ಇಲ್ಲಿ ನೀವು ಎತ್ತರ, ತೂಕ, ಅಲರ್ಜಿ , ವೈದ್ಯಕೀಯ ಇತ್ಯಾದಿ ಕನ್ಸರ್ನ್ಸ್ ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,ಉತ್ಪಾದನೆಗೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟ ಸಲುವಾಗಿ ನಮೂದಿಸಿ
 DocType: Project Task,View Task,ವೀಕ್ಷಿಸಿ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಆರಂಭವಾಗುವ
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಆರಂಭವಾಗುವ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ನಮೂದಿಸಿ
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪಡೆಯಿರಿ
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ಬೆಂಬಲ ಇಮೇಲ್ ಐಡಿ ಸೆಟಪ್ ಒಳಬರುವ ಸರ್ವರ್ . ( ಇ ಜಿ support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ಮೆರುಗು ಕೊಡುವುದರ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ಪ್ರವಾಸ ತಲುಪಬೇಕಾದರೆ ಚೂರುಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ರಚಿಸಿ. ಪ್ಯಾಕೇಜ್ ಸಂಖ್ಯೆ, ಪ್ಯಾಕೇಜ್ ್ಷೀಸಿ ಮತ್ತು ಅದರ ತೂಕ ತಿಳಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 DocType: Sales Invoice Item,Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ಡೇಸ್
 DocType: BOM,Manage cost of operations,ಕಾರ್ಯಾಚರಣೆಗಳ ನಿರ್ವಹಣೆ ವೆಚ್ಚ
 DocType: Features Setup,Item Advanced,ಐಟಂ ವಿಸ್ತೃತ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,ಹಾಟ್ ರೋಲಿಂಗ್
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ಪರೀಕ್ಷಿಸಿದ್ದು ವ್ಯವಹಾರಗಳ ಯಾವುದೇ ""ಸಲ್ಲಿಸಿದ"" ಮಾಡಲಾಗುತ್ತದೆ , ಇಮೇಲ್ ಪಾಪ್ ಅಪ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಒಂದು ಅಟ್ಯಾಚ್ಮೆಂಟ್ ಆಗಿ ವ್ಯವಹಾರ ಜೊತೆ , ಮಾಡಿದರು ವ್ಯವಹಾರ ಸಂಬಂಧಿಸಿದ "" ಸಂಪರ್ಕಿಸಿ "" ಒಂದು ಇಮೇಲ್ ಕಳುಹಿಸಲು ತೆರೆಯಿತು . ಬಳಕೆದಾರ ಅಥವಾ ಜೂನ್ ಜೂನ್ ಇಮೇಲ್ ಕಳುಹಿಸಲು ."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
 DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ವೇತನ
 DocType: Account,Account,ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ಸಿಕ್ ಲೀವ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,ಸಿಕ್ ಲೀವ್
 DocType: Email Digest,Email Digest,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್
 DocType: Delivery Note,Billing Address Name,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,ವ್ಯವಸ್ಥೆ ಬ್ಯಾಲೆನ್ಸ್
-DocType: Workflow,Is Active,ಸಕ್ರಿಯವಾಗಿದೆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,ವ್ಯವಸ್ಥೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ಮೊದಲ ದಾಖಲೆ ಉಳಿಸಿ.
 DocType: Account,Chargeable,ಪೂರಣಮಾಡಬಲ್ಲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,ಬದಲಾವಣೆ ಸಂಕ್ಷೇಪಣ
-DocType: Workflow State,Primary,ಪ್ರಾಥಮಿಕ
 DocType: Expense Claim Detail,Expense Date,ಖರ್ಚು ದಿನಾಂಕ
 DocType: Item,Max Discount (%),ಮ್ಯಾಕ್ಸ್ ಡಿಸ್ಕೌಂಟ್ ( % )
-DocType: Communication,More Information,ಹೆಚ್ಚಿನ ಮಾಹಿತಿ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,ಕೊನೆಯ ಆರ್ಡರ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ಸ್ಫೋಟ
 DocType: Company,Warn,ಎಚ್ಚರಿಕೆ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
 DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Order,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,Recurring Print Format,ಮರುಕಳಿಸುವ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
-DocType: Communication,Series,ಸರಣಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
-DocType: Communication,Email,ಗಾಜುಲೇಪ
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ವ್ಯವಹಾರ ಅಭಿವೃದ್ಧಿ ವ್ಯವಸ್ಥಾಪಕ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ನಿರ್ವಹಣೆ ಭೇಟಿ ಉದ್ದೇಶ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ಅವಧಿ
 ,General Ledger,ಸಾಮಾನ್ಯ ಲೆಡ್ಜರ್
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Features Setup,To get Item Group in details table,ವಿವರಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಐಟಂ ಗುಂಪು ಪಡೆಯಲು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ಮರುರಚನೆ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ಎಚ್ಚಣೆ
 DocType: Sales Invoice,Commission,ಆಯೋಗ
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,10 +3203,10 @@
  {% ವೇಳೆ email_id%} ಇಮೇಲ್: {{email_id}} & lt; br & gt {% endif -%} 
  </ code> </ ಪೂರ್ವ>"
 DocType: Salary Slip Deduction,Default Amount,ಡೀಫಾಲ್ಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
 DocType: Quality Inspection Reading,Quality Inspection Reading,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ ಓದುವಿಕೆ
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 ,Project wise Stock Tracking,ಪ್ರಾಜೆಕ್ಟ್ ಬುದ್ಧಿವಂತ ಸ್ಟಾಕ್ ಟ್ರ್ಯಾಕಿಂಗ್
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
 DocType: Payment Tool,Get Outstanding Vouchers,ಅತ್ಯುತ್ತಮ ರಶೀದಿ ಪಡೆಯಲು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
 DocType: Appraisal,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ಕಾಲ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,ಪರಿಶೀಲಿಸಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,ಪೂರೈಕೆದಾರರಿಂದ ವಿಧವಾಗಿ ಸಮಯ ತಲುಪಿಸಲು
 DocType: Time Log,Hours,ಅವರ್ಸ್
 DocType: Project,Expected Start Date,ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ರೋಲಿಂಗ್
-DocType: ToDo,Priority,ಆದ್ಯತೆ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
-DocType: Dropbox Backup,Dropbox Access Allowed,ಅನುಮತಿಸಲಾಗಿದೆ ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಪ್ರವೇಶ
-DocType: Dropbox Backup,Weekly,ವಾರದ
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,ಉದಾ . smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,ಸ್ವೀಕರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,ಸ್ವೀಕರಿಸಿ
 DocType: Maintenance Visit,Fully Completed,ಸಂಪೂರ್ಣವಾಗಿ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% ಕಂಪ್ಲೀಟ್
 DocType: Employee,Educational Qualification,ಶೈಕ್ಷಣಿಕ ಅರ್ಹತೆ
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ಯಶಸ್ವಿಯಾಗಿ ನಮ್ಮ ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,ಎಲೆಕ್ಟ್ರಾನ್ ಕಿರಣವು ಯಂತ್ರ
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,ಮುಖ್ಯ ವರದಿಗಳು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ ನಮೂದುಗಳನ್ನು ಸಮತೋಲನಗೊಳಿಸುತ್ತದೆ
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,ಮುಖ್ಯ ವರದಿಗಳು
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್
 ,Requested Items To Be Ordered,ಆದೇಶ ಕೋರಲಾಗಿದೆ ಐಟಂಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ನನ್ನ ಆರ್ಡರ್ಸ್
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Time Log,For Manufacturing,ಉತ್ಪಾದನೆ
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ಮೊತ್ತವನ್ನು
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,ಮೊತ್ತವನ್ನು
 DocType: BOM,Manufacturing,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್
 ,Ordered Items To Be Delivered,ನೀಡಬೇಕಾಗಿದೆ ಐಟಂಗಳು ಆದೇಶ
 DocType: Account,Income,ಆದಾಯ
-,Setup Wizard,ಸೆಟಪ್ ವಿಝಾರ್ಡ್
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ಪೂರ್ಣಗೊಳ್ಳುವ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Amount (Company Currency),ಪ್ರಮಾಣ ( ಕರೆನ್ಸಿ ಕಂಪನಿ )
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ಡೈ ಆವರಣ
-DocType: Email Alert,Reference Date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,ಮಾನ್ಯ ಮೊಬೈಲ್ ಸೂಲ ನಮೂದಿಸಿ
 DocType: Budget Detail,Budget Detail,ಬಜೆಟ್ ವಿವರ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ಕಳುಹಿಸುವ ಮೊದಲು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಿ
-DocType: Async Task,Status,ಅಂತಸ್ತು
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},ಸ್ಟಾಕ್ ಮೈ.ವಿ.ವಿ.ಯ ಐಟಂ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ {0}
-DocType: Company History,Year,ವರ್ಷ
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಪ್ಡೇಟ್ ಮಾಡಿ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ಈಗಾಗಲೇ ಕೊಕ್ಕಿನ ಟೈಮ್ ಲಾಗ್ {0}
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
 DocType: Item,Unit of Measure Conversion,ಅಳತೆ ಮತಾಂತರದ ಘಟಕ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ನೌಕರರ ಬದಲಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Naming Series,Help HTML,HTML ಸಹಾಯ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ಸೇವನೆ ಮೇಲೆ {0} ಐಟಂ ದಾಟಿದೆ ಫಾರ್ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ವ್ಯಕ್ತಿ ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಈ ವಿಳಾಸಕ್ಕೆ ಸೇರುತ್ತದೆ .
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,ಮತ್ತೊಂದು ಸಂಬಳ ರಚನೆ {0} ನೌಕರ ಸಕ್ರಿಯವಾಗಿದೆ {1}. ಅದರ ಸ್ಥಿತಿ 'ನಿಷ್ಕ್ರಿಯ' ಮುಂದುವರೆಯಲು ಮಾಡಿ.
 DocType: Purchase Invoice,Contact,ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Features Setup,Exports,ರಫ್ತು
 DocType: Lead,Converted,ಪರಿವರ್ತಿತ
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,ಐಟಂ: {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Cost Center,Budgets,ಬಜೆಟ್
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,ನವೀಕರಿಸಲಾಗಿದೆ
 DocType: Employee,Emergency Contact Details,ತುರ್ತು ಸಂಪರ್ಕ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
 DocType: Delivery Note,To Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},ಖಾತೆ {0} ಹೆಚ್ಚು ಹಣಕಾಸಿನ ವರ್ಷ ಒಂದಕ್ಕಿಂತ ನಮೂದಿಸಲಾದ {1}
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ವಿದ್ಯುತ್ತಿನ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ವಿದ್ಯುತ್ತಿನ
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ಬಳಕೆದಾರ ID ನೌಕರ ಸೆಟ್ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 DocType: Stock Entry,Default Source Warehouse,ಡೀಫಾಲ್ಟ್ ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
-DocType: User,Enabled,ಶಕ್ತಗೊಂಡಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},ನೀವು ನಿಜವಾಗಿಯೂ {0} {1} ತಿಂಗಳು ಮತ್ತು ವರ್ಷದ ಸಂಬಳ ಸ್ಲಿಪ್ ಎಲ್ಲಾ ಸಲ್ಲಿಸಲು ಬಯಸುತ್ತೀರಾ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,ಆಮದು ಚಂದಾದಾರರು
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸಿದ ಮಾಡಬಾರದು
 DocType: Notification Control,Sales Invoice Message,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಸಂದೇಶ
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,ಖಾತೆ {0} ಮುಚ್ಚುವ ರೀತಿಯ ಹೊಣೆಗಾರಿಕೆ / ಇಕ್ವಿಟಿ ಇರಬೇಕು
 DocType: Authorization Rule,Based On,ಆಧರಿಸಿದೆ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ಒಂದು ಮಾನ್ಯ ಇಮೇಲ್ ಐಡಿ ಅಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","ಅನ್ವಯಿಸುವ ಹಾಗೆ ಆರಿಸಿದರೆ ಖರೀದಿ, ಪರೀಕ್ಷಿಸಬೇಕು {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ರಿಯಾಯಿತಿ ಕಡಿಮೆ 100 ಇರಬೇಕು
-DocType: ToDo,Low,ಕಡಿಮೆ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ಸ್ಪಿನ್ನಿಂಗ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು ಅಗತ್ಯವಿದೆ
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Receipt Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,ಚಿತ್ರ ಬಿಡಿಸುವ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,ಹೊಸ ಸುದ್ದಿಪತ್ರ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,ತೋರಿಸು ಬ್ಯಾಲೆನ್ಸ್
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,ರಿವರ್ಟಿಂಗ್ನಿಂದ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
 ,Sales Analytics,ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Manufacturing Settings,Manufacturing Settings,ಉತ್ಪಾದನಾ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ಹೊಸ ಖಾತೆ ಹೆಸರು
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಸರಬರಾಜು ವೆಚ್ಚ
 DocType: Selling Settings,Settings for Selling Module,ಮಾಡ್ಯೂಲ್ ಮಾರಾಟವಾಗುವ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ಗ್ರಾಹಕ ಸೇವೆ
 DocType: Item,Thumbnail,ಥಂಬ್ನೇಲ್
 DocType: Item Customer Detail,Item Customer Detail,ಗ್ರಾಹಕ ಐಟಂ ವಿವರ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,ನಿಮ್ಮ ಇಮೇಲ್ ಅನ್ನು ಖಾತ್ರಿ
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ಆಫರ್ ಅಭ್ಯರ್ಥಿ ಒಂದು ಜಾಬ್.
 DocType: Notification Control,Prompt for Email on Submission of,ಸಲ್ಲಿಕೆ ಇಮೇಲ್ ಪ್ರಾಂಪ್ಟಿನಲ್ಲಿ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ದಿನಗಳ ಹೆಚ್ಚಿನದಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ಪ್ರೋಗ್ರೆಸ್ ಉಗ್ರಾಣದಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಕೆಲಸ
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ನಿರ್ವಾತ ಸೂರು
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-DocType: Contact Us Settings,City,ನಗರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,ಅಲ್ಟ್ರಾಸಾನಿಕ್ ಯಂತ್ರ
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ದೋಷ: ಮಾನ್ಯ ಐಡಿ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,ಐಟಂ {0} ಸೇಲ್ಸ್ ಐಟಂ ಇರಬೇಕು
 DocType: Naming Series,Update Series Number,ಅಪ್ಡೇಟ್ ಸರಣಿ ಸಂಖ್ಯೆ
 DocType: Account,Equity,ಇಕ್ವಿಟಿ
 DocType: Sales Order,Printing Details,ಮುದ್ರಣ ವಿವರಗಳು
 DocType: Task,Closing Date,ದಿನಾಂಕ ಕ್ಲೋಸಿಂಗ್
 DocType: Sales Order Item,Produced Quantity,ಉತ್ಪಾದನೆಯ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,ಇಂಜಿನಿಯರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,ಇಂಜಿನಿಯರ್
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ಹುಡುಕು ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
 DocType: Sales Partner,Partner Type,ಸಂಗಾತಿ ಪ್ರಕಾರ
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise ಡಿಸ್ಕೌಂಟ್
 DocType: Purchase Invoice,Against Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ
 DocType: Production Order,Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Quotation Item,Against Docname,docName ವಿರುದ್ಧ
 DocType: SMS Center,All Employee (Active),ಎಲ್ಲಾ ನೌಕರರ ( ಸಕ್ರಿಯ )
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ
 DocType: Item,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ಸರಣಿ Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
 DocType: Item,Serial Number Series,ಕ್ರಮ ಸಂಖ್ಯೆ ಸರಣಿ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ವೇರ್ಹೌಸ್ ಸ್ಟಾಕ್ ಐಟಂ ಕಡ್ಡಾಯ {0} ಸತತವಾಗಿ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ಚಿಲ್ಲರೆ & ಸಗಟು
 DocType: Issue,First Responded On,ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ಮೊದಲ ಬಳಕೆದಾರ : ನೀವು
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ಮೊದಲ ಬಳಕೆದಾರ : ನೀವು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,ಯಶಸ್ವಿಯಾಗಿ ಮರುಕೌನ್ಸಿಲ್
 DocType: Production Order,Planned End Date,ಯೋಜನೆ ಅಂತಿಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
 DocType: Tax Rule,Validity,ವಾಯಿದೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
-DocType: Page,No,ಇಲ್ಲ
 DocType: BOM,Materials,ಮೆಟೀರಿಯಲ್
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ಪರೀಕ್ಷಿಸಿದ್ದು ಅಲ್ಲ, ಪಟ್ಟಿ ಇದು ಅನ್ವಯಿಸಬಹುದು ಅಲ್ಲಿ ಪ್ರತಿ ಇಲಾಖೆಗಳು ಸೇರಿಸಲಾಗುತ್ತದೆ ಹೊಂದಿರುತ್ತದೆ ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಪೋಸ್ಟ್ ಸಮಯದಲ್ಲಿ ಕಡ್ಡಾಯ
@@ -3764,55 +3451,46 @@
 ,Item Prices,ಐಟಂ ಬೆಲೆಗಳು
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Period Closing Voucher,Period Closing Voucher,ಅವಧಿ ಮುಕ್ತಾಯ ಚೀಟಿ
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,ಬೆಲೆ ಪಟ್ಟಿ ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,ಬೆಲೆ ಪಟ್ಟಿ ಮಾಸ್ಟರ್ .
 DocType: Task,Review Date,ರಿವ್ಯೂ ದಿನಾಂಕ
 DocType: Purchase Invoice,Advance Payments,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಗಳು
-DocType: DocPerm,Level,ಮಟ್ಟ
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,ಸತತವಾಗಿ ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ {0} ಅದೇ ಇರಬೇಕು ಉತ್ಪಾದನೆ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,ಮಿಲ್ಲಿಂಗ್
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ಯಾವುದೇ ಅನುಮತಿ ಪಾವತಿ ಉಪಕರಣವನ್ನು ಬಳಸಲು
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% ರು ಪುನರಾವರ್ತಿತ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ 'ಅಧಿಸೂಚನೆ ಇಮೇಲ್ ವಿಳಾಸಗಳು'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,ಕರೆನ್ಸಿ ಕೆಲವು ಇತರ ಕರೆನ್ಸಿ ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Company,Round Off Account,ಖಾತೆ ಆಫ್ ಸುತ್ತ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ಕನ್ಸಲ್ಟಿಂಗ್
 DocType: Customer Group,Parent Customer Group,ಪೋಷಕ ಗ್ರಾಹಕ ಗುಂಪಿನ
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ಬದಲಾವಣೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ಇ ಜಿ "" ನನ್ನ ಕಂಪನಿ ಎಲ್ಎಲ್ """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
 DocType: Bank Reconciliation Detail,Voucher ID,ಚೀಟಿ ID ಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಪ್ರದೇಶವನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Packing Slip,Gross Weight UOM,ಒಟ್ಟಾರೆ ತೂಕದ UOM
 DocType: Email Digest,Receivables / Payables,ಕರಾರು / ಸಂದಾಯಗಳು
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 DocType: Task,Actual End Date (via Time Logs),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,ಮೂಲ ವೆಚ್ಚ ಸೆಂಟರ್ ನಮೂದಿಸಿ
 DocType: Delivery Note,Print Without Amount,ಪ್ರಮಾಣ ಇಲ್ಲದೆ ಮುದ್ರಿಸು
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
-DocType: User,Last Name,ಕೊನೆಯ ಹೆಸರು
-DocType: Web Page,Left,ಎಡ
-DocType: Event,All Day,ಎಲ್ಲಾ ದಿನ
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Issue,Support Team,ಬೆಂಬಲ ತಂಡ
 DocType: Appraisal,Total Score (Out of 5),ಒಟ್ಟು ಸ್ಕೋರ್ ( 5)
-DocType: Contact Us Settings,State,ರಾಜ್ಯ
 DocType: Batch,Batch,ಗುಂಪು
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ಬ್ಯಾಲೆನ್ಸ್
 DocType: Project,Total Expense Claim (via Expense Claims),ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು (ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ)
-DocType: User,Gender,ಲಿಂಗ
 DocType: Journal Entry,Debit Note,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು
 DocType: Stock Entry,As per Stock UOM,ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ಅವಧಿ
@@ -3826,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,ಮೌಲ್ಯಗಳ ಆಧಾರದ ವ್ಯವಹಾರ ನಿರ್ಬಂಧಿಸಲು ನಿಯಮಗಳನ್ನು ರಚಿಸಿ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ಪರಿಶೀಲಿಸಿದರೆ, ಕೆಲಸ ದಿನಗಳ ಒಟ್ಟು ಯಾವುದೇ ರಜಾದಿನಗಳು ಸೇರಿವೆ , ಮತ್ತು ಈ ಸಂಬಳ ದಿನಕ್ಕೆ ಮೌಲ್ಯವನ್ನು ಕಡಿಮೆಗೊಳಿಸುತ್ತದೆ"
 DocType: Purchase Invoice,Total Advance,ಒಟ್ಟು ಅಡ್ವಾನ್ಸ್
-DocType: Workflow State,User,ಬಳಕೆದಾರ
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ಪಾವತಿ ರಸೀತಿ ಗಮನಿಸಿ
 DocType: Customer,Credit Days Based On,ಕ್ರೆಡಿಟ್ ಡೇಸ್ ರಂದು ಆಧರಿಸಿ
 DocType: Tax Rule,Tax Rule,ತೆರಿಗೆ ನಿಯಮ
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,ಮಾರಾಟ ಸೈಕಲ್ ಉದ್ದಕ್ಕೂ ಅದೇ ದರ ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ವರ್ಕ್ಸ್ಟೇಷನ್ ಕೆಲಸ ಅವಧಿಗಳನ್ನು ಹೊರತುಪಡಿಸಿ ಸಮಯ ದಾಖಲೆಗಳು ಯೋಜನೆ.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
-DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ಚಟುವಟಿಕೆ ಆಧರಿತವಾಗಿ ಬಿಲ್ಲಿಂಗ್ ದರ (ಪ್ರತಿ ಗಂಟೆಗೆ)
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ಅಂಚು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","ಕಂಪನಿ ಇಮೇಲ್ ಐಡಿ ಪತ್ತೆಯಾಗಿಲ್ಲ , ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಮೇಲ್"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 DocType: Production Planning Tool,Filter based on item,ಐಟಂ ಆಧರಿಸಿ ಫಿಲ್ಟರ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Purchase Common,Purchase Common,ಸಾಮಾನ್ಯ ಖರೀದಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ರಿಫ್ರೆಶ್ ಮಾಡಿ.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ಕೆಳಗಿನ ದಿನಗಳಲ್ಲಿ ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ ಮಾಡುವ ಬಳಕೆದಾರರನ್ನು ನಿಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,ಅವಕಾಶದಿಂದ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,ಖಾಲಿಮಾಡುವ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
-DocType: DocField,Default,ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ಗ್ರಾಹಕರನ್ನು ಸೇರ್ಪಡೆ
 DocType: Maintenance Schedule,Schedule,ಕಾರ್ಯಕ್ರಮ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ಈ ವೆಚ್ಚ ಕೇಂದ್ರ ಬಜೆಟ್ ವಿವರಿಸಿ. ವೆಚ್ಚದ ಸೆಟ್, ನೋಡಿ &quot;ಕಂಪನಿ ಪಟ್ಟಿ&quot;"
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",""" ಹೌದು "" ಆಯ್ಕೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಮಾಸ್ಟರ್ ನೋಡಬಹುದು ಈ ಐಟಂ ಪ್ರತಿ ಘಟಕದ ಒಂದು ಅನನ್ಯ ಗುರುತನ್ನು ನೀಡುತ್ತದೆ ."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
 DocType: Employee,Education,ಶಿಕ್ಷಣ
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
 DocType: Address,Office,ಕಚೇರಿ
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವರದಿಗಳು
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ಒಂದು ತೆರಿಗೆ ಖಾತೆಯನ್ನು ರಚಿಸಲು
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,ಬ್ಯಾಚ್ ಇನ್ವೆಂಟರಿ
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,ಬ್ಯಾಚ್ ಇನ್ವೆಂಟರಿ
 DocType: Employee,Contract End Date,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ
 DocType: Sales Order,Track this Sales Order against any Project,ಯಾವುದೇ ಪ್ರಾಜೆಕ್ಟ್ ವಿರುದ್ಧ ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರ್ಯಾಕ್
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ಮೇಲೆ ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ ( ತಲುಪಿಸಲು ಬಾಕಿ ) ಮಾರಾಟ ಆದೇಶಗಳನ್ನು ಪುಲ್
-DocType: DocShare,Document Type,ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಗೆ
 DocType: Deduction Type,Deduction Type,ಕಡಿತವು ಕೌಟುಂಬಿಕತೆ
 DocType: Attendance,Half Day,ಅರ್ಧ ದಿನ
 DocType: Pricing Rule,Min Qty,ಮಿನ್ ಪ್ರಮಾಣ
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",ಬ್ಯಾಚ್ ಸೂಲ ಜೊತೆ ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ದಾಖಲೆಗಳಲ್ಲಿ ಐಟಂಗಳನ್ನು ಟ್ರ್ಯಾಕ್. &quot;ಮೆಚ್ಚಿನ ಇಂಡಸ್ಟ್ರಿ: ರಾಸಾಯನಿಕಗಳು&quot;
 DocType: GL Entry,Transaction Date,TransactionDate
 DocType: Production Plan Item,Planned Qty,ಯೋಜಿಸಿದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ಒಟ್ಟು ತೆರಿಗೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ಪ್ರಮಾಣ (ಪ್ರಮಾಣ ತಯಾರಿಸಲ್ಪಟ್ಟ) ಕಡ್ಡಾಯ
 DocType: Stock Entry,Default Target Warehouse,ಡೀಫಾಲ್ಟ್ ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Purchase Invoice,Net Total (Company Currency),ನೆಟ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
 DocType: Notification Control,Purchase Receipt Message,ಖರೀದಿ ರಸೀತಿ ಸಂದೇಶ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ಹೆಚ್ಚು
 DocType: Production Order,Actual Start Date,ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Sales Order,% of materials delivered against this Sales Order,ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,ರೆಕಾರ್ಡ್ ಐಟಂ ಚಳುವಳಿ .
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,ಸುದ್ದಿಪತ್ರ ಪಟ್ಟಿ ಚಂದಾದಾರ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,ಸೇವೆ
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 ,Monthly Salary Register,ಮಾಸಿಕ ವೇತನ ನೋಂದಣಿ
-apps/frappe/frappe/website/template.py +140,Next,ಮುಂದೆ
 DocType: Warranty Claim,If different than customer address,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
 DocType: BOM Operation,BOM Operation,BOM ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ವಿದ್ಯುದ್ಮೆರಗು
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ಹಿಂದಿನ ಸಾಲು ಪ್ರಮಾಣ ರಂದು
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ಸಾಲು {0}: ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,ಪೇಯ್ಡ್ ಒಟ್ಟು
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,ಪೇಯ್ಡ್ ಒಟ್ಟು
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,ಟೈಮ್ ಲಾಗ್ ಬಿಲ್ ಮಾಡಬಹುದಾದ ಅಲ್ಲ
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ಖರೀದಿದಾರ
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,ಖರೀದಿದಾರ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,ನಿವ್ವಳ ವೇತನ ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,ಕೈಯಾರೆ ವಿರುದ್ಧ ರಶೀದಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,ಕೈಯಾರೆ ವಿರುದ್ಧ ರಶೀದಿ ನಮೂದಿಸಿ
 DocType: SMS Settings,Static Parameters,ಸ್ಥಾಯೀ ನಿಯತಾಂಕಗಳನ್ನು
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಸಾಮೂಹಿಕ SMS ಕಳುಹಿಸಿ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,ತೆರಿಗೆ ಅಥವಾ ಶುಲ್ಕ ಪರಿಗಣಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ಕ್ರಾಸ್ ರೋಲಿಂಗ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ repacked ಎಂದು ಐಟಂ
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: Purchase Invoice,Next Date,NextDate
 DocType: Employee Education,Major/Optional Subjects,ಮೇಜರ್ / ಐಚ್ಛಿಕ ವಿಷಯಗಳ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,ಯಂತ್ರಗಳ
 DocType: Sales Invoice Item,Drop Ship,ಡ್ರಾಪ್ ಹಡಗು
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ಇಲ್ಲಿ ನೀವು ಮೂಲ , ಹೆಂಡತಿ ಮತ್ತು ಮಕ್ಕಳ ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗ ಕುಟುಂಬ ವಿವರಗಳು ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
 DocType: Hub Settings,Seller Name,ಮಾರಾಟಗಾರ ಹೆಸರು
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,ಮೂಟೆಕಟ್ಟು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ನೀವು ಮುಂದುವರೆಯುವುದಕ್ಕೆ ಮುಂಚಿತವಾಗಿ ರೂಪ ಉಳಿಸಬೇಕು
 DocType: Item Attribute,Numeric Values,ಸಂಖ್ಯೆಯ ಮೌಲ್ಯಗಳನ್ನು
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ರೂಟ್ ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು unadusted ಪ್ರಮಾಣದ ಹೆಚ್ಚಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ರೂಟ್ ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು unadusted ಪ್ರಮಾಣದ ಹೆಚ್ಚಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Manufacturing Settings,Allow Production on Holidays,ರಜಾ ದಿನಗಳಲ್ಲಿ ಪ್ರೊಡಕ್ಷನ್ ಅವಕಾಶ
 DocType: Sales Order,Customer's Purchase Order Date,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,ಬಂಡವಾಳ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,ಒಂದು CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
-DocType: Dropbox Backup,Send Backups to Dropbox,ಡ್ರಾಪ್ಬಾಕ್ಸ್ ಬ್ಯಾಕ್ಅಪ್ಗಳು ಕಳುಹಿಸಿ
 DocType: Purchase Order,To Receive and Bill,ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಬಿಲ್
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ಡಿಸೈನರ್
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
 DocType: Serial No,Delivery Details,ಡೆಲಿವರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,ಪ್ರಮಾಣ ಈ ಮಟ್ಟಕ್ಕಿಂತಲೂ ಕಳಗೆ ಬಿದ್ದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಚಿಸಲು
 ,Item-wise Purchase Register,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ನೋಂದಣಿ
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟದ ಹೊಂದಿಸಲು, ಐಟಂ ಖರೀದಿ ಐಟಂ ಅಥವಾ ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಐಟಂ ಇರಬೇಕು"
 ,Supplier Addresses and Contacts,ಸರಬರಾಜುದಾರ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
-DocType: Dropbox Backup,Send Notifications To,ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ
 DocType: Employee,Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Short biography for website and other publications.,ವೆಬ್ಸೈಟ್ ಮತ್ತು ಇತರ ಪ್ರಕಟಣೆಗಳು ಕಿರು ಜೀವನಚರಿತ್ರೆ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ನೌಕರ ಸಂಬಳ ರಚನೆ ರಚಿಸಲು ದಯವಿಟ್ಟು {0}

diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 9d33caa..66e009c 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,급여 모드
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","당신은 계절에 따라 추적 할 경우, 월별 분포를 선택합니다."
 DocType: Employee,Divorced,이혼
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,경고 : 동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,경고 : 동일한 항목을 복수 회 입력되었습니다.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,항목은 이미 동기화
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,항목은 트랜잭션에 여러 번 추가 할 수
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,재 방문 {0}이 보증 청구를 취소하기 전에 취소
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,소비자 제품
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,소비자 제품
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,첫 번째 파티 유형을 선택하십시오
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,가열 냉각
 DocType: Item,Customer Items,고객 항목
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,계정 {0} : 부모 계정은 {1} 원장이 될 수 없습니다
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com에 항목을 게시
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,승인자를 남겨
 DocType: Sales Partner,Dealer,상인
 DocType: Employee,Rented,대여
-DocType: About Us Settings,Website,웹사이트
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,다짐 플러스 소결
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* 트랜잭션에서 계산됩니다.
 DocType: Purchase Order,Customer Contact,고객 연락처
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,자료 요청에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,자료 요청에서
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 트리
 DocType: Job Applicant,Job Applicant,구직자
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,더 이상 결과가 없습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,법률
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,법률
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},실제의 형태 세금은 행의 항목 요금에 포함 할 수없는 {0}
 DocType: C-Form,Customer,고객
 DocType: Purchase Receipt Item,Required By,에 의해 필요한
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,시리즈가 업데이트
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,바느질
 DocType: Pricing Rule,Apply On,에 적용
 DocType: Item Price,Multiple Item prices.,여러 품목의 가격.
 ,Purchase Order Items To Be Received,수신 될 구매 주문 아이템
 DocType: SMS Center,All Supplier Contact,모든 공급 업체에게 연락 해주기
 DocType: Quality Inspection Reading,Parameter,매개변수
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,새로운 허가 신청
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 번호 {0} : 속도가 동일해야합니다 {1} {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,새로운 허가 신청
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,은행 어음
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1고객 현명한 항목 코드를 유지하고 자신의 코드 사용이 옵션에 따라이를 검색 할 수 있도록
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,쇼 변형
-DocType: Sales Invoice Item,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,수량
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,재고 있음
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,생산 계획 항목
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,새로운 POS의 프로필을
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,건강 관리
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
 DocType: Purchase Invoice,Monthly,월
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),지급 지연 (일)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,이메일 주소
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,방어
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,이메일 주소
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
 DocType: Company,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,행 번호 {0} :
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,행 번호 {0} :
 DocType: Delivery Note,Vehicle No,차량 없음
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,가격리스트를 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,목공
 DocType: Production Order Operation,Work In Progress,진행중인 작업
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D 프린팅
 DocType: Employee,Holiday List,휴일 목록
 DocType: Time Log,Time Log,소요시간 로그
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,회계사
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,회계사
 DocType: Cost Center,Stock User,스톡 사용자
 DocType: Company,Phone No,전화 번호
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","활동 로그, 결제 시간을 추적하기 위해 사용할 수있는 작업에 대한 사용자에 의해 수행."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},새로운 {0} : # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},새로운 {0} : # {1}
 ,Sales Partners Commission,영업 파트너위원회
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,약어는 5 개 이상의 문자를 가질 수 없습니다
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",값이 {0} {1} 항목으로 변형 \에서 제거 할 수없는 속성이 속성으로 존재한다.
-DocType: Print Settings,Classic,기본
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,이 루트 계정 및 편집 할 수 없습니다.
 DocType: BOM,Operations,운영
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},에 대한 할인의 기준으로 권한을 설정할 수 없습니다 {0}
 DocType: Bin,Quantity Requested for Purchase,구매를 위해 요청한 수량
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","두 개의 열, 이전 이름에 대해 하나의 새로운 이름을 하나 .CSV 파일 첨부"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","두 개의 열, 이전 이름에 대해 하나의 새로운 이름을 하나 .CSV 파일 첨부"
 DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,KG
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,KG
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,작업에 대한 열기.
 DocType: Item Attribute,Increment,증가
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,창고를 선택합니다 ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,광고
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,광고
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Employee,Married,결혼 한
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 DocType: Payment Reconciliation,Reconcile,조정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,식료품 점
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,은행 입장 확인
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,연금 펀드
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,계정 유형이 창고인 경우 창고는 필수입니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","확인 순서를 반복하는 경우, 반복 중지하거나 적절한 종료 날짜를 넣어 선택 취소"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간 속도 / 60) * 실제 작업 시간
 DocType: SMS Log,SMS Log,SMS 로그
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용
-DocType: Blog Post,Guest,손님
 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
 DocType: Lead,Interested,관심
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,자재 명세서 (BOM)
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,열기
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,열기
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},에서 {0}에 {1}
 DocType: Item,Copy From Item Group,상품 그룹에서 복사
 DocType: Journal Entry,Opening Entry,항목 열기
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} 필수입니다
 DocType: Stock Entry,Additional Costs,추가 비용
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
 DocType: Lead,Product Enquiry,제품 문의
-DocType: Standard Reply,Owner,소유권자
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,첫 번째 회사를 입력하십시오
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,처음 회사를 선택하세요
 DocType: Employee Education,Under Graduate,대학원에서
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,대상에
 DocType: BOM,Total Cost,총 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,리밍
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,활동 로그 :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,부동산
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,부동산
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,거래명세표
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,제약
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
 DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Employee,Mr,씨
-DocType: Custom Script,Client,클라이언트
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
 DocType: Naming Series,Prefix,접두사
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,소모품
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,소모품
 DocType: Upload Attendance,Import Log,가져 오기 로그
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,보내기
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,연봉
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,연봉
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,재고 비용
 DocType: Newsletter,Email Sent?,이메일 전송?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,시간 표시 로그
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
 DocType: Delivery Note,Installation Status,설치 상태
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
 DocType: Item,Supply Raw Materials for Purchase,공급 원료 구매
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,{0} 항목을 구매 상품이어야합니다
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  선택한 기간의 모든 날짜와 직원 조합은 기존의 출석 기록과 함께, 템플릿에 올 것이다"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,견적서를 제출 한 후 업데이트됩니다.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","행에있는 세금을 포함하려면 {0} 항목의 요금에, 행의 세금은 {1}도 포함되어야한다"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,스트레이트
 DocType: BOM Replace Tool,New BOM,새로운 BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,일괄 결제를위한 시간 로그.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,중력식 주조
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,뉴스 레터는 이미 전송 된
 DocType: Lead,Request Type,요청 유형
 DocType: Leave Application,Reason,이유
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,방송
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,실행
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,시스템 관리자가 될 것이다 첫 번째 사용자 (이 나중에 변경할 수 있습니다).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,방송
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,실행
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,시스템 관리자가 될 것이다 첫 번째 사용자 (이 나중에 변경할 수 있습니다).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,작업의 세부 사항은 실시.
 DocType: Serial No,Maintenance Status,유지 보수 상태
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,품목 및 가격
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,품목 및 가격
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},날짜에서 회계 연도 내에 있어야합니다.날짜 가정 = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,평가 대상 직원 선정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},코스트 센터 {0}에 속하지 않는 회사 {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,가격리스트는 구매 또는 판매에 적용해야합니다
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},설치 날짜는 항목에 대한 배달 날짜 이전 할 수 없습니다 {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),가격 목록 요금에 할인 (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,시작
-DocType: User,First Name,이름
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,풀 몰드 주조
 DocType: Offer Letter,Select Terms and Conditions,이용 약관 선택
 DocType: Production Planning Tool,Sales Orders,판매 주문
 DocType: Purchase Taxes and Charges,Valuation,평가
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,은행 계좌
 DocType: Leave Type,Allow Negative Balance,음의 균형이 허용
 DocType: Selling Settings,Default Territory,기본 지역
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,텔레비전
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,텔레비전
 DocType: Production Order Operation,Updated via 'Time Log','소요시간 로그'를 통해 업데이트 되었습니다.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},계정 {0}이 회사에 속하지 않는 {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
 DocType: Sales Invoice,Is Opening Entry,개시 항목
-DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우) 
+DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,창고가 필요한 내용은 이전에 제출
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,에 수신
 DocType: Sales Partner,Reseller,리셀러
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,회사를 입력하십시오
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
 DocType: Newsletter List,Total Subscribers,총 구독자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,담당자 이름
+,Contact Name,담당자 이름
 DocType: Production Plan Item,SO Pending Qty,SO 보류 수량
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,구입 요청합니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,두 주택
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,연간 잎
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,연간 잎
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정을하세요
 DocType: Time Log,Will be updated when batched.,일괄 처리 할 때 업데이트됩니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,행 {0} : 확인하시기 바랍니다이 계정에 대한 '사전인가'{1}이 사전 항목 인 경우.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},웨어 하우스는 {0}에 속하지 않는 회사 {1}
-DocType: Bulk Email,Message,메시지
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
-DocType: Dropbox Backup,Dropbox Access Key,보관 용 액세스 키
 DocType: Payment Tool,Reference No,참조 번호
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,연간
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
 DocType: Material Request Item,Min Order Qty,최소 주문 수량
 DocType: Lead,Do Not Contact,연락하지 말라
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,모든 반복 송장을 추적하는 고유 ID.그것은 제출에 생성됩니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,소프트웨어 개발자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,소프트웨어 개발자
 DocType: Item,Minimum Order Qty,최소 주문 수량
 DocType: Pricing Rule,Supplier Type,공급 업체 유형
 DocType: Item,Publish in Hub,허브에 게시
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,와이어 브러싱
 DocType: Employee,Relation,관계
 DocType: Shipping Rule,Worldwide Shipping,해외 배송
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,고객의 확정 주문.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
 DocType: Maintenance Schedule,Generate Schedule,일정을 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,비용 헤드
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,충전 유형을 먼저 선택하세요
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,최근
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,최대 5 자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,언어를 선택하십시오
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,최대 5 자
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",생산 오더에 대한 시간 로그의 생성을 사용하지 않습니다. 작업은 생산 오더에 대해 추적 할 수 없다
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,의 변형
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,항목 {0} 서비스 상품이어야합니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
-DocType: DocType,Administrator,관리자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,레이저 드릴링
-DocType: Stock UOM Replace Utility,New Stock UOM,새로운 재고 UOM
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,순환 참조 오류
-DocType: Communication,Closed,닫힘
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다.
 DocType: Lead,Industry,산업
 DocType: Employee,Job Profile,작업 프로필
 DocType: Newsletter,Newsletter,뉴스레터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,하이드로 포밍
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,네킹
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
 DocType: Journal Entry,Multi Currency,멀티 통화
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,항목이 업데이트됩니다
-DocType: Async Task,System Manager,시스템 관리자
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
 DocType: Sales Invoice Item,Delivery Note,상품 수령증
-DocType: Dropbox Backup,Allow Dropbox Access,보관 용 접근이 허용
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,세금 설정
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Workstation,Rent Cost,임대 비용
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,월 및 연도를 선택하세요
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,회사 이메일
 DocType: GL Entry,Debit Amount in Account Currency,계정 통화에서 직불 금액
 DocType: Shipping Rule,Valid for Countries,나라 유효한
-DocType: Workflow State,Refresh,새로 고침
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","통화, 전환율, 수입 총 수입 총계 등과 같은 모든 수입 관련 분야는 구매 영수증, 공급 업체 견적, 구매 송장, 구매 주문 등을 사용할 수 있습니다"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,고려 총 주문
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,필드 값을 '이달의 날 반복'을 입력하십시오
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,필드 값을 '이달의 날 반복'을 입력하십시오
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,고객 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, 배달 참고, 구매 송장, 생산 주문, 구매 주문, 구입 영수증, 견적서, 판매 주문, 재고 항목, 작업 표에서 사용 가능"
 DocType: Item Tax,Tax Rate,세율
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,항목 선택
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,항목 선택
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","항목 : {0} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,구매 영수증을 제출해야합니다
-DocType: Stock UOM Replace Utility,Current Stock UOM,현재 재고 UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,귀하의 이메일 주소
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,첨부 파일을 참조하시기 바랍니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,워터 제트 절단
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,이미 설치 완료!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,이미 설치 완료!
 ,Finished Goods,완성품
 DocType: Delivery Note,Instructions,지침
 DocType: Quality Inspection,Inspected By,검사
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,고객 및 공급 업체에 대한 계정을 생성하지 마십시오. 그들은 고객 / 공급 업체 마스터에서 직접 생성됩니다.
 DocType: Currency Exchange,Currency Exchange,환전
 DocType: Purchase Invoice Item,Item Name,품명
+DocType: Authorization Rule,Approving User  (above authorized value),(승인 된 값 이상) 사용 승인
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,신용 잔액
 DocType: Employee,Widowed,과부
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","""재고 없음""이다 요구되는 항목은 예상 수량 및 최소 주문 수량에 따라 모든 창고를 고려"
@@ -380,22 +348,21 @@
 ,Purchase Register,회원에게 구매
 DocType: Landed Cost Item,Applicable Charges,적용 요금
 DocType: Workstation,Consumable Cost,소모품 비용
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,의료
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,의료
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,잃는 이유
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,튜브 구슬
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 DocType: Employee,Single,미혼
 DocType: Issue,Attachment,첨부
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,예산은 그룹의 비용 센터를 설정할 수 없습니다
 DocType: Account,Cost of Goods Sold,매출원가
 DocType: Purchase Invoice,Yearly,매년
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,비용 센터를 입력 해주십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,비용 센터를 입력 해주십시오
 DocType: Journal Entry Account,Sales Order,판매 주문
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,평균. 판매 비율
 DocType: Purchase Order,Start date of current order's period,현재 주문의 기간의 시작 날짜
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},양 행의 일부가 될 수 없습니다 {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},양 행의 일부가 될 수 없습니다 {0}
 DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
 DocType: Delivery Note,% Installed,% 설치
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,첫 번째 회사 이름을 입력하십시오
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,IS 그룹
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,자동으로 FIFO를 기반으로 제 직렬 설정
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,체크 공급 업체 송장 번호 특이 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,열 성형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,슬리 팅
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','사건 번호 사람' '사건 번호에서'보다 작을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,비영리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,비영리
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,시작되지 않음
 DocType: Lead,Channel Partner,채널 파트너
 DocType: Account,Old Parent,이전 부모
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,휴일 마스터.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,쉘 성형
 DocType: Material Request Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
 DocType: BOM,Costing,원가 계산
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,총 수량
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,범위
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,증권 및 예치금
 DocType: Features Setup,Imports,수입
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,접착제 접합
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Job Opening,Description of a Job Opening,구인에 대한 설명
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,오늘 보류 활동
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,출석 기록.
 DocType: Bank Reconciliation,Journal Entries,저널 항목
 DocType: Sales Order Item,Used for Production Plan,생산 계획에 사용
-DocType: System Settings,Loading...,로딩 중...
-DocType: DocField,Password,비밀번호
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,융착 모델링
 DocType: Manufacturing Settings,Time Between Operations (in mins),(분에) 작업 사이의 시간
 DocType: Customer,Buyer of Goods and Services.,제품 및 서비스의 구매자.
 DocType: Journal Entry,Accounts Payable,미지급금
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,가입자 추가
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""존재하지 않습니다"
 DocType: Pricing Rule,Valid Upto,유효한 개까지
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,직접 수입
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,관리 책임자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,관리 책임자
 DocType: Payment Tool,Received Or Paid,수신 또는 유료
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,회사를 선택하세요
 DocType: Stock Entry,Difference Account,차이 계정
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,화장품
-DocType: DocField,Type,종류
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
-DocType: Communication,Subject,주제
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 ,Serial No Warranty Expiry,일련 번호 보증 만료
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,항목
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,관리 하도급
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,새 UOM 형 정수 가져야 할 필요는 없다
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,관리 하도급
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,가구 및 비품
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,가격 목록 통화는 회사의 기본 통화로 변환하는 속도에
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,자료 요구
 DocType: Company,Delete Company Transactions,회사 거래 삭제
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,항목 {0} 항목을 구매하지 않습니다
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} '알림 \
  이메일 주소'에서 잘못된 이메일 주소입니다"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,총 결제 올해 :
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,총 결제 올해 :
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","삭제할 수 없습니다 시리얼 번호 {0}, 그것은 증권 거래에 사용되는로"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),결산 (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),결산 (CR)
 DocType: Serial No,Warranty Period (Days),보증 기간 (일)
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 ,Pending Qty,보류 수량
 DocType: Job Applicant,Thread HTML,스레드 HTML
 DocType: Company,Ignore,무시
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS는 다음 번호로 전송 : {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
 DocType: Pricing Rule,Valid From,유효
 DocType: Sales Invoice,Total Commission,전체위원회
 DocType: Pricing Rule,Sales Partner,영업 파트너
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** 예산 월간 배분 ** 귀하의 비즈니스에 계절성이있는 경우 월별로 예산을 배분하는 데 도움이됩니다.
 
 ,이 분포를 사용하여 예산을 분배 ** 비용 센터에서 **이 ** 월간 배포를 설정하려면 **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,송장 테이블에있는 레코드 없음
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
-DocType: About Us Settings,Website Manager,웹 사이트 관리자
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,회계 연도의 시작 날짜는 회계 연도 종료 날짜보다 크지 않아야한다
 DocType: Warranty Claim,Resolution,해상도
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},배달 : {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,결제 및 배송 상태
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,이전
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,판매로 돌아 가기
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,당신이 생산 오더를 생성하려는 선택 판매 주문.
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,급여항목
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,잠재 고객의 데이터베이스.
+DocType: Authorization Rule,Customer or Item,고객 또는 상품
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,고객 데이터베이스입니다.
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,텀블링
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,이미 다른 UOM 일부 거래 (들)을 만들었 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 당신은 다른 기본 UOM을 사용하여 새 항목을 작성해야합니다.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
-DocType: Event,Wednesday,수요일
 DocType: Sales Invoice,Customer's Vendor,고객의 공급 업체
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,생산 오더는 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,제안서 작성
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,제안서 작성
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,또 다른 판매 사람 {0} 같은 직원 ID 존재
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},음의 재고 오류 ({6}) 항목에 대한 {0} 창고 {1}에 {2} {3}에서 {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,기본 원가 계산 속도
 DocType: Maintenance Schedule,Maintenance Schedule,유지 보수 일정
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","그런 가격 설정 규칙은 고객에 따라 필터링됩니다, 고객 그룹, 지역, 공급 업체, 공급 업체 유형, 캠페인, 판매 파트너 등"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,보관 용 파이썬 모듈을 설치하십시오
 DocType: Employee,Passport Number,여권 번호
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,관리자
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,구매 영수증에서
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,관리자
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,구매 영수증에서
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
 DocType: SMS Settings,Receiver Parameter,수신기 매개 변수
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'을 바탕으로'와 '그룹으로는'동일 할 수 없습니다
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,에
-apps/frappe/frappe/templates/base.html +145,Please enter email address,이메일 주소를 입력하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,형성 엔드 튜브
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,그룹으로 변환
 DocType: Activity Cost,Activity Type,활동 유형
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,고정 일
 DocType: Sales Invoice,Packing List,패킹리스트
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,공급 업체에 제공 구매 주문.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,출판
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,출판
 DocType: Activity Cost,Projects User,프로젝트 사용자
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,소비
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} 송장 정보 테이블에서 찾을 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0} {1} 송장 정보 테이블에서 찾을 수 없습니다
 DocType: Company,Round Off Cost Center,비용 센터를 반올림
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,유지 보수 방문은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 DocType: Material Request,Material Transfer,재료 이송
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),오프닝 (박사)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},게시 타임 스탬프 이후 여야 {0}
-apps/frappe/frappe/config/setup.py +59,Settings,설정
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,착륙 비용 세금 및 요금
 DocType: Production Order Operation,Actual Start Time,실제 시작 시간
 DocType: BOM Operation,Operation Time,운영 시간
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,더
 DocType: Pricing Rule,Sales Manager,영업 관리자
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,이름
 DocType: Journal Entry,Write Off Amount,금액을 상각
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,굽힘
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,사용자에게 허용
 DocType: Journal Entry,Bill No,청구 번호
 DocType: Purchase Invoice,Quarterly,분기 별
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,항목의 세부 사항을 입력하십시오
 DocType: Purchase Receipt,Other Details,기타 세부 사항
 DocType: Account,Accounts,회계
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,마케팅
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,스트레이트 전단
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,마케팅
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,자신의 시리얼 NOS에 따라 판매 및 구매 문서의 항목을 추적 할 수 있습니다.또한이 제품의 보증 내용을 추적하는 데 사용 할 수 있습니다.
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,거부 창고 regected 항목에 대해 필수입니다
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 DocType: Employee,Provide email id registered in company,이메일 ID는 회사에 등록 제공
 DocType: Hub Settings,Seller City,판매자 도시
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Offer Letter Term,Offer Letter Term,편지 기간을 제공
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,나무의 종류
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
 DocType: Sales Invoice,Commission Rate (%),위원회 비율 (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","바우처를 피해 유형은 판매 주문의 하나, 견적서 또는 분개해야합니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,환율을 찾을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,항공 우주
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,반갑습니다
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,항공 우주
 DocType: Journal Entry,Credit Card Entry,신용 카드 입력
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,태스크 주제
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,제품은 공급 업체에서 받았다.
-DocType: Communication,Open,열기
 DocType: Lead,Campaign Name,캠페인 이름
 ,Reserved,예약
 DocType: Purchase Order,Supply Raw Materials,공급 원료
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} 재고 상품이 아닌
 DocType: Mode of Payment Account,Default Account,기본 계정
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
-DocType: Contact Us Settings,Address Title,주소 제목
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
 ,Sales Person Target Variance Item Group-Wise,영업 사원 대상 분산 상품 그룹 와이즈
-DocType: Dropbox Backup,Daily,매일
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,기존 거래와 계정 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,기존 거래와 계정 원장으로 변환 할 수 없습니다
 DocType: Delivery Note,Customer's Purchase Order No,고객의 구매 주문 번호
 DocType: Employee,Cell Number,핸드폰 번호
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,자동 자료 요청 생성
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,상실
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,에너지
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,월급의 문.
 DocType: Item Group,Website Specifications,웹 사이트 사양
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,새 계정
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,회계 항목은 리프 노드에 대해 할 수있다. 그룹에 대한 항목은 허용되지 않습니다.
-DocType: ToDo,High,높음
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
-DocType: User,Male,남성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},상품에 필요한 구매 영수증 번호 {0}
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,판매 캠페인.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -698,7 +638,7 @@
  #### 열 
 
  1에 대한 설명.계산 유형 : 
- -이에있을 수 있습니다 ** 순 (즉, 기본 금액의 합계입니다) ** 총.
+ -이에있을 수 있습니다 ** 순 (즉, 기본 금액의 합계입니다) ** 총.
  - ** 이전 행 전체 / 양 **에 (누적 세금이나 요금에 대한).이 옵션을 선택하면 세금 금액 또는 총 (세금 테이블에) 이전 행의 비율로 적용됩니다.
  - ** 실제 (언급 한 바와 같이).
  2.계정 머리 :이 세금 
@@ -715,10 +655,9 @@
 DocType: Address,Personal,개인의
 DocType: Expense Claim Detail,Expense Claim Type,비용 청구 유형
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,쇼핑 카트에 대한 기본 설정
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","분개 {0}이이 송장 사전으로 당겨 할 필요가있는 경우 {1}, 확인 주문에 연결되어 있습니다."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,생명 공학
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","분개 {0}이이 송장 사전으로 당겨 할 필요가있는 경우 {1}, 확인 주문에 연결되어 있습니다."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,생명 공학
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,사무실 유지 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,헤밍
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Account,Liability,부채
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Process Payroll,Send Email,이메일 보내기
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,아무 권한이 없습니다
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},항목을 통해 전달되지 않기 때문에 &#39;업데이트 재고&#39;확인 할 수없는 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,내 송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,내 송장
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,검색된 직원이 없습니다
 DocType: Purchase Order,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;판매 시점&quot;기능을 사용하려면
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
-DocType: Comment,Reference Name,참조명(Reference Name)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: Sales Invoice Item,Target Warehouse,목표웨어 하우스
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,예상 배달 날짜 이전에 판매 주문 날짜가 될 수 없습니다
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
 DocType: Production Order,Item To Manufacture,제조 품목에
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,영구 금형 주조
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} 상태가 {2}이다
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,지불하기 위해 구매
 DocType: Sales Order Item,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
 DocType: Newsletter,Newsletter Manager,뉴스 관리자
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;열기&#39;
 DocType: Notification Control,Delivery Note Message,납품서 메시지
 DocType: Expense Claim,Expenses,비용
 DocType: Item Variant Attribute,Item Variant Attribute,항목 변형 특성
 ,Purchase Receipt Trends,구매 영수증 동향
 DocType: Appraisal,Select template from which you want to get the Goals,당신이 목표를 취득하는 템플릿을 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,연구 개발 (R & D)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,연구 개발 (R & D)
 ,Amount to Bill,빌 금액
 DocType: Company,Registration Details,등록 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,STAKING
 DocType: Item,Re-Order Qty,다시 주문 수량
 DocType: Leave Block List Date,Leave Block List Date,차단 목록 날짜를 남겨
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},에 보낼 예정 {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,주식의 자세한 사항
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,프로젝트 값
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,판매 시점
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},앞으로 수행 할 수 없습니다 {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","계정 잔액이 이미 신용, 당신이 설정할 수 없습니다 '직불 카드'로 '밸런스 것은이어야'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","계정 잔액이 이미 신용, 당신이 설정할 수 없습니다 '직불 카드'로 '밸런스 것은이어야'"
 DocType: Account,Balance must be,잔고는
 DocType: Hub Settings,Publish Pricing,가격을 게시
 DocType: Notification Control,Expense Claim Rejected Message,비용 청구 거부 메시지
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,못 박는
 ,Available Qty,사용 가능한 수량
 DocType: Purchase Taxes and Charges,On Previous Row Total,이전 행에 총
 DocType: Salary Slip,Working Days,작업 일
 DocType: Serial No,Incoming Rate,수신 속도
 DocType: Packing Slip,Gross Weight,총중량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.
 DocType: HR Settings,Include holidays in Total no. of Working Days,없이 총 휴일을 포함. 작업 일의
 DocType: Job Applicant,Hold,길게 누르기
 DocType: Employee,Date of Joining,가입 날짜
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,보기 가입자
 DocType: Purchase Invoice Item,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,블라스트
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,통화 환율 마스터.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
 DocType: Salary Slip,Leave Encashment Amount,현금화 금액을 남겨주
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},일련 번호 {0} 항목에 속하지 않는 {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,필요한 수량
 DocType: Bank Reconciliation,Total Amount,총액
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,인터넷 게시
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,인터넷 게시
 DocType: Production Planning Tool,Production Orders,생산 주문
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,잔고액
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,판매 가격 목록
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,항목을 동기화 게시
-DocType: GL Entry,Account Currency,계정 통화
+DocType: Bank Reconciliation,Account Currency,계정 통화
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,회사에 라운드 오프 계정을 언급 해주십시오
 DocType: Purchase Receipt,Range,범위
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Features Setup,Item Barcode,상품의 바코드
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Address,Shop,상점
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정은 자동으로 POS 송장에 업데이트됩니다.
 DocType: Employee,Permanent Address Is,영구 주소는
 DocType: Production Order Operation,Operation completed for how many finished goods?,작업이 얼마나 많은 완제품 완료?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,브랜드
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,브랜드
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,수당에 {0} 항목에 대한 교차에 대한 {1}.
 DocType: Employee,Exit Interview Details,출구 인터뷰의 자세한 사항
 DocType: Item,Is Purchase Item,구매 상품입니다
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,구매 주문 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,간접 소득
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,설정 지불 금액 = 뛰어난 금액
-DocType: Contact Us Settings,Address Line 1,1 호선 주소
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,변화
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,회사 명
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,변화
+,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,전송 항목 선택
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,모든 도움말 동영상 목록보기
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,검사가 입금 된 은행 계좌 머리를 선택합니다.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,사용자가 거래 가격리스트 평가를 편집 할 수
 DocType: Pricing Rule,Max Qty,최대 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,화학
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,화학
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 DocType: Process Payroll,Select Payroll Year and Month,급여 연도와 월을 선택
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",해당 그룹 (일반적으로 펀드의 응용 프로그램&gt; 현재 자산&gt; 은행 계좌로 이동 유형) 자녀 추가 클릭하여 (새 계정 만들기 &quot;은행&quot;
 DocType: Workstation,Electricity Cost,전기 비용
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
-DocType: Comment,Unsubscribed,가입되어 있지 않음
 DocType: Opportunity,Walk In,걷다
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,finanial 코스트 센터의 나무.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,옮겨진
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,화이트
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,화이트
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 DocType: Purchase Invoice,Get Advances Paid,선불지급
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,사진 첨부
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,확인
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,사진 첨부
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,확인
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
-DocType: Workflow State,Stop,중지
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,오류가 발생했습니다.한 가지 가능한 이유는 양식을 저장하지 않은 경우입니다.문제가 계속되면 support@erpnext.com에 문의하시기 바랍니다.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,내 장바구니
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},주문 유형 중 하나 여야합니다 {0}
 DocType: Lead,Next Contact Date,다음 접촉 날짜
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,열기 수량
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,스톡 옵션
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,스톡 옵션
 DocType: Journal Entry Account,Expense Claim,비용 청구
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},대한 수량 {0}
 DocType: Leave Application,Leave Application,휴가 신청
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,할당 도구를 남겨
 DocType: Leave Block List,Leave Block List Dates,차단 목록 날짜를 남겨
 DocType: Company,If Monthly Budget Exceeded (for expense account),월별 예산 (비용 계정) 초과하는 경우
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,트리밍
 DocType: Workstation,Net Hour Rate,인터넷 시간 비율
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,비용 구매 영수증 랜디
 DocType: Company,Default Terms,기본 약관
 DocType: Packing Slip Item,Packing Slip Item,패킹 슬립 상품
 DocType: POS Profile,Cash/Bank Account,현금 / 은행 계좌
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,제출
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,할인
 DocType: Features Setup,Purchase Discounts,할인 구매
 DocType: Workstation,Wages,임금
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 DocType: Serial No,Creation Document No,작성 문서 없음
 DocType: Issue,Issue,이슈
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","항목 변형의 속성. 예를 들어, 크기, 색상 등"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,계정은 회사와 일치하지 않습니다
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","항목 변형의 속성. 예를 들어, 크기, 색상 등"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP 창고
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
 DocType: BOM Operation,Operation,작업
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,배송 상태
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,영업 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,표준 구매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,표준 구매
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,재고 항목 만들기
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
 DocType: Item,Default Supplier,기본 공급 업체
 DocType: Manufacturing Settings,Over Production Allowance Percentage,생산 수당 비율 이상
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,시간 로그를 통해 업데이트
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,평균 연령
 DocType: Opportunity,Your sales person who will contact the customer in future,미래의 고객에게 연락 할 것이다 판매 사람
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,공급 업체의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,공급 업체의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
 DocType: Company,Default Currency,기본 통화
 DocType: Contact,Enter designation of this Contact,이 연락처의 지정을 입력
-DocType: Contact Us Settings,Address,주소
 DocType: Expense Claim,From Employee,직원에서
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,경고 : 시스템이 {0} {1} 제로의 항목에 대한 금액 때문에 과다 청구를 확인하지 않습니다
 DocType: Journal Entry,Make Difference Entry,차액 항목을 만듭니다
 DocType: Upload Attendance,Attendance From Date,날짜부터 출석
 DocType: Appraisal Template Goal,Key Performance Area,핵심 성과 지역
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,교통비
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,교통비
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,그리고 일년
 DocType: Email Digest,Annual Expense,연간 비용
 DocType: SMS Center,Total Characters,전체 문자
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-양식 송장 세부 정보
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,결제 조정 송장
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,공헌 %
 DocType: Item,website page link,웹 사이트 페이지 링크
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,처음의 사용을 위해 시스템을 준비하자.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,당신의 참고를위한 회사의 등록 번호.세금 번호 등
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,시간 로그를 선택하고 새로운 판매 송장을 만들 제출.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,선행 견적서
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,요청하지 마
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,관리
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,관리
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,시간 시트를위한 활동의 종류
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,투자 주조
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},직불 카드 또는 신용 금액 중 하나가 필요합니다 {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,활성화
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,푸른
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,푸른
 DocType: Purchase Invoice,Is Return,돌아가요
 DocType: Price List Country,Price List Country,가격 목록 나라
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,또한 노드는 '그룹'형태의 노드에서 생성 할 수 있습니다
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS 프로필 {0} 이미 사용자 생성 : {1}과 회사 {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM 변환 계수
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,적층 객체 제조
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,공급 업체 데이터베이스.
 DocType: Account,Balance Sheet,대차 대조표
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,형성 스트레치
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,귀하의 영업 사원은 고객에게 연락이 날짜에 알림을 얻을 것이다
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,세금 및 기타 급여 공제.
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
 DocType: Account,Warehouse,창고
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
 ,Purchase Order Items To Be Billed,청구 할 수 구매 주문 아이템
 DocType: Purchase Invoice Item,Net Rate,인터넷 속도
 DocType: Purchase Invoice Item,Purchase Invoice Item,구매 송장 항목
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,재고 원장 항목 및 GL 항목은 선택 구매 영수증에 대한 재 게시된다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,항목 1
 DocType: Holiday,Holiday,휴일
-DocType: Event,Saturday,토요일
 DocType: Leave Control Panel,Leave blank if considered for all branches,모든 지점을 고려하는 경우 비워 둡니다
 ,Daily Time Log Summary,매일 시간 로그 요약
-DocType: DocField,Label,라벨
 DocType: Payment Reconciliation,Unreconciled Payment Details,비 조정 지불 세부 사항
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
 DocType: Lead,Call,전화
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'항목은'비워 둘 수 없습니다
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,직원 설정
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","그리드 """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,첫 번째 접두사를 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,연구
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,연구
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Contact,User ID,사용자 ID
-DocType: Communication,Sent,발신
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,보기 원장
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
-DocType: Communication,Delivery Status,배달 상태
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 DocType: Production Order,Manufacture against Sales Order,판매 주문에 대해 제조
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,항목 설명
 DocType: Payment Tool,Payment Mode,지불 방식
 DocType: Purchase Invoice,Is Recurring,반복인가
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,직접 금속 레이저 소결
 DocType: Purchase Order,Supplied Items,제공 한
 DocType: Production Order,Qty To Manufacture,제조하는 수량
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,구매주기 동안 동일한 비율을 유지
 DocType: Opportunity Item,Opportunity Item,기회 상품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,임시 열기
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,직원 허가 밸런스
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
 DocType: Address,Address Type,주소 유형
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,작은
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,작은
 DocType: Employee,Employee Number,직원 수
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},케이스 없음 (들)을 이미 사용.케이스 없음에서 시도 {0}
 ,Invoiced Amount (Exculsive Tax),송장에 청구 된 금액 (Exculsive 세금)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,항목 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,계정 머리 {0} 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,녹색
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,녹색
 DocType: Item,Auto re-order,자동 재 주문
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,전체 달성
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,전체 달성
 DocType: Employee,Place of Issue,문제의 장소
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,계약직
-DocType: Report,Disabled,사용 안함
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,계약직
+DocType: Email Digest,Add Quote,견적 추가
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,농업
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,귀하의 제품이나 서비스
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
 DocType: Journal Entry Account,Purchase Order,구매 주문
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,이름이 필요합니다
 DocType: Purchase Invoice,Recurring Type,경상 유형
 DocType: Address,City/Town,도시
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,{0} 항목 하위 계약 품목이어야합니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,자본 장비
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,예상 배달 날짜는 계획 시작 날짜보다 적은이다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,총 발신
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","전용 ""값을""0 또는 빈 값을 발송하는 규칙 조건이있을 수 있습니다"
 DocType: Authorization Rule,Transaction,거래
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,참고 :이 비용 센터가 그룹입니다.그룹에 대한 회계 항목을 만들 수 없습니다.
-apps/frappe/frappe/config/desk.py +7,Tools,Tools (도구)
 DocType: Item,Website Item Groups,웹 사이트 상품 그룹
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,생산 주문 번호 재고 항목 목적의 제조를위한 필수입니다
 DocType: Purchase Invoice,Total (Company Currency),총 (회사 통화)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,분개
 DocType: Workstation,Workstation Name,워크 스테이션 이름
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
 DocType: Sales Partner,Target Distribution,대상 배포
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,비고
 DocType: Salary Slip,Bank Account No.,은행 계좌 번호
 DocType: Naming Series,This is the number of the last created transaction with this prefix,이것은이 접두사를 마지막으로 생성 된 트랜잭션의 수입니다
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},상품에 필요한 평가 비율 {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},상품에 필요한 평가 비율 {0}
 DocType: Quality Inspection Reading,Reading 8,8 읽기
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수 있습니다, 제로"
 DocType: Purchase Invoice,Taxes and Charges Calculation,세금과 요금 계산
 DocType: BOM Operation,Workstation,워크스테이션
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,하드웨어
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,하드웨어
 DocType: Attendance,HR Manager,HR 관리자
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,회사를 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,권한 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,데이터가 없습니다
 DocType: Appraisal Template Goal,Appraisal Template Goal,평가 템플릿 목표
 DocType: Salary Slip,Earning,당기순이익
 DocType: Payment Tool,Party Account Currency,파티 계정 환율
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,사이에있는 중복 조건 :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,총 주문액
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,음식
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,음식
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,고령화 범위 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,당신은 제출 된 생산 오더에 대해 한 번 로그를 만들 수 있습니다
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","상대에게 뉴스 레터, 리드."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,작업은 비워 둘 수 없습니다.
 ,Delivered Items To Be Billed,청구에 전달 항목
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
-DocType: DocField,Description,내용
 DocType: Authorization Rule,Average Discount,평균 할인
-DocType: Letter Head,Is Default,기본값
 DocType: Address,Utilities,"공공요금(전기세, 상/하 수도세, 가스세, 쓰레기세 등)"
 DocType: Purchase Invoice Item,Accounting,회계
 DocType: Features Setup,Features Setup,기능 설정
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,보기 제공 편지
-DocType: Communication,Communication,통신 네트워크
 DocType: Item,Is Service Item,서비스 항목은
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
 DocType: Activity Cost,Projects,프로젝트
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,회계 연도를 선택하십시오
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},에서 {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,재고 유지
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 DocType: Leave Control Panel,Leave blank if considered for all designations,모든 지정을 고려하는 경우 비워 둡니다
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,날짜 시간에서
 DocType: Email Digest,For Company,회사
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,직원 설정
 ,Batch-Wise Balance History,배치 식 밸런스 역사
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,할일 목록
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,도제
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,도제
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,음의 수량은 허용되지 않습니다
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","문자열로 품목 마스터에서 가져온이 분야에 저장 세금 세부 테이블.
  세금 및 요금에 사용"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,랜싱
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","계정이 동결 된 경우, 항목은 제한된 사용자에게 허용됩니다."
 DocType: Email Digest,Bank Balance,은행 잔액
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,직원 {0}과 달를 찾지 활성 급여 구조 없다
 DocType: Job Opening,"Job profile, qualifications required etc.","필요한 작업 프로필, 자격 등"
 DocType: Journal Entry Account,Account Balance,계정 잔액
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,거래에 대한 세금 규칙.
 DocType: Rename Tool,Type of document to rename.,이름을 바꿀 문서의 종류.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,우리는이 품목을 구매
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,우리는이 품목을 구매
 DocType: Address,Billing,청구
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,플랜지
-DocType: Bulk Email,Not Sent,보낼 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,형성 폭발
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),총 세금 및 요금 (회사 통화)
 DocType: Shipping Rule,Shipping Account,배송 계정
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0}받는 사람에게 보낼 예정
 DocType: Quality Inspection,Readings,읽기
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,서브 어셈블리
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,서브 어셈블리
 DocType: Shipping Rule Condition,To Value,값
 DocType: Supplier,Stock Manager,재고 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,분석자
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,분석자
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},행 {0} : 할당 된 양 {1} 미만 또는 JV의 양에 해당한다 {2}
 DocType: Item,Inventory,재고
 DocType: Features Setup,"To enable ""Point of Sale"" view",보기 &quot;판매 시점&quot;을 사용하려면
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,결제는 빈 카트에 할 수 없다
 DocType: Item,Sales Details,판매 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,피닝
 DocType: Opportunity,With Items,항목
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,수량에
 DocType: Notification Control,Expense Claim Rejected,비용 청구는 거부
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
 DocType: Item Attribute,Item Attribute,항목 속성
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,통치 체제
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,항목 변형
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,통치 체제
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,항목 변형
 DocType: Company,Services,Services (서비스)
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),전체 ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),전체 ({0})
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
 DocType: Sales Invoice,Source,소스
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,지불 테이블에있는 레코드 없음
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,회계 연도의 시작 날짜
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,지불 테이블에있는 레코드 없음
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,회계 연도의 시작 날짜
 DocType: Employee External Work History,Total Experience,총 체험
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,카운터 싱크
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,포장 명세서 (들) 취소
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,포장 명세서 (들) 취소
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,화물 운송 및 포워딩 요금
 DocType: Material Request Item,Sales Order No,판매 주문 번호
 DocType: Item Group,Item Group Name,항목 그룹 이름
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,촬영
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,촬영
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,제조에 대한 전송 재료
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,대표 조사
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","항목에 대한 구매 비율 : {0}을 (를) 찾을 수 없습니다, 회계 항목 (비용)을 예약하는 데 필요합니다.구매 가격 목록에 대해 품목 가격을 언급하시기 바랍니다."
 DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),추가 할인 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},오류 : {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},오류 : {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,계정 차트에서 새로운 계정을 생성 해주세요.
 DocType: Maintenance Visit,Maintenance Visit,유지 보수 방문
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,고객 지원> 고객 그룹> 지역
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,창고에서 사용 가능한 배치 수량
 DocType: Time Log Batch Detail,Time Log Batch Detail,시간 로그 일괄 처리 정보
-DocType: Workflow State,Tasks,작업
 DocType: Landed Cost Voucher,Landed Cost Help,착륙 비용 도움말
-DocType: Event,Tuesday,화요일
 DocType: Leave Block List,Block Holidays on important days.,중요한 일에 블록 휴일.
 ,Accounts Receivable Summary,미수금 요약
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},이미 기간 동안 직원 {1}에 할당 된 유형 {0}에 대한 잎 {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
 DocType: UOM,UOM Name,UOM 이름
-DocType: Top Bar Item,Target,목표물
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,기부액
 DocType: Sales Invoice,Shipping Address,배송 주소
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,이 도구를 업데이트하거나 시스템에 재고의 수량 및 평가를 해결하는 데 도움이됩니다.이것은 전형적으로 시스템 값 것과 실제로 존재 창고를 동기화하는 데 사용된다.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,브랜드 마스터.
-DocType: ToDo,Due Date,마감일
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,브랜드 마스터.
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,상자
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,조직
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,상자
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,조직
 DocType: Monthly Distribution,Monthly Distribution,예산 월간 배분
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
 DocType: Production Plan Sales Order,Production Plan Sales Order,생산 계획 판매 주문
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0}에 대한 회계 항목 만 통화 할 수있다 : {1}
 DocType: Pricing Rule,Pricing Rule,가격 규칙
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,노칭
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},행 번호 {0} : 반환 항목 {1}에 존재하지 않는 {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,은행 계정
 ,Bank Reconciliation Statement,은행 계정 조정 계산서
 DocType: Address,Lead Name,리드 명
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,열기 주식 대차
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,열기 주식 대차
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} 한 번만 표시합니다
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,은행에 반영되지 금액
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,은행에 반영되지 금액
 DocType: Quality Inspection Reading,Reading 4,4 읽기
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,회사 경비 주장한다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,원심 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,자장 보조 마무리
 DocType: Company,Default Holiday List,휴일 목록 기본
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,재고 부채
 DocType: Purchase Receipt,Supplier Warehouse,공급 업체 창고
 DocType: Opportunity,Contact Mobile No,연락처 모바일 없음
 DocType: Production Planning Tool,Select Sales Orders,선택 판매 주문
 ,Material Requests for which Supplier Quotations are not created,공급 업체의 견적이 생성되지 않는 자재 요청
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,바코드를 사용하여 항목을 추적 할 수 있습니다.당신은 상품의 바코드를 스캔하여 납품서 및 판매 송장에서 항목을 입력 할 수 있습니다.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,마크 배달로
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,마크 배달로
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,견적 확인
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
 DocType: SMS Center,Receiver List,수신기 목록
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}보기
 DocType: Salary Structure Deduction,Salary Structure Deduction,급여 구조 공제
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,선택적 레이저 소결
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,성공적인 가져 오기!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},수량 이하이어야한다 {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),나이 (일)
 DocType: Quotation Item,Quotation Item,견적 상품
 DocType: Account,Account Name,계정 이름
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,날짜에서 날짜보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,일련 번호 {0} 수량 {1} 일부가 될 수 없습니다
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,공급 유형 마스터.
 DocType: Purchase Order Item,Supplier Part Number,공급 업체 부품 번호
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,추가
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,변환 속도는 0 또는 1이 될 수 없습니다
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} 취소 또는 정지
 DocType: Accounts Settings,Credit Controller,신용 컨트롤러
 DocType: Delivery Note,Vehicle Dispatch Date,차량 파견 날짜
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,구입 영수증 {0} 제출되지
 DocType: Company,Default Payable Account,기본 지불 계정
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","이러한 운송 규칙, 가격 목록 등 온라인 쇼핑 카트에 대한 설정"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,설치 완료
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0} % 청구
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,예약 수량
 DocType: Party Account,Party Account,당 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,인적 자원
 DocType: Lead,Upper Income,위 소득
 DocType: Journal Entry Account,Debit in Company Currency,회사 통화에서 직불
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,내 문제
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,기본값
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,행 {0} : 지불 금액은 음수가 될 수 없습니다
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,보도 피팅
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 DocType: Payment Reconciliation,Payments,지불
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,핫 프레스 등방
-DocType: ToDo,Medium,중간
 DocType: Budget Detail,Budget Allocated,할당 된 예산
 DocType: Journal Entry,Entry Type,항목 유형
 ,Customer Credit Balance,고객 신용 잔액
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
 DocType: Quotation,Term Details,용어의 자세한 사항
 DocType: Manufacturing Settings,Capacity Planning For (Days),(일)에 대한 용량 계획
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
 DocType: Warranty Claim,Warranty Claim,보증 청구
 ,Lead Details,리드 세부 사항
-DocType: Authorization Rule,Approving User,승인 사용자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,단조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,도금
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
 DocType: Pricing Rule,Applicable For,에 적용
 DocType: Bank Reconciliation,From Date,날짜
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,온라인 경매
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,온라인 경매
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,수량이나 평가 비율 또는 둘 중 하나를 지정하십시오
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","회사, 월, 회계 연도는 필수입니다"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,자료 요청이 재고 항목을 확인하는 데 사용
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,항목의 하나의 단위.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',시간 로그 일괄 {0} '제출'해야
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,모든 재고 이동을위한 회계 항목을 만듭니다
 DocType: Leave Allocation,Total Leaves Allocated,할당 된 전체 잎
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},행 없음에 필요한 창고 {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,유효한 회계 연도 시작 및 종료 날짜를 입력하십시오
 DocType: Employee,Date Of Retirement,은퇴 날짜
 DocType: Upload Attendance,Get Template,양식 구하기
 DocType: Address,Postal,우편의
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,채광
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,수지 주조
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,먼저 {0}을 선택하십시오.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},텍스트 {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},텍스트 {0}
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
 DocType: Stock Entry,Material Receipt,소재 영수증
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,제품
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,제품
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},파티 형 파티는 채권 / 채무 계정이 필요합니다 {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","이 항목이 변형을 갖는다면, 이는 판매 주문 등을 선택할 수 없다"
 DocType: Lead,Next Contact By,다음 접촉
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},수량이 항목에 대한 존재하는 창고 {0} 삭제할 수 없습니다 {1}
 DocType: Quotation,Order Type,주문 유형
 DocType: Purchase Invoice,Notification Email Address,알림 전자 메일 주소
 DocType: Payment Tool,Find Invoices to Match,일치하는 송장을 찾기
 ,Item-wise Sales Register,상품이 많다는 판매 등록
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","예)  ""XYZ 국립 은행 """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","예)  ""XYZ 국립 은행 """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,이 세금은 기본 요금에 포함되어 있습니까?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,총 대상
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,총 대상
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,장바구니가 활성화됩니다
 DocType: Job Applicant,Applicant for a Job,작업에 대한 신청자
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,생성 된 NO 생성 주문하지
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,직원의 급여 전표 {0}이 (가) 이미 이번 달 생성
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,직원의 급여 전표 {0}이 (가) 이미 이번 달 생성
 DocType: Stock Reconciliation,Reconciliation JSON,화해 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Sales Invoice Item,Batch No,배치 없음
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,주요 기능
-DocType: DocPerm,Delete,삭제
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,변체
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},새로운 {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,정지 순서는 취소 할 수 없습니다.취소 멈추지.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
 DocType: Sales Team,Contribution to Net Total,인터넷 전체에 기여
 DocType: Sales Invoice Item,Customer's Item Code,고객의 상품 코드
 DocType: Stock Reconciliation,Stock Reconciliation,재고 조정
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,작업을 위해 신청자.
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
-DocType: Country,Country,국가
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,주소
-DocType: Communication,Received,획득
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},중복 된 일련 번호는 항목에 대해 입력 {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,배송 규칙의 조건
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,항목은 생산 주문을 할 수 없습니다.
-DocType: DocField,Attach Image,이미지 첨부
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),이 패키지의 순 중량. (항목의 순 중량의 합으로 자동으로 계산)
-DocType: Stock Reconciliation Item,Leave blank if no change,어떤 변화가있는 경우 비워 둡니다
 DocType: Sales Order,To Deliver and Bill,제공 및 법안
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,제조 시간 로그.
 DocType: Item,Apply Warehouse-wise Reorder Level,창고 현명한 재주문 수준을 적용
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,작업 시간에 로그인합니다.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,지불
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,지불
 DocType: Production Order Operation,Actual Time and Cost,실제 시간과 비용
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},최대의 자료 요청은 {0} 항목에 대한 {1}에 대해 수행 할 수있는 판매 주문 {2}
 DocType: Employee,Salutation,인사말
-DocType: Communication,Rejected,거부
 DocType: Pricing Rule,Brand,상표
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,판매 상품을 동시에 번들.
 DocType: Sales Order Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
 DocType: Quality Inspection Reading,Reading 10,10 읽기
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","귀하의 제품이나 제품을 구매하거나 판매하는 서비스를 나열합니다.당신이 시작할 때 항목 그룹, 측정 및 기타 속성의 단위를 확인해야합니다."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","귀하의 제품이나 제품을 구매하거나 판매하는 서비스를 나열합니다.당신이 시작할 때 항목 그룹, 측정 및 기타 속성의 단위를 확인해야합니다."
 DocType: Hub Settings,Hub Node,허브 노드
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,중복 항목을 입력했습니다.조정하고 다시 시도하십시오.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,값이 {0} 속성에 대한 {1} 유효한 항목 목록에 존재하지 않는 속성 값
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,준
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,준
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,만료
 DocType: Packing Slip,To Package No.,번호를 패키지에
-DocType: DocType,System,시스템
 DocType: Warranty Claim,Issue Date,발행일
 DocType: Activity Cost,Activity Cost,활동 비용
 DocType: Purchase Receipt Item Supplied,Consumed Qty,소비 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,통신
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,통신
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 DocType: Payment Tool,Make Payment Entry,지불 항목을 만듭니다
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
 ,Sales Invoice Trends,견적서 동향
 DocType: Leave Application,Apply / Approve Leaves,잎을 승인 / 적용
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,에 대한
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"충전 타입 또는 '이전 행 전체', '이전 행의 양에'인 경우에만 행을 참조 할 수 있습니다"
 DocType: Sales Order Item,Delivery Warehouse,배송 창고
 DocType: Stock Settings,Allowance Percent,대손 충당금 비율
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","해당 법령에가로 선택된 경우 판매, 확인해야합니다 {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,공급 업체의 견적 상품
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,급여 구조를 확인
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,양털 깎기
 DocType: Item,Has Variants,변형을 가지고
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,새로운 판매 송장을 작성하는 '판매 송장 확인'버튼을 클릭합니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,포장 및 라벨링
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,회사 마스터 및 글로벌 기본값에 기본 통화를 지정하십시오
-DocType: Dropbox Backup,Dropbox Access Secret,보관 용 액세스 비밀
 DocType: Purchase Invoice,Recurring Invoice,경상 송장
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,프로젝트 관리
 DocType: Supplier,Supplier of Goods or Services.,제품 또는 서비스의 공급.
 DocType: Budget Detail,Fiscal Year,회계 연도
 DocType: Cost Center,Budget,예산
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,달성
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,달성
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,지역 / 고객
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,예) 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},행 {0} : 할당 된 양 {1} 미만 또는 잔액을 청구하기 위해 동일합니다 {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,예) 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},행 {0} : 할당 된 양 {1} 미만 또는 잔액을 청구하기 위해 동일합니다 {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,당신이 판매 송장을 저장 한 단어에서 볼 수 있습니다.
 DocType: Item,Is Sales Item,판매 상품입니다
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,항목 그룹 트리
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} 항목을 직렬 제의 체크 항목 마스터에 대한 설정이 없습니다
 DocType: Maintenance Visit,Maintenance Time,유지 시간
 ,Amount to Deliver,금액 제공하는
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,제품 또는 서비스
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,오류가 발생했습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,태핑
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,제품 또는 서비스
 DocType: Naming Series,Current Value,현재 값
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} 생성
 DocType: Delivery Note Item,Against Sales Order,판매 주문에 대해
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
 DocType: Website Item Group,Website Item Group,웹 사이트 상품 그룹
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,관세 및 세금
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,참고 날짜를 입력 해주세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,참고 날짜를 입력 해주세요
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 지급 항목으로 필터링 할 수 없습니다 {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,웹 사이트에 표시됩니다 항목 표
 DocType: Purchase Order Item Supplied,Supplied Qty,납품 수량
 DocType: Material Request Item,Material Request Item,자료 요청 항목
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,항목 그룹의 나무.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,항목 그룹의 나무.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
 ,Item-wise Purchase History,상품 현명한 구입 내역
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,빨간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,빨간
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,행 번호 {0} : 작업 {1} 생산에서 완제품 {2} 수량에 대한 완료되지 않은 주문 # {3}.시간 로그를 통해 동작 상태를 업데이트하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,항목 UOM을 변경합니다.
 DocType: Quality Inspection Reading,Acceptance Criteria,허용 기준
 DocType: Item Attribute,Attribute Name,속성 이름
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},{0} 항목을 판매하거나 서비스 상품이어야 {1}
 DocType: Item Group,Show In Website,웹 사이트에 표시
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,그릅
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,그릅
 DocType: Task,Expected Time (in hours),(시간) 예상 시간
 ,Qty to Order,수량은 주문
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","다음의 서류 배달 참고, 기회, 자료 요청, 상품, 구매 주문, 구매 바우처, 구매자 영수증, 견적, 견적서, 제품 번들, 판매 주문, 일련 번호에 브랜드 이름을 추적"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,표 지우기
 DocType: Features Setup,Brands,상표
 DocType: C-Form Invoice Detail,Invoice No,아니 송장
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,구매 발주
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,구매 발주
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","휴가 밸런스 이미 캐리 전달 미래두고 할당 레코드되었습니다로서, {0} 전에 취소 / 적용될 수 없다 남겨 {1}"
 DocType: Activity Cost,Costing Rate,원가 계산 속도
 ,Customer Addresses And Contacts,고객 주소 및 연락처
 DocType: Employee,Resignation Letter Date,사직서 날짜
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,설정 아님
-DocType: Communication,Date,날짜
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,시스템이 설치되는 동안 잠시 기다려 주세요. 이 작업은 약간의 시간이 걸릴 수 있습니다.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 역할 '지출 승인'을 가지고 있어야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,페어링
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,페어링
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 DocType: Maintenance Schedule Detail,Actual Date,실제 날짜
 DocType: Item,Has Batch No,일괄 없음에게 있습니다
 DocType: Delivery Note,Excise Page Number,소비세의 페이지 번호
 DocType: Employee,Personal Details,개인 정보
 ,Maintenance Schedules,관리 스케줄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,엠보싱
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","생산 주문이 항목에 대한 만들 수 있습니다, 그것은 재고 품목 수 있어야합니다."
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,합류
-DocType: Authorization Rule,Above Value,상위값
 ,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
 DocType: Purchase Order,Delivered,배달
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),작업 메일 ID의 설정받는 서버. (예를 들어 jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,총 할당 된 잎 {0} 작을 수 없습니다 기간 동안 이미 승인 된 잎 {1}보다
 DocType: Journal Entry,Accounts Receivable,미수금
 ,Supplier-Wise Sales Analytics,공급 업체 현명한 판매 분석
 DocType: Address Template,This format is used if country specific format is not found,국가 별 형식을 찾을 수없는 경우이 형식이 사용됩니다
-DocType: Custom Field,Custom,사용자 지정
 DocType: Production Order,Use Multi-Level BOM,사용 다중 레벨 BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,사출 성형
 DocType: Bank Reconciliation,Include Reconciled Entries,조정 됨 항목을 포함
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,재무계정트리
 DocType: Leave Control Panel,Leave blank if considered for all employee types,모든 직원의 유형을 고려하는 경우 비워 둡니다
 DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준으로
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,품목은 {1} 자산 상품이기 때문에 계정 {0} 형식의 '고정 자산'이어야합니다
 DocType: HR Settings,HR Settings,HR 설정
-apps/frappe/frappe/config/setup.py +130,Printing,인쇄
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,당신이 허가를 신청하는 날 (들)은 휴일입니다.당신은 휴가를 신청할 필요가 없습니다.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,손목
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,약어는 비워둘수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,스포츠
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,실제 총
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,단위
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,사이트 구성에 보관 액세스 키를 설정하십시오
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,단위
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,회사를 지정하십시오
 ,Customer Acquisition and Loyalty,고객 확보 및 충성도
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,당신이 거부 된 품목의 재고를 유지하고 창고
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,재무 년에 종료
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,재무 년에 종료
 DocType: POS Profile,Price List,가격리스트
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,비용 청구
 DocType: Issue,Support,기술 지원
-DocType: Authorization Rule,Approving Role,승인 역할
 ,BOM Search,BOM 검색
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),닫기 (+ 합계 열기)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,회사에 통화를 지정하십시오
 DocType: Workstation,Wages per hour,시간당 임금
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},일괄 재고 잔액은 {0}이 될 것이다 부정적인 {1}의 창고에서 상품 {2}에 대한 {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","등 일련 NOS, POS 등의 표시 / 숨기기 기능"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},통관 날짜 행 체크인 날짜 이전 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},통관 날짜 행 체크인 날짜 이전 할 수 없습니다 {0}
 DocType: Salary Slip,Deduction,공제
 DocType: Address Template,Address Template,주소 템플릿
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,인용
 DocType: Salary Slip,Total Deduction,총 공제
 DocType: Quotation,Maintenance User,유지 보수 사용자
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,비용 업데이트
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,비용 업데이트
 DocType: Employee,Date of Birth,생일
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,항목 {0}이 (가) 이미 반환 된
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** 회계 연도는 ** 금융 년도 나타냅니다.모든 회계 항목 및 기타 주요 거래는 ** ** 회계 연도에 대해 추적됩니다.
 DocType: Opportunity,Customer / Lead Address,고객 / 리드 주소
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,작업 설명
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,작업 설명
 DocType: Purchase Order Item,Qty as per Stock UOM,수량 재고 UOM 당
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,데이터가 유효한 CSV 파일을 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,코팅
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","판매 캠페인을 추적.리드, 인용문을 추적, 판매 주문 등 캠페인에서 투자 수익을 측정합니다."
 DocType: Expense Claim,Approver,승인자
 ,SO Qty,SO 수량
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","재고 항목이 창고에 존재 {0}, 따라서 당신은 다시 할당하거나 창고를 수정할 수 없습니다"
 DocType: Appraisal,Calculate Total Score,총 점수를 계산
 DocType: Supplier Quotation,Manufacturing Manager,제조 관리자
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
-apps/erpnext/erpnext/hooks.py +84,Shipments,선적
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,딥 성형
-DocType: Purchase Order,To be delivered to customer,고객에게 전달 될
+apps/erpnext/erpnext/hooks.py +68,Shipments,선적
+DocType: Purchase Order Item,To be delivered to customer,고객에게 전달 될
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,소요시간 로그 상태는 제출해야합니다.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,일련 번호 {0} 어떤 창고에 속하지 않는
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,설정
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,행 #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,행 #
 DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서
 DocType: Pricing Rule,Supplier,공급 업체
 DocType: C-Form,Quarter,지구
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,기타 비용
 DocType: Global Defaults,Default Company,기본 회사
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {0}에 대한 청구 되요 수 없습니다 {1}보다 {2}.과다 청구가 재고 설정에서 설정하시기 바랍니다 허용하려면
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {0}에 대한 청구 되요 수 없습니다 {1}보다 {2}.과다 청구가 재고 설정에서 설정하시기 바랍니다 허용하려면
 DocType: Employee,Bank Name,은행 이름
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-위
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,{0} 사용자가 비활성화되어 있습니다
 DocType: Leave Application,Total Leave Days,총 허가 일
-DocType: Journal Entry Account,Credit in Account Currency,계정 통화 신용
 DocType: Email Digest,Note: Email will not be sent to disabled users,참고 : 전자 메일을 사용할 사용자에게 전송되지 않습니다
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Currency Exchange,From Currency,통화와
-DocType: DocField,Name,이름
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,시스템에 반영되지 금액
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},상품에 필요한 판매 주문 {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,시스템에 반영되지 금액
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,기타사항
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,기타사항
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.
 DocType: POS Profile,Taxes and Charges,세금과 요금
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","제품 또는, 구입 판매 또는 재고 유지 서비스."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,완료
-DocType: Web Form,Select DocType,문서 종류 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,꿰매
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,은행
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,은행
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,일정을 얻기 위해 '생성 일정'을 클릭 해주세요
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,새로운 비용 센터
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,새로운 비용 센터
 DocType: Bin,Ordered Quantity,주문 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","예) ""빌더를 위한  빌드 도구"""
 DocType: Quality Inspection,In Process,처리 중
 DocType: Authorization Rule,Itemwise Discount,Itemwise 할인
 DocType: Purchase Order Item,Reference Document Type,참조 문서 유형
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
 DocType: Account,Fixed Asset,고정 자산
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,직렬화 된 재고
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,직렬화 된 재고
 DocType: Activity Type,Default Billing Rate,기본 결제 요금
 DocType: Time Log Batch,Total Billing Amount,총 결제 금액
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,채권 계정
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,지불에 판매 주문
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,시간 로그 생성 :
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Employee,Blood Group,혈액 그룹
 DocType: Purchase Invoice Item,Page Break,페이지 나누기
 DocType: Production Order Operation,Pending,대기 중
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,특정 직원의 휴가 응용 프로그램을 승인 할 수 있습니다 사용자
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,당신은 변형의 기본 UOM을 변경할 수 없습니다. 템플릿의 변형 변화 기본 UOM에 대한 기본 UOM을 변경하려면
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,사무용품
 DocType: Purchase Invoice Item,Qty,수량
 DocType: Fiscal Year,Companies,회사
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,전자 공학
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,전자 공학
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,재고가 다시 주문 수준에 도달 할 때 자료 요청을 올립니다
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,유지 보수 일정에서
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,전 시간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,전 시간
 DocType: Purchase Invoice,Contact Details,연락처 세부 사항
 DocType: C-Form,Received Date,받은 날짜
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","당신이 판매 세금 및 요금 템플릿의 표준 템플릿을 생성 한 경우, 하나를 선택하고 아래 버튼을 클릭합니다."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,구인
 DocType: Payment Reconciliation,Payment Reconciliation,결제 조정
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,기술
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,기술
 DocType: Offer Letter,Offer Letter,편지를 제공
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,자료 요청 (MRP) 및 생산 오더를 생성합니다.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,총 청구 AMT 사의
 DocType: Time Log,To Time,시간
+DocType: Authorization Rule,Approving Role (above authorized value),(승인 된 값 이상) 역할을 승인
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","자식 노드를 추가하려면, 나무를 탐구하고 더 많은 노드를 추가 할 노드를 클릭합니다."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
 DocType: Production Order Operation,Completed Qty,완료 수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,가격 목록 {0} 비활성화
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,고객 상품 코드
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,주문 또는 송장에 대한 지불 항목을 만듭니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,용접
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,새로운 재고 UOM가 필요합니다
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,모든 상품은 이미 청구 된
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.','사건 번호에서'유효 기간을 지정하십시오
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
 DocType: Features Setup,Item Serial Nos,상품 직렬 NOS
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,실제 수량
 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,발견되지 일련 번호 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,고객
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,압축 성형
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,고객
 DocType: Leave Block List Date,Block Date,블록 날짜
 DocType: Sales Order,Not Delivered,전달되지 않음
 ,Bank Clearance Summary,은행 정리 요약
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","만들고, 매일, 매주 및 매월 이메일 다이제스트를 관리 할 수 있습니다."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,상품 코드> 상품 그룹> 브랜드
 DocType: Appraisal Goal,Appraisal Goal,평가목표
-DocType: Event,Friday,금요일
 DocType: Time Log,Costing Amount,원가 계산 금액
 DocType: Process Payroll,Submit Salary Slip,급여 슬립 제출
 DocType: Salary Structure,Monthly Earning & Deduction,월간 적립 및 차감
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,대량 수입
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
 DocType: SMS Log,Sender Name,보낸 사람 이름
-DocType: Page,Title,제목
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,사용자 지정
 DocType: POS Profile,[Select],[선택]
 DocType: SMS Log,Sent To,전송
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,견적서에게 확인
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},잘못된 {0} : {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},잘못된 {0} : {1}
 DocType: Sales Invoice Advance,Advance Amount,사전의 양
 DocType: Manufacturing Settings,Capacity Planning,용량 계획
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'시작일자'가 필요합니다
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'시작일자'가 필요합니다
 DocType: Journal Entry,Reference Number,참조 번호
 DocType: Employee,Employment Details,고용 세부 사항
 DocType: Employee,New Workplace,새로운 직장
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
 DocType: Item,End of Life,수명 종료
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,여행
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,여행
 DocType: Leave Block List,Allow Users,사용자에게 허용
 DocType: Purchase Order,Customer Mobile No,고객 모바일 없음
 DocType: Sales Invoice,Recurring,반복
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,전송 자료
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
 DocType: Installation Note,Installation Note,설치 노트
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,세금 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,세금 추가
 ,Financial Analytics,재무 분석
 DocType: Quality Inspection,Verified By,에 의해 확인
 DocType: Address,Subsidiary,자회사
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
 DocType: Quality Inspection,Purchase Receipt No,구입 영수증 없음
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,계약금
-DocType: System Settings,In Hours,시간
 DocType: Process Payroll,Create Salary Slip,급여 슬립을 만듭니다
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,은행에 따라 예상 균형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,버핑
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,은행에 따라 예상 균형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),자금의 출처 (부채)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
 DocType: Appraisal,Employee,종업원
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,바우처 그룹
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Sales Invoice,Mass Mailing,대량 메일 링
-DocType: Page,Standard,표준
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,쇼 지불
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,크기
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,유지 보수 일정은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,제약
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,제약
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,구입 한 항목의 비용
 DocType: Selling Settings,Sales Order Required,판매 주문 필수
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,고객을 만들기
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 읽기
 DocType: Supplier,Is Frozen,동결
 DocType: Buying Settings,Buying Settings,구매 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,질량 마무리
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,완제품 항목에 대한 BOM 번호
 DocType: Upload Attendance,Attendance To Date,날짜 출석
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),판매 이메일 ID에 대한 설정받는 서버. (예를 들어 sales@example.com)
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Tool,Payment Account,결제 계정
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,진행하는 회사를 지정하십시오
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,초안
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,보상 오프
 DocType: Quality Inspection Reading,Accepted,허용
-DocType: User,Female,여성
-DocType: Journal Entry Account,Debit in Account Currency,계정 통화에서 직불
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
-DocType: Print Settings,Modern,현대식
-DocType: Communication,Replied,대답
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},잘못된 참조 {0} {1}
 DocType: Payment Tool,Total Payment Amount,총 결제 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) 계획 quanitity보다 클 수 없습니다 ({2}) 생산에 주문 {3}
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
 DocType: Newsletter,Test,미리 보기
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","기존의 주식 거래는의 값을 변경할 수 없습니다 \이 항목에 대한 있기 때문에 &#39;일련 번호를 가지고&#39;, &#39;배치를 가지고 없음&#39;, &#39;주식 항목으로&#39;와 &#39;평가 방법&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,빠른 분개
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
 DocType: Employee,Previous Work Experience,이전 작업 경험
 DocType: Stock Entry,For Quantity,수량
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,상품에 대한 요청.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,별도의 생산 순서는 각 완제품 항목에 대해 작성됩니다.
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,설정 완료
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","회계 항목이 날짜까지 동결, 아무도 / 아래 지정된 역할을 제외하고 항목을 수정하지 않을 수 있습니다."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,뉴스 레터 메일 링리스트
 DocType: Delivery Note,Transporter Name,트랜스 포터의 이름
+DocType: Authorization Rule,Authorized Value,공인 값
 DocType: Contact,Enter department to which this Contact belongs,이 연락처가 속한 부서를 입력
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,총 결석
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,측정 단위
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,측정 단위
 DocType: Fiscal Year,Year End Date,연도 종료 날짜
 DocType: Task Depends On,Task Depends On,작업에 따라 다릅니다
 DocType: Lead,Opportunity,기회
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),기본 요금 (주식 UOM에 따라)
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
 DocType: Campaign,Campaign-.####,캠페인.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,꿰뚫는
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,수수료에 대한 회사의 제품을 판매하는 타사 대리점 / 딜러 /위원회 에이전트 / 제휴 / 대리점.
 DocType: Customer Group,Has Child Node,아이 노드에게 있습니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","여기에 정적 URL 매개 변수를 입력합니다 (예 : 보낸 사람 = ERPNext, 사용자 이름 = ERPNext, 암호 = 1234 등)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}되지 않은 활성 회계 연도에. 자세한 내용 확인은 {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,이 ERPNext에서 자동으로 생성 예를 들어 웹 사이트입니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,고령화 범위 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,광화학 가공
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2062,7 +1903,7 @@
  #### 열 
 
  1에 대한 설명.계산 유형 : 
- -이에있을 수 있습니다 ** 순 (즉, 기본 금액의 합계입니다) ** 총.
+ -이에있을 수 있습니다 ** 순 (즉, 기본 금액의 합계입니다) ** 총.
  - ** 이전 행 전체 / 양 **에 (누적 세금이나 요금에 대한).이 옵션을 선택하면 세금 금액 또는 총 (세금 테이블에) 이전 행의 비율로 적용됩니다.
  - ** 실제 (언급 한 바와 같이).
  2.계정 머리 :이 세금 
@@ -2074,11 +1915,9 @@
  8.입력 행 : ""이전 행 전체""를 기반으로하는 경우이 계산에 대한 기본 (디폴트는 이전의 행)로 이동합니다 행 번호를 선택할 수 있습니다.
  9.에 대한 세금이나 요금을 고려 세금 / 수수료는 평가만을위한 것입니다 (총의 일부가 아닌) 또는 만 (항목에 가치를 추가하지 않습니다) 총 또는 모두 경우이 섹션에서는 사용자가 지정할 수 있습니다.
  10.추가 공제 : 추가하거나 세금을 공제할지 여부를 선택합니다."
-DocType: Note,Note,정보
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
-DocType: Email Account,Email Ids,이메일 IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 DocType: Tax Rule,Billing City,결제시
 DocType: Global Defaults,Hide Currency Symbol,통화 기호에게 숨기기
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,신용 주
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},완성 된 수량보다 더 할 수 없습니다 {0} 조작에 대한 {1}
 DocType: Features Setup,Quality,품질
-DocType: Contact Us Settings,Introduction,소개
 DocType: Warranty Claim,Service Address,서비스 주소
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,재고 조정을 위해 최대 100 개의 행.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,재고 조정을 위해 최대 100 개의 행.
 DocType: Stock Entry,Manufacture,제조
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,제발 배달 주 처음
 DocType: Purchase Invoice,Currency and Price List,통화 및 가격 목록
 DocType: Opportunity,Customer / Lead Name,고객 / 리드 명
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,생산
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,생산
 DocType: Item,Allow Production Order,허용 생산 주문
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Installation Note Item,Installed Qty,설치 수량
 DocType: Lead,Fax,팩스
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,제출
 DocType: Salary Structure,Total Earning,총 적립
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,내 주소
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,조직 분기의 마스터.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,또는
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,광열비
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 위
 DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
-,Download Backups,다운로드 백업
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,지불 유형
 DocType: Process Payroll,Select Employees,직원 선택
 DocType: Bank Reconciliation,To Date,현재까지
 DocType: Opportunity,Potential Sales Deal,잠재적 인 판매 거래
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,세부 정보
 DocType: Purchase Invoice,Total Taxes and Charges,총 세금 및 요금
 DocType: Employee,Emergency Contact,비상 연락처
 DocType: Item,Quality Parameters,품질 매개 변수
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,일련 번호 / 배치
 DocType: Product Bundle,Parent Item,상위 항목
 DocType: Account,Account Type,계정 유형
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} 수행-전달할 수 없습니다 유형을 남겨주세요
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,예약 주문
 DocType: Landed Cost Voucher,Purchase Receipt Items,구매 영수증 항목
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,사용자 정의 양식
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,절단
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,편평
 DocType: Account,Income Account,수익 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,조형
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
 DocType: Item Reorder,Material Request Type,자료 요청 유형
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
-apps/frappe/frappe/desk/moduleview.py +61,Documents,서류
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,참조
 DocType: Cost Center,Cost Center,비용 센터
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,상품권 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,상품권 #
 DocType: Notification Control,Purchase Order Message,구매 주문 메시지
 DocType: Tax Rule,Shipping Country,배송 국가
 DocType: Upload Attendance,Upload HTML,업로드 HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","총 선수금  ({0})은 {1} \ 주문에 대하여 
  총합계 ({2})보다 클 수 없습니다"
 DocType: Employee,Relieving Date,날짜를 덜어
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고 재고 만 입력 / 배달 주 / 구매 영수증을 통해 변경 될 수 있습니다
 DocType: Employee Education,Class / Percentage,클래스 / 비율
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,마케팅 및 영업 책임자
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,소득세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,레이저 그물 형성을 설계
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,마케팅 및 영업 책임자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,소득세
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","선택 가격 규칙은 '가격'을 위해 만든 경우, 가격 목록을 덮어 쓰게됩니다.가격 규칙 가격이 최종 가격이기 때문에 더 이상의 할인은 적용되지해야합니다.따라서, 등 판매 주문, 구매 주문 등의 거래에있어서, 그것은 오히려 '가격 목록 평가'분야보다 '속도'필드에서 가져온 것입니다."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,스톡 설정
-DocType: User,Bio,바이오
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,새로운 비용 센터의 이름
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,기본 주소 템플릿을 찾을 수 없습니다.설정> 인쇄 및 브랜딩에서 새> 주소 템플릿을 생성 해주세요.
 DocType: Appraisal,HR User,HR 사용자
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
 DocType: Supplier,Billing Currency,결제 통화
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,아주 큰
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,아주 큰
 ,Profit and Loss Statement,손익 계산서
 DocType: Bank Reconciliation Detail,Cheque Number,수표 번호
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,누르면
 DocType: Payment Tool Detail,Payment Tool Detail,지불 도구 세부 정보
 ,Sales Browser,판매 브라우저
 DocType: Journal Entry,Total Credit,총 크레딧
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,지역정보 검색
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),대출 및 선수금 (자산)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,외상매출금
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,큰
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,어떤 직원을 찾을 수 없습니다!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,큰
 DocType: C-Form Invoice Detail,Territory,국가
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Purchase Order,Customer Address Display,고객의 주소 표시
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,연마
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","이미 다른 UOM 일부 거래 (들)을 만들었습니다 \ 있기 때문에 항목에 대한 측정의 기본 단위는 {0} 직접 변경할 수 없습니다. 기본 UOM을 변경하려면, \ 사용 stock 모듈에서 도구 &#39;UOM 유틸리티 바꾸기."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,환율이 통화를 다른 통화로 지정
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,견적 {0} 취소
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,견적 {0} 취소
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,총 발행 금액
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,직원은 {0} {1}에 휴가를했다.출석을 표시 할 수 없습니다.
 DocType: Sales Partner,Targets,대상
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
 ,S.O. No.,SO 번호
 DocType: Production Order Operation,Make Time Log,시간 로그를 확인하십시오
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,재주문 수량을 설정하세요
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,컴퓨터
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,전기 화학적 연마
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,회계 항목을 입력하기 전에  계정 차트를설정해주세요
 DocType: Purchase Invoice,Ignore Pricing Rule,가격 규칙을 무시
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,취소
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,급여 구조에 날짜 직원 가입 날짜보다 적은 수 없습니다.
 DocType: Employee Education,Graduate,졸업생
 DocType: Leave Block List,Block Days,블록 일
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","송장을 반복 있는지 확인, 반복을 중지하거나 적절한 종료 날짜를 넣어 선택 취소"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
 DocType: Packing Slip,If more than one package of the same type (for print),만약 (프린트) 동일한 유형의 하나 이상의 패키지
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,최대 {0} 행이 허용
 DocType: C-Form Invoice Detail,Net Total,합계액
 DocType: Bin,FCFS Rate,FCFS 평가
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),결제 (세금 계산서)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,목적
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","작업 {0} 워크 스테이션에서 사용 가능한 근무 시간 이상 {1}, 여러 작업으로 작업을 분해"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,전기 기계
 ,Requested,요청
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,없음 비고
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,연체
 DocType: Account,Stock Received But Not Billed,재고품 받았지만 청구하지
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,루트 계정은 그룹이어야합니다
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,총 급여 + 연체 금액 + 현금화 금액 - 총 공제
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Features Setup,Sales and Purchase,판매 및 구매
 DocType: Supplier Quotation Item,Material Request No,자료 요청 없음
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,고객의 통화는 회사의 기본 통화로 변환하는 속도에
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}이 목록에서 성공적으로 탈퇴했다.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),인터넷 속도 (회사 통화)
-apps/frappe/frappe/templates/base.html +134,Added,추가
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,지역의 나무를 관리합니다.
 DocType: Journal Entry Account,Sales Invoice,판매 송장
 DocType: Journal Entry Account,Party Balance,파티 밸런스
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,회계 연도 {0}를 찾을 수 없습니다.
 DocType: Bank Reconciliation,Get Relevant Entries,관련 항목을보세요
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,재고에 대한 회계 항목
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,코 이닝
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
-apps/frappe/frappe/desk/query_report.py +136,Total,합계
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
 DocType: Account,Root Type,루트 유형
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},행 번호 {0} : 이상 반환 할 수 없습니다 {1} 항목에 대한 {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),할인 금액 후 세액 (회사 통화)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
 DocType: Quality Inspection,Quality Inspection,품질 검사
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,형성 스프레이
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,매우 작은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL 또는 BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,최소 재고 수준
 DocType: Stock Entry,Subcontract,하청
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,제조업체 부품 번호
 DocType: Production Order Operation,Estimated Time and Cost,예상 시간 및 비용
 DocType: Bin,Bin,큰 상자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,디딤판 코
 DocType: SMS Log,No of Sent SMS,보낸 SMS 없음
 DocType: Account,Company,회사
 DocType: Account,Expense Account,비용 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,소프트웨어
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,컬러
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,소프트웨어
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,컬러
 DocType: Maintenance Visit,Scheduled,예약된
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;아니오&quot;와 &quot;판매 상품은&quot; &quot;주식의 항목으로&quot;여기서 &quot;예&quot;인 항목을 선택하고 다른 제품 번들이없는하세요
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,고르지 개월에 걸쳐 목표를 배포하는 월별 분포를 선택합니다.
 DocType: Purchase Invoice Item,Valuation Rate,평가 평가
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,가격리스트 통화 선택하지
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,항목 행 {0} : {1} 위 '구매 영수증'테이블에 존재하지 않는 구매 영수증
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,프로젝트 시작 날짜
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,까지
 DocType: Rename Tool,Rename Log,로그인에게 이름 바꾸기
 DocType: Installation Note Item,Against Document No,문서 번호에 대하여
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,판매 파트너를 관리합니다.
 DocType: Quality Inspection,Inspection Type,검사 유형
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},선택하세요 {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,연구원
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,업데이트
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,연구원
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,전송하기 전에 뉴스를 저장하십시오
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,이름이나 이메일은 필수입니다
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,수신 품질 검사.
 DocType: Purchase Order Item,Returned Qty,반품 수량
 DocType: Employee,Exit,닫기
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,루트 유형이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,루트 유형이 필수입니다
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,일련 번호 {0} 생성
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,진동 마무리
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","고객의 편의를 위해, 이러한 코드는 송장 배송 메모와 같은 인쇄 포맷으로 사용될 수있다"
 DocType: Employee,You can enter any date manually,당신은 수동으로 날짜를 입력 할 수 있습니다
 DocType: Sales Invoice,Advertisement,광고
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,수습 기간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,수습 기간
 DocType: Customer Group,Only leaf nodes are allowed in transaction,만 잎 노드는 트랜잭션에 허용
 DocType: Expense Claim,Expense Approver,지출 승인
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,구매 영수증 품목 공급
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,날짜 시간에
 DocType: SMS Settings,SMS Gateway URL,SMS 게이트웨이 URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,연마
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,포장 축소
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,보류 활동
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,확인 된
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,공급 업체> 공급 업체 유형
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,신문 발행인
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,신문 발행인
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,회계 연도 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,제련
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Attendance,Attendance Date,출석 날짜
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,급여 이별은 적립 및 차감에 따라.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,자식 노드와 계정 원장으로 변환 할 수 없습니다
 DocType: Address,Preferred Shipping Address,선호하는 배송 주소
 DocType: Purchase Receipt Item,Accepted Warehouse,허용 창고
 DocType: Bank Reconciliation Detail,Posting Date,등록일자
 DocType: Item,Valuation Method,평가 방법
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0}에 대한 환율을 찾을 수 없습니다 {1}
 DocType: Sales Invoice,Sales Team,판매 팀
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,항목을 중복
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,항목을 중복
 DocType: Serial No,Under Warranty,보증에 따른
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[오류]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,당신이 판매 주문을 저장하면 단어에서 볼 수 있습니다.
 ,Employee Birthday,직원 생일
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,벤처 캐피탈
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
 DocType: Pricing Rule,Discount Percentage,할인 비율
 DocType: Payment Reconciliation Invoice,Invoice Number,송장 번호
-apps/erpnext/erpnext/hooks.py +70,Orders,명령
+apps/erpnext/erpnext/hooks.py +54,Orders,명령
 DocType: Leave Control Panel,Employee Type,직원 유형
 DocType: Employee Leave Approver,Leave Approver,승인자를 남겨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,스웨이 징
 DocType: Manufacturing Settings,Material Transferred for Manufacture,재료 제조에 양도
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""비용 승인자""역할이있는 사용자"
 ,Issued Items Against Production Order,생산 오더에 대해 실행 항목
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,잘못된 기간
 DocType: Customer,Credit Limit,신용 한도
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,거래 종류 선택
 DocType: GL Entry,Voucher No,바우처 없음
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,주소와 연락처
 DocType: Customer,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Employee,Feedback,피드백
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","이전에 할당 할 수없는 남기기 {0}, 휴가 균형이 이미 반입 전달 미래 휴가 할당 기록되었습니다로 {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,MAINT. 예정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,연마 제트 가공
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,MAINT. 예정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
-DocType: Website Settings,Website Settings,웹 사이트 설정
 DocType: Item,Reorder level based on Warehouse,웨어 하우스를 기반으로 재정렬 수준
 DocType: Activity Cost,Billing Rate,결제 비율
 ,Qty to Deliver,제공하는 수량
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,에 대해 요청
 DocType: Quotation Item,Against Doctype,문서 종류에 대하여
 DocType: Delivery Note,Track this Delivery Note against any Project,모든 프로젝트에 대해이 배달 주를 추적
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,루트 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,보기 재고 항목
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},참고 # {0} 년 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,주소를 관리
 DocType: Pricing Rule,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
-DocType: Communication,Phone,휴대폰
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),결산 (박사)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),결산 (박사)
 DocType: Contact,Passive,수동
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,일련 번호 {0} 재고가없는
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,거래를 판매에 대한 세금 템플릿.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,청구 금액
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,업데이트 받기
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,몇 가지 샘플 레코드 추가
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,자료 요청 {0} 취소 또는 정지
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,몇 가지 샘플 레코드 추가
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,관리를 남겨주세요
-DocType: Event,Groups,그룹
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,계정별 그룹
 DocType: Sales Order,Fully Delivered,완전 배달
 DocType: Lead,Lower Income,낮은 소득
@@ -2499,45 +2307,42 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,빠른 도움말
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
 DocType: Features Setup,Sales Extras,판매 부가항목
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 계정에 대한 예산은 {1} 코스트 센터에 대해 {2} {3}에 의해 초과
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자'이후이 여야합니다
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,값 또는 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,분
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,분
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
 ,Qty to Receive,받도록 수량
 DocType: Leave Block List,Leave Block List Allowed,차단 목록은 허용 남겨
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,전환 요인은 분수에있을 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,당신은 로그인하는 데 사용할 것
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,당신은 로그인하는 데 사용할 것
 DocType: Sales Partner,Retailer,소매상 인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,모든 공급 유형
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},견적 {0}은 유형 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,당좌 차월 계정
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,급여 슬립을
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,보안 대출
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,최고 제품
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,최고 제품
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,잔액 지분
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,당신이 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다로 휴가를 승인 할 수 없습니다
 DocType: Appraisal,Appraisal,펑가
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,분실 거품 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,그림
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,날짜는 반복된다
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,공인 서명자
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},남겨 승인 중 하나 여야합니다 {0}
 DocType: Hub Settings,Seller Email,판매자 이메일
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
 DocType: Workstation Working Hour,Start Time,시작 시간
 DocType: Item Price,Bulk Import Help,대량 가져 오기 도움말
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,수량 선택 
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,수량 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,역할을 승인하면 규칙이 적용됩니다 역할로 동일 할 수 없습니다
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,이 이메일 다이제스트 수신 거부
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,보낸 메시지
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
 DocType: BOM Operation,Hour Rate,시간 비율
 DocType: Stock Settings,Item Naming By,상품 이름 지정으로
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,견적에서
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,견적에서
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},또 다른 기간 결산 항목은 {0} 이후 한 {1}
 DocType: Production Order,Material Transferred for Manufacturing,재료 제조에 대한 양도
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,계정 {0}이 존재하지 않습니다
 DocType: Purchase Receipt Item,Purchase Order Item No,구매 주문 품목 아니오
-DocType: System Settings,System Settings,시스템 설정
 DocType: Project,Project Type,프로젝트 형식
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,목표 수량 또는 목표량 하나는 필수입니다.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,다양한 활동 비용
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
 DocType: Sales Order,Fully Billed,완전 청구
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,손에 현금
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
 DocType: Serial No,Is Cancelled,취소된다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,내 선적
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,내 선적
 DocType: Journal Entry,Bill Date,청구 일자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
-DocType: Communication,Recipients,받는 사람
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,나사
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,널링
 DocType: Expense Claim,Approval Status,승인 상태
 DocType: Hub Settings,Publish Items to Hub,허브에 항목을 게시
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},값에서 행의 값보다 작아야합니다 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,송금
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,송금
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,은행 계좌를 선택하세요
 DocType: Newsletter,Create and Send Newsletters,작성 및 보내기 뉴스 레터
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,날짜 누계 이전이어야합니다
 DocType: Sales Order,Recurring Order,반복 주문
 DocType: Company,Default Income Account,기본 수입 계정
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,고객 그룹 / 고객
 DocType: Item Group,Check this if you want to show in website,당신이 웹 사이트에 표시 할 경우이 옵션을 선택
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext에 오신 것을 환영합니다
+,Welcome to ERPNext,ERPNext에 오신 것을 환영합니다
 DocType: Payment Reconciliation Payment,Voucher Detail Number,바우처 세부 번호
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,리드고객에게 견적?
 DocType: Lead,From Customer,고객의
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,통화
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,통화
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
 ,Projected,예상
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},일련 번호 {0} 창고에 속하지 않는 {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,주 : 시스템이 항목에 대한 납품에 이상 - 예약 확인하지 않습니다 {0} 수량 또는 금액으로 0이됩니다
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,Opening 날짜
 DocType: Journal Entry,Remark,비고
 DocType: Purchase Receipt Item,Rate and Amount,속도 및 양
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,지루한
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,판매 주문에서
-DocType: Blog Category,Parent Website Route,상위 웹 사이트 루트
 DocType: Sales Order,Not Billed,청구되지 않음
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,두 창고는 같은 회사에 속해 있어야합니다
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,주소록은 아직 추가되지 않습니다.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,활성 없음
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,착륙 비용 바우처 금액
 DocType: Time Log,Batched for Billing,결제를위한 일괄 처리
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,공급 업체에 의해 제기 된 지폐입니다.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,할인 금액
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,예) VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,예) VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,항목 4
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,열간 금속 가스
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
 DocType: Sales Invoice Item,Delivered Qty,납품 수량
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",세율을 언급 해당 그룹 (펀드&gt; 유동 부채&gt; 세금 및 관세의 보통 소스로 이동 유형 &quot;세금&quot;의) 자식을 추가 클릭하여 (새 계정을 만들 않습니다.
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,레이저 절단
-DocType: Event,Monday,월요일
 DocType: Journal Entry,Stock Entry,재고 항목
 DocType: Account,Payable,지급
 DocType: Salary Slip,Arrear Amount,연체 금액
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,제품 설명에게 주소
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,판매 또는 구매의이어야 하나를 선택해야합니다
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,제조 작업은 어디를 수행한다.
-DocType: Page,All,모든
 DocType: Stock Entry Detail,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
 DocType: Employee,Confirmation Date,확인 일자
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,판매 사용자
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,최소 수량이 최대 수량보다 클 수 없습니다
 DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,설정
 DocType: Lead,Lead Owner,리드 소유자
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,창고가 필요합니다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,창고가 필요합니다
 DocType: Employee,Marital Status,결혼 여부
 DocType: Stock Settings,Auto Material Request,자동 자료 요청
 DocType: Time Log,Will be updated when billed.,청구 할 때 업데이트됩니다.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,구매 주문 상품 공급
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,회사 이름은 회사가 될 수 없습니다
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,인쇄 템플릿에 대한 편지 머리.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,인쇄 템플릿의 제목은 형식 상 청구서를 예.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM 평가
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","형 이메일, 전화, 채팅, 방문 등의 모든 통신 기록"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,회사에 라운드 오프 비용 센터를 언급 해주십시오
 DocType: Purchase Invoice,Terms,약관
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,새로 만들기
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,새로 만들기
 DocType: Buying Settings,Purchase Order Required,주문 필수에게 구입
 ,Item-wise Sales History,상품이 많다는 판매 기록
 DocType: Expense Claim,Total Sanctioned Amount,전체 금액의인가를
 ,Purchase Analytics,구매 분석
 DocType: Sales Invoice Item,Delivery Note Item,배송 참고 항목
 DocType: Expense Claim,Task,태스크
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,면도
 DocType: Purchase Taxes and Charges,Reference Row #,참조 행 번호
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},배치 번호는 항목에 대해 필수입니다 {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,이 루트 판매 사람 및 편집 할 수 없습니다.
 ,Stock Ledger,재고 원장
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},속도 : {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},속도 : {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,급여 공제 전표
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,노트
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,첫 번째 그룹 노드를 선택합니다.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,양식을 작성하고 저장
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,그들의 최신의 재고 상황에 따라 모든 원료가 포함 된 보고서를 다운로드
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,직면
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,커뮤니티 포럼
 DocType: Leave Application,Leave Balance Before Application,응용 프로그램의 앞에 균형을 남겨주세요
 DocType: SMS Center,Send SMS,SMS 보내기
 DocType: Company,Default Letter Head,편지 헤드 기본
 DocType: Time Log,Billable,청구
-DocType: Authorization Rule,This will be used for setting rule in HR module,이것은 HR 모듈 규칙을 설정하는 데 사용할
 DocType: Account,Rate at which this tax is applied,요금이 세금이 적용되는
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,재주문 수량
 DocType: Company,Stock Adjustment Account,재고 조정 계정
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,잃어버린 기회
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","할인 필드는 구매 주문, 구입 영수증, 구매 송장에 사용할 수"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새로운 계정의 이름입니다. 참고 : 고객 및 공급 업체에 대한 계정을 생성하지 마십시오
-DocType: Report,Report Type,보고서 유형
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,로딩중
 DocType: BOM Replace Tool,BOM Replace Tool,BOM 교체도구
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,국가 현명한 기본 주소 템플릿
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,쇼 세금 해체
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,데이터 가져 오기 및 내보내기
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',당신이 생산 활동에 참여합니다.항목을 활성화는 '제조'
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
 DocType: Serial No,Out of AMC,AMC의 아웃
 DocType: Purchase Order Item,Material Request Detail No,자료 요청의 세부 사항 없음
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,하드 터닝
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,유지 보수 방문을합니다
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
 DocType: Company,Default Cash Account,기본 현금 계정
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","참고 : 지불은 어떤 기준에 의해 만들어진되지 않은 경우, 수동 분개를합니다."
 DocType: Item,Supplier Items,공급 업체 항목
 DocType: Opportunity,Opportunity Type,기회의 유형
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,가용성을 게시
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,생년월일은 오늘보다 클 수 없습니다.
 ,Stock Ageing,재고 고령화
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'해제
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'해제
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,제출 거래에 연락처에 자동으로 이메일을 보내십시오.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  가능 수량은 {4}, 수량을 전송 : {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
-DocType: Event,Sunday,일요일
 DocType: Sales Team,Contribution (%),기여도 (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,책임
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,책임
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,표에이어야 1 송장을 입력하십시오
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,사용자 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,사용자 추가
 DocType: Pricing Rule,Item Group,항목 그룹
 DocType: Task,Actual Start Date (via Time Logs),실제 시작 날짜 (시간 로그를 통해)
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},에 {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
 DocType: Item,Default BOM,기본 BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
 DocType: Time Log Batch,Total Hours,총 시간
 DocType: Journal Entry,Printing Settings,인쇄 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,자동차
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,항목이 필요합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,금속 사출 성형
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,배달 주에서
 DocType: Time Log,From Time,시간에서
 DocType: Notification Control,Custom Message,사용자 지정 메시지
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,투자 은행
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","국가, 시간대 및 통화를 선택"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,투자 은행
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,산세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,모래 주조
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,전기 도금
 DocType: Purchase Invoice Item,Rate,비율
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,인턴
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,인턴
 DocType: Newsletter,A Lead with this email id should exist,이 이메일 ID와 리드가 존재한다
 DocType: Stock Entry,From BOM,BOM에서
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,기본
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,다른 날짜로 반나절 휴직 일로부터 동일해야합니다
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","예) kg, 단위, NOS, M"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","예) kg, 단위, NOS, M"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
 DocType: Salary Structure,Salary Structure,급여 체계
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","여러 가격 규칙이 동일한 기준 존재, 우선 순위를 할당하여 \
  충돌을 해결하십시오.가격 규칙 : {0}"
 DocType: Account,Bank,은행
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,문제의 소재
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 DocType: Hub Settings,Access Token,액세스 토큰
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,고정 자산 상품에게 있습니다
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","당신이 긴 프린트 형식이있는 경우,이 기능은 각 페이지의 모든 머리글과 바닥 글과 함께 여러 페이지에 인쇄 할 페이지를 분할 할 수 있습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,호빙
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,모든 국가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 DocType: Fiscal Year,Year Name,올해의 이름
 DocType: Process Payroll,Process Payroll,프로세스 급여
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
 DocType: Product Bundle Item,Product Bundle Item,번들 제품 항목
 DocType: Sales Partner,Sales Partner Name,영업 파트너 명
 DocType: Purchase Invoice Item,Image View,이미지보기
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,마무리 및 산업 마무리
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,일자 및 끝
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,증권 및 상품 교환
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,드릴링
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,블로우 성형
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
 DocType: Tax Rule,Shipping City,배송시
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,이 항목은 {0} (템플릿)의 변종이다.'카피'가 설정되어 있지 않는 속성은 템플릿에서 복사됩니다
 DocType: Account,Purchase User,구매 사용자
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,망치로 침
-DocType: Web Page,Slideshow,슬라이드쇼
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,기본 주소 템플릿을 삭제할 수 없습니다
 DocType: Sales Invoice,Shipping Rule,배송 규칙
 DocType: Journal Entry,Print Heading,인쇄 제목
 DocType: Quotation,Maintenance Manager,유지 관리 관리자
-DocType: Workflow State,Search,{0}{/0}{1}검색 {/1}
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,총은 제로가 될 수 없습니다
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'마지막 주문 날짜 이후'는 0보다 크거나 같아야합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,브레이징
 DocType: C-Form,Amended From,개정
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,원료
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,원료
 DocType: Leave Application,Follow via Email,이메일을 통해 수행
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,할인 금액 후 세액
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,이 계정에 하위계정이 존재합니다.이 계정을 삭제할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,목표 수량 또는 목표량 하나는 필수입니다
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
 DocType: Leave Control Panel,Carry Forward,이월하다
@@ -2862,45 +2631,44 @@
 ,Produced,생산
 DocType: Item,Item Code for Suppliers,공급 업체에 대한 상품 코드
 DocType: Issue,Raised By (Email),(이메일)에 의해 제기
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,일반
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,레터 첨부하기
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,일반
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,레터 첨부하기
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","세금 헤드 목록 (예를 들어 부가가치세, 관세 등, 그들은 고유 한 이름을 가져야한다)과 그 표준 요금. 이것은 당신이 편집하고 더 이상 추가 할 수있는 표준 템플릿을 생성합니다."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","세금 헤드 목록 (예를 들어 부가가치세, 관세 등, 그들은 고유 한 이름을 가져야한다)과 그 표준 요금. 이것은 당신이 편집하고 더 이상 추가 할 수있는 표준 템플릿을 생성합니다."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 DocType: Journal Entry,Bank Entry,은행 입장
 DocType: Authorization Rule,Applicable To (Designation),에 적용 (지정)
-DocType: Blog Post,Blog Post,블로그 포스트
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,그룹으로
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ 비활성화 통화를 사용합니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,우편 비용
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Purchase Order,The date on which recurring order will be stop,반복되는 순서가 중지됩니다 된 날짜
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} 감소해야하거나 오버 플로우 내성을 증가한다
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,전체 현재
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,시간
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,시간
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,공급 업체에 자료를 전송
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,공급 업체에 자료를 전송
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,견적을 만들기
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,이러한 모든 항목이 이미 청구 된
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0}에 의해 승인 될 수있다
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
 DocType: BOM Replace Tool,The new BOM after replacement,교체 후 새로운 BOM
 DocType: Features Setup,Point of Sale,판매 시점
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,컬링
 DocType: Account,Tax,세금
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},행 {0} : {1} 유효하지 않은 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,정제
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},행 {0} : {1} 유효하지 않은 {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,제품 번들에서
 DocType: Production Planning Tool,Production Planning Tool,생산 계획 도구
 DocType: Quality Inspection,Report Date,보고서 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,라우팅
 DocType: C-Form,Invoices,송장
 DocType: Job Opening,Job Title,직책
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} 이미 기간 동안 직원 {1}에 할당 된 {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}받는 사람
 DocType: Features Setup,Item Groups in Details,자세한 사항 상품 그룹
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,업데이트 속도 및 가용성
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,당신이 양에 대해 더 수신하거나 전달하도록 허용 비율 명령했다.예를 들면 : 당신이 100 대를 주문한 경우. 당신의 수당은 다음 110 단위를받을 10 % 허용된다.
 DocType: Pricing Rule,Customer Group,고객 그룹
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: Item,Website Description,웹 사이트 설명
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
 ,Sales Register,판매 등록
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
 DocType: Address,Plant,심기
-DocType: DocType,Setup,설정
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,냉간 압연
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
 DocType: GL Entry,Against Voucher Type,바우처 형식에 대한
 DocType: Item,Attributes,속성
-DocType: Packing Slip,Get Items,항목 가져 오기
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,마지막 주문 날짜
-DocType: DocField,Image,영상
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,소비세 송장에게 확인
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
-DocType: Communication,Other,기타
 DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,작업 ID가 설정되어 있지
 DocType: Production Order,Planned Start Date,계획 시작 날짜
 DocType: Serial No,Creation Document Type,작성 문서 형식
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,MAINT. 방문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,MAINT. 방문
 DocType: Leave Type,Is Encash,현금화는
 DocType: Purchase Invoice,Mobile No,모바일 없음
 DocType: Payment Tool,Make Journal Entry,저널 항목을 만듭니다
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,프로젝트 와이즈 데이터는 견적을 사용할 수 없습니다
 DocType: Project,Expected End Date,예상 종료 날짜
 DocType: Appraisal Template,Appraisal Template Title,평가 템플릿 제목
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,광고 방송
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,광고 방송
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,상위 항목 {0} 주식 항목이 아니어야합니다
 DocType: Cost Center,Distribution Id,배신 ID
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,멋진 서비스
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,모든 제품 또는 서비스.
 DocType: Purchase Invoice,Supplier Address,공급 업체 주소
-DocType: Contact Us Settings,Address Line 2,2 호선 주소
-DocType: ToDo,Reference,참고
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,천공
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,시리즈는 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,금융 서비스
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,금융 서비스
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위로 {3}
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,CR
 DocType: Customer,Default Receivable Accounts,미수금 기본
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,톱질
 DocType: Tax Rule,Billing State,결제 주
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,라미네이팅
 DocType: Item Reorder,Transfer,이체
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,소결
 DocType: Journal Entry,Pay To / Recd From,지불 / 수취처
 DocType: Naming Series,Setup Series,설치 시리즈
 DocType: Supplier,Contact HTML,연락 HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,소매의
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,고객 {0}이 (가) 없습니다
 DocType: Attendance,Absent,없는
-DocType: Product Bundle,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,번들 제품
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,분쇄
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
 DocType: GL Entry,Remarks,Remarks
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
 DocType: Features Setup,POS View,POS보기
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,일련 번호의 설치 기록
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,연속 주조
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,를 지정하십시오
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,위
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,콜드 크기 조정
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,계정 {0} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,지방
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
 DocType: Holiday List,Weekly Off,주간 끄기
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예를 들어, 2012 년, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),임시 이익 / 손실 (신용)
 DocType: Sales Invoice,Return Against Sales Invoice,에 대하여 견적서를 돌려줍니다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,항목 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},회사에 기본값 {0}을 설정하십시오 {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},회사에 기본값 {0}을 설정하십시오 {1}
 DocType: Serial No,Creation Time,작성 시간
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,총 수익
 DocType: Sales Invoice,Product Bundle Help,번들 제품 도움말
 ,Monthly Attendance Sheet,월간 출석 시트
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,검색된 레코드가 없습니다
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,계정 {0} 비활성
 DocType: GL Entry,Is Advance,사전인가
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,날짜에 날짜 및 출석 출석은 필수입니다
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,입력 해주십시오은 예 또는 아니오로 '하청'
 DocType: Sales Team,Contact No.,연락 번호
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'손익'계정  {0}은 개시기입이 허용되지 않습니다
-DocType: Workflow State,Time,시간
 DocType: Features Setup,Sales Discounts,매출 할인
 DocType: Hub Settings,Seller Country,판매자 나라
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
 DocType: Sales Invoice,Terms and Conditions Details,약관의 자세한 사항
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,판매 세금 및 요금 템플릿
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,의류 및 액세서리
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,의류 및 액세서리
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,주문 번호
 DocType: Item Group,HTML / Banner that will show on the top of product list.,제품 목록의 상단에 표시됩니다 HTML / 배너입니다.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,배송 금액을 계산하는 조건을 지정합니다
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,자식 추가
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,역할 동결 계정 및 편집 동결 항목을 설정할 수
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,이 자식 노드를 가지고 원장 비용 센터로 변환 할 수 없습니다
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,변환 계수가 필요합니다
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,직렬 #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,판매에 대한 수수료
 DocType: Offer Letter Term,Value / Description,값 / 설명
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,장기 휴면 고객
 DocType: Production Order,Expected Delivery Date,예상 배송 날짜
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,부푼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,증발 패턴 주조
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,접대비
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,판매 송장은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,판매 송장은 {0}이 판매 주문을 취소하기 전에 취소해야합니다
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,나이
 DocType: Time Log,Billing Amount,결제 금액
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,항목에 대해 지정된 잘못된 수량 {0}.수량이 0보다 커야합니다.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,휴가 신청.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,기존 거래 계정은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,법률 비용
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","자동 주문은 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Sales Invoice,Posting Time,등록시간
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,새로운 고객 수익
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,여행 비용
 DocType: Maintenance Visit,Breakdown,고장
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,계정 : {0} 통화로 : {1}을 선택할 수 없습니다
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,래핑
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,근신
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
-DocType: Feed,Full Name,전체 이름
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,결말
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,근신
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,기본 창고 재고 상품에 대한 필수입니다.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},달의 급여의 지급 {0}과 연도 {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,총 지불 금액
 ,Transferred Qty,수량에게 전송
 apps/erpnext/erpnext/config/learn.py +11,Navigating,탐색
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,계획
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,계획
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,시간 로그 일괄 확인
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,발행 된
 DocType: Project,Total Billing Amount (via Time Logs),총 결제 금액 (시간 로그를 통해)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,우리는이 품목을
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,우리는이 품목을
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,공급 업체 아이디
 DocType: Journal Entry,Cash Entry,현금 항목
 DocType: Sales Partner,Contact Desc,연락처 제품 설명
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,항목 관리자
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,계정에 연간 예산을 설정하는 행을 추가합니다.
 DocType: Buying Settings,Default Supplier Type,기본 공급자 유형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,채석
 DocType: Production Order,Total Operating Cost,총 영업 비용
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,참고 : {0} 항목을 여러 번 입력
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,모든 연락처.
 DocType: Newsletter,Test Email Id,테스트 이메일 아이디
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,회사의 약어
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,회사의 약어
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,당신이 품질 검사를 수행합니다.아니 구매 영수증에 상품 QA 필수 및 QA를 활성화하지
 DocType: GL Entry,Party Type,파티 형
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,원료의 주요 항목과 동일 할 수 없습니다
 DocType: Item Attribute Value,Abbreviation,약어
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} 한도를 초과 한 authroized Not
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,회전 성형
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,급여 템플릿 마스터.
 DocType: Leave Type,Max Days Leave Allowed,최대 일 허가 허용
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,쇼핑 카트에 설정 세금 규칙
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
 ,Territory Target Variance Item Group-Wise,지역 대상 분산 상품 그룹 와이즈
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,모든 고객 그룹
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,세금 템플릿은 필수입니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,계정 {0} : 부모 계정 {1}이 (가) 없습니다
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),가격 목록 비율 (회사 통화)
 DocType: Account,Temporary,일시적인
 DocType: Address,Preferred Billing Address,선호하는 결제 주소
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,비서
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,비서
 DocType: Serial No,Distinct unit of an Item,항목의 고유 단위
 DocType: Pricing Rule,Buying,구매
 DocType: HR Settings,Employee Records to be created by,직원 기록에 의해 생성되는
@@ -3137,42 +2883,37 @@
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
 DocType: Purchase Order Item,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,다림질
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}이 정지 될
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,비용을 추가하는 규칙.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,다가오는 이벤트
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,고객이 필요합니다
-DocType: Letter Head,Letter Head,레터 헤드
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,빠른 입력
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} 반환을위한 필수입니다
 DocType: Purchase Order,To Receive,받다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,피팅 축소
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,수익 / 비용
 DocType: Employee,Personal Email,개인 이메일
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,총 분산
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,총 분산
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","활성화되면, 시스템이 자동으로 재고에 대한 회계 항목을 게시 할 예정입니다."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,중개
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,중개
 DocType: Address,Postal Code,우편 번호
 DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'", '소요시간 로그' 분단위 업데이트
+Updated via 'Time Log'",'소요시간 로그' 분단위 업데이트
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,생산 발표 순서.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Hub Settings,Name Token,이름 토큰
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,기획
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,표준 판매
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,표준 판매
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,이어야 한 창고는 필수입니다
 DocType: Serial No,Out of Warranty,보증 기간 만료
 DocType: BOM Replace Tool,Replace,교체
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,측정의 기본 단위를 입력하십시오
 DocType: Purchase Invoice Item,Project Name,프로젝트 이름
 DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
-DocType: Workflow State,Edit,편집
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Features Setup,Item Batch Nos,상품 배치 NOS
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
@@ -3180,13 +2921,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,지불 화해 지불
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,법인세 자산
 DocType: BOM Item,BOM No,BOM 없음
-DocType: Contact Us Settings,Pincode,PIN 코드
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Replace Tool,The BOM which will be replaced,대체됩니다 BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,새로운 재고 UOM은 현재 재고 UOM 달라야합니다
 DocType: Account,Debit,직불
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,잎은 0.5의 배수로 할당해야합니다
 DocType: Production Order,Operation Cost,운영 비용
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,. csv 파일에서 출석을 업로드
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,뛰어난 AMT 사의
@@ -3202,10 +2941,7 @@
 DocType: Project,Default Cost Center,기본 비용 센터
 DocType: Purchase Invoice,End Date,끝 날짜
 DocType: Employee,Internal Work History,내부 작업 기록
-DocType: DocField,Column Break,단 나누기
-DocType: Event,Thursday,목요일
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,사모
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,선회
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,사모
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
 DocType: Sales Invoice,Exhibition,전시회
@@ -3218,31 +2954,30 @@
 DocType: Employee,Held On,개최
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,생산 품목
 ,Employee Information,직원 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),비율 (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),비율 (%)
 DocType: Stock Entry Detail,Additional Cost,추가 비용
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,회계 연도 종료일
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),무급 휴직 적립 감소 (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},참고 : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,이번 주 요약
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} 행의 구입 또는 하위 계약 품목이어야 {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
 DocType: GL Entry,Party,파티
 DocType: Sales Order,Delivery Date,* 인수일
-DocType: DocField,Currency,통화
 DocType: Opportunity,Opportunity Date,기회 날짜
 DocType: Purchase Receipt,Return Against Purchase Receipt,구매 영수증에 대해 반환
 DocType: Purchase Order,To Bill,빌
 DocType: Material Request,% Ordered,% 발주
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,일한 분량에 따라 공임을 지급받는 일
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,일한 분량에 따라 공임을 지급받는 일
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,평균. 구매 비율
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
 DocType: Employee,History In Company,회사의 역사
@@ -3259,77 +2994,68 @@
 DocType: Opportunity,To Discuss,토론하기
 DocType: SMS Settings,SMS Settings,SMS 설정
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,임시 계정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,검정
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,검정
 DocType: BOM Explosion Item,BOM Explosion Item,BOM 폭발 상품
 DocType: Account,Auditor,감사
 DocType: Purchase Order,End date of current order's period,현재 주문의 기간의 종료일
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,제공 문자를 확인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,반환
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
-DocType: DocField,Fold,겹
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,변형에 대한 측정의 기본 단위는 템플릿으로 동일해야합니다
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
 DocType: Project Task,Pending Review,검토 중
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,지정하십시오
 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,고객 아이디
-DocType: Page,Page Name,페이지 이름
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,시간은 시간보다는 커야하는 방법
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},창고 {0} : 부모 계정이 {1} 회사에 BOLONG하지 않는 {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,스핀들 마무리
 DocType: BOM,Last Purchase Rate,마지막 구매 비율
 DocType: Account,Asset,자산
 DocType: Project Task,Task ID,태스크 ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","예) ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","예) ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,상품에 대한 존재할 수 없다 재고 {0} 이후 변종이있다
 ,Sales Person-wise Transaction Summary,판매 사람이 많다는 거래 요약
-DocType: System Settings,Time Zone,시간대
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext 허브에 등록
 DocType: Monthly Distribution,Monthly Distribution Percentages,예산 월간 배분 백분율
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
 DocType: Delivery Note,% of materials delivered against this Delivery Note,이 납품서에 대해 배송자재 %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,스테이플 링
 DocType: Customer,Customer Details,고객 상세 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,쉐이핑
 DocType: Employee,Reports to,에 대한 보고서
 DocType: SMS Settings,Enter url parameter for receiver nos,수신기 NOS에 대한 URL 매개 변수를 입력
 DocType: Sales Invoice,Paid Amount,지불 금액
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',마감 계정 {0}는  '부채계정'이어야합니다
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","이미 직불의 계정 잔액, 당신은 같은 '신용', '균형이어야합니다'설정할 수 없습니다"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,품질 관리
 DocType: Production Planning Tool,Filter based on customer,필터 고객에 따라
 DocType: Payment Tool Detail,Against Voucher No,바우처 없음에 대하여
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 DocType: Tax Rule,Purchase,구입
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,잔고 수량
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,잔고 수량
 DocType: Item Group,Parent Item Group,부모 항목 그룹
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}에 대한 {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,코스트 센터
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,창고.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,창고.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,공급 업체의 통화는 회사의 기본 통화로 변환하는 속도에
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},행 번호 {0} : 행과 타이밍 충돌 {1}
 DocType: Opportunity,Next Contact,다음 연락
 DocType: Employee,Employment Type,고용 유형
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,고정 자산
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,신청 기간은 2 alocation 기록을 통해 할 수 없습니다
 DocType: Item Group,Default Expense Account,기본 비용 계정
 DocType: Employee,Notice (days),공지 사항 (일)
-DocType: Page,Yes,예
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
 DocType: Employee,Encashment Date,현금화 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,전주
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","바우처를 피해 유형은 구매 주문의 하나, 구매 송장 또는 분개해야합니다"
 DocType: Account,Stock Adjustment,재고 조정
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},기본 활동 비용은 활동 유형에 대해 존재 - {0}
 DocType: Production Order,Planned Operating Cost,계획 운영 비용
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,새로운 {0} 이름
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},첨부 {0} # {1} 찾기
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},첨부 {0} # {1} 찾기
 DocType: Job Applicant,Applicant Name,신청자 이름
 DocType: Authorization Rule,Customer / Item Name,고객 / 상품 이름
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},일련 번호는 항목에 대해 필수입니다 {0}
 DocType: Item Variant Attribute,Attribute,속성
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,범위 /에서 지정하십시오
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,제작
 DocType: Serial No,Under AMC,AMC에서
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,항목 평가 비율은 착륙 비용 바우처 금액을 고려하여 계산됩니다
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,트랜잭션을 판매의 기본 설정.
@@ -3354,17 +3079,16 @@
 DocType: Payment Reconciliation,Minimum Amount,최소 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,업데이트 완성품
 DocType: Workstation,per hour,시간당
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},계열 {0} 이미 사용될 {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,웨어 하우스 (영구 재고)에 대한 계정은이 계정이 생성됩니다.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,지불 금액
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,파견
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,프로젝트 매니저
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
 DocType: Customer,Default Taxes and Charges,기본 세금 및 요금
 DocType: Account,Receivable,받을 수있는
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
 DocType: Sales Invoice,Supplier Reference,공급 업체 참조
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","선택하면, 서브 어셈블리 항목에 대한 BOM은 원료를 얻기 위해 고려 될 것입니다.그렇지 않으면, 모든 서브 어셈블리 항목은 원료로 처리됩니다."
@@ -3372,8 +3096,8 @@
 DocType: Hub Settings,Seller Description,판매자 설명
 DocType: Employee Education,Qualification,자격
 DocType: Item Price,Item Price,상품 가격
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,비누 및 세제
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,영화 및 비디오
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,비누 및 세제
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,영화 및 비디오
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
@@ -3382,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,지원 Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},회사는 창고에없는 {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,재고 UOM 유틸리티를 교체
 DocType: POS Profile,Terms and Conditions,이용약관
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},현재까지의 회계 연도 내에 있어야합니다.날짜에 가정 = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","여기서 당신은 신장, 체중, 알레르기, 의료 문제 등 유지 관리 할 수 있습니다"
@@ -3394,7 +3117,7 @@
 DocType: Sales Order Item,For Production,생산
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,위의 표에 판매 주문을 입력하십시오
 DocType: Project Task,View Task,보기 작업
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,귀하의 회계 연도가 시작됩니다
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,귀하의 회계 연도가 시작됩니다
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,구매 영수증을 입력하세요
 DocType: Sales Invoice,Get Advances Received,선불수취
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
@@ -3402,20 +3125,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),지원 전자 우편 ID의 설정받는 서버. (예를 들어 support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Salary Slip,Salary Slip,급여 전표
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,버니 싱
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'마감일자'필요
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'필요
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다."
 DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목
 DocType: Salary Slip,Payment Days,지불 일
 DocType: BOM,Manage cost of operations,작업의 비용 관리
 DocType: Features Setup,Item Advanced,상품 상세
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,열간 압연
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","체크 거래의 하나가 ""제출""하면, 이메일 팝업이 자동으로 첨부 파일로 트랜잭션, 트랜잭션에 관련된 ""연락처""로 이메일을 보내 열었다.사용자는 나 이메일을 보낼 수도 있고 그렇지 않을 수도 있습니다."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,전역 설정
 DocType: Employee Education,Employee Education,직원 교육
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
 DocType: Salary Slip,Net Pay,실질 임금
 DocType: Account,Account,계정
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,일련 번호 {0}이 (가) 이미 수신 된
@@ -3424,35 +3145,28 @@
 DocType: Customer,Sales Team Details,판매 팀의 자세한 사항
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,병가
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},잘못된 {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,병가
 DocType: Email Digest,Email Digest,이메일 다이제스트
 DocType: Delivery Note,Billing Address Name,청구 주소 이름
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,백화점
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,시스템 밸런스
-DocType: Workflow,Is Active,활성
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,백화점
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,시스템 밸런스
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,먼저 문서를 저장합니다.
 DocType: Account,Chargeable,청구
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,변경 요약
-DocType: Workflow State,Primary,기본
 DocType: Expense Claim Detail,Expense Date,비용 날짜
 DocType: Item,Max Discount (%),최대 할인 (%)
-DocType: Communication,More Information,추가 정보
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,마지막 주문 금액
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,발파
 DocType: Company,Warn,경고
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,상품 평가가 업데이트
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
 DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Order,Raw Materials Supplied,공급 원료
 DocType: Purchase Invoice,Recurring Print Format,반복 인쇄 형식
-DocType: Communication,Series,시리즈
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
 DocType: Appraisal,Appraisal Template,평가 템플릿
-DocType: Communication,Email,이메일
 DocType: Item Group,Item Classification,품목 분류
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,비즈니스 개발 매니저
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,비즈니스 개발 매니저
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,유지 보수 방문 목적
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,기간
 ,General Ledger,원장
@@ -3462,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,먼저 {0}를 선택하세요
 DocType: Features Setup,To get Item Group in details table,자세한 내용은 테이블에 항목 그룹을 얻으려면
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,다시 그리기
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,에칭
 DocType: Sales Invoice,Commission,위원회
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3480,7 +3192,7 @@
 </code></pre>","<H4> 기본 템플릿 </ H4>는 
  <p> <a href=""http://jinja.pocoo.org/docs/templates/""> 신사 템플릿 생성 </A> 및 주소의 모든 필드를 (사용 {; BR한다; 
  {% 경우 address_line2 %} {{address_line2}} & LT; BR된다 사용자 정의 필드 경우) </ P> 
- <전> <코드> {{address_line1}} LT 사용할 수 포함 % ENDIF - %} 
+ <전> <코드> {{address_line1}} LT 사용할 수 포함 % ENDIF - %} 
  {{도시}} & LT; BR된다 
  {%의 경우 상태 %} {{상태}} & LT; BR & 하였다 {% ENDIF - %} 
  {%의 경우 PIN 코드의 %} PIN : {{PIN 코드}} & LT; BR & 하였다 {%의 ENDIF - %} 
@@ -3490,7 +3202,7 @@
  {% 경우 email_id %} 이메일 : {{email_id}} & LT; BR된다 {% ENDIF - %} 
  </ 코드> </ 사전>"
 DocType: Salary Slip Deduction,Default Amount,기본 금액
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,시스템에서 찾을 수없는 창고
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,시스템에서 찾을 수없는 창고
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,이 달의 요약
 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`이상 경과 프리즈 주식은`% d의 일보다 작아야한다.
@@ -3509,13 +3221,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
 DocType: Payment Tool,Get Outstanding Vouchers,뛰어난 쿠폰 받기
 DocType: Warranty Claim,Resolved By,에 의해 해결
 DocType: Appraisal,Start Date,시작 날짜
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,가치
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,기간 동안 잎을 할당합니다.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,확인하려면 여기를 클릭하십시오
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
@@ -3525,55 +3236,43 @@
 DocType: Item,Average time taken by the supplier to deliver,공급 업체에 의해 촬영 평균 시간 제공하는
 DocType: Time Log,Hours,시간
 DocType: Project,Expected Start Date,예상 시작 날짜
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,롤링
-DocType: ToDo,Priority,우선순위
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
-DocType: Dropbox Backup,Dropbox Access Allowed,허용 보관 용 액세스
-DocType: Dropbox Backup,Weekly,주l
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,예. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,수신
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,수신
 DocType: Maintenance Visit,Fully Completed,완전히 완료
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0} % 완료
 DocType: Employee,Educational Qualification,교육 자격
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} 성공적으로 우리의 뉴스 레터 목록에 추가되었습니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,전자빔 가공
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,주 보고서
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,재고 원장 업데이트 균형 엔트리
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,주 보고서
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,가격 추가/편집
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,코스트 센터의 차트
 ,Requested Items To Be Ordered,주문 요청 항목
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,내 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,내 주문
 DocType: Price List,Price List Name,가격리스트 이름
 DocType: Time Log,For Manufacturing,제조
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,합계
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,합계
 DocType: BOM,Manufacturing,생산
 ,Ordered Items To Be Delivered,전달 될 품목을 주문
 DocType: Account,Income,수익
-,Setup Wizard,설치 마법사
 DocType: Industry Type,Industry Type,산업 유형
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,문제가 발생했습니다!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,완료일
 DocType: Purchase Invoice Item,Amount (Company Currency),금액 (회사 통화)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,다이 캐스팅
-DocType: Email Alert,Reference Date,참조 날짜
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,조직 단위 (현)의 마스터.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,유효 모바일 NOS를 입력 해주십시오
 DocType: Budget Detail,Budget Detail,예산 세부 정보
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,전송하기 전에 메시지를 입력 해주세요
-DocType: Async Task,Status,상태
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},재고 UOM는 항목에 대해 업데이트 {0}
-DocType: Company History,Year,년
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,판매 시점 프로필
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS 설정을 업데이트하십시오
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,이미 청구 시간 로그 {0}
@@ -3586,55 +3285,52 @@
 ,Serial No Service Contract Expiry,일련 번호 서비스 계약 유효
 DocType: Item,Unit of Measure Conversion,측정 단위 변환
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,직원은 변경할 수 없다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
 DocType: Naming Series,Help HTML,도움말 HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},수당에 {0} 항목에 대한 교차에 대한 {1}
 DocType: Address,Name of person or organization that this address belongs to.,이 주소가 속해있는 개인이나 조직의 이름입니다.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,공급 업체
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,공급 업체
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,또 다른 급여 구조 {0} 직원에 대한 활성화 {1}.상태 '비활성'이 진행하시기 바랍니다.
 DocType: Purchase Invoice,Contact,연락처
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,에서 수신
 DocType: Features Setup,Exports,수출
 DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 DocType: Issue,Content Type,컨텐츠 유형
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,컴퓨터
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,상품 : {0} 시스템에 존재하지 않을
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Cost Center,Budgets,예산
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,업데이트
 DocType: Employee,Emergency Contact Details,비상 연락처 세부 정보
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,그것은 무엇을 하는가?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,그것은 무엇을 하는가?
 DocType: Delivery Note,To Warehouse,창고
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},계정 {0} 더 많은 회계 연도 번 이상 입력 한 {1}
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고'재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,전기의
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,전기의
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},사용자 ID 직원에 대한 설정하지 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,피닝
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,보증 청구에서
 DocType: Stock Entry,Default Source Warehouse,기본 소스 창고
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},생일 알림 {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,래핑
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,일 이후 마지막 주문
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,일 이후 마지막 주문
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
-DocType: User,Enabled,사용
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,재고 자산
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},당신은 정말 {0}과 {1} 년 달에 대한 모든 급여 슬립 제출 하시겠습니까
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,가져 오기 구독자
@@ -3642,19 +3338,18 @@
 DocType: Attendance,Present,선물
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,배송 참고 {0} 제출하지 않아야합니다
 DocType: Notification Control,Sales Invoice Message,판매 송장 메시지
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,계정 {0}을 닫으면 형 책임 / 주식이어야합니다
 DocType: Authorization Rule,Based On,에 근거
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,프로젝트 활동 / 작업.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,급여 전표 생성
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} 유효한 이메일 ID가 아닌
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",해당 법령에가로 선택된 경우 구매 확인해야합니다 {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,할인 100 미만이어야합니다
-DocType: ToDo,Low,낮음
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,회전
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
@@ -3676,7 +3371,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,캠페인 이름이 필요합니다
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Receipt Item,Rejected Serial No,시리얼 No 거부
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,디프 드로잉
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,새로운 뉴스
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,쇼 밸런스
@@ -3687,7 +3381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,고령화 범위 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,양
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,리벳
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
 ,Sales Analytics,판매 분석
 DocType: Manufacturing Settings,Manufacturing Settings,제조 설정
@@ -3699,28 +3392,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,새 계정 이름
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,원료 공급 비용
 DocType: Selling Settings,Settings for Selling Module,모듈 판매에 대한 설정
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,고객 서비스
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,고객 서비스
 DocType: Item,Thumbnail,미리보기
 DocType: Item Customer Detail,Item Customer Detail,항목을 고객의 세부 사항
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,이메일 확인
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,제공 후보 작업.
 DocType: Notification Control,Prompt for Email on Submission of,제출의 전자 우편을위한 프롬프트
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,총 할당 잎이 기간에 일 이상이다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,{0} 항목을 재고 품목 수 있어야합니다
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,진행웨어 하우스의 기본 작업
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,회계 거래의 기본 설정.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0}이 필요합니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,진공 성형
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
-DocType: Contact Us Settings,City,시
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,초음파 가공
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,오류 : 유효한 ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,항목 {0} 판매 품목이어야합니다
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
 DocType: Account,Equity,공평
 DocType: Sales Order,Printing Details,인쇄 세부 사항
 DocType: Task,Closing Date,마감일
 DocType: Sales Order Item,Produced Quantity,생산 수량
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,기사
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,기사
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,검색 서브 어셈블리
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
 DocType: Sales Partner,Partner Type,파트너 유형
@@ -3728,7 +3417,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise 할인
 DocType: Purchase Invoice,Against Expense Account,비용 계정에 대한
 DocType: Production Order,Production Order,생산 주문
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다
 DocType: Quotation Item,Against Docname,docName 같은 반대
 DocType: SMS Center,All Employee (Active),모든 직원 (활성)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,지금보기
@@ -3736,26 +3425,24 @@
 DocType: BOM,Raw Material Cost,원료 비용
 DocType: Item,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt 차트
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,시리즈 업데이트
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,보고서 유형이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,보고서 유형이 필수입니다
 DocType: Item,Serial Number Series,일련 번호 시리즈
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},창고 재고 상품의 경우 필수 {0} 행에서 {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,소매 및 도매
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,소매 및 도매
 DocType: Issue,First Responded On,첫 번째에 반응했다
 DocType: Website Item Group,Cross Listing of Item in multiple groups,여러 그룹에서 항목의 크로스 리스팅
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,첫 번째 사용자 : 당신
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,첫 번째 사용자 : 당신
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,성공적으로 조정 됨
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,성공적으로 조정 됨
 DocType: Production Order,Planned End Date,계획 종료 날짜
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,항목이 저장되는 위치.
 DocType: Tax Rule,Validity,효력
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,송장에 청구 된 금액
 DocType: Attendance,Attendance,출석
-DocType: Page,No,NO
 DocType: BOM,Materials,도구
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","선택되지 않으면, 목록은인가되는 각 부서가 여기에 첨가되어야 할 것이다."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,게시 날짜 및 게시 시간이 필수입니다
@@ -3763,55 +3450,46 @@
 ,Item Prices,상품 가격
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
 DocType: Period Closing Voucher,Period Closing Voucher,기간 결산 바우처
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,가격리스트 마스터.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,가격리스트 마스터.
 DocType: Task,Review Date,검토 날짜
 DocType: Purchase Invoice,Advance Payments,사전 지불
-DocType: DocPerm,Level,레벨
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,행의 목표웨어 하우스가 {0}과 동일해야합니다 생산 주문
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,밀링
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,권한이 없습니다 지불 도구를 사용하지합니다
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% s을 (를) 반복되는 지정되지 않은 '알림 이메일 주소'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,환율이 다른 통화를 사용하여 항목을 한 후 변경할 수 없습니다
 DocType: Company,Round Off Account,반올림
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,니블 링
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,관리비
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,컨설팅
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,컨설팅
 DocType: Customer Group,Parent Customer Group,상위 고객 그룹
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,변경
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 DocType: Appraisal Goal,Score Earned,점수 획득
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","예) ""내 회사 LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,통지 기간
 DocType: Bank Reconciliation Detail,Voucher ID,바우처 ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,이 루트 영토 및 편집 할 수 없습니다.
 DocType: Packing Slip,Gross Weight UOM,총중량 UOM
 DocType: Email Digest,Receivables / Payables,채권 / 채무
 DocType: Delivery Note Item,Against Sales Invoice,견적서에 대하여
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,스탬핑
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,0 값을보기
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,원료의 부여 수량에서 재 포장 / 제조 후의 아이템의 수량
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 DocType: Task,Actual End Date (via Time Logs),실제 종료 날짜 (시간 로그를 통해)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,부모의 비용 센터를 입력 해주십시오
 DocType: Delivery Note,Print Without Amount,금액없이 인쇄
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
-DocType: User,Last Name,성
-DocType: Web Page,Left,왼쪽
-DocType: Event,All Day,하루 종일
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
 DocType: Issue,Support Team,지원 팀
 DocType: Appraisal,Total Score (Out of 5),전체 점수 (5 점 만점)
-DocType: Contact Us Settings,State,도
 DocType: Batch,Batch,일괄처리
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,잔고
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,잔고
 DocType: Project,Total Expense Claim (via Expense Claims),총 경비 요청 (비용 청구를 통해)
-DocType: User,Gender,성별
 DocType: Journal Entry,Debit Note,직불 주
 DocType: Stock Entry,As per Stock UOM,주식 UOM 당
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,만료되지
@@ -3825,44 +3503,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,값을 기준으로 거래를 제한하는 규칙을 만듭니다.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","이 옵션을 선택하면 총 없음. 작업 일의 휴일을 포함하며,이 급여 당 일의 가치를 감소시킬 것이다"
 DocType: Purchase Invoice,Total Advance,전체 사전
-DocType: Workflow State,User,사용자
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,가공 급여
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,분실로 설정
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,지불 영수증 참고
 DocType: Customer,Credit Days Based On,신용 일을 기준으로
 DocType: Tax Rule,Tax Rule,세금 규칙
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,판매주기 전반에 걸쳐 동일한 비율을 유지
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,워크 스테이션 근무 시간 외에 시간 로그를 계획합니다.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}이 (가) 이미 제출되었습니다
 ,Items To Be Requested,요청 할 항목
-DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Time Log,Billing Rate based on Activity Type (per hour),활동 유형에 따라 결제 요금 (시간당)
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,봉합
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","회사 이메일 ID를 찾을 수 없습니다, 따라서 전송되지 메일"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 DocType: Production Planning Tool,Filter based on item,항목을 기준으로 필터링
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
 DocType: Purchase Common,Purchase Common,공동 구매
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} 수정되었습니다.새로 고침하십시오.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,다음과 같은 일에 허가 신청을하는 사용자가 중지합니다.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,기회에서
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,블랭킹
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,고객에게 제기 지폐입니다.
-DocType: DocField,Default,기본값
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} 가입자는 추가
 DocType: Maintenance Schedule,Schedule,일정
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",이 코스트 센터에 대한 예산을 정의합니다. 예산 작업을 설정하려면 다음을 참조 &quot;회사 목록&quot;
@@ -3873,70 +3547,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Expense Claim,Approved,인가 된
 DocType: Pricing Rule,Price,가격
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""예""를 선택하면 일련 번호 마스터에서 볼 수있는 항목의 각 개체에 고유 한 ID를 제공합니다."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
 DocType: Address,Office,사무실
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,표준 보고서
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,세금 계정을 만들려면
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,비용 계정을 입력하십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
 DocType: Employee,Current Address,현재 주소
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,배치 재고
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,배치 재고
 DocType: Employee,Contract End Date,계약 종료 날짜
 DocType: Sales Order,Track this Sales Order against any Project,모든 프로젝트에 대해이 판매 주문을 추적
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,위의 기준에 따라 (전달하기 위해 출원 중) 판매 주문을 당겨
-DocType: DocShare,Document Type,문서 형식
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,공급 업체의 견적에서
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,공급 업체의 견적에서
 DocType: Deduction Type,Deduction Type,공제 유형
 DocType: Attendance,Half Day,반나절
 DocType: Pricing Rule,Min Qty,최소 수량
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",배치 번호와 판매 및 구매 문서의 항목을 추적합니다. &quot;선호 업종 : 화학&quot;
 DocType: GL Entry,Transaction Date,거래 날짜
 DocType: Production Plan Item,Planned Qty,계획 수량
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,총 세금
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,총 세금
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,수량 (수량 제조) 필수
 DocType: Stock Entry,Default Target Warehouse,기본 대상 창고
 DocType: Purchase Invoice,Net Total (Company Currency),합계액 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
 DocType: Notification Control,Purchase Receipt Message,구매 영수증 메시지
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,총 할당 된 잎은 기간보다 더 있습니다
 DocType: Production Order,Actual Start Date,실제 시작 날짜
 DocType: Sales Order,% of materials delivered against this Sales Order,이 판매 주문에 대해 배송자재 %
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,기록 항목의 움직임.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,뉴스 목록 가입자
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,서비스
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 ,Monthly Salary Register,월급 등록
-apps/frappe/frappe/website/template.py +140,Next,다음
 DocType: Warranty Claim,If different than customer address,만약 고객 주소와 다른
 DocType: BOM Operation,BOM Operation,BOM 운영
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,전해
 DocType: Purchase Taxes and Charges,On Previous Row Amount,이전 행의 양에
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,이어야 한 행에 결제 금액을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,이어야 한 행에 결제 금액을 입력하세요
 DocType: POS Profile,POS Profile,POS 프로필
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,행 {0} : 결제 금액 잔액보다 클 수 없습니다
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,무급 총
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,무급 총
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,소요시간 로그는 청구되지 않습니다
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,구매자
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,구매자
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,순 임금은 부정 할 수 없습니다
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,수동에 대해 바우처를 입력하세요
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,수동에 대해 바우처를 입력하세요
 DocType: SMS Settings,Static Parameters,정적 매개 변수
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
@@ -3945,14 +3612,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,상대에게 대량 SMS를 보내기
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,세금이나 요금에 대한 고려
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,크로스 압연
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,신용카드
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,신용카드
 DocType: BOM,Item to be manufactured or repacked,제조 또는 재 포장 할 항목
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,재고 거래의 기본 설정.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,재고 거래의 기본 설정.
 DocType: Purchase Invoice,Next Date,다음 날짜
 DocType: Employee Education,Major/Optional Subjects,주요 / 선택 주제
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,세금 및 요금을 입력하세요
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,가공
 DocType: Sales Invoice Item,Drop Ship,드롭 선박
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","여기에서 당신은 부모, 배우자와 자녀의 이름과 직업 등 가족 세부 사항을 유지 관리 할 수 있습니다"
 DocType: Hub Settings,Seller Name,판매자 이름
@@ -3962,47 +3627,44 @@
 DocType: Stock Entry,Repack,재 포장
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,당신은 진행하기 전에 양식을 저장해야합니다
 DocType: Item Attribute,Numeric Values,숫자 값
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,로고 첨부
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,로고 첨부
 DocType: Customer,Commission Rate,위원회 평가
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,바구니가 비어 있습니다
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,루트는 편집 할 수 없습니다.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,할당 된 금액은 unadusted 금액보다 큰 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,루트는 편집 할 수 없습니다.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,할당 된 금액은 unadusted 금액보다 큰 수 없습니다
 DocType: Manufacturing Settings,Allow Production on Holidays,휴일에 생산 허용
 DocType: Sales Order,Customer's Purchase Order Date,고객의 구매 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,자본금
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,CSV 파일을 선택하세요
-DocType: Dropbox Backup,Send Backups to Dropbox,드롭 박스에 백업 보내기
 DocType: Purchase Order,To Receive and Bill,수신 및 법안
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,디자이너
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,디자이너
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,이용 약관 템플릿
 DocType: Serial No,Delivery Details,납품 세부 사항
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,수량이 수준 이하로 떨어질 경우 자동으로 자료 요청을 만들
 ,Item-wise Purchase Register,상품 현명한 구매 등록
 DocType: Batch,Expiry Date,유효 기간
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",재주문 수준을 설정하려면 항목은 구매 상품 또는 제조 품목이어야합니다
 ,Supplier Addresses and Contacts,공급 업체 주소 및 연락처
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +18,Project master.,프로젝트 마스터.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,재료 명세서 (BOM)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
-DocType: Dropbox Backup,Send Notifications To,알림을 보내기
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,참조 날짜
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,참조 날짜
 DocType: Employee,Reason for Leaving,떠나는 이유
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,계정 {0}이 (가) 없습니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},직원에 대한 급여 구조를 만드십시오 {0}

diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 148e444..c04b4bd 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Alga Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izvēlieties Mēneša Distribution, ja jūs vēlaties, lai izsekotu, pamatojoties uz sezonalitāti."
 DocType: Employee,Divorced,Šķīries
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Brīdinājums: Same priekšmets ir ievadīts vairākas reizes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Preces jau sinhronizēts
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Lūdzu, izvēlieties Party veids pirmais"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Rūdīšana
 DocType: Item,Customer Items,Klientu Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
 DocType: Item,Publish Item to hub.erpnext.com,Publicēt postenis uz hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Atstājiet Approvers
 DocType: Sales Partner,Dealer,Tirgotājs
 DocType: Employee,Rented,Īrēts
-DocType: About Us Settings,Website,Mājas lapa
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Blīvēšanas plus aglomerācijas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Tiks aprēķināts darījumā.
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,No Material Pieprasījums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,No Material Pieprasījums
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nav vairāk rezultātu.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Faktiskais veids nodokli nevar iekļaut vienības likmes kārtas {0}
 DocType: C-Form,Customer,Klients
 DocType: Purchase Receipt Item,Required By,Nepieciešamais Līdz
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Series Atjaunots Veiksmīgi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Izšūšanas
 DocType: Pricing Rule,Apply On,Piesakies On
 DocType: Item Price,Multiple Item prices.,Vairāki Izstrādājumu cenas.
 ,Purchase Order Items To Be Received,"Pirkuma pasūtījuma posteņi, kas saņemami"
 DocType: SMS Center,All Supplier Contact,Visi Piegādātājs Contact
 DocType: Quality Inspection Reading,Parameter,Parametrs
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Jauns atvaļinājuma pieteikums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Jauns atvaļinājuma pieteikums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka projekts
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Lai saglabātu klientu gudrs pozīcijas kods un padarīt tās meklēšanai, pamatojoties uz to kodu Izmantojiet šo opciju"
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Rādīt Variants
-DocType: Sales Invoice Item,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Daudzums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredītiem (pasīvi)
 DocType: Employee Education,Year of Passing,Gads Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In noliktavā
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Veikt jaunu POS profils
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Veselības aprūpe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 DocType: Purchase Invoice,Monthly,Ikmēneša
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Maksājuma kavējums (dienas)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Pavadzīme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-pasta adrese
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Aizstāvēšana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-pasta adrese
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Aizstāvēšana
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Lūdzu, izvēlieties cenrādi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Kokapstrāde
 DocType: Production Order Operation,Work In Progress,Work In Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D drukāšana
 DocType: Employee,Holiday List,Brīvdienu saraksts
 DocType: Time Log,Time Log,Laiks Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Grāmatvedis
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Grāmatvedis
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Tālruņa Nr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log par veiktajām darbībām, ko lietotāji pret uzdevumu, ko var izmantot, lai izsekotu laiku, rēķinu."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Jaunais {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Jaunais {0}: # {1}
 ,Sales Partners Commission,Sales Partners Komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Saīsinājums nedrīkst būt vairāk par 5 rakstzīmes
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribūta vērtība {0} nevar noņemt no {1} kā postenī VARIANTU \ pastāv ar šo atribūtu.
-DocType: Print Settings,Classic,Klasisks
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Tas ir root kontu un to nevar rediģēt.
 DocType: BOM,Operations,Operācijas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},"Nevar iestatīt atļaujas, pamatojoties uz Atlaide {0}"
 DocType: Bin,Quantity Requested for Purchase,Daudzums lūdz iesniegt pirkšanai
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pievienojiet .csv failu ar divām kolonnām, viena veco nosaukumu un vienu jaunu nosaukumu"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Atvēršana uz darbu.
 DocType: Item Attribute,Increment,Pieaugums
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izvēlieties noliktava ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklāma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklāma
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pats uzņēmums ir reģistrēts vairāk nekā vienu reizi
 DocType: Employee,Married,Precējies
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Aizliegts {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 DocType: Payment Reconciliation,Reconcile,Saskaņot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Pārtikas veikals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Padarīt Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensiju fondi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensiju fondi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Noliktava ir obligāta, ja konts veids ir noliktava"
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Pārbaudiet, vai atkārtojas kārtību, noņemiet atzīmi, lai apturētu atkārtojas vai nodot pareizu beigu datumu"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundu Rate / 60) * Faktiskais Darbības laiks
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Izmaksas piegādāto preču
-DocType: Blog Post,Guest,Viesis
 DocType: Quality Inspection,Get Specification Details,Saņemt specifikācijas detaļas
 DocType: Lead,Interested,Ieinteresēts
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill materiālu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Atklāšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Atklāšana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},No {0} uz {1}
 DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} ir obligāta
 DocType: Stock Entry,Additional Costs,Papildu izmaksas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
-DocType: Standard Reply,Owner,Īpašnieks
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ievadiet uzņēmuma pirmais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
 DocType: Employee Education,Under Graduate,Zem absolvents
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Urbšana
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitāte Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Paziņojums par konta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,Klients
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
 DocType: Naming Series,Prefix,Priedēklis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Patērējamās
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Patērējamās
 DocType: Upload Attendance,Import Log,Import Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sūtīt
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Gada alga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gada alga
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Akciju Izdevumi
 DocType: Newsletter,Email Sent?,Nosūtīts e-pasts?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Rādīt Time Baļķi
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
 DocType: Delivery Note,Installation Status,Instalācijas statuss
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
 DocType: Item,Supply Raw Materials for Purchase,Piegādes izejvielas iegādei
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postenis {0} jābūt iegāde punkts
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Atjauninās pēc pārdošanas rēķinu iesniegšanas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Iztaisnošana
 DocType: BOM Replace Tool,New BOM,Jaunais BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Partijas Time Baļķi uz rēķinu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liešana
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Biļetens jau ir nosūtīts
 DocType: Lead,Request Type,Pieprasījums Type
 DocType: Leave Application,Reason,Iemesls
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Apraides
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Izpildīšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pirmais lietotājs kļūs System Manager (jūs varat mainīt šo vēlāk).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Apraides
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Izpildīšana
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pirmais lietotājs kļūs System Manager (jūs varat mainīt šo vēlāk).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
 DocType: Serial No,Maintenance Status,Uzturēšana statuss
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Preces un cenu
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Preces un cenu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},No datuma jābūt starp fiskālajā gadā. Pieņemot No datums = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Izvēlieties darba ņēmējam, kam jūs veidojat izvērtēšanu."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Izmaksās Center {0} nepieder Sabiedrībai {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenrādis ir jāpiemēro pērk vai pārdod
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Uzstādīšana datums nevar būt pirms piegādes datuma postenī {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Atlaide Cenrādis Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Sākums
-DocType: User,First Name,Vārds
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Pilna veidņu liešana
 DocType: Offer Letter,Select Terms and Conditions,Izvēlieties Noteikumi un nosacījumi
 DocType: Production Planning Tool,Sales Orders,Pārdošanas pasūtījumu
 DocType: Purchase Taxes and Charges,Valuation,Vērtējums
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankas konts
 DocType: Leave Type,Allow Negative Balance,Atļaut negatīvo atlikumu
 DocType: Selling Settings,Default Territory,Default Teritorija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televīzija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televīzija
 DocType: Production Order Operation,Updated via 'Time Log',"Atjaunināt, izmantojot ""Time Ieiet"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konts {0} nepieder Sabiedrībai {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Pieminēt ja nestandarta saņemama konts piemērojams
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,"Par noliktava ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saņemta
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Ievadiet Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
 DocType: Lead,Address & Contact,Adrese un kontaktinformācija
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
 DocType: Newsletter List,Total Subscribers,Kopā Reģistrētiem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Name
+,Contact Name,Contact Name
 DocType: Production Plan Item,SO Pending Qty,SO Gaida Daudz
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pieprasīt iegādei.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double korpuss
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lapām gadā
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lapām gadā
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Lūdzu noteikt nosaukšana Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 DocType: Time Log,Will be updated when batched.,"Tiks papildināts, ja batched."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
-DocType: Bulk Email,Message,Ziņa
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Atsauces Nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Gada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Atstājiet Bloķēts
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,Pārdošanas rēķins Nr
 DocType: Material Request Item,Min Order Qty,Min Order Daudz
 DocType: Lead,Do Not Contact,Nesazināties
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,"Unikāls id, lai izsekotu visas periodiskās rēķinus. Tas ir radīts apstiprināšanas."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Item,Publish in Hub,Publicē Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
 DocType: Item,Purchase Details,Pirkuma Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},{0} Prece nav atrasts &quot;Izejvielu Kopā&quot; tabulā Pirkuma pasūtījums {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire suku
 DocType: Employee,Relation,Attiecība
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Apstiprināti pasūtījumus no klientiem.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Izveidot Kalendārs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Izdevumu Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Lūdzu, izvēlieties iekasēšanas veids pirmais"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Jaunākais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 simboli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Izvēlieties savu valodu
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 simboli
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Izslēdz izveidi laika baļķu pret pasūtījumu. Darbības nedrīkst kāpurķēžu pret Ražošanas Pasūtīt
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Variants
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,{0} postenis jābūt Service postenis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
-DocType: DocType,Administrator,Administrators
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser urbšana
-DocType: Stock UOM Replace Utility,New Stock UOM,Inventāra UOM
 DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs
 DocType: Employee,External Work History,Ārējā Work Vēsture
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Apļveida Reference kļūda
-DocType: Communication,Closed,Slēgts
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Vārdos (eksportam) būs redzams pēc tam, kad jums ietaupīt pavadzīmi."
 DocType: Lead,Industry,Rūpniecība
 DocType: Employee,Job Profile,Darba Profile
 DocType: Newsletter,Newsletter,Biļetens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Mīlināšanās
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
 DocType: Journal Entry,Multi Currency,Multi Valūtas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Postenis tiek atjaunināts
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
 DocType: Sales Invoice Item,Delivery Note,Piegāde Note
-DocType: Dropbox Backup,Allow Dropbox Access,Atļaut Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Iestatīšana Nodokļi
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Maksājums Entry ir modificēts pēc velk to. Lūdzu, velciet to vēlreiz."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Workstation,Rent Cost,Rent izmaksas
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Uzņēmuma e-pasts
 DocType: GL Entry,Debit Amount in Account Currency,Debeta summa konta valūtā
 DocType: Shipping Rule,Valid for Countries,Derīgs valstīm
-DocType: Workflow State,Refresh,Atsvaidzināt
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Visus importa saistītās jomās, piemēram, valūtas maiņas kursa, importa kopapjoma importa grand kopējo utt ir pieejami pirkuma čeka, piegādātājs Citāts, pirkuma rēķina, pirkuma pasūtījuma uc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Kopā Order Uzskata
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Ievadiet ""Atkārtot mēneša diena"" lauka vērtību"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Ievadiet ""Atkārtot mēneša diena"" lauka vērtību"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Pieejams BOM, pavadzīme, pirkuma rēķina, ražošanas kārtību, pirkuma pasūtījuma, pirkuma čeka, pārdošanas rēķinu, pārdošanas rīkojumu, Fondu Entry, laika kontrolsaraksts"
 DocType: Item Tax,Tax Rate,Nodokļa likme
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select postenis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Select postenis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Vienība: {0} izdevās partiju gudrs, nevar saskaņot, izmantojot \ Stock samierināšanās, nevis izmantot akciju Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pirkuma saņemšana jāiesniedz
-DocType: Stock UOM Replace Utility,Current Stock UOM,Pašreizējā Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Jūsu e-pasta adrese
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Lūdzu, skatiet pielikumu"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Ūdens strūklas griešana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Jau Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Jau Complete !!
 ,Finished Goods,Gatavās preces
 DocType: Delivery Note,Instructions,Instrukcijas
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Lūdzu, nav izveidot klientu kontus un piegādātājiem. Tie ir radīti tieši no klienta / piegādātāja meistari."
 DocType: Currency Exchange,Currency Exchange,Valūtas maiņa
 DocType: Purchase Invoice Item,Item Name,Vienības nosaukums
+DocType: Authorization Rule,Approving User  (above authorized value),Apstiprinot lietotāju (virs atļautā vērtība)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Kredītu atlikums
 DocType: Employee,Widowed,Atraitnis
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Preces, kas jāpieprasa, kas ir ""Izpārdots"", ņemot vērā visas noliktavas, pamatojoties uz plānoto Daudz un minimālā pasūtījuma qty"
@@ -378,22 +346,21 @@
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: Landed Cost Item,Applicable Charges,Piemērojamām izmaksām
 DocType: Workstation,Consumable Cost,Patērējamās izmaksas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
 DocType: Purchase Receipt,Vehicle Date,Transportlīdzekļu Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicīnisks
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Iemesls zaudēt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 DocType: Employee,Single,Viens
 DocType: Issue,Attachment,Pieķeršanās
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budžets nevar iestatīt Group Cost Center
 DocType: Account,Cost of Goods Sold,Pārdotās produkcijas ražošanas izmaksas
 DocType: Purchase Invoice,Yearly,Katru gadu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Ievadiet izmaksu centram
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ievadiet izmaksu centram
 DocType: Journal Entry Account,Sales Order,Sales Order
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Vid. Pārdodot Rate
 DocType: Purchase Order,Start date of current order's period,Sākuma datums pašreizējās pasūtījuma perioda
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Daudzumu nevar būt daļa rindā {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Daudzumu nevar būt daļa rindā {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Daudzums un Rate
 DocType: Delivery Note,% Installed,% Uzstādīts
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ievadiet uzņēmuma nosaukumu pirmais
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automātiski iestata Serial Nos pamatojoties uz FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformēšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Sagriešanas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Lai Lieta Nr ' nevar būt mazāks kā ""No lietā Nr '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nav sākusies
 DocType: Lead,Channel Partner,Kanālu Partner
 DocType: Account,Old Parent,Old Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
+DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday meistars.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell formēšanas
 DocType: Material Request Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ievadiet Preces kods.
 DocType: BOM,Costing,Izmaksu
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ja atzīmēts, nodokļa summa tiks uzskatīta par jau iekļautas Print Rate / Print summa"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Svārstās
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
 DocType: Features Setup,Imports,Imports
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Līmēšanas
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Neapstiprinātas aktivitātes šodienu
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Apmeklējumu ieraksts.
 DocType: Bank Reconciliation,Journal Entries,Žurnāla ierakstiem
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
-DocType: System Settings,Loading...,Loading ...
-DocType: DocField,Password,Parole
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Kausēta nogulsnēšanās modelēšana
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
 DocType: Customer,Buyer of Goods and Services.,Pircējs Preču un pakalpojumu.
 DocType: Journal Entry,Accounts Payable,Kreditoru
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pievienot abonenti
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Neeksistē"
 DocType: Pricing Rule,Valid Upto,Derīgs Līdz pat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direct Ienākumi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administratīvā amatpersona
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administratīvā amatpersona
 DocType: Payment Tool,Received Or Paid,Saņem vai maksā
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry,Difference Account,Atšķirība konts
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmētika
-DocType: DocField,Type,Tips
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
-DocType: Communication,Subject,Pakļauts
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 ,Serial No Warranty Expiry,Sērijas Nr Garantija derīguma
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Punkts
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Apakšuzņēmēji
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Jaunais UOM NEDRĪKST tipa Visa skaits
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Managing Apakšuzņēmēji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mēbeles un Armatūra
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Materiālu vajadzības
 DocType: Company,Delete Company Transactions,Dzēst Uzņēmums Darījumi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Postenis {0} nav Iegādājieties postenis
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} ir nederīgs e-pasta adresi ""Paziņojums \ e-pasta adrese"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Kopā Norēķinu Šogad:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Kopā Norēķinu Šogad:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nevar izdzēst Sērijas Nr {0}, jo tas tiek izmantots akciju darījumiem"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Noslēguma (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Noslēguma (Cr)
 DocType: Serial No,Warranty Period (Days),Garantijas periods (dienas)
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 ,Pending Qty,Kamēr Daudz
 DocType: Job Applicant,Thread HTML,Pavediens HTML
 DocType: Company,Ignore,Ignorēt
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
 DocType: Pricing Rule,Valid From,Derīgs no
 DocType: Sales Invoice,Total Commission,Kopā Komisija
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,15 +461,14 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mēneša Distribution ** palīdz izplatīt savu budžetu pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu. Izplatīt budžetu, izmantojot šo sadalījumu, noteikt šo ** Mēneša sadalījums ** ar ** izmaksu centra **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Veikt klientu pasūtījumu
 DocType: Project Task,Project Task,Projekta uzdevums
-,Lead Id,Lead Id
+,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
-DocType: About Us Settings,Website Manager,Mājas lapa vadītājs
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskālā gada sākuma datums nedrīkst būt lielāks par fiskālā gada beigu datuma
 DocType: Warranty Claim,Resolution,Rezolūcija
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Piegādāts: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Norēķini un piegāde statuss
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Iepriekšējais
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izvēlieties klientu pasūtījumu, no kuriem vēlaties izveidot pasūtījumu."
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Algu sastāvdaļas.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database potenciālo klientu.
+DocType: Authorization Rule,Customer or Item,Klients vai postenis
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klientu datu bāzi.
 DocType: Quotation,Quotation To,Citāts Lai
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobātika
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Default mērvienība postenī {0} nevar mainīt tieši tāpēc, ka jums jau ir zināma darījuma (-us) ar citu UOM. Jums būs nepieciešams, lai izveidotu jaunu posteni, lai izmantotu citu Default UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
-DocType: Event,Wednesday,Trešdiena
 DocType: Sales Invoice,Customer's Vendor,Klienta Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ražošanas uzdevums ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Priekšlikums Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Priekšlikums Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Vēl Sales Person {0} pastāv ar to pašu darbinieku id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatīvs Stock Kļūda ({6}) postenī {0} noliktavā {1} uz {2}{3}{4}{5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Default Izmaksu Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Uzturēšana grafiks
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tad Cenu Noteikumi tiek filtrētas, balstoties uz klientu, klientu grupā, teritorija, piegādātājs, piegādātāju veida, kampaņas, pārdošanas partneris uc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Lūdzu, instalējiet nomestuves python moduli"
 DocType: Employee,Passport Number,Pases numurs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,No pirkuma čeka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Vadītājs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,No pirkuma čeka
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
 DocType: SMS Settings,Receiver Parameter,Uztvērējs parametrs
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Pamatojoties uz"" un ""Group By"", nevar būt vienādi"
 DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Līdz
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Ievadiet e-pasta adresi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End cauruļu veidošanas
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pārveidot uz Group
 DocType: Activity Cost,Activity Type,Pasākuma veids
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Fiksētie dienas
 DocType: Sales Invoice,Packing List,Iepakojums Latviešu
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pirkuma pasūtījumu dota piegādātājiem.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicēšana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicēšana
 DocType: Activity Cost,Projects User,Projekti User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Patērētā
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nav atrasts Rēķina informācija tabulā
 DocType: Company,Round Off Cost Center,Noapaļot izmaksu centru
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Uzturēšana Visit {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Material Request,Material Transfer,Materiāls Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Atvere (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Norīkošanu timestamp jābūt pēc {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Settings
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Izkrauti Izmaksu nodokļi un maksājumi
 DocType: Production Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Vairāk
 DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Pārdēvēt
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Locīšana
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Atļaut lietotāju
 DocType: Journal Entry,Bill No,Bill Nr
 DocType: Purchase Invoice,Quarterly,Ceturkšņa
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ievadiet Papildus informācija
 DocType: Purchase Receipt,Other Details,Cita informācija
 DocType: Account,Accounts,Konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Mārketings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight cirpšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Mārketings
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Lai izsekotu objektu pārdošanas un pirkuma dokumentiem, pamatojoties uz to sērijas nos. Tas var arī izmantot, lai izsekotu garantijas informāciju par produktu."
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Noraidīts Noliktava ir obligāta pret regected postenī
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 DocType: Employee,Provide email id registered in company,Nodrošināt e-pasta id reģistrēts uzņēmums
 DocType: Hub Settings,Seller City,Pārdevējs City
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Prece ir varianti.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} prece nav atrasta
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un Noliktavas
 DocType: Sales Invoice,Commission Rate (%),Komisijas likme (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Pret kuponu Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nevar atrast valūtas kursu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Gaidīts
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kredītkarte Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uzdevums Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
-DocType: Communication,Open,Atvērts
 DocType: Lead,Campaign Name,Kampaņas nosaukums
 ,Reserved,Rezervēts
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
@@ -639,30 +582,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ilgtermiņa aktīvi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nav krājums punkts
 DocType: Mode of Payment Account,Default Account,Default Account
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Svins jānosaka, ja Opportunity ir izgatavots no Lead"
-DocType: Contact Us Settings,Address Title,Adrese sadaļa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: Production Order Operation,Planned End Time,Plānotais Beigu laiks
 ,Sales Person Target Variance Item Group-Wise,Sales Person Mērķa Variance Prece Group-Wise
-DocType: Dropbox Backup,Daily,Katru dienu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Employee,Cell Number,Šūnu skaits
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerģija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mēnešalga paziņojumu.
 DocType: Item Group,Website Specifications,Website specifikācijas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Jauns konts
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: No {0} tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Grāmatvedības Ierakstus var veikt pret lapu mezgliem. Ieraksti pret grupām nav atļauts.
-DocType: ToDo,High,Augsts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Opportunity,Maintenance,Uzturēšana
-DocType: User,Male,Vīrietis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Pārdošanas kampaņas.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Personisks
 DocType: Expense Claim Detail,Expense Claim Type,Izdevumu Pretenzija Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Noklusējuma iestatījumi Grozs
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} ir saistīts pret ordeņa {1}, pārbaudiet, vai tas būtu velk kā iepriekš šajā rēķinā."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnoloģija
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} ir saistīts pret ordeņa {1}, pārbaudiet, vai tas būtu velk kā iepriekš šajā rēķinā."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnoloģija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ievadiet Prece pirmais
 DocType: Account,Liability,Atbildība
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Process Payroll,Send Email,Sūtīt e-pastu
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nē Atļauja
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Update Stock&quot;, nevar pārbaudīt, jo preces netiek piegādātas ar {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mani Rēķini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mani Rēķini
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Neviens darbinieks atrasts
 DocType: Purchase Order,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Lai aktivizētu &quot;tirdzniecības vieta&quot; funkcijas
 DocType: Bin,Moving Average Rate,Moving vidējā likme
 DocType: Production Planning Tool,Select Items,Izvēlieties preces
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
-DocType: Comment,Reference Name,Atsauce Name
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: Sales Invoice Item,Target Warehouse,Mērķa Noliktava
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Paredzams, Piegāde datums nevar būt pirms Sales Order Datums"
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neto peļņa / zaudējumi
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
 DocType: Production Order,Item To Manufacture,Postenis ražot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Pastāvīgs veidņu liešana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statuss ir {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 DocType: Sales Order Item,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
 DocType: Newsletter,Newsletter Manager,Biļetens vadītājs
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Atklāšana&quot;
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
 DocType: Expense Claim,Expenses,Izdevumi
 DocType: Item Variant Attribute,Item Variant Attribute,Prece Variant Prasme
 ,Purchase Receipt Trends,Pirkuma čeka tendences
 DocType: Appraisal,Select template from which you want to get the Goals,"Izvēlieties veidni, no kuras jūs vēlaties saņemt mērķus"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pētniecība un attīstība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pētniecība un attīstība
 ,Amount to Bill,"Summa, Bill"
 DocType: Company,Registration Details,Reģistrācija Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Order Daudz
 DocType: Leave Block List Date,Leave Block List Date,Atstājiet Block saraksts datums
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plānots sūtīt uz {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tirdzniecības vieta
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nevar pārnest {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
 DocType: Account,Balance must be,Līdzsvars ir jābūt
 DocType: Hub Settings,Publish Pricing,Publicēt Cenas
 DocType: Notification Control,Expense Claim Rejected Message,Izdevumu noraida prasību Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Naglām
 ,Available Qty,Pieejams Daudz
 DocType: Purchase Taxes and Charges,On Previous Row Total,No iepriekšējās rindas Kopā
 DocType: Salary Slip,Working Days,Darba dienas
 DocType: Serial No,Incoming Rate,Ienākošais Rate
 DocType: Packing Slip,Gross Weight,Bruto svars
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Iekļaut brīvdienas Kopā nē. Darba dienu
 DocType: Job Applicant,Hold,Turēt
 DocType: Employee,Date of Joining,Datums Pievienošanās
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Skatīt ES PVN reģistrā
 DocType: Purchase Invoice Item,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Smilšstrūklas
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valūtas maiņas kurss meistars.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} jābūt aktīvam
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} jābūt aktīvam
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atcelt Materiāls Vizītes {0} pirms lauzt šo apkopes vizīte
 DocType: Salary Slip,Leave Encashment Amount,Atstājiet inkasācijas summu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nepieciešamais Daudz
 DocType: Bank Reconciliation,Total Amount,Kopējā summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Interneta Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneta Publishing
 DocType: Production Planning Tool,Production Orders,Ražošanas Pasūtījumi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Bilance Value
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicēt sinhronizēt priekšmetus
-DocType: GL Entry,Account Currency,Konta valūta
+DocType: Bank Reconciliation,Account Currency,Konta valūta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Lūdzu, atsaucieties uz noapaļot konta Company"
 DocType: Purchase Receipt,Range,Diapazons
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Features Setup,Item Barcode,Postenis Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 DocType: Address,Shop,Veikals
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Naudas konts tiks automātiski atjaunināti POS Rēķinā, ja ir izvēlēts šis režīms."
 DocType: Employee,Permanent Address Is,Pastāvīga adrese ir
 DocType: Production Order Operation,Operation completed for how many finished goods?,Darbība pabeigta uz cik gatavās produkcijas?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Pabalsts pārmērīga {0} šķērsoja postenī {1}.
 DocType: Employee,Exit Interview Details,Iziet Intervija Details
 DocType: Item,Is Purchase Item,Vai iegāde postenis
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Pasūtījuma postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Netieša Ienākumi
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Uzstādīt Maksājuma summa = Outstanding Summa
-DocType: Contact Us Settings,Address Line 1,Adrese Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Pretruna
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Uzņēmuma nosaukums
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Pretruna
+,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Izvēlieties Prece pārneses
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skatīt sarakstu ar visu palīdzību video
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izvēlieties kontu vadītājs banku, kurā tika deponēts pārbaude."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Ļauj lietotājam rediģēt Cenrādi Rate darījumos
 DocType: Pricing Rule,Max Qty,Max Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rinda {0}: Samaksa pret pārdošanas / pirkšanas ordeņa vienmēr jāmarķē kā iepriekš
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Ķīmisks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Ķīmisks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,"Visi posteņi jau ir pārskaitīta, lai šim Ražošanas ordeni."
 DocType: Process Payroll,Select Payroll Year and Month,Izvēlieties Algas gads un mēnesis
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Iet uz atbilstošo grupā (parasti piemērošana fondu&gt; apgrozāmo līdzekļu&gt; bankas kontos un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku dzimšanas dienu atgādinājumus
-DocType: Comment,Unsubscribed,Atrakstīts
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Pārbaudes kritēriji
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Koks finanial izmaksu centriem.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nodota
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Balts
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Balts
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pievienojiet savu attēlu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Padarīt
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pievienojiet savu attēlu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Padarīt
 DocType: Journal Entry,Total Amount in Words,Kopā summa vārdiem
-DocType: Workflow State,Stop,Apstāties
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tur bija kļūda. Viens iespējamais iemesls varētu būt, ka jūs neesat saglabājis formu. Lūdzu, sazinieties ar support@erpnext.com ja problēma joprojām pastāv."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Grozs
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Rīkojums Type jābūt vienam no {0}
 DocType: Lead,Next Contact Date,Nākamais Contact Datums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Atklāšanas Daudzums
 DocType: Holiday List,Holiday List Name,Holiday Latviešu Name
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciju opcijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciju opcijas
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Daudz par {0}
 DocType: Leave Application,Leave Application,Atvaļinājuma pieteikums
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Atstājiet Allocation rīks
 DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ja Mēneša budžets pārsniedza (par izdevumu kontu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Rotājums
 DocType: Workstation,Net Hour Rate,Neto stundu likme
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Izkrauti izmaksas pirkuma čeka
 DocType: Company,Default Terms,Noklusējuma noteikumi
 DocType: Packing Slip Item,Packing Slip Item,Iepakošanas Slip postenis
 DocType: POS Profile,Cash/Bank Account,Naudas / bankas kontu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Iesniegšana
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Atlaide
 DocType: Features Setup,Purchase Discounts,Pirkuma Atlaides
 DocType: Workstation,Wages,Alga
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
 DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
 DocType: Issue,Issue,Izdevums
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konts nesakrīt ar Sabiedrību
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Noliktava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
 DocType: BOM Operation,Operation,Operācija
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Pārdošanas izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Pirkšana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Pirkšana
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Krājumu
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Making Krājumu
 DocType: Packing Slip,Net Weight UOM,Neto svars UOM
 DocType: Item,Default Supplier,Default piegādātājs
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Ražošanas pielaide procentos
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,"atjaunināt, izmantojot Time Baļķi"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidējais vecums
 DocType: Opportunity,Your sales person who will contact the customer in future,"Jūsu pārdošanas persona, kas sazinās ar klientu nākotnē"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
 DocType: Company,Default Currency,Default Valūtas
 DocType: Contact,Enter designation of this Contact,Ievadiet cilmes šo kontaktadresi
-DocType: Contact Us Settings,Address,Adrese
 DocType: Expense Claim,From Employee,No darbinieka
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
 DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry
 DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Platība
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportēšana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportēšana
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,un gads:
 DocType: Email Digest,Annual Expense,Gada Izdevumu
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form rēķinu Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksājumu Samierināšanās rēķins
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Ieguldījums%
 DocType: Item,website page link,vietnes lapa saite
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pieņemsim sagatavot sistēmu pirmās lietošanas.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Uzņēmuma reģistrācijas numuri jūsu atsauci. Nodokļu numurus uc
 DocType: Sales Partner,Distributor,Izplatītājs
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Grozs Piegāde noteikums
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ražošanas Order {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,"Izvēlieties Time Baļķi un iesniegt, lai izveidotu jaunu pārdošanas rēķinu."
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Pārdošanas rēķins Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nekas pieprasīt
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""faktiskā beigu datuma"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vadība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vadība
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Darbības veidi uz laiku lapām
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investīciju liešana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Nu debeta vai kredīta summa ir nepieciešama {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktīvs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Zils
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Zils
 DocType: Purchase Invoice,Is Return,Vai Return
 DocType: Price List Country,Price List Country,Cenrādis Valsts
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Turpmākas mezglus var izveidot tikai ar ""grupa"" tipa mezgliem"
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} jau izveidots lietotājam: {1} un kompānija {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Default Prece Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminētas objekts ražošana
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Piegādātājs datu bāze.
 DocType: Account,Balance Sheet,Bilance
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formēšana
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Jūsu pārdošanas persona saņems atgādinājumu par šo datumu, lai sazināties ar klientu"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Nodokļu un citu algas atskaitījumi.
-DocType: Lead,Lead,Lead
+DocType: Lead,Lead,Potenciālie klienti
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
 DocType: Account,Warehouse,Noliktava
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkuma rēķins postenis
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akciju Ledger Ieraksti un GL Ieraksti tiek nepārpublicēt izraudzītajiem pirkumu čekus
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postenis 1
 DocType: Holiday,Holiday,Brīvdiena
-DocType: Event,Saturday,Sestdiena
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Atstāt tukšu, ja to uzskata par visām filiālēm"
 ,Daily Time Log Summary,Daily Time Log kopsavilkums
-DocType: DocField,Label,Etiķete
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled maksājumu informācija
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
 DocType: Lead,Call,Izsaukums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Iestatīšana Darbinieki
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Pētniecība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Pētniecība
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Lūdzu, norādiet vismaz vienu atribūtu Atribūti tabulā"
 DocType: Contact,User ID,Lietotāja ID
-DocType: Communication,Sent,Nosūtīts
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
-DocType: Communication,Delivery Status,Piegāde statuss
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 DocType: Production Order,Manufacture against Sales Order,Izgatavojam pret pārdošanas rīkojumu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Pārējā pasaule
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Vienība Apraksts
 DocType: Payment Tool,Payment Mode,Maksājumu Mode
 DocType: Purchase Invoice,Is Recurring,Vai Atkārtojas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Tiešā metāla lāzera aglomerācijas
 DocType: Purchase Order,Supplied Items,Komplektā Items
 DocType: Production Order,Qty To Manufacture,Daudz ražot
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Uzturēt pašu likmi visā pirkuma ciklu
 DocType: Opportunity Item,Opportunity Item,Iespēja postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pagaidu atklāšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Darbinieku Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
 DocType: Address,Address Type,Adrese Īpašuma tips
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Saņemt neapmaksātus rēķinus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mazs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mazs
 DocType: Employee,Employee Number,Darbinieku skaits
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2.punkts
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konts galva {0} izveidots
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zaļš
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zaļš
 DocType: Item,Auto re-order,Auto re-pasūtīt
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Kopā Izpildīts
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kopā Izpildīts
 DocType: Employee,Place of Issue,Izsniegšanas vieta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Līgums
-DocType: Report,Disabled,Invalīdiem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Līgums
+DocType: Email Digest,Add Quote,Pievienot Citēt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Lauksaimniecība
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Savus produktus vai pakalpojumus
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
 DocType: Journal Entry Account,Purchase Order,Pasūtījuma
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nosaukums ir obligāts
 DocType: Purchase Invoice,Recurring Type,Atkārtojas Type
 DocType: Address,City/Town,City / Town
 DocType: Email Digest,Annual Income,Gada ienākumi
 DocType: Serial No,Serial No Details,Sērijas Nr Details
 DocType: Purchase Invoice Item,Item Tax Rate,Postenis Nodokļu likme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postenis {0} jābūt Apakšuzņēmēju postenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitāla Ekipējums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Paredzams, piegāde datums ir mazāks nekā plānotais sākuma datums."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Piegādātājam
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Iestatīšana konta veidu palīdz, izvēloties šo kontu darījumos."
 DocType: Purchase Invoice,Grand Total (Company Currency),Pavisam kopā (Company valūta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Kopā Izejošais
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tur var būt tikai viens Shipping pants stāvoklis ar 0 vai tukšu vērtību ""vērtēt"""
 DocType: Authorization Rule,Transaction,Darījums
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Piezīme: Šis Izmaksas centrs ir Group. Nevar veikt grāmatvedības ierakstus pret grupām.
-apps/frappe/frappe/config/desk.py +7,Tools,Darbarīki
 DocType: Item,Website Item Groups,Mājas lapa punkts Grupas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Ražošanas uzdevums numurs ir obligāta akciju ieraksta mērķis ražošanā
 DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentāri
 DocType: Salary Slip,Bank Account No.,Banka Konta Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tas ir skaitlis no pēdējiem izveidots darījuma ar šo prefiksu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Vērtēšana Rate nepieciešams postenī {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Vērtēšana Rate nepieciešams postenī {0}
 DocType: Quality Inspection Reading,Reading 8,Lasīšana 8
 DocType: Sales Partner,Agent,Aģents
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Nodokļi un maksājumi aprēķināšana
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Detaļas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Detaļas
 DocType: Attendance,HR Manager,HR vadītājs
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Lūdzu, izvēlieties Company"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nav datu
 DocType: Appraisal Template Goal,Appraisal Template Goal,Izvērtēšana Template Goal
 DocType: Salary Slip,Earning,Nopelnot
 DocType: Payment Tool,Party Account Currency,Party konta valūta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Pārklāšanās apstākļi atrasts starp:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Kopā pasūtījuma vērtība
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Pārtika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Jūs varat veikt laiku žurnāls tikai pret iesniegto ražošanas kārtībā
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Biļeteni uz kontaktiem, rezultātā."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valūta Noslēguma kontā jābūt {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Punktu summa visiem mērķiem vajadzētu būt 100. Tas ir {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Darbības nevar atstāt tukšu.
 ,Delivered Items To Be Billed,Piegādāts posteņi ir Jāmaksā
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
-DocType: DocField,Description,Apraksts
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
-DocType: Letter Head,Is Default,Vai Default
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Grāmatvedība
 DocType: Features Setup,Features Setup,Features Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Skatīt Piedāvājums vēstule
-DocType: Communication,Communication,Sakari
 DocType: Item,Is Service Item,Vai Service postenis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Lūdzu, izvēlieties saimnieciskais gads"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},No {0} | {1}{2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Uzturēt Noliktava
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontu
 DocType: Material Request,Terms and Conditions Content,Noteikumi un nosacījumi saturs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Māceklis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Māceklis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Nodokļu detaļa galda paņemti no postenis kapteiņa kā stīgu un uzglabā šajā jomā. Lieto nodokļiem un nodevām
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Nav aktīvas Algu struktūra atrasts darbiniekam {0} un mēneša
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
 DocType: Rename Tool,Type of document to rename.,Dokumenta veids pārdēvēt.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Mēs Pirkt šo preci
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Mēs Pirkt šo preci
 DocType: Address,Billing,Norēķinu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Nav nosūtīts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Sprādzienbīstama formēšana
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kopā nodokļi un maksājumi (Company valūtā)
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plānots nosūtīt uz {0} saņēmējiem
 DocType: Quality Inspection,Readings,Rādījumus
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Kompleksi
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Kompleksi
 DocType: Shipping Rule Condition,To Value,Vērtēt
 DocType: Supplier,Stock Manager,Krājumu pārvaldnieks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Darba stundu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analītiķis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar JV summai {2}
 DocType: Item,Inventory,Inventārs
 DocType: Features Setup,"To enable ""Point of Sale"" view",Lai aktivizētu &quot;tirdzniecības vieta&quot; Ņemot
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Maksājumu nevar būt par tukšu grozā
 DocType: Item,Sales Details,Pārdošanas Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Ar preces
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Daudz
 DocType: Notification Control,Expense Claim Rejected,Izdevumu noraida prasību
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datums, kad nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
 DocType: Item Attribute,Item Attribute,Postenis Atribūtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Valdība
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Postenis Variants
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Valdība
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Postenis Variants
 DocType: Company,Services,Pakalpojumi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Kopā ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Kopā ({0})
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
 DocType: Sales Invoice,Source,Avots
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanšu gada sākuma datums
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanšu gada sākuma datums
 DocType: Employee External Work History,Total Experience,Kopā pieredze
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Packing Slip (s) atcelts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Packing Slip (s) atcelts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Material Request Item,Sales Order No,Pasūtījumu Nr
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materiāli Ražošana
 DocType: Pricing Rule,For Price List,Par cenrādi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Pirkuma likme posteni: {0} nav atrasts, kas ir nepieciešams, lai rezervētu grāmatvedības ieraksts (izdevumi). Lūdzu, atsaucieties uz objektu cenu pret pērk cenrādi."
 DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Kļūda: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Kļūda: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klientu> Klientu Group> Teritorija
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Pieejams Partijas Daudz at Noliktava
 DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Partijas Detail
-DocType: Workflow State,Tasks,Uzdevumi
 DocType: Landed Cost Voucher,Landed Cost Help,Izkrauti izmaksas Palīdzība
-DocType: Event,Tuesday,Otrdiena
 DocType: Leave Block List,Block Holidays on important days.,Bloķēt Holidays par svarīgākajiem dienas.
 ,Accounts Receivable Summary,Debitoru kopsavilkums
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lapas tipa {0} jau piešķirtās Darbinieku {1} par periodu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
 DocType: UOM,UOM Name,UOM Name
-DocType: Top Bar Item,Target,Mērķis
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Ieguldījums Summa
 DocType: Sales Invoice,Shipping Address,Piegādes adrese
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Šis rīks palīdz jums, lai atjauninātu vai noteikt daudzumu un novērtēšanu krājumu sistēmā. To parasti izmanto, lai sinhronizētu sistēmas vērtības un to, kas patiesībā pastāv jūsu noliktavās."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Vārdos būs redzami, kad ietaupāt pavadzīmi."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand master.
-DocType: ToDo,Due Date,Due Date
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand master.
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kaste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizācija
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kaste
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizācija
 DocType: Monthly Distribution,Monthly Distribution,Mēneša Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Uztvērējs saraksts ir tukšs. Lūdzu, izveidojiet Uztvērēja saraksts"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Ražošanas plāns Sales Order
 DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Grāmatvedības ieraksts par {0} var veikt tikai valūtā: {1}
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Izciršanai
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankas konti
 ,Bank Reconciliation Statement,Banku samierināšanās paziņojums
 DocType: Address,Lead Name,Lead Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Atvēršanas Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Atvēršanas Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} jānorāda tikai vienu reizi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nav atļauts pārsūtīšana vairāk {0} nekā {1} pret Pirkuma pasūtījums {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nav Preces pack
 DocType: Shipping Rule Condition,From Value,No vērtība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Summas, kas nav atspoguļots bankā"
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Summas, kas nav atspoguļots bankā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrbēdzes liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnētiskais lauks-palīdz apdare
 DocType: Company,Default Holiday List,Default brīvdienu sarakstu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Akciju Saistības
 DocType: Purchase Receipt,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 DocType: Production Planning Tool,Select Sales Orders,Izvēlieties klientu pasūtījumu
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Izsekot objektus, izmantojot svītrkodu. Jums būs iespēja ievadīt objektus piegāde piezīmi un pārdošanas rēķinu, skenējot svītrkodu posteņa."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Atzīmēt kā Pasludināts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Atzīmēt kā Pasludināts
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Padarīt citāts
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Algu struktūra atskaitīšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektīvā lāzera aglomerācijas
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import veiksmīga!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vecums (dienas)
 DocType: Quotation Item,Quotation Item,Citāts postenis
 DocType: Account,Account Name,Konta nosaukums
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,No datums nevar būt lielāks par līdz šim datumam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Sērijas Nr {0} daudzums {1} nevar būt daļa
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Piegādātājs Type meistars.
 DocType: Purchase Order Item,Supplier Part Number,Piegādātājs Part Number
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Pievienot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Konversijas ātrums nevar būt 0 vai 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} tiek atcelts vai pārtraukta
 DocType: Accounts Settings,Credit Controller,Kredīts Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Transportlīdzekļu Nosūtīšanas datums
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Pirkuma saņemšana {0} nav iesniegta
 DocType: Company,Default Payable Account,Default Kreditoru konts
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Iestatījumi tiešsaistes iepirkšanās grozs, piemēram, kuģošanas noteikumus, cenrādi uc"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Jāmaksā
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Cilvēkresursi
 DocType: Lead,Upper Income,Upper Ienākumi
 DocType: Journal Entry Account,Debit in Company Currency,Debeta uzņēmumā Valūta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mani jautājumi
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Noklusējuma vērtības
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rinda {0}: Maksājuma summa nevar būt negatīvs
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Preses montāžas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
 DocType: Payment Reconciliation,Payments,Maksājumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Karstā izostatiskā nospiežot
-DocType: ToDo,Medium,Medijs
 DocType: Budget Detail,Budget Allocated,Budžets Piešķirtie
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klientu kredīta atlikuma
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
 DocType: Quotation,Term Details,Term Details
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning For (dienas)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
 DocType: Warranty Claim,Warranty Claim,Garantijas prasību
-,Lead Details,Svina Details
-DocType: Authorization Rule,Approving User,Apstiprinot User
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kalšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanizācijas
+,Lead Details,Potenciālā klienta detaļas
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
 DocType: Pricing Rule,Applicable For,Piemērojami
 DocType: Bank Reconciliation,From Date,No Datums
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdodot Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Izsoles
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Izsoles
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Lūdzu, norādiet nu Daudzums vai Vērtēšanas Rate vai abus"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, mēnesis un gads tiek obligāta"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Viena vienība posteņa.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Partijas {0} ir ""Iesniegtie"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padarīt grāmatvedības ieraksts Katrs krājumu aprites
 DocType: Leave Allocation,Total Leaves Allocated,Kopā Leaves Piešķirtie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Noliktava vajadzīgi Row Nr {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Ievadiet derīgu finanšu gada sākuma un beigu datumi
 DocType: Employee,Date Of Retirement,Brīža līdz pensionēšanās
 DocType: Upload Attendance,Get Template,Saņemt Template
 DocType: Address,Postal,Pasta
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Kalnrūpniecība
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Sveķu liešana
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu mainīt Klienta nosaukumu vai pārdēvēt klientu grupai"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Lūdzu, izvēlieties {0} pirmās."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksta {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Teksta {0}
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
 DocType: Stock Entry,Material Receipt,Materiālu saņemšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkti
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkti
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Party Type un partija ir nepieciešama / debitoru kontā {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ja šis postenis ir varianti, tad tas nevar izvēlēties pārdošanas pasūtījumiem uc"
 DocType: Lead,Next Contact By,Nākamais Kontakti Pēc
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Noliktava {0} nevar izdzēst, jo pastāv postenī daudzums {1}"
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Paziņošana e-pasta adrese
 DocType: Payment Tool,Find Invoices to Match,"Atrast rēķinus, lai atbilstu"
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","piemēram, ""XYZ National Bank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","piemēram, ""XYZ National Bank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Kopā Mērķa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Kopā Mērķa
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Grozs ir iespējots
 DocType: Job Applicant,Applicant for a Job,Pretendents uz darbu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nav Ražošanas Pasūtījumi izveidoti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Alga Slip darbinieka {0} jau izveidojis šajā mēnesī
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Alga Slip darbinieka {0} jau izveidojis šajā mēnesī
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Sales Invoice Item,Batch No,Partijas Nr
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Galvenais
-DocType: DocPerm,Delete,Izdzēst
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variants
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Jaunais {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Apturēts rīkojumu nevar atcelt. Unstop lai atceltu.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Padarīt pirkuma pasūtījuma
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Padarīt pirkuma pasūtījuma
 DocType: SMS Center,Send To,Sūtīt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Piešķirtā summa
 DocType: Sales Team,Contribution to Net Total,Ieguldījums kopējiem neto
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Pretendents uz darbu.
 DocType: Purchase Order Item,Warehouse and Reference,Noliktavas un atsauce
 DocType: Supplier,Statutory info and other general information about your Supplier,Normatīvais info un citu vispārīgu informāciju par savu piegādātāju
-DocType: Country,Country,Valsts
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adreses
-DocType: Communication,Received,Saņemti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dublēt Sērijas Nr stājās postenī {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nosacījums Shipping Reglamenta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Prece nav atļauts būt Ražošanas uzdevums.
-DocType: DocField,Attach Image,Pievienojiet attēlu
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"Neto svars šīs paketes. (Aprēķināts automātiski, kā summa neto svara vienību)"
-DocType: Stock Reconciliation Item,Leave blank if no change,"Atstājiet tukšu, ja nav izmaiņu"
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Laika Baļķi ražošanā.
 DocType: Item,Apply Warehouse-wise Reorder Level,Piesakies Warehouse-gudro Pārkārtot Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Laiks Pieteikties uz uzdevumiem.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Maksājums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Maksājums
 DocType: Production Order Operation,Actual Time and Cost,Faktiskais laiks un izmaksas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiāls pieprasījums maksimāli {0} var izdarīt postenī {1} pret pārdošanas ordeņa {2}
 DocType: Employee,Salutation,Sveiciens
-DocType: Communication,Rejected,Noraidīts
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
 DocType: Sales Order Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
 DocType: Hub Settings,Hub Node,Hub Mezgls
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Value {0} par atribūtu {1} neeksistē sarakstā derīgu postenī atribūtu vērtības
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Līdzstrādnieks
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Beidzies
 DocType: Packing Slip,To Package No.,Iesaiņot No.
-DocType: DocType,System,Sistēma
 DocType: Warranty Claim,Issue Date,Emisijas datums
 DocType: Activity Cost,Activity Cost,Aktivitāte Cost
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Patērētā Daudz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikācijas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikācijas
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 DocType: Payment Tool,Make Payment Entry,Veikt maksājumus Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
 ,Sales Invoice Trends,Pārdošanas rēķinu tendences
 DocType: Leave Application,Apply / Approve Leaves,Piesakies / Apstiprināt lapām
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Par
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Var attiekties rindu tikai tad, ja maksa tips ir ""On iepriekšējās rindas summu"" vai ""iepriekšējās rindas Kopā"""
 DocType: Sales Order Item,Delivery Warehouse,Piegāde Noliktava
 DocType: Stock Settings,Allowance Percent,Pabalsts Percent
@@ -1549,36 +1430,31 @@
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dabūtu preces no pirkumu čekus
 DocType: Serial No,Creation Date,Izveides datums
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Šķiet postenis {0} vairākas reizes Cenrādī {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Pārdošanas ir jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Pārdošanas ir jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Piegādātājs Citāts postenis
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Padarīt Algas struktūra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Nobīdes
 DocType: Item,Has Variants,Ir Varianti
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Noklikšķiniet uz ""Make pārdošanas rēķinu"" pogu, lai izveidotu jaunu pārdošanas rēķinu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Iepakojums un marķējums
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Lūdzu, norādiet noklusējuma valūtu kompānijā Master un Global noklusējumu"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Preču piegādātājam vai pakalpojumu.
 DocType: Budget Detail,Fiscal Year,Fiskālā gads
 DocType: Cost Center,Budget,Budžets
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžets nevar iedalīt pret {0}, jo tas nav ienākumu vai izdevumu kontu"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Izpildīts
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritorija / Klientu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"piemēram, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,"piemēram, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Vārdos būs redzams pēc tam, kad esat saglabāt pārdošanas rēķinu."
 DocType: Item,Is Sales Item,Vai Pārdošanas punkts
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Postenis Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
 DocType: Maintenance Visit,Maintenance Time,Apkopes laiks
 ,Amount to Deliver,Summa rīkoties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkts vai pakalpojums
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Bija kļūdas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Pieskaroties
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Produkts vai pakalpojums
 DocType: Naming Series,Current Value,Pašreizējā vērtība
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} izveidots
 DocType: Delivery Note Item,Against Sales Order,Pret pārdošanas rīkojumu
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
 DocType: Website Item Group,Website Item Group,Mājas lapa Prece Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nodevas un nodokļi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ievadiet Atsauces datums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ievadiet Atsauces datums
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabula postenī, kas tiks parādīts Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
 DocType: Material Request Item,Material Request Item,Materiāls Pieprasījums postenis
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Koks poz grupu.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Koks poz grupu.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Sarkans
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Sarkans
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
 DocType: Account,Frozen,Sasalis
 ,Open Production Orders,Atvērt pasūtījumu
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} nav pabeigta {2} Daudz gatavo preču ražošanas kārtību # {3}. Lūdzu, atjauniniet darbības statusu, izmantojot Time Baļķi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Mainīt UOM par posteņa.
 DocType: Quality Inspection Reading,Acceptance Criteria,Pieņemšanas kritēriji
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Postenis {0} ir pārdošanas vai pakalpojumu prece {1}
 DocType: Item Group,Show In Website,Show In Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupa
 DocType: Task,Expected Time (in hours),Sagaidāmais laiks (stundās)
 ,Qty to Order,Daudz pasūtījuma
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Lai izsekotu zīmolu šādos dokumentos piegādes pavadzīmē, Opportunity, materiālu pieprasījuma posteni, pirkuma pasūtījuma, Pirkuma kuponu, pircēju saņemšana, citāts, pārdošanas rēķinu, Product Bundle, pārdošanas rīkojumu, Sērijas Nr"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Skaidrs tabula
 DocType: Features Setup,Brands,Brands
 DocType: C-Form Invoice Detail,Invoice No,Rēķins Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,No Pirkuma pasūtījums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,No Pirkuma pasūtījums
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 DocType: Activity Cost,Costing Rate,Izmaksu Rate
 ,Customer Addresses And Contacts,Klientu Adreses un kontakti
 DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu."
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Not Set
-DocType: Communication,Date,Datums
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sēdēt saspringts kamēr jūsu sistēma tiek uzstādīšana. Tas var aizņemt pāris mirkļus.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pāris
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pāris
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskais datums
 DocType: Item,Has Batch No,Ir Partijas Nr
 DocType: Delivery Note,Excise Page Number,Akcīzes Page Number
 DocType: Employee,Personal Details,Personīgie Details
 ,Maintenance Schedules,Apkopes grafiki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Reljefs
 ,Quotation Trends,Citāts tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debets Lai kontā jābūt pasūtītāju konta
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kā Ražošanas Pasūtīt var izdarīt šajā postenī, ir jābūt akciju postenis."
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Savieno
-DocType: Authorization Rule,Above Value,Virs vērtība
 ,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
 DocType: Purchase Order,Delivered,Pasludināts
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup ienākošā servera darba vietas e-pasta id. (Piem jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kopā piešķirtie lapas {0} nevar būt mazāka par jau apstiprināto lapām {1} par periodu
 DocType: Journal Entry,Accounts Receivable,Debitoru parādi
 ,Supplier-Wise Sales Analytics,Piegādātājs-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Šis formāts tiek izmantots, ja valstij īpašs formāts nav atrasts"
-DocType: Custom Field,Custom,Paraža
 DocType: Production Order,Use Multi-Level BOM,Lietojiet Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Iesmidzināšana
 DocType: Bank Reconciliation,Include Reconciled Entries,Iekļaut jāsaskaņo Ieraksti
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Koks finanial kontiem.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Atstājiet tukšu, ja uzskatīja visus darbinieku tipiem"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Izplatīt Maksa Based On
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Konts {0} ir jābūt tipa ""pamatlīdzeklis"", kā postenis {1} ir Asset postenis"
 DocType: HR Settings,HR Settings,HR iestatījumi
-apps/frappe/frappe/config/setup.py +130,Printing,Iespiešana
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Izdevumu Prasība tiek gaidīts apstiprinājums. Tikai Izdevumu apstiprinātājs var atjaunināt statusu.
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Diena (-as), kurā jūs piesakāties atvaļinājuma ir svētki. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,un
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sporta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Kopā Faktiskais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Vienība
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Lūdzu noteikt Dropbox piekļuves atslēgas vietnes config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Vienība
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Lūdzu, norādiet Company"
 ,Customer Acquisition and Loyalty,Klientu iegāde un lojalitātes
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Noliktava, kur jums ir saglabāt krājumu noraidīto posteņiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Jūsu finanšu gads beidzas
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Jūsu finanšu gads beidzas
 DocType: POS Profile,Price List,Cenrādis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} tagad ir noklusējuma saimnieciskais gads. Lūdzu, atsvaidziniet savu pārlūkprogrammu, lai izmaiņas stātos spēkā."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
-DocType: Authorization Rule,Approving Role,Apstiprinot loma
 ,BOM Search,BOM Meklēt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
 DocType: Workstation,Wages per hour,Algas stundā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Rādīt / paslēpt iespējas, piemēram, sērijas numuriem, POS uc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Šāds materiāls Pieprasījumi tika automātiski izvirzīts, balstoties uz posteni atjaunotne pasūtījuma līmenī"
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klīrenss datums nevar būt pirms reģistrācijas datuma pēc kārtas {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klīrenss datums nevar būt pirms reģistrācijas datuma pēc kārtas {0}
 DocType: Salary Slip,Deduction,Atskaitīšana
 DocType: Address Template,Address Template,Adrese Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Ievadiet Darbinieku Id šīs pārdošanas persona
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Citāts
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 DocType: Quotation,Maintenance User,Uzturēšanas lietotājs
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Izmaksas Atjaunots
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Izmaksas Atjaunots
 DocType: Employee,Date of Birth,Dzimšanas datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postenis {0} jau ir atgriezies
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Saimnieciskais gads ** pārstāv finanšu gads. Visus grāmatvedības ierakstus un citi lielākie darījumi kāpurķēžu pret ** fiskālā gada **.
 DocType: Opportunity,Customer / Lead Address,Klients / Lead adrese
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Darba apraksts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Darba apraksts
 DocType: Purchase Order Item,Qty as per Stock UOM,Daudz kā vienu akciju UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Lūdzu, izvēlieties derīgu csv failu ar datiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Slānis
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
 DocType: Expense Claim,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Krājumu papildinājums pastāv pret noliktavā {0}, līdz ar to jūs nevarat atkārtoti piešķirt vai mainīt noliktava"
 DocType: Appraisal,Calculate Total Score,Aprēķināt kopējo punktu skaitu
 DocType: Supplier Quotation,Manufacturing Manager,Ražošanas vadītājs
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Sūtījumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip formēšanas
-DocType: Purchase Order,To be delivered to customer,Jāpiegādā klientam
+apps/erpnext/erpnext/hooks.py +68,Shipments,Sūtījumi
+DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Laiks Log Status jāiesniedz.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Iestatīšana
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Vārdos (Company valūta)
 DocType: Pricing Rule,Supplier,Piegādātājs
 DocType: C-Form,Quarter,Ceturksnis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Dažādi izdevumi
 DocType: Global Defaults,Default Company,Default Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Izdevumu vai Atšķirība konts ir obligāta postenī {0}, kā tā ietekmē vispārējo akciju vērtības"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nevar overbill postenī {0} rindā {1} vairāk nekā {2}. Lai atļautu pārāk augstu maksu, lūdzu, noteikts akciju Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nevar overbill postenī {0} rindā {1} vairāk nekā {2}. Lai atļautu pārāk augstu maksu, lūdzu, noteikts akciju Settings"
 DocType: Employee,Bank Name,Bankas nosaukums
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Virs
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Lietotāja {0} ir invalīds
 DocType: Leave Application,Total Leave Days,Kopā atvaļinājuma dienām
-DocType: Journal Entry Account,Credit in Account Currency,Kredīts konta valūtā
 DocType: Email Digest,Note: Email will not be sent to disabled users,Piezīme: e-pasts netiks nosūtīts invalīdiem
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Izvēlieties Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Atstāt tukšu, ja to uzskata par visu departamentu"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Currency Exchange,From Currency,No Valūta
-DocType: DocField,Name,Nosaukums
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Summas, kas nav atspoguļots sistēmā"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Lūdzu, izvēlieties piešķirtā summa, rēķina veidu un rēķina numura atleast vienā rindā"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pasūtījumu nepieciešams postenī {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Summas, kas nav atspoguļots sistēmā"
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Pārējie
-apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Pārējie
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
 DocType: POS Profile,Taxes and Charges,Nodokļi un maksājumi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkts vai pakalpojums, kas tiek pirkti, pārdot vai turēt noliktavā."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Pabeigts
-DocType: Web Form,Select DocType,Izvēlieties DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Caurvilkšanai
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banku
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banku
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Lūdzu, noklikšķiniet uz ""Generate grafiks"", lai saņemtu grafiku"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Jaunais Izmaksu centrs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Jaunais Izmaksu centrs
 DocType: Bin,Ordered Quantity,Sakārtots daudzums
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
 DocType: Quality Inspection,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
 DocType: Purchase Order Item,Reference Document Type,Atsauces dokuments Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} pret pārdošanas ordeņa {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serializēja inventarizācija
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serializēja inventarizācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
 DocType: Time Log Batch,Total Billing Amount,Kopā Norēķinu summa
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Debitoru konts
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order to Apmaksa
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Laiks Baļķi izveidots:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Item,Weight UOM,Svars UOM
 DocType: Employee,Blood Group,Asins Group
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Līdz
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Lietotāji, kuri var apstiprināt konkrētā darbinieka atvaļinājumu pieteikumus"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Jūs nevarat mainīt noklusēto UOM varianta. Lai mainītu noklusēto UOM variantā izmaiņas noklusējuma UOM veidnes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Biroja iekārtas
 DocType: Purchase Invoice Item,Qty,Daudz
 DocType: Fiscal Year,Companies,Uzņēmumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Paaugstināt Materiālu pieprasījums kad akciju sasniedz atkārtoti pasūtījuma līmeni
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,No tehniskās apkopes grafika
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Pilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Pilna laika
 DocType: Purchase Invoice,Contact Details,Kontaktinformācija
 DocType: C-Form,Received Date,Saņēma Datums
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ja esat izveidojis standarta veidni Pārdošanas nodokļi un nodevas veidni, izvēlieties vienu, un noklikšķiniet uz pogas zemāk."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Darba atklāšana
 DocType: Payment Reconciliation,Payment Reconciliation,Maksājumu Izlīgums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnoloģija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
 DocType: Offer Letter,Offer Letter,Akcija vēstule
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Izveidot Materiāls Pieprasījumi (MRP) un pasūtījumu.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Kopējo rēķinā Amt
 DocType: Time Log,To Time,Uz laiku
+DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Lai pievienotu bērnu mezgliem, pētīt koku un noklikšķiniet uz mezglu, saskaņā ar kuru vēlaties pievienot vairāk mezglu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cenrādis {0} ir invalīds
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Klientu punkts Codes
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Izveidot Maksājumu Ieraksti pret rīkojumiem vai rēķinos.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Metināšanas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Jaunais Stock UOM ir nepieciešama
 DocType: Quality Inspection,Sample Size,Izlases lielums
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Visi posteņi jau ir rēķinā
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Lūdzu, norādiet derīgu ""No lietā Nr '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Project,External,Ārējs
 DocType: Features Setup,Item Serial Nos,Postenis Serial Nr
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Faktiskais daudzums
 DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sērijas Nr {0} nav atrasts
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Jūsu klienti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Kompresijas molding
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Jūsu klienti
 DocType: Leave Block List Date,Block Date,Block Datums
 DocType: Sales Order,Not Delivered,Nav sniegusi
 ,Bank Clearance Summary,Banka Klīrenss kopsavilkums
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Postenis Code> Prece Group> Brand
 DocType: Appraisal Goal,Appraisal Goal,Izvērtēšana Goal
-DocType: Event,Friday,Piektdiena
 DocType: Time Log,Costing Amount,Izmaksu summa
 DocType: Process Payroll,Submit Salary Slip,Iesniegt par atalgojumu
 DocType: Salary Structure,Monthly Earning & Deduction,Mēneša krāšana & atskaitīšana
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import masas
 DocType: Sales Partner,Address & Contacts,Adrese & Kontakti
 DocType: SMS Log,Sender Name,Sūtītājs Vārds
-DocType: Page,Title,Virsraksts
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Pielāgot
 DocType: POS Profile,[Select],[Izvēlēties]
 DocType: SMS Log,Sent To,Nosūtīts
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Padarīt pārdošanas rēķinu
 DocType: Company,For Reference Only.,Tikai atsaucei.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Nederīga {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Nederīga {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Summa
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""No datums"" ir nepieciešams"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""No datums"" ir nepieciešams"
 DocType: Journal Entry,Reference Number,Atsauces numurs
 DocType: Employee,Employment Details,Nodarbinātības Details
 DocType: Employee,New Workplace,Jaunajā darbavietā
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Ceļot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Ceļot
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
 DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
 DocType: Sales Invoice,Recurring,Atkārtojas
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Pārdēvēt rīks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiāls
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Norādiet operācijas, ekspluatācijas izmaksas un sniegt unikālu ekspluatācijā ne jūsu darbībām."
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
 DocType: Installation Note,Installation Note,Uzstādīšana Note
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Pievienot Nodokļi
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Pievienot Nodokļi
 ,Financial Analytics,Finanšu Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Filiāle
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nevar mainīt uzņēmuma noklusējuma valūtu, jo ir kādi darījumi. Darījumi jāanulē, lai mainītu noklusējuma valūtu."
 DocType: Quality Inspection,Purchase Receipt No,Pirkuma čeka Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Rokas naudas
-DocType: System Settings,In Hours,Stundās
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Paredzams, bilance katru banku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Pulēšanas
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Paredzams, bilance katru banku"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
 DocType: Appraisal,Employee,Darbinieks
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa ar kuponu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standarts
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Rādīt Maksājumi
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Izmērs
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceitisks
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Izveidot klientu
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lasīšana 9
 DocType: Supplier,Is Frozen,Vai Frozen
 DocType: Buying Settings,Buying Settings,Pērk iestatījumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass apdare
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nē par gatavo labi posteni
 DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup ienākošā servera pārdošanas e-pasta id. (Piem sales@example.com)
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Tool,Payment Account,Maksājumu konts
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Projekts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensējošs Off
 DocType: Quality Inspection Reading,Accepted,Pieņemts
-DocType: User,Female,Sieviete
-DocType: Journal Entry Account,Debit in Account Currency,Debeta in konta valūtā
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Lūdzu, pārliecinieties, ka jūs tiešām vēlaties dzēst visus darījumus šajā uzņēmumā. Jūsu meistars dati paliks kā tas ir. Šo darbību nevar atsaukt."
-DocType: Print Settings,Modern,Mūsdienu
-DocType: Communication,Replied,Atbildēja
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Nederīga atsauce {0} {1}
 DocType: Payment Tool,Total Payment Amount,Kopā Maksājuma summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto quanitity ({2}) transportlīdzekļu ražošanā Order {3}"
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
 DocType: Newsletter,Test,Pārbaude
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Tā kā ir esošās akciju darījumi par šo priekšmetu, \ jūs nevarat mainīt vērtības &quot;Has Sērijas nē&quot;, &quot;Vai partijas Nē&quot;, &quot;Vai Stock Vienība&quot; un &quot;vērtēšanas metode&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
 DocType: Stock Entry,For Quantity,Par Daudzums
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Lūgumus par.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atsevišķa produkcija pasūtījums tiks izveidots katrā gatavā labu posteni.
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Complete Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Grāmatvedības ieraksts iesaldēta līdz šim datumam, neviens nevar darīt / mainīt ierakstu izņemot lomu zemāk norādīto."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biļetens Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Autorizēts Value
 DocType: Contact,Enter department to which this Contact belongs,"Ievadiet departaments, kurā šis Kontaktinformācija pieder"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Kopā Nav
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Mērvienības
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Mērvienības
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
 DocType: Lead,Opportunity,Iespēja
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (par katru akciju UOM)
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pīrsings
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trešā persona izplatītājs / tirgotājs / komisijas pārstāvis / filiāli / izplatītāja, kurš pārdod uzņēmumiem produktus komisija."
 DocType: Customer Group,Has Child Node,Ir Bērnu Mezgls
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ievadiet statiskās url parametrus šeit (Piem. Sūtītājs = ERPNext, lietotājvārds = ERPNext, parole = 1234 uc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} nekādā aktīvā fiskālajā gadā. Lai saņemtu sīkāku informāciju, pārbaudiet {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Novecošana Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotoķīmisko machining
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standarts nodokļu veidni, ko var attiecināt uz visiem pirkuma darījumiem. Šī veidne var saturēt sarakstu nodokļu galvas un arī citu izdevumu vadītāji, piemēram, ""Shipping"", ""apdrošināšanu"", ""Handling"" uc #### Piezīme nodokļa likmi jūs definētu šeit būs standarta nodokļa likme visiem ** preces * *. Ja ir ** Preces **, kas ir atšķirīgas cenas, tie ir jāiekļauj tajā ** Vienības nodokli ** tabulu ** Vienības ** meistars. #### Apraksts kolonnas 1. Aprēķins tips: - Tas var būt ** Neto Kopā ** (tas ir no pamatsummas summa). - ** On iepriekšējā rindā Total / Summa ** (kumulatīvais nodokļiem un nodevām). Ja izvēlaties šo opciju, nodoklis tiks piemērots kā procentus no iepriekšējās rindas (jo nodokļa tabulas) summu vai kopā. - ** Faktiskais ** (kā minēts). 2. Konta vadītājs: Account grāmata, saskaņā ar kuru šis nodoklis tiks rezervēts 3. Izmaksu Center: Ja nodoklis / maksa ir ienākumi (piemēram, kuģošanas) vai izdevumu tai jārezervē pret izmaksām centra. 4. Apraksts: apraksts nodokļa (kas tiks drukāts faktūrrēķinu / pēdiņām). 5. Rate: Nodokļa likme. 6. Summa: nodokļu summa. 7. Kopējais: kumulatīvais kopējais šo punktu. 8. Ievadiet rinda: ja, pamatojoties uz ""Iepriekšējā Row Total"", jūs varat izvēlēties rindas numuru, kas tiks ņemta par pamatu šim aprēķinam (noklusējums ir iepriekšējā rinda). 9. uzskata nodokļu vai maksājumu par: Šajā sadaļā jūs varat norādīt, vai nodoklis / maksa ir tikai novērtēšanas (nevis daļa no kopējā apjoma), vai tikai kopā (nepievieno vērtību vienība), vai abiem. 10. Pievienot vai atņem: Vai jūs vēlaties, lai pievienotu vai atskaitīt nodokli."
-DocType: Note,Note,Piezīme
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
-DocType: Email Account,Email Ids,E-pasta ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nevar ražot vairāk Vienību {0} nekā Pasūtījumu daudzums {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 DocType: Tax Rule,Billing City,Norēķinu City
 DocType: Global Defaults,Hide Currency Symbol,Slēpt valūtas simbols
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Kredīts Note
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Pabeigts Daudz nevar būt vairāk par {0} ekspluatācijai {1}
 DocType: Features Setup,Quality,Kvalitāte
-DocType: Contact Us Settings,Introduction,Ievads
 DocType: Warranty Claim,Service Address,Servisa adrese
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rindas Fondu samierināšanos.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rindas Fondu samierināšanos.
 DocType: Stock Entry,Manufacture,Ražošana
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Lūdzu Piegāde piezīme pirmais
 DocType: Purchase Invoice,Currency and Price List,Valūta un Cenrādis
 DocType: Opportunity,Customer / Lead Name,Klients / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klīrenss datums nav minēts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Ražošana
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Klīrenss datums nav minēts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Ražošana
 DocType: Item,Allow Production Order,Atļaut Ražošanas rīkojums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
 DocType: Lead,Fax,Fakss
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Iesniegtie
 DocType: Salary Structure,Total Earning,Kopā krāšana
 DocType: Purchase Receipt,Time at which materials were received,"Laiks, kurā materiāli tika saņemti"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mani adreses
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizācija filiāle meistars.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,vai
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Virs
 DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
-,Download Backups,Download Backups
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Iestatītu noklusētās vērtības, piemēram, Company, valūtas, kārtējā fiskālajā gadā, uc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Maksājuma veids
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
 DocType: Bank Reconciliation,To Date,Līdz šim
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Sīkāka informācija
 DocType: Purchase Invoice,Total Taxes and Charges,Kopā nodokļi un maksājumi
 DocType: Employee,Emergency Contact,Avārijas Contact
 DocType: Item,Quality Parameters,Kvalitātes parametri
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Sērijas Nr / Partijas
 DocType: Product Bundle,Parent Item,Parent postenis
 DocType: Account,Account Type,Konta tips
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Atstājiet Type {0} nevar veikt, nosūta"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 ,To Produce,Ražot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Rezervēts daudzums
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkuma čeka Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Pielāgošana Veidlapas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Griešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Izlīdzināšana
 DocType: Account,Income Account,Ienākumu konta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Cilnis
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Izmaksas Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kuponu #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kuponu #
 DocType: Notification Control,Purchase Order Message,Pasūtījuma Ziņa
 DocType: Tax Rule,Shipping Country,Piegāde Country
 DocType: Upload Attendance,Upload HTML,Augšupielāde HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Kopā avanss ({0}) pret rīkojuma {1}, nevar būt lielāks \ nekā Grand Kopā ({2})"
 DocType: Employee,Relieving Date,Atbrīvojot Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cenu noteikums ir, lai pārrakstītu Cenrādī / noteikt diskonta procentus, pamatojoties uz dažiem kritērijiem."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Noliktavu var mainīt tikai ar Fondu Entry / Piegāde Note / pirkuma čeka
 DocType: Employee Education,Class / Percentage,Klase / procentuālā
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Mārketinga un pārdošanas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Ienākuma nodoklis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser inženierijas neto veidošanā
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Mārketinga un pārdošanas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Ienākuma nodoklis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ja izvēlētais Cenu noteikums ir paredzēts ""cena"", tas pārrakstīs cenrādi. Cenu noteikums cena ir galīgā cena, tāpēc vairs atlaide jāpiemēro. Tādējādi, darījumos, piemēram, pārdošanas rīkojumu, pirkuma pasūtījuma utt, tas tiks atnesa 'ātrums' laukā, nevis ""Cenu saraksts likmes"" laukā."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jaunais Izmaksu centrs Name
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Kavējuma Adrese Template atrasts. Lūdzu, izveidojiet jaunu no Setup> Poligrāfija un Branding> Adrese veidni."
 DocType: Appraisal,HR User,HR User
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
 DocType: Supplier,Billing Currency,Norēķinu valūta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Īpaši liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Īpaši liels
 ,Profit and Loss Statement,Peļņas un zaudējumu aprēķins
 DocType: Bank Reconciliation Detail,Cheque Number,Čeku skaits
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nospiežot
 DocType: Payment Tool Detail,Payment Tool Detail,Maksājumu Tool Detail
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Liels
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Neviens darbinieks atrasts!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Liels
 DocType: C-Form Invoice Detail,Territory,Teritorija
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Purchase Order,Customer Address Display,Klientu Adrese Display
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Pulēšanas
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Default mērvienība postenī {0} nevar mainīt, tieši tāpēc, ka \ tu jau guvusi darījums (-us) ar citu UOM. Lai mainītu noklusēto UOM, \ izmantošana &quot;UOM aizstāt lietderība &#39;līdzeklis saskaņā ar Fondu moduli."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Norādiet Valūtas kurss pārveidot vienu valūtu citā
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citāts {0} ir atcelts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citāts {0} ir atcelts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Kopējā nesaņemtā summa
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Darbinieku {0} bija atvaļinājumā {1}. Nevar atzīmēt apmeklēšanu.
 DocType: Sales Partner,Targets,Mērķi
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Padarīt Time Ieiet
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Lūdzu noteikt pasūtīšanas daudzumu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datori
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-ķīmisko slīpēšana
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Lūdzu setup savu grāmatvedības kontu plānu, pirms sākat grāmatvedības ierakstiem"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorēt cenu veidošanas likumu
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Atcelts
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"No Datuma algu struktūru, nevar būt mazāka nekā Darbinieku Iestāšanās datums."
 DocType: Employee Education,Graduate,Absolvents
 DocType: Leave Block List,Block Days,Bloķēt dienas
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Pārbaudiet, vai atkārtojas rēķinu, noņemiet atzīmi, lai apturētu atkārtojas vai nodot pareizu beigu datumu"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
 DocType: Packing Slip,If more than one package of the same type (for print),"Ja vairāk nekā viens iepakojums, no tā paša veida (drukāšanai)"
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimālās {0} rindas atļauts
 DocType: C-Form Invoice Detail,Net Total,Net Kopā
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Norēķinu (Sales rēķins)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Mērķiem
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Vismaz vienu posteni jānorāda ar negatīvu daudzumu atgriešanās dokumentā
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} vairāk nekā visus pieejamos darba stundas darbstaciju {1}, nojauktu darbību vairākos operācijām"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektroķīmiskā machining
 ,Requested,Pieprasīts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nav Piezīmes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Nokavēts
 DocType: Account,Stock Received But Not Billed,Stock Saņemtā Bet ne Jāmaksā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Jāņem grupa
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + Arrear Summa + Inkasāciju Summa - Kopā atskaitīšana
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 DocType: Features Setup,Sales and Purchase,Pārdošanas un iegāde
 DocType: Supplier Quotation Item,Material Request No,Materiāls Pieprasījums Nr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Likmi, pēc kuras klienta valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ir veiksmīgi anulējis no šī saraksta.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Uzņēmējdarbības valūta)
-apps/frappe/frappe/templates/base.html +134,Added,Pievienots
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Pārvaldīt Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Pārdošanas rēķins
 DocType: Journal Entry Account,Party Balance,Party Balance
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskālā gads {0} nav atrasts.
 DocType: Bank Reconciliation,Get Relevant Entries,Saņemt attiecīgus ierakstus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
-apps/frappe/frappe/desk/query_report.py +136,Total,Kopsumma
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Nodokļa summa pēc atlaides apmērs (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Mērķa noliktava ir obligāta rindā {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitātes pārbaudes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formēšana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL vai BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimālā Inventāra līmenis
 DocType: Stock Entry,Subcontract,Apakšlīgumu
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Ražotāja daļas numurs
 DocType: Production Order Operation,Estimated Time and Cost,Paredzamais laiks un izmaksas
 DocType: Bin,Bin,Kaste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Aizsargapkalums
 DocType: SMS Log,No of Sent SMS,Neviens Nosūtītās SMS
 DocType: Account,Company,Kompānija
 DocType: Account,Expense Account,Izdevumu konts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Krāsa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Krāsa
 DocType: Maintenance Visit,Scheduled,Plānotais
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Lūdzu, izvēlieties elements, &quot;Vai Stock Vienība&quot; ir &quot;nē&quot; un &quot;Vai Pārdošanas punkts&quot; ir &quot;jā&quot;, un nav cita Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izvēlieties Mēneša Distribution nevienmērīgi izplatīt mērķus visā mēnešiem.
 DocType: Purchase Invoice Item,Valuation Rate,Vērtēšanas Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Postenis Row {0}: pirkuma čeka {1} neeksistē virs ""pirkumu čekus"" galda"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
 DocType: Installation Note Item,Against Document No,Pret dokumentā Nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Pārvaldīt tirdzniecības partneri.
 DocType: Quality Inspection,Inspection Type,Inspekcija Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Lūdzu, izvēlieties {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Pētnieks
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Pētnieks
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Lūdzu, saglabājiet Izdevumu pirms nosūtīšanas"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Vārds vai e-pasts ir obligāta
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Ienākošais kvalitātes pārbaude.
 DocType: Purchase Order Item,Returned Qty,Atgriezās Daudz
 DocType: Employee,Exit,Izeja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Sakne Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Sakne Type ir obligāts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Sērijas Nr {0} izveidots
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrācijas apdare
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
 DocType: Employee,You can enter any date manually,Jūs varat ievadīt jebkuru datumu manuāli
 DocType: Sales Invoice,Advertisement,Reklāma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Pārbaudes laiks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Pārbaudes laiks
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Expense Claim,Expense Approver,Izdevumu apstiprinātājs
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkuma čeka Prece Kopā
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Lai DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slīpēšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink iesaiņošana
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Neapstiprinātas aktivitātes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Apstiprināts
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Piegādātājs> Piegādātājs Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adrese sadaļa ir obligāta.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ievadiet nosaukumu, kampaņas, ja avots izmeklēšanas ir kampaņa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izvēlieties saimnieciskais gads
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Kausēšanas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
 DocType: Address,Preferred Shipping Address,Vēlamā Piegādes adrese
 DocType: Purchase Receipt Item,Accepted Warehouse,Pieņemts Noliktava
 DocType: Bank Reconciliation Detail,Posting Date,Norīkošanu Datums
 DocType: Item,Valuation Method,Vērtēšanas metode
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nevar atrast valūtas kursu {0} uz {1}
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dublikāts ieraksts
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dublikāts ieraksts
 DocType: Serial No,Under Warranty,Zem Garantija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Kļūda]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt klientu pasūtījumu."
 ,Employee Birthday,Darbinieku Birthday
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
 DocType: Pricing Rule,Discount Percentage,Atlaide procentuālā
 DocType: Payment Reconciliation Invoice,Invoice Number,Rēķina numurs
-apps/erpnext/erpnext/hooks.py +70,Orders,Pasūtījumi
+apps/erpnext/erpnext/hooks.py +54,Orders,Pasūtījumi
 DocType: Leave Control Panel,Employee Type,Darbinieku Type
 DocType: Employee Leave Approver,Leave Approver,Atstājiet apstiprinātāja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Materiāls pārvietoti, lai ražošana"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Lietotājs ar ""Izdevumu apstiprinātājs"" lomu"
 ,Issued Items Against Production Order,"Izsniegtās preces, uzrādot ordeņa"
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par grupai"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nederīga periods
 DocType: Customer,Credit Limit,Kredītlimita
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izvēlēties veidu darījumu
 DocType: GL Entry,Voucher No,Kuponu Nr
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Adrese un kontaktinformācija
 DocType: Customer,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Employee,Feedback,Atsauksmes
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atvaļinājumu nevar tikt piešķirts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Grafiks
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazīvs jet machining
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Grafiks
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
-DocType: Website Settings,Website Settings,Website iestatījumi
 DocType: Item,Reorder level based on Warehouse,Pārkārtot līmenis balstās uz Noliktava
 DocType: Activity Cost,Billing Rate,Norēķinu Rate
 ,Qty to Deliver,Daudz rīkoties
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Pieprasīts Par
 DocType: Quotation Item,Against Doctype,Pret DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekot šim pavadzīmi pret jebkuru projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root konts nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root konts nevar izdzēst
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Rādīt krājumu papildināšanu
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Atsauce # {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Pārvaldīt adreses
 DocType: Pricing Rule,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
-DocType: Communication,Phone,Telefons
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Noslēguma (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Noslēguma (Dr)
 DocType: Contact,Passive,Pasīvs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Jāmaksā Summa
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Saņemt atjauninājumus
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pievieno dažas izlases ierakstus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Pievieno dažas izlases ierakstus
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Atstājiet Management
-DocType: Event,Groups,Grupas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa ar kontu
 DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
 DocType: Lead,Lower Income,Lower Ienākumi
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ātrā palīdzība
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Avota un mērķa noliktava nevar būt vienāda rindā {0}
 DocType: Features Setup,Sales Extras,Pārdošanas Ekstras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budžets konta {1} pret izmaksām centra {2} pārsniegs līdz {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budžets konta {1} pret izmaksām centra {2} pārsniegs līdz {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vērtība vai Daudz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minūte
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minūte
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļiem un maksājumiem
 ,Qty to Receive,Daudz saņems
 DocType: Leave Block List,Leave Block List Allowed,Atstājiet Block Latviešu Atļauts
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konversijas faktors nevar būt frakcijās
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Jūs izmantot to uz autorizāciju
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Jūs izmantot to uz autorizāciju
 DocType: Sales Partner,Retailer,Mazumtirgotājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Visi Piegādātājs veidi
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citāts {0} nav tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Overdrafts konts
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Padarīt par atalgojumu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Pārlūkot BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Nodrošināti aizdevumi
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkcija
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkcija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Atklāšanas Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Nevar apstiprināt atvaļinājumu, kā jums nav atļauts apstiprināt atstāj uz Bloķēt datumiem"
 DocType: Appraisal,Appraisal,Novērtējums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-putu liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Zīmējums
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datums tiek atkārtots
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorizēts Parakstītājs
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
 DocType: Hub Settings,Seller Email,Pārdevējs Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
 DocType: Workstation Working Hour,Start Time,Sākuma laiks
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Summa (Uzņēmējdarbības valūta)
 DocType: BOM Operation,Hour Rate,Stunda Rate
 DocType: Stock Settings,Item Naming By,Postenis nosaukšana Līdz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,No aptauja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,No aptauja
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Vēl viens periods Noslēguma Entry {0} ir veikts pēc {1}
 DocType: Production Order,Material Transferred for Manufacturing,"Materiāls pārvietoti, lai Manufacturing"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konts {0} neeksistē
 DocType: Purchase Receipt Item,Purchase Order Item No,Pasūtījuma Pozīcijas Nr
-DocType: System Settings,System Settings,Sistēmas iestatījumi
 DocType: Project,Project Type,Projekts Type
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Izmaksas dažādu aktivitāšu
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 DocType: Serial No,Is Cancelled,Tiek atcelta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mani sūtījumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mani sūtījumi
 DocType: Journal Entry,Bill Date,Bill Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Pat tad, ja ir vairāki cenu noteikšanas noteikumus ar augstāko prioritāti, tiek piemēroti tad šādi iekšējie prioritātes:"
 DocType: Supplier,Supplier Details,Piegādātājs Details
-DocType: Communication,Recipients,Saņēmēji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skrūvēm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 DocType: Hub Settings,Publish Items to Hub,Publicēt preces Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},No vērtība nedrīkst būt mazāka par to vērtību rindā {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Lūdzu, izvēlieties bankas kontu"
 DocType: Newsletter,Create and Send Newsletters,Izveidot un nosūtīt jaunumus
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,No datumam jābūt pirms līdz šim datumam
 DocType: Sales Order,Recurring Order,Atkārtojas rīkojums
 DocType: Company,Default Income Account,Default Ienākumu konta
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientu Group / Klientu
 DocType: Item Group,Check this if you want to show in website,"Atzīmējiet šo, ja vēlaties, lai parādītu, kas mājas lapā"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Laipni lūdzam ERPNext
+,Welcome to ERPNext,Laipni lūdzam ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Kuponu Detail skaits
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Izraisīt Citāts
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Potenciālais klients -> Piedāvājums (quotation)
 DocType: Lead,From Customer,No Klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Zvani
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Zvani
 DocType: Project,Total Costing Amount (via Time Logs),Kopā Izmaksu summa (via Time Baļķi)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
 ,Projected,Prognozēts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Atvēršanas datums
 DocType: Journal Entry,Remark,Piezīme
 DocType: Purchase Receipt Item,Rate and Amount,Novērtēt un Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Garlaicīgs
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,No pārdošanas rīkojumu
-DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Nav Jāmaksā
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nav aktīvs
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Izkrauti izmaksas kuponu Summa
 DocType: Time Log,Batched for Billing,Batched par rēķinu
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Atlaide Summa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"piemēram, PVN"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"piemēram, PVN"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. punkts
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
 DocType: Shopping Cart Settings,Quotation Series,Citāts Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Karstā metāla gāzes formēšana
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Noliktava {0}: Uzņēmums ir obligāta
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Iet uz atbilstošo grupā (parasti līdzekļu avots&gt; īstermiņa saistībām&gt; nodokļiem un nodevām, un izveidot jaunu kontu (noklikšķinot uz Pievienot Child) tipa &quot;nodokli&quot; un to pieminēt nodokļa likmi."
 ,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Trūkst Valūtu kursi par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lāzera griešana
-DocType: Event,Monday,Pirmdiena
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Maksājams
 DocType: Salary Slip,Arrear Amount,Arrear Summa
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Adrese Dilst
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Jāizvēlas Vismaz viens pirkšana vai pārdošana
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"Gadījumos, kad ražošanas darbības tiek veiktas."
-DocType: Page,All,Viss
 DocType: Stock Entry Detail,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Sales User
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Daudz nevar būt lielāks par Max Daudz
 DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Uzlikt
 DocType: Lead,Lead Owner,Lead Īpašnieks
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Noliktava ir nepieciešama
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Noliktava ir nepieciešama
 DocType: Employee,Marital Status,Ģimenes statuss
 DocType: Stock Settings,Auto Material Request,Auto Materiāls Pieprasījums
 DocType: Time Log,Will be updated when billed.,"Tiks papildināts, ja jāmaksā."
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pasūtījuma Prece Kopā
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Uzņēmuma nosaukums nevar būt uzņēmums
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Vēstuļu Heads iespiesto veidnes.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Nosaukumi drukāt veidnes, piemēram, rēķins."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Record visas komunikācijas tipa e-pastu, tālruni, tērzēšana, vizītes, uc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Lūdzu, atsaucieties uz noapaļot Cost Center Company"
 DocType: Purchase Invoice,Terms,Noteikumi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Izveidot Jauns
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Izveidot Jauns
 DocType: Buying Settings,Purchase Order Required,Pasūtījuma Obligātas
 ,Item-wise Sales History,Postenis gudrs Sales Vēsture
 DocType: Expense Claim,Total Sanctioned Amount,Kopā sodīts summa
 ,Purchase Analytics,Pirkuma Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Piegāde Note postenis
 DocType: Expense Claim,Task,Uzdevums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Skūšana
 DocType: Purchase Taxes and Charges,Reference Row #,Atsauce Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"Tas ir sakņu pārdošanas persona, un to nevar rediģēt."
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Alga Slip atskaitīšana
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Piezīmes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Izvēlieties grupas mezglu pirmās.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Aizpildiet formu un saglabājiet to
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Lejupielādēt ziņojumu, kurā visas izejvielas, ar savu jaunāko inventāra statusu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forums
 DocType: Leave Application,Leave Balance Before Application,Atstājiet Balance pirms uzklāšanas
 DocType: SMS Center,Send SMS,Sūti SMS
 DocType: Company,Default Letter Head,Default Letter vadītājs
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,"Tas tiks izmantota, lai noteiktu noteikumu, HR moduli"
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Pārkārtot Daudz
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Iespēja Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Atlaide Fields būs pieejama Pirkuma pasūtījums, pirkuma čeka, pirkuma rēķina"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nosaukums jaunu kontu. Piezīme: Lūdzu, nav izveidot klientu kontus un piegādātājiem"
-DocType: Report,Report Type,Ziņojums Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Iekraušana
 DocType: BOM Replace Tool,BOM Replace Tool,BOM aizstāšana rīks
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Valsts gudrs noklusējuma Adrese veidnes
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Rādīt nodokļu break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datu importēšana un eksportēšana
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Ja jūs iesaistīt ražošanas darbības. Ļauj postenis ""ir ražots"""
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiāls Pieprasījums Detail Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard pagrieziena
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Veikt tehniskās apkopes vizīte
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
 DocType: Company,Default Cash Account,Default Naudas konts
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Piezīme: Ja maksājums nav veikts pret jebkādu atsauci, veikt Journal Entry manuāli."
 DocType: Item,Supplier Items,Piegādātājs preces
 DocType: Opportunity,Opportunity Type,Iespēja Type
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
 ,Stock Ageing,Stock Novecošana
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Nosūtīt automātisko e-pastus kontaktiem Iesniedzot darījumiem.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rinda {0}: Daudz nav avalable noliktavā {1} uz {2}{3}. Pieejams Daudzums: {4}, Transfer Daudzums: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postenis 3
 DocType: Purchase Order,Customer Contact Email,Klientu Kontakti Email
-DocType: Event,Sunday,Svētdiena
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Piezīme: Maksājumu ievades netiks izveidota, jo ""naudas vai bankas konts"" netika norādīta"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Pienākumi
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ievadiet Vismaz 1 rēķinu tabulā
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pievienot lietotājus
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Pievienot lietotājus
 DocType: Pricing Rule,Item Group,Postenis Group
 DocType: Task,Actual Start Date (via Time Logs),Faktiskā Sākuma datums (via Time Baļķi)
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
 DocType: Item,Default BOM,Default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Lūdzu, atkārtoti tipa uzņēmuma nosaukums, lai apstiprinātu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Time Log Batch,Total Hours,Kopējais stundu skaits
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobiļu
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ir nepieciešama postenis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metāla iesmidzināšanas formēšanas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiļu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,No piegāde piezīme
 DocType: Time Log,From Time,No Time
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investīciju banku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izvēlieties savu valsti, laika joslu un Valūta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investīciju banku
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Kodināšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand liešana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektrogalvanizācijas
 DocType: Purchase Invoice Item,Rate,Likme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interns
 DocType: Newsletter,A Lead with this email id should exist,Svins ar šo e-pasta id jāpastāv
 DocType: Stock Entry,From BOM,No BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Pamata
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Līdz šim vajadzētu būt tāds pats kā No datums par Half Day atvaļinājumu
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
 DocType: Salary Structure,Salary Structure,Algu struktūra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Vairāki Cena noteikums pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt \ konfliktu, piešķirot prioritāti. Cena Noteikumi: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompānija
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Par Noliktava
 DocType: Employee,Offer Date,Piedāvājums Datums
 DocType: Hub Settings,Access Token,Access Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Ir ilgtermiņa ieguldījumu postenim
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ja jums ir garas drukas formātus, šo funkciju var izmantot, lai sadalīt lapu, lai drukā uz vairākām lapām ar visām galvenes un kājenes katrā lappusē"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Visas teritorijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Visas teritorijas
 DocType: Purchase Invoice,Items,Preces
 DocType: Fiscal Year,Year Name,Gadā Name
 DocType: Process Payroll,Process Payroll,Process Algas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
 DocType: Product Bundle Item,Product Bundle Item,Produkta Bundle Prece
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Apdare un rūpniecības apdares
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,No un uz datumiem nepieciešamo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vērtspapīru un preču biržu
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktava
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Urbšana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow molding
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
 DocType: Tax Rule,Shipping City,Piegāde City
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ja ""Nē Copy"" ir iestatīts"
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ja ""Nē Copy"" ir iestatīts"
 DocType: Account,Purchase User,Iegādāties lietotāju
 DocType: Notification Control,Customize the Notification,Pielāgot paziņojumu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Sišana
-DocType: Web Page,Slideshow,Slaidrādi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
 DocType: Journal Entry,Print Heading,Print virsraksts
 DocType: Quotation,Maintenance Manager,Uzturēšana vadītājs
-DocType: Workflow State,Search,Meklēšana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kopā nevar būt nulle
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dienas kopš pēdējā pasūtījuma"" nedrīkst būt lielāks par vai vienāds ar nulli"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Cietlodēšana
 DocType: C-Form,Amended From,Grozīts No
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Izejviela
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Nu mērķa Daudzums vai paredzētais apjoms ir obligāta
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
 DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
@@ -2801,44 +2570,43 @@
 ,Produced,Saražotā
 DocType: Item,Item Code for Suppliers,Prece kodekss Piegādātājiem
 DocType: Issue,Raised By (Email),Raised Ar (e-pasts)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Vispārīgs
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pievienojiet iespiedveidlapām
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Vispārīgs
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Pievienojiet iespiedveidlapām
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Sarakstu jūsu nodokļu galvas (piemēram, PVN, muitas uc; viņiem ir unikālas nosaukumi) un to standarta likmes. Tas radīs standarta veidni, kuru varat rediģēt un pievienot vēl vēlāk."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Sarakstu jūsu nodokļu galvas (piemēram, PVN, muitas uc; viņiem ir unikālas nosaukumi) un to standarta likmes. Tas radīs standarta veidni, kuru varat rediģēt un pievienot vēl vēlāk."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Sērijas Nos Nepieciešamais par sērijveida postenī {0}
 DocType: Journal Entry,Bank Entry,Banka Entry
 DocType: Authorization Rule,Applicable To (Designation),Piemērojamais Lai (Apzīmējums)
-DocType: Blog Post,Blog Post,Blog Post
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ieslēgt / izslēgt valūtas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Pasta izdevumi
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datums, kurā atkārtojas pasūtījums tiks apstāties"
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} ir jāsamazina par {1}, vai jums vajadzētu palielināt pārplūdes toleranci"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Kopā Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Stunda
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Stunda
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer Materiāls piegādātājam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
-DocType: Lead,Lead Type,Lead Type
+DocType: Lead,Lead Type,Potenciālā klienta Veids (Type)
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Izveidot citāts
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Visi šie posteņi jau rēķinā
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Piegāde pants Nosacījumi
 DocType: BOM Replace Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kērlings
 DocType: Account,Tax,Nodoklis
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rinda {0}: {1} nav derīgs {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rinda {0}: {1} nav derīgs {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,No produkta Bundle
 DocType: Production Planning Tool,Production Planning Tool,Ražošanas plānošanas rīks
 DocType: Quality Inspection,Report Date,Ziņojums Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Maršrutēšana
 DocType: C-Form,Invoices,Rēķini
 DocType: Job Opening,Job Title,Amats
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} saņēmēji
 DocType: Features Setup,Item Groups in Details,Postenis Grupas detaļās
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Atjaunināšanas ātrumu un pieejamība
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procents jums ir atļauts saņemt vai piegādāt vairāk pret pasūtīto daudzumu. Piemēram: Ja esi pasūtījis 100 vienības. un jūsu pabalsts ir, tad jums ir atļauts saņemt 110 vienības 10%."
 DocType: Pricing Rule,Customer Group,Klientu Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: Item,Website Description,Mājas lapa Apraksts
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
 ,Sales Register,Sales Reģistrēties
 DocType: Quotation,Quotation Lost Reason,Citāts Lost Iemesls
 DocType: Address,Plant,Augs
-DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Aukstās velmēšanas
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
 DocType: GL Entry,Against Voucher Type,Pret kupona Tips
 DocType: Item,Attributes,Atribūti
-DocType: Packing Slip,Get Items,Saņemt Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ievadiet norakstīt kontu
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order Date
-DocType: DocField,Image,Attēls
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Saņemt Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ievadiet norakstīt kontu
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Pēdējā pasūtījuma datums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Padarīt akcīzes rēķinu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
-DocType: Communication,Other,Cits
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Darbība ID nav noteikts
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Apmeklējums
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Apmeklējums
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
 DocType: Purchase Invoice,Mobile No,Mobile Nr
 DocType: Payment Tool,Make Journal Entry,Padarīt Journal Entry
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Tirdzniecības
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Tirdzniecības
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 DocType: Cost Center,Distribution Id,Distribution Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Visi produkti vai pakalpojumi.
 DocType: Purchase Invoice,Supplier Address,Piegādātājs adrese
-DocType: Contact Us Settings,Address Line 2,Adrese Line 2
-DocType: ToDo,Reference,Atsauces
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforācijas
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Daudz
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Sērija ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanšu pakalpojumi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3}
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
 DocType: Leave Allocation,Unused leaves,Neizmantotās lapas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default parādi Debitoru
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zāģēšanas
 DocType: Tax Rule,Billing State,Norēķinu Valsts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminēšanas
 DocType: Item Reorder,Transfer,Nodošana
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Aglomerācijas
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Contact HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Mazumtirdzniecība
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klientu {0} nepastāv
 DocType: Attendance,Absent,Nekonstatē
-DocType: Product Bundle,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drupināšanas
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Piezīmes
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Nepārtrauktās liešanas
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Lūdzu, norādiet"
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Iepriekš
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold izmēru
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konts {0} nevar būt Group
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Apgabals
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Par piemēram, 2012.gada 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Pagaidu peļņa / zaudējumi (kredīts)
 DocType: Sales Invoice,Return Against Sales Invoice,Atgriešanās ar pārdošanas rēķinu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Prece 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Lūdzu iestatīt noklusēto vērtību {0} kompānijā {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Lūdzu iestatīt noklusēto vērtību {0} kompānijā {1}
 DocType: Serial No,Creation Time,Izveides laiks
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ieņēmumi kopā
 DocType: Sales Invoice,Product Bundle Help,Produkta Bundle Palīdzība
 ,Monthly Attendance Sheet,Mēneša Apmeklējumu Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Neviens ieraksts atrasts
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konts {0} ir neaktīvs
 DocType: GL Entry,Is Advance,Vai Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Apmeklējumu No Datums un apmeklētība līdz šim ir obligāta
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ievadiet ""tiek slēgti apakšuzņēmuma līgumi"", kā jā vai nē"
 DocType: Sales Team,Contact No.,Contact No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Peļņas un zaudējumu"" tipa konts {0} nav atļauts atvēršana Entry"
-DocType: Workflow State,Time,Laiks
 DocType: Features Setup,Sales Discounts,Pārdošanas Atlaides
 DocType: Hub Settings,Seller Country,Pārdevējs Country
 DocType: Authorization Rule,Authorization Rule,Autorizācija noteikums
 DocType: Sales Invoice,Terms and Conditions Details,Noteikumi un nosacījumi Details
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pārdošanas nodokļi un maksājumi Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Skaits ordeņa
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, kas parādīsies uz augšu produktu sarakstu."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,"Norādiet apstākļus, lai aprēķinātu kuģniecības summu"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Pievienot Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Loma atļauts noteikt iesaldētos kontus un rediģēt Saldētas Ieraksti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nevar pārvērst izmaksu centru, lai grāmatai, jo tā ir bērnu mezgliem"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Ir vajadzīgs pārrēķina koeficients
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Sērijas #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisijas apjoms
 DocType: Offer Letter Term,Value / Description,Vērtība / Apraksts
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,"Klienti nepērk, jo ilgu laiku"
 DocType: Production Order,Expected Delivery Date,Gaidīts Piegāde Datums
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uztūcis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Iztvaikošanas-modelis liešana
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Izklaides izdevumi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vecums
 DocType: Time Log,Billing Amount,Norēķinu summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Noteikts posteni Invalid daudzums {0}. Daudzums ir lielāks par 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pieteikumi atvaļinājuma.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridiskie izdevumi
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto pasūtījums tiks radīts, piemēram 05, 28 utt"
 DocType: Sales Invoice,Posting Time,Norīkošanu laiks
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Jaunais klientu Ieņēmumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Ceļa izdevumi
 DocType: Maintenance Visit,Breakdown,Avārija
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kā datumā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Trīšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probācija
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
-DocType: Feed,Full Name,Pilns nosaukums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Uzvarot
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probācija
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Default Noliktava ir obligāta krājumu postenī.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Samaksa algas par mēnesi {0} un gads {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
 ,Transferred Qty,Nodota Daudz
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigācija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plānošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plānošana
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Padarīt Time Ieiet Sērija
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdots
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Mēs pārdot šo Prece
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Mēs pārdot šo Prece
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Piegādātājs Id
 DocType: Journal Entry,Cash Entry,Naudas Entry
 DocType: Sales Partner,Contact Desc,Contact Desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Prece vadītājs
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Pievienot rindas noteikt ikgadējos budžetus uz kontu.
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Karjeru
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Visi Kontakti.
 DocType: Newsletter,Test Email Id,Tests Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Uzņēmuma saīsinājums
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Uzņēmuma saīsinājums
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Ja jums sekot kvalitātes pārbaudei. Ļauj lietu QA vajadzīga, un KN Nr in pirkuma čeka"
 DocType: GL Entry,Party Type,Party Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Izejvielas nevar būt tāds pats kā galveno posteni
 DocType: Item Attribute Value,Abbreviation,Saīsinājums
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotācijas formēšanas
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Algu veidni meistars.
 DocType: Leave Type,Max Days Leave Allowed,Max dienu atvaļinājumu Atļauts
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Uzstādīt Nodokļu noteikums par iepirkumu grozs
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
 DocType: Account,Temporary,Pagaidu
 DocType: Address,Preferred Billing Address,Vēlamā Norēķinu adrese
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretārs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretārs
 DocType: Serial No,Distinct unit of an Item,Atsevišķu vienību posteņa
 DocType: Pricing Rule,Buying,Pirkšana
 DocType: HR Settings,Employee Records to be created by,"Darbinieku Records, kas rada"
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
 DocType: Purchase Order Item,Supplier Quotation,Piegādātājs Citāts
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Gludināšanas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0}{1} ir apturēta
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
 DocType: Lead,Add to calendar on this date,Pievienot kalendāram šajā datumā
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Gaidāmie notikumi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientam ir pienākums
-DocType: Letter Head,Letter Head,Vēstule Head
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ir obligāta Atgriezties
 DocType: Purchase Order,To Receive,Saņemt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montāžas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ienākumi / izdevumi
 DocType: Employee,Personal Email,Personal Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Kopējās dispersijas
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Kopējās dispersijas
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ja ieslēgts, sistēma būs pēc grāmatvedības ierakstus inventāru automātiski."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokeru
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeru
 DocType: Address,Postal Code,Pasta indekss
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","minūtēs Atjaunināts izmantojot 'Time Ieiet """
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Pasūtījumi izlaists ražošanai.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Hub Settings,Name Token,Nosaukums Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Ēvelēšana
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard pārdošana
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard pārdošana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Vismaz viena noliktava ir obligāta
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ievadiet noklusējuma mērvienības
 DocType: Purchase Invoice Item,Project Name,Projekta nosaukums
 DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
-DocType: Workflow State,Edit,Rediģēt
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
 DocType: Features Setup,Item Batch Nos,Vienība Partijas Nr
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksājumu Samierināšanās Maksājumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Nodokļu Aktīvi
 DocType: BOM Item,BOM No,BOM Nr
-DocType: Contact Us Settings,Pincode,Pasta indeksa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kas tiks aizstāti
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Jaunais Stock UOM jāatšķiras no pašreizējās akciju UOM
 DocType: Account,Debit,Debets
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lapas jāpiešķir var sastāvēt no 0.5
 DocType: Production Order,Operation Cost,Darbība izmaksas
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Augšupielādēt apmeklēšanu no .csv faila
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izcila Amt
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Default Izmaksu centrs
 DocType: Purchase Invoice,End Date,Beigu datums
 DocType: Employee,Internal Work History,Iekšējā Work Vēsture
-DocType: DocField,Column Break,Kolonna Break
-DocType: Event,Thursday,Ceturtdiena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Virpošana
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klientu Atsauksmes
 DocType: Account,Expense,Izdevumi
 DocType: Sales Invoice,Exhibition,Izstāde
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Notika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Ražošanas postenis
 ,Employee Information,Darbinieku informācija
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Likme (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Likme (%)
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanšu gads beigu datums
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanšu gads beigu datums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nevar filtrēt balstīta uz kupona, ja grupēti pēc kuponu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Padarīt Piegādātāja citāts
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Padarīt Piegādātāja citāts
 DocType: Quality Inspection,Incoming,Ienākošs
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Samazināt Nopelnot par Bezalgas atvaļinājums (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partijas ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Piezīme: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ŠONEDĒĻ kopsavilkums
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} jābūt Pirkta vai Apakšuzņēmēju Ir rindā {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
 DocType: GL Entry,Party,Partija
 DocType: Sales Order,Delivery Date,Piegāde Datums
-DocType: DocField,Currency,Valūta
 DocType: Opportunity,Opportunity Date,Iespēja Datums
 DocType: Purchase Receipt,Return Against Purchase Receipt,Atgriezties Pret pirkuma čeka
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Sakārtoti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Gabaldarbs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Gabaldarbs
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Apspriediet
 DocType: SMS Settings,SMS Settings,SMS iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Pagaidu konti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Melns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Melns
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion postenis
 DocType: Account,Auditor,Revidents
 DocType: Purchase Order,End date of current order's period,Beigu datums no kārtējā pasūtījuma perioda
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Padarīt piedāvājuma vēstule
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Atgriešanās
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
-DocType: DocField,Fold,Salocīt
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Default mērvienība Variant jābūt tāda pati kā Template
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
 DocType: Project Task,Pending Review,Kamēr apskats
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Lūdzu, norādiet"
 DocType: Task,Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Klienta ID
-DocType: Page,Page Name,Lapas nosaukums
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Lai Time jābūt lielākam par laiku
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Noliktava {0}: Mātes vērā {1} nav Bolong uzņēmumam {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindle apdare
-DocType: BOM,Last Purchase Rate,Pēdējais iegāde Rate
+DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
 DocType: Account,Asset,Aktīvs
 DocType: Project Task,Task ID,Uzdevums ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","piemēram, ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","piemēram, ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Preces nevar pastāvēt postenī {0}, jo ir varianti"
 ,Sales Person-wise Transaction Summary,Sales Person-gudrs Transaction kopsavilkums
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Noliktava {0} nepastāv
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Reģistrēties Par ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mēneša procentuālo sadalījumu
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiālu piegādā pret šo piegāde piezīmes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Skavošanas
 DocType: Customer,Customer Details,Klientu Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Veidošana
 DocType: Employee,Reports to,Ziņojumi
 DocType: SMS Settings,Enter url parameter for receiver nos,Ievadiet url parametrs uztvērēja nos
 DocType: Sales Invoice,Paid Amount,Samaksāta summa
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Noslēguma kontu {0} ir jābūt tipa 'Atbildības'
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitātes vadība
 DocType: Production Planning Tool,Filter based on customer,"Filtrs, pamatojoties uz klientu"
 DocType: Payment Tool Detail,Against Voucher No,Pret kupona
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
 DocType: Tax Rule,Purchase,Pirkums
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilance Daudz
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilance Daudz
 DocType: Item Group,Parent Item Group,Parent Prece Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} uz {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Izmaksu centri
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Noliktavas.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Noliktavas.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Likmi, pēc kuras piegādātāja valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: hronometrāžu konflikti ar kārtas {1}
 DocType: Opportunity,Next Contact,Nākamais Kontakti
 DocType: Employee,Employment Type,Nodarbinātības Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Pamatlīdzekļi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Pieteikumu iesniegšanas termiņš nevar būt pa diviem alocation ierakstiem
 DocType: Item Group,Default Expense Account,Default Izdevumu konts
 DocType: Employee,Notice (days),Paziņojums (dienas)
-DocType: Page,Yes,Jā
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Inkasācija Datums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galvanoplastika
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Pret kuponu Type jābūt vienam no Pirkuma pasūtījums, Pirkuma rēķins vai Journal Entry"
 DocType: Account,Stock Adjustment,Stock korekcija
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default darbības izmaksas pastāv darbības veidam - {0}
 DocType: Production Order,Planned Operating Cost,Plānotais ekspluatācijas izmaksas
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Jaunais {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Pievienoju {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Pievienoju {0} # {1}
 DocType: Job Applicant,Applicant Name,Pieteikuma iesniedzēja nosaukums
 DocType: Authorization Rule,Customer / Item Name,Klients / vienības nosaukums
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Sērijas numurs ir obligāta postenī {0}
 DocType: Item Variant Attribute,Attribute,Īpašība
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Lūdzu, norādiet no / uz svārstīties"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Izveidoja
 DocType: Serial No,Under AMC,Zem AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Posteņu novērtēšana likme tiek pārrēķināts apsver izkraut izmaksu kupona summa
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Noklusējuma iestatījumi pārdošanas darījumu.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimālā summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atjaunināt Pabeigts preces
 DocType: Workstation,per hour,stundā
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Sērija {0} jau izmanto {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Pārskats par noliktavas (nepārtrauktās inventarizācijas), tiks izveidots saskaņā ar šo kontu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 DocType: Company,Distribution,Sadale
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Samaksātā summa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projekta vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 DocType: Customer,Default Taxes and Charges,Noklusējuma nodokļi un maksājumi
 DocType: Account,Receivable,Saņemams
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
 DocType: Sales Invoice,Supplier Reference,Piegādātājs Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ja ieslēgts, BOM uz sub-montāžas vienības tiks uzskatīts, lai iegūtu izejvielas. Pretējā gadījumā visi sub-montāžas vienības tiks uzskatīta par izejvielu."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
 DocType: Employee Education,Qualification,Kvalifikācija
 DocType: Item Price,Item Price,Vienība Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sakārtoti
 DocType: Warehouse,Warehouse Name,Noliktava Name
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Atbalsta Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Uzņēmums trūkst noliktavās {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Aizstāt Utility
 DocType: POS Profile,Terms and Conditions,Noteikumi un nosacījumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Līdz šim būtu jāatrodas attiecīgajā taksācijas gadā. Pieņemot, ka līdz šim datumam = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Šeit jūs varat saglabāt augstumu, svaru, alerģijas, medicīnas problēmas utt"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,Par ražošanu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ievadiet pārdošanas kārtību tabulā iepriekš
 DocType: Project Task,View Task,Skatīt Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Jūsu finanšu gads sākas
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Jūsu finanšu gads sākas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ievadiet pirkumu čekus
 DocType: Sales Invoice,Get Advances Received,Get Saņemtā Avansa
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup ienākošā servera atbalstu e-pasta id. (Piem support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Salary Slip,Salary Slip,Alga Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Apstādījumu
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Lai datums"" ir nepieciešama"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izveidot iepakošanas lapas par paketes jāpiegādā. Izmanto, lai paziņot Iepakojumu skaits, iepakojuma saturu un tā svaru."
 DocType: Sales Invoice Item,Sales Order Item,Pasūtījumu postenis
 DocType: Salary Slip,Payment Days,Maksājumu dienas
 DocType: BOM,Manage cost of operations,Pārvaldīt darbības izmaksām
 DocType: Features Setup,Item Advanced,Postenis Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot valcēšana
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ja kāda no pārbaudītajiem darījumiem ir ""Iesniegtie"", e-pasts pop-up automātiski atvērta, lai nosūtītu e-pastu uz saistīto ""Kontakti"" šajā darījumā, ar darījumu kā pielikumu. Lietotājs var vai nevar nosūtīt e-pastu."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globālie iestatījumi
 DocType: Employee Education,Employee Education,Darbinieku izglītība
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Konts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Sales Team Details
 DocType: Expense Claim,Total Claimed Amount,Kopējais pieprasītā summa
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciālie iespējas pārdot.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Slimības atvaļinājums
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Nederīga {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Slimības atvaļinājums
 DocType: Email Digest,Email Digest,E-pasts Digest
 DocType: Delivery Note,Billing Address Name,Norēķinu Adrese Nosaukums
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departaments veikali
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistēma Balance
-DocType: Workflow,Is Active,Vai Active
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departaments veikali
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistēma Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
-DocType: Workflow State,Primary,Galvenais
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
 DocType: Item,Max Discount (%),Max Atlaide (%)
-DocType: Communication,More Information,Vairāk informācijas
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Spridzināšanas darbi
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Pēdējā pasūtījuma Summa
 DocType: Company,Warn,Brīdināt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Posteņu novērtēšana atjaunināts
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Izejvielas Kopā
 DocType: Purchase Invoice,Recurring Print Format,Atkārtojas Print Format
-DocType: Communication,Series,Sērija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Paredzams, Piegāde datums nevar būt pirms pirkuma pasūtījuma Datums"
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
-DocType: Communication,Email,E-pasts
 DocType: Item Group,Item Classification,Postenis klasifikācija
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Biznesa attīstības vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Biznesa attīstības vadītājs
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Uzturēšana Vizītes mērķis
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periods
 ,General Ledger,General Ledger
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
 DocType: Features Setup,To get Item Group in details table,Lai iegūtu posteni Group detaļas tabulā
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Oforts
 DocType: Sales Invoice,Commission,Komisija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<H4> Default Template </ h4> <p> Izmanto <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja šablonu </a> un visi lauki adrese (ieskaitot Custom Fields ja tādi ir), būs pieejams </ p> <pre> <code> {{address_line1}} & lt; br & gt; {%, Ja address_line2%}{{address_line2}} & lt; br & gt; {% endif -%}{{pilsētas}} & lt; br & gt; {%, Ja valsts%}{{valsts}} & lt; br & gt; {% endif -%}{%, ja Pasta indeksa%} PIN: {{Pasta indeksa}} & lt; br & gt; {% endif -%}{{valsts}} & lt ; br & gt; {%, Ja tālrunis%} Tālrunis: {{tālrunis}} & lt; br & gt; {% endif -%}{%, ja fakss%} Fakss: {{fakss}} & lt; br & gt; {% endif -%}{%, ja email_id %} E-pasts: {{email_id}} & lt; br & gt; {% endif -%} </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Default Summa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Noliktava nav atrasts sistēmā
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Noliktava nav atrasts sistēmā
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Šī mēneša kopsavilkums
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitātes pārbaudes Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`IesaldētKrājumus vecākus par` jābūt mazākam par % dienām.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 DocType: Supplier,Address and Contacts,Adrese un kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
 DocType: Payment Tool,Get Outstanding Vouchers,Iegūt nepārspējamas Kuponi
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
 DocType: Appraisal,Start Date,Sākuma datums
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vērtība
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Piešķirt atstāj uz laiku.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Klikšķiniet šeit, lai pārbaudītu"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,"Vidējais laiks, ko piegādātājs piegādāt"
 DocType: Time Log,Hours,Stundas
 DocType: Project,Expected Start Date,"Paredzams, sākuma datums"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Ritošā
-DocType: ToDo,Priority,Prioritāte
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Noņemt objektu, ja maksa nav piemērojama šim postenim"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Access Atļauts
-DocType: Dropbox Backup,Weekly,Nedēļas
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Piem. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Saņemt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Saņemt
 DocType: Maintenance Visit,Fully Completed,Pilnībā Pabeigts
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% pabeigti
 DocType: Employee,Educational Qualification,Izglītības Kvalifikācijas
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ir veiksmīgi pievienota mūsu Newsletter sarakstā.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronu kūļa machining
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Lūdzu, izvēlieties sākuma datumu un beigu datums postenim {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Galvenie Ziņojumi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger ieraksti atlikumus atjaunotie
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Galvenie Ziņojumi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Pievienot / rediģēt Cenas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Shēma izmaksu centriem
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpiespriež
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mani Pasūtījumi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mani Pasūtījumi
 DocType: Price List,Price List Name,Cenrādis Name
 DocType: Time Log,For Manufacturing,Par Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Kopsummas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Kopsummas
 DocType: BOM,Manufacturing,Ražošana
 ,Ordered Items To Be Delivered,Pasūtītās preces jāpiegādā
 DocType: Account,Income,Ienākums
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Kaut kas nogāja greizi!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Pārdošanas rēķins {0} jau ir iesniegti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Pabeigšana Datums
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liešana
-DocType: Email Alert,Reference Date,Atsauces datums
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ievadiet derīgus mobilos nos
 DocType: Budget Detail,Budget Detail,Budžets Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ievadiet ziņu pirms nosūtīšanas
-DocType: Async Task,Status,Stāvoklis
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM atjaunināts postenī {0}
-DocType: Company History,Year,Gads
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profils
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Lūdzu, atjauniniet SMS Settings"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} jau rēķins
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
 DocType: Item,Unit of Measure Conversion,Mērvienība Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Darbinieku nevar mainīt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
 DocType: Naming Series,Help HTML,Palīdzība HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Pabalsts pārmērīga {0} šķērsoja postenī {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Nosaukums personas vai organizācijas, ka šī adrese pieder."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Jūsu Piegādātāji
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Jūsu Piegādātāji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Vēl Alga Struktūra {0} ir aktīva darbiniekam {1}. Lūdzu, tā statusu ""Neaktīvs"", lai turpinātu."
 DocType: Purchase Invoice,Contact,Kontakts
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Saņemts no
 DocType: Features Setup,Exports,Eksports
 DocType: Lead,Converted,Konvertē
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: No {0} uz {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dators
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
 DocType: Payment Reconciliation,Get Unreconciled Entries,Saņemt Unreconciled Ieraksti
 DocType: Cost Center,Budgets,Budžeti
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atjaunots
 DocType: Employee,Emergency Contact Details,Avārijas kontaktinformāciju var
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ko tas dod?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ko tas dod?
 DocType: Delivery Note,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konts {0} ir ievadīts vairāk nekā vienu reizi taksācijas gadā {1}
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,"Atjaunināt papildu izmaksas, lai aprēķinātu izkraut objektu izmaksas"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrības
 DocType: Stock Entry,Total Value Difference (Out - In),Kopējā vērtība Starpība (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},"Lietotāja ID nav noteikts, Darbinieka {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,No garantijas prasību
 DocType: Stock Entry,Default Source Warehouse,Default Source Noliktava
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Pieslīpēšanas
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
-DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vai jūs tiešām vēlaties iesniegt visu atalgojumu par mēnesi {0} un gadu {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importa Reģistrētiem
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Dāvana
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
 DocType: Notification Control,Sales Invoice Message,Sales rēķins Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Noslēguma kontu {0} jābūt tipa Atbildības / Equity
 DocType: Authorization Rule,Based On,Pamatojoties uz
 DocType: Sales Order Item,Ordered Qty,Sakārtots Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Laika posmā no un periodu, lai datumiem obligātajām atkārtotu {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projekta aktivitāte / uzdevums.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Izveidot algas lapas
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nav derīga e-pasta id
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
-DocType: ToDo,Low,Zems
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lūdzu noteikt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampaņas nosaukums ir obligāts
 DocType: Maintenance Visit,Maintenance Date,Uzturēšana Datums
 DocType: Purchase Receipt Item,Rejected Serial No,Noraidīts Sērijas Nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Deep zīmējums
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Jauns izdevums
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Rādīt Balance
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kniedēm
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
 ,Sales Analytics,Pārdošanas Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Ražošanas iestatījumi
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Jaunais Konta nosaukums
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Izejvielas Kopā izmaksas
 DocType: Selling Settings,Settings for Selling Module,Iestatījumi Pārdošana modulis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Klientu apkalpošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Klientu apkalpošana
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postenis Klientu Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Apstiprināt Jūsu e-pasts
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Piedāvājums kandidāts Job.
 DocType: Notification Control,Prompt for Email on Submission of,Jautāt e-pastu uz iesniegšanai
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Kopā piešķirtie lapas ir vairāk nekā dienu periodā
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} ir nepieciešams
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuuma formēšanas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,"Paredzams, datums nevar būt pirms Material Pieprasīt Datums"
-DocType: Contact Us Settings,City,Pilsēta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraskaņas mehāniskā
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Kļūda: Nav derīgs id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postenis {0} jābūt Pārdošanas punkts
 DocType: Naming Series,Update Series Number,Update Series skaits
 DocType: Account,Equity,Taisnīgums
 DocType: Sales Order,Printing Details,Drukas Details
 DocType: Task,Closing Date,Slēgšanas datums
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženieris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženieris
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meklēt Sub Kompleksi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Atlaide
 DocType: Purchase Invoice,Against Expense Account,Pret Izdevumu kontu
 DocType: Production Order,Production Order,Ražošanas rīkojums
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Jau ir iesniegta uzstādīšana Note {0}
 DocType: Quotation Item,Against Docname,Pret Docname
 DocType: SMS Center,All Employee (Active),Visi Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Skatīt Tagad
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Izejvielas izmaksas
 DocType: Item,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Ganta diagramma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Nepilna laika
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Series Atjaunots
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Ziņojums Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pirmais Lietotājs: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pirmais Lietotājs: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskālā gada sākuma datums un fiskālā gada beigu datums jau ir paredzēta fiskālā gada {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Veiksmīgi jāsaskaņo
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Production Order,Planned End Date,Plānotais beigu datums
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Tax Rule,Validity,Derīgums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rēķinā summa
 DocType: Attendance,Attendance,Apmeklētība
-DocType: Page,No,Nē
 DocType: BOM,Materials,Materiāli
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ja nav atzīmēts, sarakstā būs jāpievieno katrā departamentā, kur tas ir jāpiemēro."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
@@ -3689,55 +3376,46 @@
 ,Item Prices,Izstrādājumu cenas
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt pirkuma pasūtījuma."
 DocType: Period Closing Voucher,Period Closing Voucher,Periods Noslēguma kuponu
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Cenrādis meistars.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Cenrādis meistars.
 DocType: Task,Review Date,Pārskatīšana Datums
 DocType: Purchase Invoice,Advance Payments,Avansa maksājumi
-DocType: DocPerm,Level,Līmenis
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Mērķa noliktava rindā {0} ir jābūt tādai pašai kā Production ordeņa
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frēzēšana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nē atļauju izmantot maksājumu ierīce
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
 DocType: Company,Round Off Account,Noapaļot kontu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratīvie izdevumi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Klientu Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Maiņa
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uzteikuma termiņa
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","piemēram, ""My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Uzteikuma termiņa
 DocType: Bank Reconciliation Detail,Voucher ID,Kuponu ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"Tas ir sakne teritorija, un to nevar rediģēt."
 DocType: Packing Slip,Gross Weight UOM,Bruto svars UOM
 DocType: Email Digest,Receivables / Payables,Debitori / Parādi
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Zīmogošana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Parādīt nulles vērtības
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Daudzums posteņa iegūta pēc ražošanas / pārpakošana no dotajiem izejvielu daudzumu
 DocType: Payment Reconciliation,Receivable / Payable Account,Debitoru / kreditoru konts
 DocType: Delivery Note Item,Against Sales Order Item,Pret Sales Order posteni
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 DocType: Task,Actual End Date (via Time Logs),Faktiskā beigu datums (via Time Baļķi)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ievadiet mātes izmaksu centru
 DocType: Delivery Note,Print Without Amount,Izdrukāt Bez summa
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Nodokļu kategorija nevar būt ""Vērtējums"" vai ""Vērtējums un Total"", jo visi priekšmeti ir nenoteiktas Noliktavā preces"
-DocType: User,Last Name,Uzvārds
-DocType: Web Page,Left,Kreisais
-DocType: Event,All Day,All Day
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Nodokļu kategorija nevar būt ""Vērtējums"" vai ""Vērtējums un Total"", jo visi priekšmeti ir nenoteiktas Noliktavā preces"
 DocType: Issue,Support Team,Atbalsta komanda
 DocType: Appraisal,Total Score (Out of 5),Total Score (no 5)
-DocType: Contact Us Settings,State,Valsts
 DocType: Batch,Batch,Partijas
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Līdzsvars
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Līdzsvars
 DocType: Project,Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas)
-DocType: User,Gender,Dzimums
 DocType: Journal Entry,Debit Note,Parādzīmi
 DocType: Stock Entry,As per Stock UOM,Kā vienu Fondu UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nav beidzies
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Izveidot noteikumus, lai ierobežotu darījumi, pamatojoties uz vērtībām."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ja ieslēgts, Total nē. Darbadienu būs brīvdienas, un tas samazinātu vērtību Alga dienā"
 DocType: Purchase Invoice,Total Advance,Kopā Advance
-DocType: Workflow State,User,Lietotājs
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Apstrāde algu
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Uzstādīt kā Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksājumu saņemšana Note
 DocType: Customer,Credit Days Based On,Kredīta Dienas Based On
 DocType: Tax Rule,Tax Rule,Nodokļu noteikums
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Uzturēt pašu likmi VISĀ pārdošanas ciklā
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plānot laiku žurnālus ārpus Workstation darba laiks.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0}{1} jau ir iesniegts
 ,Items To Be Requested,"Preces, kas jāpieprasa"
-DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Time Log,Billing Rate based on Activity Type (per hour),"Norēķinu likme, pamatojoties uz darbības veida (stundā)"
 DocType: Company,Company Info,Uzņēmuma informācija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Uzņēmuma e-pasta ID nav atrasts, tāpēc pasts nav nosūtīts"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 DocType: Production Planning Tool,Filter based on item,Filtrs balstās uz posteni
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debeta kontu
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
 DocType: Sales Invoice,Rounded Total (Company Currency),Noapaļota Kopā (Company valūta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
 DocType: Purchase Common,Purchase Common,Pirkuma kopējā
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,No Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Darbinieku pabalsti
 DocType: Sales Invoice,Is POS,Ir POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rēķinus izvirzīti klientiem.
-DocType: DocField,Default,Saistību nepildīšana
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekts Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonenti pievienotās
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definēt budžets šim izmaksu centru. Lai uzstādītu budžeta pasākumus, skatiet &quot;Uzņēmuma saraksts&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Expense Claim,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izvēloties ""Jā"" sniegs unikālu identitāti katrai vienībai šī posteņa, kuru var apskatīt šajā seriālā Nr kapteinis."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
 DocType: Employee,Education,Izglītība
 DocType: Selling Settings,Campaign Naming By,Kampaņas nosaukšana Līdz
 DocType: Employee,Current Address Is,Pašreizējā adrese ir
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Pēc izvēles. Komplekti uzņēmuma noklusējuma valūtu, ja nav norādīts."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Pēc izvēles. Komplekti uzņēmuma noklusējuma valūtu, ja nav norādīts."
 DocType: Address,Office,Birojs
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standarta Ziņojumi
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Lai izveidotu nodokļu kontā
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ievadiet izdevumu kontu
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Krājums
 DocType: Employee,Current Address,Pašreizējā adrese
-DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Partijas inventarizācija
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Partijas inventarizācija
 DocType: Employee,Contract End Date,Līgums beigu datums
 DocType: Sales Order,Track this Sales Order against any Project,Sekot šim klientu pasūtījumu pret jebkuru projektu
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Pull pārdošanas pasūtījumiem (līdz piegādāt), pamatojoties uz iepriekš minētajiem kritērijiem"
-DocType: DocShare,Document Type,Dokumenta tips
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,No piegādātāja aptauja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,No piegādātāja aptauja
 DocType: Deduction Type,Deduction Type,Atskaitīšana Type
 DocType: Attendance,Half Day,Half Day
 DocType: Pricing Rule,Min Qty,Min Daudz
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Lai izsekotu objektus pārdošanas un pirkšanas dokumentu ar partijas nr. &quot;Vēlamā Rūpniecība: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Darījuma datums
 DocType: Production Plan Item,Planned Qty,Plānotais Daudz
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Kopā Nodokļu
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Kopā Nodokļu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Par Daudzums (Rūpniecības Daudzums) ir obligāts
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
 DocType: Notification Control,Purchase Receipt Message,Pirkuma čeka Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Kopā piešķirtie lapas ir vairāk nekā periodā
 DocType: Production Order,Actual Start Date,Faktiskais sākuma datums
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materiālu piegādā pret šo pārdošanas rīkojuma
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Ierakstīt postenis kustība.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biļetens Latviešu Abonenta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Gropju iegriešanas
-DocType: Email Account,Service,Pakalpojums
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 ,Monthly Salary Register,Mēnešalga Reģistrēties
-apps/frappe/frappe/website/template.py +140,Next,Nākamais
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropulēšana
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Uz iepriekšējo rindu summas
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ievadiet maksājuma summu atleast vienā rindā
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ievadiet maksājuma summu atleast vienā rindā
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rinda {0}: Maksājuma summa nedrīkst būt lielāka par izcilu summa
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Kopā Neapmaksāta
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Kopā Neapmaksāta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Laiks Log nav saņemts rēķins
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Pircējs
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Pircējs
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto darba samaksa nevar būt negatīvs
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ievadiet Pret Kuponi manuāli
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ievadiet Pret Kuponi manuāli
 DocType: SMS Settings,Static Parameters,Statiskie Parametri
 DocType: Purchase Order,Advance Paid,Izmaksāto avansu
 DocType: Item,Item Tax,Postenis Nodokļu
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Sūtīt masu SMS saviem kontaktiem
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Apsveriet nodokļi un maksājumi, lai"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredītkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredītkarte
 DocType: BOM,Item to be manufactured or repacked,Postenis tiks ražots pārsaiņojamā
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
 DocType: Purchase Invoice,Next Date,Nākamais datums
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ievadiet nodokļiem un maksājumiem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Mehāniskā apstrāde
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
 DocType: Hub Settings,Seller Name,Pārdevējs Vārds
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Nepieciešams saglabāt formu pirms procedūras
 DocType: Item Attribute,Numeric Values,Skaitliskām vērtībām
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pievienojiet Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Pievienojiet Logo
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Padarīt Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Grozs ir tukšs
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Saknes nevar rediģēt.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Piešķirtā summa nevar lielāka par unadusted summu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Saknes nevar rediģēt.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Piešķirtā summa nevar lielāka par unadusted summu
 DocType: Manufacturing Settings,Allow Production on Holidays,Atļaut Production brīvdienās
 DocType: Sales Order,Customer's Purchase Order Date,Klienta Pasūtījuma datums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Pamatkapitāls
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Lūdzu, izvēlieties csv failu"
-DocType: Dropbox Backup,Send Backups to Dropbox,Nosūtīt backups uz Dropbox
 DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Dizainers
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Dizainers
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automātiski izveidot Materiālu pieprasījumu, ja daudzums samazinās zem šī līmeņa"
 ,Item-wise Purchase Register,Postenis gudrs iegāde Reģistrēties
 DocType: Batch,Expiry Date,Derīguma termiņš
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Lai uzstādītu pasūtīšanas līmeni, postenis jābūt iegāde postenis vai Manufacturing postenis"
 ,Supplier Addresses and Contacts,Piegādātāju Adreses un kontakti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projekts meistars.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Materiālu rēķins
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
-DocType: Dropbox Backup,Send Notifications To,Nosūtīt paziņojumus
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datums
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datums
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: Expense Claim Detail,Sanctioned Amount,Sodīts Summa
 DocType: GL Entry,Is Opening,Vai atvēršana
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konts {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konts {0} nepastāv
 DocType: Account,Cash,Nauda
 DocType: Employee,Short biography for website and other publications.,Īsa biogrāfija mājas lapas un citas publikācijas.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Lūdzu, izveidojiet Algas struktūru darbiniekam {0}"

diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 31875ad..bb082a9 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Режим на плата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изберете Месечен Дистрибуција, ако сакате да ги пратите врз основа на сезоната."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Предупредување: истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Предупредување: истата таа ствар е внесен повеќе пати.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Предмети веќе се синхронизираат
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Точка овозможуваат да се додадат повеќе пати во една трансакција
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Откажи материјали Посетете {0} пред да го раскине овој Гаранција побарување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи за широка потрошувачка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Ве молиме изберете партија Тип прв
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,Теми на клиентите
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,На сметка {0}: Родител на сметка {1} не може да биде Леџер
 DocType: Item,Publish Item to hub.erpnext.com,"Објавуваат елемент, за да hub.erpnext.com"
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Остави Approvers
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Изнајмени
-DocType: About Us Settings,Website,Веб-страница
 DocType: POS Profile,Applicable for User,Применливи за пристап
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Тампонирање плус синтерување
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ќе се пресметува во трансакцијата.
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјално Барање
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Од материјално Барање
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} дрвото
 DocType: Job Applicant,Job Applicant,Работа на апликантот
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема повеќе резултати.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правни
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правни
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Крај на даночните тип не може да бидат вклучени во стапка точка во ред {0}
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Бара од страна на
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серија успешно ажурирани
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Шевове
 DocType: Pricing Rule,Apply On,Apply On
 DocType: Item Price,Multiple Item prices.,Повеќекратни цени точка.
 ,Purchase Order Items To Be Received,"Нарачката елементи, за да бидат примени"
 DocType: SMS Center,All Supplier Contact,Сите Добавувачот Контакт
 DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Нов Оставете апликација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Оцени мора да биде иста како {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Нов Оставете апликација
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банкарски нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. За да се задржи клиентите мудро код ставка и да ги пребарува врз основа на нивниот код Користете ја оваа опција
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Прикажи Варијанти
-DocType: Sales Invoice Item,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Кол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Залиха
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Производство план Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направи нови ПОС Профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравствена заштита
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
 DocType: Purchase Invoice,Monthly,Месечен
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задоцнување на плаќањето (во денови)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mail адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Одбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mail адреса
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ред # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ред # {0}:
 DocType: Delivery Note,Vehicle No,Возило Не
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Ве молиме изберете Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Дрво
 DocType: Production Order Operation,Work In Progress,Работа во прогрес
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D печатење
 DocType: Employee,Holiday List,Одмор Листа
 DocType: Time Log,Time Log,Време Влез
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Сметководител
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Сметководител
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Company,Phone No,Телефон No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Дневник на дејностите што се вршат од страна на корисниците против задачи кои може да се користи за следење на времето, платежна."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Нов {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Нов {0}: # {1}
 ,Sales Partners Commission,Продај Партнери комисија
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Кратенка не може да има повеќе од 5 знаци
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Вредноста на атрибутот {0} не може да биде отстранет од {1} како точка Варијанти \ постојат со овој атрибут.
-DocType: Print Settings,Classic,Класичен
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Ова е root сметката и не може да се уредува.
 DocType: BOM,Operations,Операции
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не може да се постави овластување врз основа на попуст за {0}
 DocType: Bin,Quantity Requested for Purchase,Кол бара за купување
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикачи CSV датотека со две колони, еден за старото име и еден за ново име"
 DocType: Packed Item,Parent Detail docname,Родител Детална docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отворање на работа.
 DocType: Item Attribute,Increment,Прираст
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изберете Магацински ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Рекламирање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Рекламирање
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Employee,Married,Брак
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 DocType: Payment Reconciliation,Reconcile,Помират
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Бакалница
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Направете банка Влегување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиски фондови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Склад е задолжително ако тип на сметка е складиште
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Lead,Person Name,Име лице
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверете дали се повторуваат цел, ја избирате да се запре периодични или стави соодветна Крај Датум"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
 DocType: SMS Log,SMS Log,SMS Влез
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Цената на испорачани материјали
-DocType: Blog Post,Guest,Гостин
 DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
 DocType: Lead,Interested,Заинтересирани
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Бил на материјалот
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отворање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отворање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} до {1}
 DocType: Item,Copy From Item Group,Копија од став група
 DocType: Journal Entry,Opening Entry,Отворање Влегување
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} е задолжително
 DocType: Stock Entry,Additional Costs,Е вклучена во цената
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Сметка со постојните трансакцијата не може да се конвертира во групата.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Сметка со постојните трансакцијата не може да се конвертира во групата.
 DocType: Lead,Product Enquiry,Производ пребарување
-DocType: Standard Reply,Owner,Сопственикот
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ве молиме внесете компанија прв
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ве молиме изберете ја првата компанија
 DocType: Employee Education,Under Graduate,Под Додипломски
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,На цел
 DocType: BOM,Total Cost,Вкупно трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Влез активност:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижнини
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижнини
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Состојба на сметката
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Лекови
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
 DocType: Expense Claim Detail,Claim Amount,Износ барање
 DocType: Employee,Mr,Г-дин
-DocType: Custom Script,Client,Клиентот
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потрошни
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Потрошни
 DocType: Upload Attendance,Import Log,Увоз Влез
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Испрати
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Трошоци
 DocType: Newsletter,Email Sent?,Е-мејл испратен?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Прикажи Време на дневници
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
 DocType: Delivery Note,Installation Status,Инсталација Статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
 DocType: Item,Supply Raw Materials for Purchase,Снабдување на суровини за набавка
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Точка {0} мора да биде Набавка Точка
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Ќе се ажурира по Продај фактура е поднесена.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","За да го вклучите данок во ред {0} на стапката точка, даноци во редови {1} исто така, мора да бидат вклучени"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Зацрвстувањето
 DocType: BOM Replace Tool,New BOM,Нов Бум
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Серија Време на дневници за исплата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity кастинг
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Билтен веќе е испратен
 DocType: Lead,Request Type,Тип на Барањето
 DocType: Leave Application,Reason,Причината
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Емитување
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Извршување
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Првиот корисник ќе стане менаџер на систем (можете да го промените ова подоцна).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Емитување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Извршување
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Првиот корисник ќе стане менаџер на систем (можете да го промените ова подоцна).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детали за операции извршени.
 DocType: Serial No,Maintenance Status,Одржување Статус
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Теми и цени
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Теми и цени
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изберете на вработените за кои ќе се создавање на оценување.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Чини Центар {0} не му припаѓа на компанијата {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ценовник мора да се примени за купување или продавање на
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Датум на инсталација не може да биде пред датумот на испорака за Точка {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на Ценовник стапка (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Почеток
-DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Кастинг со полно работно мувла
 DocType: Offer Letter,Select Terms and Conditions,Изберете Услови и правила
 DocType: Production Planning Tool,Sales Orders,Продај Нарачка
 DocType: Purchase Taxes and Charges,Valuation,Вреднување
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Банкарска сметка
 DocType: Leave Type,Allow Negative Balance,Им овозможи на негативното салдо
 DocType: Selling Settings,Default Territory,Стандардно Територија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевизија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Ажурираат преку &quot;Време Вклучи се &#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},На сметка {0} не му припаѓа на компанијата {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
-DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
+DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,За Магацински се бара пред Поднесете
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Добиени на
 DocType: Sales Partner,Reseller,Препродавач
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Ве молиме внесете компанијата
 DocType: Delivery Note Item,Against Sales Invoice Item,Против Продај фактура Точка
 ,Production Orders in Progress,Производство налози во прогрес
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
 DocType: Newsletter List,Total Subscribers,Вкупно претплатници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Име за Контакт
+,Contact Name,Име за Контакт
 DocType: Production Plan Item,SO Pending Qty,ПА очекување Количина
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создава плата се лизга за горенаведените критериуми.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Барање за купување.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двојно домување
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Остава на годишно ниво
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Остава на годишно ниво
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ве молиме да се постави Именување серија за {0} преку подесување&gt; Settings&gt; Именување Серија
 DocType: Time Log,Will be updated when batched.,Ќе биде обновен кога batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
-DocType: Bulk Email,Message,Порака
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox пристап Клучни
 DocType: Payment Tool,Reference No,Референтен број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Годишен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продај фактура Не
 DocType: Material Request Item,Min Order Qty,Минимална Подреди Количина
 DocType: Lead,Do Not Contact,Не го допирајте
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,На уникатен проект за следење на сите периодични фактури. Тоа е генерирана за поднесете.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Развивач на софтвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Развивач на софтвер
 DocType: Item,Minimum Order Qty,Минимална Подреди Количина
 DocType: Pricing Rule,Supplier Type,Добавувачот Тип
 DocType: Item,Publish in Hub,Објави во Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Жица четкање
 DocType: Employee,Relation,Врска
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврди налози од клиенти.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
 DocType: Maintenance Schedule,Generate Schedule,Генерирање Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Сметка на главата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Ве молиме изберете Полнење Тип прв
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Најнови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знаци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Изберете го вашиот јазик
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаци
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Го оневозможува создавањето на време се најавува против Производство наредби. Работи не треба да се следи од цел производство
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Варијанта на
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Точка {0} мора да биде послужната ствар
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
-DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Ласерски дупчење
-DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза UOM
 DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата
 DocType: Employee,External Work History,Надворешни Историја работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Кружни Суд Грешка
-DocType: Communication,Closed,Затвори
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака.
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профил работа
 DocType: Newsletter,Newsletter,Билтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Нежности
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
 DocType: Journal Entry,Multi Currency,Мулти Валута
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Точка се ажурира
-DocType: Async Task,System Manager,Систем за менаџер
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
 DocType: Sales Invoice Item,Delivery Note,Потврда за испорака
-DocType: Dropbox Backup,Allow Dropbox Access,Им овозможи на Dropbox пристап
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Поставување Даноци
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Ве молиме изберете месец и година
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Компанија е-мејл
 DocType: GL Entry,Debit Amount in Account Currency,Дебитна Износ во валута на сметка
 DocType: Shipping Rule,Valid for Countries,Важат за земјите
-DocType: Workflow State,Refresh,Refresh
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Сите области поврзани со увоз како валута, девизен курс, вкупниот увоз, голема вкупно итн се достапни во Набавка прием, Добавувачот цитат, купување фактура, нарачка итн"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Вкупно Ред Смета
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стапка по која клиентите Валута се претвора во основната валута купувачи
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Достапен во бирото, испорака, Набавка фактура, производство цел, нарачка, купување прием, Продај фактура, Продај Побарувања, Акции влез, timesheet"
 DocType: Item Tax,Tax Rate,Даночна стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Одберете ја изборната ставка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Точка: {0} успеа според групата, не може да се помири со користење \ берза помирување, наместо користење берза Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купување Потврда мора да се поднесе
-DocType: Stock UOM Replace Utility,Current Stock UOM,Моменталната залиха UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Вашиот е-мејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ве молиме погледнете приврзаност
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Вода авион сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Поставување веќе е завршено !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Поставување веќе е завршено !!
 ,Finished Goods,Готови производи
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Прегледано од страна на
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Ве молиме да не се создаде сметки за клиенти и добавувачи. Тие се директно создадена од мајстори на клиент / снабдувач.
 DocType: Currency Exchange,Currency Exchange,Размена на валута
 DocType: Purchase Invoice Item,Item Name,Точка Име
+DocType: Authorization Rule,Approving User  (above authorized value),Одобрување на пристап (над овластени вредност)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Кредитна биланс
 DocType: Employee,Widowed,Вдовци
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Предмети да се бара кои се &quot;Од берза&quot;, со оглед на сите магацини врз основа на проектираните Количина и минимум цел количество: Контакт лице"
@@ -378,22 +346,21 @@
 ,Purchase Register,Купување Регистрирај се
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
 DocType: Workstation,Consumable Cost,Потрошни Цена
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинска
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинска
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина за губење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Цевка капки
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 DocType: Employee,Single,Еден
 DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџетот не може да се постави на трошоците центар група
 DocType: Account,Cost of Goods Sold,Трошоците на продадени производи
 DocType: Purchase Invoice,Yearly,Годишно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Ве молиме внесете цена центар
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ве молиме внесете цена центар
 DocType: Journal Entry Account,Sales Order,Продај Побарувања
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Ср. Продажниот курс
 DocType: Purchase Order,Start date of current order's period,Датум на почеток на периодот тековниот ред е
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Количина не може да биде дел во ред {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Количина не може да биде дел во ред {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
 DocType: Delivery Note,% Installed,% Инсталирана
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ве молиме внесете го името на компанијата прв
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Е група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматски го менува Сериски броеви врз основа на правилото FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете Добавувачот број на фактурата Единственост
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термообликување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Да Случај бр &#39; не може да биде помал од &quot;Од Случај бр &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Непрофитна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Непрофитна
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не е стартуван
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Стариот Родител
@@ -415,51 +380,46 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Одмор господар.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Школка во калапи
 DocType: Material Request Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ве молиме внесете Точка законик.
 DocType: BOM,Costing,Чини
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е обележано, износот на данокот што ќе се смета како веќе се вклучени во Print Оцени / Печатење Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Вкупно Количина
 DocType: Employee,Health Concerns,Здравствени проблеми
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Неплатени
 DocType: Packing Slip,From Package No.,Од Пакет број
-DocType: Item Attribute,To Range,Да се движи
+DocType: Item Attribute,To Range,Да се движи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Хартии од вредност и депозити
 DocType: Features Setup,Imports,Увозот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепило сврзување
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Вкупно лисја распределени е задолжително
 DocType: Job Opening,Description of a Job Opening,Опис на работно место
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Во очекување на активности за денес
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Присуство евиденција.
 DocType: Bank Reconciliation,Journal Entries,Весник записи
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
-DocType: System Settings,Loading...,Се вчитува ...
-DocType: DocField,Password,Лозинка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Сплотена навредување моделирање
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
 DocType: Customer,Buyer of Goods and Services.,Купувач на стоки и услуги.
 DocType: Journal Entry,Accounts Payable,Сметки се плаќаат
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додади претплатници
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Не постои
 DocType: Pricing Rule,Valid Upto,Важи до
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Директните приходи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административен службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административен службеник
 DocType: Payment Tool,Received Or Paid,Доби Или Платиле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Ве молиме изберете ја компанијата
 DocType: Stock Entry,Difference Account,Разликата профил
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Козметика
-DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
-DocType: Communication,Subject,Предмет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 ,Serial No Warranty Expiry,Сериски Нема гаранција Важи
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Точка
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управување Склучување
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Нов UOM не смее да биде од типот цел број
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управување Склучување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебел и тела
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Стапка по која Ценовник валута е претворена во основна валута компанијата
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
@@ -480,29 +439,29 @@
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Точка {0} не е купување Точка
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} не е валиден e-mail адреса во &quot;Известување \ Email адреса&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Вкупно регистрации оваа година:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Вкупно регистрации оваа година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не можат да избришат сериски Не {0}, како што се користи во акции трансакции"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затворање (ЦР)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Затворање (ЦР)
 DocType: Serial No,Warranty Period (Days),Гарантниот период (денови)
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 ,Pending Qty,Во очекување на Количина
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорирај
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},СМС испратен до следните броеви: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
 DocType: Pricing Rule,Valid From,Важи од
 DocType: Sales Invoice,Total Commission,Вкупно комисија
 DocType: Pricing Rule,Sales Partner,Продажбата партнер
 DocType: Buying Settings,Purchase Receipt Required,Купување Прием Потребно
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Дистрибуција ** ви помага да се дистрибуира вашиот буџет низ месеци ако имате сезоната во вашиот бизнис. Да се дистрибуира буџет со користење на овој дистрибуција, користете ја оваа ** Месечен Дистрибуција ** ** во центар на трошок на **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Месечен Дистрибуција ** ви помага да се дистрибуира вашиот буџет низ месеци ако имате сезоната во вашиот бизнис. Да се дистрибуира буџет со користење на овој дистрибуција, користете ја оваа ** Месечен Дистрибуција ** ** во центар на трошок на **"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Водач Id
 DocType: C-Form Invoice Detail,Grand Total,Големиот Вкупно
-DocType: About Us Settings,Website Manager,Веб-страница менаџер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Почеток Датумот не треба да биде поголема од фискалната година Крај Датум
 DocType: Warranty Claim,Resolution,Резолуција
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Испорачани: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Платежна и испорака Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Претходната
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажбата Враќање
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изберете Продај Нарачка од која што сакате да се создаде производство наредби.
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Компоненти плата.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База на податоци на потенцијални клиенти.
+DocType: Authorization Rule,Customer or Item,Клиент или Точка
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Клиент база на податоци.
 DocType: Quotation,Quotation To,Котација на
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Распределени износ не може да биде негативен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Тркалаат
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Распределени износ не може да биде негативен
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
-DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Добавувачот на купувачи
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производство цел е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Пишување предлози
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Пишување предлози
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Постои уште еден продажбата на лице {0} со истиот Вработен проект
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Негативна состојба Грешка ({6}) за ставката {0} во складиште {1} на {2} {3} во {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година компанијата
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Чини стандардниот курс
 DocType: Maintenance Schedule,Maintenance Schedule,Распоред за одржување
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Потоа цени Правила се филтрирани врз основа на клиент, група на потрошувачи, територија, Добавувачот, Набавувачот Тип на кампањата, продажба партнер итн"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Ве молиме инсталирајте Dropbox Пајтон модул
 DocType: Employee,Passport Number,Број на пасош
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менаџер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Од Набавка Потврда
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менаџер
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Од Набавка Потврда
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Врз основа на&quot; и &quot;група Со&quot; не може да биде ист
 DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Да
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Ве молиме внесете e-mail адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крајот цевка формирање
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претворат во група
 DocType: Activity Cost,Activity Type,Тип на активност
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Фиксни дена
 DocType: Sales Invoice,Packing List,Листа на пакување
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Купување на налози со оглед на добавувачите.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Објавување
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Објавување
 DocType: Activity Cost,Projects User,Проекти пристап
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Консумира
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} не се најде во Фактура Детали маса
 DocType: Company,Round Off Cost Center,Заокружување на цена центар
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Одржување Посетете {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 DocType: Material Request,Material Transfer,Материјал трансфер
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Отворање (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Праќање пораки во временската ознака мора да биде по {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Подесувања
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Слета Цена даноци и такси
 DocType: Production Order Operation,Actual Start Time,Старт на проектот Време
 DocType: BOM Operation,Operation Time,Операција Време
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Повеќе
 DocType: Pricing Rule,Sales Manager,Менаџер за продажба
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименувај
 DocType: Journal Entry,Write Off Amount,Отпише Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Виткање
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Овозможи пристап
 DocType: Journal Entry,Bill No,Бил Не
 DocType: Purchase Invoice,Quarterly,Квартален
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ве молиме внесете детали ставка
 DocType: Purchase Receipt,Other Details,Други детали
 DocType: Account,Accounts,Сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Директно сечење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Да ги пратите ставка во продажба и купување на документи врз основа на нивните сериски бр. Ова е, исто така, може да се користи за следење гаранција детали за производот."
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбиени Магацински е задолжително против regected точка
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 DocType: Employee,Provide email id registered in company,Обезбеди мејл ID регистрирани во компанијата
 DocType: Hub Settings,Seller City,Продавачот на градот
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда писмо Рок
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Тип на дрвото
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Кол и Магацински
 DocType: Sales Invoice,Commission Rate (%),Комисијата стапка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против ваучер типот мора да биде еден од Продај Побарувања, Продај фактура или весник Влегување"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Не може да се најде на девизниот курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Воздухопловна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добредојдовте
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Воздухопловна
 DocType: Journal Entry,Credit Card Entry,Кредитна картичка за влез
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Задача Предмет
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Примената стока од добавувачите.
-DocType: Communication,Open,Отворен
 DocType: Lead,Campaign Name,Име на кампања
 ,Reserved,Задржани
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} не е парк Точка
 DocType: Mode of Payment Account,Default Account,Стандардно профил
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Водач мора да се постави ако можност е направена од олово
-DocType: Contact Us Settings,Address Title,Наслов адреса
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Production Order Operation,Planned End Time,Планирани Крај
 ,Sales Person Target Variance Item Group-Wise,Продажбата на лице Целна група Варијанса точка-wise
-DocType: Dropbox Backup,Daily,Секојдневно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Сметка со постоечките трансакцијата не може да се конвертира Леџер
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Сметка со постоечките трансакцијата не може да се конвертира Леџер
 DocType: Delivery Note,Customer's Purchase Order No,Клиентите нарачка Не
 DocType: Employee,Cell Number,Мобилен Број
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Авто Материјал Барања Генерирано
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Си ја заборавивте
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечен извештај плата.
 DocType: Item Group,Website Specifications,Веб-страница Спецификации
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Нова сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Сметководствени записи може да се направи против лист јазли. Записи од групите не се дозволени.
-DocType: ToDo,High,Висок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
-DocType: User,Male,Машко
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Купување Потврда број потребен за Точка {0}
 DocType: Item Attribute Value,Item Attribute Value,Точка вредноста на атрибутот
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Продажбата на кампањи.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Лични
 DocType: Expense Claim Detail,Expense Claim Type,Сметка побарувањето Вид
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Стандардните поставувања за Кошничка
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Весник Влегување {0} е поврзана против Ред {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Биотехнологијата
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Весник Влегување {0} е поврзана против Ред {1}, проверете дали тоа треба да се повлече како напредок во оваа фактура."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Биотехнологијата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Канцеларија Одржување трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Account,Liability,Одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Process Payroll,Send Email,Испрати E-mail
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Ажурирај акции &#39;не може да се провери, бидејќи предмети кои не се доставуваат преку {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Бр
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Бр
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Фактури
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мои Фактури
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не се пронајдени вработен
 DocType: Purchase Order,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да им овозможи на &quot;Точка на продажба&quot; карактеристики
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
-DocType: Comment,Reference Name,Референца
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: Sales Invoice Item,Target Warehouse,Целна Магацински
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Се очекува испорака датум не може да биде пред Продај Побарувања Датум
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Сите Точка групи
 DocType: Process Payroll,Activity Log,Активност Влез
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
 DocType: Production Order,Item To Manufacture,Ставка за производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постојана кастинг мувла
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус е {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Нарачка на плаќање
 DocType: Sales Order Item,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање Поради Датум
 DocType: Newsletter,Newsletter Manager,Билтен менаџер
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отворање&#39;
 DocType: Notification Control,Delivery Note Message,Испратница порака
 DocType: Expense Claim,Expenses,Трошоци
 DocType: Item Variant Attribute,Item Variant Attribute,Ставка Варијанта Атрибут
 ,Purchase Receipt Trends,Купување Потврда трендови
 DocType: Appraisal,Select template from which you want to get the Goals,Изберете дефиниција од каде што сакате да го добиете цели
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Истражување и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истражување и развој
 ,Amount to Bill,Износот на Бил
 DocType: Company,Registration Details,Детали за регистрација
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Треба да се испрати до {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Детали за акцијата
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Проектот вредност
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Продажба
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не може да го носи напред {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
 DocType: Account,Balance must be,Рамнотежа мора да биде
 DocType: Hub Settings,Publish Pricing,Објавување на цени
 DocType: Notification Control,Expense Claim Rejected Message,Сметка Тврдат Отфрлени порака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Заковаме
 ,Available Qty,На располагање Количина
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходниот ред Вкупно
 DocType: Salary Slip,Working Days,Работни дена
 DocType: Serial No,Incoming Rate,Дојдовни стапка
 DocType: Packing Slip,Gross Weight,Бруто тежина на апаратот
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Вклучи празници во Вкупен број. на работните денови
 DocType: Job Applicant,Hold,Држете
 DocType: Employee,Date of Joining,Датум на приклучување
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Види претплатници
 DocType: Purchase Invoice Item,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Пескарење
 DocType: Employee,Ms,Г-ѓа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валута на девизниот курс господар.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Бум {0} мора да биде активен
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Бум {0} мора да биде активен
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
 DocType: Salary Slip,Leave Encashment Amount,Остави инкасо Износ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Сериски № {0} не припаѓаат на Точка {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Потребни Количина
 DocType: Bank Reconciliation,Total Amount,Вкупниот износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издаваштво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Производство Нарачка
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Цена за продажба Листа
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Го објави за да ги синхронизирате предмети
-DocType: GL Entry,Account Currency,Валута сметка
+DocType: Bank Reconciliation,Account Currency,Валута сметка
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Ве молиме спомнете заокружуваат сметка во компанијата
 DocType: Purchase Receipt,Range,Опсег
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Features Setup,Item Barcode,Точка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Address,Shop,Продавница
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Стандардно банка / готовинска сметка ќе се ажурира автоматски во POS Фактура кога е избрана оваа опција.
 DocType: Employee,Permanent Address Is,Постојана адреса е
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операцијата заврши за колку готовите производи?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Додаток за надминување {0} преминал за Точка {1}.
 DocType: Employee,Exit Interview Details,Излез Интервју Детали за
 DocType: Item,Is Purchase Item,Е Набавка Точка
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Нарачка Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Индиректни доход
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Сет износот на плаќање = преостанатиот износ за наплата
-DocType: Contact Us Settings,Address Line 1,Адреса Линија 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијанса
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име на компанијата
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијанса
+,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Одберете ја изборната ставка за трансфер
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Преглед на листа на сите помош видеа
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изберете Account главата на банката во која е депониран чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Им овозможи на корисникот да ги уредувате Ценовник стапка во трансакции
 DocType: Pricing Rule,Max Qty,Макс Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хемиски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хемиски
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
 DocType: Process Payroll,Select Payroll Year and Month,Изберете Даноци година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Оди до соодветната група (обично Примена на фондови&gt; Тековни средства&gt; банкарски сметки и да се создаде нова сметка (со кликање на Додади детето) од типот &quot;банка&quot;
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
-DocType: Comment,Unsubscribed,Отпишавте
 DocType: Opportunity,Walk In,Прошетка во
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дрвото на finanial трошочни центри.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Трансферираните
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бела
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бела
 DocType: SMS Center,All Lead (Open),Сите Олово (Отвори)
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Закачите вашата слика
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Направете
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Закачите вашата слика
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Направете
 DocType: Journal Entry,Total Amount in Words,Вкупниот износ со зборови
-DocType: Workflow State,Stop,Стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Имаше грешка. Една можна причина може да биде дека не сте го зачувале форма. Ве молиме контактирајте support@erpnext.com ако проблемот продолжи.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Моја кошничка
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Цел типот мора да биде еден од {0}
 DocType: Lead,Next Contact Date,Следна Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отворање Количина
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опции на акции
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опции на акции
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Отсуство на апликација
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Остави алатката Распределба
 DocType: Leave Block List,Leave Block List Dates,Остави Забрани Листа Датуми
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако месечен Буџет надминати (за сметка на сметка)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Кастри
 DocType: Workstation,Net Hour Rate,Нето час стапка
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слета купување цена Потврда
 DocType: Company,Default Terms,Стандардно Услови
 DocType: Packing Slip Item,Packing Slip Item,Пакување фиш Точка
 DocType: POS Profile,Cash/Bank Account,Пари / банка сметка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Поднесување
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Купување Попусти
 DocType: Workstation,Wages,Платите
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја &quot;статус&quot; и заштеди
 DocType: Serial No,Creation Document No,Документот за создавање Не
 DocType: Issue,Issue,Прашање
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за точка варијанти. на пример, големината, бојата и др"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Сметка не се поклопува со компанијата
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за точка варијанти. на пример, големината, бојата и др"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Магацински
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
 DocType: BOM Operation,Operation,Работа
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Превозот држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Трошоци за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандардна Купување
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандардна Купување
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандардно Продажба Цена центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Акции правење записи
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
 DocType: Item,Default Supplier,Стандардно Добавувачот
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Во текот на производство Додаток Процент
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,ажурираат преку Време на дневници
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просечна возраст
 DocType: Opportunity,Your sales person who will contact the customer in future,Продажбата на лице кои ќе контактираат со клиентите во иднина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Листа на неколку од вашите добавувачи. Тие можат да бидат организации или поединци.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Листа на неколку од вашите добавувачи. Тие можат да бидат организации или поединци.
 DocType: Company,Default Currency,Стандардна валута
 DocType: Contact,Enter designation of this Contact,Внесете ознака на овој Контакт
-DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Од вработените
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
 DocType: Journal Entry,Make Difference Entry,Направи разликата Влегување
 DocType: Upload Attendance,Attendance From Date,Публика од денот
 DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Превоз
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Превоз
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и годината:
 DocType: Email Digest,Annual Expense,Годишната сметка
 DocType: SMS Center,Total Characters,Вкупно Ликови
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Детална C-Образец Фактура
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаќање помирување Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Учество%
 DocType: Item,website page link,веб-страница линк страница
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ајде да се подготви системот за првата употреба.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Броеви за регистрација на фирма за вашата препорака. Даночни броеви итн
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изберете Време на дневници и поднесете да се создаде нов Продај фактура.
@@ -968,7 +896,7 @@
 DocType: Salary Slip,Deductions,Одбивања
 DocType: Purchase Invoice,Start date of current invoice's period,Датум на почеток на периодот тековната сметка е
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Овој пат се Влез Batch се фактурирани.
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Да се создадат услови
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Да се создадат услови
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
 DocType: Supplier,Communications,Комуникации
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Капацитет Грешка планирање
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продај фактура напредување
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништо да побара
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,За управување со
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,За управување со
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Типови на активности за време на работниците
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Инвестиции кастинг
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Или износот дебитна или кредитна е потребно за {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blue
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blue
 DocType: Purchase Invoice,Is Return,Е враќање
 DocType: Price List Country,Price List Country,Ценовник Земја
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Понатаму јазли може да се создаде само под тип јазли &quot;група&quot;
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Профил {0} веќе создадена за корисникот: {1} и компанија {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM конверзија Фактор
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламинат производство објект
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Снабдувач база на податоци.
 DocType: Account,Balance Sheet,Биланс на состојба
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Рашири формирање
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Продажбата на лицето ќе добиете потсетување на овој датум да се јавите на клиент
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Данок и други намалувања на платите.
 DocType: Lead,Lead,Водач
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
 ,Purchase Order Items To Be Billed,"Нарачката елементи, за да бидат фактурирани"
 DocType: Purchase Invoice Item,Net Rate,Нето стапката
 DocType: Purchase Invoice Item,Purchase Invoice Item,Купување на фактура Точка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Акции Леџер записи и GL записи се објавува за избраниот Набавка Разписки
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Точка 1
 DocType: Holiday,Holiday,Одмор
-DocType: Event,Saturday,Сабота
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставете го празно ако се земе предвид за сите гранки
 ,Daily Time Log Summary,Дневен Време Пријавете се Резиме
-DocType: DocField,Label,Етикета
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусогласеност за исплата
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Global Defaults,Disable Rounded Total,Оневозможи заоблени Вкупно
 DocType: Lead,Call,Повик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Поставување на вработените
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Мрежа &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Ве молиме изберете префикс прв
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Истражување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Истражување
 DocType: Maintenance Visit Purpose,Work Done,Работа
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Contact,User ID,ID на корисникот
-DocType: Communication,Sent,Испрати
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Види Леџер
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
-DocType: Communication,Delivery Status,Статус на Испорака
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 DocType: Production Order,Manufacture against Sales Order,Производство против Продај Побарувања
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остатокот од светот
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остатокот од светот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
 ,Budget Variance Report,Буџетот Варијанса Злоупотреба
 DocType: Salary Slip,Gross Pay,Бруто плата
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Опис
 DocType: Payment Tool,Payment Mode,Начин на плаќање
 DocType: Purchase Invoice,Is Recurring,Е Повторувачки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Директен метални ласерски синтерување
 DocType: Purchase Order,Supplied Items,Испорачани делови
 DocType: Production Order,Qty To Manufacture,Количина на производство
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржување на иста стапка во текот на купувањето циклус
 DocType: Opportunity Item,Opportunity Item,Можност Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Привремено отворање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Вработен Остави Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
 DocType: Address,Address Type,Тип адреса
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Број вработен
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Нема случај (и) веќе е во употреба. Обидете се од случај не {0}
 ,Invoiced Amount (Exculsive Tax),Фактурираниот износ (Exculsive на доход)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Точка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Сметка главата {0} создаде
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелени
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелени
 DocType: Item,Auto re-order,Автоматско повторно цел
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Вкупно Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Вкупно Постигнати
 DocType: Employee,Place of Issue,Место на издавање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Договор
-DocType: Report,Disabled,Со посебни потреби
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Договор
+DocType: Email Digest,Add Quote,Додади цитат
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Земјоделството
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Вашите производи или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
 DocType: Journal Entry Account,Purchase Order,Нарачката
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Потребно е име
 DocType: Purchase Invoice,Recurring Type,Повторувачки Тип
 DocType: Address,City/Town,Град / Место
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Точка {0} мора да биде под-договор Точка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитал опрема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Се очекува испорака датум е помал од планираниот почеток датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За Добавувачот
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Поставување тип на сметка помага во изборот на оваа сметка во трансакции.
 DocType: Purchase Invoice,Grand Total (Company Currency),Големиот Вкупно (Фирма валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Вкупниот појдовен
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Може да има само еден испорака Правило Состојба со 0 или празно вредност за &quot;да го вреднуваат&quot;
 DocType: Authorization Rule,Transaction,Трансакција
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Забелешка: Оваа цена центар е група. Не може да се направи на сметководствените ставки против групи.
-apps/frappe/frappe/config/desk.py +7,Tools,Алатки
 DocType: Item,Website Item Groups,Веб-страница Точка групи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производство цел број е задолжително за производство влез акции намена
 DocType: Purchase Invoice,Total (Company Currency),Вкупно (Фирма валута)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Весник Влегување
 DocType: Workstation,Workstation Name,Работна станица Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оцени вреднување потребни за Точка {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Оцени вреднување потребни за Точка {0}
 DocType: Quality Inspection Reading,Reading 8,Читање 8
 DocType: Sales Partner,Agent,Агент
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање пријави врз основа на&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Такси и надоместоци Пресметка
 DocType: BOM Operation,Workstation,Работна станица
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Хардвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Хардвер
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ве молиме изберете една компанија
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегија Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема податоци
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Цел
 DocType: Salary Slip,Earning,Заработуваат
 DocType: Payment Tool,Party Account Currency,Партија Валута профил
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Преклопување состојби помеѓу:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Вкупно цел вредност
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Храна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Стареењето опсег од 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Можете да направите најавите време само против поднесено цел производство
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтенот на контакти, води."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на завршната сметка мора да биде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир на бодови за сите цели треба да бидат 100. Тоа е {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операции не може да се остави празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операции не може да се остави празно.
 ,Delivered Items To Be Billed,"Дадени елементи, за да бидат фактурирани"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
-DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Просечната попуст
-DocType: Letter Head,Is Default,Е стандардно
 DocType: Address,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Сметководство
 DocType: Features Setup,Features Setup,Карактеристики подесување
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Види понудата писмо
-DocType: Communication,Communication,Комуникација
 DocType: Item,Is Service Item,Е послужната ствар
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
 DocType: Activity Cost,Projects,Проекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Ве молиме изберете фискалната година
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Одржување на берза
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставете го празно ако се земе предвид за сите ознаки
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Точка {0} не е парк Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1214,31 +1124,28 @@
 DocType: GL Entry,GL Entry,GL Влегување
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 ,Batch-Wise Balance History,Според групата биланс Историја
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Да се направи листа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативни Кол не е дозволено
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Да се направи листа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Чирак
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативни Кол не е дозволено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Данок детали табелата се донесени од точка господар како стринг и се чуваат во оваа област. Се користи за даноци и такси
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако на сметката е замрзната, записи им е дозволено да ограничено корисници."
 DocType: Email Digest,Bank Balance,Банката биланс
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Нема активни плата структура најде за вработен {0} и месецот
 DocType: Job Opening,"Job profile, qualifications required etc.","Работа профил, потребните квалификации итн"
 DocType: Journal Entry Account,Account Balance,Баланс на сметка
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Правило данок за трансакции.
 DocType: Rename Tool,Type of document to rename.,Вид на документ да се преименува.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ние купуваме Оваа содржина
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Ние купуваме Оваа содржина
 DocType: Address,Billing,Платежна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Не Испратени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Експлозивни формирање
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Вкупно даноци и такси (Фирма валута)
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Треба да се испрати до {0} примачи
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Вкупно Дополнителни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Под собранија
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Под собранија
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Supplier,Stock Manager,Акции менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитичарот
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: распределени износ {1} мора да е помала или еднаква на JV износ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да им овозможи на &quot;Точка на продажба&quot; поглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаќање не може да се направи за празни кошничка
 DocType: Item,Sales Details,Детали за продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Прикачување
 DocType: Opportunity,With Items,Со предмети
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Во Количина
 DocType: Notification Control,Expense Claim Rejected,Сметка Тврдат Одбиени
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
 DocType: Item Attribute,Item Attribute,Точка Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Владата
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Точка Варијанти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Владата
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Точка Варијанти
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Вкупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Вкупно ({0})
 DocType: Cost Center,Parent Cost Center,Родител цена центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не се пронајдени во табелата за платен записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансиска година Почеток Датум
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не се пронајдени во табелата за платен записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансиска година Почеток Датум
 DocType: Employee External Work History,Total Experience,Вкупно Искуство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Пакување фиш (и) откажани
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Пакување фиш (и) откажани
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Товар и товар пријави
 DocType: Material Request Item,Sales Order No,Продај Побарувања Не
 DocType: Item Group,Item Group Name,Точка име на група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Земени
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Земени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Пренос на материјали за изработка
 DocType: Pricing Rule,For Price List,За Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Извршниот Барај
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Купување стапка за ставка: {0} не е пронајден, кои се потребни да се резервира влез сметководството (сметка). Ве молиме спомнете ставка цена од купување на ценовникот."
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнителен попуст Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Грешка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Грешка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ве молиме да се создаде нова сметка од сметковниот план.
 DocType: Maintenance Visit,Maintenance Visit,Одржување Посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиентите&gt; група на потрошувачи&gt; Територија
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Достапни Серија Количина на складиште
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Вклучи Серија Детална
-DocType: Workflow State,Tasks,Задачи
 DocType: Landed Cost Voucher,Landed Cost Help,Слета Цена Помош
-DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Забрани празници на важни датуми.
 ,Accounts Receivable Summary,Побарувања Резиме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Заминува за видот {0} веќе наменети за вработените {1} за период {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
 DocType: UOM,UOM Name,UOM Име
-DocType: Top Bar Item,Target,Целни
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Придонес Износ
 DocType: Sales Invoice,Shipping Address,Адреса за Испорака
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Оваа алатка ви помага да се ажурира или поправат количина и вреднување на акциите во системот. Тоа обично се користи за да ги синхронизирате вредности на системот и она што навистина постои во вашиот магацини.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Во Зборови ќе бидат видливи откако ќе се спаси за испорака.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Бренд господар.
-DocType: ToDo,Due Date,Поради Датум
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Бренд господар.
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Кутија
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организацијата
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Кутија
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организацијата
 DocType: Monthly Distribution,Monthly Distribution,Месечен Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство план Продај Побарувања
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Сметководство за влез на {0} може да се направи само во валута: {1}
 DocType: Pricing Rule,Pricing Rule,Цените Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал Барање за нарачка
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: Назад Точка {1} не постои во {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банкарски сметки
 ,Bank Reconciliation Statement,Банка помирување изјава
 DocType: Address,Lead Name,Водач Име
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Отворање берза Биланс
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отворање берза Биланс
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора да се појави само еднаш
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Кол е задолжително
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не се гледа во банка
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Износи не се гледа во банка
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Барања за сметка на компанијата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центрифугални кастинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнетно поле со помош на завршна обработка
 DocType: Company,Default Holiday List,Стандардно летни Листа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Акции Обврски
 DocType: Purchase Receipt,Supplier Warehouse,Добавувачот Магацински
 DocType: Opportunity,Contact Mobile No,Контакт Мобилни Не
 DocType: Production Planning Tool,Select Sales Orders,Изберете Продај Нарачка
 ,Material Requests for which Supplier Quotations are not created,Материјал Барања за кои не се создадени Добавувачот Цитати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да ги пратите предмети со помош на баркод. Вие ќе бидете во можност да влезат предмети во Испратница и Продај фактура со скенирање на баркод на ставка.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи како Дадени
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Означи како Дадени
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направете цитат
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
 DocType: SMS Center,Receiver List,Листа на примачот
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Види
 DocType: Salary Structure Deduction,Salary Structure Deduction,Структура плата Одбивање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективен ласерски синтерување
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз успешно!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (во денови)
 DocType: Quotation Item,Quotation Item,Цитат Точка
 DocType: Account,Account Name,Име на сметка
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Од датум не може да биде поголема од: Да најдам
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} количина {1} не може да биде дел
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Добавувачот Тип господар.
 DocType: Purchase Order Item,Supplier Part Number,Добавувачот Дел број
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Додавање
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Стапка на конверзија не може да биде 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{1} {0} е откажана или запрена
 DocType: Accounts Settings,Credit Controller,Кредитна контролор
 DocType: Delivery Note,Vehicle Dispatch Date,Возило диспечерски Датум
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Купување Потврда {0} не е поднесен
 DocType: Company,Default Payable Account,Стандардно се плаќаат профил
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подесувања за онлајн шопинг количка како и со правилата за испорака, ценовник, итн"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Целосно подесување
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Опишан
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Количина задржани
 DocType: Party Account,Party Account,Партијата на профилот
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Човечки ресурси
 DocType: Lead,Upper Income,Горниот дел од приходите
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна во компанијата Валута
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои прашања
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Стандардни вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ред {0}: износот за исплата не може да биде негативен
 DocType: Expense Claim,Total Amount Reimbursed,Вкупниот износ Надоместени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Прес фитинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 DocType: Payment Reconciliation,Payments,Плаќања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Жешка isostatic притискање
-DocType: ToDo,Medium,Медиум
 DocType: Budget Detail,Budget Allocated,Буџетот
 DocType: Journal Entry,Entry Type,Тип на влез
 ,Customer Credit Balance,Клиент кредитна биланс
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ажурирање на датуми банка плаќање со списанија.
 DocType: Quotation,Term Details,Рок Детали за
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирање на капацитет за (во денови)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
 DocType: Warranty Claim,Warranty Claim,Гаранција побарување
 ,Lead Details,Водач Детали за
-DocType: Authorization Rule,Approving User,Одобрување на пристап
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Фалсификување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлата
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
 DocType: Pricing Rule,Applicable For,Применливи за
 DocType: Bank Reconciliation,From Date,Од датум
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Продажба Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлајн аукции
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлајн аукции
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ве молиме напишете и некоја Кол или вреднување стапка или двете
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија, месец и фискалната година е задолжително"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Барање користат да се направи овој парк Влегување
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Една единица на некој објект.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Време Вклучи Серија {0} мора да биде предаден &quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направете влез сметководството за секој берза движење
 DocType: Leave Allocation,Total Leaves Allocated,Вкупно Лисја Распределени
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Магацински бара во ред Нема {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Ве молиме внесете валидна Финансиска година на отпочнување и завршување
 DocType: Employee,Date Of Retirement,Датум на заминување во пензија
 DocType: Upload Attendance,Get Template,Земете Шаблон
 DocType: Address,Postal,Поштенските
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударски
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Кастинг смола
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А група на клиентите постои со истото име, ве молиме промена на името на клиентите или преименување на група на купувачи"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Ве молиме изберете {0} прво.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},текст {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},текст {0}
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Потврда
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Производи
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Производи
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партијата Вид и Партијата е потребно за побарувања / Платив сметка {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако оваа точка има варијанти, тогаш тоа не може да биде избран во продажбата на налози итн"
 DocType: Lead,Next Contact By,Следна Контакт Со
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацински {0} не може да биде избришан како што постои количина за ставката {1}
 DocType: Quotation,Order Type,Цел Тип
 DocType: Purchase Invoice,Notification Email Address,Известување за е-мејл адреса
 DocType: Payment Tool,Find Invoices to Match,Најди ги Фактури на појавување
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","на пример, &quot;XYZ Народната банка&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","на пример, &quot;XYZ Народната банка&quot;"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Е овој данок се вклучени во основната стапка?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Вкупно Целна
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Вкупно Целна
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Кошничка е овозможено
 DocType: Job Applicant,Applicant for a Job,Подносителот на барањето за работа
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Нема производство наредби создаде
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Плата се лизга на вработен {0} веќе создадена за овој месец
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Плата се лизга на вработен {0} веќе создадена за овој месец
 DocType: Stock Reconciliation,Reconciliation JSON,Помирување JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Sales Invoice Item,Batch No,Серија Не
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Главните
-DocType: DocPerm,Delete,Избриши
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нов {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Престана да не може да се откаже. Отпушвам да ја откажете.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Item,Variants,Варијанти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
 DocType: Sales Team,Contribution to Net Total,Придонес на нето Вкупно
 DocType: Sales Invoice Item,Customer's Item Code,Купувачи Точка законик
 DocType: Stock Reconciliation,Stock Reconciliation,Акции помирување
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Подносителот на барањето за работа.
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
-DocType: Country,Country,Земја
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-DocType: Communication,Received,Доби
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},СТРОГО серија № влезе за точка {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за испорака Правило
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Точка не е дозволено да има цел производство.
-DocType: DocField,Attach Image,Прикачи слика
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето-тежината на овој пакет. (Се пресметува автоматски како збир на нето-тежината на предмети)
-DocType: Stock Reconciliation Item,Leave blank if no change,Оставете го празно ако нема промена
 DocType: Sales Order,To Deliver and Bill,Да дава и Бил
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Време на дневници за производство.
 DocType: Item,Apply Warehouse-wise Reorder Level,Применуваат Магацински-мудар Пренареждане Ниво
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Време Пријавете се за задачи.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Плаќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плаќање
 DocType: Production Order Operation,Actual Time and Cost,Крај на време и трошоци
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материјал Барање за максимум {0} може да се направи за ставката {1} против Продај Побарувања {2}
 DocType: Employee,Salutation,Титула
-DocType: Communication,Rejected,Одбиени
 DocType: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Бовча предмети на времето на продажба.
 DocType: Sales Order Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
 DocType: Quality Inspection Reading,Reading 10,Читањето 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Листа вашите производи или услуги да ја купите или да го продаде. Бидете сигурни да се провери точка група, Одделение за премер и други својства кога ќе почнете."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Листа вашите производи или услуги да ја купите или да го продаде. Бидете сигурни да се провери точка група, Одделение за премер и други својства кога ќе почнете."
 DocType: Hub Settings,Hub Node,Центар Јазол
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Внесовте дупликат предмети. Ве молиме да се поправат и обидете се повторно.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Вредност {0} {1} Атрибут не постои во листата на валидни Точка атрибут вредности
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Соработник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Соработник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Точка {0} не е серијали Точка
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истечен
 DocType: Packing Slip,To Package No.,Пакет бр
-DocType: DocType,System,Систем
 DocType: Warranty Claim,Issue Date,Датум на издавање
 DocType: Activity Cost,Activity Cost,Цена активност
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Конзумира Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Покажува дека пакетот е дел од овој испорака (Само Предлог)
 DocType: Payment Tool,Make Payment Entry,Направете плаќање Влегување
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Кол за ставката {0} мора да биде помала од {1}
 ,Sales Invoice Trends,Продажбата Трендови Фактура
 DocType: Leave Application,Apply / Approve Leaves,Спроведување / одобрија Лисја
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,За
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се однесува ред само ако типот на обвинението е &quot;На претходниот ред Износ&quot; или &quot;претходниот ред Вкупно &#39;
 DocType: Sales Order Item,Delivery Warehouse,Испорака Магацински
 DocType: Stock Settings,Allowance Percent,Додаток Процент
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажба треба да се провери, ако е применливо за е избран како {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Добавувачот Цитат Точка
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Направете плата структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сечење
 DocType: Item,Has Variants,Има варијанти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликнете на копчето &#39;Направете Продај фактура &quot;да се создаде нов Продај фактура.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Пакување и означување
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ве молиме наведете стандардна валута во компанијата Мајсторот и Глобал Стандардни
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox пристап Secret
 DocType: Purchase Invoice,Recurring Invoice,Повторувачки Фактура
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управување со проекти
 DocType: Supplier,Supplier of Goods or Services.,Снабдувач на стоки или услуги.
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнати
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнати
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Подрачје / клиентите
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,на пример 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: распределени износ {1} мора да биде помалку од или еднакво на фактура преостанатиот износ за наплата {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,на пример 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: распределени износ {1} мора да биде помалку од или еднакво на фактура преостанатиот износ за наплата {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Во Зборови ќе бидат видливи кога еднаш ќе ве спаси Фактура на продажба.
 DocType: Item,Is Sales Item,Е продажба Точка
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Точка Група на дрвото
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Точка {0} не е подесување за сериски бр. Проверете Точка господар
 DocType: Maintenance Visit,Maintenance Time,Одржување Време
 ,Amount to Deliver,Износ за да овозможи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Производ или услуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Имаше грешки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Навлегувањето
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Производ или услуга
 DocType: Naming Series,Current Value,Сегашна вредност
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создаден
 DocType: Delivery Note Item,Against Sales Order,Против Продај Побарувања
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
 DocType: Website Item Group,Website Item Group,Веб-страница Точка група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Давачки и даноци
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ве молиме внесете референтен датум
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ве молиме внесете референтен датум
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи плаќање не може да се филтрираат од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Табела за елемент, кој ќе биде прикажан на веб сајтот"
 DocType: Purchase Order Item Supplied,Supplied Qty,Опрема што се испорачува Количина
 DocType: Material Request Item,Material Request Item,Материјал Барање Точка
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дрвото на точка групи.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Дрвото на точка групи.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
 ,Item-wise Purchase History,Точка-мудар Набавка Историја
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвена
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Црвена
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ред # {0}: Операција {1} не е завршена за {2} Количина на готови производи во производството со цел # {3}. Ве молиме да се ажурира статусот работењето преку Време на дневници
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Промена UOM за ставка.
 DocType: Quality Inspection Reading,Acceptance Criteria,Прифаќање критериуми
 DocType: Item Attribute,Attribute Name,Атрибут Име
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},"Точка {0} мора да биде на продажба, односно послужната ствар во {1}"
 DocType: Item Group,Show In Website,Прикажи Во вебсајт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Група
 DocType: Task,Expected Time (in hours),Се очекува времето (во часови)
 ,Qty to Order,Количина да нарачате
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Да ги пратите на името на брендот во следниве документи испорака, можности, материјал Барање точка, нарачка, купување на ваучер, Набавувачот прием, цитатноста, Продај фактура, производ Бовча, Продај Побарувања, Сериски Не"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Јасно Табела
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Фактура бр
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од нарачка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Од нарачка
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
 DocType: Activity Cost,Costing Rate,Чини стапка
 ,Customer Addresses And Contacts,Адресите на клиентите и контакти
 DocType: Employee,Resignation Letter Date,Оставка писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не е поставена
-DocType: Communication,Date,Датум
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете приходи за корисници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Седнете тесни додека вашиот систем е да се биде поставување. Ова може да потрае неколку моменти.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Пар
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Пар
 DocType: Bank Reconciliation Detail,Against Account,Против профил
 DocType: Maintenance Schedule Detail,Actual Date,Крај Датум
 DocType: Item,Has Batch No,Има Batch Не
 DocType: Delivery Note,Excise Page Number,Акцизни Број на страница
 DocType: Employee,Personal Details,Лични податоци
 ,Maintenance Schedules,Распоред за одржување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Втиснување
 ,Quotation Trends,Трендови цитат
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Како што производството со цел да се направат по оваа точка, тој мора да биде точка на акциите."
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Состави
-DocType: Authorization Rule,Above Value,Пред вредност
 ,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Дадени
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Поставување на дојдовен сервер за работни места-мејл ID. (На пр jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Вкупно одобрени лисја {0} не може да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Journal Entry,Accounts Receivable,Побарувања
 ,Supplier-Wise Sales Analytics,Добавувачот-wise Продажбата анализи
 DocType: Address Template,This format is used if country specific format is not found,Овој формат се користи ако не се најде специфичен формат земја
-DocType: Custom Field,Custom,Прилагодено
 DocType: Production Order,Use Multi-Level BOM,Користете Мулти-ниво на бирото
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Шприц
 DocType: Bank Reconciliation,Include Reconciled Entries,Вклучи се помири записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дрвото на finanial сметки.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставете го празно ако се земе предвид за сите видови на вработените
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирање пријави Врз основа на
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"На сметка {0} мора да биде од типот &quot;основни средства&quot;, како точка {1} е предност Точка"
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
-apps/frappe/frappe/config/setup.py +130,Printing,Печатење
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,На ден (а) на која аплицирате за дозвола се на одмор. Вие не треба да се применуваат за одмор.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr не може да биде празно или простор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Вкупно Крај
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ве молиме да се постави Dropbox копчиња за пристап на вашиот сајт config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Ве молиме назначете фирма,"
 ,Customer Acquisition and Loyalty,Стекнување на клиентите и лојалност
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Складиште, каде што се одржување на залихи на одбиени предмети"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Вашата финансиска година завршува на
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Вашата финансиска година завршува на
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
-DocType: Authorization Rule,Approving Role,Одобрување Улогата
 ,BOM Search,Бум Барај
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затворање (отворање + одделение)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ве молиме наведете валута во компанијата
 DocType: Workstation,Wages per hour,Плата по час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Акции рамнотежа во Серија {0} ќе стане негативна {1} за Точка {2} На Магацински {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Прикажи / Сокриј функции како сериски броеви, ПОС итн"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следните Материјал Барања биле воспитани автоматски врз основа на нивото повторно цел елемент
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Датум дозвола не може да биде пред датумот проверка во ред {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Датум дозвола не може да биде пред датумот проверка во ред {0}
 DocType: Salary Slip,Deduction,Одбивање
 DocType: Address Template,Address Template,Адреса Шаблон
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Цитат
 DocType: Salary Slip,Total Deduction,Вкупно Одбивање
 DocType: Quotation,Maintenance User,Одржување пристап
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Цена освежено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Цена освежено
 DocType: Employee,Date of Birth,Датум на раѓање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Точка {0} веќе се вратени
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фискалната година ** претставува финансиска година. Сите сметководствени записи и други големи трансакции се следи против ** ** фискалната година.
 DocType: Opportunity,Customer / Lead Address,Клиент / Водечки адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Опис на работата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис на работата
 DocType: Purchase Order Item,Qty as per Stock UOM,Количина како на берза UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Ве молиме изберете една валидна CSV датотека со податоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Слој
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратете на продажба кампањи. Пратете води, цитати, Продај Побарувања итн од кампањи за да се измери враќање на инвестицијата."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ПА Количина
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Записи акции постојат против магацин {0}, па затоа не можете да се ре-додели или менување Магацински"
 DocType: Appraisal,Calculate Total Score,Пресмета вкупниот резултат
 DocType: Supplier Quotation,Manufacturing Manager,Производство менаџер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит за испорака во пакети.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Пратки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Натопи во калапи
-DocType: Purchase Order,To be delivered to customer,Да бидат доставени до клиентите
+apps/erpnext/erpnext/hooks.py +68,Shipments,Пратки
+DocType: Purchase Order Item,To be delivered to customer,Да бидат доставени до клиентите
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Вклучи Статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Сериски Не {0} не припаѓа на ниту еден Магацински
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Поставување на
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ред #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ред #
 DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута)
 DocType: Pricing Rule,Supplier,Добавувачот
 DocType: C-Form,Quarter,Четвртина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Останати трошоци
 DocType: Global Defaults,Default Company,Стандардно компанијата
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
 DocType: Employee,Bank Name,Име на банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Корисник {0} е исклучен
 DocType: Leave Application,Total Leave Days,Вкупно Остави дена
-DocType: Journal Entry Account,Credit in Account Currency,Кредит во валута на сметка
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забелешка: Е-пошта нема да биде испратена до корисниците со посебни потреби
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Currency Exchange,From Currency,Од валутен
-DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не се гледа на системот
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продај Побарувања потребни за Точка {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Износи не се гледа на системот
 DocType: Purchase Invoice Item,Rate (Company Currency),Стапка (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,"Други, пак,"
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде за појавување Точка. Ве молиме одберете некои други вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Даноци и такси
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","А производ или услуга, која е купен, кои се продаваат или се чуваат во парк."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете типот задолжен како &quot;На претходниот ред Износ&quot; или &quot;На претходниот ред Вкупно &#39;за првиот ред
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завршено
-DocType: Web Form,Select DocType,Изберете DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банкарство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ве молиме кликнете на &quot;Генерирање Распоред&quot; да се добие распоред
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нова цена центар
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Нова цена центар
 DocType: Bin,Ordered Quantity,Нареди Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","на пример, &quot;Изградба на алатки за градители&quot;"
 DocType: Quality Inspection,In Process,Во процесот
 DocType: Authorization Rule,Itemwise Discount,Itemwise попуст
 DocType: Purchase Order Item,Reference Document Type,Референтен документ Тип
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Продај Побарувања {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Продај Побарувања {1}
 DocType: Account,Fixed Asset,Основни средства
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијали Инвентар
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серијали Инвентар
 DocType: Activity Type,Default Billing Rate,Стандардно регистрации курс
 DocType: Time Log Batch,Total Billing Amount,Вкупно регистрации Износ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Побарувања профил
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продај Побарувања на плаќање
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време на дневници на креирање:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Employee,Blood Group,Крвна група
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Во очекување
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисниците кои може да одобри апликации одмор одредена вработениот
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Не можете да го промените стандардниот UOM на варијанта. За да го промените стандардниот UOM за Варијанта промените стандардниот UOM на Шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Канцеларија опрема
 DocType: Purchase Invoice Item,Qty,Количина
 DocType: Fiscal Year,Companies,Компании
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроника
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигне материјал Барање кога акциите достигне нивото повторно цел
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Од Распоред за одржување
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Со полно работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Со полно работно време
 DocType: Purchase Invoice,Contact Details,Податоци за контакт
 DocType: C-Form,Received Date,Доби датум
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ако имате креирано стандарден образец во продажба даноци и давачки дефиниција, изберете една и кликнете на копчето подолу."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Отворање работа
 DocType: Payment Reconciliation,Payment Reconciliation,Плаќање помирување
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технологија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологија
 DocType: Offer Letter,Offer Letter,Понуда писмо
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Генерирање Материјал Барања (MRP) и производство наредби.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Вкупниот фактуриран Амт
 DocType: Time Log,To Time,На време
+DocType: Authorization Rule,Approving Role (above authorized value),Одобрување Улогата (над овластени вредност)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","За да додадете дете јазли, истражуваат дрво и кликнете на јазол под кои сакате да додадете повеќе лимфни јазли."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
 DocType: Production Order Operation,Completed Qty,Завршено Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ценовник {0} е исклучен
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Клиент Точка Код
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Креирај Плаќање записи против налози или фактури.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заварување
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Нова берза UOM е потребно
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Сите предмети веќе се фактурира
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Сите предмети веќе се фактурира
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ве молиме наведете валидна &quot;од случај бр &#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
 DocType: Features Setup,Item Serial Nos,Точка Сериски броеви
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Крај на Кол
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериски № {0} не е пронајдена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Компресија калапи
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Вашите клиенти
 DocType: Leave Block List Date,Block Date,Датум на блок
 DocType: Sales Order,Not Delivered,Не Дадени
 ,Bank Clearance Summary,Банката Чистење Резиме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Креирање и управување со дневни, неделни и месечни Е-содржините."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Точка законик&gt; Точка Група&gt; Бренд
 DocType: Appraisal Goal,Appraisal Goal,Процена Цел
-DocType: Event,Friday,Петок
 DocType: Time Log,Costing Amount,Чини Износ
 DocType: Process Payroll,Submit Salary Slip,Поднесе Плата фиш
 DocType: Salary Structure,Monthly Earning & Deduction,Месечен Заработувајќи &amp; Одбивање
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз во Масовно
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Испраќачот Име
-DocType: Page,Title,Наслов
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Персонализација на
 DocType: POS Profile,[Select],[Избери]
 DocType: SMS Log,Sent To,Испратени до
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Направи Продај фактура
 DocType: Company,For Reference Only.,За повикување само.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невалиден {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Однапред Износ
 DocType: Manufacturing Settings,Capacity Planning,Планирање на капацитетот
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Од датум &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Од датум &#39;е потребен
 DocType: Journal Entry,Reference Number,Референтен број
 DocType: Employee,Employment Details,Детали за вработување
 DocType: Employee,New Workplace,Нов работен простор
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Патување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Патување
 DocType: Leave Block List,Allow Users,Им овозможи на корисниците
 DocType: Purchase Order,Customer Mobile No,Клиент Мобилни Не
 DocType: Sales Invoice,Recurring,Повторувачки
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Преименувај алатката
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Пренос на материјал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
 DocType: Installation Note,Installation Note,Инсталација Забелешка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додади Даноци
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Додади Даноци
 ,Financial Analytics,Финансиски анализи
 DocType: Quality Inspection,Verified By,Заверена од
 DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
 DocType: Quality Inspection,Purchase Receipt No,Купување Потврда Не
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Искрена пари
-DocType: System Settings,In Hours,Во часови
 DocType: Process Payroll,Create Salary Slip,Креирај Плата фиш
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,"Се очекува баланс, како на банката"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,"Се очекува баланс, како на банката"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Извор на фондови (Пасива)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
 DocType: Appraisal,Employee,Вработен
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група од Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Sales Invoice,Mass Mailing,Масовно испраќање
-DocType: Page,Standard,Стандард
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Плаќања шоу
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Големина
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Распоред за одржување {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтската
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтската
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Цената на купените предмети
 DocType: Selling Settings,Sales Order Required,Продај Побарувања задолжителни
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирај клиентите
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Е Замрзнати
 DocType: Buying Settings,Buying Settings,Поставки за купување
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса завршувањето
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Бум број за завршен добра ствар
 DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Поставување на дојдовен сервер за продажба-мејл ID. (На пр sales@example.com)
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Tool,Payment Account,Уплатна сметка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Обесштетување Off
 DocType: Quality Inspection Reading,Accepted,Прифатени
-DocType: User,Female,Женски
-DocType: Journal Entry Account,Debit in Account Currency,Дебитна во профил Валута
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
-DocType: Print Settings,Modern,Модерни
-DocType: Communication,Replied,Одговори
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Невалидна референца {0} {1}
 DocType: Payment Tool,Total Payment Amount,Вкупно исплата Износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да биде поголема од планираното quanitity ({2}) во продукција налог {3}
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Како што постојат постојните акции трансакции за оваа точка, \ вие не може да се промени на вредностите на &quot;Мора Сериски Не&quot;, &quot;Дали Серија Не&quot;, &quot;Дали берза точка&quot; и &quot;метода на проценка&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо весник Влегување
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Барања за предмети.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одделни производни цел ќе биде направена за секоја завршена добра ствар.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Целосно подесување
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Сметководство влез замрзнати до овој датум, никој не може да се направи / менувате влез освен улога наведени подолу."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проектот
 DocType: UOM,Check this to disallow fractions. (for Nos),Изберете го ова за да ги оневозможите фракции. (За NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Билтен Поштенски Листа
 DocType: Delivery Note,Transporter Name,Превозник Име
+DocType: Authorization Rule,Authorized Value,Овластен Вредност
 DocType: Contact,Enter department to which this Contact belongs,Внесете одделот на кој припаѓа оваа Контакт
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Вкупно Отсутни
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Единица мерка
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Единица мерка
 DocType: Fiscal Year,Year End Date,Година Крај Датум
 DocType: Task Depends On,Task Depends On,Задача зависи од
 DocType: Lead,Opportunity,Можност
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основната стапка (како на Акции UOM)
 DocType: SMS Log,No of Requested SMS,Број на Побарано СМС
 DocType: Campaign,Campaign-.####,Кампања -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пирсинг
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Трето лице дистрибутер / дилер / комисионен застапник / партнер / препродавач кој ги продава компании производи за провизија.
 DocType: Customer Group,Has Child Node,Има Јазол дете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарачка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарачка {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Внесете статички URL параметри тука (на пр. Испраќачот = ERPNext, корисничко име = ERPNext, лозинка = 1234 итн)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} не во било кој активен фискална година. За повеќе детали проверете {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ова е пример веб-сајт автоматски генерирани од ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Стареењето опсег 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохемиски обработка
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Стандардни даночни образец во кој може да се примени на сите Набавка трансакции. Овој шаблон може да содржи листа на даночните глави и исто така и други трошоци глави како &quot;испорака&quot;, &quot;осигурување&quot;, &quot;Ракување&quot; и др #### Забелешка Стапката на данокот ќе се дефинира овде ќе биде стандардна даночна стапка за сите предмети ** * *. Ако има ** ** Теми кои имаат различни стапки, тие мора да се додаде во ** точка Данок ** табелата во точка ** ** господар. #### Опис колумни 1. Пресметка Тип: - Ова може да биде на ** Нет Вкупно ** (што е збирот на основниот износ). - ** На претходниот ред Вкупно / Износ ** (за кумулативни даноци или давачки). Ако ја изберете оваа опција, данокот ќе се применуваат како процент од претходниот ред (во даночната маса) износот или вкупно. - Крај ** ** (како што е споменато). 2. профил Раководител: книга на сметка под кои овој данок ќе се резервира 3. Цена Центар: Ако данок / цената е приход (како превозот) или расходите треба да се резервира против трошок центар. 4. Опис: Опис на данокот (кој ќе биде испечатен во фактури / наводници). 5. Оцени: Даночна стапка. 6. Висина: висината на данокот. 7. Вкупно: Кумулативни вкупно на оваа точка. 8. Внесете ред: Ако врз основа на &quot;претходниот ред Вкупно&quot; можете да изберете број на ред кои ќе бидат земени како основа за оваа пресметка (стандардно е претходниот ред). 9. сметаат дека даночните или задолжен за: Во овој дел можете да наведете дали данок / цената е само за вреднување (не е дел од вкупниот број) или само за вкупно (не додаваат вредност на ставка) или за двете. 10. Додадете или одлежа: Без разлика дали сакате да го додадете или одземе данок."
-DocType: Note,Note,Забелешка
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
-DocType: Email Account,Email Ids,E-mail ИД
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе Точка {0} од Продај Побарувања количина {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 DocType: Tax Rule,Billing City,Платежна Сити
 DocType: Global Defaults,Hide Currency Symbol,Сокриј Валута Симбол
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Кредитна Забелешка
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Завршено Количина не може да биде повеќе од {0} за работа {1}
 DocType: Features Setup,Quality,Квалитет
-DocType: Contact Us Settings,Introduction,Вовед
 DocType: Warranty Claim,Service Address,Услуга адреса
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Макс 100 реда за акциите помирување.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Макс 100 реда за акциите помирување.
 DocType: Stock Entry,Manufacture,Производство
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Ве молиме Испратница прв
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Клиент / Водечки Име
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Чистење Датум кои не се споменати
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Чистење Датум кои не се споменати
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Им овозможи на производството со цел
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Поднесени
 DocType: Salary Structure,Total Earning,Вкупно Заработувајќи
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организација гранка господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунални трошоци
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Над 90-
 DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
-,Download Backups,Преземи бекап
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Тип на плаќање
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Bank Reconciliation,To Date,Датум
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детали за
 DocType: Purchase Invoice,Total Taxes and Charges,Вкупно даноци и такси
 DocType: Employee,Emergency Contact,Итни Контакт
 DocType: Item,Quality Parameters,Параметри за квалитет
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Сериски Не / Batch
 DocType: Product Bundle,Parent Item,Родител Точка
 DocType: Account,Account Type,Тип на сметка
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Остави Тип {0} не може да се носат-пренасочат
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Кол задржани
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купување Потврда Теми
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализација форми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Изедначување
 DocType: Account,Income Account,Сметка приходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Калапи
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошоците центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Нарачка порака
 DocType: Tax Rule,Shipping Country,Превозот Земја
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Вкупно однапред ({0}) против Ред {1} може да не биде поголема \ од Големиот Вкупно ({2})
 DocType: Employee,Relieving Date,Ослободување Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може да се менува само преку берза за влез / Испратница / Купување Потврда
 DocType: Employee Education,Class / Percentage,Класа / Процент
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Раководител на маркетинг и продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Данок на доход
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Ласерски Инженерните нето обликување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Раководител на маркетинг и продажба
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Данок на доход
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако е избрано Цените правило е направен за &quot;цената&quot;, таа ќе ги избрише ценовникот. Цените Правило цена е крајната цена, па нема повеќе Попустот треба да биде применет. Оттука, во трансакции како Продај Побарувања, нарачка итн, тоа ќе биде Земени се во полето &#39;стапка &quot;, отколку полето&quot; Ценовник стапка."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Песна води од страна на индустриски тип.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
-DocType: User,Bio,Био
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Нова цена центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардно адреса Шаблон најде. Ве молиме да се создаде нов една од подесување&gt; Печатење и Брендирање&gt; Адреса Шаблон.
 DocType: Appraisal,HR User,HR пристап
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
 DocType: Supplier,Billing Currency,Платежна валута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Добивка и загуба Изјава
 DocType: Bank Reconciliation Detail,Cheque Number,Чек број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Притискање
 DocType: Payment Tool Detail,Payment Tool Detail,Плаќање алатката Детална
 ,Sales Browser,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно кредитни
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Локалните
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити и побарувања (средства)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должниците
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Големи
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниту еден вработен пронајдена!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Големи
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Purchase Order,Customer Address Display,Клиент Адреса Покажи
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Стандардно единица мерка за Точка {0} може да се промени, бидејќи директно \ веќе сте направиле некои трансакција (а) со друг UOM. За да го промените стандардниот UOM \ употреба &quot;UOM Замени комунални &#39;алатка под Акции модул."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведете курс за претворање на еден валута во друга
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитат {0} е откажана
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитат {0} е откажана
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Вкупно преостанатиот износ за наплата
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Вработен {0} е на одмор на {1}. Не може да означува присуство.
 DocType: Sales Partner,Targets,Цели
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
 DocType: Production Order Operation,Make Time Log,Најдете време се Влез
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Ве молиме да го поставите редоследот квантитетот
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Ве молиме да се создаде клиент од водечкиот {0}
 DocType: Price List,Applicable for Countries,Применливи за земјите
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компјутери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хемиски мелење
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ве молиме да ги конфигурирате вашите сметковниот план пред да почнете Сметководство записи
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорирај Цените Правило
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Откажано
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Од денот на плата структура не може да биде помала од вработените Состави Датум.
 DocType: Employee Education,Graduate,Дипломиран
 DocType: Leave Block List,Block Days,Забрани дена
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Проверете дали се повторуваат фактура, ја избирате да се запре периодични или стави соодветна Крај Датум"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повеќе од еден пакет од ист тип (за печатење)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Дозволениот максимум {0} редови
 DocType: C-Form Invoice Detail,Net Total,Вкупно нето
 DocType: Bin,FCFS Rate,FCFS стапка
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Платежна (Продај фактура)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} подолго од било кој на располагање на работното време во станица {1}, се прекине работењето во повеќе операции"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохемиски обработка
 ,Requested,Побарано
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Нема забелешки
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Задоцнета
 DocType: Account,Stock Received But Not Billed,"Акции примени, но не Опишан"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root сметката мора да биде група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто плата + Arrear Износ + инкасо Износ - Вкупно Одбивање
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продажба и купување
 DocType: Supplier Quotation Item,Material Request No,Материјал Барање Не
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стапка по која клиентите валута е претворена во основна валута компанијата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} е успешно отпишавте од оваа листа.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето стапката (Фирма валута)
-apps/frappe/frappe/templates/base.html +134,Added,Додадено
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управување со Територија на дрвото.
 DocType: Journal Entry Account,Sales Invoice,Продај фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} не е пронајдена.
 DocType: Bank Reconciliation,Get Relevant Entries,Добие релевантни записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Сметководство за влез на берза
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Сковал
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
-apps/frappe/frappe/desk/query_report.py +136,Total,Вкупниот
 DocType: Purchase Invoice,Apply Additional Discount On,Да важат и дополнителни попуст на
 DocType: Account,Root Type,Корен Тип
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не можам да се вратат повеќе од {1} за Точка {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износот на данокот По Износ попуст (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
 DocType: Quality Inspection,Quality Inspection,Квалитет инспекција
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спреј формирање
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Екстра Мали
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или диплома
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар ниво
 DocType: Stock Entry,Subcontract,Поддоговор
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Производителот Дел број
 DocType: Production Order Operation,Estimated Time and Cost,Проценето време и трошоци
 DocType: Bin,Bin,Бин
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Душкајќи
 DocType: SMS Log,No of Sent SMS,Број на испратени СМС
 DocType: Account,Company,Компанијата
 DocType: Account,Expense Account,Сметка сметка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Софтвер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Софтвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Боја
 DocType: Maintenance Visit,Scheduled,Закажана
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ве молиме одберете ја изборната ставка каде што &quot;Дали берза Точка&quot; е &quot;Не&quot; и &quot;е продажба точка&quot; е &quot;Да&quot; и не постои друг Бовча производ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изберете Месечен Дистрибуција на нерамномерно дистрибуира цели низ месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Вреднување стапка
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ценовник Валута не е избрано
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Точка ред {0}: Набавка Потврда {1} не постои во горната табела &quot;Набавка Разписки&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Почеток на проектот Датум
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименувај Влез
 DocType: Installation Note Item,Against Document No,Против л.к
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Управуваат со продажбата партнери.
 DocType: Quality Inspection,Inspection Type,Тип на инспекцијата
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Ве молиме изберете {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Истражувач
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ажурирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Истражувач
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Ве молиме да се спаси Билтен пред да ја испратите
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Име или е-пошта е задолжително
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Дојдовен инспекција квалитет.
 DocType: Purchase Order Item,Returned Qty,Врати Количина
 DocType: Employee,Exit,Излез
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корен Тип е задолжително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корен Тип е задолжително
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Сериски № {0} создаден
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационен доработка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За погодност на клиентите, овие кодови може да се користи во печатените формати како Фактури и испорака белешки"
 DocType: Employee,You can enter any date manually,Можете да внесете кој било датум рачно
 DocType: Sales Invoice,Advertisement,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Пробниот период
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробниот период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакција
 DocType: Expense Claim,Expense Approver,Сметка Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купување Потврда точка Опрема што се испорачува
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Мелење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Смалуваат завиткување
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Активности во тек
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добавувачот&gt; Добавувачот Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,АМТ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискалната година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топење
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Attendance,Attendance Date,Публика Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распадот врз основа на заработка и одбивање.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Сметка со дете јазли не можат да се конвертираат во Леџер
 DocType: Address,Preferred Shipping Address,Најпосакувана Адреса за Испорака
 DocType: Purchase Receipt Item,Accepted Warehouse,Прифатени Магацински
 DocType: Bank Reconciliation Detail,Posting Date,Датум на објавување
 DocType: Item,Valuation Method,Начин на вреднување
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Не може да се најде на девизниот курс за {0} до {1}
 DocType: Sales Invoice,Sales Team,Тим за продажба
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Дупликат внес
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дупликат внес
 DocType: Serial No,Under Warranty,Под гаранција
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе бидат видливи откако ќе го спаси Продај Побарувања.
 ,Employee Birthday,Вработен Роденден
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Вложување на капитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Сериски № {0} не постои
 DocType: Pricing Rule,Discount Percentage,Процент попуст
 DocType: Payment Reconciliation Invoice,Invoice Number,Број на фактура
-apps/erpnext/erpnext/hooks.py +70,Orders,Нарачка
+apps/erpnext/erpnext/hooks.py +54,Orders,Нарачка
 DocType: Leave Control Panel,Employee Type,Тип на вработените
 DocType: Employee Leave Approver,Leave Approver,Остави Approver
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Ковањето
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал префрлени за Производство
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Корисник со &quot;Расходи Approver&quot; улога
 ,Issued Items Against Production Order,Издадени Теми против производството со цел
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неправилен период
 DocType: Customer,Credit Limit,Кредитен лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изберете тип на трансакција
 DocType: GL Entry,Voucher No,Ваучер Не
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Employee,Feedback,Повратна информација
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Одмор не може да се одвои пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивни авион обработка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Распоред
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
-DocType: Website Settings,Website Settings,Settings веб-страница
 DocType: Item,Reorder level based on Warehouse,Ниво врз основа на промените редоследот Магацински
 DocType: Activity Cost,Billing Rate,Платежна стапка
 ,Qty to Deliver,Количина да Избави
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Се бара за
 DocType: Quotation Item,Against Doctype,Против DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Следење на овој Испратница против било кој проект
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root сметката не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root сметката не може да се избришат
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Прикажи берза записи
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Референтен # {0} датум {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управуваат со адреси
 DocType: Pricing Rule,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
-DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затворање (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Затворање (д-р)
 DocType: Contact,Passive,Пасивни
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Сериски № {0} не во парк
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Данок дефиниција за продажба трансакции.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Фактурирани Износ
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Добијат ажурирања
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додадете неколку записи примерок
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материјал Барање {0} е откажана или запрена
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Додадете неколку записи примерок
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Остави менаџмент
-DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група од сметка
 DocType: Sales Order,Fully Delivered,Целосно Дадени
 DocType: Lead,Lower Income,Помал приход
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Помош
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
 DocType: Features Setup,Sales Extras,Продажба Бенефиции
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} буџетот на сметка {1} од трошоците центар {2} ќе се надмине со {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} буџетот на сметка {1} од трошоците центар {2} ќе се надмине со {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Од датум&quot; мора да биде по &quot;Да најдам&quot;
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
 ,Qty to Receive,Количина да добијам
 DocType: Leave Block List,Leave Block List Allowed,Остави Забрани листата на дозволени
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Фактор на конверзија не може да биде во делови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вие ќе го користите за најава
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вие ќе го користите за најава
 DocType: Sales Partner,Retailer,Трговија на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сите типови на Добавувачот
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитат {0} не е од типот на {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банка пречекорување на профилот
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Направете Плата фиш
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Преглед на бирото
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Препорачана кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Прекрасно производи
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Прекрасно производи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Салдо инвестициски фондови
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не може да се одобри отсуство, како што не се овластени да го одобри лисја Забрани Датуми"
 DocType: Appraisal,Appraisal,Процена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Кастинг Изгубени пена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се повторува
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овластен потписник
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупниот откуп на трошоци (преку купување фактура)
 DocType: Workstation Working Hour,Start Time,Почеток Време
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стапка на час
 DocType: Stock Settings,Item Naming By,Точка грабеж на име со
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од цитат
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Од цитат
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Уште еден период Затворање Влегување {0} е направен по {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал е пренесен за производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,На сметка {0} не постои
 DocType: Purchase Receipt Item,Purchase Order Item No,Нарачка Точка Не
-DocType: System Settings,System Settings,System Settings
 DocType: Project,Project Type,Тип на проект
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Или цел количество: Контакт лице или целниот износ е задолжително.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Цената на различни активности
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
 DocType: Sales Order,Fully Billed,Целосно Опишан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Парични средства во благајна
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
 DocType: Serial No,Is Cancelled,Е Откажано
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои Пратки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои Пратки
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
 DocType: Supplier,Supplier Details,Добавувачот Детали за
-DocType: Communication,Recipients,Примателите
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Нарезници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Статус на Одобри
 DocType: Hub Settings,Publish Items to Hub,Објавуваат Теми на Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Од вредност мора да биде помал од вредност во ред {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Ве молиме изберете банкарска сметка
 DocType: Newsletter,Create and Send Newsletters,Креирајте и испратете Билтени
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датум мора да е пред: Да најдам
 DocType: Sales Order,Recurring Order,Повторувачки Побарувања
 DocType: Company,Default Income Account,Сметка стандардно на доход
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Клиент група / клиентите
 DocType: Item Group,Check this if you want to show in website,Обележете го ова ако сакате да се покаже во веб-страница
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добредојдовте на ERPNext
+,Welcome to ERPNext,Добредојдовте на ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Детална број
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Да доведе до цитат
 DocType: Lead,From Customer,Од клиентите
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Повици
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Повици
 DocType: Project,Total Costing Amount (via Time Logs),Вкупно Чини Износ (преку Време на дневници)
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
 ,Projected,Проектирани
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Сериски № {0} не припаѓаат Магацински {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Забелешка: системот не ќе ги провери над-испорака и над-резервација за Точка {0}, на пример количината или сума е 0"
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Отворање датум
 DocType: Journal Entry,Remark,Напомена
 DocType: Purchase Receipt Item,Rate and Amount,Стапка и износот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадни
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од Продај Побарувања
-DocType: Blog Category,Parent Website Route,Родител вебсајт Пат
 DocType: Sales Order,Not Billed,Не Опишан
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Двете Магацински мора да припаѓа на истата компанија
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Не контакти додаде уште.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не се активни
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Слета Цена ваучер Износ
 DocType: Time Log,Batched for Billing,Batched за регистрации
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Сметки кои произлегуваат од добавувачи.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Износ попуст
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,на пример ДДВ
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,на пример ДДВ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Точка 4
 DocType: Journal Entry Account,Journal Entry Account,Весник Влегување профил
 DocType: Shopping Cart Settings,Quotation Series,Серија цитат
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Формирање жешки метални гас
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
 DocType: Sales Invoice Item,Delivered Qty,Дадени Количина
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Оди до соодветната група (обично Извор на фондови&gt; Тековни обврски&gt; даноци и давачки и да се создаде нова сметка (со кликање на Додади детето) од типот &quot;данок&quot; и се спомнуваат на даночната стапка.
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Ласерско сечење
-DocType: Event,Monday,Понеделник
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Account,Payable,Треба да се плати
 DocType: Salary Slip,Arrear Amount,Arrear Износ
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Адреса Desc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Барем еден од продажба или купување мора да бидат избрани
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Каде што се врши производните операции.
-DocType: Page,All,Сите
 DocType: Stock Entry Detail,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
 DocType: Employee,Confirmation Date,Потврда Датум
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Продажбата пристап
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Мин Количина не може да биде поголем од Макс Количина
 DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Поставете
 DocType: Lead,Lead Owner,Водач сопственик
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Се бара магацин
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Се бара магацин
 DocType: Employee,Marital Status,Брачен статус
 DocType: Stock Settings,Auto Material Request,Авто материјал Барање
 DocType: Time Log,Will be updated when billed.,Ќе биде обновен кога фактурирани.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Нарачка точка Опрема што се испорачува
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Име на компанија не може да биде компанија
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за печатење на обрасци.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Наслови за печатење шаблони пр проформа фактура.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни UOM за предмети ќе доведе до неточни (Вкупно) Нето вредноста на тежината. Бидете сигурни дека нето-тежината на секоја ставка е во иста UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Рекорд на сите комуникации од типот пошта, телефон, чет, посета, итн"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ве молиме спомнете заокружуваат цена центар во компанијата
 DocType: Purchase Invoice,Terms,Услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Креирај нова
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Креирај нова
 DocType: Buying Settings,Purchase Order Required,Нарачка задолжителни
 ,Item-wise Sales History,Точка-мудар Продажбата Историја
 DocType: Expense Claim,Total Sanctioned Amount,Вкупно санкционира Износ
 ,Purchase Analytics,Купување анализи
 DocType: Sales Invoice Item,Delivery Note Item,Испратница Точка
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бричење
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Ред #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серија број е задолжително за Точка {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ова е лице корен продажба и не може да се уредува.
 ,Stock Ledger,Акции Леџер
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Гласај: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Гласај: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата се лизга Дедукција
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Белешки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изберете група јазол во прв план.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Целта мора да биде еден од {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Пополнете го формуларот и го спаси
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преземете извештај кој ги содржи сите суровини со најновите статусот инвентар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Со кои се соочува
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форуми во заедницата
 DocType: Leave Application,Leave Balance Before Application,Остави баланс пред апликација
 DocType: SMS Center,Send SMS,Испрати СМС
 DocType: Company,Default Letter Head,Стандардно писмо Раководител
 DocType: Time Log,Billable,Фактурираните
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ова ќе се користи за поставување на власт во човечки ресурси модул
 DocType: Account,Rate at which this tax is applied,Стапка по која се применува овој данок
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Пренареждане Количина
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Можност Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Попуст полиња ќе бидат достапни во нарачката, купување прием, Набавка Фактура"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме да не се создаде сметки за клиентите и добавувачите
-DocType: Report,Report Type,Тип на излагањето
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Вчитување
 DocType: BOM Replace Tool,BOM Replace Tool,Бум Заменете алатката
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земја мудро стандардно адреса Урнеци
 DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Шоуто данок распадот
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Податоци за увоз и извоз
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Ако се вклучат во производна активност. Овозможува Точка &quot;е произведен&quot;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Purchase Order Item,Material Request Detail No,Материјал Барање Детална Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Хард пресвртна
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Направете Одржување Посета
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
 DocType: Company,Default Cash Account,Стандардно готовинска сметка
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Уплатениот износ + отпише сума не може да биде поголема од Гранд Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не е валиден сериски број за ставката {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Забелешка: Ако плаќањето не е направена на секое повикување, направи весник влез рачно."
 DocType: Item,Supplier Items,Добавувачот Теми
 DocType: Opportunity,Opportunity Type,Можност Тип
@@ -2683,69 +2468,61 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Се бара цена Центар за &#39;билансот на успех &quot;на сметка {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Трансакции може да биде избришан само од страна на креаторот на компанијата
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Неточен број на генералниот Леџер записи најде. Можеби сте избрале погрешна сметка во трансакцијата.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Да се создаде банкарска сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Да се создаде банкарска сметка
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
 ,Stock Ageing,Акции стареење
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Испрати автоматски пораки до контакти за доставување на трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Ред {0}: Количина не avalable во магацин {1} на {2} {3}. Достапни Количина: {4}, пренос Количина: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
-DocType: Event,Sunday,Недела
 DocType: Sales Team,Contribution (%),Придонес (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ве молиме внесете барем 1 фактура во табелата
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додади корисници
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Додади корисници
 DocType: Pricing Rule,Item Group,Точка група
 DocType: Task,Actual Start Date (via Time Logs),Старт на проектот Датум (преку Време на дневници)
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
 DocType: Item,Default BOM,Стандардно Бум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупно Најдобро Амт
 DocType: Time Log Batch,Total Hours,Вкупно часови
 DocType: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилски
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Е потребно точка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал шприц
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Дебитна мора да биде еднаков Вкупно кредит. Разликата е {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Од Испратница
 DocType: Time Log,From Time,Од време
 DocType: Notification Control,Custom Message,Прилагодено порака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестициско банкарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изберете ја вашата земја, временска зона и валута"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестициско банкарство
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Мариноване
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Песок кастинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Галванизација
 DocType: Purchase Invoice Item,Rate,Стапка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Практикант
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Практикант
 DocType: Newsletter,A Lead with this email id should exist,Водечки со оваа е-мејл проект треба да постои
 DocType: Stock Entry,From BOM,Од бирото
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основни
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Датум треба да биде иста како и од датумот за половина ден одмор
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","на пр Kg, единица бр, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","на пр Kg, единица бр, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
 DocType: Salary Structure,Salary Structure,Структура плата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Повеќе Цена правило постои со истите критериуми, ве молиме решавање \ конфликт со давање приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материјал прашање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
 DocType: Hub Settings,Access Token,Пристап знак
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Е фиксни средства Точка
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако имате долга формати за печатење, оваа функција може да се користи за разделување на страницата треба да се печати на повеќе страници со сите заглавјето и подножјето на секоја страница"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Сите територии
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 DocType: Fiscal Year,Year Name,Име година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
 DocType: Product Bundle Item,Product Bundle Item,Производ Бовча Точка
 DocType: Sales Partner,Sales Partner Name,Продажбата партнер Име
 DocType: Purchase Invoice Item,Image View,Слика Види
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Доработка и индустриски завршна обработка
 DocType: Issue,Opening Time,Отворање Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Од и до датуми потребни
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартии од вредност и стоковни берзи
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од магацин
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Дупчење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Калапи удар
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и вкупно
 DocType: Tax Rule,Shipping City,Превозот Сити
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Оваа содржина е варијанта на {0} (дефиниција). Атрибути ќе бидат копирани во текот од дефиниција освен ако е &quot;Не Копирај&quot; е поставена
 DocType: Account,Purchase User,Набавка пристап
 DocType: Notification Control,Customize the Notification,Персонализација на известувањето
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Ковале
-DocType: Web Page,Slideshow,Слајдшоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Стандардно адреса Шаблон не може да се избришат
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
 DocType: Journal Entry,Print Heading,Печати Заглавие
 DocType: Quotation,Maintenance Manager,Одржување менаџер
-DocType: Workflow State,Search,Барај
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Вкупно не може да биде нула
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Дена од денот на Ред&quot; мора да биде поголем или еднаков на нула
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Лемење
 DocType: C-Form,Amended From,Изменет Од
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Суровина
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Износот на данокот По Износ попуст
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Сметка детето постои за оваа сметка. Не можете да ја избришете оваа сметка.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Или цел количество: Контакт лице или целниот износ е задолжително
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
 DocType: Leave Control Panel,Carry Forward,Пренесување
@@ -2801,44 +2570,43 @@
 ,Produced,Произведени
 DocType: Item,Item Code for Suppliers,Точка Код за добавувачи
 DocType: Issue,Raised By (Email),Покренати од страна на (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Генералниот
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикачи меморандум
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Генералниот
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Прикачи меморандум
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одбие кога категорија е наменета за &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа на вашата даночна глави (на пример, ДДВ, царински итн, тие треба да имаат уникатни имиња) и стандард на нивните стапки. Ова ќе создаде стандарден образец, кои можете да ги менувате и додадете повеќе подоцна."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа на вашата даночна глави (на пример, ДДВ, царински итн, тие треба да имаат уникатни имиња) и стандард на нивните стапки. Ова ќе создаде стандарден образец, кои можете да ги менувате и додадете повеќе подоцна."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Сериски броеви кои се потребни за серијали Точка {0}
 DocType: Journal Entry,Bank Entry,Банката Влегување
 DocType: Authorization Rule,Applicable To (Designation),Применливи To (Означување)
-DocType: Blog Post,Blog Post,Блог пост
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Со група
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Овозможи / оневозможи валути.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштенски трошоци
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Датумот на кој периодично да се запре
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора да се намали од {1} или ќе треба да се зголеми претекување толеранција
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Вкупно Тековен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Водач Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Креирај цитат
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Сите овие предмети веќе се фактурира
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Сите овие предмети веќе се фактурира
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може да биде одобрена од страна на {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
 DocType: BOM Replace Tool,The new BOM after replacement,Новиот Бум по замена
 DocType: Features Setup,Point of Sale,Точка на продажба
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Виткање
 DocType: Account,Tax,Данок
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ред {0}: {1} не е валиден {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафинирање
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ред {0}: {1} не е валиден {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Од производот Бовча
 DocType: Production Planning Tool,Production Planning Tool,Алатка за производство планирање
 DocType: Quality Inspection,Report Date,Датум на извештајот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Рутирање
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Работно место
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} веќе наменети за вработените {1} за период {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примателите
 DocType: Features Setup,Item Groups in Details,Точка групи во Детали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и Достапност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент ви е дозволено да примате или да испорача повеќе во однос на количината нареди. На пример: Ако го наредил 100 единици. и вашиот додаток е 10%, тогаш ви е дозволено да се добијат 110 единици."
 DocType: Pricing Rule,Customer Group,Група на потрошувачи
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: Item,Website Description,Веб-сајт Опис
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
 ,Sales Register,Продажбата Регистрирај се
 DocType: Quotation,Quotation Lost Reason,Заборавена Причина цитат
 DocType: Address,Plant,Растителни
-DocType: DocType,Setup,Подесување
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Ладно валање
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Ве молиме изберете ја носи напред ако вие исто така сакаат да се вклучат во претходната фискална година биланс остава на оваа фискална година
 DocType: GL Entry,Against Voucher Type,Против ваучер Тип
 DocType: Item,Attributes,Атрибути
-DocType: Packing Slip,Get Items,Се предмети
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ве молиме внесете го отпише профил
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Се предмети
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последните Ред Датум
-DocType: DocField,Image,Слика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Направете акцизи Фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
-DocType: Communication,Other,Други
 DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција проект не е поставена
 DocType: Production Order,Planned Start Date,Планираниот почеток Датум
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посетата
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Посетата
 DocType: Leave Type,Is Encash,Е инкасирам
 DocType: Purchase Invoice,Mobile No,Мобилни Не
 DocType: Payment Tool,Make Journal Entry,Направете весник Влегување
@@ -2881,36 +2645,30 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект-мудар податоци не се достапни за котација
 DocType: Project,Expected End Date,Се очекува Крај Датум
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерцијален
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Комерцијален
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родител Точка {0} не мора да биде Акции Точка
 DocType: Cost Center,Distribution Id,Id дистрибуција
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Прекрасно Услуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Сите производи или услуги.
 DocType: Purchase Invoice,Supplier Address,Добавувачот адреса
-DocType: Contact Us Settings,Address Line 2,Адреса Линија 2
-DocType: ToDo,Reference,Референтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Количина
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серија е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансиски Услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансиски Услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредноста за атрибутот {0} мора да биде во рамките на опсегот на {1} до {2} во зголемувања од {3}
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Стандардно сметки побарувања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Пила
 DocType: Tax Rule,Billing State,Платежна држава
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламиниране
 DocType: Item Reorder,Transfer,Трансфер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтерување
-DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
+DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
 DocType: Supplier,Contact HTML,Контакт HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Набавка Разписки
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Трговија на мало
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не постои
 DocType: Attendance,Absent,Отсутен
-DocType: Product Bundle,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Производ Бовча
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробење
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
 DocType: GL Entry,Remarks,Забелешки
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за сериски број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано леење
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ве молиме наведете
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Над
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Студената големината
 DocType: Salary Slip,Earning & Deduction,Заработувајќи &amp; Одбивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,На сметка {0} не може да биде група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регионот
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
 DocType: Holiday List,Weekly Off,Неделен Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012 година, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Привремени Добивка / загуба (кредитни)
 DocType: Sales Invoice,Return Against Sales Invoice,Врати против Продај фактура
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Точка 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Поставете ја стандардната вредност {0} во компанијата {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Поставете ја стандардната вредност {0} во компанијата {1}
 DocType: Serial No,Creation Time,Време на
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Вкупно приходи
 DocType: Sales Invoice,Product Bundle Help,Производ Бовча Помош
 ,Monthly Attendance Sheet,Месечен евидентен лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не се пронајдени рекорд
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Се предмети од производот Бовча
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,На сметка {0} е неактивен
 DocType: GL Entry,Is Advance,Е напредување
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Публика од денот и Публика во тек е задолжително
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ве молиме внесете &#39;се дава под договор &quot;, како Да или Не"
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Добивка и загуба&quot; тип на сметка {0} не е дозволено во Отворање Влегување
-DocType: Workflow State,Time,Време
 DocType: Features Setup,Sales Discounts,Попусти за продажба
 DocType: Hub Settings,Seller Country,Продавачот Земја
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови и правила Детали за
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажбата на даноци и такси Шаблон
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Облека и додатоци
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облека и додатоци
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Број на нарачка
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Банер кои ќе се појавуваат на врвот од листата на производи.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведете услови за да се пресмета износот за испорака
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додади детето
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улогата дозволено да го поставите замрзнати сметки &amp; Уреди Замрзнати записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Не може да се конвертира цена центар за книга како што има дете јазли
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Се бара Фактор на конверзија
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Сериски #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комисијата за Продажба
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,"Клиентите не за купување, бидејќи долго време"
 DocType: Production Order,Expected Delivery Date,Се очекува испорака датум
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Издут
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Кастинг испарување-модел
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Забава трошоци
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Продај фактура {0} мора да биде укинат пред да го раскине овој Продај Побарувања
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Години
 DocType: Time Log,Billing Amount,Платежна Износ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Невалиден количество, дефинитивно за ставката {0}. Кол треба да биде поголем од 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Апликации за отсуство.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Сметка со постоечките трансакцијата не може да се избришат
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Правни трошоци
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","На ден од месецот на кој авто цел ќе биде генериранa на пример 05, 28 итн"
 DocType: Sales Invoice,Posting Time,Праќање пораки во Време
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нов корисник приходи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Патни трошоци
 DocType: Maintenance Visit,Breakdown,Дефект
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Сметка: {0} со валутна: не може да се одбрани {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Усовршувајќи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Условна казна
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
-DocType: Feed,Full Name,Целосно име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Условна казна
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Стандардно Магацински е задолжително за акциите точка.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Исплата на плата за месец {0} и годината {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Вкупно исплатен износ
 ,Transferred Qty,Пренесува Количина
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигацијата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Најдете време Пријавете се Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издадени
 DocType: Project,Total Billing Amount (via Time Logs),Вкупно регистрации Износ (преку Време на дневници)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ние продаваме Оваа содржина
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Ние продаваме Оваа содржина
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id снабдувач
 DocType: Journal Entry,Cash Entry,Кеш Влегување
 DocType: Sales Partner,Contact Desc,Контакт Desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Точка менаџер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додадете редови да го поставите на годишниот буџет на сметки.
 DocType: Buying Settings,Default Supplier Type,Стандардно Добавувачот Тип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вадење на камен
 DocType: Production Order,Total Operating Cost,Вкупно оперативни трошоци
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Забелешка: Точката {0} влегоа неколку пати
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сите контакти.
 DocType: Newsletter,Test Email Id,Тест-мејл ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанијата Кратенка
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанијата Кратенка
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Ако ги следите испитување квалитет. Овозможува точка ОК задолжителни и ОК Не во Набавка Потврда
 DocType: GL Entry,Party Type,Партијата Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Суровина којашто не може да биде иста како главна точка
 DocType: Item Attribute Value,Abbreviation,Кратенка
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized од {0} надминува граници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротациона лиење
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Плата дефиниција господар.
 DocType: Leave Type,Max Days Leave Allowed,Макс дена ја напушти Дозволено
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Постави Данок Правило за количката
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати да се води или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
 ,Territory Target Variance Item Group-Wise,Територија Целна Варијанса Точка група-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Сите групи потрошувачи
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} е задолжително. Можеби рекорд размена на валута не е создадена за {1} до {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Данок Шаблон е задолжително.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,На сметка {0}: Родител на сметка {1} не постои
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник стапка (Фирма валута)
 DocType: Account,Temporary,Привремено
 DocType: Address,Preferred Billing Address,Најпосакувана платежна адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Посебна единица на Точка
 DocType: Pricing Rule,Buying,Купување
 DocType: HR Settings,Employee Records to be created by,Вработен евиденција да бидат создадени од страна
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
 DocType: Purchase Order Item,Supplier Quotation,Добавувачот цитат
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} е запрен
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Престојни настани
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се бара купувачи
-DocType: Letter Head,Letter Head,Писмо Раководител
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брз влез
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} е задолжително за враќање
 DocType: Purchase Order,To Receive,За да добиете
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Се намалува фитинг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Личен е-маил
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Вкупната варијанса
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Вкупната варијанса
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е овозможено, системот ќе ја објавите на сметководствените ставки за попис автоматски."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокерски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерски
 DocType: Address,Postal Code,поштенски код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",во минути освежено преку &quot;Време Вклучи се &#39;
 DocType: Customer,From Lead,Од олово
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Нарачка пуштени во производство.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Hub Settings,Name Token,Име знак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Планирање
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандардна Продажба
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандардна Продажба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Барем еден магацин е задолжително
 DocType: Serial No,Out of Warranty,Надвор од гаранција
 DocType: BOM Replace Tool,Replace,Заменете
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против Продај фактура {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против Продај фактура {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ве молиме внесете го стандардно единица мерка
 DocType: Purchase Invoice Item,Project Name,Име на проектот
 DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
-DocType: Workflow State,Edit,Уреди
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Features Setup,Item Batch Nos,Точка Серија броеви
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаќање помирување на плаќање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Даночни средства
 DocType: BOM Item,BOM No,Бум Не
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Весник Влегување {0} нема сметка {1} или веќе се споредуваат со други ваучер
 DocType: Item,Moving Average,Се движат просек
 DocType: BOM Replace Tool,The BOM which will be replaced,Бум на која ќе биде заменет
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Нова берза UOM мора да бидат различни од сегашните акции UOM
 DocType: Account,Debit,Дебитна
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листови мора да бидат распределени во мултипли од 0,5"
 DocType: Production Order,Operation Cost,Оперативни трошоци
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Внеси посетеност од CSV датотека
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Најдобро Амт
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Стандардната цена центар
 DocType: Purchase Invoice,End Date,Крај Датум
 DocType: Employee,Internal Work History,Внатрешна работа Историја
-DocType: DocField,Column Break,Колона Break
-DocType: Event,Thursday,Четврток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Приватни инвестициски фондови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Претворајќи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Одржана на
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство Точка
 ,Employee Information,Вработен информации
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Стапка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Стапка (%)
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансиска година Крај Датум
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Намалување на заработка за неплатено отсуство (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Обичните Leave
 DocType: Batch,Batch ID,Серија проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Забелешка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Краток преглед на оваа недела
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} мора да биде купена или под-договор ставка во ред {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
 DocType: GL Entry,Party,Партија
 DocType: Sales Order,Delivery Date,Датум на испорака
-DocType: DocField,Currency,Валута
 DocType: Opportunity,Opportunity Date,Можност Датум
 DocType: Purchase Receipt,Return Against Purchase Receipt,Врати против Набавка Потврда
 DocType: Purchase Order,To Bill,Бил
 DocType: Material Request,% Ordered,Нареди%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Плаќаат на парче
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Плаќаат на парче
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Купување стапка
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
 DocType: Employee,History In Company,Во историјата на компанијата
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,За да дискутираат
 DocType: SMS Settings,SMS Settings,SMS Settings
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремени сметки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Црна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,Бум експлозија Точка
 DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум на завршување на периодот тековниот ред е
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Направете Понуда писмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Враќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
-DocType: DocField,Fold,Пати
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Стандардно единица мерка за варијанта мора да биде иста како Шаблон
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
 DocType: Project Task,Pending Review,Во очекување Преглед
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Ве молиме наведете
 DocType: Task,Total Expense Claim (via Expense Claim),Вкупно расходи барање (преку трошоците барање)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id на купувачи
-DocType: Page,Page Name,Страница Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,На време мора да биде поголем од Time
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацински {0}: Родител на сметка {1} не bolong на компанијата {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Вретено завршна обработка
 DocType: BOM,Last Purchase Rate,Последните Набавка стапка
 DocType: Account,Asset,Средства
 DocType: Project Task,Task ID,Задача проект
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","на пример, &quot;MC&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","на пример, &quot;MC&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Акции не може да постои на точка {0} бидејќи има варијанти
 ,Sales Person-wise Transaction Summary,Продажбата на лице-мудар Преглед на трансакциите
-DocType: System Settings,Time Zone,Временска зона
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Магацински {0} не постои
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирајте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечен Процентите Дистрибуција
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,На избраната ставка не може да има Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% На материјалите доставени од ова за испорака
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Хефтање
 DocType: Customer,Customer Details,Детали за корисници
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Обликување
 DocType: Employee,Reports to,Извештаи до
 DocType: SMS Settings,Enter url parameter for receiver nos,Внесете URL параметар за примачот бр
 DocType: Sales Invoice,Paid Amount,Уплатениот износ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Затворање на сметка {0} мора да биде од типот &quot;одговорност&quot;
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управување со квалитет
 DocType: Production Planning Tool,Filter based on customer,Филтер врз основа на клиент
 DocType: Payment Tool Detail,Against Voucher No,Против ваучер Не
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 DocType: Tax Rule,Purchase,Купување
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Биланс Количина
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Биланс Количина
 DocType: Item Group,Parent Item Group,Родител Точка група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Трошковни центри
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Магацини.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Магацини.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Стапка по која добавувачот валута е претворена во основна валута компанијата
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ред # {0}: Timings конфликти со ред {1}
 DocType: Opportunity,Next Contact,Следна Контакт
 DocType: Employee,Employment Type,Тип на вработување
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,"Основни средства,"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Период апликација не може да биде во две alocation евиденција
 DocType: Item Group,Default Expense Account,Стандардно сметка сметка
 DocType: Employee,Notice (days),Известување (во денови)
-DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
 DocType: Employee,Encashment Date,Датум на инкасо
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Против ваучер типот мора да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Account,Stock Adjustment,Акциите прилагодување
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Постои Цена стандардно активност за Тип на активност - {0}
 DocType: Production Order,Planned Operating Cost,Планираните оперативни трошоци
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Нов {0} Име
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Ви доставуваме # {0} {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Ви доставуваме # {0} {1}
 DocType: Job Applicant,Applicant Name,Подносител на барањето Име
 DocType: Authorization Rule,Customer / Item Name,Клиент / Item Име
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Сериски Не е задолжително за Точка {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ве молиме наведете од / до движат
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Создадена од страна
 DocType: Serial No,Under AMC,Според АМЦ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Точка стапка вреднување е пресметаните оглед слета ваучер износ на трошоците
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Стандардните поставувања за продажба трансакции.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Минимален износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање на готовите производи
 DocType: Workstation,per hour,на час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серија {0} веќе се користи во {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Сметка за складиште (Вечен Инвентар) ќе бидат создадени во рамките на оваа сметка.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Уплатениот износ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Проект менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
 DocType: Customer,Default Taxes and Charges,Стандардно даноци и давачки
 DocType: Account,Receivable,Побарувања
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
 DocType: Sales Invoice,Supplier Reference,Добавувачот Референтен
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако е обележано, Бум за под-собранието предмети ќе се смета за добивање на суровини. Инаку, сите објекти под-собранието ќе бидат третирани како суровина."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Продавачот Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Ставка Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Сапун и детергент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Филмски и видео
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапун и детергент
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Филмски и видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
 DocType: Warehouse,Warehouse Name,Магацински Име
 DocType: Naming Series,Select Transaction,Изберете Трансакција
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Стапка на материјали врз основа на
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддршка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанијата се водат за исчезнати во магацини {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Акции UOM Заменете комунални
 DocType: POS Profile,Terms and Conditions,Услови и правила
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Датум треба да биде во рамките на фискалната година. Претпоставувајќи Да најдам = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете да одржите висина, тежина, алергии, медицински проблеми итн"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,За производство
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ве молиме внесете продажба со цел во горната табела
 DocType: Project Task,View Task,Види Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Вашата финансиска година започнува на
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Вашата финансиска година започнува на
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ве молиме внесете Набавка Разписки
 DocType: Sales Invoice,Get Advances Received,Се аванси
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Поставување на дојдовен сервер за поддршка мејл ID. (На пр support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Salary Slip,Salary Slip,Плата фиш
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Да најдам &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерирање пакување измолкнува за пакети да бидат испорачани. Се користи за да го извести пакет број, содржината на пакетот и неговата тежина."
 DocType: Sales Invoice Item,Sales Order Item,Продај Побарувања Точка
 DocType: Salary Slip,Payment Days,Плаќање дена
 DocType: BOM,Manage cost of operations,Управување со трошоците на работење
 DocType: Features Setup,Item Advanced,Точка Напредно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло валање
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Кога било кој од обележаните трансакции се &quot;поднесе&quot;, е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани &quot;Контакт&quot; во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Општи нагодувања
 DocType: Employee Education,Employee Education,Вработен образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
 DocType: Salary Slip,Net Pay,Нето плати
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериски № {0} е веќе доби
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
 DocType: Expense Claim,Total Claimed Amount,Вкупно Тврдеше Износ
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенцијалните можности за продажба.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Боледување
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Неважечки {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Боледување
 DocType: Email Digest,Email Digest,Е-билтени
 DocType: Delivery Note,Billing Address Name,Платежна адреса Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Одделот на мало
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Систем биланс
-DocType: Workflow,Is Active,Е активен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Одделот на мало
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Систем биланс
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зачувај го документот во прв план.
 DocType: Account,Chargeable,Наплатени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Промена Кратенка
-DocType: Workflow State,Primary,Основно
 DocType: Expense Claim Detail,Expense Date,Датум на сметка
 DocType: Item,Max Discount (%),Макс попуст (%)
-DocType: Communication,More Information,Повеќе информации
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Последна нарачана Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Детонација
 DocType: Company,Warn,Предупреди
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Точка вреднување ажурирани
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
 DocType: BOM,Manufacturing User,Производство пристап
 DocType: Purchase Order,Raw Materials Supplied,Суровини Опрема што се испорачува
 DocType: Purchase Invoice,Recurring Print Format,Повторувачки печатење формат
-DocType: Communication,Series,Серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Се очекува испорака датум не може да биде пред нарачка Датум
 DocType: Appraisal,Appraisal Template,Процена Шаблон
-DocType: Communication,Email,Е-пошта
 DocType: Item Group,Item Classification,Точка Класификација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Бизнис менаџер за развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Бизнис менаџер за развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржување Посетете Цел
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период
 ,General Ledger,Општи Леџер
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Ве молиме изберете {0} Првиот
 DocType: Features Setup,To get Item Group in details table,За да се добие Точка група во детали маса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прецртуваат
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Серија {0} од точка {1} е истечен.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Гравирање
 DocType: Sales Invoice,Commission,Комисијата
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Стандардно Шаблон </h4><p> Користи <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> и сите области на адресата (вклучувајќи сопствени полиња, ако ги има) ќе биде достапен </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Стандардно Износ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Магацински не се најде во системот
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Магацински не се најде во системот
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Резиме Овој месец
 DocType: Quality Inspection Reading,Quality Inspection Reading,Квалитет инспекција читање
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
 DocType: Payment Tool,Get Outstanding Vouchers,Земете Најдобро Ваучери
 DocType: Warranty Claim,Resolved By,Реши со
 DocType: Appraisal,Start Date,Датум на почеток
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Вредност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Распредели листови за одреден период.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликни тука за да се потврди
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Просечно време преземени од страна на снабдувачот да испорача
 DocType: Time Log,Hours,Часа
 DocType: Project,Expected Start Date,Се очекува Почеток Датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Тркалање
-DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Отстрани точка ако обвиненијата не се применува на таа ставка
-DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox пристап
-DocType: Dropbox Backup,Weekly,Неделен
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,На пр. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Добивате
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Добивате
 DocType: Maintenance Visit,Fully Completed,Целосно завршен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Целосно
 DocType: Employee,Educational Qualification,Образовните квалификации
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} е успешно додаден во нашиот листа Билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,"Електрони, зрак обработка"
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Главни извештаи
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Акции Леџер записи салда ажурирани
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни извештаи
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Додај / Уреди цени
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Шема на трошоците центри
 ,Requested Items To Be Ordered,Бара предмети да се средат
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мои нарачки
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мои нарачки
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производство
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Одделение
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Одделение
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Нарачани да бидат испорачани
 DocType: Account,Income,Приходи
-,Setup Wizard,Советник за подесување
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто не беше во ред!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Продај фактура {0} е веќе испратена
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Датум на завршување
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Леене
-DocType: Email Alert,Reference Date,Референтен датум
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Организациона единица (оддел) господар.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ве молиме внесете валидна мобилен бр
 DocType: Budget Detail,Budget Detail,Буџетот Детална
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ве молиме внесете ја пораката пред испраќањето
-DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Акции UOM ажурирани за Точка {0}
-DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Продажба Профил
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ве молиме инсталирајте SMS Settings
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време Вклучи {0} веќе најавена
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Сериски Нема договор за услуги Важи
 DocType: Item,Unit of Measure Conversion,Единица мерка конверзија
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Работникот не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
 DocType: Naming Series,Help HTML,Помош HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Додаток за надминување {0} преминал за Точка {1}
 DocType: Address,Name of person or organization that this address belongs to.,Име на лицето или организацијата која оваа адреса припаѓа.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Вашите добавувачи
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Вашите добавувачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Уште една плата структура {0} е активен за вработен {1}. Ве молиме да го направи својот статус како &quot;неактивен&quot; за да продолжите.
 DocType: Purchase Invoice,Contact,Контакт
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Добиени од
 DocType: Features Setup,Exports,Извозот
 DocType: Lead,Converted,Конвертираната
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 DocType: Issue,Content Type,Типот на содржина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компјутер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компјутер
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа точка во повеќе групи на веб страната.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Точка: {0} не постои во системот
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Cost Center,Budgets,Буџети
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ажурирани
 DocType: Employee,Emergency Contact Details,Итни Контакт Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Што да направам?
-DocType: Delivery Note,To Warehouse,Да се Магацински
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Што да направам?
+DocType: Delivery Note,To Warehouse,Да се Магацински
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},На сметка {0} е внесен повеќе од еднаш за фискалната година {1}
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електрични
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електрични
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно разликата вредност (Out - Во)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID на корисникот не е поставена за вработените {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од Гаранција побарување
 DocType: Stock Entry,Default Source Warehouse,Стандардно Извор Магацински
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Роденден Потсетник за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дена од денот на нарачка
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дена од денот на нарачка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
-DocType: User,Enabled,Овозможено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Акции средства
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Дали навистина сакате да ги достават сите Плата фиш за месец {0} и годината {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Увоз претплатници
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Моментов
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Испратница {0} не мора да се поднесе
 DocType: Notification Control,Sales Invoice Message,Порака Продај фактура
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Завршната сметка {0} мора да биде од типот Одговорност / инвестициски фондови
 DocType: Authorization Rule,Based On,Врз основа на
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна активност / задача.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генерирање на исплатните листи
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не е валиден-мејл ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Купување мора да се провери, ако е применливо за е избран како {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Попуст смее да биде помал од 100
-DocType: ToDo,Low,Ниски
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Врти
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Потребно е име на кампања
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Receipt Item,Rejected Serial No,Одбиени Сериски Не
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Длабоко извлекување
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Нов Билтен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Прикажи Биланс
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Возбудлив
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
 ,Sales Analytics,Продажбата анализи
 DocType: Manufacturing Settings,Manufacturing Settings,Settings производство
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Нови име на сметка
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини и материјали обезбедени Цена
 DocType: Selling Settings,Settings for Selling Module,Поставки за продажба Модул
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Услуги за Потрошувачи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Услуги за Потрошувачи
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Точка Детали за корисници
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Потврдете ја вашата е-мејл
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Понуда кандидат работа.
 DocType: Notification Control,Prompt for Email on Submission of,Прашај за е-мејл за доставување на
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Вкупно одобрени Листовите се повеќе од дена во периодот
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Точка {0} мора да биде акции Точка
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Стандардно работа во магацин за напредокот
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} е потребно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуум калапи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
-DocType: Contact Us Settings,City,Градот
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучно обработка
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не е валидна проект?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Точка {0} мора да биде Продажбата Точка
 DocType: Naming Series,Update Series Number,Ажурирање Серија број
 DocType: Account,Equity,Капитал
 DocType: Sales Order,Printing Details,Детали за печатење
 DocType: Task,Closing Date,Краен датум
 DocType: Sales Order Item,Produced Quantity,Произведената количина
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Барај Под собранија
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
 DocType: Sales Partner,Partner Type,Тип партнер
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise попуст
 DocType: Purchase Invoice,Against Expense Account,Против сметка сметка
 DocType: Production Order,Production Order,Производството со цел
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Инсталација Забелешка {0} е веќе испратена
 DocType: Quotation Item,Against Docname,Против Docname
 DocType: SMS Center,All Employee (Active),Сите вработените (Активни)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Прикажи Сега
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Суровина трошоци
 DocType: Item,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt шема
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серија освежено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип на излагањето е задолжително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип на излагањето е задолжително
 DocType: Item,Serial Number Series,Сериски број Серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Складиште е задолжително за акциите Точка {0} во ред {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Мало и големо
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Мало и големо
 DocType: Issue,First Responded On,Прво одговорија
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крстот на оглас на точка во повеќе групи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Првата Корисник: Вие
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Првата Корисник: Вие
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успешно помири
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помири
 DocType: Production Order,Planned End Date,Планирани Крај Датум
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Каде што предмети се чуваат.
 DocType: Tax Rule,Validity,Валидноста
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Фактурираниот износ
 DocType: Attendance,Attendance,Публика
-DocType: Page,No,Не
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не е означено, листата ќе мора да се додаде на секој оддел каде што треба да се примени."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Праќање пораки во денот и објавување време е задолжително
@@ -3689,55 +3376,46 @@
 ,Item Prices,Точка цени
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Затворање на ваучер
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ценовник господар.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ценовник господар.
 DocType: Task,Review Date,Преглед Датум
 DocType: Purchase Invoice,Advance Payments,Аконтации
-DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Вкупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Целна магацин во ред {0} мора да биде иста како цел производство
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Мелење
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозвола за користење на плаќање алатката
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Известување-мејл адреси не е наведен за повторување на% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Валута не може да се промени по правење записи со употреба на други валута
 DocType: Company,Round Off Account,Заокружуваат профил
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Грицкање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административни трошоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родител група на потрошувачи
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промени
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","на пример, &quot;Мојата компанија ДОО&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказен рок
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер проект
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ова е коренот територија и не може да се уредува.
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина на апаратот UOM
 DocType: Email Digest,Receivables / Payables,Побарувања / Обврските
 DocType: Delivery Note Item,Against Sales Invoice,Против Продај фактура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Сузбивање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кол од точка добиени по производство / препакување од даден количини на суровини
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Против Продај Побарувања Точка
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 DocType: Task,Actual End Date (via Time Logs),Крај Крај Датум (преку Време на дневници)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ве молиме внесете цена центар родител
 DocType: Delivery Note,Print Without Amount,Печати Без Износ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Категорија данок не може да биде &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot; како и сите предмети се без акции предмети
-DocType: User,Last Name,Презиме
-DocType: Web Page,Left,Лево
-DocType: Event,All Day,Цел ден
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Категорија данок не може да биде &quot;Вреднување&quot; или &quot;вреднување и вкупно&quot; како и сите предмети се без акции предмети
 DocType: Issue,Support Team,Тим за поддршка
 DocType: Appraisal,Total Score (Out of 5),Вкупниот резултат (Од 5)
-DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Биланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Биланс
 DocType: Project,Total Expense Claim (via Expense Claims),Вкупно расходи барање (преку трошоците побарувања)
-DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задолжување
 DocType: Stock Entry,As per Stock UOM,Како по акција UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не е истечен
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создаде правила за ограничување на трансакции врз основа на вредности.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е обележано, Вкупно бр. на работните денови ќе бидат вклучени празници, а со тоа ќе се намали вредноста на платата по ден"
 DocType: Purchase Invoice,Total Advance,Вкупно напредување
-DocType: Workflow State,User,Корисникот
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обработка на платен список
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Постави како изгубени
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаќање Потврда Забелешка
 DocType: Customer,Credit Days Based On,Кредитна дена врз основа на
 DocType: Tax Rule,Tax Rule,Данок Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржување на иста стапка текот продажбата циклус
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План Време на дневници надвор Workstation работно време.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} е веќе испратена
 ,Items To Be Requested,Предмети да се бара
-DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежна стапка врз основа на видот на активности (на час)
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Компанија е-мејл ID не е пронајден, па затоа не пошта испратена"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 DocType: Production Planning Tool,Filter based on item,Филтер врз основа на точка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година Почеток Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Sales Invoice,Rounded Total (Company Currency),Заоблени Вкупно (Фирма валута)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
 DocType: Purchase Common,Purchase Common,Купување Заеднички
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} е изменета. Ве молиме да се одмориме.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп за корисниците од правење Остави апликации на наредните денови.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Од Можност
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Бришење
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Сметки се зголеми на клиенти.
-DocType: DocField,Default,Стандардно
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,Додадени {0} претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинираат Буџетот за оваа цена центар. За да го поставите на буџетот акција, видете &quot;компанијата Листа&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Expense Claim,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избирање на &quot;Да&quot; ќе им даде единствен идентитет на секој субјект на оваа точка која може да се гледа во серија № господар.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
 DocType: Address,Office,Канцеларија
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандардни извештаи
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да се создаде жиро сметка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ве молиме внесете сметка сметка
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да се создаде жиро сметка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
 DocType: Employee,Current Address,Тековна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Серија Инвентар
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Серија Инвентар
 DocType: Employee,Contract End Date,Договор Крај Датум
 DocType: Sales Order,Track this Sales Order against any Project,Следење на овој Продај Побарувања против било кој проект
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Продажбата на налози се повлече (во очекување да се испорача) врз основа на горенаведените критериуми
-DocType: DocShare,Document Type,Тип на документ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Од Добавувачот цитат
 DocType: Deduction Type,Deduction Type,Одбивање Тип
 DocType: Attendance,Half Day,Половина ден
 DocType: Pricing Rule,Min Qty,Мин Количина
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",За следење на предмети во продажба и купување на документи со серија бр. &quot;Склопот Индустрија: Хемикалии&quot;
 DocType: GL Entry,Transaction Date,Датум на трансакција
 DocType: Production Plan Item,Planned Qty,Планирани Количина
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Вкупен данок
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Вкупен данок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Кол (Произведени Количина) се задолжителни
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Фирма валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
 DocType: Notification Control,Purchase Receipt Message,Купување Потврда порака
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Вкупно одобрени Листовите се повеќе од периодот
 DocType: Production Order,Actual Start Date,Старт на проектот Датум
 DocType: Sales Order,% of materials delivered against this Sales Order,% На материјалите доставени од оваа Продај Побарувања
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Рекорд движење точка.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен претплатникот листа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Услуги
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 ,Monthly Salary Register,Месечна плата Регистрирај се
-apps/frappe/frappe/website/template.py +140,Next,Следна
 DocType: Warranty Claim,If different than customer address,Ако се разликува од клиент адреса
 DocType: BOM Operation,BOM Operation,Бум работа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходниот ред Износ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ве молиме внесете исплата Износ во барем еден ред
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ве молиме внесете исплата Износ во барем еден ред
 DocType: POS Profile,POS Profile,POS Профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ред {0}: Плаќањето сума не може да биде поголем од преостанатиот износ за наплата
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Вкупно ненаплатени
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Вкупно ненаплатени
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време најавите не е фактурираните
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купувачот
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Купувачот
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Нето плата со која не може да биде негативен
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ве молиме внесете го Против Ваучери рачно
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ве молиме внесете го Против Ваучери рачно
 DocType: SMS Settings,Static Parameters,Статични параметрите
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Испрати маса SMS порака на вашите контакти
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Сметаат дека даночните или полнење за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Крос-тркалање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Со кредитна картичка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Со кредитна картичка
 DocType: BOM,Item to be manufactured or repacked,"Елемент, за да се произведе или да се препакува"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Стандардните поставувања за акциите трансакции.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Стандардните поставувања за акциите трансакции.
 DocType: Purchase Invoice,Next Date,Следниот датум
 DocType: Employee Education,Major/Optional Subjects,Големи / изборни предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ве молиме внесете даноци и такси
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
 DocType: Sales Invoice Item,Drop Ship,Капка Брод
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тука може да го задржи семејството детали како име и окупација на родител, брачен другар и деца"
 DocType: Hub Settings,Seller Name,Продавачот Име
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Мора да ги зачувате форма пред да продолжите
 DocType: Item Attribute,Numeric Values,Нумерички вредности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикачи Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Прикачи Logo
 DocType: Customer,Commission Rate,Комисијата стапка
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Апликации одмор блок од страна на одделот.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Кошничка е празна
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Корен не може да се уредува.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Распределени износ може да не е поголема од износот unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корен не може да се уредува.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Распределени износ може да не е поголема од износот unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Овозможете производството за празниците
 DocType: Sales Order,Customer's Purchase Order Date,Клиентите нарачка Датум
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Ве молиме изберете CSV датотека
-DocType: Dropbox Backup,Send Backups to Dropbox,Испрати бекап на Dropbox
 DocType: Purchase Order,To Receive and Bill,За да примите и Бил
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови и правила Шаблон
 DocType: Serial No,Delivery Details,Детали за испорака
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматски се создаде материјал барањето, доколку количината паѓа под ова ниво"
 ,Item-wise Purchase Register,Точка-мудар Набавка Регистрирај се
 DocType: Batch,Expiry Date,Датумот на истекување
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да го поставите нивото редоследот точка мора да биде Набавка Точка или Производство Точка
 ,Supplier Addresses and Contacts,Добавувачот адреси и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Господар на проектот.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полудневен)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Полудневен)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се предмети од бирото
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Се предмети од бирото
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Водач Време дена
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Бил на материјали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
-DocType: Dropbox Backup,Send Notifications To,Доставуваат известувања до
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Причина за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,На сметка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,На сметка {0} не постои
 DocType: Account,Cash,Пари
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за веб-страница и други публикации.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ве молиме да се создаде Плата структура за вработен {0}

diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index cfb93c9..471a5e2 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,पगार मोड
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","तुम्ही हंगामी आधारित ट्रॅक करू इच्छित असल्यास, मासिक वितरण निवडा."
 DocType: Employee,Divorced,घटस्फोट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,चेतावनी: समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,चेतावनी: समान आयटम अनेक वेळा केलेला आहे.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,आयटम आधीच समक्रमित
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,आयटम व्यवहार अनेक वेळा जोडले जाण्यास अनुमती द्या
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,साहित्य भेट द्या {0} या हमी दावा रद्द आधी रद्द करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,ग्राहक उत्पादने
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,प्रथम पक्ष प्रकार निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,ग्राहक आयटम
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,खाते {0}: पालक खाते {1} एक खातेवही असू शकत नाही
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com करण्यासाठी आयटम प्रकाशित
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Approvers सोडा
 DocType: Sales Partner,Dealer,विक्रेता
 DocType: Employee,Rented,भाड्याने
-DocType: About Us Settings,Website,वेबसाइट
 DocType: POS Profile,Applicable for User,वापरकर्ता लागू
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविले उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती बूच"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,कॉम्पॅक्शन अधिक sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहार हिशोब केला जाईल.
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,साहित्य विनंती पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,साहित्य विनंती पासून
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} वृक्ष
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,अधिक परिणाम नाहीत.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,कायदेशीर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,कायदेशीर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},वास्तविक प्रकार कर सलग आयटम दर समाविष्ट केले जाऊ शकत नाही {0}
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,करून आवश्यक
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,नाव टाइप करा सोडा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,शिवणकाम
 DocType: Pricing Rule,Apply On,रोजी लागू करा
 DocType: Item Price,Multiple Item prices.,एकाधिक आयटम भाव.
 ,Purchase Order Items To Be Received,पर्चेस आयटम प्राप्त करण्यासाठी
 DocType: SMS Center,All Supplier Contact,सर्व पुरवठादार संपर्क
 DocType: Quality Inspection Reading,Parameter,मापदंड
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,नवी रजेचा अर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड  चा शोध करण्यासाठी करावा 
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,रो # {0}: दर सारखाच असणे आवश्यक आहे {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,नवी रजेचा अर्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,बँक ड्राफ्ट
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. या पर्याय चा वापर ग्राहक नुसार आयटम कोड ठेवणे आणि आयटम कोड  चा शोध करण्यासाठी करावा
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खाते मोड
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,दर्शवा रूपे
-DocType: Sales Invoice Item,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,प्रमाण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी नियुक्त केले आहे {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,नवीन पीओएस प्रोफाइल करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,हेल्थ केअर
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
 DocType: Purchase Invoice,Monthly,मासिक
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),भरणा विलंब (दिवस)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ई-मेल पत्ता
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,संरक्षण
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ई-मेल पत्ता
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,संरक्षण
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},रो {0}: {1} {2} सह जुळत नाही {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,रो # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,रो # {0}:
 DocType: Delivery Note,Vehicle No,वाहन नाही
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,किंमत सूची निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,लाकडीकामाच्या
 DocType: Production Order Operation,Work In Progress,प्रगती मध्ये कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D छपाई
 DocType: Employee,Holiday List,सुट्टी यादी
 DocType: Time Log,Time Log,वेळ लॉग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,फडणवीस
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,फडणवीस
 DocType: Cost Center,Stock User,शेअर सदस्य
 DocType: Company,Phone No,फोन नाही
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","कार्यक्रमांचे लॉग, बिलिंग वेळ ट्रॅक वापरले जाऊ शकते कार्ये वापरकर्त्यांना केले."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},नवी {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},नवी {0}: # {1}
 ,Sales Partners Commission,विक्री भागीदार आयोग
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,5 पेक्षा जास्त वर्ण असू शकत नाही संक्षेप
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",मूल्य {0} {1} आयटम म्हणून रूपे \ काढले जाऊ शकत नाही विशेषता या विशेषता सह अस्तित्वात.
-DocType: Print Settings,Classic,क्लासिक
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,या रूट खाते आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: BOM,Operations,ऑपरेशन्स
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},साठी सवलत आधारावर अधिकृतता सेट करू शकत नाही {0}
 DocType: Bin,Quantity Requested for Purchase,प्रमाण खरेदी विनंती
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दोन स्तंभ, जुना नाव आणि एक नवीन नाव एक .csv फाइल संलग्न"
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,किलो
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,किलो
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,जॉब साठी उघडत आहे.
 DocType: Item Attribute,Increment,बढती
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,वखार निवडा ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,जाहिरात
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,जाहिरात
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनी एकदा पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},परवानगी नाही {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 DocType: Payment Reconciliation,Reconcile,समेट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,किराणा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,बँक प्रवेश करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,पेन्शन फंड्स
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,खाते प्रकार कोठार असेल तर कोठार अनिवार्य आहे
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","चेक आदेश आवर्ती तर, आवर्ती थांबवू किंवा योग्य अंतिम तारीख ठेवणे अनचेक"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
 DocType: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
-DocType: Blog Post,Guest,अतिथी
 DocType: Quality Inspection,Get Specification Details,तपशील तपशील मिळवा
 DocType: Lead,Interested,इच्छुक
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,साहित्य बिल
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,उघडणे
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,उघडणे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},पासून {0} करण्यासाठी {1}
 DocType: Item,Copy From Item Group,आयटम गट पासून कॉपी
 DocType: Journal Entry,Opening Entry,उघडणे प्रवेश
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} अनिवार्य आहे
 DocType: Stock Entry,Additional Costs,अतिरिक्त खर्च
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट रूपांतरीत केले जाऊ शकत नाही.
 DocType: Lead,Product Enquiry,उत्पादन चौकशी
-DocType: Standard Reply,Owner,मालक
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,पहिल्या कंपनी प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,पहिल्या कंपनी निवडा कृपया
 DocType: Employee Education,Under Graduate,पदवीधर अंतर्गत
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,लक्ष्य रोजी
 DocType: BOM,Total Cost,एकूण खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,क्रियाकलाप लॉग:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,{0} आयटम प्रणाली अस्तित्वात नाही किंवा कालबाह्य झाले आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,स्थावर मालमत्ता
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,{0} आयटम प्रणाली अस्तित्वात नाही किंवा कालबाह्य झाले आहे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,स्थावर मालमत्ता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,खाते स्टेटमेंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
 DocType: Expense Claim Detail,Claim Amount,दाव्याची रक्कम
 DocType: Employee,Mr,श्री
-DocType: Custom Script,Client,क्लायंट
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
 DocType: Naming Series,Prefix,पूर्वपद
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumable
 DocType: Upload Attendance,Import Log,आयात लॉग
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,पाठवा
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक पगार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,वार्षिक पगार
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,शेअर खर्च
 DocType: Newsletter,Email Sent?,ई-मेल पाठविले?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,दर्शवा वेळ नोंदी
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
 DocType: Delivery Note,Installation Status,प्रतिष्ठापन स्थिती
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty नाकारलेले स्वीकृत + आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक {0}
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,आयटम {0} खरेदी आयटम असणे आवश्यक आहे
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", साचा डाउनलोड योग्य माहिती भरा आणि नवीन संचिकेशी संलग्न. निवडलेल्या कालावधीच्या सर्व तारखा आणि कर्मचारी संयोजन विद्यमान उपस्थिती रेकॉर्ड, टेम्पलेट येईल"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,{0} आयटम सक्रिय नाही किंवा आयुष्याच्या शेवटी गाठली आहे
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,विक्री चलन सबमिट केल्यानंतर अद्यतनित केले जाईल.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","आयटम दर सलग {0} कर समाविष्ट करण्यासाठी, पंक्ती मध्ये कर {1} समाविष्ट करणे आवश्यक आहे"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,सरळ
 DocType: BOM Replace Tool,New BOM,नवी BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,बॅच बिलिंग वेळ नोंदी.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity निर्णायक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,वृत्तपत्र यापूर्वीच पाठविला गेला आहे
 DocType: Lead,Request Type,विनंती प्रकार
 DocType: Leave Application,Reason,कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,कार्यवाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,प्रणाली व्यवस्थापक होईल प्रथम वापरकर्ता (आपण हे नंतर बदलू शकता).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,कार्यवाही
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,प्रणाली व्यवस्थापक होईल प्रथम वापरकर्ता (आपण हे नंतर बदलू शकता).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ऑपरेशन तपशील चालते.
 DocType: Serial No,Maintenance Status,देखभाल स्थिती
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,आयटम आणि ती
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,आयटम आणि ती
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},तारीख पासून आर्थिक वर्षात आत असावे. तारीख पासून गृहीत धरून = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,तुम्ही मूल्यमापन तयार ज्यांच्याकडून कर्मचारी निवडा.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},केंद्र {0} कंपनी संबंधित नाही किंमत {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्री लागू असणे आवश्यक आहे
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},प्रतिष्ठापन तारीख आयटम वितरणाची तारीख आधी असू शकत नाही {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),दर सूची रेट सूट (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,प्रारंभ
-DocType: User,First Name,प्रथम नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,पूर्ण-मूस निर्णायक
 DocType: Offer Letter,Select Terms and Conditions,निवडा अटी आणि नियम
 DocType: Production Planning Tool,Sales Orders,विक्री ऑर्डर
 DocType: Purchase Taxes and Charges,Valuation,मूल्यांकन
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,बँक खाते
 DocType: Leave Type,Allow Negative Balance,नकारात्मक शिल्लक परवानगी द्या
 DocType: Selling Settings,Default Territory,मुलभूत प्रदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,दूरदर्शन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},खाते {0} कंपनी संबंधित नाही {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
 DocType: Customer Group,Mention if non-standard receivable account applicable,"उल्लेख करावा, गैर-मानक प्राप्त खाते लागू असल्यास"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,कोठार सादर करा करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,प्राप्त
 DocType: Sales Partner,Reseller,विक्रेता
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,कंपनी प्रविष्ट करा
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},पुढील आवर्ती {0} वर तयार केले जाईल {1}
 DocType: Newsletter List,Total Subscribers,एकूण सदस्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,संपर्क नाव
+,Contact Name,संपर्क नाव
 DocType: Production Plan Item,SO Pending Qty,त्यामुळे प्रलंबित Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,वर उल्लेख केलेल्या निकष पगार स्लिप तयार.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,खरेदीसाठी विनंती.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,डबल गृहनिर्माण
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा मंजुरी या रजेचा अर्ज सादर करू शकतो
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,तारीख relieving प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,दर वर्षी नाही
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} सेटअप&gt; सेटिंग्ज द्वारे&gt; नामांकन मालिका मालिका नामांकन सेट करा
 DocType: Time Log,Will be updated when batched.,बॅच तेव्हा अद्यतनित केले जाईल.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,रो {0}: तपासा खाते विरुद्ध &#39;आगाऊ आहे&#39; {1} हा एक आगाऊ नोंद आहे तर.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},{0} कोठार कंपनी संबंधित नाही {1}
-DocType: Bulk Email,Message,संदेश
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
-DocType: Dropbox Backup,Dropbox Access Key,ड्रॉपबॉक्स प्रवेश की
 DocType: Payment Tool,Reference No,संदर्भ नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,सोडा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,वार्षिक
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,सोडा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},आयटम {0} वर जीवनाची ओवरनंतर गाठली आहे {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन नाही
 DocType: Material Request Item,Min Order Qty,किमान ऑर्डर Qty
 DocType: Lead,Do Not Contact,संपर्क करू नका
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,सर्व आवर्ती पावत्या ट्रॅक अद्वितीय आयडी. हे सबमिट निर्माण होते.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेअर डेव्हलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान Qty
 DocType: Pricing Rule,Supplier Type,पुरवठादार प्रकार
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरेदी करण्यासाठी &#39;कच्चा माल प्रदान&#39; टेबल आढळले नाही आयटम {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,वायर घासणे
 DocType: Employee,Relation,नाते
 DocType: Shipping Rule,Worldwide Shipping,जगभरातील शिपिंग
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,ग्राहक समोर ऑर्डर.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,पत्ता HTML
 DocType: Lead,Mobile No.,मोबाइल क्रमांक
 DocType: Maintenance Schedule,Generate Schedule,वेळापत्रक व्युत्पन्न
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,खर्च प्रमुख
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,पहिल्या शुल्क प्रकार निवडा
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ताज्या
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,कमाल 5 वर्ण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,आपली भाषा निवडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,कमाल 5 वर्ण
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",उत्पादन ऑर्डर विरुद्ध वेळ नोंदी निर्माण अक्षम करा. संचालन उत्पादन आदेशा माग काढला जाऊ नये
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,जिच्यामध्ये variant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,आयटम {0} सेवा आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',पेक्षा &#39;Qty निर्मिती करणे&#39; पूर्ण Qty जास्त असू शकत नाही
-DocType: DocType,Administrator,प्रशासक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,लेझर ड्रिलिंग
-DocType: Stock UOM Replace Utility,New Stock UOM,नवीन स्टॉक UOM
 DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद
 DocType: Employee,External Work History,बाह्य कार्य इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
-DocType: Communication,Closed,बंद
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,आपण डिलिव्हरी टीप जतन एकदा शब्द (निर्यात) मध्ये दृश्यमान होईल.
 DocType: Lead,Industry,उद्योग
 DocType: Employee,Job Profile,कामाचे
 DocType: Newsletter,Newsletter,वृत्तपत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,आयटम सुधारित केले आहे
-DocType: Async Task,System Manager,प्रणाली व्यवस्थापक
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
 DocType: Sales Invoice Item,Delivery Note,डिलिव्हरी टीप
-DocType: Dropbox Backup,Allow Dropbox Access,ड्रॉपबॉक्स प्रवेश परवानगी द्या
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,कर सेट अप
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो धावा केल्यानंतर भरणा प्रवेश सुधारणा करण्यात आली आहे. पुन्हा तो खेचणे करा.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,या आठवड्यात आणि प्रलंबित उपक्रम सारांश
 DocType: Workstation,Rent Cost,भाडे खर्च
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,महिना आणि वर्ष निवडा कृपया
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,कंपनी ईमेल
 DocType: GL Entry,Debit Amount in Account Currency,खाते चलनात डेबिट रक्कम
 DocType: Shipping Rule,Valid for Countries,देश वैध
-DocType: Workflow State,Refresh,रिफ्रेश
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","चलन, रूपांतर दर, आयात एकूण, आयात गोळाबेरीज इत्यादी सर्व आयात संबंधित फील्ड खरेदी पावती, पुरवठादार कोटेशन, खरेदी चलन, पर्चेस इ उपलब्ध आहेत"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहार वापरले जाऊ शकत नाही. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,मानले एकूण ऑर्डर
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,प्रविष्ट फील्ड मूल्य दिन &#39;म्हणून महिना या दिवशी पुनरावृत्ती&#39; करा
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,प्रविष्ट फील्ड मूल्य दिन &#39;म्हणून महिना या दिवशी पुनरावृत्ती&#39; करा
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ग्राहक चलन ग्राहकाच्या बेस चलनात रुपांतरीत आहे जे येथे दर
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, डिलिव्हरी टीप, खरेदी चलन, उत्पादन आदेश, पर्चेस, खरेदी पावती, विक्री चलन, विक्री आदेश, शेअर प्रवेश, Timesheet उपलब्ध"
 DocType: Item Tax,Tax Rate,कर दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,आयटम निवडा
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,आयटम निवडा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल, त्याऐवजी वापर स्टॉक प्रवेश \ शेअर मेळ वापर समेट जाऊ शकत नाही व्यवस्थापित"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,चलन {0} आधीच सादर खरेदी
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच कोणत्याही समान असणे आवश्यक आहे {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,खरेदी पावती सादर करणे आवश्यक आहे
-DocType: Stock UOM Replace Utility,Current Stock UOM,वर्तमान शेअर UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,एक आयटम बॅच (भरपूर).
 DocType: C-Form Invoice Detail,Invoice Date,चलन तारीख
 DocType: GL Entry,Debit Amount,डेबिट रक्कम
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},फक्त कंपनी दर 1 खाते असू शकते {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,आपला ई-मेल पत्ता
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,संलग्नक पहा कृपया
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,संलग्नक पहा कृपया
 DocType: Purchase Order,% Received,% प्राप्त
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,वॉटर जेट कटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
 ,Finished Goods,तयार वस्तू
 DocType: Delivery Note,Instructions,सूचना
 DocType: Quality Inspection,Inspected By,करून पाहणी केली
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,ग्राहक आणि पुरवठादार साठी खाती तयार करू नका. ते ग्राहक / पुरवठादार मालकांकडून थेट तयार आहेत.
 DocType: Currency Exchange,Currency Exchange,चलन विनिमय
 DocType: Purchase Invoice Item,Item Name,आयटम नाव
+DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य वरील) वापरकर्ता मंजूर
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,क्रेडिट शिल्लक
 DocType: Employee,Widowed,विधवा झालेली किंवा विधुर झालेला
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",आयटम अंदाज qty आणि किमान qty आधारित सर्व गोदामे विचार जे &quot;स्टॉक संपला&quot; आहेत विनंती करणे
@@ -378,22 +346,21 @@
 ,Purchase Register,खरेदी नोंदणी
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
 DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा मंजुरी' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,वैद्यकीय
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,तोट्याचा कारण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,नळी मण्यांचे काम
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 DocType: Employee,Single,सिंगल
 DocType: Issue,Attachment,संलग्नक
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,अर्थसंकल्पात गट खर्च केंद्र सेट केली जाऊ शकत नाही
 DocType: Account,Cost of Goods Sold,माल किंमत विक्री
 DocType: Purchase Invoice,Yearly,वार्षिक
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
 DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,सरासरी. विक्री दर
 DocType: Purchase Order,Start date of current order's period,चालू ऑर्डरच्या कालावधी प्रारंभ तारीख
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},प्रमाण एकापाठोपाठ एक अपूर्णांक असू शकत नाही {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},प्रमाण एकापाठोपाठ एक अपूर्णांक असू शकत नाही {0}
 DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,पहिल्या कंपनीचे नाव प्रविष्ट करा
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,आहे गट
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,स्वयंचलितपणे FIFO आधारित संख्या सिरिअल सेट
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,चेक पुरवठादार चलन क्रमांक वेगळेपण
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','प्रकरण क्रमांक' पेक्षा 'प्रकरण क्रमांक पासून' कमी असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,ना नफा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,ना नफा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,प्रारंभ नाही
 DocType: Lead,Channel Partner,चॅनेल पार्टनर
 DocType: Account,Old Parent,जुने पालक
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,फ्रोजन पर्यंत खाती
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवड
+DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडले फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,सुट्टी मास्टर.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,शेल काठ
 DocType: Material Request Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
 DocType: BOM,Costing,भांडवलाच्या
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,एकूण Qty
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,श्रेणी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,सिक्युरिटीज आणि ठेवी
 DocType: Features Setup,Imports,आयात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,चिकटवता बाँडिंग
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,वाटप एकूण पाने अनिवार्य आहे
 DocType: Job Opening,Description of a Job Opening,एक जॉब ओपनिंग वर्णन
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,आज प्रलंबित उपक्रम
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,उपस्थित रेकॉर्ड.
 DocType: Bank Reconciliation,Journal Entries,जर्नल नोंदी
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
-DocType: System Settings,Loading...,लोड करीत आहे ...
-DocType: DocField,Password,पासवर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,लघुप्रतिमा पदच्युती मॉडेलिंग
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिया दरम्यान वेळ
 DocType: Customer,Buyer of Goods and Services.,वस्तू आणि सेवा खरेदीदार.
 DocType: Journal Entry,Accounts Payable,देय खाती
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,सदस्य जोडा
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;अस्तित्वात नाही
 DocType: Pricing Rule,Valid Upto,वैध पर्यंत
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांना काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,आपल्या ग्राहकांना काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,थेट उत्पन्न
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासकीय अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,प्रशासकीय अधिकारी
 DocType: Payment Tool,Received Or Paid,मिळालेली किंवा दिलेली
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,कंपनी निवडा कृपया
 DocType: Stock Entry,Difference Account,फरक खाते
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,साहित्य विनंती उठविला जाईल जे भांडार प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-DocType: DocField,Type,प्रकार
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
-DocType: Communication,Subject,विषय
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 ,Serial No Warranty Expiry,सिरियल कोणतीही हमी कालावधी समाप्ती
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,आयटम
 DocType: Journal Entry,Difference (Dr - Cr),फरक (डॉ - कोटी)
 DocType: Account,Profit and Loss,नफा व तोटा
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,व्यवस्थापकीय Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,नवी UOM प्रकार होल क्रमांक असणे आवश्यक नाही
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,व्यवस्थापकीय Subcontracting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,फर्निचर आणि वस्तू
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,दर प्राईस यादी चलन येथे कंपनीच्या बेस चलनात रुपांतरीत आहे
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},{0} खाते कंपनी संबंधित नाही: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,साहित्य आवश्यकता
 DocType: Company,Delete Company Transactions,कंपनी व्यवहार हटवा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,आयटम {0} खरेदी नाही आयटम
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;सूचना \ ई-मेल पत्ता&#39; अवैध ईमेल पत्ता आहे
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,एकूण बिलिंग हे वर्ष:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,एकूण बिलिंग हे वर्ष:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ संपादित करा कर आणि शुल्क जोडा
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन नाही
 DocType: Territory,For reference,संदर्भासाठी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","हटवू शकत नाही सिरियल नाही {0}, तो स्टॉक व्यवहार वापरले जाते म्हणून"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),बंद (कोटी)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),बंद (कोटी)
 DocType: Serial No,Warranty Period (Days),वॉरंटी कालावधी (दिवस)
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 ,Pending Qty,प्रलंबित Qty
 DocType: Job Applicant,Thread HTML,थ्रेड HTML
 DocType: Company,Ignore,दुर्लक्ष करा
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},एसएमएस खालील संख्या पाठविले: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
 DocType: Pricing Rule,Valid From,पासून पर्यंत वैध
 DocType: Sales Invoice,Total Commission,एकूण आयोग
 DocType: Pricing Rule,Sales Partner,विक्री भागीदार
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** मासिक वितरण ** आपल्या व्यवसायात तुम्हाला हंगामी असल्यास आपण महिने ओलांडून आपले बजेट वाटप करण्यास मदत करते. **, या वितरण वापरून कमी खर्चात वाटप ** खर्च केंद्रातील ** या ** मासिक वितरण सेट करण्यासाठी"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,चलन टेबल आढळली नाही रेकॉर्ड
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,पहिल्या कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
-DocType: About Us Settings,Website Manager,वेबसाइट व्यवस्थापक
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,आर्थिक वर्ष प्रारंभ तारीख आर्थिक वर्षाच्या शेवटी तारीख पेक्षा जास्त असू नये
 DocType: Warranty Claim,Resolution,ठराव
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},वितरित: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,बिलिंग आणि वितरण स्थिती
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,पुन्हा करा ग्राहक
 DocType: Leave Control Panel,Allocate,वाटप
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,मागील
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,विक्री परत
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,आपण उत्पादन ऑर्डर तयार करू इच्छित असलेल्या पासून विक्री ऑर्डर निवडा.
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,पगार घटक.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,संभाव्य ग्राहकांच्या डेटाबेस.
+DocType: Authorization Rule,Customer or Item,ग्राहक किंवा आयटम
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ग्राहक डेटाबेस.
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),उघडणे (कोटी)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. आपण वेगळी डीफॉल्ट UOM वापरण्यासाठी नवीन आयटम तयार करणे आवश्यक आहे."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,स्टॉक नोंदी केले जातात जे विरोधात लॉजिकल वखार.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},संदर्भ नाही आणि संदर्भ तारीख आवश्यक आहे {0}
-DocType: Event,Wednesday,बुधवारी
 DocType: Sales Invoice,Customer's Vendor,ग्राहक च्या विक्रेता
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,उत्पादन ऑर्डर अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,प्रस्ताव लेखन
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,आणखी विक्री व्यक्ती {0} त्याच कर्मचारी ID अस्तित्वात
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},नकारात्मक शेअर त्रुटी ({6}) आयटम साठी {0} कोठार मध्ये {1} वर {2} {3} मधील {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,आर्थिक वर्ष कंपनी
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,डीफॉल्ट कोटीच्या दर
 DocType: Maintenance Schedule,Maintenance Schedule,देखभाल वेळापत्रक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","मग किंमत ठरविणे नियम इ ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार आधारित बाहेर फिल्टर आहेत"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,ड्रॉपबॉक्स पायथन मॉड्युल स्थापित करा
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,खरेदी पावती पासून
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,व्यवस्थापक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,खरेदी पावती पासून
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,समान आयटम अनेक वेळा केलेला आहे.
 DocType: SMS Settings,Receiver Parameter,स्वीकारणारा मापदंड
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'आधारीत' आणि 'गट करून' समान असू शकत नाही
 DocType: Sales Person,Sales Person Targets,विक्री व्यक्ती लक्ष्य
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,करण्यासाठी
-apps/frappe/frappe/templates/base.html +145,Please enter email address,ई-मेल पत्ता प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,लागत समाप्त ट्यूब
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,गट रूपांतरित
 DocType: Activity Cost,Activity Type,क्रियाकलाप प्रकार
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,मुदत दिवस
 DocType: Sales Invoice,Packing List,पॅकिंग यादी
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,खरेदी ऑर्डर पुरवठादार देण्यात.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,प्रकाशन
 DocType: Activity Cost,Projects User,प्रकल्प विकिपीडिया
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,नाश
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} चलन तपशील तक्ता आढळले नाही
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} चलन तपशील तक्ता आढळले नाही
 DocType: Company,Round Off Cost Center,खर्च केंद्र बंद फेरीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,देखभाल भेट द्या {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 DocType: Material Request,Material Transfer,साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),उघडणे (डॉ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},पोस्टिंग शिक्का नंतर असणे आवश्यक आहे {0}
-apps/frappe/frappe/config/setup.py +59,Settings,सेटिंग्ज
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,उतरले खर्च कर आणि शुल्क
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,आणखी
 DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,पुनर्नामित करा
 DocType: Journal Entry,Write Off Amount,रक्कम बंद लिहा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bending
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,सदस्य परवानगी द्या
 DocType: Journal Entry,Bill No,बिल नाही
 DocType: Purchase Invoice,Quarterly,तिमाही
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आयटम तपशील प्रविष्ट करा
 DocType: Purchase Receipt,Other Details,इतर तपशील
 DocType: Account,Accounts,खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,विपणन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,नीट shearing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,विपणन
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,सिरिअल नग आधारित विक्री आणि खरेदी दस्तऐवज आयटम ट्रॅक करण्यासाठी. हे देखील उत्पादन हमी तपशील ट्रॅक वापरले करू शकता.
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,नाकारल्याचे कोठार regected आयटम विरुद्ध अनिवार्य आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 DocType: Employee,Provide email id registered in company,कंपनी मध्ये नोंदणीकृत ई-मेल आयडी द्या
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,आयटम रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,आयटम रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळले नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,वृक्ष प्रकार
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,प्रमाण आणि कोठार
 DocType: Sales Invoice,Commission Rate (%),आयोगाने दर (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","व्हाउचर विरुद्ध प्रकार विक्री आदेश एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,विनिमय दर शोधण्यात अक्षम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,एरोस्पेस
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,आपले स्वागत आहे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,एरोस्पेस
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड प्रवेश
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,कार्य विषय
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,वस्तू पुरवठादार प्राप्त झाली.
-DocType: Communication,Open,ओपन
 DocType: Lead,Campaign Name,मोहीम नाव
 ,Reserved,राखीव
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} एक स्टॉक आयटम नाही
 DocType: Mode of Payment Account,Default Account,मुलभूत खाते
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"संधी लीड केले आहे, तर लीड सेट करणे आवश्यक आहे"
-DocType: Contact Us Settings,Address Title,पत्ता शीर्षक
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,साप्ताहिक बंद दिवस निवडा कृपया
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
 ,Sales Person Target Variance Item Group-Wise,विक्री व्यक्ती लक्ष्य फरक आयटम गट निहाय
-DocType: Dropbox Backup,Daily,दैनिक
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,विद्यमान व्यवहार खाते लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Delivery Note,Customer's Purchase Order No,ग्राहक च्या पर्चेस नाही
 DocType: Employee,Cell Number,सेल क्रमांक
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ऑटो साहित्य विनंत्या व्युत्पन्न
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,गमावले
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,ऊर्जा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,मासिक पगार विधान.
 DocType: Item Group,Website Specifications,वेबसाइट वैशिष्ट्य
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,नवीन खाते
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: पासून {0} प्रकारच्या {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,लेखा नोंदी पानांचे नोडस् विरुद्ध केले जाऊ शकते. गट विरुद्ध नोंदी परवानगी नाही.
-DocType: ToDo,High,उच्च
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,निष्क्रिय किंवा इतर BOMs निगडीत आहे म्हणून BOM रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
-DocType: User,Male,पुरुष
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},आयटम आवश्यक खरेदी पावती क्रमांक {0}
 DocType: Item Attribute Value,Item Attribute Value,आयटम मूल्य विशेषता
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,विक्री मोहिम.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,वैयक्तिक
 DocType: Expense Claim Detail,Expense Claim Type,खर्च हक्क प्रकार
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,हे खरेदी सूचीत टाका डीफॉल्ट सेटिंग्ज
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रवेश {0} हे चलन आगाऊ म्हणून कुलशेखरा धावचीत पाहिजे तर {1}, तपासा ऑर्डर विरूद्ध जोडली आहे."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,जैवतंत्रज्ञान
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","जर्नल प्रवेश {0} हे चलन आगाऊ म्हणून कुलशेखरा धावचीत पाहिजे तर {1}, तपासा ऑर्डर विरूद्ध जोडली आहे."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,जैवतंत्रज्ञान
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,कार्यालय देखभाल खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,पहिल्या आयटम प्रविष्ट करा
 DocType: Account,Liability,दायित्व
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो मागणी रक्कम पेक्षा जास्त असू शकत नाही {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,किंमत सूची निवडलेले नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Process Payroll,Send Email,ईमेल पाठवा
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी, पयायय पार्टी पहिल्या टाइप करा"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},आयटम द्वारे वितरीत नाही कारण &#39;अद्यतन शेअर&#39; तपासणे शक्य नाही {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,क्र
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,क्र
 DocType: Item,Items with higher weightage will be shown higher,उच्च महत्त्व असलेला आयटम उच्च दर्शविले जाईल
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,बँक मेळ तपशील
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,माझे चलने
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,माझे चलने
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,नाही कर्मचारी आढळले
 DocType: Purchase Order,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted तर
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;विक्री पॉइंट&quot; वैशिष्ट्ये सक्षम करण्यासाठी
 DocType: Bin,Moving Average Rate,सरासरी दर हलवित
 DocType: Production Planning Tool,Select Items,निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
-DocType: Comment,Reference Name,संदर्भ नाव
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: Sales Invoice Item,Target Warehouse,लक्ष्य कोठार
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत चेंडू किंवा पावती प्रती परवानगी द्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,अपेक्षित वितरण तारीख विक्री ऑर्डर तारीख आधी असू शकत नाही
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
 DocType: Production Order,Item To Manufacture,आयटम निर्मिती करणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,स्थायी मूस निर्णायक
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} स्थिती {2} आहे
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 DocType: Sales Order Item,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
 DocType: Newsletter,Newsletter Manager,वृत्तपत्र व्यवस्थापक
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उघडणे&#39;
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
 DocType: Expense Claim,Expenses,खर्च
 DocType: Item Variant Attribute,Item Variant Attribute,आयटम व्हेरियंट विशेषता
 ,Purchase Receipt Trends,खरेदी पावती ट्रेन्ड
 DocType: Appraisal,Select template from which you want to get the Goals,तुम्ही ध्येय प्राप्त करू इच्छित असलेल्या टेम्प्लेट निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,संशोधन आणि विकास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,संशोधन आणि विकास
 ,Amount to Bill,बिल रक्कम
 DocType: Company,Registration Details,नोंदणी तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,पुन्हा-क्रम Qty
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक यादी तारीख सोडा
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},पाठविण्याची अनुसूचित {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,शेअर तपशील
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,प्रकल्प मूल्य
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,पॉइंट-ऑफ-विक्री
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},कॅरी फॉरवर्ड करू शकत नाही {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","आधीच क्रेडिट खाते शिल्लक, आपण &#39;डेबिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
 DocType: Account,Balance must be,शिल्लक असणे आवश्यक आहे
 DocType: Hub Settings,Publish Pricing,किंमत प्रकाशित
 DocType: Notification Control,Expense Claim Rejected Message,खर्च हक्क नाकारला संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Nailing
 ,Available Qty,उपलब्ध Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,मागील पंक्ती एकूण रोजी
 DocType: Salary Slip,Working Days,कामाचे दिवस
 DocType: Serial No,Incoming Rate,येणार्या दर
 DocType: Packing Slip,Gross Weight,एकूण वजन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणाली सेट आहेत."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणाली सेट आहेत."
 DocType: HR Settings,Include holidays in Total no. of Working Days,नाही एकूण मध्ये सुटी यांचा समावेश आहे. कार्यरत दिवस
 DocType: Job Applicant,Hold,धरा
 DocType: Employee,Date of Joining,प्रवेश दिनांक
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,पहा सदस्य
 DocType: Purchase Invoice Item,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,प्राप्त आयटम बिल करायचे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,कठोर झपाटा
 DocType: Employee,Ms,श्रीमती
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,चलन विनिमय दर मास्टर.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन पुढील {0} दिवसांत वेळ शोधू शकला नाही {1}
 DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,पहिल्या दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ही देखभाल भेट द्या रद्द आधी रद्द करा साहित्य भेटी {0}
 DocType: Salary Slip,Leave Encashment Amount,एनकॅशमेंट रक्कम सोडा
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},सिरियल नाही {0} आयटम संबंधित नाही {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक Qty
 DocType: Bank Reconciliation,Total Amount,एकूण रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,इंटरनेट प्रकाशन
 DocType: Production Planning Tool,Production Orders,उत्पादन ऑर्डर
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,शिल्लक मूल्य
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,विक्री किंमत सूची
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,आयटम समक्रमित करण्यासाठी प्रकाशित
-DocType: GL Entry,Account Currency,खाते चलन
+DocType: Bank Reconciliation,Account Currency,खाते चलन
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,कंपनी मध्ये गोल बंद खाते उल्लेख करा
 DocType: Purchase Receipt,Range,श्रेणी
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,{0} कर्मचारी सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Features Setup,Item Barcode,आयटम बारकोड
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,आयटम रूपे {0} अद्ययावत
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Address,Shop,दुकान
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,या मोडमध्ये निवडलेले असताना मुलभूत बँक / रोख खाते आपोआप पीओएस चलन अद्यतनित केले जाईल.
 DocType: Employee,Permanent Address Is,स्थायी पत्ता आहे
 DocType: Production Order Operation,Operation completed for how many finished goods?,ऑपरेशन किती तयार वस्तू पूर्ण?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ब्रँड
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ब्रँड
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} आयटम साठी पार over- भत्ता {1}.
 DocType: Employee,Exit Interview Details,बाहेर पडा मुलाखत तपशील
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ऑर्डर आयटम खरेदी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,अप्रत्यक्ष उत्पन्न
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,सेट भरणा रक्कम = शिल्लक रक्कम
-DocType: Contact Us Settings,Address Line 1,पत्ता ओळ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,फरक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,कंपनी नाव
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,फरक
+,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेश (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,मदत व्हिडिओ यादी पहा
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,चेक जमा होते जेथे बँक खाते निवडा प्रमुख.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,वापरकर्ता व्यवहार दर सूची दर संपादित करण्याची परवानगी द्या
 DocType: Pricing Rule,Max Qty,कमाल Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,रासायनिक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 DocType: Process Payroll,Select Payroll Year and Month,वेतनपट वर्ष आणि महिना निवडा
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",योग्य गट (सहसा निधी अर्ज&gt; वर्तमान मालमत्ता&gt; बँक खाते जा टाइप करा) बाल जोडा वर क्लिक करून (नवीन खाते तयार &quot;बँक&quot;
 DocType: Workstation,Electricity Cost,वीज खर्च
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
-DocType: Comment,Unsubscribed,सदस्यता रद्द
 DocType: Opportunity,Walk In,मध्ये चाला
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial खर्च केंद्रांची वृक्ष.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,हस्तांतरण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,व्हाइट
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,व्हाइट
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 DocType: Purchase Invoice,Get Advances Paid,अग्रिम पेड करा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,आपले चित्र संलग्न
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,आपले चित्र संलग्न
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,करा
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
-DocType: Workflow State,Stop,थांबवा
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी आली. एक संभाव्य कारण तुम्हाला फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com संपर्क साधा.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,माझे टाका
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ऑर्डर प्रकार एक असणे आवश्यक आहे {0}
 DocType: Lead,Next Contact Date,पुढील संपर्क तारीख
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty उघडत
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,शेअर पर्याय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},साठी Qty {0}
 DocType: Leave Application,Leave Application,रजेचा अर्ज
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,वाटप साधन सोडा
 DocType: Leave Block List,Leave Block List Dates,ब्लॉक यादी तारखा सोडा
 DocType: Company,If Monthly Budget Exceeded (for expense account),मासिक अर्थसंकल्प (खर्च खात्यासाठी) ओलांडली तर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,नेट तास दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,उतरले खर्च खरेदी पावती
 DocType: Company,Default Terms,मुलभूत अटी
 DocType: Packing Slip Item,Packing Slip Item,पॅकिंग स्लिप्स आयटम
 DocType: POS Profile,Cash/Bank Account,रोख / बँक खाते
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्य नाही बदल काढली आयटम.
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,दाखल
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,सवलत
 DocType: Features Setup,Purchase Discounts,खरेदी सवलत
 DocType: Workstation,Wages,पगार
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. &#39;स्थिती&#39; आणि जतन करा अद्यतनित करा
 DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
 DocType: Issue,Issue,अंक
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","आयटम रूपे साठी विशेषता. उदा आकार, रंग इ"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,खाते कंपनी जुळत नाही
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","आयटम रूपे साठी विशेषता. उदा आकार, रंग इ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP कोठार
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},सिरियल नाही {0} पर्यंत देखभाल करार अंतर्गत आहे {1}
 DocType: BOM Operation,Operation,ऑपरेशन
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,आयटम &#39;बटण खरेदी पावत्या आयटम मिळवा&#39; वापर करून समाविष्ट करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,विक्री खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,मानक खरेदी
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,मानक खरेदी
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
-apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},विक्री ऑर्डर {0} आहे {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},विक्री ऑर्डर {0} आहे {1}
 DocType: Opportunity,Contact Info,संपर्क माहिती
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,शेअर नोंदी करून देणे
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
 DocType: Item,Default Supplier,मुलभूत पुरवठादार
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता टक्केवारी चेंडू
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,वेळ नोंदी द्वारे अद्ययावत
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,सरासरी वय
 DocType: Opportunity,Your sales person who will contact the customer in future,भविष्यात ग्राहक संपर्क साधू असलेले आपले विक्री व्यक्ती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,आपल्या पुरवठादार काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,आपल्या पुरवठादार काही करा. ते संघटना किंवा व्यक्तींना असू शकते.
 DocType: Company,Default Currency,पूर्वनिर्धारीत चलन
 DocType: Contact,Enter designation of this Contact,या संपर्क पद प्रविष्ट करा
-DocType: Contact Us Settings,Address,पत्ता
 DocType: Expense Claim,From Employee,कर्मचारी पासून
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
 DocType: Journal Entry,Make Difference Entry,फरक प्रवेश करा
 DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती
 DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,वाहतूक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,वाहतूक
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,आणि वर्ष:
 DocType: Email Digest,Annual Expense,वार्षिक खर्च
 DocType: SMS Center,Total Characters,एकूण वर्ण
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},आयटम साठी BOM क्षेत्रात BOM निवडा कृपया {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,सी-फॉर्म चलन तपशील
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भरणा मेळ चलन
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,योगदान%
 DocType: Item,website page link,संकेतस्थळावर दुवा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,च्या प्रथम वापर प्रणाली तयार द्या.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,आपल्या संदर्भासाठी कंपनी नोंदणी क्रमांक. कर संख्या इ
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 ,Ordered Items To Be Billed,आदेश दिले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,श्रेणी कमी असणे आवश्यक आहे पेक्षा श्रेणी
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,वेळ नोंदी निवडा आणि एक नवीन विक्री चलन तयार करण्यासाठी सबमिट करा.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,विक्री चलन आगाऊ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,काहीही विनंती करण्यासाठी
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,व्यवस्थापन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,व्यवस्थापन
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,वेळ पत्रके क्रियाकलाप प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,गुंतवणूक निर्णायक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},एकतर डेबिट किंवा क्रेडिट रक्कम आवश्यक आहे {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","या जिच्यामध्ये variant आयटम कोड जोडलेली जाईल. आपल्या संक्षेप &quot;एम&quot;, आहे आणि उदाहरणार्थ, आयटम कोड &quot;टी-शर्ट&quot;, &quot;टी-शर्ट-एम&quot; असेल जिच्यामध्ये variant आयटम कोड आहे"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,तुम्ही पगाराच्या स्लिप्स जतन एकदा (शब्दात) निव्वळ वेतन दृश्यमान होईल.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,सक्रिय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ब्लू
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ब्लू
 DocType: Purchase Invoice,Is Return,परत आहे
 DocType: Price List Country,Price List Country,किंमत यादी देश
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,पुढील नोडस् फक्त &#39;ग्रुप प्रकार नोडस् अंतर्गत तयार केले जाऊ शकते
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफाइल {0} आधीपासूनच प्रयोक्ता तयार: {1} आणि कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,लॅमिनेटेड ऑब्जेक्ट उत्पादन
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,पुरवठादार डेटाबेस.
 DocType: Account,Balance Sheet,ताळेबंद
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',&#39;आयटम कोड आयटम केंद्र किंमत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,लागत ताणून
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,आपले वविेतयाला ग्राहकाच्या संपर्क या तारखेला स्मरणपत्र प्राप्त होईल
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट सुरू केले"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,कर आणि इतर पगार कपात.
 DocType: Lead,Lead,लीड
 DocType: Email Digest,Payables,देय
 DocType: Account,Warehouse,कोठार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: Qty खरेदी परत प्रविष्ट करणे शक्य नाही नाकारली
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
 DocType: Purchase Invoice Item,Net Rate,नेट दर
 DocType: Purchase Invoice Item,Purchase Invoice Item,चलन आयटम खरेदी
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,शेअर लेजर नोंदी आणि जी नोंदी निवडलेल्या खरेदी पावत्या साठी पुन्हा पोस्ट केले आहेत
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,आयटम 1
 DocType: Holiday,Holiday,सुट्टी
-DocType: Event,Saturday,शनिवारी
 DocType: Leave Control Panel,Leave blank if considered for all branches,सर्व शाखा वाटल्यास रिक्त सोडा
 ,Daily Time Log Summary,दैनिक वेळ लॉग सारांश
-DocType: DocField,Label,लेबल
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled देय तपशील
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्षात वर्ष
 DocType: Global Defaults,Disable Rounded Total,गोळाबेरीज एकूण अक्षम करा
 DocType: Lead,Call,कॉल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},सह डुप्लिकेट सलग {0} त्याच {1}
 ,Trial Balance,चाचणी शिल्लक
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,कर्मचारी सेट अप
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,ग्रिड &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,पहिल्या उपसर्ग निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,संशोधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,संशोधन
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Contact,User ID,वापरकर्ता आयडी
-DocType: Communication,Sent,पाठविले
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,पहा लेजर
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
-DocType: Communication,Delivery Status,वितरण स्थिती
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","एक आयटम गट त्याच नावाने अस्तित्वात नाही, आयटम नाव बदलू किंवा आयटम गटाचे नाव कृपया"
 DocType: Production Order,Manufacture against Sales Order,विक्री ऑर्डर विरुद्ध उत्पादन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,आयटम वर्णन
 DocType: Payment Tool,Payment Mode,भरणा मोड
 DocType: Purchase Invoice,Is Recurring,आवर्ती आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,थेट मेटल लेसर sintering
 DocType: Purchase Order,Supplied Items,पुरवले आयटम
 DocType: Production Order,Qty To Manufacture,निर्मिती करणे Qty
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरेदी सायकल संपूर्ण समान दर ठेवणे
 DocType: Opportunity Item,Opportunity Item,संधी आयटम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,तात्पुरती उघडणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,कर्मचारी रजा शिल्लक
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
 DocType: Address,Address Type,पत्ता प्रकार
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,लहान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,लहान
 DocType: Employee,Employee Number,कर्मचारी संख्या
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},प्रकरण नाही (चे) आधीपासून वापरात आहे. प्रकरण नाही ते पहा {0}
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आयटम 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,खाते प्रमुख {0} तयार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,ग्रीन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,ग्रीन
 DocType: Item,Auto re-order,ऑटो पुन्हा आदेश
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,एकूण गाठले
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,एकूण गाठले
 DocType: Employee,Place of Issue,समस्या ठिकाण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,करार
-DocType: Report,Disabled,अपंग
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,करार
+DocType: Email Digest,Add Quote,कोट जोडा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,कृषी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,आपली उत्पादने किंवा सेवा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Journal Entry Account,Purchase Order,खरेदी ऑर्डर
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,नाव आवश्यक आहे
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
 DocType: Address,City/Town,शहर / नगर
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
 DocType: Serial No,Serial No Details,सिरियल तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,आयटम {0} सब-करारबद्ध आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,कॅपिटल उपकरणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम पहिल्या आधारित निवडले आहे आयटम, आयटम गट किंवा ब्रॅण्ड असू शकते जे शेत &#39;रोजी लागू करा&#39;."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,अपेक्षित वितरण तारीख नियोजनबद्ध प्रारंभ तारीख पेक्षा कमी आहे.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,पुरवठादार साठी
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट व्यवहार हे खाते निवडून मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,एकूण जाणारे
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",फक्त &quot;मूल्य&quot; 0 किंवा रिक्त मूल्य एक शिपिंग नियम अट असू शकते
 DocType: Authorization Rule,Transaction,व्यवहार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,टीप: हा खर्च केंद्र एक गट आहे. गट विरुद्ध लेखा नोंदी करू शकत नाही.
-apps/frappe/frappe/config/desk.py +7,Tools,साधने
 DocType: Item,Website Item Groups,वेबसाइट आयटम गट
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,उत्पादन ऑर्डर क्रमांक स्टॉक नोंदणी उद्देश उत्पादन अनिवार्य आहे
 DocType: Purchase Invoice,Total (Company Currency),एकूण (कंपनी चलन)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,जर्नल प्रवेश
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,टिप्पण्या
 DocType: Salary Slip,Bank Account No.,बँक खाते क्रमांक
 DocType: Naming Series,This is the number of the last created transaction with this prefix,या हा प्रत्यय गेल्या निर्माण व्यवहार संख्या आहे
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},आयटम आवश्यक मूल्यांकन दर {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},आयटम आवश्यक मूल्यांकन दर {0}
 DocType: Quality Inspection Reading,Reading 8,8 वाचन
 DocType: Sales Partner,Agent,एजंट
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम आपण &#39;वर आधारीत शुल्क वितरण&#39; बदलू पाहीजे, शून्य आहे"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर आणि शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेअर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,हार्डवेअर
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कंपनी निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,नाही डेटा
 DocType: Appraisal Template Goal,Appraisal Template Goal,मूल्यांकन साचा लक्ष्य
 DocType: Salary Slip,Earning,कमाई
 DocType: Payment Tool,Party Account Currency,पार्टी खाते चलन
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,दरम्यान आढळले आच्छादित अटी:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,एकूण ऑर्डर मूल्य
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,अन्न
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,अन्न
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing श्रेणी 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,आपण फक्त एक सादर उत्पादन आदेशा एक वेळ लॉग करू शकता
 DocType: Maintenance Schedule Item,No of Visits,भेटी नाही
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","संपर्क वृत्तपत्रे, ठरतो."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},खाते बंद चलन असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सर्व गोल गुण सम हे आहे 100 असावे {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,संचालन रिक्त सोडले जाऊ शकत नाही.
 ,Delivered Items To Be Billed,वितरित केले आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,कोठार सिरियल क्रमांक साठी बदलले जाऊ शकत नाही
-DocType: DocField,Description,वर्णन
 DocType: Authorization Rule,Average Discount,सरासरी सवलत
-DocType: Letter Head,Is Default,मुलभूत आहे
 DocType: Address,Utilities,उपयुक्तता
 DocType: Purchase Invoice Item,Accounting,लेखा
 DocType: Features Setup,Features Setup,वैशिष्ट्ये सेटअप
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ऑफर पहा पत्र
-DocType: Communication,Communication,संवाद
 DocType: Item,Is Service Item,सेवा आयटम आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,अर्ज काळात बाहेर रजा वाटप कालावधी असू शकत नाही
 DocType: Activity Cost,Projects,प्रकल्प
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,आर्थिक वर्ष निवडा कृपया
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},पासून {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,शेअर ठेवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 DocType: Leave Control Panel,Leave blank if considered for all designations,सर्व पदे विचार तर रिक्त सोडा
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक &#39;सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार वास्तविक &#39;सलग प्रभारी {0} आयटम रेट समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,पे न करता सोडू अवलंबून
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 ,Batch-Wise Balance History,बॅच-शहाणे शिल्लक इतिहास
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,सूची करावे
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,शिकाऊ उमेदवार
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,नकारात्मक प्रमाण परवानगी नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,शिकाऊ उमेदवार
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,नकारात्मक प्रमाण परवानगी नाही
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",स्ट्रिंग म्हणून आयटम मालक प्राप्त आणि या क्षेत्रात संग्रहित कर तपशील टेबल. कर आणि शुल्क करीता वापरले जाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाते गोठविले तर, नोंदी मर्यादित वापरकर्त्यांना परवानगी आहे."
 DocType: Email Digest,Bank Balance,बँक बॅलन्स
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} फक्त चलनात केले जाऊ शकते: {0} एकट्या प्रवेश {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} फक्त चलनात केले जाऊ शकते: {0} एकट्या प्रवेश {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,कर्मचारी {0} आणि महिना आढळले नाही सक्रिय तत्वे
 DocType: Job Opening,"Job profile, qualifications required etc.","कामाचे, पात्रता आवश्यक इ"
 DocType: Journal Entry Account,Account Balance,खाते शिल्लक
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,व्यवहार कर नियम.
 DocType: Rename Tool,Type of document to rename.,दस्तऐवज प्रकार पुनर्नामित करण्यात.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,आम्ही या आयटम खरेदी
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,आम्ही या आयटम खरेदी
 DocType: Address,Billing,बिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,पाठविलेला नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,लागत स्फोटक
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),एकूण कर आणि शुल्क (कंपनी चलन)
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} प्राप्तकर्ता पाठविण्यासाठी अनुसूचित
 DocType: Quality Inspection,Readings,वाचन
 DocType: Stock Entry,Total Additional Costs,एकूण अतिरिक्त खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,उप विधानसभा
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,उप विधानसभा
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Supplier,Stock Manager,शेअर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},स्रोत कोठार सलग अनिवार्य आहे {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,नाही पत्ता अद्याप जोडले.
 DocType: Workstation Working Hour,Workstation Working Hour,वर्कस्टेशन कार्यरत तास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,विश्लेषक
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा संयुक्त रक्कम बरोबरी करणे आवश्यक आहे {2}
 DocType: Item,Inventory,सूची
 DocType: Features Setup,"To enable ""Point of Sale"" view",दृश्य &quot;विक्री पॉइंट&quot; सक्षम करण्यासाठी
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,भरणा रिक्त कार्ट केले जाऊ शकत नाही
 DocType: Item,Sales Details,विक्री तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,पिन
 DocType: Opportunity,With Items,आयटम
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty मध्ये
 DocType: Notification Control,Expense Claim Rejected,खर्च हक्क नाकारला
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
 DocType: Item Attribute,Item Attribute,आयटम विशेषता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,सरकार
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,आयटम रूपे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,सरकार
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,आयटम रूपे
 DocType: Company,Services,सेवा
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),एकूण ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),एकूण ({0})
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
 DocType: Sales Invoice,Source,स्रोत
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,भरणा टेबल आढळली नाही रेकॉर्ड
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,आर्थिक वर्ष प्रारंभ तारीख
 DocType: Employee External Work History,Total Experience,एकूण अनुभव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,रद्द पॅकिंग स्लिप (चे)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,वाहतुक आणि अग्रेषित शुल्क
 DocType: Material Request Item,Sales Order No,विक्री ऑर्डर नाही
 DocType: Item Group,Item Group Name,आयटम गट नाव
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,घेतले
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,घेतले
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,उत्पादन हस्तांतरण सामुग्री
 DocType: Pricing Rule,For Price List,किंमत सूची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,कार्यकारी शोध
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","आयटम खरेदी दर: {0} आढळले नाही, एकट्या नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमत उल्लेख करा."
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),अतिरिक्त सवलत रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},त्रुटी: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},त्रुटी: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,लेखा चार्ट नवीन खाते तयार करा.
 DocType: Maintenance Visit,Maintenance Visit,देखभाल भेट द्या
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,कोठार वर उपलब्ध आहे बॅच Qty
 DocType: Time Log Batch Detail,Time Log Batch Detail,वेळ लॉग बॅच तपशील
-DocType: Workflow State,Tasks,कार्ये
 DocType: Landed Cost Voucher,Landed Cost Help,उतरले खर्च मदत
-DocType: Event,Tuesday,मंगळवारी
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
 ,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},आधीच कालावधीसाठी कर्मचारी {1} तरतूद प्रकार {0} साठी पाने {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
 DocType: UOM,UOM Name,UOM नाव
-DocType: Top Bar Item,Target,लक्ष्य
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,योगदान रक्कम
 DocType: Sales Invoice,Shipping Address,शिपिंग पत्ता
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,हे साधन आपल्याला सुधारीत किंवा प्रणाली मध्ये स्टॉक प्रमाण आणि मूल्यांकन निराकरण करण्यासाठी मदत करते. सामान्यत: प्रणाली मूल्ये आणि काय प्रत्यक्षात आपल्या गोदामे अस्तित्वात समक्रमित करण्यासाठी वापरले जाते.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,आपण डिलिव्हरी टीप जतन एकदा शब्द मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ब्रँड मास्टर.
-DocType: ToDo,Due Date,मुळे तारीख
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ब्रँड मास्टर.
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,बॉक्स
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,संघटना
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,बॉक्स
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,संघटना
 DocType: Monthly Distribution,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणारा सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना विक्री आदेश
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} एकट्या फक्त प्रवेश चलनात केले जाऊ शकते: {1}
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,तिसऱ्या क्रमांकावर
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},रो # {0}: परत आयटम {1} नाही विद्यमान नाही {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,बँक खाते
 ,Bank Reconciliation Statement,बँक मेळ विवरणपत्र
 DocType: Address,Lead Name,लीड नाव
 ,POS,पीओएस
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,उघडत स्टॉक शिल्लक
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,उघडत स्टॉक शिल्लक
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} केवळ एकदा करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer परवानगी नाही {0} पेक्षा {1} पर्चेस विरुद्ध {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},यशस्वीरित्या वाटप पाने {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,आयटम नाहीत पॅक करण्यासाठी
 DocType: Shipping Rule Condition,From Value,मूल्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,बँक प्रतिबिंबित नाही प्रमाणात
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,बँक प्रतिबिंबित नाही प्रमाणात
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,कंपनी खर्च दावे.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,केंद्रापासून निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,चुंबकीय क्षेत्र-सहाय्य पूर्ण
 DocType: Company,Default Holiday List,सुट्टी यादी डीफॉल्ट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,शेअर दायित्व
 DocType: Purchase Receipt,Supplier Warehouse,पुरवठादार कोठार
 DocType: Opportunity,Contact Mobile No,संपर्क मोबाइल नाही
 DocType: Production Planning Tool,Select Sales Orders,विक्री ऑर्डर निवडा
 ,Material Requests for which Supplier Quotations are not created,पुरवठादार अवतरणे तयार नाहीत जे साहित्य विनंत्या
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण रजा अर्ज करत आहेत ज्या दिवशी (चे) सुटी आहेत. आपण रजा अर्ज गरज नाही.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,बारकोड वापरुन आयटम ट्रॅक करण्यासाठी. आपण आयटम बारकोड स्कॅनिंग करून वितरण टीप आणि विक्री चलन आयटम दाखल करण्यास सक्षम असेल.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,मार्क वितरित म्हणून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,मार्क वितरित म्हणून
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,कोटेशन करा
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},माप मुलभूत युनिट रुपांतर घटक सलग 1 असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},माप मुलभूत युनिट रुपांतर घटक सलग 1 असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},प्रकारच्या रजा {0} जास्त असू शकत नाही {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 DocType: SMS Center,Receiver List,स्वीकारणारा यादी
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} पहा
 DocType: Salary Structure Deduction,Salary Structure Deduction,वेतन संरचना कपात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,पसंतीचा लेसर sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,आयात यशस्वी!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबल एकदा पेक्षा अधिक प्रविष्ट केले गेले आहे
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},प्रमाण जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),वय (दिवस)
 DocType: Quotation Item,Quotation Item,कोटेशन आयटम
 DocType: Account,Account Name,खाते नाव
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,तारीख तारीख करण्यासाठी पेक्षा जास्त असू शकत नाही पासून
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,तारीख तारीख करण्यासाठी पेक्षा जास्त असू शकत नाही पासून
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,सिरियल नाही {0} प्रमाणात {1} एक अपूर्णांक असू शकत नाही
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,पुरवठादार प्रकार मास्टर.
 DocType: Purchase Order Item,Supplier Part Number,पुरवठादार भाग क्रमांक
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,जोडा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,रूपांतरण दर 0 किंवा 1 असू शकत नाही
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} रद्द किंवा बंद आहे
 DocType: Accounts Settings,Credit Controller,क्रेडिट कंट्रोलर
 DocType: Delivery Note,Vehicle Dispatch Date,वाहन खलिता तारीख
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,"खरेदी पावती {0} सबमिट केलेली नाही,"
 DocType: Company,Default Payable Account,मुलभूत देय खाते
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","जसे शिपिंग नियम, किंमत सूची इत्यादी ऑनलाइन शॉपिंग कार्ट सेटिंग्ज"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,सेटअप पूर्ण
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% बिल
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,राखीव Qty
 DocType: Party Account,Party Account,पार्टी खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,मानव संसाधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,मानव संसाधन
 DocType: Lead,Upper Income,उच्च उत्पन्न
 DocType: Journal Entry Account,Debit in Company Currency,कंपनी चलनात डेबिट
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,माझे मुद्दे
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,मुलभूत मुल्य
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,रो {0}: भरणा रक्कम नकारात्मक असू शकत नाही
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,प्रेस समर्पक
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 DocType: Payment Reconciliation,Payments,देयके
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,दाबून हॉट isostatic
-DocType: ToDo,Medium,मध्यम
 DocType: Budget Detail,Budget Allocated,अर्थसंकल्प वाटप
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,नियतकालिके बँकेच्या भरणा तारखा अद्यतनित करा.
 DocType: Quotation,Term Details,मुदत तपशील
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिवस) क्षमता नियोजन
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,आयटम कोणतेही प्रमाणात किंवा मूल्य कोणत्याही बदल आहेत.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,आयटम कोणतेही प्रमाणात किंवा मूल्य कोणत्याही बदल आहेत.
 DocType: Warranty Claim,Warranty Claim,हमी दावा
 ,Lead Details,लीड तपशील
-DocType: Authorization Rule,Approving User,मंजूर सदस्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,फोर्जिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,मुलाला
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
 DocType: Pricing Rule,Applicable For,लागू
 DocType: Bank Reconciliation,From Date,तारीख पासून
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ऑनलाइन लिलाव
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,प्रमाण किंवा मूल्यांकन दर किंवा दोन्ही निर्दिष्ट करा
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","कंपनी, महिना आणि आर्थिक वर्ष अनिवार्य आहे"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",वजन \ n कृपया खूप &quot;वजन UOM&quot; उल्लेख उल्लेख आहे
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,साहित्य विनंती या शेअर नोंद करणे वापरले
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,एक आयटम एकच एकक.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',वेळ लॉग बॅच {0} &#39;सादर&#39; करणे आवश्यक आहे
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,प्रत्येक स्टॉक चळवळ एकट्या प्रवेश करा
 DocType: Leave Allocation,Total Leaves Allocated,एकूण पाने वाटप
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},रो नाही आवश्यक कोठार {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,वैध आर्थिक वर्ष प्रारंभ आणि शेवट तारखा प्रविष्ट करा
 DocType: Employee,Date Of Retirement,निवृत्ती तारीख
 DocType: Upload Attendance,Get Template,साचा मिळवा
 DocType: Address,Postal,पोस्टल
 DocType: Item,Weightage,वजन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,खनन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,राळ निर्णायक
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट तत्सम नावाने विद्यमान ग्राहक नाव बदलू किंवा ग्राहक गट नाव बदला करा
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,{0} पहिल्या निवडा.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},मजकूर {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},मजकूर {0}
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
 DocType: Stock Entry,Material Receipt,साहित्य पावती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,उत्पादने
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,उत्पादने
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},पार्टी प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटम रूपे आहेत, तर तो विक्री आदेश इ निवडले जाऊ शकत नाही"
 DocType: Lead,Next Contact By,पुढील संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},सलग आयटम {0} साठी आवश्यक त्या प्रमाणात {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},सलग आयटम {0} साठी आवश्यक त्या प्रमाणात {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},प्रमाण आयटम विद्यमान म्हणून कोठार {0} हटविले जाऊ शकत नाही {1}
 DocType: Quotation,Order Type,ऑर्डर प्रकार
 DocType: Purchase Invoice,Notification Email Address,सूचना ई-मेल पत्ता
 DocType: Payment Tool,Find Invoices to Match,मॅच चलने शोधा
 ,Item-wise Sales Register,आयटम निहाय विक्री नोंदणी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",उदा &quot;xyz नॅशनल बँक&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",उदा &quot;xyz नॅशनल बँक&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,बेसिक रेट मध्ये समाविष्ट या कर काय आहे?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,एकूण लक्ष्य
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,एकूण लक्ष्य
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,हे खरेदी सूचीत टाका सक्षम आहे
 DocType: Job Applicant,Applicant for a Job,जॉब साठी अर्जदाराची
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,तयार केला नाही उत्पादन आदेश
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,कर्मचारी पगार स्लिप्स {0} आधीच या महिन्यात तयार
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,कर्मचारी पगार स्लिप्स {0} आधीच या महिन्यात तयार
 DocType: Stock Reconciliation,Reconciliation JSON,मेळ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Sales Invoice Item,Batch No,बॅच नाही
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक च्या पर्चेस बहुन विक्री आदेश परवानगी द्या
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,मुख्य
-DocType: DocPerm,Delete,हटवा
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,जिच्यामध्ये variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},नवी {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,थांबवले आदेश रद्द केले जाऊ शकत नाही. रद्द करण्यासाठी बूच.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,पैसे मिळविता सोडा?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,शेत पासून संधी अनिवार्य आहे
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
 DocType: Sales Team,Contribution to Net Total,नेट एकूण अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आयटम कोड
 DocType: Stock Reconciliation,Stock Reconciliation,शेअर मेळ
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,जॉब साठी अर्जदाराचे.
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
-DocType: Country,Country,देश
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,पत्ते
-DocType: Communication,Received,प्राप्त
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},सिरियल नाही आयटम प्रविष्ट डुप्लिकेट {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,एक शिपिंग नियम एक अट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,आयटम उत्पादन ऑर्डर आहेत करण्याची परवानगी नाही.
-DocType: DocField,Attach Image,प्रतिमा संलग्न
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),या संकुल निव्वळ वजन. (आयटम निव्वळ वजन रक्कम म्हणून स्वयंचलितपणे गणना)
-DocType: Stock Reconciliation Item,Leave blank if no change,कोणताही बदल तर रिक्त सोडा
 DocType: Sales Order,To Deliver and Bill,वाचव आणि बिल
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलन क्रेडिट रक्कम
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,उत्पादन वेळ नोंदी.
 DocType: Item,Apply Warehouse-wise Reorder Level,कोठार कुशल पुनर्क्रमित स्तर लागू करा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,कार्ये वेळ लॉग इन करा.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,भरणा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,भरणा
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक वेळ आणि खर्च
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},जास्तीत जास्त {0} साहित्याचा विनंती {1} विक्री आदेशा आयटम साठी केले जाऊ शकते {2}
 DocType: Employee,Salutation,हा सलाम लिहीत आहे
-DocType: Communication,Rejected,नाकारल्याचे
 DocType: Pricing Rule,Brand,ब्रँड
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Sales Order Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
 DocType: Quality Inspection Reading,Reading 10,10 वाचन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","आपण खरेदी किंवा विक्री आपली उत्पादने किंवा सेवा करा. आपण प्रारंभ कराल तेव्हा उपाय व इतर मालमत्ता बाब गट, युनिट तपासण्याची खात्री करा."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","आपण खरेदी किंवा विक्री आपली उत्पादने किंवा सेवा करा. आपण प्रारंभ कराल तेव्हा उपाय व इतर मालमत्ता बाब गट, युनिट तपासण्याची खात्री करा."
 DocType: Hub Settings,Hub Node,हब नोड
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,आपण ड्युप्लिकेट आयटम केला आहे. डॉ आणि पुन्हा प्रयत्न करा.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,मूल्य {0} विशेषता साठी {1} वैध आयटम यादीत अस्तित्वात नाही मूल्ये विशेषता
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,सहकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,सहकारी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,कालबाह्य
 DocType: Packing Slip,To Package No.,क्रमांक पॅकेज करण्यासाठी
-DocType: DocType,System,प्रणाली
 DocType: Warranty Claim,Issue Date,जारी केल्याचा दिनांक
 DocType: Activity Cost,Activity Cost,क्रियाकलाप खर्च
 DocType: Purchase Receipt Item Supplied,Consumed Qty,नाश Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,दूरसंचार
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,दूरसंचार
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 DocType: Payment Tool,Make Payment Entry,भरणा प्रवेश करा
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},आयटम संख्या {0} पेक्षा कमी असणे आवश्यक आहे {1}
 ,Sales Invoice Trends,विक्री चलन ट्रेन्ड
 DocType: Leave Application,Apply / Approve Leaves,पाने मंजूर / लागू करा
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,साठी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',किंवा &#39;मागील पंक्ती एकूण&#39; &#39;मागील पंक्ती रकमेवर&#39; शुल्क प्रकार असेल तर सलग पहा शकता
 DocType: Sales Order Item,Delivery Warehouse,डिलिव्हरी कोठार
 DocType: Stock Settings,Allowance Percent,भत्ता टक्के
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर विक्री, चेक करणे आवश्यक आहे {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,पुरवठादार कोटेशन आयटम
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,तत्वे करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,रूपे आहेत
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,नवीन विक्री चलन तयार करण्यासाठी &#39;विक्री चलन करा&#39; बटणावर क्लिक करा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,पॅकेजिंग आणि लेबलिंग
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,कंपनी मास्टर आणि ग्लोबल मुलभूत पूर्वनिर्धारीत चलन निर्दिष्ट करा
-DocType: Dropbox Backup,Dropbox Access Secret,ड्रॉपबॉक्स प्रवेश गुपित
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,प्रकल्प व्यवस्थापकीय
 DocType: Supplier,Supplier of Goods or Services.,वस्तू किंवा सेवा पुरवठादार.
 DocType: Budget Detail,Fiscal Year,आर्थिक वर्ष
 DocType: Cost Center,Budget,अर्थसंकल्प
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",तो एक उत्पन्न किंवा खर्च खाते नाही आहे म्हणून अर्थसंकल्प विरुद्ध {0} नियुक्त केला जाऊ शकत नाही
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,साध्य
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,साध्य
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,प्रदेश / ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,उदा 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा थकबाकी रक्कम चलन करण्यासाठी समान आवश्यक {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,उदा 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},रो {0}: रक्कम {1} पेक्षा कमी किंवा थकबाकी रक्कम चलन करण्यासाठी समान आवश्यक {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,तुम्ही विक्री चलन जतन एकदा शब्द मध्ये दृश्यमान होईल.
 DocType: Item,Is Sales Item,विक्री आयटम आहे
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,आयटम गट वृक्ष
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,{0} आयटम सिरियल क्र सेटअप नाही. आयटम मास्टर तपासा
 DocType: Maintenance Visit,Maintenance Time,देखभाल वेळ
 ,Amount to Deliver,रक्कम वितरीत करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,एखाद्या उत्पादन किंवा सेवा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,त्रुटी होत्या.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,टॅप
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,एखाद्या उत्पादन किंवा सेवा
 DocType: Naming Series,Current Value,वर्तमान मूल्य
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} तयार
 DocType: Delivery Note Item,Against Sales Order,विक्री आदेशा
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,मुळे तारीख तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 DocType: Website Item Group,Website Item Group,वेबसाइट आयटम गट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,करापोटी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी फिल्टर जाऊ शकत नाही {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साईट मध्ये दर्शविले जाईल की आयटम टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,पुरवले Qty
 DocType: Material Request Item,Material Request Item,साहित्य विनंती आयटम
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,आयटम गटांच्या वृक्ष.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,आयटम गटांच्या वृक्ष.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू ओळीवर पेक्षा मोठे किंवा समान ओळीवर पहा करू शकत नाही
 ,Item-wise Purchase History,आयटम निहाय खरेदी इतिहास
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,लाल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,लाल
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सिरियल नाही आयटम जोडले प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन ऑर्डर
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,रो # {0}: ऑपरेशन {1} उत्पादन पूर्ण माल {2} qty पूर्ण नाही आहे ऑर्डर # {3}. वेळ नोंदी द्वारे ऑपरेशन स्थिती अद्यतनित करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,एक आयटम साठी UOM बदला.
 DocType: Quality Inspection Reading,Acceptance Criteria,स्वीकृती निकष
 DocType: Item Attribute,Attribute Name,विशेषता नाव
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},आयटम {0} विक्री किंवा सेवा आयटम असणे आवश्यक आहे {1}
 DocType: Item Group,Show In Website,वेबसाइट मध्ये दर्शवा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,गट
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,गट
 DocType: Task,Expected Time (in hours),(तास) अपेक्षित वेळ
 ,Qty to Order,मागणी Qty
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","खालील कागदपत्रे वितरण टीप, संधी, साहित्य विनंती, आयटम, पर्चेस, खरेदी व्हाउचर, ग्राहक पावती, कोटेशन, विक्री चलन, उत्पादन बंडल, विक्री आदेश, माणे मध्ये ब्रांड नाव ट्रॅक करण्यासाठी"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,साफ करा टेबल
 DocType: Features Setup,Brands,ब्रांड
 DocType: C-Form Invoice Detail,Invoice No,चलन नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,खरेदी ऑर्डर पासून
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,खरेदी ऑर्डर पासून
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे म्हणून, आधी {0} रद्द / लागू केले जाऊ शकत द्या {1}"
 DocType: Activity Cost,Costing Rate,भांडवलाच्या दर
 ,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क
 DocType: Employee,Resignation Letter Date,राजीनामा तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,किंमत नियम पुढील प्रमाणावर आधारित फिल्टर आहेत.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,सेट नाही
-DocType: Communication,Date,तारीख
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,पुन्हा करा ग्राहक महसूल
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"तुमची प्रणाली सेटअप केले जात आहे, तर खिळून बसा,. या काही क्षण लागू शकतात."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'एक्सपेन्स मंजुरी' भूमिका असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,जोडी
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,जोडी
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 DocType: Maintenance Schedule Detail,Actual Date,वास्तविक तारीख
 DocType: Item,Has Batch No,बॅच नाही आहे
 DocType: Delivery Note,Excise Page Number,अबकारी पृष्ठ क्रमांक
 DocType: Employee,Personal Details,वैयक्तिक माहिती
 ,Maintenance Schedules,देखभाल वेळापत्रक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,एम्बॉसिंग
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},आयटम गट आयटम आयटम मास्टर उल्लेख केला नाही {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","उत्पादन ऑर्डर या आयटम केले जाऊ शकतात, हा एक स्टॉक आयटम असणे आवश्यक आहे."
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,सामील होत
-DocType: Authorization Rule,Above Value,मूल्य वर
 ,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
 DocType: Purchase Order,Delivered,वितरित केले
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),रोजगार ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,एकूण वाटप पाने {0} कमी असू शकत नाही कालावधीसाठी यापूर्वीच मान्यता देण्यात पाने {1} जास्त
 DocType: Journal Entry,Accounts Receivable,प्राप्तीयोग्य खाते
 ,Supplier-Wise Sales Analytics,पुरवठादार-शहाणे विक्री विश्लेषण
 DocType: Address Template,This format is used if country specific format is not found,"देशातील विशिष्ट स्वरूप सापडले नाही, तर हे स्वरूप वापरले जाते"
-DocType: Custom Field,Custom,सानुकूल
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेव्हल BOM वापरा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,इंजेक्शन मोल्डिंग
 DocType: Bank Reconciliation,Include Reconciled Entries,समेट नोंदी समाविष्ट
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial खाती वृक्ष.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,सर्व कर्मचारी प्रकार विचार तर रिक्त सोडा
 DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शुल्क आधारित
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,आयटम {1} मालमत्ता आयटम आहे म्हणून खाते {0} &#39;मुदत मालमत्ता&#39; प्रकारच्या असणे आवश्यक आहे
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
-apps/frappe/frappe/config/setup.py +130,Printing,मुद्रण
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,तुम्ही रजा अर्ज आहेत ज्या दिवशी (चे) सुट्टी आहे. आपण रजा अर्ज गरज नाही.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,आणि
 DocType: Leave Block List Allow,Leave Block List Allow,ब्लॉक यादी परवानगी द्या सोडा
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,क्रीडा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,वास्तविक एकूण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,युनिट
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,आपली साइट संरचना मध्ये ड्रॉपबॉक्स प्रवेश कळा सेट करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,युनिट
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,कंपनी निर्दिष्ट करा
 ,Customer Acquisition and Loyalty,ग्राहक संपादन आणि लॉयल्टी
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारले आयटम साठा राखण्यासाठी आहेत जेथे कोठार
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,आपले आर्थिक वर्षात रोजी संपत आहे
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,आपले आर्थिक वर्षात रोजी संपत आहे
 DocType: POS Profile,Price List,किंमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,खर्च दावे
 DocType: Issue,Support,समर्थन
-DocType: Authorization Rule,Approving Role,भूमिका मंजूर
 ,BOM Search,BOM शोध
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),बंद (+ बेरजा उघडत)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,कंपनी चलन निर्दिष्ट करा
 DocType: Workstation,Wages per hour,ताशी वेतन
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},बॅच मध्ये शेअर शिल्लक {0} होईल नकारात्मक {1} कोठार येथील आयटम {2} साठी {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","इ सिरियल क्रमांक, पीओएस जसे दर्शवा / लपवा वैशिष्ट्ये"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,साहित्य विनंत्या खालील आयटम च्या पुन्हा ऑर्डर स्तरावर आधारित आपोआप उठविला गेला आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन असणे आवश्यक आहे {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग आवश्यक आहे {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},निपटारा तारीख सलग चेक तारखेच्या आधी असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},निपटारा तारीख सलग चेक तारखेच्या आधी असू शकत नाही {0}
 DocType: Salary Slip,Deduction,कपात
 DocType: Address Template,Address Template,पत्ता साचा
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,या विक्री व्यक्ती कर्मचारी आयडी प्रविष्ट करा
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,कोटेशन
 DocType: Salary Slip,Total Deduction,एकूण कपात
 DocType: Quotation,Maintenance User,देखभाल सदस्य
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,खर्च अद्यतनित
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,खर्च अद्यतनित
 DocType: Employee,Date of Birth,जन्म तारीख
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,आयटम {0} आधीच परत आले आहे
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** आर्थिक वर्ष ** एक आर्थिक वर्ष प्रस्तुत करते. सर्व लेखा नोंदणी व इतर प्रमुख व्यवहार ** ** आर्थिक वर्ष विरुद्ध नियंत्रीत केले जाते.
 DocType: Opportunity,Customer / Lead Address,ग्राहक / लीड पत्ता
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,कामाचे वर्णन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,कामाचे वर्णन
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty शेअर UOM नुसार
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,डेटा वैध सी फाइल निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,लेप
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","विक्री मोहिमांच्या ट्रॅक ठेवा. निष्पन्न, अवतरणे मागोवा ठेवा, विक्री ऑर्डर इत्यादी मोहीमा गुंतवणूक वर परत गेज."
 DocType: Expense Claim,Approver,माफीचा साक्षीदार
 ,SO Qty,त्यामुळे Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","शेअर नोंदी कोठार विरुद्ध अस्तित्वात {0}, त्यामुळे आपण पुन्हा-नोंदवू किंवा कोठार सुधारणा करू शकत नाही"
 DocType: Appraisal,Calculate Total Score,एकूण धावसंख्या गणना
 DocType: Supplier Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल नाही {0} पर्यंत हमी अंतर्गत आहे {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,संकुल स्प्लिट वितरण टीप.
-apps/erpnext/erpnext/hooks.py +84,Shipments,निर्यात
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,बुडवून काठ
-DocType: Purchase Order,To be delivered to customer,ग्राहकाला वितरित करणे
+apps/erpnext/erpnext/hooks.py +68,Shipments,निर्यात
+DocType: Purchase Order Item,To be delivered to customer,ग्राहकाला वितरित करणे
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,वेळ लॉग स्थिती सादर करणे आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,सिरियल नाही {0} कोणत्याही वखार संबंधित नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,सेटअप
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,रो #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,रो #
 DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन)
 DocType: Pricing Rule,Supplier,पुरवठादार
 DocType: C-Form,Quarter,तिमाहीत
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,मिश्र खर्च
 DocType: Global Defaults,Default Company,मुलभूत कंपनी
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling, शेअर सेटिंग्ज सेट करा अनुमती देण्यासाठी"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling, शेअर सेटिंग्ज सेट करा अनुमती देण्यासाठी"
 DocType: Employee,Bank Name,बँक नाव
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-वरती
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,सदस्य {0} अक्षम आहे
 DocType: Leave Application,Total Leave Days,एकूण दिवस रजा
-DocType: Journal Entry Account,Credit in Account Currency,खाते चलन क्रेडिट
 DocType: Email Digest,Note: Email will not be sent to disabled users,टीप: ईमेल वापरकर्त्यांना अक्षम पाठविली जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी वाटल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} आयटम अनिवार्य आहे {1}
 DocType: Currency Exchange,From Currency,चलन पासून
-DocType: DocField,Name,नाव
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,प्रणाली प्रतिबिंबित नाही प्रमाणात
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},आयटम आवश्यक विक्री ऑर्डर {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,प्रणाली प्रतिबिंबित नाही प्रमाणात
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,इतर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,इतर
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,एक जुळणारे आयटम शोधू शकत नाही. साठी {0} काही इतर मूल्य निवडा.
 DocType: POS Profile,Taxes and Charges,कर आणि शुल्क
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","एक उत्पादन किंवा विकत घेतले, विक्री किंवा स्टॉक मध्ये ठेवली जाते की एक सेवा."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी &#39;मागील पंक्ती एकूण रोजी&#39; &#39;मागील पंक्ती रकमेवर&#39; म्हणून जबाबदारी प्रकार निवडा किंवा करू शकत नाही
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,पूर्ण
-DocType: Web Form,Select DocType,निवडा DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,बँकिंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बँकिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,वेळापत्रक प्राप्त करण्यासाठी &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,नवी खर्च केंद्र
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,नवी खर्च केंद्र
 DocType: Bin,Ordered Quantity,आदेश दिले प्रमाण
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",उदा &quot;बांधणाऱ्यांनी साधने बिल्ड&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",उदा &quot;बांधणाऱ्यांनी साधने बिल्ड&quot;
 DocType: Quality Inspection,In Process,प्रक्रिया मध्ये
 DocType: Authorization Rule,Itemwise Discount,Itemwise सवलत
 DocType: Purchase Order Item,Reference Document Type,संदर्भ दस्तऐवज प्रकार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} विक्री आदेशा {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} विक्री आदेशा {1}
 DocType: Account,Fixed Asset,निश्चित मालमत्ता
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,सिरीयलाइज यादी
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,सिरीयलाइज यादी
 DocType: Activity Type,Default Billing Rate,डीफॉल्ट बिलिंग दर
 DocType: Time Log Batch,Total Billing Amount,एकूण बिलिंग रक्कम
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,प्राप्त खाते
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,वेळ नोंदी तयार:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,योग्य खाते निवडा
 DocType: Item,Weight UOM,वजन UOM
 DocType: Employee,Blood Group,रक्त गट
 DocType: Purchase Invoice Item,Page Break,पृष्ठ ब्रेक
 DocType: Production Order Operation,Pending,प्रलंबित
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,विशिष्ट कर्मचारी सुट्टीच्या अनुप्रयोग मंजूर करू शकता जे वापरकर्ते
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,आपण व्हेरियंट मुलभूत UOM बदलू शकत नाही. साचा व्हेरियंट बदल मुलभूत UOM मुलभूत UOM बदलण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,कार्यालय उपकरणे
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,कंपन्या
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,इलेक्ट्रॉनिक्स
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,इलेक्ट्रॉनिक्स
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,स्टॉक पुन्हा आदेश स्तरावर पोहोचते तेव्हा साहित्य विनंती वाढवण्याची
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,देखभाल वेळापत्रक पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,पूर्ण-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,पूर्ण-वेळ
 DocType: Purchase Invoice,Contact Details,संपर्क माहिती
 DocType: C-Form,Received Date,प्राप्त तारीख
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","तुम्ही विक्री कर आणि शुल्क साचा मध्ये एक मानक टेम्प्लेट तयार केले असेल तर, एक निवडा आणि खालील बटणावर क्लिक करा."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,जॉब ओपनिंग
 DocType: Payment Reconciliation,Payment Reconciliation,भरणा मेळ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,प्रभारी व्यक्तीचे नाव निवडा कृपया
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,तंत्रज्ञान
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
 DocType: Offer Letter,Offer Letter,पत्र ऑफर
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,साहित्य विनंत्या (एमआरपी) आणि उत्पादन आदेश व्युत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,एकूण Invoiced रक्कम
 DocType: Time Log,To Time,वेळ
+DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य वरील) भूमिका मंजूर
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","मुलाला नोडस् जोडण्यासाठी, वृक्ष अन्वेषण आणि आपण अधिक नोडस् जोडू इच्छित ज्या अंतर्गत नोड वर क्लिक करा."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,खाते क्रेडिट देय खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
 DocType: Production Order Operation,Completed Qty,पूर्ण Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,ग्राहक आयटम कोड
 DocType: Opportunity,Lost Reason,गमावले कारण
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ऑर्डर किंवा चलने विरुद्ध भरणा नोंदी तयार करा.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,वेल्डिंग
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,नवी स्टॉक UOM आवश्यक आहे
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;प्रकरण क्रमांक पासून&#39; एक वैध निर्दिष्ट करा
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट सुरू केले
 DocType: Project,External,बाह्य
 DocType: Features Setup,Item Serial Nos,आयटम सिरियल क्र
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या
@@ -1840,32 +1695,28 @@
 DocType: Bin,Actual Quantity,वास्तविक प्रमाण
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,आढळले नाही सिरियल नाही {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,आपले ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,संक्षेप काठ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,आपले ग्राहक
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
 DocType: Sales Order,Not Delivered,वितरण नाही
 ,Bank Clearance Summary,बँक लाभ सारांश
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","तयार करा आणि दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests व्यवस्थापित करा."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
-DocType: Event,Friday,शुक्रवारी
 DocType: Time Log,Costing Amount,भांडवलाच्या रक्कम
 DocType: Process Payroll,Submit Salary Slip,पगाराच्या स्लिप्स सादर करा
 DocType: Salary Structure,Monthly Earning & Deduction,मासिक कमाई आणि कपात
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,आयटम {0} आहे {1}% साठी Maxiumm सवलतीच्या
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,आयटम {0} आहे {1}% साठी Maxiumm सवलतीच्या
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,मोठ्या प्रमाणात आयात
 DocType: Sales Partner,Address & Contacts,पत्ता आणि संपर्क
 DocType: SMS Log,Sender Name,प्रेषकाचे नाव
-DocType: Page,Title,शीर्षक
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,सानुकूल करा
 DocType: POS Profile,[Select],[निवडा]
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,विक्री चलन करा
 DocType: Company,For Reference Only.,संदर्भ केवळ.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},अवैध {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,आगाऊ रक्कम
 DocType: Manufacturing Settings,Capacity Planning,क्षमता नियोजन
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'तारीख पासून' आवश्यक आहे
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'तारीख पासून' आवश्यक आहे
 DocType: Journal Entry,Reference Number,संदर्भ क्रमांक
 DocType: Employee,Employment Details,रोजगार तपशील
 DocType: Employee,New Workplace,नवीन कामाची जागा
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
 DocType: Item,End of Life,आयुष्याच्या शेवटी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,प्रवास
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,प्रवास
 DocType: Leave Block List,Allow Users,वापरकर्त्यांना परवानगी द्या
 DocType: Purchase Order,Customer Mobile No,ग्राहक मोबाइल नं
 DocType: Sales Invoice,Recurring,आवर्ती
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,साधन पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ट्रान्सफर साहित्य
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च निर्देशीत आणि आपल्या ऑपरेशन नाही एक अद्वितीय ऑपरेशन द्या."
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
 DocType: Installation Note,Installation Note,प्रतिष्ठापन टीप
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,कर जोडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,कर जोडा
 ,Financial Analytics,आर्थिक विश्लेषण
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 DocType: Address,Subsidiary,उपकंपनी
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
 DocType: Quality Inspection,Purchase Receipt No,खरेदी पावती नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,बयाणा रक्कम
-DocType: System Settings,In Hours,तास मध्ये
 DocType: Process Payroll,Create Salary Slip,पगाराच्या स्लिप्स तयार करा
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,बँक नुसार अपेक्षित शिल्लक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,बँक नुसार अपेक्षित शिल्लक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),निधी स्रोत (दायित्व)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
 DocType: Appraisal,Employee,कर्मचारी
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,व्हाउचर गट
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक रोजी
 DocType: Sales Invoice,Mass Mailing,मास मेलींग
-DocType: Page,Standard,मानक
 DocType: Rename Tool,File to Rename,पुनर्नामित करा फाइल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,शो देयके
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},आयटम अस्तित्वात नाही निर्दिष्ट BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,आकार
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},आयटम अस्तित्वात नाही निर्दिष्ट BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,फार्मास्युटिकल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,फार्मास्युटिकल
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,खरेदी आयटम खर्च
 DocType: Selling Settings,Sales Order Required,विक्री ऑर्डर आवश्यक
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ग्राहक तयार करा
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 वाचन
 DocType: Supplier,Is Frozen,गोठवले आहे
 DocType: Buying Settings,Buying Settings,खरेदी सेटिंग्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,मास पूर्ण
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,एक तयार झालेले चांगले आयटम साठी BOM क्रमांक
 DocType: Upload Attendance,Attendance To Date,"तारीख करण्यासाठी, विधान परिषदेच्या"
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),विक्री ई-मेल आयडी साठी सेटअप येणार्या सर्व्हर. (उदा sales@example.com)
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Tool,Payment Account,भरणा खाते
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,मसुदा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,भरपाई देणारा बंद
 DocType: Quality Inspection Reading,Accepted,स्वीकारले
-DocType: User,Female,स्त्री
-DocType: Journal Entry Account,Debit in Account Currency,खाते चलनात डेबिट
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनी सर्व व्यवहार हटवू इच्छिता याची खात्री करा. ती आहे म्हणून आपला मालक डेटा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
-DocType: Print Settings,Modern,आधुनिक
-DocType: Communication,Replied,प्रत्युत्तर दिले
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},अवैध संदर्भ {0} {1}
 DocType: Payment Tool,Total Payment Amount,एकूण भरणा रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) नियोजित quanitity पेक्षा जास्त असू शकत नाही ({2}) उत्पादन ऑर्डर {3}
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
 DocType: Newsletter,Test,कसोटी
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","सध्याच्या स्टॉक व्यवहार आपण मूल्ये बदलू शकत नाही \ या आयटम, आहेत म्हणून &#39;सिरियल नाही आहे&#39; &#39;&#39; बॅच आहे नाही &#39;,&#39; शेअर आयटम आहे &#39;आणि&#39; मूल्यांकन पद्धत &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,जलद प्रवेश जर्नल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
 DocType: Stock Entry,For Quantity,प्रमाण साठी
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},सलग येथे आयटम {0} साठी नियोजनबद्ध Qty प्रविष्ट करा {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,आयटम विनंती.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,स्वतंत्र उत्पादन करण्यासाठी प्रत्येक पूर्ण चांगल्या आयटम तयार केले जाईल.
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,सेटअप पूर्ण
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","या अद्ययावत गोठविली लेखा नोंद, कोणीही / करू खाली निर्दिष्ट भूमिका वगळता नोंद संपादीत करू शकता."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,प्रकल्प स्थिती
 DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्र साठी)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,वृत्तपत्र मेलिंग सूची
 DocType: Delivery Note,Transporter Name,वाहतुक नाव
+DocType: Authorization Rule,Authorized Value,अधिकृत मूल्य
 DocType: Contact,Enter department to which this Contact belongs,या संपर्क मालकीचे जे विभाग प्रविष्ट करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,एकूण अनुपिस्थत
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,सलग {0} जुळत नाही सामग्री विनंती आयटम किंवा कोठार
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,माप युनिट
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,माप युनिट
 DocType: Fiscal Year,Year End Date,वर्ष अंतिम तारीख
 DocType: Task Depends On,Task Depends On,कार्य अवलंबून असते
 DocType: Lead,Opportunity,संधी
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),बेसिक रेट (शेअर UOM नुसार)
 DocType: SMS Log,No of Requested SMS,मागणी एसएमएस नाही
 DocType: Campaign,Campaign-.####,मोहीम -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,छेदन
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,एक आयोग कंपन्या उत्पादने विकतो तृतीय पक्ष जो वितरक / विक्रेता / दलाल / संलग्न / विक्रेत्याशी.
 DocType: Customer Group,Has Child Node,बाल नोड आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","येथे स्थिर URL मापदंड प्रविष्ट करा (उदा. प्रेषक = ERPNext, वापरकर्तानाव = ERPNext, पासवर्ड = 1234 इ)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} कोणत्याही सक्रिय आर्थिक वर्ष आहे. अधिक माहितीसाठी या तपासासाठी {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,हे नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेले आहे
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,हे नमुना वेबसाइट ERPNext पासून स्वयं-व्युत्पन्न केलेले आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing श्रेणी 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemical यंत्र
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","सर्व खरेदी व्यवहार लागू केले जाऊ शकते मानक कर टेम्प्लेट. हा साचा इ #### आपण सर्व ** आयटम मानक कर दर असतील येथे परिभाषित कर दर टीप &quot;हाताळणी&quot;, कर डोक्यावर आणि &quot;शिपिंग&quot;, &quot;इन्शुरन्स&quot; सारखे इतर खर्च डोक्यावर यादी असू शकतात * *. विविध दर आहेत ** की ** आयटम नाहीत, तर ते ** आयटम करात समाविष्ट करणे आवश्यक आहे ** ** आयटम ** मास्टर मेज. #### स्तंभ वर्णन 1. गणना प्रकार: - हे (मूलभूत रक्कम बेरीज आहे) ** नेट एकूण ** वर असू शकते. - ** मागील पंक्ती एकूण / रक्कम ** रोजी (संचयी कर किंवा शुल्क साठी). तुम्ही हा पर्याय निवडत असाल, तर कर रक्कम एकूण (कर सारणी मध्ये) मागील सलग टक्केवारी म्हणून लागू केले जाईल. - ** ** वास्तविक (नमूद). 2. खाते प्रमुख: हा कर 3. खर्च केंद्र बुक केले जाईल ज्या अंतर्गत खाते खातेवही: कर / शुल्क (शिपिंग सारखे) एक उत्पन्न आहे किंवा खर्च तर ती खर्च केंद्र विरुद्ध गुन्हा दाखल करण्यात यावा करणे आवश्यक आहे. 4. वर्णन: कर वर्णन (की पावत्या / कोट छापले जाईल). 5. दर: कर दर. 6 रक्कम: कर रक्कम. 7. एकूण: या बिंदू संचयी एकूण. 8. रो प्रविष्ट करा: आधारित असेल, तर &quot;मागील पंक्ती एकूण&quot; जर तुम्ही या गणित एक बेस (मुलभूत मागील ओळीत आहे) म्हणून घेतले जाईल जे ओळीवर निवडू शकता. 9. कर किंवा शुल्क विचार करा: कर / शुल्क मूल्यांकन केवळ आहे (एकूण नाही एक भाग) किंवा (फक्त आयटम मूल्यवान नाही) एकूण किंवा दोन्ही असल्यावरच हा विभाग तुम्ही देखिल निर्देशीत करू शकता. 10. जोडा किंवा वजा: आपण जोडू किंवा कर वजा करायचे."
-DocType: Note,Note,टीप
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
-DocType: Email Account,Email Ids,ईमेल आयडी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर प्रमाणात जास्त आयटम {0} निर्मिती करू शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,"शेअर प्रवेश {0} सबमिट केलेली नाही,"
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 DocType: Tax Rule,Billing City,बिलिंग शहर
 DocType: Global Defaults,Hide Currency Symbol,चलन प्रतीक लपवा
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,क्रेडिट टीप
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},पूर्ण Qty पेक्षा अधिक असू शकत नाही {0} ऑपरेशन {1}
 DocType: Features Setup,Quality,गुणवत्ता
-DocType: Contact Us Settings,Introduction,परिचय
 DocType: Warranty Claim,Service Address,सेवा पत्ता
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,शेअर मेळ मॅक्स 100 पंक्ती.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,शेअर मेळ मॅक्स 100 पंक्ती.
 DocType: Stock Entry,Manufacture,उत्पादन
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,कृपया वितरण टीप पहिल्या
 DocType: Purchase Invoice,Currency and Price List,चलन आणि किंमत यादी
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाव
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,उत्पादन
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,उत्पादन
 DocType: Item,Allow Production Order,परवानगी द्या उत्पादन ऑर्डर
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
 DocType: Lead,Fax,फॅक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,सबमिट
 DocType: Salary Structure,Total Earning,एकूण कमाई
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ज्या वेळ"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,माझे पत्ते
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,संघटना शाखा मास्टर.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,किंवा
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,उपयुक्तता खर्च
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-वर
 DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
-,Download Backups,डाउनलोड साठवत
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","इ कंपनी, चलन, वर्तमान आर्थिक वर्षात, जसे सेट मुलभूत मुल्य"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,भरणा प्रकार
 DocType: Process Payroll,Select Employees,निवडा कर्मचारी
 DocType: Bank Reconciliation,To Date,तारीख करण्यासाठी
 DocType: Opportunity,Potential Sales Deal,संभाव्य विक्री कराराचा
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,तपशील
 DocType: Purchase Invoice,Total Taxes and Charges,एकूण कर आणि शुल्क
 DocType: Employee,Emergency Contact,तात्काळ संपर्क
 DocType: Item,Quality Parameters,दर्जा
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,सिरियल / नाही बॅच
 DocType: Product Bundle,Parent Item,मुख्य घटक
 DocType: Account,Account Type,खाते प्रकार
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} वाहून-अग्रेषित केले जाऊ शकत नाही प्रकार सोडा
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग कारण {0} मधील {1}. आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
 DocType: Landed Cost Voucher,Purchase Receipt Items,खरेदी पावती आयटम
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,पसंतीचे अर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,कटिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Flattening
 DocType: Account,Income Account,उत्पन्न खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,मोल्डिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",पहा कोटीच्या विभाग &quot;सामुग्री आधारित रोजी दर&quot;
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
-apps/frappe/frappe/desk/moduleview.py +61,Documents,दस्तऐवज
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ
 DocType: Cost Center,Cost Center,खर्च केंद्र
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,प्रमाणक #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,प्रमाणक #
 DocType: Notification Control,Purchase Order Message,ऑर्डर संदेश खरेदी
 DocType: Tax Rule,Shipping Country,शिपिंग देश
 DocType: Upload Attendance,Upload HTML,अपलोड करा HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",एकूण आगाऊ ({0}) आदेश विरुद्ध {1} \ जास्त असू शकत नाही एकूण पेक्षा ({2})
 DocType: Employee,Relieving Date,Relieving तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारी परिभाषित केले आहे."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश द्वारे बदलले जाऊ शकते / डिलिव्हरी टीप / खरेदी पावती
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,लेझर निव्वळ आकार घेत engineered
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,आयकर
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","निवड किंमत नियम &#39;किंमत&#39; केले असेल, तर ते दर सूची अधिलिखित केले जाईल. किंमत नियम किंमत अंतिम किंमत आहे, त्यामुळे पुढील सवलतीच्या लागू केले जावे. त्यामुळे, इ विक्री आदेश, पर्चेस जसे व्यवहार, ते ऐवजी &#39;दर सूची दर&#39; फील्डमध्ये पेक्षा, &#39;दर&#39; फील्डमध्ये प्राप्त करता येईल."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{0} quotation_to एक मूल्य निवडा {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
-DocType: User,Bio,जैव
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड समान आहेत तर, विलीन फक्त शक्य आहे. गट, रूट प्रकार, कंपनी आहे"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,नवी खर्च केंद्र नाव
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा एक नवीन तयार करा.
 DocType: Appraisal,HR User,एचआर सदस्य
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष Qty
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
 DocType: Supplier,Billing Currency,बिलिंग चलन
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,अधिक मोठे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,अधिक मोठे
 ,Profit and Loss Statement,नफा व तोटा स्टेटमेंट
 DocType: Bank Reconciliation Detail,Cheque Number,धनादेश क्रमांक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,दाबल्याने
 DocType: Payment Tool Detail,Payment Tool Detail,भरणा साधन तपशील
 ,Sales Browser,विक्री ब्राउझर
 DocType: Journal Entry,Total Credit,एकूण क्रेडिट
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश विरुद्ध अस्तित्वात {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,स्थानिक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),कर्ज मालमत्ता (assets)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,कर्जदार
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,मोठे
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,नाही कर्मचारी आढळले!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,मोठे
 DocType: C-Form Invoice Detail,Territory,प्रदेश
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,आवश्यक भेटी नाही उल्लेख करा
 DocType: Purchase Order,Customer Address Display,ग्राहक पत्ता प्रदर्शन
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,कांती
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा पुस्तक किंवा तोटा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","आपण आधीच दुसर्या UOM काही व्यवहार (चे) केले आहे \ कारण आयटम साठी उपाय, डीफॉल्ट युनिट {0} थेट बदलले जाऊ शकत नाही. मुलभूत UOM बदलण्यासाठी, \ वापर शेअर विभागात अंतर्गत साधन &#39;UOM उपयुक्तता बदला."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,विनिमय दर आणखी मध्ये एक चलन रूपांतरित करण्यात निर्देशीत
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,कोटेशन {0} रद्द
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,कोटेशन {0} रद्द
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,एकूण थकबाकी रक्कम
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,{0} कर्मचारी वर सुट्टी घेतली होती {1}. हजेरी चिन्हांकित करू शकत नाही.
 DocType: Sales Partner,Targets,लक्ष्य
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आपण सेट आणि लक्ष्य निरीक्षण करू शकता जेणेकरून सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते.
 ,S.O. No.,त्यामुळे क्रमांक
 DocType: Production Order Operation,Make Time Log,वेळ लॉग करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,पुनर्क्रमित प्रमाण सेट करा
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},लीड ग्राहक तयार करा {0}
 DocType: Price List,Applicable for Countries,देश साठी लागू
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,संगणक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,इलेक्ट्रो-रासायनिक पदार्थ बारीक
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,हे मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,खाती आपल्या चार्ट सेटअप तुम्ही लेखा नोंदी सुरू करा आधी
 DocType: Purchase Invoice,Ignore Pricing Rule,किंमत नियम दुर्लक्ष करा
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,रद्द
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,तत्वे दिनांक पासून कर्मचारी सामील होत तारीख पेक्षा कमी असू शकत नाही.
 DocType: Employee Education,Graduate,पदवीधर
 DocType: Leave Block List,Block Days,ब्लॉक दिवस
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","तपासा अशी यादी तयार करणे आवर्ती तर, आवर्ती थांबवू किंवा योग्य अंतिम तारीख ठेवणे अनचेक"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} उपस्थिती आधीच खूण आहे
 DocType: Packing Slip,If more than one package of the same type (for print),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,कमाल {0} पंक्ती परवानगी
 DocType: C-Form Invoice Detail,Net Total,नेट एकूण
 DocType: Bin,FCFS Rate,FCFS दर
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),बिलिंग (विक्री चलन)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,हेतू
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन म्हणून कोणत्याही उपलब्ध काम तासांपेक्षा जास्त {1}, अनेक ऑपरेशन मध्ये ऑपरेशन तोडून"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,पाहून यंत्र
 ,Requested,विनंती
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,नाही शेरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,मुदत संपलेला
 DocType: Account,Stock Received But Not Billed,शेअर प्राप्त पण बिल नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,रूट खाते एक गट असणे आवश्यक आहे
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,एकूण वेतन + थकबाकी रक्कम + एनकॅशमेंट रक्कम - एकूण कपात
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Features Setup,Sales and Purchase,विक्री आणि खरेदी
 DocType: Supplier Quotation Item,Material Request No,साहित्य विनंती नाही
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ग्राहकांना चलनात दर कंपनीच्या बेस चलनात रुपांतरीत आहे
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ही यादी यशस्वी सदस्यत्व रद्द केले आहे.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),निव्वळ दर (कंपनी चलन)
-apps/frappe/frappe/templates/base.html +134,Added,जोडले
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,प्रदेश वृक्ष व्यवस्थापित करा.
 DocType: Journal Entry Account,Sales Invoice,विक्री चलन
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,आर्थिक वर्ष {0} सापडले नाही.
 DocType: Bank Reconciliation,Get Relevant Entries,संबंधित नोंदी मिळवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,शेअर एकट्या प्रवेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
-apps/frappe/frappe/desk/query_report.py +136,Total,एकूण
 DocType: Purchase Invoice,Apply Additional Discount On,अतिरिक्त सवलत लागू
 DocType: Account,Root Type,रूट प्रकार
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}: पेक्षा अधिक परत करू शकत नाही {1} आयटम साठी {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग अनिवार्य आहे {0}
 DocType: Quality Inspection,Quality Inspection,गुणवत्ता तपासणी
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,लागत स्प्रे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,अतिरिक्त लहान
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: Qty मागणी साहित्य किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संघटना राहण्याचे लेखा स्वतंत्र चार्ट सह कायदेशीर अस्तित्व / उपकंपनी.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,पु किंवा बी.एस.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},फक्त रक्कम करू शकता बिल न केलेली {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,आयोगाने दर पेक्षा जास्त 100 असू शकत नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,किमान सूची स्तर
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,निर्माता भाग क्रमांक
 DocType: Production Order Operation,Estimated Time and Cost,अंदाजे वेळ आणि खर्च
 DocType: Bin,Bin,बिन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,पाठविलेला एसएमएस नाही
 DocType: Account,Company,कंपनी
 DocType: Account,Expense Account,खर्च खाते
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,सॉफ्टवेअर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,रंग
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,सॉफ्टवेअर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,रंग
 DocType: Maintenance Visit,Scheduled,अनुसूचित
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;नाही&quot; आणि &quot;विक्री आयटम आहे&quot; &quot;शेअर आयटम आहे&quot; कोठे आहे? &quot;होय&quot; आहे आयटम निवडा आणि इतर उत्पादन बंडल आहे कृपया
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,असाधारण महिने ओलांडून लक्ष्य वाटप मासिक वितरण निवडा.
 DocType: Purchase Invoice Item,Valuation Rate,मूल्यांकन दर
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,आयटम रो {0}: {1} वरील &#39;खरेदी पावत्या&#39; टेबल मध्ये अस्तित्वात नाही खरेदी पावती
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,प्रकल्प सुरू तारीख
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,पर्यंत
 DocType: Rename Tool,Rename Log,लॉग पुनर्नामित करा
 DocType: Installation Note Item,Against Document No,दस्तऐवज नाही विरुद्ध
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,विक्री भागीदार व्यवस्थापित करा.
 DocType: Quality Inspection,Inspection Type,तपासणी प्रकार
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},कृपया निवडा {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},कृपया निवडा {0}
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,संशोधक
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,अद्यतन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,संशोधक
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,पाठविण्यापूर्वी वृत्तपत्र जतन करा
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,नाव किंवा ईमेल अनिवार्य आहे
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,येणार्या गुणवत्ता तपासणी.
 DocType: Purchase Order Item,Returned Qty,परत Qty
 DocType: Employee,Exit,बाहेर पडा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} तयार माणे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,कंप पावणारा पूर्ण
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ग्राहकांच्या सोयीसाठी, हे कोड पावत्या आणि वितरण टिपा सारख्या प्रिंट स्वरूपात वापरले जाऊ शकते"
 DocType: Employee,You can enter any date manually,तुम्ही स्वतः तारीख प्रविष्ट करू शकता
 DocType: Sales Invoice,Advertisement,जाहिरात
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,प्रशिक्षणार्थी कालावधी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,प्रशिक्षणार्थी कालावधी
 DocType: Customer Group,Only leaf nodes are allowed in transaction,फक्त पाने नोडस् व्यवहार अनुमत आहेत
 DocType: Expense Claim,Expense Approver,खर्च माफीचा साक्षीदार
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरेदी पावती आयटम प्रदान
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,DATETIME करण्यासाठी
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ग्राइंडर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ओघ संकुचित
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,प्रलंबित उपक्रम
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,पुष्टी
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,तारीख relieving प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती &#39;मंजूर&#39; सादर केला जाऊ शकतो अनुप्रयोग सोडा
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्रोत मोहिम आहे तर मोहीम नाव प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,आर्थिक वर्ष निवडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,पुनर्क्रमित करा स्तर
 DocType: Attendance,Attendance Date,विधान परिषदेच्या तारीख
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,मुलाला नोडस् खाते लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,मुलाला नोडस् खाते लेजर रूपांतरीत केले जाऊ शकत नाही
 DocType: Address,Preferred Shipping Address,पसंतीचे शिपिंग पत्ता
 DocType: Purchase Receipt Item,Accepted Warehouse,स्वीकृत कोठार
 DocType: Bank Reconciliation Detail,Posting Date,पोस्टिंग तारीख
 DocType: Item,Valuation Method,मूल्यांकन पद्धत
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} करण्यासाठी विनिमय दर शोधण्यात अक्षम {1}
 DocType: Sales Invoice,Sales Team,विक्री टीम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,डुप्लिकेट नोंदणी
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,डुप्लिकेट नोंदणी
 DocType: Serial No,Under Warranty,हमी अंतर्गत
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[त्रुटी]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर जतन एकदा शब्द मध्ये दृश्यमान होईल.
 ,Employee Birthday,कर्मचारी वाढदिवस
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(दिवस मध्ये) वाटप नवी पाने
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,सिरियल नाही {0} अस्तित्वात नाही
 DocType: Pricing Rule,Discount Percentage,सवलत टक्केवारी
 DocType: Payment Reconciliation Invoice,Invoice Number,चलन क्रमांक
-apps/erpnext/erpnext/hooks.py +70,Orders,आदेश
+apps/erpnext/erpnext/hooks.py +54,Orders,आदेश
 DocType: Leave Control Panel,Employee Type,कर्मचारी प्रकार
 DocType: Employee Leave Approver,Leave Approver,माफीचा साक्षीदार सोडा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,साहित्य उत्पादन साठी हस्तांतरित
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;खर्चाचे माफीचा साक्षीदार&quot; भूमिका एक वापरकर्ता
 ,Issued Items Against Production Order,उत्पादन आदेशा जारी आयटम
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,अवैध कालावधी
 DocType: Customer,Credit Limit,क्रेडिट मर्यादा
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,व्यवहार प्रकार निवडा
 DocType: GL Entry,Voucher No,प्रमाणक नाही
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,पत्ता आणि संपर्क
 DocType: Customer,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Employee,Feedback,अभिप्राय
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","आधी वाटप केले जाऊ शकत नाही सोडा {0}, रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे म्हणून {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,पिररक्षण. वेळापत्रक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,कठोर जेट यंत्र
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,पिररक्षण. वेळापत्रक
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
-DocType: Website Settings,Website Settings,वेबसाइट सेटिंग्ज
 DocType: Item,Reorder level based on Warehouse,वखार आधारित पुन्हा क्रमवारी लावा पातळी
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,वितरीत करण्यासाठी Qty
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
 DocType: Delivery Note,Track this Delivery Note against any Project,कोणत्याही प्रकल्पाच्या विरोधात या वितरण टीप मागोवा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,रूट खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,दर्शवा शेअर नोंदी
 ,Is Primary Address,प्राथमिक पत्ता आहे
 DocType: Production Order,Work-in-Progress Warehouse,कार्य-इन-प्रगती कोठार
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Pricing Rule,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
-DocType: Communication,Phone,फोन
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),बंद (डॉ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),बंद (डॉ)
 DocType: Contact,Passive,निष्क्रीय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,नाही स्टॉक मध्ये सिरियल नाही {0}
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,व्यवहार विक्री कर टेम्प्लेट.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,बिल केलेली रक्कम
 DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,अद्यतने मिळवा
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,काही नमुना रेकॉर्ड जोडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,साहित्य विनंती {0} रद्द किंवा बंद आहे
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,काही नमुना रेकॉर्ड जोडा
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,व्यवस्थापन सोडा
-DocType: Event,Groups,गट
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
 DocType: Sales Order,Fully Delivered,पूर्णतः वितरण
 DocType: Lead,Lower Income,अल्प उत्पन्न
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,त्वरित मदत
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार रांगेत समान असू शकत नाही {0}
 DocType: Features Setup,Sales Extras,विक्री अवांतर
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} खर्च केंद्र विरुद्ध खाते {1} साठी {0} बजेट करून टाकेल {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","या शेअर मेळ उदघाटन नोंद आहे पासून फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{2} खर्च केंद्र विरुद्ध खाते {1} साठी {0} बजेट करून टाकेल {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","या शेअर मेळ उदघाटन नोंद आहे पासून फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},आयटम आवश्यक मागणी क्रमांक खरेदी {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;तारीख पासून&#39; नंतर &#39;दिनांक करण्यासाठी&#39; असणे आवश्यक आहे
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},संबंधित नाही {0} ग्राहक प्रोजेक्ट करण्यासाठी {1}
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,मूल्य किंवा Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,मिनिट
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,मिनिट
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
 DocType: Leave Block List,Leave Block List Allowed,ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,रुपांतर घटक अपूर्णांक असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,आपण लॉगिन करेल
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,आपण लॉगिन करेल
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,खाते क्रेडिट ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,सर्व पुरवठादार प्रकार
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,आयटम स्वयंचलितपणे गणती केली नाही कारण आयटम कोड बंधनकारक आहे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},कोटेशन {0} नाही प्रकारच्या {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,पगाराच्या स्लिप्स करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,सुरक्षित कर्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,अप्रतिम उत्पादने
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,उघडणे शिल्लक इक्विटी
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,तुम्ही ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही रजा मंजूर करू शकत नाही
 DocType: Appraisal,Appraisal,मूल्यमापन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,गमावले-फेस निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,चित्रकला
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,तारीख पुनरावृत्ती आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},एक असणे आवश्यक आहे माफीचा साक्षीदार सोडा {0}
 DocType: Hub Settings,Seller Email,विक्रेता ईमेल
 DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी करा चलन द्वारे)
 DocType: Workstation Working Hour,Start Time,प्रारंभ वेळ
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),निव्वळ रक्कम (कंपनी चलन)
 DocType: BOM Operation,Hour Rate,तास दर
 DocType: Stock Settings,Item Naming By,आयटम करून नामांकन
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,कोटेशन पासून
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,कोटेशन पासून
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},आणखी कालावधी संवरण {0} आला आहे {1}
 DocType: Production Order,Material Transferred for Manufacturing,साहित्य उत्पादन साठी हस्तांतरित
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,खाते {0} नाही अस्तित्वात
 DocType: Purchase Receipt Item,Purchase Order Item No,ऑर्डर आयटम नाही खरेदी
-DocType: System Settings,System Settings,प्रणाली संयोजना
 DocType: Project,Project Type,प्रकल्प प्रकार
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम आवश्यक आहे.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,विविध उपक्रम खर्च
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क तपशील
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,हातात रोख
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्ते गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
 DocType: Serial No,Is Cancelled,रद्द आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,माझे Shipments
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,माझे Shipments
 DocType: Journal Entry,Bill Date,बिल तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम आहेत जरी, तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
-DocType: Communication,Recipients,घेवप्यांची
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,मंजूरीची स्थिती
 DocType: Hub Settings,Publish Items to Hub,हब करण्यासाठी आयटम प्रकाशित
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},मूल्य रांगेत मूल्य पेक्षा कमी असणे आवश्यक पासून {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर हस्तांतरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,बँक खाते निवडा
 DocType: Newsletter,Create and Send Newsletters,तयार करा आणि पाठवा वृत्तपत्रे
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,तारीख दिनांक करण्यासाठी असणे आवश्यक आहे
 DocType: Sales Order,Recurring Order,आवर्ती ऑर्डर
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक गट / ग्राहक
 DocType: Item Group,Check this if you want to show in website,आपण वेबसाइटवर मध्ये दाखवायची असेल तर या तपासा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext आपले स्वागत आहे
+,Welcome to ERPNext,ERPNext आपले स्वागत आहे
 DocType: Payment Reconciliation Payment,Voucher Detail Number,प्रमाणक तपशील क्रमांक
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,कोटेशन होऊ
 DocType: Lead,From Customer,ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,कॉल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाच्या रक्कम (वेळ नोंदी द्वारे)
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,"ऑर्डर {0} सबमिट केलेली नाही, खरेदी"
 ,Projected,अंदाज
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},सिरियल नाही {0} कोठार संबंधित नाही {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,टीप: {0} प्रमाणात किंवा रक्कम 0 आहे म्हणून चेंडू-प्रती आणि-बुकिंग आयटम सिस्टम तपासा नाही
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,उघडण्याच्या तारीख
 DocType: Journal Entry,Remark,शेरा
 DocType: Purchase Receipt Item,Rate and Amount,दर आणि रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,कंटाळवाणा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,विक्री ऑर्डर पासून
-DocType: Blog Category,Parent Website Route,पालक वेबसाइट मार्ग
 DocType: Sales Order,Not Billed,बिल नाही
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,दोन्ही कोठार त्याच कंपनी संबंधित आवश्यक
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,संपर्क अद्याप जोडले.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,सक्रिय नाही
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,उतरले खर्च व्हाउचर रक्कम
 DocType: Time Log,Batched for Billing,बिलिंग साठी बॅच
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,पुरवठादार उपस्थित बिल.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,सवलत रक्कम
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,उदा व्हॅट
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,उदा व्हॅट
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,आयटम 4
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रवेश खाते
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","एक आयटम त्याच नावाने अस्तित्वात ({0}), आयटम समूहाचे नाव बदलू किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,लागत हॉट मेटल गॅस
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
 DocType: Sales Invoice Item,Delivered Qty,वितरित केले Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,कोठार {0}: कंपनी अनिवार्य आहे
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",कर दर उल्लेख योग्य गट (निधी&gt; वर्तमान उत्तरदायित्व&gt; कर आणि कर्तव्ये सहसा स्त्रोत जा आणि प्रकार &quot;कर&quot; या) बालक जोडा वर क्लिक करून (नवीन खाते तयार करा आणि करू.
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},साठी गहाळ चलन विनिमय दर {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,लेझर कटिंग
-DocType: Event,Monday,सोमवारी
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Account,Payable,देय
 DocType: Salary Slip,Arrear Amount,थकबाकी रक्कम
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Desc पत्ता
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,विक्री किंवा खरेदी कमीत कमी एक निवडणे आवश्यक आहे
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,उत्पादन ऑपरेशन कोठे नेले जातात.
-DocType: Page,All,सर्व
 DocType: Stock Entry Detail,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
 DocType: Employee,Confirmation Date,पुष्टीकरण तारीख
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,विक्री सदस्य
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,किमान Qty कमाल Qty पेक्षा जास्त असू शकत नाही
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,सेट
 DocType: Lead,Lead Owner,लीड मालक
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,वखार आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,वखार आवश्यक आहे
 DocType: Employee,Marital Status,विवाहित
 DocType: Stock Settings,Auto Material Request,ऑटो साहित्य विनंती
 DocType: Time Log,Will be updated when billed.,बिल जेव्हा अपडेट केले जातील.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ऑर्डर आयटम प्रदान खरेदी
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,कंपनी नाव कंपनी असू शकत नाही
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट साठी पत्र झाला.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट साठी शोध शिर्षके फाईल नाव Proforma चलन उदा.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
 DocType: POS Profile,Update Stock,अद्यतन शेअर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,आयटम साठी विविध UOM अयोग्य (एकूण) निव्वळ वजन मूल्य नेईल. प्रत्येक आयटम निव्वळ वजन समान UOM आहे याची खात्री करा.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM दर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,डिलिव्हरी टीप आयटम पुल करा
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,जर्नल नोंदी {0}-रद्द जोडलेले आहेत
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,जर्नल नोंदी {0}-रद्द जोडलेले आहेत
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","प्रकार ई-मेल, फोन, चॅट भेट, इ सर्व संचार नोंद"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,कंपनी मध्ये गोल बंद खर्च केंद्र उल्लेख करा
 DocType: Purchase Invoice,Terms,अटी
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,नवीन तयार करा
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,नवीन तयार करा
 DocType: Buying Settings,Purchase Order Required,ऑर्डर आवश्यक खरेदी
 ,Item-wise Sales History,आयटम निहाय विक्री इतिहास
 DocType: Expense Claim,Total Sanctioned Amount,एकूण मंजूर रक्कम
 ,Purchase Analytics,खरेदी Analytics
 DocType: Sales Invoice Item,Delivery Note Item,डिलिव्हरी टीप आयटम
 DocType: Expense Claim,Task,कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,दाढी
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ रो #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},बॅच नंबर आयटम अनिवार्य आहे {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,या रूट विक्री व्यक्ती आहे आणि संपादित केला जाऊ शकत नाही.
 ,Stock Ledger,शेअर लेजर
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},दर: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},दर: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,पगाराच्या स्लिप्स कपात
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,नोट्स
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,प्रथम एक गट नोड निवडा.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,फॉर्म भरा आणि तो जतन
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,त्यांच्या नवीनतम यादी स्थिती सर्व कच्चा माल असलेली एक अहवाल डाउनलोड करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,तोंड
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,समूह
 DocType: Leave Application,Leave Balance Before Application,अर्ज करण्यापूर्वी शिल्लक सोडा
 DocType: SMS Center,Send SMS,एसएमएस पाठवा
 DocType: Company,Default Letter Head,लेटरहेडवर डीफॉल्ट
 DocType: Time Log,Billable,बिल
-DocType: Authorization Rule,This will be used for setting rule in HR module,हे एचआर विभागात नियम सेट करण्यासाठी वापरले जाईल
 DocType: Account,Rate at which this tax is applied,हा कर लागू आहे येथे दर
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,पुनर्क्रमित करा Qty
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,संधी गमावली
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","सवलत फील्ड पर्चेस, खरेदी पावती, खरेदी चलन उपलब्ध होईल"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नवीन खाते नाव. टीप: ग्राहक व पुरवठादार साठी खाती तयार करू नका
-DocType: Report,Report Type,अहवाल प्रकार
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,लोड करीत आहे
 DocType: BOM Replace Tool,BOM Replace Tool,BOM साधन बदला
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,देशनिहाय मुलभूत पत्ता टेम्पलेट
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,शो कर ब्रेक अप
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,शो कर ब्रेक अप
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख नंतर असू शकत नाही {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डेटा आयात आणि निर्यात
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',तुम्ही मॅन्युफॅक्चरिंग क्रियाकलाप सहभागी तर. सक्षम आयटम &#39;उत्पादित आहे&#39;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
 DocType: Serial No,Out of AMC,एएमसी पैकी
 DocType: Purchase Order Item,Material Request Detail No,साहित्य विनंती तपशील नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,हार्ड वळण
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,देखभाल भेट द्या करा
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,विक्री मास्टर व्यवस्थापक {0} भूमिका ज्या वापरकर्ता करण्यासाठी येथे संपर्क साधा
 DocType: Company,Default Cash Account,मुलभूत रोख खाते
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,कंपनी (नाही ग्राहक किंवा पुरवठादार) मास्टर.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,पेड रक्कम रक्कम एकूण पेक्षा जास्त असू शकत नाही बंद लिहा +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} आयटम एक वैध बॅच क्रमांक नाही {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","टीप: पैसे कोणतेही संदर्भ विरुद्ध नाही, तर स्वतः जर्नल प्रवेश करा."
 DocType: Item,Supplier Items,पुरवठादार आयटम
 DocType: Opportunity,Opportunity Type,संधी प्रकार
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,म्हणून उघडा सेट
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,सादर करत आहे व्यवहार वर संपर्क स्वयंचलित ईमेल पाठवा.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","रो {0}: Qty वेअरहाऊसमध्ये avalable नाही {1} वर {2} {3}. उपलब्ध Qty: {4}, Qty हस्तांतरण: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
-DocType: Event,Sunday,रविवारी
 DocType: Sales Team,Contribution (%),योगदान (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,जबाबदारी
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,टेबल मध्ये किमान 1 चलन प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,वापरकर्ते जोडा
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,वापरकर्ते जोडा
 DocType: Pricing Rule,Item Group,आयटम गट
 DocType: Task,Actual Start Date (via Time Logs),वास्तविक प्रारंभ तारीख (वेळ नोंदी द्वारे)
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},करण्यासाठी {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0} प्रकार कर किंवा उत्पन्न किंवा खर्चाचे किंवा भार च्या खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,पाऊस बिल
 DocType: Item,Default BOM,मुलभूत BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,पुन्हा-टाइप करा कंपनीचे नाव पुष्टी करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
 DocType: Time Log Batch,Total Hours,एकूण तास
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ऑटोमोटिव्ह
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,आयटम आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,मेटल इंजेक्शन मोल्डिंग
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक आहे {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Time Log,From Time,वेळ पासून
 DocType: Notification Control,Custom Message,सानुकूल संदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","आपला देश, टाइम झोन, आणि चलन निवडा"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,गुंतवणूक बँकिंग
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,वाळू निर्णायक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,इलेक्ट्रोप्लेटिंगचा
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,हद्दीच्या
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,हद्दीच्या
 DocType: Newsletter,A Lead with this email id should exist,या ई-मेल आयडी सह आघाडी अस्तित्वात पाहिजे
 DocType: Stock Entry,From BOM,BOM पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,मूलभूत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} गोठविली आहेत करण्यापूर्वी शेअर व्यवहार
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,तारीख करण्यासाठी अर्धा दिवस रजा दिनांक पासून एकच असले पाहिजे
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केला असल्यास संदर्भ नाही बंधनकारक आहे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
 DocType: Salary Structure,Salary Structure,वेतन रचना
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","एकापेक्षा जास्त किंमत नियम समान निकष अस्तित्वात नाही, प्राधान्य सोपवून \ विरोधाचे निराकरण करा. किंमत नियम: {0}"
 DocType: Account,Bank,बँक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 DocType: Hub Settings,Access Token,प्रवेश टोकन
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,मुदत मालमत्ता आयटम आहे
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","आपण लांब प्रिंट स्वरूप असल्यास, हे वैशिष्ट्य प्रत्येक पानावर सर्व शीर्षलेख आणि तळटीप सह एकाधिक पृष्ठांवर मुद्रित केले पृष्ठ विभाजन करण्यासाठी वापरले जाऊ शकते"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,सर्व प्रदेश
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 DocType: Fiscal Year,Year Name,वर्ष नाव
 DocType: Process Payroll,Process Payroll,प्रक्रिया वेतनपट
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,कामाचे दिवस पेक्षा अधिक सुटी या महिन्यात आहेत.
 DocType: Product Bundle Item,Product Bundle Item,उत्पादन बंडल आयटम
 DocType: Sales Partner,Sales Partner Name,विक्री भागीदार नाव
 DocType: Purchase Invoice Item,Image View,प्रतिमा पहा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,पूर्ण आणि औद्योगिक पूर्ण
 DocType: Issue,Opening Time,उघडणे वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,आणि आवश्यक तारखा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,सिक्युरिटीज अँड कमोडिटी
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ड्रिलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,वाहणे काठ
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
 DocType: Tax Rule,Shipping City,शिपिंग शहर
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0} (साचा) एक प्रकार आहे. &#39;नाही प्रत बनवा&#39; वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
 DocType: Account,Purchase User,खरेदी सदस्य
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,ठोकून
-DocType: Web Page,Slideshow,स्लाइडशो
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,मुलभूत पत्ता साचा हटविले जाऊ शकत नाही
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
 DocType: Journal Entry,Print Heading,प्रिंट शीर्षक
 DocType: Quotation,Maintenance Manager,देखभाल व्यवस्थापक
-DocType: Workflow State,Search,शोध
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,एकूण शून्य असू शकत नाही
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;गेल्या ऑर्डर असल्याने दिवस&#39; शून्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,पासून दुरुस्ती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,कच्चा माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,कच्चा माल
 DocType: Leave Application,Follow via Email,ईमेल द्वारे अनुसरण करा
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,सवलत रक्कम नंतर कर रक्कम
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,बाल खाते हे खाते विद्यमान आहे. आपण हे खाते हटवू शकत नाही.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम विद्यमान {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,पहिल्या पोस्टिंग तारीख निवडा
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
 DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
@@ -2801,44 +2570,43 @@
 ,Produced,निर्मिती
 DocType: Item,Item Code for Suppliers,पुरवठादार आयटम कोड
 DocType: Issue,Raised By (Email),उपस्थित (ईमेल)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,सामान्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,नाव संलग्न
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,सामान्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,नाव संलग्न
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","आपल्या कर डोक्यावर यादी (उदा व्हॅट सीमाशुल्क इत्यादी, ते वेगळी नावे असावा) आणि त्यांचे प्रमाण दरात. हे आपण संपादित आणि नंतर अधिक जोडू शकता, जे मानक टेम्पलेट, तयार करेल."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","आपल्या कर डोक्यावर यादी (उदा व्हॅट सीमाशुल्क इत्यादी, ते वेगळी नावे असावा) आणि त्यांचे प्रमाण दरात. हे आपण संपादित आणि नंतर अधिक जोडू शकता, जे मानक टेम्पलेट, तयार करेल."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम साठी सिरियल क्र आवश्यक {0}
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
 DocType: Authorization Rule,Applicable To (Designation),लागू करण्यासाठी (पद)
-DocType: Blog Post,Blog Post,ब्लॉग पोस्ट
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,गट
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ अक्षम चलने सक्षम करा.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,पोस्टल खर्च
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक्कम)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Purchase Order,The date on which recurring order will be stop,आवर्ती ऑर्डर बंद होणार तारीख
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल नाही
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,"{0} {1} किंवा आपण वाढ करावी, उतू सहिष्णुता कमी करणे आवश्यक आहे"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,एकूण उपस्थित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,तास
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,तास
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल नाही कोठार आहे शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,कोटेशन तयार करा
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,आपण ब्लॉक तारखा वर पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},मंजूर केले जाऊ शकते {0}
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
 DocType: BOM Replace Tool,The new BOM after replacement,बदली नवीन BOM
 DocType: Features Setup,Point of Sale,विक्री पॉइंट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,कर्लिंग
 DocType: Account,Tax,कर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},रो {0}: {1} एक वैध नाही {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,शुद्धीकरण
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},रो {0}: {1} एक वैध नाही {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,उत्पादन बंडल पासून
 DocType: Production Planning Tool,Production Planning Tool,उत्पादन नियोजन साधन
 DocType: Quality Inspection,Report Date,अहवाल तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,मार्गाचे
 DocType: C-Form,Invoices,पावत्या
 DocType: Job Opening,Job Title,कार्य शीर्षक
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} आधीच कालावधीसाठी कर्मचारी {1} तरतूद {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} घेवप्यांची
 DocType: Features Setup,Item Groups in Details,तपशील आयटम गट
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,कारखानदार प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,रेट अद्यतनित करा आणि उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"टक्केवारी तुम्हांला स्वीकारणार नाही किंवा आदेश दिले प्रमाणात विरुद्ध अधिक वितरीत करण्याची परवानगी आहे. उदाहरणार्थ: तुम्ही 100 युनिट्स आदेश दिले असेल, तर. आणि आपल्या भत्ता नंतर आपण 110 युनिट प्राप्त करण्याची अनुमती आहे 10% आहे."
 DocType: Pricing Rule,Customer Group,ग्राहक गट
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},खर्च अकांऊंट बाब अनिवार्य आहे {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},खर्च अकांऊंट बाब अनिवार्य आहे {0}
 DocType: Item,Website Description,वेबसाइट वर्णन
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
 ,Sales Register,विक्री नोंदणी
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
 DocType: Address,Plant,वनस्पती
-DocType: DocType,Setup,सेटअप
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,या महिन्यात आणि प्रलंबित उपक्रम सारांश
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,थंड रोलिंग
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म या चलन {0} काढून टाका {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म या चलन {0} काढून टाका {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षात शिल्लक या आर्थिक वर्षात पाने समाविष्ट करू इच्छित असल्यास कॅरी फॉरवर्ड निवडा कृपया
 DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
 DocType: Item,Attributes,विशेषता
-DocType: Packing Slip,Get Items,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,खाते बंद लिहा प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,गेल्या ऑर्डर तारीख
-DocType: DocField,Image,प्रतिमा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,अबकारी चलन करा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},खाते {0} नाही कंपनी मालकीचे नाही {1}
-DocType: Communication,Other,इतर
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ऑपरेशन आयडी सेट नाही
 DocType: Production Order,Planned Start Date,नियोजनबद्ध प्रारंभ तारीख
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज प्रकार
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,पिररक्षण. भेट द्या
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,पिररक्षण. भेट द्या
 DocType: Leave Type,Is Encash,रोख रकमेत बदलून आहे
 DocType: Purchase Invoice,Mobile No,मोबाइल नाही
 DocType: Payment Tool,Make Journal Entry,जर्नल प्रवेश करा
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,प्रकल्प निहाय माहिती कोटेशन उपलब्ध नाही
 DocType: Project,Expected End Date,अपेक्षित शेवटची तारीख
 DocType: Appraisal Template,Appraisal Template Title,मूल्यांकन साचा शीर्षक
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,व्यावसायिक
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,व्यावसायिक
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,पालक आयटम {0} शेअर आयटम असू शकत नाही
 DocType: Cost Center,Distribution Id,वितरण आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,अप्रतिम सेवा
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,सर्व उत्पादने किंवा सेवा.
 DocType: Purchase Invoice,Supplier Address,पुरवठादार पत्ता
-DocType: Contact Us Settings,Address Line 2,पत्ता ओळ 2
-DocType: ToDo,Reference,संदर्भ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty आउट
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,मालिका अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,वित्तीय सेवा
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवा
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} विशेषता मूल्य श्रेणीत असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3}
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Leave Allocation,Unused leaves,न वापरलेले पाने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,कोटी
 DocType: Customer,Default Receivable Accounts,प्राप्तीयोग्य खाते डीफॉल्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,बिलिंग राज्य
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,लॅमिनेट
 DocType: Item Reorder,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,मुळे तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
 DocType: Supplier,Contact HTML,संपर्क HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,किरकोळ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
-DocType: Product Bundle,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,उत्पादन बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,निर्णायक
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
 DocType: GL Entry,Remarks,शेरा
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,आधारित बंद लिहा
 DocType: Features Setup,POS View,पीओएस पहा
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,एक सिरियल क्रमांक प्रतिष्ठापन रेकॉर्ड
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,सतत निर्णायक
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,एक निर्दिष्ट करा
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,वर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,थंड आकाराचे
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,खाते {0} एक गट असू शकत नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,प्रदेश
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरला जाईल.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
 DocType: Holiday List,Weekly Off,साप्ताहिक बंद
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदा 2012, 2012-13 साठी"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),अस्थायी नफा / तोटा (क्रेडिट)
 DocType: Sales Invoice,Return Against Sales Invoice,विरुद्ध विक्री चलन परत
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,आयटम 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},कंपनी मध्ये डीफॉल्ट मूल्य {0} सेट करा {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},कंपनी मध्ये डीफॉल्ट मूल्य {0} सेट करा {1}
 DocType: Serial No,Creation Time,निर्मिती वेळ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,एकूण महसूल
 DocType: Sales Invoice,Product Bundle Help,उत्पादन बंडल मदत
 ,Monthly Attendance Sheet,मासिक हजेरी पत्रक
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,आढळले नाही रेकॉर्ड
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: खर्च केंद्र आयटम अनिवार्य आहे {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,उत्पादन बंडल आयटम मिळवा
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,खाते {0} निष्क्रिय आहे
 DocType: GL Entry,Is Advance,आगाऊ आहे
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,तारीख करण्यासाठी तारीख आणि विधान परिषदेच्या पासून उपस्थिती अनिवार्य आहे
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून &#39;Subcontracted आहे&#39; प्रविष्ट करा
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,होय किंवा नाही म्हणून &#39;Subcontracted आहे&#39; प्रविष्ट करा
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही 
-DocType: Workflow State,Time,वेळ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'नफा व तोटा' प्रकार खाते {0} प्रवेशास परवानगी नाही
 DocType: Features Setup,Sales Discounts,विक्री सवलत
 DocType: Hub Settings,Seller Country,विक्रेता देश
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
 DocType: Sales Invoice,Terms and Conditions Details,अटी आणि शर्ती तपशील
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,विक्री कर आणि शुल्क साचा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,तयार कपडे आणि अॅक्सेसरीज
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,तयार कपडे आणि अॅक्सेसरीज
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ऑर्डर संख्या
 DocType: Item Group,HTML / Banner that will show on the top of product list.,उत्पादन सूचीच्या वर दर्शवेल की HTML / बॅनर.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,शिपिंग रक्कम गणना अटी निर्देशीत
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,बाल जोडा
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,भूमिका फ्रोजन खाती &amp; संपादित करा फ्रोजन नोंदी सेट करण्याची परवानगी
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ते मूल जोड आहेत म्हणून खातेवही खर्च केंद्र रूपांतरित करू शकत नाही
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,रुपांतरण फॅक्टर आवश्यक आहे
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,सिरियल #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,विक्री आयोगाने
 DocType: Offer Letter Term,Value / Description,मूल्य / वर्णन
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,ग्राहक वेळ असल्याने खरेदी
 DocType: Production Order,Expected Delivery Date,अपेक्षित वितरण तारीख
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,फुगवटा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,बाष्पीभवन-नमुना निर्णायक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,मनोरंजन खर्च
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,या विक्री ऑर्डर रद्द आधी चलन {0} रद्द करणे आवश्यक आहे विक्री
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,वय
 DocType: Time Log,Billing Amount,बिलिंग रक्कम
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,आयटम निर्दिष्ट अवैध प्रमाण {0}. प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,निरोप साठी अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,विद्यमान व्यवहार खाते हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,कायदेशीर खर्च
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","ऑटो आदेश 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Sales Invoice,Posting Time,पोस्टिंग वेळ
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,नवीन ग्राहक महसूल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,प्रवास खर्च
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} निवडले जाऊ शकत नाही
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,खाते: {0} चलन: {1} निवडले जाऊ शकत नाही
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी संबंधित नाही: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,यशस्वीरित्या ही कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
-DocType: Feed,Full Name,पूर्ण नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,उमेदवारीचा काळ
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,मुलभूत कोठार स्टॉक आयटम अनिवार्य आहे.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},महिन्यात पगार भरणा {0} आणि वर्ष {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो घाला दर सूची दर गहाळ असेल तर
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
 ,Transferred Qty,हस्तांतरित Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नॅव्हिगेट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,नियोजन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,नियोजन
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,वेळ लॉग बॅच करा
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,जारी
 DocType: Project,Total Billing Amount (via Time Logs),एकूण बिलिंग रक्कम (वेळ नोंदी द्वारे)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,आम्ही या आयटम विक्री
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,आम्ही या आयटम विक्री
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,पुरवठादार आयडी
 DocType: Journal Entry,Cash Entry,रोख प्रवेश
 DocType: Sales Partner,Contact Desc,संपर्क desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,आयटम व्यवस्थापक
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,खाती वार्षिक अर्थसंकल्प सेट करण्यासाठी पंक्ती जोडा.
 DocType: Buying Settings,Default Supplier Type,मुलभूत पुरवठादार प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,दागिने
 DocType: Production Order,Total Operating Cost,एकूण ऑपरेटिंग खर्च
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,टीप: आयटम {0} अनेक वेळा प्रवेश केला
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,सर्व संपर्क.
 DocType: Newsletter,Test Email Id,कसोटी ई मेल आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,कंपनी Abbreviation
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,कंपनी Abbreviation
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,आपण गुणवत्ता तपासणी अनुसरण केल्यास. खरेदी पावती नाही आयटम गुणवत्ता आवश्यक आणि QA वर सक्षम
 DocType: GL Entry,Party Type,पार्टी प्रकार
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,कच्चा माल मुख्य आयटम म्हणून समान असू शकत नाही
 DocType: Item Attribute Value,Abbreviation,संक्षेप
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} मर्यादा ओलांडते पासून authroized नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,फेरपालटीचे काठ
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,वेतन टेम्प्लेट मास्टर.
 DocType: Leave Type,Max Days Leave Allowed,कमाल दिवस रजा परवानगी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,हे खरेदी सूचीत टाका सेट कर नियम
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेल्या स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,सर्व ग्राहक गट
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} करणे आवश्यक आहे. कदाचित चलन विनिमय रेकॉर्ड {1} {2} करण्यासाठी तयार केले नाही.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,कर साचा बंधनकारक आहे.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,खाते {0}: पालक खाते {1} अस्तित्वात नाही
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),किंमत सूची दर (कंपनी चलन)
 DocType: Account,Temporary,अस्थायी
 DocType: Address,Preferred Billing Address,पसंतीचे बिलिंग पत्ता
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,सचिव
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,सचिव
 DocType: Serial No,Distinct unit of an Item,एक आयटम वेगळा एकक
 DocType: Pricing Rule,Buying,खरेदी
 DocType: HR Settings,Employee Records to be created by,कर्मचारी रेकॉर्ड करून तयार करणे
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,आयटम कुशल दर सूची दर
 DocType: Purchase Order Item,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण जतन एकदा शब्द मध्ये दृश्यमान होईल.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,इस्त्रीसाठी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} बंद आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,पुढील कार्यक्रम
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक आवश्यक आहे
-DocType: Letter Head,Letter Head,लेटरहेडवर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,जलद प्रवेश
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} परत अनिवार्य आहे
 DocType: Purchase Order,To Receive,प्राप्त करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,समर्पक संकुचित
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,उत्पन्न / खर्च
 DocType: Employee,Personal Email,वैयक्तिक ईमेल
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,एकूण फरक
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,एकूण फरक
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","सक्षम असल्यास, प्रणाली आपोआप यादी एकट्या नोंदी पोस्ट होईल."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,दलाली
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
 DocType: Address,Postal Code,पिन कोड
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ऑर्डर उत्पादन प्रकाशीत.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करणे आवश्यक
 DocType: Hub Settings,Name Token,नाव टोकन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,नियोजन
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,मानक विक्री
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,मानक विक्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,किमान एक कोठार अनिवार्य आहे
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Replace Tool,Replace,बदला
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,माप मुलभूत युनिट प्रविष्ट करा
 DocType: Purchase Invoice Item,Project Name,प्रकल्प नाव
 DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
-DocType: Workflow State,Edit,संपादित करा
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च तर
 DocType: Features Setup,Item Batch Nos,आयटम बॅच क्र
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,भरणा मेळ भरणा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,कर मालमत्ता
 DocType: BOM Item,BOM No,BOM नाही
-DocType: Contact Us Settings,Pincode,पिनकोड
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} {1} किंवा आधीच इतर व्हाउचर जुळवले खाते नाही
 DocType: Item,Moving Average,हलवित सरासरी
 DocType: BOM Replace Tool,The BOM which will be replaced,पुनर्स्थित केले जाईल BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,नवी स्टॉक UOM चालू स्टॉक UOM भिन्न असणे आवश्यक आहे
 DocType: Account,Debit,डेबिट
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,पाने 0.5 च्या पटीत वाटप करणे आवश्यक आहे
 DocType: Production Order,Operation Cost,ऑपरेशन खर्च
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,एक .csv फाइल पासून उपस्थिती अपलोड करा
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,बाकी रक्कम
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,मुलभूत खर्च केंद्र
 DocType: Purchase Invoice,End Date,शेवटची तारीख
 DocType: Employee,Internal Work History,अंतर्गत कार्य इतिहास
-DocType: DocField,Column Break,स्तंभ ब्रेक
-DocType: Event,Thursday,गुरुवारी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,अडचणीत
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
 DocType: Sales Invoice,Exhibition,प्रदर्शन
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,आयोजित रोजी
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,उत्पादन आयटम
 ,Employee Information,कर्मचारी माहिती
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),दर (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),दर (%)
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य (स्फोट झाला) आवश्यक
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),पे न करता सोडू साठी मिळवून कमी (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल नाही {1} जुळत नाही {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},टीप: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,या आठवड्यातील सारांश
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} एकापाठोपाठ एक खरेदी किंवा उप-करारबद्ध आयटम असणे आवश्यक आहे {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,डिलिव्हरी तारीख
-DocType: DocField,Currency,चलन
 DocType: Opportunity,Opportunity Date,संधी तारीख
 DocType: Purchase Receipt,Return Against Purchase Receipt,खरेदी पावती विरुद्ध परत
 DocType: Purchase Order,To Bill,बिल
 DocType: Material Request,% Ordered,% आदेश
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,सरासरी. खरेदी दर
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
 DocType: SMS Settings,SMS Settings,SMS सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,तात्पुरती खाती
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,ब्लॅक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,ब्लॅक
 DocType: BOM Explosion Item,BOM Explosion Item,BOM स्फोट आयटम
 DocType: Account,Auditor,लेखापरीक्षक
 DocType: Purchase Order,End date of current order's period,चालू ऑर्डरच्या कालावधी समाप्ती तारीख
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ऑफर पत्र करा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,परत
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
-DocType: DocField,Fold,दुमडणे
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,निर्दिष्ट करा
 DocType: Task,Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ग्राहक आयडी
-DocType: Page,Page Name,पृष्ठ नाव
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,वेळ वेळ पासून पेक्षा जास्त असणे आवश्यक करण्यासाठी
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},कोठार {0}: पालक खाते {1} कंपनी bolong नाही {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,आस पूर्ण
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
 DocType: Project Task,Task ID,कार्य आयडी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",उदा &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",उदा &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आयटम साठी अस्तित्वात शकत नाही स्टॉक {0} पासून रूपे आहेत
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
-DocType: System Settings,Time Zone,वेळ क्षेत्र
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,कोठार {0} अस्तित्वात नाही
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext हब नोंदणी
 DocType: Monthly Distribution,Monthly Distribution Percentages,मासिक वितरण टक्केवारी
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,निवडलेले आयटम बॅच असू शकत नाही
 DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्य% या डिलिव्हरी टीप विरोधात वितरित
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,ग्राहक तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,आकार घेत
 DocType: Employee,Reports to,अहवाल
 DocType: SMS Settings,Enter url parameter for receiver nos,स्वीकारणारा नग साठी मापदंड प्रविष्ट करा
 DocType: Sales Invoice,Paid Amount,पेड रक्कम
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',खाते {0} बंद प्रकार &#39;दायित्व&#39; असणे आवश्यक
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,नाही इतर मुलभूत आहे म्हणून हे मुलभूतरित्या पत्ता साचा सेट
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","आधीच डेबिट खाते शिल्लक, आपण &#39;क्रेडिट&#39; म्हणून &#39;शिल्लक असणे आवश्यक आहे&#39; सेट करण्याची परवानगी नाही"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,गुणवत्ता व्यवस्थापन
 DocType: Production Planning Tool,Filter based on customer,फिल्टर ग्राहक आधारित
 DocType: Payment Tool Detail,Against Voucher No,व्हाउचर नाही विरुद्ध
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आयटम संख्या प्रविष्ट करा {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 DocType: Tax Rule,Purchase,खरेदी
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,शिल्लक Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शिल्लक Qty
 DocType: Item Group,Parent Item Group,मुख्य घटक गट
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} साठी {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,खर्च केंद्रे
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,गोदामांची.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,गोदामांची.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,जे पुरवठादार चलनात दर कंपनीच्या बेस चलनात रुपांतरीत आहे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},रो # {0}: ओळ वेळा संघर्ष {1}
 DocType: Opportunity,Next Contact,पुढील संपर्क
 DocType: Employee,Employment Type,रोजगार प्रकार
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,स्थिर मालमत्ता
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,अर्ज कालावधी दोन alocation रेकॉर्ड ओलांडून असू शकत नाही
 DocType: Item Group,Default Expense Account,मुलभूत खर्च खाते
 DocType: Employee,Notice (days),सूचना (दिवस)
-DocType: Page,Yes,होय
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","व्हाउचर विरुद्ध प्रकार पर्चेस एक, खरेदी चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Account,Stock Adjustment,शेअर समायोजन
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},मुलभूत गतिविधी खर्च क्रियाकलाप प्रकार विद्यमान - {0}
 DocType: Production Order,Planned Operating Cost,नियोजनबद्ध ऑपरेटिंग खर्च
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,नवी {0} नाव
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},शोधू करा संलग्न {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},शोधू करा संलग्न {0} # {1}
 DocType: Job Applicant,Applicant Name,अर्जदाराचे नाव
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / आयटम नाव
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},सिरियल नाही आयटम अनिवार्य आहे {0}
 DocType: Item Variant Attribute,Attribute,विशेषता
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,श्रेणी / पासून ते निर्दिष्ट करा
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,करून तयार
 DocType: Serial No,Under AMC,एएमसी अंतर्गत
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,आयटम मूल्यांकन दर उतरले खर्च व्हाउचर रक्कम विचार recalculated आहे
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,व्यवहार विक्री डीफॉल्ट सेटिंग्ज.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,किमान रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,अद्यतन पूर्ण वस्तू
 DocType: Workstation,per hour,प्रती तास
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},आधीच वापरले मालिका {0} {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,कोठार (शा्वत सूची) खाते या खाते अंतर्गत तयार करण्यात येणार आहे.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,अदा केलेली रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,प्रकल्प व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,आयटम परवानगी कमाल सवलतीच्या: {0} {1}% आहे
 DocType: Customer,Default Taxes and Charges,मुलभूत कर आणि शुल्क
 DocType: Account,Receivable,प्राप्त
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे भूमिका.
 DocType: Sales Invoice,Supplier Reference,पुरवठादार संदर्भ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","चेक केलेले असल्यास, उप-विधानसभा आयटम BOM कच्चा माल मिळत विचार केला जाईल. अन्यथा, सर्व उप-विधानसभा आयटम एक कच्चा माल म्हणून मानले जाईल."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,विक्रेता वर्णन
 DocType: Employee Education,Qualification,पात्रता
 DocType: Item Price,Item Price,आयटम किंमत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,साबण आणि कपडे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,मोशन पिक्चर आणि व्हिडिओ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,समर्थन Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी गोदामांची मधिल आढळणारी {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,शेअर UOM उपयुक्तता बदला
 DocType: POS Profile,Terms and Conditions,अटी आणि शर्ती
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},तारीख करण्यासाठी आर्थिक वर्ष आत असावे. = तारीख करण्यासाठी गृहीत धरून {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","येथे आपण इ उंची, वजन, अॅलर्जी, वैद्यकीय चिंता राखण्यास मदत"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,उत्पादन
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,वरील टेबल विक्री करण्यासाठी प्रविष्ट करा
 DocType: Project Task,View Task,पहा कार्य
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,आपले आर्थिक वर्षात सुरू
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,आपले आर्थिक वर्षात सुरू
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,खरेदी पावती प्रविष्ट करा
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त करा
 DocType: Email Digest,Add/Remove Recipients,घेवप्यांची जोडा / काढा
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी &#39;डीफॉल्ट म्हणून सेट करा&#39; वर क्लिक करा"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),मदत ईमेल आयडी सेटअप येणार्या सर्व्हर. (उदा support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,आयटम जिच्यामध्ये variant {0} समान गुणधर्म अस्तित्वात
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'तारीख' आवश्यक आहे
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'तारीख' आवश्यक आहे
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित करण्यासाठी स्लिप पॅकिंग व्युत्पन्न. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
 DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
 DocType: Salary Slip,Payment Days,भरणा दिवस
 DocType: BOM,Manage cost of operations,ऑपरेशन खर्च व्यवस्थापित करा
 DocType: Features Setup,Item Advanced,आयटम प्रगत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,हॉट रोलिंग
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","तपासले व्यवहार कोणत्याही &quot;सबमिट&quot; जातात तेव्हा, एक ईमेल पॉप-अप आपोआप संलग्नक म्हणून व्यवहार, की व्यवहार संबंधित &quot;संपर्क&quot; एक ईमेल पाठवू उघडले. वापरकर्ता मे किंवा ई-मेल पाठवू शकत नाही."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ग्लोबल सेटिंग्ज
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,हे आयटम तपशील प्राप्त करणे आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,हे आयटम तपशील प्राप्त करणे आवश्यक आहे.
 DocType: Salary Slip,Net Pay,नेट पे
 DocType: Account,Account,खाते
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,सिरियल नाही {0} आधीच प्राप्त झाले आहे
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,विक्री कार्यसंघ तपशील
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,विक्री संभाव्य संधी.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,आजारी रजा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},अवैध {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,आजारी रजा
 DocType: Email Digest,Email Digest,ईमेल डायजेस्ट
 DocType: Delivery Note,Billing Address Name,बिलिंग पत्ता नाव
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,विभाग स्टोअर्स
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,प्रणाली शिल्लक
-DocType: Workflow,Is Active,सक्रिय आहे
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग स्टोअर्स
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,प्रणाली शिल्लक
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,खालील गोदामांची नाही लेखा नोंदी
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,पहिल्या दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,बदला Abbreviation
-DocType: Workflow State,Primary,प्राथमिक
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
 DocType: Item,Max Discount (%),कमाल सवलत (%)
-DocType: Communication,More Information,अधिक माहिती
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,गेल्या ऑर्डर रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,झपाटा
 DocType: Company,Warn,चेतावणी द्या
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,आयटम मूल्यांकन अद्ययावत
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
 DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Order,Raw Materials Supplied,कच्चा माल प्रदान
 DocType: Purchase Invoice,Recurring Print Format,आवर्ती प्रिंट स्वरूप
-DocType: Communication,Series,मालिका
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,अपेक्षित वितरण तारीख पर्चेस तारीख आधी असू शकत नाही
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
-DocType: Communication,Email,ईमेल
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यवसाय विकास व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,व्यवसाय विकास व्यवस्थापक
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,देखभाल भेट द्या उद्देश
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,कालावधी
 ,General Ledger,सामान्य खातेवही
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,प्रथम {0} निवडा कृपया
 DocType: Features Setup,To get Item Group in details table,तपशील तक्ता मध्ये आयटम गट प्राप्त करण्यासाठी
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,ठरविण्याशी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,कोरीव काम
 DocType: Sales Invoice,Commission,आयोग
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> डीफॉल्ट टेम्पलेट </h4><p> उपयोग <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> आणि उपलब्ध असेल (जर असेल तर सानुकूल फील्ड समावेश) पत्ता सर्व फील्ड </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,डीफॉल्ट रक्कम
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,हा महिना च्या सारांश
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता तपासणी वाचन
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन साठी 0 पेक्षा असणे आवश्यक आहे {0}
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px करून (प) वेब अनुकूल 900px ठेवा (ह)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px करून (प) वेब अनुकूल 900px ठेवा (ह)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती अद्ययावत आहेत
 DocType: Payment Tool,Get Outstanding Vouchers,थकबाकी कूपन मिळवा
 DocType: Warranty Claim,Resolved By,करून निराकरण
 DocType: Appraisal,Start Date,प्रारंभ तारीख
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,मूल्य
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,सत्यापित करण्यासाठी येथे क्लिक करा
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
 DocType: Time Log,Hours,तास
 DocType: Project,Expected Start Date,अपेक्षित प्रारंभ तारीख
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,पाठवित
-DocType: ToDo,Priority,प्राधान्य
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,शुल्क की आयटम लागू नाही तर आयटम काढा
-DocType: Dropbox Backup,Dropbox Access Allowed,ड्रॉपबॉक्स प्रवेश परवानगी
-DocType: Dropbox Backup,Weekly,साप्ताहिक
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,उदा. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,प्राप्त
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,प्राप्त
 DocType: Maintenance Visit,Fully Completed,पूर्णतः पूर्ण
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% पूर्ण
 DocType: Employee,Educational Qualification,शैक्षणिक अर्हता
 DocType: Workstation,Operating Costs,खर्च
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} यशस्वीरित्या आमच्या वार्तापत्राचे यादीत समाविष्ट केले गेले आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: एक पुनर्क्रमित अगोदरपासून या कोठार विद्यमान {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,इलेक्ट्रॉन बीम यंत्र
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ऑर्डर {0} सादर करणे आवश्यक आहे उत्पादन
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},आयटम प्रारंभ तारीख आणि अंतिम तारीख निवडा कृपया {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,मुख्य अहवाल
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,शेअर लेजर अद्ययावत शिल्लक नोंदी
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,मुख्य अहवाल
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीख करण्यासाठी तारखेपासून आधी असू शकत नाही
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,/ संपादित करा किंमती जोडा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,कॉस्ट केंद्रे चार्ट
 ,Requested Items To Be Ordered,मागणी आयटम आज्ञाप्य
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,माझे ऑर्डर
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,माझे ऑर्डर
 DocType: Price List,Price List Name,किंमत सूची नाव
 DocType: Time Log,For Manufacturing,उत्पादन साठी
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,एकूण
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,एकूण
 DocType: BOM,Manufacturing,उत्पादन
 ,Ordered Items To Be Delivered,आदेश दिले आयटम वितरित करणे
 DocType: Account,Income,उत्पन्न
-,Setup Wizard,सेटअप सहाय्यक
 DocType: Industry Type,Industry Type,उद्योग प्रकार
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,काहीतरी चूक झाली!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,चेतावणी: अनुप्रयोग सोडा खालील ब्लॉक तारखा समाविष्टीत आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,चलन {0} आधीच सादर केला गेला आहे विक्री
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,पूर्ण तारीख
 DocType: Purchase Invoice Item,Amount (Company Currency),रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,मरतात निर्णायक
-DocType: Email Alert,Reference Date,संदर्भ तारीख
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,वैध मोबाईल क्र प्रविष्ट करा
 DocType: Budget Detail,Budget Detail,अर्थसंकल्प तपशील
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,पाठविण्यापूर्वी कृपया संदेश प्रविष्ट करा
-DocType: Async Task,Status,स्थिती
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},शेअर UOM आयटम सुधारित {0}
-DocType: Company History,Year,वर्ष
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,पॉइंट-ऑफ-विक्री प्रोफाइल
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS सेटिंग्ज अद्यतनित करा
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,आधीच बिल वेळ लॉग {0}
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,सिरियल नाही सेवा करार कालावधी समाप्ती
 DocType: Item,Unit of Measure Conversion,माप रुपांतर युनिट
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,कर्मचारी बदलले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकाच खाते डेबिट करू शकत नाही
 DocType: Naming Series,Help HTML,मदत HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% असावे नियुक्त एकूण वजन. ही सेवा विनामुल्य आहे {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} आयटम साठी पार over- भत्ता {1}
 DocType: Address,Name of person or organization that this address belongs to.,या पत्त्यावर मालकीची व्यक्ती किंवा संस्थेच्या नाव.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,आपले पुरवठादार
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,आपले पुरवठादार
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केले आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,आणखी तत्वे {0} कर्मचारी सक्रिय आहे {1}. त्याच्या &#39;चा दर्जा निष्क्रीय&#39; पुढे जाण्यासाठी करा.
 DocType: Purchase Invoice,Contact,संपर्क
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,पासून प्राप्त
 DocType: Features Setup,Exports,निर्यात
 DocType: Lead,Converted,रूपांतरित
 DocType: Item,Has Serial No,सिरियल नाही आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: पासून {0} साठी {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},रो # {0}: आयटम सेट करा पुरवठादार {1}
 DocType: Issue,Content Type,सामग्री प्रकार
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,संगणक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट अनेक गट या आयटम यादी.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,इतर चलन खाती परवानगी मल्टी चलन पर्याय तपासा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,आयटम: {0} प्रणाली अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,आपण गोठविलेल्या मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Cost Center,Budgets,खर्चाचे अंदाजपत्रक
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,अद्यतनित
 DocType: Employee,Emergency Contact Details,तात्काळ संपर्क तपशील
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ती काय करते?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ती काय करते?
 DocType: Delivery Note,To Warehouse,गुदाम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},खाते {0} आर्थिक वर्षात एकापेक्षा अधिक प्रविष्ट केले गेले आहे {1}
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;होय&#39; असेल नॉन-स्टॉक आयटम शकत नाही &#39;सिरियल नाही आहे&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,विधान परिषदेच्या भविष्यात तारखा करीता चिन्हाकृत केले जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,आयटम उतरले किंमत काढण्यासाठी अतिरिक्त खर्च अद्यतनित करा
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,इलेक्ट्रिकल
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,इलेक्ट्रिकल
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},वापरकर्ता आयडी कर्मचारी साठी सेट न {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,हमी दावा पासून
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,ब्लॉक यादी नाव सोडा
-DocType: User,Enabled,सक्षम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,शेअर मालमत्ता
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},आपण खरोखर महिन्यात {0} या वर्षासाठी सर्व पगाराच्या स्लिप्स जमा करायचा {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,आयात सदस्य
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,सादर
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,डिलिव्हरी टीप {0} सादर जाऊ नये
 DocType: Notification Control,Sales Invoice Message,विक्री चलन संदेश
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,खाते {0} बंद प्रकार दायित्व / इक्विटी असणे आवश्यक आहे
 DocType: Authorization Rule,Based On,आधारित
 DocType: Sales Order Item,Ordered Qty,आदेश दिले Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},पासून आणि कालावधी आवर्ती बंधनकारक तारखा करण्यासाठी कालावधी {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,पगार डाव सावरला व्युत्पन्न
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} एक वैध ई-मेल आयडी नाही
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","पाञ म्हणून निवडले आहे, तर खरेदी, चेक करणे आवश्यक आहे {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,सवलत 100 पेक्षा कमी असणे आवश्यक आहे
-DocType: ToDo,Low,कमी
 DocType: Purchase Invoice,Write Off Amount (Company Currency),रक्कम बंद लिहा (कंपनी चलन)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,हातमाग
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरले खर्च व्हाउचर
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},सेट करा {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महिना दिवशी पुन्हा करा
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,मोहीम नाव आवश्यक आहे
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Receipt Item,Rejected Serial No,नाकारल्याचे सिरियल नाही
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,दीप रेखाचित्र
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,नवी वृत्तपत्र
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},आयटम साठी अंतिम तारीख कमी असणे आवश्यक आहे प्रारंभ तारीख {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,दर्शवा शिल्लक
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,रक्कम
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
 ,Sales Analytics,विक्री Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,उत्पादन सेटिंग्ज
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,नवीन खाते नाव
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,कच्चा माल प्रदान खर्च
 DocType: Selling Settings,Settings for Selling Module,विभाग विक्री साठी सेटिंग्ज
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ग्राहक सेवा
 DocType: Item,Thumbnail,लघुप्रतिमा
 DocType: Item Customer Detail,Item Customer Detail,आयटम ग्राहक तपशील
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,आपला ई-मेल पुष्टी करा
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ऑफर उमेदवार जॉब.
 DocType: Notification Control,Prompt for Email on Submission of,सादरीकरण ईमेल विनंती
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,एकूण वाटप पाने कालावधीत दिवस जास्त आहे
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,आयटम {0} एक स्टॉक आयटम असणे आवश्यक आहे
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,प्रगती वखार मध्ये डीफॉल्ट कार्य
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,लेखा व्यवहार डीफॉल्ट सेटिंग्ज.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} आवश्यक आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,व्हॅक्यूम काठ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारीख आधी असू शकत नाही
-DocType: Contact Us Settings,City,शहर
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic यंत्र
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,त्रुटी: वैध आयडी?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,आयटम {0} विक्री आयटम असणे आवश्यक आहे
 DocType: Naming Series,Update Series Number,अद्यतन मालिका क्रमांक
 DocType: Account,Equity,इक्विटी
 DocType: Sales Order,Printing Details,मुद्रण तपशील
 DocType: Task,Closing Date,अखेरची दिनांक
 DocType: Sales Order Item,Produced Quantity,निर्मिती प्रमाण
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,अभियंता
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,अभियंता
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,शोध उप विधानसभा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},आयटम कोड रो नाही आवश्यक {0}
 DocType: Sales Partner,Partner Type,भागीदार प्रकार
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise सवलत
 DocType: Purchase Invoice,Against Expense Account,खर्चाचे खाते विरुद्ध
 DocType: Production Order,Production Order,उत्पादन ऑर्डर
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,प्रतिष्ठापन टीप {0} आधीच सादर केला गेला आहे
 DocType: Quotation Item,Against Docname,Docname विरुद्ध
 DocType: SMS Center,All Employee (Active),सर्व कर्मचारी (सक्रिय)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,आता पहा
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,कच्चा माल खर्च
 DocType: Item,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करायचे आहे आयटम आणि नियोजित qty प्रविष्ट करा.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,मालिका अद्यतनित
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,अहवाल प्रकार अनिवार्य आहे
 DocType: Item,Serial Number Series,अनुक्रमांक मालिका
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},कोठार सलग शेअर आयटम {0} अनिवार्य आहे {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,रिटेल अॅण्ड घाऊक
 DocType: Issue,First Responded On,प्रथम रोजी प्रतिसाद
 DocType: Website Item Group,Cross Listing of Item in multiple groups,अनेक गट आयटम च्या क्रॉस यादी
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,प्रथम वापरकर्ता: आपण
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,प्रथम वापरकर्ता: आपण
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,यशस्वीरित्या समेट
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,यशस्वीरित्या समेट
 DocType: Production Order,Planned End Date,नियोजनबद्ध अंतिम तारीख
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,आयटम कोठे साठवले जातात.
 DocType: Tax Rule,Validity,वैधता
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced रक्कम
 DocType: Attendance,Attendance,विधान परिषदेच्या
-DocType: Page,No,नाही
 DocType: BOM,Materials,साहित्य
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","तपासले नाही, तर यादी तो लागू करण्यात आली आहे, जेथे प्रत्येक विभाग जोडले आहे."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,तारीख पोस्ट आणि वेळ पोस्ट करणे आवश्यक आहे
@@ -3689,55 +3376,46 @@
 ,Item Prices,आयटम किंमती
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,तुम्ही पर्चेस जतन एकदा शब्द मध्ये दृश्यमान होईल.
 DocType: Period Closing Voucher,Period Closing Voucher,कालावधी बंद व्हाउचर
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,किंमत सूची मास्टर.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,किंमत सूची मास्टर.
 DocType: Task,Review Date,पुनरावलोकन तारीख
 DocType: Purchase Invoice,Advance Payments,आगाऊ पेमेंट
-DocType: DocPerm,Level,स्तर
 DocType: Purchase Taxes and Charges,On Net Total,नेट एकूण रोजी
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,{0} सलग लक्ष्य कोठार उत्पादन आदेश सारखाच असणे आवश्यक आहे
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,दळणे
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,कोणतीही परवानगी नाही भरणा साधन वापरण्यास
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,चलन काही इतर चलन वापरत नोंदी केल्यानंतर बदलले जाऊ शकत नाही
 DocType: Company,Round Off Account,खाते बंद फेरीत
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,प्रशासकीय खर्च
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,सल्ला
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,सल्ला
 DocType: Customer Group,Parent Customer Group,पालक ग्राहक गट
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,बदला
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",उदा &quot;माझे कंपनी LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,सूचना कालावधी
 DocType: Bank Reconciliation Detail,Voucher ID,प्रमाणक आयडी
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,या मूळ प्रदेश आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Packing Slip,Gross Weight UOM,एकूण वजन UOM
 DocType: Email Digest,Receivables / Payables,Receivables / देय
 DocType: Delivery Note Item,Against Sales Invoice,विक्री चलन विरुद्ध
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,स्टॅम्पिंग
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,उतरले खर्च आयटम
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},विशेषतेसाठी मूल्य विशेषता निर्दिष्ट करा {0}
 DocType: Item,Default Warehouse,मुलभूत कोठार
 DocType: Task,Actual End Date (via Time Logs),वास्तविक समाप्ती तारीख (वेळ नोंदी द्वारे)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},अर्थसंकल्पात गट खाते विरुद्ध नियुक्त केली जाऊ शकत {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,पालक खर्च केंद्र प्रविष्ट करा
 DocType: Delivery Note,Print Without Amount,रक्कम न मुद्रण
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
-DocType: User,Last Name,गेल्या नाव
-DocType: Web Page,Left,डावीकडे
-DocType: Event,All Day,सर्व दिवस
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
 DocType: Issue,Support Team,समर्थन कार्यसंघ
 DocType: Appraisal,Total Score (Out of 5),(5 पैकी) एकूण धावसंख्या
-DocType: Contact Us Settings,State,राज्य
 DocType: Batch,Batch,बॅच
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,शिल्लक
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,शिल्लक
 DocType: Project,Total Expense Claim (via Expense Claims),एकूण खर्च हक्क (खर्चाचे दावे द्वारे)
-DocType: User,Gender,लिंग
 DocType: Journal Entry,Debit Note,डेबिट टीप
 DocType: Stock Entry,As per Stock UOM,शेअर UOM नुसार
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,कालबाह्य नाही
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,मूल्ये आधारित व्यवहार प्रतिबंधित नियम तयार करा.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","चेक केलेले असल्यास, एकूण नाही. कार्यरत दिवस सुटी समावेश असेल, आणि या पगार प्रति दिन मूल्य कमी होईल"
 DocType: Purchase Invoice,Total Advance,एकूण आगाऊ
-DocType: Workflow State,User,सदस्य
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,प्रक्रिया वेतनपट
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,हरवले म्हणून सेट करा
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भरणा पावती टीप
 DocType: Customer,Credit Days Based On,क्रेडिट दिवस आधारित
 DocType: Tax Rule,Tax Rule,कर नियम
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,विक्री सायकल संपूर्ण समान दर ठेवणे
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,वर्कस्टेशन कार्य तासांनंतर वेळ नोंदी योजना.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} आधीच सादर केला गेला आहे
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
-DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Time Log,Billing Rate based on Activity Type (per hour),क्रियाकलाप प्रकार आधारित बिलिंग दर (प्रती तास)
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","कंपनी ईमेल आयडी आढळले नाही, त्यामुळे पाठविले नाही मेल"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 DocType: Production Planning Tool,Filter based on item,फिल्टर आयटम आधारित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण ग्रुपला गुप्त करू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,खाते प्रकार निवडले आहे कारण ग्रुपला गुप्त करू शकत नाही.
 DocType: Purchase Common,Purchase Common,खरेदी सामान्य
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} सुधारणा करण्यात आली आहे. रिफ्रेश करा.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,खालील दिवस रजा अनुप्रयोग बनवण्यासाठी वापरकर्त्यांना थांबवा.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,संधी पासून
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} नाही अस्तित्वात
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ग्राहक असण्याचा बिले.
-DocType: DocField,Default,मुलभूत
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम आहे {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} ग्राहक जोडले
 DocType: Maintenance Schedule,Schedule,वेळापत्रक
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","हा खर्च केंद्र अर्थसंकल्पात परिभाषित. बजेट क्रिया सेट करण्यासाठी, पाहू &quot;कंपनी यादी&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केले नाही
 DocType: Expense Claim,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट &#39;म्हणून
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} असे सेट करणे आवश्यक वर मुक्त कर्मचारी लेफ्ट &#39;म्हणून
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",निवडणे &quot;होय&quot; सिरियल नाही मास्टर पाहिले जाऊ शकतात या आयटम प्रत्येक घटकाचे करण्यासाठी एक अद्वितीय ओळख देईल.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरवतो."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरवतो."
 DocType: Address,Office,कार्यालय
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,मानक अहवाल
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,पहिल्या कर्मचारी नोंद निवडा.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: पक्ष / खात्याशी जुळत नाही {1} / {2} मधील {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,एक कर खाते तयार करणे
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
 DocType: Employee,Current Address,सध्याचा पत्ता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्टपणे निर्दिष्ट केले नसेल तर आयटम नंतर वर्णन, प्रतिमा, किंमत, कर टेम्प्लेट सेट केल्या जातील इत्यादी दुसरा आयटम प्रकार आहे तर"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,बॅच यादी
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,बॅच यादी
 DocType: Employee,Contract End Date,करार अंतिम तारीख
 DocType: Sales Order,Track this Sales Order against any Project,कोणत्याही प्रकल्पाच्या विरोधात या विक्री ऑर्डर मागोवा
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,पुल विक्री आदेश वरील निकष आधारित (वितरीत करण्यासाठी प्रलंबित)
-DocType: DocShare,Document Type,दस्तऐवज प्रकार
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,पुरवठादार कोटेशन पासून
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,पुरवठादार कोटेशन पासून
 DocType: Deduction Type,Deduction Type,कपात प्रकार
 DocType: Attendance,Half Day,अर्धा दिवस
 DocType: Pricing Rule,Min Qty,किमान Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",बॅच नग सह विक्री आणि खरेदी दस्तऐवज आयटम ट्रॅक करणे. &quot;पसंतीचे उद्योग: रसायन&quot;
 DocType: GL Entry,Transaction Date,व्यवहार तारीख
 DocType: Production Plan Item,Planned Qty,नियोजनबद्ध Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,एकूण कर
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,एकूण कर
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,प्रमाण साठी (Qty उत्पादित) करणे आवश्यक आहे
 DocType: Stock Entry,Default Target Warehouse,मुलभूत लक्ष्य कोठार
 DocType: Purchase Invoice,Net Total (Company Currency),निव्वळ एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते फक्त लागू आहे
 DocType: Notification Control,Purchase Receipt Message,खरेदी पावती संदेश
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,एकूण वाटप पाने कालावधी जास्त आहे
 DocType: Production Order,Actual Start Date,वास्तविक प्रारंभ तारीख
 DocType: Sales Order,% of materials delivered against this Sales Order,साहित्य% या विक्री आदेशा वितरित
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,नोंद आयटम चळवळ.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,वृत्तपत्र यादी ग्राहक
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,सेवा
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलनात केले गेले आहेत {0} कंपनी {1}. चलन एक प्राप्त किंवा देय असलेले खाते निवडा {0}.
 ,Monthly Salary Register,मासिक पगार नोंदणी
-apps/frappe/frappe/website/template.py +140,Next,पुढील
 DocType: Warranty Claim,If different than customer address,ग्राहक पत्ता पेक्षा भिन्न असेल तर
 DocType: BOM Operation,BOM Operation,BOM ऑपरेशन
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,मागील पंक्ती रकमेवर
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,किमान एक सलग भरणा रक्कम प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,किमान एक सलग भरणा रक्कम प्रविष्ट करा
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,रो {0}: भरणा रक्कम शिल्लक रक्कम पेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,न चुकता केल्यामुळे एकूण
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,न चुकता केल्यामुळे एकूण
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,वेळ लॉग बिल देण्यायोग्य नाही
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} आयटम एक टेम्प्लेट आहे, त्याच्या रूपे कृपया एक निवडा"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ग्राहक
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,ग्राहक
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,निव्वळ वेतन नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,स्वतः विरुद्ध कूपन प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,स्वतः विरुद्ध कूपन प्रविष्ट करा
 DocType: SMS Settings,Static Parameters,स्थिर बाबी
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,वस्तुमान एसएमएस आपले संपर्क पाठवा
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,कर किंवा शुल्क विचार करा
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक Qty अनिवार्य आहे
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,क्रॉस-रोलिंग
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा repacked करणे
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,स्टॉक व्यवहार डीफॉल्ट सेटिंग्ज.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,स्टॉक व्यवहार डीफॉल्ट सेटिंग्ज.
 DocType: Purchase Invoice,Next Date,पुढील तारीख
 DocType: Employee Education,Major/Optional Subjects,मुख्य / पर्यायी विषय
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,कर आणि शुल्क प्रविष्ट करा
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,यंत्र
 DocType: Sales Invoice Item,Drop Ship,ड्रॉप जहाज
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","येथे आपण नाव आणि पालक, पती, पत्नी आणि मुले उद्योग जसे कौटुंबिक तपशील राखण्यास मदत"
 DocType: Hub Settings,Seller Name,विक्रेता नाव
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आपण पुढे जाण्यापूर्वी फॉर्म जतन करणे आवश्यक आहे
 DocType: Item Attribute,Numeric Values,अंकीय मूल्यांना
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,लोगो संलग्न
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,लोगो संलग्न
 DocType: Customer,Commission Rate,आयोगाने दर
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,कार्ट रिक्त आहे
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,रूट संपादित केले जाऊ शकत नाही.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,रक्कम unadusted रक्कम अधिक करू शकता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,रूट संपादित केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,रक्कम unadusted रक्कम अधिक करू शकता
 DocType: Manufacturing Settings,Allow Production on Holidays,सुट्टीच्या दिवशी उत्पादन परवानगी द्या
 DocType: Sales Order,Customer's Purchase Order Date,ग्राहक च्या पर्चेस तारीख
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,कॅपिटल शेअर
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,एक सी फाइल निवडा
-DocType: Dropbox Backup,Send Backups to Dropbox,ड्रॉपबॉक्स साठवत पाठवा
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,डिझायनर
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,अटी आणि शर्ती साचा
 DocType: Serial No,Delivery Details,वितरण तपशील
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},प्रकार करीता खर्च केंद्र सलग आवश्यक आहे {0} कर टेबल {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"प्रमाण या पातळी खाली पडले, तर स्वयंचलितपणे साहित्य विनंती तयार"
 ,Item-wise Purchase Register,आयटम निहाय खरेदी नोंदणी
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","पुनर्क्रमित पातळी सेट करण्यासाठी, आयटम खरेदी आयटम किंवा उत्पादन आयटम असणे आवश्यक आहे"
 ,Supplier Addresses and Contacts,पुरवठादार पत्ते आणि संपर्क
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,पहिल्या श्रेणी निवडा
 apps/erpnext/erpnext/config/projects.py +18,Project master.,प्रकल्प मास्टर.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,वेळ दिवस घेऊन
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,साहित्य बिल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते आवश्यक आहे {1}
-DocType: Dropbox Backup,Send Notifications To,सूचना पाठवा
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,संदर्भ तारीख
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,संदर्भ तारीख
 DocType: Employee,Reason for Leaving,सोडत आहे कारण
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद लिंक केले जाऊ शकत नाही {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,खाते {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,खाते {0} अस्तित्वात नाही
 DocType: Account,Cash,रोख
 DocType: Employee,Short biography for website and other publications.,वेबसाइट आणि इतर प्रकाशने लहान चरित्र.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},कर्मचारी पगार रचना तयार करा {0}

diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
new file mode 100644
index 0000000..8f77d53
--- /dev/null
+++ b/erpnext/translations/ms.csv

@@ -0,0 +1,3596 @@
+DocType: Employee,Salary Mode,Mod Gaji
+DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Pilih Pengagihan Bulanan, jika anda mahu untuk mengesan berdasarkan bermusim."
+DocType: Employee,Divorced,Bercerai
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Amaran: Sama item telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Item telah disegerakkan
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Benarkan Perkara yang akan ditambah beberapa kali dalam urus niaga
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Melawat {0} sebelum membatalkan Waranti Tuntutan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pengguna
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Sila pilih Jenis Parti pertama
+DocType: Item,Customer Items,Item Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
+DocType: Item,Publish Item to hub.erpnext.com,Terbitkan Perkara untuk hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,E-mel Pemberitahuan
+DocType: Item,Default Unit of Measure,Unit keingkaran Langkah
+DocType: SMS Center,All Sales Partner Contact,Semua Jualan Rakan Hubungi
+DocType: Employee,Leave Approvers,Tinggalkan Approvers
+DocType: Sales Partner,Dealer,Peniaga
+DocType: Employee,Rented,Disewa
+DocType: POS Profile,Applicable for User,Digunakan untuk Pengguna
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
+DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Dari Permintaan Bahan
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,Pokok {0}
+DocType: Job Applicant,Job Applicant,Kerja Pemohon
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Tiada lagi hasil.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Undang-undang
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Jenis cukai sebenar tidak boleh dimasukkan dalam kadar Perkara berturut-turut {0}
+DocType: C-Form,Customer,Pelanggan
+DocType: Purchase Receipt Item,Required By,Diperlukan oleh
+DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Penghantaran Nota
+DocType: Department,Department,Jabatan
+DocType: Purchase Order,% Billed,% Dibilkan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kadar pertukaran mestilah sama dengan {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Nama Pelanggan
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","Semua bidang yang berkaitan eksport seperti mata wang, kadar penukaran, jumlah eksport, eksport dan lain-lain jumlah besar boleh didapati dalam Nota Penghantaran, POS, Sebut Harga, Invois Jualan, Jualan Pesanan dan lain-lain"
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
+DocType: Manufacturing Settings,Default 10 mins,Default 10 minit
+DocType: Leave Type,Leave Type Name,Tinggalkan Nama Jenis
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Siri Dikemaskini Berjaya
+DocType: Pricing Rule,Apply On,Memohon Pada
+DocType: Item Price,Multiple Item prices.,Harga Item berbilang.
+,Purchase Order Items To Be Received,Item Pesanan Belian Akan Diterima
+DocType: SMS Center,All Supplier Contact,Semua Pembekal Contact
+DocType: Quality Inspection Reading,Parameter,Parameter
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Cuti Permohonan Baru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draf
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Untuk mengekalkan kod item berdasarkan pelanggan dan untuk membolehkan mereka dicari berdasarkan kod mereka, guna pilihan ini"
+DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
+apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show Kelainan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Pinjaman (Liabiliti)
+DocType: Employee Education,Year of Passing,Tahun Pemergian
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Stock
+DocType: Designation,Designation,Jawatan
+DocType: Production Plan Item,Production Plan Item,Rancangan Pengeluaran Item
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Buat Profil POS baru
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
+DocType: Purchase Invoice,Monthly,Bulanan
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Invois
+DocType: Maintenance Schedule Item,Periodicity,Jangka masa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Alamat e-mel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
+DocType: Company,Abbr,Abbr
+DocType: Appraisal Goal,Score (0-5),Score (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
+DocType: Delivery Note,Vehicle No,Kenderaan Tiada
+apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Sila pilih Senarai Harga
+DocType: Production Order Operation,Work In Progress,Kerja Dalam Kemajuan
+DocType: Employee,Holiday List,Senarai Holiday
+DocType: Time Log,Time Log,Masa Log
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Akauntan
+DocType: Cost Center,Stock User,Saham pengguna
+DocType: Company,Phone No,Telefon No
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log Aktiviti yang dilakukan oleh pengguna terhadap Tugas yang boleh digunakan untuk mengesan masa, bil."
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: # {1}
+,Sales Partners Commission,Pasangan Jualan Suruhanjaya
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Singkatan tidak boleh mempunyai lebih daripada 5 aksara
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
+						exist with this Attribute.",Atribut Nilai {0} tidak boleh dikeluarkan dari {1} sebagai Item Kelainan \ wujud dengan Atribut ini.
+apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Ini adalah akaun akar dan tidak boleh diedit.
+DocType: BOM,Operations,Operasi
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak boleh menetapkan kebenaran secara Diskaun untuk {0}
+DocType: Bin,Quantity Requested for Purchase,Kuantiti yang diminta untuk Pembelian
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Lampirkan fail csv dengan dua lajur, satu untuk nama lama dan satu untuk nama baru"
+DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
+apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Membuka pekerjaan.
+DocType: Item Attribute,Increment,Kenaikan
+apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Pilih Warehouse ...
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Pengiklanan
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Syarikat yang sama memasuki lebih daripada sekali
+DocType: Employee,Married,Berkahwin
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak dibenarkan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+DocType: Payment Reconciliation,Reconcile,Mendamaikan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
+DocType: Quality Inspection Reading,Reading 1,Membaca 1
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Buat Bank Entry
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pencen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Gudang adalah wajib jika jenis akaun adalah Gudang
+DocType: SMS Center,All Sales Person,Semua Orang Jualan
+DocType: Lead,Person Name,Nama Orang
+DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Periksa sama ada perintah berulang, jangan tanda supaya berhenti atau meletakkan Tarikh Akhir betul"
+DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
+DocType: Account,Credit,Kredit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,Sila setup Pekerja Sistem Penamaan dalam Sumber Manusia&gt; Tetapan HR
+DocType: POS Profile,Write Off Cost Center,Tulis Off PTJ
+DocType: Warehouse,Warehouse Detail,Detail Gudang
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +181,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
+DocType: Tax Rule,Tax Type,Jenis Cukai
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
+DocType: Item,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Satu Pelanggan wujud dengan nama yang sama
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
+DocType: SMS Log,SMS Log,SMS Log
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
+DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Butiran
+DocType: Lead,Interested,Berminat
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Pembukaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} kepada {1}
+DocType: Item,Copy From Item Group,Salinan Dari Perkara Kumpulan
+DocType: Journal Entry,Opening Entry,Entry pembukaan
+DocType: Stock Entry,Additional Costs,Kos Tambahan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+DocType: Lead,Product Enquiry,Pertanyaan Produk
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Sila masukkan syarikat pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Sila pilih Syarikat pertama
+DocType: Employee Education,Under Graduate,Di bawah Siswazah
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Sasaran Pada
+DocType: BOM,Total Cost,Jumlah Kos
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log Aktiviti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Harta Tanah
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Penyata Akaun
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+DocType: Expense Claim Detail,Claim Amount,Tuntutan Amaun
+DocType: Employee,Mr,Mr
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Jenis pembekal / Pembekal
+DocType: Naming Series,Prefix,Awalan
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Guna habis
+DocType: Upload Attendance,Import Log,Import Log
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Hantar
+DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
+DocType: SMS Center,All Contact,Semua Contact
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Gaji Tahunan
+DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Perbelanjaan saham
+DocType: Newsletter,Email Sent?,E-mel Dihantar?
+DocType: Journal Entry,Contra Entry,Contra Entry
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
+DocType: Journal Entry Account,Credit in Company Currency,Kredit dalam Mata Wang Syarikat
+DocType: Delivery Note,Installation Status,Pemasangan Status
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty Diterima + Ditolak mestilah sama dengan kuantiti yang Diterima untuk Perkara {0}
+DocType: Item,Supply Raw Materials for Purchase,Bahan mentah untuk bekalan Pembelian
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Perkara {0} mestilah Pembelian Item
+DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
+DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Akan dikemaskinikan selepas Invois Jualan dikemukakan.
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
+apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Tetapan untuk HR Modul
+DocType: SMS Center,SMS Center,SMS Center
+DocType: BOM Replace Tool,New BOM,New BOM
+apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Masa Log bil.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter telah dihantar
+DocType: Lead,Request Type,Jenis Permintaan
+DocType: Leave Application,Reason,Sebab
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Pelaksanaan
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pengguna yang pertama akan menjadi Pengurus Sistem (anda boleh menukarnya kemudian).
+apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Butiran operasi dijalankan.
+DocType: Serial No,Maintenance Status,Penyelenggaraan Status
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Item dan Harga
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
+DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Pilih Pekerja untuk siapa anda mewujudkan Penilaian.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kos Pusat {0} bukan milik Syarikat {1}
+DocType: Customer,Individual,Individu
+apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Rancangan untuk lawatan penyelenggaraan.
+DocType: SMS Settings,Enter url parameter for message,Masukkan parameter url untuk mesej
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Peraturan untuk menggunakan penentuan harga dan diskaun.
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +81,This Time Log conflicts with {0} for {1} {2},Masa ini konflik Log dengan {0} untuk {1} {2}
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Senarai Harga mesti pakai untuk Membeli atau Menjual
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Tarikh pemasangan tidak boleh sebelum tarikh penghantaran untuk Perkara {0}
+DocType: Pricing Rule,Discount on Price List Rate (%),Diskaun Senarai Harga Kadar (%)
+DocType: Offer Letter,Select Terms and Conditions,Pilih Terma dan Syarat
+DocType: Production Planning Tool,Sales Orders,Jualan Pesanan
+DocType: Purchase Taxes and Charges,Valuation,Penilaian
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +17,Set as Default,Tetapkan sebagai lalai
+,Purchase Order Trends,Membeli Trend Pesanan
+apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Memperuntukkan daun bagi tahun ini.
+DocType: Earning Type,Earning Type,Jenis pendapatan
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Perancangan Kapasiti melumpuhkan dan Penjejakan Masa
+DocType: Bank Reconciliation,Bank Account,Akaun Bank
+DocType: Leave Type,Allow Negative Balance,Benarkan Baki negatif
+DocType: Selling Settings,Default Territory,Wilayah Default
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisyen
+DocType: Production Order Operation,Updated via 'Time Log',Dikemaskini melalui &#39;Time Log&#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Akaun {0} bukan milik Syarikat {1}
+DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
+DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
+DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Diterima Dalam
+DocType: Sales Partner,Reseller,Penjual Semula
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Sila masukkan Syarikat
+DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
+,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
+DocType: Lead,Address & Contact,Alamat
+DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
+DocType: Newsletter List,Total Subscribers,Jumlah Pelanggan
+,Contact Name,Nama Kenalan
+DocType: Production Plan Item,SO Pending Qty,SO selesai Qty
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
+apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Meminta untuk pembelian.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Meninggalkan setiap Tahun
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Sila tetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
+DocType: Time Log,Will be updated when batched.,Akan dikemaskinikan apabila berkumpulan.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak &#39;Adakah Advance&#39; terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
+apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
+DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
+DocType: Payment Tool,Reference No,Rujukan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Tahunan
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
+DocType: Stock Entry,Sales Invoice No,Jualan Invois No
+DocType: Material Request Item,Min Order Qty,Min Order Qty
+DocType: Lead,Do Not Contact,Jangan Hubungi
+DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id unik untuk mengesan semua invois berulang. Ia dihasilkan di hantar.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Perisian Pemaju
+DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
+DocType: Pricing Rule,Supplier Type,Jenis Pembekal
+DocType: Item,Publish in Hub,Menyiarkan dalam Hab
+,Terretory,Terretory
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Permintaan bahan
+DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
+DocType: Item,Purchase Details,Butiran Pembelian
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Perkara {0} tidak dijumpai dalam &#39;Bahan Mentah Dibekalkan&#39; meja dalam Pesanan Belian {1}
+DocType: Employee,Relation,Perhubungan
+DocType: Shipping Rule,Worldwide Shipping,Penghantaran di seluruh dunia
+apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pesanan disahkan dari Pelanggan.
+DocType: Purchase Receipt Item,Rejected Quantity,Ditolak Kuantiti
+DocType: Features Setup,"Field available in Delivery Note, Quotation, Sales Invoice, Sales Order","Bidang yang terdapat di Nota Penghantaran, Sebut Harga, Invois Jualan, Pesanan Jualan"
+DocType: SMS Settings,SMS Sender Name,SMS Sender Nama
+DocType: Contact,Is Primary Contact,Adalah Hubungi Rendah
+DocType: Notification Control,Notification Control,Kawalan Pemberitahuan
+DocType: Lead,Suggestions,Cadangan
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Perkara Set Kumpulan segi belanjawan di Wilayah ini. Juga boleh bermusim dengan menetapkan Pengedaran.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +72,Please enter parent account group for warehouse {0},Sila masukkan kumpulan akaun induk untuk gudang {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +242,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
+DocType: Supplier,Address HTML,Alamat HTML
+DocType: Lead,Mobile No.,No. Telefon
+DocType: Maintenance Schedule,Generate Schedule,Menjana Jadual
+DocType: Purchase Invoice Item,Expense Head,Perbelanjaan Ketua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Sila pilih Jenis Caj pertama
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terkini
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 aksara
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Melumpuhkan penciptaan balak masa terhadap Perintah Pengeluaran. Operasi tidak boleh dikesan terhadap Perintah Pengeluaran
+DocType: Accounts Settings,Settings for Accounts,Tetapan untuk Akaun
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Menguruskan Orang Jualan Tree.
+DocType: Item,Synced With Hub,Segerakkan Dengan Hub
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Salah Kata Laluan
+DocType: Item,Variant Of,Varian Daripada
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Perkara {0} mesti Perkhidmatan Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
+DocType: Period Closing Voucher,Closing Account Head,Penutup Kepala Akaun
+DocType: Employee,External Work History,Luar Sejarah Kerja
+apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Ralat Rujukan Pekeliling
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Perkataan (Eksport) akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
+DocType: Lead,Industry,Industri
+DocType: Employee,Job Profile,Profil kerja
+DocType: Newsletter,Newsletter,Surat Berita
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
+DocType: Journal Entry,Multi Currency,Mata Multi
+DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
+DocType: Sales Invoice Item,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Menubuhkan Cukai
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Entry pembayaran telah diubah suai selepas anda ditarik. Sila tarik lagi.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
+DocType: Workstation,Rent Cost,Kos sewa
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Sila pilih bulan dan tahun
+DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Masukkan id e-mel yang dipisahkan oleh koma, invois akan dihantar secara automatik pada tarikh tertentu"
+DocType: Employee,Company Email,Syarikat E-mel
+DocType: GL Entry,Debit Amount in Account Currency,Jumlah debit dalam Mata Wang Akaun
+DocType: Shipping Rule,Valid for Countries,Sah untuk Negara
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Semua bidang yang berkaitan import seperti mata wang, kadar penukaran, jumlah import, import dan lain-lain jumlah besar boleh didapati dalam Resit Pembelian, Sebutharga Pembekal, Invois Belian, Pesanan Belian dan lain-lain"
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Jumlah Pesanan Dianggap
+apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Terdapat dalam BOM, Menghantar Nota, Invois Belian, Pesanan Pengeluaran, Pesanan Belian, Resit Pembelian, Jualan Invois, Jualan Order, Saham Masuk, Timesheet"
+DocType: Item Tax,Tax Rate,Kadar Cukai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Pilih Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry","Perkara: {0} berjaya kelompok-bijak, tidak boleh berdamai dengan menggunakan \ Saham Perdamaian, sebaliknya menggunakan Saham Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Tukar ke Kumpulan bukan-
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Resit Pembelian perlu dihantar
+apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
+DocType: C-Form Invoice Detail,Invoice Date,Tarikh invois
+DocType: GL Entry,Debit Amount,Jumlah Debit
+apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Alamat e-mel anda
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Sila lihat lampiran
+DocType: Purchase Order,% Received,% Diterima
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Persediaan Sudah Lengkap !!
+,Finished Goods,Barangan selesai
+DocType: Delivery Note,Instructions,Arahan
+DocType: Quality Inspection,Inspected By,Diperiksa oleh
+DocType: Maintenance Visit,Maintenance Type,Jenis Penyelenggaraan
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},No siri {0} bukan milik Penghantaran Nota {1}
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Perkara Kualiti Pemeriksaan Parameter
+DocType: Leave Application,Leave Approver Name,Tinggalkan nama Pelulus
+,Schedule Date,Jadual Tarikh
+DocType: Packed Item,Packed Item,Makan Perkara
+apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Tetapan lalai untuk membeli transaksi.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Kos Aktiviti wujud untuk Pekerja {0} terhadap Jenis Kegiatan - {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Sila TIDAK mewujudkan Akaun untuk Pelanggan dan Pembekal. Ia diciptakan secara langsung daripada tuan Pelanggan / Pembekal.
+DocType: Currency Exchange,Currency Exchange,Pertukaran mata wang
+DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Authorization Rule,Approving User  (above authorized value),Meluluskan pengguna (di atas nilai yang diberi kuasa)
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Baki kredit
+DocType: Employee,Widowed,Janda
+DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Perkara untuk diminta iaitu &quot;Daripada Saham&quot; segala urusan gudang berdasarkan qty yang diunjurkan dan perintah qty minimum
+DocType: Workstation,Working Hours,Waktu Bekerja
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
+,Purchase Register,Pembelian Daftar
+DocType: Landed Cost Item,Applicable Charges,Caj yang dikenakan
+DocType: Workstation,Consumable Cost,Kos guna habis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
+DocType: Purchase Receipt,Vehicle Date,Kenderaan Tarikh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Perubatan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Sebab bagi kehilangan
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
+DocType: Employee,Single,Single
+DocType: Issue,Attachment,Lampiran
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Bajet tidak boleh ditetapkan untuk PTJ Kumpulan
+DocType: Account,Cost of Goods Sold,Kos Barang Dijual
+DocType: Purchase Invoice,Yearly,Setiap tahun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Sila masukkan PTJ
+DocType: Journal Entry Account,Sales Order,Pesanan Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Purata. Menjual Kadar
+DocType: Purchase Order,Start date of current order's period,Tarikh tempoh perintah semasa memulakan
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Kuantiti tidak boleh menjadi sebahagian kecil berturut-turut {0}
+DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
+DocType: Delivery Note,% Installed,% Dipasang
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Sila masukkan nama syarikat pertama
+DocType: BOM,Item Desription,Perkara Desription
+DocType: Purchase Invoice,Supplier Name,Nama Pembekal
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Manual ERPNext yang
+DocType: Account,Is Group,Adakah Kumpulan
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Set Siri Nos secara automatik berdasarkan FIFO
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Semak Pembekal Invois Nombor Keunikan
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Kepada Perkara No. ' tidak boleh kurang daripada 'Dari Perkara No.'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Keuntungan tidak
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Belum Bermula
+DocType: Lead,Channel Partner,Rakan Channel
+DocType: Account,Old Parent,Old Ibu Bapa
+DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Menyesuaikan teks pengenalan yang berlaku sebagai sebahagian daripada e-mel itu. Setiap transaksi mempunyai teks pengenalan yang berasingan.
+DocType: Sales Taxes and Charges Template,Sales Master Manager,Master Sales Manager
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
+DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
+DocType: SMS Log,Sent On,Dihantar Pada
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
+DocType: Sales Order,Not Applicable,Tidak Berkenaan
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Master bercuti.
+DocType: Material Request Item,Required Date,Tarikh Diperlukan
+DocType: Delivery Note,Billing Address,Alamat Bil
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Sila masukkan Kod Item.
+DocType: BOM,Costing,Berharga
+DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jika disemak, jumlah cukai yang akan dianggap sebagai sudah termasuk dalam Kadar Cetak / Print Amaun"
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Kuantiti
+DocType: Employee,Health Concerns,Kebimbangan Kesihatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,Belum dibayar
+DocType: Packing Slip,From Package No.,Dari Pakej No.
+DocType: Item Attribute,To Range,Untuk Julat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
+DocType: Features Setup,Imports,Import
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
+DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
+apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Rekod kehadiran.
+DocType: Bank Reconciliation,Journal Entries,Jurnal Penyertaan
+DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
+DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
+DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Perkhidmatan.
+DocType: Journal Entry,Accounts Payable,Akaun-akaun Boleh diBayar
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Tambah Pelanggan
+apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Tidak wujud"
+DocType: Pricing Rule,Valid Upto,Sah Upto
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Pendapatan Langsung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Pegawai Tadbir
+DocType: Payment Tool,Received Or Paid,Diterima Atau Dibayar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Sila pilih Syarikat
+DocType: Stock Entry,Difference Account,Akaun perbezaan
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
+DocType: Shipping Rule,Net Weight,Berat Bersih
+DocType: Employee,Emergency Phone,Telefon Kecemasan
+,Serial No Warranty Expiry,Serial Tiada Jaminan tamat
+DocType: Sales Order,To Deliver,Untuk Menyampaikan
+DocType: Purchase Invoice Item,Item,Perkara
+DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
+DocType: Account,Profit and Loss,Untung dan Rugi
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Urusan subkontrak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Perabot dan Perlawanan
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
+DocType: Selling Settings,Default Customer Group,Default Pelanggan Kumpulan
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika kurang upaya, bidang &#39;Bulat Jumlah&#39; tidak akan dapat dilihat dalam mana-mana transaksi"
+DocType: BOM,Operating Cost,Kos operasi
+,Gross Profit,Keuntungan kasar
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Kenaikan tidak boleh 0
+DocType: Production Planning Tool,Material Requirement,Keperluan Bahan
+DocType: Company,Delete Company Transactions,Padam Transaksi Syarikat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Perkara {0} tidak Membeli Item
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
+					Email Address'",{0} adalah alamat e-mel yang tidak sah dalam &#39;Pemberitahuan \ Alamat E-mel&#39;
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Jumlah Bil Tahun Ini:
+DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
+DocType: Purchase Invoice,Supplier Invoice No,Pembekal Invois No
+DocType: Territory,For reference,Untuk rujukan
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Tidak dapat memadam No Serial {0}, kerana ia digunakan dalam urus niaga saham"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Penutup (Cr)
+DocType: Serial No,Warranty Period (Days),Tempoh Waranti (Hari)
+DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
+,Pending Qty,Menunggu Kuantiti
+DocType: Job Applicant,Thread HTML,Thread HTML
+DocType: Company,Ignore,Abaikan
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pembekal Gudang mandatori bagi sub-kontrak Pembelian Resit
+DocType: Pricing Rule,Valid From,Sah Dari
+DocType: Sales Invoice,Total Commission,Jumlah Suruhanjaya
+DocType: Pricing Rule,Sales Partner,Rakan Jualan
+DocType: Buying Settings,Purchase Receipt Required,Resit pembelian Diperlukan
+DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
+
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Pengagihan Bulanan ** membantu anda mengagihkan bajet anda melangkaui bulan-bulan jika anda mempunyai musim dalam perniagaan anda. Untuk mengagihkan bajet yang menggunakan taburan ini, tetapkan **Pengagihan Bulanan** di **Pusat Kos** berkenaan"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Tahun kewangan / perakaunan.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Buat Jualan Pesanan
+DocType: Project Task,Project Task,Projek Petugas
+,Lead Id,Lead Id
+DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Tahun fiskal Tarikh Mula tidak seharusnya lebih besar daripada Tahun Anggaran Tarikh akhir
+DocType: Warranty Claim,Resolution,Resolusi
+apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dihantar: {0}
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Akaun Belum Bayar
+DocType: Sales Order,Billing and Delivery Status,Bil dan Status Penghantaran
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
+DocType: Leave Control Panel,Allocate,Memperuntukkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Jualan Pulangan
+DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Pilih Pesanan Jualan yang anda ingin membuat Pesanan Pengeluaran.
+DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
+apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponen gaji.
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Pangkalan data pelanggan yang berpotensi.
+DocType: Authorization Rule,Customer or Item,Pelanggan atau Perkara
+apps/erpnext/erpnext/config/crm.py +17,Customer database.,Pangkalan data pelanggan.
+DocType: Quotation,Quotation To,Sebutharga Untuk
+DocType: Lead,Middle Income,Pendapatan Tengah
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Pembukaan (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unit keingkaran Langkah untuk Perkara {0} tidak boleh diubah langsung kerana anda telah membuat beberapa transaksi (s) dengan UOM lain. Anda akan perlu untuk membuat item baru untuk menggunakan UOM Lalai yang berbeza.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
+DocType: Purchase Order Item,Billed Amt,Billed AMT
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
+DocType: Sales Invoice,Customer's Vendor,Penjual Pelanggan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Pengeluaran Pesanan adalah Mandatori
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Penulisan Cadangan
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Satu lagi Orang Jualan {0} wujud dengan id Pekerja yang sama
+apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Ralat Saham ({6}) untuk Perkara {0} dalam Gudang {1} pada {2} {3} dalam {4} {5}
+DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
+DocType: Packing Slip Item,DN Detail,Detail DN
+DocType: Time Log,Billed,Dibilkan
+DocType: Batch,Batch Description,Batch Penerangan
+DocType: Delivery Note,Time at which items were delivered from warehouse,Masa di mana barang-barang telah dihantar dari gudang
+DocType: Sales Invoice,Sales Taxes and Charges,Jualan Cukai dan Caj
+DocType: Employee,Organization Profile,Organisasi Profil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +90,Please setup numbering series for Attendance via Setup > Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
+DocType: Employee,Reason for Resignation,Sebab Peletakan jawatan
+apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Template bagi tujuan penilaian prestasi.
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Invois / Journal Entry Details
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Kewangan {2}
+DocType: Buying Settings,Settings for Buying Module,Tetapan untuk Membeli Modul
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,Sila masukkan Resit Pembelian pertama
+DocType: Buying Settings,Supplier Naming By,Pembekal Menamakan Dengan
+DocType: Activity Type,Default Costing Rate,Kadar Kos lalai
+DocType: Maintenance Schedule,Maintenance Schedule,Jadual Penyelenggaraan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Peraturan Kemudian Harga ditapis keluar berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Jenis Pembekal, Kempen, Rakan Jualan dan lain-lain"
+DocType: Employee,Passport Number,Nombor Pasport
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Pengurus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Dari Resit Pembelian
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
+DocType: SMS Settings,Receiver Parameter,Penerima Parameter
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan Kepada' dan 'Kumpul Mengikut' tidak boleh sama
+DocType: Sales Person,Sales Person Targets,Sasaran Orang Jualan
+DocType: Production Order Operation,In minutes,Dalam beberapa minit
+DocType: Issue,Resolution Date,Resolusi Tarikh
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
+DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Tukar ke Kumpulan
+DocType: Activity Cost,Activity Type,Jenis Kegiatan
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Jumlah dihantar
+DocType: Customer,Fixed Days,Hari Tetap
+DocType: Sales Invoice,Packing List,Senarai Pembungkusan
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pesanan pembelian diberikan kepada Pembekal.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Penerbitan
+DocType: Activity Cost,Projects User,Projek pengguna
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Digunakan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} tidak terdapat dalam jadual Butiran Invois
+DocType: Company,Round Off Cost Center,Bundarkan PTJ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Lawatan penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+DocType: Material Request,Material Transfer,Pemindahan bahan
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Pembukaan (Dr)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Penempatan tanda waktu mesti selepas {0}
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Cukai Tanah Kos dan Caj
+DocType: Production Order Operation,Actual Start Time,Masa Mula Sebenar
+DocType: BOM Operation,Operation Time,Masa Operasi
+DocType: Pricing Rule,Sales Manager,Pengurus Jualan
+DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
+DocType: Journal Entry,Bill No,Rang Undang-Undang No
+DocType: Purchase Invoice,Quarterly,Suku Tahunan
+DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
+DocType: Sales Order Item,Basic Rate (Company Currency),Kadar asas (Syarikat mata wang)
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Sila masukkan butiran item
+DocType: Purchase Receipt,Other Details,Butiran lain
+DocType: Account,Accounts,Akaun-akaun
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pemasaran
+DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Untuk mengesan item dalam jualan dan dokumen pembelian berdasarkan nos siri mereka. Ini juga boleh digunakan untuk mengesan butiran jaminan produk.
+DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Gudang ditolak adalah wajib terhadap item regected
+DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
+DocType: Employee,Provide email id registered in company,Menyediakan id e-mel yang berdaftar dalam syarikat
+DocType: Hub Settings,Seller City,Penjual City
+DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
+DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Perkara {0} tidak dijumpai
+DocType: Bin,Stock Value,Nilai saham
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Jenis
+DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantiti Digunakan Seunit
+DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
+DocType: Material Request Item,Quantity and Warehouse,Kuantiti dan Gudang
+DocType: Sales Invoice,Commission Rate (%),Kadar komisen (%)
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Terhadap Baucer Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Journal Entry"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroangkasa
+DocType: Journal Entry,Credit Card Entry,Entry Kad Kredit
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Petugas Subjek
+apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Barangan yang diterima daripada Pembekal.
+DocType: Lead,Campaign Name,Nama Kempen
+,Reserved,Cipta Terpelihara
+DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Aset Semasa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} bukan perkara stok
+DocType: Mode of Payment Account,Default Account,Akaun Default
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Sila pilih hari cuti mingguan
+DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
+,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
+DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
+DocType: Employee,Cell Number,Bilangan sel
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Permintaan bahan Auto Generated
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
+DocType: Opportunity,Opportunity From,Peluang Daripada
+apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Kenyataan gaji bulanan.
+DocType: Item Group,Website Specifications,Laman Web Spesifikasi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Akaun Baru
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Catatan perakaunan boleh dibuat terhadap nod daun. Catatan terhadap Kumpulan adalah tidak dibenarkan.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
+DocType: Opportunity,Maintenance,Penyelenggaraan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
+DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
+apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Kempen jualan.
+DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Template cukai standard yang boleh diguna pakai untuk semua Transaksi Jualan. Templat ini boleh mengandungi senarai kepala cukai dan juga lain kepala perbelanjaan / pendapatan seperti &quot;Penghantaran&quot;, &quot;Insurans&quot;, &quot;Pengendalian&quot; dan lain-lain #### Nota Kadar cukai anda tentukan di sini akan menjadi kadar cukai standard untuk semua ** Item **. Jika terdapat Item ** ** yang mempunyai kadar yang berbeza, mereka perlu ditambah dalam ** Item Cukai ** meja dalam ** ** Item induk. #### Keterangan Kolum 1. Pengiraan Jenis: - Ini boleh menjadi pada ** ** Jumlah bersih (iaitu jumlah jumlah asas). - ** Pada Row Sebelumnya Jumlah / Jumlah ** (untuk cukai atau caj terkumpul). Jika anda memilih pilihan ini, cukai yang akan digunakan sebagai peratusan daripada baris sebelumnya (dalam jadual cukai) amaun atau jumlah. - ** ** Sebenar (seperti yang dinyatakan). 2. Ketua Akaun: The lejar Akaun di mana cukai ini akan ditempah 3. Kos Center: Jika cukai / caj adalah pendapatan (seperti penghantaran) atau perbelanjaan perlu ditempah terhadap PTJ. 4. Keterangan: Keterangan cukai (yang akan dicetak dalam invois / sebut harga). 5. Kadar: Kadar Cukai. 6. Jumlah: Jumlah Cukai. 7. Jumlah: Jumlah terkumpul sehingga hal ini. 8. Masukkan Row: Jika berdasarkan &quot;Row Sebelumnya Jumlah&quot; anda boleh pilih nombor barisan yang akan diambil sebagai asas untuk pengiraan ini (default adalah berturut-turut sebelumnya). 9. Cukai ini termasuk dalam Kadar Asas ?: Jika anda mendaftar ini, ia bermakna bahawa cukai ini tidak akan ditunjukkan di bawah meja item, tetapi akan dimasukkan ke dalam Kadar Asas dalam jadual item utama anda. Ini berguna jika anda ingin memberikan harga yang rata (termasuk semua cukai) harga kepada pelanggan."
+DocType: Employee,Bank A/C No.,Bank A / C No.
+DocType: Expense Claim,Project,Projek
+DocType: Quality Inspection Reading,Reading 7,Membaca 7
+DocType: Address,Personal,Peribadi
+DocType: Expense Claim Detail,Expense Claim Type,Perbelanjaan Jenis Tuntutan
+DocType: Shopping Cart Settings,Default settings for Shopping Cart,Tetapan lalai untuk Troli Beli Belah
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal Entry {0} dikaitkan terhadap Perintah {1}, memeriksa jika ia harus ditarik sebagai pendahuluan dalam invois ini."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Sila masukkan Perkara pertama
+DocType: Account,Liability,Liabiliti
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
+DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
+apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Senarai Harga tidak dipilih
+DocType: Employee,Family Background,Latar Belakang Keluarga
+DocType: Process Payroll,Send Email,Hantar E-mel
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Tiada Kebenaran
+DocType: Company,Default Bank Account,Akaun Bank Default
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Stock&#39; tidak boleh disemak kerana perkara yang tidak dihantar melalui {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
+DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Invois saya
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Tiada pekerja didapati
+DocType: Purchase Order,Stopped,Berhenti
+DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Pilih BOM untuk memulakan
+DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
+apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Hantar Sekarang
+,Support Analytics,Sokongan Analytics
+DocType: Item,Website Warehouse,Laman Web Gudang
+DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari dalam bulan di mana invois automatik akan dijana contohnya 05, 28 dan lain-lain"
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor mesti kurang daripada atau sama dengan 5
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C-Borang rekod
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Pelanggan dan Pembekal
+DocType: Email Digest,Email Digest Settings,E-mel Tetapan Digest
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Pertanyaan sokongan daripada pelanggan.
+DocType: Features Setup,"To enable ""Point of Sale"" features",Untuk membolehkan &quot;Point of Sale&quot; ciri-ciri
+DocType: Bin,Moving Average Rate,Bergerak Kadar Purata
+DocType: Production Planning Tool,Select Items,Pilih Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
+DocType: Maintenance Visit,Completion Status,Siap Status
+DocType: Sales Invoice Item,Target Warehouse,Sasaran Gudang
+DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Jualan Pesanan Tarikh
+DocType: Upload Attendance,Import Attendance,Import Kehadiran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Semua Kumpulan Perkara
+DocType: Process Payroll,Activity Log,Log Aktiviti
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Keuntungan bersih / Rugi
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
+DocType: Production Order,Item To Manufacture,Perkara Untuk Pembuatan
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status adalah {2}
+apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
+DocType: Sales Order Item,Projected Qty,Unjuran Qty
+DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
+DocType: Newsletter,Newsletter Manager,Newsletter Pengurus
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Pembukaan&#39;
+DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
+DocType: Expense Claim,Expenses,Perbelanjaan
+DocType: Item Variant Attribute,Item Variant Attribute,Perkara Variant Sifat
+,Purchase Receipt Trends,Trend Resit Pembelian
+DocType: Appraisal,Select template from which you want to get the Goals,Pilih template yang anda ingin mendapatkan Matlamat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Penyelidikan &amp; Pembangunan
+,Amount to Bill,Jumlah untuk Rang Undang-undang
+DocType: Company,Registration Details,Butiran Pendaftaran
+DocType: Item,Re-Order Qty,Re-Order Qty
+DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Sekat Senarai Tarikh
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dijadual menghantar kepada {0}
+DocType: Pricing Rule,Price or Discount,Harga atau diskaun
+DocType: Sales Team,Incentives,Insentif
+DocType: SMS Log,Requested Numbers,Nombor diminta
+apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Penilaian prestasi.
+DocType: Sales Invoice Item,Stock Details,Stok
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Projek
+apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Tempat jualan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
+DocType: Account,Balance must be,Baki mestilah
+DocType: Hub Settings,Publish Pricing,Terbitkan Harga
+DocType: Notification Control,Expense Claim Rejected Message,Mesej perbelanjaan Tuntutan Ditolak
+,Available Qty,Terdapat Qty
+DocType: Purchase Taxes and Charges,On Previous Row Total,Pada Sebelumnya Row Jumlah
+DocType: Salary Slip,Working Days,Hari Bekerja
+DocType: Serial No,Incoming Rate,Kadar masuk
+DocType: Packing Slip,Gross Weight,Berat kasar
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nama syarikat anda yang mana anda menubuhkan sistem ini.
+DocType: HR Settings,Include holidays in Total no. of Working Days,Termasuk bercuti di Jumlah no. Hari Kerja
+DocType: Job Applicant,Hold,Pegang
+DocType: Employee,Date of Joining,Tarikh Menyertai
+DocType: Naming Series,Update Series,Update Siri
+DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak
+DocType: Item Attribute,Item Attribute Values,Nilai Perkara Sifat
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Lihat Pelanggan
+DocType: Purchase Invoice Item,Purchase Receipt,Resit Pembelian
+,Received Items To Be Billed,Barangan yang diterima dikenakan caj
+DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
+DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mesti aktif
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Sila pilih jenis dokumen pertama
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
+DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Penunaian Jumlah
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
+DocType: Bank Reconciliation,Total Amount,Jumlah
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
+DocType: Production Planning Tool,Production Orders,Pesanan Pengeluaran
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Nilai Baki
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publish untuk menyegerakkan item
+DocType: Bank Reconciliation,Account Currency,Mata Wang Akaun
+apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
+DocType: Purchase Receipt,Range,Pelbagai
+DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
+DocType: Features Setup,Item Barcode,Item Barcode
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+DocType: Quality Inspection Reading,Reading 6,Membaca 6
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
+DocType: Address,Shop,Kedai
+DocType: Hub Settings,Sync Now,Sync Sekarang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +167,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam POS Invois apabila mod ini dipilih.
+DocType: Employee,Permanent Address Is,Alamat Tetap Adakah
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi siap untuk berapa banyak barangan siap?
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Jenama
+apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Peruntukan berlebihan {0} terlintas untuk Perkara {1}.
+DocType: Employee,Exit Interview Details,Butiran Keluar Temuduga
+DocType: Item,Is Purchase Item,Adalah Pembelian Item
+DocType: Journal Entry Account,Purchase Invoice,Invois Belian
+DocType: Stock Ledger Entry,Voucher Detail No,Detail baucar Tiada
+DocType: Stock Entry,Total Outgoing Value,Jumlah Nilai Keluar
+apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarikh dan Tarikh Tutup merasmikan perlu berada dalam sama Tahun Anggaran
+DocType: Lead,Request for Information,Permintaan Maklumat
+DocType: Payment Tool,Paid,Dibayar
+DocType: Salary Slip,Total in words,Jumlah dalam perkataan
+DocType: Material Request Item,Lead Time Date,Lead Tarikh Masa
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,adalah wajib. Mungkin rekod pertukaran mata wang tidak dicipta untuk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Untuk item &#39;Bundle Produk&#39;, Gudang, No Serial dan batch Tidak akan dipertimbangkan dari &#39;Packing List&#39; meja. Jika Gudang dan Batch No adalah sama untuk semua barangan pembungkusan untuk item apa-apa &#39;Bundle Produk&#39;, nilai-nilai boleh dimasukkan dalam jadual Perkara utama, nilai akan disalin ke &#39;Packing List&#39; meja."
+apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Penghantaran kepada pelanggan.
+DocType: Purchase Invoice Item,Purchase Order Item,Pesanan Pembelian Item
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Pendapatan tidak langsung
+DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Jumlah Pembayaran Set = Jumlah Cemerlang
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varian
+,Company Name,Nama Syarikat
+DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Lihat senarai semua video bantuan
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pilih kepala akaun bank di mana cek didepositkan.
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Membolehkan pengguna untuk mengedit Senarai Harga Kadar dalam urus niaga
+DocType: Pricing Rule,Max Qty,Max Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pembayaran terhadap Jualan / Pesanan Belian perlu sentiasa ditandakan sebagai pendahuluan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimia
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
+DocType: Process Payroll,Select Payroll Year and Month,Pilih Tahun Gaji dan Bulan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pergi ke kumpulan yang sesuai (biasanya Permohonan Dana&gt; Aset Semasa&gt; Akaun Bank dan membuat Akaun baru (dengan klik pada Tambah Kanak-kanak) jenis &quot;Bank&quot;
+DocType: Workstation,Electricity Cost,Kos Elektrik
+DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
+DocType: Opportunity,Walk In,Berjalan Dalam
+DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pohon Pusat Kos finanial.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Dipindahkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,White
+DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
+DocType: Purchase Invoice,Get Advances Paid,Mendapatkan Pendahuluan Dibayar
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Sertakan Gambar Anda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Buat
+DocType: Journal Entry,Total Amount in Words,Jumlah Amaun dalam Perkataan
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Terdapat ralat. Yang berkemungkinan boleh bahawa anda belum menyimpan borang. Sila hubungi support@erpnext.com jika masalah berterusan.
+apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Keranjang saya
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Perintah Jenis mestilah salah seorang daripada {0}
+DocType: Lead,Next Contact Date,Hubungi Seterusnya Tarikh
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Membuka Qty
+DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Pilihan Saham
+DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qty untuk {0}
+DocType: Leave Application,Leave Application,Cuti Permohonan
+apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Tinggalkan Alat Peruntukan
+DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
+DocType: Company,If Monthly Budget Exceeded (for expense account),Jika Anggaran Bulanan Melebihi (untuk akaun perbelanjaan)
+DocType: Workstation,Net Hour Rate,Kadar Hour bersih
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kos mendarat Pembelian Resit
+DocType: Company,Default Terms,Terma Default
+DocType: Packing Slip Item,Packing Slip Item,Pembungkusan Slip Perkara
+DocType: POS Profile,Cash/Bank Account,Akaun Tunai / Bank
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
+DocType: Delivery Note,Delivery To,Penghantaran Untuk
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Jadual atribut adalah wajib
+DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} tidak boleh negatif
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Diskaun
+DocType: Features Setup,Purchase Discounts,Diskaun Pembelian
+DocType: Workstation,Wages,Upah
+DocType: Time Log,Will be updated only if Time Log is 'Billable',Akan dikemas kini hanya jika Time Log adalah &#39;dapat ditaksir&#39;
+DocType: Project,Internal,Dalam Negeri
+DocType: Task,Urgent,Segera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Sila nyatakan ID Row sah untuk barisan {0} dalam jadual {1}
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Pergi ke Desktop dan mula menggunakan ERPNext
+DocType: Item,Manufacturer,Pengeluar
+DocType: Landed Cost Item,Purchase Receipt Item,Pembelian Penerimaan Perkara
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Jumlah Jualan
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Time Logs
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda Pelulus Perbelanjaan untuk rekod ini. Sila Kemas kini &#39;Status&#39; dan Jimat
+DocType: Serial No,Creation Document No,Penciptaan Dokumen No
+DocType: Issue,Issue,Isu
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akaun tidak sepadan dengan Syarikat
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Sifat-sifat bagi Perkara Kelainan. contohnya Saiz, Warna dan lain-lain"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
+DocType: BOM Operation,Operation,Operasi
+DocType: Lead,Organization Name,Nama Pertubuhan
+DocType: Tax Rule,Shipping State,Negeri Penghantaran
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Perbelanjaan jualan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Membeli Standard
+DocType: GL Entry,Against,Terhadap
+DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
+DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
+apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
+DocType: Opportunity,Contact Info,Maklumat perhubungan
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Membuat Kemasukan Stok
+DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
+DocType: Item,Default Supplier,Pembekal Default
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Lebih Pengeluaran Peratus Peruntukan
+DocType: Shipping Rule Condition,Shipping Rule Condition,Penghantaran Keadaan Peraturan
+DocType: Features Setup,Miscelleneous,Miscelleneous
+DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
+DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
+apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Untuk {0} | {1} {2}
+DocType: Time Log Batch,updated via Time Logs,dikemaskini melalui Time Logs
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Purata Umur
+DocType: Opportunity,Your sales person who will contact the customer in future,Orang jualan anda yang akan menghubungi pelanggan pada masa akan datang
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Senarai beberapa pembekal anda. Mereka boleh menjadi organisasi atau individu.
+DocType: Company,Default Currency,Mata wang lalai
+DocType: Contact,Enter designation of this Contact,Masukkan penetapan Hubungi ini
+DocType: Expense Claim,From Employee,Dari Pekerja
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
+DocType: Journal Entry,Make Difference Entry,Membawa Perubahan Entry
+DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tarikh
+DocType: Appraisal Template Goal,Key Performance Area,Kawasan Prestasi Utama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Pengangkutan
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dan tahun:
+DocType: Email Digest,Annual Expense,Perbelanjaan Tahunan
+DocType: SMS Center,Total Characters,Jumlah Watak
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Sila pilih BOM dalam bidang BOM untuk Perkara {0}
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Borang Invois
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Bayaran Penyesuaian Invois
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Sumbangan%
+DocType: Item,website page link,pautan halaman laman web
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Nombor pendaftaran syarikat untuk rujukan anda. Nombor cukai dan lain-lain
+DocType: Sales Partner,Distributor,Pengedar
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Membeli-belah Troli Penghantaran Peraturan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Pengeluaran Pesanan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+,Ordered Items To Be Billed,Item Diperintah dibilkan
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Pilih Masa balak dan Hantar untuk mewujudkan Invois Jualan baru.
+DocType: Global Defaults,Global Defaults,Lalai Global
+DocType: Salary Slip,Deductions,Potongan
+DocType: Purchase Invoice,Start date of current invoice's period,Tarikh tempoh invois semasa memulakan
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +23,This Time Log Batch has been billed.,Ini batch Masa Log telah ditaksir.
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Cipta Peluang
+DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
+DocType: Supplier,Communications,Komunikasi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +287,Capacity Planning Error,Kapasiti Ralat Perancangan
+,Trial Balance for Party,Baki percubaan untuk Parti
+DocType: Lead,Consultant,Perunding
+DocType: Salary Slip,Earnings,Pendapatan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +357,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Perakaunan membuka Baki
+DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Mula Sebenar' tidak boleh lebih besar daripada 'Tarikh Akhir Sebenar'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Pengurusan
+apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Jenis-jenis aktiviti untuk Lembaran Masa
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Jumlah debit atau kredit sama ada diperlukan untuk {0}
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blue
+DocType: Purchase Invoice,Is Return,Tempat kembalinya
+DocType: Price List Country,Price List Country,Senarai harga Negara
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nod lagi hanya boleh diwujudkan di bawah nod jenis &#39;Kumpulan
+DocType: Item,UOMs,UOMs
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} telah dicipta untuk pengguna: {1} dan syarikat {2}
+DocType: Purchase Order Item,UOM Conversion Factor,Faktor Penukaran UOM
+DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
+apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Pangkalan data pembekal.
+DocType: Account,Balance Sheet,Kunci Kira-kira
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Orang jualan anda akan mendapat peringatan pada tarikh ini untuk menghubungi pelanggan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
+apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Cukai dan potongan gaji lain.
+DocType: Lead,Lead,Lead
+DocType: Email Digest,Payables,Pemiutang
+DocType: Account,Warehouse,Gudang
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
+,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
+DocType: Purchase Invoice Item,Net Rate,Kadar bersih
+DocType: Purchase Invoice Item,Purchase Invoice Item,Membeli Invois Perkara
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Saham Lejar Penyertaan dan GL Penyertaan diumumkan bagi Resit Pembelian dipilih
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Perkara 1
+DocType: Holiday,Holiday,Holiday
+DocType: Leave Control Panel,Leave blank if considered for all branches,Tinggalkan kosong jika dipertimbangkan untuk semua cawangan
+,Daily Time Log Summary,Masa Log Ringkasan Harian
+DocType: Payment Reconciliation,Unreconciled Payment Details,Butiran Pembayaran yang belum disatukan
+DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
+DocType: Global Defaults,Disable Rounded Total,Melumpuhkan Bulat Jumlah
+DocType: Lead,Call,Panggilan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
+,Trial Balance,Imbangan Duga
+apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Menubuhkan Pekerja
+apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Sila pilih awalan pertama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Penyelidikan
+DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
+apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Sila nyatakan sekurang-kurangnya satu atribut dalam jadual Atribut
+DocType: Contact,User ID,ID Pengguna
+apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Lihat Lejar
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
+DocType: Production Order,Manufacture against Sales Order,Pengilangan terhadap Jualan Pesanan
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
+,Budget Variance Report,Belanjawan Laporan Varian
+DocType: Salary Slip,Gross Pay,Gaji kasar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividen Dibayar
+apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Perakaunan Lejar
+DocType: Stock Reconciliation,Difference Amount,Perbezaan Amaun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +192,Retained Earnings,Pendapatan tertahan
+DocType: BOM Item,Item Description,Perkara Penerangan
+DocType: Payment Tool,Payment Mode,Cara Pembayaran
+DocType: Purchase Invoice,Is Recurring,Adalah Berulang
+DocType: Purchase Order,Supplied Items,Item dibekalkan
+DocType: Production Order,Qty To Manufacture,Qty Untuk Pembuatan
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mengekalkan kadar yang sama sepanjang kitaran pembelian
+DocType: Opportunity Item,Opportunity Item,Peluang Perkara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Pembukaan sementara
+,Employee Leave Balance,Pekerja Cuti Baki
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
+DocType: Address,Address Type,Alamat Jenis
+DocType: Purchase Receipt,Rejected Warehouse,Gudang Ditolak
+DocType: GL Entry,Against Voucher,Terhadap Baucar
+DocType: Item,Default Buying Cost Center,Default Membeli Kos Pusat
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Untuk mendapatkan yang terbaik daripada ERPNext, kami menyarankan anda mengambil sedikit masa dan menonton video bantuan."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Perkara {0} mesti Item Jualan
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,kepada
+DocType: Item,Lead Time in days,Masa utama dalam hari
+,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
+DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Invois Cemerlang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
+apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Kecil
+DocType: Employee,Employee Number,Bilangan pekerja
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
+,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Perkara 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kepala Akaun {0} telah diadakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Green
+DocType: Item,Auto re-order,Auto semula perintah
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Jumlah Pencapaian
+DocType: Employee,Place of Issue,Tempat Dikeluarkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrak
+DocType: Email Digest,Add Quote,Tambah Quote
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Perbelanjaan tidak langsung
+apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Produk atau Perkhidmatan anda
+DocType: Mode of Payment,Mode of Payment,Cara Pembayaran
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
+DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
+DocType: Warehouse,Warehouse Contact Info,Gudang info
+DocType: Purchase Invoice,Recurring Type,Jenis berulang
+DocType: Address,City/Town,Bandar / Pekan
+DocType: Email Digest,Annual Income,Pendapatan tahunan
+DocType: Serial No,Serial No Details,Serial No Butiran
+DocType: Purchase Invoice Item,Item Tax Rate,Perkara Kadar Cukai
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Perkara {0} mestilah Sub-kontrak Perkara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Peralatan Modal
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
+DocType: Hub Settings,Seller Website,Penjual Laman Web
+apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
+DocType: Appraisal Goal,Goal,Matlamat
+DocType: Sales Invoice Item,Edit Description,Edit Penerangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Jangkaan Tarikh penghantaran adalah lebih rendah daripada yang dirancang Tarikh Mula.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Untuk Pembekal
+DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Menetapkan Jenis Akaun membantu dalam memilih Akaun ini dalam urus niaga.
+DocType: Purchase Invoice,Grand Total (Company Currency),Jumlah Besar (Syarikat mata wang)
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Jumlah Keluar
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Hanya ada satu Keadaan Peraturan Penghantaran dengan 0 atau nilai kosong untuk &quot;Untuk Nilai&quot;
+DocType: Authorization Rule,Transaction,Transaksi
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Ini PTJ adalah Kumpulan. Tidak boleh membuat catatan perakaunan terhadap kumpulan.
+DocType: Item,Website Item Groups,Kumpulan Website Perkara
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Nombor pesanan pengeluaran adalah wajib untuk masuk saham pembuatan tujuan
+DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
+apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
+DocType: Journal Entry,Journal Entry,Jurnal Entry
+DocType: Workstation,Workstation Name,Nama stesen kerja
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
+DocType: Salary Slip,Bank Account No.,No. Akaun Bank
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Kadar penilaian diperlukan untuk Perkara {0}
+DocType: Quality Inspection Reading,Reading 8,Membaca 8
+DocType: Sales Partner,Agent,Agen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua perkara adalah sifar, mungkin anda perlu menukar &#39;Edar Caj Berdasarkan&#39;"
+DocType: Purchase Invoice,Taxes and Charges Calculation,Cukai dan Caj Pengiraan
+DocType: BOM Operation,Workstation,Stesen kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Perkakasan
+DocType: Attendance,HR Manager,HR Manager
+apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Sila pilih sebuah Syarikat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Cuti
+DocType: Purchase Invoice,Supplier Invoice Date,Pembekal Invois Tarikh
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
+DocType: Appraisal Template Goal,Appraisal Template Goal,Templat Penilaian Matlamat
+DocType: Salary Slip,Earning,Pendapatan
+DocType: Payment Tool,Party Account Currency,Akaun Pihak Mata Wang
+,BOM Browser,BOM Pelayar
+DocType: Purchase Taxes and Charges,Add or Deduct,Tambah atau Memotong
+DocType: Company,If Yearly Budget Exceeded (for expense account),Jika Bajet tahunan Melebihi (untuk akaun perbelanjaan)
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Keadaan bertindih yang terdapat di antara:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Journal Entry {0} telah diselaraskan dengan beberapa baucar lain
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Jumlah Nilai Pesanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Makanan
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Penuaan 3
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Anda boleh membuat log masa sahaja terhadap perintah pengeluaran dikemukakan
+DocType: Maintenance Schedule Item,No of Visits,Jumlah Lawatan
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Surat berita kepada kenalan, membawa."
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata Wang Akaun Penutupan mestilah {0}
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah mata untuk semua matlamat harus 100. Ia adalah {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasi tidak boleh dibiarkan kosong.
+,Delivered Items To Be Billed,Item Dihantar dikenakan caj
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
+DocType: Authorization Rule,Average Discount,Diskaun Purata
+DocType: Address,Utilities,Utiliti
+DocType: Purchase Invoice Item,Accounting,Perakaunan
+DocType: Features Setup,Features Setup,Ciri-ciri Persediaan
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Lihat Tawaran Surat
+DocType: Item,Is Service Item,Adalah Perkhidmatan Perkara
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
+DocType: Activity Cost,Projects,Projek
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Sila pilih Tahun Anggaran
+apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Dari {0} | {1} {2}
+DocType: BOM Operation,Operation Description,Operasi Penerangan
+DocType: Item,Will also apply to variants,Juga akan memohon kepada varian
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat ubah Tahun Fiskal Mula Tarikh dan Tahun Anggaran Tarikh akhir sekali Tahun Fiskal disimpan.
+DocType: Quotation,Shopping Cart,Troli Membeli-belah
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Purata harian Keluar
+DocType: Pricing Rule,Campaign,Kempen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
+DocType: Purchase Invoice,Contact Person,Dihubungi
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
+DocType: Holiday List,Holidays,Cuti
+DocType: Sales Order Item,Planned Quantity,Dirancang Kuantiti
+DocType: Purchase Invoice Item,Item Tax Amount,Jumlah Perkara Cukai
+DocType: Item,Maintain Stock,Mengekalkan Stok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
+DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Dari datetime
+DocType: Email Digest,For Company,Bagi Syarikat
+apps/erpnext/erpnext/config/support.py +38,Communication log.,Log komunikasi.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Membeli Jumlah
+DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
+apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Carta Akaun
+DocType: Material Request,Terms and Conditions Content,Terma dan Syarat Kandungan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
+DocType: Employee,Owned,Milik
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
+DocType: Pricing Rule,"Higher the number, higher the priority","Lebih tinggi nombor tersebut, lebih tinggi keutamaan"
+,Purchase Invoice Trends,Membeli Trend Invois
+DocType: Employee,Better Prospects,Prospek yang lebih baik
+DocType: Appraisal,Goals,Matlamat
+DocType: Warranty Claim,Warranty / AMC Status,Waranti / AMC Status
+,Accounts Browser,Pelayar Akaun-akaun
+DocType: GL Entry,GL Entry,GL Entry
+DocType: HR Settings,Employee Settings,Tetapan pekerja
+,Batch-Wise Balance History,Batch Bijaksana Baki Sejarah
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To Do List
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Perantis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+Used for Taxes and Charges",Cukai terperinci jadual diambil dari ruang induk sebagai rentetan dan disimpan di dalam bidang ini. Digunakan untuk Cukai dan Caj
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
+DocType: Email Digest,Bank Balance,Baki Bank
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Tiada Struktur Gaji aktif dijumpai untuk pekerja {0} dan bulan
+DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
+DocType: Journal Entry Account,Account Balance,Baki Akaun
+apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
+DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk menamakan semula.
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kami membeli Perkara ini
+DocType: Address,Billing,Bil
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Cukai dan Caj (Mata Wang Syarikat)
+DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dijadual menghantar kepada {0} penerima
+DocType: Quality Inspection,Readings,Bacaan
+DocType: Stock Entry,Total Additional Costs,Jumlah Kos Tambahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Dewan Sub
+DocType: Shipping Rule Condition,To Value,Untuk Nilai
+DocType: Supplier,Stock Manager,Pengurus saham
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk berturut-turut {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +581,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Pejabat Disewa
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tiada alamat ditambah lagi.
+DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Penganalisis
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau bersamaan dengan jumlah JV {2}
+DocType: Item,Inventory,Inventori
+DocType: Features Setup,"To enable ""Point of Sale"" view",Untuk membolehkan &quot;Point of Sale&quot; Pandangan
+apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pembayaran tidak boleh dibuat untuk cart kosong
+DocType: Item,Sales Details,Jualan Butiran
+DocType: Opportunity,With Items,Dengan Item
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Kuantiti
+DocType: Notification Control,Expense Claim Rejected,Perbelanjaan Tuntutan Ditolak
+DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
+",Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
+DocType: Item Attribute,Item Attribute,Perkara Sifat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Kerajaan
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Kelainan Perkara
+DocType: Company,Services,Perkhidmatan
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Jumlah ({0})
+DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
+DocType: Sales Invoice,Source,Sumber
+DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Tahun Kewangan Tarikh Mula
+DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding dan Caj
+DocType: Material Request Item,Sales Order No,Pesanan Jualan No
+DocType: Item Group,Item Group Name,Perkara Kumpulan Nama
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Bahan Pemindahan bagi Pembuatan
+DocType: Pricing Rule,For Price List,Untuk Senarai Harga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cari Eksekutif
+apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kadar pembelian untuk item: {0} tidak ditemui, yang diperlukan untuk menempah kemasukan perakaunan (perbelanjaan). Sila sebutkan harga item dengan senarai harga belian."
+DocType: Maintenance Schedule,Schedules,Jadual
+DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
+DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskaun tambahan (Mata Wang Syarikat)
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ralat: {0}&gt; {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Sila buat akaun baru dari carta akaun.
+DocType: Maintenance Visit,Maintenance Visit,Penyelenggaraan Lawatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch didapati Qty di Gudang
+DocType: Time Log Batch Detail,Time Log Batch Detail,Masa Log batch Detail
+DocType: Landed Cost Voucher,Landed Cost Help,Tanah Kos Bantuan
+DocType: Leave Block List,Block Holidays on important days.,Sekat Cuti pada hari-hari penting.
+,Accounts Receivable Summary,Ringkasan Akaun Belum Terima
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
+DocType: UOM,UOM Name,Nama UOM
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Jumlah Sumbangan
+DocType: Sales Invoice,Shipping Address,Alamat Penghantaran
+DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Alat ini membantu anda untuk mengemas kini atau yang menetapkan kuantiti dan penilaian stok sistem. Ia biasanya digunakan untuk menyegerakkan nilai sistem dan apa yang benar-benar wujud di gudang anda.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Master Jenama.
+DocType: Sales Invoice Item,Brand Name,Nama jenama
+DocType: Purchase Receipt,Transporter Details,Butiran Transporter
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Box
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Pertubuhan
+DocType: Monthly Distribution,Monthly Distribution,Pengagihan Bulanan
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Penerima Senarai kosong. Sila buat Penerima Senarai
+DocType: Production Plan Sales Order,Production Plan Sales Order,Rancangan Pengeluaran Jualan Pesanan
+DocType: Sales Partner,Sales Partner Target,Jualan Rakan Sasaran
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kemasukan Perakaunan untuk {0} hanya boleh dibuat dalam mata wang: {1}
+DocType: Pricing Rule,Pricing Rule,Peraturan Harga
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Dikembalikan Perkara {1} tidak wujud dalam {2} {3}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Akaun Bank
+,Bank Reconciliation Statement,Penyata Penyesuaian Bank
+DocType: Address,Lead Name,Nama Lead
+,POS,POS
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Membuka Baki Saham
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mesti muncul hanya sekali
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak dibenarkan Pindahkan lebih {0} daripada {1} terhadap Perintah Pembelian {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Meninggalkan Diperuntukkan Berjaya untuk {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tiada item untuk pek
+DocType: Shipping Rule Condition,From Value,Dari Nilai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Amaun tidak dicerminkan dalam bank
+DocType: Quality Inspection Reading,Reading 4,Membaca 4
+apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuntutan perbelanjaan syarikat.
+DocType: Company,Default Holiday List,Default Senarai Holiday
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Liabiliti saham
+DocType: Purchase Receipt,Supplier Warehouse,Gudang Pembekal
+DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
+DocType: Production Planning Tool,Select Sales Orders,Pilih Pesanan Jualan
+,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
+DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Untuk menjejaki item menggunakan kod bar. Anda akan dapat untuk memasuki perkara dalam Nota Penghantaran dan Jualan Invois dengan mengimbas kod bar barangan.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Tanda sebagai Dihantar
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Membuat Sebut Harga
+DocType: Dependent Task,Dependent Task,Petugas bergantung
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
+DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
+DocType: SMS Center,Receiver List,Penerima Senarai
+DocType: Payment Tool Detail,Payment Amount,Jumlah Bayaran
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
+apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Lihat
+DocType: Salary Structure Deduction,Salary Structure Deduction,Struktur Potongan Gaji
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Umur (Hari)
+DocType: Quotation Item,Quotation Item,Sebut Harga Item
+DocType: Account,Account Name,Nama Akaun
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Dari Tarikh tidak boleh lebih besar daripada Dating
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} kuantiti {1} tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Jenis pembekal induk.
+DocType: Purchase Order Item,Supplier Part Number,Pembekal Bahagian Nombor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Kadar Penukaran tidak boleh menjadi 0 atau 1
+apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} dibatalkan atau dihentikan
+DocType: Accounts Settings,Credit Controller,Pengawal Kredit
+DocType: Delivery Note,Vehicle Dispatch Date,Kenderaan Dispatch Tarikh
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Pembelian Resit {0} tidak dikemukakan
+DocType: Company,Default Payable Account,Default Akaun Belum Bayar
+apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Tetapan untuk troli membeli-belah dalam talian seperti peraturan perkapalan, senarai harga dan lain-lain"
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% dibilkan
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Terpelihara Qty
+DocType: Party Account,Party Account,Akaun Pihak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Sumber Manusia
+DocType: Lead,Upper Income,Pendapatan atas
+DocType: Journal Entry Account,Debit in Company Currency,Debit dalam Syarikat Mata Wang
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Isu saya
+DocType: BOM Item,BOM Item,BOM Perkara
+DocType: Appraisal,For Employee,Untuk Pekerja
+DocType: Company,Default Values,Nilai lalai
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Jumlah Pembayaran tidak boleh negatif
+DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
+DocType: Customer,Default Price List,Senarai Harga Default
+DocType: Payment Reconciliation,Payments,Pembayaran
+DocType: Budget Detail,Budget Allocated,Bajet Diperuntukkan
+DocType: Journal Entry,Entry Type,Jenis Kemasukan
+,Customer Credit Balance,Baki Pelanggan Kredit
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,Sila sahkan id e-mel anda
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Pelanggan dikehendaki untuk &#39;Customerwise Diskaun&#39;
+apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
+DocType: Quotation,Term Details,Butiran jangka
+DocType: Manufacturing Settings,Capacity Planning For (Days),Perancangan Keupayaan (Hari)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
+DocType: Warranty Claim,Warranty Claim,Jaminan Tuntutan
+,Lead Details,Butiran Lead
+DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
+DocType: Pricing Rule,Applicable For,Terpakai Untuk
+DocType: Bank Reconciliation,From Date,Dari Tarikh
+DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
+DocType: Maintenance Visit,Partially Completed,Sebahagiannya telah lengkap
+DocType: Leave Type,Include holidays within leaves as leaves,Termasuk cuti dalam daun daun
+DocType: Sales Invoice,Packed Items,Makan Item
+apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Jaminan Tuntutan terhadap No. Siri
+DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Gantikan BOM tertentu dalam semua BOMs lain di mana ia digunakan. Ia akan menggantikan BOM pautan lama, mengemas kini kos dan menjana semula &quot;BOM Letupan Perkara&quot; jadual seperti BOM baru"
+DocType: Shopping Cart Settings,Enable Shopping Cart,Membolehkan Troli
+DocType: Employee,Permanent Address,Alamat Tetap
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Perkara {0} mestilah Perkara Perkhidmatan.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +226,"Advance paid against {0} {1} cannot be greater \
+						than Grand Total {2}",Advance dibayar terhadap {0} {1} tidak boleh lebih besar \ daripada Jumlah Besar {2}
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Sila pilih kod item
+DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Mengurangkan Potongan bagi Cuti Tanpa Gaji (LWP)
+DocType: Territory,Territory Manager,Pengurus Wilayah
+DocType: Delivery Note Item,To Warehouse (Optional),Untuk Gudang (pilihan)
+DocType: Sales Invoice,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
+DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
+DocType: Selling Settings,Selling Settings,Menjual Tetapan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Lelong Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Sila nyatakan sama ada atau Kuantiti Kadar Nilaian atau kedua-duanya
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Syarikat, Bulan dan Tahun Anggaran adalah wajib"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Perbelanjaan pemasaran
+,Item Shortage Report,Perkara Kekurangan Laporan
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unit tunggal Item satu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Masa Log batch {0} mesti &#39;Dihantar&#39;
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Buat Perakaunan Entry Untuk Setiap Pergerakan Saham
+DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Diperuntukkan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Gudang diperlukan semasa Row Tiada {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Sila masukkan tahun kewangan yang sah Mula dan Tarikh Akhir
+DocType: Employee,Date Of Retirement,Tarikh Persaraan
+DocType: Upload Attendance,Get Template,Dapatkan Template
+DocType: Address,Postal,Pos
+DocType: Item,Weightage,Wajaran
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Satu Kumpulan Pelanggan sudah wujud dengan nama yang sama, sila tukar nama Pelanggan atau menamakan semula Kumpulan Pelanggan"
+apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Sila pilih {0} pertama.
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},teks {0}
+DocType: Territory,Parent Territory,Wilayah Ibu Bapa
+DocType: Quality Inspection Reading,Reading 2,Membaca 2
+DocType: Stock Entry,Material Receipt,Penerimaan Bahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produk
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {0}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika perkara ini mempunyai varian, maka ia tidak boleh dipilih dalam pesanan jualan dan lain-lain"
+DocType: Lead,Next Contact By,Hubungi Seterusnya By
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak boleh dihapuskan sebagai kuantiti wujud untuk Perkara {1}
+DocType: Quotation,Order Type,Perintah Jenis
+DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat E-mel
+DocType: Payment Tool,Find Invoices to Match,Cari Invois untuk Padankan
+,Item-wise Sales Register,Perkara-bijak Jualan Daftar
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",contohnya &quot;XYZ Bank Negara&quot;
+DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cukai ini adalah termasuk dalam Kadar Asas?
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Jumlah Sasaran
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Troli Membeli-belah diaktifkan
+DocType: Job Applicant,Applicant for a Job,Pemohon untuk pekerjaan yang
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Tiada Perintah Pengeluaran dicipta
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Slip gaji pekerja {0} telah dicipta untuk bulan ini
+DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
+DocType: Sales Invoice Item,Batch No,Batch No
+DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
+apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varian
+DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Perintah berhenti tidak boleh dibatalkan. Unstop untuk membatalkan.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
+DocType: Employee,Leave Encashed?,Cuti ditunaikan?
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
+DocType: Item,Variants,Kelainan
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Buat Pesanan Belian
+DocType: SMS Center,Send To,Hantar Kepada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang diperuntukkan
+DocType: Sales Team,Contribution to Net Total,Sumbangan kepada Jumlah Bersih
+DocType: Sales Invoice Item,Customer's Item Code,Kod Item Pelanggan
+DocType: Stock Reconciliation,Stock Reconciliation,Saham Penyesuaian
+DocType: Territory,Territory Name,Wilayah Nama
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +152,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Pemohon pekerjaan.
+DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Rujukan
+DocType: Supplier,Statutory info and other general information about your Supplier,Maklumat berkanun dan maklumat umum lain mengenai pembekal anda
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Alamat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak mempunyai apa-apa yang tidak dapat ditandingi {1} masuk
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Salinan No Serial masuk untuk Perkara {0}
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,Satu syarat untuk Peraturan Penghantaran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Perkara yang tidak dibenarkan mempunyai Perintah Pengeluaran.
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih pakej ini. (Dikira secara automatik sebagai jumlah berat bersih item)
+DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
+DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
+apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Masa balak untuk pengeluaran.
+DocType: Item,Apply Warehouse-wise Reorder Level,Memohon Gudang-bijak Reorder Level
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+DocType: Authorization Control,Authorization Control,Kawalan Kuasa
+apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Masa Log untuk tugas-tugas.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pembayaran
+DocType: Production Order Operation,Actual Time and Cost,Masa sebenar dan Kos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimum {0} boleh dibuat untuk Perkara {1} terhadap Sales Order {2}
+DocType: Employee,Salutation,Salam
+DocType: Pricing Rule,Brand,Jenama
+DocType: Item,Will also apply for variants,Juga akan memohon varian
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Barangan bundle pada masa jualan.
+DocType: Sales Order Item,Actual Qty,Kuantiti Sebenar
+DocType: Sales Invoice Item,References,Rujukan
+DocType: Quality Inspection Reading,Reading 10,Membaca 10
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Senarai produk atau perkhidmatan anda bahawa anda membeli atau menjual. Pastikan untuk memeriksa Kumpulan Item, Unit Ukur dan hartanah lain apabila anda mula."
+DocType: Hub Settings,Hub Node,Hub Nod
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
+apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Nilai {0} untuk Atribut {1} tidak wujud dalam senarai item sah Atribut Nilai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Madya
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
+DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Tamat
+DocType: Packing Slip,To Package No.,Untuk Pakej No.
+DocType: Warranty Claim,Issue Date,Isu Tarikh
+DocType: Activity Cost,Activity Cost,Kos Aktiviti
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Digunakan Qty
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikasi
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
+DocType: Payment Tool,Make Payment Entry,Buat Entry Pembayaran
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
+,Sales Invoice Trends,Sales Trend Invois
+DocType: Leave Application,Apply / Approve Leaves,Sapukan / Meluluskan Daun
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
+DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
+DocType: Stock Settings,Allowance Percent,Peruntukan Peratus
+DocType: SMS Settings,Message Parameter,Mesej Parameter
+DocType: Serial No,Delivery Document No,Penghantaran Dokumen No
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Dapatkan Item Dari Pembelian Terimaan
+DocType: Serial No,Creation Date,Tarikh penciptaan
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Perkara {0} muncul beberapa kali dalam Senarai Harga {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Jualan hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
+DocType: Purchase Order Item,Supplier Quotation Item,Pembekal Sebutharga Item
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Buat Struktur Gaji
+DocType: Item,Has Variants,Mempunyai Kelainan
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik pada butang &#39;Buat Jualan Invois&#39; untuk mewujudkan Invois Jualan baru.
+DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
+DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
+apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Sila nyatakan mata wang lalai dalam Syarikat Induk dan Lalai Global
+DocType: Purchase Invoice,Recurring Invoice,Invois berulang
+apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Menguruskan Projek
+DocType: Supplier,Supplier of Goods or Services.,Pembekal Barangan atau Perkhidmatan.
+DocType: Budget Detail,Fiscal Year,Tahun Anggaran
+DocType: Cost Center,Budget,Bajet
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajet tidak boleh diberikan terhadap {0}, kerana ia bukan satu akaun Pendapatan atau Perbelanjaan"
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Wilayah / Pelanggan
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,contohnya 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan invois Jumlah tertunggak {2}
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Invois Jualan.
+DocType: Item,Is Sales Item,Adalah Item Jualan
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Perkara Kumpulan Tree
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
+DocType: Maintenance Visit,Maintenance Time,Masa penyelenggaraan
+,Amount to Deliver,Jumlah untuk Menyampaikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Satu Produk atau Perkhidmatan
+DocType: Naming Series,Current Value,Nilai semasa
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} dihasilkan
+DocType: Delivery Note Item,Against Sales Order,Terhadap Perintah Jualan
+,Serial No Status,Serial No Status
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Meja Item tidak boleh kosong
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+						must be greater than or equal to {2}","Row {0}: Untuk menetapkan {1} jangka masa, perbezaan antara dari dan ke tarikh \ mesti lebih besar daripada atau sama dengan {2}"
+DocType: Pricing Rule,Selling,Jualan
+DocType: Employee,Salary Information,Maklumat Gaji
+DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
+apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+DocType: Website Item Group,Website Item Group,Laman Web Perkara Kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tugas dan Cukai
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Sila masukkan tarikh Rujukan
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri bayaran tidak boleh ditapis oleh {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,Jadual untuk Perkara yang akan dipaparkan dalam Laman Web
+DocType: Purchase Order Item Supplied,Supplied Qty,Dibekalkan Qty
+DocType: Material Request Item,Material Request Item,Bahan Permintaan Item
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Pohon Kumpulan Item.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
+,Item-wise Purchase History,Perkara-bijak Pembelian Sejarah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Merah
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
+DocType: Account,Frozen,Beku
+,Open Production Orders,Pesanan Pengeluaran terbuka
+DocType: Installation Note,Installation Time,Masa pemasangan
+DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operasi {1} tidak siap untuk {2} qty barangan siap dalam Pengeluaran Pesanan # {3}. Sila kemas kini status operasi melalui Time Logs
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Pelaburan
+DocType: Issue,Resolution Details,Resolusi Butiran
+DocType: Quality Inspection Reading,Acceptance Criteria,Kriteria Penerimaan
+DocType: Item Attribute,Attribute Name,Atribut Nama
+apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Perkara {0} mesti Jualan atau Perkhidmatan Item dalam {1}
+DocType: Item Group,Show In Website,Show Dalam Laman Web
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Kumpulan
+DocType: Task,Expected Time (in hours),Jangkaan Masa (dalam jam)
+,Qty to Order,Qty Aturan
+DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Untuk menjejaki jenama dalam dokumen-dokumen berikut Penghantaran Nota, Peluang, Permintaan Bahan, Perkara, Pesanan Belian, Baucar Pembelian, Pembeli Resit, Sebut Harga, Invois Jualan, Bundle Produk, Jualan Pesanan, No Siri"
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Carta Gantt semua tugas.
+DocType: Appraisal,For Employee Name,Nama Pekerja
+DocType: Holiday List,Clear Table,Jadual jelas
+DocType: Features Setup,Brands,Jenama
+DocType: C-Form Invoice Detail,Invoice No,Tiada invois
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Dari Pesanan Belian
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+DocType: Activity Cost,Costing Rate,Kadar berharga
+,Customer Addresses And Contacts,Alamat Pelanggan Dan Kenalan
+DocType: Employee,Resignation Letter Date,Peletakan jawatan Surat Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulang Hasil Pelanggan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pasangan
+DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
+DocType: Maintenance Schedule Detail,Actual Date,Tarikh sebenar
+DocType: Item,Has Batch No,Mempunyai Batch No
+DocType: Delivery Note,Excise Page Number,Eksais Bilangan Halaman
+DocType: Employee,Personal Details,Maklumat Peribadi
+,Maintenance Schedules,Jadual Penyelenggaraan
+,Quotation Trends,Trend Sebut Harga
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
+DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
+,Pending Amount,Sementara menunggu Jumlah
+DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
+DocType: Purchase Order,Delivered,Dihantar
+apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Persediaan pelayan masuk untuk id e-mel pekerjaan. (Contohnya jobs@example.com)
+DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarikh di mana invois berulang akan berhenti
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah daun diperuntukkan {0} tidak boleh kurang daripada daun yang telah pun diluluskan {1} bagi tempoh
+DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima
+,Supplier-Wise Sales Analytics,Pembekal Bijaksana Jualan Analytics
+DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format tertentu negara tidak dijumpai
+DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
+DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Penyertaan berdamai
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree akaun finanial.
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Tinggalkan kosong jika dipertimbangkan untuk semua jenis pekerja
+DocType: Landed Cost Voucher,Distribute Charges Based On,Mengedarkan Caj Berasaskan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Akaun {0} mestilah dari jenis &#39;Aset Tetap&#39; sebagai Item {1} adalah Perkara Aset
+DocType: HR Settings,HR Settings,Tetapan HR
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Perbelanjaan Tuntutan sedang menunggu kelulusan. Hanya Pelulus Perbelanjaan yang boleh mengemas kini status.
+DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
+DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Jumlah Sebenar
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unit
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Sila nyatakan Syarikat
+,Customer Acquisition and Loyalty,Perolehan Pelanggan dan Kesetiaan
+DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Gudang di mana anda mengekalkan stok barangan ditolak
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Tahun kewangan anda berakhir pada
+DocType: POS Profile,Price List,Senarai Harga
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} kini Tahun Anggaran asalan. Sila muat semula browser anda untuk mengemaskini perubahan
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Tuntutan perbelanjaan
+DocType: Issue,Support,Sokongan
+,BOM Search,BOM Search
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Penutup (Membuka Total +)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
+DocType: Workstation,Wages per hour,Upah sejam
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {3}
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Papar / Sembunyi ciri-ciri seperti Serial No, POS dan lain-lain"
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Mengikuti Permintaan Bahan telah dibangkitkan secara automatik berdasarkan pesanan semula tahap Perkara ini
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Tarikh pelepasan tidak boleh sebelum tarikh cek berturut-turut {0}
+DocType: Salary Slip,Deduction,Potongan
+DocType: Address Template,Address Template,Templat Alamat
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
+DocType: Territory,Classification of Customers by region,Pengelasan Pelanggan mengikut wilayah
+DocType: Project,% Tasks Completed,% Tugas Selesai
+DocType: Project,Gross Margin,Margin kasar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,pengguna orang kurang upaya
+DocType: Opportunity,Quotation,Sebut Harga
+DocType: Salary Slip,Total Deduction,Jumlah Potongan
+DocType: Quotation,Maintenance User,Penyelenggaraan pengguna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kos Dikemaskini
+DocType: Employee,Date of Birth,Tarikh Lahir
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Perkara {0} telah kembali
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Tahun Fiskal ** mewakili Tahun Kewangan. Semua kemasukan perakaunan dan transaksi utama yang lain dijejak terhadap Tahun Fiskal ** **.
+DocType: Opportunity,Customer / Lead Address,Pelanggan / Lead Alamat
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
+DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
+DocType: Purchase Taxes and Charges,Deduct,Memotong
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Penerangan mengenai Jawatan
+DocType: Purchase Order Item,Qty as per Stock UOM,Qty seperti Saham UOM
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Simpan Track Kempen Jualan. Jejaki Leads, Sebut Harga, Pesanan Jualan dan lain-lain daripada kempen untuk mengukur Pulangan atas Pelaburan."
+DocType: Expense Claim,Approver,Pelulus
+,SO Qty,SO Qty
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Penyertaan saham wujud terhadap gudang {0}, oleh itu anda tidak boleh menetapkan semula atau mengubah suai Gudang"
+DocType: Appraisal,Calculate Total Score,Kira Jumlah Skor
+DocType: Supplier Quotation,Manufacturing Manager,Pembuatan Pengurus
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
+apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
+apps/erpnext/erpnext/hooks.py +68,Shipments,Penghantaran
+DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Masa Log Status mesti Dihantar.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
+DocType: Purchase Invoice,In Words (Company Currency),Dalam Perkataan (Syarikat mata wang)
+DocType: Pricing Rule,Supplier,Pembekal
+DocType: C-Form,Quarter,Suku
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Perbelanjaan Pelbagai
+DocType: Global Defaults,Default Company,Syarikat Default
+apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Perbelanjaan atau akaun perbezaan adalah wajib bagi Perkara {0} kerana ia kesan nilai saham keseluruhan
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak boleh overbill untuk Perkara {0} berturut-turut {1} lebih daripada {2}. Untuk membolehkan overbilling, sila ditetapkan dalam Tetapan Saham"
+DocType: Employee,Bank Name,Nama Bank
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Di atas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Pengguna {0} adalah orang kurang upaya
+DocType: Leave Application,Total Leave Days,Jumlah Hari Cuti
+DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: Email tidak akan dihantar kepada pengguna kurang upaya
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Pilih Syarikat ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
+apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+DocType: Currency Exchange,From Currency,Dari Mata Wang
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Sila pilih Jumlah Diperuntukkan, Jenis Invois dan Nombor Invois dalam atleast satu baris"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Pesanan Jualan diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Amaun tidak dicerminkan dalam sistem
+DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Lain
+apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.
+DocType: POS Profile,Taxes and Charges,Cukai dan Caj
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Satu Produk atau Perkhidmatan yang dibeli, dijual atau disimpan dalam stok."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Sila klik pada &#39;Menjana Jadual&#39; untuk mendapatkan jadual
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Kos Pusat Baru
+DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
+DocType: Quality Inspection,In Process,Dalam Proses
+DocType: Authorization Rule,Itemwise Discount,Itemwise Diskaun
+DocType: Purchase Order Item,Reference Document Type,Rujukan Jenis Dokumen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
+DocType: Account,Fixed Asset,Aset Tetap
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventori bersiri
+DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
+DocType: Time Log Batch,Total Billing Amount,Jumlah Bil
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Akaun Belum Terima
+,Stock Balance,Baki saham
+apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Perintah Jualan kepada Pembayaran
+DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Masa Log dicipta:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Sila pilih akaun yang betul
+DocType: Item,Weight UOM,Berat UOM
+DocType: Employee,Blood Group,Kumpulan Darah
+DocType: Purchase Invoice Item,Page Break,Page Break
+DocType: Production Order Operation,Pending,Sementara menunggu
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Pengguna yang boleh meluluskan permohonan cuti kakitangan yang khusus
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Peralatan Pejabat
+DocType: Purchase Invoice Item,Qty,Qty
+DocType: Fiscal Year,Companies,Syarikat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Meningkatkan Bahan Permintaan apabila saham mencapai tahap semula perintah-
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Dari Jadual Penyelenggaraan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Sepenuh masa
+DocType: Purchase Invoice,Contact Details,Butiran Hubungi
+DocType: C-Form,Received Date,Tarikh terima
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika anda telah mencipta satu template standard dalam Jualan Cukai dan Caj Template, pilih satu dan klik pada butang di bawah."
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Sila nyatakan negara untuk Peraturan Penghantaran ini atau daftar Penghantaran di seluruh dunia
+DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
+DocType: Offer Letter Term,Offer Term,Tawaran Jangka
+DocType: Quality Inspection,Quality Manager,Pengurus Kualiti
+DocType: Job Applicant,Job Opening,Lowongan
+DocType: Payment Reconciliation,Payment Reconciliation,Penyesuaian bayaran
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
+DocType: Offer Letter,Offer Letter,Menawarkan Surat
+apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Menjana Permintaan Bahan (MRP) dan Perintah Pengeluaran.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Jumlah invois AMT
+DocType: Time Log,To Time,Untuk Masa
+DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Untuk menambah nod anak, meneroka pokok dan klik pada nod di mana anda mahu untuk menambah lebih banyak nod."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+DocType: Production Order Operation,Completed Qty,Siap Qty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, akaun debit hanya boleh dikaitkan dengan kemasukan kredit lain"
+apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
+DocType: Manufacturing Settings,Allow Overtime,Benarkan kerja lebih masa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
+DocType: Stock Reconciliation Item,Current Valuation Rate,Kadar Penilaian semasa
+DocType: Item,Customer Item Codes,Kod Item Pelanggan
+DocType: Opportunity,Lost Reason,Hilang Akal
+apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Buat Penyertaan Bayaran terhadap Pesanan atau Invois.
+DocType: Quality Inspection,Sample Size,Saiz Sampel
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Sila nyatakan yang sah Dari Perkara No. &#39;
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat kos lanjut boleh dibuat di bawah Kumpulan tetapi penyertaan boleh dibuat terhadap bukan Kumpulan
+DocType: Project,External,Luar
+DocType: Features Setup,Item Serial Nos,Perkara Serial No.
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Kebenaran
+DocType: Branch,Branch,Cawangan
+apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Penjenamaan
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,Tiada slip gaji dijumpai untuk bulan:
+DocType: Bin,Actual Quantity,Kuantiti sebenar
+DocType: Shipping Rule,example: Next Day Shipping,contoh: Penghantaran Hari Seterusnya
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,No siri {0} tidak dijumpai
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Pelanggan anda
+DocType: Leave Block List Date,Block Date,Sekat Tarikh
+DocType: Sales Order,Not Delivered,Tidak Dihantar
+,Bank Clearance Summary,Bank Clearance Ringkasan
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kod Item&gt; Perkara Kumpulan&gt; Jenama
+DocType: Appraisal Goal,Appraisal Goal,Penilaian Matlamat
+DocType: Time Log,Costing Amount,Jumlah berharga
+DocType: Process Payroll,Submit Salary Slip,Hantar Slip Gaji
+DocType: Salary Structure,Monthly Earning & Deduction,Pendapatan Bulanan &amp; Potongan
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Diskaun Maxiumm untuk Perkara {0} adalah {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import di Bulk
+DocType: Sales Partner,Address & Contacts,Alamat Kenalan
+DocType: SMS Log,Sender Name,Nama Pengirim
+DocType: POS Profile,[Select],[Pilih]
+DocType: SMS Log,Sent To,Dihantar Kepada
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Buat Jualan Invois
+DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Tidak sah {0}: {1}
+DocType: Sales Invoice Advance,Advance Amount,Advance Jumlah
+DocType: Manufacturing Settings,Capacity Planning,Perancangan Kapasiti
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Dari Tarikh&#39; diperlukan
+DocType: Journal Entry,Reference Number,Nombor Rujukan
+DocType: Employee,Employment Details,Butiran Pekerjaan
+DocType: Employee,New Workplace,New Tempat Kerja
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Ditetapkan sebagai Ditutup
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},No Perkara dengan Barcode {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 0
+DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,Jika anda mempunyai Pasukan Jualan dan Jualan Partners (Channel Partners) mereka boleh ditandakan dan mengekalkan sumbangan mereka dalam aktiviti jualan
+DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
+DocType: Item,"Allow in Sales Order of type ""Service""",Benarkan dalam Sales Order dari jenis &quot;Perkhidmatan&quot;
+apps/erpnext/erpnext/setup/doctype/company/company.py +80,Stores,Kedai
+DocType: Time Log,Projects Manager,Projek Pengurus
+DocType: Serial No,Delivery Time,Masa penghantaran
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
+DocType: Item,End of Life,Akhir Hayat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Perjalanan
+DocType: Leave Block List,Allow Users,Benarkan Pengguna
+DocType: Purchase Order,Customer Mobile No,Pelanggan Bimbit
+DocType: Sales Invoice,Recurring,Berulang
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jejaki Pendapatan berasingan dan Perbelanjaan untuk menegak produk atau bahagian.
+DocType: Rename Tool,Rename Tool,Nama semula Tool
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kos
+DocType: Item Reorder,Item Reorder,Perkara Reorder
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Pemindahan Bahan
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nyatakan operasi, kos operasi dan memberikan Operasi unik tidak kepada operasi anda."
+DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
+DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
+DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
+DocType: Installation Note,Installation Note,Pemasangan Nota
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Tambah Cukai
+,Financial Analytics,Analisis Kewangan
+DocType: Quality Inspection,Verified By,Disahkan oleh
+DocType: Address,Subsidiary,Anak Syarikat
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
+DocType: Quality Inspection,Purchase Receipt No,Resit Pembelian No
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
+DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Keseimbangan dijangka seperti bank
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
+DocType: Appraisal,Employee,Pekerja
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Import Dari E-mel
+apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Jemput sebagai pengguna
+DocType: Features Setup,After Sale Installations,Selepas Pemasangan Sale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
+DocType: Workstation Working Hour,End Time,Akhir Masa
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Terma kontrak standard untuk Jualan atau Beli.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Kumpulan dengan Voucher
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
+DocType: Sales Invoice,Mass Mailing,Mailing massa
+DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Show Pembayaran
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadual Penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+DocType: Notification Control,Expense Claim Approved,Perbelanjaan Tuntutan Diluluskan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
+DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
+apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Buat Pelanggan
+DocType: Purchase Invoice,Credit To,Kredit Untuk
+DocType: Employee Education,Post Graduate,Siswazah
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadual Penyelenggaraan Terperinci
+DocType: Quality Inspection Reading,Reading 9,Membaca 9
+DocType: Supplier,Is Frozen,Adalah Beku
+DocType: Buying Settings,Buying Settings,Tetapan Membeli
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. untuk Perkara Baik Selesai
+DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Persediaan pelayan masuk untuk id e-mel jualan. (Contohnya sales@example.com)
+DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
+DocType: Payment Tool,Payment Account,Akaun Pembayaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Pampasan Off
+DocType: Quality Inspection Reading,Accepted,Diterima
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sila pastikan anda benar-benar ingin memadam semua urus niaga bagi syarikat ini. Data induk anda akan kekal kerana ia adalah. Tindakan ini tidak boleh dibuat asal.
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Rujukan tidak sah {0} {1}
+DocType: Payment Tool,Total Payment Amount,Jumlah Pembayaran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak boleh lebih besar dari kuantiti yang dirancang ({2}) dalam Pesanan Pengeluaran {3}
+DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+DocType: Newsletter,Test,Ujian
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Oleh kerana terdapat transaksi saham sedia ada untuk item ini, \ anda tidak boleh menukar nilai-nilai &#39;Belum Bersiri&#39;, &#39;Mempunyai batch Tidak&#39;, &#39;Apakah Saham Perkara&#39; dan &#39;Kaedah Penilaian&#39;"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
+DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
+DocType: Stock Entry,For Quantity,Untuk Kuantiti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} tidak diserahkan
+apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Permintaan untuk barang-barang.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Perintah pengeluaran berasingan akan diwujudkan bagi setiap item siap baik.
+DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Catatan Perakaunan dibekukan sehingga tarikh ini, tiada siapa boleh melakukan / mengubah suai kemasukan kecuali yang berperanan seperti di bawah."
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projek
+DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
+apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Senarai Mel
+DocType: Delivery Note,Transporter Name,Nama Transporter
+DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
+DocType: Contact,Enter department to which this Contact belongs,Masukkan jabatan yang Contact ini kepunyaan
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Jumlah Tidak hadir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unit Tindakan
+DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
+DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
+DocType: Lead,Opportunity,Peluang
+DocType: Salary Structure Earning,Salary Structure Earning,Struktur Gaji Pendapatan
+,Completed Production Orders,Pesanan Pengeluaran selesai
+DocType: Operation,Default Workstation,Workstation Default
+DocType: Notification Control,Expense Claim Approved Message,Mesej perbelanjaan Tuntutan Diluluskan
+DocType: Email Digest,How frequently?,Berapa kerap?
+DocType: Purchase Receipt,Get Current Stock,Dapatkan Saham Semasa
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Tree Rang Undang-Undang Bahan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
+DocType: Production Order,Actual End Date,Tarikh Akhir Sebenar
+DocType: Authorization Rule,Applicable To (Role),Terpakai Untuk (Peranan)
+DocType: Stock Entry,Purpose,Tujuan
+DocType: Item,Will also apply for variants unless overrridden,Juga akan memohon varian kecuali overrridden
+DocType: Purchase Invoice,Advances,Pendahuluan
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Meluluskan pengguna tidak boleh menjadi sama seperti pengguna peraturan adalah Terpakai Untuk
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Kadar asas (seperti Stock UOM)
+DocType: SMS Log,No of Requested SMS,Jumlah SMS yang diminta
+DocType: Campaign,Campaign-.####,Kempen -. ####
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah seterusnya
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang pengedar pihak ketiga / peniaga / ejen / kenalan / penjual semula yang menjual produk syarikat untuk komisen.
+DocType: Customer Group,Has Child Node,Kanak-kanak mempunyai Nod
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statik di sini (Eg. Penghantar = ERPNext, nama pengguna = ERPNext, kata laluan = 1234 dan lain-lain)"
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam mana-mana Tahun Fiskal aktif. Untuk maklumat lanjut daftar {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Range Penuaan 1
+DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.","Template cukai standard yang boleh diguna pakai untuk semua Transaksi Pembelian. Templat ini boleh mengandungi senarai kepala cukai dan juga kepala perbelanjaan lain seperti &quot;Penghantaran&quot;, &quot;Insurans&quot;, &quot;Pengendalian&quot; dan lain-lain #### Nota Kadar cukai anda tentukan di sini akan menjadi kadar cukai standard untuk semua ** Item * *. Jika terdapat Item ** ** yang mempunyai kadar yang berbeza, mereka perlu ditambah dalam ** Item Cukai ** meja dalam ** ** Item induk. #### Keterangan Kolum 1. Pengiraan Jenis: - Ini boleh menjadi pada ** ** Jumlah bersih (iaitu jumlah jumlah asas). - ** Pada Row Sebelumnya Jumlah / Jumlah ** (untuk cukai atau caj terkumpul). Jika anda memilih pilihan ini, cukai yang akan digunakan sebagai peratusan daripada baris sebelumnya (dalam jadual cukai) amaun atau jumlah. - ** ** Sebenar (seperti yang dinyatakan). 2. Ketua Akaun: The lejar Akaun di mana cukai ini akan ditempah 3. Kos Center: Jika cukai / caj adalah pendapatan (seperti penghantaran) atau perbelanjaan perlu ditempah terhadap PTJ. 4. Keterangan: Keterangan cukai (yang akan dicetak dalam invois / sebut harga). 5. Kadar: Kadar Cukai. 6. Jumlah: Jumlah Cukai. 7. Jumlah: Jumlah terkumpul sehingga hal ini. 8. Masukkan Row: Jika berdasarkan &quot;Row Sebelumnya Jumlah&quot; anda boleh pilih nombor barisan yang akan diambil sebagai asas untuk pengiraan ini (default adalah berturut-turut sebelumnya). 9. Pertimbangkan Cukai atau Caj: Dalam bahagian ini, anda boleh menentukan jika cukai / caj adalah hanya untuk penilaian (bukan sebahagian daripada jumlah) atau hanya untuk jumlah (tidak menambah nilai kepada item) atau kedua-duanya. 10. Tambah atau Tolak: Adakah anda ingin menambah atau memotong cukai."
+DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
+DocType: Tax Rule,Billing City,Bandar Bil
+DocType: Global Defaults,Hide Currency Symbol,Menyembunyikan Simbol mata wang
+apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","contohnya Bank, Tunai, Kad Kredit"
+DocType: Journal Entry,Credit Note,Nota Kredit
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Siap Qty tidak boleh lebih daripada {0} untuk operasi {1}
+DocType: Features Setup,Quality,Kualiti
+DocType: Warranty Claim,Service Address,Alamat Perkhidmatan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 baris untuk Saham Penyesuaian.
+DocType: Stock Entry,Manufacture,Pembuatan
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Sila Penghantaran Nota pertama
+DocType: Purchase Invoice,Currency and Price List,Mata wang dan Senarai Harga
+DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Lead
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Pengeluaran
+DocType: Item,Allow Production Order,Membenarkan Perintah Pengeluaran
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
+DocType: Installation Note Item,Installed Qty,Dipasang Qty
+DocType: Lead,Fax,Fax
+DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+DocType: Salary Structure,Total Earning,Jumlah Pendapatan
+DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
+apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Alamat saya
+DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
+apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Master cawangan organisasi.
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,atau
+DocType: Sales Order,Billing Status,Bil Status
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Perbelanjaan utiliti
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Ke atas
+DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
+DocType: Notification Control,Sales Order Message,Pesanan Jualan Mesej
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nilai Default Tetapkan seperti Syarikat, mata wang, fiskal semasa Tahun, dan lain-lain"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Jenis Pembayaran
+DocType: Process Payroll,Select Employees,Pilih Pekerja
+DocType: Bank Reconciliation,To Date,Tarikh
+DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
+DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Cukai dan Caj
+DocType: Employee,Emergency Contact,Hubungi Kecemasan
+DocType: Item,Quality Parameters,Parameter Kualiti
+DocType: Target Detail,Target  Amount,Sasaran Jumlah
+DocType: Shopping Cart Settings,Shopping Cart Settings,Troli membeli-belah Tetapan
+DocType: Journal Entry,Accounting Entries,Catatan Perakaunan
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Salinan Entry. Sila semak Kebenaran Peraturan {0}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +25,Global POS Profile {0} already created for company {1},Profil POS Global {0} telah dicipta untuk syarikat {1}
+DocType: Purchase Order,Ref SQ,Ref SQ
+apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Ganti Perkara / BOM dalam semua BOMs
+DocType: Purchase Order Item,Received Qty,Diterima Qty
+DocType: Stock Entry Detail,Serial No / Batch,Serial No / batch
+DocType: Product Bundle,Parent Item,Perkara Ibu Bapa
+DocType: Account,Account Type,Jenis Akaun
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak boleh bawa dikemukakan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
+,To Produce,Hasilkan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
+DocType: Packing Slip,Identification of the package for the delivery (for print),Pengenalan pakej untuk penghantaran (untuk cetak)
+DocType: Bin,Reserved Quantity,Cipta Terpelihara Kuantiti
+DocType: Landed Cost Voucher,Purchase Receipt Items,Item Resit Pembelian
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Borang menyesuaikan
+DocType: Account,Income Account,Akaun Pendapatan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Penghantaran
+DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lihat &quot;Kadar Bahan Based On&quot; dalam Seksyen Kos
+DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
+DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
+DocType: Cost Center,Cost Center,PTJ
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Baucer #
+DocType: Notification Control,Purchase Order Message,Membeli Pesanan Mesej
+DocType: Tax Rule,Shipping Country,Penghantaran Negara
+DocType: Upload Attendance,Upload HTML,Naik HTML
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Jumlah terlebih dahulu ({0}) terhadap Perintah {1} tidak boleh lebih besar \ daripada Jumlah Besar ({2})
+DocType: Employee,Relieving Date,Melegakan Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Peraturan Harga dibuat untuk menulis ganti Senarai Harga / menentukan peratusan diskaun, berdasarkan beberapa kriteria."
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya boleh ditukar melalui Saham Entry / Penghantaran Nota / Resit Pembelian
+DocType: Employee Education,Class / Percentage,Kelas / Peratus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Cukai Pendapatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika Peraturan Harga dipilih dibuat untuk &#39;Harga&#39;, ia akan menulis ganti Senarai Harga. Harga Peraturan Harga adalah harga akhir, jadi tidak ada diskaun lagi boleh diguna pakai. Oleh itu, dalam urus niaga seperti Perintah Jualan, Pesanan Belian dan lain-lain, ia akan berjaya meraih jumlah dalam bidang &#39;Rate&#39;, daripada bidang &#39;Senarai Harga Rate&#39;."
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
+DocType: Item Supplier,Item Supplier,Perkara Pembekal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Semua Alamat.
+DocType: Company,Stock Settings,Tetapan saham
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
+apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,New Nama PTJ
+DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Tiada Templat Alamat lalai dijumpai. Sila buat yang baru dari Setup&gt; Percetakan dan Penjenamaan&gt; Templat Alamat.
+DocType: Appraisal,HR User,HR pengguna
+DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Isu-isu
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mestilah salah seorang daripada {0}
+DocType: Sales Invoice,Debit To,Debit Untuk
+DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
+,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
+DocType: Supplier,Billing Currency,Bil Mata Wang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Lebih Besar
+,Profit and Loss Statement,Penyata Untung dan Rugi
+DocType: Bank Reconciliation Detail,Cheque Number,Nombor Cek
+DocType: Payment Tool Detail,Payment Tool Detail,Alat pembayaran Detail
+,Sales Browser,Jualan Pelayar
+DocType: Journal Entry,Total Credit,Jumlah Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Tempatan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Besar
+DocType: C-Form Invoice Detail,Territory,Wilayah
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
+DocType: Purchase Order,Customer Address Display,Alamat Pelanggan Display
+DocType: Stock Settings,Default Valuation Method,Kaedah Penilaian Default
+DocType: Production Order Operation,Planned Start Time,Dirancang Mula Masa
+apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Kunci Kira-kira rapat dan buku Untung atau Rugi.
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nyatakan Kadar Pertukaran untuk menukar satu matawang kepada yang lain
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Sebut Harga {0} dibatalkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Cemerlang
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pekerja {0} adalah bercuti di {1}. Tidak boleh menandakan kehadiran.
+DocType: Sales Partner,Targets,Sasaran
+DocType: Price List,Price List Master,Senarai Harga Master
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
+,S.O. No.,PP No.
+DocType: Production Order Operation,Make Time Log,Buat Masa Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
+DocType: Price List,Applicable for Countries,Digunakan untuk Negara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputer
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ini adalah kumpulan pelanggan akar dan tidak boleh diedit.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Sila setup carta akaun anda sebelum anda mula Penyertaan Perakaunan
+DocType: Purchase Invoice,Ignore Pricing Rule,Abaikan Peraturan Harga
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tarikh dalam Struktur Gaji tidak boleh kurang daripada Pekerja Tarikh Menyertai.
+DocType: Employee Education,Graduate,Siswazah
+DocType: Leave Block List,Block Days,Hari blok
+DocType: Journal Entry,Excise Entry,Eksais Entry
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Amaran: Sales Order {0} telah wujud terhadap Perintah Pembelian Pelanggan {1}
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Terma dan Syarat Standard yang boleh ditambah untuk Jualan dan Pembelian. Contoh: 1. Kesahan tawaran itu. 1. Terma Pembayaran (Dalam Advance, Mengenai Kredit, bahagian pendahuluan dan lain-lain). 1. Apakah tambahan (atau perlu dibayar oleh Pelanggan). 1. Keselamatan amaran / penggunaan. 1. Waranti jika ada. 1. Kembali Polisi. 1. Syarat-syarat penghantaran, jika berkenaan. 1. Cara-cara menangani pertikaian, tanggung rugi, kerugian, dan lain-lain 1. Alamat dan Contact Syarikat anda."
+DocType: Attendance,Leave Type,Cuti Jenis
+apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaun perbelanjaan / Perbezaan ({0}) mestilah akaun &#39;Keuntungan atau Kerugian&#39;
+DocType: Account,Accounts User,pengguna Akaun-akaun
+DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Periksa sama ada invois berulang, jangan tanda supaya berhenti atau meletakkan Tarikh Akhir betul"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
+DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
+DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
+DocType: Bin,FCFS Rate,Kadar FCFS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Bil (Jualan Invois)
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang tertunggak
+DocType: Project Task,Working,Kerja
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Saham Queue (FIFO)
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Sila pilih Time Log.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} bukan milik Syarikat {1}
+DocType: Account,Round Off,Bundarkan
+,Requested Qty,Diminta Qty
+DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Troli
+DocType: BOM Item,Scrap %,Scrap%
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda"
+DocType: Maintenance Visit,Purposes,Tujuan
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast perkara seseorang itu perlu dimasukkan dengan kuantiti negatif dalam dokumen pulangan
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada mana-mana waktu kerja yang terdapat di stesen kerja {1}, memecahkan operasi ke dalam pelbagai operasi"
+,Requested,Diminta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Tidak Catatan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Tertunggak
+DocType: Account,Stock Received But Not Billed,Saham Diterima Tetapi Tidak Membilkan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Akaun root mestilah kumpulan
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gaji kasar + Tunggakan Jumlah + Penunaian Jumlah - Jumlah Potongan
+DocType: Monthly Distribution,Distribution Name,Nama pengedaran
+DocType: Features Setup,Sales and Purchase,Jual Beli
+DocType: Supplier Quotation Item,Material Request No,Permintaan bahan Tidak
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Kadar di mana pelanggan mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} telah berjaya henti melanggan dari senarai ini.
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Kadar bersih (Syarikat mata wang)
+apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Mengurus Wilayah Tree.
+DocType: Journal Entry Account,Sales Invoice,Invois jualan
+DocType: Journal Entry Account,Party Balance,Baki pihak
+DocType: Sales Invoice Item,Time Log Batch,Masa Log Batch
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +437,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+DocType: Company,Default Receivable Account,Default Akaun Belum Terima
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk jumlah gaji yang dibayar bagi kriteria yang dipilih di atas
+DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
+DocType: Purchase Invoice,Half-yearly,Setengah tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Tahun fiskal {0} tidak dijumpai.
+DocType: Bank Reconciliation,Get Relevant Entries,Dapatkan Entri Berkaitan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
+DocType: Sales Invoice,Sales Team1,Team1 Jualan
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Perkara {0} tidak wujud
+DocType: Sales Invoice,Customer Address,Alamat Pelanggan
+DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
+DocType: Account,Root Type,Jenis akar
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,Plot
+DocType: Item Group,Show this slideshow at the top of the page,Menunjukkan tayangan gambar ini di bahagian atas halaman
+DocType: BOM,Item UOM,Perkara UOM
+DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Amaun Cukai Selepas Jumlah Diskaun (Syarikat mata wang)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Gudang sasaran adalah wajib untuk berturut-turut {0}
+DocType: Quality Inspection,Quality Inspection,Pemeriksaan Kualiti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tambahan Kecil
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Akaun {0} dibekukan
+DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL atau BS
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tahap Inventori Minimum
+DocType: Stock Entry,Subcontract,Subkontrak
+apps/erpnext/erpnext/public/js/utils/party.js +121,Please enter {0} first,Sila masukkan {0} pertama
+DocType: Production Planning Tool,Get Items From Sales Orders,Dapatkan Item Dari Jualan Pesanan
+DocType: Production Order Operation,Actual End Time,Waktu Tamat Sebenar
+DocType: Production Planning Tool,Download Materials Required,Muat turun Bahan Diperlukan
+DocType: Item,Manufacturer Part Number,Pengeluar Bahagian Bilangan
+DocType: Production Order Operation,Estimated Time and Cost,Anggaran Masa dan Kos
+DocType: Bin,Bin,Bin
+DocType: SMS Log,No of Sent SMS,Bilangan SMS dihantar
+DocType: Account,Company,Syarikat
+DocType: Account,Expense Account,Akaun Perbelanjaan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perisian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Warna
+DocType: Maintenance Visit,Scheduled,Berjadual
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Sila pilih Item mana &quot;Apakah Saham Perkara&quot; adalah &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lain
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Pilih Pengagihan Bulanan untuk tidak sekata mengedarkan sasaran seluruh bulan.
+DocType: Purchase Invoice Item,Valuation Rate,Kadar penilaian
+apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Senarai harga mata wang tidak dipilih
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Perkara Row {0}: Resit Pembelian {1} tidak wujud dalam jadual &#39;Pembelian Resit&#39; di atas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sehingga
+DocType: Rename Tool,Rename Log,Log menamakan semula
+DocType: Installation Note Item,Against Document No,Terhadap Dokumen No
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Mengurus Jualan Partners.
+DocType: Quality Inspection,Inspection Type,Jenis Pemeriksaan
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Sila pilih {0}
+DocType: C-Form,C-Form No,C-Borang No
+DocType: BOM,Exploded_items,Exploded_items
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Penyelidik
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Sila simpan Newsletter sebelum menghantar
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nama atau E-mel adalah wajib
+apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Pemeriksaan kualiti yang masuk.
+DocType: Purchase Order Item,Returned Qty,Kembali Kuantiti
+DocType: Employee,Exit,Keluar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Jenis akar adalah wajib
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No siri {0} dicipta
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
+DocType: Employee,You can enter any date manually,Anda boleh memasuki mana-mana tarikh secara manual
+DocType: Sales Invoice,Advertisement,Iklan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Tempoh Percubaan
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya nod daun dibenarkan dalam urus niaga
+DocType: Expense Claim,Expense Approver,Perbelanjaan Pelulus
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Resit Pembelian Item Dibekalkan
+apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Bayar
+apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Untuk datetime
+DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
+apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Sementara menunggu Aktiviti
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Disahkan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Pembekal&gt; Jenis Pembekal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Sila masukkan tarikh melegakan.
+apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; boleh dikemukakan
+apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Alamat Tajuk adalah wajib.
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kempen jika sumber siasatan adalah kempen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Akhbar Penerbit
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Anggaran
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pesanan semula Level
+DocType: Attendance,Attendance Date,Kehadiran Tarikh
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
+DocType: Address,Preferred Shipping Address,Pilihan Alamat Penghantaran
+DocType: Purchase Receipt Item,Accepted Warehouse,Gudang Diterima
+DocType: Bank Reconciliation Detail,Posting Date,Penempatan Tarikh
+DocType: Item,Valuation Method,Kaedah Penilaian
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Tidak dapat mencari kadar pertukaran untuk {0} kepada {1}
+DocType: Sales Invoice,Sales Team,Pasukan Jualan
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entri pendua
+DocType: Serial No,Under Warranty,Di bawah Waranti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Ralat]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Perintah Jualan.
+,Employee Birthday,Pekerja Hari Lahir
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Teroka
+DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,No siri {0} tidak wujud
+DocType: Pricing Rule,Discount Percentage,Peratus diskaun
+DocType: Payment Reconciliation Invoice,Invoice Number,Nombor invois
+apps/erpnext/erpnext/hooks.py +54,Orders,Pesanan
+DocType: Leave Control Panel,Employee Type,Jenis Pekerja
+DocType: Employee Leave Approver,Leave Approver,Tinggalkan Pelulus
+DocType: Manufacturing Settings,Material Transferred for Manufacture,Bahan Dipindahkan untuk Pembuatan
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Pengguna dengan Peranan ""Pelulus Perbelanjaan"""
+,Issued Items Against Production Order,Barangan yang dikeluarkan Terhadap Perintah Pengeluaran
+DocType: Pricing Rule,Purchase Manager,Pembelian Pengurus
+DocType: Payment Tool,Payment Tool,Alat pembayaran
+DocType: Target Detail,Target Detail,Detail Sasaran
+DocType: Sales Order,% of materials billed against this Sales Order,% bahan-bahan yang dibilkan terhadap Pesanan Jualan ini
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Kemasukan Tempoh Penutup
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Susutnilai
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
+DocType: Customer,Credit Limit,Had Kredit
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Pilih jenis transaksi
+DocType: GL Entry,Voucher No,Baucer Tiada
+DocType: Leave Allocation,Leave Allocation,Tinggalkan Peruntukan
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +396,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Templat istilah atau kontrak.
+DocType: Customer,Address and Contact,Alamat dan Perhubungan
+DocType: Customer,Last Day of the Next Month,Hari terakhir Bulan Depan
+DocType: Employee,Feedback,Maklumbalas
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti yang tidak boleh diperuntukkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Jadual Selenggaraan
+DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
+DocType: Item,Reorder level based on Warehouse,Tahap pesanan semula berdasarkan Warehouse
+DocType: Activity Cost,Billing Rate,Kadar bil
+,Qty to Deliver,Qty untuk Menyampaikan
+DocType: Monthly Distribution Percentage,Month,Bulan
+,Stock Analytics,Saham Analytics
+DocType: Installation Note Item,Against Document Detail No,Terhadap Detail Dokumen No
+DocType: Quality Inspection,Outgoing,Keluar
+DocType: Material Request,Requested For,Diminta Untuk
+DocType: Quotation Item,Against Doctype,Terhadap DOCTYPE
+DocType: Delivery Note,Track this Delivery Note against any Project,Jejaki Penghantaran Nota ini terhadap mana-mana Projek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Akaun akar tidak boleh dihapuskan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show Saham Penyertaan
+,Is Primary Address,Adakah Alamat Utama
+DocType: Production Order,Work-in-Progress Warehouse,Kerja dalam Kemajuan Gudang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Mengurus Alamat
+DocType: Pricing Rule,Item Code,Kod Item
+DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
+DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
+DocType: Journal Entry,User Remark,Catatan pengguna
+DocType: Lead,Market Segment,Segmen pasaran
+DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Penutup (Dr)
+DocType: Contact,Passive,Pasif
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,No siri {0} tidak dalam stok
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
+DocType: Sales Invoice,Write Off Outstanding Amount,Tulis Off Cemerlang Jumlah
+DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Semak jika anda memerlukan invois berulang automatik. Selepas menyerahkan sebarang invois jualan, seksyen berulang akan dapat dilihat."
+DocType: Account,Accounts Manager,Pengurus Akaun-akaun
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +39,Time Log {0} must be 'Submitted',Masa Log {0} mesti &#39;Dihantar&#39;
+DocType: Stock Settings,Default Stock UOM,Default Saham UOM
+DocType: Time Log,Costing Rate based on Activity Type (per hour),Kos Kadar berdasarkan Jenis Aktiviti (sejam)
+DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
+DocType: Employee Education,School/University,Sekolah / Universiti
+DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
+,Billed Amount,Jumlah dibilkan
+DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dapatkan Maklumat Terbaru
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Tambah rekod sampel beberapa
+apps/erpnext/erpnext/config/hr.py +210,Leave Management,Tinggalkan Pengurusan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Kumpulan dengan Akaun
+DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
+DocType: Lead,Lower Income,Pendapatan yang lebih rendah
+DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","Ketua akaun di bawah Liabiliti, di mana Keuntungan / Kerugian akan diberikan kad"
+DocType: Payment Tool,Against Vouchers,Terhadap Baucar
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Bantuan Pantas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Sumber dan sasaran gudang tidak boleh sama berturut-turut untuk {0}
+DocType: Features Setup,Sales Extras,Jualan Tambahan
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} bajet untuk Akaun {1} terhadap Kos Pusat {2} akan berlebihan sebanyak {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
+,Stock Projected Qty,Saham Unjuran Qty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
+DocType: Warranty Claim,From Company,Daripada Syarikat
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Nilai atau Qty
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Saat
+DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
+,Qty to Receive,Qty untuk Menerima
+DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Sekat Senarai Dibenarkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Anda akan menggunakannya untuk Login
+DocType: Sales Partner,Retailer,Peruncit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis Pembekal
+apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kod Item adalah wajib kerana Perkara tidak bernombor secara automatik
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Jadual Penyelenggaraan
+DocType: Sales Order,%  Delivered,% Dihantar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Akaun Overdraf bank
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pinjaman Bercagar
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produk Awesome
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Pembukaan Ekuiti Baki
+DocType: Appraisal,Appraisal,Penilaian
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarikh diulang
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang diberi kuasa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
+DocType: Hub Settings,Seller Email,Penjual E-mel
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
+DocType: Workstation Working Hour,Start Time,Waktu Mula
+DocType: Item Price,Bulk Import Help,Bulk Bantuan Import
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,Pilih Kuantiti
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Meluluskan Peranan tidak boleh sama dengan peranan peraturan adalah Terpakai Untuk
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +66,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +36,Message Sent,Mesej dihantar
+DocType: Production Plan Sales Order,SO Date,SO Tarikh
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas pelanggan
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Syarikat mata wang)
+DocType: BOM Operation,Hour Rate,Kadar jam
+DocType: Stock Settings,Item Naming By,Perkara Menamakan Dengan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Dari Sebut Harga
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Satu lagi Entry Tempoh Penutup {0} telah dibuat selepas {1}
+DocType: Production Order,Material Transferred for Manufacturing,Bahan Dipindahkan untuk Pembuatan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Akaun {0} tidak wujud
+DocType: Purchase Receipt Item,Purchase Order Item No,Pesanan Pembelian Item No
+DocType: Project,Project Type,Jenis Projek
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Qty sasaran atau sasaran jumlah sama ada adalah wajib.
+apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kos pelbagai aktiviti
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
+DocType: Item,Inspection Required,Pemeriksaan Diperlukan
+DocType: Purchase Invoice Item,PR Detail,Detail PR
+DocType: Sales Order,Fully Billed,Membilkan sepenuhnya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tunai Dalam Tangan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Gudang penghantaran diperlukan untuk item stok {0}
+DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kasar pakej. Biasanya berat bersih + pembungkusan berat badan yang ketara. (Untuk cetak)
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
+DocType: Serial No,Is Cancelled,Apakah Dibatalkan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Penghantaran saya
+DocType: Journal Entry,Bill Date,Rang Undang-Undang Tarikh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Walaupun terdapat beberapa Peraturan Harga dengan keutamaan tertinggi, keutamaan dalaman maka berikut digunakan:"
+DocType: Supplier,Supplier Details,Butiran Pembekal
+DocType: Expense Claim,Approval Status,Kelulusan Status
+DocType: Hub Settings,Publish Items to Hub,Menerbitkan item untuk Hub
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Sila pilih Akaun Bank
+DocType: Newsletter,Create and Send Newsletters,Buat dan Hantar Surat Berita
+DocType: Sales Order,Recurring Order,Pesanan berulang
+DocType: Company,Default Income Account,Akaun Pendapatan Default
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
+DocType: Item Group,Check this if you want to show in website,Semak ini jika anda mahu untuk menunjukkan di laman web
+,Welcome to ERPNext,Selamat datang ke ERPNext
+DocType: Payment Reconciliation Payment,Voucher Detail Number,Baucer Nombor Detail
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Membawa kepada Sebut Harga
+DocType: Lead,From Customer,Daripada Pelanggan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Panggilan
+DocType: Project,Total Costing Amount (via Time Logs),Jumlah Kos (melalui Time Log)
+DocType: Purchase Order Item Supplied,Stock UOM,Saham UOM
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
+,Projected,Unjuran
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
+apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
+DocType: Notification Control,Quotation Message,Sebut Harga Mesej
+DocType: Issue,Opening Date,Tarikh pembukaan
+DocType: Journal Entry,Remark,Catatan
+DocType: Purchase Receipt Item,Rate and Amount,Kadar dan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Dari Jualan Pesanan
+DocType: Sales Order,Not Billed,Tidak Membilkan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
+apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ada kenalan yang ditambahkan lagi.
+DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kos mendarat Baucer Jumlah
+DocType: Time Log,Batched for Billing,Berkumpulan untuk Billing
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
+DocType: POS Profile,Write Off Account,Tulis Off Akaun
+apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Jumlah diskaun
+DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Invois Belian
+DocType: Item,Warranty Period (in days),Tempoh jaminan (dalam hari)
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,contohnya VAT
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Perkara 4
+DocType: Journal Entry Account,Journal Entry Account,Akaun Entry jurnal
+DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
+DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
+DocType: Sales Invoice Item,Delivered Qty,Dihantar Qty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Gudang {0}: Syarikat adalah wajib
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pergi ke kumpulan yang sesuai (biasanya Sumber Dana&gt; Liabiliti Semasa&gt; Cukai dan Tugas dan membuat Akaun baru (dengan mengklik Tambah Kanak-kanak) jenis &quot;Cukai&quot; dan melakukan menyebut kadar Cukai.
+,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Hilang Mata Wang Kadar Pertukaran untuk {0}
+DocType: Journal Entry,Stock Entry,Saham Entry
+DocType: Account,Payable,Kena dibayar
+DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Gross Profit %,Keuntungan kasar%
+DocType: Appraisal Goal,Weightage (%),Wajaran (%)
+DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
+DocType: Newsletter,Newsletter List,Senarai Newsletter
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,Semak jika anda ingin menghantar slip gaji mel kepada setiap pekerja semasa menyerahkan slip gaji
+DocType: Lead,Address Desc,Alamat Deskripsi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
+apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
+DocType: Stock Entry Detail,Source Warehouse,Sumber Gudang
+DocType: Installation Note,Installation Date,Tarikh pemasangan
+DocType: Employee,Confirmation Date,Pengesahan Tarikh
+DocType: C-Form,Total Invoiced Amount,Jumlah Invois
+DocType: Account,Sales User,Jualan Pengguna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Qty tidak boleh lebih besar daripada Max Qty
+DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
+DocType: Lead,Lead Owner,Lead Pemilik
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Gudang diperlukan
+DocType: Employee,Marital Status,Status Perkahwinan
+DocType: Stock Settings,Auto Material Request,Bahan Auto Permintaan
+DocType: Time Log,Will be updated when billed.,Akan dikemaskinikan apabila ditaksir.
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disediakan Kuantiti Batch di Dari Gudang
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
+DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Dihantar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Perkara {0}: qty Mengarahkan {1} tidak boleh kurang daripada perintah qty minimum {2} (ditakrifkan dalam Perkara).
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
+DocType: Territory,Territory Targets,Sasaran Wilayah
+DocType: Delivery Note,Transporter Info,Maklumat Transporter
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pesanan Pembelian Item Dibekalkan
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nama syarikat tidak boleh menjadi syarikat
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Ketua surat untuk template cetak.
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tajuk untuk template cetak seperti Proforma Invois.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
+DocType: POS Profile,Update Stock,Update Saham
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Sila tarik item daripada Nota Penghantaran
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Jurnal Penyertaan {0} adalah un berkaitan
+apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekod semua komunikasi e-mel jenis, telefon, chat, keindahan, dan lain-lain"
+apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Sila menyebut Round Off PTJ dalam Syarikat
+DocType: Purchase Invoice,Terms,Syarat
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Buat Baru
+DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
+,Item-wise Sales History,Perkara-bijak Sejarah Jualan
+DocType: Expense Claim,Total Sanctioned Amount,Jumlah Diiktiraf
+,Purchase Analytics,Analytics Pembelian
+DocType: Sales Invoice Item,Delivery Note Item,Penghantaran Nota Perkara
+DocType: Expense Claim,Task,Petugas
+DocType: Purchase Taxes and Charges,Reference Row #,Rujukan Row #
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ini adalah orang jualan akar dan tidak boleh diedit.
+,Stock Ledger,Saham Lejar
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Kadar: {0}
+DocType: Salary Slip Deduction,Salary Slip Deduction,Gaji Slip Potongan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Pilih nod kumpulan pertama.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Isi borang dan simpannya
+DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Muat turun laporan yang mengandungi semua bahan-bahan mentah dengan status inventori terbaru mereka
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Komuniti Forum
+DocType: Leave Application,Leave Balance Before Application,Tinggalkan Baki Sebelum Permohonan
+DocType: SMS Center,Send SMS,Hantar SMS
+DocType: Company,Default Letter Head,Surat Ketua Default
+DocType: Time Log,Billable,Dapat ditaksir
+DocType: Account,Rate at which this tax is applied,Kadar yang cukai ini dikenakan
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Pesanan semula Qty
+DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
+DocType: Journal Entry,Write Off,Tulis Off
+DocType: Time Log,Operation ID,ID Operasi
+DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem Pengguna (log masuk) ID. Jika ditetapkan, ia akan menjadi lalai untuk semua bentuk HR."
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
+DocType: Task,depends_on,depends_on
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Peluang Hilang
+DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Bidang diskaun boleh didapati dalam Pesanan Belian, Resit Pembelian, Invois Belian"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akaun baru. Nota: Sila jangan membuat akaun untuk Pelanggan dan Pembekal
+DocType: BOM Replace Tool,BOM Replace Tool,BOM Ganti Alat
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara lalai bijak Templat Alamat
+DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
+DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Jika anda terlibat dalam aktiviti pembuatan. Membolehkan Perkara &#39;dihasilkan&#39;
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Posting Invois Tarikh
+DocType: Sales Invoice,Rounded Total,Bulat Jumlah
+DocType: Product Bundle,List items that form the package.,Senarai item yang membentuk pakej.
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
+DocType: Serial No,Out of AMC,Daripada AMC
+DocType: Purchase Order Item,Material Request Detail No,Permintaan Detail Bahan Tidak
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
+DocType: Company,Default Cash Account,Akaun Tunai Default
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Amaun yang dibayar + Tulis Off Jumlah tidak boleh lebih besar daripada Jumlah Besar
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Jika bayaran tidak dibuat terhadap mana-mana rujukan, membuat Journal Kemasukan secara manual."
+DocType: Item,Supplier Items,Item Pembekal
+DocType: Opportunity,Opportunity Type,Jenis Peluang
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Syarikat Baru
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},Pusat Kos yang diperlukan untuk &#39;Untung Rugi akaun {0}
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Urusniaga hanya boleh dihapuskan oleh pencipta Syarikat
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Jumlah yang tidak betul Lejar Am Penyertaan dijumpai. Anda mungkin telah memilih Akaun salah dalam urus niaga.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Untuk membuat Akaun Bank
+DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
+,Stock Ageing,Saham Penuaan
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Hantar e-mel automatik ke Kenalan ke atas urus niaga Mengemukakan.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty tidak avalable dalam gudang {1} pada {2} {3}. Terdapat Kuantiti: {4}, Pemindahan Kuantiti: {5}"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Perkara 3
+DocType: Purchase Order,Customer Contact Email,Pelanggan Hubungi E-mel
+DocType: Sales Team,Contribution (%),Sumbangan (%)
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entry Bayaran tidak akan diwujudkan sejak &#39;Tunai atau Akaun Bank tidak dinyatakan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Tanggungjawab
+apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Template
+DocType: Sales Person,Sales Person Name,Orang Jualan Nama
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Sila masukkan atleast 1 invois dalam jadual di
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Tambah Pengguna
+DocType: Pricing Rule,Item Group,Perkara Kumpulan
+DocType: Task,Actual Start Date (via Time Logs),Tarikh Mula Sebenar (melalui Log Masa)
+DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
+DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
+DocType: Item,Default BOM,BOM Default
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Jumlah Cemerlang AMT
+DocType: Time Log Batch,Total Hours,Jumlah Jam
+DocType: Journal Entry,Printing Settings,Tetapan Percetakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotif
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Dari Penghantaran Nota
+DocType: Time Log,From Time,Dari Masa
+DocType: Notification Control,Custom Message,Custom Mesej
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Pelaburan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
+DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
+DocType: Purchase Invoice Item,Rate,Kadar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Pelatih
+DocType: Newsletter,A Lead with this email id should exist,Satu Broker dengan id e-mel ini perlu wujud
+DocType: Stock Entry,From BOM,Dari BOM
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Asas
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tarikh harus sama seperti Dari Tarikh untuk cuti Hari Separuh
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","contohnya Kg, Unit, No, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
+DocType: Salary Structure,Salary Structure,Struktur gaji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
+			conflict by assigning priority. Price Rules: {0}","Peraturan Harga Multiple wujud dengan kriteria yang sama, sila menyelesaikan \ konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
+DocType: Account,Bank,Bank
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Syarikat Penerbangan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Isu Bahan
+DocType: Material Request Item,For Warehouse,Untuk Gudang
+DocType: Employee,Offer Date,Tawaran Tarikh
+DocType: Hub Settings,Access Token,Token Akses
+DocType: Sales Invoice Item,Serial No,No siri
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
+DocType: Item,Is Fixed Asset Item,Adalah tetap Aset Perkara
+DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
+DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Jika anda mempunyai format cetakan lama, ciri ini boleh digunakan untuk berpecah halaman untuk dicetak pada beberapa halaman dengan semua pengepala dan pengaki pada setiap halaman"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Semua Wilayah
+DocType: Purchase Invoice,Items,Item
+DocType: Fiscal Year,Year Name,Nama Tahun
+DocType: Process Payroll,Process Payroll,Proses Gaji
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
+DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Item
+DocType: Sales Partner,Sales Partner Name,Nama Rakan Jualan
+DocType: Purchase Invoice Item,Image View,Lihat imej
+DocType: Issue,Opening Time,Masa Pembukaan
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Dari dan kepada tarikh yang dikehendaki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Sekuriti &amp; Bursa Komoditi
+DocType: Shipping Rule,Calculate Based On,Kira Based On
+DocType: Delivery Note Item,From Warehouse,Dari Gudang
+DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
+DocType: Tax Rule,Shipping City,Penghantaran Bandar
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Perkara ini adalah Varian {0} (Template). Sifat-sifat akan disalin lebih dari template kecuali &#39;Tiada Salinan&#39; ditetapkan
+DocType: Account,Purchase User,Pembelian Pengguna
+DocType: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
+DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
+DocType: Journal Entry,Print Heading,Cetak Kepala
+DocType: Quotation,Maintenance Manager,Pengurus Penyelenggaraan
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh sifar
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;Hari Sejak Pesanan Terakhir&#39; mesti lebih besar daripada atau sama dengan sifar
+DocType: C-Form,Amended From,Pindaan Dari
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Bahan mentah
+DocType: Leave Application,Follow via Email,Ikut melalui E-mel
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Akaun kanak-kanak wujud untuk akaun ini. Anda tidak boleh memadam akaun ini.
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Sama ada qty sasaran atau jumlah sasaran adalah wajib
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
+apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
+DocType: Leave Control Panel,Carry Forward,Carry Forward
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar
+DocType: Department,Days for which Holidays are blocked for this department.,Hari yang mana Holidays disekat untuk jabatan ini.
+,Produced,Dihasilkan
+DocType: Item,Item Code for Suppliers,Kod Item untuk Pembekal
+DocType: Issue,Raised By (Email),Dibangkitkan Oleh (E-mel)
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Ketua
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Lampirkan Kepala Surat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Senarai kepala cukai anda (contohnya VAT, Kastam dan lain-lain, mereka harus mempunyai nama-nama yang unik) dan kadar standard mereka. Ini akan mewujudkan templat standard, yang anda boleh menyunting dan menambah lebih kemudian."
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial No Diperlukan untuk Perkara bersiri {0}
+DocType: Journal Entry,Bank Entry,Bank Entry
+DocType: Authorization Rule,Applicable To (Designation),Terpakai Untuk (Jawatan)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
+apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Membolehkan / melumpuhkan mata wang.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Perbelanjaan pos
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumlah (AMT)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
+DocType: Purchase Order,The date on which recurring order will be stop,Tarikh perintah berulang akan berhenti
+DocType: Quality Inspection,Item Serial No,Item No Serial
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} mesti dikurangkan dengan {1} atau anda perlu meningkatkan toleransi limpahan
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Jumlah Hadir
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Jam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Perkara bersiri {0} tidak boleh dikemaskini \ menggunakan Saham Penyesuaian
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Pemindahan Bahan kepada Pembekal
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
+DocType: Lead,Lead Type,Jenis Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Buat Sebut Harga
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Semua barang-barang ini telah diinvois
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Boleh diluluskan oleh {0}
+DocType: Shipping Rule,Shipping Rule Conditions,Penghantaran Peraturan Syarat
+DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru selepas penggantian
+DocType: Features Setup,Point of Sale,Tempat Jualan
+DocType: Account,Tax,Cukai
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} bukan sah {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Dari Fail Produk
+DocType: Production Planning Tool,Production Planning Tool,Pengeluaran Alat Perancangan
+DocType: Quality Inspection,Report Date,Laporan Tarikh
+DocType: C-Form,Invoices,Invois
+DocType: Job Opening,Job Title,Tajuk Kerja
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} - {3}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Penerima
+DocType: Features Setup,Item Groups in Details,Kumpulan item dalam Butiran
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Mula Point-of-Sale (POS)
+apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
+DocType: Stock Entry,Update Rate and Availability,Kadar Update dan Ketersediaan
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Peratus anda dibenarkan untuk menerima atau menyampaikan lebih daripada kuantiti yang ditempah. Sebagai contoh: Jika anda telah menempah 100 unit. dan Elaun anda adalah 10% maka anda dibenarkan untuk menerima 110 unit.
+DocType: Pricing Rule,Customer Group,Kumpulan pelanggan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
+DocType: Item,Website Description,Laman Web Penerangan
+DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
+,Sales Register,Jualan Daftar
+DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
+DocType: Address,Plant,Loji
+apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
+DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
+DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
+DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
+DocType: Item,Attributes,Sifat-sifat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Lepas Tarikh Perintah
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Buat Eksais Invois
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
+DocType: C-Form,C-Form,C-Borang
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID Operasi tidak ditetapkan
+DocType: Production Order,Planned Start Date,Dirancang Tarikh Mula
+DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Lawatan Selenggaraan
+DocType: Leave Type,Is Encash,Adalah menunaikan
+DocType: Purchase Invoice,Mobile No,Tidak Bergerak
+DocType: Payment Tool,Make Journal Entry,Buat Journal Entry
+DocType: Leave Allocation,New Leaves Allocated,Daun baru Diperuntukkan
+apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
+DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
+DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Perdagangan
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
+DocType: Cost Center,Distribution Id,Id pengedaran
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Perkhidmatan Awesome
+apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Semua Produk atau Perkhidmatan.
+DocType: Purchase Invoice,Supplier Address,Alamat Pembekal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Keluar Qty
+apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
+apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Nilai untuk Atribut {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3}
+DocType: Tax Rule,Sales,Jualan
+DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+DocType: Leave Allocation,Unused leaves,Daun yang tidak digunakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
+DocType: Customer,Default Receivable Accounts,Default Akaun Belum Terima
+DocType: Tax Rule,Billing State,Negeri Bil
+DocType: Item Reorder,Transfer,Pemindahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
+apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Tarikh Akhir adalah wajib
+apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
+DocType: Journal Entry,Pay To / Recd From,Bayar Untuk / Recd Dari
+DocType: Naming Series,Setup Series,Persediaan Siri
+DocType: Supplier,Contact HTML,Hubungi HTML
+DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
+DocType: Payment Reconciliation,Maximum Amount,Jumlah Maksimum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
+DocType: Quality Inspection,Delivery Note No,Penghantaran Nota Tiada
+DocType: Company,Retail,Runcit
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Pelanggan {0} tidak wujud
+DocType: Attendance,Absent,Tidak hadir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Cukai dan Caj Template
+DocType: Upload Attendance,Download Template,Muat turun Template
+DocType: GL Entry,Remarks,Catatan
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
+DocType: Journal Entry,Write Off Based On,Tulis Off Based On
+DocType: Features Setup,POS View,POS Lihat
+apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sila nyatakan
+DocType: Offer Letter,Awaiting Response,Menunggu Response
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Di atas
+DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Akaun {0} tidak boleh menjadi Kumpulan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
+DocType: Holiday List,Weekly Off,Mingguan Off
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk contoh: 2012, 2012-13"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Sementara Untung / Rugi (Kredit)
+DocType: Sales Invoice,Return Against Sales Invoice,Kembali Terhadap Jualan Invois
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Perkara 5
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Sila menetapkan nilai lalai {0} dalam Syarikat {1}
+DocType: Serial No,Creation Time,Penciptaan Masa
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Jumlah Pendapatan
+DocType: Sales Invoice,Product Bundle Help,Produk Bantuan Bundle
+,Monthly Attendance Sheet,Lembaran Kehadiran Bulanan
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rekod tidak dijumpai
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Akaun {0} tidak aktif
+DocType: GL Entry,Is Advance,Adalah Advance
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Kehadiran Dari Tarikh dan Kehadiran Untuk Tarikh adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Sila masukkan &#39;Apakah Subkontrak&#39; seperti Ya atau Tidak
+DocType: Sales Team,Contact No.,Hubungi No.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Untung dan Rugi' akaun jenis {0} tidak dibenarkan dalam Kemasukan Permulaan
+DocType: Features Setup,Sales Discounts,Jualan Diskaun
+DocType: Hub Settings,Seller Country,Penjual Negara
+DocType: Authorization Rule,Authorization Rule,Peraturan kebenaran
+DocType: Sales Invoice,Terms and Conditions Details,Terma dan Syarat Butiran
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Jualan Cukai dan Caj Template
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian &amp; Aksesori
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Bilangan Pesanan
+DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bahagian atas senarai produk.
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Menentukan syarat-syarat untuk mengira jumlah penghantaran
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Tambah Anak
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Peranan Dibenarkan untuk Set Akaun Frozen &amp; Frozen Edit Entri
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Tidak boleh menukar PTJ ke lejar kerana ia mempunyai nod anak
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Suruhanjaya Jualan
+DocType: Offer Letter Term,Value / Description,Nilai / Penerangan
+DocType: Tax Rule,Billing Country,Bil Negara
+,Customers Not Buying Since Long Time,Pelanggan Tidak Membeli Sejak Long Time
+DocType: Production Order,Expected Delivery Date,Jangkaan Tarikh Penghantaran
+apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Perbelanjaan hiburan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Jualan Invois {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Umur
+DocType: Time Log,Billing Amount,Bil Jumlah
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantiti yang ditentukan tidak sah untuk item {0}. Kuantiti perlu lebih besar daripada 0.
+apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Permohonan untuk kebenaran.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Perbelanjaan Undang-undang
+DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Hari dalam bulan perintah automatik akan dijana contohnya 05, 28 dan lain-lain"
+DocType: Sales Invoice,Posting Time,Penempatan Masa
+DocType: Sales Order,% Amount Billed,% Jumlah Dibilkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Perbelanjaan Telefon
+DocType: Sales Partner,Logo,Logo
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Semak ini jika anda mahu untuk memaksa pengguna untuk memilih siri sebelum menyimpan. Tidak akan ada lalai jika anda mendaftar ini.
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},No Perkara dengan Tiada Serial {0}
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Pemberitahuan Terbuka
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Perbelanjaan langsung
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Hasil Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Perbelanjaan Perjalanan
+DocType: Maintenance Visit,Breakdown,Pecahan
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
+DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Seperti pada Tarikh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Percubaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Gudang lalai adalah wajib bagi saham Perkara.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pembayaran gaji untuk bulan {0} dan tahun {1}
+DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
+,Transferred Qty,Dipindahkan Qty
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Melayari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Perancangan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Buat Masa Log Batch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Isu
+DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Kami menjual Perkara ini
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id Pembekal
+DocType: Journal Entry,Cash Entry,Entry Tunai
+DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
+apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
+DocType: Email Digest,Send regular summary reports via Email.,Hantar laporan ringkasan tetap melalui E-mel.
+DocType: Brand,Item Manager,Perkara Pengurus
+DocType: Cost Center,Add rows to set annual budgets on Accounts.,Tambah baris untuk menetapkan belanjawan tahunan pada Akaun.
+DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
+DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
+apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Semua Kenalan.
+DocType: Newsletter,Test Email Id,Id Ujian E-mel
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Singkatan Syarikat
+DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Jika anda mengikuti Pemeriksaan Kualiti. Membolehkan Perkara QA Diperlukan dan QA Tidak dalam Resit Pembelian
+DocType: GL Entry,Party Type,Jenis Parti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Bahan mentah tidak boleh sama dengan Perkara utama
+DocType: Item Attribute Value,Abbreviation,Singkatan
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
+apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Master template gaji.
+DocType: Leave Type,Max Days Leave Allowed,Max Hari Cuti dibenarkan
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Menetapkan Peraturan Cukai untuk troli membeli-belah
+DocType: Payment Tool,Set Matching Amounts,Tetapkan Jumlah Matching
+DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
+,Sales Funnel,Saluran Jualan
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbreviation is mandatory,Singkatan adalah wajib
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Dalam Troli
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Terima kasih kerana berminat dengan melanggan kemas kini kami
+,Qty to Transfer,Qty untuk Pemindahan
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
+DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
+,Territory Target Variance Item Group-Wise,Wilayah Sasaran Varian Perkara Kumpulan Bijaksana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template cukai adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
+DocType: Account,Temporary,Sementara
+DocType: Address,Preferred Billing Address,Alamat Bil pilihan
+DocType: Monthly Distribution Percentage,Percentage Allocation,Peratus Peruntukan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Setiausaha
+DocType: Serial No,Distinct unit of an Item,Unit yang berbeza Perkara yang
+DocType: Pricing Rule,Buying,Membeli
+DocType: HR Settings,Employee Records to be created by,Rekod Pekerja akan diwujudkan oleh
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Ini batch Masa Log telah dibatalkan.
+,Reqd By Date,Reqd Tarikh
+DocType: Salary Slip Earning,Salary Slip Earning,Gaji Slip Pendapatan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Pemiutang
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Tiada Serial adalah wajib
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Perkara Bijaksana Cukai Detail
+,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
+DocType: Purchase Order Item,Supplier Quotation,Sebutharga Pembekal
+DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} telah dihentikan
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+DocType: Lead,Add to calendar on this date,Tambah ke kalendar pada tarikh ini
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Acara akan datang
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan dikehendaki
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Kemasukan Pantas
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Pulangan
+DocType: Purchase Order,To Receive,Untuk Menerima
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
+DocType: Email Digest,Income / Expense,Pendapatan / Perbelanjaan
+DocType: Employee,Personal Email,E-mel peribadi
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Jumlah Varian
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan menghantar entri perakaunan untuk inventori secara automatik."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+DocType: Address,Postal Code,Poskod
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",dalam minit dikemaskini melalui &#39;Time Log&#39;
+DocType: Customer,From Lead,Dari Lead
+apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
+apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Pilih Tahun Anggaran ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+DocType: Hub Settings,Name Token,Nama Token
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Jualan Standard
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast satu gudang adalah wajib
+DocType: Serial No,Out of Warranty,Daripada Waranti
+DocType: BOM Replace Tool,Replace,Ganti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Sila masukkan Unit keingkaran Langkah
+DocType: Purchase Invoice Item,Project Name,Nama Projek
+DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
+DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
+DocType: Features Setup,Item Batch Nos,Perkara Batch No.
+DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
+apps/erpnext/erpnext/config/learn.py +204,Human Resource,Sumber Manusia
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Penyesuaian Pembayaran Pembayaran
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset Cukai
+DocType: BOM Item,BOM No,BOM Tiada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
+DocType: Item,Moving Average,Purata bergerak
+DocType: BOM Replace Tool,The BOM which will be replaced,The BOM yang akan digantikan
+DocType: Account,Debit,Debit
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Daun mesti diperuntukkan dalam gandaan 0.5
+DocType: Production Order,Operation Cost,Operasi Kos
+apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Memuat naik kehadiran dari fail csv
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,AMT Cemerlang
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sasaran yang ditetapkan Perkara Kumpulan-bijak untuk Orang Jualan ini.
+DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Untuk memberi isu ini, menggunakan &quot;Berikan&quot; butang di bar sisi."
+DocType: Stock Settings,Freeze Stocks Older Than [Days],Stok Freeze Lama Than [Hari]
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
+apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun fiskal: {0} tidak wujud
+DocType: Currency Exchange,To Currency,Untuk Mata Wang
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Membenarkan pengguna berikut untuk meluluskan Permohonan Cuti untuk hari blok.
+apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Jenis-jenis Tuntutan Perbelanjaan.
+DocType: Item,Taxes,Cukai
+DocType: Project,Default Cost Center,Kos Pusat Default
+DocType: Purchase Invoice,End Date,Tarikh akhir
+DocType: Employee,Internal Work History,Sejarah Kerja Dalaman
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiti Persendirian
+DocType: Maintenance Visit,Customer Feedback,Maklum Balas Pelanggan
+DocType: Account,Expense,Perbelanjaan
+DocType: Sales Invoice,Exhibition,Pameran
+DocType: Item Attribute,From Range,Dari Range
+apps/erpnext/erpnext/stock/utils.py +89,Item {0} ignored since it is not a stock item,Perkara {0} diabaikan kerana ia bukan satu perkara saham
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +29,Submit this Production Order for further processing.,Hantar Pesanan Pengeluaran ini untuk proses seterusnya.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Tidak memohon Peraturan Harga dalam transaksi tertentu, semua Peraturan Harga berkenaan perlu dimatikan."
+DocType: Company,Domain,Domain
+,Sales Order Trends,Trend Pesanan Jualan
+DocType: Employee,Held On,Diadakan Pada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pengeluaran Item
+,Employee Information,Maklumat Kakitangan
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Kadar (%)
+DocType: Stock Entry Detail,Additional Cost,Kos tambahan
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Akhir Tahun Kewangan Tarikh
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Membuat Sebutharga Pembekal
+DocType: Quality Inspection,Incoming,Masuk
+DocType: BOM,Materials Required (Exploded),Bahan yang diperlukan (Meletup)
+DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Mengurangkan Pendapatan untuk Cuti Tanpa Gaji (LWP)
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Tambah pengguna kepada organisasi anda, selain daripada diri sendiri"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Cuti kasual
+DocType: Batch,Batch ID,ID Batch
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota: {0}
+,Delivery Note Trends,Trend Penghantaran Nota
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Ringkasan Minggu Ini
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mesti benda  yang Dibeli atau Sub-Kontrak di baris {1}
+apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
+DocType: GL Entry,Party,Parti
+DocType: Sales Order,Delivery Date,Tarikh Penghantaran
+DocType: Opportunity,Opportunity Date,Peluang Tarikh
+DocType: Purchase Receipt,Return Against Purchase Receipt,Kembali Terhadap Resit Pembelian
+DocType: Purchase Order,To Bill,Rang Undang-Undang
+DocType: Material Request,% Ordered,% Mengarahkan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Purata. Kadar Membeli
+DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
+DocType: Employee,History In Company,Sejarah Dalam Syarikat
+apps/erpnext/erpnext/config/crm.py +151,Newsletters,Surat Berita
+DocType: Address,Shipping,Penghantaran
+DocType: Stock Ledger Entry,Stock Ledger Entry,Saham Lejar Entry
+DocType: Department,Leave Block List,Tinggalkan Sekat Senarai
+DocType: Customer,Tax ID,ID Cukai
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
+DocType: Accounts Settings,Accounts Settings,Tetapan Akaun-akaun
+DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Loji dan Jentera
+DocType: Sales Partner,Partner's Website,Laman Web Pasangan
+DocType: Opportunity,To Discuss,Bincang
+DocType: SMS Settings,SMS Settings,Tetapan SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Akaun sementara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Black
+DocType: BOM Explosion Item,BOM Explosion Item,Letupan BOM Perkara
+DocType: Account,Auditor,Audit
+DocType: Purchase Order,End date of current order's period,Tarikh akhir tempoh perintah semasa
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Membuat Surat Tawaran
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Pulangan
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unit keingkaran Langkah untuk Variant mesti sama dengan Template
+DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
+DocType: Pricing Rule,Disable,Melumpuhkan
+DocType: Project Task,Pending Review,Sementara menunggu Review
+DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Pelanggan
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Untuk Masa mesti lebih besar daripada Dari Masa
+DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akaun Ibu Bapa {1} tidak Bolong kepada syarikat {2}
+DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
+DocType: Account,Asset,Aset
+DocType: Project Task,Task ID,Petugas ID
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",contohnya &quot;MC&quot;
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak boleh wujud untuk Perkara {0} kerana mempunyai varian
+,Sales Person-wise Transaction Summary,Jualan Orang-bijak Transaksi Ringkasan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Gudang {0} tidak wujud
+apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Daftar Untuk ERPNext Hub
+DocType: Monthly Distribution,Monthly Distribution Percentages,Peratusan Taburan Bulanan
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% bahan-bahan yang dihantar untuk Nota Penghantaran ini
+DocType: Customer,Customer Details,Butiran Pelanggan
+DocType: Employee,Reports to,Laporan kepada
+DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
+DocType: Sales Invoice,Paid Amount,Jumlah yang dibayar
+,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
+DocType: Item Variant,Item Variant,Perkara Varian
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Pengurusan Kualiti
+DocType: Production Planning Tool,Filter based on customer,Filter berdasarkan pelanggan
+DocType: Payment Tool Detail,Against Voucher No,Terhadap Baucer Tiada
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
+DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
+DocType: Tax Rule,Purchase,Pembelian
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Baki Kuantiti
+DocType: Item Group,Parent Item Group,Ibu Bapa Item Kumpulan
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Pusat Kos
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Gudang.
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Kadar di mana pembekal mata wang ditukar kepada mata wang asas syarikat
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik pengaturan masa dengan barisan {1}
+DocType: Opportunity,Next Contact,Seterusnya Hubungi
+DocType: Employee,Employment Type,Jenis pekerjaan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aset Tetap
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Tempoh permohonan tidak boleh di dua rekod alocation
+DocType: Item Group,Default Expense Account,Akaun Perbelanjaan Default
+DocType: Employee,Notice (days),Notis (hari)
+DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
+DocType: Employee,Encashment Date,Penunaian Tarikh
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Terhadap Baucer Jenis mesti menjadi salah satu Pesanan Belian, Invois Belian atau Journal Entry"
+DocType: Account,Stock Adjustment,Pelarasan saham
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kos Aktiviti lalai wujud untuk Jenis Kegiatan - {0}
+DocType: Production Order,Planned Operating Cost,Dirancang Kos Operasi
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nama
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Dilampirkan {0} # {1}
+DocType: Job Applicant,Applicant Name,Nama pemohon
+DocType: Authorization Rule,Customer / Item Name,Pelanggan / Nama Item
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Kumpulan agregat Item ** ** kepada yang lain Item ** **. Ini berguna jika anda bundling Item ** ** tertentu ke dalam satu pakej dan anda mengekalkan saham daripada ** Item dibungkus ** dan tidak agregat ** Item **. Pakej ** ** Item akan mempunyai &quot;Adakah Saham Perkara&quot; sebagai &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; sebagai &quot;Ya&quot;. Untuk Contoh: Jika anda jual Komputer riba dan Ransel secara berasingan dan mempunyai harga istimewa jika pelanggan membeli kedua-duanya, maka Laptop + Backpack akan menjadi baru Perkara Bundle Produk. Nota: BOM = Bill of Materials"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No siri adalah wajib bagi Perkara {0}
+DocType: Item Variant Attribute,Attribute,Atribut
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Sila nyatakan dari / ke berkisar
+DocType: Serial No,Under AMC,Di bawah AMC
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Perkara kadar penilaian dikira semula memandangkan jumlah baucar kos mendarat
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Tetapan lalai untuk menjual transaksi.
+DocType: BOM Replace Tool,Current BOM,BOM semasa
+apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Tambah No Serial
+DocType: Production Order,Warehouses,Gudang
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Cetak dan pegun
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Node kumpulan
+DocType: Payment Reconciliation,Minimum Amount,Jumlah Minimum
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mendapat tempat Barangan
+DocType: Workstation,per hour,sejam
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akaun untuk gudang (Inventori Kekal) yang akan diwujudkan di bawah Akaun ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
+DocType: Company,Distribution,Pengagihan
+apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Amaun Dibayar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Pengurus Projek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
+DocType: Customer,Default Taxes and Charges,Cukai lalai dan Caj
+DocType: Account,Receivable,Belum Terima
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak dibenarkan untuk menukar pembekal sebagai Perintah Pembelian sudah wujud
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
+DocType: Sales Invoice,Supplier Reference,Rujukan Pembekal
+DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Jika disemak, BOM untuk item sub-pemasangan akan dipertimbangkan untuk mendapatkan bahan-bahan mentah. Jika tidak, semua item sub-pemasangan akan dianggap sebagai bahan mentah."
+DocType: Material Request,Material Issue,Isu Bahan
+DocType: Hub Settings,Seller Description,Penjual Penerangan
+DocType: Employee Education,Qualification,Kelayakan
+DocType: Item Price,Item Price,Perkara Harga
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun &amp; Detergen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
+DocType: Warehouse,Warehouse Name,Nama Gudang
+DocType: Naming Series,Select Transaction,Pilih Transaksi
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
+DocType: Journal Entry,Write Off Entry,Tulis Off Entry
+DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Sokongan
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Syarikat yang hilang dalam gudang {0}
+DocType: POS Profile,Terms and Conditions,Terma dan Syarat
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarikh perlu berada dalam Tahun Fiskal. Dengan mengandaikan Untuk Tarikh = {0}
+DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Di sini anda boleh mengekalkan ketinggian, berat badan, alahan, masalah kesihatan dan lain-lain"
+DocType: Leave Block List,Applies to Company,Terpakai kepada Syarikat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
+DocType: Purchase Invoice,In Words,Dalam Perkataan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +213,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
+DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Bahan Untuk Gudang
+DocType: Sales Order Item,For Production,Untuk Pengeluaran
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Sila masukkan perintah jualan dalam jadual di atas
+DocType: Project Task,View Task,Lihat Petugas
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Tahun kewangan anda bermula pada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Sila masukkan Pembelian Terimaan
+DocType: Sales Invoice,Get Advances Received,Mendapatkan Pendahuluan Diterima
+DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Persediaan pelayan masuk untuk id e-mel sokongan. (Contohnya support@example.com)
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Kekurangan Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+DocType: Salary Slip,Salary Slip,Slip Gaji
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menjana slip pembungkusan untuk pakej yang akan dihantar. Digunakan untuk memberitahu jumlah pakej, kandungan pakej dan berat."
+DocType: Sales Invoice Item,Sales Order Item,Pesanan Jualan Perkara
+DocType: Salary Slip,Payment Days,Hari Pembayaran
+DocType: BOM,Manage cost of operations,Menguruskan kos operasi
+DocType: Features Setup,Item Advanced,Perkara Advanced
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Apabila mana-mana urus niaga yang diperiksa adalah &quot;Dihantar&quot;, e-mel pop-up secara automatik dibuka untuk menghantar e-mel kepada yang berkaitan &quot;Hubungi&quot; dalam transaksi itu, dengan transaksi itu sebagai lampiran. Pengguna mungkin atau tidak menghantar e-mel."
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Tetapan Global
+DocType: Employee Education,Employee Education,Pendidikan Pekerja
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+DocType: Salary Slip,Net Pay,Gaji bersih
+DocType: Account,Account,Akaun
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,No siri {0} telah diterima
+,Requested Items To Be Transferred,Item yang diminta Akan Dipindahkan
+DocType: Purchase Invoice,Recurring Id,Id berulang
+DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
+DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Tidak sah {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Cuti Sakit
+DocType: Email Digest,Email Digest,E-mel Digest
+DocType: Delivery Note,Billing Address Name,Bil Nama Alamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kedai Jabatan
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistem Imbangan
+apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
+apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Simpan dokumen pertama.
+DocType: Account,Chargeable,Boleh dikenakan cukai
+DocType: Company,Change Abbreviation,Perubahan Singkatan
+DocType: Expense Claim Detail,Expense Date,Perbelanjaan Tarikh
+DocType: Item,Max Discount (%),Max Diskaun (%)
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Perintah lepas Jumlah
+DocType: Company,Warn,Beri amaran
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
+DocType: BOM,Manufacturing User,Pembuatan pengguna
+DocType: Purchase Order,Raw Materials Supplied,Bahan mentah yang dibekalkan
+DocType: Purchase Invoice,Recurring Print Format,Format Cetak berulang
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Pesanan Belian Tarikh
+DocType: Appraisal,Appraisal Template,Templat Penilaian
+DocType: Item Group,Item Classification,Item Klasifikasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Pengurus Pembangunan Perniagaan
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Penyelenggaraan Lawatan Tujuan
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Tempoh
+,General Ledger,Lejar Am
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Leads
+DocType: Item Attribute Value,Attribute Value,Atribut Nilai
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Id e-mel mestilah unik, telah wujud untuk {0}"
+,Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Sila pilih {0} pertama
+DocType: Features Setup,To get Item Group in details table,Untuk mendapatkan Item Kumpulan dalam jadual butiran
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
+DocType: Sales Invoice,Commission,Suruhanjaya
+DocType: Address Template,"<h4>Default Template</h4>
+<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
+<pre><code>{{ address_line1 }}&lt;br&gt;
+{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
+{{ city }}&lt;br&gt;
+{% if state %}{{ state }}&lt;br&gt;{% endif -%}
+{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
+{{ country }}&lt;br&gt;
+{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
+{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
+{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
+</code></pre>","<h4> Templat lalai </h4><p> Menggunakan <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja template</a> dan semua bidang Alamat (termasuk Custom Fields jika ada) boleh didapati </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
+DocType: Salary Slip Deduction,Default Amount,Jumlah Default
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Ringkasan ini Bulan ini
+DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
+DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
+,Project wise Stock Tracking,Projek Landasan Saham bijak
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
+DocType: Stock Entry Detail,Actual Qty (at source/target),Kuantiti sebenar (pada sumber / sasaran)
+DocType: Item Customer Detail,Ref Code,Ref Kod
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Rekod pekerja.
+DocType: HR Settings,Payroll Settings,Tetapan Gaji
+apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
+apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Meletakkan pesanan
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Akar tidak boleh mempunyai pusat kos ibu bapa
+apps/erpnext/erpnext/public/js/stock_analytics.js +59,Select Brand...,Pilih Jenama ...
+DocType: Sales Invoice,C-Form Applicable,C-Borang Berkaitan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+DocType: Supplier,Address and Contacts,Alamat dan Kenalan
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Penukaran
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Pastikan ia web 900px mesra (w) dengan 100px (h)
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
+DocType: Payment Tool,Get Outstanding Vouchers,Dapatkan Baucer Cemerlang
+DocType: Warranty Claim,Resolved By,Diselesaikan oleh
+DocType: Appraisal,Start Date,Tarikh Mula
+apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Memperuntukkan daun untuk suatu tempoh.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik di sini untuk mengesahkan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
+DocType: Purchase Invoice Item,Price List Rate,Senarai Harga Kadar
+DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Menunjukkan &quot;Pada Saham&quot; atau &quot;Tidak dalam Saham&quot; berdasarkan saham yang terdapat di gudang ini.
+apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Rang Undang-Undang Bahan (BOM)
+DocType: Item,Average time taken by the supplier to deliver,Purata masa yang diambil oleh pembekal untuk menyampaikan
+DocType: Time Log,Hours,Jam
+DocType: Project,Expected Start Date,Jangkaan Tarikh Mula
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Buang item jika caj tidak berkenaan dengan perkara yang
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Contohnya. smsgateway.com/api/send_sms.cgi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Menerima
+DocType: Maintenance Visit,Fully Completed,Siap Sepenuhnya
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Lengkap
+DocType: Employee,Educational Qualification,Kelayakan pendidikan
+DocType: Workstation,Operating Costs,Kos operasi
+DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} telah berjaya ditambah ke senarai surat berita kami.
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
+DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Laporan Utama
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
+DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Carta Pusat Kos
+,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Pesanan
+DocType: Price List,Price List Name,Senarai Harga Nama
+DocType: Time Log,For Manufacturing,Untuk Pembuatan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Jumlah
+DocType: BOM,Manufacturing,Pembuatan
+,Ordered Items To Be Delivered,Item mengarahkan Akan Dihantar
+DocType: Account,Income,Pendapatan
+DocType: Industry Type,Industry Type,Jenis industri
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Sesuatu telah berlaku!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tarikh Siap
+DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Syarikat mata wang)
+apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unit organisasi (jabatan) induk.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Sila masukkan nos bimbit sah
+DocType: Budget Detail,Budget Detail,Detail bajet
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Sila masukkan mesej sebelum menghantar
+apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Sila Kemaskini Tetapan SMS
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Masa Log {0} telah dibilkan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Pinjaman tidak bercagar
+DocType: Cost Center,Cost Center Name,Kos Nama Pusat
+DocType: Maintenance Schedule Detail,Scheduled Date,Tarikh yang dijadualkan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Jumlah dibayar AMT
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesej yang lebih besar daripada 160 aksara akan berpecah kepada berbilang mesej
+DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
+,Serial No Service Contract Expiry,Serial No Kontrak Perkhidmatan tamat
+DocType: Item,Unit of Measure Conversion,Unit Langkah Penukaran
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pekerja tidak boleh diubah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
+DocType: Naming Series,Help HTML,Bantuan HTML
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
+apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Peruntukan berlebihan {0} terlintas untuk Perkara {1}
+DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini kepunyaan.
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Pembekal anda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Satu lagi Struktur Gaji {0} aktif untuk pekerja {1}. Sila buat statusnya &#39;tidak aktif&#39; untuk meneruskan.
+DocType: Purchase Invoice,Contact,Hubungi
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Pemberian
+DocType: Features Setup,Exports,Eksport
+DocType: Lead,Converted,Ditukar
+DocType: Item,Has Serial No,Mempunyai No Siri
+DocType: Employee,Date of Issue,Tarikh Keluaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
+DocType: Issue,Content Type,Jenis kandungan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
+DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
+DocType: Payment Reconciliation,Get Unreconciled Entries,Dapatkan belum disatukan Penyertaan
+DocType: Cost Center,Budgets,Belanjawan
+DocType: Employee,Emergency Contact Details,Butiran Hubungi Kecemasan
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Apa yang ia buat?
+DocType: Delivery Note,To Warehouse,Untuk Gudang
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Akaun {0} telah memasuki lebih daripada sekali untuk tahun fiskal {1}
+,Average Commission Rate,Purata Kadar Suruhanjaya
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
+DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
+DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
+apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Kemas kini kos tambahan untuk mengira kos mendarat barangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID pengguna tidak ditetapkan untuk Pekerja {0}
+apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Dari Waranti Tuntutan
+DocType: Stock Entry,Default Source Warehouse,Default Sumber Gudang
+DocType: Item,Customer Code,Kod Pelanggan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Sejak hari Perintah lepas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
+DocType: Buying Settings,Naming Series,Menamakan Siri
+DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Adakah anda benar-benar mahu Submit semua Slip Gaji untuk bulan {0} dan tahun {1}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Pelanggan Import
+DocType: Target Detail,Target Qty,Sasaran Qty
+DocType: Attendance,Present,Hadir
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
+DocType: Notification Control,Sales Invoice Message,Mesej Invois Jualan
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Akaun {0} mestilah jenis Liabiliti / Ekuiti
+DocType: Authorization Rule,Based On,Berdasarkan
+DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Perkara {0} dilumpuhkan
+DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Tempoh Dari dan Musim Ke tarikh wajib untuk berulang {0}
+apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviti projek / tugasan.
+apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Menjana Gaji Slip
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
+DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Sila set {0}
+DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
+DocType: Employee,Health Details,Kesihatan Butiran
+DocType: Offer Letter,Offer Letter Terms,Tawaran Terma Surat
+DocType: Features Setup,To track any installation or commissioning related work after sales,Untuk mengesan mana-mana pepasangan atau pentauliahan kerja yang berkaitan selepas jualan
+DocType: Project,Estimated Costing,Anggaran Kos
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Entry Detail Journal Tiada
+DocType: Employee External Work History,Salary,Gaji
+DocType: Serial No,Delivery Document Type,Penghantaran Dokumen Jenis
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Hantar semua slip gaji bagi kriteria yang dipilih di atas
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} perkara-perkara telah diselaraskan
+DocType: Sales Order,Partly Delivered,Sebahagiannya Dihantar
+DocType: Sales Invoice,Existing Customer,Pelanggan sedia ada
+DocType: Email Digest,Receivables,Penghutang
+DocType: Customer,Additional information regarding the customer.,Maklumat tambahan mengenai pelanggan.
+DocType: Quality Inspection Reading,Reading 5,Membaca 5
+DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Masukkan id e-mel yang dipisahkan dengan tanda koma, pesanan akan dihantar secara automatik pada tarikh tertentu"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nama Kempen diperlukan
+DocType: Maintenance Visit,Maintenance Date,Tarikh Penyelenggaraan
+DocType: Purchase Receipt Item,Rejected Serial No,Tiada Serial Ditolak
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
+apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Baki
+DocType: Item,"Example: ABCD.#####
+If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### Jika siri ditetapkan dan No Serial tidak disebut dalam urus niaga, nombor siri maka automatik akan diwujudkan berdasarkan siri ini. Jika anda sentiasa mahu dengan jelas menyebut Serial No untuk item ini. kosongkan ini."
+DocType: Upload Attendance,Upload Attendance,Naik Kehadiran
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Jumlah
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM digantikan
+,Sales Analytics,Jualan Analytics
+DocType: Manufacturing Settings,Manufacturing Settings,Tetapan Pembuatan
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Menubuhkan E-mel
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,Sila masukkan mata wang lalai dalam Syarikat Induk
+DocType: Stock Entry Detail,Stock Entry Detail,Detail saham Entry
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,Peringatan Harian
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nama Akaun Baru
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kos Bahan mentah yang dibekalkan
+DocType: Selling Settings,Settings for Selling Module,Tetapan untuk Menjual Modul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Khidmat Pelanggan
+DocType: Item,Thumbnail,Thumbnail
+DocType: Item Customer Detail,Item Customer Detail,Item Pelanggan Detail
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Sahkan E-mel anda
+apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tawaran calon Kerja a.
+DocType: Notification Control,Prompt for Email on Submission of,Meminta untuk e-mel pada Penyerahan
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Jumlah daun diperuntukkan lebih daripada hari-hari dalam tempoh yang
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
+DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Tetapan lalai untuk transaksi perakaunan.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Jangkaan Tarikh tidak boleh sebelum Bahan Permintaan Tarikh
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Perkara {0} mestilah Item Jualan
+DocType: Naming Series,Update Series Number,Update Siri Nombor
+DocType: Account,Equity,Ekuiti
+DocType: Sales Order,Printing Details,Percetakan Butiran
+DocType: Task,Closing Date,Tarikh Tutup
+DocType: Sales Order Item,Produced Quantity,Dihasilkan Kuantiti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Jurutera
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Mencari Sub Dewan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
+DocType: Sales Partner,Partner Type,Rakan Jenis
+DocType: Purchase Taxes and Charges,Actual,Sebenar
+DocType: Authorization Rule,Customerwise Discount,Customerwise Diskaun
+DocType: Purchase Invoice,Against Expense Account,Terhadap Akaun Perbelanjaan
+DocType: Production Order,Production Order,Perintah Pengeluaran
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Pemasangan Nota {0} telah diserahkan
+DocType: Quotation Item,Against Docname,Terhadap Docname
+DocType: SMS Center,All Employee (Active),Semua Pekerja (Aktif)
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Lihat Sekarang
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Pilih tempoh apabila invois akan dijana secara automatik
+DocType: BOM,Raw Material Cost,Kos bahan mentah
+DocType: Item,Re-Order Level,Re-Order Level
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Sambilan
+DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
+DocType: Employee,Cheque,Cek
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Siri Dikemaskini
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Jenis Laporan adalah wajib
+DocType: Item,Serial Number Series,Nombor Siri Siri
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Runcit &amp; Borong
+DocType: Issue,First Responded On,Pertama Dijawab Pada
+DocType: Website Item Group,Cross Listing of Item in multiple groups,Penyenaraian rentas Item dalam pelbagai kumpulan
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pengguna Pertama: Anda
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tarikh Mula dan Tahun Anggaran Tarikh Tamat sudah ditetapkan dalam Tahun Anggaran {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Berjaya didamaikan
+DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
+apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Di mana item disimpan.
+DocType: Tax Rule,Validity,Kesahan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invois
+DocType: Attendance,Attendance,Kehadiran
+DocType: BOM,Materials,Bahan
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak disemak, senarai itu perlu ditambah kepada setiap Jabatan di mana ia perlu digunakan."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
+apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
+,Item Prices,Harga Item
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Pesanan Belian.
+DocType: Period Closing Voucher,Period Closing Voucher,Tempoh Baucer Tutup
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Senarai Harga induk.
+DocType: Task,Review Date,Tarikh Semakan
+DocType: Purchase Invoice,Advance Payments,Bayaran Pendahuluan
+DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Tiada kebenaran untuk menggunakan Alat Pembayaran
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Alamat-alamat E-mel Makluman' tidak dinyatakan untuk %s yang berulang
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Mata wang tidak boleh diubah selepas membuat masukan menggunakan beberapa mata wang lain
+DocType: Company,Round Off Account,Bundarkan Akaun
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Perbelanjaan pentadbiran
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
+DocType: Customer Group,Parent Customer Group,Ibu Bapa Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Perubahan
+DocType: Purchase Invoice,Contact Email,Hubungi E-mel
+DocType: Appraisal Goal,Score Earned,Skor Diperoleh
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",contohnya &quot;My Syarikat LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Tempoh notis
+DocType: Bank Reconciliation Detail,Voucher ID,ID baucar
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak boleh diedit.
+DocType: Packing Slip,Gross Weight UOM,Berat kasar UOM
+DocType: Email Digest,Receivables / Payables,Penghutang / Pemiutang
+DocType: Delivery Note Item,Against Sales Invoice,Terhadap Invois Jualan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Akaun Kredit
+DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Menunjukkan nilai-nilai sifar
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kuantiti item diperolehi selepas pembuatan / pembungkusan semula daripada kuantiti diberi bahan mentah
+DocType: Payment Reconciliation,Receivable / Payable Account,Belum Terima / Akaun Belum Bayar
+DocType: Delivery Note Item,Against Sales Order Item,Terhadap Sales Order Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+DocType: Item,Default Warehouse,Gudang Default
+DocType: Task,Actual End Date (via Time Logs),Tarikh Tamat Sebenar (melalui Log Masa)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Sila masukkan induk pusat kos
+DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Kategori cukai tidak boleh menjadi &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39; kerana semua perkara adalah perkara tanpa saham yang
+DocType: Issue,Support Team,Pasukan Sokongan
+DocType: Appraisal,Total Score (Out of 5),Jumlah Skor (Daripada 5)
+DocType: Batch,Batch,Batch
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Baki
+DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan)
+DocType: Journal Entry,Debit Note,Nota Debit
+DocType: Stock Entry,As per Stock UOM,Seperti Saham UOM
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Tidak tamat
+DocType: Journal Entry,Total Debit,Jumlah Debit
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,Barangan lalai Mendapat Warehouse
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Orang Jualan
+DocType: Sales Invoice,Cold Calling,Panggilan Dingin
+DocType: SMS Parameter,SMS Parameter,SMS Parameter
+DocType: Maintenance Schedule Item,Half Yearly,Setengah Tahunan
+DocType: Lead,Blog Subscriber,Blog Pelanggan
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Mewujudkan kaedah-kaedah untuk menyekat transaksi berdasarkan nilai-nilai.
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika disemak, Jumlah no. Hari Kerja termasuk cuti, dan ini akan mengurangkan nilai Gaji Setiap Hari"
+DocType: Purchase Invoice,Total Advance,Jumlah Advance
+apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Pemprosesan Payroll
+DocType: Opportunity Item,Basic Rate,Kadar asas
+DocType: GL Entry,Credit Amount,Jumlah Kredit
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ditetapkan sebagai Hilang
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Nota
+DocType: Customer,Credit Days Based On,Hari Kredit Berasaskan
+DocType: Tax Rule,Tax Rule,Peraturan Cukai
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mengekalkan Kadar Sama Sepanjang Kitaran Jualan
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Rancang log masa di luar Waktu Workstation Kerja.
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} telah diserahkan
+,Items To Be Requested,Item Akan Diminta
+DocType: Time Log,Billing Rate based on Activity Type (per hour),Kadar bil berdasarkan Jenis Aktiviti (sejam)
+DocType: Company,Company Info,Maklumat Syarikat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Syarikat E-mel ID tidak dijumpai, maka mel tidak dihantar"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
+DocType: Production Planning Tool,Filter based on item,Filter berdasarkan item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Akaun Debit
+DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
+DocType: Attendance,Employee Name,Nama Pekerja
+DocType: Sales Invoice,Rounded Total (Company Currency),Bulat Jumlah (Syarikat mata wang)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
+DocType: Purchase Common,Purchase Common,Pembelian Bersama
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
+DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Dari Peluang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Manfaat Pekerja
+DocType: Sales Invoice,Is POS,Adalah POS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
+DocType: Production Order,Manufactured Qty,Dikilangkan Qty
+DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
+apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak wujud
+apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Bil dinaikkan kepada Pelanggan.
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} pelanggan ditambah
+DocType: Maintenance Schedule,Schedule,Jadual
+DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Tentukan Bajet untuk PTJ ini. Untuk menetapkan tindakan bajet, lihat &quot;Senarai Syarikat&quot;"
+DocType: Account,Parent Account,Akaun Ibu Bapa
+DocType: Quality Inspection Reading,Reading 3,Membaca 3
+,Hub,Hub
+DocType: GL Entry,Voucher Type,Baucer Jenis
+apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+DocType: Expense Claim,Approved,Diluluskan
+DocType: Pricing Rule,Price,Harga
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Memilih &quot;Ya&quot; akan memberikan identiti yang unik untuk setiap entiti item ini yang boleh dilihat dalam Serial No induk.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
+DocType: Employee,Education,Pendidikan
+DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
+DocType: Employee,Current Address Is,Alamat semasa
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Pilihan. Set mata wang lalai syarikat, jika tidak dinyatakan."
+DocType: Address,Office,Pejabat
+apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Catatan jurnal perakaunan.
+DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Untuk membuat Akaun Cukai
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
+DocType: Account,Stock,Saham
+DocType: Employee,Current Address,Alamat Semasa
+DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah variasi yang lain item maka penerangan, gambar, harga, cukai dan lain-lain akan ditetapkan dari template melainkan jika dinyatakan secara jelas"
+DocType: Serial No,Purchase / Manufacture Details,Pembelian / Butiran Pembuatan
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventori
+DocType: Employee,Contract End Date,Kontrak Tarikh akhir
+DocType: Sales Order,Track this Sales Order against any Project,Jejaki Pesanan Jualan ini terhadap mana-mana Projek
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pesanan jualan Tarik (menunggu untuk menyampaikan) berdasarkan kriteria di atas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Dari Sebutharga Pembekal
+DocType: Deduction Type,Deduction Type,Potongan Jenis
+DocType: Attendance,Half Day,Hari separuh
+DocType: Pricing Rule,Min Qty,Min Qty
+DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Untuk mengesan barang-barang jualan dan dokumen pembelian dengan nos kelompok. &quot;Industri dipilih: Bahan kimia&quot;
+DocType: GL Entry,Transaction Date,Transaksi Tarikh
+DocType: Production Plan Item,Planned Qty,Dirancang Kuantiti
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Jumlah Cukai
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Untuk Kuantiti (Dikilangkan Qty) adalah wajib
+DocType: Stock Entry,Default Target Warehouse,Default Gudang Sasaran
+DocType: Purchase Invoice,Net Total (Company Currency),Jumlah bersih (Syarikat mata wang)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Jenis Parti dan Parti hanya terpakai terhadap / akaun Belum Bayar Belum Terima
+DocType: Notification Control,Purchase Receipt Message,Pembelian Resit Mesej
+DocType: Production Order,Actual Start Date,Tarikh Mula Sebenar
+DocType: Sales Order,% of materials delivered against this Sales Order,% bahan-bahan yang dihantar untuk Pesanan Jualan ini
+apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Pergerakan item rekod.
+DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Senarai Pelanggan
+DocType: Hub Settings,Hub Settings,Tetapan Hub
+DocType: Project,Gross Margin %,Margin kasar%
+DocType: BOM,With Operations,Dengan Operasi
+apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
+,Monthly Salary Register,Gaji Bulanan Daftar
+DocType: Warranty Claim,If different than customer address,Jika berbeza daripada alamat pelanggan
+DocType: BOM Operation,BOM Operation,BOM Operasi
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Pada Row Jumlah Sebelumnya
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Sila masukkan Pembayaran Jumlah dalam atleast satu baris
+DocType: POS Profile,POS Profile,POS Profil
+apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Jumlah Bayaran tidak boleh lebih besar daripada Jumlah Cemerlang
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Jumlah yang tidak dibayar
+apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Masa Log tidak dapat ditaksir
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Pembeli
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Gaji bersih tidak boleh negatif
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Sila masukkan Terhadap Baucar secara manual
+DocType: SMS Settings,Static Parameters,Parameter statik
+DocType: Purchase Order,Advance Paid,Advance Dibayar
+DocType: Item,Item Tax,Perkara Cukai
+DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Liabiliti Semasa
+apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Hantar SMS massa ke kenalan anda
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Cukai atau Caj
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kad Kredit
+DocType: BOM,Item to be manufactured or repacked,Perkara yang perlu dibuat atau dibungkus semula
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Tetapan lalai bagi urus niaga saham.
+DocType: Purchase Invoice,Next Date,Tarikh seterusnya
+DocType: Employee Education,Major/Optional Subjects,Subjek utama / Pilihan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Sila masukkan Cukai dan Caj
+DocType: Sales Invoice Item,Drop Ship,Drop Ship
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini anda boleh mengekalkan butiran keluarga seperti nama dan pekerjaan ibu bapa, suami atau isteri dan anak-anak"
+DocType: Hub Settings,Seller Name,Nama Penjual
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Cukai dan Caj Dipotong (Syarikat mata wang)
+DocType: Item Group,General Settings,Tetapan umum
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Dari Mata Wang dan Untuk mata wang tidak boleh sama
+DocType: Stock Entry,Repack,Membungkus semula
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda mesti Simpan bentuk sebelum meneruskan
+DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Lampirkan Logo
+DocType: Customer,Commission Rate,Kadar komisen
+apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Membuat Varian
+apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
+apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Troli kosong
+DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Akar tidak boleh diedit.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah unadusted
+DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
+DocType: Sales Order,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Modal Saham
+DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Sila pilih fail csv
+DocType: Purchase Order,To Receive and Bill,Terima dan Rang Undang-undang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Terma dan Syarat Template
+DocType: Serial No,Delivery Details,Penghantaran Details
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
+DocType: Item,Automatically create Material Request if quantity falls below this level,Mewujudkan Bahan Permintaan secara automatik jika kuantiti jatuh di bawah paras ini
+,Item-wise Purchase Register,Perkara-bijak Pembelian Daftar
+DocType: Batch,Expiry Date,Tarikh Luput
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Untuk menetapkan tahap pesanan semula, item perlu menjadi Perkara Pembelian atau Manufacturing Perkara"
+,Supplier Addresses and Contacts,Alamat Pembekal dan Kenalan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Sila pilih Kategori pertama
+apps/erpnext/erpnext/config/projects.py +18,Project master.,Induk projek.
+DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Separuh Hari)
+DocType: Supplier,Credit Days,Hari Kredit
+DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Rang Undang-Undang Bahan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {1}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Tarikh
+DocType: Employee,Reason for Leaving,Sebab Berhenti
+DocType: Expense Claim Detail,Sanctioned Amount,Jumlah dibenarkan
+DocType: GL Entry,Is Opening,Adalah Membuka
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Akaun {0} tidak wujud
+DocType: Account,Cash,Tunai
+DocType: Employee,Short biography for website and other publications.,Biografi ringkas untuk laman web dan penerbitan lain.

diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index fbd36f4..66ecdb6 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,လစာ Mode ကို
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","သင်ရာသီပေါ်အခြေခံပြီးခြေရာခံချင်လျှင်, လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။"
 DocType: Employee,Divorced,ကွာရှင်း
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,သတိပေးချက်: အတူတူပါပဲတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,ပြီးသား Sync လုပ်ထား items
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,ပါတီ Type ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Annealing
 DocType: Item,Customer Items,customer ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} တစ်ဦးလယ်ဂျာမဖွစျနိုငျ
 DocType: Item,Publish Item to hub.erpnext.com,hub.erpnext.com မှ Item ထုတ်ဝေ
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,ခွင့်ပြုချက် Leave
 DocType: Sales Partner,Dealer,အရောင်းကိုယ်စားလှယ်
 DocType: Employee,Rented,ငှားရမ်းထားသော
-DocType: About Us Settings,Website,website
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compact အပေါင်း sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ပစ္စည်းတောင်းဆိုမှုကနေ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,နောက်ထပ်ရလဒ်များမရှိပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ဥပဒေကြောင်းအရ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ဥပဒေကြောင်းအရ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},အမှန်တကယ် type ကိုအခွန်အတန်း {0} အတွက် Item နှုန်းကတွင်ထည့်သွင်းမရနိုင်ပါ
 DocType: C-Form,Customer,ဝယ်သူ
 DocType: Purchase Receipt Item,Required By,အားဖြင့်လိုအပ်သော
@@ -37,26 +34,25 @@
 DocType: Purchase Order,% Billed,% Bill
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ချိန်း Rate {1} {0} အဖြစ်အတူတူဖြစ်ရမည် ({2})
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
-DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ငွေကြေး, ကူးပြောင်းနှုန်းပို့ကုန်စုစုပေါင်းပို့ကုန်ခမ်းနားစုစုပေါင်းစသည်တို့ကို Delivery Note ကိုရရှိနိုင်ပါတယ်, POS စက်, စျေးနှုန်း, အရောင်းပြေစာ, အရောင်းအမိန့်စသည်တို့ကဲ့သို့သောအားလုံးသည်ပို့ကုန်နှင့်ဆက်စပ်သောလယ်ကွက်"
+DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.","ငွေကြေး, ကူးပြောင်းနှုန်းပို့ကုန်စုစုပေါင်းပို့ကုန်ခမ်းနားစုစုပေါင်းစသည်တို့ကို Delivery Note ကိုရရှိနိုင်ပါတယ်, POS စက်, စျေးနှုန်း, အရောင်းပြေစာ, အရောင်းအမိန့်စသည်တို့ကဲ့သို့သောအားလုံးသည်ပို့ကုန်နှင့်ဆက်စပ်သောလယ်ကွက်"
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ဦးခေါင်း (သို့မဟုတ်အုပ်စုများ) စာရင်းကိုင် Entries စေကြနှင့်ချိန်ခွင်ထိန်းသိမ်းထားသည့်ဆန့်ကျင်။
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +177,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,ချုပ်
 DocType: Pricing Rule,Apply On,တွင် Apply
 DocType: Item Price,Multiple Item prices.,အကွိမျမြားစှာ Item ဈေးနှုန်းများ။
 ,Purchase Order Items To Be Received,ရရှိထားသည့်ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: SMS Center,All Supplier Contact,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
 DocType: Quality Inspection Reading,Parameter,parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,ဒီ option ကိုသူတို့ရဲ့ code ကိုအသုံးအပေါ်အခြေခံပြီး 1. ဖောက်သည်ပညာရှိသောသူကို item code ကိုထိန်းသိမ်းရန်နှင့်သူတို့ကိုရှာဖွေစေ
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Show ကို Variant
-DocType: Sales Invoice Item,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,အရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),ချေးငွေများ (စိစစ်)
 DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},အသုံးပြုသူ {0} ပြီးသားန်ထမ်း {1} မှတာဝန်ပေးသည်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,အသစ် POS Profile ကိုလုပ်ပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 DocType: Purchase Invoice,Monthly,လစဉ်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,အီးမေးလ်လိပ်စာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ကာကွယ်မှု
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,အီးမေးလ်လိပ်စာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,row # {0}:
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,အကယ်စင်စစ်
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D ပုံနှိပ်ခြင်း
 DocType: Employee,Holiday List,အားလပ်ရက်များစာရင်း
 DocType: Time Log,Time Log,အချိန်အထဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,စာရင်းကိုင်
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,စာရင်းကိုင်
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Company,Phone No,Phone များမရှိပါ
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","ခြေရာခံချိန်, ငွေတောင်းခံရာတွင်အသုံးပြုနိုင် Tasks ကိုဆန့်ကျင်အသုံးပြုသူများဖျော်ဖြေလှုပ်ရှားမှုများ၏အထဲ။"
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},နယူး {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},နယူး {0}: # {1}
 ,Sales Partners Commission,အရောင်း Partners ကော်မရှင်
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,အတိုကောက်ကျော်ကို 5 ဇာတ်ကောင်ရှိသည်မဟုတ်နိုင်
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Value ကို {0} Item မူကွဲ \ အဖြစ် {1} ကနေဖယ်ရှားပစ်လို့မရနိုငျ Attribute ကိုဤ Attribute နှင့်အတူတည်ရှိ။
-DocType: Print Settings,Classic,Classic
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,ဒါကအမြစ်အကောင့်ကိုဖြစ်ပါတယ်နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: BOM,Operations,စစ်ဆင်ရေး
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} သည်လျှော့၏အခြေခံပေါ်မှာခွင့်ပြုချက်ထားနိုင်ဘူး
 DocType: Bin,Quantity Requested for Purchase,ဝယ်ယူခြင်းအဘို့အတောင်းဆိုထားသောပမာဏ
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာမအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာမအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,ကီလိုဂရမ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,ကီလိုဂရမ်
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
 DocType: Item Attribute,Increment,increment
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,တူညီသော Company ကိုတစ်ကြိမ်ထက်ပိုပြီးသို့ ဝင်. ဖြစ်ပါတယ်
 DocType: Employee,Married,အိမ်ထောင်သည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ဘို့ခွင့်မပြု
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ကုန်စုံ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ဘဏ်မှ Entry &#39;ပါစေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,အကောင့်အမျိုးအစားကိုဂိုဒေါင်လျှင်ဂိုဒေါင်မသင်မနေရ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","အမိန့်ထပ်တလဲလဲလျှင်စစ်ဆေး, ထပ်တလဲလဲရပ်တန့်သို့မဟုတ်သင့်လျော် End Date ကိုတင် uncheck"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ၏ကုန်ကျစရိတ်
-DocType: Blog Post,Guest,ဧည့်သည်
 DocType: Quality Inspection,Get Specification Details,Specification အသေးစိတ် Get
 DocType: Lead,Interested,စိတ်ဝင်စား
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,ပစ္စည်း၏ဘီလ်
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,ဖွင့်ပွဲ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,ဖွင့်ပွဲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} ကနေ {1} မှ
 DocType: Item,Copy From Item Group,Item အုပ်စု မှစ. မိတ္တူ
 DocType: Journal Entry,Opening Entry,Entry &#39;ဖွင့်လှစ်
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} မသင်မနေရ
 DocType: Stock Entry,Additional Costs,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုအုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Lead,Product Enquiry,ထုတ်ကုန်ပစ္စည်း Enquiry
-DocType: Standard Reply,Owner,ပိုင်ဆိုင်သူ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee Education,Under Graduate,ဘွဲ့လွန်အောက်မှာ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,အကောင့်၏ထုတ်ပြန်ကြေညာချက်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
 DocType: Expense Claim Detail,Claim Amount,ပြောဆိုချက်ကိုငွေပမာဏ
 DocType: Employee,Mr,ဦး
-DocType: Custom Script,Client,ဖောက်သည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
 DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumer
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumer
 DocType: Upload Attendance,Import Log,သွင်းကုန်အထဲ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ပေးပို့
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,နှစ်ပတ်လည်လစာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 DocType: Newsletter,Email Sent?,အီးမေးလ် Sent?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show ကိုအချိန် Logs
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,item {0} တစ်ဦးဝယ်ယူ Item ဖြစ်ရမည်
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,အရောင်းပြေစာ Submitted ပြီးနောက် updated လိမ့်မည်။
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ဖွောငျ့စေ
 DocType: BOM Replace Tool,New BOM,နယူး BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,ငွေတောင်းခံသည် batch အချိန် Logs ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity သွန်း
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,သတင်းလွှာပြီးသားကိုစလှေတျခဲ့
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
 DocType: Leave Application,Reason,အကွောငျးရငျး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,အသံလွှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,သတ်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ပထမဦးဆုံးအသုံးပြုသူဟာ System Manager က (သင်နောက်ပိုင်းမှာဒီပြောင်းလဲနိုင်သည်) ဖြစ်လာပါလိမ့်မယ်။
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,အသံလွှင့်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,သတ်ခြင်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ပထမဦးဆုံးအသုံးပြုသူဟာ System Manager က (သင်နောက်ပိုင်းမှာဒီပြောင်းလဲနိုင်သည်) ဖြစ်လာပါလိမ့်မယ်။
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
 DocType: Serial No,Maintenance Status,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,ပစ္စည်းများနှင့်စျေးနှုန်းများ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},နေ့စွဲကနေဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ မှစ. ယူဆ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,သင်စိစစ်ရေးအတွက်ဘယ်သူကိုများအတွက်န်ထမ်းကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Center က {0} ကုန်ကျကုမ္ပဏီ {1} ပိုင်ပါဘူး
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,စျေးနှုန်း List ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installation လုပ်တဲ့နေ့စွဲ Item {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Pricing Rule,Discount on Price List Rate (%),စျေးနှုန်း List ကို Rate (%) အပေါ်လျှော့စျေး
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,စတင်
-DocType: User,First Name,နာမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,full-မှိုသွန်း
 DocType: Offer Letter,Select Terms and Conditions,စည်းကမ်းသတ်မှတ်ချက်များကိုရွေးပါ
 DocType: Production Planning Tool,Sales Orders,အရောင်းအမိန့်
 DocType: Purchase Taxes and Charges,Valuation,အဘိုးထားခြင်း
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,ဘဏ်မှအကောင့်
 DocType: Leave Type,Allow Negative Balance,အပြုသဘောမဆောင်သော Balance Allow
 DocType: Selling Settings,Default Territory,default နယ်မြေတွေကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,ရုပ်မြင်သံကြား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ရုပ်မြင်သံကြား
 DocType: Production Order Operation,Updated via 'Time Log',&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
 DocType: Customer Group,Mention if non-standard receivable account applicable,Non-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,ဂိုဒေါင်လိုအပ်သည်သည်ခင် Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,တွင်ရရှိထားသည့်
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,ကုမ္ပဏီရိုက်ထည့်ပေးပါ
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
 DocType: Newsletter List,Total Subscribers,စုစုပေါင်း Subscribers
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ဆက်သွယ်ရန်အမည်
+,Contact Name,ဆက်သွယ်ရန်အမည်
 DocType: Production Plan Item,SO Pending Qty,SO Pend Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,အထက်တွင်ဖော်ပြခဲ့သောစံသတ်မှတ်ချက်များသည်လစာစလစ်ဖန်တီးပေးပါတယ်။
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,နှစ်ချက်အိမ်ရာ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Setup ကို&gt; Settings&gt; အမည်စီးရီးကနေတဆင့် {0} သည်စီးရီးအမည်သတ်မှတ် ကျေးဇူးပြု.
 DocType: Time Log,Will be updated when batched.,batched သည့်အခါ updated လိမ့်မည်။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် &#39;&#39; ကြိုတင်ထုတ် Is &#39;&#39; စစ်ဆေးပါ။
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
-DocType: Bulk Email,Message,message
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox ကို Access Key ကို
 DocType: Payment Tool,Reference No,ကိုးကားစရာမရှိပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,နှစ်ပတ်လည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
 DocType: Material Request Item,Min Order Qty,min မိန့် Qty
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,အားလုံးထပ်တလဲလဲကုန်ပို့လွှာ tracking များအတွက်ထူးခြားသော id ။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software ကို Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,ဝါယာကြိုးအမွှန်းတင်
 DocType: Employee,Relation,ဆှေမြိုး
 DocType: Shipping Rule,Worldwide Shipping,Worldwide မှသဘောင်္တင်ခ
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Customer များအနေဖြင့်အတည်ပြုပြောဆိုသည်အမိန့်။
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
 DocType: Maintenance Schedule,Generate Schedule,ဇယား Generate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,စရိတ်ဌာနမှူး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,တာဝန်ခံကအမျိုးအစားပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,နောက်ဆုံး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,max 5 ဇာတ်ကောင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Your Language ကိုရွေးပါ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,max 5 ဇာတ်ကောင်
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,စာရင်းထဲတွင်ပထမဦးဆုံးထွက်ခွာခွင့်ပြုချက်ကို default ထွက်ခွာခွင့်ပြုချက်အဖြစ်သတ်မှတ်ကြလိမ့်မည်
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်အချိန်သစ်လုံး၏ဖန်တီးမှုကိုဖြုတ်ပေးလိုက်။ စစ်ဆင်ရေးထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်ခြေရာခံထောက်လှမ်းလိမ့်မည်မဟုတ်
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,item {0} ဝန်ဆောင်မှု Item ဖြစ်ရမည်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-DocType: DocType,Administrator,အုပ်ချုပ်သူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,လေဆာတူးဖော်
-DocType: Stock UOM Replace Utility,New Stock UOM,နယူးစတော့အိတ် UOM
 DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး
 DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
-DocType: Communication,Closed,ပိတ်ထားသော
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။
 DocType: Lead,Industry,စက်မှုလုပ်ငန်း
 DocType: Employee,Job Profile,ယောဘ၏ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Newsletter,Newsletter,သတင်းလွှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,item updated ဖြစ်ပါတယ်
-DocType: Async Task,System Manager,system Manager က
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
 DocType: Sales Invoice Item,Delivery Note,Delivery မှတ်ချက်
-DocType: Dropbox Backup,Allow Dropbox Access,Dropbox ကို Access က Allow
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,ကုမ္ပဏီအီးမေးလ်
 DocType: GL Entry,Debit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက် debit ပမာဏ
 DocType: Shipping Rule,Valid for Countries,နိုင်ငံများအဘို့သက်တမ်းရှိ
-DocType: Workflow State,Refresh,အားဖြည့်
-DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ငွေကြေး, ကူးပြောင်းနှုန်းသွင်းကုန်စုစုပေါင်းသွင်းကုန်ခမ်းနားစုစုပေါင်းစသည်တို့ကိုဝယ်ယူခြင်းပြေစာရရှိနိုင်ပါတယ်, ပေးသွင်းစျေးနှုန်း, ဝယ်ယူခြင်းပြေစာစသည်တို့ကိုဝယ်ယူခြင်းအမိန့်တူအားလုံးသည်သွင်းကုန်နှင့်ဆက်စပ်သောလယ်ကွက်"
+DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ငွေကြေး, ကူးပြောင်းနှုန်းသွင်းကုန်စုစုပေါင်းသွင်းကုန်ခမ်းနားစုစုပေါင်းစသည်တို့ကိုဝယ်ယူခြင်းပြေစာရရှိနိုင်ပါတယ်, ပေးသွင်းစျေးနှုန်း, ဝယ်ယူခြင်းပြေစာစသည်တို့ကိုဝယ်ယူခြင်းအမိန့်တူအားလုံးသည်သွင်းကုန်နှင့်ဆက်စပ်သောလယ်ကွက်"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM, Delivery မှတ်ချက်, ဝယ်ယူခြင်းပြေစာ, ထုတ်လုပ်မှုအမိန့်, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, အရောင်းပြေစာ, အရောင်းအမိန့်, စတော့အိတ် Entry, Timesheet အတွက်ရရှိနိုင်"
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Item ကိုရွေးပါ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry &#39;ကိုသုံး"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ဝယ်ယူခြင်းပြေစာတင်သွင်းရမည်
-DocType: Stock UOM Replace Utility,Current Stock UOM,လက်ရှိစတော့အိတ် UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,သင့်အီးမေးလ်လိပ်စာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ရေဂျက်လေယာဉ်ဖြတ်တောက်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
 ,Finished Goods,လက်စသတ်ကုန်စည်
 DocType: Delivery Note,Instructions,ညွှန်ကြားချက်များ
 DocType: Quality Inspection,Inspected By,အားဖြင့်ကြည့်ရှုစစ်ဆေးသည်
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Customer နှင့်ပေးသွင်းသည် Accounts ကိုဖန်တီးမပါဘူးပေးပါ။ သူတို့ကဖောက်သည် / ပေးသွင်းရှင်များထံမှတိုက်ရိုက်နေသူများကဖန်တီးနေကြပါတယ်။
 DocType: Currency Exchange,Currency Exchange,ငွေကြေးလဲလှယ်မှု
 DocType: Purchase Invoice Item,Item Name,item အမည်
+DocType: Authorization Rule,Approving User  (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအသုံးပြုသူ
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,ခရက်ဒစ် Balance
 DocType: Employee,Widowed,မုဆိုးမ
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",စီမံကိန်း qty နှင့်နိမ့်ဆုံးအမိန့် qty အပေါ်အခြေခံပြီးအားလုံးသိုလှောင်ရုံစဉ်းစား &quot;စတော့အိတ်ထဲက&quot; သောမေတ္တာရပ်ခံခံရဖို့ items
@@ -378,22 +346,21 @@
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
 DocType: Workstation,Consumable Cost,စားသုံးသူများကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ဆေးဘက်ဆိုင်ရာ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,tube ပုတီး
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 DocType: Employee,Single,တခုတည်းသော
 DocType: Issue,Attachment,attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,ဘဏ္ဍာငွေအရအသုံး Group ကကုန်ကျစရိတ် Center ကမဘို့ရာခန့်မရနိုင်ပါ
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
 DocType: Purchase Invoice,Yearly,နှစ်အလိုက်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
 DocType: Journal Entry Account,Sales Order,အရောင်းအမိန့်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
 DocType: Purchase Order,Start date of current order's period,လက်ရှိအမိန့်ရဲ့ကာလ၏နေ့စွဲ Start
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},အရေအတွက်အတန်း {0} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},အရေအတွက်အတန်း {0} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,ကုမ္ပဏီအမည်ကိုပထမဦးဆုံးရိုက်ထည့်ပေးပါ
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,အုပ်စုဖြစ်ပါတယ်
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,FIFO အပေါ်အခြေခံပြီးအလိုအလြောကျ Set Serial အမှတ်
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ပေးသွင်းပြေစာနံပါတ်ထူးခြားသောစစ်ဆေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,အလျားလိုက်အပေါက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;&#39; အမှုအမှတ်နိုင်ရန် &#39;&#39; &#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; ထက်နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,non အကျိုးအမြတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,non အကျိုးအမြတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Started မဟုတ်
 DocType: Lead,Channel Partner,channel Partner
 DocType: Account,Old Parent,စာဟောငျးမိဘ
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,အားလပ်ရက်မာစတာ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,shell အတု ယူ. ပုံသှငျး
 DocType: Material Request Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
 DocType: BOM,Costing,ကုန်ကျ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","checked အကယ်. ထားပြီးပုံနှိပ် Rate / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,စုစုပေါင်း Qty
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Range ကိုမှ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
 DocType: Features Setup,Imports,သွင်းကုန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ကော် Bond
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Job Opening,Description of a Job Opening,တစ်ဦးယောဘဖွင့်ပွဲ၏ဖော်ပြချက်များ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,တက်ရောက်သူစံချိန်တင်။
 DocType: Bank Reconciliation,Journal Entries,ဂျာနယ် Entries
 DocType: Sales Order Item,Used for Production Plan,ထုတ်လုပ်ရေးစီမံကိန်းအတွက်အသုံးပြု
-DocType: System Settings,Loading...,Loading ...
-DocType: DocField,Password,Password ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,တွက် deposition မော်ဒယ်
 DocType: Manufacturing Settings,Time Between Operations (in mins),(မိနစ်အတွက်) Operations အကြားတွင်အချိန်
 DocType: Customer,Buyer of Goods and Services.,ကုန်စည်နှင့်ဝန်ဆောင်မှုများ၏ဝယ်သောသူ။
 DocType: Journal Entry,Accounts Payable,ပေးရန်ရှိသောစာရင်း
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Subscribers Add
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;တည်ရှိပါဘူး
 DocType: Pricing Rule,Valid Upto,သက်တမ်းရှိအထိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,တိုက်ရိုက်ဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 DocType: Payment Tool,Received Or Paid,ရရှိထားသည့်ဒါမှမဟုတ် Paid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Stock Entry,Difference Account,ခြားနားချက်အကောင့်
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
 DocType: Production Order,Additional Operating Cost,နောက်ထပ် Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,အလှကုန်
-DocType: DocField,Type,ပုံစံ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
-DocType: Communication,Subject,ဘာသာရပ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,အလှကုန်
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 ,Serial No Warranty Expiry,serial မရှိပါအာမခံသက်တမ်းကုန်ဆုံး
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,အချက်
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,နယူး UOM type ကိုလုံးအရေအတွက်၏ဖြစ်မဟုတ်ပါရမယ်
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,ပရိဘောဂနှင့်ကရိယာ
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,စျေးနှုန်းစာရင်းငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,item {0} Item ဝယ်ယူမဟုတ်
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} &#39;&#39; အမိန့်ကြော်ငြာစာ \ Email လိပ်စာ &#39;&#39; တစ်မမှန်ကန်တဲ့အီးမေးလ်လိပ်စာဖြစ်ပါသည်
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,စုစုပေါင်း Billing ဒီတစ်နှစ်တာ:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,စုစုပေါင်း Billing ဒီတစ်နှစ်တာ:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","ဒါကြောင့်စတော့ရှယ်ယာငွေပေးငွေယူမှာအသုံးပြုတဲ့အတိုင်း, {0} Serial No မဖျက်နိုင်ပါ"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),(Cr) ပိတ်ပစ်
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),(Cr) ပိတ်ပစ်
 DocType: Serial No,Warranty Period (Days),အာမခံကာလ (Days)
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 ,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Job Applicant,Thread HTML,thread က HTML
 DocType: Company,Ignore,ဂရုမပြု
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
 DocType: Pricing Rule,Valid From,မှစ. သက်တမ်းရှိ
 DocType: Sales Invoice,Total Commission,စုစုပေါင်းကော်မရှင်
 DocType: Pricing Rule,Sales Partner,အရောင်း Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းအတွက်ရာသီရှိပါကသင်လအတွင်းအနှံ့သင့်ရဲ့ဘတ်ဂျက်ဖြန့်ဝေကူညီပေးသည်။ , ဒီဖြန့်ဖြူးသုံးပြီးဘတ်ဂျက်ဖြန့်ဖြူးအတွက် ** ကုန်ကျစရိတ် Center မှာ ** ဒီ ** လစဉ်ဖြန့်ဖြူးတင်ထားရန် **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
-DocType: About Us Settings,Website Manager,website Manager က
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်
 DocType: Warranty Claim,Resolution,resolution
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},ကယ်နှုတ်တော်မူ၏: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,ငွေတောင်းခံနှင့်ပေးပို့ခြင်းနဲ့ Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,လွန်ခဲ့သော
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,အရောင်းသို့ပြန်သွားသည်
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,သင်ထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးရန်လိုသည့်အနေဖြင့်အရောင်းအမိန့်ကိုရွေးချယ်ပါ။
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,လစာအစိတ်အပိုင်းများ။
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,အလားအလာရှိသောဖောက်သည်၏ဒေတာဘေ့စ။
+DocType: Authorization Rule,Customer or Item,customer သို့မဟုတ် Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,customer ဒေတာဘေ့စ။
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (s) ကိုရာ၌ခန့်ထားပြီဖြစ်သောကြောင့်ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ သင်တစ်ဦးကွဲပြားခြားနားသောပုံမှန် UOM သုံးစွဲဖို့အသစ်တစ်ခုပစ္စည်းကိုဖန်တီးရန်လိုအပ်ပါလိမ့်မည်။
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
-DocType: Event,Wednesday,ဗုဒ္ဓဟူးနေ့
 DocType: Sales Invoice,Customer's Vendor,customer ရဲ့ vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,ထုတ်လုပ်မှုအမိန့်မသင်မနေရဖြစ်ပါသည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,အဆိုပြုချက်ကို Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,အဆိုပြုချက်ကို Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,နောက်ထပ်အရောင်းပုဂ္ဂိုလ် {0} တူညီသောန်ထမ်းက id နှင့်အတူတည်ရှိ
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},{4} {5} အတွက် {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် Item {0} သည် negative စတော့အိတ်အမှား ({6})
 DocType: Fiscal Year Company,Fiscal Year Company,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကုမ္ပဏီ
@@ -557,46 +514,37 @@
 DocType: Activity Type,Default Costing Rate,Default အနေနဲ့ကုန်ကျနှုန်း
 DocType: Maintenance Schedule,Maintenance Schedule,ပြုပြင်ထိန်းသိမ်းမှုဇယား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,dropbox အတွက် Python ရဲ့ module တစ်ခု install လုပ် ကျေးဇူးပြု.
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager က
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,ဝယ်ယူခြင်းပြေစာထဲကနေ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager က
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,ဝယ်ယူခြင်းပြေစာထဲကနေ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
 DocType: SMS Settings,Receiver Parameter,receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;&#39; တွင် အခြေခံ. &#39;နဲ့&#39; Group မှဖြင့် &#39;&#39; အတူတူမဖွစျနိုငျ
 DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ရန်
-apps/frappe/frappe/templates/base.html +145,Please enter email address,အီးမေးလ်လိပ်စာရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,အဆုံးပြွန်ဖွဲ့စည်း
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Group ကိုကူးပြောင်း
 DocType: Activity Cost,Activity Type,လုပ်ဆောင်ချက်ကအမျိုးအစား
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,ကယ်နှုတ်တော်မူ၏ငွေပမာဏ
 DocType: Customer,Fixed Days,Fixed Days
 DocType: Sales Invoice,Packing List,ကုန်ပစ္စည်းစာရင်း
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ပေးသွင်းမှပေးထားသောအမိန့်ဝယ်ယူအသုံးပြုပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,ပုံနှိပ်ထုတ်ဝေခြင်း
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ပေးသွင်းမှပေးထားသောအမိန့်ဝယ်ယူအသုံးပြုပါ။
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,ပုံနှိပ်ထုတ်ဝေခြင်း
 DocType: Activity Cost,Projects User,စီမံကိန်းများအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ကျွမ်းလောင်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ပြေစာအသေးစိတ် table ထဲမှာမတှေ့
 DocType: Company,Round Off Cost Center,ကုန်ကျစရိတ် Center ကပိတ် round
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Material Request,Material Transfer,ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),ဖွင့်ပွဲ (ဒေါက်တာ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Post Timestamp ကို {0} နောက်မှာဖြစ်ရပါမည်
-apps/frappe/frappe/config/setup.py +59,Settings,Settings ကို
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ကုန်ကျစရိတ်အခွန်နှင့်စွပ်စွဲချက်ဆင်းသက်
 DocType: Production Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,နောက်ထပ်
 DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Rename
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,ကွေး
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,အသုံးပြုသူ Allow
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
 DocType: Purchase Invoice,Quarterly,သုံးလတစ်ကြိမ်
 DocType: Selling Settings,Delivery Note Required,Delivery မှတ်ချက်လိုအပ်သော
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
 DocType: Account,Accounts,ငွေစာရင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ဖြောင့်မှေးကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,ရောင်းအားကို item ကိုခြေရာခံနှင့်၎င်းတို့၏အမှတ်စဉ် nos အပေါ်အခြေခံပြီးစာရွက်စာတမ်းများဝယ်ယူရန်။ ဤသည်ကိုလည်းထုတ်ကုန်၏အာမခံအသေးစိတ်အချက်အလက်များကိုခြေရာခံရန်အသုံးပြုနိုင်သည်။
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,ပယ်ချဂိုဒေါင် regected တဲ့ item ကိုဆန့်ကျင်မသင်မနေရ
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 DocType: Employee,Provide email id registered in company,ကုမ္ပဏီမှတ်ပုံတင်အီးမေးလ်က id ပေး
 DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,item မျိုးကွဲရှိပါတယ်။
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,item {0} မတွေ့ရှိ
 DocType: Bin,Stock Value,စတော့အိတ် Value တစ်ခု
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,သစ်ပင်ကို Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,အရေအတွက်နှင့်ဂိုဒေါင်
 DocType: Sales Invoice,Commission Rate (%),ကော်မရှင် Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","ဘောက်ချာ Type အရောင်းအမိန့်, အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်ဆန့်ကျင်"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ငွေလဲနှုန်းကိုရှာတွေ့ဖို့မအောင်မြင်ဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ကြိုဆိုပါတယ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card ကို Entry &#39;
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,ကုန်ပစ္စည်းများပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
-DocType: Communication,Open,ဖွင့်လှစ်
 DocType: Lead,Campaign Name,ကင်ပိန်းအမည်
 ,Reserved,Reserved
 DocType: Purchase Order,Supply Raw Materials,supply ကုန်ကြမ်း
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Mode of Payment Account,Default Account,default အကောင့်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
-DocType: Contact Us Settings,Address Title,လိပ်စာခေါင်းစဉ်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
 ,Sales Person Target Variance Item Group-Wise,အရောင်းပုဂ္ဂိုလ် Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-DocType: Dropbox Backup,Daily,နေ့စဉ်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Delivery Note,Customer's Purchase Order No,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Employee,Cell Number,cell အရေအတွက်
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
 DocType: Item Group,Website Specifications,website သတ်မှတ်ချက်များ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,နယူးအကောင့်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,စာရင်းကိုင် Entries အရွက်ဆုံမှတ်များဆန့်ကျင်စေနိုင်ပါတယ်။ အဖွဲ့တွေဆန့်ကျင် entries ခွင့်ပြုမထားပေ။
-DocType: ToDo,High,မြင့်သော
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
-DocType: User,Male,ယောကျာ်းလေး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
 DocType: Item Attribute Value,Item Attribute Value,item Attribute Value တစ်ခု
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,အရောင်းစည်းရုံးလှုံ့ဆော်မှုများ။
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -684,17 +624,16 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","အားလုံးအရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမှလျှောက်ထားနိုင်ပါသည်က Standard အခွန် Simple template ။ ဤသည်ကို template ** သင်ဒီမှာသတ်မှတ်အဆိုပါအခွန်နှုန်းထားကိုအလုံးစုံတို့အဘို့စံအခွန်နှုန်းကဖွစျလိမျ့မညျမှတ်ချက်အခွန်အကြီးအကဲများနှင့်လည်း &quot;သဘောင်္တင်ခ&quot; နဲ့တူအခြားစရိတ် / ဝင်ငွေအကြီးအကဲများ, &quot;အာမခံ&quot; စသည်တို့ကို &quot;ကိုင်တွယ်ခြင်း&quot; #### ၏စာရင်းဆံ့နိုင် items ** ။ ကွဲပြားခြားနားသောနှုန်းထားများရှိသည် ** ပစ္စည်းများ ** ရှိပါတယ် အကယ်. သူတို့ ** Item ခွန်အတွက်ကဆက်ပြောသည်ရမည် ** ဇယားသည် ** Item ** မာစတာအတွက်။ ဒါဟာ ** စုစုပေါင်း ** Net ပေါ်မှာဖြစ်နိုင် (ထိုအခြေခံပမာဏ၏ပေါင်းလဒ်သည်) -:-Columns 1. တွက်ချက် Type ၏ #### ဖော်ပြချက်။ - ** ယခင် Row တွင်စုစုပေါင်း / ငွေပမာဏ ** (တဖြည်းဖြည်းတိုးပွားလာအခွန်သို့မဟုတ်စွဲချက်တွေအတွက်) ။ သင်သည်ဤ option ကိုရွေးချယ်ပါလျှင်, အခွန်ယခင်အတန်း (အခွန် table ထဲမှာ) ပမာဏသို့မဟုတ်စုစုပေါင်းတစ်ရာခိုင်နှုန်းအဖြစ်လျှောက်ထားပါလိမ့်မည်။ - ** (ဖော်ပြခဲ့သောကဲ့သို့) ** အမှန်တကယ်။ 2. အကောင့်အကြီးအကဲ: အခွန် / အုပ် (ရေကြောင်းနှင့်တူ) အနေနဲ့ဝင်ငွေသည်သို့မဟုတ်ကကုန်ကျစရိတ် Center ကဆန့်ကျင်ဘွတ်ကင်ရန်လိုအပ်ပါသည် expense အကယ်. : ဤအခွန် 3 ကုန်ကျစရိတ် Center ကကြိုတင်ဘွတ်ကင်လိမ့်မည်ဟူသောလက်အောက်ရှိအကောင့်လယ်ဂျာ။ 4. Description: (ကုန်ပို့လွှာ / quote တွေအတွက်ပုံနှိပ်လိမ့်မည်ဟု) အခွန်၏ဖော်ပြချက်။ 5. Rate: အခွန်နှုန်းက။ 6. ငွေပမာဏ: အခွန်ပမာဏ။ 7. စုစုပေါင်း: ဤအချက်မှတဖြည်းဖြည်းတိုးပွားများပြားလာစုစုပေါင်း။ 8. Row Enter: &quot;ယခင် Row စုစုပေါင်း&quot; အပေါ်အခြေခံပြီး အကယ်. သင်သည်ဤတွက်ချက်မှုတစ်ခုအခြေစိုက်စခန်းအဖြစ်ယူကြလိမ့်မည်ဟူသောအတန်းအရေအတွက် (default အနေနဲ့ယခင်အတန်းသည်) ကို select လုပ်ပေးနိုင်ပါတယ်။ 9. အခြေခံပညာနှုန်းတွင်ထည့်သွင်းကဒီအခွန် Is ?: သင်သည်ဤစစ်ဆေးဆိုပါကဒီအခွန်ပစ္စည်းကိုစားပွဲအောက်တွင်ပြလိမ့်မည်မဟုတ်ပါဆိုလိုသည်, ဒါပေမယ့်သင့်ရဲ့အဓိကကို item table ထဲမှာအခြေခံနှုန်းတွင်ထည့်သွင်းရလိမ့်မည်။ သင်ဖောက်သည်တစ်ဦးပြားစျေးနှုန်း (အားလုံးအခွန်၏အားလုံးပါဝင်နိုင်) စျေးနှုန်းပေးချင်တယ်ဘယ်မှာဒါဟာအသုံးဝင်သည်။"
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","အားလုံးအရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမှလျှောက်ထားနိုင်ပါသည်က Standard အခွန် Simple template ။ ဤသည်ကို template ** သင်ဒီမှာသတ်မှတ်အဆိုပါအခွန်နှုန်းထားကိုအလုံးစုံတို့အဘို့စံအခွန်နှုန်းကဖွစျလိမျ့မညျမှတ်ချက်အခွန်အကြီးအကဲများနှင့်လည်း &quot;သဘောင်္တင်ခ&quot; နဲ့တူအခြားစရိတ် / ဝင်ငွေအကြီးအကဲများ, &quot;အာမခံ&quot; စသည်တို့ကို &quot;ကိုင်တွယ်ခြင်း&quot; #### ၏စာရင်းဆံ့နိုင် items ** ။ ကွဲပြားခြားနားသောနှုန်းထားများရှိသည် ** ပစ္စည်းများ ** ရှိပါတယ် အကယ်. သူတို့ ** Item ခွန်အတွက်ကဆက်ပြောသည်ရမည် ** ဇယားသည် ** Item ** မာစတာအတွက်။ ဒါဟာ ** စုစုပေါင်း ** Net ပေါ်မှာဖြစ်နိုင် (ထိုအခြေခံပမာဏ၏ပေါင်းလဒ်သည်) -:-Columns 1. တွက်ချက် Type ၏ #### ဖော်ပြချက်။ - ** ယခင် Row တွင်စုစုပေါင်း / ငွေပမာဏ ** (တဖြည်းဖြည်းတိုးပွားလာအခွန်သို့မဟုတ်စွဲချက်တွေအတွက်) ။ သင်သည်ဤ option ကိုရွေးချယ်ပါလျှင်, အခွန်ယခင်အတန်း (အခွန် table ထဲမှာ) ပမာဏသို့မဟုတ်စုစုပေါင်းတစ်ရာခိုင်နှုန်းအဖြစ်လျှောက်ထားပါလိမ့်မည်။ - ** (ဖော်ပြခဲ့သောကဲ့သို့) ** အမှန်တကယ်။ 2. အကောင့်အကြီးအကဲ: အခွန် / အုပ် (ရေကြောင်းနှင့်တူ) အနေနဲ့ဝင်ငွေသည်သို့မဟုတ်ကကုန်ကျစရိတ် Center ကဆန့်ကျင်ဘွတ်ကင်ရန်လိုအပ်ပါသည် expense အကယ်. : ဤအခွန် 3 ကုန်ကျစရိတ် Center ကကြိုတင်ဘွတ်ကင်လိမ့်မည်ဟူသောလက်အောက်ရှိအကောင့်လယ်ဂျာ။ 4. Description: (ကုန်ပို့လွှာ / quote တွေအတွက်ပုံနှိပ်လိမ့်မည်ဟု) အခွန်၏ဖော်ပြချက်။ 5. Rate: အခွန်နှုန်းက။ 6. ငွေပမာဏ: အခွန်ပမာဏ။ 7. စုစုပေါင်း: ဤအချက်မှတဖြည်းဖြည်းတိုးပွားများပြားလာစုစုပေါင်း။ 8. Row Enter: &quot;ယခင် Row စုစုပေါင်း&quot; အပေါ်အခြေခံပြီး အကယ်. သင်သည်ဤတွက်ချက်မှုတစ်ခုအခြေစိုက်စခန်းအဖြစ်ယူကြလိမ့်မည်ဟူသောအတန်းအရေအတွက် (default အနေနဲ့ယခင်အတန်းသည်) ကို select လုပ်ပေးနိုင်ပါတယ်။ 9. အခြေခံပညာနှုန်းတွင်ထည့်သွင်းကဒီအခွန် Is ?: သင်သည်ဤစစ်ဆေးဆိုပါကဒီအခွန်ပစ္စည်းကိုစားပွဲအောက်တွင်ပြလိမ့်မည်မဟုတ်ပါဆိုလိုသည်, ဒါပေမယ့်သင့်ရဲ့အဓိကကို item table ထဲမှာအခြေခံနှုန်းတွင်ထည့်သွင်းရလိမ့်မည်။ သင်ဖောက်သည်တစ်ဦးပြားစျေးနှုန်း (အားလုံးအခွန်၏အားလုံးပါဝင်နိုင်) စျေးနှုန်းပေးချင်တယ်ဘယ်မှာဒါဟာအသုံးဝင်သည်။"
 DocType: Employee,Bank A/C No.,ဘဏ်မှ A / C အမှတ်
 DocType: Expense Claim,Project,စီမံကိန်း
 DocType: Quality Inspection Reading,Reading 7,7 Reading
 DocType: Address,Personal,ပုဂ္ဂိုလ်ရေး
 DocType: Expense Claim Detail,Expense Claim Type,စရိတ်တောင်းဆိုမှုများ Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းသည် default setting များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဂျာနယ် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်နွယ်နေပါသည်ကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်အဖြစ်ဆွဲရပါမည်ဆိုပါက, စစ်ဆေးပါ။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,ဇီဝနည်းပညာ
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဂျာနယ် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်နွယ်နေပါသည်ကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်အဖြစ်ဆွဲရပါမည်ဆိုပါက, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,ဇီဝနည်းပညာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Liability,တာဝန်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Process Payroll,Send Email,အီးမေးလ်ပို့ပါ
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"ပစ္စည်းများကို {0} ကနေတဆင့်ကယ်နှုတ်တော်မူ၏မဟုတ်သောကြောင့်, &#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; checked မရနိုင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ငါ့အငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ငါ့အငွေတောင်းခံလွှာ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Purchase Order,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point သို့ရောင်းရငွေ၏&quot; features တွေ enable လုပ်ဖို့
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
-DocType: Comment,Reference Name,ကိုးကားစရာအမည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: Sales Invoice Item,Target Warehouse,Target ကဂိုဒေါင်
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုအရောင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Production Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,အမြဲတမ်းမှိုသွန်း
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 DocType: Sales Order Item,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
 DocType: Newsletter,Newsletter Manager,သတင်းလွှာ Manager က
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
 DocType: Expense Claim,Expenses,ကုန်ကျစရိတ်
 DocType: Item Variant Attribute,Item Variant Attribute,item Variant Attribute
 ,Purchase Receipt Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Appraisal,Select template from which you want to get the Goals,သင်ရည်မှန်းချက်များရရှိရန်လိုသည့်အနေဖြင့်တန်းပလိတ်ကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
 ,Amount to Bill,ဘီလ်မှငွေပမာဏကို
 DocType: Company,Registration Details,မှတ်ပုံတင်ခြင်းအသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ရှယ်ယာ
 DocType: Item,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},{0} မှပို့ပေးရန်စီစဉ်ထား
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},{0} ရှေ့ဆက်မဆောင်ရွက်နိုင်သ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
 DocType: Account,Balance must be,ချိန်ခွင်ဖြစ်ရမည်
 DocType: Hub Settings,Publish Pricing,စျေးနှုန်းများထုတ်ဝေ
 DocType: Notification Control,Expense Claim Rejected Message,စရိတ်တောင်းဆိုမှုများသတင်းစကားကိုငြင်းပယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,သံမှို
 ,Available Qty,ရရှိနိုင်သည့် Qty
 DocType: Purchase Taxes and Charges,On Previous Row Total,ယခင် Row စုစုပေါင်းတွင်
 DocType: Salary Slip,Working Days,အလုပ်လုပ် Days
 DocType: Serial No,Incoming Rate,incoming Rate
 DocType: Packing Slip,Gross Weight,စုစုပေါင်းအလေးချိန်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။
 DocType: HR Settings,Include holidays in Total no. of Working Days,အဘယ်သူမျှမစုစုပေါင်းအတွက်အားလပ်ရက်ပါဝင်သည်။ အလုပ်အဖွဲ့ Days ၏
 DocType: Job Applicant,Hold,ကိုင်
 DocType: Employee,Date of Joining,အတူနေ့စွဲ
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,view Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ပွန်းစားခြင်းပေါက်ကွဲမှု
 DocType: Employee,Ms,ဒေါ်
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
 DocType: Salary Slip,Leave Encashment Amount,Encashment ငွေပမာဏ Leave
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Purchase Receipt Item Supplied,Required Qty,မရှိမဖြစ်တဲ့ Qty
 DocType: Bank Reconciliation,Total Amount,စုစုပေါင်းတန်ဘိုး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
 DocType: Production Planning Tool,Production Orders,ထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ချိန်ခွင် Value တစ်ခု
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,အရောင်းစျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,ပစ္စည်းများကိုတစ်ပြိုင်တည်းချိန်ကိုက်ရန် Publish
-DocType: GL Entry,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
+DocType: Bank Reconciliation,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,ကုမ္ပဏီထဲမှာအကောင့်ပိတ် Round ကိုဖော်ပြရန် ကျေးဇူးပြု.
 DocType: Purchase Receipt,Range,အကွာအဝေး
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Features Setup,Item Barcode,item Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 DocType: Address,Shop,ကုန်ဆိုင်
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရွေးချယ်ထားသောအခါ default ဘဏ်မှ / ငွေအကောင့်ကိုအလိုအလျှောက် POS ပြေစာအတွက် updated လိမ့်မည်။
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,အဆိုပါအမှတ်တံဆိပ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,အဆိုပါအမှတ်တံဆိပ်
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{0} over- ခွင့် Item {1} သည်ကိုကူး။
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ဝယ်ယူခြင်းအမိန့် Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,သွယ်ဝိုက်ဝင်ငွေခွန်
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ငွေပေးချေမှုရမည့်ငွေပမာဏ set = ထူးချွန်ပမာဏ
-DocType: Contact Us Settings,Address Line 1,လိပ်စာစာကြောင်း 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ကှဲလှဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ကုမ္ပဏီအမည်
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ကှဲလှဲ
+,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,အားလုံးအကူအညီနဲ့ဗီဒီယိုစာရင်းကိုကြည့်ခြင်း
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,အသုံးပြုသူငွေကြေးလွှဲပြောင်းမှုမှာစျေးနှုန်း List ကို Rate တည်းဖြတ်ရန် Allow
 DocType: Pricing Rule,Max Qty,max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,ဓါတုဗေဒ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ဓါတုဗေဒ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 DocType: Process Payroll,Select Payroll Year and Month,လစာတစ်နှစ်တာနှင့်လကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",အမျိုးအစား) ကလေးသူငယ် Add ကိုနှိပ်ခြင်းအားဖြင့် (&quot;Bank က&quot; သင့်လျော်သောအုပ်စု (ရန်ပုံငွေကိုပုံမှန်အားဖြင့်လျှောက်လွှာ&gt; လက်ရှိပိုင်ဆိုင်မှုများ&gt; Bank မှ Accounts ကိုသွားပြီးသစ်တစ်ခုအကောင့်ဖန်တီး
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
-DocType: Comment,Unsubscribed,unsubscribe
 DocType: Opportunity,Walk In,ခုနှစ်တွင် Walk
 DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက်
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,finanial ကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferable
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,အဖြူ
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,လုပ်ပါ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,သင်၏ရုပ်ပုံ Attach
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,လုပ်ပါ
 DocType: Journal Entry,Total Amount in Words,စကားအတွက်စုစုပေါင်းပမာဏ
-DocType: Workflow State,Stop,ရပ်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ဆိုတဲ့ error ရှိခဲ့သည်။ တစျခုဖြစ်နိုင်သည်ဟုအကြောင်းပြချက်ကိုသင်ပုံစံကယ်တင်ခြင်းသို့မရောက်ကြပြီဖြစ်နိုင်ပါတယ်။ ပြဿနာရှိနေသေးလျှင် support@erpnext.com ကိုဆက်သွယ်ပါ။
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,အကြှနျုပျ၏လှည်း
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},အမိန့် Type {0} တယောက်ဖြစ်ရပါမည်
 DocType: Lead,Next Contact Date,Next ကိုဆက်သွယ်ရန်နေ့စွဲ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty ဖွင့်လှစ်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,စတော့အိတ် Options ကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,စတော့အိတ် Options ကို
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0} သည် Qty
 DocType: Leave Application,Leave Application,လျှောက်လွှာ Leave
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ဖြန့်ဝေ Tool ကို Leave
 DocType: Leave Block List,Leave Block List Dates,Block List ကိုနေ့ရက်များ Leave
 DocType: Company,If Monthly Budget Exceeded (for expense account),ဒီလအတွက်ဘဏ္ဍာငွေအရအသုံး (စရိတ်အကောင့်) ကိုကျော်လွန်လိုလျှင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,တစ်ခုကိုချုံ့ခြင်း
 DocType: Workstation,Net Hour Rate,Net ကအချိန်နာရီနှုန်း
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ကုန်ကျစရိတ်ဝယ်ယူ Receipt ဆင်းသက်
 DocType: Company,Default Terms,default သက်မှတ်ချက်များ
 DocType: Packing Slip Item,Packing Slip Item,ထုပ်ပိုး Item စလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: POS Profile,Cash/Bank Account,ငွေသား / ဘဏ်မှအကောင့်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,FILE
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,လြှော့ခွငျး
 DocType: Features Setup,Purchase Discounts,လျော့စျေးဝယ်ယူ
 DocType: Workstation,Wages,လုပ်ခလစာ
@@ -909,21 +838,22 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို &#39;နဲ့ Status&#39; နှင့် Save ကို Update ကျေးဇူးပြု.
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 DocType: Issue,Issue,ထုတ်ပြန်သည်
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,အကောင့်ကိုကုမ္ပဏီနှင့်ကိုက်ညီမပါဘူး
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ဂိုဒေါင်
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
 DocType: BOM Operation,Operation,စစ်ဆင်ရေး
 DocType: Lead,Organization Name,အစည်းအရုံးအမည်
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,အရောင်းအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,စံဝယ်ယူ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,စံဝယ်ယူ
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},အရောင်းအမိန့် {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
 DocType: Item,Default Supplier,default ပေးသွင်း
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ထုတ်လုပ်မှု Allow ရာခိုင်နှုန်းကျော်
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,အချိန် Logs ကနေတဆင့် updated
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ပျမ်းမျှအားဖြင့်ခေတ်
 DocType: Opportunity,Your sales person who will contact the customer in future,အနာဂတ်အတွက်ဖောက်သည်ဆက်သွယ်ပါလိမ့်မည်တော်မူသောသင်တို့ရောင်းအားလူတစ်ဦး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,သင့်ရဲ့ပေးသွင်းသူများ၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,သင့်ရဲ့ပေးသွင်းသူများ၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 DocType: Company,Default Currency,default ငွေကြေးစနစ်
 DocType: Contact,Enter designation of this Contact,ဒီဆက်သွယ်ရန်၏သတ်မှတ်ရေး Enter
-DocType: Contact Us Settings,Address,လိပ်စာ
 DocType: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
 DocType: Journal Entry,Make Difference Entry,Difference Entry &#39;ပါစေ
 DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက်
 DocType: Appraisal Template Goal,Key Performance Area,Key ကိုစွမ်းဆောင်ရည်ဧရိယာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,နှင့်တစ်နှစ်:
 DocType: Email Digest,Annual Expense,နှစ်ပတ်လည်သုံးစွဲမှု
 DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင်
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form တွင်ပြေစာ Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးပြေစာ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,contribution%
 DocType: Item,website page link,ဝက်ဘ်ဆိုက်စာမျက်နှာလင့်ခ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,၏ပထမဦးဆုံးအသုံးပြုရန် system ကိုပြင်ကြကုန်အံ့။
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,သင့်ရဲ့ကိုးကားနိုင်ရန်ကုမ္ပဏီမှတ်ပုံတင်နံပါတ်များ။ အခွန်နံပါတ်များစသည်တို့
 DocType: Sales Partner,Distributor,ဖြန့်ဖြူး
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,စျေးဝယ်တွန်းလှည်း Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 ,Ordered Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ထုတ်ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,အချိန် Logs ကိုရွေးပြီးအသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန် Submit ။
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,စီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,စီမံခန့်ခွဲမှု
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,အချိန် Sheet များသည်လှုပ်ရှားမှုများအမျိုးအစားများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,ရင်းနှီးမြှုပ်နှံမှုသွန်း
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},debit သို့မဟုတ်ခရက်ဒစ်ပမာဏကို {0} သည်လိုအပ်သည်ဖြစ်စေ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,active
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ပြာသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ပြာသော
 DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
 DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,နောက်ထပ်ဆုံမှတ်များသာ &#39;&#39; Group မှ &#39;&#39; type ကိုဆုံမှတ်များအောက်မှာနေသူများကဖန်တီးနိုင်ပါသည်
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile ကို {0} ပြီးသားအသုံးပြုသူဖန်တီး: {1} နှင့်ကုမ္ပဏီ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ကူးပြောင်းခြင်း Factor
 DocType: Stock Settings,Default Item Group,default Item Group က
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,ဖျင်အရာဝတ္ထုကုန်ထုတ်လုပ်မှု
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch ဖွဲ့စည်း
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,သင့်ရဲ့ရောင်းအားလူတစ်ဦးကိုဖောက်သည်ကိုဆက်သွယ်ရန်ဤနေ့စွဲအပေါ်တစ်ဦးသတိပေးရလိမ့်မည်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,အခွန်နှင့်အခြားလစာဖြတ်တောက်။
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
 DocType: Account,Warehouse,ကုနျလှောငျရုံ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,စတော့အိတ်လယ်ဂျာ Entries နှင့် GL Entries ရွေးချယ်ထားတဲ့ဝယ်ယူလက်ခံသည်ထပ်မံတင်ပို့နေကြသည်
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,item 1
 DocType: Holiday,Holiday,အားလပ်ရက်များ
-DocType: Event,Saturday,စနေနေ့
 DocType: Leave Control Panel,Leave blank if considered for all branches,အားလုံးအကိုင်းအခက်စဉ်းစားလျှင်အလွတ် Leave
 ,Daily Time Log Summary,Daily သတင်းစာအချိန်အထဲအကျဉ်းချုပ်
-DocType: DocField,Label,ကပ်တံဆိပ်
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ငွေပေးချေမှုရမည့်အသေးစိတ်
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
 DocType: Lead,Call,တယ်လီဖုန်းဆက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,သုတေသန
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,သုတေသန
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ထို Attribute တွေက table ထဲမှာအနည်းဆုံးတစ်ခု attribute ကို specify ကျေးဇူးပြု.
 DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
-DocType: Communication,Sent,ကိုစလှေတျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,view လယ်ဂျာ
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-DocType: Communication,Delivery Status,Delivery နဲ့ Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 DocType: Production Order,Manufacture against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်ထုတ်လုပ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,item ဖော်ပြချက်များ
 DocType: Payment Tool,Payment Mode,ငွေပေးချေမှုရမည့် Mode ကို
 DocType: Purchase Invoice,Is Recurring,ထပ်တလဲလဲဖြစ်ပါတယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,တိုက်ရိုက်သတ္တုလေဆာ sintering
 DocType: Purchase Order,Supplied Items,ထောက်ပံ့ရေးပစ္စည်းများ
 DocType: Production Order,Qty To Manufacture,ထုတ်လုပ်ခြင်းရန် Qty
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ဝယ်ယူသံသရာတလျှောက်လုံးအတူတူနှုန်းကထိန်းသိမ်းနည်း
 DocType: Opportunity Item,Opportunity Item,အခွင့်အလမ်း Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,ယာယီဖွင့်ပွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
 DocType: Address,Address Type,လိပ်စာရိုက်ထည့်ပါ
@@ -1073,52 +990,50 @@
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,အရောင်းအမိန့် {0} တရားဝင်မဟုတ်
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,သေးငယ်သော
 DocType: Employee,Employee Number,ဝန်ထမ်းအရေအတွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,အကောင့်ဖွင့်ဦးခေါင်း {0} နေသူများကဖန်တီး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,စိမ်းလန်းသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,စိမ်းလန်းသော
 DocType: Item,Auto re-order,မော်တော်ကားပြန်လည်အမိန့်
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,အကောင်အထည်ဖော်ခဲ့သောစုစုပေါင်း
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,အကောင်အထည်ဖော်ခဲ့သောစုစုပေါင်း
 DocType: Employee,Place of Issue,ထုတ်ဝေသည့်နေရာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
-DocType: Report,Disabled,ချို့ငဲသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,စာချုပ်
+DocType: Email Digest,Add Quote,Quote Add
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,နာမတော်ကိုမလိုအပ်သည်
 DocType: Purchase Invoice,Recurring Type,ထပ်တလဲလဲ Type
 DocType: Address,City/Town,မြို့တော် / မြို့
 DocType: Email Digest,Annual Income,နှစ်စဉ်ဝင်ငွေ
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,item {0} တစ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,မြို့တော်ပစ္စည်းများ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
 DocType: Hub Settings,Seller Website,ရောင်းချသူဝက်ဘ်ဆိုက်
 apps/erpnext/erpnext/controllers/selling_controller.py +143,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},ထုတ်လုပ်မှုအမိန့် status ကို {0} သည်
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,မျှော်လင့်ထားသည့် Delivery Date ကိုစီစဉ်ထားသော Start ကိုနေ့စွဲထက်ယျဆုံးသောဖြစ်ပါတယ်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,ပေးသွင်းအကြောင်းမူကား
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Account Type ကိုချိန်ညှိခြင်းကိစ္စများကို၌ဤအကောင့်ကိုရွေးချယ်ခြင်းအတွက်ကူညီပေးသည်။
 DocType: Purchase Invoice,Grand Total (Company Currency),က Grand စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,စုစုပေါင်းအထွက်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",သာ &quot;To Value တစ်ခု&quot; ကို 0 င်သို့မဟုတ်ကွက်လပ်တန်ဖိုးကိုနှင့်တသားတ Shipping Rule အခြေအနေမရှိနိုငျ
 DocType: Authorization Rule,Transaction,ကိစ္စ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,မှတ်ချက်: ဤကုန်ကျစရိတ် Center ကတစ်ဦးအုပ်စုဖြစ်ပါတယ်။ အုပ်စုများဆန့်ကျင်စာရင်းကိုင် entries တွေကိုလုပ်မရပါ။
-apps/frappe/frappe/config/desk.py +7,Tools,Tools များ
 DocType: Item,Website Item Groups,website Item အဖွဲ့များ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,ထုတ်လုပ်မှုအမိန့်နံပါတ်စတော့ရှယ်ယာ entry ကိုရည်ရွယ်ချက်ထုတ်လုပ်ခြင်းသည်မသင်မနေရ
 DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,ဂျာနယ် Entry &#39;
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,comments
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Item {0} လိုအပ်အဘိုးပြတ် Rate
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Item {0} လိုအပ်အဘိုးပြတ် Rate
 DocType: Quality Inspection Reading,Reading 8,8 Reading
 DocType: Sales Partner,Agent,ကိုယ်စားလှယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",စုစုပေါင်း {0} ပစ္စည်းများအားလုံးသည်သုညကသင် &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်နိုင်ပါသည်
 DocType: Purchase Invoice,Taxes and Charges Calculation,အခွန်နှင့်စွပ်စွဲချက်တွက်ချက်
 DocType: BOM Operation,Workstation,Workstation နှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,အခွင့်ထူးထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,အဘယ်သူမျှမအချက်အလက်
 DocType: Appraisal Template Goal,Appraisal Template Goal,စိစစ်ရေး Template: Goal
 DocType: Salary Slip,Earning,ဝင်ငွေ
 DocType: Payment Tool,Party Account Currency,ပါတီ၏အကောင့်ကိုငွေကြေးစနစ်
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,အကြားတွေ့ရှိထပ်အခြေအနေများ:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,စုစုပေါင်းအမိန့် Value တစ်ခု
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,အစာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,အစာ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,သင်ကသာတင်သွင်းထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်နေတဲ့အချိန် log ကိုဖြစ်စေနိုင်ပါတယ်
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","အဆက်အသွယ်များ, စေပြီးမှသတင်းလွှာ။"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},အနီးကပ်အကောင့်ကို၏ငွေကြေး {0} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},အားလုံးပန်းတိုင်သည်ရမှတ် sum 100 ဖြစ်သင့်သည်က {0} သည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,စစ်ဆင်ရေးအလွတ်ကျန်မရနိုင်ပါ။
 ,Delivered Items To Be Billed,ကြေညာတဲ့ခံရဖို့ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
-DocType: DocField,Description,ဖေါ်ပြချက်
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
-DocType: Letter Head,Is Default,ပုံမှန်ဖြစ်
 DocType: Address,Utilities,အသုံးအဆောင်များ
 DocType: Purchase Invoice Item,Accounting,စာရင်းကိုင်
 DocType: Features Setup,Features Setup,အင်္ဂါရပ်များကို Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,view ကမ်းလှမ်းချက်ပေးစာ
-DocType: Communication,Communication,ဆက်သွယ်ရေး
 DocType: Item,Is Service Item,ဝန်ဆောင်မှု Item ဖြစ်ပါတယ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
 DocType: Activity Cost,Projects,စီမံကိန်းများ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},{0} ကနေ | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Datetime ကနေ
 DocType: Email Digest,For Company,ကုမ္ပဏီ
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,စာရင်းလုပ်ပါမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,အလုပ်သင်သူ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,အလုပ်သင်သူ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,အနုတ်လက္ခဏာပမာဏခွင့်ပြုမထားဘူး
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",အခွန်အသေးစိတ်စားပွဲတစ် string ကို item ကိုမာစတာကနေခေါ်ယူသောအခါနှင့်ဤလယ်ပြင်၌သိုလှောင်ထား။ အခွန်နှင့်စွပ်စွဲချက်အတွက်အသုံးပြု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,တက်ကြွသောလစာဝန်ထမ်း {0} တွေ့ရှိဖွဲ့စည်းပုံနှင့်တစ်လအဘယ်သူမျှမ
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
 DocType: Rename Tool,Type of document to rename.,အမည်ပြောင်းရန်စာရွက်စာတမ်းအမျိုးအစား။
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
 DocType: Address,Billing,ငွေတောင်းခံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Sent မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ဖွဲ့စည်းပေါက်ကွဲ
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} လက်ခံသူများမှပို့ပေးရန်စီစဉ်ထား
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,sub စညျးဝေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,sub စညျးဝေး
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Supplier,Stock Manager,စတော့အိတ် Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
@@ -1248,104 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,လေ့လာဆန်းစစ်သူ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} JV ငွေပမာဏ {2} ထက်လျော့နည်းသို့မဟုတ်နှင့်ထပ်တူဖြစ်ရပါမည်
 DocType: Item,Inventory,စာရင်း
 DocType: Features Setup,"To enable ""Point of Sale"" view",&quot;Point သို့ရောင်းရငွေ၏&quot; အမြင် enable လုပ်ဖို့
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,ငွေပေးချေမှုရမည့်အချည်းနှီးလှည်းတို့ကိုလုပ်မပြနိုင်
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,ပစ္စည်းများနှင့်အတူ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty အတွက်
 DocType: Notification Control,Expense Claim Rejected,စရိတ်ဖြစ်သည်ဆိုခြင်းကိုပယ်ချခဲ့သည်
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",လာမယ့်ကုန်ပို့လွှာ generated လိမ့်မည်သည့်နေ့ရက်။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
 DocType: Item Attribute,Item Attribute,item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,item Variant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,အစိုးရ
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),စုစုပေါင်း ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),စုစုပေါင်း ({0})
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Material Request Item,Sales Order No,အရောင်းအမိန့်မရှိပါ
 DocType: Item Group,Item Group Name,item Group မှအမည်
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ယူ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Manufacturing သည်ပစ္စည်းများလွှဲပြောင်း
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","ကို item သည်ဝယ်ယူနှုန်းက: {0} မတွေ့ရှိ, entry ကို (စရိတ်) စာရင်းကိုင် book ရန်လိုအပ်သောအရာ။ တစ်ဦးဝယ်စျေးနှုန်းစာရင်းကိုဆန့်ကျင်တဲ့ item စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),အပိုဆောင်းလျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},error: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},error: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,ငွေစာရင်း၏ Chart ဟာကနေအကောင့်သစ်ဖန်တီးပေးပါ။
 DocType: Maintenance Visit,Maintenance Visit,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Batch Qty
 DocType: Time Log Batch Detail,Time Log Batch Detail,အချိန်အထဲ Batch Detail
-DocType: Workflow State,Tasks,Tasks ကို
 DocType: Landed Cost Voucher,Landed Cost Help,ကုန်ကျစရိတ်အကူအညီဆင်းသက်
-DocType: Event,Tuesday,အင်္ဂါနေ့
 DocType: Leave Block List,Block Holidays on important days.,အရေးကြီးသောရက်အားလပ်ရက်ပိတ်ဆို့။
 ,Accounts Receivable Summary,Accounts ကို receiver အကျဉ်းချုပ်
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,န်ထမ်းအခန်းက္ပတင်ထားရန်တစ်ထမ်းစံချိန်အတွက်အသုံးပြုသူ ID လယ်ပြင်၌ထားကြ၏ ကျေးဇူးပြု.
 DocType: UOM,UOM Name,UOM အမည်
-DocType: Top Bar Item,Target,Target က
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,contribution ငွေပမာဏ
 DocType: Sales Invoice,Shipping Address,ကုန်ပစ္စည်းပို့ဆောင်ရမည့်လိပ်စာ
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,ဒီ tool ကိုသင် system ထဲမှာစတော့ရှယ်ယာများအရေအတွက်နှင့်အဘိုးပြတ် update သို့မဟုတ်ပြုပြင်ဖို့ကူညီပေးသည်။ ဒါဟာပုံမှန်အားဖြင့် system ကိုတန်ဖိုးများနှင့်အဘယ်တကယ်တော့သင့်ရဲ့သိုလှောင်ရုံထဲမှာရှိနေပြီတပြိုင်တည်းအသုံးပြုသည်။
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ကုန်အမှတ်တံဆိပ်မာစတာ။
-DocType: ToDo,Due Date,သတ်မှတ်ချိန်းရက်
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ကုန်အမှတ်တံဆိပ်မာစတာ။
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,သေတ္တာ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,အဖွဲ့
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,သေတ္တာ
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,အဖွဲ့
 DocType: Monthly Distribution,Monthly Distribution,လစဉ်ဖြန့်ဖြူး
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,receiver List ကိုအချည်းနှီးပါပဲ။ Receiver များစာရင်းဖန်တီး ကျေးဇူးပြု.
 DocType: Production Plan Sales Order,Production Plan Sales Order,ထုတ်လုပ်မှုစီမံကိန်းအရောင်းအမိန့်
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{1}: {0} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,ထစ်
-apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {2} {3} ထဲမှာရှိနေပြီပါဘူး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,ဘဏ်မှ Accounts ကို
 ,Bank Reconciliation Statement,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေးထုတ်ပြန်ကြေညာချက်
 DocType: Address,Lead Name,ခဲအမည်
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} တစ်ခါသာပေါ်လာရကြမည်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,ဘဏ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,ဘဏ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Quality Inspection Reading,Reading 4,4 Reading
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugal သွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,သံလိုက်စက်ကွင်း-ကူညီပြီး
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,စတော့အိတ်မှုစိစစ်
 DocType: Purchase Receipt,Supplier Warehouse,ပေးသွင်းဂိုဒေါင်
 DocType: Opportunity,Contact Mobile No,မိုဘိုင်းလ်မရှိဆက်သွယ်ရန်
 DocType: Production Planning Tool,Select Sales Orders,အရောင်းအမိန့်ကိုရွေးပါ
 ,Material Requests for which Supplier Quotations are not created,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,barcode ကို အသုံးပြု. ပစ္စည်းများခြေရာခံရန်။ သင်ဟာ item ၏ barcode scan ဖတ်ခြင်းဖြင့် Delivery Note နှင့်အရောင်းပြေစာအတွက်ပစ္စည်းများဝင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,"ကယ်နှုတ်တော်မူ၏အဖြစ်, Mark"
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,စျေးနှုန်းလုပ်ပါ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 DocType: SMS Center,Receiver List,receiver များစာရင်း
@@ -1353,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ကြည့်ရန်
 DocType: Salary Structure Deduction,Salary Structure Deduction,လစာဖွဲ့စည်းပုံထုတ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective လေဆာ sintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,အောင်မြင်သောတင်သွင်း!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),အသက်အရွယ် (နေ့ရက်များ)
 DocType: Quotation Item,Quotation Item,စျေးနှုန်း Item
 DocType: Account,Account Name,အကောင့်အမည်
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,နေ့စွဲကနေနေ့စွဲရန်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,serial No {0} အရေအတွက် {1} တဲ့အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ပေးသွင်း Type မာစတာ။
 DocType: Purchase Order Item,Supplier Part Number,ပေးသွင်းအပိုင်းနံပါတ်
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,ပေါင်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,ကူးပြောင်းခြင်းနှုန်းက 0 င်သို့မဟုတ် 1 မဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ကိုဖျက်သိမ်းသို့မဟုတ်ရပ်တန့်နေသည်
 DocType: Accounts Settings,Credit Controller,ခရက်ဒစ် Controller
 DocType: Delivery Note,Vehicle Dispatch Date,မော်တော်ယာဉ် Dispatch နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,ဝယ်ယူခြင်း Receipt {0} တင်သွင်းသည်မဟုတ်
 DocType: Company,Default Payable Account,default ပေးဆောင်အကောင့်
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","ထိုကဲ့သို့သောစသည်တို့ရေကြောင်းစည်းမျဉ်းစည်းကမ်းများ, စျေးနှုန်းစာရင်းအဖြစ်အွန်လိုင်းစျေးဝယ်လှည်းသည် Settings ကို"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup ကို Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,ကြေညာတဲ့ {0}%
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,လူ့အင်အားအရင်းအမြစ်
 DocType: Lead,Upper Income,အထက်ဝင်ငွေခွန်
 DocType: Journal Entry Account,Debit in Company Currency,Company မှငွေကြေးစနစ်အတွက် debit
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ငါ့အကိစ္စများ
@@ -1386,12 +1281,9 @@
 DocType: Company,Default Values,default တန်ဖိုးများ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏကိုအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,သငျ့ Press မှ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 DocType: Payment Reconciliation,Payments,ငွေပေးချေမှု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic ကိုနှိပ်
-DocType: ToDo,Medium,အလယ်အလတ်
 DocType: Budget Detail,Budget Allocated,ဘဏ္ဍာငွေအရအသုံးခွဲဝေ
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
 ,Customer Credit Balance,customer Credit Balance
@@ -1400,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
 DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Days) သည်စွမ်းဆောင်ရည်စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
 DocType: Warranty Claim,Warranty Claim,အာမခံပြောဆိုချက်ကို
 ,Lead Details,ခဲအသေးစိတ်ကို
-DocType: Authorization Rule,Approving User,အတည်ပြုပေးသောအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
 DocType: Pricing Rule,Applicable For,အကြောင်းမူကားသက်ဆိုင်သော
 DocType: Bank Reconciliation,From Date,နေ့စွဲကနေ
@@ -1427,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,အကြီးဆုံးအွန်လိုင်းအဘိဓါန်လေလံ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,ပမာဏသို့မဟုတ်အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate သို့မဟုတ်နှစ်ဦးစလုံးဖြစ်စေသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","ကုမ္ပဏီ, လနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာမသင်မနေရ"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',အချိန်အထဲ Batch {0} &#39;&#39; Submitted &#39;&#39; ရမည်
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ကျွန်တော်စတော့အိတ်လပ်ြရြားမြသည်စာရင်းကိုင် Entry &#39;ပါစေ
 DocType: Leave Allocation,Total Leaves Allocated,ခွဲဝေစုစုပေါင်းရွက်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့်ဂိုဒေါင်
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
 DocType: Address,Postal,စာတိုက်
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,သတ္တုတူးဖော်ရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ဗဓေလသစ်သွန်း
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,ပထမဦးဆုံး {0} ကို select ပေးပါ။
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},စာသားအ {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},စာသားအ {0}
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
 DocType: Stock Entry,Material Receipt,material Receipt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ထုတ်ကုန်များ
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,ထုတ်ကုန်များ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်လိုအပ်သည် {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",ဒီအချက်ကိုမျိုးကွဲရှိပါတယ်လျှင်စသည်တို့အရောင်းအမိန့်အတွက်ရွေးချယ်ထားမပြနိုင်
 DocType: Lead,Next Contact By,Next ကိုဆက်သွယ်ရန်အားဖြင့်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},အရေအတွက် Item {1} သည်တည်ရှိအဖြစ်ဂိုဒေါင် {0} ဖျက်ပြီးမရနိုင်ပါ
 DocType: Quotation,Order Type,အမိန့် Type
 DocType: Purchase Invoice,Notification Email Address,အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ
 DocType: Payment Tool,Find Invoices to Match,ပွဲစဉ်မှငွေတောင်းခံလွှာကိုရှာပါ
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",ဥပမာ &quot;XYZ လို့အမျိုးသားဘဏ်မှ&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",ဥပမာ &quot;XYZ လို့အမျိုးသားဘဏ်မှ&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,အခြေခံပညာနှုန်းတွင်ထည့်သွင်းဒီအခွန်ဖြစ်သနည်း
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,စုစုပေါင်း Target က
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,စုစုပေါင်း Target က
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,စျေးဝယ်လှည်း enabled ဖြစ်ပါတယ်
 DocType: Job Applicant,Applicant for a Job,တစ်ဦးယောဘသည်လျှောက်ထားသူ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,created မရှိပါထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဒီလဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဒီလဖန်တီး
 DocType: Stock Reconciliation,Reconciliation JSON,ပြန်လည်သင့်မြတ်ရေး JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Sales Invoice Item,Batch No,batch မရှိပါ
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,အဓိက
-DocType: DocPerm,Delete,Delete
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,မူကွဲ
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},နယူး {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,ရပ်တန့်နိုင်ရန်ဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့လှတျ။
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
 DocType: Sales Team,Contribution to Net Total,Net ကစုစုပေါင်းမှ contribution
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ Item Code ကို
 DocType: Stock Reconciliation,Stock Reconciliation,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး
@@ -1493,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,တစ်ဦးယောဘသည်လျှောက်ထားသူ။
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
-DocType: Country,Country,ပြည်
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,လိပ်စာများ
-DocType: Communication,Received,ရရှိထားသည့်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Serial No Item {0} သည်သို့ဝင် Duplicate
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,တစ် Shipping Rule များအတွက်အခြေအနေ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,item ထုတ်လုပ်မှုအမိန့်ရှိခွင့်မပြုခဲ့တာဖြစ်ပါတယ်။
-DocType: DocField,Attach Image,Image ကို Attach
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ဒီအထုပ်၏ကျော့ကွင်းကိုအလေးချိန်။ (ပစ္စည်းပိုက်ကွန်ကိုအလေးချိန်၏အချုပ်အခြာအဖြစ်ကိုအလိုအလျောက်တွက်ချက်)
-DocType: Stock Reconciliation Item,Leave blank if no change,အဘယ်သူမျှမပြောင်းလဲမှုလျှင်လွတ် Leave
 DocType: Sales Order,To Deliver and Bill,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,ကုန်ထုတ်လုပ်မှုသည်အချိန် Logs ။
 DocType: Item,Apply Warehouse-wise Reorder Level,ဂိုဒေါင်ပညာ Reorder အဆင့် Apply
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,တာဝန်များကိုအချိန်အထဲ။
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,ငွေပေးချေမှုရမည့်
 DocType: Production Order Operation,Actual Time and Cost,အမှန်တကယ်အချိန်နှင့်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},အများဆုံး၏ပစ္စည်းတောင်းဆိုမှု {0} အရောင်းအမိန့် {2} ဆန့်ကျင်ပစ္စည်း {1} သည်ဖန်ဆင်းနိုင်
 DocType: Employee,Salutation,နှုတ်ဆက်
-DocType: Communication,Rejected,ပယ်ချ
 DocType: Pricing Rule,Brand,ကုန်အမှတ်တံဆိပ်
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
 DocType: Sales Order Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
 DocType: Hub Settings,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Value ကို {0} Attribute များအတွက် {1} မမှန်ကန်ပစ္စည်းများ၏စာရင်းထဲတွင်မတည်ရှိပါဘူးတန်ဖိုးများ Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,အပေါင်းအဖေါ်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expired
 DocType: Packing Slip,To Package No.,အမှတ် Package မှ
-DocType: DocType,System,စံနစ်
 DocType: Warranty Claim,Issue Date,ထုတ်ပြန်ရက်စွဲ
 DocType: Activity Cost,Activity Cost,လုပ်ဆောင်ချက်ကုန်ကျစရိတ်
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ကျွမ်းလောင် Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,ဆက်သွယ်ရေးလုပ်ငန်း
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 DocType: Payment Tool,Make Payment Entry,ငွေပေးချေမှုရမည့် Entry &#39;ပါစေ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
 ,Sales Invoice Trends,အရောင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Leave Application,Apply / Approve Leaves,Apply / ရွက်အတည်ပြု
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,"အကြောင်းမူကား,"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်း &#39;&#39; ယခင် Row ပမာဏတွင် &#39;&#39; ဟုတာဝန်ခံ type ကိုအသုံးပြုမှသာလျှင်အတန်းရည်ညွှန်းနိုင်ပါသည်
 DocType: Sales Order Item,Delivery Warehouse,Delivery ဂိုဒေါင်
 DocType: Stock Settings,Allowance Percent,ထောက်ပံ့ကြေးရာခိုင်နှုန်း
@@ -1551,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","အကြောင်းမူကားသက်ဆိုင်သော {0} အဖြစ်ရွေးချယ်လျှင်ရောင်းချခြင်း, checked ရမည်"
 DocType: Purchase Order Item,Supplier Quotation Item,ပေးသွင်းစျေးနှုန်း Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,လစာဖွဲ့စည်းပုံပါစေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,ညှပ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,အသစ်တစ်ခုကိုအရောင်းပြေစာကိုဖန်တီးရန်ခလုတ်ကို &#39;&#39; အရောင်းပြေစာလုပ်ပါ &#39;&#39; ပေါ်တွင်ကလစ်နှိပ်ပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,ထုပ်ပိုးပစ္စည်းများနှင့်တံဆိပ်ကပ်ခြင်း
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,ကုမ္ပဏီနှင့် Master နှင့် Global Defaults ကိုအတွက်ပုံမှန်ငွေကြေးစနစ်ကိုသတ်မှတ်ပေးပါ
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox ကို Access ကလျှို့ဝှက်ချက်
 DocType: Purchase Invoice,Recurring Invoice,ထပ်တလဲလဲပြေစာ
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
 DocType: Supplier,Supplier of Goods or Services.,ကုန်စည်သို့မဟုတ်န်ဆောင်မှုများ၏ပေးသွင်း။
 DocType: Budget Detail,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Cost Center,Budget,ဘတ်ဂျက်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,အောင်မြင်
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,အောင်မြင်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ဥပမာ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,ဥပမာ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,သင်အရောင်းပြေစာကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 DocType: Item,Is Sales Item,အရောင်း Item ဖြစ်ပါတယ်
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,item Group ကသစ်ပင်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
 DocType: Maintenance Visit,Maintenance Time,ပြုပြင်ထိန်းသိမ်းမှုအချိန်
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,အမှားများရှိကြ၏။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,ပုတ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} နေသူများကဖန်တီး
 DocType: Delivery Note Item,Against Sales Order,အရောင်းအမိန့်ဆန့်ကျင်
@@ -1591,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
 DocType: Website Item Group,Website Item Group,website Item Group က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,တာဝန်နှင့်အခွန်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Site မှာပြထားတဲ့လိမ့်မည်ဟု Item သည်စားပွဲတင်
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
 DocType: Material Request Item,Material Request Item,material တောင်းဆိုမှု Item
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Item အဖွဲ့များ၏ပင်လည်းရှိ၏။
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Item အဖွဲ့များ၏ပင်လည်းရှိ၏။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,နီသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,နီသော
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 ,Open Production Orders,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
@@ -1609,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,row # {0}: စစ်ဆင်ရေး {1} ထုတ်လုပ်မှုအမိန့် # {3} အတွက်ချောကုန်စည် {2} qty သည်ပြီးစီးသည်မဟုတ်။ အချိန် Logs ကနေတဆင့်စစ်ဆင်ရေးအဆင့်အတန်းကို update ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,တစ်ဦး Item သည် UOM ပြောင်းလဲပါ။
 DocType: Quality Inspection Reading,Acceptance Criteria,လက်ခံမှုကိုလိုအပ်ချက်
 DocType: Item Attribute,Attribute Name,အမည် Attribute
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},item {0} {1} အတွက်အရောင်းသို့မဟုတ်ဝန်ဆောင်မှု Item ဖြစ်ရမည်
 DocType: Item Group,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,အစု
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,အစု
 DocType: Task,Expected Time (in hours),(နာရီအတွင်း) မျှော်လင့်ထားအချိန်
 ,Qty to Order,ရမလဲမှ Qty
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","အောက်ပါစာရွက်စာတမ်းများ Delivery မှတ်ချက်, အခွင့်အလမ်းများ, ပစ္စည်းတောင်းဆိုခြင်း, Item, ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ voucher, ဝယ်ယူမှု Receipt, စျေးနှုန်း, အရောင်းပြေစာ, ကုန်ပစ္စည်း Bundle ကို, အရောင်းအမိန့်, Serial No အတွက်အမှတ်တံဆိပ်နာမကိုခြေရာခံဖို့"
@@ -1623,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Clear ကိုဇယား
 DocType: Features Setup,Brands,ကုန်အမှတ်တံဆိပ်
 DocType: C-Form Invoice Detail,Invoice No,ကုန်ပို့လွှာမရှိပါ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,ဝယ်ယူခြင်းအမိန့်ကနေ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
 DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate
 ,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Set မဟုတ်
-DocType: Communication,Date,နေ့စှဲ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,သင့် system ဖြစ်ရခြင်း setup ကိုနေစဉ်တင်းကြပ်ထိုင်နေ။ ဤသည်အချိန်အနည်းငယ်ကြာနိုင်ပါသည်။
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,လင်မယား
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,လင်မယား
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 DocType: Maintenance Schedule Detail,Actual Date,အမှန်တကယ်နေ့စွဲ
 DocType: Item,Has Batch No,Batch မရှိရှိပါတယ်
 DocType: Delivery Note,Excise Page Number,ယစ်မျိုးစာမျက်နှာနံပါတ်
 DocType: Employee,Personal Details,ပုဂ္ဂိုလ်ရေးအသေးစိတ်
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ထုတ်လုပ်မှုအမိန့်ဒီအချက်ကိုသည်ကိုဖန်ဆင်းနိုင်ပါတယ်ကြောင့်တစ်စတော့ရှယ်ယာကို item ဖြစ်ရမည်။
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,ဝင်ရောက်
-DocType: Authorization Rule,Above Value,Value တစ်ခုအထက်
 ,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
 DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),အလုပ်အကိုင်အခွင့်အအီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total ကုမ္ပဏီခွဲဝေအရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုပြီးအရွက် {1} ထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Journal Entry,Accounts Receivable,ငွေစာရင်းရရန်ရှိသော
 ,Supplier-Wise Sales Analytics,ပေးသွင်း-ပညာရှိအရောင်း Analytics
 DocType: Address Template,This format is used if country specific format is not found,တိုင်းပြည်တိကျတဲ့ format ကိုမတွေ့ရှိပါကဤ format ကိုအသုံးပြုပါတယ်
-DocType: Custom Field,Custom,ထုံးစံဓလေ့
 DocType: Production Order,Use Multi-Level BOM,Multi-Level BOM ကိုသုံးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,injection အတု ယူ. ပုံသှငျး
 DocType: Bank Reconciliation,Include Reconciled Entries,ပြန်. Entries Include
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,finanial အကောင့်အသစ်များ၏ပင်လည်းရှိ၏။
 DocType: Leave Control Panel,Leave blank if considered for all employee types,အားလုံးန်ထမ်းအမျိုးအစားစဉ်းစားလျှင်အလွတ် Leave
 DocType: Landed Cost Voucher,Distribute Charges Based On,တွင် အခြေခံ. စွပ်စွဲချက်ဖြန့်ဝေ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,အကောင့်ဖွင့် Item {1} အဖြစ် {0} အမျိုးအစားဖြစ်ရမည် &#39;&#39; Fixed Asset &#39;&#39; တစ်ဦး Asset Item ဖြစ်ပါတယ်
 DocType: HR Settings,HR Settings,HR Settings ကို
-apps/frappe/frappe/config/setup.py +130,Printing,ပုံနှိပ်ခြင်း
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,သင်ခွင့်များအတွက်လျှောက်ထားသည့်အပေါ်အဆိုပါနေ့ရက်ကို (s) အားလပ်ရက်ဖြစ်ကြ၏။ သင်ဟာခွင့်လျှောက်ထားစရာမလိုပေ။
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,နှင့်
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,အားကစား
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,အမှန်တကယ်စုစုပေါင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,ယူနစ်
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,သင့်ရဲ့ site ကို config ကိုအတွက် Dropbox ကို access ကိုသော့ထားပေးပါ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,ယူနစ်
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
 DocType: POS Profile,Price List,စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ယခုက default ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဖြစ်ပါတယ်။ အကျိုးသက်ရောက်မှုယူမှအပြောင်းအလဲအတွက်သင့် browser refresh ပေးပါ။
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,စရိတ်စွပ်စွဲ
 DocType: Issue,Support,ထောက်ပံ့
-DocType: Authorization Rule,Approving Role,အတည်ပြုပေးသောအခန်းက္ပ
 ,BOM Search,BOM ရှာရန်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,ကုမ္ပဏီအတွက်ငွေကြေးသတ်မှတ် ကျေးဇူးပြု.
 DocType: Workstation,Wages per hour,တစ်နာရီလုပ်ခ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","စသည်တို့ Serial အမှတ်, POS စက်တို့ကဲ့သို့ပြ / ဖျောက် features တွေ"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},ရှင်းလင်းရေးနေ့စွဲအတန်း {0} အတွက်စစ်ဆေးခြင်းရက်စွဲမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},ရှင်းလင်းရေးနေ့စွဲအတန်း {0} အတွက်စစ်ဆေးခြင်းရက်စွဲမီမဖွစျနိုငျ
 DocType: Salary Slip,Deduction,သဘောအယူအဆ
 DocType: Address Template,Address Template,လိပ်စာ Template:
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
@@ -1706,76 +1571,68 @@
 DocType: Opportunity,Quotation,ကိုးကာချက်
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 DocType: Quotation,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ကုန်ကျစရိတ် Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Employee,Date of Birth,မွေးနေ့
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,item {0} ပြီးသားပြန်ထားပြီ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ ** တစ်ဘဏ္ဍာရေးတစ်နှစ်တာကိုကိုယ်စားပြုပါတယ်။ အားလုံးသည်စာရင်းကိုင် posts များနှင့်အခြားသောအဓိကကျသည့်ကိစ္စများကို ** ** ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဆန့်ကျင်ခြေရာခံထောက်လှမ်းနေကြပါတယ်။
 DocType: Opportunity,Customer / Lead Address,customer / ခဲလိပ်စာ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
 DocType: Purchase Order Item,Qty as per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ် Qty
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,ဒေတာနဲ့တရားဝင် CSV ဖိုင်ကိုရွေးပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,အထပ်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",စတော့အိတ် entries တွေကို {0} သွားတော့သင် re-assign သို့မဟုတ်ဂိုဒေါင် modify မရပါဘူးဂိုဒေါင်ဆန့်ကျင်တည်ရှိနေ
 DocType: Appraisal,Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်
 DocType: Supplier Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
-apps/erpnext/erpnext/hooks.py +84,Shipments,တင်ပို့ရောင်းချမှု
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip အတု ယူ. ပုံသှငျး
-DocType: Purchase Order,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
+apps/erpnext/erpnext/hooks.py +68,Shipments,တင်ပို့ရောင်းချမှု
+DocType: Purchase Order Item,To be delivered to customer,ဖောက်သည်မှကယ်နှုတ်တော်မူ၏ခံရဖို့
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,အချိန်အထဲနဲ့ Status Submitted ရမည်။
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Up ကိုပြင်ဆင်ခြင်း
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,row #
 DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင်
 DocType: Pricing Rule,Supplier,ကုန်သွင်းသူ
 DocType: C-Form,Quarter,လေးပုံတစ်ပုံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,အထွေထွေအသုံးစရိတ်များ
 DocType: Global Defaults,Default Company,default ကုမ္ပဏီ
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,စရိတ်သို့မဟုတ် Difference အကောင့်ကိုကသက်ရောက်မှုအဖြစ် Item {0} ခြုံငုံစတော့ရှယ်ယာတန်ဖိုးသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ပိုပစ္စည်းများအတွက် overbill နိုင်ဘူး။ overbilling ခွင့်ပြုပါရန်, စတော့အိတ် Settings ကိုကိုထားကိုကျေးဇူးတင်ပါ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ပိုပစ္စည်းများအတွက် overbill နိုင်ဘူး။ overbilling ခွင့်ပြုပါရန်, စတော့အိတ် Settings ကိုကိုထားကိုကျေးဇူးတင်ပါ"
 DocType: Employee,Bank Name,ဘဏ်မှအမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,အသုံးပြုသူ {0} ပိတ်ထားတယ်
 DocType: Leave Application,Total Leave Days,စုစုပေါင်းထွက်ခွာ Days
-DocType: Journal Entry Account,Credit in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Email Digest,Note: Email will not be sent to disabled users,မှတ်ချက်: အီးမေးလ်မသန်မစွမ်းအသုံးပြုသူများထံသို့စေလွှတ်လိမ့်မည်မဟုတ်ပေ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
-DocType: DocField,Name,နာမကို
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,စနစ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Item {0} လိုအပ်အရောင်းအမိန့်
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,စနစ်ထဲမှာထင်ဟပ်မဟုတ်ပမာဏ
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,အခြားသူများ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: POS Profile,Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်စတော့ရှယ်ယာအတွက်ဝယ်ရောင်းမစောင့်ဘဲပြုလုပ်ထားတဲ့န်ဆောင်မှု။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,ပြီးစီး
-DocType: Web Form,Select DocType,DOCTYPE ကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,အချိန်ဇယားအရ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,နယူးကုန်ကျစရိတ် Center က
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,နယူးကုန်ကျစရိတ် Center က
 DocType: Bin,Ordered Quantity,အမိန့်ပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
 DocType: Quality Inspection,In Process,Process ကိုအတွက်
 DocType: Authorization Rule,Itemwise Discount,Itemwise လျှော့
 DocType: Purchase Order Item,Reference Document Type,ကိုးကားစရာ Document ဖိုင် Type အမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
 DocType: Time Log Batch,Total Billing Amount,စုစုပေါင်း Billing ငွေပမာဏ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,receiver အကောင့်
@@ -1783,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,အချိန် Logs နေသူများကဖန်တီး:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Employee,Blood Group,လူအသွေး Group က
 DocType: Purchase Invoice Item,Page Break,စာမျက်နှာ Break
 DocType: Production Order Operation,Pending,လာမည့်
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,အတိအကျန်ထမ်းရဲ့ခွင့်ပလီကေးရှင်းကိုအတည်ပြုနိုင်သူသုံးစွဲသူများက
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,သငျသညျ Variant ၏ default အနေနဲ့ UOM မပြောင်းနိုင်ပါ။ Template ကို၏ Variant ပြောင်းလဲမှုကို default UOM များအတွက် default အနေနဲ့ UOM ပြောင်းလဲပစ်ရန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Office ကိုပစ္စည်းများ
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,ကုမ္ပဏီများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,အီလက်ထရောနစ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,အီလက်ထရောနစ်
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,စတော့ရှယ်ယာပြန်လည်မိန့်အဆင့်ရောက်ရှိသည့်အခါပစ္စည်းတောင်းဆိုမှုမြှင်
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Maintenance ဇယားထဲကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,အချိန်ပြည့်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,အချိန်ပြည့်
 DocType: Purchase Invoice,Contact Details,ဆက်သွယ်ရန်အသေးစိတ်
 DocType: C-Form,Received Date,ရရှိထားသည့်နေ့စွဲ
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","သင်အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template ထဲမှာတစ်ဦးစံ template ကိုဖန်တီးခဲ့လျှင်, တယောက်ရွေးပြီးအောက်တွင်ဖော်ပြထားသော button ကို click လုပ်ပါ။"
@@ -1807,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,ယောဘသည်အဖွင့်ပွဲ
 DocType: Payment Reconciliation,Payment Reconciliation,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
 DocType: Offer Letter,Offer Letter,ကမ်းလှမ်းမှုကိုပေးစာ
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,ပစ္စည်းတောင်းဆို (MRP) နှင့်ထုတ်လုပ်မှုအမိန့် Generate ။
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,စုစုပေါင်းငွေတောင်းခံလွှာ Amt
 DocType: Time Log,To Time,အချိန်မှ
+DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအခန်းက္ပ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ကလေးဆုံမှတ်များထည့်ရန်သစ်ပင်ကိုလေ့လာစူးစမ်းခြင်းနှင့်သင်နောက်ထပ်ဆုံမှတ်များထည့်ချင်ရာအောက်တွင် node ကို click လုပ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
@@ -1824,12 +1682,10 @@
 DocType: Item,Customer Item Codes,customer Item ကုဒ်တွေဟာ
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,အမိန့်သို့မဟုတ်ငွေတောင်းခံလွှာဆန့်ကျင်ငွေပေးချေမှုရမည့် Entries ဖန်တီးပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,ဂဟေဆော်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,နယူးစတော့အိတ် UOM လိုအပ်သည်
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; တရားဝင်သတ်မှတ် ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
 DocType: Features Setup,Item Serial Nos,item Serial အမှတ်
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
@@ -1839,15 +1695,13 @@
 DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ
 DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} မတွေ့ရှိ serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,သင့် Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,compression အတု ယူ. ပုံသှငျး
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,သင့် Customer
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
 DocType: Sales Order,Not Delivered,ကယ်နှုတ်တော်မူ၏မဟုတ်
 ,Bank Clearance Summary,ဘဏ်မှရှင်းလင်းရေးအကျဉ်းချုပ်
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,item Code ကို&gt; Item Group မှ&gt; ကုန်တံဆိပ်
 DocType: Appraisal Goal,Appraisal Goal,စိစစ်ရေးဂိုး
-DocType: Event,Friday,သောကြာနေ့
 DocType: Time Log,Costing Amount,ငွေပမာဏကုန်ကျ
 DocType: Process Payroll,Submit Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit
 DocType: Salary Structure,Monthly Earning & Deduction,လစဉ်ဝင်ငွေ &amp; ထုတ်ယူ
@@ -1855,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,ထုထည်ကြီးအတွက်သွင်းကုန်
 DocType: Sales Partner,Address & Contacts,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: SMS Log,Sender Name,ပေးပို့သူအမည်
-DocType: Page,Title,ဘှဲ့
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Customize
 DocType: POS Profile,[Select],[ရွေးပါ]
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,ကြိုတင်ငွေပမာဏ
 DocType: Manufacturing Settings,Capacity Planning,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်း
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
 DocType: Journal Entry,Reference Number,ကိုးကားစရာနံပါတ်
 DocType: Employee,Employment Details,အလုပ်အကိုင်အခွင့်အအသေးစိတ်ကို
 DocType: Employee,New Workplace,နယူးလုပ်ငန်းခွင်
@@ -1879,7 +1731,7 @@
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,ခရီးသွား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,ခရီးသွား
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
 DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
 DocType: Sales Invoice,Recurring,ထပ်တလဲလဲ
@@ -1887,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Tool ကို Rename
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
 DocType: Installation Note,Installation Note,Installation မှတ်ချက်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,အခွန် Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,အခွန် Add
 ,Financial Analytics,ဘဏ္ဍာရေး Analytics
 DocType: Quality Inspection,Verified By,By Verified
 DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
 DocType: Quality Inspection,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,စားရန်ဖြစ်တော်မူ၏ငွေ
-DocType: System Settings,In Hours,အလုပ်ချိန်အတွက်
 DocType: Process Payroll,Create Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ဘဏ်နှုန်းအဖြစ်မျှော်လင့်ထားချိန်ခွင်လျှာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ဘဏ်နှုန်းအဖြစ်မျှော်လင့်ထားချိန်ခွင်လျှာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
 DocType: Appraisal,Employee,လုပ်သား
@@ -1916,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,ဘောက်ချာအားဖြင့်အုပ်စု
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Sales Invoice,Mass Mailing,mass စာပို့
-DocType: Page,Standard,စံ
 DocType: Rename Tool,File to Rename,Rename မှ File
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,ငွေပေးချေပြရန်
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,အရွယ်
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,ဆေးဝါး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,ဆေးဝါး
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ဝယ်ယူပစ္စည်းများ၏ကုန်ကျစရိတ်
 DocType: Selling Settings,Sales Order Required,အရောင်းအမိန့်လိုအပ်ပါသည်
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,ဖောက်သည် Create
@@ -1934,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 Reading
 DocType: Supplier,Is Frozen,Frozen ဖြစ်ပါသည်
 DocType: Buying Settings,Buying Settings,Settings ကိုဝယ်ယူ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,mass ပြီး
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,တစ် Finished ကောင်း Item သည် BOM အမှတ်
 DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက်ရောက်
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),အရောင်းအီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ sales@example.com)
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Tool,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,မူကြမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ပိတ် Compensatory
 DocType: Quality Inspection Reading,Accepted,လက်ခံထားတဲ့
-DocType: User,Female,မိန်းမ
-DocType: Journal Entry Account,Debit in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက် debit
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
-DocType: Print Settings,Modern,ခေတ်သစ်
-DocType: Communication,Replied,Replied
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {0} {1}
 DocType: Payment Tool,Total Payment Amount,စုစုပေါင်းငွေပေးချေမှုရမည့်ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ထုတ်လုပ်မှုအမိန့် {3} အတွက်စီစဉ်ထား quanitity ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
 DocType: Newsletter,Test,စမ်းသပ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","လက်ရှိစတော့ရှယ်ယာအရောင်းအဒီအချက်ကိုသည်ရှိပါတယ်အမျှ \ သင် &#39;&#39; Serial No ရှိခြင်း &#39;&#39; ၏စံတန်ဖိုးများကိုပြောင်းလဲလို့မရဘူး, &#39;&#39; Batch မရှိပါဖူး &#39;&#39; နှင့် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ &#39;&#39; စတော့အိတ် Item Is &#39;&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
@@ -1965,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ပစ္စည်းများသည်တောင်းဆိုမှုများ။
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,အသီးအသီးကောင်းဆောင်းပါးတပုဒ်ကိုလက်စသတ်သည်သီးခြားထုတ်လုပ်မှုအမိန့်ကိုဖန်တီးလိမ့်မည်။
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,complete ကို Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ဒီ up to date ဖြစ်နေအေးခဲစာရင်းကိုင် entry ကိုဘယ်သူမှလုပ်နိုင် / အောက်တွင်သတ်မှတ်ထားသောအခန်းကဏ္ဍ မှလွဲ. entry ကို modify ။
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,စီမံချက်လက်ရှိအခြေအနေ
 DocType: UOM,Check this to disallow fractions. (for Nos),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,သတင်းလွှာစာပို့စာရင်း
 DocType: Delivery Note,Transporter Name,Transporter အမည်
+DocType: Authorization Rule,Authorized Value,Authorized Value ကို
 DocType: Contact,Enter department to which this Contact belongs,ဒီဆက်သွယ်ရန်ပိုငျဆိုငျသောဌာနကိုထည့်သွင်းပါ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,စုစုပေါင်းပျက်ကွက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,တိုင်း၏ယူနစ်
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
 DocType: Lead,Opportunity,အခွင့်အရေး
@@ -1996,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(စတော့အိတ် UOM နှုန်းအတိုင်း) အခြေခံပညာနှုန်း
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
 DocType: Customer Group,Has Child Node,ကလေး Node ရှိပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ဒီနေရာမှာ static နဲ့ url parameters တွေကိုရိုက်ထည့်ပါ (ဥပမာ။ ပေးပို့သူ = ERPNext, အသုံးပြုသူအမည် = ERPNext, စကားဝှက် = 1234 စသည်တို့)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} မတက်ကြွဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ။ အသေးစိတ်ကို {2} စစ်ဆေးပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Photochemical machine
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2026,12 +1868,10 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","အားလုံးဝယ်ယူခြင်းငွေကြေးကိစ္စရှင်းလင်းမှုမှလျှောက်ထားနိုင်ပါသည်က Standard အခွန် Simple template ။ * ဤ template ကိုအခွန်ဦးခေါင်းစာရင်းမဆံ့နိုင်ပြီးကိုလည်း &quot;Shipping&quot;, &quot;အာမခံ&quot; စသည်တို့ကို &quot;ကိုင်တွယ်ခြင်း&quot; #### ကဲ့သို့အခြားစရိတ်အကြီးအကဲများသင်ဒီမှာသတ်မှတ်အဆိုပါအခွန်နှုန်းထားကိုအားလုံး ** ပစ္စည်းများများအတွက်စံအခွန်နှုန်းကဖွစျလိမျ့မညျမှတ်ချက် * ။ ကွဲပြားခြားနားသောနှုန်းထားများရှိသည် ** ပစ္စည်းများ ** ရှိပါတယ် အကယ်. သူတို့ ** Item ခွန်အတွက်ကဆက်ပြောသည်ရမည် ** ဇယားသည် ** Item ** မာစတာအတွက်။ ဒါဟာ ** စုစုပေါင်း ** Net ပေါ်မှာဖြစ်နိုင် (ထိုအခြေခံပမာဏ၏ပေါင်းလဒ်သည်) -:-Columns 1. တွက်ချက် Type ၏ #### ဖော်ပြချက်။ - ** ယခင် Row တွင်စုစုပေါင်း / ငွေပမာဏ ** (တဖြည်းဖြည်းတိုးပွားလာအခွန်သို့မဟုတ်စွဲချက်တွေအတွက်) ။ သင်သည်ဤ option ကိုရွေးချယ်ပါလျှင်, အခွန်ယခင်အတန်း (အခွန် table ထဲမှာ) ပမာဏသို့မဟုတ်စုစုပေါင်းတစ်ရာခိုင်နှုန်းအဖြစ်လျှောက်ထားပါလိမ့်မည်။ - ** (ဖော်ပြခဲ့သောကဲ့သို့) ** အမှန်တကယ်။ 2. အကောင့်အကြီးအကဲ: အခွန် / အုပ် (ရေကြောင်းနှင့်တူ) အနေနဲ့ဝင်ငွေသည်သို့မဟုတ်ကကုန်ကျစရိတ် Center ကဆန့်ကျင်ဘွတ်ကင်ရန်လိုအပ်ပါသည် expense အကယ်. : ဤအခွန် 3 ကုန်ကျစရိတ် Center ကကြိုတင်ဘွတ်ကင်လိမ့်မည်ဟူသောလက်အောက်ရှိအကောင့်လယ်ဂျာ။ 4. Description: (ကုန်ပို့လွှာ / quote တွေအတွက်ပုံနှိပ်လိမ့်မည်ဟု) အခွန်၏ဖော်ပြချက်။ 5. Rate: အခွန်နှုန်းက။ 6. ငွေပမာဏ: အခွန်ပမာဏ။ 7. စုစုပေါင်း: ဤအချက်မှတဖြည်းဖြည်းတိုးပွားများပြားလာစုစုပေါင်း။ 8. Row Enter: &quot;ယခင် Row စုစုပေါင်း&quot; အပေါ်အခြေခံပြီး အကယ်. သင်သည်ဤတွက်ချက်မှုတစ်ခုအခြေစိုက်စခန်းအဖြစ်ယူကြလိမ့်မည်ဟူသောအတန်းအရေအတွက် (default အနေနဲ့ယခင်အတန်းသည်) ကို select လုပ်ပေးနိုင်ပါတယ်။ 9. တွေအတွက်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ: အခွန် / အုပ်အဘိုးပြတ် (စုစုပေါင်း၏မအစိတ်အပိုင်း) သည်သို့မဟုတ်သာစုစုပေါင်း (ပစ္စည်းမှတန်ဖိုးကိုထည့်သွင်းမမ) သို့မဟုတ်နှစ်ဦးစလုံးသည်သာလျှင်ဤအပိုင်းကိုသင်သတ်မှတ်နိုင်ပါတယ်။ 10. Add သို့မဟုတ်ထုတ်ယူ: သင်အခွန် add သို့မဟုတ်နှိမ်ချင်ဖြစ်စေ။"
-DocType: Note,Note,မှတ်ချက်
+10. Add or Deduct: Whether you want to add or deduct the tax.","အားလုံးဝယ်ယူခြင်းငွေကြေးကိစ္စရှင်းလင်းမှုမှလျှောက်ထားနိုင်ပါသည်က Standard အခွန် Simple template ။ * ဤ template ကိုအခွန်ဦးခေါင်းစာရင်းမဆံ့နိုင်ပြီးကိုလည်း &quot;Shipping&quot;, &quot;အာမခံ&quot; စသည်တို့ကို &quot;ကိုင်တွယ်ခြင်း&quot; #### ကဲ့သို့အခြားစရိတ်အကြီးအကဲများသင်ဒီမှာသတ်မှတ်အဆိုပါအခွန်နှုန်းထားကိုအားလုံး ** ပစ္စည်းများများအတွက်စံအခွန်နှုန်းကဖွစျလိမျ့မညျမှတ်ချက် * ။ ကွဲပြားခြားနားသောနှုန်းထားများရှိသည် ** ပစ္စည်းများ ** ရှိပါတယ် အကယ်. သူတို့ ** Item ခွန်အတွက်ကဆက်ပြောသည်ရမည် ** ဇယားသည် ** Item ** မာစတာအတွက်။ ဒါဟာ ** စုစုပေါင်း ** Net ပေါ်မှာဖြစ်နိုင် (ထိုအခြေခံပမာဏ၏ပေါင်းလဒ်သည်) -:-Columns 1. တွက်ချက် Type ၏ #### ဖော်ပြချက်။ - ** ယခင် Row တွင်စုစုပေါင်း / ငွေပမာဏ ** (တဖြည်းဖြည်းတိုးပွားလာအခွန်သို့မဟုတ်စွဲချက်တွေအတွက်) ။ သင်သည်ဤ option ကိုရွေးချယ်ပါလျှင်, အခွန်ယခင်အတန်း (အခွန် table ထဲမှာ) ပမာဏသို့မဟုတ်စုစုပေါင်းတစ်ရာခိုင်နှုန်းအဖြစ်လျှောက်ထားပါလိမ့်မည်။ - ** (ဖော်ပြခဲ့သောကဲ့သို့) ** အမှန်တကယ်။ 2. အကောင့်အကြီးအကဲ: အခွန် / အုပ် (ရေကြောင်းနှင့်တူ) အနေနဲ့ဝင်ငွေသည်သို့မဟုတ်ကကုန်ကျစရိတ် Center ကဆန့်ကျင်ဘွတ်ကင်ရန်လိုအပ်ပါသည် expense အကယ်. : ဤအခွန် 3 ကုန်ကျစရိတ် Center ကကြိုတင်ဘွတ်ကင်လိမ့်မည်ဟူသောလက်အောက်ရှိအကောင့်လယ်ဂျာ။ 4. Description: (ကုန်ပို့လွှာ / quote တွေအတွက်ပုံနှိပ်လိမ့်မည်ဟု) အခွန်၏ဖော်ပြချက်။ 5. Rate: အခွန်နှုန်းက။ 6. ငွေပမာဏ: အခွန်ပမာဏ။ 7. စုစုပေါင်း: ဤအချက်မှတဖြည်းဖြည်းတိုးပွားများပြားလာစုစုပေါင်း။ 8. Row Enter: &quot;ယခင် Row စုစုပေါင်း&quot; အပေါ်အခြေခံပြီး အကယ်. သင်သည်ဤတွက်ချက်မှုတစ်ခုအခြေစိုက်စခန်းအဖြစ်ယူကြလိမ့်မည်ဟူသောအတန်းအရေအတွက် (default အနေနဲ့ယခင်အတန်းသည်) ကို select လုပ်ပေးနိုင်ပါတယ်။ 9. တွေအတွက်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ: အခွန် / အုပ်အဘိုးပြတ် (စုစုပေါင်း၏မအစိတ်အပိုင်း) သည်သို့မဟုတ်သာစုစုပေါင်း (ပစ္စည်းမှတန်ဖိုးကိုထည့်သွင်းမမ) သို့မဟုတ်နှစ်ဦးစလုံးသည်သာလျှင်ဤအပိုင်းကိုသင်သတ်မှတ်နိုင်ပါတယ်။ 10. Add သို့မဟုတ်ထုတ်ယူ: သင်အခွန် add သို့မဟုတ်နှိမ်ချင်ဖြစ်စေ။"
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
-DocType: Email Account,Email Ids,အီးမေးလ် IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
 DocType: Global Defaults,Hide Currency Symbol,ငွေကြေးစနစ်သင်္ကေတဝှက်
@@ -2039,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,ခရက်ဒစ်မှတ်ချက်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},ပြီးစီး Qty {1} စစ်ဆင်ရေးသည် {0} ထက်ပိုမဖွစျနိုငျ
 DocType: Features Setup,Quality,အရည်အသွေးပြည့်
-DocType: Contact Us Settings,Introduction,နိဒါန်း
 DocType: Warranty Claim,Service Address,Service ကိုလိပ်စာ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတို့အတွက် max 100 ကိုတန်းစီ။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတို့အတွက် max 100 ကိုတန်းစီ။
 DocType: Stock Entry,Manufacture,ပြုလုပ်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,ပထမဦးဆုံး Delivery Note ကိုနှစ်သက်သော
 DocType: Purchase Invoice,Currency and Price List,ငွေကြေးနှင့်စျေးနှုန်းကိုစာရင်း
 DocType: Opportunity,Customer / Lead Name,customer / ခဲအမည်
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,ထုတ်လုပ်မှု
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,ထုတ်လုပ်မှု
 DocType: Item,Allow Production Order,ထုတ်လုပ်မှုအမိန့် Allow
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
 DocType: Lead,Fax,ဖက်စ်
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Submitted
 DocType: Salary Structure,Total Earning,စုစုပေါင်းဝင်ငွေ
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,အကြှနျုပျ၏လိပ်စာ
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,သို့မဟုတ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-အထက်
 DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
-,Download Backups,ဒေါင်းလုပ်ရန်များ
 DocType: Notification Control,Sales Order Message,အရောင်းအမိန့် Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ငွေပေးချေမှုရမည့် Type
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
 DocType: Bank Reconciliation,To Date,ယနေ့အထိ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,အသေးစိတ်အချက်အလက်များကို
 DocType: Purchase Invoice,Total Taxes and Charges,စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်
 DocType: Employee,Emergency Contact,အရေးပေါ်ဆက်သွယ်ရန်
 DocType: Item,Quality Parameters,အရည်အသွေးအ Parameter များကို
@@ -2087,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,serial No / Batch
 DocType: Product Bundle,Parent Item,မိဘ Item
 DocType: Account,Account Type,Account Type
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
@@ -2094,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
 DocType: Landed Cost Voucher,Purchase Receipt Items,Receipt ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,အထူးပြုလုပ်ခြင်း Form များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ဖြတ်တောက်ခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ပြစ်
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,မှို
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
-apps/frappe/frappe/desk/moduleview.py +61,Documents,စာရွက်စာတမ်းများ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,ကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,ဘောက်ချာ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,ဘောက်ချာ #
 DocType: Notification Control,Purchase Order Message,အမိန့် Message ယ်ယူ
 DocType: Tax Rule,Shipping Country,သဘောင်္တင်ခနိုင်ငံဆိုင်ရာ
 DocType: Upload Attendance,Upload HTML,HTML ကို upload
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",အမိန့် {1} ကို Grand စုစုပေါင်းထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျ ({2}) ဆန့်ကျင်စုစုပေါင်းကြိုတင်မဲ ({0})
 DocType: Employee,Relieving Date,နေ့စွဲ Relieving
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","စျေးနှုန်းနည်းဥပဒေအချို့သတ်မှတ်ချက်များအပေါ်အခြေခံပြီး, လျှော့စျေးရာခိုင်နှုန်းသတ်မှတ် / စျေးနှုန်း List ကို overwrite မှလုပ်ဖြစ်ပါတယ်။"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ဂိုဒေါင်သာစတော့အိတ် Entry / Delivery မှတ်ချက် / ဝယ်ယူခြင်းပြေစာကနေတဆင့်ပြောင်းလဲနိုင်ပါသည်
 DocType: Employee Education,Class / Percentage,class / ရေရာခိုင်နှုန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ဝင်ငွေခွန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,လေဆာရာလမ်း၌ကွန်ရွက် shaping သည်အင်ဂျင်နီယာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ရွေးချယ်ထားသည့်စျေးနှုန်းများ Rule &#39;စျေးနှုန်း&#39; &#39;အဘို့သည်ဆိုပါကစျေးနှုန်း List ကို overwrite လုပ်သွားမှာ။ စျေးနှုန်း Rule စျေးနှုန်းနောက်ဆုံးစျေးနှုန်းဖြစ်ပါတယ်, ဒါကြောင့်အဘယ်သူမျှမကနောက်ထပ်လျှော့စျေးလျှောက်ထားရပါမည်။ ဒါကွောငျ့, အရောင်းအမိန့်, ဝယ်ယူခြင်းအမိန့်စသည်တို့ကဲ့သို့သောကိစ္စများကိုအတွက်ကြောင့်မဟုတ်ဘဲ &#39;&#39; စျေးနှုန်း List ကို Rate &#39;&#39; လယ်ပြင်ထက်, &#39;&#39; Rate &#39;&#39; လယ်ပြင်၌ခေါ်ယူသောအခါလိမ့်မည်။"
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
@@ -2127,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
-DocType: User,Bio,ဇီဝ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,မျှမတွေ့ပါက default လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့် Branding&gt; လိပ်စာ Template ကနေအသစ်တစ်လုံးဖန်တီးပေးပါ။
 DocType: Appraisal,HR User,HR အသုံးပြုသူတို့၏
@@ -2142,46 +1973,39 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,အပိုအကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,အပိုအကြီးစား
 ,Profit and Loss Statement,အမြတ်နှင့်အရှုံးထုတ်ပြန်ကြေညာချက်
 DocType: Bank Reconciliation Detail,Cheque Number,Cheques နံပါတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,ဝန်လေးသော
 DocType: Payment Tool Detail,Payment Tool Detail,ငွေပေးချေမှုရမည့် Tool ကို Detail
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ဒေသဆိုင်ရာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),ချေးငွေနှင့်ကြိုတင်ငွေ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ငျြ့ရမညျအကွောငျး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,အဘယ်သူမျှမန်ထမ်းတွေ့ရှိ!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,အကြီးစား
 DocType: C-Form Invoice Detail,Territory,နယျမွေ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Purchase Order,Customer Address Display,customer လိပ်စာ Display ကို
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,အရောင်တင်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","ပစ္စည်းအဘို့အတိုင်း၏ default အနေနဲ့ယူနစ် {0} သင်ပြီးသားကိုအခြား UOM နှင့်အတူအချို့သောအရောင်းအဝယ် (သို့) စေပြီ \ ဘာဖြစ်လို့လဲဆိုတော့ကိုတိုက်ရိုက်ပြောင်းလဲသွားမရနိုင်ပါ။ default အနေနဲ့ UOM, \ အသုံးပြုမှုကိုပြောင်းလဲဖို့တော့အိတ် module ကိုအောက်မှ tool ကို &#39;&#39; UOM Utility ကိုအစားထိုး &#39;&#39; ။"
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,စျေးနှုန်း {0} ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,စုစုပေါင်းထူးချွန်ငွေပမာဏ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,ဝန်ထမ်း {0} {1} အပေါ်ခွင့်ရှိ၏။ တက်ရောက်သူအထိမ်းအမှတ်နိုင်ဘူး။
 DocType: Sales Partner,Targets,ပစ်မှတ်
 DocType: Price List,Price List Master,စျေးနှုန်း List ကိုမဟာ
-DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
+DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
 ,S.O. No.,SO အမှတ်
 DocType: Production Order Operation,Make Time Log,အချိန်အထဲလုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,reorder အအရေအတွက်သတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,ကွန်ပျူတာများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,electro-ဓာတုကြိတ်
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,သင်စာရင်းကိုင် Entries စတင်ခင် setup ကိုအကောင့်အသစ်များ၏သင့်ရဲ့ဇယား ကျေးဇူးပြု.
 DocType: Purchase Invoice,Ignore Pricing Rule,စျေးနှုန်းများ Rule Ignore
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ဖျက်သိမ်း
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,နေ့စွဲကနေလစာဖွဲ့စည်းပုံထဲမှာန်ထမ်းအတူနေ့စွဲထက်လျှော့နည်းလို့မရပါဘူး။
 DocType: Employee Education,Graduate,ဘွဲ့ရသည်
 DocType: Leave Block List,Block Days,block Days
@@ -2199,14 +2023,13 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","အရောင်းနှင့်ဝယ်ယူထည့်သွင်းနိုင်ပါသည်က Standard စည်းကမ်းသတ်မှတ်ချက်များ။ ဥပမာ: ကမ်းလှမ်းမှုကို၏ 1. သက်တမ်းရှိ။ 1. ငွေပေးချေမှုရမည့်ဝေါဟာရများ (Advance မှာတော့ Credit တွင်တစ်စိတ်တစ်ပိုင်းကြိုတင်မဲစသည်တို့) ။ 1. အပို (သို့မဟုတ်ဖောက်သည်များကပေးဆောင်) သည်အဘယ်သို့။ 1. ဘေးကင်းရေး / အသုံးပြုမှုသတိပေးချက်ကို။ 1. အာမခံရှိလျှင်။ 1. မူဝါဒပြန်ပို့ပေးသည်။ သက်ဆိုင်လျှင်, တင်ပို့၏ 1. သက်မှတ်ချက်များ။ စသည်တို့အငြင်းပွားမှုများဖြေရှင်း၏ 1. နည်းလမ်းများ, လျော်ကြေး, တာဝန်ယူမှု, 1. လိပ်စာနှင့်သင့် Company ၏ဆက်သွယ်ရန်။"
+1. Address and Contact of your Company.","အရောင်းနှင့်ဝယ်ယူထည့်သွင်းနိုင်ပါသည်က Standard စည်းကမ်းသတ်မှတ်ချက်များ။ ဥပမာ: ကမ်းလှမ်းမှုကို၏ 1. သက်တမ်းရှိ။ 1. ငွေပေးချေမှုရမည့်ဝေါဟာရများ (Advance မှာတော့ Credit တွင်တစ်စိတ်တစ်ပိုင်းကြိုတင်မဲစသည်တို့) ။ 1. အပို (သို့မဟုတ်ဖောက်သည်များကပေးဆောင်) သည်အဘယ်သို့။ 1. ဘေးကင်းရေး / အသုံးပြုမှုသတိပေးချက်ကို။ 1. အာမခံရှိလျှင်။ 1. မူဝါဒပြန်ပို့ပေးသည်။ သက်ဆိုင်လျှင်, တင်ပို့၏ 1. သက်မှတ်ချက်များ။ စသည်တို့အငြင်းပွားမှုများဖြေရှင်း၏ 1. နည်းလမ်းများ, လျော်ကြေး, တာဝန်ယူမှု, 1. လိပ်စာနှင့်သင့် Company ၏ဆက်သွယ်ရန်။"
 DocType: Attendance,Leave Type,Type Leave
 apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,စရိတ် / Difference အကောင့်ကို ({0}) တစ်ဦး &#39;&#39; အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်း &#39;&#39; အကောင့်ကိုရှိရမည်
 DocType: Account,Accounts User,အသုံးပြုသူအကောင့်
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","ကုန်ပို့လွှာထပ်တလဲလဲလျှင်စစ်ဆေး, ထပ်တလဲလဲရပ်တန့်သို့မဟုတ်သင့်လျော် End Date ကိုတင် uncheck"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
 DocType: Packing Slip,If more than one package of the same type (for print),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,ခွင့်ပြုအများဆုံး {0} တန်း
 DocType: C-Form Invoice Detail,Net Total,Net ကစုစုပေါင်း
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),ငွေတောင်းခံ (အရောင်းပြေစာ)
@@ -2223,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,ရည်ရွယ်ချက်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","စစ်ဆင်ရေး {0} ရှည်ကို Workstation {1} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,electrochemical machine
 ,Requested,မေတ္တာရပ်ခံ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,အဘယ်သူမျှမမှတ်ချက်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,မပွေကုနျနသော
 DocType: Account,Stock Received But Not Billed,စတော့အိတ်ရရှိထားသည့်ဒါပေမဲ့ကြေညာတဲ့မ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,gross Pay ကို + ကြွေးကျန်ပမာဏ + Encashment ပမာဏ - စုစုပေါင်းထုတ်ယူ
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Features Setup,Sales and Purchase,အရောင်းနှင့်ဝယ်ယူခြင်း
 DocType: Supplier Quotation Item,Material Request No,material တောင်းဆိုမှုမရှိပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ဖောက်သည်ရဲ့ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ဒီစာရင်းထဲကအောင်မြင်စွာ unsubscribe သိရသည်။
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net က Rate (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/frappe/frappe/templates/base.html +134,Added,Added
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,နယ်မြေတွေကို Tree Manage ။
 DocType: Journal Entry Account,Sales Invoice,အရောင်းပြေစာ
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
@@ -2250,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရဘူး။
 DocType: Bank Reconciliation,Get Relevant Entries,သက်ဆိုင်ရာလုပ်ငန်း Entries Get
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
-apps/frappe/frappe/desk/query_report.py +136,Total,စုစုပေါင်း
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
 DocType: Account,Root Type,အမြစ်ကအမျိုးအစား
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
@@ -2264,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target ကဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
 DocType: Quality Inspection,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,ဖွဲ့စည်းဖြန်းလိုက်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,အပိုအသေးစား
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL သို့မဟုတ် BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,နိမ့်ဆုံးစာရင်းအဆင့်
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2282,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,ထုတ်လုပ်သူအပိုင်းနံပါတ်
 DocType: Production Order Operation,Estimated Time and Cost,ခန့်မှန်းခြေအချိန်နှင့်ကုန်ကျစရိတ်
 DocType: Bin,Bin,ကျီငယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,နှာခေါင်း
 DocType: SMS Log,No of Sent SMS,Sent SMS ၏မရှိပါ
 DocType: Account,Company,ကုမ္ပဏီ
 DocType: Account,Expense Account,စရိတ်အကောင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software များ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,အရောင်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,အရောင်
 DocType: Maintenance Visit,Scheduled,Scheduled
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;စတော့အိတ် Item ရှိ၏&quot; ဘယ်မှာ Item ကို select &quot;No&quot; ဖြစ်ပါတယ်နှင့် &quot;အရောင်း Item ရှိ၏&quot; &quot;ဟုတ်တယ်&quot; ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ညီလအတွင်းအနှံ့ပစ်မှတ်ဖြန့်ဝေရန်လစဉ်ဖြန့်ဖြူးကိုရွေးချယ်ပါ။
 DocType: Purchase Invoice Item,Valuation Rate,အဘိုးပြတ် Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,item Row {0}: ဝယ်ယူခြင်း Receipt {1} အထက် &#39;&#39; ဝယ်ယူလက်ခံ &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project မှ Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
 DocType: Installation Note Item,Against Document No,Document ဖိုင်မျှဆန့်ကျင်
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,အရောင်း Partners Manage ။
 DocType: Quality Inspection,Inspection Type,စစ်ဆေးရေး Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},{0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,သုတေသီတစ်ဦး
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update ကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,သုတေသီတစ်ဦး
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,ပို့သည့်ရှေ့တော်၌ထိုသတင်းလွှာကိုကယ်တင် ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,အမည်သို့မဟုတ်အီးမေးလ်မသင်မနေရ
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,incoming အရည်အသွေးအစစ်ဆေးခံရ။
 DocType: Purchase Order Item,Returned Qty,ပြန်လာသော Qty
 DocType: Employee,Exit,ထွက်ပေါက်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,serial No {0} နေသူများကဖန်တီး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory ပြီး
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",ဖောက်သည်များအဆင်ပြေဤ codes တွေကိုငွေတောင်းခံလွှာနှင့် Delivery မှတ်စုများတူပုံနှိပ်ပုံစံများဖြင့်အသုံးပြုနိုင်
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
 DocType: Sales Invoice,Advertisement,ကျွွောငာခကျြ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Probationary Period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Probationary Period
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ထောက်ပံ့ဝယ်ယူ Receipt Item
@@ -2325,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Datetime မှ
 DocType: SMS Settings,SMS Gateway URL,SMS ကို Gateway က URL ကို
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ကြိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,ထုပ်ပိုးကျုံ့
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,အတည်ပြုပြောကြား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ပေးသွင်း&gt; ပေးသွင်း Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ရောစပ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Address,Preferred Shipping Address,ပိုဦးစားပေးသည် Shipping လိပ်စာ
 DocType: Purchase Receipt Item,Accepted Warehouse,လက်ခံထားတဲ့ဂိုဒေါင်
 DocType: Bank Reconciliation Detail,Posting Date,Post date
 DocType: Item,Valuation Method,အဘိုးပြတ် Method ကို
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} {1} ရန်အဘို့အငွေလဲနှုန်းရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Sales Invoice,Sales Team,အရောင်းရေးအဖွဲ့
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,entry ကို Duplicate
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,entry ကို Duplicate
 DocType: Serial No,Under Warranty,အာမခံအောက်မှာ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[အမှား]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,သင်အရောင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
 DocType: Pricing Rule,Discount Percentage,လျော့စျေးရာခိုင်နှုန်း
 DocType: Payment Reconciliation Invoice,Invoice Number,ကုန်ပို့လွှာနံပါတ်
-apps/erpnext/erpnext/hooks.py +70,Orders,အမိန့်
+apps/erpnext/erpnext/hooks.py +54,Orders,အမိန့်
 DocType: Leave Control Panel,Employee Type,ဝန်ထမ်းကအမျိုးအစား
 DocType: Employee Leave Approver,Leave Approver,ခွင့်ပြုချက် Leave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,ထုတ်လုပ်ခြင်းများအတွက်သို့လွှဲပြောင်း material
 DocType: Expense Claim,"A user with ""Expense Approver"" role",&quot;သုံးစွဲမှုအတည်ပြုချက်&quot; အခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူတစ်ဦး
 ,Issued Items Against Production Order,ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်ထုတ်ပေးပစ္စည်းများ
@@ -2373,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,မမှန်ကန်ခြင်းကာလအတွင်း
 DocType: Customer,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,အရောင်းအဝယ်အမျိုးအစားကိုရွေးပါ
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
@@ -2383,11 +2195,10 @@
 DocType: Customer,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Customer,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Employee,Feedback,တုံ့ပြန်ချက်
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,maint ။ ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,ပွန်းစားဂျက်လေယာဉ် machine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,maint ။ ဇယား
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
-DocType: Website Settings,Website Settings,website Settings ကို
 DocType: Item,Reorder level based on Warehouse,ဂိုဒေါင်အပေါ်အခြေခံပြီး reorder level ကို
 DocType: Activity Cost,Billing Rate,ငွေတောင်းခံ Rate
 ,Qty to Deliver,လှတျတျောမူဖို့ Qty
@@ -2398,20 +2209,19 @@
 DocType: Material Request,Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ
 DocType: Quotation Item,Against Doctype,DOCTYPE ဆန့်ကျင်
 DocType: Delivery Note,Track this Delivery Note against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤ Delivery Note ကိုခြေရာခံ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root account ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Show ကိုစတော့အိတ် Entries
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,လိပ်စာ Manage
 DocType: Pricing Rule,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
-DocType: Communication,Phone,Phone များ
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Contact,Passive,မလှုပ်မရှားနေသော
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
@@ -2427,10 +2237,9 @@
 ,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Updates ကိုရယူပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,စီမံခန့်ခွဲမှု Leave
-DocType: Event,Groups,အုပ်စုများ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,အကောင့်အားဖြင့်အုပ်စု
 DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
 DocType: Lead,Lower Income,lower ဝင်ငွေခွန်
@@ -2439,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,လျင်မြန်စွာအကူအညီ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
 DocType: Features Setup,Sales Extras,အရောင်း Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ကုန်ကျစရိတ် Center ကဆန့်ကျင်အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ကုန်ကျစရိတ် Center ကဆန့်ကျင်အကောင့်အတွက်ဘတ်ဂျက် {1} {2} {3} အားဖြင့်ကျော်လွန်ပါလိမ့်မယ်
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,မိနစ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,မိနစ်
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 ,Qty to Receive,လက်ခံမှ Qty
 DocType: Leave Block List,Leave Block List Allowed,Block List ကို Allowed Leave
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ကူးပြောင်းခြင်းအချက်အပိုငျးအရှိမဖြစ်နိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,သင်ဟာ Login အသုံးပြုလိမ့်မည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,သင်ဟာ Login အသုံးပြုလိမ့်မည်
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Browse ကို BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,လုံခြုံသောချေးငွေ
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome ကိုထုတ်ကုန်ပစ္စည်းများ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome ကိုထုတ်ကုန်ပစ္စည်းများ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,သင် Block နေ့ရက်များပေါ်တွင်အရွက်ကအတည်ပြုဖို့အခွင့်ရနေကြသည်မဟုတ်အဖြစ်ခွင့်အတည်ပြုလို့မရပါဘူး
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,ဆုံးရှုံး-မြှုပ်သွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,ကားပုံ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Workstation Working Hour,Start Time,Start ကိုအချိန်
@@ -2486,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: BOM Operation,Hour Rate,အချိန်နာရီနှုန်း
 DocType: Stock Settings,Item Naming By,အားဖြင့်အမည် item
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,စျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,စျေးနှုန်းအနေဖြင့်
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{0} {1} ပြီးနောက်ဖန်ဆင်းခဲ့နောက်ထပ်ကာလသင်တန်းဆင်းပွဲ Entry &#39;
 DocType: Production Order,Material Transferred for Manufacturing,ကုန်ထုတ်လုပ်မှုသည်လွှဲပြောင်း material
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,အကောင့်ကို {0} တည်ရှိပါဘူး
 DocType: Purchase Receipt Item,Purchase Order Item No,ဝယ်ယူခြင်းအမိန့် Item မရှိပါ
-DocType: System Settings,System Settings,System Settings
 DocType: Project,Project Type,စီမံကိန်းကအမျိုးအစား
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,အမျိုးမျိုးသောလှုပ်ရှားမှုများကုန်ကျစရိတ်
@@ -2500,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,လက်၌ငွေသား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,ငါ့အတင်ပို့မှု
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,ငါ့အတင်ပို့မှု
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
-DocType: Communication,Recipients,လက်ခံသူများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 DocType: Hub Settings,Publish Items to Hub,Hub မှပစ္စည်းများထုတ်ဝေ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},တန်ဖိုးမြှင်ထံမှအတန်း {0} အတွက်တန်ဖိုးထက်နည်းရှိရမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,ငွေလွှဲခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,ဘဏ်မှအကောင့်ကို select ကျေးဇူးပြု.
 DocType: Newsletter,Create and Send Newsletters,သတင်းလွှာ Create နှင့် Send
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,နေ့စွဲကနေနေ့စွဲရန်မီဖြစ်ရမည်
 DocType: Sales Order,Recurring Order,ထပ်တလဲလဲအမိန့်
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
 DocType: Item Group,Check this if you want to show in website,သင်ဝက်ဘ်ဆိုက်အတွက်ကိုပြချင်တယ်ဆိုရင်ဒီစစ်ဆေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
+,Welcome to ERPNext,ERPNext မှလှိုက်လှဲစွာကြိုဆိုပါသည်
 DocType: Payment Reconciliation Payment,Voucher Detail Number,ဘောက်ချာ Detail နံပါတ်
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,စျေးနှုန်းဆီသို့ဦးတည်
 DocType: Lead,From Customer,ဖောက်သည်ထံမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,ဖုန်းခေါ်ဆိုမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,ဖုန်းခေါ်ဆိုမှု
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 ,Projected,စီမံကိန်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
@@ -2537,13 +2338,10 @@
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
 DocType: Journal Entry,Remark,ပွောဆို
 DocType: Purchase Receipt Item,Rate and Amount,rate နှင့်ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,ထွင်းဖေါက်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,အရောင်းအမိန့်ကနေ
-DocType: Blog Category,Parent Website Route,မိဘဝက်ဘ်ဆိုက်လမ်းကြောင်း
 DocType: Sales Order,Not Billed,ကြေညာတဲ့မ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,နှစ်ဦးစလုံးဂိုဒေါင်အတူတူကုမ္ပဏီပိုင်ရမယ်
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,တက်ကြွသောမ
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ကုန်ကျစရိတ်ဘောက်ချာငွေပမာဏဆင်းသက်
 DocType: Time Log,Batched for Billing,Billing သည် Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ပေးသွင်းခြင်းဖြင့်ကြီးပြင်းဥပဒေကြမ်းများ။
@@ -2551,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,လျော့စျေးပမာဏ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ဥပမာ VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,ဥပမာ VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot သတ္တုဓာတ်ငွေ့ဖွဲ့စည်း
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမိန့်နေ့စွဲ
 DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,ဂိုဒေါင် {0}: ကုမ္ပဏီမသင်မနေရ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",သင့်လျော်သောအုပ်စုရန်ပုံငွေ&gt; လက်ရှိမှုစိစစ်&gt; အခွန်နှင့်တာဝန်၏ (များသောအားဖြင့်အရင်းအမြစ်ကိုသွားပါအသစ်တစ်ခုအကောင့်ဖန်တီး (ကလေး Add ကိုနှိပ်ခြင်းအားဖြင့်) အမျိုးအစား &quot;ခွန်&quot; ၏နှင့်အခွန်နှုန်းကိုဖော်ပြရန်လုပ်ပါ။
-,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
+,Payment Period Based On Invoice Date,ပြေစာနေ့စွဲတွင် အခြေခံ. ငွေပေးချေမှုရမည့်ကာလ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,လေဆာဖြတ်တောက်ခြင်း
-DocType: Event,Monday,တနင်္လာနေ့
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Account,Payable,ပေးအပ်သော
 DocType: Salary Slip,Arrear Amount,ကြွေးကျန်ပမာဏ
@@ -2577,7 +2372,6 @@
 DocType: Lead,Address Desc,Desc လိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,ရောင်းစျေးသို့မဟုတ်ဝယ်ယူ၏ Atleast တယောက်ရွေးချယ်ထားရမည်ဖြစ်သည်
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,အဘယ်မှာရှိကုန်ထုတ်လုပ်မှုလုပ်ငန်းများကိုသယ်ဆောင်ကြသည်။
-DocType: Page,All,အားလုံး
 DocType: Stock Entry Detail,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
 DocType: Employee,Confirmation Date,အတည်ပြုချက်နေ့စွဲ
@@ -2585,9 +2379,8 @@
 DocType: Account,Sales User,အရောင်းအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,min Qty Max Qty ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ထား
 DocType: Lead,Lead Owner,ခဲပိုင်ရှင်
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,ဂိုဒေါင်လိုအပ်သည်
 DocType: Employee,Marital Status,အိမ်ထောင်ရေးအခြေအနေ
 DocType: Stock Settings,Auto Material Request,မော်တော်ကားပစ္စည်းတောင်းဆိုခြင်း
 DocType: Time Log,Will be updated when billed.,"ကြေညာတဲ့အခါ, updated လိမ့်မည်။"
@@ -2601,44 +2394,40 @@
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ဝယ်ယူခြင်းအမိန့် Item ထောက်ပံ့
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,ကုမ္ပဏီအမည် Company ကိုမဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ပုံနှိပ်တင်းပလိတ်များသည်ခေါင်းစဉ်များငွေလွှဲစာတမ်းတန်ဖိုးပြေစာဥပမာ။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","အမျိုးအစားအီးမေးလ်အားလုံးဆက်သွယ်ရေးစံချိန်, ဖုန်း, chat, အလည်အပတ်ခရီး, etc"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,ကုမ္ပဏီအတွက်က Round ပိတ်ဖော်ပြရန် ကျေးဇူးပြု. ကုန်ကျစရိတ် Center က
 DocType: Purchase Invoice,Terms,သက်မှတ်ချက်များ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,နယူး Create
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,နယူး Create
 DocType: Buying Settings,Purchase Order Required,အမိန့်လိုအပ်ပါသည်ယ်ယူ
 ,Item-wise Sales History,item-ပညာရှိသအရောင်းသမိုင်း
 DocType: Expense Claim,Total Sanctioned Amount,စုစုပေါင်းပိတ်ဆို့ငွေပမာဏ
 ,Purchase Analytics,ဝယ်ယူခြင်း Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Delivery မှတ်ချက် Item
 DocType: Expense Claim,Task,လုပ်ငန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,ရိတ်
 DocType: Purchase Taxes and Charges,Reference Row #,ကိုးကားစရာ Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,"ဒါကအမြစ်ရောင်းအားလူတစ်ဦးဖြစ်ပြီး, edited မရနိုင်ပါ။"
 ,Stock Ledger,စတော့အိတ်လယ်ဂျာ
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,လစာစလစ်ဖြတ်ပိုင်းပုံစံထုတ်ယူ
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,မှတ်စုများ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,ပထမဦးဆုံးအဖွဲ့တစ်ဖွဲ့ node ကိုရွေးချယ်ပါ။
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,သူတို့ရဲ့နောက်ဆုံးစာရင်းအဆင့်အတန်းနှင့်အတူအားလုံးကုန်ကြမ်းင်တစ်ဦးအစီရင်ခံစာ Download
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ကွန်မြူနတီဖိုရမ်၏
 DocType: Leave Application,Leave Balance Before Application,လျှောက်လွှာခင်မှာ Balance Leave
 DocType: SMS Center,Send SMS,SMS ပို့
 DocType: Company,Default Letter Head,default ပေးစာဌာနမှူး
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,ဒါဟာ HR module တစ်ခု၌အုပ်စိုး setting တွင်အသုံးပြုလိမ့်မည်
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
@@ -2650,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,အခွင့်အလမ်းပျောက်ဆုံးသွားသော
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","လျော့စျေး Fields ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူ Receipt, ဝယ်ယူခြင်းပြေစာအတွက်ရရှိနိုင်ပါလိမ့်မည်"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,အသစ်သောအကောင့်အမည်ဖြစ်တယ်။ မှတ်ချက်: Customer နှင့်ပေးသွင်းများအတွက်အကောင့်တွေကိုဖန်တီးကြပါဘူးကျေးဇူးပြုပြီး
-DocType: Report,Report Type,အစီရင်ခံစာ Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,loading
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Tool ကိုအစားထိုးပါ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,တိုင်းပြည်ပညာရှိသောသူကို default လိပ်စာ Templates
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Show ကိုအခွန်ချိုး-up က
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ဒေတာပို့ကုန်သွင်းကုန်
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',သင်ကုန်ထုတ်လုပ်မှုလုပ်ဆောင်မှုအတွက်ပါဝင်ပါ။ Item &#39;&#39; ကုန်ပစ္စည်းထုတ်လုပ်သည် &#39;&#39; နိုင်ပါတယ်
@@ -2665,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
 DocType: Serial No,Out of AMC,AMC ထဲက
 DocType: Purchase Order Item,Material Request Detail No,material တောင်းဆိုမှု Detail မရှိပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ခဲယဉ်းလှည့်
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 DocType: Company,Default Cash Account,default ငွေအကောင့်
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","မှတ်ချက်: ငွေပေးချေမှုဆိုကိုးကားဆန့်ကျင်တော်မသည်မှန်လျှင်, ကို manually ဂျာနယ် Entry &#39;ပါစေ။"
 DocType: Item,Supplier Items,ပေးသွင်းပစ္စည်းများ
 DocType: Opportunity,Opportunity Type,အခွင့်အလမ်းကအမျိုးအစား
@@ -2686,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ပွင့်လင်းအဖြစ် Set
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,မ့အရောင်းအပေါ်ဆက်သွယ်ရန်မှအလိုအလျှောက်အီးမေးလ်များကိုပေးပို့ပါ။
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","row {0}: Qty {2} {3} အပေါ်ဂိုဒေါင် {1} အတွက် avalable မဟုတ်။ ရရှိနိုင်သည့် Qty: {4}, Qty လွှဲပြောင်း: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
-DocType: Event,Sunday,တနင်္ဂနွေ
 DocType: Sales Team,Contribution (%),contribution (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,တာဝန်ဝတ္တရားများ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,template
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,table ထဲမှာ atleast 1 ငွေတောင်းခံလွှာကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,အသုံးပြုသူများအ Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,အသုံးပြုသူများအ Add
 DocType: Pricing Rule,Item Group,item Group က
 DocType: Task,Actual Start Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
 DocType: Item,Default BOM,default BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
-DocType: Time Log Batch,Total Hours,စုစုပေါင်းနာရီ
+DocType: Time Log Batch,Total Hours,စုစုပေါင်းနာရီ
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,မော်တော်ယာဉ်
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,item လိုအပ်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,metal ဆေးထိုးအတု ယူ. ပုံသှငျး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Time Log,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","သင့်ရဲ့နိုင်ငံ, အချိန်ဇုန်နှင့်ငွေကြေးစနစ်ကိုရွေးပါ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ဆားစိမ်ရေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,သဲသွန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,အလုပ်သင်ဆရာဝန်
 DocType: Newsletter,A Lead with this email id should exist,ဒီအီးမေးလ်က id နှင့်အတူတစ်ခဲတည်ရှိနေသင့်ပါတယ်
 DocType: Stock Entry,From BOM,BOM ကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,နေ့စွဲမှတစ်ဝက်နေ့ခွင့်ယူသည်နေ့စွဲ မှစ. အဖြစ်အတူတူဖြစ်သင့်
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Salary Structure,Salary Structure,လစာဖွဲ့စည်းပုံ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","အကွိမျမြားစှာစျေးနှုန်း Rule တူညီသောစံသတ်မှတ်ချက်များနှင့်အတူရှိနေတယ်, ဦးစားပေးသတ်မှတ်ခြင်းအားဖြင့်ပဋိပက္ခဖြေရှင်းရန် \ ကိုကျေးဇူးတင်ပါ။ စျေးနှုန်းနည်းဥပဒေများ: {0}"
 DocType: Account,Bank,ကမ်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 DocType: Hub Settings,Access Token,Access Token
@@ -2753,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Fixed Asset Item ဖြစ်ပါတယ်
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",သင်ရှည်လျားပုံနှိပ်ပုံစံများရှိပါကဒီ feature တစ်ခုချင်းစီစာမျက်နှာပေါ်မှာရှိသမျှ headers နှင့် footer နှင့်အတူမျိုးစုံစာမျက်နှာများပေါ်တွင်ပုံနှိပ်ခံရဖို့ page ကိုခွဲထွက်ဖို့အသုံးပြုနိုင်ပါတယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,အားလုံးသည် Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 DocType: Fiscal Year,Year Name,တစ်နှစ်တာအမည်
 DocType: Process Payroll,Process Payroll,Process ကိုလစာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
 DocType: Product Bundle Item,Product Bundle Item,ထုတ်ကုန်ပစ္စည်း Bundle ကို Item
 DocType: Sales Partner,Sales Partner Name,အရောင်း Partner အမည်
 DocType: Purchase Invoice Item,Image View,image ကိုကြည့်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finish &amp; စက်မှုဇုန်ပြီး
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities မှ &amp; ကုန်စည်ဒိုင်
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,ရေနံတွင်းတူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ထိုးနှက်အတု ယူ. ပုံသှငျး
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
 DocType: Tax Rule,Shipping City,သဘောင်္တင်ခစီးတီး
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ဒါဟာ Item {0} (Template) ၏ Variant ဖြစ်ပါတယ်။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် Attribute တွေတင်းပလိတ်ဖိုင်ကနေကော်ပီကူးပါလိမ့်မည်
-DocType: Account,Purchase User,ဝယ်ယူအသုံးပြုသူ
+DocType: Account,Purchase User,ဝယ်ယူအသုံးပြုသူ
 DocType: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,တူ
-DocType: Web Page,Slideshow,ဆလိုက်ရှိုး
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
 DocType: Journal Entry,Print Heading,ပုံနှိပ် HEAD
 DocType: Quotation,Maintenance Manager,ပြုပြင်ထိန်းသိမ်းမှု Manager က
-DocType: Workflow State,Search,ရှာဖှေ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,စုစုပေါင်းသုညမဖြစ်နိုင်
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,ထက် သာ. ကြီးမြတ်သို့မဟုတ်သုညနဲ့ညီမျှဖြစ်ရမည် &#39;&#39; ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. Days &#39;ဟူ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,မှစ. ပြင်ဆင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,ကုန်ကြမ်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,ကလေးသူငယ်အကောင့်ကိုဒီအကောင့်ရှိနေပြီ။ သင်သည်ဤအကောင့်ကိုမဖျက်နိုင်ပါ။
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
@@ -2800,42 +2570,40 @@
 ,Produced,ထုတ်လုပ်
 DocType: Item,Item Code for Suppliers,ပေးသွင်းသည် item Code ကို
 DocType: Issue,Raised By (Email),(အီးမေးလ်) အားဖြင့်ထမြောက်စေတော်
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ယေဘုယျ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Letterhead Attach
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ယေဘုယျ
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Letterhead Attach
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
 DocType: Authorization Rule,Applicable To (Designation),(သတ်မှတ်ပေးထားခြင်း) ရန်သက်ဆိုင်သော
-DocType: Blog Post,Blog Post,ဘလော့ Post က
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group မှဖြင့်
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / ငွေကြေးများ disable ။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,စာတိုက်အသုံးစရိတ်များ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါင်း (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,ထပ်တလဲလဲအမိန့်ရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Quality Inspection,Item Serial No,item Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} လျှော့ချရမည်သို့မဟုတ်သင်လျတ်သည်းခံစိတ်ကိုတိုးမြှင့်သင့်ပါတယ်
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,စုစုပေါင်းလက်ရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,နာရီ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,နာရီ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,စျေးနှုန်း Create
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
 DocType: Features Setup,Point of Sale,ရောင်းမည်၏ပွိုင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,များအဖြစ်
 DocType: Account,Tax,အခွန်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},row {0}: {1} တရားဝင် {2} မဟုတ်ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,သန့်စင်
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},row {0}: {1} တရားဝင် {2} မဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုမှသည်
 DocType: Production Planning Tool,Production Planning Tool,ထုတ်လုပ်မှုစီမံကိန်း Tool ကို
 DocType: Quality Inspection,Report Date,အစီရင်ခံစာနေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,routing
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} လက်ခံရယူ
@@ -2846,33 +2614,29 @@
 DocType: Stock Entry,Update Rate and Availability,နှုန်းနှင့် Available Update
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ရာခိုင်နှုန်းသင်အမိန့်ကိုဆန့်ကျင်အရေအတွက်ပိုမိုလက်ခံရယူသို့မဟုတ်ကယ်လွှတ်ခြင်းငှါခွင့်ပြုထားပါသည်။ ဥပမာ: သင်က 100 ယူနစ်အမိန့်ရပြီဆိုပါက။ နှင့်သင်၏ Allow သင် 110 ယူနစ်ကိုခံယူခွင့်ရနေကြပြီးတော့ 10% ဖြစ်ပါတယ်။
 DocType: Pricing Rule,Customer Group,ဖောက်သည်အုပ်စု
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: Item,Website Description,website ဖော်ပြချက်များ
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
 DocType: Address,Plant,စက်ရုံ
-DocType: DocType,Setup,တည်ဆောက်သည်
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,အေးလှိမ့်
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
 DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
 DocType: Item,Attributes,Attribute တွေ
-DocType: Packing Slip,Get Items,ပစ္စည်းများ Get
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,ပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
-DocType: DocField,Image,image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ယစ်မျိုးပြေစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
-DocType: Communication,Other,အခြား
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,စစ်ဆင်ရေး ID ကိုစွဲလမ်းခြင်းမ
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,maint ။ အလည်အပတ်သွားရောက်
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
 DocType: Purchase Invoice,Mobile No,မိုဘိုင်းလ်မရှိပါ
 DocType: Payment Tool,Make Journal Entry,ဂျာနယ် Entry &#39;ပါစေ
@@ -2880,35 +2644,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 DocType: Cost Center,Distribution Id,ဖြန့်ဖြူး Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome ကိုန်ဆောင်မှုများ
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,အားလုံးသည်ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ။
 DocType: Purchase Invoice,Supplier Address,ပေးသွင်းလိပ်စာ
-DocType: Contact Us Settings,Address Line 2,လိပ်စာလိုင်း 2
-DocType: ToDo,Reference,အညွှန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty out
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,စီးရီးမသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Attribute တန်ဖိုး {0} {1} {3} ၏ထပ်တိုး {2} မှများ၏အကွာအဝေးအတွင်းဖြစ်ရပါမည်
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,default receiver Accounts ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sawing
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ဖျင်
 DocType: Item Reorder,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
 DocType: Supplier,Contact HTML,ဆက်သွယ်ရန် HTML ကို
@@ -2919,9 +2677,8 @@
 DocType: Company,Retail,လက်လီ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,customer {0} မတည်ရှိပါဘူး
 DocType: Attendance,Absent,မရှိသော
-DocType: Product Bundle,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ကြိတ်ခွဲ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
 DocType: Upload Attendance,Download Template,ဒေါင်းလုပ် Template:
 DocType: GL Entry,Remarks,အမှာစကား
@@ -2929,48 +2686,44 @@
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
 DocType: Features Setup,POS View,POS ကြည့်ရန်
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,စဉ်ဆက်မပြတ်သွန်း
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,တစ်ဦးကိုသတ်မှတ်ပေးပါ
 DocType: Offer Letter,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,အထက်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,အေးအရွယ်အစားညှိ
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,အကောင့်ကို {0} တစ်ဦးအုပ်စုမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ဒေသ
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
 DocType: Holiday List,Weekly Off,အပတ်စဉ်ထုတ်ပိတ်
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ဥပမာ 2012 ခုနှစ်, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),ယာယီအမြတ်ခွန် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,item 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},{1} ကုမ္ပဏီအတွက် {0} default တန်ဖိုးထားပေးပါ
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},{1} ကုမ္ပဏီအတွက် {0} default တန်ဖိုးထားပေးပါ
 DocType: Serial No,Creation Time,ဖန်ဆင်းခြင်းအချိန်
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,စုစုပေါင်းအခွန်ဝန်ကြီးဌာန
 DocType: Sales Invoice,Product Bundle Help,ထုတ်ကုန်ပစ္စည်း Bundle ကိုအကူအညီ
 ,Monthly Attendance Sheet,လစဉ်တက်ရောက် Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,စံချိန်မျှမတွေ့ပါ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,အကောင့်ကို {0} လှုပျမရှားသည်
 DocType: GL Entry,Is Advance,ကြိုတင်ထုတ်သည်
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,နေ့စွဲရန်နေ့စွဲနှင့်တက်ရောက် မှစ. တက်ရောက်သူမသင်မနေရ
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,ရိုက်ထည့်ပေးပါဟုတ်ကဲ့သို့မဟုတ်မရှိပါအဖြစ် &#39;&#39; Subcontracted သည် &#39;&#39;
 DocType: Sales Team,Contact No.,ဆက်သွယ်ရန်အမှတ်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Entry &#39;ဖွင့်လှစ်ခွင့်ပြုမ&#39; &#39;အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု&#39; &#39;type ကိုအကောင့်ကို {0}
-DocType: Workflow State,Time,အချိန်
 DocType: Features Setup,Sales Discounts,အရောင်းလျှော့စျေး
 DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,အဝတ်အထည်နှင့်ဆက်စပ်ပစ္စည်းများ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,အဝတ်အထည်နှင့်ဆက်စပ်ပစ္စည်းများ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,အမိန့်အရေအတွက်
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ထုတ်ကုန်စာရင်း၏ထိပ်ပေါ်မှာပြလတံ့သောက HTML / Banner ။
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ရေကြောင်းပမာဏကိုတွက်ချက်ရန်အခြေအနေများကိုသတ်မှတ်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,ကလေး Add
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Frozen Accounts ကို &amp; Edit ကိုအေးခဲ Entries Set မှ Allowed အခန်းကဏ္ဍ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ဒါကြောင့်ကလေးဆုံမှတ်များရှိပါတယ်အဖြစ်လယ်ဂျာမှကုန်ကျစရိတ် Center က convert နိုင်ဘူး
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ကူးပြောင်းခြင်း Factor လိုအပ်သည်
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,အရောင်းအပေါ်ကော်မရှင်
 DocType: Offer Letter Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
@@ -2978,15 +2731,13 @@
 ,Customers Not Buying Since Long Time,ဖောက်သည်ကို Long အချိန်ကတည်းကဝယ်ယူမ
 DocType: Production Order,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bulging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,အငွေ့ပျံခြင်း-ပုံစံကိုသွန်း
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,အရောင်းပြေစာ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,အရောင်းပြေစာ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,အသက်အရွယ်
 DocType: Time Log,Billing Amount,ငွေတောင်းခံငွေပမာဏ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ကို item {0} သည်သတ်မှတ်ထားသောမမှန်ကန်ခြင်းအရေအတွက်။ အရေအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်သည်။
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,ခွင့်သည်ပလီကေးရှင်း။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,လက်ရှိငွေပေးငွေယူနှင့်အတူအကောင့်ကိုဖျက်ပစ်မရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ဥပဒေရေးရာအသုံးစရိတ်များ
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","အော်တိုအမိန့် 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Sales Invoice,Posting Time,posting အချိန်
@@ -3000,26 +2751,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,နယူးဖောက်သည်အခွန်ဝန်ကြီးဌာန
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ခရီးသွားအသုံးစရိတ်များ
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
-DocType: Feed,Full Name,နာမည်အပြည့်အစုံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,အစမ်းထား
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,default ဂိုဒေါင်စတော့ရှယ်ယာ Item တွေအတွက်မဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},လ {0} သည်လစာ၏ငွေပေးချေမှုရမည့်နှင့်တစ်နှစ် {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 ,Transferred Qty,လွှဲပြောင်း Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigator
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,စီမံကိန်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,စီမံကိန်း
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,အချိန်အထဲ Batch လုပ်ပါ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ထုတ်ပြန်သည်
 DocType: Project,Total Billing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ပေးသွင်း Id
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 DocType: Sales Partner,Contact Desc,ဆက်သွယ်ရန် Desc
@@ -3028,18 +2776,16 @@
 DocType: Brand,Item Manager,item Manager က
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Accounts ကိုအပေါ်နှစ်စဉ်ဘတ်ဂျက်တင်ထားရန်တန်းစီထည့်ပါ။
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Quarrying
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 DocType: Newsletter,Test Email Id,စမ်းသပ်မှုအီးမေးလ် Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,သင်အရည်အသွေးစစ်ဆေးရေးအတိုင်းလိုက်နာပါ။ Item QA လိုအပ်ပါသည်နှင့် QA မရှိဝယ်ယူခြင်းပြေစာအတွက်နိုင်ပါတယ်
 DocType: GL Entry,Party Type,ပါတီ Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,ကုန်ကြမ်းအဓိက Item အဖြစ်အတူတူမဖွစျနိုငျ
 DocType: Item Attribute Value,Abbreviation,အကျဉ်း
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ကန့်သတ်ထက်ကျော်လွန်ပြီးကတည်းက authroized မဟုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotate အတု ယူ. ပုံသှငျး
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,လစာ template ကိုမာစတာ။
 DocType: Leave Type,Max Days Leave Allowed,max Days ထွက်ခွာခွင့်ပြု
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,စျေးဝယ်လှည်းများအတွက်အခွန်နည်းဥပဒေ Set
@@ -3053,15 +2799,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} မဖြစ်မနေဖြစ်ပါတယ်။ ဖြစ်ရင်ငွေကြေးစနစ်ချိန်းစံချိန် {1} {2} မှဖန်တီးသည်မဟုတ်။
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Account,Temporary,ယာယီ
 DocType: Address,Preferred Billing Address,ပိုဦးစားပေးသည် Billing လိပ်စာ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,အတွင်းဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,အတွင်းဝန်
 DocType: Serial No,Distinct unit of an Item,တစ်ဦး Item ၏ထူးခြားသောယူနစ်
 DocType: Pricing Rule,Buying,ဝယ်
 DocType: HR Settings,Employee Records to be created by,အသုံးပြုနေသူများကဖန်တီးခံရဖို့ဝန်ထမ်းမှတ်တမ်း
@@ -3074,42 +2820,37 @@
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
 DocType: Purchase Order Item,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,သံ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} ရပ်တန့်နေသည်
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
 DocType: Lead,Add to calendar on this date,ဒီနေ့စွဲအပေါ်ပြက္ခဒိန်မှ Add
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,လာမည့်အဖြစ်အပျက်များ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,customer လိုအပ်သည်
-DocType: Letter Head,Letter Head,ပေးစာဌာနမှူး
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,လျင်မြန်စွာ Entry &#39;
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} သို့ပြန်သွားသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Order,To Receive,လက်ခံမှ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,သငျ့ကျုံ့
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,ဝင်ငွေခွန် / သုံးစွဲမှု
 DocType: Employee,Personal Email,ပုဂ္ဂိုလ်ရေးအီးမေးလ်
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,စုစုပေါင်းကှဲလှဲ
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,စုစုပေါင်းကှဲလှဲ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","enabled လျှင်, system ကိုအလိုအလျှောက်စာရင်းသည်စာရင်းကိုင် entries တွေကို post လိမ့်မည်။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,brokerage
 DocType: Address,Postal Code,စာတိုက်သင်္ကေတ
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated မိနစ်အနည်းငယ်အတွက်
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Hub Settings,Name Token,Token အမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,လေယာဉ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,စံရောင်းချသည့်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,စံရောင်းချသည့်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast တယောက်ဂိုဒေါင်မသင်မနေရ
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,တိုင်း၏ default အနေနဲ့ယူနစ်ကိုရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice Item,Project Name,စီမံကိန်းအမည်
 DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
-DocType: Workflow State,Edit,Edit ကို
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Features Setup,Item Batch Nos,item Batch အမှတ်
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
@@ -3117,13 +2858,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေးငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,အခွန်ပိုင်ဆိုင်မှုများ
 DocType: BOM Item,BOM No,BOM မရှိပါ
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Replace Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,နယူးစတော့အိတ် UOM လက်ရှိစတော့ရှယ်ယာထံမှကွဲပြားခြားနားဖြစ်ရမည် UOM
 DocType: Account,Debit,debit
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,အရွက် 0.5 အလီလီခွဲဝေရမည်
 DocType: Production Order,Operation Cost,စစ်ဆင်ရေးကုန်ကျစရိတ်
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,တစ် .csv file ကိုထံမှတက်ရောက်သူ upload
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,ထူးချွန် Amt
@@ -3139,10 +2878,7 @@
 DocType: Project,Default Cost Center,default ကုန်ကျစရိတ် Center က
 DocType: Purchase Invoice,End Date,အဆုံးနေ့စွဲ
 DocType: Employee,Internal Work History,internal လုပ်ငန်းသမိုင်း
-DocType: DocField,Column Break,ကော်လံ Break
-DocType: Event,Thursday,ကြာသပတေးနေ့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,အချိုးအကွေ့
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
 DocType: Sales Invoice,Exhibition,ပွပှဲ
@@ -3155,31 +2891,30 @@
 DocType: Employee,Held On,တွင်ကျင်းပ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ထုတ်လုပ်မှု Item
 ,Employee Information,ဝန်ထမ်းပြန်ကြားရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),rate (%)
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Pay (LWP) မရှိရင်ထွက်ခွာသည်အလုပ်လုပ်ပြီးဝင်ငွေကိုလျော့ချ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},မှတ်စု: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} အတန်း {1} အတွက်ဝယ်ယူသို့မဟုတ် Sub-စာချုပ်ချုပ်ဆို Item ဖြစ်ရမည်
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
 DocType: GL Entry,Party,ပါတီ
 DocType: Sales Order,Delivery Date,ကုန်ပို့ရက်စွဲ
-DocType: DocField,Currency,ငှေကွေး
 DocType: Opportunity,Opportunity Date,အခွင့်အလမ်းနေ့စွဲ
 DocType: Purchase Receipt,Return Against Purchase Receipt,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Purchase Order,To Bill,ဘီလ်မှ
 DocType: Material Request,% Ordered,% မိန့်ထုတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Piecework
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Piecework
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
@@ -3196,77 +2931,68 @@
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
 DocType: SMS Settings,SMS Settings,SMS ကို Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,ယာယီ Accounts ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
 DocType: Purchase Order,End date of current order's period,လက်ရှိအမိန့်ရဲ့ကာလ၏အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ကမ်းလှမ်းချက်ပေးစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,ပြန်လာ
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
-DocType: DocField,Fold,ခေါက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ Template ကိုအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,သတ်မှတ် ကျေးဇူးပြု.
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,customer Id
-DocType: Page,Page Name,စာမျက်နှာအမည်
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,အချိန်မှအချိန် မှစ. ထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,အရောင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ဗိုင်းလိပ်တံပြီး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",ဥပမာ &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",ဥပမာ &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
-DocType: System Settings,Time Zone,အချိန်ဇုန်
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub သည် Register
 DocType: Monthly Distribution,Monthly Distribution Percentages,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ဒီ Delivery Note ကိုဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Staples
 DocType: Customer,Customer Details,customer အသေးစိတ်ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,ပုံဖော်
 DocType: Employee,Reports to,အစီရင်ခံစာများမှ
 DocType: SMS Settings,Enter url parameter for receiver nos,လက်ခံ nos သည် url parameter ကိုရိုက်ထည့်
 DocType: Sales Invoice,Paid Amount,Paid ငွေပမာဏ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',အကောင့် {0} ပိတ်ပြီး type ကို &#39;&#39; ဆိုက် &#39;&#39; ၏ဖြစ်ရမည်
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
 DocType: Production Planning Tool,Filter based on customer,ဖောက်သည်အပေါ်အခြေခံပြီး filter
 DocType: Payment Tool Detail,Against Voucher No,ဘောက်ချာမရှိဆန့်ကျင်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
 DocType: Tax Rule,Purchase,ဝယ်ခြမ်း
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,ချိန်ခွင် Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ချိန်ခွင် Qty
 DocType: Item Group,Parent Item Group,မိဘပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} သည်
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ကုန်ကျစရိတ်စင်တာများ
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,ကုန်လှောင်ရုံ။
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,ကုန်လှောင်ရုံ။
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ပေးသွင်းမယ့်ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},row # {0}: အတန်းနှင့်အတူအချိန်ပဋိပက္ခများ {1}
 DocType: Opportunity,Next Contact,Next ကိုဆက်သွယ်ရန်
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,ပလီကေးရှင်းကာလအတွင်းနှစ်ဦး alocation မှတ်တမ်းများကိုဖြတ်ပြီးမဖွစျနိုငျ
 DocType: Item Group,Default Expense Account,default သုံးစွဲမှုအကောင့်
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
-DocType: Page,Yes,ဟုတ်ကဲ့
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ဘောက်ချာ Type ဝယ်ယူခြင်းအမိန့်, ဝယ်ယူခြင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်ဆန့်ကျင်"
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},{0} - default လုပ်ဆောင်ချက်ကုန်ကျစရိတ်လုပ်ဆောင်ချက်ကအမျိုးအစားသည်တည်ရှိ
 DocType: Production Order,Planned Operating Cost,စီစဉ်ထားတဲ့ Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,နယူး {0} အမည်
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},{0} # {1} တွဲကိုတွေ့ ကျေးဇူးပြု.
 DocType: Job Applicant,Applicant Name,လျှောက်ထားသူအမည်
 DocType: Authorization Rule,Customer / Item Name,customer / Item အမည်
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3279,7 +3005,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},serial No Item {0} သည်မသင်မနေရ
 DocType: Item Variant Attribute,Attribute,attribute
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,အကွာအဝေးမှ / ထံမှ specify ကျေးဇူးပြု.
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,By Created
 DocType: Serial No,Under AMC,AMC အောက်မှာ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,item အဘိုးပြတ်မှုနှုန်းဆင်းသက်ကုန်ကျစရိတ်ဘောက်ချာပမာဏကိုထည့်သွင်းစဉ်းစားပြန်လည်တွက်ချက်နေပါတယ်
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
@@ -3291,17 +3016,16 @@
 DocType: Payment Reconciliation,Minimum Amount,နိမ့်ဆုံးပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Finished ကုန်စည် Update
 DocType: Workstation,per hour,တစ်နာရီကို
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},စီးရီး {0} ပြီးသား {1} များတွင်အသုံးပြု
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,အဆိုပါကုန်လှောင်ရုံ (ထာဝရစာရင်း) ကိုအကောင့်ကိုဒီအကောင့်အောက်မှာနေသူများကဖန်တီးလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Paid ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,စီမံကိန်းမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 DocType: Customer,Default Taxes and Charges,Default အနေနဲ့အခွန်နှင့်စွပ်စွဲချက်
 DocType: Account,Receivable,receiver
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအမိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအမိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
 DocType: Sales Invoice,Supplier Reference,ပေးသွင်းကိုးကားစရာ
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","checked လျှင်, Sub-ပရိသပစ္စည်းများသည် BOM ကုန်ကြမ်းဆိုတော့စဉ်းစားရလိမ့်မည်။ ဒီလိုမှမဟုတ်ရင်အားလုံးက sub-ပရိသတ်အပစ္စည်းများကိုတစ်ကုန်ကြမ်းအဖြစ်ကုသရလိမ့်မည်။"
@@ -3309,8 +3033,8 @@
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
 DocType: Item Price,Item Price,item စျေးနှုန်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,ဆပ်ပြာ &amp; ဆပ်ပြာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; ဗီဒီယို
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
@@ -3319,7 +3043,6 @@
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ပံ့ပိုးမှု Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ကုမ္ပဏီဂိုဒေါင် {0} ပျောက်ဆုံးနေသည်
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,စတော့အိတ် UOM Utility ကိုအစားထိုးပါ
 DocType: POS Profile,Terms and Conditions,စည်းကမ်းနှင့်သတ်မှတ်ချက်များ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},နေ့စွဲဖို့ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းတွင်သာဖြစ်သင့်သည်။ နေ့စွဲ = {0} နိုင်ရန်ယူဆ
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ဒီနေရာတွင်အမြင့်, အလေးချိန်, ဓါတ်မတည်, ဆေးဘက်ဆိုင်ရာစိုးရိမ်ပူပန်မှုများစသည်တို့ကိုထိန်းသိမ်းထားနိုင်ပါတယ်"
@@ -3331,7 +3054,7 @@
 DocType: Sales Order Item,For Production,ထုတ်လုပ်မှုများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Project Task,View Task,view Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်စတင်ခဲ့သည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်စတင်ခဲ့သည်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,ဝယ်ယူလက်ခံရိုက်ထည့်ပေးပါ
 DocType: Sales Invoice,Get Advances Received,ကြိုတင်ငွေရရှိထားသည့် Get
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
@@ -3339,20 +3062,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),အထောက်အပံ့အီးမေးလ်က id သည် Setup ကိုအဝင် server ကို။ (ဥပမာ support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ကယ်နှုတ်တော်မူ၏ခံရဖို့အစုအထုပ်ကိုတနိုင်ငံအညွန့ထုပ်ပိုး Generate ။ package ကိုနံပါတ်, package ကို contents တွေကိုနှင့်၎င်း၏အလေးချိန်အကြောင်းကြားရန်အသုံးပြုခဲ့ကြသည်။"
 DocType: Sales Invoice Item,Sales Order Item,အရောင်းအမိန့် Item
 DocType: Salary Slip,Payment Days,ငွေပေးချေမှုရမည့်ကာလသ
 DocType: BOM,Manage cost of operations,စစ်ဆင်ရေး၏ကုန်ကျစရိတ် Manage
 DocType: Features Setup,Item Advanced,item ကို Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot လှိမ့်
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ထို checked ကိစ္စများကိုမဆို &quot;Submitted&quot; အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် &quot;ဆက်သွယ်ရန်&quot; ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ကမ္ဘာလုံးဆိုင်ရာချိန်ညှိချက်များကို
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
 DocType: Salary Slip,Net Pay,Net က Pay ကို
 DocType: Account,Account,အကောင့်ဖွင့်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -3361,35 +3082,28 @@
 DocType: Customer,Sales Team Details,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,နေမကောင်းထွက်ခွာ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},မမှန်ကန်ခြင်း {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,နေမကောင်းထွက်ခွာ
 DocType: Email Digest,Email Digest,အီးမေးလ် Digest မဂ္ဂဇင်း
 DocType: Delivery Note,Billing Address Name,ငွေတောင်းခံလိပ်စာအမည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System ကို Balance
-DocType: Workflow,Is Active,Active ဖြစ်ပါတယ်
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System ကို Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
-DocType: Workflow State,Primary,မူလတန်း
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
 DocType: Item,Max Discount (%),max လျှော့ (%)
-DocType: Communication,More Information,More Information ကို
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,နောက်ဆုံးအမိန့်ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,ပေါက်ကွဲမှု
 DocType: Company,Warn,အသိပေး
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,item အဘိုးပြတ် updated
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
 DocType: BOM,Manufacturing User,ကုန်ထုတ်လုပ်မှုအသုံးပြုသူတို့၏
 DocType: Purchase Order,Raw Materials Supplied,ပေးထားသည့်ကုန်ကြမ်းပစ္စည်းများ
 DocType: Purchase Invoice,Recurring Print Format,ထပ်တလဲလဲပုံနှိပ်စီစဉ်ဖွဲ့စည်းမှုပုံစံ
-DocType: Communication,Series,စီးရီး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
-DocType: Communication,Email,အီးမေးလ်
 DocType: Item Group,Item Classification,item ခွဲခြား
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,စီးပွားရေးဖွံ့ဖြိုးတိုးတက်ရေးမန်နေဂျာ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ပြုပြင်ထိန်းသိမ်းမှုခရီးစဉ်ရည်ရွယ်ချက်
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ကာလ
 ,General Ledger,အထွေထွေလယ်ဂျာ
@@ -3399,9 +3113,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 DocType: Features Setup,To get Item Group in details table,အသေးစိတ်အချက်အလက်များကို table ထဲမှာ Item Group မှရရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,စွဲထင်
 DocType: Sales Invoice,Commission,ကော်မရှင်
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3416,7 +3128,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> default Template: </h4><p> အသုံးပြုသည် <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templates</a> နှင့် (Custom Field များရှိလျှင်အပါအဝင်) လိပ်စာအပေါင်းတို့သည်လယ်ကွင်းရရှိနိုင်ပါလိမ့်မည် </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,default ငွေပမာဏ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
 DocType: Quality Inspection Reading,Quality Inspection Reading,အရည်အသွေးအစစ်ဆေးရေးစာဖတ်ခြင်း
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze တော့စျေးကွက် Older Than`% ဃရက်ပတ်လုံးထက်သေးငယ်ဖြစ်သင့်သည်။
@@ -3435,13 +3147,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
 DocType: Payment Tool,Get Outstanding Vouchers,ထူးချွန် voucher Get
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
 DocType: Appraisal,Start Date,စတင်သည့်ရက်စွဲ
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,အဘိုး
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,တစ်ဦးကာလသည်အရွက်ခွဲဝေချထားပေးရန်။
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,အတည်ပြုရန်ဤနေရာကိုနှိပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
@@ -3451,55 +3162,43 @@
 DocType: Item,Average time taken by the supplier to deliver,ပျမ်းမျှအားဖြင့်အချိန်မကယ်မလွှတ်မှပေးသွင်းခြင်းဖြင့်ယူ
 DocType: Time Log,Hours,နာရီ
 DocType: Project,Expected Start Date,မျှော်လင့်ထားသည့် Start ကိုနေ့စွဲ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,ဦးစားပေး
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,စွဲချက်က item တခုကိုသက်ဆိုင်မဖြစ်လျှင်တဲ့ item Remove
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox ကို Access က Allowed
-DocType: Dropbox Backup,Weekly,ရက်သတ္တပတ်တကြိမ်ဖြစ်သော
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,eg ။ smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,လက်ခံရရှိ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,လက်ခံရရှိ
 DocType: Maintenance Visit,Fully Completed,အပြည့်အဝပြီးစီး
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,Complete {0}%
 DocType: Employee,Educational Qualification,ပညာရေးဆိုင်ရာအရည်အချင်း
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} အောင်မြင်စွာကျွန်တော်တို့ရဲ့သတင်းလွှာစာရင်းတွင်ထည့်သွင်းခဲ့သည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,electron beam machine
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,အဓိကအစီရင်ခံစာများ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,စတော့အိတ်လယ်ဂျာ updated ခွင် entries
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,အဓိကအစီရင်ခံစာများ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား
 ,Requested Items To Be Ordered,အမိန့်ခံရဖို့မေတ္တာရပ်ခံပစ္စည်းများ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,ငါ့အမိန့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,ငါ့အမိန့်
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
 DocType: Time Log,For Manufacturing,ကုန်ထုတ်လုပ်မှုများအတွက်
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,စုစုပေါင်း
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,စုစုပေါင်း
 DocType: BOM,Manufacturing,ကုန်ထုတ်လုပ်မှု
 ,Ordered Items To Be Delivered,လွတ်ပေးရန်အမိန့်ထုတ်ပစ္စည်းများ
 DocType: Account,Income,ဝင်ငွေခွန်
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,ပြီးစီးနေ့စွဲ
 DocType: Purchase Invoice Item,Amount (Company Currency),ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,ချ. သေဆုံး
-DocType: Email Alert,Reference Date,ကိုးကားစရာနေ့စွဲ
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,တရားဝင်မိုဘိုင်း nos ရိုက်ထည့်ပေးပါ
 DocType: Budget Detail,Budget Detail,ဘဏ္ဍာငွေအရအသုံး Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ပေးပို့ခြင်းမပြုမီသတင်းစကားကိုရိုက်ထည့်ပေးပါ
-DocType: Async Task,Status,အဆင့်အတန်း
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},စတော့အိတ် UOM Item {0} သည် updated
-DocType: Company History,Year,ခုနှစ်
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ကို Settings ကို Update ကျေးဇူးပြု.
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,အချိန်အထဲ {0} ပြီးသားကြေညာ
@@ -3512,55 +3211,52 @@
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
 DocType: Item,Unit of Measure Conversion,တိုင်းကူးပြောင်းခြင်း၏ယူနစ်
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,ဝန်ထမ်းမပြောင်းနိုင်ဘူး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
 DocType: Naming Series,Help HTML,HTML ကိုကူညီပါ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{0} over- ခွင့် Item {1} သည်ကိုကူး
 DocType: Address,Name of person or organization that this address belongs to.,ဒီလိပ်စာကိုပိုင်ဆိုင်ကြောင်းလူတစ်ဦးသို့မဟုတ်အဖွဲ့အစည်း၏အမည်ပြောပါ။
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,သင့်ရဲ့ပေးသွင်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,သင့်ရဲ့ပေးသွင်း
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,နောက်ထပ်လစာဖွဲ့စည်းပုံ {0} ဝန်ထမ်း {1} သည်တက်ကြွဖြစ်ပါတယ်။ သူ့ရဲ့အနေအထား &#39;&#39; မဝင် &#39;&#39; ဆက်လက်ဆောင်ရွက်စေပါလော့။
 DocType: Purchase Invoice,Contact,ထိတှေ့
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,မှစ. ရရှိထားသည့်
 DocType: Features Setup,Exports,ပို့ကုန်များ
 DocType: Lead,Converted,ပွောငျး
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 DocType: Issue,Content Type,content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,ကွန်ပျူတာ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Cost Center,Budgets,ဘတ်ဂျက်
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Updated
 DocType: Employee,Emergency Contact Details,အရေးပေါ်ဆက်သွယ်ရန်အသေးစိတ်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
 DocType: Delivery Note,To Warehouse,ဂိုဒေါင်မှ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},အကောင့်ကို {0} ဘဏ္ဍာရေးနှစ်များအတွက် {1} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,electrical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,electrical
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},အသုံးပြုသူ ID န်ထမ်း {0} သည်စွဲလမ်းခြင်းမ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,အာမခံပြောဆိုချက်ကိုထံမှ
 DocType: Stock Entry,Default Source Warehouse,default Source ကိုဂိုဒေါင်
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
-DocType: User,Enabled,Enabled
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},သင်အမှန်တကယ်လ {0} အပေါင်းသည်လစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit ချင်ပြုပါနှင့်တစ်နှစ် {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,သွင်းကုန် Subscribers
@@ -3568,19 +3264,18 @@
 DocType: Attendance,Present,လက်ဆောင်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
 DocType: Notification Control,Sales Invoice Message,အရောင်းပြေစာ Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,အကောင့်ကို {0} ပိတ်ပြီး type ကိုတာဝန်ဝတ္တရား / Equity ၏ဖြစ်ရပါမည်
 DocType: Authorization Rule,Based On,ပေါ်အခြေခံကာ
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,လစာစလစ် Generate
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} မှန်ကန်သော email က id မဟုတ်ပါဘူး
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","application များအတွက် {0} အဖြစ်ရွေးချယ်မယ်ဆိုရင်ဝယ်, checked ရမည်"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
-DocType: ToDo,Low,အနိမျ့
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ချည်ငင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},{0} set ကျေးဇူးပြု.
 DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
@@ -3602,7 +3297,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ကင်ပိန်းအမည်လိုအပ်သည်
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Receipt Item,Rejected Serial No,ပယ်ချ Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,နက်ရှိုင်းသောပုံဆွဲ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,နယူးသတင်းလွှာ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show ကို Balance
@@ -3612,7 +3306,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,ငွေပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
 ,Sales Analytics,အရောင်း Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,ကုန်ထုတ်လုပ်မှု Settings ကို
@@ -3624,28 +3317,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,နယူးအကောင့်အမည်
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,ကုန်ကြမ်းပစ္စည်းများကုန်ကျစရိတ်ထောက်ပံ့
 DocType: Selling Settings,Settings for Selling Module,ရောင်းချသည့် Module သည် Settings ကို
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,ဧည့်ဝန်ဆောင်မှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,ဧည့်ဝန်ဆောင်မှု
 DocType: Item,Thumbnail,thumbnail
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,အီးမေးလ်အတည်ပြုပါ
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ကိုယ်စားလှယ်လောင်းတစ်ဦးယောဘငှေပါ။
 DocType: Notification Control,Prompt for Email on Submission of,၏လကျအောကျခံအပေါ်အီးမေးလ်သည် Prompt ကို
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွက်ရက်ထက်ပိုပါတယ်
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} လိုအပ်သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,လေဟာနယ်အတု ယူ. ပုံသှငျး
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
-DocType: Contact Us Settings,City,မြို့
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic machine
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,error: မမှန်ကန်သောက id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,item {0} တစ်ခုအရောင်း Item ဖြစ်ရမည်
 DocType: Naming Series,Update Series Number,Update ကိုစီးရီးနံပါတ်
 DocType: Account,Equity,equity
 DocType: Sales Order,Printing Details,ပုံနှိပ် Details ကို
 DocType: Task,Closing Date,နိဂုံးချုပ်နေ့စွဲ
 DocType: Sales Order Item,Produced Quantity,ထုတ်လုပ်ပမာဏ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,အင်ဂျင်နီယာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,အင်ဂျင်နီယာ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ရှာဖွေရန် Sub စညျးဝေး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
 DocType: Sales Partner,Partner Type,partner ကအမျိုးအစား
@@ -3653,7 +3342,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise လျှော့
 DocType: Purchase Invoice,Against Expense Account,အသုံးအကောင့်ဆန့်ကျင်
 DocType: Production Order,Production Order,ထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installation မှတ်ချက် {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Quotation Item,Against Docname,Docname ဆန့်ကျင်
 DocType: SMS Center,All Employee (Active),အားလုံးသည်န်ထမ်း (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,အခုတော့ကြည့်ရန်
@@ -3661,26 +3350,24 @@
 DocType: BOM,Raw Material Cost,ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ်
 DocType: Item,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt ဇယား
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,စီးရီး Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,The First အသုံးပြုသူ: သင့်
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,The First အသုံးပြုသူ: သင့်
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,အောင်မြင်စွာ ပြန်.
 DocType: Production Order,Planned End Date,စီစဉ်ထားတဲ့အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Tax Rule,Validity,တရားဝင်မှု
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced ငွေပမာဏ
 DocType: Attendance,Attendance,သွားရောက်ရှိနေခြင်း
-DocType: Page,No,မရှိပါ
 DocType: BOM,Materials,ပစ္စည်းများ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","checked မလျှင်, စာရင်းကလျှောက်ထားခံရဖို့ရှိပါတယ်ရှိရာတစ်ဦးစီဦးစီးဌာနမှထည့်သွင်းရပါလိမ့်မယ်။"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
@@ -3688,55 +3375,46 @@
 ,Item Prices,item ဈေးနှုန်းများ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,သင်ဝယ်ယူခြင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 DocType: Period Closing Voucher,Period Closing Voucher,ကာလသင်တန်းဆင်းပွဲ voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,စျေးနှုန်း List ကိုမာစတာ။
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,စျေးနှုန်း List ကိုမာစတာ။
 DocType: Task,Review Date,ပြန်လည်ဆန်းစစ်ခြင်းနေ့စွဲ
 DocType: Purchase Invoice,Advance Payments,ငွေပေးချေရှေ့တိုး
-DocType: DocPerm,Level,level
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,အတန်းအတွက်ပစ်မှတ်ဂိုဒေါင် {0} ထုတ်လုပ်မှုအမိန့်အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,ကြိတ်စက်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ငွေပေးချေမှုရမည့် Tool ကိုအသုံးပွုဖို့မရှိပါခွင့်ပြုချက်
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,မိဘဖောက်သည်အုပ်စု
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,ပွောငျးလဲခွငျး
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",ဥပမာ &quot;ကျနော့်ကုမ္ပဏီ LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,သတိပေးချက်ကာလ
 DocType: Bank Reconciliation Detail,Voucher ID,ဘောက်ချာ ID ကို
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,"ဒါကအမြစ်နယ်မြေဖြစ်ပြီး, edited မရနိုင်ပါ။"
 DocType: Packing Slip,Gross Weight UOM,gross အလေးချိန် UOM
 DocType: Email Digest,Receivables / Payables,receiver / ပေးဆောင်
 DocType: Delivery Note Item,Against Sales Invoice,အရောင်းပြေစာဆန့်ကျင်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 DocType: Task,Actual End Date (via Time Logs),(အချိန် Logs ကနေတဆင့်) အမှန်တကယ် End Date ကို
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
 DocType: Delivery Note,Print Without Amount,ငွေပမာဏမရှိရင် Print
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,အခွန်အမျိုးအစားအားလုံးပစ္စည်းများကိုအဖြစ် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;မဖြစ်နိုင်သည် non-စတော့ရှယ်ယာပစ္စည်းများဖြစ်ကြသည်
-DocType: User,Last Name,မျိုးနွယ်အမည်
-DocType: Web Page,Left,လက်ဝဲဘက်
-DocType: Event,All Day,အားလုံးသည်နေ့
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,အခွန်အမျိုးအစားအားလုံးပစ္စည်းများကိုအဖြစ် &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;မဖြစ်နိုင်သည် non-စတော့ရှယ်ယာပစ္စည်းများဖြစ်ကြသည်
 DocType: Issue,Support Team,Support Team သို့
 DocType: Appraisal,Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်
-DocType: Contact Us Settings,State,ပြည်နယ်
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,ချိန်ခွင်လျှာ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,ချိန်ခွင်လျှာ
 DocType: Project,Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
-DocType: User,Gender,"ကျား, မ"
 DocType: Journal Entry,Debit Note,debit မှတ်ချက်
 DocType: Stock Entry,As per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ်
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Expired မဟုတ်
@@ -3750,44 +3428,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,တန်ဖိုးများကိုအပေါ်အခြေခံပြီးအရောင်းအကနျ့သစည်းမျဉ်းစည်းကမ်းတွေကိုဖန်တီးပါ။
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","checked, စုစုပေါင်းမျှမပါ။ အလုပ်အဖွဲ့ Days ၏အားလပ်ရက်ပါဝင်ပါလိမ့်မယ်, ဒီလစာ Per နေ့၏တန်ဖိုးကိုလျော့ချလိမ့်မည်"
 DocType: Purchase Invoice,Total Advance,စုစုပေါင်းကြိုတင်ထုတ်
-DocType: Workflow State,User,အသုံးပြုသူ
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
 DocType: Opportunity Item,Basic Rate,အခြေခံပညာ Rate
 DocType: GL Entry,Credit Amount,အကြွေးပမာဏ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ငွေပေးချေမှုရမည့်ပြေစာမှတ်ချက်
 DocType: Customer,Credit Days Based On,တွင် အခြေခံ. credit Days
 DocType: Tax Rule,Tax Rule,အခွန်စည်းမျဉ်း
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,အရောင်း Cycle တစ်လျှောက်လုံးအတူတူပါပဲ Rate ထိန်းသိမ်းနည်း
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation နှင့်အလုပ်အဖွဲ့နာရီပြင်ပတွင်အချိန်မှတ်တမ်းများကြိုတင်စီစဉ်ထားပါ။
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation နှင့်အလုပ်အဖွဲ့နာရီပြင်ပတွင်အချိန်မှတ်တမ်းများကြိုတင်စီစဉ်ထားပါ။
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ပြီးသားတင်သွင်းခဲ့
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
-DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Time Log,Billing Rate based on Activity Type (per hour),ငွေတောင်းခံနှုန်း (တစ်နာရီလျှင်) လုပ်ဆောင်ချက်ကအမျိုးအစားပေါ်အခြေခံပြီး
 DocType: Company,Company Info,ကုမ္ပဏီ Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,ချုပ်ရိုး
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","ဤအရပ်မှပို့ပေးဖို့စလှေတျတျောကိုမတှေ့မကုမ္ပဏီသည်အီးမေးလ် ID ကို,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 DocType: Production Planning Tool,Filter based on item,item ကို select လုပ်ထားတဲ့အပေါ်အခြေခံပြီး filter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
 DocType: Purchase Common,Purchase Common,တူညီသည့်အယ်ယူ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} modified သိရသည်။ refresh ပေးပါ။
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,အခွင့်အလမ်းအနေဖြင့်
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 DocType: Sales Invoice,Is POS,POS စက်ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ထုပ်ပိုးအရေအတွက်အတန်း {1} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Customer များကြီးပြင်းဥပဒေကြမ်းများ။
-DocType: DocField,Default,ပျက်ကွက်
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,စီမံကိန်း Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,ကဆက်ပြောသည် {0} လစဉ်ကြေး ပေး.
 DocType: Maintenance Schedule,Schedule,ဇယား
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","ဒီအကုန်ကျစရိတ်စင်တာဘဏ္ဍာငွေအရအသုံး Define ။ ဘတ်ဂျက်အရေးယူတင်ထားရန်, &quot;ကုမ္ပဏီစာရင်း&quot; ကိုကြည့်ပါ"
@@ -3798,70 +3472,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Expense Claim,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;Yes&quot; ကိုရွေးချယ်ခြင်းအတွက် Serial No မာစတာအတွက်ကြည့်ရှုနိုင်ပါသည်သောဤတဲ့ item ကိုအသီးအသီး entity တစ်ခုထူးခြားသောဝိသေသလက္ခဏာကိုငါပေးမည်။
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
 DocType: Address,Office,ရုံး
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,စံအစီရင်ခံစာများ
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,တစ်ဦးခွန်အကောင့်ကိုဖန်တီးရန်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
 DocType: Employee,Current Address,လက်ရှိလိပ်စာ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ကို item အခြားတဲ့ item တစ်ခုမူကွဲဖြစ်ပါတယ် အကယ်. အတိအလင်းသတ်မှတ်လိုက်သောမဟုတ်လျှင်ထို့နောက်ဖော်ပြချက်, ပုံရိပ်, စျေးနှုန်း, အခွန်စသည်တို့အတွက် template ကိုကနေသတ်မှတ်ကြလိမ့်မည်"
 DocType: Serial No,Purchase / Manufacture Details,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,batch Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,batch Inventory
 DocType: Employee,Contract End Date,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲ
 DocType: Sales Order,Track this Sales Order against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤအရောင်းအမိန့်အားခြေရာခံ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,အထက်ပါသတ်မှတ်ချက်များအပေါ်အခြေခံပြီးအရောင်းအမိန့် (ကယ်နှုတ်ရန်ဆိုင်းငံ့ထား) Pull
-DocType: DocShare,Document Type,စာရွက်စာတမ်းကအမျိုးအစား
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ပေးသွင်းစျေးနှုန်းအနေဖြင့်
 DocType: Deduction Type,Deduction Type,သဘောအယူအဆကအမျိုးအစား
 DocType: Attendance,Half Day,တစ်ဝက်နေ့
 DocType: Pricing Rule,Min Qty,min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",အသုတ်နော့နှင့်အတူအရောင်းနှင့်ဝယ်ယူစာရွက်စာတမ်းများအတွက်ပစ္စည်းများကိုခြေရာခံရန်။ &quot;Preferences စက်မှုလက်မှုလုပ်ငန်းရှင်များ: ဓာတုပစ္စည်း&quot;
 DocType: GL Entry,Transaction Date,transaction နေ့စွဲ
 DocType: Production Plan Item,Planned Qty,စီစဉ်ထား Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,စုစုပေါင်းအခွန်
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,စုစုပေါင်းအခွန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,ပမာဏအတွက် (Qty ကုန်ပစ္စည်းထုတ်လုပ်) မသင်မနေရ
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
 DocType: Notification Control,Purchase Receipt Message,ဝယ်ယူခြင်းပြေစာ Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွင်းထက်ပို
 DocType: Production Order,Actual Start Date,အမှန်တကယ် Start ကိုနေ့စွဲ
 DocType: Sales Order,% of materials delivered against this Sales Order,ဒီအရောင်းအမိန့်ဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,စံချိန်တင်တဲ့ item လှုပ်ရှားမှု။
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,သတင်းလွှာများစာရင်းရရှိရန် Register စာရင်းပေးသွင်း
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,ဝန်ဆောင်မှု
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 ,Monthly Salary Register,လစဉ်လစာမှတ်ပုံတင်မည်
-apps/frappe/frappe/website/template.py +140,Next,နောက်တစ်ခု
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
 DocType: BOM Operation,BOM Operation,BOM စစ်ဆင်ရေး
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,ယခင် Row ပမာဏတွင်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,atleast တယောက်အတန်းအတွက်ငွေပေးချေမှုရမည့်ငွေပမာဏကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,atleast တယောက်အတန်းအတွက်ငွေပေးချေမှုရမည့်ငွေပမာဏကိုရိုက်ထည့်ပေးပါ
 DocType: POS Profile,POS Profile,POS ကိုယ်ရေးအချက်အလက်များ profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,row {0}: ငွေပေးချေမှုရမည့်ငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,စုစုပေါင်း Unpaid
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,စုစုပေါင်း Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,အချိန်အထဲ billable မဟုတ်ပါဘူး
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ဝယ်ယူ
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,ဝယ်ယူ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ကအခပေးအနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,ထိုဆန့်ကျင် voucher ကို manually ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,ထိုဆန့်ကျင် voucher ကို manually ရိုက်ထည့်ပေးပါ
 DocType: SMS Settings,Static Parameters,static Parameter များကို
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
@@ -3870,14 +3537,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,သင့်ရဲ့အဆက်အသွယ်မှအစုလိုက်အပြုံလိုက် SMS ပို့
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,သည်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,cross-လှိမ့်
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,အကြွေးဝယ်ကဒ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,အကြွေးဝယ်ကဒ်
 DocType: BOM,Item to be manufactured or repacked,item ထုတ်လုပ်သောသို့မဟုတ် repacked ခံရဖို့
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
 DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
 DocType: Employee Education,Major/Optional Subjects,ဗိုလ်မှူး / မလုပ်မဖြစ်ကျအောကျခံ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,machine
 DocType: Sales Invoice Item,Drop Ship,drop သင်္ဘော
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
 DocType: Hub Settings,Seller Name,ရောင်းချသူအမည်
@@ -3887,47 +3552,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,သင်ကအမှုတွဲရှေ့တော်၌ထိုပုံစံကို Save ရမယ်
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo ကို Attach
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Logo ကို Attach
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,ခွဲဝေငွေပမာဏ unadusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ခွဲဝေငွေပမာဏ unadusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
 DocType: Manufacturing Settings,Allow Production on Holidays,အားလပ်ရက်အပေါ်ထုတ်လုပ်မှု Allow
 DocType: Sales Order,Customer's Purchase Order Date,customer ရဲ့ဝယ်ယူခြင်းအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,မြို့တော်စတော့အိတ်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
-DocType: Dropbox Backup,Send Backups to Dropbox,Dropbox ကိုမှရန်များ Send
 DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီလ်မှ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,ပုံစံရေးဆှဲသူ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Item,Automatically create Material Request if quantity falls below this level,အရေအတွက်ကဤအဆင့်အောက်ကျလျှင်အလိုအလျှောက်ပစ္စည်းတောင်းဆိုမှုဖန်တီး
 ,Item-wise Purchase Register,item-ပညာရှိသောသူသည်ဝယ်ယူမှတ်ပုံတင်မည်
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","reorder အ level ကိုတင်ထားရန်, ကို item တစ်ခုဝယ်ယူပစ္စည်းသို့မဟုတ်ထုတ်လုပ်ခြင်းပစ္စည်းဖြစ်ရပါမည်"
 ,Supplier Addresses and Contacts,ပေးသွင်းလိပ်စာနှင့်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project မှမာစတာ။
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
-DocType: Dropbox Backup,Send Notifications To,ရန်အသိပေးချက်များ Send
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref နေ့စွဲ
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref နေ့စွဲ
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,အကောင့်ကို {0} မတည်ရှိပါဘူး
 DocType: Account,Cash,ငွေသား
 DocType: Employee,Short biography for website and other publications.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ဝန်ထမ်း {0} သည်လစာဖွဲ့စည်းပုံဖန်တီး ကျေးဇူးပြု.

diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index ef9777d..05b5680 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Salaris Modus
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecteer Maandelijkse Distributie, als je wilt volgen op basis van seizoensinvloeden."
 DocType: Employee,Divorced,Gescheiden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Waarschuwing: Hetzelfde item is meerdere keren ingevoerd.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artikelen reeds gesynchroniseerd
-DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan Item om meerdere keren in een transactie worden toegevoegd
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan Item om meerdere keren in een transactie worden toegevoegd
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumentenproducten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumentenproducten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Selecteer Party Type eerste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Gloeien
 DocType: Item,Customer Items,Klant Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
 DocType: Item,Publish Item to hub.erpnext.com,Publiceer Item om hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Verlof goedkeurders
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Verhuurd
-DocType: About Us Settings,Website,Website
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Verdichting plus sinteren
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Aanvraag
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Van Materiaal Aanvraag
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Boom
 DocType: Job Applicant,Job Applicant,Sollicitant
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Geen andere resultaten.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Wettelijk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Wettelijk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}
 DocType: C-Form,Customer,Klant
 DocType: Purchase Receipt Item,Required By,Benodigd op
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Reeks succesvol bijgewerkt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Hechten
 DocType: Pricing Rule,Apply On,toepassing op
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 ,Purchase Order Items To Be Received,Inkooporder Artikelen nog te ontvangen
 DocType: SMS Center,All Supplier Contact,Alle Leverancier Contact
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Nieuwe Verlofaanvraag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Nieuwe Verlofaanvraag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Om de klantgebaseerde artikelcode te onderhouden om ze zoekbaar te maken op basis van hun code; gebruik deze optie
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Toon Varianten
-DocType: Sales Invoice Item,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Leningen (Passiva)
 DocType: Employee Education,Year of Passing,Voorbije Jaar
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Op Voorraad
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Maak nieuwe POS Profiel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Gezondheidszorg
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 DocType: Purchase Invoice,Monthly,Maandelijks
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vertraging in de betaling (Dagen)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailadres
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defensie
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailadres
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
 DocType: Company,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rij # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rij # {0}:
 DocType: Delivery Note,Vehicle No,Voertuig nr.
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Selecteer Prijslijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Houtbewerking
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D printing
 DocType: Employee,Holiday List,Holiday Lijst
 DocType: Time Log,Time Log,Tijd Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Accountant
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Company,Phone No,Telefoonnummer
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",Log van activiteiten van gebruikers tegen taken die kunnen worden gebruikt voor het bijhouden van tijd facturering.
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nieuwe {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nieuwe {0}: # {1}
 ,Sales Partners Commission,Verkoop Partners Commissie
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Afkorting kan niet meer dan 5 tekens lang zijn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
-						exist with this Attribute.",Attribuut Waarde {0} niet uit {1} als Item Varianten \ kan worden verwijderd bestaan met dit attribuut.
-DocType: Print Settings,Classic,Klassiek
+						exist with this Attribute.",Attribuut Waarde {0} niet uit {1} als Item Varianten \ kan worden verwijderd bestaan met dit attribuut.
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dit is een basisrekening en kan niet worden bewerkt.
 DocType: BOM,Operations,Bewerkingen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan de autorisatie niet instellen op basis van Korting voor {0}
 DocType: Bin,Quantity Requested for Purchase,Aantal aangevraagd voor inkoop
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bevestig .csv-bestand met twee kolommen, één voor de oude naam en één voor de nieuwe naam"
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vacature voor een baan.
 DocType: Item Attribute,Increment,Aanwas
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Kies Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Adverteren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Adverteren
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Hetzelfde bedrijf is meer dan één keer ingevoerd
 DocType: Employee,Married,Getrouwd
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Niet toegestaan voor {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 DocType: Payment Reconciliation,Reconcile,Afletteren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Kruidenierswinkel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Maak Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,pensioenfondsen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Magazijn is verplicht als het account type Warehouse
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Controleer of terugkerende orde, uitvinken om te stoppen met terugkerende of zet de juiste Einddatum"
@@ -124,44 +119,39 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +141,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: Item,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief/60) * De werkelijke Operation Time
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
-DocType: Blog Post,Guest,Gast
 DocType: Quality Inspection,Get Specification Details,Get Specificatie Details
 DocType: Lead,Interested,Geïnteresseerd
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Stuklijst
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Opening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Van {0} tot {1}
 DocType: Item,Copy From Item Group,Kopiëren van Item Group
 DocType: Journal Entry,Opening Entry,Opening Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} is verplicht
 DocType: Stock Entry,Additional Costs,Bijkomende kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
 DocType: Lead,Product Enquiry,Product Aanvraag
-DocType: Standard Reply,Owner,eigenaar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vul aub eerst bedrijf in
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Onder Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Doel op
 DocType: BOM,Total Cost,Totale kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Ruimen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Activiteitenlogboek:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Vastgoed
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Vastgoed
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Rekeningafschrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Geneesmiddelen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Geneesmiddelen
 DocType: Expense Claim Detail,Claim Amount,Claim Bedrag
 DocType: Employee,Mr,De heer
-DocType: Custom Script,Client,Klant
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
 DocType: Naming Series,Prefix,Voorvoegsel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Verbruiksartikelen
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Verbruiksartikelen
 DocType: Upload Attendance,Import Log,Importeren Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Verstuur
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Jaarsalaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Jaarsalaris
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Voorraadkosten
 DocType: Newsletter,Email Sent?,E-mail verzonden?
@@ -169,30 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
 DocType: Delivery Note,Installation Status,Installatie Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
 DocType: Item,Supply Raw Materials for Purchase,Supply Grondstoffen voor Aankoop
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artikel {0} moet een inkoopbaar artikel zijn
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens en bevestig het gewijzigde bestand.
- Alle data en werknemer combinatie in de geselecteerde periode zal komen in de sjabloon, met bestaande presentielijsten"
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zal worden bijgewerkt zodra verkoopfactuur is ingediend.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen "
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rechttrekken
 DocType: BOM Replace Tool,New BOM,Nieuwe Eenheid
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tijd Logs voor Billing.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter reeds verzonden
 DocType: Lead,Request Type,Aanvraag type
 DocType: Leave Application,Reason,Reden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Uitzenden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Uitvoering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,De eerste gebruiker zal de System Manager te worden (u kunt deze later wijzigen).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Uitzenden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Uitvoering
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,De eerste gebruiker zal de System Manager te worden (u kunt deze later wijzigen).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Details van de uitgevoerde handelingen.
 DocType: Serial No,Maintenance Status,Onderhoud Status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikelen en prijzen
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikelen en prijzen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Van Datum moet binnen het boekjaar zijn. Er vanuit gaande dat Van Datum {0} is
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecteer de werknemer voor wie u de Beoordeling wilt maken.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostenplaats {0} behoort niet tot Bedrijf {1}
@@ -204,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prijslijst moet van toepassing zijn op Inkoop of Verkoop
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},De installatie mag niet vóór leveringsdatum voor post {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Korting op de prijslijst Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Voornaam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mal gieten
 DocType: Offer Letter,Select Terms and Conditions,Select Voorwaarden
 DocType: Production Planning Tool,Sales Orders,Verkooporders
 DocType: Purchase Taxes and Charges,Valuation,Waardering
@@ -218,58 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankrekening
 DocType: Leave Type,Allow Negative Balance,Laat negatief saldo
 DocType: Selling Settings,Default Territory,Standaard Regio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisie
 DocType: Production Order Operation,Updated via 'Time Log',Bijgewerkt via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Rekening {0} behoort niet tot Bedrijf {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: Sales Invoice,Is Opening Entry,Wordt Opening Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Vermeld als niet-standaard te ontvangen houdend met de toepasselijke
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Voor Magazijn is vereist voor het Indienen
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ontvangen op
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vul Bedrijf in
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
 DocType: Lead,Address & Contact,Adres &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
 DocType: Newsletter List,Total Subscribers,Totaal Abonnees
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Contact Naam
+,Contact Name,Contact Naam
 DocType: Production Plan Item,SO Pending Qty,VO afwachting Aantal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Maakt salarisstrook voor de bovengenoemde criteria.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Inkoopaanvraag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbele behuizing
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Verlaat per jaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Verlaat per jaar
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Stel Naming Series voor {0} via Setup&gt; Instellingen&gt; Naamgeving Series
 DocType: Time Log,Will be updated when batched.,Zal worden bijgewerkt wanneer gedoseerd.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
-DocType: Bulk Email,Message,Bericht
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referentienummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,jaar-
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
 DocType: Material Request Item,Min Order Qty,Minimum Aantal
 DocType: Lead,Do Not Contact,Neem geen contact op
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,De unieke ID voor het bijhouden van alle terugkerende facturen. Het wordt gegenereerd bij het indienen.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Item,Publish in Hub,Publiceren in Hub
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,"Materiaal Aanvraag
-"
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum
 DocType: Item,Purchase Details,Inkoop Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Staalborstel
 DocType: Employee,Relation,Relatie
 DocType: Shipping Rule,Worldwide Shipping,Wereldwijde verzending
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bevestigde orders van klanten.
@@ -285,12 +264,10 @@
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 DocType: Maintenance Schedule,Generate Schedule,Genereer Plan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Kosten Hoofd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Selecteer eerst een Charge Type
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,laatst
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max. 5 tekens
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecteer uw taal
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max. 5 tekens
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,De eerste Verlofgoedkeurder in de lijst wordt als de standaard Verlofgoedkeurder ingesteld
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Schakelt creatie van tijd logs tegen productieorders. Operations mag niet worden gevolgd tegen Productieorder
@@ -301,29 +278,20 @@
 DocType: Item,Variant Of,Variant van
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Artikel {0} moet service-artikel zijn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Voltooide Aantal kan niet groter zijn dan 'Aantal aan Manufacture'
-DocType: DocType,Administrator,Beheerder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserboren
-DocType: Stock UOM Replace Utility,New Stock UOM,Nieuwe Voorraad Eenheid
 DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd
 DocType: Employee,External Work History,Externe Werk Geschiedenis
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kringverwijzing Error
-DocType: Communication,Closed,Gesloten
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat.
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Functieprofiel
 DocType: Newsletter,Newsletter,Nieuwsbrief
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Insnoering
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
 DocType: Journal Entry,Multi Currency,Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Het artikel is bijgewerkt
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
 DocType: Sales Invoice Item,Delivery Note,Vrachtbrief
-DocType: Dropbox Backup,Allow Dropbox Access,Laat Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Het opzetten van Belastingen
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Bericht is gewijzigd nadat u het getrokken. Neem dan trekt het weer.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Workstation,Rent Cost,Huurkosten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecteer maand en jaar
@@ -331,33 +299,30 @@
 DocType: Employee,Company Email,Bedrijf E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debet Bedrag in account Valuta
 DocType: Shipping Rule,Valid for Countries,Geldig voor Landen
-DocType: Workflow State,Refresh,Verversen
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import gerelateerde gebieden zoals valuta , wisselkoers , import totaal, import eindtotaal enz. zijn beschikbaar in aankoopbewijs Leverancier offerte, factuur , bestelbon enz."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Totaal Bestel Beschouwd
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Vul de 'Herhaal op dag van de maand' waarde in
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Vul de 'Herhaal op dag van de maand' waarde in
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Verkrijgbaar in BOM , Delivery Note, aankoopfactuur, Productie Order , Bestelling , Kwitantie , verkoopfactuur , Sales Order , Voorraad Entry , Rooster"
 DocType: Item Tax,Tax Rate,Belastingtarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecteer Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selecteer Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} beheerd batchgewijs, is niet te rijmen met behulp \
  Stock Verzoening, in plaats daarvan gebruik Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Aankoopbon moet worden ingediend
-DocType: Stock UOM Replace Utility,Current Stock UOM,Huidige voorraad eenheid
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Uw e-mailadres
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Zie bijlage
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Waterstraalsnijden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Installatie al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Installatie al voltooid !
 ,Finished Goods,Gereed Product
 DocType: Delivery Note,Instructions,Instructies
 DocType: Quality Inspection,Inspected By,Geïnspecteerd door
@@ -372,6 +337,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Gelieve geen accounts voor klanten en leveranciers te creëren. Ze worden rechtstreeks gemaakt op basis van de klant / leverancier meesters.
 DocType: Currency Exchange,Currency Exchange,Wisselkoersen
 DocType: Purchase Invoice Item,Item Name,Artikelnaam
+DocType: Authorization Rule,Approving User  (above authorized value),Goedkeuren gebruiker (boven de toegestane waarde)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Batig saldo
 DocType: Employee,Widowed,Weduwe
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Artikelen die worden aangevraagd die ""Niet op voorraad"" zijn, rekening houdend met alle magazijnen op basis van verwachte aantal en minimale bestelhoeveelheid"
@@ -381,22 +347,21 @@
 ,Purchase Register,Inkoop Register
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
 DocType: Workstation,Consumable Cost,Verbruikskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
 DocType: Purchase Receipt,Vehicle Date,Vehicle Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,medisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,medisch
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube kralen
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 DocType: Employee,Single,Enkele
 DocType: Issue,Attachment,Gehechtheid
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan niet worden ingesteld voor groep kostenplaats
 DocType: Account,Cost of Goods Sold,Kostprijs verkopen
 DocType: Purchase Invoice,Yearly,Jaarlijks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Vul kostenplaats in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vul kostenplaats in
 DocType: Journal Entry Account,Sales Order,Verkooporder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Gem. Verkoopkoers
 DocType: Purchase Order,Start date of current order's period,Startdatum van de periode huidige order periode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Hoeveelheid moet een geheel getal zijn in rij {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Hoeveelheid moet een geheel getal zijn in rij {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
 DocType: Delivery Note,% Installed,% Geïnstalleerd
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vul aub eerst de naam van het bedrijf in
@@ -406,10 +371,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisch instellen serienummers op basis van FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Scheurende
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Tot Zaak nr' kan niet minder zijn dan 'Van Zaak nr'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Niet gestart
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Oude Parent
@@ -418,13 +381,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Vakantie meester .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell moulding
 DocType: Material Request Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vul Artikelcode in.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Indien aangevinkt, zal de BTW-bedrag worden beschouwd als reeds in de Print Tarief / Print Bedrag"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totaal Aantal
@@ -434,35 +397,30 @@
 DocType: Item Attribute,To Range,Om Bereik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
 DocType: Features Setup,Imports,Imports
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lijmen
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Afwachting van activiteiten voor vandaag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Aanwezigheid record.
 DocType: Bank Reconciliation,Journal Entries,Journaalposten
 DocType: Sales Order Item,Used for Production Plan,Gebruikt voor Productie Plan
-DocType: System Settings,Loading...,Laden ...
-DocType: DocField,Password,Wachtwoord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition Modeling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (in minuten)
 DocType: Customer,Buyer of Goods and Services.,Koper van goederen en diensten.
 DocType: Journal Entry,Accounts Payable,Crediteuren
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abonnees toevoegen
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Bestaat niet"
 DocType: Pricing Rule,Valid Upto,Geldig Tot
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Directe Inkomsten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Boekhouder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Boekhouder
 DocType: Payment Tool,Received Or Paid,Ontvangen of betaald
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Selecteer Company
 DocType: Stock Entry,Difference Account,Verschillenrekening
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan niet dicht taak als haar afhankelijke taak {0} is niet gesloten.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetica
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
-DocType: Communication,Subject,Onderwerp
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 ,Serial No Warranty Expiry,Serienummer Garantie Afloop
@@ -470,8 +428,7 @@
 DocType: Purchase Invoice Item,Item,Artikel
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Managing Subcontracting
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nieuwe Eenheid mag NIET van het type Geheel getal zijn
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Managing Subcontracting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meubilair en Inrichting
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
@@ -483,30 +440,30 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Verwijder Company Transactions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,ARtikel {0} is geen inkoopbaar artikel
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} is een ongeldig e-mailadres in 'Notification \
  Email Address'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Totaal Billing Dit Jaar:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Totaal Billing Dit Jaar:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan niet verwijderen Serienummer {0}, zoals het wordt gebruikt in de voorraad transacties"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Sluiten (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Sluiten (Cr)
 DocType: Serial No,Warranty Period (Days),Garantieperiode (dagen)
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 ,Pending Qty,In afwachting Aantal
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Negeren
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
 DocType: Pricing Rule,Valid From,Geldig van
 DocType: Sales Invoice,Total Commission,Totaal Commissie
 DocType: Pricing Rule,Sales Partner,Verkoop Partner
 DocType: Buying Settings,Purchase Receipt Required,Ontvangstbevestiging Verplicht
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Maandelijkse Verdeling** helpt u uw budget te verdelen over maanden als u seizoensgebondenheid in uw bedrijf heeft. Om een budget te verdelen met behulp van deze verdeling, stelt u deze **Maandelijkse Verdeling** in in de **Kostenplaats**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Geen records gevonden in de factuur tabel
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Maandelijkse Verdeling** helpt u uw budget te verdelen over maanden als u seizoensgebondenheid in uw bedrijf heeft. Om een budget te verdelen met behulp van deze verdeling, stelt u deze **Maandelijkse Verdeling** in in de **Kostenplaats**"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
@@ -514,7 +471,6 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
-DocType: About Us Settings,Website Manager,Website Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Boekjaar Startdatum mag niet groter zijn dan het Boekjaar Einddatum
 DocType: Warranty Claim,Resolution,Oplossing
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levertijd: {0}
@@ -522,25 +478,24 @@
 DocType: Sales Order,Billing and Delivery Status,Facturering en Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,vorig
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Terugkerende verkoop
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecteer Verkooporders op basis waarvan u Productie Orders wilt maken.
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Salaris componenten.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database van potentiële klanten.
+DocType: Authorization Rule,Customer or Item,Klant of Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Klantenbestand.
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
-DocType: Event,Wednesday,Woensdag
 DocType: Sales Invoice,Customer's Vendor,Leverancier van Klant
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Productie Order is Verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Voorstel Schrijven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Voorstel Schrijven
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Een andere Sales Person {0} bestaat met dezelfde werknemer id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatieve Voorraad Fout ({6}) voor Artikel {0} in Magazijn {1} op {2} {3} in {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscale Jaar Company
@@ -561,20 +516,16 @@
 DocType: Activity Type,Default Costing Rate,Standaard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Onderhoudsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dan worden prijsregels uitgefilterd op basis van Klant, Klantgroep, Regio,  Leverancier, Leverancier Type, Campagne, Verkooppartner, etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Installeer dropbox python module
 DocType: Employee,Passport Number,Paspoortnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Van Ontvangstbevestiging
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Van Ontvangstbevestiging
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Gebaseerd op' en 'Groepeer per' kunnen niet hetzelfde zijn
 DocType: Sales Person,Sales Person Targets,Verkoper Doelen
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,naar
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Vul het e-mailadres in
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Eindbuis vormen
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Activiteit Type
@@ -582,25 +533,20 @@
 DocType: Customer,Fixed Days,Vaste Dagen
 DocType: Sales Invoice,Packing List,Paklijst
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inkooporders voor leveranciers.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projecten Gebruiker
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumed
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} niet gevonden in Factuur Details tabel
 DocType: Company,Round Off Cost Center,Afronden kostenplaats
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Onderhoud Bezoek {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Material Request,Material Transfer,Materiaal Verplaatsing
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening ( Dr )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Plaatsing timestamp moet na {0} zijn
-apps/frappe/frappe/config/setup.py +59,Settings,Instellingen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Vrachtkosten belastingen en toeslagen
 DocType: Production Order Operation,Actual Start Time,Werkelijke Starttijd
 DocType: BOM Operation,Operation Time,Operatie Tijd
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Meer
 DocType: Pricing Rule,Sales Manager,Verkoopsmanager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Hernoemen
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Verbuiging
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Door gebruiker toestaan
 DocType: Journal Entry,Bill No,Factuur nr
 DocType: Purchase Invoice,Quarterly,Kwartaal
 DocType: Selling Settings,Delivery Note Required,Vrachtbrief Verplicht
@@ -609,17 +555,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vul artikeldetails in
 DocType: Purchase Receipt,Other Details,Andere Details
 DocType: Account,Accounts,Rekeningen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight scheren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Het bijhouden van een artikel in verkoop- en inkoopdocumenten op basis van het serienummer. U kunt hiermee ook de garantiedetails van het product bijhouden.
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Afgewezen Magazijn is verplicht bij een afgewezen Artikel.
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Employee,Provide email id registered in company,Zorg voor een bedrijfs e-mail ID
 DocType: Hub Settings,Seller City,Verkoper Stad
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Item heeft varianten.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Artikel {0} niet gevonden
 DocType: Bin,Stock Value,Voorraad Waarde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Boom Type
@@ -628,14 +573,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en magazijn
 DocType: Sales Invoice,Commission Rate (%),Commissie Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Tegen Voucher Typ een van Sales Order, verkoopfactuur of Inboeken moet zijn"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Niet in staat om wisselkoers vinden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Ruimtevaart
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Welkom
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Ruimtevaart
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Taak Onderwerp
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Goederen ontvangen van leveranciers.
-DocType: Communication,Open,Open
 DocType: Lead,Campaign Name,Campagnenaam
 ,Reserved,gereserveerd
 DocType: Purchase Order,Supply Raw Materials,Supply Grondstoffen
@@ -644,29 +585,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} is geen voorraad artikel
 DocType: Mode of Payment Account,Default Account,Standaard Rekening
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de Opportunity is gemaakt obv een lead
-DocType: Contact Us Settings,Address Title,Adres Titel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
 ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
-DocType: Dropbox Backup,Daily,Dagelijks
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Employee,Cell Number,Mobiele nummer
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Je kan niet in de huidige voucher in 'Tegen Journal Entry' kolom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportunity Van
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Maandsalaris overzicht.
 DocType: Item Group,Website Specifications,Website Specificaties
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nieuwe Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Van {0} van type {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Boekingen kunnen worden gemaakt tegen leaf nodes. Inzendingen tegen groepen zijn niet toegestaan.
-DocType: ToDo,High,Hoog
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Opportunity,Maintenance,Onderhoud
-DocType: User,Male,Mannelijk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Verkoop campagnes
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -714,10 +652,9 @@
 DocType: Address,Personal,Persoonlijk
 DocType: Expense Claim Detail,Expense Claim Type,Kostendeclaratie Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standaardinstellingen voor Winkelwagen
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} is verbonden met de Orde {1}, controleer dan of het moet worden getrokken als voorschot in deze factuur."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} is verbonden met de Orde {1}, controleer dan of het moet worden getrokken als voorschot in deze factuur."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Gebouwen Onderhoudskosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
@@ -725,14 +662,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Process Payroll,Send Email,E-mail verzenden
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Bijwerken voorraad' kan niet worden gecontroleerd, omdat items niet worden geleverd via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nrs
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Bijwerken voorraad' kan niet worden aangevinkt omdat items niet worden geleverd via {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nrs
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mijn facturen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mijn facturen
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Geen werknemer gevonden
 DocType: Purchase Order,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
@@ -744,42 +682,39 @@
 DocType: Item,Website Warehouse,Website Magazijn
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn
-apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form regels
+apps/erpnext/erpnext/config/accounts.py +169,C-Form records,C -Form records
 apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Klant en leverancier
 DocType: Email Digest,Email Digest Settings,E-mail Digest Instellingen
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Support vragen van klanten.
 DocType: Features Setup,"To enable ""Point of Sale"" features",Naar &quot;Point of Sale&quot; functies in te schakelen
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Selecteer Artikelen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
-DocType: Comment,Reference Name,Referentie Naam
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: Sales Invoice Item,Target Warehouse,Doel Magazijn
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Verwachte leverdatum kan niet voor de Verkooporder Datum
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto winst / verlies
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
 DocType: Production Order,Item To Manufacture,Artikel te produceren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanente mal gieten
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Aanschaffen om de betaling
 DocType: Sales Order Item,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
 DocType: Newsletter,Newsletter Manager,Nieuwsbrief Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Variant {0} bestaat al met dezelfde kenmerken
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Opening&#39;
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
 DocType: Expense Claim,Expenses,Uitgaven
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribute
 ,Purchase Receipt Trends,Ontvangstbevestiging Trends
 DocType: Appraisal,Select template from which you want to get the Goals,Selecteer template van waaruit u de Doelen wilt krijgen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Research & Development
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Research & Development
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Registratie Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-order Aantal
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Gepland om te sturen naar {0}
@@ -790,18 +725,16 @@
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Verkooppunt
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan niet dragen {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo reeds in Credit, is het niet toegestaan om 'evenwicht moet worden' als 'Debet'"
 DocType: Account,Balance must be,Saldo moet worden
 DocType: Hub Settings,Publish Pricing,Publiceer Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Kostendeclaratie afgewezen Bericht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spijkeren
 ,Available Qty,Beschikbaar Aantal
 DocType: Purchase Taxes and Charges,On Previous Row Total,Aantal van volgende rij
 DocType: Salary Slip,Working Days,Werkdagen
 DocType: Serial No,Incoming Rate,Inkomende Rate
 DocType: Packing Slip,Gross Weight,Bruto Gewicht
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Feestdagen opnemen in totaal aantal werkdagen.
 DocType: Job Applicant,Hold,Houden
 DocType: Employee,Date of Joining,Datum van Indiensttreding
@@ -811,30 +744,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Bekijk Abonnees
 DocType: Purchase Invoice Item,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Gritstralen
 DocType: Employee,Ms,Mevrouw
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Wisselkoers stam.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Stuklijst {0} moet actief zijn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuleren Materiaal Bezoeken {0} voor het annuleren van deze Maintenance Visit
 DocType: Salary Slip,Leave Encashment Amount,Laat inning Bedrag
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Benodigde hoeveelheid
 DocType: Bank Reconciliation,Total Amount,Totaal bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Production Planning Tool,Production Orders,Productieorders
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publiceren naar onderdelen wilt synchroniseren
-DocType: GL Entry,Account Currency,Account Valuta
+DocType: Bank Reconciliation,Account Currency,Account Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Vermeld Ronde Off Account in Company
 DocType: Purchase Receipt,Range,Reeks
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Features Setup,Item Barcode,Artikel Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 DocType: Address,Shop,Winkelen
@@ -843,7 +775,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standaard Kas-/Bankrekening wordt automatisch bijgewerkt in POS Factuur als deze modus is geselecteerd.
 DocType: Employee,Permanent Address Is,Vast Adres is
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operatie afgerond voor hoeveel eindproducten?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,De Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,De Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Korting voor over-{0} gekruist voor post {1}.
 DocType: Employee,Exit Interview Details,Exit Gesprek Details
 DocType: Item,Is Purchase Item,Is inkoopartikel
@@ -855,67 +787,62 @@
 DocType: Payment Tool,Paid,Betaald
 DocType: Salary Slip,Total in words,Totaal in woorden
 DocType: Material Request Item,Lead Time Date,Lead Tijd Datum
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,is verplicht. Misschien Valutawissel record is niet gemaakt voor
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,is verplicht. Misschien is dit Valuta record niet gemaakt voor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Voor &#39;Product Bundel&#39; items, Warehouse, Serienummer en Batch Geen zal worden beschouwd van de &#39;Packing List&#39; tafel. Als Warehouse en Batch Geen zijn hetzelfde voor alle verpakking items voor welke &#39;Product Bundle&#39; punt, kunnen die waarden in de belangrijkste Item tafel worden ingevoerd, wordt waarden worden gekopieerd naar &quot;Packing List &#39;tafel."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Verzendingen naar klanten.
 DocType: Purchase Invoice Item,Purchase Order Item,Inkooporder Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirecte Inkomsten
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Betaling Bedrag = openstaande bedrag
-DocType: Contact Us Settings,Address Line 1,Adres Lijn 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variantie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Bedrijfsnaam
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variantie
+,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Kies Punt voor Overdracht
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Bekijk een overzicht van alle hulp video&#39;s
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecteer hoofdrekening van de bank waar cheque werd gedeponeerd.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Zodat de gebruiker te bewerken prijslijst Rate bij transacties
 DocType: Pricing Rule,Max Qty,Max Aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rij {0}: Betaling tegen Sales / Purchase Order moet altijd worden gemarkeerd als voorschot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemisch
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemisch
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 DocType: Process Payroll,Select Payroll Year and Month,Selecteer Payroll Jaar en Maand
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Ga naar de juiste groep (meestal Toepassing van fondsen&gt; Vlottende activa&gt; Bankrekeningen en maak een nieuwe account (door te klikken op Toevoegen kind) van het type &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
-DocType: Comment,Unsubscribed,Uitgeschreven
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Inspectie Criteria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Boom van financiële kostenplaatsen.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overgebrachte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Wit
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Voeg uw foto toe
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Maken
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Voeg uw foto toe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Maken
 DocType: Journal Entry,Total Amount in Words,Totaal bedrag in woorden
-DocType: Workflow State,Stop,stoppen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat u het formulier niet hebt opgeslagen. Neem contact op met Support als het probleem aanhoudt .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mijn winkelwagen
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Order Type moet één van {0} zijn
 DocType: Lead,Next Contact Date,Volgende Contact Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aandelenopties
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aandelenopties
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Aantal voor {0}
 DocType: Leave Application,Leave Application,Verlofaanvraag
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Verlof Toewijzing Tool
 DocType: Leave Block List,Leave Block List Dates,Laat Block List Data
 DocType: Company,If Monthly Budget Exceeded (for expense account),Als Maandelijkse Budget overschreden (voor declaratierekening)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Garneersel
 DocType: Workstation,Net Hour Rate,Netto uurtarief
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Vrachtkosten Inkoop Ontvangstbewijs
 DocType: Company,Default Terms,Default Voorwaarden
 DocType: Packing Slip Item,Packing Slip Item,Pakbon Artikel
 DocType: POS Profile,Cash/Bank Account,Kas/Bankrekening
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Archiveren
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Korting
 DocType: Features Setup,Purchase Discounts,Inkoopkortingen
 DocType: Workstation,Wages,Loon
@@ -923,7 +850,7 @@
 DocType: Project,Internal,Intern
 DocType: Task,Urgent,Dringend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},Geef een geldige rij-ID voor rij {0} in tabel {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad en gebruiken ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Ga naar het bureaublad om aan de slag te gaan met ERPNext
 DocType: Item,Manufacturer,Fabrikant
 DocType: Landed Cost Item,Purchase Receipt Item,Ontvangstbevestiging Artikel
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
@@ -932,7 +859,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
 DocType: Serial No,Creation Document No,Aanmaken Document nr
 DocType: Issue,Issue,Uitgifte
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Account komt niet overeen met de vennootschap
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
 DocType: BOM Operation,Operation,Operatie
@@ -940,13 +868,13 @@
 DocType: Tax Rule,Shipping State,Scheepvaart State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Verkoopkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard kopen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard kopen
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Maken Stock Inzendingen
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Maken Stock Inzendingen
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
 DocType: Item,Default Supplier,Standaardleverancier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Production Allowance Percentage
@@ -961,32 +889,30 @@
 DocType: Time Log Batch,updated via Time Logs,bijgewerkt via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde Leeftijd
 DocType: Opportunity,Your sales person who will contact the customer in future,Uw verkopers die in de toekomst contact op zullen nemen met de klant.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 DocType: Company,Default Currency,Standaard valuta
 DocType: Contact,Enter designation of this Contact,Voer aanduiding van deze Contactpersoon in
-DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Van Medewerker
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
 DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry
 DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vervoer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vervoer
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,en jaar:
 DocType: Email Digest,Annual Expense,Jaarlijkse Expense
 DocType: SMS Center,Total Characters,Totaal Tekens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Factuurspecificatie
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Afletteren Factuur
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bijdrage%
 DocType: Item,website page link,Website Paginalink
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Laten we het voorbereiden van het systeem voor het eerste gebruik.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Registratienummers van de onderneming voor uw referentie. Fiscale nummers, enz."
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Winkelwagen Verzenden Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Productie Order {0} moet worden geannuleerd voor het annuleren van deze verkooporder
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecteer Tijd Logs en druk op Indienen om een nieuwe verkoopfactuur maken.
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecteer Tijd Logs en druk op Indienen om een nieuwe verkoopfactuur maken.
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
 DocType: Salary Slip,Deductions,Inhoudingen
 DocType: Purchase Invoice,Start date of current invoice's period,Begindatum van de huidige factuurperiode
@@ -1003,14 +929,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Beheer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Beheer
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Soorten activiteiten voor Time Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investment casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ofwel debet of credit bedrag is nodig voor {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Actief
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blauw
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blauw
 DocType: Purchase Invoice,Is Return,Is Return
 DocType: Price List Country,Price List Country,Prijslijst Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Verder nodes kunnen alleen worden gemaakt op grond van het type nodes 'Groep'
@@ -1020,50 +944,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profiel {0} al gemaakt voor de gebruiker: {1} en {2} bedrijf
 DocType: Purchase Order Item,UOM Conversion Factor,Eenheid Omrekeningsfactor
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Gelaagd object productie
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverancierbestand
 DocType: Account,Balance Sheet,Balans
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Strekvormen
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Uw verkoper krijgt een herinnering op deze datum om contact op te nemen met de klant
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Belastingen en andere inhoudingen op het salaris.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
 DocType: Account,Warehouse,Magazijn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Voorraad boekingen en Journaalposten worden opnieuw geboekt voor de geselecteerde Ontvangstbewijzen
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punt 1
 DocType: Holiday,Holiday,Feestdag
-DocType: Event,Saturday,Zaterdag
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laat leeg indien dit voor alle vestigingen is
 ,Daily Time Log Summary,Dagelijkse Tijd Log Samenvatting
-DocType: DocField,Label,Label
 DocType: Payment Reconciliation,Unreconciled Payment Details,Niet-afgeletterde Betalingsgegevens
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
 DocType: Lead,Call,Bellen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Het opzetten van Werknemers
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Rooster """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Selecteer eerst een voorvoegsel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,onderzoek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,onderzoek
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Gelieve ten minste één attribuut in de tabel attributen opgeven
 DocType: Contact,User ID,Gebruikers-ID
-DocType: Communication,Sent,verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Bekijk Grootboek
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
-DocType: Communication,Delivery Status,Verzendstatus
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 DocType: Production Order,Manufacture against Sales Order,Produceren tegen Verkooporder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Rest van de Wereld
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
@@ -1074,13 +991,11 @@
 DocType: BOM Item,Item Description,Artikelomschrijving
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Is Terugkerende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direct metal lasersintering
 DocType: Purchase Order,Supplied Items,Geleverde Artikelen
 DocType: Production Order,Qty To Manufacture,Aantal te produceren
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Handhaaf zelfde tarief gedurende inkoopcyclus
 DocType: Opportunity Item,Opportunity Item,Opportunity Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tijdelijke Opening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Werknemer Verlof Balans
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
 DocType: Address,Address Type,Adrestype
@@ -1096,35 +1011,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get openstaande facturen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Klein
 DocType: Employee,Employee Number,Werknemer Nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punt 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hoofdrekening {0} aangemaakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Groen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Groen
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totaal Bereikt
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totaal Bereikt
 DocType: Employee,Place of Issue,Plaats van uitgifte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
-DocType: Report,Disabled,Uitgezet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
+DocType: Email Digest,Add Quote,Quote voegen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,landbouw
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Uw producten of diensten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Wijze van betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Inkooporder
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Naam is vereist
 DocType: Purchase Invoice,Recurring Type,Terugkerende Type
 DocType: Address,City/Town,Stad / Plaats
 DocType: Email Digest,Annual Income,Jaarlijks inkomen
 DocType: Serial No,Serial No Details,Serienummer Details
 DocType: Purchase Invoice Item,Item Tax Rate,Artikel BTW-tarief
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artikel {0} moet een uitbesteed artikel zijn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitaalgoederen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
@@ -1134,14 +1048,13 @@
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Verwachte levertijd is minder dan gepland Start Date.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Instellen Account Type helpt bij het selecteren van deze account in transacties.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Munt)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totaal Uitgaande
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Er kan maar één Verzendregel Voorwaarde met 0 of blanco waarde zijn voor ""To Value """
 DocType: Authorization Rule,Transaction,Transactie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opmerking: Deze kostenplaats is een groep. Kan geen boekingen aanmaken voor groepen.
-apps/frappe/frappe/config/desk.py +7,Tools,Tools
 DocType: Item,Website Item Groups,Website Artikelgroepen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Productieordernummer is verplicht voor voorraad binnenkomst doel de fabricage
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
@@ -1149,24 +1062,22 @@
 DocType: Journal Entry,Journal Entry,Journaalpost
 DocType: Workstation,Workstation Name,Naam van werkstation
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Reacties
 DocType: Salary Slip,Bank Account No.,Bankrekeningnummer
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dit is het nummer van de laatst gemaakte transactie met dit voorvoegsel
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Waardering Tarief vereist voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Waardering Tarief vereist voor Artikel {0}
 DocType: Quality Inspection Reading,Reading 8,Meting 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kunt u zou moeten veranderen &#39;Verdeel Kosten op basis van&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Belastingen en Toeslagen berekenen
 DocType: BOM Operation,Workstation,Werkstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Selecteer aub een andere vennootschap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Bijzonder Verlof
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,U moet Winkelwagen activeren.
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Geen gegevens
 DocType: Appraisal Template Goal,Appraisal Template Goal,Beoordeling Sjabloon Doel
 DocType: Salary Slip,Earning,Verdienen
 DocType: Payment Tool,Party Account Currency,Party account Valuta
@@ -1176,26 +1087,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende voorwaarden gevonden tussen :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totale orderwaarde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Voeding
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,U kunt een tijd log maken alleen tegen een ingediende productieorder
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nieuwsbrieven naar contacten, leads."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta van de Closing rekening moet worden {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van de punten voor alle doelen moeten zijn 100. Het is {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Bewerkingen kan niet leeg worden gelaten.
 ,Delivered Items To Be Billed,Geleverde Artikelen nog te factureren
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
-DocType: DocField,Description,Beschrijving
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
-DocType: Letter Head,Is Default,Is Standaard
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Boekhouding
 DocType: Features Setup,Features Setup,Features Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Bekijk aanbieding Letter
-DocType: Communication,Communication,Communicatie
 DocType: Item,Is Service Item,Is service-artikel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Selecteer boekjaar
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Van {0} | {1} {2}
@@ -1214,7 +1122,7 @@
 DocType: Item,Maintain Stock,Handhaaf Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Van Datetime
 DocType: Email Digest,For Company,Voor Bedrijf
@@ -1224,7 +1132,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
@@ -1238,31 +1146,28 @@
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 ,Batch-Wise Balance History,Batchgewijze Balans Geschiedenis
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Actie Lijst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,leerling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,leerling
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Belasting detail tafel haalden van post meester als een string en opgeslagen in dit gebied.
  Gebruikt voor en -heffingen"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Boekhouding Entry voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Boekhouding Entry voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Geen actieve salarisstructuur gevonden voor werknemer {0} en de maand
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Fiscale Regel voor transacties.
 DocType: Rename Tool,Type of document to rename.,Type document te hernoemen.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,We kopen dit artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,We kopen dit artikel
 DocType: Address,Billing,Facturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Niet verzonden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosieve vormen
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totaal belastingen en toeslagen (Bedrijfsvaluta)
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Gepland om te sturen naar {0} ontvangers
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Uitbesteed werk
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Uitbesteed werk
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
@@ -1272,105 +1177,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Werken Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan JV hoeveelheid {2}
 DocType: Item,Inventory,Voorraad
 DocType: Features Setup,"To enable ""Point of Sale"" view",Inschakelen &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan niet worden gemaakt voor een lege boodschappenmand
 DocType: Item,Sales Details,Verkoop Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Met Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
 DocType: Notification Control,Expense Claim Rejected,Kostendeclaratie afgewezen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",De datum waarop de volgende factuur wordt gegenereerd. Het wordt gegenereerd op te leggen.
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Overheid
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Item Varianten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Overheid
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Item Varianten
 DocType: Company,Services,Services
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totaal ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Totaal ({0})
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
 DocType: Sales Invoice,Source,Bron
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Geen records gevonden in de betaling tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Boekjaar Startdatum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Geen records gevonden in de betaling tabel
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Boekjaar Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Verzinken
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakbon(en) geannuleerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Material Request Item,Sales Order No,Verkooporder nr.
 DocType: Item Group,Item Group Name,Artikel groepsnaam
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Ingenomen
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Verplaats Materialen voor Productie
 DocType: Pricing Rule,For Price List,Voor Prijslijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Aankoopkoers voor punt: {0} niet gevonden, die nodig is om boekhoudkundige afschrijving (kosten) te boeken. Vermeld post prijs tegen een aankoopprijs lijst."
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Extra korting Bedrag (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fout : {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fout : {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Maak nieuwe rekening van Rekeningschema.
 DocType: Maintenance Visit,Maintenance Visit,Onderhoud Bezoek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klant > Klantgroep > Regio
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Verkrijgbaar Aantal Batch bij Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Tijd Log Batch Detail
-DocType: Workflow State,Tasks,taken
 DocType: Landed Cost Voucher,Landed Cost Help,Vrachtkosten Help
-DocType: Event,Tuesday,Dinsdag
 DocType: Leave Block List,Block Holidays on important days.,Blokeer Vakantie op belangrijke dagen.
 ,Accounts Receivable Summary,Debiteuren Samenvatting
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Bladeren voor type {0} reeds toegewezen voor Employee {1} voor periode {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
 DocType: UOM,UOM Name,Eenheid Naam
-DocType: Top Bar Item,Target,Doel
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bijdrage Bedrag
 DocType: Sales Invoice,Shipping Address,Verzendadres
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Deze tool helpt u om te werken of te repareren de hoeveelheid en de waardering van de voorraad in het systeem. Het wordt meestal gebruikt om het systeem waarden en wat in uw magazijnen werkelijk bestaat synchroniseren.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,In Woorden zijn zichtbaar zodra u de vrachtbrief opslaat.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Merk meester.
-DocType: ToDo,Due Date,Verloopdatum
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Merk meester.
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Doos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,De Organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Doos
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,De Organisatie
 DocType: Monthly Distribution,Monthly Distribution,Maandelijkse Verdeling
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Ontvanger Lijst is leeg. Maak Ontvanger Lijst
 DocType: Production Plan Sales Order,Production Plan Sales Order,Productie Plan Verkooporder
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Boekhouding Entry voor {0} kan alleen worden gemaakt in valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Het kerven
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankrekeningen
 ,Bank Reconciliation Statement,Bank Aflettering Statement
 DocType: Address,Lead Name,Lead Naam
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Het openen Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Het openen Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} mag slechts eenmaal voorkomen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan om meer tranfer {0} dan {1} tegen Purchase Order {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan om meer tranfer {0} dan {1} tegen Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Geen Artikelen om te verpakken
 DocType: Shipping Rule Condition,From Value,Van Waarde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bedragen die niet terug te vinden in de bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bedragen die niet terug te vinden in de bank
 DocType: Quality Inspection Reading,Reading 4,Meting 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Claims voor bedrijfsonkosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugaal gieten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetisch veld bijgestaan afwerking
 DocType: Company,Default Holiday List,Standaard Vakantiedagen Lijst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Receipt,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 DocType: Production Planning Tool,Select Sales Orders,Selecteer Verkooporders
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Het kunnen identificeren van artikelen mbv een streepjescode. U kunt hiermee artikelen op Vrachtbrieven en Verkoopfacturen invoeren door de streepjescode van het artikel te scannen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markeren als geleverd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markeren als geleverd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Maak Offerte
 DocType: Dependent Task,Dependent Task,Afhankelijke Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Ontvanger Lijst
@@ -1378,31 +1274,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} View
 DocType: Salary Structure Deduction,Salary Structure Deduction,Salaris Structuur Aftrek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selectieve lasersintering
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeren succesvol!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Leeftijd (dagen)
 DocType: Quotation Item,Quotation Item,Offerte Artikel
 DocType: Account,Account Name,Rekening Naam
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Vanaf de datum kan niet groter zijn dan tot nu toe
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} hoeveelheid {1} moet een geheel getal zijn
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverancier Type stam.
 DocType: Purchase Order Item,Supplier Part Number,Leverancier Onderdeelnummer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Toevoegen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Succespercentage kan niet 0 of 1 zijn
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} is geannuleerd of gestopt
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Voertuig Vertrekdatum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Ontvangstbevestiging {0} is niet ingediend
 DocType: Company,Default Payable Account,Standaard Payable Account
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Instellingen voor online winkelwagentje zoals scheepvaart regels, prijslijst enz."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installatie voltooid
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% gefactureerd
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Human Resources
 DocType: Lead,Upper Income,Bovenste Inkomen
 DocType: Journal Entry Account,Debit in Company Currency,Debet in Company Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mijn Problemen
@@ -1411,12 +1303,9 @@
 DocType: Company,Default Values,Standaard Waarden
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rij {0}: Betaling bedrag kan niet negatief zijn
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Press fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
 DocType: Payment Reconciliation,Payments,Betalingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Heet isostatisch persen
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budget Toegewezen
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klant Kredietsaldo
@@ -1425,12 +1314,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
 DocType: Quotation,Term Details,Voorwaarde Details
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning Voor (Dagen)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
 DocType: Warranty Claim,Warranty Claim,Garantie Claim
 ,Lead Details,Lead Details
-DocType: Authorization Rule,Approving User,Goedkeuren Gebruiker
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smeden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
 DocType: Pricing Rule,Applicable For,Toepasselijk voor
 DocType: Bank Reconciliation,From Date,Van Datum
@@ -1452,64 +1338,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betaalde bedrag (Company Munt)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,online Veilingen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,online Veilingen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Specificeer ofwel Hoeveelheid of Waarderingstarief of beide
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
-apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkel stuks van een artikel. 
+apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkel stuks van een artikel.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tijd Log Batch {0} moet worden 'Ingediend'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totaal Verlofdagen Toegewezen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vereist bij Row Geen {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Voer geldige boekjaar begin- en einddatum
 DocType: Employee,Date Of Retirement,Pensioneringsdatum
 DocType: Upload Attendance,Get Template,Get Sjabloon
 DocType: Address,Postal,Post-
 DocType: Item,Weightage,Weging
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mijnbouw
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hars casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Een Klantgroep met dezelfde naam bestaat. Gelieve de naam van de Klant of de Klantgroep  wijzigen
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Selecteer eerst {0}.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
 DocType: Stock Entry,Material Receipt,Materiaal ontvangst
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,producten
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,producten
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partij Type en Partij is nodig voor Debiteuren / Crediteuren rekening {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Als dit item heeft varianten, dan kan het niet worden geselecteerd in verkooporders etc."
 DocType: Lead,Next Contact By,Volgende Contact Door
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazijn {0} kan niet worden verwijderd als er voorraad is voor artikel {1}
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Notificatie e-mailadres
 DocType: Payment Tool,Find Invoices to Match,Vind facturen aan te passen
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","bv ""XYZ Nationale Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","bv ""XYZ Nationale Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totaal Doel
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totaal Doel
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Winkelwagen is ingeschakeld
 DocType: Job Applicant,Applicant for a Job,Aanvrager van een baan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Geen productieorders aangemaakt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salarisstrook van de werknemer {0} al gemaakt voor deze maand
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Salarisstrook van de werknemer {0} al gemaakt voor deze maand
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Sales Invoice Item,Batch No,Partij nr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoofd
-DocType: DocPerm,Delete,Verwijder
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nieuwe {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Gestopte order kan niet worden geannuleerd. Terugdraaien om te annuleren .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Van veld is verplicht
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Toegewezen bedrag
 DocType: Sales Team,Contribution to Net Total,Bijdrage aan Netto Totaal
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
@@ -1518,53 +1402,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidaat voor een baan.
 DocType: Purchase Order Item,Warehouse and Reference,Magazijn en Referentie
 DocType: Supplier,Statutory info and other general information about your Supplier,Wettelijke info en andere algemene informatie over uw leverancier
-DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adressen
-DocType: Communication,Received,ontvangen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dubbel Serienummer ingevoerd voor Artikel {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Een voorwaarde voor een Verzendregel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item is niet toegestaan om Productieorder hebben.
-DocType: DocField,Attach Image,Bevestig Afbeelding
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item is niet toegestaan om Productieorder hebben.
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Het nettogewicht van dit pakket. (Wordt automatisch berekend als de som van de netto-gewicht van de artikelen)
-DocType: Stock Reconciliation Item,Leave blank if no change,Laat leeg als er geen verandering
 DocType: Sales Order,To Deliver and Bill,Te leveren en Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Logs voor de productie.
 DocType: Item,Apply Warehouse-wise Reorder Level,Solliciteer Warehouse-wise Reorder Niveau
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tijd Log voor taken.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Werkelijke Tijd en kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiaal Aanvraag van maximaal {0} kan worden gemaakt voor Artikel {1} tegen Verkooporder {2}
 DocType: Employee,Salutation,Aanhef
-DocType: Communication,Rejected,Afgewezen
 DocType: Pricing Rule,Brand,Merk
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 DocType: Sales Order Item,Actual Qty,Werkelijk Aantal
 DocType: Sales Invoice Item,References,Referenties
 DocType: Quality Inspection Reading,Reading 10,Meting 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Een lijst van uw producten of diensten die u koopt of verkoopt .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Waarde {0} voor Attribute {1} bestaat niet in de lijst van geldige Item attribuutwaarden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,associëren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,associëren
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Verlopen
 DocType: Packing Slip,To Package No.,Naar pakket nr
-DocType: DocType,System,Systeem
 DocType: Warranty Claim,Issue Date,Uitgiftedatum
 DocType: Activity Cost,Activity Cost,Activiteit Kosten
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbruikt aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,telecommunicatie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,telecommunicatie
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 DocType: Payment Tool,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
 ,Sales Invoice Trends,Verkoopfactuur Trends
 DocType: Leave Application,Apply / Approve Leaves,Toepassing / Goedkeuren Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Voor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan verwijzen rij alleen als het type lading is 'On Vorige Row Bedrag ' of ' Vorige Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Toelage Procent
@@ -1576,33 +1455,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Verkoop moet zijn aangevinkt, indien ""Van toepassing voor"" is geselecteerd als {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverancier Offerte Artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maak salarisstructuur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Het scheren
 DocType: Item,Has Variants,Heeft Varianten
-apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik op &#39;Sales Invoice&#39; knop om een nieuwe verkoopfactuur maken.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Verpakking en etikettering
+apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klik op &#39;Sales Invoice&#39; knop om een nieuwe verkoopfactuur maken.
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Specificeer een Standaard Valuta in Bedrijfsstam en Algemene Standaardwaarden
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Toegang Secret
 DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverancier van goederen of diensten.
 DocType: Budget Detail,Fiscal Year,Boekjaar
 DocType: Cost Center,Budget,Begroting
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan niet worden toegewezen tegen {0}, want het is geen baten of lasten rekening"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Bereikt
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Regio / Klantenservice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,bijv. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,bijv. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In Woorden zijn zichtbaar zodra u de Verkoopfactuur opslaat.
 DocType: Item,Is Sales Item,Is verkoopartikel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artikel groepstructuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
 DocType: Maintenance Visit,Maintenance Time,Onderhoud Tijd
 ,Amount to Deliver,Bedrag te leveren
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Een product of dienst
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Er zijn fouten opgetreden.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Een product of dienst
 DocType: Naming Series,Current Value,Huidige waarde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} aangemaakt
 DocType: Delivery Note Item,Against Sales Order,Tegen klantorder
@@ -1617,15 +1491,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Verloopdatum kan niet voor de Boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Invoerrechten en Belastingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vul Peildatum in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vul Peildatum in
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafel voor post die in Web Site zal worden getoond
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
 DocType: Material Request Item,Material Request Item,Materiaal Aanvraag Artikel
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Boom van Artikelgroepen .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Boom van Artikelgroepen .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rood
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rood
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
 DocType: Account,Frozen,Bevroren
 ,Open Production Orders,Open productieorders
@@ -1635,92 +1509,80 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rij # {0}: Operation {1} is niet voltooid voor {2} aantal van afgewerkte goederen in productieorders # {3}. Gelieve operatie status bijwerken via Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Wijzig Eenheid voor een Artikel.
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptatiecriteria
 DocType: Item Attribute,Attribute Name,Attribuutnaam
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Artikel {0} moet verkoop- of service-artikel zijn in {1}
 DocType: Item Group,Show In Website,Toon in Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Groep
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Groep
 DocType: Task,Expected Time (in hours),Verwachte Tijd (in uren)
 ,Qty to Order,Aantal te bestellen
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Om merknaam volgen in de volgende documenten Delivery Note, Opportunity, Material Request, Item, Purchase Order, Aankoopbon, Koper ontvangst, Citaat, Sales Invoice, Goederen Bundel, Sales Order, Serienummer"
-apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-daigram van alle taken.
+apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt-diagram van alle taken.
 DocType: Appraisal,For Employee Name,Voor Naam werknemer
 DocType: Holiday List,Clear Table,Wis Tabel
 DocType: Features Setup,Brands,Merken
 DocType: C-Form Invoice Detail,Invoice No,Factuur nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Van Inkooporder
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Van Inkooporder
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Klant adressen en contacten
 DocType: Employee,Resignation Letter Date,Ontslagbrief Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet ingesteld
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Het systeem wordt nu ingericht. Dit kan even duren.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,paar
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,paar
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 DocType: Maintenance Schedule Detail,Actual Date,Werkelijke Datum
 DocType: Item,Has Batch No,Heeft Batch nr.
 DocType: Delivery Note,Excise Page Number,Accijnzen Paginanummer
 DocType: Employee,Personal Details,Persoonlijke Gegevens
 ,Maintenance Schedules,Onderhoudsschema&#39;s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Zoals productieorder kan worden gemaakt voor dit punt, moet het een voorraad item."
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aansluiting
-DocType: Authorization Rule,Above Value,Boven waarde
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
 DocType: Purchase Order,Delivered,Geleverd
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup inkomende server voor banen e-id . ( b.v. jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totaal toegewezen bladeren {0} kan niet lager zijn dan die reeds zijn goedgekeurd bladeren {1} voor de periode
 DocType: Journal Entry,Accounts Receivable,Debiteuren
 ,Supplier-Wise Sales Analytics,Leverancier-gebaseerde Verkoop Analyse
 DocType: Address Template,This format is used if country specific format is not found,Dit formaat wordt gebruikt als landspecifiek formaat niet kan worden gevonden
-DocType: Custom Field,Custom,Aangepast
 DocType: Production Order,Use Multi-Level BOM,Gebruik Multi-Level Stuklijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Spuitgieten
 DocType: Bank Reconciliation,Include Reconciled Entries,Omvatten Reconciled Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Boom van financiële rekeningen
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laat leeg indien overwogen voor alle werknemer soorten
 DocType: Landed Cost Voucher,Distribute Charges Based On,Verdeel Toeslagen op basis van
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Rekening {0} moet van het type 'vaste activa', omdat Artikel {1} een Activa Artikel is"
 DocType: HR Settings,HR Settings,HR-instellingen
-apps/frappe/frappe/config/setup.py +130,Printing,Afdrukken
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostendeclaratie is in afwachting van goedkeuring. Alleen de Kosten Goedkeurder kan status bijwerken.
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,De dag(en) waarvoor je verlof aanvraagt zijn feestdagen. Hier hoef je niet voor aan te vragen.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,en
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totaal Werkelijke
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,eenheid
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Stel Dropbox access keys in in uw site configuratie
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,eenheid
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Specificeer Bedrijf
 ,Customer Acquisition and Loyalty,Klantenwerving en behoud
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazijn waar u voorraad bijhoudt van afgewezen artikelen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Uw financiële jaar eindigt op
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Uw financiële jaar eindigt op
 DocType: POS Profile,Price List,Prijslijst
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nu het standaard Boekjaar. Ververs uw browser om de wijziging door te voeren .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Declaraties
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Goedkeuren Rol
 ,BOM Search,BOM Zoeken
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Sluiting (openen + Totalen)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Omschrijf valuta Company
 DocType: Workstation,Wages per hour,Loon per uur
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Toon / verberg functies, zoals serienummers , POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Material Aanvragen werden automatisch verhoogd op basis van re-order niveau-item
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klaring mag niet voor check datum in rij {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klaring mag niet voor check datum in rij {0}
 DocType: Salary Slip,Deduction,Aftrek
 DocType: Address Template,Address Template,Adres Sjabloon
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Vul Employee Id van deze verkoper
@@ -1732,76 +1594,68 @@
 DocType: Opportunity,Quotation,Offerte
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 DocType: Quotation,Maintenance User,Onderhoud Gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosten Bijgewerkt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kosten Bijgewerkt
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Artikel {0} is al geretourneerd
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Boekjaar** staat voor een financieel jaar. Alle boekingen en andere belangrijke transacties worden bijgehouden in **boekjaar**.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Functiebeschrijving
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Functiebeschrijving
 DocType: Purchase Order Item,Qty as per Stock UOM,Aantal per Voorraad eenheid
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Selecteer een geldig CSV-bestand met gegevens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Bekleding
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment. "
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment."
 DocType: Expense Claim,Approver,Goedkeurder
 ,SO Qty,VO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Voorraadboekingen bestaan al voor magazijn {0}, dus u kunt het magazijn niet wijzigen of toewijzen."
 DocType: Appraisal,Calculate Total Score,Bereken Totaalscore
 DocType: Supplier Quotation,Manufacturing Manager,Productie Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zendingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip moulding
-DocType: Purchase Order,To be delivered to customer,Om de klant te leveren
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zendingen
+DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tijd Log Status moet worden ingediend.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Opzetten
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rij #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rij #
 DocType: Purchase Invoice,In Words (Company Currency),In Woorden (Bedrijfsvaluta)
 DocType: Pricing Rule,Supplier,Leverancier
 DocType: C-Form,Quarter,Kwartaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse Kosten
 DocType: Global Defaults,Default Company,Standaard Bedrijf
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kosten- of verschillenrekening is verplicht voor artikel {0} omdat het invloed heeft op de totale voorraadwaarde
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Toestaan overbilling, stel dan in Stock Instellingen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Toestaan overbilling, stel dan in Stock Instellingen"
 DocType: Employee,Bank Name,Naam Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Boven
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Gebruiker {0} is uitgeschakeld
 DocType: Leave Application,Total Leave Days,Totaal verlofdagen
-DocType: Journal Entry Account,Credit in Account Currency,Krediet in rekening Valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opmerking: E-mail wordt niet verzonden naar uitgeschakelde gebruikers
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selecteer Bedrijf ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Currency Exchange,From Currency,Van Valuta
-DocType: DocField,Name,Naam
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Bedragen die niet terug te vinden in het systeem
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Verkooporder nodig voor Artikel {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Bedragen die niet terug te vinden in het systeem
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,anderen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,anderen
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Een Product of een Dienst dat wordt gekocht, verkocht of in voorraad wordt gehouden."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Voltooid
-DocType: Web Form,Select DocType,Selecteer DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Kotteren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankieren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankieren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Klik op 'Genereer Planning' om planning te krijgen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nieuwe Kostenplaats
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nieuwe Kostenplaats
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
 DocType: Quality Inspection,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
 DocType: Purchase Order Item,Reference Document Type,Referentie Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} tegen Verkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Geserialiseerde Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
 DocType: Time Log Batch,Total Billing Amount,Totaal factuurbedrag
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Vorderingen Account
@@ -1809,19 +1663,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales om de betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tijd Logs gemaakt:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Selecteer juiste account
 DocType: Item,Weight UOM,Gewicht Eenheid
 DocType: Employee,Blood Group,Bloedgroep
 DocType: Purchase Invoice Item,Page Break,Pagina-einde
 DocType: Production Order Operation,Pending,In afwachting van
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gebruikers die verlofaanvragen een bepaalde werknemer kan goedkeuren
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,U kunt standaard Verpakking van Variant niet veranderen. Om standaard UOM veranderen Variant verandering standaard Verpakking van de Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kantoor Apparatuur
 DocType: Purchase Invoice Item,Qty,Aantal
 DocType: Fiscal Year,Companies,Bedrijven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,elektronica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Maak Materiaal Aanvraag wanneer voorraad daalt tot onder het bestelniveau
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Van onderhoudsschema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Full-time
 DocType: Purchase Invoice,Contact Details,Contactgegevens
 DocType: C-Form,Received Date,Ontvangstdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Als u een standaard template in Sales en -heffingen Template hebt gemaakt, selecteert u een en klik op de knop hieronder."
@@ -1833,14 +1687,15 @@
 DocType: Job Applicant,Job Opening,Vacature
 DocType: Payment Reconciliation,Payment Reconciliation,Afletteren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 DocType: Offer Letter,Offer Letter,Aanbod Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Aanvragen (MRP) en Productieorders.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totale gefactureerde Amt
 DocType: Time Log,To Time,Tot Tijd
+DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om onderliggende nodes te voegen , klap de boom uit en klik op de node waaronder u meer nodes wilt toevoegen."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
 DocType: Production Order Operation,Completed Qty,Voltooide Aantal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
@@ -1850,12 +1705,10 @@
 DocType: Item,Customer Item Codes,Customer Item Codes
 DocType: Opportunity,Lost Reason,Reden van verlies
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Maak Betaling Inzendingen tegen bestellingen of facturen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Lassen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nieuwe Voorraad Eenheid is verplicht
 DocType: Quality Inspection,Sample Size,Monster grootte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle items zijn reeds gefactureerde
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Geef een geldig 'Van Zaaknummer'
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Artikel Serienummers
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
@@ -1865,15 +1718,13 @@
 DocType: Bin,Actual Quantity,Werkelijke hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} niet gevonden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Uw Klanten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Persgieten
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Uw Klanten
 DocType: Leave Block List Date,Block Date,Blokeer Datum
 DocType: Sales Order,Not Delivered,Niet geleverd
 ,Bank Clearance Summary,Bank Ontruiming Samenvatting
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail nieuwsbrieven ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Artikelcode > Product Groep > Merk
 DocType: Appraisal Goal,Appraisal Goal,Beoordeling Doel
-DocType: Event,Friday,Vrijdag
 DocType: Time Log,Costing Amount,Costing Bedrag
 DocType: Process Payroll,Submit Salary Slip,Indienen salarisstrook
 DocType: Salary Structure,Monthly Earning & Deduction,Maandelijkse Verdienen &amp; Aftrek
@@ -1881,16 +1732,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import in bulk
 DocType: Sales Partner,Address & Contacts,Adres & Contacten
 DocType: SMS Log,Sender Name,Naam afzender
-DocType: Page,Title,Titel
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Aanpassen
 DocType: POS Profile,[Select],[Selecteer]
 DocType: SMS Log,Sent To,Verzenden Naar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
 DocType: Company,For Reference Only.,Alleen voor referentie.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ongeldige {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Voorschot Bedrag
 DocType: Manufacturing Settings,Capacity Planning,Capaciteit Planning
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Van Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Van Datum' is vereist
 DocType: Journal Entry,Reference Number,Referentienummer
 DocType: Employee,Employment Details,Dienstverband Details
 DocType: Employee,New Workplace,Nieuwe werkplek
@@ -1905,7 +1754,7 @@
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,reizen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,reizen
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
 DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
 DocType: Sales Invoice,Recurring,Terugkerende
@@ -1913,23 +1762,21 @@
 DocType: Rename Tool,Rename Tool,Hernoem Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Verplaats Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties, operationele kosten en geef een unieke operatienummer aan uw activiteiten ."
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
 DocType: Installation Note,Installation Note,Installatie Opmerking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Belastingen toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Belastingen toevoegen
 ,Financial Analytics,Financiële Analyse
 DocType: Quality Inspection,Verified By,Geverifieerd door
 DocType: Address,Subsidiary,Dochteronderneming
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan bedrijf standaard valuta niet veranderen , want er zijn bestaande transacties . Transacties moeten worden geannuleerd om de standaard valuta te wijzigen ."
 DocType: Quality Inspection,Purchase Receipt No,Ontvangstbevestiging nummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
-DocType: System Settings,In Hours,In Hours
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Verwacht banksaldo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Verwacht banksaldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
 DocType: Appraisal,Employee,Werknemer
@@ -1939,18 +1786,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Workstation Working Hour,End Time,Eindtijd
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaard contractvoorwaarden voor Verkoop of Inkoop .
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep door Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep volgens Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standaard
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Toon betalingen
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Grootte
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Geneesmiddel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak klant
@@ -1960,30 +1805,25 @@
 DocType: Quality Inspection Reading,Reading 9,Meting 9
 DocType: Supplier,Is Frozen,Is Bevroren
 DocType: Buying Settings,Buying Settings,Inkoop Instellingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass afwerking
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stuklijst nr voor een Gereed Product Artikel
 DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup inkomende server voor de verkoop e-id . ( b.v. sales@example.com )
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Tool,Payment Account,Betaalrekening
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ontwerp
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compenserende Off
 DocType: Quality Inspection Reading,Accepted,Geaccepteerd
-DocType: User,Female,Vrouwelijk
-DocType: Journal Entry Account,Debit in Account Currency,Debet in rekening Valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Zorg ervoor dat u echt wilt alle transacties voor dit bedrijf te verwijderen. Uw stamgegevens zal blijven zoals het is. Deze actie kan niet ongedaan gemaakt worden.
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Beantwoord
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ongeldige referentie {0} {1}
 DocType: Payment Tool,Total Payment Amount,Verschuldigde totaalbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan niet groter zijn dan geplande hoeveelheid ({2}) in productieorders {3}
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Omdat er bestaande voorraad transacties voor deze post, \ u de waarden van het niet kunnen veranderen &#39;Heeft Serial No&#39;, &#39;Heeft Batch Nee&#39;, &#39;Is Stock Item&#39; en &#39;Valuation Method&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
 DocType: Stock Entry,For Quantity,Voor Aantal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
@@ -1991,17 +1831,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Artikelaanvragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Een aparte Productie Order zal worden aangemaakt voor elk gereed product artikel
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Voltooien Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekingen bevroren tot deze datum, niemand kan / de boeking wijzigen behalve de hieronder gespecificeerde rol."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nieuwsbrief Mailing List
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
+DocType: Authorization Rule,Authorized Value,Authorized Value
 DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totaal Afwezig
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Eenheid
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Eenheid
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
 DocType: Lead,Opportunity,Opportunity
@@ -2022,16 +1862,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (volgens Stock UOM)
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
 DocType: Campaign,Campaign-.####,Campagne-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Doordringend
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Een derde partij distributeur / dealer / commissionair / affiliate / reseller die uw producten voor een commissie verkoopt.
 DocType: Customer Group,Has Child Node,Heeft onderliggende node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Voer statische url parameters hier in (bijv. afzender=ERPNext, username = ERPNext, wachtwoord = 1234 enz.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} is niet in het actieve fiscale jaar. Voor meer informatie kijk {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Vergrijzing Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemische verspanen
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2073,11 +1912,9 @@
  8. Voer Row: Als op basis van ""Vorige Row Total"" kunt u het rijnummer die zullen worden genomen als basis voor deze berekening (standaard is de vorige rij) te selecteren.
  9. Overweeg Tax of Charge voor: In dit gedeelte kunt u aangeven of de belasting / heffing is alleen voor de waardering (geen deel uit van het totaal) of alleen voor de totale (voegt niets toe aan het item) of voor beide.
  10. Toe te voegen of Trek: Of u wilt toevoegen of aftrekken van de belasting."
-DocType: Note,Note,Opmerking
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
-DocType: Email Account,Email Ids,E-mail Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan niet meer produceren van Artikel {0} dan de Verkooporder hoeveelheid {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 DocType: Tax Rule,Billing City,Billing Stad
 DocType: Global Defaults,Hide Currency Symbol,Verberg Valutasymbool
@@ -2085,40 +1922,36 @@
 DocType: Journal Entry,Credit Note,Creditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Afgesloten Aantal niet meer dan {0} bedrijfsgereed {1}
 DocType: Features Setup,Quality,Kwaliteit
-DocType: Contact Us Settings,Introduction,Introductie
 DocType: Warranty Claim,Service Address,Service Adres
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rijen voor Voorraad aflettering.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rijen voor Voorraad aflettering.
 DocType: Stock Entry,Manufacture,Fabricage
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Gelieve Afleveringsbon eerste
 DocType: Purchase Invoice,Currency and Price List,Valuta en Prijslijst
 DocType: Opportunity,Customer / Lead Name,Klant / Lead Naam
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Ontruiming Datum niet vermeld
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,productie
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Ontruiming Datum niet vermeld
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,productie
 DocType: Item,Allow Production Order,Laat Productieorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Ingediend
 DocType: Salary Structure,Total Earning,Totale Winst
 DocType: Purchase Receipt,Time at which materials were received,Tijdstip waarop materialen zijn ontvangen
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mijn Adressen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisatie tak meester .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,of
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,of
 DocType: Sales Order,Billing Status,Factuur Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Boven
 DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
-,Download Backups,Download Backups
 DocType: Notification Control,Sales Order Message,Verkooporder Bericht
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Instellen Standaardwaarden zoals Bedrijf , Valuta , huidige boekjaar , etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betaling Type
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
 DocType: Bank Reconciliation,To Date,Tot Datum
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Details
 DocType: Purchase Invoice,Total Taxes and Charges,Totaal belastingen en toeslagen
 DocType: Employee,Emergency Contact,Noodgeval Contact
 DocType: Item,Quality Parameters,Kwaliteitsparameters
@@ -2133,6 +1966,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Bovenliggend Artikel
 DocType: Account,Account Type,Rekening Type
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
@@ -2140,33 +1974,28 @@
 DocType: Bin,Reserved Quantity,Gereserveerde Hoeveelheid
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ontvangstbevestiging Artikelen
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassen Formulieren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Stek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Afvlakking
 DocType: Account,Income Account,Inkomstenrekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Lijstwerk
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie &quot;Rate Of Materials Based On&quot; in Costing Sectie
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documenten
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostenplaats
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,voucher nr
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher nr
 DocType: Notification Control,Purchase Order Message,Inkooporder Bericht
 DocType: Tax Rule,Shipping Country,Verzenden Land
 DocType: Upload Attendance,Upload HTML,Upload HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})","Totaal vooraf ({0}) tegen Bestel {1} kan niet groter zijn \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})","Totaal vooraf ({0}) tegen Bestel {1} kan niet groter zijn \
  dan de Grand Total ({2})"
 DocType: Employee,Relieving Date,Ontslagdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prijsbepalingsregel overschrijft de prijslijst / defininieer een kortingspercentage, gebaseerd op een aantal criteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Voorraad Invoer / Vrachtbrief / Ontvangstbewijs worden veranderd
 DocType: Employee Education,Class / Percentage,Klasse / Percentage
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Hoofd Marketing en Verkoop
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstenbelasting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser ontworpen net shaping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Hoofd Marketing en Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstenbelasting
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Als geselecteerde Pricing Regel is gemaakt voor 'Prijs', zal het Prijslijst overschrijven. Prijsstelling Regel prijs is de uiteindelijke prijs, dus geen verdere korting moet worden toegepast. Vandaar dat in transacties zoals Sales Order, Purchase Order etc, het zal worden opgehaald in 'tarief' veld, in plaats van het veld 'prijslijst Rate'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
@@ -2174,10 +2003,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Beheer Customer Group Boom .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nieuwe Kostenplaats Naam
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Geen standaard-adres Template gevonden. Maak een nieuwe van Setup> Afdrukken en Branding> Address Template.
 DocType: Appraisal,HR User,HR Gebruiker
@@ -2189,31 +2017,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
 DocType: Supplier,Billing Currency,Billing Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Groot
 ,Profit and Loss Statement,Winst-en verliesrekening
 DocType: Bank Reconciliation Detail,Cheque Number,Cheque nummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Persing
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Groot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Geen werknemer gevonden!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Groot
 DocType: C-Form Invoice Detail,Territory,Regio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Purchase Order,Customer Address Display,Customer Address Weergave
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polijsten
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standaard maateenheid voor post {0} kan niet direct worden gewijzigd omdat \ heb je al enkele transactie (s) met een andere UOM gemaakt. Om standaard UOM wijzigen, \ gebruik &#39;UOM Vervang Utility&#39; hulpmiddel onder Stock module."
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een valuta om te zetten in een andere
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offerte {0} is geannuleerd
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een valuta om te zetten in een andere
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Offerte {0} is geannuleerd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totale uitstaande bedrag
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Werknemer {0} was met verlof op {1} . Kan aanwezigheid niet markeren .
 DocType: Sales Partner,Targets,Doelen
@@ -2221,14 +2043,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
 ,S.O. No.,VO nr
 DocType: Production Order Operation,Make Time Log,Maak Time Inloggen
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Stel reorder hoeveelheid
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-chemische slijpen
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Stel eerst uw rekeningschema op, voordat u start met het invoeren van boekingen"
 DocType: Purchase Invoice,Ignore Pricing Rule,Negeer Prijsregel
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Geannuleerd
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Van datum salarisstructuur kan niet minder dan Employee Deelnemen datum.
 DocType: Employee Education,Graduate,Afstuderen
 DocType: Leave Block List,Block Days,Blokeer Dagen
@@ -2265,7 +2086,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Controleer of terugkerende factuur, schakelt u om te stoppen met terugkerende of zet de juiste Einddatum"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maximum {0} rijen toegestaan
 DocType: C-Form Invoice Detail,Net Total,Netto Totaal
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturering (verkoopfactuur)
@@ -2282,20 +2102,19 @@
 DocType: Maintenance Visit,Purposes,Doeleinden
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Minstens één punt moet in ruil document worden ingevoerd met een negatieve hoeveelheid
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} langer dan alle beschikbare werktijd in werkstation {1}, breken de operatie in meerdere operaties"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemische bewerking
 ,Requested,Aangevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Geen Opmerkingen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Achterstallig
 DocType: Account,Stock Received But Not Billed,Voorraad ontvangen maar nog niet gefactureerd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root account moet een groep
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutoloon + achteraf Bedrag + inning Bedrag - Totaal Aftrek
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Features Setup,Sales and Purchase,Verkoop en Inkoop
 DocType: Supplier Quotation Item,Material Request No,Materiaal Aanvraag nr.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} heeft met succes uitgeschreven uit deze lijst geweest.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Toegevoegd
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Beheer Grondgebied Boom.
 DocType: Journal Entry Account,Sales Invoice,Verkoopfactuur
 DocType: Journal Entry Account,Party Balance,Partij Balans
@@ -2309,11 +2128,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiscale Jaar {0} niet gevonden.
 DocType: Bank Reconciliation,Get Relevant Entries,Haal relevante gegevens op
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Boekingen voor Voorraad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
-apps/frappe/frappe/desk/query_report.py +136,Total,Totaal
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
@@ -2323,14 +2140,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Belasting Bedrag na korting Bedrag (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Doel magazijn is verplicht voor rij {0}
 DocType: Quality Inspection,Quality Inspection,Kwaliteitscontrole
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray vormen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan alleen tegen betaling te maken ongefactureerde {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum voorraadniveau
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2341,86 +2157,80 @@
 DocType: Item,Manufacturer Part Number,Onderdeelnummer fabrikant
 DocType: Production Order Operation,Estimated Time and Cost,Geschatte Tijd en Kosten
 DocType: Bin,Bin,Bak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Metalen bescherming hiervoor
 DocType: SMS Log,No of Sent SMS,Aantal gestuurde SMS
 DocType: Account,Company,Bedrijf
 DocType: Account,Expense Account,Kostenrekening
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Colour
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Colour
 DocType: Maintenance Visit,Scheduled,Geplande
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Rij {0}: Kwitantie {1} bestaat niet in bovenstaande tabel 'Aankoopfacturen'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
 DocType: Installation Note Item,Against Document No,Tegen Document nr.
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Beheer Verkoop Partners.
 DocType: Quality Inspection,Inspection Type,Inspectie Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Selecteer {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,onderzoeker
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Bijwerken
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,onderzoeker
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Sla de nieuwsbrief op voor het verzenden
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Naam of E-mail is verplicht
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inkomende kwaliteitscontrole.
 DocType: Purchase Order Item,Returned Qty,Terug Aantal
 DocType: Employee,Exit,Uitgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type is verplicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type is verplicht
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} aangemaakt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibratory afwerking
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Voor het gemak van de klanten, kunnen deze codes worden gebruikt in gedrukte formaten zoals facturen en de leveringsbonnen"
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
 DocType: Sales Invoice,Advertisement,Advertentie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Proeftijd
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan in transactie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Proeftijd
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan in transactie
 DocType: Expense Claim,Expense Approver,Onkosten Goedkeurder
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ontvangstbevestiging Artikel geleverd
 apps/erpnext/erpnext/public/js/pos/pos.js +343,Pay,Betalen
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Om Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slijpen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krimpfolie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Afwachting Activiteiten
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bevestigd
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverancier > Leverancier Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adres titel is verplicht.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer de naam van de campagne in als bron van onderzoek Campagne is
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecteer het fiscale jaar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
 DocType: Address,Preferred Shipping Address,Voorkeur verzendadres
 DocType: Purchase Receipt Item,Accepted Warehouse,Geaccepteerd Magazijn
 DocType: Bank Reconciliation Detail,Posting Date,Plaatsingsdatum
 DocType: Item,Valuation Method,Waardering Methode
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Niet in staat om wisselkoers voor {0} te vinden {1}
 DocType: Sales Invoice,Sales Team,Verkoop Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dubbele invoer
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dubbele invoer
 DocType: Serial No,Under Warranty,Binnen Garantie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fout]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorden zijn zichtbaar zodra u de Verkooporder opslaat.
 ,Employee Birthday,Werknemer Verjaardag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} bestaat niet
 DocType: Pricing Rule,Discount Percentage,Kortingspercentage
 DocType: Payment Reconciliation Invoice,Invoice Number,Factuurnummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestellingen
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestellingen
 DocType: Leave Control Panel,Employee Type,Type werknemer
 DocType: Employee Leave Approver,Leave Approver,Verlof goedkeurder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Uitstampen
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Overgedragen materiaal voor vervaardiging
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Een gebruiker met ""Onkosten Goedkeurder"" rol"
 ,Issued Items Against Production Order,Uitgegeven Artikelen voor productieorder
@@ -2432,7 +2242,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostenplaats met bestaande transacties kan niet worden omgezet in groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ongeldige periode
 DocType: Customer,Credit Limit,Kredietlimiet
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecteer type transactie
 DocType: GL Entry,Voucher No,Voucher nr.
@@ -2442,11 +2251,10 @@
 DocType: Customer,Address and Contact,Adres en contactgegevens
 DocType: Customer,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Employee,Feedback,Terugkoppeling
-apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Rooster
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Schurende jet bewerkingscentra
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan niet eerder worden toegewezen {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
+apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Rooster
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
-DocType: Website Settings,Website Settings,Website instellingen
 DocType: Item,Reorder level based on Warehouse,Bestelniveau gebaseerd op Warehouse
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Aantal te leveren
@@ -2456,21 +2264,20 @@
 DocType: Quality Inspection,Outgoing,Uitgaande
 DocType: Material Request,Requested For,Aangevraagd voor
 DocType: Quotation Item,Against Doctype,Tegen Doctype
-DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project 
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-account kan niet worden verwijderd
+DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-account kan niet worden verwijderd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Toon Voorraadboekingen
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Beheren Adressen
 DocType: Pricing Rule,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Details
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
-DocType: Communication,Phone,Telefoon
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Sluiten (Db)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Sluiten (Db)
 DocType: Contact,Passive,Passief
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} niet op voorraad
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
@@ -2486,11 +2293,10 @@
 ,Billed Amount,Gefactureerd Bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Krijg Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Voeg een paar monster verslagen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Voeg een paar voorbeeld records toe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Laat management
-DocType: Event,Groups,Groepen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen per Rekening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen volgens Rekening
 DocType: Sales Order,Fully Delivered,Volledig geleverd
 DocType: Lead,Lower Income,Lager inkomen
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","De hoofdrekening onder Passiva, waarin Winst of Verlies zal worden geboekt"
@@ -2498,40 +2304,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Quick Help
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Bron- en doelmagazijn kan niet hetzelfde zijn voor de rij {0}
 DocType: Features Setup,Sales Extras,Verkoop Extra's
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget voor Rekening {1} tegen kostenplaats {2} zal worden overschreden met {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget voor Rekening {1} tegen kostenplaats {2} zal worden overschreden met {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Waarde of Aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,minuut
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,minuut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
 ,Qty to Receive,Aantal te ontvangen
-DocType: Leave Block List,Leave Block List Allowed,Laat toegestaan Block List
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Conversiefactor kan niet in fracties
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,U zult het gebruiken om in te loggen
+DocType: Leave Block List,Leave Block List Allowed,Laat toegestaan Block List
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,U zult het gebruiken om in te loggen
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverancier Types
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bank Kredietrekening
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak Salarisstrook
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bladeren BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Leningen met onderpand
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome producten
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome producten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Opening Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Kan verlof niet goedkeuren omdat u niet bevoegd bent om verloven op Geblokkeerde Datums Data goed te keuren
 DocType: Appraisal,Appraisal,Beoordeling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-schuim casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tekening
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum wordt herhaald
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Geautoriseerd ondertekenaar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
 DocType: Hub Settings,Seller Email,Verkoper Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Workstation Working Hour,Start Time,Starttijd
@@ -2545,12 +2348,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobedrag (Company valuta)
 DocType: BOM Operation,Hour Rate,Uurtarief
 DocType: Stock Settings,Item Naming By,Artikel benoeming door
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Van Offerte
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Van Offerte
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Een ander Periode sluitpost {0} is gemaakt na {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiaal Overgedragen voor Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Rekening {0} bestaat niet
 DocType: Purchase Receipt Item,Purchase Order Item No,Inkooporder Artikel nr
-DocType: System Settings,System Settings,Systeeminstellingen
 DocType: Project,Project Type,Project Type
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ofwel doelwit aantal of streefbedrag is verplicht.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kosten van verschillende activiteiten
@@ -2559,36 +2361,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kasvoorraad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts 
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts
 DocType: Serial No,Is Cancelled,Is Geannuleerd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mijn verzendingen
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mijn verzendingen
 DocType: Journal Entry,Bill Date,Factuurdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Als er meerdere Prijsbepalings Regels zijn met de hoogste prioriteit, dan wordt de volgende interene prioriteit gehanteerd:"
 DocType: Supplier,Supplier Details,Leverancier Details
-DocType: Communication,Recipients,Ontvangers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Schroeven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Opruwen
 DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiceer Artikelen toevoegen aan Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Van waarde moet minder zijn dan waarde in rij {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,overboeking
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,overboeking
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Selecteer Bankrekening
 DocType: Newsletter,Create and Send Newsletters,Maken en verzenden Nieuwsbrieven
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Van Datum moet voor Tot Datum
 DocType: Sales Order,Recurring Order,Terugkerende Bestel
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klantengroep / Klant
 DocType: Item Group,Check this if you want to show in website,Selecteer dit als u wilt weergeven in de website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Welkom bij ERPNext
+,Welcome to ERPNext,Welkom bij ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Nummer
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Leiden tot Offerte
 DocType: Lead,From Customer,Van Klant
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Oproepen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Oproepen
 DocType: Project,Total Costing Amount (via Time Logs),Totaal Costing bedrag (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
@@ -2596,13 +2394,10 @@
 DocType: Issue,Opening Date,Openingsdatum
 DocType: Journal Entry,Remark,Opmerking
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Vervelend
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Van Verkooporder
-DocType: Blog Category,Parent Website Route,Bovenliggende Website Route
 DocType: Sales Order,Not Billed,Niet in rekening gebracht
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nog geen contacten toegevoegd.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Niet actief
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Vrachtkosten Voucher Bedrag
 DocType: Time Log,Batched for Billing,Gebundeld voor facturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturen van leveranciers.
@@ -2610,20 +2405,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Korting Bedrag
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,bijv. BTW
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,bijv. BTW
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas vormen
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
 DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazijn {0}: Bedrijf is verplicht
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Ga naar de juiste groep (meestal Bron van fondsen&gt; Kortlopende verplichtingen&gt; Belastingen en Taken en maak een nieuwe account (door op van het type &quot;Tax&quot; klikken toevoegen Kind) en doe noemen het belastingtarief.
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Ontbrekende Wisselkoersen voor {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lasersnijden
-DocType: Event,Monday,Maandag
 DocType: Journal Entry,Stock Entry,Voorraadtransactie
 DocType: Account,Payable,betaalbaar
 DocType: Salary Slip,Arrear Amount,Achterstallig bedrag
@@ -2636,7 +2428,6 @@
 DocType: Lead,Address Desc,Adres Omschr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Tenminste een van de verkopen of aankopen moeten worden gekozen
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Waar de productie-activiteiten worden uitgevoerd.
-DocType: Page,All,Alle
 DocType: Stock Entry Detail,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
 DocType: Employee,Confirmation Date,Bevestigingsdatum
@@ -2644,9 +2435,8 @@
 DocType: Account,Sales User,Sales Gebruiker
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Aantal kan niet groter zijn dan Max Aantal zijn
 DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Instellen
 DocType: Lead,Lead Owner,Lead Eigenaar
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse is vereist
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Warehouse is vereist
 DocType: Employee,Marital Status,Burgerlijke staat
 DocType: Stock Settings,Auto Material Request,Automatisch Materiaal Request
 DocType: Time Log,Will be updated when billed.,Zal worden bijgewerkt wanneer gefactureerd.
@@ -2655,49 +2445,45 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan Datum van Indiensttreding
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Geleverd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2} (gedefinieerd in punt) zijn.
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inkooporder Artikel geleverd
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Bedrijfsnaam kan niet bedrijf
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofden voor print sjablonen.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Bijwerken Voorraad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Record van alle communicatie van het type e-mail, telefoon, chat, bezoek, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vermeld Ronde Off kostenplaats in Company
 DocType: Purchase Invoice,Terms,Voorwaarden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Maak nieuw
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Maak nieuw
 DocType: Buying Settings,Purchase Order Required,Inkooporder verplicht
 ,Item-wise Sales History,Artikelgebaseerde Verkoop Geschiedenis
 DocType: Expense Claim,Total Sanctioned Amount,Totaal Goedgekeurd Bedrag
 ,Purchase Analytics,Inkoop Analyse
 DocType: Sales Invoice Item,Delivery Note Item,Vrachtbrief Artikel
 DocType: Expense Claim,Task,Taak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Het scheren
 DocType: Purchase Taxes and Charges,Reference Row #,Referentie Rij #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een basis verkoper en kan niet worden bewerkt .
 ,Stock Ledger,Voorraad Dagboek
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salarisstrook Aftrek
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Opmerkingen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecteer eerst een groep knooppunt.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Doel moet één zijn van {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vul het formulier in en sla het op
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download een rapport met alle grondstoffen met hun laatste voorraadstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Verlofsaldo voor aanvraag
 DocType: SMS Center,Send SMS,SMS versturen
 DocType: Company,Default Letter Head,Standaard Briefhoofd
 DocType: Time Log,Billable,Factureerbaar
-DocType: Authorization Rule,This will be used for setting rule in HR module,Deze wordt gebruikt voor instelling regel HR module
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Bestelaantal
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
@@ -2709,12 +2495,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Verloren
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Korting Velden zullen beschikbaar zijn in Inkooporder, Ontvangstbewijs, Inkoopfactuur"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,De naam van de nieuwe account. Let op: Gelieve niet goed voor klanten en leveranciers te creëren
-DocType: Report,Report Type,Rapport Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laden
 DocType: BOM Replace Tool,BOM Replace Tool,Stuklijst Vervang gereedschap
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landgebaseerde standaard Adres Template
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Toon tax break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Verloop- / Referentie Datum kan niet na {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gegevens importeren en exporteren
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Als u te betrekken in de productie -activiteit . Stelt Item ' is vervaardigd '
@@ -2724,16 +2508,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiaal Aanvraag Detail nr.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Harddraaien
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maak Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
 DocType: Company,Default Cash Account,Standaard Kasrekening
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opmerking: Als de betaling niet is gedaan tegen elke verwijzing, handmatig maken Journal Entry."
 DocType: Item,Supplier Items,Leverancier Artikelen
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2745,7 +2528,7 @@
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Geboortedatum kan niet groter zijn dan vandaag.
 ,Stock Ageing,Voorraad Veroudering
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Instellen als Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Stuur automatische e-mails naar Contactpersonen op Indienen transacties.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2753,58 +2536,50 @@
 Beschikbaar aantal: {4}, Verplaats Aantal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact E-mail
-DocType: Event,Sunday,Zondag
 DocType: Sales Team,Contribution (%),Bijdrage (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bankrekening' niet gespecificeerd is."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Verantwoordelijkheden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vul tenminste 1 factuur in in de tabel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Gebruikers toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Gebruikers toevoegen
 DocType: Pricing Rule,Item Group,Artikelgroep
 DocType: Task,Actual Start Date (via Time Logs),Werkelijke Startdatum (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
 DocType: Item,Default BOM,Standaard Stuklijst
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Time Log Batch,Total Hours,Totaal Uren
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Artikel is vereist
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal spuitgieten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Van Vrachtbrief
 DocType: Time Log,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Selecteer uw land, tijdzone en valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Beitsen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand casting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Tarief
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,intern
 DocType: Newsletter,A Lead with this email id should exist,Een Lead met dit e-mail ID moet bestaan
 DocType: Stock Entry,From BOM,Van BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Basis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tot Datum moet dezelfde zijn als Van Datum voor een halve dag verlof
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum van Indiensttreding moet groter zijn dan Geboortedatum
 DocType: Salary Structure,Salary Structure,Salarisstructuur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Er bestaan meerdere prijsbepalingsregels met dezelfde criteria, los aub op \ conflict bij het toewijzen van prioriteit. Prijsbepaling Regels: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Kwestie Materiaal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Kwestie Materiaal
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 DocType: Hub Settings,Access Token,Toegang Token
@@ -2813,45 +2588,37 @@
 DocType: Item,Is Fixed Asset Item,Is Vast Activum
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Als je al lang af te drukken formaten, kan deze functie gebruikt worden om splitsing van de pagina die moet worden afgedrukt op meerdere pagina&#39;s met alle kop-en voetteksten op elke pagina"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle gebieden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 DocType: Fiscal Year,Year Name,Jaar Naam
 DocType: Process Payroll,Process Payroll,Verwerk Salarisadministratie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Verkoop Partner Naam
 DocType: Purchase Invoice Item,Image View,Afbeelding Bekijken
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Afwerking &amp; industriële afwerking
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Van en naar data vereist
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & Commodity Exchanges
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Boren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Blow moulding
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
 DocType: Tax Rule,Shipping City,Verzending Stad
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dit artikel is een variant van {0} (Template). Attributen zullen worden gekopieerd uit de sjabloon, tenzij 'No Copy' is ingesteld"
 DocType: Account,Purchase User,Aankoop Gebruiker
 DocType: Notification Control,Customize the Notification,Aanpassen Kennisgeving
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Gehamer
-DocType: Web Page,Slideshow,Diashow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
 DocType: Sales Invoice,Shipping Rule,Verzendregel
 DocType: Journal Entry,Print Heading,Print Kop
 DocType: Quotation,Maintenance Manager,Maintenance Manager
-DocType: Workflow State,Search,Zoek
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totaal kan niet nul zijn
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dagen sinds laatste opdracht' moet groter of gelijk zijn aan nul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Solderen
 DocType: C-Form,Amended From,Gewijzigd Van
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,grondstof
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ofwel doelwit aantal of streefbedrag is verplicht
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Selecteer Boekingsdatum eerste
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2860,45 +2627,44 @@
 ,Produced,Geproduceerd
 DocType: Item,Item Code for Suppliers,Item Code voor leveranciers
 DocType: Issue,Raised By (Email),Opgevoerd door (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Algemeen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Bevestig briefhoofd
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Algemeen
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Bevestig briefhoofd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lijst uw fiscale koppen (bv BTW, douane etc, ze moeten unieke namen hebben) en hun standaard tarieven. Dit zal een standaard template, die u kunt bewerken en voeg later meer te creëren."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lijst uw fiscale koppen (bv BTW, douane etc, ze moeten unieke namen hebben) en hun standaard tarieven. Dit zal een standaard template, die u kunt bewerken en voeg later meer te creëren."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Volgnummers zijn vereist voor Seriegebonden Artikel {0}
 DocType: Journal Entry,Bank Entry,Bank Invoer
 DocType: Authorization Rule,Applicable To (Designation),Van toepassing zijn op (Benaming)
-DocType: Blog Post,Blog Post,Blog Post
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Groeperen volgens
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,In- / uitschakelen valuta .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Portokosten
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Purchase Order,The date on which recurring order will be stop,De datum waarop terugkerende bestelling wordt te stoppen
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} moet worden verminderd met {1} of u moet de overboeking tolerantie verhogen
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totaal Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,uur
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,uur
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer Material aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer Material aan Leverancier
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om te bladeren op Block Data keuren
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Belasting
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rij {0}: {1} is geen geldige {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rij {0}: {1} is geen geldige {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Van product Bundle
 DocType: Production Planning Tool,Production Planning Tool,Productie Planning Tool
 DocType: Quality Inspection,Report Date,Rapport datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Facturen
 DocType: Job Opening,Job Title,Functiebenaming
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} reeds toegewezen voor Employee {1} voor periode {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Ontvangers
 DocType: Features Setup,Item Groups in Details,Artikelgroepen in Details
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
@@ -2907,33 +2673,29 @@
 DocType: Stock Entry,Update Rate and Availability,Update snelheid en beschikbaarheid
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentage dat u meer mag ontvangen of leveren dan de bestelde hoeveelheid. Bijvoorbeeld: Als u  100 eenheden heeft besteld en uw bandbreedte is 10% dan mag u 110 eenheden ontvangen.
 DocType: Pricing Rule,Customer Group,Klantengroep
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: Item,Website Description,Website Beschrijving
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 ,Sales Register,Verkoopregister
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
 DocType: Address,Plant,Fabriek
-DocType: DocType,Setup,Instellingen
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Samenvatting voor deze maand en in afwachting van activiteiten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Koudwalsen
 DocType: Customer Group,Customer Group Name,Klant Groepsnaam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
 DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
 DocType: Item,Attributes,Attributen
-DocType: Packing Slip,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Voer Afschrijvingenrekening in
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Laatste Bestel Date
-DocType: DocField,Image,Afbeelding
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Account {0} niet behoort tot bedrijf {1}
-DocType: Communication,Other,Ander
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operation ID niet ingesteld
 DocType: Production Order,Planned Start Date,Geplande Startdatum
 DocType: Serial No,Creation Document Type,Aanmaken Document type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Bezoek
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Bezoek
 DocType: Leave Type,Is Encash,Is incasseren
 DocType: Purchase Invoice,Mobile No,Mobiel nummer
 DocType: Payment Tool,Make Journal Entry,Maak Journal Entry
@@ -2941,35 +2703,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,commercieel
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 DocType: Cost Center,Distribution Id,Distributie Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Services
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle producten of diensten.
 DocType: Purchase Invoice,Supplier Address,Adres Leverancier
-DocType: Contact Us Settings,Address Line 2,Adres Lijn 2
-DocType: ToDo,Reference,Referentie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforeren
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Reeks is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Financiële Dienstverlening
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Waar voor Attribute {0} moet binnen het bereik van {1} tot {2} in de stappen van {3}
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte bladeren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default Debiteuren
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Zagen
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamineren
 DocType: Item Reorder,Transfer,Verplaatsen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinteren
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
 DocType: Supplier,Contact HTML,Contact HTML
@@ -2980,9 +2736,8 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klant {0} bestaat niet
 DocType: Attendance,Absent,Afwezig
-DocType: Product Bundle,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Product Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Breken
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: GL Entry,Remarks,Opmerkingen
@@ -2990,48 +2745,44 @@
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installatie record voor een Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Continugieten
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Specificeer een
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Boven
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold sizing
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Rekening {0} kan geen groep zijn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regio
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
 DocType: Holiday List,Weekly Off,Wekelijks Vrij
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Voor bijvoorbeeld 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Voorlopige winst / verlies (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Terug Tegen Sales Invoice
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punt 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Stel standaard waarde {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Stel standaard waarde {0} in Company {1}
 DocType: Serial No,Creation Time,Aanmaaktijd
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Totale omzet
 DocType: Sales Invoice,Product Bundle Help,Product Bundel Help
 ,Monthly Attendance Sheet,Maandelijkse Aanwezigheids Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Geen record gevonden
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Krijg Items uit Product Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Rekening {0} is niet actief
 DocType: GL Entry,Is Advance,Is voorschot
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en Aanwezigheid Tot Datum zijn verplicht.
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Vul 'Is Uitbesteed' in als Ja of Nee
 DocType: Sales Team,Contact No.,Contact Nr
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan in Openings Invoer
-DocType: Workflow State,Time,Tijd
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Winst- en verliesrekening' rekeningtype {0} niet toegestaan in Openings Invoer
 DocType: Features Setup,Sales Discounts,Verkoop kortingen
 DocType: Hub Settings,Seller Country,Verkoper Land
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Sales en -heffingen Template
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Aantal Bestel
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner dat zal laten zien op de bovenkant van het product lijst.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specificeer de voorwaarden om het verzendbedrag te berekenen
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Onderliggende toevoegen
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegestaan om Stel Frozen Accounts & bewerken Frozen Entries
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol toegestaan om Stel Frozen Accounts & bewerken Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Kan kostenplaats niet omzetten naar grootboek vanwege onderliggende nodes
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Conversiefactor is verplicht
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Commissie op de verkoop
 DocType: Offer Letter Term,Value / Description,/ Beschrijving
@@ -3039,48 +2790,43 @@
 ,Customers Not Buying Since Long Time,Klanten Niet kopen Sinds Long Time
 DocType: Production Order,Expected Delivery Date,Verwachte leverdatum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Uitpuilende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporative-patroon casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representatiekosten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Leeftijd
 DocType: Time Log,Billing Amount,Billing Bedrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aanvragen voor verlof.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Juridische Kosten
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische bestelling wordt bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Sales Invoice,Posting Time,Plaatsing Time
 DocType: Sales Order,% Amount Billed,% Gefactureerd Bedrag
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Telefoonkosten
 DocType: Sales Partner,Logo,Logo
-DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
 apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Geen Artikel met Serienummer {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Open Meldingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Directe Kosten
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nieuwe klant Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiskosten
 DocType: Maintenance Visit,Breakdown,Storing
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Op Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,proeftijd
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
-DocType: Feed,Full Name,Volledige naam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinchen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1} 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,proeftijd
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standaard Magazijn is verplicht voor voorraadartikel .
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Betaling van salaris voor de maand {0} en jaar {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
 ,Transferred Qty,Verplaatst Aantal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigeren
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planning
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Maak tijd Inloggen Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Uitgegeven
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Wij verkopen dit artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Wij verkopen dit artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverancier Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Contact Omschr
@@ -3089,18 +2835,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Rijen toevoegen om jaarlijkse begrotingen op Rekeningen in te stellen.
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Delfstoffen
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle contactpersonen.
 DocType: Newsletter,Test Email Id,Test E-mail ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Bedrijf Afkorting
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Bedrijf Afkorting
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Als u volgen Kwaliteitscontrole . Stelt Item QA Vereiste en QA Geen in Kwitantie
 DocType: GL Entry,Party Type,partij Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Grondstof kan niet hetzelfde zijn als hoofdartikel
 DocType: Item Attribute Value,Abbreviation,Afkorting
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotatiegieten
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Salaris sjabloon stam .
 DocType: Leave Type,Max Days Leave Allowed,Max Dagen Verlof toegestaan
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Stel Tax Regel voor winkelmandje
@@ -3112,17 +2856,17 @@
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Dank u voor uw interesse in een abonnement op onze updates
 ,Qty to Transfer,Aantal te verplaatsen
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offertes naar leads of klanten.
-DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
+DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Belasting Template is verplicht.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
 DocType: Account,Temporary,Tijdelijk
 DocType: Address,Preferred Billing Address,Voorkeur Factuuradres
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretaresse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretaresse
 DocType: Serial No,Distinct unit of an Item,Aanwijsbare eenheid van een Artikel
 DocType: Pricing Rule,Buying,Inkoop
 DocType: HR Settings,Employee Records to be created by,Werknemer Records worden gecreëerd door
@@ -3135,24 +2879,21 @@
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
 DocType: Purchase Order Item,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Strijken
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} is gestopt
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} is al in gebruik in post {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,aankomende evenementen
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klant is verplicht
-DocType: Letter Head,Letter Head,Brief Hoofd
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snelle invoer
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} is verplicht voor Return
 DocType: Purchase Order,To Receive,Ontvangen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink fitting
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Inkomsten / Uitgaven
 DocType: Employee,Personal Email,Persoonlijke e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Indien aangevinkt, zal het systeem voorraadboekingen automatisch plaatsen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,makelaardij
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,makelaardij
 DocType: Address,Postal Code,Postcode
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","in Minuten 
@@ -3160,18 +2901,16 @@
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Orders vrijgegeven voor productie.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Hub Settings,Name Token,Naam Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Schaven
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standaard Verkoop
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standaard Verkoop
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Tenminste een magazijn is verplicht
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vul Standaard eenheid in
 DocType: Purchase Invoice Item,Project Name,Naam van het project
 DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
-DocType: Workflow State,Edit,Bewerken
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
 DocType: Features Setup,Item Batch Nos,Artikel Batchnummers
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
@@ -3179,13 +2918,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Afletteren Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Belastingvorderingen
 DocType: BOM Item,BOM No,Stuklijst nr.
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nieuwe Voorraad Eenheid moet verschillen van bestaande Eenheden
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Verloven moeten in veelvouden van 0,5 worden toegewezen"
 DocType: Production Order,Operation Cost,Operatie Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Upload aanwezigheid uit een .csv-bestand
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Openstaande Amt
@@ -3201,10 +2938,7 @@
 DocType: Project,Default Cost Center,Standaard Kostenplaats
 DocType: Purchase Invoice,End Date,Einddatum
 DocType: Employee,Internal Work History,Interne Werk Geschiedenis
-DocType: DocField,Column Break,Column Break
-DocType: Event,Thursday,Donderdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Draai
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
 DocType: Sales Invoice,Exhibition,Tentoonstelling
@@ -3217,31 +2951,30 @@
 DocType: Employee,Held On,Held Op
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Productie Item
 ,Employee Information,Werknemer Informatie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarief (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Tarief (%)
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Boekjaar Einddatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Boekjaar Einddatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Vouchernummer, indien gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Verminderen Inkomsten voor onbetaald verlof
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partij ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opmerking : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Samenvatting van deze week
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} moet een gekocht of uitbesteed artikel zijn in rij {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
 DocType: GL Entry,Party,Partij
 DocType: Sales Order,Delivery Date,Leveringsdatum
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Opportunity Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Terug Tegen Aankoop Receipt
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Bestelde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,stukwerk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,stukwerk
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
@@ -3258,77 +2991,68 @@
 DocType: Opportunity,To Discuss,Te bespreken
 DocType: SMS Settings,SMS Settings,SMS-instellingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tijdelijke Accounts
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Zwart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Zwart
 DocType: BOM Explosion Item,BOM Explosion Item,Stuklijst Uitklap Artikel
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Einddatum van de periode huidige bestelling's
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Bod uitbrengen Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Terugkeer
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
-DocType: DocField,Fold,Vouw
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standaard maateenheid voor Variant moet hetzelfde zijn als sjabloon
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Specificeer
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
-DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Om tijd groter dan Van Time moet zijn
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel afwerking
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","bijv. ""MB"""
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan voor Artikel {0} omdat het varianten heeft.
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","bijv. ""MB"""
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan voor Artikel {0} omdat het varianten heeft.
 ,Sales Person-wise Transaction Summary,Verkopergebaseerd Transactie Overzicht
-DocType: System Settings,Time Zone,Tijdzone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazijn {0} bestaat niet
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inschrijven Voor ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelijkse Verdeling Percentages
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% van de geleverde materialen voor deze Vrachtbrief
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Nieten
 DocType: Customer,Customer Details,Klant Details
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Vorming
 DocType: Employee,Reports to,Rapporteert aan
 DocType: SMS Settings,Enter url parameter for receiver nos,Voer URL-parameter voor de ontvanger nos
 DocType: Sales Invoice,Paid Amount,Betaald Bedrag
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Closing account {0} moet van het type ' Aansprakelijkheid ' zijn
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo reeds in Debit, is het niet toegestaan om 'evenwicht moet worden' als 'Credit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quality Management
 DocType: Production Planning Tool,Filter based on customer,Filteren op basis van klant
 DocType: Payment Tool Detail,Against Voucher No,Tegen blad nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
 DocType: Tax Rule,Purchase,Inkopen
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Aantal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balans Aantal
 DocType: Item Group,Parent Item Group,Bovenliggende Artikelgroep
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} voor {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostenplaatsen
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Magazijnen.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Magazijnen.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Koers waarmee de leverancier valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rij #{0}: Tijden conflicteren met rij {1}
 DocType: Opportunity,Next Contact,Volgende Contact
 DocType: Employee,Employment Type,Dienstverband Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Vaste Activa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Aanvraagperiode kan niet over twee alocation platen
 DocType: Item Group,Default Expense Account,Standaard Kostenrekening
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
-DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
 DocType: Employee,Encashment Date,Betalingsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformeren
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Tegen Voucher Typ een van Purchase Order, Aankoop Factuur of Inboeken moet zijn"
 DocType: Account,Stock Adjustment,Voorraad aanpassing
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Default Activiteit Kosten bestaat voor Activity Type - {0}
 DocType: Production Order,Planned Operating Cost,Geplande bedrijfskosten
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nieuwe {0} Naam
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},In bijlage vindt u {0} # {1}
 DocType: Job Applicant,Applicant Name,Aanvrager Naam
 DocType: Authorization Rule,Customer / Item Name,Klant / Naam van het punt
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3341,7 +3065,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serienummer is verplicht voor Artikel {0}
 DocType: Item Variant Attribute,Attribute,Attribuut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Gelieve te specificeren van / naar variëren
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Gemaakt door
 DocType: Serial No,Under AMC,Onder AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Item waardering tarief wordt herberekend overweegt landde kosten voucherbedrag
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
@@ -3349,30 +3072,29 @@
 apps/erpnext/erpnext/public/js/utils.js +57,Add Serial No,Voeg Serienummer toe
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Kantoorartikelen
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groep Node
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +122,Group Node,Groeperingsnode
 DocType: Payment Reconciliation,Minimum Amount,Minimumbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Bijwerken Gereed Product
 DocType: Workstation,per hour,per uur
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Reeks {0} al gebruikt in {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder deze rekening.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 DocType: Company,Distribution,Distributie
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betaald bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 DocType: Customer,Default Taxes and Charges,Standaard en -heffingen
 DocType: Account,Receivable,Vordering
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan om van leverancier te veranderen als bestelling al bestaat
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan om van leverancier te veranderen als bestelling al bestaat
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
 DocType: Sales Invoice,Supplier Reference,Leverancier Referentie
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Indien aangevinkt, zal BOM voor sub-assemblage zaken geacht voor het krijgen van grondstoffen. Anders zullen alle subeenheid items worden behandeld als een grondstof."
 DocType: Material Request,Material Issue,Materiaal uitgifte
 DocType: Hub Settings,Seller Description,Verkoper Beschrijving
 DocType: Employee Education,Qualification,Kwalificatie
 DocType: Item Price,Item Price,Artikelprijs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Zeep & Wasmiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
@@ -3381,7 +3103,6 @@
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Bedrijf ontbreekt in magazijnen {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Voorraad Eenheid Vervang Utility
 DocType: POS Profile,Terms and Conditions,Algemene Voorwaarden
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tot Datum moet binnen het boekjaar vallenn. Ervan uitgaande dat Tot Datum = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hier kunt u onderhouden lengte, gewicht, allergieën, medische zorgen, enz."
@@ -3393,7 +3114,7 @@
 DocType: Sales Order Item,For Production,Voor Productie
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vul de verkooporder in in de bovenstaande tabel
 DocType: Project Task,View Task,Bekijk Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Uw financiële jaar begint op
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Uw financiële jaar begint op
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vul Aankoopfacturen
 DocType: Sales Invoice,Get Advances Received,Get ontvangen voorschotten
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
@@ -3401,20 +3122,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup inkomende server voor ondersteuning e-id . ( b.v. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Item variant {0} bestaat met dezelfde kenmerken
 DocType: Salary Slip,Salary Slip,Salarisstrook
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polijsten
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tot Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tot Datum' is vereist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden."
 DocType: Sales Invoice Item,Sales Order Item,Verkooporder Artikel
 DocType: Salary Slip,Payment Days,Betaling Dagen
 DocType: BOM,Manage cost of operations,Beheer kosten van de operaties
 DocType: Features Setup,Item Advanced,Geavanceerd Artikel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Warmwalsen
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
 DocType: Salary Slip,Net Pay,Nettoloon
 DocType: Account,Account,Rekening
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
@@ -3423,35 +3142,28 @@
 DocType: Customer,Sales Team Details,Verkoop Team Details
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Ziekteverlof
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ongeldige {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Ziekteverlof
 DocType: Email Digest,Email Digest,E-mail Digest
 DocType: Delivery Note,Billing Address Name,Factuuradres Naam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Warenhuizen
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Systeem Balans
-DocType: Workflow,Is Active,Is actief
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Warenhuizen
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Systeem Balans
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Oplaadbare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Verandering Afkorting
-DocType: Workflow State,Primary,Primair
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
 DocType: Item,Max Discount (%),Max Korting (%)
-DocType: Communication,More Information,Meer informatie
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Laatste Orderbedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Ontploffing
 DocType: Company,Warn,Waarschuwen
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Artikelwaardering bijgewerkt
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, opmerkelijke inspanning die moet gaan in de administratie."
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,"
 DocType: BOM,Manufacturing User,Productie Gebruiker
 DocType: Purchase Order,Raw Materials Supplied,Grondstoffen Geleverd
 DocType: Purchase Invoice,Recurring Print Format,Terugkerende Print Format
-DocType: Communication,Series,Reeksen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Verwachte leverdatum kan niet voor de Inkooporder Datum
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Item Classificatie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Doel van onderhouds bezoek
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,Grootboek
@@ -3461,9 +3173,7 @@
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Selecteer eerst {0}
 DocType: Features Setup,To get Item Group in details table,Om Artikelgroep in details tabel te plaatsen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Hertekenen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Ets
 DocType: Sales Invoice,Commission,commissie
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3489,7 +3199,7 @@
  {% indien email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Standaard Bedrag
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Magazijn niet gevonden in het systeem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazijn niet gevonden in het systeem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Samenvatting van deze maand
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteitscontrole Meting
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
@@ -3498,7 +3208,7 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Onderhoudsschema {0} bestaat tegen {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Werkelijke Aantal (bij de bron / doel)
 DocType: Item Customer Detail,Ref Code,Ref Code
-apps/erpnext/erpnext/config/hr.py +13,Employee records.,Werknemer records.
+apps/erpnext/erpnext/config/hr.py +13,Employee records.,Werknemer regel.
 DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 apps/erpnext/erpnext/templates/pages/cart.html +13,Place Order,Plaats bestelling
@@ -3508,13 +3218,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 DocType: Supplier,Address and Contacts,Adres en Contacten
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
 DocType: Payment Tool,Get Outstanding Vouchers,Krijg Outstanding Vouchers
 DocType: Warranty Claim,Resolved By,Opgelost door
 DocType: Appraisal,Start Date,Startdatum
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Waarde
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Toewijzen bladeren voor een periode .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klik hier om te controleren
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
@@ -3524,55 +3233,43 @@
 DocType: Item,Average time taken by the supplier to deliver,De gemiddelde tijd die door de leverancier te leveren
 DocType: Time Log,Hours,Uren
 DocType: Project,Expected Start Date,Verwachte startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Prioriteit
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Artikel verwijderen als de kosten niet van toepassing zijn op dat artikel
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Toegang toegestaan
-DocType: Dropbox Backup,Weekly,Wekelijks
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Bijv. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Ontvangen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Ontvangen
 DocType: Maintenance Visit,Fully Completed,Volledig afgerond
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% voltooid
 DocType: Employee,Educational Qualification,Educatieve Kwalificatie
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} is succesvol toegevoegd aan onze nieuwsbrief lijst.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren verklaren, omdat Offerte is gemaakt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronenbundel bewerkingscentra
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hoofdrapporten
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Voorraad Dagboek saldi bijgewerkt
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoofdrapporten
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Toevoegen / bewerken Prijzen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kostenplaatsenschema
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mijn Bestellingen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mijn Bestellingen
 DocType: Price List,Price List Name,Prijslijst Naam
 DocType: Time Log,For Manufacturing,Voor Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalen
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totalen
 DocType: BOM,Manufacturing,Productie
 ,Ordered Items To Be Delivered,Bestelde artikelen te leveren
 DocType: Account,Income,Inkomsten
-,Setup Wizard,Instellingen Wizard
 DocType: Industry Type,Industry Type,Industrie Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Er is iets fout gegaan!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Voltooiingsdatum
 DocType: Purchase Invoice Item,Amount (Company Currency),Bedrag (Company Munt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die casting
-DocType: Email Alert,Reference Date,Referentie Datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Voer geldige mobiele nummers in
 DocType: Budget Detail,Budget Detail,Budget Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vul bericht in alvorens te verzenden
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Voorraad Eenheid bijgewerkt voor Artikel {0}
-DocType: Company History,Year,Jaar
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Werk SMS-instellingen bij
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Inloggen {0} reeds gefactureerde
@@ -3585,55 +3282,52 @@
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
 DocType: Item,Unit of Measure Conversion,Eenheid van Meet Conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Werknemer kan niet worden gewijzigd
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
 DocType: Naming Series,Help HTML,Help HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Korting voor over-{0} gekruist voor post {1}
 DocType: Address,Name of person or organization that this address belongs to.,Naam van de persoon of organisatie waartoe dit adres behoort.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Uw Leveranciers
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Kan niet als Verloren instellen, omdat er al een Verkoop Order is gemaakt."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Een ander loongebouw {0} is actief voor de werknemer {1}. Maak dan de status 'Inactief' om door te gaan.
 DocType: Purchase Invoice,Contact,Contact
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Gekregen van
 DocType: Features Setup,Exports,Export
 DocType: Lead,Converted,Omgezet
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Van {0} voor {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 DocType: Issue,Content Type,Content Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Haal onafgeletterde transacties op
 DocType: Cost Center,Budgets,Budgetten
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Bijgewerkt
 DocType: Employee,Emergency Contact Details,Noodgeval Contactgegevens
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Wat doet het?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Rekening {0} is meer dan één keer ingevoerd voor het boekjaar {1}
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualiseren extra kosten voor landde kosten van artikelen te berekenen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elektrisch
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Gebruikers-ID niet ingesteld voor Werknemer {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Van Garantie Claim
 DocType: Stock Entry,Default Source Warehouse,Standaard Bronmagazijn
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagen sinds laatste Order
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds laatste Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
-DocType: User,Enabled,Ingeschakeld
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Wilt u echt alle salarisstroken voor de maand {0} en jaar {1} indienen?
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonnees Import
@@ -3641,25 +3335,24 @@
 DocType: Attendance,Present,Presenteer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
 DocType: Notification Control,Sales Invoice Message,Verkoopfactuur bericht
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Sluiten account {0} moet van het type aansprakelijkheid / Equity zijn
 DocType: Authorization Rule,Based On,Gebaseerd op
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Van en periode te data verplicht voor terugkerende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Project activiteit / taak.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Genereer Salarisstroken
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} is geen geldig e-mail ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
-DocType: ToDo,Low,Laag
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Schrijf Off Bedrag (Company Munt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Stel {0} in
 DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
 DocType: Employee,Health Details,Gezondheid Details
 DocType: Offer Letter,Offer Letter Terms,Aanbod Letter Voorwaarden
-DocType: Features Setup,To track any installation or commissioning related work after sales,Om een installatie of commissie-gerelateerd werk na verkoop bij te houden
+DocType: Features Setup,To track any installation or commissioning related work after sales,Om een installatie of commissie-gerelateerd werk na verkoop bij te houden
 DocType: Project,Estimated Costing,Geschatte Costing
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Inboeken Detail Nee
 DocType: Employee External Work History,Salary,Salaris
@@ -3675,7 +3368,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Campagne Naam is vereist
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Afgewezen Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Dieptrekken
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nieuw Nieuwsbrief
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Toon Balans
@@ -3685,7 +3377,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Bedrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Klinken
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
 ,Sales Analytics,Verkoop analyse
 DocType: Manufacturing Settings,Manufacturing Settings,Productie Instellingen
@@ -3697,28 +3388,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nieuwe Rekening Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstoffen Leveringskosten
 DocType: Selling Settings,Settings for Selling Module,Instellingen voor het verkopen van Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Klantenservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Klantenservice
 DocType: Item,Thumbnail,Miniatuur
 DocType: Item Customer Detail,Item Customer Detail,Artikel Klant Details
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bevestig uw e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Aanbieding kandidaat een baan.
 DocType: Notification Control,Prompt for Email on Submission of,Vragen om E-mail op Indiening van
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totaal toegewezen bladeren zijn meer dan dagen in de periode
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuümvormen
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
-DocType: Contact Us Settings,City,City
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasoon bewerken
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fout: geen geldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artikel {0} moet een verkoopbaar artikel zijn
 DocType: Naming Series,Update Series Number,Bijwerken Serienummer
 DocType: Account,Equity,Vermogen
 DocType: Sales Order,Printing Details,Afdrukken Details
 DocType: Task,Closing Date,Afsluitingsdatum
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenieur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zoeken Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3726,7 +3413,7 @@
 DocType: Authorization Rule,Customerwise Discount,Klantgebaseerde Korting
 DocType: Purchase Invoice,Against Expense Account,Tegen Kostenrekening
 DocType: Production Order,Production Order,Productieorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installatie Opmerking {0} is al ingediend
 DocType: Quotation Item,Against Docname,Tegen Docname
 DocType: SMS Center,All Employee (Active),Alle medewerkers (Actief)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bekijk nu
@@ -3734,26 +3421,24 @@
 DocType: BOM,Raw Material Cost,Grondstofprijzen
 DocType: Item,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deeltijds
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Reeks bijgewerkt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapport type is verplicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,De eerste gebruiker: U
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker: U
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Succesvol Afgeletterd
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Production Order,Planned End Date,Geplande Einddatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Tax Rule,Validity,Deugdelijkheid
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Factuurbedrag
 DocType: Attendance,Attendance,Aanwezigheid
-DocType: Page,No,Nee
 DocType: BOM,Materials,Materialen
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
@@ -3761,55 +3446,46 @@
 ,Item Prices,Artikelprijzen
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In Woorden zijn zichtbaar zodra u de Inkooporder opslaat
 DocType: Period Closing Voucher,Period Closing Voucher,Periode Closing Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Prijslijst stam.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Prijslijst stam.
 DocType: Task,Review Date,Herzieningsdatum
 DocType: Purchase Invoice,Advance Payments,Advance Payments
-DocType: DocPerm,Level,Niveau
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frezen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Geen toestemming om Betaling Tool gebruiken
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
 DocType: Company,Round Off Account,Afronden Account
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Knabbelen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administratie Kosten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Bovenliggende klantgroep
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Verandering
 DocType: Purchase Invoice,Contact Email,Contact E-mail
-DocType: Appraisal Goal,Score Earned,Verdiende Score 
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
+DocType: Appraisal Goal,Score Earned,Verdiende Score
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","bijv. ""Mijn Bedrijf BV"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Opzegtermijn
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dit is een basis regio en kan niet worden bewerkt .
 DocType: Packing Slip,Gross Weight UOM,Bruto Gewicht Eenheid
 DocType: Email Digest,Receivables / Payables,Debiteuren / Crediteuren
 DocType: Delivery Note Item,Against Sales Invoice,Tegen Sales Invoice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempelen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Toon nulwaarden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Hoeveelheid product verkregen na productie / herverpakken van de gegeven hoeveelheden grondstoffen
 DocType: Payment Reconciliation,Receivable / Payable Account,Vorderingen / Crediteuren Account
 DocType: Delivery Note Item,Against Sales Order Item,Tegen Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 DocType: Task,Actual End Date (via Time Logs),Werkelijke Einddatum (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vul bovenliggende kostenplaats in
 DocType: Delivery Note,Print Without Amount,Printen zonder Bedrag
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Belastingcategorie kan niet 'Waardering' of 'Waardering en Totaal' zijn als geen van de artikelen voorraadartikelen zijn
-DocType: User,Last Name,Achternaam
-DocType: Web Page,Left,Links
-DocType: Event,All Day,Gehele dag
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Belastingcategorie kan niet 'Waardering' of 'Waardering en Totaal' zijn als geen van de artikelen voorraadartikelen zijn
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Totale Score (van de 5)
-DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Partij
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties)
-DocType: User,Gender,Geslacht
 DocType: Journal Entry,Debit Note,Debetnota
 DocType: Stock Entry,As per Stock UOM,Per Stock Verpakking
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Niet Verlopen
@@ -3823,44 +3499,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Regels maken om transacties op basis van waarden te beperken.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien aangevinkt, Totaal niet. van Werkdagen zal omvatten feestdagen, en dit zal de waarde van het salaris per dag te verminderen"
 DocType: Purchase Invoice,Total Advance,Totaal Voorschot
-DocType: Workflow State,User,Gebruiker
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processing Payroll
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Instellen als Verloren
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Ontvangst Opmerking
 DocType: Customer,Credit Days Based On,Credit dagen op basis van
 DocType: Tax Rule,Tax Rule,Belasting Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Handhaaf zelfde tarief gedurende verkoopcyclus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plan tijd logs buiten Workstation Arbeidstijdenwet.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} al is ingediend
 ,Items To Be Requested,Aan te vragen artikelen
-DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Facturering tarief gebaseerd op Activity Type (per uur)
 DocType: Company,Company Info,Bedrijfsinformatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Naaien
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Bedrijf Email-id niet gevonden, dus mail niet verzonden"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 DocType: Production Planning Tool,Filter based on item,Filteren op basis van artikel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debit Account
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Kan niet verkapte naar Groep omdat Account Type is geselecteerd.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Kan niet verkapte naar Groep omdat Account Type is geselecteerd.
 DocType: Purchase Common,Purchase Common,Inkoop Gemeenschappelijk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Van Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Employee Benefits
 DocType: Sales Invoice,Is POS,Is POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Factureren aan Klanten
-DocType: DocField,Default,Standaard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Project Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnees toegevoegd
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definieer begroting voor deze kostenplaats. De begroting actie, zie &quot;Company List&quot;"
@@ -3871,70 +3543,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Expense Claim,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Door ""Ja"" te selecteren kunt u een voorkomen van dit artikel maken welke u kunt bekijken in de Serienummer Stamdata."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
 DocType: Employee,Education,Onderwijs
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
 DocType: Address,Office,Kantoor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standaard rapporten
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Selecteer eerst Werknemer Record.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Een belastingrekening aanmaken
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vul Kostenrekening in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Als artikel is een variant van een ander item dan beschrijving, afbeelding, prijzen, belastingen etc zal worden ingesteld van de sjabloon, tenzij expliciet vermeld"
 DocType: Serial No,Purchase / Manufacture Details,Inkoop / Productie Details
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Contract Einddatum
 DocType: Sales Order,Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Haal verkooporders (in afwachting van levering) op basis van de bovengenoemde criteria
-DocType: DocShare,Document Type,Soort document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Van Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Van Leverancier Offerte
 DocType: Deduction Type,Deduction Type,Aftrek Type
 DocType: Attendance,Half Day,Halve dag
 DocType: Pricing Rule,Min Qty,min Aantal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Om items in de verkoop en aankoop van documenten met batch nos volgen. &quot;Voorkeur Industrie: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transactie Datum
 DocType: Production Plan Item,Planned Qty,Gepland Aantal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Voor Hoeveelheid (Geproduceerd Aantal) is verplicht
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
 DocType: Notification Control,Purchase Receipt Message,Ontvangstbevestiging Bericht
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totaal toegewezen bladeren zijn meer dan periode
 DocType: Production Order,Actual Start Date,Werkelijke Startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% van de geleverde materialen voor deze verkooporder
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Opnemen artikelbeweging
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nieuwsbrief Lijst Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Uitsteekmachines
-DocType: Email Account,Service,Service
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn al gemaakt in valuta {0} voor het bedrijf {1}. Selecteer een vordering of schuld gehouden met valuta {0}.
 ,Monthly Salary Register,Maandsalaris Register
-apps/frappe/frappe/website/template.py +140,Next,volgende
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
 DocType: BOM Operation,BOM Operation,Stuklijst Operatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytisch polijsten
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Aantal van vorige rij
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vul Betaling Bedrag in tenminste één rij
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vul Betaling Bedrag in tenminste één rij
 DocType: POS Profile,POS Profile,POS Profiel
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rij {0}: kan Betaling bedrag niet groter is dan openstaande bedrag zijn
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Totaal Onbetaalde
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totaal Onbetaalde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tijd Log is niet factureerbaar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Koper
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Koper
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettoloon kan niet negatief zijn
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Gelieve handmatig invoeren van de Against Vouchers
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Gelieve handmatig invoeren van de Against Vouchers
 DocType: SMS Settings,Static Parameters,Statische Parameters
 DocType: Purchase Order,Advance Paid,Voorschot Betaald
 DocType: Item,Item Tax,Artikel Belasting
@@ -3943,14 +3608,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Stuur massa SMS naar uw contacten
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overweeg belasting of heffing voor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rollen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Artikel te vervaardigen of herverpakken
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
 DocType: Purchase Invoice,Next Date,Volgende datum
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Voer aub Belastingen en Toeslagen in
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
 DocType: Hub Settings,Seller Name,Verkoper Naam
@@ -3960,47 +3623,44 @@
 DocType: Stock Entry,Repack,Herverpakken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,U moet het formulier opslaan voordat u verder gaat
 DocType: Item Attribute,Numeric Values,Numerieke waarden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Bevestig Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Bevestig Logo
 DocType: Customer,Commission Rate,Commissie Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blok verlaten toepassingen per afdeling.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Winkelwagen is leeg
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan niet worden bewerkt .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Toegekende bedrag kan niet hoger zijn dan unadusted bedrag
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan niet worden bewerkt .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Toegekende bedrag kan niet hoger zijn dan unadusted bedrag
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat Productie op vakantie
 DocType: Sales Order,Customer's Purchase Order Date,Inkooporder datum van Klant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapitaal Stock
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Selecteer een CSV-bestand
-DocType: Dropbox Backup,Send Backups to Dropbox,Stuur Backups naar Dropbox
 DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Ontwerper
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Maak automatisch Materiaal aanvragen als de hoeveelheid lager niveau
 ,Item-wise Purchase Register,Artikelgebaseerde Inkoop Register
 DocType: Batch,Expiry Date,Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Om bestelniveau stellen, moet onderdeel van een aankoop Item of Manufacturing Item zijn"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Project stam.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
-DocType: Dropbox Backup,Send Notifications To,Verzend Notificaties naar
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Date
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Kas
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Maak salarisstructuur voor werknemer {0}

diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 30a5bf4..97d5840 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Lønn Mode
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Velg Månedlig Distribution, hvis du ønsker å spore basert på sesongvariasjoner."
 DocType: Employee,Divorced,Skilt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Advarsel: Samme element er angitt flere ganger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Elementer allerede synkronisert
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Forbrukerprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrukerprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vennligst velg Partiet Type først
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Gløding
 DocType: Item,Customer Items,Kunde Items
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,La godkjennere
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Leide
-DocType: About Us Settings,Website,Nettsted
 DocType: POS Profile,Applicable for User,Gjelder for User
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Press pluss sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Purchase Order,Customer Contact,Kundekontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Fra Material Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Fra Material Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} treet
 DocType: Job Applicant,Job Applicant,Jobbsøker
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ingen flere resultater.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Faktiske typen skatt kan ikke inkluderes i Element rente i rad {0}
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kreves av
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serien er oppdatert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Stikk
 DocType: Pricing Rule,Apply On,Påfør på
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,Purchase Order Elementer som skal mottas
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New La Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New La Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Draft
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. For å opprettholde kunde kloke elementet koden og gjøre dem søkbare basert på deres bruk kode dette alternativet
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Vis Varianter
-DocType: Sales Invoice Item,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Antall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På Lager
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Gjør nye POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Helsevesen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 DocType: Purchase Invoice,Monthly,Månedlig
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Forsinket betaling (dager)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Post-Adresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Forsvars
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Post-Adresse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Vehicle Nei
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vennligst velg Prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Trearbeid
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
 DocType: Employee,Holiday List,Holiday List
 DocType: Time Log,Time Log,Tid Logg
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Accountant
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefonnr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Logg av aktiviteter som utføres av brukere mot Oppgaver som kan brukes for å spore tid, fakturering."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0} # {1}
 ,Sales Partners Commission,Sales Partners Commission
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke ha mer enn fem tegn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Tilskriver Verdi {0} kan ikke fjernes fra {1} som Element Varianter \ eksistere med dette attributtet.
-DocType: Print Settings,Classic,Classic
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dette er en rot konto og kan ikke redigeres.
 DocType: BOM,Operations,Operasjoner
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sette autorisasjon på grunnlag av Rabatt for {0}
 DocType: Bin,Quantity Requested for Purchase,Antall Spurt for Purchase
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Fest CSV-fil med to kolonner, en for det gamle navnet og en for det nye navnet"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Åpning for en jobb.
 DocType: Item Attribute,Increment,Tilvekst
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Velg Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Annonsering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Annonsering
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er angitt mer enn én gang
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tillatt for {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 DocType: Payment Reconciliation,Reconcile,Forsone
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Dagligvare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Gjør Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensjonsfondene
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse er obligatorisk hvis kontotype er Warehouse
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Lead,Person Name,Person Name
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Sjekk om tilbakevendende orden, fjern haken for å stoppe tilbakevendende eller sette riktig sluttdato"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad for leverte varer
-DocType: Blog Post,Guest,Gjest
 DocType: Quality Inspection,Get Specification Details,Få Spesifikasjon Detaljer
 DocType: Lead,Interested,Interessert
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Åpning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Åpning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra varegruppe
 DocType: Journal Entry,Opening Entry,Åpning Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} er obligatorisk
 DocType: Stock Entry,Additional Costs,Tilleggskostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørsel
-DocType: Standard Reply,Owner,Eier
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Skriv inn et selskap først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vennligst velg selskapet først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rømming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitetsloggen:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Eiendom
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutskrift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmasi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsum
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Konsum
 DocType: Upload Attendance,Import Log,Import Logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Sende
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årslønn
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Aksje Utgifter
 DocType: Newsletter,Email Sent?,E-post sendt?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logger
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
 DocType: Delivery Note,Installation Status,Installasjon Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Elementet {0} må være et kjøp varen
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vil bli oppdatert etter Sales Faktura sendes inn.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rette
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Tid Logger for fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity casting
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrevet har allerede blitt sendt
 DocType: Lead,Request Type,Forespørsel Type
 DocType: Leave Application,Reason,Reason
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Kringkasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Execution
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den første brukeren vil bli System Manager (du kan endre dette senere).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Kringkasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Execution
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den første brukeren vil bli System Manager (du kan endre dette senere).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljene for operasjonen utføres.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Elementer og priser
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Elementer og priser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Velg Employee for hvem du oppretter Appraisal.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostnadssteds {0} ikke tilhører selskapet {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installasjonsdato kan ikke være før leveringsdato for Element {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prisliste Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Fornavn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-mold casting
 DocType: Offer Letter,Select Terms and Conditions,Velg Vilkår
 DocType: Production Planning Tool,Sales Orders,Salgsordrer
 DocType: Purchase Taxes and Charges,Valuation,Verdivurdering
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillat negativ saldo
 DocType: Selling Settings,Default Territory,Standard Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,TV
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',Oppdatert via &#39;Time Logg&#39;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} tilhører ikke selskapet {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottatt On
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Skriv inn Firma
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Navn
+,Contact Name,Kontakt Navn
 DocType: Production Plan Item,SO Pending Qty,SO Venter Antall
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Oppretter lønn slip for ovennevnte kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Be for kjøp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bolig
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Later per år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Later per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vennligst sett Naming Series for {0} via Oppsett&gt; Innstillinger&gt; Naming Series
 DocType: Time Log,Will be updated when batched.,Vil bli oppdatert når dosert.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk &#39;Er Advance &quot;mot Account {1} hvis dette er et forskudd oppføring.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
-DocType: Bulk Email,Message,Beskjed
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Tilgang Key
 DocType: Payment Tool,Reference No,Referansenummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
 DocType: Material Request Item,Min Order Qty,Min Bestill Antall
 DocType: Lead,Do Not Contact,Ikke kontakt
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unike id for sporing av alle løpende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Programvareutvikler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Item,Publish in Hub,Publisere i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
 DocType: Item,Purchase Details,Kjøps Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire børsting
 DocType: Employee,Relation,Relasjon
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekreftede bestillinger fra kunder.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Leder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vennligst velg Charge Type først
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Siste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maks 5 tegn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Velg ditt språk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maks 5 tegn
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den første La Godkjenner i listen vil bli definert som standard La Godkjenner
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Deaktiverer etableringen av tids logger mot produksjonsordrer. Driften skal ikke spores mot produksjonsordre
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Elementet {0} må være service Element
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laser boring
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock målenheter
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Rundskriv Reference Error
-DocType: Communication,Closed,Stengt
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel.
 DocType: Lead,Industry,Industry
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Nyhetsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Elementet oppdateres
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
 DocType: Sales Invoice Item,Delivery Note,Levering Note
-DocType: Dropbox Backup,Allow Dropbox Access,Tillat Dropbox Tilgang
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Sette opp skatter
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Betaling Entry har blitt endret etter at du trakk den. Kan trekke det igjen.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Velg måned og år
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Selskapet E-post
 DocType: GL Entry,Debit Amount in Account Currency,Debet beløp på kontoen Valuta
 DocType: Shipping Rule,Valid for Countries,Gyldig for Land
-DocType: Workflow State,Refresh,Refresh
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alle import relaterte felt som valuta, valutakurs, import totalt, import grand total etc er tilgjengelig i kvitteringen Leverandør sitat, fakturaen, innkjøpsordre etc."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total Bestill Regnes
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Skriv inn &#39;Gjenta på dag i måneden&#39; feltverdi
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Skriv inn &#39;Gjenta på dag i måneden&#39; feltverdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Tilgjengelig i BOM, følgeseddel, fakturaen, produksjonsordre, innkjøpsordre, kvitteringen Salg Faktura, Salgsordre, Stock Entry, Timeregistrering"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Velg element
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Velg element
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Kvitteringen må sendes
-DocType: Stock UOM Replace Utility,Current Stock UOM,Nåværende Stock målenheter
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din epostadresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vennligst se vedlegg
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vannskjæring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Oppsett Allerede Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Oppsett Allerede Komplett !!
 ,Finished Goods,Ferdigvarer
 DocType: Delivery Note,Instructions,Bruksanvisning
 DocType: Quality Inspection,Inspected By,Inspisert av
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Vennligst ikke opprette kontoer for kunder og leverandører. De er laget direkte fra kunde / leverandør mestere.
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
 DocType: Purchase Invoice Item,Item Name,Navn
+DocType: Authorization Rule,Approving User  (above authorized value),Godkjenne Bruker (ovenfor autorisert verdi)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Elementer for å bli forespurt som er &quot;Utsolgt&quot; vurderer alle lagre basert på anslått stk og minimum ordreantall
@@ -378,22 +346,21 @@
 ,Purchase Register,Kjøp Register
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
 DocType: Workstation,Consumable Cost,Forbrukskostnads
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medisinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Grunnen for å tape
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 DocType: Employee,Single,Enslig
 DocType: Issue,Attachment,Vedlegg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budsjettet kan ikke stilles for konsernet kostnadssted
 DocType: Account,Cost of Goods Sold,Varekostnad
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Skriv inn kostnadssted
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Skriv inn kostnadssted
 DocType: Journal Entry Account,Sales Order,Salgsordre
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Salgskurs
 DocType: Purchase Order,Start date of current order's period,Startdato av nåværende ordre periode
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Antall kan ikke være en brøkdel i rad {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Antall kan ikke være en brøkdel i rad {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
 DocType: Delivery Note,% Installed,% Installert
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Skriv inn firmanavn først
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Gruppe
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Sett Serial Nos basert på FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Slitting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Til sak nr&#39; kan ikke være mindre enn &quot;From sak nr &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ikke i gang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday mester.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell molding
 DocType: Material Request Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis det er merket, vil skattebeløpet betraktes som allerede er inkludert i Print Rate / Print Beløp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Antall
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
 DocType: Features Setup,Imports,Importen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Liming
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Ventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Tilskuerrekord.
 DocType: Bank Reconciliation,Journal Entries,Journaloppføringer
 DocType: Sales Order Item,Used for Production Plan,Brukes for Produksjonsplan
-DocType: System Settings,Loading...,Laster inn ...
-DocType: DocField,Password,Passord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Smeltet deponering modellering
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 DocType: Customer,Buyer of Goods and Services.,Kjøper av varer og tjenester.
 DocType: Journal Entry,Accounts Payable,Leverandørgjeld
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Legg Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Ikke eksisterer
 DocType: Pricing Rule,Valid Upto,Gyldig Opp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkte Inntekt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Administrative Officer
 DocType: Payment Tool,Received Or Paid,Mottatt eller betalt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry,Difference Account,Forskjellen konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetikk
-DocType: DocField,Type,Type
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
-DocType: Communication,Subject,Emne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Ingen garanti Utløpsserie
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Sak
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Administrerende Underleverandører
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New målenheter må ikke være av typen heltall
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Administrerende Underleverandører
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Møbler og ligaen
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hastigheten som Prisliste valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slett transaksjoner
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Element {0} er ikke kjøpe varen
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} er en ugyldig e-postadresse i «Notification \ e-postadresse &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Total Billing i år:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Total Billing i år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette Serial No {0}, slik det brukes i aksjetransaksjoner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Lukking (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Lukking (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperioden (dager)
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 ,Pending Qty,Venter Stk
 DocType: Job Applicant,Thread HTML,Tråd HTML
 DocType: Company,Ignore,Ignorer
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
 DocType: Pricing Rule,Valid From,Gyldig Fra
 DocType: Sales Invoice,Total Commission,Total Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månedlig Distribution ** hjelper deg fordele budsjettet over måneder hvis du har sesongvariasjoner i din virksomhet. Å distribuere et budsjett å bruke denne fordelingen, sette dette ** Månedlig Distribution ** i ** Cost Center **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry, kan Serial Nos ikke bli slått sammen"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Regnskapsår Startdato bør ikke være større enn regnskapsåret Sluttdato
 DocType: Warranty Claim,Resolution,Oppløsning
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levering: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Forrige
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Velg salgsordrer som du ønsker å opprette produksjonsordrer.
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lønn komponenter.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Database med potensielle kunder.
+DocType: Authorization Rule,Customer or Item,Kunden eller Element
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kundedatabase.
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard Enhet for Element {0} kan ikke endres direkte fordi du allerede har gjort noen transaksjon (er) med en annen målenheter. Du må opprette et nytt element for å bruke et annet standardmålenheter.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
-DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Vendor
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produksjonsordre er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslaget Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Forslaget Writing
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Error ({6}) for Element {0} i Warehouse {1} {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Regnskapsåret selskapet
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Standard Koster Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedlikeholdsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Vennligst installer dropbox python modul
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Fra Kjøpskvittering
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Fra Kjøpskvittering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
 DocType: SMS Settings,Receiver Parameter,Mottaker Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Based On&quot; og &quot;Grupper etter&quot; ikke kan være det samme
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Til
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Skriv inn e-postadresse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,End rør forming
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konverter til konsernet
 DocType: Activity Cost,Activity Type,Aktivitetstype
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Faste Days
 DocType: Sales Invoice,Packing List,Pakkeliste
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Innkjøpsordrer gis til leverandører.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publisering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publisering
 DocType: Activity Cost,Projects User,Prosjekter User
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Forbrukes
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ble ikke funnet i Fakturadetaljer tabellen
 DocType: Company,Round Off Cost Center,Rund av kostnadssted
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vedlikehold Besøk {0} må avbestilles før den avbryter denne salgsordre
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Åpning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Oppslaget tidsstempel må være etter {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Innstillinger
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter og avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mer
 DocType: Pricing Rule,Sales Manager,Salgssjef
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Gi nytt navn
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bøye
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillat User
 DocType: Journal Entry,Bill No,Bill Nei
 DocType: Purchase Invoice,Quarterly,Quarterly
 DocType: Selling Settings,Delivery Note Required,Levering Note Påkrevd
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Skriv inn elementdetaljer
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Kontoer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Markedsføring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rett klipping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Markedsføring
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Å spore element i salgs- og kjøpsdokumenter basert på deres serie nos. Dette er kan også brukes til å spore detaljer om produktet garanti.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvist Warehouse er obligatorisk mot regected element
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Elementet har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} ikke funnet
 DocType: Bin,Stock Value,Stock Verdi
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tre Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommisjonen Rate (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Mot Voucher Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Å finne valutakursen klarer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Velkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kredittkort Entry
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Task Subject
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mottatte varer fra leverandører.
-DocType: Communication,Open,Åpen
 DocType: Lead,Campaign Name,Kampanjenavn
 ,Reserved,Reservert
 DocType: Purchase Order,Supply Raw Materials,Leverer råvare
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
-DocType: Contact Us Settings,Address Title,Adresse Tittel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
-DocType: Dropbox Backup,Daily,Daglig
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Employee,Cell Number,Cell Number
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månedslønn uttalelse.
 DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Ny Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Regnskaps Oppføringer kan gjøres mot bladnoder. Føringer mot grupper er ikke tillatt.
-DocType: ToDo,High,Høy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
-DocType: User,Male,Mann
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Salgskampanjer.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Personlig
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinnstillingene for handlekurv
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologi
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Process Payroll,Send Email,Send E-Post
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Oppdater Stock&#39; kan ikke kontrolleres fordi elementene ikke er levert via {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mine Fakturaer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mine Fakturaer
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen ansatte funnet
 DocType: Purchase Order,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",For å aktivere &quot;Point of Sale&quot; funksjoner
 DocType: Bin,Moving Average Rate,Moving Gjennomsnittlig pris
 DocType: Production Planning Tool,Select Items,Velg Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
-DocType: Comment,Reference Name,Referanse Name
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Forventet Leveringsdato kan ikke være før Salgsordre Dato
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto gevinst / tap
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
 DocType: Production Order,Item To Manufacture,Element for å produsere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent mold casting
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status er {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Bestilling til betaling
 DocType: Sales Order Item,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
 DocType: Newsletter,Newsletter Manager,Nyhetsbrev manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Opening&quot;
 DocType: Notification Control,Delivery Note Message,Levering Note Message
 DocType: Expense Claim,Expenses,Utgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Sak Variant Egenskap
 ,Purchase Receipt Trends,Kvitteringen Trender
 DocType: Appraisal,Select template from which you want to get the Goals,Velg mal som du ønsker å få de målene
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning Og Utvikling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning Og Utvikling
 ,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Order Antall
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planlagt å sende til {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Utsalgssted
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Kan ikke bære frem {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Avvist Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spikring
 ,Available Qty,Tilgjengelig Antall
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Salary Slip,Working Days,Arbeidsdager
 DocType: Serial No,Incoming Rate,Innkommende Rate
 DocType: Packing Slip,Gross Weight,Bruttovekt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkluder ferier i Total no. arbeidsdager
 DocType: Job Applicant,Hold,Hold
 DocType: Employee,Date of Joining,Dato for Delta
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Abonnenter
 DocType: Purchase Invoice Item,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sandblåsing
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakursen mester.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} må være aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
 DocType: Salary Slip,Leave Encashment Amount,La Encashment Beløp
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internett Publisering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Production Planning Tool,Production Orders,Produksjonsordrer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balanse Verdi
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg Prisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publisere synkronisere elementer
-DocType: GL Entry,Account Currency,Account Valuta
+DocType: Bank Reconciliation,Account Currency,Account Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Vennligst oppgi Round Off-konto i selskapet
 DocType: Purchase Receipt,Range,Område
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Features Setup,Item Barcode,Sak Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Address,Shop,Butikk
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
 DocType: Employee,Permanent Address Is,Permanent Adresse Er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasjonen gjennomført for hvor mange ferdigvarer?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,The Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Fradrag for over- {0} krysset for Element {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Detaljer
 DocType: Item,Is Purchase Item,Er Purchase Element
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Innkjøpsordre Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekte inntekt
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Still Betalingsbeløp = utestående beløp
-DocType: Contact Us Settings,Address Line 1,Adresselinje 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Selskapsnavn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Velg elementet for Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vis en liste over alle hjelpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Velg kontoen leder av banken der sjekken ble avsatt.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillater brukeren å redigere Prisliste Rate i transaksjoner
 DocType: Pricing Rule,Max Qty,Max Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betaling mot Salg / innkjøpsordre skal alltid merkes som forskudd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kjemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kjemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 DocType: Process Payroll,Select Payroll Year and Month,Velg Lønn år og måned
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Gå til den aktuelle gruppen (vanligvis Application of Funds&gt; Omløpsmidler&gt; bankkontoer og opprette en ny konto (ved å klikke på Legg Child) av typen &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
-DocType: Comment,Unsubscribed,Utmeldings
 DocType: Opportunity,Walk In,Gå Inn
 DocType: Item,Inspection Criteria,Inspeksjon Kriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial Kostnadssteder.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Overført
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Hvit
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Fest Your Picture
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Gjøre
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Fest Your Picture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Gjøre
 DocType: Journal Entry,Total Amount in Words,Totalbeløp i Words
-DocType: Workflow State,Stop,Stoppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var en feil. En mulig årsak kan være at du ikke har lagret skjemaet. Ta kontakt support@erpnext.com hvis problemet vedvarer.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Handlekurv
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Ordretype må være en av {0}
 DocType: Lead,Next Contact Date,Neste Kontakt Dato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Antall åpne
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Aksjeopsjoner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antall for {0}
 DocType: Leave Application,Leave Application,La Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,La Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,La Block List Datoer
 DocType: Company,If Monthly Budget Exceeded (for expense account),Hvis Månedlig budsjett Skredet (for regning)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,Netto timepris
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost Kjøpskvittering
 DocType: Company,Default Terms,Standard Terms
 DocType: Packing Slip Item,Packing Slip Item,Pakking Slip Element
 DocType: POS Profile,Cash/Bank Account,Cash / Bank Account
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Filing
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Kjøps Rabatter
 DocType: Workstation,Wages,Lønn
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater &quot;Status&quot; og Lagre
 DocType: Serial No,Creation Document No,Creation Dokument nr
 DocType: Issue,Issue,Problem
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontoen samsvarer ikke med selskapet
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
 DocType: BOM Operation,Operation,Operasjon
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Shipping State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Elementet må legges til med &quot;Get Elementer fra innkjøps Receipts &#39;knappen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Salgs Utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard Kjøpe
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard Kjøpe
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Making Stock Entries
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,oppdatert via Tid Logger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din selger som vil ta kontakt med kunden i fremtiden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Angi utpeking av denne kontakten
-DocType: Contact Us Settings,Address,Adresse
 DocType: Expense Claim,From Employee,Fra Employee
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,og år:
 DocType: Email Digest,Annual Expense,Årlig Expense
 DocType: SMS Center,Total Characters,Totalt tegn
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betaling Avstemming Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,nettside lenke
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,La oss klargjøre systemet for første gangs bruk.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Firmaregistreringsnumre som referanse. Skatte tall osv
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Handlevogn Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produksjonsordre {0} må avbestilles før den avbryter denne salgsordre
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Velg Tid Logger og Send for å opprette en ny salgsfaktura.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting å be om
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledelse
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typer aktiviteter for timelister
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringen casting
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Enten debet- eller kredittbeløpet er nødvendig for {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ytterligere noder kan bare skapt under &#39;Gruppe&#39; type noder
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS profil {0} allerede opprettet for user: {1} og selskapet {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Målenheter Omregningsfaktor
 DocType: Stock Settings,Default Item Group,Standard varegruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminert objekt produksjon
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balanse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch forming
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din selger vil få en påminnelse på denne datoen for å kontakte kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt og andre lønnstrekk.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Account,Warehouse,Warehouse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Arkiv Ledger Oppføringer og GL Oppføringer repostes for de valgte Kjøps Receipts
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Sak 1
 DocType: Holiday,Holiday,Ferie
-DocType: Event,Saturday,Lørdag
 DocType: Leave Control Panel,Leave blank if considered for all branches,La stå tom hvis vurderes for alle grener
 ,Daily Time Log Summary,Daglig Tid Logg Summary
-DocType: DocField,Label,Etiketten
 DocType: Payment Reconciliation,Unreconciled Payment Details,Avstemte Betalingsopplysninger
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Sette opp ansatte
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vennligst velg først prefiks
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Contact,User ID,Bruker-ID
-DocType: Communication,Sent,Sendte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vis Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
-DocType: Communication,Delivery Status,Levering Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 DocType: Production Order,Manufacture against Sales Order,Produserer mot kundeordre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten Av Verden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Element Beskrivelse
 DocType: Payment Tool,Payment Mode,Betaling Mode
 DocType: Purchase Invoice,Is Recurring,Er Recurring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkte metall laser sintring
 DocType: Purchase Order,Supplied Items,Leveringen
 DocType: Production Order,Qty To Manufacture,Antall å produsere
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Opprettholde samme tempo gjennom hele kjøpssyklusen
 DocType: Opportunity Item,Opportunity Item,Opportunity Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Midlertidig Åpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Ansatt La Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
 DocType: Address,Address Type,Adressetype
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Få utestående fakturaer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Sak 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto hodet {0} opprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grønn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grønn
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Oppnådd Total
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Oppnådd Total
 DocType: Employee,Place of Issue,Utstedelsessted
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
-DocType: Report,Disabled,Funksjonshemmede
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakts
+DocType: Email Digest,Add Quote,Legg Sitat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Landbruk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Dine produkter eller tjenester
 DocType: Mode of Payment,Mode of Payment,Modus for betaling
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 DocType: Journal Entry Account,Purchase Order,Bestilling
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Navn er påkrevd
 DocType: Purchase Invoice,Recurring Type,Gjentakende Type
 DocType: Address,City/Town,Sted / by
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Elementet {0} må være en underleverandør Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital Equipments
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Forventet Leveringsdato er mindre enn planlagt startdato.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,For Leverandør
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Stille Kontotype hjelper i å velge denne kontoen i transaksjoner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Selskap Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Utgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Det kan bare være én Shipping Rule Forhold med 0 eller blank verdi for &quot;å verd&quot;
 DocType: Authorization Rule,Transaction,Transaksjons
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Merk: Denne Cost Center er en gruppe. Kan ikke gjøre regnskapspostene mot grupper.
-apps/frappe/frappe/config/desk.py +7,Tools,Verktøy
 DocType: Item,Website Item Groups,Website varegrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produksjon varenummer er obligatorisk for aksje oppføring formål produksjon
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Journal Entry
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Verdsettelse Rate nødvendig for Element {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Verdsettelse Rate nødvendig for Element {0}
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} for alle elementer er null, kan det hende du bør endre &#39;Fordel Avgifter basert på &quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og avgifter Beregning
 DocType: BOM Operation,Workstation,Arbeidsstasjon
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst velg et selskap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du må aktivere Handlevogn
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ingen Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Appraisal Mal Goal
 DocType: Salary Slip,Earning,Tjene
 DocType: Payment Tool,Party Account Currency,Partiet konto Valuta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Total ordreverdi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan lage en tidslogg bare mot en innsendt produksjonsordre
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev til kontaktene, fører."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasjoner kan ikke stå tomt.
 ,Delivered Items To Be Billed,Leverte varer til å bli fakturert
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
-DocType: DocField,Description,Beskrivelse
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
-DocType: Letter Head,Is Default,Er Standard
 DocType: Address,Utilities,Verktøy
 DocType: Purchase Invoice Item,Accounting,Regnskap
 DocType: Features Setup,Features Setup,Funksjoner Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vis tilbud Letter
-DocType: Communication,Communication,Kommunikasjon
 DocType: Item,Is Service Item,Er Tjenesten Element
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vennligst velg regnskapsår
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Fra Datetime
 DocType: Email Digest,For Company,For selskapet
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Avhenger La Uten Pay
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Gjøremålsliste
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negative Antall er ikke tillatt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lærling
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detalj tabell hentet fra elementet Hoved som en streng, og som er lagret på dette feltet. Brukes for skatter og avgifter"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ingen aktive Lønn Struktur funnet for arbeidstaker {0} og måneden
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skatteregel for transaksjoner.
 DocType: Rename Tool,Type of document to rename.,Type dokument for å endre navn.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi kjøper denne varen
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vi kjøper denne varen
 DocType: Address,Billing,Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flensing
-DocType: Bulk Email,Not Sent,Ikke sendt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplosiv forming
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale skatter og avgifter (Selskapet valuta)
 DocType: Shipping Rule,Shipping Account,Shipping konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planlagt å sende til {0} mottakere
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Supplier,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik JV mengden {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",For å aktivere &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betaling kan ikke gjøres for tom handlevogn
 DocType: Item,Sales Details,Salgs Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Låsing
 DocType: Opportunity,With Items,Med Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antall
 DocType: Notification Control,Expense Claim Rejected,Expense krav Avvist
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Datoen da neste faktura vil bli generert. Det genereres på send.
 DocType: Item Attribute,Item Attribute,Sak Egenskap
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regjeringen
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Element Varianter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regjeringen
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Element Varianter
 DocType: Company,Services,Tjenester
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
 DocType: Sales Invoice,Source,Source
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Regnskapsår Startdato
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Regnskapsår Startdato
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Enker
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Material Request Item,Sales Order No,Salgsordre Nei
 DocType: Item Group,Item Group Name,Sak Gruppenavn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tatt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transfer Materialer for produksjon
 DocType: Pricing Rule,For Price List,For Prisliste
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kjøp rate for element: {0} ikke funnet, noe som er nødvendig å bestille regnskap oppføring (regning). Vennligst oppgi vareprisen mot et kjøp prisliste."
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatt Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Feil: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Feil: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Opprett ny konto fra kontoplanen.
 DocType: Maintenance Visit,Maintenance Visit,Vedlikehold Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kunde&gt; Kunde Group&gt; Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgjengelig Batch Antall på Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Tid Logg Batch Detalj
-DocType: Workflow State,Tasks,Oppgaver
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjelp
-DocType: Event,Tuesday,Tirsdag
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
 ,Accounts Receivable Summary,Kundefordringer Sammendrag
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Later for typen {0} allerede bevilget for Employee {1} for perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
-DocType: Top Bar Item,Target,Target
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidrag Beløp
 DocType: Sales Invoice,Shipping Address,Sendingsadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Dette verktøyet hjelper deg til å oppdatere eller fikse mengde og verdsetting av aksjer i systemet. Det er vanligvis brukes til å synkronisere systemverdier og hva som faktisk eksisterer i ditt varehus.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,I Ord vil være synlig når du lagrer følgeseddel.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand mester.
-DocType: ToDo,Due Date,Tidsfrist
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand mester.
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Eske
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisasjonen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Eske
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisasjonen
 DocType: Monthly Distribution,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottaker-listen er tom. Opprett Receiver Liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produksjonsplan Salgsordre
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Regnskap Entry for {0} kan bare gjøres i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prising Rule
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Innskjæring
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {1} ikke eksisterer i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkontoer
 ,Bank Reconciliation Statement,Bankavstemming Statement
 DocType: Address,Lead Name,Lead Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Åpning Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Åpning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} må vises bare en gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Beløp ikke reflektert i bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Beløp ikke reflektert i bank
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Sentrifugale støping
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfelt-assistert behandling
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Receipt,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Velg salgsordrer
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Å spore elementer ved hjelp av strekkoden. Du vil være i stand til å legge inn elementer i følgeseddel og salgsfaktura ved å skanne strekkoden på varen.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Merk som Leveres
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Merk som Leveres
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Gjør sitat
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 DocType: SMS Center,Receiver List,Mottaker List
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vis
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lønn Struktur Fradrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv laser sintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import Vellykket!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antall må ikke være mer enn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Alder (dager)
 DocType: Quotation Item,Quotation Item,Sitat Element
 DocType: Account,Account Name,Brukernavn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Fra dato ikke kan være større enn To Date
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} mengde {1} kan ikke være en brøkdel
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverandør Type mester.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør delenummer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Legg
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Konverteringsfrekvens kan ikke være 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} avbrytes eller stoppes
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vehicle Publiseringsdato
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Kvitteringen {0} er ikke innsendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Innstillinger for online shopping cart som skipsregler, prisliste etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturert
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Menneskelige Ressurser
 DocType: Lead,Upper Income,Øvre Inntekt
 DocType: Journal Entry Account,Debit in Company Currency,Debet i selskapet Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mine Issues
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Standardverdier
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betaling beløpet kan ikke være negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Trykk fitting
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
 DocType: Payment Reconciliation,Payments,Betalinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk pressing
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budsjett Avsatt
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Customer Credit Balance
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
 DocType: Quotation,Term Details,Term Detaljer
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasitetsplanlegging For (dager)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
 DocType: Warranty Claim,Warranty Claim,Garantikrav
 ,Lead Details,Lead Detaljer
-DocType: Authorization Rule,Approving User,Godkjenne User
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smiing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
 DocType: Pricing Rule,Applicable For,Aktuelt For
 DocType: Bank Reconciliation,From Date,Fra Dato
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online auksjoner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online auksjoner
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Vennligst oppgi enten Mengde eller Verdivurdering Rate eller begge deler
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Company, Måned og regnskapsåret er obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enkelt enhet av et element.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tid Logg Batch {0} må være &quot;Skrevet&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gjør regnskap Entry For Hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totalt Leaves Avsatt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse kreves ved Row Nei {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mining
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin casting
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,En kundegruppe eksisterer med samme navn kan du endre Kundens navn eller endre navn på Kundegruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vennligst velg {0} først.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materialet Kvittering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partiet Type og Party er nødvendig for fordringer / gjeld konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis dette elementet har varianter, så det kan ikke velges i salgsordrer etc."
 DocType: Lead,Next Contact By,Neste Kontakt Av
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} kan ikke slettes som kvantitet finnes for Element {1}
 DocType: Quotation,Order Type,Ordretype
 DocType: Purchase Invoice,Notification Email Address,Varsling e-postadresse
 DocType: Payment Tool,Find Invoices to Match,Finn Fakturaer til Match
 ,Item-wise Sales Register,Element-messig Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",f.eks &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",f.eks &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Total Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Total Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Handlevogn er aktivert
 DocType: Job Applicant,Applicant for a Job,Kandidat til en jobb
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ingen produksjonsordrer som er opprettet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Lønn Slip av ansattes {0} allerede opprettet for denne måneden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Lønn Slip av ansattes {0} allerede opprettet for denne måneden
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Sales Invoice Item,Batch No,Batch No
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hoved
-DocType: DocPerm,Delete,Slett
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppet rekkefølge kan ikke bli kansellert. Døves å avbryte.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidat til en jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovfestet info og annen generell informasjon om din Leverandør
-DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-DocType: Communication,Received,Mottatt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplisere serie Ingen kom inn for Element {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En forutsetning for en Shipping Rule
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Varen er ikke lov til å ha produksjonsordre.
-DocType: DocField,Attach Image,Fest bilde
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovekten av denne pakken. (Automatisk beregnet som summen av nettovekt elementer)
-DocType: Stock Reconciliation Item,Leave blank if no change,La stå tom hvis ingen endring
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Tid Logger for industrien.
 DocType: Item,Apply Warehouse-wise Reorder Level,Påfør Warehouse-messig Omgjøre nivå
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Logg for oppgaver.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Betaling
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialet Request av maksimal {0} kan gjøres for Element {1} mot Salgsordre {2}
 DocType: Employee,Salutation,Hilsen
-DocType: Communication,Rejected,Avvist
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Sales Order Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
 DocType: Quality Inspection Reading,Reading 10,Lese 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Verdien {0} for Egenskap {1} finnes ikke i listen over gyldige Sak attributtverdier
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Forbinder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Forbinder
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utløpt
 DocType: Packing Slip,To Package No.,Å pakke No.
-DocType: DocType,System,System
 DocType: Warranty Claim,Issue Date,Utgivelsesdato
 DocType: Activity Cost,Activity Cost,Aktivitet Kostnad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrukes Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikasjon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikasjon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 DocType: Payment Tool,Make Payment Entry,Utfør betaling Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
 ,Sales Invoice Trends,Salgsfaktura Trender
 DocType: Leave Application,Apply / Approve Leaves,Påfør / Godkjenn Løv
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Til
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Kan referere rad bare hvis belastningen typen er &#39;On Forrige Row beløp &quot;eller&quot; Forrige Row Totals
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
 DocType: Stock Settings,Allowance Percent,Fradrag Prosent
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Selling må sjekkes, hvis dette gjelder for er valgt som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør sitat Element
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Gjør Lønn Struktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klikk på &quot;Gjør Sales Faktura-knappen for å opprette en ny salgsfaktura.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Emballering og merking
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Tilgang Secret
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
 DocType: Budget Detail,Fiscal Year,Regnskapsår
 DocType: Cost Center,Budget,Budsjett
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Oppnås
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,f.eks 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,f.eks 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord vil være synlig når du lagrer salgsfaktura.
 DocType: Item,Is Sales Item,Er Sales Element
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Varegruppe treet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
 DocType: Maintenance Visit,Maintenance Time,Vedlikehold Tid
 ,Amount to Deliver,Beløp å levere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Et produkt eller tjeneste
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Det var feil.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Et produkt eller tjeneste
 DocType: Naming Series,Current Value,Nåværende Verdi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} opprettet
 DocType: Delivery Note Item,Against Sales Order,Mot Salgsordre
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
 DocType: Website Item Group,Website Item Group,Website varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Skriv inn Reference dato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
 DocType: Material Request Item,Material Request Item,Materialet Request Element
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Tree of varegrupper.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Tree of varegrupper.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 ,Item-wise Purchase History,Element-messig Purchase History
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rød
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Rød
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Åpne produksjonsordrer
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} er ikke fullført for {2} qty av ferdigvarer i Produksjonsordre # {3}. Vennligst oppdater driftsstatus via Tid Logger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Endre målenheter for et element.
 DocType: Quality Inspection Reading,Acceptance Criteria,Akseptkriterier
 DocType: Item Attribute,Attribute Name,Attributt navn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Elementet {0} må være salgs- eller service Element i {1}
 DocType: Item Group,Show In Website,Show I Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Gruppe
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Gruppe
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 ,Qty to Order,Antall å bestille
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Å spore merkenavn i følgende dokumenter følgeseddel, Opportunity, Material Request, Element, innkjøpsordre, Purchase kupong, Kjøper Mottak, sitat, salgsfaktura, Product Bundle, Salgsordre, Serial No"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Merker
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Fra innkjøpsordre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Fra innkjøpsordre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ikke sett
-DocType: Communication,Date,Dato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sitte mens systemet blir oppsettet. Dette kan ta en liten stund.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 DocType: Maintenance Schedule Detail,Actual Date,Selve Dato
 DocType: Item,Has Batch No,Har Batch No
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
 DocType: Employee,Personal Details,Personlig Informasjon
 ,Maintenance Schedules,Vedlikeholdsplaner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Preging
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Uttak fra kontoen må være en fordring konto
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som produksjonsordre kan gjøres for dette, må det være en lagervare."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bli med
-DocType: Authorization Rule,Above Value,Fremfor Verdi
 ,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
 DocType: Purchase Order,Delivered,Levert
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Oppsett innkommende server for jobbene e-id. (F.eks jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Kundefordringer
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Salgs Analytics
 DocType: Address Template,This format is used if country specific format is not found,Dette formatet brukes hvis landet bestemt format ikke er funnet
-DocType: Custom Field,Custom,Custom
 DocType: Production Order,Use Multi-Level BOM,Bruk Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Innsprøyting
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkluder forsonet Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Tree of finanial kontoer.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,La stå tom hvis vurderes for alle typer medarbeider
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere Kostnader Based On
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Konto {0} må være av typen &quot;Fixed Asset &#39;som Element {1} er en ressurs Element
 DocType: HR Settings,HR Settings,HR-innstillinger
-apps/frappe/frappe/config/setup.py +130,Printing,Utskrift
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (e) der du søker om permisjon er ferie. Du trenger ikke søke om permisjon.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,og
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhet
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Vennligst sett Dropbox hurtigtaster på din config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Enhet
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din regnskapsår avsluttes på
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din regnskapsår avsluttes på
 DocType: POS Profile,Price List,Pris Liste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nå standard regnskapsåret. Vennligst oppdater nettleser for at endringen skal tre i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Regninger
 DocType: Issue,Support,Support
-DocType: Authorization Rule,Approving Role,Godkjenne Rolle
 ,BOM Search,BOM Søk
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Lukking (Åpning + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vennligst oppgi valuta i selskapet
 DocType: Workstation,Wages per hour,Lønn per time
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Vis / skjul funksjoner som Serial Nos, POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materiale Requests har vært reist automatisk basert på element re-order nivå
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Klaring dato kan ikke være før innsjekking dato i rad {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Klaring dato kan ikke være før innsjekking dato i rad {0}
 DocType: Salary Slip,Deduction,Fradrag
 DocType: Address Template,Address Template,Adresse Mal
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Sitat
 DocType: Salary Slip,Total Deduction,Total Fradrag
 DocType: Quotation,Maintenance User,Vedlikehold Bruker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kostnad Oppdatert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Element {0} er allerede returnert
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskapsår ** representerer et regnskapsår. Alle regnskapspostene og andre store transaksjoner spores mot ** regnskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Stillingsbeskrivelse
 DocType: Purchase Order Item,Qty as per Stock UOM,Antall pr Stock målenheter
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Velg en gyldig csv-fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Coating
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkivoppføringer finnes mot lageret {0}, dermed kan du ikke re-tildele eller endre Warehouse"
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Supplier Quotation,Manufacturing Manager,Produksjonssjef
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Forsendelser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip molding
-DocType: Purchase Order,To be delivered to customer,Som skal leveres til kunde
+apps/erpnext/erpnext/hooks.py +68,Shipments,Forsendelser
+DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Logg Status må sendes inn.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setter Opp
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Pricing Rule,Supplier,Leverandør
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
 DocType: Employee,Bank Name,Bank Name
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Bruker {0} er deaktivert
 DocType: Leave Application,Total Leave Days,Totalt La Days
-DocType: Journal Entry Account,Credit in Account Currency,Kreditt i kontoen Valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Merk: E-post vil ikke bli sendt til funksjonshemmede brukere
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Velg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Currency Exchange,From Currency,Fra Valuta
-DocType: DocField,Name,Navn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Salgsordre kreves for Element {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Beløp ikke reflektert i system
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vennligst velg avsatt beløp, fakturatype og fakturanummer i minst én rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Salgsordre kreves for Element {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Beløp ikke reflektert i system
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annet
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Fullført
-DocType: Web Form,Select DocType,Velg DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Rømming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Banking
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vennligst klikk på &quot;Generer Schedule &#39;for å få timeplanen
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New kostnadssted
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,New kostnadssted
 DocType: Bin,Ordered Quantity,Bestilte Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
 DocType: Quality Inspection,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 DocType: Purchase Order Item,Reference Document Type,Reference Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot Salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialisert Lager
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
 DocType: Time Log Batch,Total Billing Amount,Total Billing Beløp
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Fordring konto
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Salgsordre til betaling
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Logger opprettet:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Employee,Blood Group,Blodgruppe
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Avventer
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Brukere som kan godkjenne en bestemt ansattes permisjon applikasjoner
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan ikke endre standardmålenheter av Variant. For å endre standardmålenheter for Variant endring standardmålenheter av Mal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontor utstyr
 DocType: Purchase Invoice Item,Qty,Antall
 DocType: Fiscal Year,Companies,Selskaper
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronikk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikk
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hev Material Request når aksjen når re-order nivå
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Fra vedlikeholdsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Fulltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Fulltid
 DocType: Purchase Invoice,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt dato
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har opprettet en standard mal i salgs skatter og avgifter mal, velger du ett og klikk på knappen under."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Avstemming
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vennligst velg Incharge persons navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 DocType: Offer Letter,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Fakturert Amt
 DocType: Time Log,To Time,Til Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","For å legge til barnet noder, utforske treet og klikk på noden under som du vil legge til flere noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 DocType: Production Order Operation,Completed Qty,Fullført Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prisliste {0} er deaktivert
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Kunden element Codes
 DocType: Opportunity,Lost Reason,Mistet Reason
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Lag Betalings Entries mot bestillinger eller fakturaer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sveising
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock målenheter er nødvendig
 DocType: Quality Inspection,Sample Size,Sample Size
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alle elementene er allerede blitt fakturert
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vennligst oppgi en gyldig &quot;Fra sak nr &#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
 DocType: Features Setup,Item Serial Nos,Sak Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dine kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Komprimering støping
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Dine kunder
 DocType: Leave Block List Date,Block Date,Block Dato
 DocType: Sales Order,Not Delivered,Ikke levert
 ,Bank Clearance Summary,Bank Lagersalg Summary
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Sak Kode&gt; Vare Group&gt; Brand
 DocType: Appraisal Goal,Appraisal Goal,Appraisal Goal
-DocType: Event,Friday,Fredag
 DocType: Time Log,Costing Amount,Costing Beløp
 DocType: Process Payroll,Submit Salary Slip,Send Lønn Slip
 DocType: Salary Structure,Monthly Earning & Deduction,Månedlig Tjene &amp; Fradrag
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i Bulk
 DocType: Sales Partner,Address & Contacts,Adresse og Kontakt
 DocType: SMS Log,Sender Name,Avsender Navn
-DocType: Page,Title,Tittel
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tilpass
 DocType: POS Profile,[Select],[Velg]
 DocType: SMS Log,Sent To,Sendt til
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Gjør Sales Faktura
 DocType: Company,For Reference Only.,For referanse.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ugyldig {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Forskuddsbeløp
 DocType: Manufacturing Settings,Capacity Planning,Kapasitetsplanlegging
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Fra dato&quot; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Fra dato&quot; er nødvendig
 DocType: Journal Entry,Reference Number,Referanse Nummer
 DocType: Employee,Employment Details,Sysselsetting Detaljer
 DocType: Employee,New Workplace,Nye arbeidsplassen
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
 DocType: Item,End of Life,Slutten av livet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Reise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Reise
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
 DocType: Sales Invoice,Recurring,Gjentakende
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spesifiser drift, driftskostnadene og gi en unik Operation nei til driften."
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
 DocType: Installation Note,Installation Note,Installasjon Merk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Legg Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Legg Skatter
 ,Financial Analytics,Finansielle Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Datterselskap
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
 DocType: Quality Inspection,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
-DocType: System Settings,In Hours,I Hours
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Forventet balanse pr bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Rasping
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Forventet balanse pr bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Source of Funds (Gjeld)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
 DocType: Appraisal,Employee,Ansatt
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupper etter Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Sales Invoice,Mass Mailing,Masseutsendelse
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Filen til Rename
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Vis Betalinger
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Størrelse
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Opprett kunde
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lese 9
 DocType: Supplier,Is Frozen,Er Frozen
 DocType: Buying Settings,Buying Settings,Kjøpe Innstillinger
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass behandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for et ferdig God Sak
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Oppsett innkommende server for salg e-id. (F.eks sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Betaling konto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenserende Off
 DocType: Quality Inspection Reading,Accepted,Akseptert
-DocType: User,Female,Kvinne
-DocType: Journal Entry Account,Debit in Account Currency,Debet i Account Valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Sørg for at du virkelig ønsker å slette alle transaksjoner for dette selskapet. Dine stamdata vil forbli som det er. Denne handlingen kan ikke angres.
-DocType: Print Settings,Modern,Moderne
-DocType: Communication,Replied,Svarte
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ugyldig referanse {0} {1}
 DocType: Payment Tool,Total Payment Amount,Total Betalingsbeløp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Råvare kan ikke være blank.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ettersom det er eksisterende lagertransaksjoner for dette elementet, \ du ikke kan endre verdiene for «Har Serial No &#39;,&#39; Har Batch No &#39;,&#39; Er Stock Element&quot; og &quot;verdsettelsesmetode &#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hurtig Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
 DocType: Stock Entry,For Quantity,For Antall
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Komplett Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Regnskap oppføring frosset opp til denne datoen, kan ingen gjøre / endre oppføring unntatt rolle angitt nedenfor."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev postliste
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Autorisert Verdi
 DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total Fraværende
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måleenhet
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
 DocType: Lead,Opportunity,Opportunity
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
 DocType: Campaign,Campaign-.####,Kampanje -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredjepart distributør / forhandler / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
 DocType: Customer Group,Has Child Node,Har Child Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Aldring Range 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokjemisk bearbeiding
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standard skatt mal som kan brukes på alle kjøpstransaksjoner. Denne malen kan inneholde liste over skatte hoder og også andre utgifter hoder som &quot;Shipping&quot;, &quot;Forsikring&quot;, &quot;Håndtering&quot; osv #### Note Skattesatsen du definerer her vil være standard skattesats for alle ** Items * *. Hvis det er ** Elementer ** som har forskjellige priser, må de legges i ** Sak Skatt ** bord i ** Sak ** mester. #### Beskrivelse av kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (som er summen av grunnbeløpet). - ** På Forrige Row Total / Beløp ** (for kumulative skatter eller avgifter). Hvis du velger dette alternativet, vil skatten bli brukt som en prosentandel av forrige rad (i skattetabellen) eller en total. - ** Faktisk ** (som nevnt). 2. Account Head: Konto hovedbok der denne skatten vil bli bokført 3. Cost Center: Hvis skatt / avgift er en inntekt (som frakt) eller utgifter det må bestilles mot et kostnadssted. 4. Beskrivelse: Beskrivelse av skatt (som vil bli skrevet ut i fakturaer / sitater). 5. Ranger: skattesats. 6. Beløp: Skatt beløp. 7. Totalt: Akkumulert total til dette punktet. 8. Angi Row: Dersom basert på &quot;Forrige Row Total&quot; du kan velge radnummeret som vil bli tatt som en base for denne beregningen (standard er den forrige rad). 9. Vurdere Skatte eller Charge for: I denne delen kan du angi om skatt / avgift er kun for verdivurdering (ikke en del av total) eller bare for total (ikke tilføre verdi til elementet) eller for begge. 10. legge til eller trekke: Enten du ønsker å legge til eller trekke skatt."
-DocType: Note,Note,Notat
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
-DocType: Email Account,Email Ids,E-IDer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Global Defaults,Hide Currency Symbol,Skjule Valutasymbol
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Fullført Antall kan ikke være mer enn {0} for operasjon {1}
 DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Introduksjon
 DocType: Warranty Claim,Service Address,Tjenesten Adresse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Maks 100 rader for Stock avstemming.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Maks 100 rader for Stock avstemming.
 DocType: Stock Entry,Manufacture,Produksjon
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vennligst følgeseddel først
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Klaring Dato ikke nevnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produksjon
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Klaring Dato ikke nevnt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produksjon
 DocType: Item,Allow Production Order,Tillat produksjonsordre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Installation Note Item,Installed Qty,Installert antall
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Sendt inn
 DocType: Salary Structure,Total Earning,Total Tjene
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mine adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisering gren mester.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Above
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
-,Download Backups,Last ned sikkerhetskopier
 DocType: Notification Control,Sales Order Message,Salgsordre Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Sett standardverdier som Company, Valuta, værende regnskapsår, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betalings Type
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Totale skatter og avgifter
 DocType: Employee,Emergency Contact,Nødtelefon
 DocType: Item,Quality Parameters,Kvalitetsparametere
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Parent Element
 DocType: Account,Account Type,Kontotype
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Reservert Antall
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cutting
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Utflating
 DocType: Account,Income Account,Inntekt konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of materialer basert på&quot; i Costing Seksjon
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
 DocType: Item Reorder,Material Request Type,Materialet Request Type
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenter
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadssted
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kupong #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupong #
 DocType: Notification Control,Purchase Order Message,Innkjøpsordre Message
 DocType: Tax Rule,Shipping Country,Shipping Land
 DocType: Upload Attendance,Upload HTML,Last opp HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})",Total forhånd ({0}) mot Bestill {1} kan ikke være større \ enn Grand Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Total forhånd ({0}) mot Bestill {1} kan ikke være større \ enn Grand Total ({2})
 DocType: Employee,Relieving Date,Lindrende Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prising Rule er laget for å overskrive Prisliste / definere rabattprosenten, basert på noen kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lageret kan bare endres via Stock Entry / følgeseddel / Kjøpskvittering
 DocType: Employee Education,Class / Percentage,Klasse / Prosent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Head of Marketing and Sales
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inntektsskatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser konstruert netto forme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Head of Marketing and Sales
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inntektsskatt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgt Pricing Rule er laget for &#39;Pris&#39;, det vil overskrive Prisliste. Priser Rule prisen er den endelige prisen, så ingen ytterligere rabatt bør påføres. Derfor, i transaksjoner som Salgsordre, innkjøpsordre osv, det vil bli hentet i &quot;Valuta-feltet, heller enn&quot; Prisliste Valuta-feltet."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New kostnadssted Navn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett&gt; Trykking og merkevarebygging&gt; Adresse Mal.
 DocType: Appraisal,HR User,HR User
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
 DocType: Supplier,Billing Currency,Faktureringsvaluta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra large
 ,Profit and Loss Statement,Resultatregnskap
 DocType: Bank Reconciliation Detail,Cheque Number,Sjekk Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Trykke
 DocType: Payment Tool Detail,Payment Tool Detail,Betaling Tool Detail
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen ansatte funnet!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Purchase Order,Customer Address Display,Kunde Adresse Skjerm
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standard Enhet for Element {0} kan ikke endres direkte fordi \ du allerede har gjort noen transaksjon (er) med en annen målenheter. For å endre standardmålenheter, \ bruk &#39;målenheter Erstatt Utility &quot;verktøy i henhold Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiser Exchange Rate å konvertere en valuta til en annen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Sitat {0} er kansellert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Sitat {0} er kansellert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totalt utestående beløp
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ansatt {0} var på permisjon på {1}. Kan ikke merke oppmøte.
 DocType: Sales Partner,Targets,Targets
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Gjør Tid Logg
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Vennligst sett omgjøring kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datamaskiner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kjemisk sliping
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vennligst oppsettet ditt kontoplan før du begynner Regnskaps Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorer Pricing Rule
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Avbrutt
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i lønn struktur kan ikke være mindre enn Employee Bli Date.
 DocType: Employee Education,Graduate,Utdannet
 DocType: Leave Block List,Block Days,Block Days
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Sjekk om tilbakevendende faktura, fjerner du merket for å stoppe tilbakevendende eller sette riktig sluttdato"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} rader tillatt
 DocType: C-Form Invoice Detail,Net Total,Net Total
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Billing (salgsfaktura)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast ett element bør legges inn med negativt antall i retur dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokjemisk bearbeiding
 ,Requested,Spurt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nei Anmerkninger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Forfalt
 DocType: Account,Stock Received But Not Billed,"Stock mottatt, men ikke fakturert"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root-kontoen må være en gruppe
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutto lønn + etterskudd Beløp + Encashment Beløp - Total Fradrag
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Features Setup,Sales and Purchase,Salg og Innkjøp
 DocType: Supplier Quotation Item,Material Request No,Materialet Request Ingen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hastigheten som kundens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har blitt avsluttet abonnementet fra denne listen.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto Rate (Selskap Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Lagt
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Regnskapsår {0} ble ikke funnet.
 DocType: Bank Reconciliation,Get Relevant Entries,Få Relevante Entries
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Regnskap Entry for Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Preging
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebeløp Etter Rabattbeløp (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lageret er obligatorisk for rad {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray forming
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimum lagerbeholdning
 DocType: Stock Entry,Subcontract,Underentrepriser
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Produsentens varenummer
 DocType: Production Order Operation,Estimated Time and Cost,Estimert leveringstid og pris
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Ingen av Sendte SMS
 DocType: Account,Company,Selskap
 DocType: Account,Expense Account,Expense konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programvare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farge
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farge
 DocType: Maintenance Visit,Scheduled,Planlagt
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vennligst velg Element der &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og det er ingen andre Product Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Velg Månedlig Distribusjon til ujevnt fordele målene gjennom måneder.
 DocType: Purchase Invoice Item,Valuation Rate,Verdivurdering Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prisliste Valuta ikke valgt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Sak Rad {0}: Kjøpskvittering {1} finnes ikke i ovenfor &#39;innkjøps Receipts&#39; bord
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
 DocType: Installation Note Item,Against Document No,Mot Dokument nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrer Salgs Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksjon Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vennligst velg {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forsker
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Oppdater
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forsker
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Ta vare på Nyhetsbrev før sending
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Navn eller E-post er obligatorisk
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Innkommende kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Returnerte Stk
 DocType: Employee,Exit,Utgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type er obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} opprettet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrasjonsbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For det lettere for kunder, kan disse kodene brukes i trykte formater som regningene og leveringssedlene"
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
 DocType: Sales Invoice,Advertisement,Annonse
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Sliping
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krympe innpakning
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Ventende Aktiviteter
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekreftet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresse Tittel er obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Avis Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Avis Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Velg regnskapsår
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Attendance,Attendance Date,Oppmøte Dato
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Address,Preferred Shipping Address,Foretrukne leveringsadresse
 DocType: Purchase Receipt Item,Accepted Warehouse,Akseptert Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Publiseringsdato
 DocType: Item,Valuation Method,Verdsettelsesmetode
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Å finne kursen for {0} klarer {1}
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicate entry
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicate entry
 DocType: Serial No,Under Warranty,Under Garanti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord vil være synlig når du lagrer kundeordre.
 ,Employee Birthday,Ansatt Bursdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial No {0} finnes ikke
 DocType: Pricing Rule,Discount Percentage,Rabatt Prosent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Bestillinger
+apps/erpnext/erpnext/hooks.py +54,Orders,Bestillinger
 DocType: Leave Control Panel,Employee Type,Ansettelsesform
 DocType: Employee Leave Approver,Leave Approver,La Godkjenner
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materialet Overført for Produksjon
 DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruker med &quot;Expense Godkjenner&quot; rolle
 ,Issued Items Against Production Order,Utstedte gjenstander mot produksjonsordre
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ugyldig periode
 DocType: Customer,Credit Limit,Kredittgrense
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Velg type transaksjon
 DocType: GL Entry,Voucher No,Kupong Ingen
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Adresse og Kontakt
 DocType: Customer,Last Day of the Next Month,Siste dag av neste måned
 DocType: Employee,Feedback,Tilbakemelding
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidsplan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Slipende jet maskinering
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidsplan
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
-DocType: Website Settings,Website Settings,Nettstedinnstillinger
 DocType: Item,Reorder level based on Warehouse,Omgjøre nivå basert på Warehouse
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Antall å levere
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette følgeseddel mot ethvert prosjekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-kontoen kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-kontoen kan ikke slettes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Vis Arkiv Entries
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Administrer Adresser
 DocType: Pricing Rule,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Lukking (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Lukking (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Fakturert beløp
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Få oppdateringer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Legg et par eksempler på poster
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Legg et par eksempler på poster
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,La Ledelse
-DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
 DocType: Sales Order,Fully Delivered,Fullt Leveres
 DocType: Lead,Lower Income,Lavere inntekt
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hurtighjelp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kilden og målet lageret kan ikke være det samme for rad {0}
 DocType: Features Setup,Sales Extras,Salgs Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budsjett for kontoen {1} mot kostnadssted {2} vil overgå ved {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budsjett for kontoen {1} mot kostnadssted {2} vil overgå ved {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Verdi eller Stk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minutt
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minutt
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 ,Qty to Receive,Antall å motta
 DocType: Leave Block List,Leave Block List Allowed,La Block List tillatt
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omregningsfaktor kan ikke være i fraksjoner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du vil bruke det til innlogging
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du vil bruke det til innlogging
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kassekreditt konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Gjør Lønn Slip
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Sikret lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkter
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Awesome Produkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Åpningsbalanse Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Kan ikke godkjenne permisjon som du ikke er autorisert til å godkjenne bladene på Block Datoer
 DocType: Appraisal,Appraisal,Appraisal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum avstøpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Tegning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Dato gjentas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},La godkjenner må være en av {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorisert signatur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},La godkjenner må være en av {0}
 DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløp (Company Valuta)
 DocType: BOM Operation,Hour Rate,Time Rate
 DocType: Stock Settings,Item Naming By,Sak Naming Av
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fra sitat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fra sitat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annen periode Closing Entry {0} har blitt gjort etter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materialet Overført for Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} ikke eksisterer
 DocType: Purchase Receipt Item,Purchase Order Item No,Innkjøpsordre Varenr
-DocType: System Settings,System Settings,Systeminnstillinger
 DocType: Project,Project Type,Prosjekttype
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten målet stk eller mål beløpet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kostnad for ulike aktiviteter
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mine Forsendelser
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mine Forsendelser
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
 DocType: Supplier,Supplier Details,Leverandør Detaljer
-DocType: Communication,Recipients,Mottakere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Godkjenningsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiser varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vennligst velg Bank Account
 DocType: Newsletter,Create and Send Newsletters,Lag og send nyhetsbrev
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Fra dato må være før til dato
 DocType: Sales Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
 DocType: Item Group,Check this if you want to show in website,Sjekk dette hvis du vil vise på nettstedet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Velkommen til ERPNext
+,Welcome to ERPNext,Velkommen til ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Kupong Detalj Number
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Føre til prisanslag
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Samtaler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtaler
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
 ,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Åpningsdato
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Fra salgsordre
-DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ikke Fakturert
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter er lagt til ennå.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ikke aktiv
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløp
 DocType: Time Log,Batched for Billing,Dosert for Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbeløp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,reskontroførsel
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Varmt metall gass forming
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Gå til den aktuelle gruppen (vanligvis finansieringskilde&gt; Kortsiktig gjeld&gt; Skatter og plikter og opprette en ny konto (ved å klikke på Legg Child) av typen &quot;Skatt&quot; og gjøre nevne skattesatsen.
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser skjæring
-DocType: Event,Monday,Mandag
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betales
 DocType: Salary Slip,Arrear Amount,Etterskudd Beløp
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
-DocType: Page,All,Alt
 DocType: Stock Entry Detail,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
 DocType: Employee,Confirmation Date,Bekreftelse Dato
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Salg User
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Lead Eier
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Warehouse er nødvendig
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Warehouse er nødvendig
 DocType: Employee,Marital Status,Sivilstatus
 DocType: Stock Settings,Auto Material Request,Auto Materiell Request
 DocType: Time Log,Will be updated when billed.,Vil bli oppdatert når fakturert.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Innkjøpsordre Sak Leveres
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Firmanavn kan ikke være selskap
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevark for utskriftsmaler.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registrering av all kommunikasjon av typen e-post, telefon, chat, besøk, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vennligst oppgi Round Off Cost Center i selskapet
 DocType: Purchase Invoice,Terms,Vilkår
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Opprett ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Opprett ny
 DocType: Buying Settings,Purchase Order Required,Innkjøpsordre Påkrevd
 ,Item-wise Sales History,Element-messig Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total vedtatte beløp
 ,Purchase Analytics,Kjøps Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Element
 DocType: Expense Claim,Task,Task
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbering
 DocType: Purchase Taxes and Charges,Reference Row #,Referanse Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dette er en grunnlegg salg person og kan ikke redigeres.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Valuta: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Valuta: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lønn Slip Fradrag
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notater
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Velg en gruppe node først.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Hensikten må være en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll ut skjemaet og lagre det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Last ned en rapport som inneholder alle råvarer med deres nyeste inventar status
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,La Balance Før Application
 DocType: SMS Center,Send SMS,Send SMS
 DocType: Company,Default Letter Head,Standard Brevhode
 DocType: Time Log,Billable,Fakturerbare
-DocType: Authorization Rule,This will be used for setting rule in HR module,Dette vil bli brukt for å sette regelen i HR-modul
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Omgjøre Antall
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Mulighet tapte
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabatt Fields vil være tilgjengelig i innkjøpsordre, kvitteringen fakturaen"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Merk: Vennligst ikke opprette kontoer for kunder og leverandører
-DocType: Report,Report Type,Rapporttype
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laster
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Erstatt Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Country klok standardadresse Maler
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Vis skatt break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Hvis du involvere i produksjon aktivitet. Aktiverer Element &#39;produseres&#39;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
 DocType: Serial No,Out of AMC,Ut av AMC
 DocType: Purchase Order Item,Material Request Detail No,Materialet Request Detail Ingen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard vende
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Gjør Vedlikehold Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Merk: Dersom betaling ikke skjer mot noen referanse, gjøre Journal Entry manuelt."
 DocType: Item,Supplier Items,Leverandør Items
 DocType: Opportunity,Opportunity Type,Opportunity Type
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} er deaktivert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sett som Åpen
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Send automatisk e-poster til Kontakter på Sende transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antall ikke avalable i lageret {1} {2} {3}. Tilgjengelig Antall: {4}, Overfør Antall: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Sak 3
 DocType: Purchase Order,Customer Contact Email,Kundekontakt E-post
-DocType: Event,Sunday,Søndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Merk: Betaling Entry vil ikke bli laget siden &quot;Cash eller bankkontoen ble ikke spesifisert
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområder
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Legg til brukere
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Legg til brukere
 DocType: Pricing Rule,Item Group,Varegruppe
 DocType: Task,Actual Start Date (via Time Logs),Faktisk startdato (via Time Logger)
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
 DocType: Time Log Batch,Total Hours,Totalt antall timer
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automotive
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Elementet er påkrevd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal sprøytestøping
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Fra følgeseddel
 DocType: Time Log,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Velg land, tidssone og valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sand avstøpning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanisering
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,En Lead med denne e-id skal eksistere
 DocType: Stock Entry,From BOM,Fra BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
 DocType: Salary Structure,Salary Structure,Lønn Struktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Pris Regel eksisterer med samme kriteriene, kan du løse \ konflikten ved å prioritere. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Issue Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Issue Material
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Tilbudet Dato
 DocType: Hub Settings,Access Token,Tilgang Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Er Fixed Asset Element
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Hvis du har lange utskriftsformater, kan denne funksjonen brukes til å splitte den siden som skal skrives ut på flere sider med alle topp- og bunntekster på hver side"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alle Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Process Lønn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
 DocType: Product Bundle Item,Product Bundle Item,Produktet Bundle Element
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Bilde Vis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; industribehandling
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Fra og Til dato kreves
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verdipapirer og råvarebørser
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Drilling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsing
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
 DocType: Tax Rule,Shipping City,Shipping by
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denne varen er en variant av {0} (Mal). Attributtene vil bli kopiert over fra malen med mindre &#39;No Copy&#39; er satt
 DocType: Account,Purchase User,Kjøp User
 DocType: Notification Control,Customize the Notification,Tilpass varslings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hammering
-DocType: Web Page,Slideshow,Lysbildefremvisning
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
 DocType: Journal Entry,Print Heading,Print Overskrift
 DocType: Quotation,Maintenance Manager,Vedlikeholdsbehandling
-DocType: Workflow State,Search,Søk
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan ikke være null
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;Dager siden siste Bestill &quot;må være større enn eller lik null
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lodding
 DocType: C-Form,Amended From,Endret Fra
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmateriale
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Enten målet stk eller mål beløpet er obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vennligst velg Publiseringsdato først
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
 DocType: Leave Control Panel,Carry Forward,Fremføring
@@ -2801,44 +2570,43 @@
 ,Produced,Produsert
 DocType: Item,Item Code for Suppliers,Sak Kode for leverandører
 DocType: Issue,Raised By (Email),Raised By (e-post)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Generelt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Fest Brev
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Generelt
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Fest Brev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Nødvendig for Serialisert Element {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Gjelder til (Betegnelse)
-DocType: Blog Post,Blog Post,Blogginnlegg
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupper etter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivere / deaktivere valutaer.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Utgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Datoen da gjentakende ordre vil bli stoppe
 DocType: Quality Inspection,Item Serial No,Sak Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} må reduseres med {1} eller du bør øke overløps toleranse
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Total Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Overføre materialet til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Overføre materialet til Leverandør
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Lag sitat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader på Block Datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
 DocType: Features Setup,Point of Sale,Utsalgssted
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skatte
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rad {0}: {1} er ikke en gyldig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} er ikke en gyldig {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Fra Product Bundle
 DocType: Production Planning Tool,Production Planning Tool,Produksjonsplanlegging Tool
 DocType: Quality Inspection,Report Date,Rapporter Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} allerede bevilget for Employee {1} for perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottakere
 DocType: Features Setup,Item Groups in Details,Varegrupper i detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Oppdateringsfrekvens og tilgjengelighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Prosentvis du har lov til å motta eller levere mer mot antall bestilte produkter. For eksempel: Hvis du har bestilt 100 enheter. og din Fradrag er 10% så du har lov til å motta 110 enheter.
 DocType: Pricing Rule,Customer Group,Kundegruppe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: Item,Website Description,Website Beskrivelse
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 ,Sales Register,Salg Register
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
 DocType: Address,Plant,Plant
-DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Oppsummering for denne måneden og ventende aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kaldvalsing
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Item,Attributes,Egenskaper
-DocType: Packing Slip,Get Items,Få Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Skriv inn avskrive konto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Siste Order Date
-DocType: DocField,Image,Bilde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Gjør Vesenet Faktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
-DocType: Communication,Other,Andre
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operasjon ID ikke satt
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation dokumenttype
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besøk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besøk
 DocType: Leave Type,Is Encash,Er encash
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Gjør Journal Entry
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 DocType: Cost Center,Distribution Id,Distribusjon Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Awesome Tjenester
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alle produkter eller tjenester.
 DocType: Purchase Invoice,Supplier Address,Leverandør Adresse
-DocType: Contact Us Settings,Address Line 2,Adresselinje 2
-DocType: ToDo,Reference,Referanse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforering
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansielle Tjenester
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Verdi for Egenskap {0} må være innenfor rekkevidden av {1} til {2} i trinn på {3}
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
 DocType: Leave Allocation,Unused leaves,Ubrukte blader
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Fordringer Kunde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Saging
 DocType: Tax Rule,Billing State,Billing State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Retail
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
-DocType: Product Bundle,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produktet Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Knusing
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
 DocType: GL Entry,Remarks,Bemerkninger
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 DocType: Features Setup,POS View,POS Vis
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installasjon rekord for en Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuerlig avstøpning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vennligst oppgi en
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Fremfor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold dimensjonering
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} kan ikke være en gruppe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
 DocType: Holiday List,Weekly Off,Ukentlig Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Foreløpig Profit / Loss (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Tilbake Mot Salg Faktura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Sak 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Vennligst angi standardverdien {0} i selskapet {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Vennligst angi standardverdien {0} i selskapet {1}
 DocType: Serial No,Creation Time,Creation Tid
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Totale Inntekter
 DocType: Sales Invoice,Product Bundle Help,Produktet Bundle Hjelp
 ,Monthly Attendance Sheet,Månedlig Oppmøte Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen rekord funnet
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} er inaktiv
 DocType: GL Entry,Is Advance,Er Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Oppmøte Fra Dato og oppmøte To Date er obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Skriv inn &#39;Er underleverandør&#39; som Ja eller Nei
 DocType: Sales Team,Contact No.,Kontaktnummer.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Resultat &#39;type konto {0} ikke tillatt i Åpning Entry
-DocType: Workflow State,Time,Tid
 DocType: Features Setup,Sales Discounts,Salgs Rabatter
 DocType: Hub Settings,Seller Country,Selger Land
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antall Bestill
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner som vil vises på toppen av listen over produkter.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Spesifiser forhold til å beregne frakt beløp
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Legg Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle lov til å sette Frosne Kontoer og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Kan ikke konvertere kostnadssted til hovedbok som den har barnet noder
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Omregningsfaktor er nødvendig
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provisjon på salg
 DocType: Offer Letter Term,Value / Description,Verdi / beskrivelse
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Kunder Ikke Kjøpe siden lenge
 DocType: Production Order,Expected Delivery Date,Forventet Leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Svulmende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Fordamping-mønster casting
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Underholdning Utgifter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Alder
 DocType: Time Log,Billing Amount,Faktureringsbeløp
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Søknader om permisjon.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rettshjelp
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dagen i måneden som auto ordre vil bli generert for eksempel 05, 28 osv"
 DocType: Sales Invoice,Posting Time,Postering Tid
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Revenue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Reiseutgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
-DocType: Feed,Full Name,Fullt Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Prøvetid
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Warehouse er obligatorisk for lagervare.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetaling av lønn for måneden {0} og år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
 ,Transferred Qty,Overført Antall
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlegging
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlegging
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Gjør Tid Logg Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Utstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi selger denne vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vi selger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverandør Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Sak manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Legg rekker å sette årlige budsjettene på Kontoer.
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Bergverk
 DocType: Production Order,Total Operating Cost,Total driftskostnader
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alle kontakter.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Firma Forkortelse
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Firma Forkortelse
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Hvis du følger Quality Inspection. Aktiverer Element QA Nødvendig og QA Ingen i Kjøpskvittering
 DocType: GL Entry,Party Type,Partiet Type
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotasjonsstøping
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lønn mal mester.
 DocType: Leave Type,Max Days Leave Allowed,Max Dager La tillatt
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Still skatteregel for shopping cart
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alle kundegrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatt Mal er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Account,Temporary,Midlertidig
 DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretær
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet av et element
 DocType: Pricing Rule,Buying,Kjøpe
 DocType: HR Settings,Employee Records to be created by,Medarbeider Records å være skapt av
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
 DocType: Purchase Order Item,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} er stoppet
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
 DocType: Lead,Add to calendar on this date,Legg til i kalender på denne datoen
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Kommende arrangementer
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden må
-DocType: Letter Head,Letter Head,Brevhode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hurtig Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,Å Motta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krympe montering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Inntekt / Kostnad
 DocType: Employee,Personal Email,Personlig e-post
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktivert, vil systemet starte regnskapspostene for inventar automatisk."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,postnummer
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Minutter Oppdatert via &#39;Time Logg&#39;
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Bestillinger frigitt for produksjon.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Hub Settings,Name Token,Navn Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Høvling
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standard Selling
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standard Selling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst én lageret er obligatorisk
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Skriv inn standard måleenhet
 DocType: Purchase Invoice Item,Project Name,Prosjektnavn
 DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
-DocType: Workflow State,Edit,Redigere
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
 DocType: Features Setup,Item Batch Nos,Sak Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Avstemming Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
-DocType: Contact Us Settings,Pincode,Pinkode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock målenheter må være forskjellig fra dagens lager målenheter
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Bladene skal avsettes i multipler av 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Last opp oppmøte fra en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Standard kostnadssted
 DocType: Purchase Invoice,End Date,Sluttdato
 DocType: Employee,Internal Work History,Intern Work History
-DocType: DocField,Column Break,Kolonne Break
-DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Utstilling
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Avholdt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksjon Element
 ,Employee Information,Informasjon ansatt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Regnskapsårets slutt Dato
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan ikke filtrere basert på Voucher Nei, hvis gruppert etter Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduser Tjene for permisjon uten lønn (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Denne ukens oppsummering
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} må være et Kjøpt eller underleverandør til element i rad {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
 DocType: GL Entry,Party,Selskap
 DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Opportunity Dato
 DocType: Purchase Receipt,Return Against Purchase Receipt,Tilbake Against Kjøpskvittering
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akkord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akkord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Å Diskutere
 DocType: SMS Settings,SMS Settings,SMS-innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Midlertidige kontoer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Element
 DocType: Account,Auditor,Revisor
 DocType: Purchase Order,End date of current order's period,Sluttdato for dagens orden periode
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Gjør Tilbudsbrevet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
-DocType: DocField,Fold,Brett
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standard Enhet for Variant må være samme som mal
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
 DocType: Project Task,Pending Review,Avventer omtale
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Vennligst spesifiser
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kunde-ID
-DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Å må Tid være større enn fra Time
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel behandling
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",f.eks &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",f.eks &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
-DocType: System Settings,Time Zone,Tidssone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Warehouse {0} finnes ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrer For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av materialer leveres mot denne følgeseddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stifting
 DocType: Customer,Customer Details,Kunde Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Forme
 DocType: Employee,Reports to,Rapporter til
 DocType: SMS Settings,Enter url parameter for receiver nos,Skriv inn url parameter for mottaker nos
 DocType: Sales Invoice,Paid Amount,Innbetalt beløp
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Lukke konto {0} må være av typen &quot;Ansvar&quot;
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetsstyring
 DocType: Production Planning Tool,Filter based on customer,Filter basert på kundens
 DocType: Payment Tool Detail,Against Voucher No,Mot Voucher Nei
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 DocType: Tax Rule,Purchase,Kjøp
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanse Antall
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balanse Antall
 DocType: Item Group,Parent Item Group,Parent varegruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostnadssteder
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Varehus.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Varehus.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hastigheten som leverandørens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: timings konflikter med rad {1}
 DocType: Opportunity,Next Contact,Neste Kontakt
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anleggsmidler
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
 DocType: Item Group,Default Expense Account,Standard kostnadskonto
 DocType: Employee,Notice (days),Varsel (dager)
-DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
 DocType: Employee,Encashment Date,Encashment Dato
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electro
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Mot Voucher Type må være en av innkjøpsordre, fakturaen eller bilagsregistrering"
 DocType: Account,Stock Adjustment,Stock Adjustment
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitet Kostnad finnes for Aktivitetstype - {0}
 DocType: Production Order,Planned Operating Cost,Planlagt driftskostnader
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vedlagt {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Vedlagt {0} # {1}
 DocType: Job Applicant,Applicant Name,Søkerens navn
 DocType: Authorization Rule,Customer / Item Name,Kunde / Navn
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Serial No er obligatorisk for Element {0}
 DocType: Item Variant Attribute,Attribute,Attributt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Vennligst oppgi fra / til spenner
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Laget Av
 DocType: Serial No,Under AMC,Under AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Sak verdivurdering rente beregnes på nytt vurderer inntakskost kupong beløp
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimumsbeløp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Oppdater ferdigvarer
 DocType: Workstation,per hour,per time
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serien {0} allerede brukt i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual inventar) vil bli opprettet under denne kontoen.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 DocType: Company,Distribution,Distribusjon
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Beløpet Betalt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Prosjektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 DocType: Customer,Default Taxes and Charges,Standard Skatter og avgifter
 DocType: Account,Receivable,Fordring
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
 DocType: Sales Invoice,Supplier Reference,Leverandør Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Hvis det er merket, vil BOM for sub-montering elementer vurderes for å få råvarer. Ellers vil alle sub-montering elementer bli behandlet som en råvare."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Selger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifisering
 DocType: Item Price,Item Price,Sak Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Såpe og vaskemiddel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Selskapet er mangler i varehus {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock målenheter Erstatt Utility
 DocType: POS Profile,Terms and Conditions,Vilkår og betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date bør være innenfor regnskapsåret. Antar To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Her kan du opprettholde høyde, vekt, allergier, medisinske bekymringer etc"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,For Production
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Skriv inn salgsordre i tabellen ovenfor
 DocType: Project Task,View Task,Vis Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din regnskapsår begynner på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din regnskapsår begynner på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Skriv inn kvitteringer
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Oppsett innkommende server for støtte e-id. (F.eks support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Salary Slip,Salary Slip,Lønn Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&#39;To Date&#39; er påkrevd
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
 DocType: Sales Invoice Item,Sales Order Item,Salgsordre Element
 DocType: Salary Slip,Payment Days,Betalings Days
 DocType: BOM,Manage cost of operations,Administrer driftskostnader
 DocType: Features Setup,Item Advanced,Sak Avansert
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Hot rullende
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når noen av de merkede transaksjonene &quot;Skrevet&quot;, en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende &quot;Kontakt&quot; i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale innstillinger
 DocType: Employee Education,Employee Education,Ansatt Utdanning
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} er allerede mottatt
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potensielle muligheter for å selge.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sykefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sykefravær
 DocType: Email Digest,Email Digest,E-post Digest
 DocType: Delivery Note,Billing Address Name,Billing Address Navn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varehus
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Er Aktiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Endre Forkortelse
-DocType: Workflow State,Primary,Primær
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabatt (%)
-DocType: Communication,More Information,Mer informasjon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Siste ordrebeløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sprengning
 DocType: Company,Warn,Advare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Sak verdivurdering oppdatert
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Order,Raw Materials Supplied,Råvare Leveres
 DocType: Purchase Invoice,Recurring Print Format,Gjentakende Print Format
-DocType: Communication,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Forventet Leveringsdato kan ikke være før Purchase Order Date
 DocType: Appraisal,Appraisal Template,Appraisal Mal
-DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Sak Klassifisering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedlikehold Besøk Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periode
 ,General Ledger,General Ledger
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vennligst velg {0} først
 DocType: Features Setup,To get Item Group in details table,For å få varen Group i detaljer tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsing
 DocType: Sales Invoice,Commission,Kommisjon
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Standard mal </h4><p> Bruker <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> og alle felt av Adresse (inkludert egendefinerte felt hvis noen) vil være tilgjengelig </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Standard Beløp
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse ikke funnet i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse ikke funnet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Denne måneden Oppsummering
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Payment Tool,Get Outstanding Vouchers,Få Utestående Kuponger
 DocType: Warranty Claim,Resolved By,Løst Av
 DocType: Appraisal,Start Date,Startdato
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Verdi
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klikk her for å verifisere
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Gjennomsnittlig tid tatt av leverandøren til å levere
 DocType: Time Log,Hours,Timer
 DocType: Project,Expected Start Date,Tiltredelse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullende
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Fjern artikkel om avgifter er ikke aktuelt til dette elementet
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tilgang tillatt
-DocType: Dropbox Backup,Weekly,Ukentlig
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Motta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Motta
 DocType: Maintenance Visit,Fully Completed,Fullt Fullført
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Komplett
 DocType: Employee,Educational Qualification,Pedagogiske Kvalifikasjoner
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har blitt lagt inn i vår nyhetsbrevliste.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle maskinering
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hoved Reports
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger oppføringer balanserer oppdatert
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hoved Reports
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Legg til / Rediger priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plan Kostnadssteder
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mine bestillinger
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mine bestillinger
 DocType: Price List,Price List Name,Prisliste Name
 DocType: Time Log,For Manufacturing,For Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Manufacturing
 ,Ordered Items To Be Delivered,Bestilte varer som skal leveres
 DocType: Account,Income,Inntekt
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industry Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Noe gikk galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløp (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Støping
-DocType: Email Alert,Reference Date,Reference Date
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Skriv inn et gyldig mobil nos
 DocType: Budget Detail,Budget Detail,Budsjett Detalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Skriv inn meldingen før du sender
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock målenheter oppdatert for Element {0}
-DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profile
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Oppdater SMS-innstillinger
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tid Logg {0} allerede fakturert
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
 DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Arbeidstaker kan ikke endres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Fradrag for over- {0} krysset for Element {1}
 DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dine Leverandører
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Dine Leverandører
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En annen Lønn Struktur {0} er aktiv for arbeidstaker {1}. Vennligst sin status &quot;Inaktiv&quot; for å fortsette.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Mottatt fra
 DocType: Features Setup,Exports,Eksporten
 DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Fra {0} for {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 DocType: Issue,Content Type,Innholdstype
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Datamaskin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Få avstemte Entries
 DocType: Cost Center,Budgets,Budsjetter
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Oppdatert
 DocType: Employee,Emergency Contact Details,Detaljer nødtelefon
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Hva gjør det?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Hva gjør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} har blitt lagt inn mer enn en gang for regnskapsåret {1}
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Oppdater ekstra kostnader for å beregne inntakskost annonser
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Bruker-ID ikke satt for Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Fra garantikrav
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Bursdag Påminnelse for {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dager siden siste Bestill
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dager siden siste Bestill
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
-DocType: User,Enabled,Aktivert
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Har du virkelig ønsker å sende all lønn slip for måneden {0} og år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukke konto {0} må være av typen Ansvar / Egenkapital
 DocType: Authorization Rule,Based On,Basert På
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periode Fra og perioden Til dato obligatoriske for gjentakende {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Prosjektet aktivitet / oppgave.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generere lønnsslipper
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} er ikke en gyldig e-id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
-DocType: ToDo,Low,Lav
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanjenavn er påkrevd
 DocType: Maintenance Visit,Maintenance Date,Vedlikehold Dato
 DocType: Purchase Receipt Item,Rejected Serial No,Avvist Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Deep tegning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Ny Nyhetsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Vis Balance
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Beløp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Medrivende
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
 ,Sales Analytics,Salgs Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Produksjons Innstillinger
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundeservice
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekreft Din e-post
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Tilbudet kandidat en jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Spør for E-post om innsending av
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} er nødvendig
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumstøping
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
-DocType: Contact Us Settings,City,By
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultralyd maskinering
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Feil: Ikke en gyldig id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Elementet {0} må være en Sales Element
 DocType: Naming Series,Update Series Number,Update-serien Nummer
 DocType: Account,Equity,Egenkapital
 DocType: Sales Order,Printing Details,Utskrift Detaljer
 DocType: Task,Closing Date,Avslutningsdato
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniør
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Rabatt
 DocType: Purchase Invoice,Against Expense Account,Mot regning
 DocType: Production Order,Production Order,Produksjon Bestill
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installasjon Merk {0} har allerede blitt sendt
 DocType: Quotation Item,Against Docname,Mot Docname
 DocType: SMS Center,All Employee (Active),All Employee (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vis nå
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Raw Material Cost
 DocType: Item,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serien Oppdatert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporter Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den første brukeren: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den første brukeren: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Vellykket Forsonet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Vellykket Forsonet
 DocType: Production Order,Planned End Date,Planlagt sluttdato
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Hvor varene er lagret.
 DocType: Tax Rule,Validity,Gyldighet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturert beløp
 DocType: Attendance,Attendance,Oppmøte
-DocType: Page,No,Nei
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
@@ -3689,55 +3376,46 @@
 ,Item Prices,Varepriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord vil være synlig når du lagrer innkjøpsordre.
 DocType: Period Closing Voucher,Period Closing Voucher,Periode Closing Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Prisliste mester.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Prisliste mester.
 DocType: Task,Review Date,Omtale Dato
 DocType: Purchase Invoice,Advance Payments,Forskudd
-DocType: DocPerm,Level,Nivå
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresing
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillatelse til å bruke Betaling Tool
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
 DocType: Company,Round Off Account,Rund av konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrative utgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Kundegruppe
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",f.eks &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Oppsigelsestid
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",f.eks &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Oppsigelsestid
 DocType: Bank Reconciliation Detail,Voucher ID,Kupong ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dette er en rot territorium og kan ikke redigeres.
 DocType: Packing Slip,Gross Weight UOM,Bruttovekt målenheter
 DocType: Email Digest,Receivables / Payables,Fordringer / gjeld
 DocType: Delivery Note Item,Against Sales Invoice,Mot Salg Faktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stempling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Vis nullverdier
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antall element oppnådd etter produksjon / nedpakking fra gitte mengder råvarer
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordringer / gjeld konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot kundeordreposisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 DocType: Task,Actual End Date (via Time Logs),Selve Sluttdato (via Time Logger)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Skriv inn forelder kostnadssted
 DocType: Delivery Note,Print Without Amount,Skriv ut Uten Beløp
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Avgiftskategori kan ikke være &quot;Verdsettelse&quot; eller &quot;Verdsettelse og Total&quot; som alle elementene er ikke-lager
-DocType: User,Last Name,Etternavn
-DocType: Web Page,Left,Venstre
-DocType: Event,All Day,Hele Dagen
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Avgiftskategori kan ikke være &quot;Verdsettelse&quot; eller &quot;Verdsettelse og Total&quot; som alle elementene er ikke-lager
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Total poengsum (av 5)
-DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Parti
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balanse
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balanse
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav)
-DocType: User,Gender,Kjønn
 DocType: Journal Entry,Debit Note,Debitnota
 DocType: Stock Entry,As per Stock UOM,Pr Stock målenheter
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke utløpt
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Lage regler for å begrense transaksjoner basert på verdier.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis det er merket, Total nei. arbeidsdager vil omfatte helligdager, og dette vil redusere verdien av Lønn per dag"
 DocType: Purchase Invoice,Total Advance,Total Advance
-DocType: Workflow State,User,Bruker
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processing Lønn
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Sett som tapte
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Kvittering Note
 DocType: Customer,Credit Days Based On,Kreditt Days Based On
 DocType: Tax Rule,Tax Rule,Skatt Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Opprettholde samme hastighet Gjennom Salgssyklus
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlegg tids logger utenfor arbeidsstasjon arbeidstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har allerede blitt sendt
 ,Items To Be Requested,Elementer å bli forespurt
-DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing pris basert på aktivitet Type (per time)
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,False
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Firma Email ID ikke funnet, derav posten sendt"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 DocType: Production Planning Tool,Filter based on item,Filter basert på element
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
 DocType: Purchase Common,Purchase Common,Kjøp Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fra Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ytelser til ansatte
 DocType: Sales Invoice,Is POS,Er POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Regninger hevet til kundene.
-DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Prosjekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter lagt
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definer Budsjett for denne kostnadssted. Slik stiller budsjett handling, se &quot;Selskapet List&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Expense Claim,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Velge &quot;Ja&quot; vil gi en unik identitet til hver enhet av dette elementet som kan sees i Serial No mester.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 DocType: Address,Office,Kontor
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vennligst velg Employee Record først.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,For å opprette en Tax-konto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Skriv inn Expense konto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Lager
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Lager
 DocType: Employee,Contract End Date,Kontraktssluttdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Pull salgsordrer (pending å levere) basert på kriteriene ovenfor
-DocType: DocShare,Document Type,Document Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Fra Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Fra Leverandør sitat
 DocType: Deduction Type,Deduction Type,Fradrag Type
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antall
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Å spore elementer i salgs- og kjøps dokumenter med batch nos. &quot;Foretrukket Bransje: Kjemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaksjonsdato
 DocType: Production Plan Item,Planned Qty,Planlagt Antall
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Skatte
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Skatte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,For Mengde (Produsert Stk) er obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
 DocType: Notification Control,Purchase Receipt Message,Kvitteringen Message
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tildelte bladene er mer enn perioden
 DocType: Production Order,Actual Start Date,Faktisk startdato
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av materialer leveres mot denne kundeordre
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record element bevegelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev List Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Tjeneste
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 ,Monthly Salary Register,Månedlig Lønn Register
-apps/frappe/frappe/website/template.py +140,Next,Neste
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløp
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Skriv inn Betalingsbeløp i minst én rad
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Skriv inn Betalingsbeløp i minst én rad
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rad {0}: Betalingsbeløp kan ikke være større enn utestående beløp
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total Ubetalte
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total Ubetalte
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tid Log er ikke fakturerbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kjøper
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kjøper
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolønn kan ikke være negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Vennligst oppgi Against Kuponger manuelt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Vennligst oppgi Against Kuponger manuelt
 DocType: SMS Settings,Static Parameters,Statiske Parametere
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Sende masse SMS til kontaktene dine
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenk Skatte eller Charge for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rullende
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredittkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredittkort
 DocType: BOM,Item to be manufactured or repacked,Elementet som skal produseres eller pakkes
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
 DocType: Purchase Invoice,Next Date,Neste dato
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Skriv inn skatter og avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Maskinering
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
 DocType: Hub Settings,Seller Name,Selger Navn
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Pakk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du må Lagre skjemaet før du fortsetter
 DocType: Item Attribute,Numeric Values,Numeriske verdier
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Fest Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Fest Logo
 DocType: Customer,Commission Rate,Kommisjon
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Handlevognen er tom
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan ikke redigeres.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Bevilget beløp kan ikke større enn unadusted mengde
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Bevilget beløp kan ikke større enn unadusted mengde
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillat Produksjonen på helligdager
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapitalbeholdningen
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vennligst velg en csv-fil
-DocType: Dropbox Backup,Send Backups to Dropbox,Send Sikkerhetskopier til Dropbox
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatisk opprette Material Forespørsel om kvantitet faller under dette nivået
 ,Item-wise Purchase Register,Element-messig Purchase Register
 DocType: Batch,Expiry Date,Utløpsdato
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Slik stiller omgjøring nivå, må varen være en innkjøpsenhet eller Manufacturing Element"
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Prosjektet mester.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
-DocType: Dropbox Backup,Send Notifications To,Send varsler til
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Dato
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: Expense Claim Detail,Sanctioned Amount,Sanksjonert Beløp
 DocType: GL Entry,Is Opening,Er Åpnings
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} finnes ikke
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi for hjemmeside og andre publikasjoner.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Opprett Lønn Struktur for arbeidstaker {0}

diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 903d185..d972453 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Wybierz dystrybucji miesięcznej, jeśli chcesz śledzić oparty na sezonowość."
 DocType: Employee,Divorced,Rozwiedziony
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Ostrzeżenie: Ta sama pozycja została wprowadzona wielokrotnie.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Pozycje już synchronizowane
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produkty konsumenckie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produkty konsumenckie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Wybierz typ pierwszy Party
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Wyżarzania
 DocType: Item,Customer Items,Pozycje klientów
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
 DocType: Item,Publish Item to hub.erpnext.com,Publikacja na hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Osoby Zatwierdzające Urlop
 DocType: Sales Partner,Dealer,Diler
 DocType: Employee,Rented,Wynajęty
-DocType: About Us Settings,Website,Strona WWW
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zagęszczania oraz spiekania
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Prośby o Materiał
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od Prośby o Materiał
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Drzewo
 DocType: Job Applicant,Job Applicant,
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Brak już następnych wyników.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legalnie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legalnie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Rzeczywista Podatek typu nie mogą być wliczone w cenę towaru w wierszu {0}
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Szycie
 DocType: Pricing Rule,Apply On,
 DocType: Item Price,Multiple Item prices.,
 ,Purchase Order Items To Be Received,Przedmioty oczekujące na potwierdzenie odbioru Zamówienia Kupna
 DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Przekaz bankowy
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,
 DocType: Mode of Payment Account,Mode of Payment Account,Konto księgowe dla tego rodzaju płatności
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Pokaż Warianty
-DocType: Sales Invoice Item,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Ilość
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Dodaj nowy profil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Opieka zdrowotna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 DocType: Purchase Invoice,Monthly,Miesięcznie
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Opóźnienie w płatności (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adres e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrona
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adres e-mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
 DocType: Company,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Wiersz # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Wiersz # {0}:
 DocType: Delivery Note,Vehicle No,Nr pojazdu
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Wybierz Cennik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Obróbka drewna
 DocType: Production Order Operation,Work In Progress,Praca w toku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Drukowanie 3D
 DocType: Employee,Holiday List,Lista świąt
 DocType: Time Log,Time Log,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Księgowy
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Księgowy
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Company,Phone No,Nr telefonu
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Zaloguj wykonywanych przez użytkowników z zadań, które mogą być wykorzystywane do śledzenia czasu, rozliczeń."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nowy {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nowy {0}: # {1}
 ,Sales Partners Commission,
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Skrót nie może posiadać więcej niż 5 znaków
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atrybut Wartość {0} nie może być usunięty z {1} jako element Warianty \ istnieje z tym atrybutem.
-DocType: Print Settings,Classic,Klasyczny
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,
 DocType: BOM,Operations,Działania
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},
 DocType: Bin,Quantity Requested for Purchase,Ilość zaproponowana do Zakupu
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Dołączyć plik .csv z dwoma kolumnami, po jednym dla starej nazwy i jeden dla nowej nazwy"
 DocType: Packed Item,Parent Detail docname,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Ogłoszenie o pracę
 DocType: Item Attribute,Increment,Przyrost
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Wybierz Magazyn ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamowanie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamowanie
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama Spółka wpisana jest więcej niż jeden raz
 DocType: Employee,Married,Poślubiony
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Artykuły spożywcze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Dodaj Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundusze Emerytalne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Magazyn jest obowiązkowe, jeżeli typ konta to Magazyn"
 DocType: SMS Center,All Sales Person,
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Sprawdź, czy kolejność powtarzających się, usuń zaznaczenie, aby zatrzymać powtarzające się lub umieścić właściwą datę zakończenia"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
 DocType: SMS Log,SMS Log,
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koszt dostarczonych przedmiotów
-DocType: Blog Post,Guest,Gość
 DocType: Quality Inspection,Get Specification Details,Pobierz szczegóły specyfikacji
 DocType: Lead,Interested,
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Zestawienie materiałowe
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otwarcie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otwarcie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
 DocType: Journal Entry,Opening Entry,Wpis początkowy
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} jest obowiązkowe
 DocType: Stock Entry,Additional Costs,Dodatkowe koszty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
 DocType: Lead,Product Enquiry,
-DocType: Standard Reply,Owner,Właściciel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Proszę najpierw wpisać Firmę
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Najpierw wybierz firmę
 DocType: Employee Education,Under Graduate,
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,
 DocType: BOM,Total Cost,Koszt całkowity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Rozwiercanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dziennik aktywności:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nieruchomości
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nieruchomości
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Wyciąg z rachunku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
 DocType: Expense Claim Detail,Claim Amount,Kwota roszczenia
 DocType: Employee,Mr,Pan
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Konsumpcyjny
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Konsumpcyjny
 DocType: Upload Attendance,Import Log,Log operacji importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Wyślij
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Roczne Wynagrodzenie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Roczne Wynagrodzenie
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Wydatki na składowanie
 DocType: Newsletter,Email Sent?,Wiadomość wysłana?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logi
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
 DocType: Delivery Note,Installation Status,Status instalacji
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
 DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Wszystko daty i pracownik połączenie w wybranym okresie przyjdzie w szablonie, z istniejącymi rekordy frekwencji"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Zostanie zaktualizowane po wysłaniu Faktury Sprzedaży
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,
 DocType: SMS Center,SMS Center,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Prostowanie
 DocType: BOM Replace Tool,New BOM,Nowe zestawienie materiałowe
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Czas Logi do fakturowania.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Odlewania Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter już został wysłany
 DocType: Lead,Request Type,
 DocType: Leave Application,Reason,Powód
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Wykonanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Pierwszy użytkownik będzie Administratorem Systemu (można to zmienić później).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Wykonanie
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Pierwszy użytkownik będzie Administratorem Systemu (można to zmienić później).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
 DocType: Serial No,Maintenance Status,Status Konserwacji
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Produkty i cennik
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Produkty i cennik
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrum kosztów {0} nie należy do Firmy {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cennik musi być przyporządkowany do kupna albo sprzedaży
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},
 DocType: Pricing Rule,Discount on Price List Rate (%),Zniżka Cennik Oceń (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,
-DocType: User,First Name,Imię
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formy do odlewania
 DocType: Offer Letter,Select Terms and Conditions,Wybierz Regulamin
 DocType: Production Planning Tool,Sales Orders,Zlecenia sprzedaży
 DocType: Purchase Taxes and Charges,Valuation,Wycena
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Konto bankowe
 DocType: Leave Type,Allow Negative Balance,Dozwolony ujemny bilans
 DocType: Selling Settings,Default Territory,Domyślne terytorium
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Telewizja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozcinając
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Telewizja
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizowana przez ""Czas Zaloguj"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Konto {0} nie jest przypisane do Firmy {1}
 DocType: Naming Series,Series List for this Transaction,
 DocType: Sales Invoice,Is Opening Entry,
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Wspomnieć, jeśli nie standardowe konto należności dotyczy"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Dla magazynu jest wymagane przed wysłaniem
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Otrzymana w dniu
 DocType: Sales Partner,Reseller,
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Proszę wpisać Firmę
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
 DocType: Lead,Address & Contact,Adres i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
 DocType: Newsletter List,Total Subscribers,Wszystkich zapisani
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nazwa kontaktu
+,Contact Name,Nazwa kontaktu
 DocType: Production Plan Item,SO Pending Qty,
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tworzy Pasek Wypłaty dla wskazanych wyżej kryteriów.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Podwójna obudowa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Urlopy na Rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Urlopy na Rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Proszę ustawić Naming Series dla {0} poprzez Konfiguracja&gt; Ustawienia&gt; Seria Naming
 DocType: Time Log,Will be updated when batched.,
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
-DocType: Bulk Email,Message,Wiadomość
 DocType: Item Website Specification,Item Website Specification,
-DocType: Dropbox Backup,Dropbox Access Key,Klucz do Dostępu do Dropboxa
 DocType: Payment Tool,Reference No,Nr Odniesienia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roczny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedażowej
 DocType: Material Request Item,Min Order Qty,Min. wartość zamówienia
 DocType: Lead,Do Not Contact,Nie Kontaktuj
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Programista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Item,Publish in Hub,Publikowanie w Hub
 ,Terretory,Terytorium
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Drut szczotkowanie
 DocType: Employee,Relation,Relacja
 DocType: Shipping Rule,Worldwide Shipping,Wysyłka na całym świecie
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potwierdzone zamówienia od klientów
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Zagłębianie
 DocType: Purchase Invoice Item,Expense Head,Szef Wydatków
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Najpierw wybierz typ opłaty
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ostatnie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Maksymalnie 5 znaków
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Wybierz Swój Język
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Maksymalnie 5 znaków
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Wyłącza tworzenie dzienników razem przeciwko zleceń produkcyjnych. Operacje nie są śledzone przed produkcja na zamówienie
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Wariant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Wiercenie laserowe
-DocType: Stock UOM Replace Utility,New Stock UOM,Nowa jednostka miary stanu
 DocType: Period Closing Voucher,Closing Account Head,
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Circular Error Referencje
-DocType: Communication,Closed,Zamknięte
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
 DocType: Lead,Industry,
 DocType: Employee,Job Profile,Profil Pracy
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Przewężenie
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
 DocType: Journal Entry,Multi Currency,Wielu Waluta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
 DocType: Sales Invoice Item,Delivery Note,Dowód dostawy
-DocType: Dropbox Backup,Allow Dropbox Access,Pozwól na dostęp do Dropboksa
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Konfigurowanie podatki
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Wpis płatności został zmodyfikowany po ściągnięciu. Proszę ściągnąć ponownie.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Workstation,Rent Cost,Koszt Wynajmu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Wybierz miesiąc i rok
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Email do firmy
 DocType: GL Entry,Debit Amount in Account Currency,Kwota debetową w walucie rachunku
 DocType: Shipping Rule,Valid for Countries,Ważny dla krajów
-DocType: Workflow State,Refresh,Odśwież
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Zamówienie razem Uważany
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",
 DocType: Item Tax,Tax Rate,Stawka podatku
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Wybierz produkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Wybierz produkt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
  Zdjęcie Pojednania, zamiast używać Stock Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potwierdzenie Zakupu musi zostać wysłane
-DocType: Stock UOM Replace Utility,Current Stock UOM,Bieżąca jednostka miary asortymentu
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Proszę przejrzeć załącznik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Cięcie strumieniem wody
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,
 ,Finished Goods,Ukończone dobra
 DocType: Delivery Note,Instructions,Instrukcje
 DocType: Quality Inspection,Inspected By,Skontrolowane przez
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Proszę nie tworzyć konta dla klientów i dostawców. Są one tworzone bezpośrednio od mistrzów klienta / dostawcy.
 DocType: Currency Exchange,Currency Exchange,Wymiana Walut
 DocType: Purchase Invoice Item,Item Name,Nazwa pozycji
+DocType: Authorization Rule,Approving User  (above authorized value),Zatwierdzanie autoryzowanego użytkownika (powyżej wartości)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo kredytowe
 DocType: Employee,Widowed,Wdowiec / Wdowa
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",
@@ -380,22 +348,21 @@
 ,Purchase Register,
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
 DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Pojazd Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medyczny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medyczny
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Powód straty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Frezowanie Tube
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 DocType: Employee,Single,Pojedynczy
 DocType: Issue,Attachment,Załącznik
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budżet nie może być ustawiony na centrum kosztów Grupy
 DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia
 DocType: Purchase Invoice,Yearly,Rocznie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,
 DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Średnia. Cena sprzedaży
 DocType: Purchase Order,Start date of current order's period,Datę rozpoczęcia bieżącego zlecenia
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Ilość nie może być ułamkiem w rzędzie {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Ilość nie może być ułamkiem w rzędzie {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
 DocType: Delivery Note,% Installed,% Zainstalowanych
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Proszę najpierw wpisać nazwę Firmy
@@ -405,25 +372,23 @@
 DocType: Account,Is Group,Czy Grupa
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nr seryjny automatycznie ustawiona w oparciu o FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sprawdź Dostawca numer faktury Wyjątkowość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Kształtowanie na gorąco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cięcie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Brak Zysków
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Brak Zysków
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nie Rozpoczęte
 DocType: Lead,Channel Partner,
 DocType: Account,Old Parent,Stary obiekt nadrzędny
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,
 DocType: Sales Taxes and Charges Template,Sales Master Manager,Główny Menadżer Sprzedaży
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
-DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do 
+DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Odlewnictwo Shell
 DocType: Material Request Item,Required Date,
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Proszę wpisać Kod Produktu
 DocType: BOM,Costing,Zestawienie kosztów
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Razem szt
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,
 DocType: Features Setup,Imports,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Klejenie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Działania oczekujące na dziś
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,
 DocType: Bank Reconciliation,Journal Entries,Zapisy księgowe
 DocType: Sales Order Item,Used for Production Plan,Używane do Planu Produkcji
-DocType: System Settings,Loading...,Wczytuję...
-DocType: DocField,Password,Hasło
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Osadzanie topionego
 DocType: Manufacturing Settings,Time Between Operations (in mins),Czas między operacjami (w min)
 DocType: Customer,Buyer of Goods and Services.,Nabywca towarów i usług.
 DocType: Journal Entry,Accounts Payable,Zobowiązania
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj abonentów
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nie istnieje"
 DocType: Pricing Rule,Valid Upto,Ważny do
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Przychody bezpośrednie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,
 DocType: Payment Tool,Received Or Paid,Otrzymane lub zapłacone
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry,Difference Account,Konto Różnic
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,
 DocType: Production Order,Additional Operating Cost,Dodatkowy koszt operacyjny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetyki
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",
-DocType: Communication,Subject,Temat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetyki
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 ,Serial No Warranty Expiry,
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,"Pozycja (towar, produkt lub usługa)"
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Zarządzanie Podwykonawstwo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Zarządzanie Podwykonawstwo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Meble i osprzęt
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
@@ -482,21 +441,21 @@
 DocType: Production Planning Tool,Material Requirement,
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,{0} nie jest pozycją kupowaną
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} jest nieprawidłowym adresem e-mail w 'Powiadomienia \ Adres Email'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Suma płatności w tym roku:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Suma płatności w tym roku:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nie można usunąć nr seryjnego {0}, ponieważ jest wykorzystywany w transakcjach magazynowych"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zamknięcie (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zamknięcie (Cr)
 DocType: Serial No,Warranty Period (Days),Okres gwarancji (dni)
 DocType: Installation Note Item,Installation Note Item,
 ,Pending Qty,Oczekuje szt
 DocType: Job Applicant,Thread HTML,
 DocType: Company,Ignore,Ignoruj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS wysłany do następujących liczb: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
 DocType: Pricing Rule,Valid From,Ważny od
 DocType: Sales Invoice,Total Commission,
 DocType: Pricing Rule,Sales Partner,
@@ -506,7 +465,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Miesięczny Dystrybucja ** pozwala Ci zaplanować budżet w ciągu roku, jeśli w Twojej firmie występuje sezonowość.
 
  Aby rozplanować budżet w ** dystrybucji miesięcznej ** ustaw  Miesięczą dystrybucję w ** Centrum Kosztów **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",
@@ -514,7 +473,6 @@
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Całkowita suma
-DocType: About Us Settings,Website Manager,Manager strony WWW
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Data rozpoczęcia roku obrotowego nie powinny być większe niż data zakończenia roku obrotowego
 DocType: Warranty Claim,Resolution,
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dostarczone: {0}
@@ -522,25 +480,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturowanie i dostawy status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Wstecz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Zwrot sprzedaży
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza danych potencjalnych klientów.
+DocType: Authorization Rule,Customer or Item,Klient lub przedmiotu
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza danych klientów.
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Koziołkujący
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniana bezpośrednio, ponieważ masz już jakąś transakcję (y) z innym UOM. Musisz utworzyć nowy obiekt, aby użyć innego domyślnego UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
-DocType: Event,Wednesday,Środa
 DocType: Sales Invoice,Customer's Vendor,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produkcja Zamówienie jest obowiązkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},
 DocType: Fiscal Year Company,Fiscal Year Company,Rok podatkowy firmy
@@ -561,20 +518,16 @@
 DocType: Activity Type,Default Costing Rate,Domyślnie Costing Cena
 DocType: Maintenance Schedule,Maintenance Schedule,Plan Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,
 DocType: Employee,Passport Number,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z Potwierdzenia Kupna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z Potwierdzenia Kupna
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Sama pozycja została wprowadzona wielokrotnie.
 DocType: SMS Settings,Receiver Parameter,Parametr Odbiorcy
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"Pola ""Bazuje na"" i ""Grupuj wg."" nie mogą być takie same"
 DocType: Sales Person,Sales Person Targets,
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,do
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Proszę wpisać adres e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec rurki tworzące
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla rodzaju płatności {0}
 DocType: Selling Settings,Customer Naming By,
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Przekształć w Grupę
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
@@ -582,25 +535,20 @@
 DocType: Customer,Fixed Days,Stałe Dni
 DocType: Sales Invoice,Packing List,Lista przedmiotów do spakowania
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Zamówienia Kupna dane Dostawcom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Działalność wydawnicza
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Działalność wydawnicza
 DocType: Activity Cost,Projects User,Użytkownik projektu
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Skonsumowano 
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Skonsumowano
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Nie znaleziono tabeli w Szczegóły faktury
 DocType: Company,Round Off Cost Center,Zaokrąglić centrum kosztów
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Wizyta Konserwacji {0} musi być anulowana przed usunięciem nakazu sprzedaży
 DocType: Material Request,Material Transfer,Transfer materiałów
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Otwarcie (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},
-apps/frappe/frappe/config/setup.py +59,Settings,
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Koszt podatków i opłat
 DocType: Production Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
 DocType: BOM Operation,Operation Time,Czas operacji
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Więcej
 DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Zmień nazwę
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Zginanie
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,
 DocType: Journal Entry,Bill No,Numer Rachunku
 DocType: Purchase Invoice,Quarterly,Kwartalnie
 DocType: Selling Settings,Delivery Note Required,Dowód dostawy jest wymagany
@@ -609,17 +557,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
 DocType: Account,Accounts,Księgowość
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Proste cięcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Odrzucony Magazyn jest obowiązkowy dla odrzuconych przedmiotów
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Employee,Provide email id registered in company,
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 DocType: Email Digest,Next email will be sent on:,
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,
 DocType: Bin,Stock Value,
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,
@@ -628,14 +575,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Ilość i magazyn
 DocType: Sales Invoice,Commission Rate (%),Wartość prowizji (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Podstawą księgowania może być tu Zlecenie sprzedaży, Faktura sprzedaży lub Zapis księgowy"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nie można znaleźć kurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Witamy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,
 DocType: Journal Entry,Credit Card Entry,Wejście kart kredytowych
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Temat zadania
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Produkty otrzymane od dostawców.
-DocType: Communication,Open,Otwarty
 DocType: Lead,Campaign Name,Nazwa kampanii
 ,Reserved,Zarezerwowany
 DocType: Purchase Order,Supply Raw Materials,Zaopatrzenia w surowce
@@ -644,29 +587,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nie jest przechowywany na magazynie
 DocType: Mode of Payment Account,Default Account,Domyślne konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,
-DocType: Contact Us Settings,Address Title,
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
 ,Sales Person Target Variance Item Group-Wise,
-DocType: Dropbox Backup,Daily,Codziennie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Employee,Cell Number,Numer komórki
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Wnioski Auto Materiał Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
 DocType: Item Group,Website Specifications,Specyfikacja strony WWW
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nowe konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Zapisy księgowe mogą być wykonane na kontach podrzędnych. Wpisy wobec grupy kont nie są dozwolone.
-DocType: ToDo,High,Wysoki
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Opportunity,Maintenance,Konserwacja
-DocType: User,Male,Mężczyzna
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -714,10 +654,9 @@
 DocType: Address,Personal,Osobiste
 DocType: Expense Claim Detail,Expense Claim Type,Typ Zwrotu Kosztów
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Domyślne ustawienia koszyku
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Księgowanie {0} jest związany przeciwko Zakonu {1}, sprawdzić, czy należy go wyciągnął, jak wcześniej w tej fakturze."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Technologia Bio
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Księgowanie {0} jest związany przeciwko Zakonu {1}, sprawdzić, czy należy go wyciągnął, jak wcześniej w tej fakturze."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Technologia Bio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Wydatki na obsługę biura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
@@ -725,14 +664,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Process Payroll,Send Email,
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Brak uprawnień
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Aktualizacja Zdjęcie&quot; Nie można sprawdzić, ponieważ elementy nie są dostarczane za pośrednictwem {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Numery
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Numery
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktury
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktury
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nie znaleziono pracowników
 DocType: Purchase Order,Stopped,
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
@@ -751,35 +691,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Aby włączyć &quot;punkt sprzedaży&quot; funkcje
 DocType: Bin,Moving Average Rate,
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
-DocType: Comment,Reference Name,Nazwa Odniesienia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: Sales Invoice Item,Target Warehouse,
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty sprzedaży
 DocType: Upload Attendance,Import Attendance,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Stałe formy odlewniczej
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} Stan jest {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Zamówienie zakupu do płatności
 DocType: Sales Order Item,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
 DocType: Newsletter,Newsletter Manager,Biuletyn Kierownik
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otwarcie&quot;
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
 DocType: Expense Claim,Expenses,Wydatki
 DocType: Item Variant Attribute,Item Variant Attribute,Pozycja Wersja Atrybut
 ,Purchase Receipt Trends,Trendy Potwierdzenia Zakupu
 DocType: Appraisal,Select template from which you want to get the Goals,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Badania i rozwój
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Badania i rozwój
 ,Amount to Bill,
 DocType: Company,Registration Details,Szczegóły Rejestracji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Wytyczania
 DocType: Item,Re-Order Qty,Ilość w ponowieniu zamówienia
 DocType: Leave Block List Date,Leave Block List Date,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},
@@ -790,18 +727,16 @@
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punkt sprzedaży
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nie można kontynuować {0} 
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
-DocType: Account,Balance must be,Bilans powinien wynosić 
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Już Kredyty saldo konta, nie możesz ustawić ""Równowaga musi być"" za ""Debit"""
+DocType: Account,Balance must be,Bilans powinien wynosić
 DocType: Hub Settings,Publish Pricing,Opublikuj Ceny
 DocType: Notification Control,Expense Claim Rejected Message,Wiadomość o odrzuconym zwrocie wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Byczy
 ,Available Qty,Dostępne szt
 DocType: Purchase Taxes and Charges,On Previous Row Total,
 DocType: Salary Slip,Working Days,Dni robocze
 DocType: Serial No,Incoming Rate,
 DocType: Packing Slip,Gross Weight,Waga brutto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.
 DocType: HR Settings,Include holidays in Total no. of Working Days,
 DocType: Job Applicant,Hold,
 DocType: Employee,Date of Joining,Data Wstąpienia
@@ -811,30 +746,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobacz subskrybentów
 DocType: Purchase Invoice Item,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Czyszczenie strumieniowo-ścierne
 DocType: Employee,Ms,Pani
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Główna wartość Wymiany walut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musi być aktywny
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,
 DocType: Salary Slip,Leave Encashment Amount,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},
 DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość
 DocType: Bank Reconciliation,Total Amount,Wartość całkowita
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,
 DocType: Production Planning Tool,Production Orders,Zamówienia Produkcji
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Wartość bilansu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikowanie synchronizować elementy
-DocType: GL Entry,Account Currency,Waluta konta
+DocType: Bank Reconciliation,Account Currency,Waluta konta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie
 DocType: Purchase Receipt,Range,Przedział
 DocType: Supplier,Default Payable Accounts,Domyślne Konto Płatności
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Features Setup,Item Barcode,Kod kreskowy
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,
 DocType: Address,Shop,Sklep
@@ -843,7 +777,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Domyślne Konto Bank / Kasa będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
 DocType: Employee,Permanent Address Is,Stały adres to
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacja zakończona na jak wiele wyrobów gotowych?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Zniżki dla nadmiernie {0} przeszedł na pozycję {1}.
 DocType: Employee,Exit Interview Details,Wyjdź z szczegółów wywiadu
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
@@ -862,60 +796,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Przedmiot Zamówienia Kupna
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Przychody pośrednie
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ustaw Kwota płatności = zaległej kwoty
-DocType: Contact Us Settings,Address Line 1,Adres Linia 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Zmienność
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nazwa firmy
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Zmienność
+,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Wybierz produkt Transferu
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobacz listę wszystkich filmów pomocy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,
 DocType: Pricing Rule,Max Qty,Maks. Ilość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Wiersz {0}: Płatność przeciwko sprzedaży / Zamówienia powinny być zawsze oznaczone jako góry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemiczny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemiczny
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 DocType: Process Payroll,Select Payroll Year and Month,Wybierz Płace rok i miesiąc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Idź do odpowiedniej grupy (zwykle wykorzystania funduszy&gt; Aktywa obrotowe&gt; rachunków bankowych i utworzyć nowe konto (klikając na Dodaj Child) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypomnień o urodzinach Pracowników
-DocType: Comment,Unsubscribed,Nie zarejestrowany
 DocType: Opportunity,Walk In,Wejście
 DocType: Item,Inspection Criteria,Kryteria kontrolne
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,"Centrum kosztów, czyli Miejsca Powstawania Kosztów."
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Przeniesione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biały
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biały
 DocType: SMS Center,All Lead (Open),
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Załącz własny obrazek (awatar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Stwórz
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Załącz własny obrazek (awatar)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Stwórz
 DocType: Journal Entry,Total Amount in Words,
-DocType: Workflow State,Stop,Zatrzymaj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Mój koszyk
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opcje magazynu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opcje magazynu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Ilość dla {0}
 DocType: Leave Application,Leave Application,Wniosek o Urlop
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Narzędzie do przydziału urlopu
 DocType: Leave Block List,Leave Block List Dates,
 DocType: Company,If Monthly Budget Exceeded (for expense account),Jeśli budżet miesięczny Przekroczone (dla rachunku kosztów)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Przycinanie
 DocType: Workstation,Net Hour Rate,Stawka godzinowa Netto
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Koszt kupionego przedmiotu
 DocType: Company,Default Terms,Regulamin domyślne
 DocType: Packing Slip Item,Packing Slip Item,
 DocType: POS Profile,Cash/Bank Account,Konto Kasa / Bank
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Katalogowanie
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zniżka (rabat)
 DocType: Features Setup,Purchase Discounts,Zniżki zakupu
 DocType: Workstation,Wages,Zarobki
@@ -932,7 +861,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,
 DocType: Serial No,Creation Document No,
 DocType: Issue,Issue,
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto nie odpowiada Spółki
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazyn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},
 DocType: BOM Operation,Operation,Operacja
@@ -940,13 +870,13 @@
 DocType: Tax Rule,Shipping State,Stan Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Koszty Sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,
 DocType: GL Entry,Against,
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Dokonywanie stockowe Wpisy
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Dokonywanie stockowe Wpisy
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
 DocType: Item,Default Supplier,Domyślny dostawca
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad zasiłkach Procent Produkcji
@@ -961,29 +891,27 @@
 DocType: Time Log Batch,updated via Time Logs,Zaktualizowano przed Dziennik Czasu
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,
 DocType: Opportunity,Your sales person who will contact the customer in future,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
 DocType: Company,Default Currency,Domyślna waluta
 DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu
-DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Od Pracownika
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,
 DocType: Upload Attendance,Attendance From Date,
 DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,i rok:
 DocType: Email Digest,Annual Expense,Rocznych kosztów
 DocType: SMS Center,Total Characters,Wszystkich Postacie
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Płatność Wyrównawcza Faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Udział %
 DocType: Item,website page link,link do strony WWW
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Przygotujmy system do pierwszego użycia.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,
 DocType: Sales Partner,Distributor,Dystrybutor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Koszyk Wysyłka Reguła
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,
@@ -1003,68 +931,58 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Zarząd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Zarząd
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Odlewania
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Wymagana jest debetowa lub kredytowa kwota dla {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktywny
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Niebieski
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Niebieski
 DocType: Purchase Invoice,Is Return,Czy Wróć
 DocType: Price List Country,Price List Country,Cena Kraj
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,
 DocType: Item,UOMs,Jednostki miary
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1} 
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} już utworzony przez użytkownika: {1} i {2} firma
 DocType: Purchase Order Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Obiekt produkcyjny laminowany
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza dostawców
 DocType: Account,Balance Sheet,Arkusz Bilansu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formowania
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,
 DocType: Lead,Lead,Trop
 DocType: Email Digest,Payables,
 DocType: Account,Warehouse,Magazyn
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zapisy księgi zapasów oraz księgi głównej są odświeżone dla wybranego dokumentu zakupu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pozycja 1
 DocType: Holiday,Holiday,Święto
-DocType: Event,Saturday,Sobota
 DocType: Leave Control Panel,Leave blank if considered for all branches,Zostaw puste jeśli jest to rozważane dla wszystkich oddziałów
 ,Daily Time Log Summary,
-DocType: DocField,Label,"etykieta
-"
 DocType: Payment Reconciliation,Unreconciled Payment Details,Szczegóły płatności nieuzgodnione
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
 DocType: Lead,Call,Połączenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Konfigurowanie Pracownicy
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Badania
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów
 DocType: Contact,User ID,ID Użytkownika
-DocType: Communication,Sent,Wysłano
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Podgląd księgi
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
-DocType: Communication,Delivery Status,Status dostawy
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 DocType: Production Order,Manufacture against Sales Order,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Reszta świata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,
 DocType: Salary Slip,Gross Pay,Płaca brutto
@@ -1075,13 +993,11 @@
 DocType: BOM Item,Item Description,Opis produktu
 DocType: Payment Tool,Payment Mode,Tryb Płatności
 DocType: Purchase Invoice,Is Recurring,Czy cykliczne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Bezpośrednie spiekania laserowego metali
 DocType: Purchase Order,Supplied Items,Dostarczone przedmioty
 DocType: Production Order,Qty To Manufacture,Ilość do wyprodukowania
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Utrzymanie stałej stawki przez cały cykl zakupu
 DocType: Opportunity Item,Opportunity Item,Przedmiot Szansy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tymczasowe otwarcia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilans zwolnień pracownika
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
 DocType: Address,Address Type,Typ Adresu
@@ -1097,35 +1013,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Uzyskaj zaległą fakturę
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mały
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mały
 DocType: Employee,Employee Number,Numer pracownika
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0} 
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
 ,Invoiced Amount (Exculsive Tax),
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Pozycja 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zielony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zielony
 DocType: Item,Auto re-order,Automatyczne ponowne zamówienie
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Razem Osiągnięte
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Razem Osiągnięte
 DocType: Employee,Place of Issue,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-DocType: Report,Disabled,Wyłączony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+DocType: Email Digest,Add Quote,Dodaj Cytat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Rolnictwo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Twoje Produkty lub Usługi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Twoje Produkty lub Usługi
 DocType: Mode of Payment,Mode of Payment,Rodzaj płatności
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,
 DocType: Journal Entry Account,Purchase Order,Zamówienie kupna
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Imię jest obowiązkowe
 DocType: Purchase Invoice,Recurring Type,Powtarzający się typ
 DocType: Address,City/Town,Miasto/Miejscowość
 DocType: Email Digest,Annual Income,Roczny dochód
 DocType: Serial No,Serial No Details,Szczegóły numeru seryjnego
 DocType: Purchase Invoice Item,Item Tax Rate,Stawka podatku dla tej pozycji
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko rachunki kredytowe mogą być połączone z innym wejściem debetowej"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
@@ -1135,14 +1050,13 @@
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Oczekiwany Dostawa Data jest mniejszy niż planowane daty rozpoczęcia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Razem Wychodzące
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",
 DocType: Authorization Rule,Transaction,
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,
-apps/frappe/frappe/config/desk.py +7,Tools,Narzędzia
 DocType: Item,Website Item Groups,Grupy przedmiotów strony WWW
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numer zlecenia produkcyjnego jest obowiązkowy dla celów ewidencji zapasów do produkcji
 DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
@@ -1150,24 +1064,22 @@
 DocType: Journal Entry,Journal Entry,Zapis księgowy
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentarze
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Wskaźnik wyceny jest wymagany dla Przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Wskaźnik wyceny jest wymagany dla Przedmiotu {0}
 DocType: Quality Inspection Reading,Reading 8,Odczyt 8
 DocType: Sales Partner,Agent,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów jest równa zero, może powinieneś zmienić &quot;Dystrybucja opłat na podstawie&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,
 DocType: BOM Operation,Workstation,Stacja robocza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,
 DocType: Attendance,HR Manager,
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firmę
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musisz włączyć Koszyk
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Brak danych
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cel szablonu oceny
 DocType: Salary Slip,Earning,Dochód
 DocType: Payment Tool,Party Account Currency,Partia konto Waluta
@@ -1177,26 +1089,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Łączna wartość zamówienia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Żywność
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Możesz zrobić dziennik czasu tylko przed złożonego zlecenia produkcyjnego
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacje nie może być puste.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacje nie może być puste.
 ,Delivered Items To Be Billed,Dostarczone przedmioty oczekujące na fakturowanie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
-DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,
-DocType: Letter Head,Is Default,Jest domyślny
 DocType: Address,Utilities,
 DocType: Purchase Invoice Item,Accounting,Księgowość
 DocType: Features Setup,Features Setup,Ustawienia właściwości
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Zobacz List Oferty
-DocType: Communication,Communication,Komunikacja
 DocType: Item,Is Service Item,Jest usługą
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Wybierz Rok Podatkowy
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1215,7 +1124,7 @@
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zbiory wpisy już utworzone dla Produkcji Zakonu
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od DateTime
 DocType: Email Digest,For Company,Dla firmy
@@ -1225,7 +1134,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
@@ -1239,31 +1148,28 @@
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,"Lista ""Do zrobienia"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Uczeń
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Uczeń
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Podatki pobierane z tabeli szczegółów mistrza poz jako ciąg znaków i przechowywane w tej dziedzinie.
  Służy do podatkach i opłatach"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,kopiowanie
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Wejście księgowe dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Wejście księgowe dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Brak aktywnego Struktura znaleziono pracownika wynagrodzenie {0} i miesiąca
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
 DocType: Rename Tool,Type of document to rename.,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupujemy ten przedmiot
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kupujemy ten przedmiot
 DocType: Address,Billing,Rozliczenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Wywinięcie
-DocType: Bulk Email,Not Sent,Nie wysłane
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Wybuchowe formowania
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),
 DocType: Shipping Rule,Shipping Account,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,
 DocType: Shipping Rule Condition,To Value,
 DocType: Supplier,Stock Manager,Kierownik magazynu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},
@@ -1273,105 +1179,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analityk
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analityk
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa JV ilości {2}
 DocType: Item,Inventory,Inwentarz
 DocType: Features Setup,"To enable ""Point of Sale"" view",Aby włączyć &quot;punkt sprzedaży&quot; widzenia
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Płatność nie może być wykonana za pusty koszyk
 DocType: Item,Sales Details,Szczegóły sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Przypinanie
 DocType: Opportunity,With Items,Z przedmiotami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,
 DocType: Notification Control,Expense Claim Rejected,Zwrot wydatku odrzucony
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Dzień, w którym będą generowane następne faktury. Generowanie wykonywane jest na żądanie."
 DocType: Item Attribute,Item Attribute,Element Atrybut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Rząd
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Warianty artykuł
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Rząd
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Warianty artykuł
 DocType: Company,Services,Usługi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Razem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Razem ({0})
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
 DocType: Sales Invoice,Source,Źródło
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data początku roku finansowego
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data początku roku finansowego
 DocType: Employee External Work History,Total Experience,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Pogłębianie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Material Request Item,Sales Order No,Nr Zlecenia Sprzedaży
 DocType: Item Group,Item Group Name,
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Wzięty
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiały transferowe dla Produkcja
 DocType: Pricing Rule,For Price List,Dla Listy Cen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Szukanie wykonawcze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Kurs kupna dla pozycji: {0} nie znaleziono, która jest wymagana do rezerwacji zapisów księgowych (koszty). Powołaj się na rzecz cena przed cennika skupu."
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatkowa kwota rabatu (waluta firmy)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Błąd: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Błąd: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,
 DocType: Maintenance Visit,Maintenance Visit,Wizyta Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Klient >  Grupa klientów > Terytorium
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostępne w Warehouse partii Ilość
 DocType: Time Log Batch Detail,Time Log Batch Detail,
-DocType: Workflow State,Tasks,Zadania
 DocType: Landed Cost Voucher,Landed Cost Help,Ugruntowany Koszt Pomocy
-DocType: Event,Tuesday,Wtorek
 DocType: Leave Block List,Block Holidays on important days.,Blok Wakacje na ważne dni.
 ,Accounts Receivable Summary,Należności Podsumowanie
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Pozostawia dla typu {0} już przydzielonego Pracodawcy dla {1} {2} okresu - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
 DocType: UOM,UOM Name,Nazwa Jednostki Miary
-DocType: Top Bar Item,Target,
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Kwota udziału
 DocType: Sales Invoice,Shipping Address,Adres dostawy
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,To narzędzie pomaga uaktualnić lub ustalić ilość i wycenę akcji w systemie. To jest zwykle używany do synchronizacji wartości systemowych i co rzeczywiście istnieje w magazynach.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,
-DocType: ToDo,Due Date,Termin
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transporterów
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Pudło
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacja
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Pudło
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacja
 DocType: Monthly Distribution,Monthly Distribution,Miesięczny Dystrybucja
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista odbiorców jest pusta. Proszę stworzyć Listę Odbiorców
 DocType: Production Plan Sales Order,Production Plan Sales Order,Zamówienie sprzedaży plany produkcji
 DocType: Sales Partner,Sales Partner Target,
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Wejście księgowe dla {0} może być dokonywane wyłącznie w walucie: {1}
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Nacinania
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiał Wniosek o Zamówieniu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Konta bankowe
 ,Bank Reconciliation Statement,Stan uzgodnień z wyciągami z banku
 DocType: Address,Lead Name,Nazwa Tropu
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Saldo otwierające zapasy
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Saldo otwierające zapasy
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musi pojawić się tylko raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie wolno przesyłaj więcej niż {0} {1} przeciwko Zamówienia {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Brak Przedmiotów do pakowania
 DocType: Shipping Rule Condition,From Value,Od wartości
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Kwoty nie odzwierciedlone w banku
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Kwoty nie odzwierciedlone w banku
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Zwrot wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odlewanie odśrodkowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Wspomagane wykańczania pola magnetycznego
 DocType: Company,Default Holiday List,Domyślnie lista urlopowa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,
 DocType: Purchase Receipt,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 DocType: Production Planning Tool,Select Sales Orders,
 ,Material Requests for which Supplier Quotations are not created,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Oznacz jako Dostawa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Oznacz jako Dostawa
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Dodać Oferta
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,
 DocType: SMS Center,Receiver List,Lista odbiorców
@@ -1379,31 +1276,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobacz
 DocType: Salary Structure Deduction,Salary Structure Deduction,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektywne spiekanie laserowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Ilość nie może być większa niż {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Wiek (dni)
 DocType: Quotation Item,Quotation Item,Przedmiot Wyceny
 DocType: Account,Account Name,Nazwa konta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Data od - nie może być późniejsza niż Data do
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,
 DocType: Purchase Order Item,Supplier Part Number,Numer katalogowy dostawcy
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Dodaj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Wartością konwersji nie może być 0 ani 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} jest anulowane lub wstrzymane
 DocType: Accounts Settings,Credit Controller,
 DocType: Delivery Note,Vehicle Dispatch Date,Data wysłania pojazdu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Potwierdzenie Zakupu {0} nie zostało wysłane
 DocType: Company,Default Payable Account,Domyślnie konto płatności
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ustawienia dla internetowego koszyka, takie jak zasady żeglugi, cennika itp"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Konfiguracja zakończona
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% rozliczono
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Kadry
 DocType: Lead,Upper Income,
 DocType: Journal Entry Account,Debit in Company Currency,Debet w firmie Waluta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problemy
@@ -1412,12 +1305,9 @@
 DocType: Company,Default Values,Domyślne Wartości
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Wiersz {0}: kwota płatności nie może być ujemna
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Prasa montażu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
 DocType: Payment Reconciliation,Payments,Płatności
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prasowanie izostatyczne na gorąco
-DocType: ToDo,Medium,Średni
 DocType: Budget Detail,Budget Allocated,
 DocType: Journal Entry,Entry Type,Rodzaj wejścia
 ,Customer Credit Balance,Saldo kredytowe klienta
@@ -1426,12 +1316,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,
 DocType: Quotation,Term Details,Szczegóły warunków
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planowanie zdolności Do (dni)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
 DocType: Warranty Claim,Warranty Claim,Roszczenie gwarancyjne
 ,Lead Details,Dane Tropu
-DocType: Authorization Rule,Approving User,Użytkownik Zatwierdzający
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kucie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galwanizacja
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
 DocType: Pricing Rule,Applicable For,Stosowne dla
 DocType: Bank Reconciliation,From Date,Od daty
@@ -1453,64 +1340,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukcje Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukcje Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Jednostka produktu.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tworzenie Zapisów Księgowych dla każdej zmiany stanu Magazynu
 DocType: Leave Allocation,Total Leaves Allocated,
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazyn wymagany w wierszu nr {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Proszę wpisać poprawny rok obrotowy od daty rozpoczęcia i zakończenia
 DocType: Employee,Date Of Retirement,Data przejścia na emeryturę
 DocType: Upload Attendance,Get Template,Pobierz szablon
 DocType: Address,Postal,Pocztowy
 DocType: Item,Weightage,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Górnictwo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Odlewy z żywicy
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy  
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grupa Odbiorców posiada taką nazwę - wprowadź inną nazwę Odbiorcy lub zmień nazwę Grupy
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Proszę najpierw wybrać {0}.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},tekst {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},tekst {0}
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
 DocType: Stock Entry,Material Receipt,Przyjęcie materiałów
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkty
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Strona Typ i Partia jest wymagany do otrzymania / rachunku Płatne {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp"
 DocType: Lead,Next Contact By,
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazyn {0} nie może zostać usunięty ponieważ istnieje wartość dla przedmiotu {1}
 DocType: Quotation,Order Type,Typ zamówienia
 DocType: Purchase Invoice,Notification Email Address,
 DocType: Payment Tool,Find Invoices to Match,Znajdź pasujące faktury
 ,Item-wise Sales Register,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","np ""XYZ Narodowy Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Łączna docelowa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Łączna docelowa
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Koszyk jest włączony
 DocType: Job Applicant,Applicant for a Job,Aplikant do Pracy
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Sales Invoice Item,Batch No,Nr Partii
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Główny
-DocType: DocPerm,Delete,Usuń
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Wariant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nowy rekord {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,
 DocType: SMS Center,Send To,
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},
+DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
 DocType: Sales Team,Contribution to Net Total,
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
@@ -1519,53 +1404,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Aplikant do Pracy.
 DocType: Purchase Order Item,Warehouse and Reference,Magazyn i punkt odniesienia
 DocType: Supplier,Statutory info and other general information about your Supplier,
-DocType: Country,Country,Kraj
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-DocType: Communication,Received,Otrzymano
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Zduplikowany Nr Seryjny wprowadzony dla przedmiotu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Warunkiem art wysyłka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkt nie może mieć produkcja na zamówienie.
-DocType: DocField,Attach Image,Dołącz obrazek
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),
-DocType: Stock Reconciliation Item,Leave blank if no change,Zostaw puste jeśli nie zaszły żadne zmiany
 DocType: Sales Order,To Deliver and Bill,Do dostarczenia i Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Czas Logi do produkcji.
 DocType: Item,Apply Warehouse-wise Reorder Level,Zastosuj Warehouse-mądry Reorder Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Płatność
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Płatność
 DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},
 DocType: Employee,Salutation,
-DocType: Communication,Rejected,Odrzucono
 DocType: Pricing Rule,Brand,Marka
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,
 DocType: Sales Order Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
 DocType: Quality Inspection Reading,Reading 10,Odczyt 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary. "
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary."
 DocType: Hub Settings,Hub Node,Hub Węzeł
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Wartość {0} do {1} atrybutów nie istnieje na liście ważnej pozycji wartości atrybutów
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Upłynął
 DocType: Packing Slip,To Package No.,
-DocType: DocType,System,
 DocType: Warranty Claim,Issue Date,
 DocType: Activity Cost,Activity Cost,Aktywny Koszt
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Skonsumowana ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 DocType: Payment Tool,Make Payment Entry,
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
 ,Sales Invoice Trends,
 DocType: Leave Application,Apply / Approve Leaves,Zastosuj / Zatwierdź liście
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Dla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',
 DocType: Sales Order Item,Delivery Warehouse,Magazyn Dostawa
 DocType: Stock Settings,Allowance Percent,Dopuszczalny procent
@@ -1577,33 +1457,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Sprzedaż musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strzyżenie
 DocType: Item,Has Variants,Ma Warianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakowania i etykietowania
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Sprecyzuj domyślną walutę w ustawieniach firmy i globalnych
-DocType: Dropbox Backup,Dropbox Access Secret,Sekret do Dostępu do Dropboxa
 DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Zarządzanie projektami
 DocType: Supplier,Supplier of Goods or Services.,Dostawca towarów lub usług.
 DocType: Budget Detail,Fiscal Year,Rok Podatkowy
 DocType: Cost Center,Budget,Budżet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budżet nie może być przypisany przed {0}, ponieważ nie jest to konto przychodów lub kosztów"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Osiągnięte
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Osiągnięte
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,
 DocType: Item,Is Sales Item,Jest pozycją sprzedawalną
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Drzewo kategorii
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,
 DocType: Maintenance Visit,Maintenance Time,Czas Konserwacji
 ,Amount to Deliver,Kwota do Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt lub usługa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Dotykając
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Produkt lub usługa
 DocType: Naming Series,Current Value,Bieżąca Wartość
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} utworzone
 DocType: Delivery Note Item,Against Sales Order,Na podstawie zamówienia sprzedaży
@@ -1618,15 +1493,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
 DocType: Website Item Group,Website Item Group,Grupa przedmiotów strony WWW
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Podatki i cła
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela dla pozycji, które zostaną pokazane w Witrynie"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
 DocType: Material Request Item,Material Request Item,
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,
 ,Item-wise Purchase History,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Czerwony
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Czerwony
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
@@ -1636,12 +1511,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Wiersz # {0}: {1} operacja nie zostanie zakończona do {2} Ilość wyrobów gotowych w produkcji Zamówienie # {3}. Proszę zaktualizować stan pracy za pomocą Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,
 DocType: Issue,Resolution Details,
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Zmień jednostkę miary dla produktu
 DocType: Quality Inspection Reading,Acceptance Criteria,Kryteria akceptacji
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},
 DocType: Item Group,Show In Website,Pokaż na stronie internetowej
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupa
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupa
 DocType: Task,Expected Time (in hours),Oczekiwany czas (w godzinach)
 ,Qty to Order,Ilość do zamówienia
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Aby śledzić markę w następujących dokumentach dostawy Uwaga, Opportunity, materiał: Zapytanie, poz, Zamówienia, zakupu bonu Zamawiającego odbioru, Notowania, faktury sprzedaży, Bundle wyrobów, zlecenia sprzedaży, nr seryjny"
@@ -1650,78 +1524,67 @@
 DocType: Holiday List,Clear Table,Wyczyść tabelę
 DocType: Features Setup,Brands,Marki
 DocType: C-Form Invoice Detail,Invoice No,Nr faktury
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od Zamówienia Kupna
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od Zamówienia Kupna
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów
 ,Customer Addresses And Contacts,
 DocType: Employee,Resignation Letter Date,
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Brak Ustawień
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Czekaj cierpliwie, system jest konfigurowany. To zajmie zaledwie kilka chwil."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Para
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Para
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
 DocType: Item,Has Batch No,Posada numer partii (batch)
 DocType: Delivery Note,Excise Page Number,Akcyza numeru strony
 DocType: Employee,Personal Details,Dane Osobowe
 ,Maintenance Schedules,Plany Konserwacji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Tłoczenie
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debet na konto musi być rachunkiem otrzymującym
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",
 DocType: Shipping Rule Condition,Shipping Amount,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Łączący
-DocType: Authorization Rule,Above Value,Wartość Powyżej
 ,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
 DocType: Purchase Order,Delivered,Dostarczono
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Liczba przyznanych liście {0} nie może być mniejsza niż już zatwierdzonych liści {1} w okresie
 DocType: Journal Entry,Accounts Receivable,Należności
 ,Supplier-Wise Sales Analytics,
 DocType: Address Template,This format is used if country specific format is not found,"Format ten jest używany, jeśli Format danego kraju nie znaleziono"
-DocType: Custom Field,Custom,Niestandardowy
 DocType: Production Order,Use Multi-Level BOM,Używaj wielopoziomowych zestawień materiałowych
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Formowanie wtryskowe
 DocType: Bank Reconciliation,Include Reconciled Entries,Dołącz uzgodnione wpisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Rejestr operacji gospodarczych.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Zostaw puste jeśli jest to rozważane dla wszystkich typów pracowników
 DocType: Landed Cost Voucher,Distribute Charges Based On,Rozpowszechnianie opłat na podstawie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,
 DocType: HR Settings,HR Settings,Ustawienia HR
-apps/frappe/frappe/config/setup.py +130,Printing,Druk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Zwrot Kosztów jest w oczekiwaniu na potwierdzenie. Tylko osoba zatwierdzająca wydatki może uaktualnić status.
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,i
 DocType: Leave Block List Allow,Leave Block List Allow,
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Razem Rzeczywisty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,szt.
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,szt.
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Sprecyzuj Firmę
 ,Customer Acquisition and Loyalty,
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazyn w którym zarządzasz odrzuconymi przedmiotami
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Zakończenie roku podatkowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Zakończenie roku podatkowego
 DocType: POS Profile,Price List,Cennik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} jest teraz domyślnym rokiem finansowym. Odśwież swoją przeglądarkę aby zmiana weszła w życie
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
-DocType: Authorization Rule,Approving Role,
 ,BOM Search,BOM Szukaj
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Proszę określić walutę w Spółce
 DocType: Workstation,Wages per hour,Zarobki na godzinę
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowy. Waluta konto musi być {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Niniejszy materiał Wnioski zostały podniesione automatycznie na podstawie poziomu ponownego zamówienia elementu
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowy. Waluta konto musi być {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},
 DocType: Salary Slip,Deduction,Odliczenie
 DocType: Address Template,Address Template,Szablon Adresu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Proszę podać ID pracownika tej osoby ze sprzedaży
@@ -1733,76 +1596,68 @@
 DocType: Opportunity,Quotation,Wycena
 DocType: Salary Slip,Total Deduction,
 DocType: Quotation,Maintenance User,Użytkownik Konserwacji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Koszt Zaktualizowano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Koszt Zaktualizowano
 DocType: Employee,Date of Birth,Data urodzenia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL na przywiązanie {0}
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis Pracy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis Pracy
 DocType: Purchase Order Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Proszę wybrać poprawny plik .csv z danymi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Powłoka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
 ,SO Qty,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Zbiory występować przeciwko wpisy magazynu {0}, a więc nie można ponownie przypisać lub zmienić Warehouse"
 DocType: Appraisal,Calculate Total Score,Oblicz całkowity wynik
 DocType: Supplier Quotation,Manufacturing Manager,Kierownik Produkcji
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,
-apps/erpnext/erpnext/hooks.py +84,Shipments,Przesyłki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Odlewnictwo DIP
-DocType: Purchase Order,To be delivered to customer,Być dostarczone do klienta
+apps/erpnext/erpnext/hooks.py +68,Shipments,Przesyłki
+DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Czas Zaloguj status musi być złożony.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Numer seryjny: {0} nie należy do żadnej Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurowanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Wiersz #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Wiersz #
 DocType: Purchase Invoice,In Words (Company Currency),
 DocType: Pricing Rule,Supplier,Dostawca
 DocType: C-Form,Quarter,Kwartał
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Pozostałe drobne wydatki
 DocType: Global Defaults,Default Company,Domyślna Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Wydatek albo różnica w koncie jest obowiązkowa dla przedmiotu {0} jako że ma wpływ na końcową wartość zapasów
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nie można overbill dla pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżonych cen, należy ustawić w Ustawieniach stockowe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nie można overbill dla pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżonych cen, należy ustawić w Ustawieniach stockowe"
 DocType: Employee,Bank Name,Nazwa banku
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Powyżej
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Użytkownik {0} jest wyłączony
 DocType: Leave Application,Total Leave Days,
-DocType: Journal Entry Account,Credit in Account Currency,Kredyt w walucie rachunku
 DocType: Email Digest,Note: Email will not be sent to disabled users,
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Wybierz firmą ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Currency Exchange,From Currency,Od Waluty
-DocType: DocField,Name,Imię
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Kwoty nie odzwierciedlone w systemie
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Proszę wybrać Przyznana kwota, faktury i faktury Rodzaj numer w conajmniej jednym rzędzie"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Zlecenie Sprzedaży jest wymagane dla Elementu {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Kwoty nie odzwierciedlone w systemie
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Inni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Inni
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Zakończono
-DocType: Web Form,Select DocType,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Przeciągarki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankowość
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nowe Centrum Kosztów
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nowe Centrum Kosztów
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
 DocType: Quality Inspection,In Process,
 DocType: Authorization Rule,Itemwise Discount,
 DocType: Purchase Order Item,Reference Document Type,Oznaczenie typu dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inwentaryzacja w odcinkach
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inwentaryzacja w odcinkach
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
 DocType: Time Log Batch,Total Billing Amount,Łączna kwota płatności
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Konto Należności
@@ -1810,19 +1665,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Płatności do zamówienia sprzedaży
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Czas Logi utworzone:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Item,Weight UOM,Waga jednostkowa
 DocType: Employee,Blood Group,Grupa Krwi
 DocType: Purchase Invoice Item,Page Break,Znak końca strony
 DocType: Production Order Operation,Pending,W toku
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Użytkownicy którzy mogą zatwierdzić wnioski o urlop konkretnych użytkowników
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nie można zmienić domyślnej UOM wariantu. Aby zmienić domyślny Jednostka miary dla wariantu zmiany domyślnej UOM szablonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Urządzenie Biura
 DocType: Purchase Invoice Item,Qty,Ilość
 DocType: Fiscal Year,Companies,Firmy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Wywołaj Prośbę Materiałową, gdy stan osiągnie próg ponowienia zlecenia"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od Planu Konserwacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na cały etet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na cały etet
 DocType: Purchase Invoice,Contact Details,Szczegóły kontaktu
 DocType: C-Form,Received Date,Data Otrzymania
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jeśli utworzono standardowy szablon w podatku od sprzedaży i Prowizji szablonu, wybierz jedną i kliknij na przycisk poniżej."
@@ -1834,14 +1689,15 @@
 DocType: Job Applicant,Job Opening,
 DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia
 DocType: Offer Letter,Offer Letter,Oferta List
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Razem zafakturowane Amt
 DocType: Time Log,To Time,
+DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit To account must be a Payable account
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Cennik {0} jest wyłączony
@@ -1851,12 +1707,10 @@
 DocType: Item,Customer Item Codes,Kody Pozycja klienta
 DocType: Opportunity,Lost Reason,
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Utwórz zapisy płatności dla Zamówień lub Faktur.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Spawanie
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Wymagana jest nowa jednostka miary stanu
 DocType: Quality Inspection,Sample Size,Wielkość próby
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
 DocType: Features Setup,Item Serial Nos,
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
@@ -1866,15 +1720,13 @@
 DocType: Bin,Actual Quantity,Rzeczywista Ilość
 DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numer seryjny: {0} Nie znaleziono
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Twoi Klienci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formowanie tłoczne
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Twoi Klienci
 DocType: Leave Block List Date,Block Date,
 DocType: Sales Order,Not Delivered,Nie dostarczony
 ,Bank Clearance Summary,
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Rzecz kod> Pozycja Grupy> Marka
 DocType: Appraisal Goal,Appraisal Goal,Cel oceny
-DocType: Event,Friday,Piątek
 DocType: Time Log,Costing Amount,Kwota zestawienia kosztów
 DocType: Process Payroll,Submit Salary Slip,
 DocType: Salary Structure,Monthly Earning & Deduction,
@@ -1882,16 +1734,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Masowego importu
 DocType: Sales Partner,Address & Contacts,Adresy i kontakty
 DocType: SMS Log,Sender Name,
-DocType: Page,Title,
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Dostosuj
 DocType: POS Profile,[Select],[Wybierz]
 DocType: SMS Log,Sent To,Wysłane Do
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Nowa faktura sprzedaży
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Nieprawidłowy {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Nieprawidłowy {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Kwota Zaliczki
 DocType: Manufacturing Settings,Capacity Planning,Planowanie zdolności
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Pole 'Od daty' jest wymagane
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Pole 'Od daty' jest wymagane
 DocType: Journal Entry,Reference Number,Numer Odniesienia
 DocType: Employee,Employment Details,Szczegóły zatrudnienia
 DocType: Employee,New Workplace,Nowe Miejsce Pracy
@@ -1906,7 +1756,7 @@
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Podróż
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Podróż
 DocType: Leave Block List,Allow Users,
 DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
 DocType: Sales Invoice,Recurring,Powtarzający się
@@ -1914,23 +1764,21 @@
 DocType: Rename Tool,Rename Tool,Zmień nazwę narzędzia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
 DocType: Installation Note,Installation Note,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Definiowanie podatków
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Definiowanie podatków
 ,Financial Analytics,Analityka finansowa
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 DocType: Address,Subsidiary,
-apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę "
+apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę"
 DocType: Quality Inspection,Purchase Receipt No,Nr Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
-DocType: System Settings,In Hours,
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Oczekiwane saldo wg banków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Polerowanie
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Oczekiwane saldo wg banków
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Pasywa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
 DocType: Appraisal,Employee,Pracownik
@@ -1943,15 +1791,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupuj według Podstawy księgowania
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane dniu
 DocType: Sales Invoice,Mass Mailing,
-DocType: Page,Standard,
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Pokaż Płatności
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Rozmiar
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutyczny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Selling Settings,Sales Order Required,
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Utwórz klienta
@@ -1961,30 +1807,25 @@
 DocType: Quality Inspection Reading,Reading 9,Odczyt 9
 DocType: Supplier,Is Frozen,Jest Zamrożony
 DocType: Buying Settings,Buying Settings,Ustawienia Kupna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Msza wykończenie
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,
 DocType: Upload Attendance,Attendance To Date,
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Tool,Payment Account,Konto Płatność
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Wersja robocza
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,
 DocType: Quality Inspection Reading,Accepted,Przyjęte
-DocType: User,Female,Kobieta
-DocType: Journal Entry Account,Debit in Account Currency,Polecenie zapłaty w walucie rachunku
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Upewnij się, że na pewno chcesz usunąć wszystkie transakcje dla tej firmy. Twoje dane podstawowe pozostanie tak jak jest. Ta akcja nie można cofnąć."
-DocType: Print Settings,Modern,Nowoczesny
-DocType: Communication,Replied,
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Nieprawidłowy odniesienia {0} {1}
 DocType: Payment Tool,Total Payment Amount,Całkowita kwota płatności
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nie może być większa niż zaplanowana ilość ({2}) w Zleceniu Produkcyjnym {3}
 DocType: Shipping Rule,Shipping Rule Label,
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surowce nie może być puste.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Surowce nie może być puste.
 DocType: Newsletter,Test,
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Jak są istniejące transakcji giełdowych dla tej pozycji, \ nie można zmienić wartości &quot;Czy numer seryjny&quot;, &quot;Czy Batch Nie &#39;,&#39; Czy Pozycja Zdjęcie&quot; i &quot;Metoda wyceny&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Szybkie Księgowanie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
 DocType: Stock Entry,For Quantity,Dla Ilości
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},
@@ -1992,17 +1833,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,
 DocType: Purchase Invoice,Terms and Conditions1,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Pełna konfiguracja
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Biuletyn Mailing List
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
+DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
 DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Razem Nieobecny
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Jednostka miary
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Jednostka miary
 DocType: Fiscal Year,Year End Date,Data końca roku
 DocType: Task Depends On,Task Depends On,Zadanie Zależy od
 DocType: Lead,Opportunity,Oferta
@@ -2023,16 +1864,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Stawki podstawowej (zgodnie Stock UOM)
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
 DocType: Campaign,Campaign-.####,Kampania-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Dystrybutor strona trzecia / handlowiec / prowizji agenta / partner / sprzedawcę, który sprzedaje produkty firm z tytułu prowizji."
 DocType: Customer Group,Has Child Node,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Wpisz parametry statycznego URL tutaj (np. nadawca=ERPNext, nazwa użytkownika=ERPNext, hasło=1234 itd.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie w każdym aktywnym roku podatkowego. Aby uzyskać więcej informacji sprawdź {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starzenie Zakres 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Obróbka fotochemiczna
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1914,9 @@
  8. Wprowadź Row: Jeśli na podstawie ""Razem poprzedniego wiersza"" można wybrać numer wiersza, które będą brane jako baza do tego obliczenia (domyślnie jest to poprzednia wiersz).
  9. Zastanów podatek lub opłatę za: W tej sekcji można określić, czy podatek / opłata jest tylko dla wyceny (nie jest częścią całości) lub tylko dla całości (nie dodaje wartości do elementu) lub oba.
  10. Dodać lub odjąć: Czy chcesz dodać lub odjąć podatek."
-DocType: Note,Note,Notatka
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
-DocType: Email Account,Email Ids,E-mail identyfikatory
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
 DocType: Global Defaults,Hide Currency Symbol,Ukryj symbol walutowy
@@ -2086,40 +1924,36 @@
 DocType: Journal Entry,Credit Note,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Zakończono Ilość nie może zawierać więcej niż {0} do pracy {1}
 DocType: Features Setup,Quality,Jakość
-DocType: Contact Us Settings,Introduction,
 DocType: Warranty Claim,Service Address,
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 wierszy dla Stock Pojednania.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 wierszy dla Stock Pojednania.
 DocType: Stock Entry,Manufacture,Produkcja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Proszę dostawy Uwaga pierwsza
 DocType: Purchase Invoice,Currency and Price List,Waluta i cennik
 DocType: Opportunity,Customer / Lead Name,Nazwa Klienta / Tropu
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produkcja
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produkcja
 DocType: Item,Allow Production Order,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,
 DocType: Salary Structure,Total Earning,
 DocType: Purchase Receipt,Time at which materials were received,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,lub
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Wydatki na usługi komunalne
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ponad
 DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
-,Download Backups,Pobierz Kopie zapasowe
 DocType: Notification Control,Sales Order Message,Informacje Zlecenia Sprzedaży
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ płatności
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
 DocType: Bank Reconciliation,To Date,Do daty
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Szczegóły
 DocType: Purchase Invoice,Total Taxes and Charges,
 DocType: Employee,Emergency Contact,Kontakt na wypadek nieszczęśliwych wypadków
 DocType: Item,Quality Parameters,Parametry jakościowe
@@ -2134,6 +1968,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,
 DocType: Product Bundle,Parent Item,Element nadrzędny
 DocType: Account,Account Type,Typ konta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Zostaw typu {0} nie może być przenoszenie przekazywane
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
@@ -2141,34 +1976,28 @@
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cięcie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Spłaszczenie
 DocType: Account,Income Account,Konto przychodów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Odlewanie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centrum kosztów
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Bon #
-DocType: Notification Control,Purchase Order Message,"Wiadomość Zamówienia Kupna
-"
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bon #
+DocType: Notification Control,Purchase Order Message,Wiadomość Zamówienia Kupna
 DocType: Tax Rule,Shipping Country,Wysyłka Kraj
 DocType: Upload Attendance,Upload HTML,Wyślij HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Suma zaliczki ({0}) przeciwko Zakonu {1} nie może być większa niż Wielkie \
  Razem ({2})"
 DocType: Employee,Relieving Date,Data zwolnienia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu
 DocType: Employee Education,Class / Percentage,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Podatek dochodowy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser zaprojektowany na kształtowanie siatki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Podatek dochodowy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jeśli wybrana reguła Wycena jest dla 'Cena' spowoduje zastąpienie cennik. Zasada jest cena Wycena ostateczna cena, więc dalsze zniżki powinny być stosowane. W związku z tym, w transakcjach takich jak zlecenia sprzedaży, zamówienia itp, będzie pobrana w polu ""stopa"", a nie polu ""Cennik stopa""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,
 DocType: Item Supplier,Item Supplier,Dostawca
@@ -2176,10 +2005,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nazwa nowego Centrum Kosztów
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nie znaleziono adresu domyślnego szablonu. Proszę utworzyć nowy Setup> Druk i Branding> Szablon adresowej.
 DocType: Appraisal,HR User,Kadry - użytkownik
@@ -2191,31 +2019,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Bardzo Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Bardzo Duży
 ,Profit and Loss Statement,Rachunek zysków i strat
 DocType: Bank Reconciliation Detail,Cheque Number,Numer czeku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Naciśnięcie
 DocType: Payment Tool Detail,Payment Tool Detail,Szczegóły Narzędzia Płatności
 ,Sales Browser,
 DocType: Journal Entry,Total Credit,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Duży
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nie znaleziono pracowników!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Duży
 DocType: C-Form Invoice Detail,Territory,Terytorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,
 DocType: Purchase Order,Customer Address Display,Adres klienta Wyświetlacz
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polerowanie
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Domyślnie Jednostka miary dla pozycji {0} nie może być zmieniony bezpośrednio, ponieważ \ masz już jakąś transakcję (y) z innym UOM. Aby zmienić domyślny UOM, \ stosowanie &quot;Jednostka miary&quot; Utility wymienić narzędzie pod modułem Seryjna."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Wycena {0} jest anulowana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Wycena {0} jest anulowana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pracownik {0} był na zwolnieniu {1}. Nie można zaznaczyć obecności.
 DocType: Sales Partner,Targets,Cele
@@ -2223,14 +2045,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
 ,S.O. No.,
 DocType: Production Order Operation,Make Time Log,Dodać do czasu Zaloguj
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Proszę ustawić ilość zmienić kolejność
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Komputery
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Szlif elektrochemikaliów
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Należy ustalić własny Plan Kont zanim rozpocznie się księgowanie
-DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Reguły Cen
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anulowano
+DocType: Purchase Invoice,Ignore Pricing Rule,Ignoruj Reguły Cen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od tej pory w strukturze wynagrodzeń nie może być mniejsza niż Pracowniczych Łączenie Data.
 DocType: Employee Education,Graduate,Absolwent
 DocType: Leave Block List,Block Days,
@@ -2267,7 +2088,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,
 DocType: Packing Slip,If more than one package of the same type (for print),
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,
 DocType: C-Form Invoice Detail,Net Total,Łączna wartość netto
 DocType: Bin,FCFS Rate,
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fakturowanie (faktury sprzedaży)
@@ -2284,20 +2104,19 @@
 DocType: Maintenance Visit,Purposes,Cele
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Conajmniej jedna pozycja powinna być wpisana w ilości negatywnej w dokumencie powrotnej
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacja {0} dłużej niż wszelkie dostępne w godzinach pracy stacji roboczej {1}, rozbić na kilka operacji operacji"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Obróbka elektrochemiczna
 ,Requested,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Brak Uwag
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zaległy
 DocType: Account,Stock Received But Not Billed,"Przyjęte na stan, nie zapłacone (zobowiązanie)"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Konto root musi być grupą
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Features Setup,Sales and Purchase,
 DocType: Supplier Quotation Item,Material Request No,
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} została pomyślnie wypisany z listy.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Cena netto (Spółka Waluta)
-apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,
 DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
@@ -2311,11 +2130,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Rok podatkowy {0} nie został znaleziony.
 DocType: Bank Reconciliation,Get Relevant Entries,Pobierz odpowiednie pozycje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Zapis księgowy dla zapasów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,
 DocType: Sales Invoice,Customer Address,Adres klienta
-apps/frappe/frappe/desk/query_report.py +136,Total,
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
 DocType: Account,Root Type,
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Wiersz # {0}: Nie można wrócić więcej niż {1} dla pozycji {2}
@@ -2325,14 +2142,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Kwota podatku po uwzględnieniu rabatu (waluta firmy)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},
 DocType: Quality Inspection,Quality Inspection,Kontrola jakości
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formowania
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL albo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalny poziom zapasów
 DocType: Stock Entry,Subcontract,Zlecenie
@@ -2343,42 +2159,39 @@
 DocType: Item,Manufacturer Part Number,Numer katalogowy producenta
 DocType: Production Order Operation,Estimated Time and Cost,Szacowany czas i koszt
 DocType: Bin,Bin,Kosz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Noski
 DocType: SMS Log,No of Sent SMS,Numer wysłanego Sms
 DocType: Account,Company,Firma
 DocType: Account,Expense Account,Konto Wydatków
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Oprogramowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Kolor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Oprogramowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Kolor
 DocType: Maintenance Visit,Scheduled,Zaplanowane
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Proszę wybrać produkt, gdzie &quot;Czy Pozycja Zdjęcie&quot; brzmi &quot;Nie&quot; i &quot;Czy Sales Item&quot; brzmi &quot;Tak&quot;, a nie ma innego Bundle wyrobów"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Wybierz dystrybucji miesięcznej się nierównomiernie rozprowadzić cele całej miesięcy.
 DocType: Purchase Invoice Item,Valuation Rate,Wskaźnik wyceny
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Pozycja Wiersz {0}: Zakup Otrzymanie {1} nie istnieje w tabeli powyżej Zakup kwitów ''
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3} 
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
 DocType: Installation Note Item,Against Document No,
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Zarządzaj sprzedaży Partnerzy.
 DocType: Quality Inspection,Inspection Type,Typ kontroli
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Proszę wybrać {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizacja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,
 DocType: Purchase Order Item,Returned Qty,Wrócił szt
 DocType: Employee,Exit,Wyjście
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Wykańczanie wibracyjne
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy"
 DocType: Employee,You can enter any date manually,Możesz wprowadzić jakąkolwiek datę ręcznie
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Okres próbny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Okres próbny
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,
@@ -2386,43 +2199,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Aby DateTime
 DocType: SMS Settings,SMS Gateway URL,
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Szlifowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Pakowania w folię termokurczliwą
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Oczekujące Inne
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potwierdzone
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dostawca> Typ dostawcy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Wytapianie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Attendance,Attendance Date,
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
 DocType: Address,Preferred Shipping Address,
 DocType: Purchase Receipt Item,Accepted Warehouse,Przyjęty Magazyn
 DocType: Bank Reconciliation Detail,Posting Date,Data publikacji
 DocType: Item,Valuation Method,Metoda wyceny
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nie można znaleźć kurs wymiany dla {0} {1}
 DocType: Sales Invoice,Sales Team,
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Wpis zduplikowany
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Wpis zduplikowany
 DocType: Serial No,Under Warranty,Pod Gwarancją
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Błąd]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,
 ,Employee Birthday,Data urodzenia pracownika
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,
 DocType: Pricing Rule,Discount Percentage,Procent zniżki
 DocType: Payment Reconciliation Invoice,Invoice Number,Numer faktury
-apps/erpnext/erpnext/hooks.py +70,Orders,Zamówienia
+apps/erpnext/erpnext/hooks.py +54,Orders,Zamówienia
 DocType: Leave Control Panel,Employee Type,Typ pracownika
 DocType: Employee Leave Approver,Leave Approver,Zatwierdzający Urlop
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Kucie
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiał Przeniesione dla Produkcja
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Użytkownik z ""Koszty zatwierdzająca"" roli"
 ,Issued Items Against Production Order,
@@ -2434,7 +2244,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Spadek wartości
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Nieprawidłowy okres
 DocType: Customer,Credit Limit,
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Wybierz rodzaj transakcji
 DocType: GL Entry,Voucher No,Nr Podstawy księgowania
@@ -2444,11 +2253,10 @@
 DocType: Customer,Address and Contact,Adres i Kontakt
 DocType: Customer,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Employee,Feedback,Informacja zwrotna
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Urlopu nie może być przyznane przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Harmonogram
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Obróbka strumieniowa ścierne
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Harmonogram
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
-DocType: Website Settings,Website Settings,Ustawienia strony internetowej
 DocType: Item,Reorder level based on Warehouse,Zmiana kolejności w oparciu o poziom Magazynu
 DocType: Activity Cost,Billing Rate,Kursy rozliczeniowe
 ,Qty to Deliver,Ilość do dostarczenia
@@ -2459,20 +2267,19 @@
 DocType: Material Request,Requested For,
 DocType: Quotation Item,Against Doctype,
 DocType: Delivery Note,Track this Delivery Note against any Project,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Pokaż zapisy stanu
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Odnośnik #{0} wpisano z datą {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Zarządzaj adresy
 DocType: Pricing Rule,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
 DocType: Journal Entry,User Remark,Spostrzeżenie Użytkownika
 DocType: Lead,Market Segment,
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zamknięcie (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zamknięcie (Dr)
 DocType: Contact,Passive,
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,
@@ -2488,10 +2295,9 @@
 ,Billed Amount,Ilość Rozliczenia
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Pobierz aktualizacje
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodaj kilka rekordów przykładowe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Dodaj kilka rekordów przykładowe
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Zarządzanie urlopami
-DocType: Event,Groups,Grupy
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta
 DocType: Sales Order,Fully Delivered,Całkowicie Dostarczono
 DocType: Lead,Lower Income,
@@ -2500,40 +2306,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Szybka pomoc
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},
 DocType: Features Setup,Sales Extras,
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budżet dla konta {1} z MPK {2} będzie przekroczony o {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} Budżet dla konta {1} z MPK {2} będzie przekroczony o {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 ,Stock Projected Qty,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Wartość albo Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
 ,Qty to Receive,Ilość do otrzymania
 DocType: Leave Block List,Leave Block List Allowed,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Współczynnik konwersji nie może być ułamkiem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Będzie go używać do logowania
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Będzie go używać do logowania
 DocType: Sales Partner,Retailer,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredyty na konto musi być kontem Bilans
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Typy wszystkich dostawców
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kredyt w rachunku bankowym
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Przeglądaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Pożyczki
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Bilans otwarcia Kapitału własnego
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nie można potwierdzić zwolnienia bo nie jesteś autoryzowany do zatwierdzania zwolnienia podczas Zablokowanych Dat
 DocType: Appraisal,Appraisal,Ocena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Pianka do odlewania Lost-
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Rysunek
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data jest powtórzona
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Upoważniony sygnatariusz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
 DocType: Hub Settings,Seller Email,Sprzedawca email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
 DocType: Workstation Working Hour,Start Time,Czas rozpoczęcia
@@ -2547,12 +2350,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta Spółki)
 DocType: BOM Operation,Hour Rate,Stawka godzinowa
 DocType: Stock Settings,Item Naming By,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z Wyceny
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z Wyceny
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},
 DocType: Production Order,Material Transferred for Manufacturing,Materiał Przeniesiony do Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} nie istnieje
 DocType: Purchase Receipt Item,Purchase Order Item No,Nr przedmiotu Zamówienia Kupna
-DocType: System Settings,System Settings,Ustawienia Systemowe
 DocType: Project,Project Type,Typ projektu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Wymagana jest ilość lub kwota docelowa
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Koszt różnych działań
@@ -2561,36 +2363,32 @@
 DocType: Purchase Invoice Item,PR Detail,
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 DocType: Serial No,Is Cancelled,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje Przesyłki
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje Przesyłki
 DocType: Journal Entry,Bill Date,Data Rachunku
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Nawet jeśli istnieje wiele przepisów dotyczących cen o najwyższym priorytecie, a następnie następujące priorytety wewnętrznej są stosowane:"
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
-DocType: Communication,Recipients,Adresaci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Przykręcenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Radełkowanie
 DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 DocType: Hub Settings,Publish Items to Hub,Publikowanie produkty do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Wartość ""od"" musi być mniejsza niż wartość w rzędzie {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Przelew
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Przelew
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Wybierz konto Bankowe
 DocType: Newsletter,Create and Send Newsletters,Utwórz i wyślij biuletyny
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Data od musi być przed datą do
 DocType: Sales Order,Recurring Order,Powtarzające się Zamówienie
 DocType: Company,Default Income Account,Domyślne konto przychodów
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa Klientów / Klient
 DocType: Item Group,Check this if you want to show in website,Zaznacz czy chcesz uwidocznić to na stronie WWW
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Zapraszamy do ERPNext
+,Welcome to ERPNext,Zapraszamy do ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Numer Szczegółu Bonu
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Trop do Wyceny
 DocType: Lead,From Customer,Od klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Połączenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Połączenia
 DocType: Project,Total Costing Amount (via Time Logs),Całkowita ilość Costing (przez Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
 ,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,
@@ -2598,13 +2396,10 @@
 DocType: Issue,Opening Date,Data Otwarcia
 DocType: Journal Entry,Remark,Uwaga
 DocType: Purchase Receipt Item,Rate and Amount,Stawka i Ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudny
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Zamówienia Sprzedaży
-DocType: Blog Category,Parent Website Route,Nadrzędna Trasa Strony WWW
 DocType: Sales Order,Not Billed,Nie zaksięgowany
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nie aktywny
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kwota Kosztu Voucheru
 DocType: Time Log,Batched for Billing,
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Rachunki od dostawców.
@@ -2612,20 +2407,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Wartość zniżki
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,np. VAT
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,np. VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gorący gaz formowania metali
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
 DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowa
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Idź do odpowiedniej grupy (zwykle źródło funduszy> Zobowiązania krótkoterminowe> Podatki i cła i utworzyć nowe konto (klikając na Dodaj Child) typu ""podatek"" i ustal stawkę podatku."
 ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Cięcie laserowe
-DocType: Event,Monday,Poniedziałek
 DocType: Journal Entry,Stock Entry,Zapis magazynowy
 DocType: Account,Payable,
 DocType: Salary Slip,Arrear Amount,
@@ -2638,7 +2430,6 @@
 DocType: Lead,Address Desc,Opis adresu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Conajmniej jeden sprzedaż lub zakup musi być wybrany
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
-DocType: Page,All,Wszystko
 DocType: Stock Entry Detail,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
 DocType: Employee,Confirmation Date,Data potwierdzenia
@@ -2646,9 +2437,8 @@
 DocType: Account,Sales User,Sprzedaż użytkownika
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,
 DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Zbiór
 DocType: Lead,Lead Owner,Właściciel Tropu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Magazyn jest wymagany
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Magazyn jest wymagany
 DocType: Employee,Marital Status,
 DocType: Stock Settings,Auto Material Request,
 DocType: Time Log,Will be updated when billed.,
@@ -2662,44 +2452,40 @@
 DocType: Territory,Territory Targets,
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nazwa firmy nie może być firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Nagłówki to wzorów druku
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Zaktualizuj Asortyment
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Dogładzenie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Zapis wszystkich komunikatów typu e-mail, telefon, czat, wizyty, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Powołaj zaokrąglić centrum kosztów w Spółce
 DocType: Purchase Invoice,Terms,Warunki
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Utwórz nowy
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Utwórz nowy
 DocType: Buying Settings,Purchase Order Required,Wymagane jest Zamówienia Kupna
 ,Item-wise Sales History,
 DocType: Expense Claim,Total Sanctioned Amount,
 ,Purchase Analytics,Analiza Zakupów
 DocType: Sales Invoice Item,Delivery Note Item,Przedmiot z dowodu dostawy
 DocType: Expense Claim,Task,Zadanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Golenie
 DocType: Purchase Taxes and Charges,Reference Row #,Rząd Odniesienia #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,
 ,Stock Ledger,Księga zapasów
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Cena: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Cena: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notatki
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Na początku wybierz węzeł grupy.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cel musi być jednym z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Wypełnij formularz i zapisz
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Ściągnij raport zawierający surowe dokumenty z najnowszym statusem zapasu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Społeczność Forum
 DocType: Leave Application,Leave Balance Before Application,Status Urlopu przed Wnioskiem
 DocType: SMS Center,Send SMS,
 DocType: Company,Default Letter Head,Domyślny nagłówek Listowy
 DocType: Time Log,Billable,Rozliczalny
-DocType: Authorization Rule,This will be used for setting rule in HR module,
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ilość do ponownego zamówienia
 DocType: Company,Stock Adjustment Account,
@@ -2711,12 +2497,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Szansa Utracona
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Pola zniżek będą dostępne w Zamówieniu Kupna, Potwierdzeniu Kupna, Fakturze Kupna"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nazwa nowego konta. Uwaga: Proszę nie tworzyć konta dla odbiorców i dostawców
-DocType: Report,Report Type,Typ raportu
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Wczytywanie
 DocType: BOM Replace Tool,BOM Replace Tool,
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Szablony Adresów na dany kraj
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Pokaż Podatek rozpad
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport danych
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',
@@ -2726,16 +2510,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
 DocType: Serial No,Out of AMC,
 DocType: Purchase Order Item,Material Request Detail No,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Trudno zwrotnym
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Stwórz Wizytę Konserwacji
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
 DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Uwaga: Jeżeli płatność nie posiada jakiegokolwiek odniesienia, należy ręcznie dokonać wpisu do dziennika."
 DocType: Item,Supplier Items,Dostawca przedmioty
 DocType: Opportunity,Opportunity Type,Typ szansy
@@ -2747,66 +2530,58 @@
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ustaw jako Rozwinąć
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Automatycznie wysyłać e-maile do kontaktów z transakcji Zgłaszanie.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Wiersz {0}: Taka ilość nie jest dostępna w magazynie {1} w {2} {3}. Dostępna liczba to: {4}, Przenieś: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pozycja 3
 DocType: Purchase Order,Customer Contact Email,Kontakt z klientem e-mail
-DocType: Event,Sunday,Niedziela
 DocType: Sales Team,Contribution (%),Udział (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Obowiązki
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Szablon
 DocType: Sales Person,Sales Person Name,
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj użytkowników
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Dodaj użytkowników
 DocType: Pricing Rule,Item Group,Kategoria
 DocType: Task,Actual Start Date (via Time Logs),Rzeczywista Data Rozpoczęcia (przez Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
 DocType: Item,Default BOM,Domyślny Wykaz Materiałów
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Time Log Batch,Total Hours,
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Wtrysk Metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od Dowodu Dostawy
 DocType: Time Log,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Wybierz swój kraj, strefę czasową i walutę"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Konto Kasa lub Bank jest wymagane dla tworzenia zapisów Płatności
 DocType: Purchase Invoice,Price List Exchange Rate,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Marynowanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Odlewy piaskowe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galwanotechnika
 DocType: Purchase Invoice Item,Rate,Stawka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,
 DocType: Newsletter,A Lead with this email id should exist,Sygnał z tym adresem e-mail powinien istnieć
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Podstawowy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transakcji giełdowych przed {0} są zamrożone
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Plan"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
 DocType: Salary Structure,Salary Structure,
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Stwardnienie Cena Zasada istnieje z samych kryteriów, proszę rozwiązać \
  konfliktu przez wyznaczenie priorytet. Cena Zasady: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Wydanie Materiał
 DocType: Material Request Item,For Warehouse,Dla magazynu
 DocType: Employee,Offer Date,Data oferty
 DocType: Hub Settings,Access Token,Dostęp Reklamowe
@@ -2815,45 +2590,37 @@
 DocType: Item,Is Fixed Asset Item,Jest stałą pozycją aktywów
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 DocType: Fiscal Year,Year Name,Nazwa roku
 DocType: Process Payroll,Process Payroll,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,
 DocType: Purchase Invoice Item,Image View,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Wykończenie i wykańczanie przemysłowe
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Od Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Wiercenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Regranulat
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
 DocType: Tax Rule,Shipping City,Wysyłka Miasto
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Pozycja ta jest Wariant {0} (szablonu). Atrybuty zostaną skopiowane z szablonu, chyba że ""Nie Kopiuj"" jest ustawiony"
 DocType: Account,Purchase User,Zakup użytkownika
 DocType: Notification Control,Customize the Notification,Dostosuj powiadomienie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kucie
-DocType: Web Page,Slideshow,
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
 DocType: Sales Invoice,Shipping Rule,
 DocType: Journal Entry,Print Heading,Nagłówek do druku
 DocType: Quotation,Maintenance Manager,Menager Konserwacji
-DocType: Workflow State,Search,Szukaj
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,Pole 'Dni od ostatniego zamówienia' musi być większe bądź równe zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lutowanie
 DocType: C-Form,Amended From,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surowiec
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Wymagana jest ilość lub kwota docelowa
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
@@ -2862,45 +2629,44 @@
 ,Produced,Wyprodukowany
 DocType: Item,Item Code for Suppliers,Rzecz kod dla dostawców
 DocType: Issue,Raised By (Email),Wywołany przez (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Ogólne
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Ogólne
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista głowy podatkowe (np podatku VAT, ceł itp powinny mieć unikatowe nazwy) i ich standardowe stawki. Spowoduje to utworzenie standardowego szablonu, który można edytować i dodać później."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista głowy podatkowe (np podatku VAT, ceł itp powinny mieć unikatowe nazwy) i ich standardowe stawki. Spowoduje to utworzenie standardowego szablonu, który można edytować i dodać później."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},
 DocType: Journal Entry,Bank Entry,Wpis Banku
 DocType: Authorization Rule,Applicable To (Designation),Stosowne dla (Nominacja)
-DocType: Blog Post,Blog Post,Wpis Blogu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupuj według
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Włącz/wyłącz waluty.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Wydatki pocztowe
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Purchase Order,The date on which recurring order will be stop,Data powracającym zamówienie zostanie zatrzymać
 DocType: Quality Inspection,Item Serial No,Nr seryjny
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musi być zmniejszona o {1} lub należy zwiększyć tolerancję nadmiaru
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Razem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Godzina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Godzina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Przenieść materiał do dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Przenieść materiał do dostawcy
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,
 DocType: Lead,Lead Type,Typ Tropu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Utwórz ofertę
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania liście na bloku Daty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
 DocType: Shipping Rule,Shipping Rule Conditions,
 DocType: BOM Replace Tool,The new BOM after replacement,
 DocType: Features Setup,Point of Sale,Punkt Sprzedaży (POS)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Podatek
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Wiersz {0}: {1} nie jest ważne {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Doskonalenie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Wiersz {0}: {1} nie jest ważne {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle produktu
 DocType: Production Planning Tool,Production Planning Tool,Narzędzie do planowania produkcji
 DocType: Quality Inspection,Report Date,Data raportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Tytuł Pracy
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} już przydzielone Pracodawcy dla {1} {2} okresu - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} - Odbiorcy
 DocType: Features Setup,Item Groups in Details,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
@@ -2909,33 +2675,29 @@
 DocType: Stock Entry,Update Rate and Availability,Aktualizacja Cena i dostępność
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,
 DocType: Pricing Rule,Customer Group,Grupa Klientów
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: Item,Website Description,Opis strony WWW
 DocType: Serial No,AMC Expiry Date,
 ,Sales Register,
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
 DocType: Address,Plant,Zakład
-DocType: DocType,Setup,Ustawienia
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Walcowanie na zimno
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
 DocType: Item,Attributes,Atrybuty
-DocType: Packing Slip,Get Items,Pobierz produkty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Pobierz produkty
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Proszę zdefiniować konto odpisów (strat)
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Data Ostatniego Zamówienia
-DocType: DocField,Image,Obrazek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
-DocType: Communication,Other,Inne
 DocType: C-Form,C-Form,
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operacji nie zostało ustawione
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
 DocType: Serial No,Creation Document Type,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Odwiedzić
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Odwiedzić
 DocType: Leave Type,Is Encash,
 DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego
 DocType: Payment Tool,Make Journal Entry,Dodać Journal Entry
@@ -2943,35 +2705,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komercyjny
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 DocType: Cost Center,Distribution Id,ID Dystrybucji
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Wszystkie produkty i usługi.
 DocType: Purchase Invoice,Supplier Address,Adres dostawcy
-DocType: Contact Us Settings,Address Line 2,Adres Linia 2
-DocType: ToDo,Reference,Odnośnik (np. identyfikator przelewu bankowego)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforowanie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Usługi finansowe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Wartość atrybutu {0} musi mieścić się w zakresie {1} do {2} w przyrostach {3}
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
 DocType: Leave Allocation,Unused leaves,Niewykorzystane urlopy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Kr
 DocType: Customer,Default Receivable Accounts,Domyślne konta należności
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Piłowanie
 DocType: Tax Rule,Billing State,Stan Billing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminowanie
 DocType: Item Reorder,Transfer,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spiekania
 DocType: Journal Entry,Pay To / Recd From,
 DocType: Naming Series,Setup Series,
 DocType: Supplier,Contact HTML,HTML kontaktu
@@ -2982,9 +2738,8 @@
 DocType: Company,Retail,
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Klient {0} nie istnieje
 DocType: Attendance,Absent,Nieobecny
-DocType: Product Bundle,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Pakiet produktów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Miażdżący
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
 DocType: Upload Attendance,Download Template,Ściągnij Szablon
 DocType: GL Entry,Remarks,Uwagi
@@ -2992,48 +2747,44 @@
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
 DocType: Features Setup,POS View,
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Odlewanie ciągłe
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj 
+apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Powyżej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Zimna rozmiaru
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Konto {0} nie może być Grupą (kontem dzielonym)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,
 DocType: Holiday List,Weekly Off,
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","np. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Wstępny Zysk / Strata (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Powrót Against faktury sprzedaży
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Pkt 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Proszę ustawić domyślną wartość {0} w Spółce {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Proszę ustawić domyślną wartość {0} w Spółce {1}
 DocType: Serial No,Creation Time,Czas utworzenia
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Łączne przychody
 DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Pomoc
 ,Monthly Attendance Sheet,
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nie znaleziono wyników
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Elementy z Bundle produktu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} jest nieaktywne
 DocType: GL Entry,Is Advance,
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,
 DocType: Sales Team,Contact No.,Numer Kontaktu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,Konto typu 'Zyski i Straty' ({0}) nie może być wpisem otwierającym rok
-DocType: Workflow State,Time,
 DocType: Features Setup,Sales Discounts,
 DocType: Hub Settings,Seller Country,Sprzedawca Kraj
 DocType: Authorization Rule,Authorization Rule,
 DocType: Sales Invoice,Terms and Conditions Details,Szczegóły regulaminu
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numer zlecenia
 DocType: Item Group,HTML / Banner that will show on the top of product list.,
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Określ warunki do obliczenia kwoty wysyłki
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rola dozwolone ustawić zamrożonych kont i Edytuj Mrożone wpisy
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Współczynnik konwersji jest wymagany
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Prowizja od sprzedaży
 DocType: Offer Letter Term,Value / Description,Wartość / Opis
@@ -3041,15 +2792,13 @@
 ,Customers Not Buying Since Long Time,Klient nie kupuje od dłuższego czasu
 DocType: Production Order,Expected Delivery Date,Spodziewana data odbioru przesyłki
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Wypukły
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Wzór odlewania parowanie-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Wydatki na reprezentację
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Wiek
 DocType: Time Log,Billing Amount,Kwota Rozliczenia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Wnioski o rezygnację
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Wydatki na obsługę prawną
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym zamówienie zostanie wygenerowane automatycznie np 05, 28 itd"
 DocType: Sales Invoice,Posting Time,Czas publikacji
@@ -3063,26 +2812,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nowy Przychody klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Wydatki na podróże
 DocType: Maintenance Visit,Breakdown,
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,W sprawie daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Gładzenia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
-DocType: Feed,Full Name,Imię i nazwisko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Zaciskanie
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1} 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Domyślny magazyn jest obowiązkowy dla przedmiotu z asortymentu.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Płatność pensji za miesiąć {0} i rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kwota całkowita Płatny
 ,Transferred Qty,
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Nawigacja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planowanie
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Dodać Czas Zaloguj Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Wydany
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Sprzedajemy ten przedmiot
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Sprzedajemy ten przedmiot
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,ID Dostawcy
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 DocType: Sales Partner,Contact Desc,Opis kontaktu
@@ -3091,18 +2837,16 @@
 DocType: Brand,Item Manager,Pozycja menedżera
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Wydobywanie
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Wszystkie kontakty.
 DocType: Newsletter,Test Email Id,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Nazwa skrótowa firmy
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Nazwa skrótowa firmy
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,
 DocType: GL Entry,Party Type,Typ Grupy
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot
 DocType: Item Attribute Value,Abbreviation,Skrót
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Formowanie rotacyjne
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,
 DocType: Leave Type,Max Days Leave Allowed,
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Ustaw Reguła podatkowa do koszyka
@@ -3116,15 +2860,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,
 ,Territory Target Variance Item Group-Wise,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
 DocType: Account,Temporary,Tymczasowy
 DocType: Address,Preferred Billing Address,
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,
 DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu
 DocType: Pricing Rule,Buying,Zakupy
 DocType: HR Settings,Employee Records to be created by,Rekordy pracownika do utworzenia przez
@@ -3137,24 +2881,21 @@
 ,Item-wise Price List Rate,
 DocType: Purchase Order Item,Supplier Quotation,
 DocType: Quotation,In Words will be visible once you save the Quotation.,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Prasowanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} jest zatrzymany
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
 DocType: Lead,Add to calendar on this date,Dodaj do kalendarza pod tą datą
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,nadchodzące wydarzenia
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient jest wymagany
-DocType: Letter Head,Letter Head,Nagłówek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Szybkie wejścia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} jest obowiązkowe Powrót
 DocType: Purchase Order,To Receive,Otrzymać
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montażu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,
 DocType: Employee,Personal Email,Osobisty E-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Całkowitej wariancji
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Całkowitej wariancji
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,
 DocType: Address,Postal Code,kod pocztowy
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","w minutach 
@@ -3162,18 +2903,16 @@
 DocType: Customer,From Lead,Od Tropu
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Zamówienia puszczone do produkcji.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Struganie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,
 DocType: Serial No,Out of Warranty,Poza Gwarancją
 DocType: BOM Replace Tool,Replace,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Proszę wpisać domyślną jednostkę miary
 DocType: Purchase Invoice Item,Project Name,Nazwa projektu
 DocType: Supplier,Mention if non-standard receivable account,"Wspomnieć, jeśli nie standardowe konto należności"
-DocType: Workflow State,Edit,Edytuj
 DocType: Journal Entry Account,If Income or Expense,
 DocType: Features Setup,Item Batch Nos,
 DocType: Stock Ledger Entry,Stock Value Difference,
@@ -3181,20 +2920,18 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatność Wyrównawcza Płatności
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Podatek należny (zwrot)
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
-DocType: Contact Us Settings,Pincode,Kod PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
 DocType: Item,Moving Average,
 DocType: BOM Replace Tool,The BOM which will be replaced,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Urlop musi by przyporządkowany w mnożniku 0.5
 DocType: Production Order,Operation Cost,Koszt operacji
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Prześlij Frekwencję z pliku .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Zaległa wartość
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamroź asortyment starszy niż [dni]
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Rok fiskalny: {0} nie istnieje
 DocType: Currency Exchange,To Currency,
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,
@@ -3203,10 +2940,7 @@
 DocType: Project,Default Cost Center,Domyślne Centrum Kosztów
 DocType: Purchase Invoice,End Date,Data zakończenia
 DocType: Employee,Internal Work History,Wewnętrzne Historia Pracuj
-DocType: DocField,Column Break,
-DocType: Event,Thursday,Czwartek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Kapitał prywatny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Obrócenie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitał prywatny
 DocType: Maintenance Visit,Customer Feedback,Informacja zwrotna Klienta
 DocType: Account,Expense,Koszt
 DocType: Sales Invoice,Exhibition,Wystawa
@@ -3219,31 +2953,30 @@
 DocType: Employee,Held On,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pozycja Produkcja
 ,Employee Information,Informacja o pracowniku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stawka (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Stawka (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data końca roku finansowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data końca roku finansowego
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nie można przefiltrować wg Podstawy, jeśli pogrupowano z użyciem Podstawy"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,
 DocType: BOM,Materials Required (Exploded),
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmniejsz wypłatę za Bezpłatny Urlop
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Urlop okolicznościowy
 DocType: Batch,Batch ID,Identyfikator Partii
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Uwaga: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Podsumowanie W tym tygodniu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
 DocType: GL Entry,Party,Grupa
 DocType: Sales Order,Delivery Date,Data dostawy
-DocType: DocField,Currency,Waluta
 DocType: Opportunity,Opportunity Date,Data szansy
 DocType: Purchase Receipt,Return Against Purchase Receipt,Powrót Przeciwko ZAKUPU
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Zamówione
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
@@ -3255,82 +2988,73 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,
 DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Komisja
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Zakład i maszyneria 
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Zakład i maszyneria
 DocType: Sales Partner,Partner's Website,Strona WWW Partnera
 DocType: Opportunity,To Discuss,
 DocType: SMS Settings,SMS Settings,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Rachunki tymczasowe
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Czarny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Account,Auditor,Audytor
 DocType: Purchase Order,End date of current order's period,Data zakończenia okresu bieżącego zlecenia
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Złóż ofertę 
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Złóż ofertę
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Powrót
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
-DocType: DocField,Fold,Zagiąć
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Domyślne jednostki miary dla Variant musi być taki sam jak szablon
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
 DocType: Project Task,Pending Review,Czekający na rewizję
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Sprecyzuj
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrotu kosztów (przez Kosztów zastrzeżenia)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID klienta
-DocType: Page,Page Name,Nazwa strony
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Do czasu musi być większy niż czas From
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Wykończenie wrzeciona
 DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
 DocType: Account,Asset,Składnik aktywów
 DocType: Project Task,Task ID,Identyfikator zadania
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","np. ""MC"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","np. ""MC"""
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty"
 ,Sales Person-wise Transaction Summary,
-DocType: System Settings,Time Zone,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazyn {0} nie istnieje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Zarejestruj Dla Hubu ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Miesięczne Procenty Dystrybucja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Wybrany element nie może mieć Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiałów dostarczonych w stosunku do dowodu dostawy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zszywanie
 DocType: Customer,Customer Details,Dane Klienta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Kształtowanie
 DocType: Employee,Reports to,
 DocType: SMS Settings,Enter url parameter for receiver nos,Wpisz URL dla odbiorcy numeru
 DocType: Sales Invoice,Paid Amount,Zapłacona kwota
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',
 ,Available Stock for Packing Items,
 DocType: Item Variant,Item Variant,Pozycja Wersja
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stan konta już Debit, nie możesz ustawić ""waga musi być"" jako ""Kredyty"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Zarządzanie jakością
 DocType: Production Planning Tool,Filter based on customer,Filtr bazujący na kliencie
 DocType: Payment Tool Detail,Against Voucher No,Dowód nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
 DocType: Tax Rule,Purchase,Zakup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Ilość bilansu
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ilość bilansu
 DocType: Item Group,Parent Item Group,Grupa Elementu nadrzędnego
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} do {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centra Kosztów
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Magazyny.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Magazyny.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stawka przy użyciu której waluta dostawcy jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Wiersz # {0}: taktowania konflikty z rzędu {1}
 DocType: Opportunity,Next Contact,Następnie Kontakt
 DocType: Employee,Employment Type,Typ zatrudnienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Środki trwałe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Okres aplikacja nie może być w dwóch zapisów alocation
 DocType: Item Group,Default Expense Account,Domyślne konto rozchodów
 DocType: Employee,Notice (days),Wymówienie (dni)
-DocType: Page,Yes,Tak
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
 DocType: Employee,Encashment Date,Data Inkaso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Galwanoplastyka
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Podstawą księgowania może być tu Zamówienie zakupu, Faktura zakupu lub Zapis księgowy"
 DocType: Account,Stock Adjustment,Koszty braków
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Istnieje Domyślnie aktywny Koszt rodzajów działalności - {0}
 DocType: Production Order,Planned Operating Cost,Planowany koszt operacyjny
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nowy {0} Nazwa
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Załączeniu {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Załączeniu {0} # {1}
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
 DocType: Authorization Rule,Customer / Item Name,Klient / Nazwa Przedmiotu
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3067,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},
 DocType: Item Variant Attribute,Attribute,Atrybut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Proszę określić zakres od/do
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Utworzone przez
 DocType: Serial No,Under AMC,
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilość kupon wylądował
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
@@ -3355,17 +3078,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimalna ilość
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Zaktualizuj Ukończone Dobra
 DocType: Workstation,per hour,na godzinę
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 DocType: Company,Distribution,Dystrybucja
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Kwota zapłacona
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 DocType: Customer,Default Taxes and Charges,Domyślne podatków i opłat
 DocType: Account,Receivable,Należności
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,
 DocType: Sales Invoice,Supplier Reference,
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",
@@ -3373,10 +3095,9 @@
 DocType: Hub Settings,Seller Description,Sprzedawca Opis
 DocType: Employee Education,Qualification,Kwalifikacja
 DocType: Item Price,Item Price,Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,"Zamówione
-"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 DocType: Naming Series,Select Transaction,
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,
@@ -3384,7 +3105,6 @@
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Brakująca firma w magazynach {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,
 DocType: POS Profile,Terms and Conditions,Regulamin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Aby Data powinna być w tym roku podatkowym. Zakładając To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",
@@ -3396,7 +3116,7 @@
 DocType: Sales Order Item,For Production,Dla Produkcji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,
 DocType: Project Task,View Task,Zobacz Zadanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Rozpoczęcie roku podatkowego
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Rozpoczęcie roku podatkowego
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Wprowadź dokumenty zakupu
 DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
@@ -3404,20 +3124,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Salary Slip,Salary Slip,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Nagniatania
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Do daty' jest wymaganym polem
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do daty' jest wymaganym polem
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
 DocType: Sales Invoice Item,Sales Order Item,Pozycja Zlecenia Sprzedaży
 DocType: Salary Slip,Payment Days,Dni Płatności
 DocType: BOM,Manage cost of operations,Zarządzaj kosztami działań
 DocType: Features Setup,Item Advanced,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Walcowanie na gorąco
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Ustawienia globalne
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,
@@ -3426,47 +3144,38 @@
 DocType: Customer,Sales Team Details,
 DocType: Expense Claim,Total Claimed Amount,
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Urlop chorobowy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Nieprawidłowy {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Urlop chorobowy
 DocType: Email Digest,Email Digest,przetwarzanie emaila
 DocType: Delivery Note,Billing Address Name,Nazwa Adresu do Faktury
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Bilans systemu
-DocType: Workflow,Is Active,Jest aktywny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Bilans systemu
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Zmień Skrót
-DocType: Workflow State,Primary,Podstawowy
 DocType: Expense Claim Detail,Expense Date,Data wydatku
 DocType: Item,Max Discount (%),Maksymalny rabat (%)
-DocType: Communication,More Information,Więcej informacji
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Kwota ostatniego zamówienia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Wybuchowych
 DocType: Company,Warn,Ostrzeż
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
 DocType: BOM,Manufacturing User,Produkcja użytkownika
 DocType: Purchase Order,Raw Materials Supplied,Dostarczone surowce
 DocType: Purchase Invoice,Recurring Print Format,Format wydruku cykliczne
-DocType: Communication,Series,Seria
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty jej kupna
 DocType: Appraisal,Appraisal Template,Szablon oceny
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Cel Wizyty Konserwacji
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Okres
 ,General Ledger,Księga główna
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobacz Tropy
 DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID nie może się powtarzać, ten już zajęty dla {0} "
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Email ID nie może się powtarzać, ten już zajęty dla {0}"
 ,Itemwise Recommended Reorder Level,
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Proszę najpierw wybrać {0}
 DocType: Features Setup,To get Item Group in details table,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Odświeżanie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Akwaforta
 DocType: Sales Invoice,Commission,Prowizja
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3492,7 +3201,7 @@
  {% jeśli email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Domyślnie Kwota
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Podsumowanie tego miesiąca
 DocType: Quality Inspection Reading,Quality Inspection Reading,Odczyt kontroli jakości
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,
@@ -3511,13 +3220,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 DocType: Supplier,Address and Contacts,Adres i Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
 DocType: Payment Tool,Get Outstanding Vouchers,Pobierz zaległe Kupony
 DocType: Warranty Claim,Resolved By,
 DocType: Appraisal,Start Date,
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Wartość
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknij tutaj, aby zweryfikować"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
@@ -3527,55 +3235,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Średni czas podjęte przez dostawcę do dostarczenia
 DocType: Time Log,Hours,Godziny
 DocType: Project,Expected Start Date,Spodziewana data startowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Walcówka
-DocType: ToDo,Priority,Priorytet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Usuń element, jeśli opłata nie ma zastosowania do tej pozycji"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dostęp do Dropboxa Dopuszczony
-DocType: Dropbox Backup,Weekly,Tygodniowo
-DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Odbierać
+DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,np. smsgateway.com/api/send_sms.cgi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Odbierać
 DocType: Maintenance Visit,Fully Completed,Całkowicie ukończono
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kompletne
 DocType: Employee,Educational Qualification,Kwalifikacje edukacyjne
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} został pomyślnie dodany do naszego newslettera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Obróbka wiązką elektronów
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Raporty główne
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raporty główne
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,
 DocType: Purchase Receipt Item,Prevdoc DocType,
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Edytuj ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Struktura kosztów (MPK)
 ,Requested Items To Be Ordered,
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje Zamówienia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje Zamówienia
 DocType: Price List,Price List Name,Nazwa cennika
 DocType: Time Log,For Manufacturing,Dla Produkcji
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Sumy całkowite
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Sumy całkowite
 DocType: BOM,Manufacturing,Produkcja
 ,Ordered Items To Be Delivered,Zamówione produkty do dostarczenia
 DocType: Account,Income,Przychody
-,Setup Wizard,
 DocType: Industry Type,Industry Type,
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Coś poszło nie tak!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia
 DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Odlewów
-DocType: Email Alert,Reference Date,Data Odniesienia
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,
 DocType: Budget Detail,Budget Detail,Szczegóły Budżetu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem
-DocType: Async Task,Status,
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Zaktualizowano jednostkę miary zapasów dla pozycji {0}
-DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Zaktualizuj Ustawienia SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Czas Zaloguj {0} już zapowiadane
@@ -3588,56 +3284,52 @@
 ,Serial No Service Contract Expiry,
 DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Pracownik nie może być zmieniony
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
 DocType: Naming Series,Help HTML,
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Zniżki dla nadmiernie {0} przeszedł na pozycję {1}
 DocType: Address,Name of person or organization that this address belongs to.,Imię odoby lub organizacji do której należy adres.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Twoi Dostawcy
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Twoi Dostawcy
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Innym Wynagrodzenie Struktura {0} jest aktywny przez pracownika {1}. Należy się jej status ""nieaktywny"", aby kontynuować."
 DocType: Purchase Invoice,Contact,Kontakt
-DocType: Features Setup,Exports,"Eksport
-"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Otrzymane od
+DocType: Features Setup,Exports,Eksport
 DocType: Lead,Converted,Przekształcono
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 DocType: Issue,Content Type,Typ zawartości
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Komputer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pobierz Wpisy nieuzgodnione
 DocType: Cost Center,Budgets,Budżety
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Zaktualizowano
 DocType: Employee,Emergency Contact Details,Kontakt na wypadek nieszczęśliwych wypadków - szczegóły
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Co to robi?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Co to robi?
 DocType: Delivery Note,To Warehouse,Do magazynu
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1} 
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Konto {0} zostało wprowadzone więcej niż raz dla roku podatkowego {1}
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: Purchase Taxes and Charges,Account Head,
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Zaktualizuj dodatkowe koszty do obliczenia całkowitego kosztu operacji
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektryczne
 DocType: Stock Entry,Total Value Difference (Out - In),Całkowita Wartość Różnica (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID Użytkownika nie ustawiony dla Pracownika {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Kulkowania
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od Reklamacji
 DocType: Stock Entry,Default Source Warehouse,Domyślny magazyn źródłowy
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Docieranie
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dni od ostatniego zamówienia
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od ostatniego zamówienia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Obciążenie rachunku musi być kontem Bilans
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,
-DocType: User,Enabled,Włączony
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aktywa obrotowe
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Czy na pewno chcesz Wysłać wszystkie Pensje za miesiąc {0} i rok {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import abonentów
@@ -3645,19 +3337,18 @@
 DocType: Attendance,Present,Obecny
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
 DocType: Notification Control,Sales Invoice Message,
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zamknięcie konta {0} musi być typu odpowiedzialności / Equity
 DocType: Authorization Rule,Based On,Bazujący na
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Okres Okres Od i Do dat obowiązkowych dla powtarzających {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Czynność / zadanie projektu
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Utwórz Paski Wypłaty
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} błędny identyfikator e-mail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
-DocType: ToDo,Low,Niski
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napisz Off Kwota (Spółka Waluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ustaw {0}
 DocType: Purchase Invoice,Repeat on Day of Month,
@@ -3679,7 +3370,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nazwa kampanii jest wymagana
 DocType: Maintenance Visit,Maintenance Date,Data Konserwacji
 DocType: Purchase Receipt Item,Rejected Serial No,Odrzucony Nr Seryjny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Głębokie tłoczenie
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nowy biuletyn
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Pokaż Saldo
@@ -3690,7 +3380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Wartość
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitowania
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
 ,Sales Analytics,Analityka sprzedaży
 DocType: Manufacturing Settings,Manufacturing Settings,Ustawienia produkcyjne
@@ -3702,28 +3391,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nowa nazwa konta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Koszt dostarczonych surowców
 DocType: Selling Settings,Settings for Selling Module,Ustawienia modułu sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Obsługa Klienta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Obsługa Klienta
 DocType: Item,Thumbnail,Miniaturka
 DocType: Item Customer Detail,Item Customer Detail,
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potwierdź Swój Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Zaproponuj kandydatowi pracę
 DocType: Notification Control,Prompt for Email on Submission of,
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Liczba przyznanych liście są więcej niż dni w okresie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} is wymagany
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Formowanie próżniowe
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Spodziewana data nie może być wcześniejsza od daty prośby o materiał
-DocType: Contact Us Settings,City,Miasto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Obróbka ultradźwiękowa
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Błąd: Nie ważne id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
 DocType: Sales Order,Printing Details,Szczegóły Drukarnie
 DocType: Task,Closing Date,Data zamknięcia
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inżynier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inżynier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zespoły Szukaj Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},
 DocType: Sales Partner,Partner Type,Typ Partnera
@@ -3731,7 +3416,7 @@
 DocType: Authorization Rule,Customerwise Discount,Zniżka dla klienta
 DocType: Purchase Invoice,Against Expense Account,Konto wydatków
 DocType: Production Order,Production Order,Zamówinie produkcji
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,
 DocType: Quotation Item,Against Docname,
 DocType: SMS Center,All Employee (Active),Wszyscy pracownicy (aktywni)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobacz teraz
@@ -3739,26 +3424,24 @@
 DocType: BOM,Raw Material Cost,Koszt surowców
 DocType: Item,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Wykres Gantta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Niepełnoetatowy
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Typ raportu jest wymagany
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Pierwszy użytkownik: to Ty!
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Pierwszy użytkownik: to Ty!
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego są już ustawione w roku podatkowym {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Pomyślnie uzgodnione
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Production Order,Planned End Date,Planowana data zakończenia
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Tax Rule,Validity,Ważność
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Kwota zafakturowana
 DocType: Attendance,Attendance,
-DocType: Page,No,Nie
 DocType: BOM,Materials,Materiały
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
@@ -3766,55 +3449,46 @@
 ,Item Prices,Ceny
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,
 DocType: Period Closing Voucher,Period Closing Voucher,Zamknięcie roku
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ustawienia Cennika.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ustawienia Cennika.
 DocType: Task,Review Date,
 DocType: Purchase Invoice,Advance Payments,Zaliczki
-DocType: DocPerm,Level,Poziom
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Przemiał
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Brak uprawnień do korzystania z narzędzi płatności
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Gryząc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Wydatki na podstawową działalność
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsulting
 DocType: Customer Group,Parent Customer Group,Nadrzędna Grupa Klientów
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Reszta
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
 DocType: Appraisal Goal,Score Earned,
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","np. ""Moja Firma LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Okres wypowiedzenia
 DocType: Bank Reconciliation Detail,Voucher ID,ID Bonu
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,
 DocType: Packing Slip,Gross Weight UOM,
 DocType: Email Digest,Receivables / Payables,Należności / Zobowiązania
 DocType: Delivery Note Item,Against Sales Invoice,Na podstawie faktury sprzedaży
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Cechowanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Pokaż wartości zerowe
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ilość produktu otrzymanego po produkcji / przepakowaniu z podanych ilości surowców
 DocType: Payment Reconciliation,Receivable / Payable Account,Konto Należności / Zobowiązań
 DocType: Delivery Note Item,Against Sales Order Item,Na podstawie pozycji zamówienia sprzedaży
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 DocType: Task,Actual End Date (via Time Logs),Rzeczywista Data zakończenia (przez Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,
 DocType: Delivery Note,Print Without Amount,Drukuj bez wartości
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,
-DocType: User,Last Name,Nazwisko
-DocType: Web Page,Left,Opuścił
-DocType: Event,All Day,Cały Dzień
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),
-DocType: Contact Us Settings,State,Stan
 DocType: Batch,Batch,Partia
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilans
 DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez Zastrzeżeń koszty)
-DocType: User,Gender,Płeć
 DocType: Journal Entry,Debit Note,Nota debetowa
 DocType: Stock Entry,As per Stock UOM,
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nie minął
@@ -3828,44 +3502,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",
 DocType: Purchase Invoice,Total Advance,
-DocType: Workflow State,User,Użytkownik
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Tworzenie listy płac
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Otrzymanie płatności Uwaga
 DocType: Customer,Credit Days Based On,Dni kredytowe w oparciu o
 DocType: Tax Rule,Tax Rule,Reguła podatkowa
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Utrzymanie tej samej stawki przez cały cykl sprzedaży
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zaplanuj dzienniki poza godzinami Workstation Pracy.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zostało już dodane 
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zostało już dodane
 ,Items To Be Requested,
-DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Kursy rozliczeniowe na podstawie rodzajów działalności (za godzinę)
 DocType: Company,Company Info,Informacje o firmie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ząbkowanie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Email ID Firmy nie został znaleziony, w wyniku czego e-mail nie został wysłany"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 DocType: Production Planning Tool,Filter based on item,Filtr bazujący na Przedmiocie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Konto debetowe
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
 DocType: Sales Invoice,Rounded Total (Company Currency),Końcowa zaokrąglona kwota (waluta firmy)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
 DocType: Purchase Common,Purchase Common,
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Szansy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Wykrawanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Świadczenia pracownicze
 DocType: Sales Invoice,Is POS,
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1} 
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Rachunki dla klientów.
-DocType: DocField,Default,Domyślny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentów dodano
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiowanie budżetu tego centrum kosztów. Aby ustawić działania budżetu, patrz &quot;Lista Spółka&quot;"
@@ -3876,70 +3546,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Expense Claim,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wybranie ""Tak"" pozwoli w unikalny sposób identyfikować każdą pojedynczą sztukę tej rzeczy i która będzie mogła być przeglądana w sekcji Nr Seryjny"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
 DocType: Employee,Education,Wykształcenie
 DocType: Selling Settings,Campaign Naming By,
 DocType: Employee,Current Address Is,Obecny adres to
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
 DocType: Address,Office,Biuro
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raporty standardowe
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Aby utworzyć konto podatkowe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Wprowadź konto Wydatków
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Asortyment
 DocType: Employee,Current Address,Obecny adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jeśli pozycja jest wariant innego elementu, a następnie opis, zdjęcia, ceny, podatki itp zostanie ustalony z szablonu, o ile nie określono wyraźnie"
 DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inwentaryzacja partii
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inwentaryzacja partii
 DocType: Employee,Contract End Date,Data końcowa kontraktu
 DocType: Sales Order,Track this Sales Order against any Project,
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,
-DocType: DocShare,Document Type,Typ Dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od Wyceny Kupna
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od Wyceny Kupna
 DocType: Deduction Type,Deduction Type,Typ odliczenia
 DocType: Attendance,Half Day,Pół Dnia
 DocType: Pricing Rule,Min Qty,Min. ilość
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Do śledzenia produktów w sprzedaży i dokumentów zakupu z numerach partii. &quot;Preferowane Branża: Chemia&quot;
 DocType: GL Entry,Transaction Date,Data transakcji
 DocType: Production Plan Item,Planned Qty,Planowana ilość
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Razem podatkowa
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Razem podatkowa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Do Ilość (Wyprodukowano kopie) są obowiązkowe
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
 DocType: Notification Control,Purchase Receipt Message,Wiadomość Potwierdzenia Zakupu
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Liczba przyznanych liście są więcej niż okres
 DocType: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
 DocType: Sales Order,% of materials delivered against this Sales Order,% materiałów dostarczonych w ramach zlecenia sprzedaży
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Zapisz ruch produktu.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Biuletyn Lista Abonent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dłutarki
-DocType: Email Account,Service,Usługa
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 ,Monthly Salary Register,
-apps/frappe/frappe/website/template.py +140,Next,Dalej
 DocType: Warranty Claim,If different than customer address,
 DocType: BOM Operation,BOM Operation,
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektropolerowanie
 DocType: Purchase Taxes and Charges,On Previous Row Amount,
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Podaj płatności Kwota w conajmniej jednym rzędzie
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Podaj płatności Kwota w conajmniej jednym rzędzie
 DocType: POS Profile,POS Profile,POS profilu
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Wiersz {0}: Płatność Kwota nie może być większa niż kwota kredytu pozostała
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Razem Niezapłacone
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Razem Niezapłacone
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Czas nie jest rozliczanych Zaloguj
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupujący
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupujący
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Stawka Netto nie może być na minusie
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Proszę wprowadzić ręcznie z dowodami
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Proszę wprowadzić ręcznie z dowodami
 DocType: SMS Settings,Static Parameters,
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
@@ -3948,14 +3611,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Rozwać Podatek albo Opłatę za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-walcówka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,
 DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
 DocType: Purchase Invoice,Next Date,
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Proszę wprowadzić podatki i opłaty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obróbka
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
 DocType: Hub Settings,Seller Name,Sprzedawca Nazwa
@@ -3965,47 +3626,44 @@
 DocType: Stock Entry,Repack,Przepakowanie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Zapisz formularz aby kontynuować
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Załącz Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Załącz Logo
 DocType: Customer,Commission Rate,Wartość prowizji
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Koszyk jest pusty
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,
 DocType: Manufacturing Settings,Allow Production on Holidays,Pozwól Produkcja na święta
 DocType: Sales Order,Customer's Purchase Order Date,Data Zamówienia Zakupu Klienta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapitał zakładowy
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Proszę wybrać plik .csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Wyślij kopie zapasowe na Dropbox
 DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatyczne tworzenie Materiał wniosku, jeżeli ilość spada poniżej tego poziomu"
 ,Item-wise Purchase Register,
 DocType: Batch,Expiry Date,Data ważności
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Aby ustawić poziom zmienić kolejność, element musi być pozycja nabycia lub przedmiotu"
 ,Supplier Addresses and Contacts,
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Dyrektor projektu
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Zestawienie materiałów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
-DocType: Dropbox Backup,Send Notifications To,
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: Expense Claim Detail,Sanctioned Amount,
 DocType: GL Entry,Is Opening,
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},

diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index a4c1c9f..fd36ce0 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produtos para o Consumidor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recozimento
 DocType: Item,Customer Items,Itens de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Pai {1} não pode ser um livro-razão
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Deixe aprovadores
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Employee,Rented,Alugado
-DocType: About Us Settings,Website,Site
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Do Pedido de materiais
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Do Pedido de materiais
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Exigido por
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Licença
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Costura
 DocType: Pricing Rule,Apply On,Aplicar Em
 DocType: Item Price,Multiple Item prices.,Vários preços item.
 ,Purchase Order Items To Be Received,Comprar itens para ser recebido
 DocType: SMS Center,All Supplier Contact,Todos os Contatos de Fornecedor
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Para manter o código de item do cliente e para torná-los pesquisáveis com base em seu código use esta opção
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque Administrativo
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Para manter o código de item do cliente e para torná-los pesquisáveis com base em seu código use esta opção
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Variantes
-DocType: Sales Invoice Item,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de passagem
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao funcionário {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Atenção à Saúde
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Atenção à Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
 DocType: Company,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
 DocType: Employee,Holiday List,Lista de feriado
 DocType: Time Log,Time Log,Tempo Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Contador
 DocType: Cost Center,Stock User,Estoque de Usuário
 DocType: Company,Phone No,Nº de telefone
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nova {0}: # {1}
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Vendas Partners Comissão
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atributo Valor {0} não pode ser removido a partir de {1} como item Variantes \ existe com este atributo.
-DocType: Print Settings,Classic,Clássico
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Esta é uma conta de root e não pode ser editada.
 DocType: BOM,Operations,Operações
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base em desconto para {0}
 DocType: Bin,Quantity Requested for Purchase,Quantidade Solicitada para Compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
 DocType: Packed Item,Parent Detail docname,Docname do Detalhe pai
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Vaga de emprego.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicidade
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidade
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,mercearia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Armazém é obrigatória se o tipo de conta é Armazém
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Lead,Person Name,Nome Pessoa
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verifique se a ordem recorrentes, desmarque a opção de parar recorrentes ou colocar adequada Data de Término"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Taxa por Hora/ 60) * Tempo de operação atual
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
-DocType: Blog Post,Guest,Convidado
 DocType: Quality Inspection,Get Specification Details,Obter detalhes da Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} é obrigatório
 DocType: Stock Entry,Additional Costs,Custos adicionais
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
 DocType: Lead,Product Enquiry,Consulta de Produto
-DocType: Standard Reply,Owner,proprietário
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Por favor insira primeira empresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Em Graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Alvo Em
 DocType: BOM,Total Cost,Custo Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrilagem
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Log de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,imóveis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,imóveis
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato de conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Valor Requerido
 DocType: Employee,Mr,Sr.
-DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornecedor Tipo / Fornecedor
 DocType: Naming Series,Prefix,Prefixo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todo o Contato
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a fatura de vendas ser Submetida.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo de RH
 DocType: SMS Center,SMS Center,Centro de SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
 DocType: BOM Replace Tool,New BOM,Nova LDM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado
 DocType: Lead,Request Type,Tipo de Solicitação
 DocType: Leave Application,Reason,Motivo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Radio-difusão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,execução
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio-difusão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,execução
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado da manutenção
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Itens e Preços
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Itens e Preços
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecione o funcionário para quem você está criando a Avaliação.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),% de Desconto sobre o Preço da Lista de Preços
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,começo
-DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Conta Bancária
 DocType: Leave Type,Allow Negative Balance,Permitir saldo negativo
 DocType: Selling Settings,Default Territory,Território padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rasgando
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},A Conta {0} não pertence à Empresa {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: Sales Invoice,Is Opening Entry,Está abrindo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Para for necessário Armazém antes Enviar
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,"Recebeu, em"
 DocType: Sales Partner,Reseller,Revendedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Por favor, indique Empresa"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Ordens de produção em andamento
 DocType: Lead,Address & Contact,Endereço e Contato
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome do Contato
+,Contact Name,Nome do Contato
 DocType: Production Plan Item,SO Pending Qty,Qtde. pendente na OV
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de Compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
-DocType: Bulk Email,Message,Mensagem
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
 DocType: Lead,Do Not Contact,Não entre em contato
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A ID exclusiva para acompanhar todas as facturas recorrentes. Ele é gerado em enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Pedido Mínimo
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes da compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Escova de aço
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio para todo o planeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos confirmados de clientes.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Telefone Celular.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agenda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Conta de despesas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Por favor seleccione Carga Tipo primeiro
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Latest
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecione seu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} deve ser item de serviço
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
-DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perfuração laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova UDM de estoque
 DocType: Period Closing Voucher,Closing Account Head,Conta de Fechamento
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
-DocType: Communication,Closed,Fechado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por extenso (Exportação) será visível quando você salvar a Guia de Remessa.
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil da Vaga
 DocType: Newsletter,Newsletter,Boletim informativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Carícias
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por e-mail sobre a criação de Pedido de material automático
 DocType: Journal Entry,Multi Currency,Multi Moeda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item é atualizado
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de Remessa
-DocType: Dropbox Backup,Allow Dropbox Access,Permitir Acesso Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Rent Custo
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,E-mail da Empresa
 DocType: GL Entry,Debit Amount in Account Currency,Montante Débito em Conta de moeda
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-DocType: Workflow State,Refresh,Atualizar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos os campos de relacionados à importação, como moeda, taxa de conversão, total geral de importação, total de importação etc estão disponíveis no Recibo de compra, fornecedor de cotação, fatura de compra, ordem de compra, etc."
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Order Total Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Designação do empregado (por exemplo, CEO , diretor , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em LDM, Nota de Entrega, Fatura de Compra, Ordem de Produção, Ordem de Compra, Recibo de compra, Nota Fiscal de Venda, Ordem de Venda, Entrada no Estoque, Quadro de Horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selecionar item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
-DocType: Stock UOM Replace Utility,Current Stock UOM,Unidade de Medida do Estoque Atual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da nota fiscal
 DocType: GL Entry,Debit Amount,Débito Montante
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,Recebido %
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte do jato de água
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Instalação já está completa !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Instalação já está completa !
 ,Finished Goods,Produtos Acabados
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, não criar contas para clientes e fornecedores. Eles são criados diretamente do cliente / fornecedor mestres."
 DocType: Currency Exchange,Currency Exchange,Câmbio
 DocType: Purchase Invoice Item,Item Name,Nome do Item
+DocType: Authorization Rule,Approving User  (above authorized value),Aprovando Usuário (acima do valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo credor
 DocType: Employee,Widowed,Viúvo(a)
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Os itens a serem solicitados que estão &quot;Fora de Estoque&quot;, considerando todos os almoxarifados com base na quantidade projetada e pedido mínimo"
@@ -380,22 +348,21 @@
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos consumíveis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter papel 'Liberador'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicamentos
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motivo para perder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Anexos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Por favor, indique Centro de Custo"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, indique Centro de Custo"
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Méd. Vendendo Taxa
 DocType: Purchase Order,Start date of current order's period,Data do período da ordem atual Comece
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fracção em Coluna {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fracção em Coluna {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Taxa
 DocType: Delivery Note,% Installed,Instalado %
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Por favor, insira o nome da empresa em primeiro lugar"
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cortando
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Número do Caso Final' não pode ser menor que o 'Número do Caso Inicial'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Não Iniciado
 DocType: Lead,Channel Partner,Parceiro de Canal
 DocType: Account,Old Parent,Pai Velho
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+DocType: HR Settings,Employee record is created using selected field. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mestre férias .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Por favor, insira o Código Item."
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se marcado, o valor do imposto será considerado como já incluído na Impressão de Taxa / Impressão do Valor"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e depósitos
 DocType: Features Setup,Imports,Importações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ligação adesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
 DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Atividades pendentes para hoje
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Registro de comparecimento.
 DocType: Bank Reconciliation,Journal Entries,Lançamentos do livro Diário
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
-DocType: System Settings,Loading...,Carregando ...
-DocType: DocField,Password,Senha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelagem deposição fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operações (em minutos)
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" não existe"
 DocType: Pricing Rule,Valid Upto,Válido até
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Escritório Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,Conta Diferença
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazém para que Pedido de materiais serão levantados"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
-DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
-DocType: Communication,Subject,Assunto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de emergência
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,item
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gerenciando Subcontratação
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base da empresa
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
@@ -482,21 +441,21 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} não é comprar item
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} é um endereço de e-mail inválido em 'Endereço de Email de Notificação'
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Faturamento total este ano:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Faturamento total este ano:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Encargos
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 ,Pending Qty,Pendente Qtde
 DocType: Job Applicant,Thread HTML,Tópico HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
 DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total da Comissão
 DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
@@ -504,15 +463,14 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","A **Distribuição Mensal** ajuda a ratear o seu orçamento através dos meses, se você possui sazonalidade em seu negócio. Para ratear um orçamento usando esta distribuição, defina a**Distribuição Mensal** no **Centro de Custo**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +581,Make Sales Order,Criar ordem de vendas
 DocType: Project Task,Project Task,Tarefa do Projeto
-,Lead Id,chumbo Id
+,Lead Id,Cliente em Potencial ID
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
-DocType: About Us Settings,Website Manager,Administrador do site
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Ano Fiscal Data de início não deve ser maior do que o Fiscal Year End Date
 DocType: Warranty Claim,Resolution,Resolução
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregue: {0}
@@ -520,25 +478,24 @@
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Retorno de Vendas
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione as Ordens de Venda a partir das quais você deseja criar Ordens de Produção.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
+DocType: Authorization Rule,Customer or Item,Cliente ou Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de Dados de Clientes
 DocType: Quotation,Quotation To,Cotação para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Montante alocado não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
-DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor do cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -559,20 +516,16 @@
 DocType: Activity Type,Default Costing Rate,Preço de Custo Padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação da Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale o Dropbox módulo python"
 DocType: Employee,Passport Number,Número do Passaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De Recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De Recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro do recebedor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupar por' não podem ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas do Vendedor
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data da Resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converter em Grupo
 DocType: Activity Cost,Activity Type,Tipo da Atividade
@@ -580,25 +533,20 @@
 DocType: Customer,Fixed Days,Dias Fixos
 DocType: Sales Invoice,Packing List,Lista de embalagem
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordens de Compra dadas a fornecedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela Detalhes da Nota Fiscal
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Configurações
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos Custo desembarcados e Encargos
 DocType: Production Order Operation,Actual Start Time,Hora Real de Início
 DocType: BOM Operation,Operation Time,Tempo de Operação
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mais
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,renomear
 DocType: Journal Entry,Write Off Amount,Eliminar Valor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir que o usuário
 DocType: Journal Entry,Bill No,Fatura Nº
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Obrigatória
@@ -607,17 +555,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 DocType: Purchase Receipt,Other Details,Outros detalhes
 DocType: Account,Accounts,Contas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de série. Isso também pode ser usado para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Armazém Rejeitado é obrigatória na rubrica regected
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer Endereço de E-mail registrado na empresa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árvore
@@ -626,14 +573,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedidos de Vendas, Vendas Nota Fiscal ou do Diário"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Incapaz de encontrar taxa de câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aeroespacial
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bem vindo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Registro de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Assunto da Tarefa
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
-DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nome da Campanha
 ,Reserved,reservado
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
@@ -641,30 +584,27 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} não é um item de estoque
 DocType: Mode of Payment Account,Default Account,Conta Padrão
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Fila deve ser definido se Opportunity é feito de chumbo
-DocType: Contact Us Settings,Address Title,Título do Endereço
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Vendas Pessoa Alvo Variance item Group-wise
-DocType: Dropbox Backup,Daily,Diário
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Telefone Celular
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salarial mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
-DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -712,10 +652,9 @@
 DocType: Address,Personal,Pessoal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Pedido de Reembolso de Despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despesas de manutenção de escritório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Por favor, indique primeiro item"
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
@@ -723,14 +662,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da Reconciliação Bancária
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Minhas Faturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -738,46 +678,43 @@
 DocType: SMS Center,All Customer Contact,Todo o Contato do Cliente
 apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Carregar saldo de estoque a partir de um arquivo CSV.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,Enviar agora
-,Support Analytics,Análise do Suporte
+,Support Analytics,Análise de Pós-Vendas
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
 apps/erpnext/erpnext/config/accounts.py +169,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clientes e Fornecedores
 DocType: Email Digest,Email Digest Settings,Configurações do Resumo por E-mail
-apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suporte a consultas de clientes.
+apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Suporte as perguntas de clientes.
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Taxa da Média Móvel
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
-DocType: Comment,Reference Name,Nome de Referência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: Sales Invoice Item,Target Warehouse,Almoxarifado de destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},O estado {0} {1} é {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde. Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Abrindo'
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
 DocType: Expense Claim,Expenses,Despesas
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
 ,Purchase Receipt Trends,Compra Trends Recibo
 DocType: Appraisal,Select template from which you want to get the Goals,Selecione o modelo a partir do qual você deseja obter as Metas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Valor a ser Faturado
 DocType: Company,Registration Details,Detalhes de Registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Estacando
 DocType: Item,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
@@ -788,18 +725,16 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,O Saldo deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Mensagem de recusa do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Pregando
 ,Available Qty,Disponível Qtde
 DocType: Purchase Taxes and Charges,On Previous Row Total,No Total na linha anterior
 DocType: Salary Slip,Working Days,Dias de Trabalho
 DocType: Serial No,Incoming Rate,Valor de Entrada
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
 DocType: Job Applicant,Hold,Segurar
 DocType: Employee,Date of Joining,Data da Efetivação
@@ -809,30 +744,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
 DocType: Purchase Invoice Item,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Taxa de Câmbio Mestre
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} deve ser ativo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Materiais Visitas {0} antes de cancelar este Manutenção Visita
 DocType: Salary Slip,Leave Encashment Amount,Valor das Licenças cobradas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade requerida
 DocType: Bank Reconciliation,Total Amount,Valor Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publishing Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor Patrimonial
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
-DocType: GL Entry,Account Currency,Conta Moeda
+DocType: Bank Reconciliation,Account Currency,Conta Moeda
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Antecipação da Nota Fiscal de Compra
 DocType: Address,Shop,Loja
@@ -841,7 +775,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta do Banco/Caixa padrão será atualizada automaticamente na nota fiscal do PDV quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Endereço permanente é
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Detalhes da Entrevista de saída
 DocType: Item,Is Purchase Item,É item de compra
@@ -853,68 +787,62 @@
 DocType: Payment Tool,Paid,Pago
 DocType: Salary Slip,Total in words,Total por extenso
 DocType: Material Request Item,Lead Time Date,Prazo de entrega
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez recorde de câmbios não é criado para
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,é mandatório. Talvez o registro de taxas de câmbios não está criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Favor especificar Sem Serial para item {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para os itens &#39;pacote de produtos &quot;, Armazém, Serial e não há Batch Não será considerada a partir do&#39; Packing List &#39;tabela. Se Warehouse e Batch Não são as mesmas para todos os itens de embalagem para qualquer item de &#39;Bundle Produto&#39;, esses valores podem ser inseridos na tabela do item principal, os valores serão copiados para &#39;Packing List&#39; tabela."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Os embarques para os clientes.
 DocType: Purchase Invoice Item,Purchase Order Item,Item da Ordem de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
-DocType: Contact Us Settings,Address Line 1,Endereço
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da Empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
+,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selecionar item para Transferência
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione a Conta do banco onde o cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Taxa da Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
 DocType: HR Settings,Don't send Employee Birthday Reminders,Não envie aos empregados lembretes de aniversários
-DocType: Comment,Unsubscribed,Inscrição Cancelada
-DocType: Opportunity,Walk In,"Caminhe em
-"
+DocType: Opportunity,Walk In,Caminhe em
 DocType: Item,Inspection Criteria,Critérios de Inspeção
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Branco
-DocType: SMS Center,All Lead (Open),Todos Prospectos (Abertos)
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco
+DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexe sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexe sua imagem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total por extenso
-DocType: Workflow State,Stop,pare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Houve um erro . Uma razão provável pode ser que você não tenha salvo o formulário. Entre em contato com support@erpnext.com se o problema persistir .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Meu carrinho
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
 DocType: Lead,Next Contact Date,Data do próximo Contato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtde abertura
 DocType: Holiday List,Holiday List Name,Nome da lista de feriados
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Solicitação de Licenças
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ferramenta de Alocação de Licenças
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se orçamento mensal excedido (por conta de despesas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aparar
 DocType: Workstation,Net Hour Rate,Net Hour Taxa
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de compra do custo de desembarque
 DocType: Company,Default Terms,Termos Padrão
 DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: POS Profile,Cash/Bank Account,Conta do Caixa/Banco
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos da compra
 DocType: Workstation,Wages,Salário
@@ -931,7 +859,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Estado' e salvar
 DocType: Serial No,Creation Document No,Número de Criação do Documento
 DocType: Issue,Issue,Questão
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conta não coincidir com a Empresa
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
 DocType: BOM Operation,Operation,Operação
@@ -939,13 +868,13 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pedido de Vendas {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fazendo de Stock Entradas
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Fazendo de Stock Entradas
 DocType: Packing Slip,Net Weight UOM,UDM do Peso Líquido
 DocType: Item,Default Supplier,Fornecedor padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ao longo de Produção Provisão Percentagem
@@ -960,29 +889,27 @@
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Idade Média
 DocType: Opportunity,Your sales person who will contact the customer in future,Seu vendedor entrará em contato com o cliente no futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite a designação deste contato
-DocType: Contact Us Settings,Address,Endereço
 DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar diferença de lançamento
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área Chave de Performance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Total de Personagens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalhe Fatura do Formulário-C
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconciliação O pagamento da fatura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuição%
 DocType: Item,website page link,link da página do site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens encomendados a serem faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1001,15 +928,13 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Saldo de Contabilidade
 DocType: Sales Invoice Advance,Sales Invoice Advance,Antecipação da Nota Fiscal de Venda
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nada de pedir
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser superior que a 'Data Final Real'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gestão
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gestão
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de atividades para quadro de horários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Carcaça de investimento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},De qualquer débito ou valor do crédito é necessário para {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ativo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,É Retorno
 DocType: Price List Country,Price List Country,Preço da lista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Outros nós só pode ser criado sob os nós do tipo ""grupo"""
@@ -1019,50 +944,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS perfil {0} já criado para o usuário: {1} e {2} empresa
 DocType: Purchase Order Item,UOM Conversion Factor,Fator de Conversão da UDM
 DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objeto de fabricação laminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banco de dados do Fornecedor.
 DocType: Account,Balance Sheet,Balanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Estiramento formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impostos e outras deduções salariais.
-DocType: Lead,Lead,Prospecto
+DocType: Lead,Lead,Cliente em Potencial
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Banco de Ledger Entradas e GL As entradas são reenviados para os recibos de compra selecionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Número 1
 DocType: Holiday,Holiday,Feriado
-DocType: Event,Saturday,Sábado
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se considerado para todos os ramos
 ,Daily Time Log Summary,Resumo Diário Log Tempo
-DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Detalhes do pagamento
 DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entradas' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entradas' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
 DocType: Contact,User ID,ID de Usuário
-DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
-DocType: Communication,Delivery Status,Estado da entrega
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1073,13 +991,11 @@
 DocType: BOM Item,Item Description,Descrição do Item
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direto de metal sinterização a laser
 DocType: Purchase Order,Supplied Items,Itens fornecidos
 DocType: Production Order,Qty To Manufacture,Qtde. Para Fabricação
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter o mesmo valor através de todo o ciclo de compra
 DocType: Opportunity Item,Opportunity Item,Item da oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Equilíbrio Leave empregado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de Endereço
@@ -1089,41 +1005,40 @@
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Para tirar o melhor proveito de ERPNext, recomendamos que você levar algum tempo e assistir a esses vídeos de ajuda."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Item {0} deve ser item de vendas
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,para
-DocType: Item,Lead Time in days,Tempo de entrega em dias
+DocType: Item,Lead Time in days,Prazo de entrega em dias
 ,Accounts Payable Summary,Resumo do Contas a Pagar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter faturas pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número do Funcionário
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Valor faturado ( Exculsive Tributário)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Conta {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Re-ordenar Automaticamente
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total de Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
 DocType: Employee,Place of Issue,Local de Emissão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
-DocType: Report,Disabled,Desativado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
+DocType: Email Digest,Add Quote,Adicionar Citar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Seus produtos ou serviços
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Seus produtos ou serviços
 DocType: Mode of Payment,Mode of Payment,Forma de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Almoxarifado
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Nome é obrigatório
 DocType: Purchase Invoice,Recurring Type,Tipo de recorrência
 DocType: Address,City/Town,Cidade / Município
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto do Item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
@@ -1133,14 +1048,13 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,para Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta nas transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Só pode haver uma regra de envio Condição com 0 ou valor em branco para "" To Valor """
 DocType: Authorization Rule,Transaction,Transação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este Centro de Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
-apps/frappe/frappe/config/desk.py +7,Tools,Ferramentas
 DocType: Item,Website Item Groups,Grupos de Itens do site
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Número de ordem de produção é obrigatória para fabricação propósito entrada estoque
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
@@ -1148,24 +1062,22 @@
 DocType: Journal Entry,Journal Entry,Lançamento do livro Diário
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentários
 DocType: Salary Slip,Bank Account No.,Nº Conta Bancária
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
 DocType: Quality Inspection Reading,Reading 8,Leitura 8
 DocType: Sales Partner,Agent,Agente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode você deve mudar &quot;Distribuir taxas sobre &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
 DocType: BOM Operation,Workstation,Estação de Trabalho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ferragens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ferragens
 DocType: Attendance,HR Manager,Gerente de RH
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, selecione uma empresa"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
 DocType: Salary Slip,Earning,Ganho
 DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
@@ -1175,26 +1087,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Você pode fazer um registro de tempo apenas contra uma ordem de produção apresentada
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
-DocType: File,old_parent,old_parent
-apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters para contatos, leva."
+apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Email Marketing para Contatos e Clientes em Potencial.
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos devem ser 100. É {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a serem faturados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
-DocType: DocField,Description,Descrição
 DocType: Authorization Rule,Average Discount,Desconto Médio
-DocType: Letter Head,Is Default,É padrão
 DocType: Address,Utilities,Serviços Públicos
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração de características
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vista Oferta Letter
-DocType: Communication,Communication,Comunicação
 DocType: Item,Is Service Item,É item de serviço
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
@@ -1213,7 +1122,7 @@
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1223,7 +1132,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdos dos Termos e Condições
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem agendamento
 DocType: Employee,Owned,Pertencente
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1237,31 +1146,28 @@
 DocType: HR Settings,Employee Settings,Configurações Empregado
 ,Batch-Wise Balance History,Balanço por Histórico de Lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Lista de Tarefas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Detalhe da tabela de imposto obtido a partir mestre como uma string e armazenado neste campo.
  Usado para Tributos e Encargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empregado não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada , as entradas são permitidos aos usuários restritos."
 DocType: Email Digest,Bank Balance,Saldo bancário
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Sem Estrutura salarial para o empregado ativo encontrado {0} eo mês
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da Vaga , qualificações exigidas , etc"
 DocType: Journal Entry Account,Account Balance,Saldo da conta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regra de imposto para transações.
 DocType: Rename Tool,Type of document to rename.,Tipo de documento a ser renomeado.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nós compramos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Não Enviados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (moeda da empresa)
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar para {0} destinatários
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assembléias
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
@@ -1271,105 +1177,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na importação !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,No Qt
 DocType: Notification Control,Expense Claim Rejected,Pedido de Reembolso de Despesas Rejeitado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,governo
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,governo
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escareaï¿½o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Nº da Ordem de Venda
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Lote disponível Qtde no Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Tempo Log Detail Batch
-DocType: Workflow State,Tasks,Tarefas
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
-DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo do Contas a Receber
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome da UDM
-DocType: Top Bar Item,Target,Meta
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribuição Total
 DocType: Sales Invoice,Shipping Address,Endereço de envio
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta ferramenta ajuda você a atualizar ou corrigir a quantidade ea valorização das ações no sistema. Ele é geralmente usado para sincronizar os valores do sistema e que realmente existe em seus armazéns.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Por extenso será visível quando você salvar a Guia de Remessa.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Cadastro de Marca.
-DocType: ToDo,Due Date,Data de Vencimento
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Cadastro de Marca.
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,a Organização
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,a Organização
 DocType: Monthly Distribution,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Ordem de Venda do Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
-DocType: Address,Lead Name,Nome do Prospecto
+DocType: Address,Lead Name,Nome do Cliente em Potencial
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Abertura da Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundição centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic acabamento assistida-campo
 DocType: Company,Default Holiday List,Lista Padrão de Feriados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passivo estoque
 DocType: Purchase Receipt,Supplier Warehouse,Almoxarifado do Fornecedor
 DocType: Opportunity,Contact Mobile No,Celular do Contato
 DocType: Production Planning Tool,Select Sales Orders,Selecione as Ordens de Venda
 ,Material Requests for which Supplier Quotations are not created,Os pedidos de materiais para os quais Fornecedor Quotations não são criados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na Guia de Remessa e Nota Fiscal de Venda através do escaneamento do código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Aniversário Lembretes
 DocType: SMS Center,Receiver List,Lista de recebedores
@@ -1377,31 +1274,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visão
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução da Estrutura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importe com sucesso!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
 DocType: Quotation Item,Quotation Item,Item da Cotação
 DocType: Account,Account Name,Nome da Conta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça do Fornecedor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Adicionar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Cobrada
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,reservados Qtde
 DocType: Party Account,Party Account,Conta Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Empresa de moeda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
@@ -1410,12 +1303,9 @@
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Uni de press de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensagem isostática a quente
-DocType: ToDo,Medium,Médio
 DocType: Budget Detail,Budget Allocated,Orçamento Alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de Crédito do Cliente
@@ -1424,12 +1314,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
 DocType: Quotation,Term Details,Detalhes dos Termos
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
 DocType: Warranty Claim,Warranty Claim,Reclamação de Garantia
-,Lead Details,Detalhes do Prospecto
-DocType: Authorization Rule,Approving User,Usuário Aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanização
+,Lead Details,Detalhes do Cliente em Potencial
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
 DocType: Pricing Rule,Applicable For,aplicável
 DocType: Bank Reconciliation,From Date,A partir da data
@@ -1451,64 +1338,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Leilões Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa , Mês e Ano Fiscal é obrigatória"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Item de relatório Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer essa entrada de material
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unidade única de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faça Contabilidade entrada para cada Banco de Movimento
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter Modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Peso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de material
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,produtos
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,produtos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em ordens de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído pois existe quantidade para item {1}
 DocType: Quotation,Order Type,Tipo de Ordem
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 DocType: Payment Tool,Find Invoices to Match,Encontre Faturas para combinar
 ,Item-wise Sales Register,Vendas de item sábios Registrar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ex: ""XYZ National Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ex: ""XYZ National Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este imposto está incluído no Valor Base?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Alvo total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Alvo total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Não há ordens de produção criadas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Sales Invoice Item,Batch No,Nº do Lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
-DocType: DocPerm,Delete,Excluir
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Criar ordem de compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Criar ordem de compra
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
 DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
 DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliação de Estoque
@@ -1517,53 +1402,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Candidato à uma vaga
 DocType: Purchase Order Item,Warehouse and Reference,Armazém e referências
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações estatutárias e outras informações gerais sobre o seu Fornecedor
-DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
-DocType: Communication,Received,recebido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Journal Entry {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
-DocType: DocField,Attach Image,Anexar Imagem
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
-DocType: Stock Reconciliation Item,Leave blank if no change,Deixe em branco se não houver mudança
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo e Custo Real
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
 DocType: Employee,Salutation,Saudação
-DocType: Communication,Rejected,Rejeitado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Também se aplica a variantes
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Sales Order Item,Actual Qty,Qtde Real
 DocType: Sales Invoice Item,References,Referências
 DocType: Quality Inspection Reading,Reading 10,Leitura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Você digitou itens duplicados . Por favor, corrigir e tentar novamente."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para o atributo {1} não existe na lista de item válido Valores de Atributo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Para Pacote Nº.
-DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Data da Questão
 DocType: Activity Cost,Activity Cost,Custo de atividade
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicações
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
 DocType: Payment Tool,Make Payment Entry,Criar entrada de pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Tendência de Notas Fiscais de Venda
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Para
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Armazém de entrega
 DocType: Stock Settings,Allowance Percent,Percentual de tolerância
@@ -1575,33 +1455,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Item da Cotação do Fornecedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Criar estrutura salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clique em &#39;Criar Fatura de vendas&#39; botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendedor pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
-DocType: Dropbox Backup,Dropbox Access Secret,Segredo de Acesso Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Nota Fiscal Recorrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gerenciamento de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget Detail,Fiscal Year,Exercício fiscal
 DocType: Cost Center,Budget,Orçamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Território / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,por exemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Tree grupo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} não está configurado para n º s de série mestre check item
 DocType: Maintenance Visit,Maintenance Time,Tempo da manutenção
 ,Amount to Deliver,Valor a entregar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Um produto ou serviço
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ocorreram erros .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Um produto ou serviço
 DocType: Naming Series,Current Value,Valor Atual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra a Ordem de Vendas
@@ -1616,15 +1491,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo de Itens do site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
 DocType: Material Request Item,Material Request Item,Item de solicitação de material
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos de itens .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Árvore de Grupos de itens .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Pedidos em aberto Produção
@@ -1634,12 +1509,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes da Resolução
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Alterar UDM de um item.
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
 DocType: Item Attribute,Attribute Name,Nome do atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} deve ser de Vendas ou Atendimento item em {1}
 DocType: Item Group,Show In Website,Mostrar No Site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupo
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 ,Qty to Order,Qtde encomendar
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para rastrear marca no seguintes documentos Nota de Entrega, Oportunidade, Pedir Material, Item, Pedido de Compra, Compra de Vouchers, o Comprador Receipt, cotação, Vendas fatura, Pacote de Produtos, Pedido de Vendas, Serial No"
@@ -1648,78 +1522,67 @@
 DocType: Holiday List,Clear Table,Limpar Tabela
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Nota Fiscal nº
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Preço de Custo
 ,Customer Addresses And Contacts,Endereços e Contatos do Cliente
 DocType: Employee,Resignation Letter Date,Data da carta de demissão
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,não informado
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sente-se apertado enquanto o sistema está sendo configurado . Isso pode demorar alguns instantes.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,par
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Maintenance Schedule Detail,Actual Date,Data Real
 DocType: Item,Has Batch No,Tem nº de Lote
 DocType: Delivery Note,Excise Page Number,Número de página do imposto
 DocType: Employee,Personal Details,Detalhes pessoais
 ,Maintenance Schedules,Horários de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gravação em relevo
 ,Quotation Trends,Tendências de cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item, ele deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
-DocType: Authorization Rule,Above Value,Acima do Valor
 ,Pending Amount,Enquanto aguarda Valor
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será interrompida
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
 DocType: Journal Entry,Accounts Receivable,Contas a Receber
 ,Supplier-Wise Sales Analytics,Fornecedor -wise vendas Analytics
 DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado
-DocType: Custom Field,Custom,Personalizado
 DocType: Production Order,Use Multi-Level BOM,Utilize LDM de Vários Níveis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Moldagem por injeção
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas finanial .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"A Conta {0} deve ser do tipo ""Ativo Fixo"" pois o item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações de RH
-apps/frappe/frappe/config/setup.py +130,Printing,Impressão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unidade
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Defina teclas de acesso Dropbox em sua configuração local
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,unidade
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Aquisição de Clientes e Fidelização
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almoxarifado onde você está mantendo estoque de itens rejeitados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Seu exercício termina em
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Seu exercício termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Os relatórios de despesas
-DocType: Issue,Support,Suporte
-DocType: Authorization Rule,Approving Role,Perfil de Aprovador
+DocType: Issue,Support,Pós-Vendas
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,salário por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar recursos como os números de ordem , POS , etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Na sequência de pedidos de materiais têm sido levantadas automaticamente com base no nível de re-ordem do item
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM fator de conversão é necessária na linha {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
 DocType: Address Template,Address Template,Modelo de endereço
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Digite Employee Id desta pessoa de vendas
@@ -1731,76 +1594,68 @@
 DocType: Opportunity,Quotation,Cotação
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Custo Atualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde. como por UDM de estoque
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, selecione um arquivo csv com dados válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Clientes em Potencial, Orçamentos, Pedido de Vendas, de Campanhas e etc, para medir retorno sobre o investimento."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qtde
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a Pontuação Total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
-DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
+apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
+DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company)
 DocType: Pricing Rule,Supplier,Fornecedor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
 DocType: Employee,Bank Name,Nome do Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Acima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Usuário {0} está desativado
 DocType: Leave Application,Total Leave Days,Total de dias de licença
-DocType: Journal Entry Account,Credit in Account Currency,Crédito em Conta de moeda
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: e-mails não serão enviado para usuários desabilitados
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selecione Empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego ( permanente , contrato, etc estagiário ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 DocType: Currency Exchange,From Currency,De Moeda
-DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,outros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou um serviço que é comprado, vendido ou mantido em estoque."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Concluído
-DocType: Web Form,Select DocType,Selecione o DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancário
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade encomendada
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por exemplo ""Construa ferramentas para os construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ex: ""Construa ferramentas para os construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Venda {1}
 DocType: Account,Fixed Asset,ativos Fixos
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
 DocType: Time Log Batch,Total Billing Amount,Valor Total do faturamento
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contas a Receber
@@ -1808,19 +1663,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Quebra de página
 DocType: Production Order Operation,Pending,Pendente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um funcionário específico
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Você não pode mudar UOM padrão de Variant. Para alterar UOM padrão para Variant UOM mudança padrão do modelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de escritório
 DocType: Purchase Invoice Item,Qty,Qtde.
 DocType: Fiscal Year,Companies,Empresas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,eletrônica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,eletrônica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levante solicitar material quando o estoque atinge novo pedido de nível
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Do Programa de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tempo integral
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tempo integral
 DocType: Purchase Invoice,Contact Details,Detalhes do Contato
 DocType: C-Form,Received Date,Data de recebimento
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se você criou um modelo padrão de Impostos e Taxas de Vendas Modelo, selecione um e clique no botão abaixo."
@@ -1832,14 +1687,15 @@
 DocType: Job Applicant,Job Opening,Vaga de emprego
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliação Pagamento
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Oferecer Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e ordens de produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturado Amt
 DocType: Time Log,To Time,Para Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Para adicionar nós filho, explorar árvore e clique no nó em que você deseja adicionar mais nós."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,A conta de Crédito deve ser uma conta do Contas à Pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Qtde concluída
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
@@ -1849,12 +1705,10 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão da perda
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar registro de pagamento para as Ordens ou Faturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo Estoque UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Nº de série de Itens
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões
@@ -1864,15 +1718,13 @@
 DocType: Bin,Actual Quantity,Quantidade Real
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldagem por compressão
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Clientes
 DocType: Leave Block List Date,Block Date,Bloquear Data
 DocType: Sales Order,Not Delivered,Não Entregue
 ,Bank Clearance Summary,Banco Resumo Clearance
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código do item> Item Grupo> Marca
 DocType: Appraisal Goal,Appraisal Goal,Meta de Avaliação
-DocType: Event,Friday,Sexta-feira
 DocType: Time Log,Costing Amount,Custando Montante
 DocType: Process Payroll,Submit Salary Slip,Enviar folha de pagamento
 DocType: Salary Structure,Monthly Earning & Deduction,Salário mensal e dedução
@@ -1880,16 +1732,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em massa
 DocType: Sales Partner,Address & Contacts,Endereços e Contatos
 DocType: SMS Log,Sender Name,Nome do Remetente
-DocType: Page,Title,Título
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalize
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Criar fatura de vendas
 DocType: Company,For Reference Only.,Apenas para referência.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Inválido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantidade Antecipada
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,Informe a 'Data Inicial'
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Informe a 'Data Inicial'
 DocType: Journal Entry,Reference Number,Número de Referência
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
@@ -1904,7 +1754,7 @@
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelhecimento Baseado em
 DocType: Item,End of Life,Fim de Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir que os usuários
 DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
@@ -1912,23 +1762,21 @@
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,transferência de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,transferência de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações , custos operacionais e dar uma operação única não às suas operações."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adicionar Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Adicionar Impostos
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
 DocType: Quality Inspection,Purchase Receipt No,Nº do Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinheiro Ganho
-DocType: System Settings,In Hours,Em Horas
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilíbrio esperado como por banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilíbrio esperado como por banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
 DocType: Appraisal,Employee,Funcionário
@@ -1941,15 +1789,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo pela Vale
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Sales Invoice,Mass Mailing,Divulgação em massa
-DocType: Page,Standard,Padrão
 DocType: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de Produtos Comprados
 DocType: Selling Settings,Sales Order Required,Ordem de Venda Obrigatória
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Criar Cliente
@@ -1959,30 +1805,25 @@
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
 DocType: Supplier,Is Frozen,Está Congelado
 DocType: Buying Settings,Buying Settings,Configurações de Compras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabamento em massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceito
-DocType: User,Female,Feminino
-DocType: Journal Entry Account,Debit in Account Currency,Débito em Conta de moeda
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que você realmente quer apagar todas as operações para esta empresa. Os seus dados mestre vai permanecer como está. Essa ação não pode ser desfeita."
-DocType: Print Settings,Modern,Moderno
-DocType: Communication,Replied,Respondeu
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referência inválida {0} {1}
 DocType: Payment Tool,Total Payment Amount,Valor Total Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planejada ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado em algum item
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa de se BOM mencionado em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
@@ -1990,19 +1831,18 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Uma Ordem de Produção separada será criada para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registros contábeis congelados até a presente data, ninguém pode criar/modificar registros com exceção do perfil especificado abaixo."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome da Transportadora
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidade de Medida
-DocType: Fiscal Year,Year End Date,"Data final do ano
-"
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidade de Medida
+DocType: Fiscal Year,Year End Date,Data final do ano
 DocType: Task Depends On,Task Depends On,Tarefa depende de
 DocType: Lead,Opportunity,Oportunidade
 DocType: Salary Structure Earning,Salary Structure Earning,Ganho da Estrutura Salarial
@@ -2022,16 +1862,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo da UOM)
 DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perfurante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa Envelhecimento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinagem fotoquímica
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2073,11 +1912,9 @@
  8. Digite Row: Se baseado em ""Anterior Row Total"", você pode selecionar o número da linha que será tomado como base para este cálculo (o padrão é a linha anterior).
  9. Considere imposto ou encargo para: Nesta seção, você pode especificar se o imposto / taxa é apenas para avaliação (não uma parte do total) ou apenas para total (não agrega valor ao item) ou para ambos.
  10. Adicionar ou deduzir: Se você quer adicionar ou deduzir o imposto."
-DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
-DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -2085,40 +1922,36 @@
 DocType: Journal Entry,Credit Note,Nota de Crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Completado Qtd não pode ser mais do que {0} para operação de {1}
 DocType: Features Setup,Quality,Qualidade
-DocType: Contact Us Settings,Introduction,Introdução
 DocType: Warranty Claim,Service Address,Endereço de Serviço
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 linhas para da reconciliação.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 linhas para da reconciliação.
 DocType: Stock Entry,Manufacture,Fabricação
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
 DocType: Purchase Invoice,Currency and Price List,Moeda e Preço
 DocType: Opportunity,Customer / Lead Name,Nome do Cliente/Cliente em Potencial
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produção
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Apuramento data não mencionada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Quantidade Instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Total de Ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ou
 DocType: Sales Order,Billing Status,Estado do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Lista de preço de compra padrão
-,Download Backups,Download de Backups
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir valores padrão , como Company, de moeda, Atual Exercício , etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de pagamento
 DocType: Process Payroll,Select Employees,Selecione funcionários
 DocType: Bank Reconciliation,To Date,Até a Data
 DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalhes
 DocType: Purchase Invoice,Total Taxes and Charges,Total de Impostos e Encargos
 DocType: Employee,Emergency Contact,Contato de emergência
 DocType: Item,Quality Parameters,Parâmetros de Qualidade
@@ -2133,6 +1966,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de Conta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda """
 ,To Produce,para Produzir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
@@ -2140,44 +1974,38 @@
 DocType: Bin,Reserved Quantity,Quantidade Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Itens do Recibo de Compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta de Receitas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Área Chave de Responsabilidade
 DocType: Item Reorder,Material Request Type,Tipo de solicitação de material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Reference
 DocType: Cost Center,Cost Center,Centro de Custos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,vale #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,vale #
 DocType: Notification Control,Purchase Order Message,Mensagem da Ordem de Compra
 DocType: Tax Rule,Shipping Country,O envio País
 DocType: Upload Attendance,Upload HTML,Carregar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Antecedência Total ({0}) contra a Ordem {1} não pode ser maior do que o Grand \
  Total ({2})"
 DocType: Employee,Relieving Date,Data da Liberação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Armazém só pode ser alterado através de entrada / entrega  da nota / recibo de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engenharia shaping net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
-apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trilha leva por setor Type.
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +328,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Configurações da
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar grupos de clientes
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Novo Centro de Custo Nome
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No modelo padrão Endereço encontrado. Por favor, crie um novo a partir de configuração> Impressão e Branding> modelo de endereço."
 DocType: Appraisal,HR User,HR Usuário
@@ -2189,31 +2017,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde Real Após a Transação
 ,Pending SO Items For Purchase Request,"Itens Pendentes Assim, por solicitação de compra"
 DocType: Supplier,Billing Currency,Faturamento Moeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
 ,Profit and Loss Statement,Demonstração dos Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número do cheque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premente
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso &#39;UOM Substitua Utility &quot;ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotação {0} esta cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2221,14 +2043,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número de S.O.
 DocType: Production Order Operation,Make Time Log,Make Time Log
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadores
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de moagem
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Este é um grupo de clientes de raiz e não pode ser editada.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a lançamentos contábeis"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir da data em Estrutura salarial não pode ser menor do que Employee Juntando Data.
 DocType: Employee Education,Graduate,Pós-graduação
 DocType: Leave Block List,Block Days,Bloco de Dias
@@ -2265,7 +2086,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Marque se é uma nota fiscal recorrente, desmarque para parar a recorrência ou colocar uma Data Final adequada"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Comparecimento para o empregado {0} já está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Se mais do que uma embalagem do mesmo tipo (para impressão)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo de {0} linhas permitido
 DocType: C-Form Invoice Detail,Net Total,Total Líquido
 DocType: Bin,FCFS Rate,Taxa FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Faturamento (Nota Fiscal de Vendas)
@@ -2282,20 +2102,19 @@
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Maquinagem electroquimica
 ,Requested,solicitado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
 DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturados"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Conta raiz deve ser um grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor em atraso + Valor de cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome da distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compra
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
-apps/frappe/frappe/templates/base.html +134,Added,Adicionado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gerenciar territórios
 DocType: Journal Entry Account,Sales Invoice,Nota Fiscal de Venda
 DocType: Journal Entry Account,Party Balance,Balance Partido
@@ -2309,11 +2128,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Lançamento Contábil de Estoque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
 DocType: Account,Root Type,Tipo de Raiz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Não é possível retornar mais de {1} para {2} item
@@ -2323,14 +2140,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: Quantidade de material solicitado é menor do que a ordem mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ou BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2341,42 +2157,39 @@
 DocType: Item,Manufacturer Part Number,Número de peça do fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: Bin,Bin,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Astrágalo
 DocType: SMS Log,No of Sent SMS,Nº de SMS enviados
 DocType: Account,Company,Empresa
 DocType: Account,Expense Account,Conta de Despesas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Cor
 DocType: Maintenance Visit,Scheduled,Agendado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de Preço Moeda não selecionado
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do Projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
 DocType: Installation Note Item,Against Document No,Contra o Documento Nº
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gerenciar parceiros de vendas.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Por favor seleccione {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,investigador
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Atualizar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,investigador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, salve o Boletim informativo antes de enviar"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome ou E-mail é obrigatório
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspeção de qualidade de entrada.
 DocType: Purchase Order Item,Returned Qty,Devolvido Qtde
 DocType: Employee,Exit,Sair
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibroacabamento
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como Notas Fiscais e Guias de Remessa"
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como Notas Fiscais e Guias de Remessa"
 DocType: Employee,You can enter any date manually,Você pode entrar qualquer data manualmente
 DocType: Sales Invoice,Advertisement,Anúncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item do Recibo de Compra Fornecido
@@ -2384,43 +2197,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,URL de Gateway para SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titulo do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se o motivo da consulta foi uma campanha.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de Comparecimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
 DocType: Address,Preferred Shipping Address,Endereço para envio preferido
 DocType: Purchase Receipt Item,Accepted Warehouse,Almoxarifado Aceito
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
 DocType: Item,Valuation Method,Método de Avaliação
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,duplicar entrada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,duplicar entrada
 DocType: Serial No,Under Warranty,Sob Garantia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar a Ordem de Venda.
 ,Employee Birthday,Aniversário empregado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risco
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças alocadas (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
-apps/erpnext/erpnext/hooks.py +70,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Deformação
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um usuário com o papel ""Aprovador de Despesas"""
 ,Issued Items Against Production Order,Itens emitida contra Ordem de Produção
@@ -2432,7 +2242,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Nº do comprovante
@@ -2442,11 +2251,10 @@
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Manut. Cronograma
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
-DocType: Website Settings,Website Settings,Configurações do site
 DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém
 DocType: Activity Cost,Billing Rate,Preço de Faturamento
 ,Qty to Deliver,Qt para entregar
@@ -2457,20 +2265,19 @@
 DocType: Material Request,Requested For,solicitadas para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Guia de Remessa contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
 DocType: Serial No,Warranty / AMC Details,Garantia / Detalhes do CAM
 DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de mercado
-DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de trabalho interno do Funcionário
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Indiferente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2486,10 +2293,9 @@
 ,Billed Amount,valor faturado
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliação Bancária
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
-DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
 DocType: Sales Order,Fully Delivered,Totalmente entregue
 DocType: Lead,Lower Income,Baixa Renda
@@ -2498,40 +2304,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajuda Rápida
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Fonte e armazém de destino não pode ser o mesmo para a linha {0}
 DocType: Features Setup,Sales Extras,Extras de Vendas
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Orçamento {0} para conta {1} contra Centro de Custo {2} excederá por {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Orçamento {0} para conta {1} contra Centro de Custo {2} excederá por {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
 ,Stock Projected Qty,Banco Projetada Qtde
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos sobre Compras
 ,Qty to Receive,Qt para receber
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fator de conversão não pode estar em frações
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Você usará isso para o Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você usará isso para o Login
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os Tipos de Fornecedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Bancária Garantida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Criar folha de salário
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Principais Produtos
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Principais Produtos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Abertura Patrimônio Balance
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Não foi possível aprovar a licença que você não está autorizado a aprovar folhas em datas Bloco
 DocType: Appraisal,Appraisal,Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetida
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Email do Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2545,12 +2348,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Valor por hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Citação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De Citação
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Nº do Item da Ordem de Compra
-DocType: System Settings,System Settings,Configurações do sistema
 DocType: Project,Project Type,Tipo de Projeto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ou qty alvo ou valor alvo é obrigatória.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Custo das diferentes actividades
@@ -2559,36 +2361,32 @@
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os usuários com esta função são autorizados a estabelecer contas congeladas e criar / modificar lançamentos contábeis contra contas congeladas
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data de Faturamento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
-DocType: Communication,Recipients,Destinatários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Enroscando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Estado da Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor selecione a Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar email marketing
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A data inicial deve ser anterior a data final
 DocType: Sales Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta de Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Cliente/Cliente
 DocType: Item Group,Check this if you want to show in website,Marque esta opção se você deseja mostrar no site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bem vindo ao ERPNext
+,Welcome to ERPNext,Bem vindo ao ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número Detalhe voucher
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Levar a cotação
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Fazer um Orçamento
 DocType: Lead,From Customer,Do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM do Estoque
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,projetado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
@@ -2596,34 +2394,28 @@
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
-DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não Faturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Não ativo
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Faturamento
-apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers., Faturas levantada por Fornecedores.
+apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Faturas levantada por Fornecedores.
 DocType: POS Profile,Write Off Account,Eliminar Conta
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Journal Entry
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Vá para o grupo apropriado (geralmente Fonte de Recursos&gt;&gt; Passivo Circulante Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e fazer mencionar a taxa de imposto.
 ,Payment Period Based On Invoice Date,Período de pagamento com base no fatura Data
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte a laser
-DocType: Event,Monday,Segunda-feira
 DocType: Journal Entry,Stock Entry,Lançamento no Estoque
 DocType: Account,Payable,a pagar
 DocType: Salary Slip,Arrear Amount,Quantidade em atraso
@@ -2636,7 +2428,6 @@
 DocType: Lead,Address Desc,Descrição do Endereço
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Pelo menos um dos Vendedores ou Compradores deve ser selecionado
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
-DocType: Page,All,Tudo
 DocType: Stock Entry Detail,Source Warehouse,Almoxarifado de origem
 DocType: Installation Note,Installation Date,Data de Instalação
 DocType: Employee,Confirmation Date,Data de Confirmação
@@ -2644,9 +2435,8 @@
 DocType: Account,Sales User,Usuário de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Quantidade mínima não pode ser maior do que quantidade máxima
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
-DocType: Lead,Lead Owner,Proprietário do Prospecto
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Armazém é necessária
+DocType: Lead,Lead Owner,Proprietário do Cliente em Potencial
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Armazém é necessária
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisição de material automática
 DocType: Time Log,Will be updated when billed.,Será atualizado quando faturado.
@@ -2660,44 +2450,40 @@
 DocType: Territory,Territory Targets,Metas do Território
 DocType: Delivery Note,Transporter Info,Informações da Transportadora
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item da Ordem de Compra fornecido
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nome da empresa não pode ser empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Chefes de letras para modelos de impressão .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Atualizar Estoque
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de e-mail, telefone, chat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
 DocType: Purchase Invoice,Terms,condições
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Criar Novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Criar Novo
 DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatória
 ,Item-wise Sales History,Item-wise Histórico de Vendas
 DocType: Expense Claim,Total Sanctioned Amount,Valor Total Sancionado
 ,Purchase Analytics,Análise de compras
 DocType: Sales Invoice Item,Delivery Note Item,Item da Guia de Remessa
 DocType: Expense Claim,Task,Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbear
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Esta é uma pessoa de vendas de raiz e não pode ser editado .
 ,Stock Ledger,Livro de Inventário
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Classificação: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução da folha de pagamento
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e salvá-lo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixar um relatório contendo todas as matérias-primas com o seu estado mais recente do inventário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças antes da solicitação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeçalho Padrão
 DocType: Time Log,Billable,Faturável
-DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para a definição de regras no módulo RH
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
@@ -2709,12 +2495,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidade perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campos de desconto estarão disponíveis em Ordem de Compra, Recibo de Compra, Nota Fiscal de Compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
-DocType: Report,Report Type,Tipo de relatório
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregando
 DocType: BOM Replace Tool,BOM Replace Tool,Ferramenta de Substituição da LDM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereços administrados por País
 DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mostrar imposto break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se envolver em atividades de fabricação. Permite Item ' é fabricado '
@@ -2724,16 +2508,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
 DocType: Serial No,Out of AMC,Fora do CAM
 DocType: Purchase Order Item,Material Request Detail No,Detalhe materiais Pedido Não
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneamento duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Criar visita de manutenção
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,"Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se o pagamento não é feito contra qualquer referência, fazer Journal Entry manualmente."
 DocType: Item,Supplier Items,Fornecedor Itens
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidade
@@ -2745,7 +2528,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' é desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' é desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2753,59 +2536,51 @@
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
-DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Adicionar usuários
 DocType: Pricing Rule,Item Group,Grupo de Itens
 DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,LDM padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimento Bancário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimento Bancário
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,A fundição em areia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,internar
-DocType: Newsletter,A Lead with this email id should exist,Deve existir um Prospecto com esse endereço de e-mail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
+DocType: Newsletter,A Lead with this email id should exist,Deve existir um Cliente em Potencial com esse endereço de e-mail
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Básico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Para data deve ser mesmo a partir da data de licença Meio Dia
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por exemplo, kg, Unidade, nº, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","por exemplo, kg, Unidade, nº, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Efetivação deve ser maior do que a Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Almoxarifado
 DocType: Employee,Offer Date,Oferta Data
 DocType: Hub Settings,Access Token,Token de Acesso
@@ -2814,45 +2589,37 @@
 DocType: Item,Is Fixed Asset Item,É item de Imobilização
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se você formatos longos de impressão, esse recurso pode ser usado para dividir a página a ser impressa em várias páginas com todos os cabeçalhos e rodapés em cada página"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 DocType: Fiscal Year,Year Name,Nome do ano
 DocType: Process Payroll,Process Payroll,Processa folha de pagamento
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Nome do Parceiro de Vendas
 DocType: Purchase Invoice Item,Image View,Ver imagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabamento e acabamento industrial
 DocType: Issue,Opening Time,Horário de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
 DocType: Tax Rule,Shipping City,O envio da Cidade
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Batimento
-DocType: Web Page,Slideshow,Apresentação de slides
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Journal Entry,Print Heading,Cabeçalho de impressão
 DocType: Quotation,Maintenance Manager,Gerente de Manutenção
-DocType: Workflow State,Search,Pesquisar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dias desde a última Ordem' deve ser maior ou igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Corrigido a partir de
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Siga por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ou qty alvo ou valor alvo é obrigatório
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No BOM padrão existe para item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Encaminhar
@@ -2861,45 +2628,44 @@
 ,Produced,produzido
 DocType: Item,Item Code for Suppliers,Código do item para fornecedores
 DocType: Issue,Raised By (Email),Levantadas por (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Geral
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Anexar Timbrado
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Geral
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Anexar Timbrado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
-DocType: Blog Post,Blog Post,Mensagem do Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Despesas Postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferência de material para Fornecedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
-DocType: Lead,Lead Type,Tipo de Prospecto
+DocType: Lead,Lead Type,Tipo de Cliente em Potencial
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Criar Orçamento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Ondulação
 DocType: Account,Tax,Imposto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refino
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Produto
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Data do Relatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminhamento
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Detalhes dos Grupos de Itens
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
@@ -2908,33 +2674,29 @@
 DocType: Stock Entry,Update Rate and Availability,Taxa de atualização e disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentagem que estão autorizados a receber ou entregar mais contra a quantidade encomendada. Por exemplo: Se você encomendou 100 unidades. e seu subsídio é de 10%, então você está autorizada a receber 110 unidades."
 DocType: Pricing Rule,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Vendas Registrar
 DocType: Quotation,Quotation Lost Reason,Razão da perda da Cotação
 DocType: Address,Plant,Planta
-DocType: DocType,Setup,Configuração
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminação a frio
 DocType: Customer Group,Customer Group Name,Nome do Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
 DocType: Item,Attributes,Atributos
-DocType: Packing Slip,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
-DocType: DocField,Image,Imagem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Criar imposto de fatura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
-DocType: Communication,Other,Outro
 DocType: C-Form,C-Form,Formulário-C
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Tipo de Criação do Documento
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrança
 DocType: Purchase Invoice,Mobile No,Telefone Celular
 DocType: Payment Tool,Make Journal Entry,Faça Journal Entry
@@ -2942,35 +2704,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data Final prevista
 DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id da distribuição
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Principais Serviços
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos os Produtos ou Serviços.
 DocType: Purchase Invoice,Supplier Address,Endereço do Fornecedor
-DocType: Contact Us Settings,Address Line 2,Complemento
-DocType: ToDo,Reference,Referência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perfurante
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Fora Qtde
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serviços Financeiros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para o ítem de estoque {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch BOM explodiu (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Para (Funcionário)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterização
 DocType: Journal Entry,Pay To / Recd From,Pagar Para/ Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
 DocType: Supplier,Contact HTML,Contato HTML
@@ -2981,9 +2737,8 @@
 DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
-DocType: Product Bundle,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixar o Modelo
 DocType: GL Entry,Remarks,Observações
@@ -2991,48 +2746,44 @@
 DocType: Journal Entry,Write Off Based On,Eliminar Baseado em
 DocType: Features Setup,POS View,Visualizar PDV
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um nº de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,A Conta {0} não pode ser um Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Descanso semanal
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorno Contra Vendas Fatura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
 DocType: Serial No,Creation Time,Data de Criação
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Receita Total
 DocType: Sales Invoice,Product Bundle Help,Produto Bundle Ajuda
 ,Monthly Attendance Sheet,Folha de Presença Mensal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nenhum registro encontrado
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obter Itens de Bundle Produto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,A Conta {0} está inativa
 DocType: GL Entry,Is Advance,É antecipado
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Data de Início do Comparecimento e Data Final de Comparecimento é obrigatória
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
 DocType: Sales Team,Contact No.,Nº Contato.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,A conta {0} tipo 'Lucros e Perdas' não é permitida na Abertura do Período
-DocType: Workflow State,Time,Tempo
 DocType: Features Setup,Sales Discounts,Descontos de Vendas
 DocType: Hub Settings,Seller Country,País do Vendedor
 DocType: Authorization Rule,Authorization Rule,Regra de autorização
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condições
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Faixa que vai ser mostrada no topo da lista de produtos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar sub-item
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Fator de Conversão é obrigatório
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -3040,15 +2791,13 @@
 ,Customers Not Buying Since Long Time,Os clientes não compra desde há muito tempo
 DocType: Production Order,Expected Delivery Date,Data de entrega prevista
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Horário da Postagem
@@ -3062,26 +2811,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Pai {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
-DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
 ,Transferred Qty,transferido Qtde
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planejamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planejamento
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Criar tempo de log
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nós vendemos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
@@ -3090,18 +2836,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicione linhas para definir orçamentos anuais nas Contas.
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os Contatos.
 DocType: Newsletter,Test Email Id,Endereço de Email de Teste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Sigla da Empresa
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Sigla da Empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se você seguir Inspeção de Qualidade . Permite item QA Obrigatório e QA Não no Recibo de compra
 DocType: GL Entry,Party Type,Tipo de Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotomoldagem
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Modelo Mestre de Salário .
 DocType: Leave Type,Max Days Leave Allowed,Período máximo de Licença
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
@@ -3112,18 +2856,18 @@
 apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Carrinho
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Thank you for your interest in subscribing to our updates,Obrigado por seu interesse na subscrição de nossas atualizações
 ,Qty to Transfer,Qtde transferir
-apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Prospectos ou Clientes.
+apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Clientes em Potencial ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Pai {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretário
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Empregado Records para ser criado por
@@ -3136,43 +2880,38 @@
 ,Item-wise Price List Rate,-Item sábio Preço de Taxa
 DocType: Purchase Order Item,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar a cotação.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,O Cliente é obrigatório
-DocType: Letter Head,Letter Head,Timbrado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para Retorno
 DocType: Purchase Order,To Receive,Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Receitas / Despesas
 DocType: Employee,Personal Email,E-mail pessoal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variância total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Corretagem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretagem
 DocType: Address,Postal Code,Código postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
  Atualizado via 'Time Log'"
-DocType: Customer,From Lead,Do Lead
+DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberadas para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um almoxarifado é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do Projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
-DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Nº do Lote do Item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
@@ -3180,13 +2919,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,Nº da LDM
-DocType: Contact Us Settings,Pincode,CEP
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo Estoque UOM deve ser diferente do atual UOM estoque
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar comparecimento a partir de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3202,10 +2939,7 @@
 DocType: Project,Default Cost Center,Centro de Custo Padrão
 DocType: Purchase Invoice,End Date,Data final
 DocType: Employee,Internal Work History,História Trabalho Interno
-DocType: DocField,Column Break,Quebra de coluna
-DocType: Event,Thursday,Quinta-feira
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Volta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentário do Cliente
 DocType: Account,Expense,despesa
 DocType: Sales Invoice,Exhibition,Exposição
@@ -3218,31 +2952,30 @@
 DocType: Employee,Held On,Realizada em
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
 ,Employee Information,Informações do Funcionário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Taxa (%)
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Não é possível filtrar com base no Comprovante Não, se agrupados por voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Criar cotação com fornecedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Criar cotação com fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,ID do Lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratado na linha {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
 DocType: GL Entry,Party,Parte
 DocType: Sales Order,Delivery Date,Data de entrega
-DocType: DocField,Currency,Moeda
 DocType: Opportunity,Opportunity Date,Data da oportunidade
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
 DocType: Purchase Order,To Bill,Para Bill
 DocType: Material Request,% Ordered,% Ordenado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
@@ -3259,77 +2992,68 @@
 DocType: Opportunity,To Discuss,Para Discutir
 DocType: SMS Settings,SMS Settings,Definições de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Contas temporárias
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Preto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,Item da Explosão da LDM
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
-DocType: DocField,Fold,Dobrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,Desativar
 DocType: Project Task,Pending Review,Revisão pendente
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Por favor, especifique"
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação Despesa Total (via Despesa Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id do Cliente
-DocType: Page,Page Name,Nome da Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Mestre {1} não pertence à empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabamento Spindle
 DocType: BOM,Last Purchase Rate,Valor da última compra
 DocType: Account,Asset,Ativo
 DocType: Project Task,Task ID,ID Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por exemplo "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","por exemplo "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo da transação Pessoa-wise vendas
-DocType: System Settings,Time Zone,Fuso horário
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% do material entregue contra esta Guia de Remessa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detalhes do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formação
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro da url para os números de receptores
 DocType: Sales Invoice,Paid Amount,Valor pago
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
 ,Available Stock for Packing Items,Estoque disponível para o empacotamento de Itens
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha no
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Histórico de trabalho externo do Funcionário
 DocType: Tax Rule,Purchase,Compras
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balanço Qtde
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balanço Qtde
 DocType: Item Group,Parent Item Group,Grupo de item pai
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de custo
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Armazéns .
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Armazéns .
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa na qual a moeda do fornecedor é convertida para a moeda base da empresa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitos Timings com linha {1}
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Padrão de Despesa
 DocType: Employee,Notice (days),Notice ( dias)
-DocType: Page,Yes,Sim
 DocType: Tax Rule,Sales Tax Template,Template Imposto sobre Vendas
 DocType: Employee,Encashment Date,Data da cobrança
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedido de Compra, nota fiscal de compra ou do Diário"
 DocType: Account,Stock Adjustment,Banco de Ajuste
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
 DocType: Production Order,Planned Operating Cost,Planejado Custo Operacional
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nome
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Segue em anexo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Segue em anexo {0} # {1}
 DocType: Job Applicant,Applicant Name,Nome do Candidato
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3066,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Não Serial é obrigatória para item {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Criado por
 DocType: Serial No,Under AMC,Sob CAM
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,As configurações padrão para a venda de transações.
@@ -3354,17 +3077,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Valor mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Atualizar Produtos Acabados
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} já usado em {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conta para o armazém ( inventário permanente ) será criado nessa conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 DocType: Company,Distribution,Distribuição
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência do Fornecedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se marcado, os itens da LDM para a Sub-Montagem serão considerados para obter matérias-primas. Caso contrário, todos os itens da sub-montagem vão ser tratados como matéria-prima."
@@ -3372,17 +3094,16 @@
 DocType: Hub Settings,Seller Description,Descrição do Vendedor
 DocType: Employee Education,Qualification,Qualificação
 DocType: Item Price,Item Price,Preço do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,pedido
 DocType: Warehouse,Warehouse Name,Nome do Almoxarifado
 DocType: Naming Series,Select Transaction,Selecione a Transação
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, indique Aprovando Papel ou aprovar Usuário"
 DocType: Journal Entry,Write Off Entry,Escrever Off Entry
 DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base em
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suporte
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Análise de Pós-Vendas
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Não exite uma empresa relacionada nos armazéns {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitário para Substituir UDM do Estoque
 DocType: POS Profile,Terms and Conditions,Termos e Condições
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, preocupações médica, etc"
@@ -3394,28 +3115,26 @@
 DocType: Sales Order Item,For Production,Para Produção
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Por favor entre pedidos de vendas na tabela acima
 DocType: Project Task,View Task,Ver Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,O ano financeiro inicia em
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,O ano financeiro inicia em
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 DocType: Sales Invoice,Get Advances Received,Obter adiantamentos recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Transaction not allowed against stopped Production Order {0},Transação não é permitido contra parou Ordem de produção {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
-apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
+apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada de emails para suporte. ( por exemplo pos-vendas@examplo.com.br )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Data Final' é necessária
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Data Final' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
 DocType: Sales Invoice Item,Sales Order Item,Item da Ordem de Venda
 DocType: Salary Slip,Payment Days,Datas de Pagamento
 DocType: BOM,Manage cost of operations,Gerenciar custo das operações
 DocType: Features Setup,Item Advanced,Item antecipado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminação a quente
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são &quot;Enviadas&quot;, um pop-up abre automaticamente para enviar um e-mail para o &quot;Contato&quot; associado a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Escolaridade do Funcionário
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Não {0} já foi recebido
@@ -3424,47 +3143,38 @@
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
 DocType: Expense Claim,Total Claimed Amount,Montante Total Requerido
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
 DocType: Email Digest,Email Digest,Resumo por E-mail
 DocType: Delivery Note,Billing Address Name,Nome do Endereço de Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Lojas de Departamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Equilíbrio sistema
-DocType: Workflow,Is Active,É Ativo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Equilíbrio sistema
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Taxável
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mudança abreviação
-DocType: Workflow State,Primary,Primário
 DocType: Expense Claim Detail,Expense Date,Data da despesa
 DocType: Item,Max Discount (%),Desconto Máx. (%)
-DocType: Communication,More Information,Mais informação
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Jateamento
 DocType: Company,Warn,Avisar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valorização item atualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve ir nos registros."
 DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
 DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
-DocType: Communication,Series,série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
 DocType: Appraisal,Appraisal Template,Modelo de Avaliação
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade da visita de manutenção
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,período
 ,General Ledger,Razão Geral
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veja Leads
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veja os Clientes em Potencial
 DocType: Item Attribute Value,Attribute Value,Atributo Valor
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","ID de e-mail deve ser único, já existe para {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Recomendado nível de reposição
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Por favor seleccione {0} primeiro
 DocType: Features Setup,To get Item Group in details table,Para obter Grupo de Itens na tabela de detalhes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redesenhar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura a água forte
 DocType: Sales Invoice,Commission,Comissão
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3490,7 +3200,7 @@
  {% if% email_id} Email: {{email_id}} & lt; br & gt ; {endif% -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Quantidade padrão
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse não foi encontrado no sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse não foi encontrado no sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumo deste mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura da Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
@@ -3509,13 +3219,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalhe da Conversão de UDM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Circulação Vouchers
 DocType: Warranty Claim,Resolved By,Resolvido por
 DocType: Appraisal,Start Date,Data de Início
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocar licenças por um período.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir ela mesma como uma conta principal
@@ -3525,55 +3234,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário por parte do fornecedor para entregar
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Data Inicial prevista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolando
-DocType: ToDo,Priority,Prioridade
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
-DocType: Dropbox Backup,Weekly,Semanalmente
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Por exemplo: smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluída
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido , porque Cotação foi feita."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Relatórios principais
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Banco de Ledger Entradas saldos atualizados
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da Lista de Preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totais
 DocType: BOM,Manufacturing,Fabricação
 ,Ordered Items To Be Delivered,Itens encomendados a serem entregues
 DocType: Account,Income,Receitas
-,Setup Wizard,Assistente de Configuração
 DocType: Industry Type,Industry Type,Tipo de indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos 
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Aviso: pedido de férias contém as datas de intervalos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Amount (Moeda Company)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
-DocType: Email Alert,Reference Date,Data de Referência
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique nn móveis válidos"
 DocType: Budget Detail,Budget Detail,Detalhe do Orçamento
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
-DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Da UOM atualizado do número {0}
-DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize Configurações SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo Log {0} já faturado
@@ -3586,55 +3283,52 @@
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização a que este endereço pertence.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Seus Fornecedores
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Seus Fornecedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como perdida como ordem de venda é feita.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Outra estrutura Salário {0} está ativo para empregado {1}. Por favor, faça o seu estatuto ""inativos"" para prosseguir."
 DocType: Purchase Invoice,Contact,Contato
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Recebido de
 DocType: Features Setup,Exports,Exportações
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Tem nº de Série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Unreconciled Entradas
 DocType: Cost Center,Budgets,Orçamentos
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atualizado
 DocType: Employee,Emergency Contact Details,Detalhes do contato de emergência
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,O que isto faz ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,O que isto faz ?
 DocType: Delivery Note,To Warehouse,Para Almoxarifado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},A Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Funcionário {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Almoxarifado da origem padrão
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Dobrando
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dias desde a última ordem
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dias desde a última ordem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Séries nomeadas
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
-DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos estoque
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Assinantes de importação
@@ -3642,19 +3336,18 @@
 DocType: Attendance,Present,Apresentar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Entrega Nota {0} não deve ser apresentado
 DocType: Notification Control,Sales Invoice Message,Mensagem da Nota Fiscal de Venda
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,ordenada Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade / tarefa do projeto.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gerar folhas de pagamento
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} não é um ID de e-mail válido
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
-DocType: ToDo,Low,Baixo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Fiação
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3676,7 +3369,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome da campanha é necessária
 DocType: Maintenance Visit,Maintenance Date,Data de manutenção
 DocType: Purchase Receipt Item,Rejected Serial No,Nº de Série Rejeitado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Desenho profundo
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novo Boletim informativo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3687,7 +3379,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
 ,Sales Analytics,Analítico de Vendas
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
@@ -3699,28 +3390,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Novo Nome da conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de fornecimento de Matérias-Primas
 DocType: Selling Settings,Settings for Selling Module,Definições para vender Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalhe do Cliente do Item
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme Seu Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar e-mail no envio da
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} é necessária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldagem a vácuo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista não pode ser antes de Material Data do Pedido
-DocType: Contact Us Settings,City,Cidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualizar Números de Séries
 DocType: Account,Equity,equidade
 DocType: Sales Order,Printing Details,Imprimir detalhes
 DocType: Task,Closing Date,Data de Encerramento
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
@@ -3728,7 +3415,7 @@
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Agora
@@ -3736,26 +3423,24 @@
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qtde. planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,De meio expediente
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serial Series Número
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,O primeiro usuário : Você
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,O primeiro usuário : Você
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor faturado
 DocType: Attendance,Attendance,Comparecimento
-DocType: Page,No,Não
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
@@ -3763,55 +3448,46 @@
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por extenso será visível quando você salvar a Ordem de Compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Comprovante de Encerramento período
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Mestre Lista de Preços.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Mestre Lista de Preços.
 DocType: Task,Review Date,Data da Revisão
 DocType: Purchase Invoice,Advance Payments,Adiantamentos
-DocType: DocPerm,Level,Nível
 DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,O 'Endereço de Email para Notificação' não foi especificado para %s recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresagem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,O 'Endereço de Email para Notificação' não foi especificado para %s recorrente
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
 DocType: Company,Round Off Account,Termine Conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordiscando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consultoria
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,E-mail do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
 DocType: Bank Reconciliation Detail,Voucher ID,ID do Comprovante
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este é um território de raiz e não pode ser editada.
 DocType: Packing Slip,Gross Weight UOM,UDM do Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de desembarque do Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir Sem Quantia
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria imposto não pode ser ' Avaliação ' ou ' Avaliação e total "", como todos os itens não são itens de estoque"
-DocType: User,Last Name,Sobrenome
-DocType: Web Page,Left,Esquerda
-DocType: Event,All Day,Todo o Dia
-DocType: Issue,Support Team,Equipe de Apoio
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoria imposto não pode ser ' Avaliação ' ou ' Avaliação e total "", como todos os itens não são itens de estoque"
+DocType: Issue,Support Team,Equipe de Pós-Vendas
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (sobre 5)
-DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lote
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
-DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
 DocType: Stock Entry,As per Stock UOM,Como UDM do Estoque
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
@@ -3825,44 +3501,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, não total. de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Antecipação Total
-DocType: Workflow State,User,Usuário
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processamento de folha de pagamento
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Quantidade de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Definir como perdida
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
 DocType: Customer,Credit Days Based On,Dias crédito com base em
 DocType: Tax Rule,Tax Rule,Regra imposto
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo ritmo durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi enviado
 ,Items To Be Requested,Itens a ser solicitado
-DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Preço para Facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Costura
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","E-mail ID da Empresa não foi encontrado , portanto o e-mail não pode ser enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fundos de Aplicação ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar baseado no item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
 DocType: Fiscal Year,Year Start Date,Data do início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
 DocType: Purchase Common,Purchase Common,Compras comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,De Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É PDV
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde. fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturas levantdas para Clientes.
-DocType: DocField,Default,Padrão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentados
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3873,70 +3545,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selecionando &quot;Sim&quot; vai dar uma identificação única para cada entidade deste item que pode ser vista no cadastro do Número de Série.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criado para Empregado {1} no intervalo de datas informado
 DocType: Employee,Education,educação
 DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
 DocType: Employee,Current Address Is,Endereço atual é
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 DocType: Address,Office,Escritório
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos no livro Diário.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Detalhes Compra / Fabricação
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventário Batch
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventário Batch
 DocType: Employee,Contract End Date,Data Final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de Venda contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxar as Ordens de Venda (pendentes de entrega) com base nos critérios acima
-DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,De Fornecedor Cotação
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,De Fornecedor Cotação
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,Quantidade mínima
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para controlar os itens em documentos de vendas e de compra com nsa lote. &quot;Indústria preferida: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Data da Transação
 DocType: Production Plan Item,Planned Qty,Qtde. planejada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Fiscal total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Almoxarifado de destino padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem do Recibo de Compra
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Data de Início Real
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue contra esta Ordem de Venda
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
-DocType: Email Account,Service,Serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Registrar salário mensal
-apps/frappe/frappe/website/template.py +140,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Valor na linha anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: valor do pagamento não pode ser maior do que a quantidade Outstanding
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total de Unpaid
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tempo Log não é cobrável
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salário líquido não pode ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
 DocType: SMS Settings,Static Parameters,Parâmetros estáticos
 DocType: Purchase Order,Advance Paid,Adiantamento pago
 DocType: Item,Item Tax,Imposto do Item
@@ -3945,14 +3610,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quant. Real é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Cartão de crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Cartão de crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricado ou reembalado
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,As configurações padrão para transações com ações .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,As configurações padrão para transações com ações .
 DocType: Purchase Invoice,Next Date,Próxima data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Nome do Vendedor
@@ -3962,47 +3625,44 @@
 DocType: Stock Entry,Repack,Reembalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Os valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Anexar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear licenças por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo Operacional Real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root não pode ser editado .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Montante atribuído não pode superior à quantia não ajustada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root não pode ser editado .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Montante atribuído não pode superior à quantia não ajustada
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a produção em feriados
 DocType: Sales Order,Customer's Purchase Order Date,Do Cliente Ordem de Compra Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Detalhes do peso do pacote
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, selecione um arquivo csv"
-DocType: Dropbox Backup,Send Backups to Dropbox,Enviar Backups para Dropbox
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Fornecedor Endereços e contatos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Por favor seleccione Categoria primeira
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
 DocType: Leave Type,Is Carry Forward,É encaminhado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens de BOM
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de entrega
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obter itens de BOM
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de entrega em dias
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,É abertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,A Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,A Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"

diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index cccac52..ea32aa8 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Modo de salário
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selecione distribuição mensal, se você quer acompanhar com base na sazonalidade."
 DocType: Employee,Divorced,Divorciado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenção: O mesmo artigo foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,produtos para o Consumidor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,produtos para o Consumidor
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione Partido Tipo primeiro"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Recozimento
 DocType: Item,Customer Items,Itens de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Conta {0}: conta principal {1} não pode ser um livro
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Deixe aprovadores
 DocType: Sales Partner,Dealer,Revendedor
 DocType: Employee,Rented,Alugado
-DocType: About Us Settings,Website,Site
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactação mais sinterização
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moeda é necessário para Preço de {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado na transação.
 DocType: Purchase Order,Customer Contact,Contato do cliente
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Van Materiaal Request
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Van Materiaal Request
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árvore
 DocType: Job Applicant,Job Applicant,Candidato a emprego
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Exigido por
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Deixe Nome Tipo
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Série atualizado com sucesso
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Costura
 DocType: Pricing Rule,Apply On,aplicar Em
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 ,Purchase Order Items To Be Received,Comprar itens para ser recebido
 DocType: SMS Center,All Supplier Contact,Todos os contactos de fornecedores
 DocType: Quality Inspection Reading,Parameter,Parâmetro
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Data prevista End não pode ser menor do que o esperado Data de Início
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
-DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Usar esta opção para manter o código do item a nível de clientes e para torná-los pesquisáveis com base em seu código
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa deve ser o mesmo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Aplicação deixar Nova
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,cheque administrativo
+DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Usar esta opção para manter o código do item a nível de clientes e para torná-los pesquisáveis com base em seu código
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Mostrar Variantes
-DocType: Sales Invoice Item,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Empréstimos ( Passivo)
 DocType: Employee Education,Year of Passing,Ano de Passagem
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Em Estoque
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Item do plano de produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizador {0} já está atribuído a Empregado {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Faça novo perfil POS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Cuidados de Saúde
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidados de Saúde
 DocType: Purchase Invoice,Monthly,Mensal
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Atraso no pagamento (Dias)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Endereço De Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,defesa
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Endereço De Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,defesa
 DocType: Company,Abbr,Abrv
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} não corresponde com {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,No veículo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Por favor, selecione Lista de Preço"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Carpintaria
 DocType: Production Order Operation,Work In Progress,Trabalho em andamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Impressão 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Tempo Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contabilista
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Contabilista
 DocType: Cost Center,Stock User,Estoque de Usuário
 DocType: Company,Phone No,N º de telefone
-DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nova {0}: # {1}
+DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log de atividades realizadas por usuários contra as tarefas que podem ser usados para controle de tempo, de faturamento."
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Vendas Partners Comissão
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atributo Valor {0} não pode ser removido a partir de {1} como item Variantes \ existe com este atributo.
-DocType: Print Settings,Classic,Clássico
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Dit is een root account en kan niet worden bewerkt .
 DocType: BOM,Operations,Operações
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base em desconto para {0}
 DocType: Bin,Quantity Requested for Purchase,Quantidade Solicitada para Compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
 DocType: Packed Item,Parent Detail docname,Docname Detalhe pai
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg.
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg.
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,A abertura para um trabalho.
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selecione Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,publicidade
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,publicidade
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Mesma empresa está inscrita mais de uma vez
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra entrega Nota {0}
 DocType: Payment Reconciliation,Reconcile,conciliar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Mercearia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Faça Banco Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Warehouse é obrigatória se o tipo de conta é Warehouse
 DocType: SMS Center,All Sales Person,Todos os vendedores
 DocType: Lead,Person Name,Nome Pessoa
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verifique se a ordem recorrentes, desmarque a opção de parar recorrentes ou colocar adequada Data de Término"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Taxa / 60) * Tempo real Operação
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Itens Entregues
-DocType: Blog Post,Guest,Convidado
 DocType: Quality Inspection,Get Specification Details,Obtenha detalhes de Especificação
 DocType: Lead,Interested,Interessado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiais
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Abertura Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} é obrigatório
 DocType: Stock Entry,Additional Costs,Custos adicionais
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Conta com a transação existente não pode ser convertido em grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Conta com a transação existente não pode ser convertido em grupo.
 DocType: Lead,Product Enquiry,Produto Inquérito
-DocType: Standard Reply,Owner,eigenaar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Gelieve eerst in bedrijf
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Por favor, selecione Empresa primeiro"
 DocType: Employee Education,Under Graduate,Sob graduação
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Custo Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Mandrilagem
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,imóveis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,imóveis
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato de conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
 DocType: Expense Claim Detail,Claim Amount,Quantidade reivindicação
 DocType: Employee,Mr,Sr.
-DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
 DocType: Naming Series,Prefix,Prefixo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumíveis
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumíveis
 DocType: Upload Attendance,Import Log,Importar Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salário Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do exercício social
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,despesas Stock
 DocType: Newsletter,Email Sent?,E-mail enviado?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Logs
 DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda Empresa
 DocType: Delivery Note,Installation Status,Status da instalação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aceite + Qty Rejeitada deve ser igual a quantidade recebida por item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para a Compra
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} deve ser um item de compra
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Todas as datas e empregado combinação no período selecionado virá no modelo, com registros de freqüência existentes"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Será atualizado após a factura de venda é submetido.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Configurações para o Módulo HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Endireitando
 DocType: BOM Replace Tool,New BOM,Novo BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Logs Tempo para o faturamento.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Fundição Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletim informativo já foi enviado
 DocType: Lead,Request Type,Tipo de Solicitação
 DocType: Leave Application,Reason,Razão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,radiodifusão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,execução
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifusão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,execução
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,O primeiro usuário será o System Manager (você pode mudar isso mais tarde).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Os detalhes das operações realizadas.
 DocType: Serial No,Maintenance Status,Estado de manutenção
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Itens e Preços
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Itens e Preços
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selecione o funcionário para quem você está criando a Avaliação.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centro de Custo {0} não pertence a Empresa {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Desconto no preço de lista Taxa (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,begin
-DocType: User,First Name,Nome
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,De fundição de molde completa
 DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
 DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
 DocType: Purchase Taxes and Charges,Valuation,Avaliação
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Conta bancária
 DocType: Leave Type,Allow Negative Balance,Permitir saldo negativo
 DocType: Selling Settings,Default Territory,Território padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,televisão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rasgando
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisão
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Conta {0} não pertence à empresa {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
 DocType: Sales Invoice,Is Opening Entry,Está abrindo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se não padronizado conta a receber aplicável
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Para Armazém é necessário antes Enviar
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,"Recebeu, em"
 DocType: Sales Partner,Reseller,Revendedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vul Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
 ,Production Orders in Progress,Productieorders in Progress
 DocType: Lead,Address & Contact,Endereço e contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Acrescente as folhas não utilizadas de atribuições anteriores
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Próximo Recorrente {0} será criado em {1}
 DocType: Newsletter List,Total Subscribers,Total de Assinantes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nome de Contato
+,Contact Name,Nome de Contato
 DocType: Production Plan Item,SO Pending Qty,Está pendente de Qtde
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de salário para os critérios acima mencionados.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Pedido de compra.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Caixa de duas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Folhas por ano
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, defina Naming Series para {0} em Configurar&gt; Configurações&gt; Naming Series"
 DocType: Time Log,Will be updated when batched.,Será atualizado quando agrupadas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
-DocType: Bulk Email,Message,Mensagem
 DocType: Item Website Specification,Item Website Specification,Especificação Site item
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Chave de Acesso
 DocType: Payment Tool,Reference No,Número de referência
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Deixe Bloqueados
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Deixe Bloqueados
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Da Reconciliação item
 DocType: Stock Entry,Sales Invoice No,Vendas factura n
 DocType: Material Request Item,Min Order Qty,Min Qty Ordem
 DocType: Lead,Do Not Contact,Neem geen contact op
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A ID exclusiva para acompanhar todas as facturas recorrentes. Ele é gerado em enviar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtde mínima
 DocType: Pricing Rule,Supplier Type,Tipo de fornecedor
 DocType: Item,Publish in Hub,Publicar em Hub
 ,Terretory,terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Pedido de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Pedido de material
 DocType: Bank Reconciliation,Update Clearance Date,Atualize Data Liquidação
 DocType: Item,Purchase Details,Detalhes de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} não encontrado em &#39;matérias-primas fornecidas &quot;na tabela Ordem de Compra {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Escova de aço
 DocType: Employee,Relation,Relação
 DocType: Shipping Rule,Worldwide Shipping,Envio para todo o planeta
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Confirmado encomendas de clientes.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agende
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chefe despesa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Selecteer Charge Type eerste
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Último
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caracteres
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selecione seu idioma
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caracteres
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro Deixe Approver na lista vai ser definido como o Leave Approver padrão
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Desabilita a criação de logs de tempo contra ordens de produção. As operações não devem ser rastreados contra a ordem de produção
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Variante de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} deve ser item de serviço
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Concluído Qtde não pode ser maior do que ""Qtde de Fabricação"""
-DocType: DocType,Administrator,Administrador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Perfuração laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nova da UOM
 DocType: Period Closing Voucher,Closing Account Head,Fechando Chefe Conta
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Erro de referência circular
-DocType: Communication,Closed,Fechado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Em Palavras (Exportação) será visível quando você salvar a Nota de Entrega.
 DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil
 DocType: Newsletter,Newsletter,Boletim informativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Carícias
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por e-mail sobre a criação de Pedido de material automático
 DocType: Journal Entry,Multi Currency,Multi Moeda
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item é atualizado
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
 DocType: Sales Invoice Item,Delivery Note,Guia de remessa
-DocType: Dropbox Backup,Allow Dropbox Access,Permitir Dropbox Acesso
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurando Impostos
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pagamento foi modificado depois que você puxou-o. Por favor, puxe-o novamente."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} entrou duas vezes no item Imposto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Workstation,Rent Cost,Kosten huur
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Selecione mês e ano
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,bedrijf E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Montante Débito em Conta de moeda
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-DocType: Workflow State,Refresh,Refrescar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos os campos exportados tais como, moeda, taxa de conversão, total de exportação, total de exportação final e etc, estão disponíveis no Recibo de compra, Orçamento, factura, ordem de compra e etc."
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Order Total Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Designação do empregado (por exemplo, CEO , diretor , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa em que moeda do cliente é convertido para a moeda base de cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponível em BOM, nota de entrega , factura de compra , ordem de produção , ordem de compra , Recibo de compra , nota fiscal de venda , ordem de venda , Stock entrada , quadro de horários"
 DocType: Item Tax,Tax Rate,Taxa de Imposto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selecionar item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selecionar item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Compra Invoice {0} já é submetido
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lote n deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converter para não-Grupo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Recibo de compra devem ser apresentados
-DocType: Stock UOM Replace Utility,Current Stock UOM,UOM Stock atual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lote) de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da fatura
 DocType: GL Entry,Debit Amount,Débito Montante
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Seu endereço de email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Por favor, veja anexo"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Por favor, veja anexo"
 DocType: Purchase Order,% Received,% Recebido
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Corte do jato de água
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup al voltooid !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup al voltooid !
 ,Finished Goods,afgewerkte producten
 DocType: Delivery Note,Instructions,Instruções
 DocType: Quality Inspection,Inspected By,Inspecionado por
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Por favor, não criar contas para clientes e fornecedores. Eles são criados diretamente do cliente / fornecedor mestres."
 DocType: Currency Exchange,Currency Exchange,Câmbio
 DocType: Purchase Invoice Item,Item Name,Nome do item
+DocType: Authorization Rule,Approving User  (above authorized value),Aprovando Usuário (acima do valor autorizado)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Saldo credor
 DocType: Employee,Widowed,Viúva
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Os itens a serem solicitados que estão &quot;fora de estoque&quot;, considerando todos os armazéns com base no qty projetada e qty mínimo"
@@ -380,22 +348,21 @@
 ,Purchase Register,Compra Registre
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,verbruiksartikelen Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter regra 'Aprovar ausência'
 DocType: Purchase Receipt,Vehicle Date,Veículo Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,médico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,médico
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Reden voor het verliezen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tubo beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Employee,Single,Único
 DocType: Issue,Attachment,Acessório
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Orçamento não pode ser definido para o grupo de centro de custo
 DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Vul kostenplaats
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vul kostenplaats
 DocType: Journal Entry Account,Sales Order,Ordem de Vendas
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Méd. Taxa de venda
 DocType: Purchase Order,Start date of current order's period,Data do período da ordem atual Comece
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fracção em linha {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fracção em linha {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Taxa
 DocType: Delivery Note,% Installed,% Instalado
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vul de naam van het bedrijf voor het eerst
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,É o grupo
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Serial N ° s automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Fornecedor Nota Fiscal Número Unicidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Cortando
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Para o número de Processo' não pode ser inferior a 'De número de Processo'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,sem Fins Lucrativos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Não Iniciado
 DocType: Lead,Channel Partner,Parceiro de Canal
 DocType: Account,Old Parent,Pai Velho
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas Upto
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+DocType: HR Settings,Employee record is created using selected field. ,Registro de empregado é criado usando o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Férias Principais.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Moldagem Shell
 DocType: Material Request Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Cobrança
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vul Item Code .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vul Item Code .
 DocType: BOM,Costing,Custeio
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se selecionado, o valor do imposto será considerado como já incluído na tarifa Impressão / Quantidade de impressão"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtde
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e depósitos
 DocType: Features Setup,Imports,Importações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Ligação adesiva
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
 DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Atividades pendentes para hoje
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Recorde de público.
 DocType: Bank Reconciliation,Journal Entries,Diário de entradas
 DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
-DocType: System Settings,Loading...,Loading ...
-DocType: DocField,Password,Palavra Passe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelagem deposição fundida
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operações (em minutos)
 DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
 DocType: Journal Entry,Accounts Payable,Contas a Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adicionar Inscritos
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Não existe"""
 DocType: Pricing Rule,Valid Upto,Válido Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Resultado direto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",Kan niet filteren op basis van account als gegroepeerd per account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Diretor Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Diretor Administrativo
 DocType: Payment Tool,Received Or Paid,Recebidos ou pagos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry,Difference Account,verschil Account
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vul Warehouse waarvoor Materiaal Request zal worden verhoogd
 DocType: Production Order,Additional Operating Cost,Custo Operacional adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosméticos
-DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
-DocType: Communication,Subject,Assunto
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Te fuseren , moeten volgende eigenschappen hetzelfde zijn voor beide posten"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Emergency Phone
 ,Serial No Warranty Expiry,Caducidade Não Serial Garantia
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,item
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucros e perdas
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gerenciando Subcontratação
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nova UOM NÃO deve ser do tipo inteiro Número
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gerenciando Subcontratação
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Móveis e utensílios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa em que moeda lista de preços é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Conta {0} não pertence à empresa: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} não é comprar item
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} é um endereço de e-mail inválido em 'Notificação \
  o endereço de email"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Faturamento total este ano:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Faturamento total este ano:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Taxas
 DocType: Purchase Invoice,Supplier Invoice No,Fornecedor factura n
 DocType: Territory,For reference,Para referência
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível excluir Serial No {0}, como ele é usado em transações de ações"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Fechamento (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Fechamento (Cr)
 DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
 DocType: Installation Note Item,Installation Note Item,Item Nota de Instalação
 ,Pending Qty,Pendente Qtde
 DocType: Job Applicant,Thread HTML,Tópico HTML
 DocType: Company,Ignore,Ignorar
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
 DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total Comissão
 DocType: Pricing Rule,Sales Partner,Parceiro de vendas
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuição Mensal** ajuda a distribuir o seu orçamento durante meses, se você tem a sazonalidade em seu negócio.
 
  Para distribuir um orçamento usando esta distribuição, introduzir o campo **Distribuição Mensal** no **Centro de Custo **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, selecione Companhia e Festa Tipo primeiro"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Exercício / contabilidade.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , kan de serienummers niet worden samengevoegd"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Projeto Tarefa
 ,Lead Id,lead Id
 DocType: C-Form Invoice Detail,Grand Total,Total
-DocType: About Us Settings,Website Manager,Site Gerente
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Ano Fiscal Data de início não deve ser maior do que o Fiscal Year End Date
 DocType: Warranty Claim,Resolution,Resolução
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Entregue: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Faturamento e Entrega Estado
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita os clientes
 DocType: Leave Control Panel,Allocate,Atribuír
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,anterior
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vendas Retorno
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selecione Ordens de venda a partir do qual você deseja criar ordens de produção.
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue por Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariais.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
+DocType: Authorization Rule,Customer or Item,Cliente ou Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Banco de dados do cliente.
-DocType: Quotation,Quotation To,Para citação
+DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Montante atribuído não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tombo
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outro UOM. Você precisará criar um novo item para usar um UOM padrão diferente.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Montante atribuído não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Faturado Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um armazém lógico contra o qual as entradas em existências são feitas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
-DocType: Event,Wednesday,Quarta-feira
 DocType: Sales Invoice,Customer's Vendor,Vendedor cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Ordem de produção é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendas Pessoa {0} existe com o mesmo ID de Employee
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Banco de Erro ( {6} ) para item {0} no Armazém {1} em {2} {3} em {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,A taxa de custeio padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Programação de Manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então Preços Regras são filtradas com base no Cliente, Grupo de Clientes, Território, fornecedor, fornecedor Tipo, Campanha, Parceiro de vendas etc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Por favor, instale o Dropbox módulo python"
 DocType: Employee,Passport Number,Número do Passaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,De Recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,gerente
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,De Recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro receptor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e ' Agrupado por ' não pode ser o mesmo
 DocType: Sales Person,Sales Person Targets,Metas de vendas Pessoa
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,para
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Por favor insira o endereço de email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Extremidade de tubo formando
 DocType: Production Order Operation,In minutes,Em questão de minutos
 DocType: Issue,Resolution Date,Data resolução
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Cliente de nomeação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Converteren naar Groep
 DocType: Activity Cost,Activity Type,Tipo de Atividade
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Dias Fixos
 DocType: Sales Invoice,Packing List,Lista de embalagem
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,As ordens de compra dadas a fornecedores.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
 DocType: Activity Cost,Projects User,Projetos de Usuário
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} não foi encontrado na tabela detalhes da fatura.
 DocType: Company,Round Off Cost Center,Termine Centro de Custo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Manutenção Visita {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Material Request,Material Transfer,Transferência de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Abertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Configurações
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos Custo desembarcados e Encargos
 DocType: Production Order Operation,Actual Start Time,Hora de início Atual
 DocType: BOM Operation,Operation Time,Tempo de Operação
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mais
 DocType: Pricing Rule,Sales Manager,Gerente De Vendas
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,andere naam geven
 DocType: Journal Entry,Write Off Amount,Escreva Off Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Dobrando
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir utilizador
 DocType: Journal Entry,Bill No,Projeto de Lei n
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de Entrega Obrigatório
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 DocType: Purchase Receipt,Other Details,Outros detalhes
 DocType: Account,Accounts,Contas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Em linha reta de corte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Para acompanhar o item em documentos de vendas e de compras com base em seus números de ordem. Este é também pode ser usada para rastrear detalhes sobre a garantia do produto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock atual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Verworpen Warehouse is verplicht tegen regected post
 DocType: Account,Expenses Included In Valuation,Despesas incluídos na avaliação
 DocType: Employee,Provide email id registered in company,Fornecer ID e-mail registrado na empresa
 DocType: Hub Settings,Seller City,Vendedor Cidade
 DocType: Email Digest,Next email will be sent on:,Próximo e-mail será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Oferecer Carta Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor da
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,boom Type
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Comissão Taxa (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Ordem de Vendas, Fatura ou Diário"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Incapaz de encontrar taxa de câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,aeroespaço
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,bem-vindo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,aeroespaço
 DocType: Journal Entry,Credit Card Entry,Entrada de cartão de crédito
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Tarefa Assunto
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
-DocType: Communication,Open,Abrir
 DocType: Lead,Campaign Name,Nome da campanha
 ,Reserved,gereserveerd
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} não é um item de stock
 DocType: Mode of Payment Account,Default Account,Conta Padrão
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Fila deve ser definido se Opportunity é feito de chumbo
-DocType: Contact Us Settings,Address Title,Título do endereço
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Por favor seleccione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Vendas Pessoa Alvo Variance item Group-wise
-DocType: Dropbox Backup,Daily,Diário
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Conta com a transação existente não pode ser convertido em livro
 DocType: Delivery Note,Customer's Purchase Order No,Ordem de Compra do Cliente Não
 DocType: Employee,Cell Number,Número de células
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Pedidos de Materiais Auto Gerado
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Você não pode entrar comprovante atual em 'Against Journal Entry' coluna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,energia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declaração salário mensal.
 DocType: Item Group,Website Specifications,Especificações do site
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nova Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Fator de Conversão é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Lançamentos contábeis podem ser feitas contra nós folha. Entradas contra grupos não são permitidos.
-DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 DocType: Opportunity,Maintenance,Manutenção
-DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanhas de vendas .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Pessoal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de reembolso de despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diário de entrada {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,biotecnologia
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Diário de entrada {0} está ligado contra a Ordem {1}, verificar se ele deve ser puxado como avanço nessa fatura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Despesas de manutenção de escritório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Gelieve eerst in Item
 DocType: Account,Liability,responsabilidade
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Process Payroll,Send Email,Enviar E-mail
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nenhuma permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar baseado em Festa, selecione Partido Escreva primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;Atualização da &#39;não pode ser verificado porque os itens não são entregues via {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banco Detalhe Reconciliação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Minhas Faturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Minhas Faturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nenhum funcionário encontrado
 DocType: Purchase Order,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Para ativar &quot;Point of Sale&quot; recursos
 DocType: Bin,Moving Average Rate,Movendo Taxa Média
 DocType: Production Planning Tool,Select Items,Selecione itens
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
-DocType: Comment,Reference Name,Nome de referência
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} contra conta {1} com a data de {2}
 DocType: Maintenance Visit,Completion Status,Status de conclusão
 DocType: Sales Invoice Item,Target Warehouse,Armazém alvo
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre a entrega ou recebimento até esta cento
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Vendas Data
 DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Registro de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compor automaticamente mensagem na apresentação de transações.
 DocType: Production Order,Item To Manufacture,Item Para Fabricação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Fundição com Molde Permanente
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} estatuto é {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ordem de Compra para pagamento
 DocType: Sales Order Item,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
 DocType: Newsletter,Newsletter Manager,Boletim Gerente
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Abertura'
 DocType: Notification Control,Delivery Note Message,Mensagem Nota de Entrega
 DocType: Expense Claim,Expenses,Despesas
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
 ,Purchase Receipt Trends,Compra Trends Recibo
 DocType: Appraisal,Select template from which you want to get the Goals,Selecione o modelo a partir do qual você deseja obter as Metas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Pesquisa e Desenvolvimento
 ,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Detalhes registro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Estacando
 DocType: Item,Re-Order Qty,Re-order Qtde
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar para {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Detalhes da
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do projeto
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Ponto de venda
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Não é possível levar adiante {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo já em crédito, você não tem permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,Equilíbrio deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Relatório de Despesas Rejeitado Mensagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Pregando
 ,Available Qty,Qtde Disponível
 DocType: Purchase Taxes and Charges,On Previous Row Total,No total linha anterior
 DocType: Salary Slip,Working Days,Dias de trabalho
 DocType: Serial No,Incoming Rate,Taxa de entrada
 DocType: Packing Slip,Gross Weight,Peso bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het opzetten van dit systeem .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het opzetten van dit systeem .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
 DocType: Job Applicant,Hold,Segurar
 DocType: Employee,Date of Joining,Data da Unir
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Exibir Inscritos
 DocType: Purchase Invoice Item,Purchase Receipt,Compra recibo
 ,Received Items To Be Billed,Itens recebidos a ser cobrado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Jateamento abrasivo
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Mestre taxa de câmbio .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plano de sub-conjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} deve ser ativo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} deve ser ativo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Materiais Visitas {0} antes de cancelar este Manutenção Visita
 DocType: Salary Slip,Leave Encashment Amount,Deixe Quantidade cobrança
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade requerida
 DocType: Bank Reconciliation,Total Amount,Valor Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Publishing Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Waarde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
-DocType: GL Entry,Account Currency,Conta Moeda
+DocType: Bank Reconciliation,Account Currency,Conta Moeda
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empregado {0} não está ativo ou não existe
 DocType: Features Setup,Item Barcode,Código de barras do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Variantes item {0} atualizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Variantes item {0} atualizado
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Compra Antecipada Fatura
 DocType: Address,Shop,Loja
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta padrão Banco / Cash será atualizado automaticamente na fatura POS quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Vast adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída por quantos produtos acabados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,A Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,A Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Provisão para over-{0} cruzou para item {1}.
 DocType: Employee,Exit Interview Details,Sair Detalhes Entrevista
 DocType: Item,Is Purchase Item,É item de compra
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Comprar item Ordem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Resultado indirecto
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Definir Valor do Pagamento = Valor Excepcional
-DocType: Contact Us Settings,Address Line 1,Endereço Linha 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nome da empresa
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variação
+,Company Name,Nome da empresa
 DocType: SMS Center,Total Message(s),Mensagem total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selecionar item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selecionar item para Transferência
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione cabeça conta do banco onde cheque foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao utilizador editar Taxa de Lista de Preços em transações
 DocType: Pricing Rule,Max Qty,Max Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: O pagamento contra Vendas / Ordem de Compra deve ser sempre marcado como antecedência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,químico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Process Payroll,Select Payroll Year and Month,Selecione Payroll ano e mês
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Vá para o grupo apropriado (geralmente Aplicação de Fundos&gt; Ativo Circulante&gt; Contas Bancárias e criar uma nova conta (clicando em Adicionar filho) do tipo &quot;Banco&quot;
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
-DocType: Comment,Unsubscribed,Inscrição cancelada
 DocType: Opportunity,Walk In,Entrar
 DocType: Item,Inspection Criteria,Critérios de inspeção
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árvore de Centros de custo finanial .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Branco
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Branco
 DocType: SMS Center,All Lead (Open),Todos chumbo (Aberto)
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Anexar a sua imagem
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Fazer
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Anexar a sua imagem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Fazer
 DocType: Journal Entry,Total Amount in Words,Valor Total em Palavras
-DocType: Workflow State,Stop,pare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Er is een fout opgetreden . Een mogelijke reden zou kunnen zijn dat je niet hebt opgeslagen het formulier . Neem dan contact support@erpnext.com als het probleem aanhoudt .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Meu carrinho
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
 DocType: Lead,Next Contact Date,Data Contato próximo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Opening Aantal
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Deixe Aplicação
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Deixe Ferramenta de Alocação
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
 DocType: Company,If Monthly Budget Exceeded (for expense account),Se orçamento mensal excedido (por conta de despesas)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aparar
 DocType: Workstation,Net Hour Rate,Net Hour Taxa
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de compra Landed Cost
 DocType: Company,Default Terms,Termos Padrão
 DocType: Packing Slip Item,Packing Slip Item,Embalagem item deslizamento
 DocType: POS Profile,Cash/Bank Account,Caixa / Banco Conta
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela de atributo é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabela de atributo é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordem de Vendas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arquivamento
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Desconto
 DocType: Features Setup,Purchase Discounts,Descontos de compra
 DocType: Workstation,Wages,Salário
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Expense Approver voor dit record . Werk van de 'Status' en opslaan
 DocType: Serial No,Creation Document No,Creatie Document No
 DocType: Issue,Issue,Questão
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Conta não coincidir com a Empresa
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Não {0} está sob contrato de manutenção até {1}
 DocType: BOM Operation,Operation,Operação
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Estado Envio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"O artigo deve ser adicionado usando ""Obter itens de recibos de compra 'botão"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Despesas com Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Compra padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Venda Padrão Centro de Custo
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Pedido de Vendas {0} é {1}
 DocType: Opportunity,Contact Info,Informações para contato
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Fazendo de Stock Entradas
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Fazendo de Stock Entradas
 DocType: Packing Slip,Net Weight UOM,UOM Peso Líquido
 DocType: Item,Default Supplier,Fornecedor padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Ao longo de Produção Provisão Percentagem
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,atualizado via Time Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Média de Idade
 DocType: Opportunity,Your sales person who will contact the customer in future,Sua pessoa de vendas que entrará em contato com o cliente no futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 DocType: Company,Default Currency,Moeda padrão
 DocType: Contact,Enter designation of this Contact,Digite designação de este contato
-DocType: Contact Us Settings,Address,Endereço
 DocType: Expense Claim,From Employee,De Empregado
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento desde montante para item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Faça Entrada Diferença
 DocType: Upload Attendance,Attendance From Date,Presença de Data
-DocType: Appraisal Template Goal,Key Performance Area,Performance de Área Chave 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,transporte
+DocType: Appraisal Template Goal,Key Performance Area,Performance de Área Chave
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,transporte
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,e ano:
 DocType: Email Digest,Annual Expense,Despesa anual
 DocType: SMS Center,Total Characters,Total de Personagens
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Por favor, selecione no campo BOM BOM por item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Detalhe Fatura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconciliação O pagamento da fatura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuição%
 DocType: Item,website page link,link da página site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Vamos preparar o sistema para a primeira utilização.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números da empresa de registro para sua referência. Números fiscais, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrinho Rule Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar esta ordem de venda
 ,Ordered Items To Be Billed,Itens ordenados a ser cobrado
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selecione Time Logs e enviar para criar uma nova factura de venda.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Vendas antecipadas Fatura
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Niets aan te vragen
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' Data de início' não pode ser maior que 'Data Final '
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,gestão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,gestão
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de atividades para folhas de tempo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Carcaça de investimento
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},É requerido um valor de débito ou crédito para {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (em palavras) será visível quando você salvar a folha de salário.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Ativo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Azul
 DocType: Purchase Invoice,Is Return,É Retorno
 DocType: Price List Country,Price List Country,Preço da lista País
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Verder nodes kunnen alleen worden gemaakt op grond van het type nodes 'Groep'
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS perfil {0} já criado para o usuário: {1} e {2} empresa
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Fator de Conversão
 DocType: Stock Settings,Default Item Group,Grupo Item padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objeto de fabricação laminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Banco de dados de fornecedores.
 DocType: Account,Balance Sheet,Balanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centro de custo para item com o Código do item '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Estiramento formando
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete sobre esta data para contato com o cliente
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Fiscais e deduções salariais outros.
 DocType: Lead,Lead,Conduzir
 DocType: Email Digest,Payables,Contas a pagar
 DocType: Account,Warehouse,Armazém
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeitado Qtde não pode ser inscrita no retorno de compra
 ,Purchase Order Items To Be Billed,Ordem de Compra itens a serem faturados
 DocType: Purchase Invoice Item,Net Rate,Taxa Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Comprar item Fatura
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Banco de Ledger Entradas e GL As entradas são reenviados para os recibos de compra selecionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Número 1
 DocType: Holiday,Holiday,Férias
-DocType: Event,Saturday,Sábado
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se considerado para todos os ramos
 ,Daily Time Log Summary,Resumo Diário Log Tempo
-DocType: DocField,Label,Etiqueta
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Detalhes do pagamento
 DocType: Global Defaults,Current Fiscal Year,Atual Exercício
 DocType: Global Defaults,Disable Rounded Total,Desativar total arredondado
 DocType: Lead,Call,Chamar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' Entradas ' não pode estar vazio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' Entradas ' não pode estar vazio
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
 ,Trial Balance,Balancete
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurando Empregados
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Por favor seleccione prefixo primeiro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,pesquisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,pesquisa
 DocType: Maintenance Visit Purpose,Work Done,Trabalho feito
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
 DocType: Contact,User ID,ID de utilizador
-DocType: Communication,Sent,verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Diário
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
-DocType: Communication,Delivery Status,Estado entrega
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mudar o nome do grupo de itens"
 DocType: Production Order,Manufacture against Sales Order,Fabricação contra a Ordem de Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resto do mundo
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resto do mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório Variance Orçamento
 DocType: Salary Slip,Gross Pay,Salário bruto
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Item Descrição
 DocType: Payment Tool,Payment Mode,O modo de pagamento
 DocType: Purchase Invoice,Is Recurring,É recorrente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direto de metal sinterização a laser
 DocType: Purchase Order,Supplied Items,Itens fornecidos
 DocType: Production Order,Qty To Manufacture,Qtde Para Fabricação
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter mesmo ritmo durante todo o ciclo de compra
 DocType: Opportunity Item,Opportunity Item,Item oportunidade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Abertura temporária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Empregado Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo Conta {0} deve ser sempre {1}
 DocType: Address,Address Type,Tipo de endereço
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obter Facturas Pendentes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Ordem de Vendas {0} não é válido
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Pequeno
 DocType: Employee,Employee Number,Número de empregado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag ( Exculsive BTW )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Conta principal {0} criada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto re-fim
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total de Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
 DocType: Employee,Place of Issue,Local de Emissão
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,contrato
-DocType: Report,Disabled,Inválido
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,contrato
+DocType: Email Digest,Add Quote,Adicionar Citar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Fator coversion UOM necessário para UOM: {0} no Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Uw producten of diensten
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Uw producten of diensten
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Dit is een hoofditem groep en kan niet worden bewerkt .
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
 DocType: Warehouse,Warehouse Contact Info,Armazém Informações de Contato
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,O Nome é obrigatório
 DocType: Purchase Invoice,Recurring Type,Tipo recorrente
 DocType: Address,City/Town,Cidade / Município
 DocType: Email Digest,Annual Income,Rendimento anual
 DocType: Serial No,Serial No Details,Serial Detalhes Nenhum
 DocType: Purchase Invoice Item,Item Tax Rate,Taxa de Imposto item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Entrega Nota {0} não é submetido
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Data de entrega esperada é menor do que o planejado Data de Início.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,voor Leverancier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Tipo de conta Definir ajuda na seleção desta conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grande Total (moeda da empresa)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Sainte total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Só pode haver uma regra de envio Condição com 0 ou valor em branco para "" To Valor """
 DocType: Authorization Rule,Transaction,Transação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este Centro de Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
-apps/frappe/frappe/config/desk.py +7,Tools,Ferramentas
 DocType: Item,Website Item Groups,Item Grupos site
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Número de ordem de produção é obrigatória para fabricação propósito entrada estoque
 DocType: Purchase Invoice,Total (Company Currency),Total (Companhia de moeda)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,Diário de entradas
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},O BOM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição alvo
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentários
 DocType: Salary Slip,Bank Account No.,Banco Conta N º
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criados com este prefixo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Valorização Taxa exigida para item {0}
 DocType: Quality Inspection Reading,Reading 8,Leitura 8
 DocType: Sales Partner,Agent,Agente
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode você deve mudar &quot;Distribuir taxas sobre &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos e Encargos de Cálculo
 DocType: BOM Operation,Workstation,Estação de trabalho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gestor de RH
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, selecione uma empresa"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Fornecedor Data Fatura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta Modelo de avaliação
 DocType: Salary Slip,Earning,Ganhando
 DocType: Payment Tool,Party Account Currency,Partido Conta Moeda
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diário {0} já é ajustado contra algum outro comprovante
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor total da ordem
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Você pode fazer um registro de tempo apenas contra uma ordem de produção apresentado
 DocType: Maintenance Schedule Item,No of Visits,N º de Visitas
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Newsletters para contatos, leva."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos devem ser 100. É {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,A operação não pode ser deixado em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,A operação não pode ser deixado em branco.
 ,Delivered Items To Be Billed,Itens entregues a ser cobrado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
-DocType: DocField,Description,Descrição
 DocType: Authorization Rule,Average Discount,Desconto médio
-DocType: Letter Head,Is Default,É Default
 DocType: Address,Utilities,Utilitários
 DocType: Purchase Invoice Item,Accounting,Contabilidade
 DocType: Features Setup,Features Setup,Configuração características
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vista Oferta Letter
-DocType: Communication,Communication,Comunicação
 DocType: Item,Is Service Item,É item de serviço
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
 DocType: Activity Cost,Projects,Projetos
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Por favor seleccione o Ano Fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},A partir de {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,Manter da
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Banco de entradas já criadas para ordem de produção
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de data e hora
 DocType: Email Digest,For Company,Para a Empresa
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Termos e Condições conteúdo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem marcação
 DocType: Employee,Owned,Possuído
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de licença sem vencimento
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,werknemer Instellingen
 ,Batch-Wise Balance History,Por lotes História Balance
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Para fazer a lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativo Quantidade não é permitido
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativo Quantidade não é permitido
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Detalhe da tabela de imposto obtido a partir mestre como uma string e armazenado neste campo.
  Usado para Tributos e Encargos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empregado não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de account wordt gepauzeerd, blijven inzendingen mogen gebruikers met beperkte rechten ."
 DocType: Email Digest,Bank Balance,Saldo bancário
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Sem Estrutura salarial para o empregado ativo encontrado {0} eo mês
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil, qualificações exigidas , etc"
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regra de imposto para transações.
 DocType: Rename Tool,Type of document to rename.,Tipo de documento a ser renomeado.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Nós compramos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Nós compramos este item
 DocType: Address,Billing,Faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Não Enviados
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivo formando
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (moeda da empresa)
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar para {0} destinatários
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assembléias
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assembléias
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Supplier,Stock Manager,Da Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Origem do Warehouse é obrigatória para a linha {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: quantidade atribuídos {1} tem de ser menor ou igual à quantidade JV {2}
 DocType: Item,Inventory,Inventário
 DocType: Features Setup,"To enable ""Point of Sale"" view",Para ativar &quot;Point of Sale&quot; vista
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,O pagamento não pode ser feito para carrinho vazio
 DocType: Item,Sales Details,Detalhes de vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixando
 DocType: Opportunity,With Items,Com Itens
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
 DocType: Notification Control,Expense Claim Rejected,Relatório de Despesas Rejeitado
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",A data na qual próxima fatura será gerada. Ele é gerado em enviar.
 DocType: Item Attribute,Item Attribute,Atributo item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Governo
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,As variantes de item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Governo
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,As variantes de item
 DocType: Company,Services,Serviços
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
 DocType: Sales Invoice,Source,Fonte
 DocType: Leave Type,Is Leave Without Pay,É licença sem vencimento
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Exercício Data de Início
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Exercício Data de Início
 DocType: Employee External Work History,Total Experience,Experiência total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Escareaï¿½o
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding e Encargos
 DocType: Material Request Item,Sales Order No,Vendas decreto n º
 DocType: Item Group,Item Group Name,Nome do Grupo item
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Tomado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiais de transferência para Fabricação
 DocType: Pricing Rule,For Price List,Para Lista de Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM nenhum detalhe
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montante desconto adicional (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Erro: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Erro: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta do Plano de Contas ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de manutenção
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo Cliente> Território
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Lote disponível Qtde no Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Tempo Log Detail Batch
-DocType: Workflow State,Tasks,tarefas
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
-DocType: Event,Tuesday,Terça-feira
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
 ,Accounts Receivable Summary,Resumo das Contas a Receber
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Deixa para o tipo {0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome UOM
-DocType: Top Bar Item,Target,Alvo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribuição Montante
 DocType: Sales Invoice,Shipping Address,Endereço para envio
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta ferramenta ajuda você a atualizar ou corrigir a quantidade ea valorização das ações no sistema. Ele é geralmente usado para sincronizar os valores do sistema e que realmente existe em seus armazéns.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Em Palavras será visível quando você salvar a Nota de Entrega.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Mestre marca.
-DocType: ToDo,Due Date,Data de Vencimento
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Mestre marca.
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalhes Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,de Organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,caixa
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,de Organisatie
 DocType: Monthly Distribution,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produção Plano de Ordem de Vendas
 DocType: Sales Partner,Sales Partner Target,Vendas Alvo Parceiro
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Entrada Contabilidade para {0} só pode ser feito em moeda: {1}
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Pedido de material a Ordem de Compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Item devolvido {1} não existe em {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,bankrekeningen
 ,Bank Reconciliation Statement,Declaração de reconciliação bancária
 DocType: Address,Lead Name,Nome levar
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Abertura da Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Abertura da Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranfer mais do que {0} {1} contra Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Manufacturing Kwantiteit is verplicht
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Valores não reflete em banco
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Valores não reflete em banco
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Os pedidos de despesa da empresa.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Fundição centrífuga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic acabamento assistida-campo
 DocType: Company,Default Holiday List,Padrão Lista de férias
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Passivo stock
 DocType: Purchase Receipt,Supplier Warehouse,Armazém fornecedor
 DocType: Opportunity,Contact Mobile No,Contato móveis não
 DocType: Production Planning Tool,Select Sales Orders,Selecione Pedidos de Vendas
 ,Material Requests for which Supplier Quotations are not created,Materiaal Verzoeken waarvoor Leverancier Offertes worden niet gemaakt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Para rastrear itens usando código de barras. Você será capaz de inserir itens na nota de entrega e nota fiscal de venda pela digitalização de código de barras do item.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Marcar como Proferido
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Marcar como Proferido
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Faça Cotação
 DocType: Dependent Task,Dependent Task,Tarefa dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 DocType: SMS Center,Receiver List,Lista de receptor
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade consumida
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vista
 DocType: Salary Structure Deduction,Salary Structure Deduction,Dedução Estrutura Salarial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Seletiva sinterização a laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importeer Succesvol!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserido mais de uma vez na Tabela de Conversão de Fator
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo de itens emitidos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Idade (Dias)
-DocType: Quotation Item,Quotation Item,Item citação
+DocType: Quotation Item,Quotation Item,Item de Orçamento
 DocType: Account,Account Name,Nome da conta
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Fornecedor Tipo de mestre.
 DocType: Purchase Order Item,Supplier Part Number,Número da peça de fornecedor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Adicionar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} é cancelado ou interrompido
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Veículo Despacho Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
 DocType: Company,Default Payable Account,Conta a Pagar Padrão
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Definições para carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Instalação concluída
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Tida
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Gereserveerd Aantal
 DocType: Party Account,Party Account,Conta Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Renda superior
 DocType: Journal Entry Account,Debit in Company Currency,Débito em Empresa de moeda
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Meus Problemas
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Valores Padrão
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Valor do pagamento não pode ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Montante total reembolsado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Uni de press de
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Contra Fatura de Fornecedor {0} {1} datada
 DocType: Customer,Default Price List,Lista de Preços padrão
 DocType: Payment Reconciliation,Payments,Pagamentos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Prensagem isostática a quente
-DocType: ToDo,Medium,Médio
 DocType: Budget Detail,Budget Allocated,Orçamento alocado
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de crédito do cliente
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
 DocType: Quotation,Term Details,Detalhes prazo
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nenhum dos itens tiver qualquer mudança na quantidade ou valor.
 DocType: Warranty Claim,Warranty Claim,Reclamação de Garantia
 ,Lead Details,Chumbo Detalhes
-DocType: Authorization Rule,Approving User,Aprovar Utilizador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Galvanização
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
 DocType: Pricing Rule,Applicable For,Aplicável para
 DocType: Bank Reconciliation,From Date,A partir da data
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Valor pago (Empresa de moeda)
 DocType: Purchase Invoice,Additional Discount,Desconto adicional
 DocType: Selling Settings,Selling Settings,Vendendo Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Leilões Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a quantidade ou Taxa de Valorização ou ambos"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Bedrijf , maand en het fiscale jaar is verplicht"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Punt Tekort Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Mencione ""Peso UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Pedido de material usado para fazer isto Stock Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Única unidade de um item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tempo Log Batch {0} deve ser ' enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Folhas total atribuído
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Armazém necessária no Row Nenhuma {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Por favor, indique Ano válido Financial datas inicial e final"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 DocType: Upload Attendance,Get Template,Obter modelo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Mineração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,De moldagem de resina
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Um grupo de clientes existente com o mesmo nome, por favor altere o nome do cliente ou renomear o grupo de clientes"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Por favor seleccione {0} primeiro.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},texto {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},texto {0}
 DocType: Territory,Parent Territory,Território pai
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
 DocType: Stock Entry,Material Receipt,Recebimento de materiais
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,produtos
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,produtos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Festa Tipo and Party é necessário para receber / pagar contas {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em ordens de venda etc."
 DocType: Lead,Next Contact By,Contato Próxima Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído como existe quantidade para item {1}
 DocType: Quotation,Order Type,Tipo de Ordem
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 DocType: Payment Tool,Find Invoices to Match,Encontre Faturas para combinar
 ,Item-wise Sales Register,Vendas de item sábios Registrar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","eg ""XYZ National Bank """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","eg ""XYZ National Bank """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,É este imposto incluído na Taxa Básica?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Alvo total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Alvo total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Carrinho de Compras está habilitado
 DocType: Job Applicant,Applicant for a Job,Candidato a um emprego
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Não há ordens de produção criadas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Folha de salário de empregado {0} já criado para este mês
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Sales Invoice Item,Batch No,No lote
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias ordens de venda contra a Ordem de Compra do Cliente
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,principal
-DocType: DocPerm,Delete,Excluir
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variante
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nova {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Parado ordem não pode ser cancelado. Desentupir para cancelar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM padrão ({0}) deve estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Deixe cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunidade De O campo é obrigatório
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Maak Bestelling
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Maak Bestelling
 DocType: SMS Center,Send To,Enviar para
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Montante atribuído
 DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
 DocType: Sales Invoice Item,Customer's Item Code,Código do Cliente item
 DocType: Stock Reconciliation,Stock Reconciliation,Da Reconciliação
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Candidato a um emprego.
 DocType: Purchase Order Item,Warehouse and Reference,Armazém e Referência
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações legais e outras informações gerais sobre o seu Fornecedor
-DocType: Country,Country,País
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Endereços
-DocType: Communication,Received,ontvangen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diário {0} não tem qualquer {1} entrada incomparável
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de envio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item não é permitido ter ordem de produção.
-DocType: DocField,Attach Image,anexar imagem
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma de peso líquido dos itens)
-DocType: Stock Reconciliation Item,Leave blank if no change,Deixe em branco se não houver mudança
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Bill
 DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Logs de horário para a fabricação.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Warehouse-wise Reordenar Nível
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} deve ser apresentado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} deve ser apresentado
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tempo de registro para as tarefas.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pagamento
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagamento
 DocType: Production Order Operation,Actual Time and Cost,Tempo atual e custo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitação de materiais de máxima {0} pode ser feita para item {1} contra ordem de venda {2}
 DocType: Employee,Salutation,Saudação
-DocType: Communication,Rejected,Rejeitado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,Será que também se aplicam para as variantes
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle itens no momento da venda.
 DocType: Sales Order Item,Actual Qty,Qtde Atual
 DocType: Sales Invoice Item,References,Referências
 DocType: Quality Inspection Reading,Reading 10,Leitura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Liste seus produtos ou serviços que você comprar ou vender .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U heeft dubbele items ingevoerd. Aub verwijderen en probeer het opnieuw .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valor {0} para o atributo {1} não existe na lista de item válido Valores de Atributo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Para empacotar Não.
-DocType: DocType,System,Sistema
 DocType: Warranty Claim,Issue Date,Data de Emissão
 DocType: Activity Cost,Activity Cost,Atividade Custo
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtde consumida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicações
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só Projecto)
 DocType: Payment Tool,Make Payment Entry,Betalen Entry
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Quantidade de item {0} deve ser inferior a {1}
 ,Sales Invoice Trends,Vendas Tendências fatura
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Licenças
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Para
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Armazém de entrega
 DocType: Stock Settings,Allowance Percent,Subsídio Percentual
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Cotação do item fornecedor
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maak salarisstructuur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Shearing
 DocType: Item,Has Variants,Tem Variantes
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clique em &#39;Criar Fatura de vendas&#39; botão para criar uma nova factura de venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Embalagem e rotulagem
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendas Pessoa pai
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox acesso secreta
 DocType: Purchase Invoice,Recurring Invoice,Fatura recorrente
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Gerenciamento de Projetos
 DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget Detail,Fiscal Year,Ano Fiscal
 DocType: Cost Center,Budget,Orçamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Alcançados
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Grondgebied / Klantenservice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por exemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,por exemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Em Palavras será visível quando você salvar a nota fiscal de venda.
 DocType: Item,Is Sales Item,É item de vendas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Punt Groepsstructuur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} não está configurado para n º s de série mestre check item
 DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
 ,Amount to Deliver,Valor a entregar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Um produto ou serviço
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Er waren fouten .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Tapping
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Um produto ou serviço
 DocType: Naming Series,Current Value,Valor Atual
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} criado
 DocType: Delivery Note Item,Against Sales Order,Contra Ordem de Venda
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
 DocType: Website Item Group,Website Item Group,Grupo Item site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Por favor, indique data de referência"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Fornecido Qtde
 DocType: Material Request Item,Material Request Item,Item de solicitação de material
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árvore de Grupos de itens .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Árvore de Grupos de itens .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
 ,Item-wise Purchase History,Item-wise Histórico de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Vermelho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Vermelho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em "" Gerar Cronograma ' para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Open productieorders
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Row # {0}: Operation {1} não for completado por {2} qty de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Tempo Logs"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimentos
 DocType: Issue,Resolution Details,Detalhes de Resolução
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Alterar UOM de um item.
 DocType: Quality Inspection Reading,Acceptance Criteria,Critérios de Aceitação
 DocType: Item Attribute,Attribute Name,Nome do atributo
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} deve ser de Vendas ou Atendimento item em {1}
 DocType: Item Group,Show In Website,Mostrar No Site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupo
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 ,Qty to Order,Aantal te bestellen
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Para rastrear marca no seguintes documentos Nota de Entrega, Oportunidade, Pedir Material, Item, Pedido de Compra, Compra de Vouchers, o Comprador Receipt, cotação, Vendas fatura, Pacote de Produtos, Pedido de Vendas, Serial No"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Tabela clara
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,A factura n º
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Da Ordem de Compra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Custando Classificação
 ,Customer Addresses And Contacts,Endereços e contatos de clientes
 DocType: Employee,Resignation Letter Date,Data carta de demissão
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,niet instellen
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Cliente Repita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Hou je vast terwijl uw systeem wordt setup. Dit kan even duren .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a regra de 'Aprovador de Despesas'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,par
 DocType: Bank Reconciliation Detail,Against Account,Contra Conta
 DocType: Maintenance Schedule Detail,Actual Date,Data atual
 DocType: Item,Has Batch No,Não tem Batch
 DocType: Delivery Note,Excise Page Number,Número de página especial sobre o consumo
 DocType: Employee,Personal Details,Detalhes pessoais
 ,Maintenance Schedules,Horários de Manutenção
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Gravação em relevo
 ,Quotation Trends,Tendências cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Como ordem de produção pode ser feita para este item , deve ser um item de estoque."
 DocType: Shipping Rule Condition,Shipping Amount,Valor do transporte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Juntando
-DocType: Authorization Rule,Above Value,Acima de Valor
 ,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configuração do servidor de entrada para os trabalhos de identificação do email . ( por exemplo jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Número de veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será parar
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de folhas alocados {0} não pode ser menos do que as folhas já aprovados {1} para o período
 DocType: Journal Entry,Accounts Receivable,Contas a receber
 ,Supplier-Wise Sales Analytics,Leveranciers Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Este formato é usado se o formato específico país não é encontrado
-DocType: Custom Field,Custom,Personalizado
 DocType: Production Order,Use Multi-Level BOM,Utilize Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Moldagem por injeção
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árvore de contas financeiras.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de empregados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir taxas sobre
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Conta {0} deve ser do tipo "" Ativo Fixo "" como item {1} é um item de ativos"
 DocType: HR Settings,HR Settings,Configurações RH
-apps/frappe/frappe/config/setup.py +130,Printing,Impressão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Declaratie is in afwachting van goedkeuring . Alleen de Expense Approver kan status bijwerken .
 DocType: Purchase Invoice,Additional Discount Amount,Montante desconto adicional
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,No dia (s) em que você está se candidatando para a licença estão de férias. Você não precisa solicitar uma licença .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,e
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,esportes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,esportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,unidade
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Defina teclas de acesso Dropbox em sua configuração local
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,unidade
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Klantenwerving en Loyalty
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Armazém onde você está mantendo estoque de itens rejeitados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Seu exercício termina em
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Seu exercício termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o padrão Ano Fiscal. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Os relatórios de despesas
 DocType: Issue,Support,Apoiar
-DocType: Authorization Rule,Approving Role,Aprovar Responsabilidade
 ,BOM Search,BOM Pesquisa
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Fechando (abertura + Totais)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique moeda in Company"
 DocType: Workstation,Wages per hour,Os salários por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Ocultar recursos como os números de ordem , POS , etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Na sequência de pedidos de materiais têm sido levantadas automaticamente com base no nível de re-ordem do item
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM fator de conversão é necessária na linha {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Apuramento data não pode ser anterior à data de verificação na linha {0}
 DocType: Salary Slip,Deduction,Dedução
 DocType: Address Template,Address Template,Modelo de endereço
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Digite Employee Id desta pessoa de vendas
@@ -1730,79 +1594,71 @@
 DocType: Project,Gross Margin,Margem Bruta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,Vul Productie Item eerste
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,usuário desativado
-DocType: Opportunity,Quotation,Citação
+DocType: Opportunity,Quotation,Orçamento
 DocType: Salary Slip,Total Deduction,Dedução Total
 DocType: Quotation,Maintenance User,Manutenção do usuário
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Custo Atualizado
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Custo Atualizado
 DocType: Employee,Date of Birth,Data de Nascimento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Ano Fiscal ** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra ** Ano Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Klant / Lead Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Actual Tempo Operação
 DocType: Authorization Rule,Applicable To (User),Para aplicável (Utilizador)
 DocType: Purchase Taxes and Charges,Deduct,Subtrair
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrição do trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde como por Ação UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Por favor, selecione um arquivo csv com dados válidos"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Revestimento
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"" não é permitido em série nomeando"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Leads, cotações, Pedido de Vendas etc de Campanhas para medir retorno sobre o investimento."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Aantal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","As entradas em existências existir contra armazém {0}, portanto, você não pode voltar a atribuir ou modificar Warehouse"
 DocType: Appraisal,Calculate Total Score,Calcular a pontuação total
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufatura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Não {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Nota de Entrega dividir em pacotes.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Os embarques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Moldagem Dip
-DocType: Purchase Order,To be delivered to customer,Para ser entregue ao cliente
+apps/erpnext/erpnext/hooks.py +68,Shipments,Os embarques
+DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tempo Log Estado devem ser apresentadas.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Serial No {0} não pertence a nenhum Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurando
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Words (Moeda Company)
 DocType: Pricing Rule,Supplier,Fornecedor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Despesas Diversas
 DocType: Global Defaults,Default Company,Empresa padrão
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
 DocType: Employee,Bank Name,Nome do banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Acima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utilizador {0} está desativado
 DocType: Leave Application,Total Leave Days,Total de dias de férias
-DocType: Journal Entry Account,Credit in Account Currency,Crédito em Conta de moeda
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: e-mail não será enviado para utilizadores com deficiência
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selecione Empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego ( permanente , contrato, etc estagiário ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} é obrigatório para item {1}
 DocType: Currency Exchange,From Currency,De Moeda
-DocType: DocField,Name,Nome
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordem de venda necessário para item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Valores não reflete em sistema
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordem de venda necessário para item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Valores não reflete em sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (moeda da empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,outros
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,outros
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou serviço que é comprado, vendido ou mantido em stock."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Concluído
-DocType: Web Form,Select DocType,Selecione DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brochar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,bancário
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancário
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em "" Gerar Agenda "" para obter cronograma"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Novo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Novo Centro de Custo
 DocType: Bin,Ordered Quantity,Quantidade pedida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","Ex: ""Ferramentas de construção para construtores """
 DocType: Quality Inspection,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto Itemwise
 DocType: Purchase Order Item,Reference Document Type,Referência Tipo de Documento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} contra a Ordem de Vendas {1}
 DocType: Account,Fixed Asset,Activos Fixos
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventário Serialized
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventário Serialized
 DocType: Activity Type,Default Billing Rate,Faturamento Taxa de Inadimplência
 DocType: Time Log Batch,Total Billing Amount,Valor Total do faturamento
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contas a Receber
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Pedido de Vendas para pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe de Despesas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Time Logs criado:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,Peso UOM
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Quebra de página
 DocType: Production Order Operation,Pending,Pendente
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um funcionário específico
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Você não pode mudar UOM padrão de Variant. Para alterar UOM padrão para Variant UOM mudança padrão do modelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de escritório
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Empresas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,eletrônica
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,eletrônica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levante solicitar material quando o estoque atinge novo pedido de nível
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Da Manutenção Agendada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,De tempo integral
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,De tempo integral
 DocType: Purchase Invoice,Contact Details,Contacto
 DocType: C-Form,Received Date,Data de recebimento
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se você criou um modelo padrão de Impostos e Taxas de Vendas Modelo, selecione um e clique no botão abaixo."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Oferta de emprego
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliação Pagamento
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,tecnologia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tecnologia
 DocType: Offer Letter,Offer Letter,Oferecer Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Gerar Pedidos de Materiais (MRP) e Ordens de Produção.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total facturado Amt
 DocType: Time Log,To Time,Para Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovando Papel (acima do valor autorizado)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om onderliggende nodes te voegen , te verkennen boom en klik op het knooppunt waar u wilt meer knooppunten toe te voegen ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Crédito em conta deve ser uma conta a pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Concluído Qtde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Preço de {0} está desativado
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,Item de cliente Códigos
 DocType: Opportunity,Lost Reason,Razão perdido
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Criar entradas de pagamento contra as ordens ou Faturas.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Soldadura
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Novo stock UOM é necessária
 DocType: Quality Inspection,Sample Size,Tamanho da amostra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitas em grupos, mas as entradas podem ser feitas contra os não-Groups"
 DocType: Project,External,Externo
 DocType: Features Setup,Item Serial Nos,Item n º s de série
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,Quantidade Atual
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Next Day envio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Os seus Clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Moldagem por compressão
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Os seus Clientes
 DocType: Leave Block List Date,Block Date,Bloquear Data
 DocType: Sales Order,Not Delivered,Não entregue
 ,Bank Clearance Summary,Banco Resumo Clearance
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Criar e gerenciar diários, semanais e mensais digere e-mail."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código do item> Item Grupo> Marca
 DocType: Appraisal Goal,Appraisal Goal,Meta de avaliação
-DocType: Event,Friday,Sexta-feira
 DocType: Time Log,Costing Amount,Custando Montante
 DocType: Process Payroll,Submit Salary Slip,Enviar folha de salário
 DocType: Salary Structure,Monthly Earning & Deduction,Salário mensal e dedução
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em massa
 DocType: Sales Partner,Address & Contacts,Endereço e contatos
 DocType: SMS Log,Sender Name,Nome do remetente
-DocType: Page,Title,Título
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalize
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: SMS Log,Sent To,Enviado Para
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Maak verkoopfactuur
 DocType: Company,For Reference Only.,Apenas para referência.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Inválido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Quantidade Adiantada
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Data de' é necessário
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Data de' é necessário
 DocType: Journal Entry,Reference Number,Número de Referência
 DocType: Employee,Employment Details,Detalhes de emprego
 DocType: Employee,New Workplace,Novo local de trabalho
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Prazo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antiguidade Baseado em
 DocType: Item,End of Life,Fim da Vida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,viagem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,viagem
 DocType: Leave Block List,Allow Users,Permitir utilizadores
 DocType: Purchase Order,Customer Mobile No,Cliente Móvel Nenhum
 DocType: Sales Invoice,Recurring,Recorrente
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Renomear Ferramenta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Item Reordenar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Materiaal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Geef de operaties , operationele kosten en geven een unieke operatie niet aan uw activiteiten ."
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O usuário deve sempre escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir stock negativo
 DocType: Installation Note,Installation Note,Nota de Instalação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adicionar impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Adicionar impostos
 ,Financial Analytics,Análise Financeira
 DocType: Quality Inspection,Verified By,Verificado Por
 DocType: Address,Subsidiary,Subsidiário
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
 DocType: Quality Inspection,Purchase Receipt No,Compra recibo Não
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinheiro Earnest
-DocType: System Settings,In Hours,Em Horas
 DocType: Process Payroll,Create Salary Slip,Criar folha de salário
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Equilíbrio esperado como por banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Equilíbrio esperado como por banco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fonte de Recursos ( Passivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantidade em linha {0} ( {1} ) deve ser a mesma quantidade fabricada {2}
 DocType: Appraisal,Employee,Empregado
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo pela Vale
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Sales Invoice,Mass Mailing,Divulgação em massa
-DocType: Page,Standard,Padrão
 DocType: Rename Tool,File to Rename,Arquivo para renomear
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Mostrar Pagamentos
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Tamanho
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Especificada BOM {0} não existe para item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de manutenção {0} deve ser cancelado antes de cancelar esta ordem de venda
 DocType: Notification Control,Expense Claim Approved,Relatório de Despesas Aprovado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,farmacêutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de itens comprados
 DocType: Selling Settings,Sales Order Required,Ordem vendas Obrigatório
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Maak de klant
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Leitura 9
 DocType: Supplier,Is Frozen,Está Congelado
 DocType: Buying Settings,Buying Settings,Comprar Configurações
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Acabamento em massa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Não. para um item acabado
 DocType: Upload Attendance,Attendance To Date,Atendimento para a data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuração do servidor de entrada de e-mail id vendas. ( por exemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Levantadas por
 DocType: Payment Tool,Payment Account,Conta de Pagamento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Rascunho
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,compensatória Off
 DocType: Quality Inspection Reading,Accepted,Aceite
-DocType: User,Female,Feminino
-DocType: Journal Entry Account,Debit in Account Currency,Débito em Conta de moeda
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que você realmente quer apagar todas as operações para esta empresa. Os seus dados mestre vai permanecer como está. Essa ação não pode ser desfeita."
-DocType: Print Settings,Modern,Moderno
-DocType: Communication,Replied,Respondeu
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referência inválida {0} {1}
 DocType: Payment Tool,Total Payment Amount,Valor Total Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade  pré estabelecida ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Regra envio Rótulo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
 DocType: Newsletter,Test,Teste
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Como existem transações com ações existentes para este item, \ não é possível alterar os valores de &#39;não tem Serial&#39;, &#39;Tem Lote n&#39;, &#39;é Stock item &quot;e&quot; Método de avaliação&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Breve Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,U kunt geen koers veranderen als BOM agianst een item genoemd
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique Planned Qt para item {0} na linha {1}"
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordem de produção separado será criado para cada item acabado.
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Instalação concluída
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registo contábil congelado até à presente data, ninguém pode fazer / modificar entrada exceto para as funções especificadas abaixo."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bewaar het document voordat het genereren van onderhoudsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Mailing List Boletim informativo
 DocType: Delivery Note,Transporter Name,Nome Transporter
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
 DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que pertence este contato
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Total de Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ou Armazém para linha {0} não corresponde Pedido de materiais
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidade de Medida
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unidade de Medida
 DocType: Fiscal Year,Year End Date,Data de Fim de Ano
 DocType: Task Depends On,Task Depends On,Tarefa depende de
 DocType: Lead,Opportunity,Oportunidade
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa básica (de acordo da UOM)
 DocType: SMS Log,No of Requested SMS,No pedido de SMS
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Perfurante
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos passos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data Contrato Final deve ser maior que Data de Participar
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
 DocType: Customer Group,Has Child Node,Tem nó filho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} contra a Ordem de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros URL estática aqui (por exemplo remetente = ERPNext, username = ERPNext, password = 1234, etc)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não em qualquer ano fiscal ativa. Para mais detalhes consulte {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa Envelhecimento 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Usinagem fotoquímica
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. Digite Row: Se baseado em ""Anterior Row Total"", você pode selecionar o número da linha que será tomado como base para este cálculo (o padrão é a linha anterior).
  9. Considere imposto ou encargo para: Nesta seção, você pode especificar se o imposto / taxa é apenas para avaliação (não uma parte do total) ou apenas para total (não agrega valor ao item) ou para ambos.
  10. Adicionar ou deduzir: Se você quer adicionar ou deduzir o imposto."
-DocType: Note,Note,Nota
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade RECD
-DocType: Email Account,Email Ids,Email Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade Ordem de Vendas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Da entrada {0} não é apresentado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 DocType: Tax Rule,Billing City,Faturamento Cidade
 DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Nota de Crédito
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Completado Qtd não pode ser mais do que {0} para operação de {1}
 DocType: Features Setup,Quality,Qualidade
-DocType: Contact Us Settings,Introduction,Introdução
 DocType: Warranty Claim,Service Address,Serviço Endereço
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 linhas para da reconciliação.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 linhas para da reconciliação.
 DocType: Stock Entry,Manufacture,Fabricação
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
-DocType: Purchase Invoice,Currency and Price List,Moeda e Lista de Preço
+DocType: Purchase Invoice,Currency and Price List,Moeda e Lista de Preços
 DocType: Opportunity,Customer / Lead Name,Cliente / Nome de chumbo
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,produção
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Apuramento data não mencionada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,produção
 DocType: Item,Allow Production Order,Permitir Ordem de Produção
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Quantidade instalada
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Ganhar total
 DocType: Purchase Receipt,Time at which materials were received,Momento em que os materiais foram recebidos
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Os meus endereços
 DocType: Stock Ledger Entry,Outgoing Rate,Taxa de saída
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mestre Organização ramo .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ou
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ou
 DocType: Sales Order,Billing Status,Estado de faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Despesas de Utilidade
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Standaard Buying Prijslijst
-,Download Backups,Download de Backups
 DocType: Notification Control,Sales Order Message,Vendas Mensagem Ordem
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir valores padrão , como Company, de moeda, Atual Exercício , etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,betaling Type
 DocType: Process Payroll,Select Employees,Selecione funcionários
 DocType: Bank Reconciliation,To Date,Conhecer
 DocType: Opportunity,Potential Sales Deal,Promoção de Vendas Potenciais
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalhes
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impostos e Encargos
 DocType: Employee,Emergency Contact,Emergency Contact
 DocType: Item,Quality Parameters,Parâmetros de Qualidade
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Account,Account Type,Tipo de conta
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerado para todos os itens. Por favor, clique em "" Gerar Agenda '"
 ,To Produce,Produce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Quantidade reservados
 DocType: Landed Cost Voucher,Purchase Receipt Items,Comprar Itens Recibo
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas de personalização
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Corte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Achatamento
 DocType: Account,Income Account,Conta Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modelagem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Responsabilidade de Área chave
 DocType: Item Reorder,Material Request Type,Tipo de solicitação de material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Fator de Conversão UOM é obrigatória
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documentos
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Centro de Custos
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,voucher #
 DocType: Notification Control,Purchase Order Message,Mensagem comprar Ordem
 DocType: Tax Rule,Shipping Country,O envio País
 DocType: Upload Attendance,Upload HTML,Carregar HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Antecedência Total ({0}) contra a Ordem {1} não pode ser maior do que o Grand \
  Total ({2})"
 DocType: Employee,Relieving Date,Aliviar Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Stock Entry / Delivery Note / Kwitantie worden veranderd
 DocType: Employee Education,Class / Percentage,Classe / Percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engenharia shaping net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Diretor de Marketing e Vendas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Imposto de Renda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como a Ordem de Vendas, Ordem de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Lista de Preços Rate '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trilha leva por setor Type.
 DocType: Item Supplier,Item Supplier,Fornecedor item
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todos os endereços.
 DocType: Company,Stock Settings,Configurações da
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gerenciar Grupo Cliente Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nome de NOvo Centro de Custo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nome de NOvo Centro de Custo
 DocType: Leave Control Panel,Leave Control Panel,Deixe Painel de Controle
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No modelo padrão Endereço encontrado. Por favor, crie um novo a partir de configuração> Impressão e Branding> modelo de endereço."
 DocType: Appraisal,HR User,HR Utilizador
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde atual após a transação
 ,Pending SO Items For Purchase Request,"Itens Pendentes Assim, por solicitação de compra"
 DocType: Supplier,Billing Currency,Faturamento Moeda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra-grande
 ,Profit and Loss Statement,Demonstração dos Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheques
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Premente
 DocType: Payment Tool Detail,Payment Tool Detail,Detalhe ferramenta de pagamento
 ,Sales Browser,Navegador Vendas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativo )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nenhum funcionário encontrado!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Grande
 DocType: C-Form Invoice Detail,Territory,Território
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Purchase Order,Customer Address Display,Exibir endereço do cliente
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polimento
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unidade de medida padrão para item {0} não pode ser alterado diretamente porque \ você já fez alguma transação (s) com outro UOM. Para alterar UOM padrão, \ uso &#39;UOM Substitua Utility &quot;ferramenta abaixo Stock módulo."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Cotação {0} é cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Cotação {0} é cancelada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante total em dívida
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empregado {0} estava de licença em {1} . Não pode marcar presença.
 DocType: Sales Partner,Targets,Metas
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,S.O. Nee.
 DocType: Production Order Operation,Make Time Log,Make Time Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Por favor, defina a quantidade de reabastecimento"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, crie Cliente de chumbo {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,informática
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-química de moagem
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Dit is een wortel klantgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure o seu plano de contas antes de começar a fazer lançamentos contabilísticos"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar regra de preços
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Cancelado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir da data em Estrutura salarial não pode ser menor do que Employee Juntando Data.
 DocType: Employee Education,Graduate,Pós-graduação
 DocType: Leave Block List,Block Days,Dias bloco
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Verifique se factura recorrente, desmarque a parar recorrente ou colocar Data final adequada"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Atendimento para empregado {0} já está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Se mais do que uma embalagem do mesmo tipo (por impressão)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Máximo de {0} linhas permitido
 DocType: C-Form Invoice Detail,Net Total,Líquida Total
 DocType: Bin,FCFS Rate,Taxa FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Faturamento (Nota Fiscal de Vendas)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Pelo menos um item deve ser inserido com quantidade negativa no documento de devolução
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operação {0} mais do que as horas de trabalho disponíveis na estação de trabalho {1}, quebrar a operação em várias operações"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Maquinagem electroquimica
 ,Requested,gevraagd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Não Observações
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vencido
 DocType: Account,Stock Received But Not Billed,"Banco recebido, mas não faturados"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Conta raiz deve ser um grupo
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor + Valor vencido cobrança - Dedução Total
 DocType: Monthly Distribution,Distribution Name,Nome de distribuição
 DocType: Features Setup,Sales and Purchase,Vendas e Compras
 DocType: Supplier Quotation Item,Material Request No,Pedido de material no
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} foi retirado com sucesso a partir desta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Companhia de moeda)
-apps/frappe/frappe/templates/base.html +134,Added,Adicionado
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gerenciar Árvore Território.
 DocType: Journal Entry Account,Sales Invoice,Fatura de vendas
 DocType: Journal Entry Account,Party Balance,Balance Partido
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Ano Fiscal {0} não foi encontrado.
 DocType: Bank Reconciliation,Get Relevant Entries,Obter entradas relevantes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Entrada de Contabilidade da
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Cunhagem
 DocType: Sales Invoice,Sales Team1,Vendas team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do cliente
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar desconto adicional em
 DocType: Account,Root Type,Tipo de Raiz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Não é possível retornar mais de {1} para {2} item
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto Valor Depois de desconto (Companhia de moeda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Destino do Warehouse é obrigatória para a linha {0}
 DocType: Quality Inspection,Quality Inspection,Inspeção de Qualidade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formação
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Muito Pequeno
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing : Materiaal gevraagde Aantal minder dan Minimum afname
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL of BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Taxa de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nível Mínimo Inventory
 DocType: Stock Entry,Subcontract,Subcontratar
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,Número da peça de fabricante
 DocType: Production Order Operation,Estimated Time and Cost,Tempo estimado e Custo
 DocType: Bin,Bin,Caixa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Astrágalo
 DocType: SMS Log,No of Sent SMS,N º de SMS enviados
 DocType: Account,Company,Companhia
 DocType: Account,Expense Account,Conta Despesa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Cor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Cor
 DocType: Maintenance Visit,Scheduled,Programado
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente alvos através meses.
 DocType: Purchase Invoice Item,Valuation Rate,Taxa de valorização
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Não foi indicada uma Moeda para a Lista de Preços
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Row item {0}: Recibo de compra {1} não existe em cima da tabela 'recibos de compra'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Empregado {0} já solicitou {1} {2} entre e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do projeto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
 DocType: Rename Tool,Rename Log,Renomeie Entrar
 DocType: Installation Note Item,Against Document No,Contra documento No
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gerenciar parceiros de vendas.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Por favor seleccione {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Por favor seleccione {0}
 DocType: C-Form,C-Form No,C-Forma Não
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,investigador
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Atualizar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,investigador
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Por favor, salve o Boletim informativo antes de enviar"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nome ou E-mail é obrigatório
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspeção de qualidade de entrada.
 DocType: Purchase Order Item,Returned Qty,Devolvido Qtde
 DocType: Employee,Exit,Sair
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Tipo de Raiz é obrigatório
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Não {0} criado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibroacabamento
-DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como facturas e guias de entrega"
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como facturas e guias de entrega"
 DocType: Employee,You can enter any date manually,Você pode entrar em qualquer data manualmente
 DocType: Sales Invoice,Advertisement,Anúncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Nós folha apenas são permitidos em operação
 DocType: Expense Claim,Expense Approver,Despesa Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra do item em actualização
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway de URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Moagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Retráctil
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Atividades pendentes
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Fornecedor> Fornecedor Tipo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, indique data alívio ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,O título do Endereço é obrigatório.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se fonte de pesquisa é a campanha
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editores de Jornais
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Jornais
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Attendance,Attendance Date,Data de atendimento
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salário com base em salário e dedução.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Conta com nós filhos não pode ser convertido em livro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Conta com nós filhos não pode ser convertido em livro
 DocType: Address,Preferred Shipping Address,Endereço para envio preferido
 DocType: Purchase Receipt Item,Accepted Warehouse,Armazém Aceite
 DocType: Bank Reconciliation Detail,Posting Date,Data da Publicação
 DocType: Item,Valuation Method,Método de Avaliação
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Incapaz de encontrar a taxa de câmbio para {0} para {1}
 DocType: Sales Invoice,Sales Team,Equipe de Vendas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,duplicar entrada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,duplicar entrada
 DocType: Serial No,Under Warranty,Sob Garantia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Em Palavras será visível quando você salvar a Ordem de Vendas.
 ,Employee Birthday,Aniversário empregado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risco
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 DocType: UOM,Must be Whole Number,Deve ser Número inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Folhas novas atribuído (em dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Não {0} não existe
 DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
 DocType: Payment Reconciliation Invoice,Invoice Number,Número da fatura
-apps/erpnext/erpnext/hooks.py +70,Orders,Encomendas
+apps/erpnext/erpnext/hooks.py +54,Orders,Encomendas
 DocType: Leave Control Panel,Employee Type,Tipo de empregado
 DocType: Employee Leave Approver,Leave Approver,Deixe Aprovador
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Deformação
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para Fabricação
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um utilizador com responsabilidade de ""Aprovar Despesas"""
 ,Issued Items Against Production Order,Itens emitida contra Ordem de Produção
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Período inválido
 DocType: Customer,Credit Limit,Limite de Crédito
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selecione o tipo de transação
 DocType: GL Entry,Voucher No,Vale No.
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,Endereço e Contato
 DocType: Customer,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Employee,Feedback,Comentários
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Devido / Reference Data excede dias de crédito de clientes permitidos por {0} dia (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Manut. Cronograma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Usinagem jato abrasivo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Manut. Cronograma
 DocType: Stock Settings,Freeze Stock Entries,Congelar da Entries
-DocType: Website Settings,Website Settings,Configurações do site
 DocType: Item,Reorder level based on Warehouse,Nível de reabastecimento baseado em Armazém
 DocType: Activity Cost,Billing Rate,Faturamento Taxa
 ,Qty to Deliver,Aantal te leveren
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,gevraagd voor
 DocType: Quotation Item,Against Doctype,Contra Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Nota de Entrega contra qualquer projeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Conta root não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Conta root não pode ser excluído
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Mostrar Banco de Entradas
 ,Is Primary Address,É primário Endereço
 DocType: Production Order,Work-in-Progress Warehouse,Armazém Work-in-Progress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gerenciar endereços
 DocType: Pricing Rule,Item Code,Código do artigo
 DocType: Production Planning Tool,Create Production Orders,Criar ordens de produção
 DocType: Serial No,Warranty / AMC Details,Garantia / AMC Detalhes
 DocType: Journal Entry,User Remark,Observação de usuário
 DocType: Lead,Market Segment,Segmento de mercado
-DocType: Communication,Phone,Telefone
 DocType: Employee Internal Work History,Employee Internal Work History,Empregado História Trabalho Interno
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Fechamento (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Fechamento (Dr)
 DocType: Contact,Passive,Passiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Não {0} não em estoque
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Modelo imposto pela venda de transações.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,gefactureerde bedrag
 DocType: Bank Reconciliation,Bank Reconciliation,Banco Reconciliação
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obter atualizações
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adicione alguns registros de exemplo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Pedido de material {0} é cancelado ou interrompido
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Adicione alguns registros de exemplo
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Deixar de Gestão
-DocType: Event,Groups,Grupos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupo por Conta
 DocType: Sales Order,Fully Delivered,Totalmente entregue
 DocType: Lead,Lower Income,Baixa Renda
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Quick Help
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Fonte e armazém de destino não pode ser o mesmo para a linha {0}
 DocType: Features Setup,Sales Extras,Extras de vendas
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} orçamento para conta {1} contra Centro de Custo {2} excederá por {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} orçamento para conta {1} contra Centro de Custo {2} excederá por {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Número do pedido requerido para item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','A Data de ' deve ser depois de ' Para Data '
 ,Stock Projected Qty,Verwachte voorraad Aantal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor ou Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos de compra
 ,Qty to Receive,Aantal te ontvangen
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Fator de conversão não pode estar em frações
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Você vai usá-lo para o Login
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Você vai usá-lo para o Login
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos os tipos de fornecedores
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Cotação {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Programa de Manutenção
 DocType: Sales Order,%  Delivered,% Entregue
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Conta Garantida Banco
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Maak loonstrook
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Empréstimos garantidos
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,produtos impressionantes
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,produtos impressionantes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Abertura Patrimônio Balance
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Não foi possível aprovar a licença que você não está autorizado a aprovar folhas em datas Bloco
 DocType: Appraisal,Appraisal,Avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,De fundição de espuma perdida
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desenho
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data é repetido
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
 DocType: Hub Settings,Seller Email,Vendedor Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (Purchase via da fatura)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Companhia de moeda)
 DocType: BOM Operation,Hour Rate,Taxa à hora
 DocType: Stock Settings,Item Naming By,Item de nomeação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,De Orçamento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,De Orçamento
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para Manufatura
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Conta {0} não existe
 DocType: Purchase Receipt Item,Purchase Order Item No,Comprar item Portaria n
-DocType: System Settings,System Settings,Configurações do sistema
 DocType: Project,Project Type,Tipo de projeto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Valores de Qtd Alvo ou montante alvo são obrigatórios
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Custo das diferentes actividades
@@ -2560,50 +2364,43 @@
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 DocType: Sales Order,Fully Billed,Totalmente Anunciado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na mão
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Armazém de entrega necessário para estoque item {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met deze rol mogen bevroren accounts en maak / boekingen tegen bevroren rekeningen wijzigen
 DocType: Serial No,Is Cancelled,É cancelado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Minhas remessas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Minhas remessas
 DocType: Journal Entry,Bill Date,Data Bill
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 DocType: Supplier,Supplier Details,Detalhes fornecedor
-DocType: Communication,Recipients,Destinatários
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Enroscando
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status de Aprovação
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor seleccione Conta Bancária
 DocType: Newsletter,Create and Send Newsletters,Criar e enviar Newsletters
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,A partir da data deve ser anterior a Data
 DocType: Sales Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta Rendimento padrão
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Klantenservice
 DocType: Item Group,Check this if you want to show in website,Marque esta opção se você deseja mostrar no site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bem-vindo ao ERPNext
+,Welcome to ERPNext,Bem-vindo ao ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número Detalhe voucher
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Levar a cotação
 DocType: Lead,From Customer,Do Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,chamadas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Montante Custeio Total (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Estoque UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Ordem de Compra {0} não é submetido
 ,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
-DocType: Notification Control,Quotation Message,Mensagem citação
+DocType: Notification Control,Quotation Message,Mensagem de Orçamento
 DocType: Issue,Opening Date,Data de abertura
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Taxa e montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chato
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Da Ordem de Vendas
-DocType: Blog Category,Parent Website Route,Pai site Route
 DocType: Sales Order,Not Billed,Não faturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Beide Warehouse moeten behoren tot dezelfde Company
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Não ativo
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Custo Landed Comprovante Montante
 DocType: Time Log,Batched for Billing,Agrupadas para Billing
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Contas levantada por Fornecedores.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Montante do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Regresso contra factura de compra
 DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por exemplo IVA
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,por exemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Journal Entry Account,Journal Entry Account,Conta Diário de entrada
 DocType: Shopping Cart Settings,Quotation Series,Cotação Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomear o item"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gás de metais a quente
 DocType: Sales Order Item,Sales Order Date,Vendas Data Ordem
 DocType: Sales Invoice Item,Delivered Qty,Qtde entregue
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Vá para o grupo apropriado (geralmente Fonte de Recursos&gt;&gt; Passivo Circulante Impostos e Taxas e criar uma nova conta (clicando em Adicionar Criança) do tipo &quot;imposto&quot; e fazer mencionar a taxa de imposto.
 ,Payment Period Based On Invoice Date,Betaling Periode Based On Factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Corte a laser
-DocType: Event,Monday,Segunda-feira
 DocType: Journal Entry,Stock Entry,Entrada stock
 DocType: Account,Payable,a pagar
 DocType: Salary Slip,Arrear Amount,Quantidade atraso
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,Endereço Descr
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Pelo menos um dos que vendem ou compram deve ser selecionado
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Sempre que as operações de fabricação são realizadas.
-DocType: Page,All,Tudo
 DocType: Stock Entry Detail,Source Warehouse,Armazém fonte
 DocType: Installation Note,Installation Date,Data de instalação
 DocType: Employee,Confirmation Date,bevestiging Datum
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,Vendas de Usuário
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Qty mínimo não pode ser maior do que Max Qtde
 DocType: Stock Entry,Customer or Supplier Details,Cliente ou fornecedor detalhes
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Lead,Lead Owner,Levar Proprietário
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Armazém é necessária
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Armazém é necessária
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Pedido de material Auto
 DocType: Time Log,Will be updated when billed.,Será atualizado quando faturado.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,Metas território
 DocType: Delivery Note,Transporter Info,Informações Transporter
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item da ordem de compra em actualização
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Nome da empresa não pode ser empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Chefes de letras para modelos de impressão .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Actualização de stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM diferente para itens levará a incorreta valor Peso Líquido (Total ) . Certifique-se de que o peso líquido de cada item está na mesma UOM .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Taxa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Lançamentos {0} são un-linked
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de e-mail, telefone, chat, visita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
 DocType: Purchase Invoice,Terms,Voorwaarden
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Create New
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Create New
 DocType: Buying Settings,Purchase Order Required,Ordem de Compra Obrigatório
 ,Item-wise Sales History,Item-wise Histórico de Vendas
 DocType: Expense Claim,Total Sanctioned Amount,Valor total Sancionada
 ,Purchase Analytics,Analytics compra
 DocType: Sales Invoice Item,Delivery Note Item,Item Nota de Entrega
 DocType: Expense Claim,Task,Tarefa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Barbear
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Dit is een wortel verkoper en kan niet worden bewerkt .
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Classificação: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Classificação: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Dedução folha de salário
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selecione um nó de grupo em primeiro lugar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Objetivo deve ser um dos {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Preencha o formulário e guarde-o
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Baixe um relatório contendo todas as matérias-primas com o seu estado mais recente inventário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Revestimento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Deixe Equilíbrio Antes da aplicação
 DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeça Padrão Letter
 DocType: Time Log,Billable,Faturável
-DocType: Authorization Rule,This will be used for setting rule in HR module,Isso será usado para fixação de regras no módulo HR
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordenar Qtde
 DocType: Company,Stock Adjustment Account,Banco de Acerto de Contas
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Oportunidade perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campos de desconto estará disponível em Ordem de Compra, Recibo de Compra, Nota Fiscal de Compra"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
-DocType: Report,Report Type,Tipo de relatório
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Carregamento
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Ferramenta Substituir
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos País default sábio endereço
 DocType: Sales Order Item,Supplier delivers to Customer,Fornecedor entrega ao Cliente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Mostrar imposto break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Mostrar imposto break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Se envolver em atividades de fabricação. Permite Item ' é fabricado '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
 DocType: Serial No,Out of AMC,Fora da AMC
 DocType: Purchase Order Item,Material Request Detail No,Detalhe materiais Pedido Não
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Torneamento duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Maak Maintenance Visit
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com o usuário que tem Vendas Mestre Gerente {0} papel"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company ( não cliente ou fornecedor ) mestre.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Por favor, digite ' Data prevista de entrega '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notas de entrega {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Write Off Valor não pode ser maior do que o total geral
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido por item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Nota: Se o pagamento não é feito contra qualquer referência, crie manualmente uma entrada no diário."
 DocType: Item,Supplier Items,Fornecedor Itens
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidade
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento estoque
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' está desativada
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar e-mails automáticos para Contatos sobre transações de enviar.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  Disponível Qtde: {4}, Quantidade de transferência: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
-DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribuição (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Modelo
 DocType: Sales Person,Sales Person Name,Vendas Nome Pessoa
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adicionar usuários
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Adicionar usuários
 DocType: Pricing Rule,Item Group,Grupo Item
 DocType: Task,Actual Start Date (via Time Logs),Data de início real (via Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliação
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas Adicionado (Moeda Company)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 DocType: Sales Order,Partly Billed,Parcialmente faturado
 DocType: Item,Default BOM,BOM padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, re-tipo o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total de Outstanding Amt
 DocType: Time Log Batch,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Configurações de impressão
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,automotivo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item é necessário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Moldagem por injeção de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Débito total deve ser igual ao total de crédito.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automotivo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De Nota de Entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensagem personalizada
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Banca de Investimento
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Investimento
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Dinheiro ou conta bancária é obrigatória para a tomada de entrada de pagamento
 DocType: Purchase Invoice,Price List Exchange Rate,Preço Lista de Taxa de Câmbio
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,A fundição em areia
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Taxa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,internar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,internar
 DocType: Newsletter,A Lead with this email id should exist,Um Lead com esse ID de e-mail deve existir
 DocType: Stock Entry,From BOM,De BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,básico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, clique em "" Gerar Agenda '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Om datum moet dezelfde zijn als Van Datum voor halve dag verlof zijn
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","kg por exemplo, Unidade, n, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","kg por exemplo, Unidade, n, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data de Juntando deve ser maior do que o Data de Nascimento
 DocType: Salary Structure,Salary Structure,Estrutura Salarial
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple regra de preço existe com os mesmos critérios, por favor resolver \
  conflito, atribuindo prioridade. Regras Preço: {0}"
 DocType: Account,Bank,Banco
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Companhia aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Material Issue
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia aérea
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,Para Armazém
 DocType: Employee,Offer Date,aanbieding Datum
 DocType: Hub Settings,Access Token,Token de Acesso
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,É item de Imobilização
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Se você tem muito tempo imprimir formatos, esse recurso pode ser usado para dividir a página a ser impressa em várias páginas com todos os cabeçalhos e rodapés em cada página"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 DocType: Fiscal Year,Year Name,Nome do Ano
 DocType: Process Payroll,Process Payroll,Payroll processo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Produto Bundle item
 DocType: Sales Partner,Sales Partner Name,Vendas Nome do parceiro
 DocType: Purchase Invoice Item,Image View,Ver imagem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Acabamento e acabamento industrial
 DocType: Issue,Opening Time,Tempo de abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Do Armazém
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Perfuração
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,A moldagem por sopro
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
 DocType: Tax Rule,Shipping City,O envio da Cidade
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este artigo é um Variant de {0} (modelo). Atributos serão copiados a partir do modelo, a menos que 'No Copy' é definido"
 DocType: Account,Purchase User,Compra de Usuário
 DocType: Notification Control,Customize the Notification,Personalize a Notificação
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Batimento
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
 DocType: Sales Invoice,Shipping Rule,Regra de envio
 DocType: Journal Entry,Print Heading,Imprimir título
 DocType: Quotation,Maintenance Manager,Gerente de Manutenção
-DocType: Workflow State,Search,Pesquisar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total não pode ser zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dias desde a última encomenda deve ser maior ou igual a zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Soldadura
 DocType: C-Form,Amended From,Alterado De
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Matéria-prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Matéria-prima
 DocType: Leave Application,Follow via Email,Enviar por e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Conta Criança existe para esta conta. Você não pode excluir esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Valores de Qtd Alvo ou montante alvo são obrigatórios
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No BOM padrão existe para item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No BOM padrão existe para item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Abrindo data deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Transportar
@@ -2862,45 +2631,44 @@
 ,Produced,geproduceerd
 DocType: Item,Item Code for Suppliers,Código do item para fornecedores
 DocType: Issue,Raised By (Email),Levantadas por (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Geral
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,anexar timbrado
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Geral
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,anexar timbrado
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Obrigatório para Serialized item {0}
 DocType: Journal Entry,Bank Entry,Banco Entry
 DocType: Authorization Rule,Applicable To (Designation),Para aplicável (Designação)
-DocType: Blog Post,Blog Post,Blog Mensagem
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Ativar / desativar moedas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,despesas postais
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Purchase Order,The date on which recurring order will be stop,A data em que ordem recorrente será parar
 DocType: Quality Inspection,Item Serial No,No item de série
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} deve ser reduzido em {1} ou você deve aumentar a tolerância ao excesso
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Presente total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Item Serialized {0} não pode ser atualizado utilizando \
  da Reconciliação"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferência de material para Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferência de material para Fornecedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Chumbo Tipo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Maak Offerte
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Todos esses itens já foram faturados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,O BOM novo após substituição
 DocType: Features Setup,Point of Sale,Ponto de Venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Ondulação
 DocType: Account,Tax,Imposto
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refino
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} não é um válido {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De Bundle Produto
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Relatório Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Encaminhamento
 DocType: C-Form,Invoices,Faturas
 DocType: Job Opening,Job Title,Cargo
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} já alocado para Employee {1} para {2} período - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatários
 DocType: Features Setup,Item Groups in Details,Grupos de itens em Detalhes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
@@ -2909,69 +2677,59 @@
 DocType: Stock Entry,Update Rate and Availability,Taxa de atualização e disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentagem que estão autorizados a receber ou entregar mais contra a quantidade encomendada. Por exemplo: Se você encomendou 100 unidades. e seu subsídio é de 10%, então você está autorizada a receber 110 unidades."
 DocType: Pricing Rule,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: Item,Website Description,Descrição do site
 DocType: Serial No,AMC Expiry Date,AMC Data de Validade
 ,Sales Register,Vendas Registrar
 DocType: Quotation,Quotation Lost Reason,Cotação Perdeu Razão
 DocType: Address,Plant,Planta
-DocType: DocType,Setup,Instalação
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Resumo para este mês e atividades pendentes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Laminação a frio
 DocType: Customer Group,Customer Group Name,Nome do grupo de clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione Carry Forward se você também quer incluir equilíbrio ano fiscal anterior deixa para este ano fiscal
 DocType: GL Entry,Against Voucher Type,Tipo contra Vale
 DocType: Item,Attributes,Atributos
-DocType: Packing Slip,Get Items,Obter itens
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obter itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Por favor, indique Escrever Off Conta"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última data do pedido
-DocType: DocField,Image,Imagem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Maak Accijnzen Factuur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
-DocType: Communication,Other,Outro
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operação ID não definida
 DocType: Production Order,Planned Start Date,Planejado Start Date
 DocType: Serial No,Creation Document Type,Type het maken van documenten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Manut. Visita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Manut. Visita
 DocType: Leave Type,Is Encash,É cobrar
 DocType: Purchase Invoice,Mobile No,No móvel
-DocType: Payment Tool,Make Journal Entry,Crie Diário de entrada 
+DocType: Payment Tool,Make Journal Entry,Crie Diário de entrada
 DocType: Leave Allocation,New Leaves Allocated,Nova Folhas alocado
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dados do projecto -wise não está disponível para Cotação
 DocType: Project,Expected End Date,Data final esperado
 DocType: Appraisal Template,Appraisal Template Title,Título do modelo de avaliação
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
 DocType: Cost Center,Distribution Id,Id distribuição
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Serviços impressionante
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos os produtos ou serviços.
 DocType: Purchase Invoice,Supplier Address,Endereço do Fornecedor
-DocType: Contact Us Settings,Address Line 2,Endereço Linha 2
-DocType: ToDo,Reference,Referência
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perfurante
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série é obrigatório
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Serviços Financeiros
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valor para o atributo {0} deve estar dentro da gama de {1} a {2} nos incrementos de {3}
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de base
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Armazém necessário para stock o item {0}
 DocType: Leave Allocation,Unused leaves,Folhas não utilizadas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Padrão Contas a Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Serrar
 DocType: Tax Rule,Billing State,Estado de faturamento
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminação
 DocType: Item Reorder,Transfer,Transferir
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch ontplofte BOM ( inclusief onderdelen )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável a (Empregado)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterização
 DocType: Journal Entry,Pay To / Recd From,Para pagar / RECD De
 DocType: Naming Series,Setup Series,Série de configuração
 DocType: Supplier,Contact HTML,Contato HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,Varejo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Cliente {0} não existe
 DocType: Attendance,Absent,Ausente
-DocType: Product Bundle,Product Bundle,Bundle produto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Esmagador
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Comprar Impostos e Taxas Template
 DocType: Upload Attendance,Download Template,Baixe Template
 DocType: GL Entry,Remarks,Observações
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,Escreva Off Baseado em
 DocType: Features Setup,POS View,POS Ver
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Registro de instalação de um n º de série
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Lingotamento contínuo
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique um"
 DocType: Offer Letter,Awaiting Response,Aguardando resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Acima
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionamento frio
 DocType: Salary Slip,Earning & Deduction,Ganhar &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Conta {0} não pode ser um grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Região
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Lucro Provisória / Loss (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Retorno Contra Vendas Fatura
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Por favor, defina o valor padrão {0} in Company {1}"
 DocType: Serial No,Creation Time,Aanmaaktijd
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Receita Total
 DocType: Sales Invoice,Product Bundle Help,Produto Bundle Ajuda
 ,Monthly Attendance Sheet,Folha de Presença Mensal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nenhum registro encontrado
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obter Itens de Bundle Produto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Conta {0} está inativa
 DocType: GL Entry,Is Advance,É o avanço
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Aanwezigheid Van Datum en tot op heden opkomst is verplicht
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
 DocType: Sales Team,Contact No.,Fale Não.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lucros e Perdas "" tipo de conta {0} não é permitido na abertura de entrada"
-DocType: Workflow State,Time,Tempo
 DocType: Features Setup,Sales Discounts,Descontos de vendas
 DocType: Hub Settings,Seller Country,Vendedor País
 DocType: Authorization Rule,Authorization Rule,Regra autorização
 DocType: Sales Invoice,Terms and Conditions Details,Termos e Condições Detalhes
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de vendas e de modelo Encargos
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Ordem
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML bandeira / que vai mostrar no topo da lista de produtos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adicionar Descendente
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Fator de Conversão é necessária
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comissão sobre Vendas
 DocType: Offer Letter Term,Value / Description,Valor / Descrição
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,Os clientes não compra desde há muito tempo
 DocType: Production Order,Expected Delivery Date,Data de entrega prevista
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito e Crédito é igual para {0} # {1}. A diferença é {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Bojudo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativo-padrão de elenco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,despesas de representação
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fatura de vendas {0} deve ser cancelado antes de cancelar esta ordem de venda
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Idade
 DocType: Time Log,Billing Amount,Faturamento Montante
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Os pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Conta com a transação existente não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,despesas legais
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","O dia do mês em que ordem auto será gerado por exemplo, 05, 28, etc"
 DocType: Sales Invoice,Posting Time,Postagem Tempo
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Despesas de viagem
 DocType: Maintenance Visit,Breakdown,Colapso
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Conta: {0} com moeda: {1} não pode ser seleccionado
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: conta principal {1} não pertence à empresa: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Excluído com sucesso todas as transacções relacionadas com esta empresa!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como em Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Afiando
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,provação
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
-DocType: Feed,Full Name,Nome Completo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Conquistar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,provação
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Armazém padrão é obrigatório para estoque Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagamento de salário para o mês {0} e {1} ano
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática taxa de lista de preços se ausente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante total pago
 ,Transferred Qty,overgedragen hoeveelheid
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,planejamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,planejamento
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Make Time Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do faturamento (via Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Nós vendemos este item
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Nós vendemos este item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Fornecedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Contato Descr
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,Item Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adicionar linhas para definir orçamentos anuais nas contas.
 DocType: Buying Settings,Default Supplier Type,Tipo de fornecedor padrão
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Pedreiras
 DocType: Production Order,Total Operating Cost,Custo Operacional Total
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Nota : Item {0} entrou várias vezes
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos os contactos.
 DocType: Newsletter,Test Email Id,Email Id teste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,bedrijf Afkorting
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,bedrijf Afkorting
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Se você seguir Inspeção de Qualidade . Permite item QA Obrigatório e QA Não no Recibo de compra
 DocType: GL Entry,Party Type,Tipo de Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotomoldagem
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Mestre modelo Salário .
 DocType: Leave Type,Max Days Leave Allowed,Dias Max Deixe admitidos
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotações para Leads ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Território Alvo Variance item Group-wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez recorde Câmbios não é criado para {1} de {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template imposto é obrigatório.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Conta {0}: conta principal {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço Taxa List (moeda da empresa)
 DocType: Account,Temporary,Temporário
 DocType: Address,Preferred Billing Address,Preferred Endereço de Cobrança
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação percentual
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,secretário
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,secretário
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Comprar
 DocType: HR Settings,Employee Records to be created by,Registros de funcionário devem ser criados por
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,Item- wise Prijslijst Rate
 DocType: Purchase Order Item,Supplier Quotation,Cotação fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Em Palavras será visível quando você salvar a cotação.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Engomadoria
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} está parado
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} já utilizado em item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,próximos eventos
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,É necessário ao cliente
-DocType: Letter Head,Letter Head,Cabeça letra
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Entrada Rápida
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para retorno
 DocType: Purchase Order,To Receive,Receber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Encolher montagem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Receitas / Despesas
 DocType: Employee,Personal Email,E-mail pessoal
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Variância total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,corretagem
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,corretagem
 DocType: Address,Postal Code,Código postal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,De Chumbo
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Ordens liberado para produção.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selecione o ano fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS perfil necessário para fazer POS Entry
 DocType: Hub Settings,Name Token,Nome do token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planing
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,venda padrão
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Pelo menos um armazém é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: BOM Replace Tool,Replace,Substituir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} contra Faturas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} contra Faturas {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Por favor entre unidade de medida padrão
 DocType: Purchase Invoice Item,Project Name,Nome do projeto
 DocType: Supplier,Mention if non-standard receivable account,Mencione se não padronizado conta a receber
-DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Se a renda ou Despesa
 DocType: Features Setup,Item Batch Nos,Lote n item
 DocType: Stock Ledger Entry,Stock Value Difference,Banco de Valor Diferença
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliação Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
 DocType: BOM Item,BOM No,BOM Não
-DocType: Contact Us Settings,Pincode,PINCODE
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Diário de entrada {0} não tem conta {1} ou já comparado com outro comprovante
 DocType: Item,Moving Average,Média móvel
 DocType: BOM Replace Tool,The BOM which will be replaced,O BOM que será substituído
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Novo stock UOM deve ser diferente do atual UOM stock
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Operação Custo
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Carregar atendimento de um arquivo CSV.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Outstanding Amt
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,Centro de Custo Padrão
 DocType: Purchase Invoice,End Date,Data final
 DocType: Employee,Internal Work History,História Trabalho Interno
-DocType: DocField,Column Break,Quebra de coluna
-DocType: Event,Thursday,Quinta-feira
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Volta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentário do cliente
 DocType: Account,Expense,despesa
 DocType: Sales Invoice,Exhibition,Exposição
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,Realizada em
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
 ,Employee Information,Informações do Funcionário
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Taxa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Taxa (%)
 DocType: Stock Entry Detail,Additional Cost,Custo adicional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Encerramento do Exercício Social Data
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Encerramento do Exercício Social Data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Kan niet filteren op basis van Voucher Nee, als gegroepeerd per Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzir a Geração de Renda para sair sem pagar (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Adicionar usuários à sua organização, além de si mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Número de ordem {1} não coincide com {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Deixar
 DocType: Batch,Batch ID,Lote ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota de entrega Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Resumo da Semana
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} deve ser um item comprado ou subcontratadas na linha {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
 DocType: GL Entry,Party,Festa
 DocType: Sales Order,Delivery Date,Data de entrega
-DocType: DocField,Currency,Moeda
 DocType: Opportunity,Opportunity Date,Data oportunidade
 DocType: Purchase Receipt,Return Against Purchase Receipt,Retorno Contra Recibo de compra
 DocType: Purchase Order,To Bill,Para Bill
 DocType: Material Request,% Ordered,Ordem%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,trabalho por peça
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Méd. Taxa de Compra
 DocType: Task,Actual Time (in Hours),Tempo real (em horas)
 DocType: Employee,History In Company,Historial na Empresa
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,Para Discutir
 DocType: SMS Settings,SMS Settings,Definições SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Contas temporárias
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Preto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Preto
 DocType: BOM Explosion Item,BOM Explosion Item,BOM item explosão
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,A data de término do período da ordem atual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Faça uma oferta Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorna
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
-DocType: DocField,Fold,Dobra
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unidade de medida padrão para Variant deve ser o mesmo como modelo
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 DocType: Pricing Rule,Disable,incapacitar
 DocType: Project Task,Pending Review,Revisão pendente
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Por favor, especifique"
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação Despesa Total (via Despesa Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id Cliente
-DocType: Page,Page Name,Nome da Página
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Para Tempo deve ser maior From Time
 DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Ordem de Vendas {0} não é submetido
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: conta Parent {1} não Bolong à empresa {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Acabamento Spindle
 DocType: BOM,Last Purchase Rate,Compra de última
 DocType: Account,Asset,ativos
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","Ex: "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","Ex: "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo da transação Pessoa-wise vendas
-DocType: System Settings,Time Zone,Fuso horário
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dos materiais entregues contra esta Nota de Entrega
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detalhes do cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formação
 DocType: Employee,Reports to,Relatórios para
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro url para nn receptor
 DocType: Sales Invoice,Paid Amount,Valor pago
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Fechando Conta {0} deve ser do tipo ' responsabilidade '
 ,Available Stock for Packing Items,Stock disponível para items embalados
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"A definição desse modelo de endereço como padrão, pois não há outro padrão"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo já em débito, não tem permissão para definir 'saldo deve ser' como 'crédito'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestão da Qualidade
 DocType: Production Planning Tool,Filter based on customer,Filtrar baseado em cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra a folha nº
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Empregado história de trabalho externo
 DocType: Tax Rule,Purchase,Comprar
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Aantal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Aantal
 DocType: Item Group,Parent Item Group,Grupo item pai
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centros de custo
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Armazéns .
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Armazéns .
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa na qual a moeda que fornecedor é convertido para a moeda da empresa de base
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitos Timings com linha {1}
 DocType: Opportunity,Next Contact,Próximo Contato
 DocType: Employee,Employment Type,Tipo de emprego
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Imobilizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Despesa padrão
 DocType: Employee,Notice (days),Notice ( dagen )
-DocType: Page,Yes,Sim
 DocType: Tax Rule,Sales Tax Template,Template Imposto sobre Vendas
 DocType: Employee,Encashment Date,Data cobrança
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Comprovante Tipo deve ser um dos Pedido de Compra, nota fiscal de compra ou do Diário"
 DocType: Account,Stock Adjustment,Banco de Ajuste
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
 DocType: Production Order,Planned Operating Cost,Planejado Custo Operacional
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Nome
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Segue em anexo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Segue em anexo {0} # {1}
 DocType: Job Applicant,Applicant Name,Nome do requerente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do item
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Não Serial é obrigatória para item {0}
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Por favor, especifique de / para variar"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Criado por
 DocType: Serial No,Under AMC,Sob AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,As configurações padrão para a venda de transações.
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Montante Mínimo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Afgewerkt update Goederen
 DocType: Workstation,per hour,por hora
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} já usado em {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Uma conta para o armazém ( Perpetual Inventory ) será criada tendo como base esta conta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse não pode ser excluído como existe entrada de material de contabilidade para este armazém.
 DocType: Company,Distribution,Distribuição
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,expedição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Projetos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,expedição
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 DocType: Customer,Default Taxes and Charges,Impostos e Encargos padrão
 DocType: Account,Receivable,a receber
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Não é permitido mudar de fornecedor como ordem de compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
 DocType: Sales Invoice,Supplier Reference,Referência fornecedor
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Se selecionado, o BOM para a sub-montagem itens serão considerados para obter matérias-primas. Caso contrário, todos os itens de sub-montagem vai ser tratado como uma matéria-prima."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,Vendedor Descrição
 DocType: Employee Education,Qualification,Qualificação
 DocType: Item Price,Item Price,Item Preço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & detergente
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,bestelde
 DocType: Warehouse,Warehouse Name,Nome Armazém
 DocType: Naming Series,Select Transaction,Selecione Transação
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,Taxa de materiais com base
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ondersteuning Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Empresa está em falta nos armazéns {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Utilitário da Substituir UOM
 DocType: POS Profile,Terms and Conditions,Termos e Condições
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Para data deve ser dentro do exercício social. Assumindo Para Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, etc preocupações médica"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,Para Produção
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vul de verkooporder in de bovenstaande tabel
 DocType: Project Task,View Task,Ver Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,O ano financeiro tem início a
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,O ano financeiro tem início a
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Digite recibos de compra
 DocType: Sales Invoice,Get Advances Received,Obter adiantamentos recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar / Remover Destinatários
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit fiscale jaar ingesteld als standaard , klik op ' Als standaard instellen '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuração do servidor de entrada para suporte e-mail id . ( por exemplo support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Salary Slip,Salary Slip,Folha de salário
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polimento
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' O campo Para Data ' é necessária
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' O campo Para Data ' é necessária
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
 DocType: Sales Invoice Item,Sales Order Item,Vendas item Ordem
 DocType: Salary Slip,Payment Days,Datas de Pagamento
 DocType: BOM,Manage cost of operations,Gerenciar custo das operações
 DocType: Features Setup,Item Advanced,Item Avançado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminação a quente
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações verificadas estão &quot;Enviado&quot;, um e-mail pop-up aberta automaticamente para enviar um e-mail para o associado &quot;Contato&quot;, em que a transação, com a transação como um anexo. O usuário pode ou não enviar o e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Globais
 DocType: Employee Education,Employee Education,Educação empregado
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Não {0} já foi recebido
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,Vendas Team Detalhes
 DocType: Expense Claim,Total Claimed Amount,Montante reclamado total
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Oportunidades potenciais para a venda.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,doente Deixar
 DocType: Email Digest,Email Digest,E-mail Digest
 DocType: Delivery Note,Billing Address Name,Faturamento Nome Endereço
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Lojas de Departamento
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Equilíbrio sistema
-DocType: Workflow,Is Active,É Ativo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Equilíbrio sistema
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Imputável
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Mudança abreviação
-DocType: Workflow State,Primary,Primário
 DocType: Expense Claim Detail,Expense Date,Data despesa
 DocType: Item,Max Discount (%),Max Desconto (%)
-DocType: Communication,More Information,Mais informação
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Last Order Montante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Jateamento
 DocType: Company,Warn,Avisar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Valorização item atualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve ir nos registros."
 DocType: BOM,Manufacturing User,Manufacturing Usuário
 DocType: Purchase Order,Raw Materials Supplied,Matérias-primas em actualização
 DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
-DocType: Communication,Series,serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Previsão de Entrega A data não pode ser antes de Ordem de Compra Data
 DocType: Appraisal,Appraisal Template,Modelo de avaliação
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Classificação do Item
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desenvolvimento de Negócios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade visita de manutenção
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,periode
 ,General Ledger,Razão
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Recomendado nível de reposição
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Por favor seleccione {0} primeiro
 DocType: Features Setup,To get Item Group in details table,Para obter Grupo item na tabela de detalhes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redesenhar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravura a água forte
 DocType: Sales Invoice,Commission,comissão
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3203,7 @@
  {% if% email_id} Email: {{email_id}} & lt; br & gt ; {endif% -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Quantidade padrão
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Warehouse não foi encontrado no sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Warehouse não foi encontrado no sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Resumo deste mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura de Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` Congelar Stocks Mais antigo do que ` deve ser menor que %d dias .
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 DocType: Supplier,Address and Contacts,Endereços e contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Detalhe Conversão
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Mantenha- web 900px amigável (w) por 100px ( h )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Payment Tool,Get Outstanding Vouchers,Obter Vales Pendentes
 DocType: Warranty Claim,Resolved By,Resolvido por
 DocType: Appraisal,Start Date,Data de Início
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Atribuír licenças por um período .
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Clique aqui para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode atribuir-se como conta principal
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário por parte do fornecedor para entregar
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Data de Início do esperado
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolando
-DocType: ToDo,Priority,Prioridade
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox acesso permitido
-DocType: Dropbox Backup,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex:. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receber
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receber
 DocType: Maintenance Visit,Fully Completed,Totalmente concluída
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% concluído
 DocType: Employee,Educational Qualification,Qualificação Educacional
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Employee Leave Approver,Employee Leave Approver,Empregado Leave Approver
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} foi adicionada com sucesso à nossa lista Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Uma entrada de reabastecimento já existe para este armazém {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kan niet verklaren als verloren , omdat Offerte is gemaakt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron usinagem feixe
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Compra Mestre Gerente
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Relatórios principais
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Banco de Ledger Entradas saldos atualizados
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Relatórios principais
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot op heden kan niet eerder worden vanaf datum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adicionar / Editar preços
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,Itens solicitados devem ser pedidos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Meus pedidos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Meus pedidos
 DocType: Price List,Price List Name,Nome da lista de preços
 DocType: Time Log,For Manufacturing,Para Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totais
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totais
 DocType: BOM,Manufacturing,Fabrico
 ,Ordered Items To Be Delivered,Itens ordenados a ser entregue
 DocType: Account,Income,renda
-,Setup Wizard,Assistente de Configuração
 DocType: Industry Type,Industry Type,Tipo indústria
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Algo deu errado!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Atenção: Deixe o aplicativo contém seguintes datas bloco
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
 DocType: Purchase Invoice Item,Amount (Company Currency),Quantidade (Moeda da Empresa)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Fundição
-DocType: Email Alert,Reference Date,Data de Referência
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organização unidade (departamento) mestre.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique nn móveis válidos"
 DocType: Budget Detail,Budget Detail,Detalhe orçamento
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
-DocType: Async Task,Status,Estado
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Da UOM atualizado do número {0}
-DocType: Company History,Year,Ano
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Perfil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize as Configurações relacionadas com o SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tempo Log {0} já faturado
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,N º de Série Vencimento Contrato de Serviço
 DocType: Item,Unit of Measure Conversion,Unidade de Conversão de Medida
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empregado não pode ser alterado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Você não pode de crédito e débito mesma conta ao mesmo tempo
 DocType: Naming Series,Help HTML,Ajuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Provisão para over-{0} cruzou para item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização que este endereço pertence.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,uw Leveranciers
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,uw Leveranciers
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan niet ingesteld als Lost als Sales Order wordt gemaakt .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Outra estrutura Salário {0} está ativo para empregado {1}. Por favor, faça o seu estatuto ""inativos"" para prosseguir."
 DocType: Purchase Invoice,Contact,Contato
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Recebido de
 DocType: Features Setup,Exports,Exportações
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Não tem número de série
 DocType: Employee,Date of Issue,Data de Emissão
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: A partir de {0} para {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
 DocType: Issue,Content Type,Tipo de conteúdo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,computador
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computador
 DocType: Item,List this Item in multiple groups on the website.,Lista este item em vários grupos no site.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} não existe no sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,U bent niet bevoegd om Frozen waarde in te stellen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Entradas não reconciliadas
 DocType: Cost Center,Budgets,Orçamentos
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Atualizado
 DocType: Employee,Emergency Contact Details,Detalhes de contato de emergência
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Wat doet het?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Wat doet het?
 DocType: Delivery Note,To Warehouse,Para Armazém
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Conta {0} foi inserida mais de uma vez para o ano fiscal {1}
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Tem número de série ' não pode ser 'Sim' para o item sem stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Atendimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta principal
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo desembarcado de itens
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,elétrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,elétrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença Valor Total (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID do usuário não definido para Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,A partir da solicitação de garantia
 DocType: Stock Entry,Default Source Warehouse,Armazém da fonte padrão
 DocType: Item,Customer Code,Código Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Lembrete de aniversário para {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Dobrando
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagen sinds vorige Bestel
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagen sinds vorige Bestel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Nomeando Series
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
-DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock activo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Você realmente quer submeter todos os folha de salário do mês {0} e {1} ano
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Assinantes de importação
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,Apresentar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Entrega Nota {0} não deve ser apresentado
 DocType: Notification Control,Sales Invoice Message,Vendas Mensagem Fatura
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
 DocType: Authorization Rule,Based On,Baseado em
 DocType: Sales Order Item,Ordered Qty,bestelde Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} está desativada
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Item {0} está desativada
 DocType: Stock Settings,Stock Frozen Upto,Fotografia congelada Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Atividade de projeto / tarefa.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Gerar Folhas de Vencimento
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} não é um ID de e-mail válido
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso for selecionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
-DocType: ToDo,Low,Baixo
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escrever Off Montante (Companhia de moeda)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Fiação
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Row # {0}: Por favor, defina a quantidade de reabastecimento"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Comprovante Custo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Defina {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repita no Dia do Mês
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Nome da campanha é necessária
 DocType: Maintenance Visit,Maintenance Date,Data de manutenção
 DocType: Purchase Receipt Item,Rejected Serial No,Rejeitado Não Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Desenho profundo
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Novo Boletim informativo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Mostrar Balance
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM e Manufatura Quantidade são obrigatórios
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Quantidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM substituído
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nieuw account Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Matérias-primas fornecidas Custo
 DocType: Selling Settings,Settings for Selling Module,Definições para vender Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,atendimento ao cliente
 DocType: Item,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalhe Cliente item
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirme Seu Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar-mail mediante a apresentação da
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Total de folhas alocados são mais do que dias no período
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Padrão trabalho no armazém Progresso
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} é necessária
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Moldagem a vácuo
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
-DocType: Contact Us Settings,City,Cidade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic usinagem
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Erro: Não é um ID válido?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} deve ser um item de vendas
 DocType: Naming Series,Update Series Number,Atualização de Número de Série
 DocType: Account,Equity,equidade
 DocType: Sales Order,Printing Details,Imprimir detalhes
 DocType: Task,Closing Date,Data de Encerramento
 DocType: Sales Order Item,Produced Quantity,Quantidade produzida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,engenheiro
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa subconjuntos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Código do item exigido no Row Não {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Desconto Customerwise
 DocType: Purchase Invoice,Against Expense Account,Contra a conta de despesas
 DocType: Production Order,Production Order,Ordem de Produção
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos os Empregados (Ativo)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
 DocType: Item,Re-Order Level,Re-order Nível
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qty planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gráfico Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Lista de férias aplicável
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Série Atualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tipo de relatório é obrigatória
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tipo de relatório é obrigatória
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeiro respondeu em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz de Listagem do item em vários grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,De eerste gebruiker : U
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,De eerste gebruiker : U
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ano Fiscal Data de Início e Término do Exercício Social Data já estão definidos no ano fiscal de {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciliados com sucesso
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Planejado Data de Término
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Onde os itens são armazenados.
 DocType: Tax Rule,Validity,Validade
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor faturado
 DocType: Attendance,Attendance,Comparecimento
-DocType: Page,No,Não
 DocType: BOM,Materials,Materiais
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data e postagem Posting tempo é obrigatório
@@ -3764,56 +3451,46 @@
 ,Item Prices,Preços de itens
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Em Palavras será visível quando você salvar a Ordem de Compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Comprovante de Encerramento período
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Lista de Preços Principal.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Lista de Preços Principal.
 DocType: Task,Review Date,Comente Data
 DocType: Purchase Invoice,Advance Payments,Adiantamentos
-DocType: DocPerm,Level,Nível
 DocType: Purchase Taxes and Charges,On Net Total,Em Líquida Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"'Notificação Endereços de e-mail"" não especificado para o recorrente %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fresagem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Sem permissão para usar ferramenta de pagamento
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"'Notificação Endereços de e-mail"" não especificado para o recorrente %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
 DocType: Company,Round Off Account,Termine Conta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Mordiscando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Despesas Administrativas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,consultor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,consultor
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Mudança
 DocType: Purchase Invoice,Contact Email,Contato E-mail
 DocType: Appraisal Goal,Score Earned,Pontuação Agregado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
-DocType: Bank Reconciliation Detail,Voucher ID,"ID de Vale
-"
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","por exemplo "" My Company LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Período de aviso prévio
+DocType: Bank Reconciliation Detail,Voucher ID,ID de Vale
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Dit is een wortel grondgebied en kan niet worden bewerkt .
 DocType: Packing Slip,Gross Weight UOM,UOM Peso Bruto
 DocType: Email Digest,Receivables / Payables,Contas a receber / contas a pagar
 DocType: Delivery Note Item,Against Sales Invoice,Contra a nota fiscal de venda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Estampagem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Item de custo Landed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem de determinadas quantidades de matérias-primas
 DocType: Payment Reconciliation,Receivable / Payable Account,Receber Conta / Payable
 DocType: Delivery Note Item,Against Sales Order Item,Contra a Ordem de venda do item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém padrão
 DocType: Task,Actual End Date (via Time Logs),Data Real End (via Time Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir Sem Quantia
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Fiscale categorie kan ' Valuation ' of ' Valuation en Total ' als alle items zijn niet-voorraadartikelen niet
-DocType: User,Last Name,Sobrenome
-DocType: Web Page,Left,Esquerda
-DocType: Event,All Day,Todo o Dia
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Fiscale categorie kan ' Valuation ' of ' Valuation en Total ' als alle items zijn niet-voorraadartikelen niet
 DocType: Issue,Support Team,Equipe de Apoio
 DocType: Appraisal,Total Score (Out of 5),Pontuação total (em 5)
-DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Fornada
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Equilíbrio
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Equilíbrio
 DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
-DocType: User,Gender,Sexo
 DocType: Journal Entry,Debit Note,Nota de Débito
 DocType: Stock Entry,As per Stock UOM,Como por Banco UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
@@ -3827,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, não total. de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Antecipação total
-DocType: Workflow State,User,Utilizador
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Processamento de folha de pagamento
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Quantidade de crédito
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Instellen als Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
 DocType: Customer,Credit Days Based On,Dias crédito com base em
 DocType: Tax Rule,Tax Rule,Regra imposto
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo ritmo durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar logs de tempo fora do horário de trabalho estação de trabalho.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} já foi apresentado
 ,Items To Be Requested,Items worden aangevraagd
-DocType: Purchase Order,Get Last Purchase Rate,Obter Última Tarifa de Compra
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Taxa de facturação com base no tipo de atividade (por hora)
 DocType: Company,Company Info,Informações da empresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Costura
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Empresa E-mail ID não foi encontrado , daí mail não enviado"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicações de Recursos ( Ativos )
 DocType: Production Planning Tool,Filter based on item,Filtrar com base no item
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Conta de debito
 DocType: Fiscal Year,Year Start Date,Data de início do ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (Moeda Company)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
 DocType: Purchase Common,Purchase Common,Compre comum
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado . Por favor, atualize ."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pare de usuários de fazer aplicações deixam nos dias seguintes.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,van Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Branqueamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Benefícios a Empregados
 DocType: Sales Invoice,Is POS,É POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde fabricados
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Contas levantou a Clientes.
-DocType: DocField,Default,Omissão
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} assinantes acrescentado
 DocType: Maintenance Schedule,Schedule,Programar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definir orçamento para este centro de custo. Para definir a ação orçamento, consulte &quot;Lista de Empresas&quot;"
@@ -3875,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 DocType: Expense Claim,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Empregado aliviada em {0} deve ser definido como 'Esquerda'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selecionando &quot;Sim&quot; vai dar uma identidade única para cada entidade deste item que pode ser visto no mestre Número de ordem.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} criado para Employee {1} no intervalo de datas
 DocType: Employee,Education,educação
 DocType: Selling Settings,Campaign Naming By,Campanha de nomeação
 DocType: Employee,Current Address Is,Huidige adres wordt
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
 DocType: Address,Office,Escritório
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Relatórios padrão
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Lançamentos contábeis em diários
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém A partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Por favor, selecione Employee primeiro registro."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / conta não coincide com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para criar uma conta de impostos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Por favor insira Conta Despesa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Aankoop / Productie Details
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventário Batch
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventário Batch
 DocType: Employee,Contract End Date,Data final do contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Ordem de vendas contra qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxe pedidos de vendas pendentes (de entregar) com base nos critérios acima
-DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Do Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Do Orçamento de Fornecedor
 DocType: Deduction Type,Deduction Type,Tipo de dedução
 DocType: Attendance,Half Day,Meio Dia
 DocType: Pricing Rule,Min Qty,min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Para controlar os itens em documentos de vendas e de compra com nsa lote. &quot;Indústria preferida: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Data Transação
 DocType: Production Plan Item,Planned Qty,Qtde planejada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Fiscal total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Fiscal total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Armazém alvo padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda Company)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tipo e partido só é aplicável contra a receber / a pagar contas
 DocType: Notification Control,Purchase Receipt Message,Mensagem comprar Recebimento
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total de folhas alocados mais de período
 DocType: Production Order,Actual Start Date,Atual Data de início
 DocType: Sales Order,% of materials delivered against this Sales Order,% dos materiais entregues contra esta Ordem de Vendas
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Gravar o movimento item.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Boletim lista assinante
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Escatelar
-DocType: Email Account,Service,serviço
 DocType: Hub Settings,Hub Settings,Configurações Hub
 DocType: Project,Gross Margin %,Margem Bruta%
 DocType: BOM,With Operations,Com Operações
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 ,Monthly Salary Register,Salário mensal Registrar
-apps/frappe/frappe/website/template.py +140,Next,próximo
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolimento
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Quantidade em linha anterior
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Digite valor do pagamento em pelo menos uma fileira
 DocType: POS Profile,POS Profile,POS Perfil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: valor do pagamento não pode ser maior do que a quantidade Outstanding
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Total de Unpaid
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total de Unpaid
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tempo Log não é cobrável
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Comprador
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salário líquido não pode ser negativo
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Por favor, indique o Contra Vouchers manualmente"
 DocType: SMS Settings,Static Parameters,Parâmetros estáticos
 DocType: Purchase Order,Advance Paid,Adiantamento pago
 DocType: Item,Item Tax,Imposto item
@@ -3947,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere imposto ou encargo para
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde real é obrigatória
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolamento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,cartão de crédito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,cartão de crédito
 DocType: BOM,Item to be manufactured or repacked,Item a ser fabricados ou reembalados
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,As configurações padrão para transações com ações .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,As configurações padrão para transações com ações .
 DocType: Purchase Invoice,Next Date,Data próxima
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcional
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Digite Impostos e Taxas
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Usinagem
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes como o nome da família e ocupação do cônjuge, pai e filhos"
 DocType: Hub Settings,Seller Name,Vendedor Nome
@@ -3964,47 +3628,44 @@
 DocType: Stock Entry,Repack,Reembalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Os valores numéricos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,anexar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,anexar Logo
 DocType: Customer,Commission Rate,Taxa de Comissão
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Faça Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquear deixar aplicações por departamento.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Carrinho está vazio
 DocType: Production Order,Actual Operating Cost,Custo operacional real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root não pode ser editado .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Montante atribuído não pode ser superior à quantia desasjustada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root não pode ser editado .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Montante atribuído não pode ser superior à quantia desasjustada
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a produção aos feriados
 DocType: Sales Order,Customer's Purchase Order Date,Do Cliente Ordem de Compra Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Peso Detalhes do pacote
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, selecione um arquivo csv"
-DocType: Dropbox Backup,Send Backups to Dropbox,Enviar Backups para Dropbox
 DocType: Purchase Order,To Receive and Bill,Para receber e Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,estilista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,estilista
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termos e Condições de modelo
 DocType: Serial No,Delivery Details,Detalhes da entrega
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Criar automaticamente um pedido de material se a quantidade for inferior a este nível
 ,Item-wise Purchase Register,Item-wise Compra Register
 DocType: Batch,Expiry Date,Data de validade
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Para definir o nível de reabastecimento, o item deve ser um item de compra ou Manufacturing item"
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Selecteer Categorie eerst
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projeto mestre.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como US $ etc ao lado de moedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Meio Dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de crédito
 DocType: Leave Type,Is Carry Forward,É Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obter itens da Lista de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obter itens da Lista de Material
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Levar dias Tempo
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tipo e partido é necessário para receber / pagar conta {1}
-DocType: Dropbox Backup,Send Notifications To,Enviar notificações para
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
 DocType: GL Entry,Is Opening,Está abrindo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Por favor, crie estrutura salarial por empregado {0}"

diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index cef7fc1..5dad645 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mod de salariu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Selectați Distributie lunar, dacă doriți să urmăriți bazat pe sezonalitate."
 DocType: Employee,Divorced,Divorțat/a
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Atenție: Same articol a fost introdus de mai multe ori.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Articole deja sincronizate
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Produse consumator
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produse consumator
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vă rugăm să selectați Party Type primul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Refacere
 DocType: Item,Customer Items,Articole clientului
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
 DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Aprobatori Concediu
 DocType: Sales Partner,Dealer,Comerciant
 DocType: Employee,Rented,Închiriate
-DocType: About Us Settings,Website,Site web
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compactare plus sinterizare
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Va fi calculat în cadrul tranzacției.
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Din Cerere de Material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Din Cerere de Material
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} arbore
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nu mai multe rezultate.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Juridic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridic
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Taxa efectivă de tip nu poate fi inclusă în tariful articolului din rândul {0}
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Cerute de
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Actualizat cu succes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Broșat
 DocType: Pricing Rule,Apply On,Se aplică pe
 DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
 ,Purchase Order Items To Be Received,Achiziția comandă elementele de încasat
 DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
 DocType: Quality Inspection Reading,Parameter,Parametru
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Noua cerere de concediu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Noua cerere de concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Ciorna bancară
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Pentru a menține codul de client element înțelept și pentru a le face pe baza utilizării lor cod de această opțiune
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Arată Variante
-DocType: Sales Invoice Item,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Cantitate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Imprumuturi (Raspunderi)
 DocType: Employee Education,Year of Passing,Ani de la promovarea
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,În Stoc
@@ -64,25 +60,23 @@
 DocType: Production Plan Item,Production Plan Item,Planul de producție Articol
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Face noi POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Servicii de Sanatate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 DocType: Purchase Invoice,Monthly,Lunar
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Întârziere de plată (zile)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Adresa De E-Mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Apărare
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Adresa De E-Mail
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
 DocType: Company,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,
 DocType: Delivery Note,Vehicle No,Vehicul Nici
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vă rugăm să selectați lista de prețuri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Prelucrarea lemnului
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Imprimare 3D
 DocType: Employee,Holiday List,Lista de Vacanță
 DocType: Time Log,Time Log,Timp Conectare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contabil
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Contabil
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Company,Phone No,Nu telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log activităților efectuate de utilizatori, contra Sarcinile care pot fi utilizate pentru timpul de urmărire, facturare."
@@ -90,26 +84,27 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Prescurtarea nu poate contine mai mult de 5 caractere
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Caracteristica Valoarea {0} nu poate fi scos din {1} ca postul variante \ exista cu acest atribut.
-DocType: Print Settings,Classic,Clasic
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Acesta este un cont de rădăcină și nu pot fi editate.
 DocType: BOM,Operations,Operatii
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nu se poate seta autorizare pe baza de Discount pentru {0}
 DocType: Bin,Quantity Requested for Purchase,Cantitate solicitată de cumparare
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru denumirea veche și unul pentru denumirea nouă"
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Deschidere pentru un loc de muncă.
 DocType: Item Attribute,Increment,Creștere
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Selectați Depozit ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Publicitate
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitate
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aceeași societate este înscris de mai multe ori
 DocType: Employee,Married,Căsătorit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nu este permisă {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Băcănie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Asigurați-Bank intrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondurile de pensii
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Depozit este obligatorie dacă tipul de cont este de depozit
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Verificați dacă comanda recurente, debifați pentru a opri recurente sau încearcă propriu Data de încheiere"
@@ -126,41 +121,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
 DocType: SMS Log,SMS Log,SMS Conectare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
-DocType: Blog Post,Guest,Oaspete
 DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
 DocType: Lead,Interested,Interesat
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Factură de material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Deschidere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Deschidere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De la {0} {1} la
 DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} este obligatoriu
 DocType: Stock Entry,Additional Costs,Costuri suplimentare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
 DocType: Lead,Product Enquiry,Intrebare produs
-DocType: Standard Reply,Owner,Proprietar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Va rugam sa introduceti prima companie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vă rugăm să selectați Company primul
 DocType: Employee Education,Under Graduate,Sub Absolvent
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Alezaj
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Jurnal Activitati:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Imobiliare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extras de cont
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
 DocType: Expense Claim Detail,Claim Amount,Suma Cerere
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizor Tip / Furnizor
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumabile
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Consumabile
 DocType: Upload Attendance,Import Log,Import Conectare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Trimiteți
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salariu anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Salariu anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Cheltuieli stoc
 DocType: Newsletter,Email Sent?,Email Trimis?
@@ -168,7 +158,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Arată timp Busteni
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
 DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
 DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Articolul {0} trebuie să fie un Articol de Cumparare
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -176,22 +166,20 @@
  Toate datele și angajat combinație în perioada selectata va veni în șablon, cu înregistrări nervi existente"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Vor fi actualizate după Factura Vanzare este prezentat.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Îndreptare
 DocType: BOM Replace Tool,New BOM,Nou BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Înregistrarile temporale aferente lotului pentru facturare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Turnare Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter-ul a fost deja trimis
 DocType: Lead,Request Type,Cerere tip
 DocType: Leave Application,Reason,motiv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Transminiune
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Executie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Primul Utilizatorul va deveni System Manager (puteți schimba asta mai târziu).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transminiune
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Executie
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Primul Utilizatorul va deveni System Manager (puteți schimba asta mai târziu).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detalii privind operațiunile efectuate.
 DocType: Serial No,Maintenance Status,Stare Mentenanta
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Articole și Prețuri
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Articole și Prețuri
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},De la data trebuie să fie în anul fiscal. Presupunând că la data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Selectați angajatul pentru care doriți să creați de evaluare.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Centrul de Cost {0} nu aparține Companiei {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de prețuri trebuie să fie aplicabilă pentru cumpărarea sau vânzarea de
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Reducere la Lista de preturi Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Început(Pornire)
-DocType: User,First Name,Prenume
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Turnare full-mucegai
 DocType: Offer Letter,Select Terms and Conditions,Selectați Termeni și condiții
 DocType: Production Planning Tool,Sales Orders,Comenzi de vânzări
 DocType: Purchase Taxes and Charges,Valuation,Evaluare
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Cont bancar
 DocType: Leave Type,Allow Negative Balance,Permiteţi sold negativ
 DocType: Selling Settings,Default Territory,Teritoriu Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televiziune
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Tăiere prin tranșare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiziune
 DocType: Production Order Operation,Updated via 'Time Log',"Actualizat prin ""Ora Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Contul {0} nu aparține Companiei {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: Sales Invoice,Is Opening Entry,Deschiderea este de intrare
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menționa dacă non-standard de cont primit aplicabil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primit la
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Va rugam sa introduceti de companie
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
 DocType: Lead,Address & Contact,Adresă și contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
 DocType: Newsletter List,Total Subscribers,Abonații totale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nume Persoana de Contact
+,Contact Name,Nume Persoana de Contact
 DocType: Production Plan Item,SO Pending Qty,SO așteptare Cantitate
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Creare fluturas de salariu pentru criteriile mentionate mai sus.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Cere pentru cumpărare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Locuințe dublu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Frunze pe an
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Frunze pe an
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Vă rugăm să setați Numirea Series pentru {0} prin Configurare&gt; Setări&gt; Seria Naming
 DocType: Time Log,Will be updated when batched.,Vor fi actualizate atunci când dozate.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
-DocType: Bulk Email,Message,Mesaj
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
-DocType: Dropbox Backup,Dropbox Access Key,Cheie de Acces Dropbox 
 DocType: Payment Tool,Reference No,De referință nr
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Anual
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
 DocType: Material Request Item,Min Order Qty,Min Ordine Cantitate
 DocType: Lead,Do Not Contact,Nu contactati
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id-ul unic pentru urmărirea toate facturile recurente. Acesta este generat pe prezinte.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Item,Publish in Hub,Publica in Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
 DocType: Item,Purchase Details,Detalii de cumpărare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Sârmă periaj
 DocType: Employee,Relation,Relație
 DocType: Shipping Rule,Worldwide Shipping,Expediere
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Comenzi confirmate de la clienți.
@@ -283,45 +264,34 @@
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Mobil Nu.
 DocType: Maintenance Schedule,Generate Schedule,Generează orar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Beneficiar Cheltuiala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vă rugăm să selectați tipul de taxă în primul rând
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Ultimul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 caractere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Selectați limba
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 caractere
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Primul Aprobatorul Lăsați în lista va fi setat ca implicit concediu aprobator
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Dezactivează crearea de busteni de timp împotriva ordinelor de producție. Operațiuni nu sunt urmărite în producție Ordine
 DocType: Accounts Settings,Settings for Accounts,Setări pentru conturi
-apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile 
+apps/erpnext/erpnext/config/crm.py +90,Manage Sales Person Tree.,Gestioneaza Ramificatiile Persoanei responsabila cu Vanzarile
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Articolul {0} trebuie să fie un Articol de Service
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Foraj Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Nou Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal
 DocType: Employee,External Work History,Istoricul lucrului externă
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Eroare de referință Circular
-DocType: Communication,Closed,Închis
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota.
 DocType: Lead,Industry,Industrie
 DocType: Employee,Job Profile,Profilul postului
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hidroformare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
 DocType: Journal Entry,Multi Currency,Multi valutar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Articolul este Actualizat
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
 DocType: Sales Invoice Item,Delivery Note,Nota de Livrare
-DocType: Dropbox Backup,Allow Dropbox Access,Permiteţi accesul Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configurarea Impozite
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Plata intrare a fost modificat după ce-l tras. Vă rugăm să trage din nou.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Workstation,Rent Cost,Chirie Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vă rugăm selectați luna și anul
@@ -329,39 +299,36 @@
 DocType: Employee,Company Email,E-mail Companie
 DocType: GL Entry,Debit Amount in Account Currency,Suma debit în contul valutar
 DocType: Shipping Rule,Valid for Countries,Valabil pentru țările
-DocType: Workflow State,Refresh,Actualizare
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Toate câmpurile legate de import, cum ar fi moneda, rata de conversie, import total, import total general etc. sunt disponibile în chitanță de cumpărare, cotație furnizor, factură de cumpărare, comandă de cumpărare, etc"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Comanda total Considerat
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponibil în BOM, nota de livrare, factura de cumparare, comanda de producție, comanda de cumparare, chitanţa de cumpărare, factura de vânzare,comanda de vânzare, intrare de stoc, pontaj"
 DocType: Item Tax,Tax Rate,Cota de impozitare
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Selectați articol
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Selectați articol
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
  stoc reconciliere, utilizați în schimb stoc intrare gestionate"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Primirea cumparare trebuie depuse
-DocType: Stock UOM Replace Utility,Current Stock UOM,Stoc Curent UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa dvs. de e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Vă rugăm să consultați atașament
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Tăiere cu jet de apă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup deja complet!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup deja complet!
 ,Finished Goods,Produse Finite
 DocType: Delivery Note,Instructions,Instrucţiuni
 DocType: Quality Inspection,Inspected By,Inspectat de
 DocType: Maintenance Visit,Maintenance Type,Tip Mentenanta
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +61,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nu aparține de livrare Nota {1}
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametru Inspecție de Calitate Articol 
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametru Inspecție de Calitate Articol
 DocType: Leave Application,Leave Approver Name,Lăsați Nume aprobator
 ,Schedule Date,Program Data
 DocType: Packed Item,Packed Item,Articol ambalate
@@ -370,6 +337,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Vă rugăm să nu creeze conturi pentru clienți și furnizori. Ele sunt create direct de la masterat Client / furnizor.
 DocType: Currency Exchange,Currency Exchange,Schimb valutar
 DocType: Purchase Invoice Item,Item Name,Denumire Articol
+DocType: Authorization Rule,Approving User  (above authorized value),Aprobarea utilizator (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balanța de credit
 DocType: Employee,Widowed,Văduvit
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",
@@ -379,22 +347,21 @@
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
 DocType: Workstation,Consumable Cost,Cost Consumabile
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
 DocType: Purchase Receipt,Vehicle Date,Vehicul Data
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Motiv pentru a pierde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tub ciubuc
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 DocType: Employee,Single,Celibatar
 DocType: Issue,Attachment,Atașament
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buget nu poate fi setat pentru cost Center Group
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Va rugam sa introduceti Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Va rugam sa introduceti Cost Center
 DocType: Journal Entry Account,Sales Order,Comandă de vânzări
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Rată de vânzare medie
 DocType: Purchase Order,Start date of current order's period,Data perioadei ordin curent Lansați
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Cantitatea nu poate fi o fracțiune în rând {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Cantitatea nu poate fi o fracțiune în rând {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
 DocType: Delivery Note,% Installed,% Instalat
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Va rugam sa introduceti numele companiei în primul rând
@@ -404,10 +371,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Setat automat Serial nr bazat pe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Tăiere
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Până la situația nr.' nu poate fi mai mică decât 'De la situația nr.'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non-Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Neînceput
 DocType: Lead,Channel Partner,Partner Canal
 DocType: Account,Old Parent,Vechi mamă
@@ -416,13 +381,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
+DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Maestru de vacanta.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell laminat
 DocType: Material Request Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
 DocType: BOM,Costing,Cost
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","In cazul in care se bifeaza, suma taxelor va fi considerată ca fiind deja inclusa în Rata de Imprimare / Suma de Imprimare"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Raport Cantitate
@@ -432,35 +397,30 @@
 DocType: Item Attribute,To Range,La gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
 DocType: Features Setup,Imports,Importurile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lipire
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Activități în așteptare pentru ziua de azi
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Record de prezenţă.
 DocType: Bank Reconciliation,Journal Entries,Intrari în jurnal
 DocType: Sales Order Item,Used for Production Plan,Folosit pentru Planul de producție
-DocType: System Settings,Loading...,Se încarcă...
-DocType: DocField,Password,Parolă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelare depunere condensat
 DocType: Manufacturing Settings,Time Between Operations (in mins),Timp între operațiuni (în minute)
 DocType: Customer,Buyer of Goods and Services.,Cumpărător de produse și servicii.
 DocType: Journal Entry,Accounts Payable,Conturi de plată
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Adăugaţi Abonați
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" nu există"
 DocType: Pricing Rule,Valid Upto,Valid Până la
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Venituri Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Ofițer administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Ofițer administrativ
 DocType: Payment Tool,Received Or Paid,Primite sau plătite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry,Difference Account,Diferența de Cont
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Cosmetică
-DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
-DocType: Communication,Subject,Subiect
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 ,Serial No Warranty Expiry,Serial Nu Garantie pana
@@ -468,8 +428,7 @@
 DocType: Purchase Invoice Item,Item,Obiect
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Gestionarea Subcontractarea
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nu trebuie să fie de tip Număr întreg
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Gestionarea Subcontractarea
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilier si Accesorii
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rata la care lista de prețuri moneda este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
@@ -481,21 +440,21 @@
 DocType: Production Planning Tool,Material Requirement,Cerința de material
 DocType: Company,Delete Company Transactions,Ștergeți Tranzacții Company
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Articolul {0} nu este Articol de Cumparare
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} este o adresă de email invalidă în ""Notificare \ Adrese de email"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nu se poate șterge de serie nr {0}, așa cum este utilizat în tranzacțiile bursiere"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),De închidere (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),De închidere (Cr)
 DocType: Serial No,Warranty Period (Days),Perioada de garanție (zile)
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 ,Pending Qty,Așteptare Cantitate
 DocType: Job Applicant,Thread HTML,HTML fir
 DocType: Company,Ignore,Ignora
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
 DocType: Pricing Rule,Valid From,Valabil de la
 DocType: Sales Invoice,Total Commission,Total de Comisie
 DocType: Pricing Rule,Sales Partner,Partener de vânzări
@@ -503,7 +462,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Distribuție lunară** vă ajută să vă distribuiți bugetul pe luni, dacă aveți sezonalitate în afacerea dvs. Pentru a distribui un buget folosind această distribuție, configurați această **distribuție lunară** în **centrul de cost**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Ne pare rău, Serial nr nu se pot uni"
@@ -511,7 +470,6 @@
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
-DocType: About Us Settings,Website Manager,Site-ul Manager de
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Anul fiscal Data începerii nu trebuie să fie mai mare decât anul fiscal Data de încheiere
 DocType: Warranty Claim,Resolution,Rezolutie
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Livrate: {0}
@@ -519,25 +477,24 @@
 DocType: Sales Order,Billing and Delivery Status,Facturare și de livrare Starea
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Precedenta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Vânzări de returnare
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Selectați comenzi de vânzări de la care doriți să creați comenzi de producție.
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componente salariale.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza de date cu clienți potențiali.
+DocType: Authorization Rule,Customer or Item,Client sau un element
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza de Date Client.
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Suma alocată nu poate fi negativă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Unitatea de măsură implicită pentru postul {0} nu poate fi schimbat direct, deoarece aveti si voi deja unele tranzacții (i) cu un alt UOM. Veți avea nevoie pentru a crea un nou element pentru a utiliza un alt implicit UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
-DocType: Event,Wednesday,Miercuri
 DocType: Sales Invoice,Customer's Vendor,Vanzator Client
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Producția Comanda este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Propunere de scriere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propunere de scriere
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un alt Sales Person {0} există cu același ID Angajat
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Eroare negativ Stock ({6}) pentru postul {0} în Depozit {1} la {2} {3} în {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Anul fiscal companie
@@ -558,20 +515,16 @@
 DocType: Activity Type,Default Costing Rate,Implicit Rata Costing
 DocType: Maintenance Schedule,Maintenance Schedule,Program Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Apoi normelor privind prețurile sunt filtrate pe baza Customer, Client Group, Territory, furnizor, furnizor de tip, Campania, Vanzari Partener etc"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Vă rugăm să instalați dropbox modul python
 DocType: Employee,Passport Number,Numărul de pașaport
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Din Chitanta de Cumparare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Din Chitanta de Cumparare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
 DocType: SMS Settings,Receiver Parameter,Receptor Parametru
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Bazat pe' și 'Grupat dupa' nu pot fi identice
 DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Până la data
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Introduceți adresa de e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub de formare a capetelor
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Transforma in grup
 DocType: Activity Cost,Activity Type,Tip Activitate
@@ -579,25 +532,20 @@
 DocType: Customer,Fixed Days,Zilele fixe
 DocType: Sales Invoice,Packing List,Lista de ambalare
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,A achiziționa ordine de date Furnizori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Editare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Editare
 DocType: Activity Cost,Projects User,Proiecte de utilizare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nu a fost găsit în tabelul detalii factură
 DocType: Company,Round Off Cost Center,Rotunji cost Center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vizita de Mentenanta {0} trebuie sa fie anulată înainte de a anula această Comandă de Vânzări
 DocType: Material Request,Material Transfer,Transfer de material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Deschidere (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postarea trebuie să fie după {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Setări
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impozite cost debarcate și Taxe
 DocType: Production Order Operation,Actual Start Time,Timpul efectiv de începere
 DocType: BOM Operation,Operation Time,Funcționare Ora
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mai mult
 DocType: Pricing Rule,Sales Manager,Director De Vânzări
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Redenumire
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Îndoire
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permiteţi utilizator
 DocType: Journal Entry,Bill No,Factură nr.
 DocType: Purchase Invoice,Quarterly,Trimestrial
 DocType: Selling Settings,Delivery Note Required,Nota de Livrare Necesara
@@ -606,17 +554,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Va rugam sa introduceti detalii element
 DocType: Purchase Receipt,Other Details,Alte detalii
 DocType: Account,Accounts,Conturi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Forfecare drept
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Pentru a urmări element în vânzări și a documentelor de achiziție, pe baza lor de serie nr. Acest lucru se poate, de asemenea, utilizat pentru a urmări detalii de garanție ale produsului."
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Warehouse respins este obligatorie împotriva articol regected
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 DocType: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
 DocType: Hub Settings,Seller City,Vânzător oraș
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Element are variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Articolul {0} nu a fost găsit
 DocType: Bin,Stock Value,Valoare stoc
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Arbore Tip
@@ -625,14 +572,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de vânzări, factură de vânzări sau intrare în jurnal"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Bioprelucrare
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Imposibil de găsit cursului de schimb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Spaţiul aerian
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bine ați venit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Spaţiul aerian
 DocType: Journal Entry,Credit Card Entry,Card de credit intrare
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Sarcina Subiect
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Bunuri primite de la furnizori.
-DocType: Communication,Open,Deschide
 DocType: Lead,Campaign Name,Denumire campanie
 ,Reserved,Rezervat
 DocType: Purchase Order,Supply Raw Materials,Aprovizionarea cu materii prime
@@ -641,29 +584,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nu este un articol de stoc
 DocType: Mode of Payment Account,Default Account,Cont Implicit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
-DocType: Contact Us Settings,Address Title,Titlu adresă
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: Production Order Operation,Planned End Time,Planificate End Time
 ,Sales Person Target Variance Item Group-Wise,Persoana de vânzări țintă varianță Articol Grupa Înțelept
-DocType: Dropbox Backup,Daily,Zilnic
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Employee,Cell Number,Număr Celula
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Cereri materiale Auto Generat
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Declarația salariu lunar.
 DocType: Item Group,Website Specifications,Site-ul Specificații
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Cont nou
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Intrările contabile pot fi create comparativ nodurilor frunză. Intrările comparativ grupurilor nu sunt permise.
-DocType: ToDo,High,Ridicat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Opportunity,Maintenance,Mentenanţă
-DocType: User,Male,Masculin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Campanii de vanzari.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -711,10 +651,9 @@
 DocType: Address,Personal,Trader
 DocType: Expense Claim Detail,Expense Claim Type,Tip Revendicare Cheltuieli
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Setările implicite pentru Cosul de cumparaturi
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal de intrare {0} este legată de Ordine {1}, verificați dacă aceasta ar trebui să fie tras ca avans în această factură."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Jurnal de intrare {0} este legată de Ordine {1}, verificați dacă aceasta ar trebui să fie tras ca avans în această factură."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Cheltuieli de întreținere birou
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Tivitură
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Va rugam sa introduceti Articol primul
 DocType: Account,Liability,Răspundere
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
@@ -722,14 +661,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Process Payroll,Send Email,Trimiteți-ne email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nici o permisiune
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Actualizare Stock&quot; nu pot fi verificate, deoarece obiectele nu sunt livrate prin {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualizare stoc"" nu poate fi activat, deoarece obiectele nu sunt livrate prin {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Facturile mele
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Facturile mele
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Nu a fost gasit angajat
 DocType: Purchase Order,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
@@ -748,35 +688,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Pentru a activa &quot;punct de vânzare&quot; caracteristici
 DocType: Bin,Moving Average Rate,Rata medie mobilă
 DocType: Production Planning Tool,Select Items,Selectați Elemente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
-DocType: Comment,Reference Name,Nume de referință
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: Sales Invoice Item,Target Warehouse,Țintă Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Vanzare
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Profit / pierdere net
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
 DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Turnare mucegai permanent
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stare este {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusul este {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Comandă de aprovizionare de plata
 DocType: Sales Order Item,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
 DocType: Newsletter,Newsletter Manager,Newsletter Director
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Deschiderea&quot;
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
 DocType: Expense Claim,Expenses,Cheltuieli
 DocType: Item Variant Attribute,Item Variant Attribute,Varianta element Atribut
 ,Purchase Receipt Trends,Tendințe Primirea de cumpărare
 DocType: Appraisal,Select template from which you want to get the Goals,Selectați șablonul din care doriți să obțineți Obiectivelor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Cercetare & Dezvoltare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Cercetare & Dezvoltare
 ,Amount to Bill,Sumă pentru facturare
 DocType: Company,Registration Details,Detalii de înregistrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-comanda Cantitate
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programat pentru a trimite la {0}
@@ -787,18 +724,16 @@
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Punct de vânzare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nu se poate duce mai departe {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
 DocType: Account,Balance must be,Bilanţul trebuie să fie
 DocType: Hub Settings,Publish Pricing,Publica Prețuri
 DocType: Notification Control,Expense Claim Rejected Message,Mesaj Respingere Revendicare Cheltuieli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Cuie
 ,Available Qty,Cantitate disponibilă
 DocType: Purchase Taxes and Charges,On Previous Row Total,Inapoi la rândul Total
 DocType: Salary Slip,Working Days,Zile lucratoare
 DocType: Serial No,Incoming Rate,Rate de intrare
 DocType: Packing Slip,Gross Weight,Greutate brută
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Includ vacanțe în total nr. de zile lucrătoare
 DocType: Job Applicant,Hold,Păstrarea / Ţinerea / Deţinerea
 DocType: Employee,Date of Joining,Data Aderării
@@ -808,30 +743,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Vezi Abonații
 DocType: Purchase Invoice Item,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Sablare
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Maestru cursului de schimb valutar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} trebuie să fie activ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuleaza Vizite Material {0} înainte de a anula această Vizita de întreținere
 DocType: Salary Slip,Leave Encashment Amount,Suma Incasare Concediu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Necesar Cantitate
 DocType: Bank Reconciliation,Total Amount,Suma totală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Editura Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Editura Internet
 DocType: Production Planning Tool,Production Orders,Comenzi de producție
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valoarea bilanţului
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publica pentru a sincroniza articole
-DocType: GL Entry,Account Currency,Moneda cont
+DocType: Bank Reconciliation,Account Currency,Moneda cont
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Vă rugăm să menționați rotunji contul în companie
 DocType: Purchase Receipt,Range,Interval
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Features Setup,Item Barcode,Element de coduri de bare
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 DocType: Address,Shop,Magazin
@@ -840,7 +774,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
 DocType: Employee,Permanent Address Is,Adresa permanentă este
 DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marca
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Alocație mai mare decât -{0} anulată pentru articolul {1}.
 DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
 DocType: Item,Is Purchase Item,Este de cumparare Articol
@@ -859,60 +793,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Comandă de aprovizionare Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Venituri indirecte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set de plată Suma = suma restantă
-DocType: Contact Us Settings,Address Line 1,Adresă Linie 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variație
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Denumire Companie
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variație
+,Company Name,Denumire Companie
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Selectați Element de Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vizualizați o listă cu toate filmele de ajutor
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Selectați contul șef al băncii, unde de verificare a fost depus."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permiteţi utilizatorului să editeze lista ratelor preturilor din tranzacții
 DocType: Pricing Rule,Max Qty,Max Cantitate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rând {0}: Plata împotriva Vânzări / Ordinului de Procurare ar trebui să fie întotdeauna marcate ca avans
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chimic
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimic
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 DocType: Process Payroll,Select Payroll Year and Month,Selectați Salarizare anul și luna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Du-te la grupul corespunzător (de obicei, de aplicare fondurilor&gt; Active curente&gt; Conturi bancare și de a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip &quot;Banca&quot;"
 DocType: Workstation,Electricity Cost,Cost energie electrică
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
-DocType: Comment,Unsubscribed,Nesubscrise
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,Criteriile de inspecție
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Arborele de centre de cost finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Alb
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Atașați imaginea dvs.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Realizare
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Atașați imaginea dvs.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Realizare
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
-DocType: Workflow State,Stop,Oprire
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Nu a fost o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați support@erpnext.com dacă problema persistă.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Cosul meu
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Pentru Tipul trebuie să fie una dintre {0}
 DocType: Lead,Next Contact Date,Următor Contact Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Deschiderea Cantitate
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opțiuni pe acțiuni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Opțiuni pe acțiuni
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Cantitate pentru {0}
 DocType: Leave Application,Leave Application,Aplicatie pentru Concediu
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Mijloc pentru Alocare Concediu
 DocType: Leave Block List,Leave Block List Dates,Date Lista Concedii Blocate
 DocType: Company,If Monthly Budget Exceeded (for expense account),Dacă bugetul lunar depășită (pentru contul de cheltuieli)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Aranjare
 DocType: Workstation,Net Hour Rate,Net Rata de ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chitanta de Cumparare aferent Costului Final
 DocType: Company,Default Terms,Termeni implicite
 DocType: Packing Slip Item,Packing Slip Item,Bonul Articol
 DocType: POS Profile,Cash/Bank Account,Numerar/Cont Bancar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Depozit
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Reducere
 DocType: Features Setup,Purchase Discounts,Cumpărare Reduceri
 DocType: Workstation,Wages,Salarizare
@@ -929,7 +858,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
 DocType: Serial No,Creation Document No,Creare Document Nr.
 DocType: Issue,Issue,Problem
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Cont nu se potrivește cu Compania
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depozit
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
 DocType: BOM Operation,Operation,Operație
@@ -937,19 +867,19 @@
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Postul trebuie să fie adăugate folosind ""obține elemente din Cumpără Încasări"" buton"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Cheltuieli de vânzare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Cumpararea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Cumpararea Standard
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Efectuarea de stoc Entries
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Efectuarea de stoc Entries
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
 DocType: Item,Default Supplier,Furnizor Implicit
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Peste producție Reduceri Procentaj
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regula Condiții presetate
 DocType: Features Setup,Miscelleneous,Miscelleneous
-DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala 
+DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
 DocType: Sales Person,Select company name first.,Selectați numele companiei în primul rând.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
@@ -958,29 +888,27 @@
 DocType: Time Log Batch,updated via Time Logs,actualizat prin timp Busteni
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârstă medie
 DocType: Opportunity,Your sales person who will contact the customer in future,Persoana de vânzări care va contacta clientul în viitor
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
 DocType: Company,Default Currency,Monedă implicită
 DocType: Contact,Enter designation of this Contact,Introduceți destinatia acestui Contact
-DocType: Contact Us Settings,Address,Adresă
 DocType: Expense Claim,From Employee,Din Angajat
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
 DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
 DocType: Upload Attendance,Attendance From Date,Prezenţa del la data
 DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,și anul:
 DocType: Email Digest,Annual Expense,Cheltuieli anuale
 DocType: SMS Center,Total Characters,Total de caractere
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detaliu factură formular-C
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Reconcilierea plata facturii
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribuția%
 DocType: Item,website page link,pagina site-ului link-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Să se pregătească sistemul de prima utilizare.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numerele de înregistrare companie pentru referință. Numerele fiscale etc
 DocType: Sales Partner,Distributor,Distribuitor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Cosul de cumparaturi Articolul Transport
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Producția de Ordine {0} trebuie anulată înainte de a anula această comandă de vânzări
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Selectați Timp Busteni Trimite pentru a crea o nouă factură de vânzare.
@@ -999,15 +927,13 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Sold Contabilitate
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nimic de a solicita
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de început' nu poate fi ulterioară datei 'Data efectivă de sfârșit'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Management
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Management
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipuri de activități de fișe de pontaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Turnare de investiții
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Suma de Debit sau de Credit este necesar pentru {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Albastru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Albastru
 DocType: Purchase Invoice,Is Return,Este de returnare
 DocType: Price List Country,Price List Country,Lista de preturi Țară
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Noduri suplimentare pot fi create numai în noduri de tip 'Grup'
@@ -1017,50 +943,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} deja creat pentru utilizator: {1} și compania {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factorul de conversie UOM
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Fabricație obiect laminat
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Baza de date furnizor.
 DocType: Account,Balance Sheet,Bilant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Întindere de formare
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Persoană de vânzări va primi un memento la această dată pentru a lua legătura cu clientul
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impozitul și alte rețineri salariale.
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
 DocType: Account,Warehouse,Depozit
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stocul Ledger Înscrieri și GL intrările sunt postate pentru selectate Veniturile achiziție
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postul 1
 DocType: Holiday,Holiday,Vacanță
-DocType: Event,Saturday,Sâmbătă
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lăsați necompletat dacă se consideră pentru toate ramurile
-,Daily Time Log Summary,Rezumat Zilnic Log Timp 
-DocType: DocField,Label,Etichetă
+,Daily Time Log Summary,Rezumat Zilnic Log Timp
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nereconciliate Detalii de plată
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
 DocType: Lead,Call,Apelaţi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Intrările' nu pot fi vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Configurarea angajati
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vă rugăm să selectați prefix întâi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Cercetarea
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Cercetarea
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Vă rugăm să specificați cel puțin un atribut în tabelul Atribute
 DocType: Contact,User ID,ID-ul de utilizator
-DocType: Communication,Sent,Trimis
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Vezi Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
-DocType: Communication,Delivery Status,Starea de Livrare
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 DocType: Production Order,Manufacture against Sales Order,Fabricarea de comandă de vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Restul lumii
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
@@ -1071,19 +990,17 @@
 DocType: BOM Item,Item Description,Descriere Articol
 DocType: Payment Tool,Payment Mode,Modul de plată
 DocType: Purchase Invoice,Is Recurring,Este recurent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Metalice directă sinterizare cu laser
 DocType: Purchase Order,Supplied Items,Articole furnizate
 DocType: Production Order,Qty To Manufacture,Cantitate pentru fabricare
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Menține aceeași cată in cursul ciclului de cumpărare
 DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Deschiderea temporară
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Bilant Concediu Angajat
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
 DocType: Address,Address Type,Tip adresă
 DocType: Purchase Receipt,Rejected Warehouse,Depozit Respins
 DocType: GL Entry,Against Voucher,Comparativ voucherului
-DocType: Item,Default Buying Cost Center,Centru de Cost Cumparare Implicit 
+DocType: Item,Default Buying Cost Center,Centru de Cost Cumparare Implicit
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Pentru a obține cele mai bune din ERPNext, vă recomandăm să luați ceva timp și de ceas aceste filme de ajutor."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,la
@@ -1093,35 +1010,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Mic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Mic
 DocType: Employee,Employee Number,Numar angajat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punctul 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Titularul contului {0} creat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Verde
 DocType: Item,Auto re-order,Auto re-comanda
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Raport Realizat
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Raport Realizat
 DocType: Employee,Place of Issue,Locul eliberării
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contract
-DocType: Report,Disabled,Dezactivat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contract
+DocType: Email Digest,Add Quote,Adaugă Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Agricultură
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produsele sau serviciile dvs.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultură
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Produsele sau serviciile dvs.
 DocType: Mode of Payment,Mode of Payment,Mod de plata
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Este necesar numele
 DocType: Purchase Invoice,Recurring Type,Tip recurent
 DocType: Address,City/Town,Oras/Localitate
 DocType: Email Digest,Annual Income,Venit anual
 DocType: Serial No,Serial No Details,Serial Nu Detalii
 DocType: Purchase Invoice Item,Item Tax Rate,Rata de Impozitare Articol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Articolul {0} trebuie să fie un Articol Sub-contractat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Echipamente de Capital
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
@@ -1131,39 +1047,36 @@
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Așteptat Data de livrare este mai mică decât era planificat Începere Data.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pentru furnizor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setarea Tipul de cont ajută în selectarea acest cont în tranzacții.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total general (Valuta Companie)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Raport de ieșire
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Nu poate fi doar o singură regulă Condiții presetate cu 0 sau o valoare necompletată pentru ""la valoarea"""
 DocType: Authorization Rule,Transaction,Tranzacție
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Notă: Acest centru de cost este un grup. Nu pot face înregistrări contabile impotriva grupuri.
-apps/frappe/frappe/config/desk.py +7,Tools,Instrumente
 DocType: Item,Website Item Groups,Site-ul Articol Grupuri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numărul de ordine Producția este obligatorie pentru intrarea stoc scop înregistrării
 DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
 DocType: Journal Entry,Journal Entry,Intrare în jurnal
 DocType: Workstation,Workstation Name,Stație de lucru Nume
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest: 
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Comentarii
 DocType: Salary Slip,Bank Account No.,Cont bancar nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Rata de evaluare necesar pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Rata de evaluare necesar pentru postul {0}
 DocType: Quality Inspection Reading,Reading 8,Lectură 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Total {0} pentru toate elementele este zero, se poate ar trebui să se schimbe &quot;Distribuirea taxelor pe baza&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impozite și Taxe Calcul
 DocType: BOM Operation,Workstation,Stație de lucru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Manager Resurse Umane
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vă rugăm să selectați o companie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege concediu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Obiectiv model expertivă
 DocType: Salary Slip,Earning,Câștig Salarial
 DocType: Payment Tool,Party Account Currency,Partidul cont valutar
@@ -1173,26 +1086,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiții se suprapun găsite între:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valoarea totală Comanda
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Puteți face un jurnal de timp doar împotriva unui ordin de producție prezentată
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletine de contacte, conduce."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta contului de închidere trebuie să fie {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puncte pentru toate obiectivele ar trebui să fie 100. este {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operațiunile nu poate fi lasat necompletat.
 ,Delivered Items To Be Billed,Produse Livrate Pentru a fi Facturate
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
-DocType: DocField,Description,Descriere
 DocType: Authorization Rule,Average Discount,Discount mediiu
-DocType: Letter Head,Is Default,Este Implicit
 DocType: Address,Utilities,Utilitați
 DocType: Purchase Invoice Item,Accounting,Contabilitate
 DocType: Features Setup,Features Setup,Caracteristici de setare
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Vezi Scrisoare Oferta
-DocType: Communication,Communication,Comunicare
 DocType: Item,Is Service Item,Este Serviciul Articol
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vă rugăm să selectați Anul fiscal
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},De la {0} | {1} {2}
@@ -1204,14 +1114,14 @@
 DocType: Pricing Rule,Campaign,Campanie
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
 DocType: Purchase Invoice,Contact Person,Persoană de contact
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Data de început anticipata' nu poate fi ulterioara datei 'Data de sfârșit anticipata'
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date','Data de început preconizatã' nu poate fi dupa data 'Data de sfârșit anticipatã'
 DocType: Holiday List,Holidays,Concedii
 DocType: Sales Order Item,Planned Quantity,Planificate Cantitate
 DocType: Purchase Invoice Item,Item Tax Amount,Suma Taxa Articol
 DocType: Item,Maintain Stock,Menține Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,De la Datetime
 DocType: Email Digest,For Company,Pentru Companie
@@ -1221,7 +1131,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Grafic Conturi
 DocType: Material Request,Terms and Conditions Content,Termeni și condiții de conținut
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depinde de concediu fără plată
@@ -1235,31 +1145,28 @@
 DocType: HR Settings,Employee Settings,Setări Angajat
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,To do list
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Începător
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Nu este permisă cantitate negativă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Începător
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Nu este permisă cantitate negativă
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Taxa detaliu tabel preluat de la maestru articol ca un șir și stocate în acest domeniu.
  Folosit pentru Impozite și Taxe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Intepare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,O structură Salariul activ găsite pentru angajat {0} și luna
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
 DocType: Rename Tool,Type of document to rename.,Tip de document pentru a redenumi.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Cumparam acest articol
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Cumparam acest articol
 DocType: Address,Billing,Facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Bordurare
-DocType: Bulk Email,Not Sent,Nu a fost trimis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Exploziv formarea
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impozite si Taxe (Compania valutar)
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programat pentru a trimite la {0} destinatari
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depozit sursă este obligatorie pentru rând {0}
@@ -1269,103 +1176,94 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nici adresa adăugat încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Features Setup,"To enable ""Point of Sale"" view",Pentru a activa &quot;punct de vânzare&quot; vedere
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plata nu se poate face pentru cart gol
 DocType: Item,Sales Details,Detalii vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Fixarea
 DocType: Opportunity,With Items,Cu articole
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,În Cantitate
 DocType: Notification Control,Expense Claim Rejected,Revendicare Cheltuieli Respinsa
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Data la care va fi generat următoarea factură. Acesta este generată pe prezinte.
 DocType: Item Attribute,Item Attribute,Postul Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Guvern
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variante Postul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Guvern
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variante Postul
 DocType: Company,Services,Servicii
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
 DocType: Sales Invoice,Source,Sursă
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Data de Inceput An Financiar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Data de Inceput An Financiar
 DocType: Employee External Work History,Total Experience,Experiența totală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zencuire
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Material Request Item,Sales Order No,Vânzări Ordinul nr
 DocType: Item Group,Item Group Name,Denumire Grup Articol
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Luate
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materiale de transfer de Fabricare
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Cautare Executiva
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Discount suplimentar Suma (companie de valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Eroare: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Eroare: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Vă rugăm să creați un cont nou de Planul de conturi.
 DocType: Maintenance Visit,Maintenance Visit,Vizita Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Client> Client Group> Teritoriul
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantitate lot disponibilă în depozit
 DocType: Time Log Batch Detail,Time Log Batch Detail,Ora Log lot Detaliu
-DocType: Workflow State,Tasks,Sarcini
 DocType: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
-DocType: Event,Tuesday,Marți
 DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
 ,Accounts Receivable Summary,Rezumat conturi de încasare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Frunze de tip {0} deja alocate pentru Angajat {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
 DocType: UOM,UOM Name,Numele UOM
-DocType: Top Bar Item,Target,Țintă
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribuția Suma
 DocType: Sales Invoice,Shipping Address,Adresa de livrare
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Acest instrument vă ajută să actualizați sau stabili cantitatea și evaluarea stocului in sistem. Acesta este de obicei folosit pentru a sincroniza valorile de sistem și ceea ce există de fapt în depozite tale.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,În cuvinte va fi vizibil după ce a salva de livrare Nota.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Deţinător marcă.
-DocType: ToDo,Due Date,Data Limita 
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Deţinător marcă.
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Cutie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizația
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Cutie
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizația
 DocType: Monthly Distribution,Monthly Distribution,Distributie lunar
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receptor Lista goala. Vă rugăm să creați Receiver Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Planul de producție comandă de vânzări
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Intrarea contabilitate pentru {0} se poate face numai în valută: {1}
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Crestare
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
 ,Bank Reconciliation Statement,Extras de cont reconciliere bancară
 DocType: Address,Lead Name,Nume Conducere
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Sold Stock
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Sold Stock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} trebuie să apară doar o singură dată
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nu sunt produse în ambalaj
 DocType: Shipping Rule Condition,From Value,Din Valoare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Sumele nu sunt corespunzătoare cu banca
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Cererile pentru cheltuieli companie.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Turnare centrifugală
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Asistată de câmp magnetic de finisare
 DocType: Company,Default Holiday List,Implicit Listă de vacanță
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Pasive stoc
 DocType: Purchase Receipt,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 DocType: Production Planning Tool,Select Sales Orders,Selectați comenzi de vânzări
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Pentru a urmări elemente utilizând coduri de bare. Va fi capabil de a intra articole în nota de livrare și factură de vânzare prin scanarea codului de bare de element.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark livrate
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark livrate
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Face ofertă
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 DocType: SMS Center,Receiver List,Receptor Lista
@@ -1373,31 +1271,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Vezi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Structura Salariul Deducerea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sinterizare cu laser selectivă
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importa cu succes!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Vârstă (zile)
 DocType: Quotation Item,Quotation Item,Citat Articol
 DocType: Account,Account Name,Numele Contului
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,De la data nu poate fi mai mare decât la data
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Nu {0} {1} cantitate nu poate fi o fracțiune
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Furnizor de tip maestru.
 DocType: Purchase Order Item,Supplier Part Number,Furnizor Număr
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Adaugă
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Rata de conversie nu poate fi 0 sau 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} este anulată sau oprită
 DocType: Accounts Settings,Credit Controller,Controler de Credit
 DocType: Delivery Note,Vehicle Dispatch Date,Dispeceratul vehicul Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
 DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Setări pentru cosul de cumparaturi on-line, cum ar fi normele de transport maritim, lista de preturi, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configurare complet
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Taxat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervate Cantitate
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Resurse umane
 DocType: Lead,Upper Income,Venituri de sus
 DocType: Journal Entry Account,Debit in Company Currency,Debit în companie valutar
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Problemele mele
@@ -1406,12 +1300,9 @@
 DocType: Company,Default Values,Valori implicite
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rând {0}: Suma de plată nu poate fi negativ
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Presa de montare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
 DocType: Payment Reconciliation,Payments,Plăți
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatice la cald presare
-DocType: ToDo,Medium,Medie
 DocType: Budget Detail,Budget Allocated,Buget alocat
 DocType: Journal Entry,Entry Type,Tipul de intrare
 ,Customer Credit Balance,Balanța Clienți credit
@@ -1420,12 +1311,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
 DocType: Quotation,Term Details,Detalii pe termen
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificarea capacitate de (zile)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
 DocType: Warranty Claim,Warranty Claim,Garanție revendicarea
 ,Lead Details,Detalii Conducere
-DocType: Authorization Rule,Approving User,Aprobare utilizator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Forjare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Placare
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
 DocType: Pricing Rule,Applicable For,Aplicabil pentru
 DocType: Bank Reconciliation,From Date,Din data
@@ -1447,64 +1335,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Licitatii Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Licitatii Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Vă rugăm să specificați fie Cantitate sau Evaluează evaluare sau ambele
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compania, Luna și Anul fiscal sunt obligatorii"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Unitate unică a unui articol.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Ora Log Lot {0} trebuie să fie ""Înscris"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Realizeaza Intrare de Contabilitate Pentru Fiecare Modificare a Stocului
 DocType: Leave Allocation,Total Leaves Allocated,Totalul Frunze alocate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Depozit necesar la Row Nu {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Va rugam sa introduceti valabil financiare Anul începe și a termina Perioada
 DocType: Employee,Date Of Retirement,Data Pensionare
 DocType: Upload Attendance,Get Template,Obține șablon
 DocType: Address,Postal,Poștal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Minerit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Turnare de rășină
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Există un grup de clienți cu același nume vă rugăm să schimbați numele clientului sau să redenumiți grupul de clienți
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vă rugăm să selectați {0} primul.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Textul {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Textul {0}
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Primirea de material
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Instrumente
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Instrumente
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Dacă acest element are variante, atunci nu poate fi selectat în comenzile de vânzări, etc."
 DocType: Lead,Next Contact By,Următor Contact Prin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Depozit {0} nu poate fi ștearsă ca exista cantitate pentru postul {1}
 DocType: Quotation,Order Type,Tip comandă
 DocType: Purchase Invoice,Notification Email Address,Notificarea Adresa de e-mail
 DocType: Payment Tool,Find Invoices to Match,Găsiți Facturi pentru a se potrivi
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","de exemplu, ""XYZ Banca Națională """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Raport țintă
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Raport țintă
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Cosul de cumparaturi este activat
 DocType: Job Applicant,Applicant for a Job,Solicitant pentru un loc de muncă
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nu sunt comenzile de producție create
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Salariul alunecare de angajat {0} deja creat pentru această lună
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Salariul alunecare de angajat {0} deja creat pentru această lună
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Sales Invoice Item,Batch No,Lot nr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Principal
-DocType: DocPerm,Delete,Șterge
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variantă
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nou {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Pentru a opri nu pot fi anulate. Unstop pentru a anula.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Suma alocată
 DocType: Sales Team,Contribution to Net Total,Contribuție la Total Net
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
@@ -1513,53 +1399,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitant pentru un loc de muncă.
 DocType: Purchase Order Item,Warehouse and Reference,Depozit și referință
 DocType: Supplier,Statutory info and other general information about your Supplier,Info statutar și alte informații generale despre dvs. de Furnizor
-DocType: Country,Country,Ţară
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adrese
-DocType: Communication,Received,Primita
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Nr. Serial introdus pentru articolul {0} este duplicat
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,O condiție pentru o normă de transport
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Postul nu este permis să aibă producție comandă.
-DocType: DocField,Attach Image,Atașați imagine
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Greutatea netă a acestui pachet. (Calculat automat ca suma de greutate netă de produs)
-DocType: Stock Reconciliation Item,Leave blank if no change,Lăsați necompletat dacă nici o schimbare
 DocType: Sales Order,To Deliver and Bill,Pentru a livra și Bill
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Timp Busteni pentru productie.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicați nivel de reorganizare tip depozit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Log timp de sarcini.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Plată
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plată
 DocType: Production Order Operation,Actual Time and Cost,Timp și cost efective
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
 DocType: Employee,Salutation,Salut
-DocType: Communication,Rejected,Respinse
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Set de articole în momemntul vânzării.
 DocType: Sales Order Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
 DocType: Quality Inspection Reading,Reading 10,Reading 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Valoarea {0} pentru {1} Atribut nu există în lista de la punctul valabile Valorile atributelor
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Asociaţi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirat
 DocType: Packing Slip,To Package No.,La pachetul Nr
-DocType: DocType,System,Sistem
 DocType: Warranty Claim,Issue Date,Data emiterii
 DocType: Activity Cost,Activity Cost,Cost activitate
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantitate Consumata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telecomunicații
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicații
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 DocType: Payment Tool,Make Payment Entry,Realizeaza Intrare de Plati
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
 ,Sales Invoice Trends,Vânzări Tendințe factură
 DocType: Leave Application,Apply / Approve Leaves,Aplicați / aprobaţi concedii
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pentru
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Se poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
 DocType: Sales Order Item,Delivery Warehouse,Depozit de livrare
 DocType: Stock Settings,Allowance Percent,Procent Alocație
@@ -1571,32 +1452,27 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","De vânzare trebuie să fie verificate, dacă este cazul Pentru este selectat ca {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Furnizor ofertă Articol
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Realizeaza Structura Salariala
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Tuns
 DocType: Item,Has Variants,Are variante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Clic pe butonul 'Intocmeste Factura Vanzare' pentru a crea o nouă Factură de Vânzare.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Ambalare și etichetare
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vă rugăm să precizați implicit de valuta în Compania de Master și setări implicite globale
-DocType: Dropbox Backup,Dropbox Access Secret,Secret pentru Acces Dropbox 
 DocType: Purchase Invoice,Recurring Invoice,Factura recurent
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Managementul Proiectelor
 DocType: Supplier,Supplier of Goods or Services.,Furnizor de bunuri sau servicii.
 DocType: Budget Detail,Fiscal Year,An Fiscal
 DocType: Cost Center,Budget,Buget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bugetul nu pot fi atribuite în {0}, deoarece nu este un cont venituri sau cheltuieli"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Realizat
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Realizat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Teritoriu / client
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,de exemplu 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,de exemplu 5
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,În cuvinte va fi vizibil după ce a salva de vânzări factură.
 DocType: Item,Is Sales Item,Este produs de vânzări
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ramificatie Grup Articole
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
 DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
 ,Amount to Deliver,Sumă pentru livrare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Produs sau Serviciu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Au fost erori.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Atingând
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Un Produs sau Serviciu
 DocType: Naming Series,Current Value,Valoare curenta
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} creat
 DocType: Delivery Note Item,Against Sales Order,Comparativ comenzii de vânzări
@@ -1610,15 +1486,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
 DocType: Website Item Group,Website Item Group,Site-ul Grupa de articole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Impozite și taxe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vă rugăm să introduceți data de referință
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vă rugăm să introduceți data de referință
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabelul pentru postul care va fi afișat în site-ul
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
 DocType: Material Request Item,Material Request Item,Material Cerere Articol
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Arborele de Postul grupuri.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Arborele de Postul grupuri.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Roșu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Roșu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
 DocType: Account,Frozen,Congelat
 ,Open Production Orders,Comenzi deschis de producție
@@ -1628,12 +1504,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rând # {0}: {1} Funcționare nu este finalizată pentru {2} cantitate de produse finite în Producție Comanda # {3}. Vă rugăm să actualizați starea de funcționare prin timp Busteni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Schimba UOM pentru un articol.
 DocType: Quality Inspection Reading,Acceptance Criteria,Criteriile de receptie
 DocType: Item Attribute,Attribute Name,Denumire atribut
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Articolul {0} trebuie să fie un Articol de Vanzari sau de Service in {1}
 DocType: Item Group,Show In Website,Arata pe site-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
 DocType: Task,Expected Time (in hours),Timp de așteptat (în ore)
 ,Qty to Order,Cantitate pentru comandă
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Pentru a urmări nume de brand în următoarele documente de însoțire a mărfii, oportunitate, cerere Material, Postul, comanda de achiziție, Cumpărare Voucherul, Cumpărătorul Primirea, cotatie, vânzări factură, produse Bundle, comandă de vânzări, ordine"
@@ -1642,77 +1517,66 @@
 DocType: Holiday List,Clear Table,Sterge Masa
 DocType: Features Setup,Brands,Mărci
 DocType: C-Form Invoice Detail,Invoice No,Factura Nu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order, Din Ordinul de Comanda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Din Ordinul de Comanda
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Adrese de clienți și Contacte
 DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nu a fost setat
-DocType: Communication,Date,Dată
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Stai bine în timp ce sistemul este în curs de instalare. Acest lucru poate dura câteva momente.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pereche
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pereche
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
 DocType: Item,Has Batch No,Are nr. de Lot
 DocType: Delivery Note,Excise Page Number,Numărul paginii accize
 DocType: Employee,Personal Details,Detalii personale
 ,Maintenance Schedules,Program Mentenanta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ștanțare
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debit cont trebuie să fie un cont de creanțe
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Deoarece se poate întocmi ordin de producție aferent acestui articol, acesta trebuie să fie un articol de stoc."
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Aderarea
-DocType: Authorization Rule,Above Value,Valoarea de mai sus
 ,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
 DocType: Purchase Order,Delivered,Livrat
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Configurare de server de intrare pentru ocuparea forței de muncă id-ul de e-mail. (De exemplu jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total frunze alocate {0} nu poate fi mai mic de frunze deja aprobate {1} pentru perioada
 DocType: Journal Entry,Accounts Receivable,Conturi de Incasare
 ,Supplier-Wise Sales Analytics,Furnizor înțelept Vânzări Analytics
 DocType: Address Template,This format is used if country specific format is not found,Acest format este utilizat în cazul în format specific țării nu este găsit
-DocType: Custom Field,Custom,Personalizat
 DocType: Production Order,Use Multi-Level BOM,Utilizarea Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Injectarea
 DocType: Bank Reconciliation,Include Reconciled Entries,Includ intrările împăcat
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Arborele de conturi finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lăsați necompletat dacă se consideră pentru toate tipurile de angajați
 DocType: Landed Cost Voucher,Distribute Charges Based On,Împărțiți taxelor pe baza
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Contul {0} trebuie să fie de tipul 'valoare stabilită' deoarece articolul {1} este un articol de valoare
 DocType: HR Settings,HR Settings,Setări Resurse Umane
-apps/frappe/frappe/config/setup.py +130,Printing,Tipărire
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Revendicarea Cheltuielilor este în curs de aprobare. Doar Aprobatorul de Cheltuieli poate actualiza statusul.
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,A doua zi (e) pe care aplici pentru concediu sunt vacanță. Tu nu trebuie să se aplice pentru concediu.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,și
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Raport real
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unitate
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Vă rugăm să setați tastele de acces Dropbox pe site-ul dvs. de configurare
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Unitate
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vă rugăm să specificați companiei
 ,Customer Acquisition and Loyalty,Achiziționare și Loialitate Client
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Anul dvs. financiar se încheie pe
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Anul dvs. financiar se încheie pe
 DocType: POS Profile,Price List,Lista de prețuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum implicit anul fiscal. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
-DocType: Authorization Rule,Approving Role,Aprobare rol
 ,BOM Search,BOM Căutare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Vă rugăm să specificați în valută companie
 DocType: Workstation,Wages per hour,Salarii pe oră
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Arată / Ascunde caracteristici cum ar fi de serie nr, POS etc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ca urmare a solicitărilor de materiale au fost ridicate în mod automat în funcție de nivelul de re-comanda item
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data Aprobare nu poate fi anterioara datei de verificare pentru inregistrarea {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data Aprobare nu poate fi anterioara datei de verificare pentru inregistrarea {0}
 DocType: Salary Slip,Deduction,Deducere
 DocType: Address Template,Address Template,Model adresă
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Vă rugăm să introduceți ID-ul de angajat al acestei persoane de vânzări
@@ -1724,76 +1588,68 @@
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Total de deducere
 DocType: Quotation,Maintenance User,Întreținere utilizator
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Cost actualizat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Cost actualizat
 DocType: Employee,Date of Birth,Data Nașterii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Articolul {0} a fost deja returnat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anul fiscal** reprezintă un an financiar. Toate intrările contabile și alte tranzacții majore sunt monitorizate comparativ cu ** Anul fiscal **.
 DocType: Opportunity,Customer / Lead Address,Client / Adresa principala
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descrierea postului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Descrierea postului
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantitate conform Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vă rugăm să selectați un fișier csv valid cu date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Strat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment."
 DocType: Expense Claim,Approver,Aprobator
 ,SO Qty,SO Cantitate
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Intrări din stocul exista împotriva depozit {0}, deci nu puteți re-atribui sau modifica Depozit"
 DocType: Appraisal,Calculate Total Score,Calculaţi scor total
 DocType: Supplier Quotation,Manufacturing Manager,Manufacturing Manager de
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Transporturile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Formare prin imersie
-DocType: Purchase Order,To be delivered to customer,Pentru a fi livrat clientului
+apps/erpnext/erpnext/hooks.py +68,Shipments,Transporturile
+DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Ora Log Starea trebuie să fie prezentate.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configurarea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,
 DocType: Purchase Invoice,In Words (Company Currency),În cuvinte (Compania valutar)
 DocType: Pricing Rule,Supplier,Furnizor
 DocType: C-Form,Quarter,Trimestru
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Cheltuieli diverse
 DocType: Global Defaults,Default Company,Companie Implicita
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nu pot overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nu pot overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
 DocType: Employee,Bank Name,Denumire bancă
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,de mai sus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Utilizatorul {0} este dezactivat
 DocType: Leave Application,Total Leave Days,Total de zile de concediu
-DocType: Journal Entry Account,Credit in Account Currency,Credit în cont valutar
 DocType: Email Digest,Note: Email will not be sent to disabled users,Notă: Adresa de email nu va fi trimis la utilizatorii cu handicap
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Selectați compania ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Currency Exchange,From Currency,Din moneda
-DocType: DocField,Name,Nume
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vă rugăm să selectați suma alocată, de tip Factură și factură Numărul din atleast rând una"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ordinul de vânzări necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Sumele nu sunt corespunzătoare cu sistemul
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Altel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Altel
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Finalizat
-DocType: Web Form,Select DocType,Selectați DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broșare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bancar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Vă rugăm să faceți clic pe ""Generate Program"", pentru a obține programul"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Centru de cost nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Centru de cost nou
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
 DocType: Quality Inspection,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
 DocType: Purchase Order Item,Reference Document Type,Referință Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventarul serializat
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventarul serializat
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
 DocType: Time Log Batch,Total Billing Amount,Suma totală de facturare
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Contul de încasat
@@ -1801,19 +1657,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Comanda de vânzări la plată
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Timp Busteni creat:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Vă rugăm să selectați contul corect
 DocType: Item,Weight UOM,Greutate UOM
 DocType: Employee,Blood Group,Grupă de sânge
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,În așteptarea
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizatorii care poate aproba cererile de concediu o anumită angajatilor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nu puteți modifica implicit UOM a variantei. Pentru a modifica implicit UOM pentru Variant schimbare implicit UOM a șablonului
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Echipamente de birou
 DocType: Purchase Invoice Item,Qty,Cantitate
 DocType: Fiscal Year,Companies,Companii
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electronică
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronică
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ridica Material Cerere atunci când stocul ajunge la nivelul re-comandă
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Din Program de Intretinere
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Permanent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Permanent
 DocType: Purchase Invoice,Contact Details,Detalii Persoana de Contact
 DocType: C-Form,Received Date,Data primit
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Dacă ați creat un model standard la taxele de vânzare și taxe Format, selectați una și faceți clic pe butonul de mai jos."
@@ -1825,14 +1681,15 @@
 DocType: Job Applicant,Job Opening,Deschidere Loc de Muncă
 DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnologia nou-aparuta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
 DocType: Offer Letter,Offer Letter,Oferta Scrisoare
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Genereaza Cereri de Material (MRP) și Comenzi de Producție.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Totală facturată Amt
 DocType: Time Log,To Time,La timp
+DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Pentru a adăuga noduri copil, explora copac și faceți clic pe nodul în care doriți să adăugați mai multe noduri."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
@@ -1842,12 +1699,10 @@
 DocType: Item,Customer Item Codes,Coduri client Postul
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Creați Intrările de plată împotriva comenzi sau facturi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sudare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM este necesar
 DocType: Quality Inspection,Sample Size,Eșantionul de dimensiune
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Toate articolele au fost deja facturate
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vă rugăm să specificați un valabil ""Din cauza nr"""
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Nr. de Serie Articol
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni
@@ -1857,15 +1712,13 @@
 DocType: Bin,Actual Quantity,Cantitate Efectivă
 DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial nr {0} nu a fost găsit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Clienții dvs.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Turnare prin compresie
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Clienții dvs.
 DocType: Leave Block List Date,Block Date,Dată blocare
 DocType: Sales Order,Not Delivered,Nu Pronunțată
 ,Bank Clearance Summary,Sumar aprobare bancă
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Cod articol> Articol Grupa> Brand
 DocType: Appraisal Goal,Appraisal Goal,Obiectiv expertiză
-DocType: Event,Friday,Vineri
 DocType: Time Log,Costing Amount,Costing Suma
 DocType: Process Payroll,Submit Salary Slip,Prezenta Salariul Slip
 DocType: Salary Structure,Monthly Earning & Deduction,Câștigul salarial lunar & Deducerea
@@ -1873,21 +1726,19 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import în vrac
 DocType: Sales Partner,Address & Contacts,Adresă şi contacte
 DocType: SMS Log,Sender Name,Sender Name
-DocType: Page,Title,Titlu
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Personalizeaza
 DocType: POS Profile,[Select],[Selectati]
 DocType: SMS Log,Sent To,Trimis La
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Realizeaza Factura de Vanzare
 DocType: Company,For Reference Only.,Numai Pentru referință.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Sumă în avans
 DocType: Manufacturing Settings,Capacity Planning,Planificarea capacității
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Din Data' este necesar
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Din Data' este necesar
 DocType: Journal Entry,Reference Number,Numărul de referință
 DocType: Employee,Employment Details,Detalii angajare
 DocType: Employee,New Workplace,Nou loc de muncă
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Setați ca Închis
-apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 0
 DocType: Features Setup,If you have Sales Team and Sale Partners (Channel Partners)  they can be tagged and maintain their contribution in the sales activity,"Dacă exista Echipa de Eanzari si Partenerii de Vanzari (Parteneri de Canal), acestea pot fi etichetate și isi pot menține contribuția in activitatea de vânzări"
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
@@ -1897,7 +1748,7 @@
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
 DocType: Item,End of Life,Sfârsitul vieții
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Călători
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Călători
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
 DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
 DocType: Sales Invoice,Recurring,Recurent
@@ -1905,23 +1756,21 @@
 DocType: Rename Tool,Rename Tool,Redenumirea Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material de transfer
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifica operațiunilor, costurile de exploatare și să dea o operațiune unică nu pentru operațiunile dumneavoastră."
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
 DocType: Installation Note,Installation Note,Instalare Notă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Adăugaţi Taxe
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Adăugaţi Taxe
 ,Financial Analytics,Analitica Financiara
 DocType: Quality Inspection,Verified By,Verificate de
 DocType: Address,Subsidiary,Filială
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nu se poate schimba moneda implicita a companiei, deoarece există tranzacții in desfasurare. Tranzacțiile trebuie să fie anulate pentru a schimba moneda implicita."
 DocType: Quality Inspection,Purchase Receipt No,Primirea de cumpărare Nu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
-DocType: System Settings,In Hours,În ore
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Sold estimat ca pe bancă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Şlefuire
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Sold estimat ca pe bancă
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Sursa fondurilor (pasive)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
 DocType: Appraisal,Employee,Angajat
@@ -1934,15 +1783,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grup in functie de Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatoriu pe
 DocType: Sales Invoice,Mass Mailing,Corespondență în masă
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Afiseaza Plati
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Dimensiune
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Creare Client
@@ -1952,30 +1799,25 @@
 DocType: Quality Inspection Reading,Reading 9,Lectură 9
 DocType: Supplier,Is Frozen,Este înghețat
 DocType: Buying Settings,Buying Settings,Configurări cumparare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Finisare masă
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. BOM pentru un articol tip produs finalizat
 DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configurare de server de intrare pentru ID-ul de e-mail de vânzări. (De exemplu sales@example.com)
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Tool,Payment Account,Cont de plăți
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Ciornă
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Fara Masuri Compensatorii
 DocType: Quality Inspection Reading,Accepted,Acceptat
-DocType: User,Female,Feminin
-DocType: Journal Entry Account,Debit in Account Currency,Debit în contul valutar
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vă rugăm să asigurați-vă că într-adevăr să ștergeți toate tranzacțiile pentru această companie. Datele dvs. de bază vor rămâne așa cum este. Această acțiune nu poate fi anulată.
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,A răspuns:
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referință invalid {0} {1}
 DocType: Payment Tool,Total Payment Amount,Raport de plată Suma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nu poate fi mai mare decât cantitatea planificată ({2}) aferent comenzii de producție {3}
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Deoarece există tranzacții bursiere existente pentru acest element, \ nu puteți schimba valorile &quot;nu are nici o serie&quot;, &quot;are lot nr&quot;, &quot;Este Piesa&quot; și &quot;Metoda de evaluare&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Jurnal de intrare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 DocType: Employee,Previous Work Experience,Anterior Work Experience
 DocType: Stock Entry,For Quantity,Pentru Cantitate
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
@@ -1983,17 +1825,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Cererile de elemente.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup, Setare Finalizata
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stare de proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Nume
+DocType: Authorization Rule,Authorized Value,Valoarea autorizată
 DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Raport Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unitate de măsură
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Unitate de măsură
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
 DocType: Lead,Opportunity,Oportunitate
@@ -2014,16 +1856,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rata de bază (conform Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
 DocType: Campaign,Campaign-.####,Campanie-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Pătrunzător
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
 DocType: Customer Group,Has Child Node,Are nod fiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu în nici un activ anul fiscal. Pentru mai multe detalii verifica {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu este in nici un an fiscal activ. Pentru mai multe detalii verifica {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Clasă de uzură 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Prelucrare fotochimic
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2065,52 +1906,46 @@
  8. Introduceți Row: Dacă bazat pe ""Înapoi Row Total"", puteți selecta numărul rând care vor fi luate ca bază pentru acest calcul (implicit este rândul precedent).
  9. Luați în considerare Brut sau Taxa pentru: În această secțiune puteți specifica dacă taxa / taxa este doar pentru evaluare (nu o parte din total) sau numai pe total (nu adaugă valoare elementul) sau pentru ambele.
  10. Adăugați sau deduce: Fie că doriți să adăugați sau deduce taxa."
-DocType: Note,Note,Notă
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
-DocType: Email Account,Email Ids,Email Id-urile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nu se pot produce mai multe Articole {0} decât cantitatea din Ordinul de Vânzări {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
-DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar 
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
 DocType: Tax Rule,Billing City,Oraș de facturare
 DocType: Global Defaults,Hide Currency Symbol,Ascunde simbol moneda
 apps/erpnext/erpnext/config/accounts.py +164,"e.g. Bank, Cash, Credit Card","de exemplu, bancar, Cash, Card de credit"
 DocType: Journal Entry,Credit Note,Nota de Credit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Completat Cantitate nu poate fi mai mare de {0} pentru funcționare {1}
 DocType: Features Setup,Quality,Calitate
-DocType: Contact Us Settings,Introduction,Introducere
 DocType: Warranty Claim,Service Address,Adresa serviciu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rânduri de stoc reconciliere.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rânduri de stoc reconciliere.
 DocType: Stock Entry,Manufacture,Fabricare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vă rugăm livrare Nota primul
 DocType: Purchase Invoice,Currency and Price List,Valută și lista de prețuri
 DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Data Aprobare nespecificata
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producţie
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Data Aprobare nespecificata
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Producţie
 DocType: Item,Allow Production Order,Permiteţi comandă de producţie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Inscrisa
 DocType: Salary Structure,Total Earning,Câștigul salarial total de
 DocType: Purchase Receipt,Time at which materials were received,Timp în care s-au primit materiale
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresele mele
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Ramură organizație maestru.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,sau
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Cheltuieli de utilitate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-sus
 DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
-,Download Backups,Descarca Backup
 DocType: Notification Control,Sales Order Message,Comandă de vânzări Mesaj
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Seta valorile implicite, cum ar fi Compania, valutar, Current Anul fiscal, etc"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tip de plată
 DocType: Process Payroll,Select Employees,Selectați angajati
 DocType: Bank Reconciliation,To Date,La Data
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalii
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
 DocType: Employee,Emergency Contact,Contact de Urgență
 DocType: Item,Quality Parameters,Parametri de calitate
@@ -2125,6 +1960,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / lot
 DocType: Product Bundle,Parent Item,Părinte Articol
 DocType: Account,Account Type,Tipul Contului
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
@@ -2132,33 +1968,28 @@
 DocType: Bin,Reserved Quantity,Rezervat Cantitate
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primirea de cumpărare Articole
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare Personalizarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Tăiere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Aplatizare
 DocType: Account,Income Account,Contul de venit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Turnare
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
 DocType: Item Reorder,Material Request Type,Material Cerere tip
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Documente
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Re
 DocType: Cost Center,Cost Center,Centrul de cost
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Purchase Order Mesaj
 DocType: Tax Rule,Shipping Country,Transport Tara
 DocType: Upload Attendance,Upload HTML,Încărcați HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Raport avans ({0}) împotriva Comanda {1} nu poate fi mai mare decât \
  totalul ({2})"
 DocType: Employee,Relieving Date,Alinarea Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regula de stabilire a prețurilor se face pentru a suprascrie Pret / defini procent de reducere, pe baza unor criterii."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depozit poate fi modificat numai prin Bursa de primire de intrare / livrare Nota / cumparare
 DocType: Employee Education,Class / Percentage,Clasă / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing și Vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impozit pe venit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser proiectat modelarea net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing și Vânzări
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impozit pe venit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","În cazul în care articolul Prețuri selectat se face pentru ""Pret"", se va suprascrie lista de prețuri. Prețul Articolul Prețuri este prețul final, deci ar trebui să se aplice mai departe reducere. Prin urmare, în cazul tranzacțiilor, cum ar fi comandă de vânzări, Ordinului de Procurare, etc, acesta va fi preluat în câmpul ""Rate"", mai degrabă decât câmpul ""Lista de prețuri Rata""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track conduce de Industrie tip.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
@@ -2166,10 +1997,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vă rugăm să selectați o valoare de {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
-DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Numele noului centru de cost
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nu Format implicit Adresa găsit. Vă rugăm să creați unul nou de la Setup> Imprimare și Branding> Format Adresa.
 DocType: Appraisal,HR User,Utilizator HR
@@ -2181,31 +2011,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
 DocType: Supplier,Billing Currency,Moneda de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra mare
 ,Profit and Loss Statement,Profit și pierdere
 DocType: Bank Reconciliation Detail,Cheque Number,Număr Cec
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Presare
 DocType: Payment Tool Detail,Payment Tool Detail,Plata Instrumentul Detalii
 ,Sales Browser,Vânzări Browser
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Mare
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Nici un angajat nu a fost gasit!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Mare
 DocType: C-Form Invoice Detail,Territory,Teritoriu
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Purchase Order,Customer Address Display,Adresa de afișare client
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustruire
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Unitatea de măsură implicită pentru postul {0} nu poate fi schimbată în mod direct, deoarece \ aveti si voi deja unele tranzacții (i) cu un alt UOM. Pentru a schimba implicit UOM, \ utilizarea &quot;UOM Înlocuiți Utility&quot; instrument în modul stoc."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} este anulat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} este anulat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Suma Impresionant
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Angajatul {0} a fost în concediu pe {1}. Nu se poate marca prezență.
 DocType: Sales Partner,Targets,Obiective
@@ -2213,14 +2037,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
 ,S.O. No.,SO Nu.
 DocType: Production Order Operation,Make Time Log,Fa-ti timp Log
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Vă rugăm să setați cantitatea reordona
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
 DocType: Price List,Applicable for Countries,Aplicabile pentru țările
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chimice de slefuire
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Acesta este un grup de clienți rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vă rugăm configurarea diagrama de conturi înainte de a începe înregistrările contabile
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignora Regula Preturi
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anulat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De la data la structura salariului nu poate fi mai mică decât Angajat Aderarea Data.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Zile de blocare
@@ -2257,7 +2080,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Bifati pentru factura recurenta, debifați pentru a opri recurenta sau introduceti Data de Incheiere"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maxime {0} rânduri permis
 DocType: C-Form Invoice Detail,Net Total,Total net
 DocType: Bin,FCFS Rate,Rata FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Facturare (factură de vânzare)
@@ -2274,20 +2096,19 @@
 DocType: Maintenance Visit,Purposes,Scopuri
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Cel puțin un element ar trebui să fie introduse cu cantitate negativa în documentul de returnare
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operațiunea {0} mai mult decât orice ore de lucru disponibile în stație de lucru {1}, descompun operațiunea în mai multe operațiuni"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Prelucrare electrochimică
 ,Requested,Solicitată
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Nu Observații
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Întârziat
 DocType: Account,Stock Received But Not Billed,"Stock primite, dar nu Considerat"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Contul de root trebuie să fie un grup
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brut Suma de plată + restante Suma + încasări - Total Deducerea
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 DocType: Features Setup,Sales and Purchase,Vanzari si cumparare
 DocType: Supplier Quotation Item,Material Request No,Cerere de material Nu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rata la care moneda clientului este convertită în valuta de bază a companiei
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} a fost dezabonat cu succes din această listă.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Rata netă (companie de valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Adăugat
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Gestioneaza Ramificatiile Teritoriule.
 DocType: Journal Entry Account,Sales Invoice,Factură de vânzări
 DocType: Journal Entry Account,Party Balance,Balanța Party
@@ -2301,11 +2122,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Anul fiscal {0} nu a fost găsit.
 DocType: Bank Reconciliation,Get Relevant Entries,Obține intrările relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Intrare contabilitate pentru stoc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă client
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
 DocType: Account,Root Type,Rădăcină Tip
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nu se pot întoarce mai mult {1} pentru postul {2}
@@ -2315,14 +2134,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma impozitului pe urma Discount Suma (companie de valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depozit țintă este obligatorie pentru rând {0}
 DocType: Quality Inspection,Quality Inspection,Inspecție de calitate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray de formare
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL sau BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivelul minim Inventarul
 DocType: Stock Entry,Subcontract,Subcontract
@@ -2333,41 +2151,38 @@
 DocType: Item,Manufacturer Part Number,Numarul de piesa
 DocType: Production Order Operation,Estimated Time and Cost,Timpul estimat și cost
 DocType: Bin,Bin,Coş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Nu de SMS-uri trimise
 DocType: Account,Company,Compania
 DocType: Account,Expense Account,Cont de cheltuieli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Culoare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Culoare
 DocType: Maintenance Visit,Scheduled,Programat
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vă rugăm să selectați postul unde &quot;Este Piesa&quot; este &quot;nu&quot; și &quot;Este punctul de vânzare&quot; este &quot;da&quot; și nu este nici un alt produs Bundle
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selectați Distributie lunar pentru a distribui neuniform obiective pe luni.
 DocType: Purchase Invoice Item,Valuation Rate,Rata de evaluare
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista de pret Valuta nu selectat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
 DocType: Installation Note Item,Against Document No,Împotriva documentul nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Gestiona vânzările Partners.
 DocType: Quality Inspection,Inspection Type,Inspecție Tip
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vă rugăm să selectați {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Vă rugăm să selectați {0}
 DocType: C-Form,C-Form No,Nr. formular-C
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Cercetător
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Actualizare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Cercetător
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Vă rugăm să salvați Newsletter înainte de a trimite
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nume sau E-mail este obligatorie
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Control de calitate de intrare.
 DocType: Purchase Order Item,Returned Qty,Întors Cantitate
 DocType: Employee,Exit,Iesire
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Rădăcină de tip este obligatorie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Rădăcină de tip este obligatorie
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Nu {0} a creat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Finisare vibratorie
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pentru comoditatea clienților, aceste coduri pot fi utilizate în formate de imprimare cum ar fi Facturi și Note de Livrare"
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
 DocType: Sales Invoice,Advertisement,Reclamă
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Perioadă De Probă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Perioadă De Probă
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Expense Claim,Expense Approver,Cheltuieli aprobator
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Primirea de cumpărare Articol Livrat
@@ -2375,43 +2190,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Pentru a Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Măcinare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink ambalaj
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Activități în curs
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Confirmat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizor> Furnizor Tip
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Titlul adresei este obligatoriu.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Editorii de ziare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editorii de ziare
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selectați anul fiscal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Metalurgie
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Attendance,Attendance Date,Dată prezenţă
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
 DocType: Address,Preferred Shipping Address,Preferat Adresa Shipping
 DocType: Purchase Receipt Item,Accepted Warehouse,Depozit Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Dată postare
 DocType: Item,Valuation Method,Metoda de evaluare
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Imposibilitatea de a găsi rata de schimb pentru {0} {1} la
 DocType: Sales Invoice,Sales Team,Echipa de vânzări
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Inregistrare duplicat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Inregistrare duplicat
 DocType: Serial No,Under Warranty,În garanție
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Eroare]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,În cuvinte va fi vizibil după ce a salva comanda de vânzări.
 ,Employee Birthday,Zi de naștere angajat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Capital de Risc
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risc
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Frunze noi alocate (în zile)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Nu {0} nu există
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
 DocType: Payment Reconciliation Invoice,Invoice Number,Numar factura
-apps/erpnext/erpnext/hooks.py +70,Orders,Comenzi
+apps/erpnext/erpnext/hooks.py +54,Orders,Comenzi
 DocType: Leave Control Panel,Employee Type,Tip angajat
 DocType: Employee Leave Approver,Leave Approver,Aprobator Concediu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Forjare la cald
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferat pentru fabricarea
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un utilizator cu rol de ""aprobator cheltuieli"""
 ,Issued Items Against Production Order,Emise Articole împotriva producției de comandă
@@ -2423,7 +2235,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Perioada de invalid
 DocType: Customer,Credit Limit,Limita de Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Selectați tipul de tranzacție
 DocType: GL Entry,Voucher No,Voletul nr
@@ -2433,11 +2244,10 @@
 DocType: Customer,Address and Contact,Adresa si Contact
 DocType: Customer,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Employee,Feedback,Reactie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Concediu nu poate fi repartizat înainte {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Program
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Prelucrare cu jet abraziv
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Program
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
-DocType: Website Settings,Website Settings,Setarile site-ului
 DocType: Item,Reorder level based on Warehouse,Nivel reordona pe baza Warehouse
 DocType: Activity Cost,Billing Rate,Rata de facturare
 ,Qty to Deliver,Cantitate pentru a oferi
@@ -2448,20 +2258,19 @@
 DocType: Material Request,Requested For,Pentru a solicitat
 DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
 DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Contul de root nu pot fi șterse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Contul de root nu pot fi șterse
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Arată stoc Entries
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} din {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Gestionați Adrese
 DocType: Pricing Rule,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),De închidere (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),De închidere (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
@@ -2477,10 +2286,9 @@
 ,Billed Amount,Sumă facturată
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obțineți actualizări
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Adaugă câteva înregistrări eșantion
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Adaugă câteva înregistrări eșantion
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lasă Managementul
-DocType: Event,Groups,Grupuri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grup in functie de Cont
 DocType: Sales Order,Fully Delivered,Livrat complet
 DocType: Lead,Lower Income,Micsoreaza Venit
@@ -2489,40 +2297,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ajutor rapid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Sursă și depozit țintă nu poate fi același pentru rând {0}
 DocType: Features Setup,Sales Extras,Extras de vânzare
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} comparativ centrului de cost {2} va fi depășit cu {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie ulterior 'Până în Data'
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},bugetul {0} pentru contul {1} comparativ centrului de cost {2} va fi depășit cu {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valoare sau Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
 ,Qty to Receive,Cantitate de a primi
 DocType: Leave Block List,Leave Block List Allowed,Lista Concedii Blocate Permise
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Factorul de conversie nu pot fi în fracțiuni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Îl veti folosi pentru autentificare
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Îl veti folosi pentru autentificare
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate tipurile de furnizor
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nu de tip {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Descoperire cont bancar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Realizeaza Fluturas de Salar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navigare BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Împrumuturi garantate
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produse extraordinare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Sold Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nu se poate aproba concediu deoarece nu sunteti autorizat să aprobati concedii in Date Blocate
 DocType: Appraisal,Appraisal,Expertiză
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Turnare a pierdut-spumă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Desen
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data se repetă
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Semnatar autorizat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
 DocType: Hub Settings,Seller Email,Vânzător de e-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
 DocType: Workstation Working Hour,Start Time,Ora de începere
@@ -2536,12 +2341,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Suma netă (companie de valuta)
 DocType: BOM Operation,Hour Rate,Rata Oră
 DocType: Stock Settings,Item Naming By,Denumire Articol Prin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Din Ofertă
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Din Ofertă
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},O altă intrare închidere de perioada {0} a fost efectuată după {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferat pentru Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Contul {0} nu există
 DocType: Purchase Receipt Item,Purchase Order Item No,Comandă de aprovizionare Punctul nr
-DocType: System Settings,System Settings,Setări de sistem
 DocType: Project,Project Type,Tip de proiect
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cantitatea țintă sau valoarea țintă este obligatorie.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costul diverse activități
@@ -2550,36 +2354,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
 DocType: Sales Order,Fully Billed,Complet Taxat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Bani în mână
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 DocType: Serial No,Is Cancelled,Este anulat
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Livrările mele
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Livrările mele
 DocType: Journal Entry,Bill Date,Dată factură
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
 DocType: Supplier,Supplier Details,Detalii furnizor
-DocType: Communication,Recipients,Destinatarii
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Înșurubare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Status aprobare
 DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vă rugăm să selectați cont bancar
 DocType: Newsletter,Create and Send Newsletters,A crea și trimite Buletine
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Din Data trebuie să fie anterioara Pana la Data
 DocType: Sales Order,Recurring Order,Comanda recurent
 DocType: Company,Default Income Account,Contul Venituri Implicit
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Client / Client
 DocType: Item Group,Check this if you want to show in website,Bifati dacă doriți să fie afisat în site
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bine ati venit la ERPNext
+,Welcome to ERPNext,Bine ati venit la ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Numărul de Detaliu
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Duce la ofertă
 DocType: Lead,From Customer,De la Client
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Apeluri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Apeluri
 DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
 DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
 ,Projected,Proiectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
@@ -2587,13 +2387,10 @@
 DocType: Issue,Opening Date,Data deschiderii
 DocType: Journal Entry,Remark,Remarcă
 DocType: Purchase Receipt Item,Rate and Amount,Rata și volumul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Plictisitor
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Din Comanda de Vânzări
-DocType: Blog Category,Parent Website Route,Părinte Site Route
 DocType: Sales Order,Not Billed,Nu Taxat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nu contact adăugat încă.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Nu este activ
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
 DocType: Time Log,Batched for Billing,Transformat în lot pentru facturare
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
@@ -2601,20 +2398,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Reducere Suma
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"de exemplu, TVA"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"de exemplu, TVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Gaz de metal la cald
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
 DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Du-te la grupul corespunzător (de obicei, sursa fondurilor&gt; Pasive curente&gt; taxelor și impozitelor și a crea un nou cont (făcând clic pe Adăugați pentru copii) de tip &quot;fiscal&quot; și de a face mai vorbim rata de impozitare."
 ,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Lipsește Schimb valutar prețul pentru {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Tăiere cu laser
-DocType: Event,Monday,Luni
 DocType: Journal Entry,Stock Entry,Stoc de intrare
 DocType: Account,Payable,Plătibil
 DocType: Salary Slip,Arrear Amount,Sumă restantă
@@ -2627,7 +2421,6 @@
 DocType: Lead,Address Desc,Adresă Desc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
-DocType: Page,All,Tot
 DocType: Stock Entry Detail,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
 DocType: Employee,Confirmation Date,Data de Confirmare
@@ -2635,9 +2428,8 @@
 DocType: Account,Sales User,Vânzări de utilizare
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Cantitate nu poate fi mai mare decât Max Cantitate
 DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Setează
 DocType: Lead,Lead Owner,Proprietar Conducere
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Este necesar depozit
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Este necesar depozit
 DocType: Employee,Marital Status,Stare civilă
 DocType: Stock Settings,Auto Material Request,Auto cerere de material
 DocType: Time Log,Will be updated when billed.,Vor fi actualizate atunci când facturat.
@@ -2650,44 +2442,40 @@
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Comandă de aprovizionare Articol Livrat
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Numele companiei nu poate fi companie
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Antete de Scrisoare de Sabloane de Imprimare.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinisare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Înregistrare a tuturor comunicărilor de tip e-mail, telefon, chat-ul, vizita, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Vă rugăm să menționați rotunji Center cost în companie
 DocType: Purchase Invoice,Terms,Termeni
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Creeaza Nou
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Creeaza Nou
 DocType: Buying Settings,Purchase Order Required,Comandă de aprovizionare necesare
 ,Item-wise Sales History,Istoric Vanzari Articol-Avizat
 DocType: Expense Claim,Total Sanctioned Amount,Suma totală sancționat
 ,Purchase Analytics,Analytics de cumpărare
 DocType: Sales Invoice Item,Delivery Note Item,Nota de Livrare Articol
 DocType: Expense Claim,Task,Sarcină
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Ras
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Aceasta este o persoană de vânzări rădăcină și nu pot fi editate.
 ,Stock Ledger,Stoc Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Evaluare: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Evaluare: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Salariul Slip Deducerea
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Observații
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Selectați un nod grup prim.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Completați formularul și salvați-l
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descărcati un raport care conține toate materiile prime cu ultimul lor status de inventar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Cu care se confruntă
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Balanta Concediu Inainte de Aplicare
 DocType: SMS Center,Send SMS,Trimite SMS
 DocType: Company,Default Letter Head,Implicit Scrisoare Șef
 DocType: Time Log,Billable,Facturabil
-DocType: Authorization Rule,This will be used for setting rule in HR module,Aceasta va fi utilizată pentru stabilirea regulă în modul de HR
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reordonare Cantitate
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
@@ -2699,12 +2487,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Opportunity Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Campurile cu Reduceri vor fi disponibile în Ordinul de Cumparare, Chitanta de Cumparare, Factura de Cumparare"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Numele de cont nou. Notă: Vă rugăm să nu creați conturi pentru clienți și furnizori
-DocType: Report,Report Type,Tip de raport
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Încărcare
 DocType: BOM Replace Tool,BOM Replace Tool,Mijloc de înlocuire BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Șabloanele țară înțelept adresa implicită
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Arată impozit break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datele de import și export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Dacă vă implicati în activitatea de producție. Permite Articolului 'Este Fabricat'

@@ -2745,7 +2531,7 @@
 Incoming,Preluare

 Incoming Rate,Rate de Preluare

 Incoming quality inspection.,Control de Calitate de Preluare.

-Incorrect or Inactive BOM {0} for Item {1} at row {2},FDM {0} Incorect sau Inactiv aferent articolului {1} din inregistrarea {2}

+Incorrect or Inactive BOM {0} for Item {1} at row {2},FDM {0} Incorect sau Inactiv aferent articolului {1} din inregistrarea {2}

 Indicates that the package is a part of this delivery,Indică faptul că pachetul este o parte din această livrare

 Indirect Expenses,Cheltuieli Indirecte

 Indirect Income,Venituri Indirecte

@@ -2826,16 +2612,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
 DocType: Serial No,Out of AMC,Din AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Cerere Detaliu Nu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Greu de cotitură
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
 DocType: Company,Default Cash Account,Cont de Numerar Implicit
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Vă rugăm să introduceți ""Data de livrare așteptată"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Notă: În cazul în care plata nu se face împotriva oricărei referire, face manual Jurnal intrare."
 DocType: Item,Supplier Items,Furnizor Articole
 DocType: Opportunity,Opportunity Type,Tip de oportunitate
@@ -2845,9 +2630,9 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Număr incorect de contabilitate intrările găsit. Este posibil să fi selectat un cont greșit în tranzacție.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Pentru a crea un cont bancar
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
 ,Stock Ageing,Stoc Îmbătrânirea
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' este dezactivat
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' este dezactivat
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setați ca Deschis
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Trimite prin email automate de contact pe tranzacțiile Depunerea.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2855,59 +2640,51 @@
  Disponibil Cantitate: {4}, Transfer Cantitate: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punctul 3
 DocType: Purchase Order,Customer Contact Email,Contact Email client
-DocType: Event,Sunday,Duminică
 DocType: Sales Team,Contribution (%),Contribuție (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Notă: Plata de intrare nu va fi creat deoarece ""Cash sau cont bancar"" nu a fost specificat"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilitati
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Adauga utilizatori
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Adauga utilizatori
 DocType: Pricing Rule,Item Group,Grup Articol
 DocType: Task,Actual Start Date (via Time Logs),Data efectivă de început (prin Jurnale de Timp)
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
 DocType: Item,Default BOM,FDM Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vă rugăm să re-tip numele companiei pentru a confirma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totală restantă Amt
 DocType: Time Log Batch,Total Hours,Total ore
 DocType: Journal Entry,Printing Settings,Setări de imprimare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Autopropulsat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Este necesară Articol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,De turnare prin injecție de metal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autopropulsat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Din Nota de Livrare
 DocType: Time Log,From Time,Din Time
 DocType: Notification Control,Custom Message,Mesaj Personalizat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Selectați țara ta, fusul orar și valutar"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Decapare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Turnarea în nisip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizare
 DocType: Purchase Invoice Item,Rate,
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interna
 DocType: Newsletter,A Lead with this email id should exist,Un Lider cu acest id de e-mail ar trebui să existe
 DocType: Stock Entry,From BOM,De la BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Elementar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
 DocType: Salary Structure,Salary Structure,Structura salariu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Există Preț multiple articolul cu aceleași criterii, vă rugăm să rezolve conflictele \
  prin atribuirea prioritate. Reguli Pret: {0}"
 DocType: Account,Bank,Bancă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Eliberarea Material
 DocType: Material Request Item,For Warehouse,Pentru Depozit
 DocType: Employee,Offer Date,Oferta Date
 DocType: Hub Settings,Access Token,Acces Token
@@ -2916,45 +2693,37 @@
 DocType: Item,Is Fixed Asset Item,Este fixă Asset Postul
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Dacă aveți formate de imprimare lungi, această caracteristică poate fi folosita pentru a împărți pagina pentru imprimare pe mai multe pagini, cu toate anteturile și subsolurile de pe fiecare pagină"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Toate teritoriile
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Toate teritoriile
 DocType: Purchase Invoice,Items,Articole
 DocType: Fiscal Year,Year Name,An Denumire
 DocType: Process Payroll,Process Payroll,Salarizare proces
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
 DocType: Product Bundle Item,Product Bundle Item,Produs Bundle Postul
 DocType: Sales Partner,Sales Partner Name,Numele Partner Sales
 DocType: Purchase Invoice Item,Image View,Imagine Vizualizare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finisare și finisare industriale
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Datele De La și Pana La necesare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,A Valorilor Mobiliare și Burselor de Mărfuri
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Foraj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Modelare prin suflare
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
 DocType: Tax Rule,Shipping City,Transport Oraș
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
 DocType: Account,Purchase User,Cumpărare de utilizare
 DocType: Notification Control,Customize the Notification,Personalizare Notificare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Ciocănitură
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
 DocType: Journal Entry,Print Heading,Imprimare Titlu
 DocType: Quotation,Maintenance Manager,Intretinere Director
-DocType: Workflow State,Search,Căutare
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalul nu poate să fie zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Zile de la ultima comandă' trebuie să fie mai mare sau egal cu zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lipire
 DocType: C-Form,Amended From,Modificat din
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Material brut
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cantitatea țintă sau valoarea țintă este obligatorie
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
@@ -2963,45 +2732,44 @@
 ,Produced,Produs
 DocType: Item,Item Code for Suppliers,Articol Cod pentru Furnizori
 DocType: Issue,Raised By (Email),Ridicate de (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Atașați antet
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,General
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Atașați antet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista capetele fiscale (de exemplu, TVA, vamale etc., ei ar trebui să aibă nume unice) și ratele lor standard. Acest lucru va crea un model standard, pe care le puteți edita și adăuga mai târziu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista capetele fiscale (de exemplu, TVA, vamale etc., ei ar trebui să aibă nume unice) și ratele lor standard. Acest lucru va crea un model standard, pe care le puteți edita și adăuga mai târziu."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial nr necesare pentru postul serializat {0}
 DocType: Journal Entry,Bank Entry,Intrare bancară
 DocType: Authorization Rule,Applicable To (Designation),Aplicabil pentru (destinaţie)
-DocType: Blog Post,Blog Post,Postare blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupul De
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Activare / dezactivare valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Cheltuieli poștale
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Purchase Order,The date on which recurring order will be stop,Data la care comanda recurent va fi opri
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} trebuie să fie redus cu {1} sau dvs. ar trebui să incrementați toleranța în exces
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Raport Prezent
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Oră
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Oră
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transfer de material la furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transfer de material la furnizor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Creare Ofertă
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Toate aceste articole au fost deja facturate
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Condiții Regula de transport maritim
 DocType: BOM Replace Tool,The new BOM after replacement,Noul BOM după înlocuirea
 DocType: Features Setup,Point of Sale,Point of Sale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Impozite
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rând {0}: {1} nu este valid {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinare
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rând {0}: {1} nu este valid {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,De la Bundle produs
 DocType: Production Planning Tool,Production Planning Tool,Producție instrument de planificare
 DocType: Quality Inspection,Report Date,Data raportului
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Rutare
 DocType: C-Form,Invoices,Facturi
 DocType: Job Opening,Job Title,Denumire post
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Destinatari
 DocType: Features Setup,Item Groups in Details,Grup Articol în Detalii
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
@@ -3010,33 +2778,29 @@
 DocType: Stock Entry,Update Rate and Availability,Actualizarea Rata și disponibilitatea
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentul vi se permite de a primi sau livra mai mult față de cantitatea comandata. De exemplu: Dacă ați comandat 100 de unități. și alocația este de 10%, atunci vi se permite să primească 110 de unități."
 DocType: Pricing Rule,Customer Group,Grup Client
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: Item,Website Description,Site-ul Descriere
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
 ,Sales Register,Vânzări Inregistrare
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
 DocType: Address,Plant,Instalarea
-DocType: DocType,Setup,Setare
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Rulare la rece
 DocType: Customer Group,Customer Group Name,Nume Group Client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
 DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
 DocType: Item,Attributes,Atribute
-DocType: Packing Slip,Get Items,Obtine Articole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Obtine Articole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Ultima comandă Data
-DocType: DocField,Image,Imagine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Realizeaza Factura de Accize
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
-DocType: Communication,Other,Altul
 DocType: C-Form,C-Form,Formular-C
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID operațiune nu este setat
 DocType: Production Order,Planned Start Date,Start data planificată
 DocType: Serial No,Creation Document Type,Tip de document creație
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizita
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vizita
 DocType: Leave Type,Is Encash,Este încasa
 DocType: Purchase Invoice,Mobile No,Mobil Nu
 DocType: Payment Tool,Make Journal Entry,Asigurați Jurnal intrare
@@ -3044,35 +2808,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Comercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 DocType: Cost Center,Distribution Id,Id distribuție
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicii extraordinare
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Toate produsele sau serviciile.
 DocType: Purchase Invoice,Supplier Address,Furnizor Adresa
-DocType: Contact Us Settings,Address Line 2,Adresă Linie 2
-DocType: ToDo,Reference,Referinta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforare
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Cantitate
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seria este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Servicii financiare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Valoare pentru Atribut {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3}
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
 DocType: Leave Allocation,Unused leaves,Frunze neutilizate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Implicit Conturi creanțe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Tăierea
 DocType: Tax Rule,Billing State,Stat de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminare
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterizarea
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
 DocType: Supplier,Contact HTML,HTML Persoana de Contact
@@ -3083,8 +2841,7 @@
 DocType: Company,Retail,Cu amănuntul
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Clientul {0} nu există
 DocType: Attendance,Absent,Absent
-DocType: Product Bundle,Product Bundle,Bundle produs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrobitor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produs
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achiziționa impozite și taxe Template
 DocType: Upload Attendance,Download Template,Descărcați Sablon
 DocType: GL Entry,Remarks,Remarci
@@ -3092,48 +2849,44 @@
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Turnare continuă
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vă rugăm să specificați un
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Dimensionarea rece
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Contul {0} nu poate fi un Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regiune
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
 DocType: Holiday List,Weekly Off,Săptămânal Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","De exemplu, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Profit provizorie / Pierdere (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Reveni Împotriva Vânzări factură
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punctul 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Vă rugăm să setați valoare implicită {0} în {1} companie
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Vă rugăm să setați valoare implicită {0} în {1} companie
 DocType: Serial No,Creation Time,Timp de creare
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Raport Venituri
 DocType: Sales Invoice,Product Bundle Help,Produs Bundle Ajutor
 ,Monthly Attendance Sheet,Lunar foaia de prezență
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nu s-au găsit înregistrări
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Center de Cost este obligatoriu pentru articolul {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Obține elemente din Bundle produse
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Contul {0} este inactiv
 DocType: GL Entry,Is Advance,Este Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Prezenţa de la data și prezența până la data sunt obligatorii
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Va rugam sa introduceti ""este subcontractată"" ca Da sau Nu"
 DocType: Sales Team,Contact No.,Nr. Persoana de Contact
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"'Tipul de cont 'Profit și pierdere' {0} nu este permis în intrarea de deschidere"""
-DocType: Workflow State,Time,Oră
 DocType: Features Setup,Sales Discounts,Reduceri de vânzare
 DocType: Hub Settings,Seller Country,Vânzător Țară
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
 DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impozite vânzări și șabloane Taxe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Îmbrăcăminte și accesorii
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numărul de comandă
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, care va arăta pe partea de sus a listei de produse."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Precizați condițiile de calcul cantitate de transport maritim
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Adăugaţi fiu
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolul pot organiza conturile înghețate și congelate Editați intrările
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nu se poate converti de cost Centrul de registru, deoarece are noduri copil"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Factorul de Conversie este necesar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Comision pentru Vânzări
 DocType: Offer Letter Term,Value / Description,Valoare / Descriere
@@ -3141,15 +2894,13 @@
 ,Customers Not Buying Since Long Time,Clienții care nu au efectuat cumparaturi de foarte mult timp
 DocType: Production Order,Expected Delivery Date,Data de Livrare Preconizata
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lărgire
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Turnare evaporare-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Cheltuieli de Divertisment
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Vârstă
 DocType: Time Log,Billing Amount,Suma de facturare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Cantitate nevalidă specificată pentru element {0}. Cantitatea ar trebui să fie mai mare decât 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Cererile de concediu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Cheltuieli Juridice
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Zi a lunii în care comanda automat va fi generat de exemplu 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Postarea de timp
@@ -3157,32 +2908,29 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Telephone Expenses,Cheltuieli de telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
-apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nici un articol cu ordine {0}
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Nici un articol cu ordine {0}
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,Notificări deschise
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Cheltuieli Directe
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Noi surse de venit pentru clienți
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cheltuieli de călătorie
 DocType: Maintenance Visit,Breakdown,Avarie
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ca pe data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Finisare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Probă
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
-DocType: Feed,Full Name,Nume complet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Concludent
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Probă
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Depozitul Implicit este obligatoriu pentru articol din stoc.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Plata salariului pentru luna {0} și {1 an}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
 ,Transferred Qty,Transferat Cantitate
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigarea
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planificare
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Ora face Log lot
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emis
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vindem acest articol
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vindem acest articol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizor Id
 DocType: Journal Entry,Cash Entry,Cash intrare
 DocType: Sales Partner,Contact Desc,Persoana de Contact Desc
@@ -3191,18 +2939,16 @@
 DocType: Brand,Item Manager,Postul de manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Adaugaţi rânduri pentru a stabili bugete anuale pentru Conturi.
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Cariere
 DocType: Production Order,Total Operating Cost,Cost total de operare
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Toate contactele.
 DocType: Newsletter,Test Email Id,Test de e-mail Id-ul
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviere Companie
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Abreviere Companie
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,In cazul in care urmați Inspecție de calitate. Activeaza Articol QA solicitat și nr. QA din Chitanta de Cumparare
 DocType: GL Entry,Party Type,Tip de partid
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Materii prime nu poate fi la fel ca Item principal
 DocType: Item Attribute Value,Abbreviation,Abreviere
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Turnare prin rotație
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maestru șablon salariu.
 DocType: Leave Type,Max Days Leave Allowed,Max zile de concediu de companie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Regula fiscală pentru coșul de cumpărături
@@ -3216,15 +2962,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Format de impozitare este obligatorie.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
 DocType: Account,Temporary,Temporar
 DocType: Address,Preferred Billing Address,Adresa de facturare preferat
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretar
 DocType: Serial No,Distinct unit of an Item,Unitate distinctă de Postul
 DocType: Pricing Rule,Buying,Cumpărare
 DocType: HR Settings,Employee Records to be created by,Inregistrari Angajaților pentru a fi create prin
@@ -3237,24 +2983,21 @@
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
 DocType: Purchase Order Item,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Calcat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} este oprit
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
 DocType: Lead,Add to calendar on this date,Adăugaţi în calendar la această dată
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,evenimente viitoare
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Clientul este necesar
-DocType: Letter Head,Letter Head,Antet Scrisoare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Intrarea rapidă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} este obligatorie pentru returnare
 DocType: Purchase Order,To Receive,A Primi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink montaj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Venituri / cheltuieli
 DocType: Employee,Personal Email,Personal de e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Raport Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Raport Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Dacă este activat, sistemul va posta automat înregistrări contabile pentru inventar."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokeraj
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeraj
 DocType: Address,Postal Code,Cod poștal
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","în procesul-verbal 
@@ -3262,18 +3005,16 @@
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Comenzi lansat pentru producție.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Hub Settings,Name Token,Numele Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,"Masini pentru dimensionat,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Vanzarea Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Vanzarea Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Cel puţin un depozit este obligatoriu
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Va rugam sa introduceti Unitatea de măsură prestabilită
 DocType: Purchase Invoice Item,Project Name,Denumirea proiectului
 DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
-DocType: Workflow State,Edit,Editare
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
 DocType: Features Setup,Item Batch Nos,Lot nr element
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
@@ -3281,13 +3022,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Active fiscale
 DocType: BOM Item,BOM No,Nr. BOM
-DocType: Contact Us Settings,Pincode,Parola așa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM care va fi înlocuit
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM trebuie să fie diferit de curent stoc UOM
 DocType: Account,Debit,Debitare
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Concediile trebuie să fie alocate în multipli de 0.5"""
 DocType: Production Order,Operation Cost,Funcționare cost
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Încărcați de participare dintr-un fișier csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Impresionant Amt
@@ -3303,10 +3042,7 @@
 DocType: Project,Default Cost Center,Cost Center Implicit
 DocType: Purchase Invoice,End Date,Dată finalizare
 DocType: Employee,Internal Work History,Istoria interne de lucru
-DocType: DocField,Column Break,Coloana Break
-DocType: Event,Thursday,Joi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Cotitură
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Feedback Client
 DocType: Account,Expense,Cheltuială
 DocType: Sales Invoice,Exhibition,Expoziție
@@ -3319,30 +3055,29 @@
 DocType: Employee,Held On,Organizat In
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Producția Postul
 ,Employee Information,Informații angajat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Rate (%)
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Data de Incheiere An Financiar
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Data de Incheiere An Financiar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nu se poate filtra pe baza voucher Nr., în cazul gruparii in functie de Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduce Câștigul salarial de concediu fără plată (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Notă: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Rezumat această săptămână
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} trebuie sa fie un articol cumpărat sau subcontractat în rândul {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin tranzacții de stoc
 DocType: GL Entry,Party,Grup
 DocType: Sales Order,Delivery Date,Data de Livrare
-DocType: DocField,Currency,Valută
 DocType: Opportunity,Opportunity Date,Oportunitate Data
 DocType: Purchase Receipt,Return Against Purchase Receipt,Reveni cu confirmare de primire cumparare
 DocType: Purchase Order,To Bill,Pentru a Bill
 DocType: Material Request,% Ordered,Comandat%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Muncă în acord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Muncă în acord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Rată de cumparare medie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
@@ -3359,77 +3094,68 @@
 DocType: Opportunity,To Discuss,Pentru a discuta
 DocType: SMS Settings,SMS Settings,Setări SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Conturi temporare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Negru
 DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Data de încheiere a perioadei ordin curent
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Face Scrisoare Oferta
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Întoarcere
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
-DocType: DocField,Fold,Plia
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Unitatea implicit de măsură pentru Variant trebuie să fie aceeași ca șablon
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
 DocType: Project Task,Pending Review,Revizuirea în curs
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Vă rugăm să specificați
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Clienți Id
-DocType: Page,Page Name,Nume pagină
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,A timpului trebuie să fie mai mare decât la timp
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Finisare ax
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
 DocType: Project Task,Task ID,Sarcina ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","de exemplu ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","de exemplu ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
 ,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depozitul {0} nu există
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inregistreaza-te pentru ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% din materialele livrate comparativ cu această notă de Livrare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Capsare
 DocType: Customer,Customer Details,Detalii Client
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Modelarea
 DocType: Employee,Reports to,Rapoarte
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduceți parametru url pentru receptor nos
 DocType: Sales Invoice,Paid Amount,Suma plătită
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Inchiderea Contului {0} trebuie să fie de tip 'Răspundere'
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Managementul calității
 DocType: Production Planning Tool,Filter based on customer,Filtru bazat pe client
 DocType: Payment Tool Detail,Against Voucher No,Comparativ voucherului nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
 DocType: Tax Rule,Purchase,Cumpărarea
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantitate de bilanţ
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Cantitate de bilanţ
 DocType: Item Group,Parent Item Group,Părinte Grupa de articole
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pentru {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Centre de cost
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Depozite.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Depozite.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Rata la care moneda furnizorului este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rând # {0}: conflicte timpilor cu rândul {1}
 DocType: Opportunity,Next Contact,Următor Contact
 DocType: Employee,Employment Type,Tip angajare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Active Fixe
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Perioada de aplicare nu poate fi peste două înregistrări alocation
 DocType: Item Group,Default Expense Account,Cont de Cheltuieli Implicit
 DocType: Employee,Notice (days),Preaviz (zile)
-DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
 DocType: Employee,Encashment Date,Data plata in Numerar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Comparativ tipului de voucher trebuie să fie o opțiune dintre următoarele: ordin de cumparare, factură de cumpărare sau intrare în jurnal"
 DocType: Account,Stock Adjustment,Ajustarea stoc
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Există implicit Activitate Cost de activitate de tip - {0}
 DocType: Production Order,Planned Operating Cost,Planificate cost de operare
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Noul {0} Nume
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Vă rugăm să găsiți atașat {0} # {1}
 DocType: Job Applicant,Applicant Name,Nume solicitant
 DocType: Authorization Rule,Customer / Item Name,Client / Denumire articol
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3442,7 +3168,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Nu serial este obligatorie pentru postul {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Vă rugăm să precizați de la / la gama
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Creat de
 DocType: Serial No,Under AMC,Sub AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Rata de evaluare Articolul este recalculat în vedere aterizat sumă voucher de cost
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
@@ -3454,17 +3179,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Suma minima
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Marfuri actualizare finite
 DocType: Workstation,per hour,pe oră
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Series {0} folosit deja în {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 DocType: Company,Distribution,Distribuire
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Sumă plătită
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Manager de Proiect
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 DocType: Customer,Default Taxes and Charges,Impozite și taxe prestabilite
 DocType: Account,Receivable,De încasat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
 DocType: Sales Invoice,Supplier Reference,Furnizor de referință
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","In cazul in care se bifeaza, FDM pentru un articol sub-asamblare va fi luat în considerare pentru obținere materii prime. În caz contrar, toate articolele de sub-asamblare vor fi tratate ca si materie primă."
@@ -3472,8 +3196,8 @@
 DocType: Hub Settings,Seller Description,Descriere vânzător
 DocType: Employee Education,Qualification,Calificare
 DocType: Item Price,Item Price,Pret Articol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
 DocType: Warehouse,Warehouse Name,Denumire depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
@@ -3482,7 +3206,6 @@
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compania lipsește din depozitul {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stoc UOM Înlocuiți Utility
 DocType: POS Profile,Terms and Conditions,Termeni şi condiţii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Pentru a Data ar trebui să fie în anul fiscal. Presupunând Pentru a Data = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aici puteți stoca informatii despre inaltime, greutate, alergii, probleme medicale etc"
@@ -3494,7 +3217,7 @@
 DocType: Sales Order Item,For Production,Pentru Producție
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vă rugăm să introduceți comenzi de vânzări în tabelul de mai sus
 DocType: Project Task,View Task,Vezi Sarcina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Anul dvs. financiar începe la data de
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Anul dvs. financiar începe la data de
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Va rugam sa introduceti cumparare Încasări
 DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
@@ -3502,20 +3225,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configurare de server de intrare pentru suport de e-mail id. (De exemplu support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Salary Slip,Salary Slip,Salariul Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Lustruire
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Până la data' este necesară
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Până la data' este necesară
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
 DocType: Sales Invoice Item,Sales Order Item,Comandă de vânzări Postul
 DocType: Salary Slip,Payment Days,Zile de plată
 DocType: BOM,Manage cost of operations,Gestioneaza costul operațiunilor
 DocType: Features Setup,Item Advanced,Articol avansate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Laminarea la cald
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setări globale
 DocType: Employee Education,Employee Education,Educație Angajat
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
 DocType: Salary Slip,Net Pay,Plată netă
 DocType: Account,Account,Cont
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
@@ -3524,35 +3245,28 @@
 DocType: Customer,Sales Team Details,Detalii de vânzări Echipa
 DocType: Expense Claim,Total Claimed Amount,Total suma pretinsă
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potențiale oportunități de vânzare.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,A concediului medical
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,A concediului medical
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Numele din adresa de facturare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Magazine Departament
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistemul Balanța
-DocType: Workflow,Is Active,Este activ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Magazine Departament
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistemul Balanța
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Schimbarea abreviere
-DocType: Workflow State,Primary,Principal:
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
 DocType: Item,Max Discount (%),Max Discount (%)
-DocType: Communication,More Information,Mai multe informatii
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Ultima cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Sablare
 DocType: Company,Warn,Avertiza
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Evaluare Articol Actualizata
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
 DocType: BOM,Manufacturing User,Producție de utilizare
 DocType: Purchase Order,Raw Materials Supplied,Materii prime furnizate
 DocType: Purchase Invoice,Recurring Print Format,Recurente Print Format
-DocType: Communication,Series,Serii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Cumparare
 DocType: Appraisal,Appraisal Template,Model expertiză
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Postul Clasificare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scop Vizita Mentenanta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Perioada
 ,General Ledger,Registru Contabil General
@@ -3562,9 +3276,7 @@
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vă rugăm selectați 0} {întâi
 DocType: Features Setup,To get Item Group in details table,Pentru a obține Grupa de articole în detalii de masă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Retrasarea
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravură
 DocType: Sales Invoice,Commission,Comision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3590,10 +3302,10 @@
  {% dacă email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Implicit Suma
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Rezumat această lună
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate Reading
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic decât %d zile.
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
 ,Project wise Stock Tracking,Proiect înțelept Tracking Stock
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
@@ -3609,13 +3321,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
 DocType: Supplier,Address and Contacts,Adresa si contact
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
 DocType: Payment Tool,Get Outstanding Vouchers,Ia restante Tichete
 DocType: Warranty Claim,Resolved By,Rezolvat prin
 DocType: Appraisal,Start Date,Data începerii
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Valoare
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Click aici pentru a verifica
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
@@ -3625,55 +3336,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Timpul mediu luate de către furnizor de a livra
 DocType: Time Log,Hours,Ore
 DocType: Project,Expected Start Date,Data de Incepere Preconizata
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rulare
-DocType: ToDo,Priority,Prioritate
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
-DocType: Dropbox Backup,Dropbox Access Allowed,Acces Dropbox Permis
-DocType: Dropbox Backup,Weekly,Săptămânal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,De exemplu. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Primi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Primi
 DocType: Maintenance Visit,Fully Completed,Completat in Intregime
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complet
 DocType: Employee,Educational Qualification,Detalii Calificare de Învățământ
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} a fost adăugat cu succes la lista noastră Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Electron prelucrare cu fascicul
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vă rugăm să selectați data de început și Data de final pentru postul {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Rapoarte Principale
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stoc Ledger intrări solduri actualizate
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Rapoarte Principale
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Adăugați / editați preturi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafic Centre de Cost
 ,Requested Items To Be Ordered,Elemente solicitate să fie comandate
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Comenzile mele
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Comenzile mele
 DocType: Price List,Price List Name,Lista de prețuri Nume
 DocType: Time Log,For Manufacturing,Pentru Producție
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totaluri
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totaluri
 DocType: BOM,Manufacturing,De fabricație
 ,Ordered Items To Be Delivered,Comandat de elemente pentru a fi livrate
 DocType: Account,Income,Venit
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industrie Tip
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Ceva a mers prost!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
 DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Turnarea
-DocType: Email Alert,Reference Date,Data de referință
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Unitate de organizare (departament) maestru.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Va rugam sa introduceti nos mobile valabile
 DocType: Budget Detail,Budget Detail,Detaliu buget
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vă rugăm să introduceți mesajul înainte de trimitere
-DocType: Async Task,Status,Stare
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stoc UOM actualizate pentru postul {0}
-DocType: Company History,Year,An
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Punctul de vânzare profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Vă rugăm să actualizați Setări SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Timp Log {0} deja facturat
@@ -3686,55 +3385,52 @@
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
 DocType: Item,Unit of Measure Conversion,Unitate de măsură de conversie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Angajat nu poate fi schimbat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
 DocType: Naming Series,Help HTML,Ajutor HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Alocație mai mare decât -{0} anulată pentru articolul {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizorii dumneavoastră
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Furnizorii dumneavoastră
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"O altă structură salarială {0} este activă pentru angajatul {1}. Vă rugăm să îi setaţi statusul ""inactiv"" pentru a continua."
 DocType: Purchase Invoice,Contact,Persoana de Contact
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Primit de la
 DocType: Features Setup,Exports,Exporturi
 DocType: Lead,Converted,Transformat
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: de la {0} pentru {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 DocType: Issue,Content Type,Tip Conținut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Computer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ia nereconciliate Entries
 DocType: Cost Center,Budgets,Bugete
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizat
 DocType: Employee,Emergency Contact Details,Detalii Contact de Urgență
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ce face?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ce face?
 DocType: Delivery Note,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Contul {0} a fost introdus de mai multe ori pentru anul fiscal {1}
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Are numarul de serie' nu poate fi 'Da' pentru articolele care nu sunt in stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualizati costuri suplimentare pentru a calcula costul aterizat de articole
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Electric
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Electric
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID-ul de utilizator nu este setat pentru Angajat {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Prelucrare stropire
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De la garanție revendicarea
 DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Memento dată naştere pentru {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lepuit
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Zile de la ultima comandă
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Zile de la ultima comandă
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
-DocType: User,Enabled,Activat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Doriti intr-adevar sa introduceti toti Fluturasii de Salar pentru luna {0} și anul {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Abonații de import
@@ -3742,19 +3438,18 @@
 DocType: Attendance,Present,Prezenta
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
 DocType: Notification Control,Sales Invoice Message,Factură de vânzări Mesaj
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Contul {0} de închidere trebuie să fie de tip răspunderii / capitaluri proprii
 DocType: Authorization Rule,Based On,Bazat pe
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Perioada de la si perioadă la datele obligatorii pentru recurente {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Activitatea de proiect / sarcină.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generează fluturașe de salariu
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nu este un id de email valid
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
-DocType: ToDo,Low,Scăzut
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Vă rugăm să setați {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
@@ -3764,7 +3459,7 @@
 DocType: Project,Estimated Costing,Costing estimat
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Jurnalul intrare Detalii nr
 DocType: Employee External Work History,Salary,Salariu
-DocType: Serial No,Delivery Document Type,Tip Document de Livrare 
+DocType: Serial No,Delivery Document Type,Tip Document de Livrare
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Să prezinte toate fișele de salariu pentru criteriile selectate de mai sus
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} articole sincronizate
 DocType: Sales Order,Partly Delivered,Parțial livrate
@@ -3776,7 +3471,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Denumirea campaniei este necesară
 DocType: Maintenance Visit,Maintenance Date,Data Mentenanta
 DocType: Purchase Receipt Item,Rejected Serial No,Respins de ordine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Ambutisare
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Noi Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Arată Balanța
@@ -3787,7 +3481,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sumă
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nituire
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
 ,Sales Analytics,Analytics de vânzare
 DocType: Manufacturing Settings,Manufacturing Settings,Setări de fabricație
@@ -3799,28 +3492,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nume nou cont
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costul materiilor prime livrate
 DocType: Selling Settings,Settings for Selling Module,Setări pentru vânzare Modulul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Service Client
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Service Client
 DocType: Item,Thumbnail,Miniatură
 DocType: Item Customer Detail,Item Customer Detail,Detaliu Articol Client
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Confirmați Email-ul dvs.
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidat un loc de muncă.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt de e-mail pe Depunerea
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,TOTAL frunze alocate sunt mai mult decât zile în perioada
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} este necesar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Turnare sub vid
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
-DocType: Contact Us Settings,City,Oraș
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Prelucrare cu ultrasunete
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Eroare: Nu a id valid?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Articolul {0} trebuie să fie un Articol de Vânzări
 DocType: Naming Series,Update Series Number,Actualizare Serii Număr
 DocType: Account,Equity,Echitate
 DocType: Sales Order,Printing Details,Imprimare Detalii
 DocType: Task,Closing Date,Data de Inchidere
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inginer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inginer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Căutare subansambluri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
 DocType: Sales Partner,Partner Type,Tip partener
@@ -3828,7 +3517,7 @@
 DocType: Authorization Rule,Customerwise Discount,Reducere Client
 DocType: Purchase Invoice,Against Expense Account,Comparativ contului de cheltuieli
 DocType: Production Order,Production Order,Număr Comandă Producţie:
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalarea Nota {0} a fost deja prezentat
 DocType: Quotation Item,Against Docname,Comparativ denumirii documentului
 DocType: SMS Center,All Employee (Active),Toți angajații (activi)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Vizualizează acum
@@ -3836,26 +3525,24 @@
 DocType: BOM,Raw Material Cost,Materie primă Cost
 DocType: Item,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Actualizat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Tip de raport este obligatorie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Primul utilizator:
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Primul utilizator:
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Data începerii anului fiscal și se termină anul fiscal la data sunt deja stabilite în anul fiscal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Împăcați cu succes
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Împăcați cu succes
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Tax Rule,Validity,Valabilitate
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Suma facturată
 DocType: Attendance,Attendance,Prezență
-DocType: Page,No,Nu
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","In cazul in care este debifat, lista va trebui să fie adăugata fiecarui Departament unde trebuie sa fie aplicată."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
@@ -3863,55 +3550,46 @@
 ,Item Prices,Preturi Articol
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,În cuvinte va fi vizibil după ce a salva Ordinul de cumparare.
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher perioadă de închidere
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Maestru Lista de prețuri.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Maestru Lista de prețuri.
 DocType: Task,Review Date,Data Comentariului
 DocType: Purchase Invoice,Advance Payments,Plățile în avans
-DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frezare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nu permisiunea de a utiliza plată Tool
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
 DocType: Company,Round Off Account,Rotunji cont
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Ciugulit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Cheltuieli administrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consilia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consilia
 DocType: Customer Group,Parent Customer Group,Părinte Client Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Schimbare
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 DocType: Appraisal Goal,Score Earned,Scor Earned
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Perioada De Preaviz
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","de exemplu ""My Company LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Perioada De Preaviz
 DocType: Bank Reconciliation Detail,Voucher ID,ID Voucher
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Acesta este un teritoriu rădăcină și nu pot fi editate.
 DocType: Packing Slip,Gross Weight UOM,Greutate Brută UOM
 DocType: Email Digest,Receivables / Payables,Creanțe / Datorii
 DocType: Delivery Note Item,Against Sales Invoice,Comparativ facturii de vânzări
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Ștanțare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Cont de credit
-DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol 
+DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Afiseaza valorile nule
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantitatea de produs obținut după fabricarea / reambalare de la cantități date de materii prime
 DocType: Payment Reconciliation,Receivable / Payable Account,De încasat de cont / de plătit
 DocType: Delivery Note Item,Against Sales Order Item,Comparativ articolului comenzii de vânzări
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 DocType: Task,Actual End Date (via Time Logs),Dată efectivă de sfârşit (prin Jurnale de Timp)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte
 DocType: Delivery Note,Print Without Amount,Imprima Fără Suma
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Taxa Categoria nu poate fi ""de evaluare"" sau ""de evaluare și total"", ca toate elementele sunt produse non-stoc"
-DocType: User,Last Name,Nume
-DocType: Web Page,Left,Stânga
-DocType: Event,All Day,Toată ziua
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Taxa Categoria nu poate fi ""de evaluare"" sau ""de evaluare și total"", ca toate elementele sunt produse non-stoc"
 DocType: Issue,Support Team,Echipa de Suport
 DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
-DocType: Contact Us Settings,State,Stat
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bilanţ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilanţ
 DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
-DocType: User,Gender,Sex
 DocType: Journal Entry,Debit Note,Nota de Debit
 DocType: Stock Entry,As per Stock UOM,Ca şi pentru stoc UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nu expirat
@@ -3925,44 +3603,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Creare reguli pentru restricționare tranzacții bazate pe valori.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","In cazul in care se bifeaza, nr. total de zile lucratoare va include si sarbatorile, iar acest lucru va reduce valoarea Salariul pe Zi"
 DocType: Purchase Invoice,Total Advance,Total de Advance
-DocType: Workflow State,User,Utilizator
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Prelucrare de salarizare
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Setați ca Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plată Primirea Note
 DocType: Customer,Credit Days Based On,Zile de credit pe baza
 DocType: Tax Rule,Tax Rule,Regula de impozitare
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Menține Aceeași Rată in Cursul Ciclului de Vânzări
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planificați busteni de timp în afara orelor de lucru de lucru.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} a fost deja introdus
 ,Items To Be Requested,Articole care vor fi solicitate
-DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Rata de facturare bazat pe activitatea de tip (pe oră)
 DocType: Company,Company Info,Informatii Companie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Fălțuire
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","ID-ul de e-mail al Companiei nu a fost găsit, prin urmare, e-mail nu a fost trimis"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 DocType: Production Planning Tool,Filter based on item,Filtru bazata pe articol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Contul debit
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
 DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
 DocType: Purchase Common,Purchase Common,Cumpărare comună
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Din Oportunitate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Înnegrire
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficiile angajatului
 DocType: Sales Invoice,Is POS,Este POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturi cu valoarea ridicată pentru clienți.
-DocType: DocField,Default,Implicit
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id-ul proiectului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonați adăugați
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definirea Bugetul pentru acest centru de cost. Pentru a seta o acțiune buget, consultați &quot;Lista Firme&quot;"
@@ -3973,69 +3647,62 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Expense Claim,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selectând ""Da"", va da o identitate unică pentru fiecare entitate din acest articol, care poate fi vizualizat în ordine maestru."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
 DocType: Employee,Education,Educație
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Opțional. Setează implicit moneda companiei, în cazul în care nu este specificat."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Opțional. Setează implicit moneda companiei, în cazul în care nu este specificat."
 DocType: Address,Office,Birou
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Rapoarte standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Pentru a crea un cont fiscală
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
 DocType: Employee,Current Address,Adresa actuală
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
 DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Lot Inventarul
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Lot Inventarul
 DocType: Employee,Contract End Date,Data de Incheiere Contract
 DocType: Sales Order,Track this Sales Order against any Project,Urmareste acest Ordin de vânzări față de orice proiect
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Trage comenzi de vânzări (în curs de a livra), pe baza criteriilor de mai sus"
-DocType: DocShare,Document Type,Tip Document
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Din Furnizor de Ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Din Furnizor de Ofertă
 DocType: Deduction Type,Deduction Type,Tip Deducerea
 DocType: Attendance,Half Day,Jumătate de zi
 DocType: Pricing Rule,Min Qty,Min Cantitate
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""","Pentru a urmări articolele din acte vânzare-cumpărare, cu nr de lot. &quot;Industrie preferate: Produse chimice&quot;"
 DocType: GL Entry,Transaction Date,Data tranzacției
 DocType: Production Plan Item,Planned Qty,Planificate Cantitate
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Taxa totală
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Taxa totală
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pentru Cantitate (fabricat Cant) este obligatorie
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
 DocType: Notification Control,Purchase Receipt Message,Primirea de cumpărare Mesaj
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Total frunze alocate sunt mai mult decât perioada de
 DocType: Production Order,Actual Start Date,Dată Efectivă de Început
 DocType: Sales Order,% of materials delivered against this Sales Order,% din materialele livrate comparativ cu această comandă de vânzări
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Mișcare element înregistrare.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Listă Abonat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Mortezat
-DocType: Email Account,Service,Servicii
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 ,Monthly Salary Register,Salariul lunar Inregistrare
-apps/frappe/frappe/website/template.py +140,Next,Următor
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
 DocType: BOM Operation,BOM Operation,Operațiune BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electrochimică
 DocType: Purchase Taxes and Charges,On Previous Row Amount,La rândul precedent Suma
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Va rugam sa introduceti Plata Suma în atleast rând una
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Va rugam sa introduceti Plata Suma în atleast rând una
 DocType: POS Profile,POS Profile,POS Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rând {0}: Plata Suma nu poate fi mai mare de Impresionant Suma
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Totală neremunerată
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totală neremunerată
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Timpul Conectare nu este facturabile
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Cumpărător
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Cumpărător
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salariul net nu poate fi negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Va rugam sa introduceti pe baza documentelor justificative manual
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Va rugam sa introduceti pe baza documentelor justificative manual
 DocType: SMS Settings,Static Parameters,Parametrii statice
 DocType: Purchase Order,Advance Paid,Avans plătit
 DocType: Item,Item Tax,Taxa Articol
@@ -4044,14 +3711,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-laminare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Card de Credit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Card de Credit
 DocType: BOM,Item to be manufactured or repacked,Articol care urmează să fie fabricat sau reambalat
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
 DocType: Purchase Invoice,Next Date,Data viitoare
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Va rugam sa introduceti impozite și taxe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Prelucrare
 DocType: Sales Invoice Item,Drop Ship,Drop navelor
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
 DocType: Hub Settings,Seller Name,Nume vânzător
@@ -4061,47 +3726,44 @@
 DocType: Stock Entry,Repack,Reambalați
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Trebuie să salvați formularul înainte de a începe
 DocType: Item Attribute,Numeric Values,Valori numerice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Atașați logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Atașați logo
 DocType: Customer,Commission Rate,Rata de Comision
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Coșul este gol
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Rădăcină nu poate fi editat.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Suma alocată nu poate mai mare decât valoarea neajustată
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Rădăcină nu poate fi editat.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Suma alocată nu poate mai mare decât valoarea neajustată
 DocType: Manufacturing Settings,Allow Production on Holidays,Permiteţi operaţii de producție pe durata sărbătorilor
 DocType: Sales Order,Customer's Purchase Order Date,Data Comanda de Aprovizionare Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vă rugăm să selectați un fișier csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Trimite Backup pentru Dropbox
 DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Proiectant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Proiectant
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Crea automat Material Cerere dacă cantitate scade sub acest nivel
 ,Item-wise Purchase Register,Registru Achizitii Articol-Avizat
 DocType: Batch,Expiry Date,Data expirării
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Pentru a seta nivelul de reordona, element trebuie să fie un articol de cumparare sau de fabricație Postul"
 ,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Maestru proiect.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Proiect de lege de materiale
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
-DocType: Dropbox Backup,Send Notifications To,Trimite notificări
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
 DocType: Expense Claim Detail,Sanctioned Amount,Sancționate Suma
 DocType: GL Entry,Is Opening,Se deschide
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Contul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Contul {0} nu există
 DocType: Account,Cash,Numerar
 DocType: Employee,Short biography for website and other publications.,Scurta biografie pentru site-ul web și alte publicații.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Vă rugăm să creați Structura Salariul pentru angajat {0}

diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 04f15c1..dc95aa7 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Выберите ежемесячное распределение, если вы хотите, чтобы отслеживать на основе сезонности."
 DocType: Employee,Divorced,Разведенный
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Внимание: То же пункт был введен несколько раз.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Элементы уже синхронизированы
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Разрешить пункт будет добавлен несколько раз в сделке
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Отменить Материал Визит {0} до отмены этой претензии по гарантийным обязательствам
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Потребительские товары
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Потребительские товары
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Пожалуйста, выберите партии первого типа"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Отжиг
 DocType: Item,Customer Items,Предметы клиентов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Счет {0}: Родительский счет {1} не может быть регистром
 DocType: Item,Publish Item to hub.erpnext.com,Опубликовать деталь к hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Оставьте Утверждающие
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Арендованный
-DocType: About Us Settings,Website,Сайт
 DocType: POS Profile,Applicable for User,Применимо для пользователя
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Уплотнение плюс спекания
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Будет рассчитана в сделке.
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Из материалов запрос
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Из материалов запрос
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Соискатель работы
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нет больше результатов.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Легальный
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Легальный
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Фактический тип налога не могут быть включены в стоимость товара в строке {0}
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Требуется По
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Сшивание
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Несколько цены товара.
 ,Purchase Order Items To Be Received,"Покупка Заказ позиции, которые будут получены"
 DocType: SMS Center,All Supplier Contact,Все поставщиком Связаться
 DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Новый Оставить заявку
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: цена должна быть такой же, как {1}: {2} ({3} / {4})"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Новый Оставить заявку
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банковский счет
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Используйте данную опцию для поддержания клиентско-удобных кодов и для возможности удобного поиска по ним
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показать варианты
-DocType: Sales Invoice Item,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличии
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Производственный план Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен сотрудником {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Создайте новый POS профиля
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Здравоохранение
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
 DocType: Purchase Invoice,Monthly,Ежемесячно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Задержка в оплате (дни)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Счет-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Счет-фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адрес Электронной Почты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Оборона
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адрес Электронной Почты
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
 DocType: Company,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобиль №
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Пожалуйста, выберите прайс-лист"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообрабатывающий
 DocType: Production Order Operation,Work In Progress,Работа продолжается
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-печать
 DocType: Employee,Holiday List,Список праздников
 DocType: Time Log,Time Log,Журнал учета времени
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Бухгалтер
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Бухгалтер
 DocType: Cost Center,Stock User,Фото пользователя
 DocType: Company,Phone No,Номер телефона
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Журнал деятельность, осуществляемая пользователей от задач, которые могут быть использованы для отслеживания времени, биллинга."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Новый {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Новый {0}: # {1}
 ,Sales Partners Commission,Партнеры по сбыту Комиссия
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Атрибут Значение {0} не может быть удалена из {1} в качестве пункта Варианты \ существуют с этим атрибутом.
-DocType: Print Settings,Classic,Классические
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Это корень счета и не могут быть изменены.
 DocType: BOM,Operations,Эксплуатация
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
 DocType: Bin,Quantity Requested for Purchase,Количество Потребовал для покупки
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепите файл .csv с двумя колоннами, одна для старого имени и один для нового названия"
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Открытие на работу.
 DocType: Item Attribute,Increment,Приращение
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Выберите Склад ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовый
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Сделать Банк Стажер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсионные фонды
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Склад является обязательным, если тип учетной записи: Склад"
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Убедитесь в том, повторяющихся порядок, снимите, чтобы остановить повторяющихся или поставить правильное Дата окончания"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Стоимость доставленных изделий
-DocType: Blog Post,Guest,Гость
 DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
 DocType: Lead,Interested,Заинтересованный
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Накладная на материалы
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Открытие
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Открытие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},От {0} до {1}
 DocType: Item,Copy From Item Group,Скопируйте Из группы товаров
 DocType: Journal Entry,Opening Entry,Открытие запись
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} является обязательным
 DocType: Stock Entry,Additional Costs,Дополнительные расходы
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
 DocType: Lead,Product Enquiry,Product Enquiry
-DocType: Standard Reply,Owner,Владелец
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Пожалуйста, введите компанию первой"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
 DocType: Employee Education,Under Graduate,Под Выпускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Целевая На
 DocType: BOM,Total Cost,Общая стоимость
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Развертывание
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активности:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Недвижимость
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Недвижимость
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Выписка по счету
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармацевтика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Expense Claim Detail,Claim Amount,Сумма претензии
 DocType: Employee,Mr,Г-н
-DocType: Custom Script,Client,Клиент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип Поставщик / Поставщик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Потребляемый
 DocType: Upload Attendance,Import Log,Лог импорта
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Отправить
 DocType: Sales Invoice Item,Delivered By Supplier,Поставляется Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годовой оклад
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годовой оклад
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Отправки сообщения?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показать журналы Время
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Все даты и сотрудник сочетание в выбранный период придет в шаблоне, с существующими посещаемости"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Будет обновлена после Расходная накладная представляется.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Выпрямление
 DocType: BOM Replace Tool,New BOM,Новый BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетная Журналы Время для оплаты.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Литье сифонной
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Информационный бюллетень уже был отправлен
 DocType: Lead,Request Type,Тип запроса
 DocType: Leave Application,Reason,Возвращаемое значение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Вещание
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Реализация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Первый пользователь будет System Manager (вы можете изменить это позже).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Реализация
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Первый пользователь будет System Manager (вы можете изменить это позже).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Информация о выполненных операциях.
 DocType: Serial No,Maintenance Status,Техническое обслуживание Статус
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Предметы и Цены
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Предметы и Цены
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},С даты должно быть в пределах финансового года. Предполагая С даты = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Выберите Employee, для которых вы создаете оценки."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Скидка на Прайс-лист ставка (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Начать
-DocType: User,First Name,Имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Литье Полное формы
 DocType: Offer Letter,Select Terms and Conditions,Выберите Сроки и условия
 DocType: Production Planning Tool,Sales Orders,Заказы
 DocType: Purchase Taxes and Charges,Valuation,Оценка
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Банковский счет
 DocType: Leave Type,Allow Negative Balance,Разрешить отрицательное сальдо
 DocType: Selling Settings,Default Territory,По умолчанию Территория
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телевидение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Наносящий разрез
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевидение
 DocType: Production Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Аккаунт {0} не принадлежит компании {1}
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
 DocType: Customer Group,Mention if non-standard receivable account applicable,Упоминание если нестандартная задолженность счет применимо
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Для требуется Склад перед Отправить
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Поступило На
 DocType: Sales Partner,Reseller,Торговый посредник
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Пожалуйста, введите Компания"
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
 DocType: Newsletter List,Total Subscribers,Всего Подписчики
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Имя Контакта
+,Contact Name,Имя Контакта
 DocType: Production Plan Item,SO Pending Qty,ТАК В ожидании Кол-во
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Создает ведомость расчета зарплаты за вышеуказанные критерии.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запрос на покупку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двухместный жилья
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листья в год
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листья в год
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Пожалуйста, установите именования серия для {0} через Setup&gt; Настройки&gt; именования серии"
 DocType: Time Log,Will be updated when batched.,Будет обновляться при пакетном.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
-DocType: Bulk Email,Message,Сообщение
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Ключ доступа
 DocType: Payment Tool,Reference No,Ссылка Нет
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,За год
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирение товара
 DocType: Stock Entry,Sales Invoice No,Счет Продажи Нет
 DocType: Material Request Item,Min Order Qty,Минимальный заказ Кол-во
 DocType: Lead,Do Not Contact,Не обращайтесь
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Уникальный идентификатор для отслеживания все повторяющиеся счетов-фактур. Он создается на представить.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик Программного обеспечения
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Разработчик Программного обеспечения
 DocType: Item,Minimum Order Qty,Минимальное количество заказа
 DocType: Pricing Rule,Supplier Type,Тип поставщика
 DocType: Item,Publish in Hub,Опубликовать в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Проволочной щеткой
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всему миру
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный номер
 DocType: Maintenance Schedule,Generate Schedule,Создать расписание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Вдавливания
 DocType: Purchase Invoice Item,Expense Head,Расходов Глава
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Пожалуйста, выберите Charge Тип первый"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последние
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 символов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Выбор языка
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 символов
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Оставить утверждающий в списке будет установлен по умолчанию Оставить утверждающего
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","Отключение создание временных журналов против производственных заказов. Операции, не будет отслеживаться в отношении производственного заказа"
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Вариант
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} должно быть Service Элемент
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
-DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерное бурение
-DocType: Stock UOM Replace Utility,New Stock UOM,Новый фонда UOM
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклическая ссылка Ошибка
-DocType: Communication,Closed,Закрыт
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной.
 DocType: Lead,Industry,Промышленность
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Рассылка новостей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Дегидрогенизация нефтепродуктов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Образование шейки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
 DocType: Journal Entry,Multi Currency,Мульти валюта
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Пункт обновляется
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
 DocType: Sales Invoice Item,Delivery Note,· Отметки о доставке
-DocType: Dropbox Backup,Allow Dropbox Access,Разрешить Dropbox Access
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Настройка Налоги
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} вводится дважды в пункт налог
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Workstation,Rent Cost,Стоимость аренды
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Пожалуйста, выберите месяц и год"
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Email предприятия
 DocType: GL Entry,Debit Amount in Account Currency,Дебет Сумма в валюте счета
 DocType: Shipping Rule,Valid for Countries,Действительно для странам
-DocType: Workflow State,Refresh,Обновить
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Все импорта смежных областях, как валюты, обменный курс, общий объем импорта, импорт общего итога и т.д. доступны в ТОВАРНЫЙ ЧЕК, поставщиков цитаты, счета-фактуры Заказа т.д."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Итоговый заказ считается
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скорость, с которой Заказчик валют преобразуется в базовой валюте клиента"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации, накладной, счете-фактуре, производственного заказа, заказа на поставку, покупка получение, счет-фактура, заказ клиента, фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Размер налога
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Выбрать пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Выбрать пункт
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Пункт: {0} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Покупка Получение должны быть представлены
-DocType: Stock UOM Replace Utility,Current Stock UOM,Наличие на складе Единица измерения
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Партия элементов.
 DocType: C-Form Invoice Detail,Invoice Date,Дата выставления счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваш адрес электронной почты
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Пожалуйста, см. приложение"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Резка струей воды
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Настройка Уже завершена!!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Настройка Уже завершена!!
 ,Finished Goods,Готовая продукция
 DocType: Delivery Note,Instructions,Инструкции
 DocType: Quality Inspection,Inspected By,Проверено
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Пожалуйста, не создавайте учетных записей для клиентов и поставщиков. Они создаются непосредственно из клиента / поставщика мастеров."
 DocType: Currency Exchange,Currency Exchange,Курс обмена валюты
 DocType: Purchase Invoice Item,Item Name,Название элемента
+DocType: Authorization Rule,Approving User  (above authorized value),Утверждении пользователь (выше уставного стоимости)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Остаток кредита
 DocType: Employee,Widowed,Овдовевший
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Пункты, запрашиваемые которые ""Нет на месте"" с учетом всех складов на основе прогнозируемого Кол-во и Минимальное количество заказа"
@@ -380,22 +348,21 @@
 ,Purchase Register,Покупка Становиться на учет
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
 DocType: Workstation,Consumable Cost,Расходные Стоимость
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Подтверждающего Отсутствие"""
 DocType: Purchase Receipt,Vehicle Date,Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медицинский
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина потери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Труба бисером
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 DocType: Employee,Single,Единственный
 DocType: Issue,Attachment,Привязанность
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не может быть установлен для группы МВЗ
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
 DocType: Purchase Invoice,Yearly,Ежегодно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Пожалуйста, введите МВЗ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Пожалуйста, введите МВЗ"
 DocType: Journal Entry Account,Sales Order,Заказ на продажу
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Ср. Курс продажи
 DocType: Purchase Order,Start date of current order's period,Дату периода текущего заказа Начните
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
 DocType: Delivery Note,% Installed,% Установлено
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Пожалуйста, введите название компании сначала"
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Является Группа
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматически указан серийный пп на основе FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверьте Поставщик Номер счета Уникальность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформования
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Продольная резка
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""До Дела №"" не может быть меньше, чем ""От Дела №"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое предприятие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое предприятие
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не начато
 DocType: Lead,Channel Partner,Channel ДУrtner
 DocType: Account,Old Parent,Старый родительский
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены До
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбрано несколько раз в таблице атрибутов
+DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell литье
 DocType: Material Request Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Пожалуйста, введите Код товара."
 DocType: BOM,Costing,Стоимость
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всего Кол-во
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,В диапазоне
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 DocType: Features Setup,Imports,Импорт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Склеивание
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Job Opening,Description of a Job Opening,Описание работу Открытие
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,В ожидании деятельность на сегодняшний день
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Информация о посещаемости.
 DocType: Bank Reconciliation,Journal Entries,Записи в журнале
 DocType: Sales Order Item,Used for Production Plan,Используется для производственного плана
-DocType: System Settings,Loading...,Загрузка...
-DocType: DocField,Password,Пароль
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Плавленый осаждение Моделирование
 DocType: Manufacturing Settings,Time Between Operations (in mins),Время между операциями (в мин)
 DocType: Customer,Buyer of Goods and Services.,Покупатель товаров и услуг.
 DocType: Journal Entry,Accounts Payable,Счета к оплате
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Добавить Подписчики
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" не существует"
 DocType: Pricing Rule,Valid Upto,Действительно До
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Они могут быть организации или частные лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Они могут быть организации или частные лица.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фильтровать на основе счета, если сгруппированы по Счет"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Администратор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Администратор
 DocType: Payment Tool,Received Or Paid,Полученные или уплаченные
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Stock Entry,Difference Account,Счет разницы
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
-DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
-DocType: Communication,Subject,Тема
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 ,Serial No Warranty Expiry,не Серийный Нет Гарантия Срок
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Элемент
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управление субподряда
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новая единица измерения НЕ должна быть целочисленной
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управление субподряда
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебель и приспособления
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Скорость, с которой Прайс-лист валюта конвертируется в базовую валюту компании"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
@@ -482,21 +441,21 @@
 DocType: Production Planning Tool,Material Requirement,Потребности в материалах
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} неправильный адрес электронной почты в ""Уведомление \ адрес электронной почты"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Всего счетов в этом году:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Всего счетов в этом году:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
 DocType: Territory,For reference,Для справки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не удается удалить Серийный номер {0}, так как он используется в сделках с акциями"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закрытие (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закрытие (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантийный срок (дней)
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 ,Pending Qty,В ожидании Кол-во
 DocType: Job Applicant,Thread HTML,Тема HTML
 DocType: Company,Ignore,Игнорировать
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS отправлено следующих номеров: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Действительно с
 DocType: Sales Invoice,Total Commission,Всего комиссия
 DocType: Pricing Rule,Sales Partner,Торговый партнер
@@ -506,7 +465,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Ежемесячная абонентская распространения ** помогает распространять свой бюджет через месяцев, если у вас есть сезонность в вашем бизнесе.
 
  Чтобы распределить бюджет с помощью этого распределения, установите этот ** ежемесячное распределение ** в ** МВЗ **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Не записи не найдено в таблице счетов
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансовый / отчетного года.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
@@ -514,7 +473,6 @@
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
-DocType: About Us Settings,Website Manager,Сайт менеджер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Финансовый год Дата начала не должен быть больше, чем финансовый год Дата окончания"
 DocType: Warranty Claim,Resolution,Разрешение
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Поставляется: {0}
@@ -522,25 +480,24 @@
 DocType: Sales Order,Billing and Delivery Status,Биллинг и доставка Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Предыдущая
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажи Вернуться
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Выберите Заказы из которого вы хотите создать производственных заказов.
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (Drop кораблей)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Зарплата компоненты.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База данных потенциальных клиентов.
+DocType: Authorization Rule,Customer or Item,Клиент или товара
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,База данных клиентов.
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логика Склада,по которому сделаны складские записи"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
-DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Производитель Клиентам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Заказ продукции является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение Написание
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Предложение Написание
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Другой человек Продажи {0} существует с тем же идентификатором Сотрудника
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ({6}) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Финансовый год компании
@@ -561,20 +518,16 @@
 DocType: Activity Type,Default Costing Rate,По умолчанию Калькуляция Оценить
 DocType: Maintenance Schedule,Maintenance Schedule,График технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Пожалуйста, установите модуль питона Dropbox"
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,От купли получении
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,От купли получении
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
 DocType: SMS Settings,Receiver Parameter,Приемник Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
 DocType: Sales Person,Sales Person Targets,Менеджера по продажам Цели
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,для
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Конец трубки формирования
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Преобразовать в группе
 DocType: Activity Cost,Activity Type,Тип активности
@@ -582,25 +535,20 @@
 DocType: Customer,Fixed Days,Основные Дни
 DocType: Sales Invoice,Packing List,Комплект поставки
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Заказы, выданные поставщикам."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Публикация
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Публикация
 DocType: Activity Cost,Projects User,Проекты Пользователь
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Потребляемая
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} не найден в  таблице счета
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0} {1} не найден в  таблице счета
 DocType: Company,Round Off Cost Center,Округление Стоимость центр
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,О передаче материала
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Открытие (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Настройки
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Далее
 DocType: Pricing Rule,Sales Manager,Менеджер По Продажам
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Переименовать
 DocType: Journal Entry,Write Off Amount,Списание Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Изгиб
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Разрешить пользователю
 DocType: Journal Entry,Bill No,Номер накладной
 DocType: Purchase Invoice,Quarterly,Ежеквартально
 DocType: Selling Settings,Delivery Note Required,Доставка Примечание необходимое
@@ -609,17 +557,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Purchase Receipt,Other Details,Другие детали
 DocType: Account,Accounts,Учётные записи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножницы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Чтобы отслеживать пункт в купли-продажи документов по их серийных NOS. Это также может использоваться для отслеживания гарантийные детали продукта.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Отклонен Склад является обязательным против regected пункта
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 DocType: Employee,Provide email id registered in company,Обеспечить электронный идентификатор зарегистрирован в компании
 DocType: Hub Settings,Seller City,Продавец Город
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Предложение Письмо срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -628,14 +575,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комиссия ставка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","На ваучере Тип должен быть одним из заказа клиента, накладная или Запись в журнале"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Невозможно найти обменный курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Авиационно-космический
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Добро пожаловать
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авиационно-космический
 DocType: Journal Entry,Credit Card Entry,Вступление Кредитная карта
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Задача
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Товары, полученные от поставщиков."
-DocType: Communication,Open,Открыт
 DocType: Lead,Campaign Name,Название кампании
 ,Reserved,Зарезервировано
 DocType: Purchase Order,Supply Raw Materials,Поставка сырья
@@ -644,29 +587,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} не является складской позицией
 DocType: Mode of Payment Account,Default Account,По умолчанию учетная запись
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
-DocType: Contact Us Settings,Address Title,Название адреса
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
-DocType: Dropbox Backup,Daily,Ежедневно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Счет существующей проводки не может быть преобразован в регистр
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Счет существующей проводки не может быть преобразован в регистр
 DocType: Delivery Note,Customer's Purchase Order No,Клиентам Заказ Нет
 DocType: Employee,Cell Number,Количество звонков
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запросы Авто материал, полученный"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Поражений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Энергоэффективность
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Ежемесячная выписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Новая учетная запись
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: С {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Бухгалтерские записи можно с листовыми узлами. Записи против групп не допускаются.
-DocType: ToDo,High,Высокий
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
-DocType: User,Male,Мужчина
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Получение число, необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Пункт Значение атрибута
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампании по продажам.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -714,10 +654,9 @@
 DocType: Address,Personal,Личное
 DocType: Expense Claim Detail,Expense Claim Type,Расходов претензии Тип
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройки по умолчанию для корзину
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запись в журнале {0} связан с орденом {1}, проверить, если он должен быть подтянут, как продвинуться в этом счете."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Биотехнологии
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запись в журнале {0} связан с орденом {1}, проверить, если он должен быть подтянут, как продвинуться в этом счете."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Биотехнологии
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Офис эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хемминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Пожалуйста, введите пункт первый"
 DocType: Account,Liability,Ответственность сторон
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
@@ -725,14 +664,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Process Payroll,Send Email,Отправить e-mail
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обновления Склада"" не могут быть проверены, так как позиция не поставляется через {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,кол-во
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,кол-во
 DocType: Item,Items with higher weightage will be shown higher,"Элементы с более высокой weightage будет показано выше,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банковская сверка подробно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мои Счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мои Счета
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Сотрудник не найден
 DocType: Purchase Order,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
@@ -751,35 +691,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Чтобы включить &quot;Точки продаж&quot; Особенности
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
-DocType: Comment,Reference Name,Ссылка Имя
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: Sales Invoice Item,Target Warehouse,Целевая Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
 DocType: Production Order,Item To Manufacture,Элемент Производство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постоянная форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Заказ на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
 DocType: Newsletter,Newsletter Manager,Рассылка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Открытие&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Expense Claim,Expenses,Расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Вариант Пункт Атрибут
 ,Purchase Receipt Trends,Покупка чеков тенденции
 DocType: Appraisal,Select template from which you want to get the Goals,"Выберите шаблон, из которого вы хотите получить Целей"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Научно-исследовательские и опытно-конструкторские работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Научно-исследовательские и опытно-конструкторские работы
 ,Amount to Bill,"Сумма, Биллу"
 DocType: Company,Registration Details,Регистрационные данные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Разбивка
 DocType: Item,Re-Order Qty,Re порядка Кол-во
 DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
@@ -790,18 +727,16 @@
 DocType: Sales Invoice Item,Stock Details,Фото Детали
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Значимость проекта
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Торговая точка
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс счета в Кредите, запрещена установка 'Баланс должен быть' как 'Дебет'"
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Опубликовать Цены
 DocType: Notification Control,Expense Claim Rejected Message,Расходов претензии Отклонен Сообщение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Замечательный
 ,Available Qty,Доступные Кол-во
 DocType: Purchase Taxes and Charges,On Previous Row Total,На предыдущей строки Всего
 DocType: Salary Slip,Working Days,В рабочие дни
 DocType: Serial No,Incoming Rate,Входящий Оценить
 DocType: Packing Slip,Gross Weight,Вес брутто
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включите праздники в общей сложности не. рабочих дней
 DocType: Job Applicant,Hold,Удержание
 DocType: Employee,Date of Joining,Дата вступления
@@ -811,30 +746,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Посмотреть Подписчики
 DocType: Purchase Invoice Item,Purchase Receipt,Покупка Получение
 ,Received Items To Be Billed,Полученные товары быть выставлен счет
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивоструйное
 DocType: Employee,Ms,Госпожа
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} должен быть активным
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} должен быть активным
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Salary Slip,Leave Encashment Amount,Оставьте Инкассация Количество
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обязательные Кол-во
 DocType: Bank Reconciliation,Total Amount,Общая сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издания
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издания
 DocType: Production Planning Tool,Production Orders,Производственные заказы
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта баланса
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажи Прайс-лист
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опубликовать синхронизировать элементы
-DocType: GL Entry,Account Currency,Валюта счета
+DocType: Bank Reconciliation,Account Currency,Валюта счета
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Пожалуйста, укажите округлить счет в компании"
 DocType: Purchase Receipt,Range,температур
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Address,Shop,Магазин
@@ -843,7 +777,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,По умолчанию Счет в банке / Наличные будут автоматически обновляться в POS фактуре когда выбран этот режим.
 DocType: Employee,Permanent Address Is,Постоянный адрес Является
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операция выполнена На сколько готовой продукции?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Марка
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Марка
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Учет по-{0} скрещенными за Пункт {1}.
 DocType: Employee,Exit Interview Details,Выход Интервью Подробности
 DocType: Item,Is Purchase Item,Является Покупка товара
@@ -862,60 +796,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Заказ товара
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Установите Сумма платежа = сумма Выдающийся
-DocType: Contact Us Settings,Address Line 1,Адрес (1-я строка)
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсия
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Название компании
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсия
+,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Выбрать пункт трансфера
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Просмотреть список всех справочных видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Выберите учетную запись глава банка, в котором проверка была размещена."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Разрешить пользователю редактировать Прайс-лист Оценить в сделках
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Химический
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химический
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 DocType: Process Payroll,Select Payroll Year and Month,Выберите Payroll год и месяц
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти к соответствующей группе (обычно использования средств&gt; Текущие активы&gt; Банковские счета и создать новый аккаунт (нажав на Добавить Ребенка) типа &quot;банк&quot;
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
-DocType: Comment,Unsubscribed,Отписавшийся
 DocType: Opportunity,Walk In,Прогулка в
 DocType: Item,Inspection Criteria,Осмотр Критерии
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Все передаваемые
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Белый
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Белый
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Сделать
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Сделать
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
-DocType: Workflow State,Stop,стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Моя корзина
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Тип заказа должен быть одним из {0}
 DocType: Lead,Next Contact Date,Следующая контакты
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Открытие Кол-во
 DocType: Holiday List,Holiday List Name,Имя Список праздников
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опционы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опционы
 DocType: Journal Entry Account,Expense Claim,Расходов претензии
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Кол-во для {0}
 DocType: Leave Application,Leave Application,Оставить заявку
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставьте Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
 DocType: Company,If Monthly Budget Exceeded (for expense account),Если Ежемесячный бюджет превышен (за счет расходов)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Обрезки
 DocType: Workstation,Net Hour Rate,Чистая час Цена
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Посадка стоимости покупки Квитанция
 DocType: Company,Default Terms,По умолчанию Условия
 DocType: Packing Slip Item,Packing Slip Item,Упаковочный лист Пункт
-DocType: POS Profile,Cash/Bank Account, Наличные / Банковский счет
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
+DocType: POS Profile,Cash/Bank Account,Наличные / Банковский счет
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут стол является обязательным
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Атрибут стол является обязательным
 DocType: Production Planning Tool,Get Sales Orders,Получить заказов клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Скидка
 DocType: Features Setup,Purchase Discounts,Покупка Скидки
 DocType: Workstation,Wages,Заработная плата
@@ -932,7 +861,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 DocType: Serial No,Creation Document No,Создание документа Нет
 DocType: Issue,Issue,Проблема
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Счет не соответствует с Компанией
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Склад
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 DocType: BOM Operation,Operation,Операция
@@ -940,13 +870,13 @@
 DocType: Tax Rule,Shipping State,Государственный Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Расходы на продажи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандартный Покупка
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандартный Покупка
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажи Заказать {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Создание изображения в дневнике
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Создание изображения в дневнике
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
 DocType: Item,Default Supplier,По умолчанию Поставщик
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на производство Процент
@@ -961,29 +891,27 @@
 DocType: Time Log Batch,updated via Time Logs,обновляется через журналы Time
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш продавец, который свяжется с клиентом в будущем"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Перечислите несколько ваших поставщиков. Они могут быть организации или частные лица.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Перечислите несколько ваших поставщиков. Они могут быть организации или частные лица.
 DocType: Company,Default Currency,Базовая валюта
 DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
-DocType: Contact Us Settings,Address,Адрес
 DocType: Expense Claim,From Employee,От работника
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
 DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспортные расходы
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспортные расходы
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,конец года
 DocType: Email Digest,Annual Expense,Годовые расходы
 DocType: SMS Center,Total Characters,Персонажей
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-образный Счет Подробно
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Оплата Примирение Счет
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Вклад%
 DocType: Item,website page link,сайт ссылку
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Давайте подготовить систему для первого использования.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Регистрационные номера компании для вашей справки. Налоговые числа и т.д.
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Выберите Журналы время и предоставить для создания нового счета-фактуры.
@@ -1003,14 +931,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Расходная накладная Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ничего просить
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Управление
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управление
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Виды деятельности для Время листов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Литье по выплавляемым моделям
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
-DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активен
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Синий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Синий
 DocType: Purchase Invoice,Is Return,Является Вернуться
 DocType: Price List Country,Price List Country,Цены Страна
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Дальнейшие узлы могут быть созданы только под узлами типа «Группа»
@@ -1020,50 +946,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS-профиля {0} уже создана для пользователя: {1} и компания {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коэффициент пересчета единицы измерения
 DocType: Stock Settings,Default Item Group,По умолчанию Пункт Группа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Производство многослойного объекта
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Поставщик базы данных.
 DocType: Account,Balance Sheet,Балансовый отчет
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Стретч формирования
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш продавец получит напоминание в этот день, чтобы связаться с клиентом"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Налоговые и иные отчисления заработной платы.
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
 ,Purchase Order Items To Be Billed,Покупка Заказ позиции быть выставлен счет
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Покупка Счет Пункт
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток-Ledger Записи и GL Записи повторно отправил для выбранных Покупка расписок
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
 DocType: Holiday,Holiday,Выходной
-DocType: Event,Saturday,Суббота
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Оставьте пустым, если считать для всех отраслей"
 ,Daily Time Log Summary,Дневной Резюме Время Лог
-DocType: DocField,Label,Имя поля
 DocType: Payment Reconciliation,Unreconciled Payment Details,Несогласованные Детали компенсации
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
 DocType: Lead,Call,Звонок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Настройка сотрудников
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Сетка """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Исследования
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Исследования
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Contact,User ID,ID пользователя
-DocType: Communication,Sent,Отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Посмотреть Леджер
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
-DocType: Communication,Delivery Status,Статус доставки
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производство против заказ клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
 ,Budget Variance Report,Бюджет Разница Сообщить
 DocType: Salary Slip,Gross Pay,Зарплата до вычетов
@@ -1074,13 +993,11 @@
 DocType: BOM Item,Item Description,Описание позиции
 DocType: Payment Tool,Payment Mode,Режим компенсации
 DocType: Purchase Invoice,Is Recurring,Повторяется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Прямая металлическая лазерное спекание
 DocType: Purchase Order,Supplied Items,Поставляемые товары
 DocType: Production Order,Qty To Manufacture,Кол-во для производства
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Поддержание же скоростью в течение покупке цикла
 DocType: Opportunity Item,Opportunity Item,Возможность Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Временное открытие
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Сотрудник Оставить Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Тип адреса
@@ -1096,35 +1013,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Небольшой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Небольшой
 DocType: Employee,Employee Number,Общее число сотрудников
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Сумма по счетам (Exculsive стоимость)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Основной счет {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зеленый
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зеленый
 DocType: Item,Auto re-order,Авто повторного заказа
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Всего Выполнено
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Всего Выполнено
 DocType: Employee,Place of Issue,Место выдачи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
-DocType: Report,Disabled,Отключено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
+DocType: Email Digest,Add Quote,Добавить Цитата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сельское хозяйство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваши продукты или услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
 DocType: Warehouse,Warehouse Contact Info,Склад Контактная информация
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Имя обязательно
 DocType: Purchase Invoice,Recurring Type,Периодическое Тип
 DocType: Address,City/Town,Город / поселок
 DocType: Email Digest,Annual Income,Годовой доход
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
@@ -1134,14 +1050,13 @@
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Ожидаемая дата поставки меньше, чем Запланированная дата начала."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всего Исходящие
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для ""To Размер"""
 DocType: Authorization Rule,Transaction,Транзакция
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примечание: Эта МВЗ является Группа. Невозможно сделать бухгалтерские проводки против групп.
-apps/frappe/frappe/config/desk.py +7,Tools,Инструментарий
 DocType: Item,Website Item Groups,Сайт Группы товаров
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Номер заказа Продукция является обязательным для производства фондового входа назначения
 DocType: Purchase Invoice,Total (Company Currency),Всего (Компания валют)
@@ -1149,24 +1064,22 @@
 DocType: Journal Entry,Journal Entry,Запись в дневнике
 DocType: Workstation,Workstation Name,Имя рабочей станции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
 DocType: Sales Partner,Target Distribution,Целевая Распределение
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Комментарии
 DocType: Salary Slip,Bank Account No.,Счет №
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Это число последнего созданного сделки с этим префиксом
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
 DocType: Quality Inspection Reading,Reading 8,Чтение 8
 DocType: Sales Partner,Agent,Оператор
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равна нулю, может, вы должны изменить &quot;Распределить плату на основе&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Налоги и сборы Расчет
 DocType: BOM Operation,Workstation,Рабочая станция
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Оборудование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Оборудование
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Пожалуйста, выберите компанию"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Поставщик Дата выставления счета
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необходимо включить Корзину
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,нет данных
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
 DocType: Salary Slip,Earning,Зарабатывание
 DocType: Payment Tool,Party Account Currency,Партия Валюта счета
@@ -1176,26 +1089,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Общая стоимость заказа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Еда
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старение Диапазон 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Вы можете сделать журнал времени только против представленной продукции для того,"
 DocType: Maintenance Schedule Item,No of Visits,Нет посещений
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Бюллетени для контактов, приводит."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"Операции, не может быть пустым."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"Операции, не может быть пустым."
 ,Delivered Items To Be Billed,Поставленные товары быть выставлен счет
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
-DocType: DocField,Description,Описание
 DocType: Authorization Rule,Average Discount,Средняя скидка
-DocType: Letter Head,Is Default,Является умолчанию
 DocType: Address,Utilities,Инженерное оборудование
 DocType: Purchase Invoice Item,Accounting,Бухгалтерия
 DocType: Features Setup,Features Setup,Особенности установки
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Посмотреть предложение Письмо
-DocType: Communication,Communication,Общение
 DocType: Item,Is Service Item,Является Service Элемент
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
 DocType: Activity Cost,Projects,Проекты
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},С {0} | {1} {2}
@@ -1214,7 +1124,7 @@
 DocType: Item,Maintain Stock,Поддержание складе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Оставьте пустым, если рассматривать для всех обозначений"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,С DateTime
 DocType: Email Digest,For Company,За компанию
@@ -1224,7 +1134,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1238,31 +1148,28 @@
 DocType: HR Settings,Employee Settings,Работники Настройки
 ,Batch-Wise Balance History,Партиями Баланс История
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список задач
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Ученик
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Отрицательный Количество не допускается
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Ученик
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Отрицательный Количество не допускается
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Налоговый Подробная таблица выбирается из мастера элемента в виде строки и хранится в этой области.
  Используется по налогам и сборам"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Вскрытие
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Сотрудник не может сообщить себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Если счет замораживается, записи разрешается ограниченных пользователей."
 DocType: Email Digest,Bank Balance,Банковский баланс
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Учет Вход для {0}: {1} могут быть сделаны только в валюте: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Учет Вход для {0}: {1} могут быть сделаны только в валюте: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Отсутствие активного Зарплата Структура найдено сотрудника {0} и месяц
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы, необходимая квалификация и т.д."
 DocType: Journal Entry Account,Account Balance,Остаток на счете
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Налоговый Правило для сделок.
 DocType: Rename Tool,Type of document to rename.,"Вид документа, переименовать."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Мы Купить этот товар
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Мы Купить этот товар
 DocType: Address,Billing,Выставление счетов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Загибание
-DocType: Bulk Email,Not Sent,Не Отправлено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Взрывная формирования
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всего Налоги и сборы (Компания Валюты)
 DocType: Shipping Rule,Shipping Account,Доставка счета
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планируется отправить {0} получателей
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
@@ -1272,105 +1179,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адрес не добавлено ни.
 DocType: Workstation Working Hour,Workstation Working Hour,Рабочая станция Рабочие часы
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналитик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Строка {0}: С номером количество {1} должен быть меньше или равен количеству СП {2}
 DocType: Item,Inventory,Инвентаризация
 DocType: Features Setup,"To enable ""Point of Sale"" view",Чтобы включить &quot;Точка зрения&quot; Продажа
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не может быть сделано для пустого корзину
 DocType: Item,Sales Details,Продажи Подробности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закрепление
 DocType: Opportunity,With Items,С элементами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Кол-во
 DocType: Notification Control,Expense Claim Rejected,Расходов претензии Отклонен
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Дата, на которую будет генерироваться следующий счет-фактура. Он создается на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Правительство
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варианты
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Правительство
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всего ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Всего ({0})
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Не записи не найдено в таблице оплаты
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Начало финансового периода
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Не записи не найдено в таблице оплаты
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Начало финансового периода
 DocType: Employee External Work History,Total Experience,Суммарный опыт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкование
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Заказ на продажу Нет
 DocType: Item Group,Item Group Name,Пункт Название группы
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятый
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача материалов для производства
 DocType: Pricing Rule,For Price List,Для Прейскурантом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Дополнительная скидка Сумма (валюта компании)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ошибка: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Пожалуйста, создайте новую учетную запись с Планом счетов бухгалтерского учета."
 DocType: Maintenance Visit,Maintenance Visit,Техническое обслуживание Посетить
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Клиент> Группа клиентов> Территория
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступные Пакетная Кол-во на складе
 DocType: Time Log Batch Detail,Time Log Batch Detail,Время входа Пакетная Подробно
-DocType: Workflow State,Tasks,задачи
 DocType: Landed Cost Voucher,Landed Cost Help,Земельные Стоимость Помощь
-DocType: Event,Tuesday,Вторник
 DocType: Leave Block List,Block Holidays on important days.,Блок Отдых на важных дней.
 ,Accounts Receivable Summary,Дебиторская задолженность Резюме
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листья для типа {0}, уже выделенных на работника {1} для периода {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Имя единица измерения
-DocType: Top Bar Item,Target,цель
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Вклад Сумма
 DocType: Sales Invoice,Shipping Address,Адрес доставки
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Этот инструмент поможет вам обновить или исправить количество и оценку запасов в системе. Это, как правило, используется для синхронизации системных значений и то, что на самом деле существует в ваших складах."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,По словам будет виден только вы сохраните накладной.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Бренд мастер.
-DocType: ToDo,Due Date,Дата выполнения
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Бренд мастер.
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Рамка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организация
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Рамка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организация
 DocType: Monthly Distribution,Monthly Distribution,Ежемесячно дистрибуция
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст. Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производственный план по продажам Заказать
 DocType: Sales Partner,Sales Partner Target,Партнеры по сбыту целям
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Учет Вход для {0} могут быть сделаны только в валюте: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насечка
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материал Заказать орденом
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: возвращенный деталь {1} не существует в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковские счета
 ,Bank Reconciliation Statement,Банковская сверка состояние
 DocType: Address,Lead Name,Ведущий Имя
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Открытие акции Остаток
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Открытие акции Остаток
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} должен появиться только один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для упаковки
 DocType: Shipping Rule Condition,From Value,От стоимости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производство Количество является обязательным
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суммы не отражается в банке
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суммы не отражается в банке
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензии по счет компании.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центробежное литье
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнитное поле при содействии отделка
 DocType: Company,Default Holiday List,По умолчанию Список праздников
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Акции Обязательства
 DocType: Purchase Receipt,Supplier Warehouse,Склад поставщика
 DocType: Opportunity,Contact Mobile No,Связаться Мобильный Нет
 DocType: Production Planning Tool,Select Sales Orders,Выберите заказы на продажу
 ,Material Requests for which Supplier Quotations are not created,"Материал Запросы, для которых Поставщик Котировки не создаются"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Чтобы отслеживать предметы, используя штрих-код. Вы сможете ввести элементы в накладной и счет-фактуру путем сканирования штрих-кода товара."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Отметить как при поставке
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Отметить как при поставке
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Сделать цитаты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
 DocType: SMS Center,Receiver List,Приемник Список
@@ -1378,31 +1276,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Просмотр
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Вычет
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективный лазерного спекания
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Успешно импортированно!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количество должно быть не более {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Возраст (дней)
 DocType: Quotation Item,Quotation Item,Цитата Пункт
 DocType: Account,Account Name,Имя Учетной Записи
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Тип Поставщик мастер.
 DocType: Purchase Order Item,Supplier Part Number,Поставщик Номер детали
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Добавить
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} отменён или остановлен
 DocType: Accounts Settings,Credit Controller,Кредитная контроллер
 DocType: Delivery Note,Vehicle Dispatch Date,Автомобиль Отправка Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,По умолчанию оплачивается аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Настройки для онлайн корзины, такие как правилами перевозок, прайс-лист и т.д."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Объявленный
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Зарезервированное кол-во
 DocType: Party Account,Party Account,Партия аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Кадры
 DocType: Lead,Upper Income,Верхний Доход
 DocType: Journal Entry Account,Debit in Company Currency,Дебет в валюте компании
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мои вопросы
@@ -1411,12 +1305,9 @@
 DocType: Company,Default Values,Значения По Умолчанию
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сумма платежа не может быть отрицательным
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Пресс-фитинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 DocType: Payment Reconciliation,Payments,Оплата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Горячая изостатического прессования
-DocType: ToDo,Medium,Средний
 DocType: Budget Detail,Budget Allocated,"Бюджет, выделенный"
 DocType: Journal Entry,Entry Type,Тип записи
 ,Customer Credit Balance,Заказчик Кредитный Баланс
@@ -1425,12 +1316,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
 DocType: Quotation,Term Details,Срочные Подробнее
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирование мощности в течение (дней)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
 DocType: Warranty Claim,Warranty Claim,Претензия по гарантии
 ,Lead Details,Лид Подробности
-DocType: Authorization Rule,Approving User,Утверждении Пользователь
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Ковка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Обшивка
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
 DocType: Pricing Rule,Applicable For,Применимо для
 DocType: Bank Reconciliation,From Date,С Даты
@@ -1452,64 +1340,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Аукционы в Интернете
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Аукционы в Интернете
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компания, месяц и финансовый год является обязательным"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Одно устройство элемента.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть 'Представленные'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Сделать учета запись для каждого фондовой Движения
 DocType: Leave Allocation,Total Leaves Allocated,Всего Листья Выделенные
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Склад требуется в строке Нет {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Пожалуйста, введите действительный финансовый год даты начала и окончания"
 DocType: Employee,Date Of Retirement,Дата выбытия
 DocType: Upload Attendance,Get Template,Получить шаблон
 DocType: Address,Postal,Почтовый
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Добыча
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Литье смолы
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Пожалуйста, выберите {0} в первую очередь."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
 DocType: Stock Entry,Material Receipt,Материал Поступление
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукты
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Продукты
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партия Тип и Сторона обязана в течение / дебиторская задолженность внимание {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Если этот пункт имеет варианты, то она не может быть выбран в заказах и т.д."
 DocType: Lead,Next Contact By,Следующая Контактные По
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Склад {0} не может быть удален как существует количество для Пункт {1}
 DocType: Quotation,Order Type,Тип заказа
 DocType: Purchase Invoice,Notification Email Address,E-mail адрес для уведомлений
 DocType: Payment Tool,Find Invoices to Match,"Найти счетов, чтобы соответствовать"
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","например ""XYZ Национальный банк """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","например ""XYZ Национальный банк """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Этот налог Входит ли в базовой ставки?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Всего Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Всего Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Корзина включена
 DocType: Job Applicant,Applicant for a Job,Заявитель на вакансию
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Нет Производственные заказы, созданные"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
 DocType: Stock Reconciliation,Reconciliation JSON,Примирение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспорт отчета и распечатать его с помощью приложения электронной таблицы.
 DocType: Sales Invoice Item,Batch No,№ партии
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Основные
-DocType: DocPerm,Delete,Удалить
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Вариант
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новый {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Приостановленный заказ не может быть отменен. Снимите с заказа статус ""Приостановлено"" для отмены"
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
 DocType: Sales Team,Contribution to Net Total,Вклад в Net Всего
 DocType: Sales Invoice Item,Customer's Item Code,Клиентам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Фото со Примирение
@@ -1518,53 +1404,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Заявитель на работу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
-DocType: Country,Country,Страна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреса
-DocType: Communication,Received,Получено
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Условия для правил перевозки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не разрешается иметь производственного заказа.
-DocType: DocField,Attach Image,Прикрепить изображение
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Чистый вес этого пакета. (Автоматический расчет суммы чистой вес деталей)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Оставьте пустым, если никаких изменений"
 DocType: Sales Order,To Deliver and Bill,Чтобы доставить и Билл
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журналы Время для изготовления.
 DocType: Item,Apply Warehouse-wise Reorder Level,Применить Склад-накрест Reorder уровень
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} должны быть представлены
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} должны быть представлены
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Время входа для задач.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Оплата
 DocType: Production Order Operation,Actual Time and Cost,Фактическое время и стоимость
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Обращение
-DocType: Communication,Rejected,Отклоненные
 DocType: Pricing Rule,Brand,Бренд
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle детали на момент продажи.
 DocType: Sales Order Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
 DocType: Quality Inspection Reading,Reading 10,Чтение 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
 DocType: Hub Settings,Hub Node,Узел Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели повторяющихся элементов. Пожалуйста, исправить и попробовать еще раз."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Значение {0} для атрибута {1} не существует в списке действительного значения Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Помощник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Помощник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создание приемника Список
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истек срок действия
 DocType: Packing Slip,To Package No.,Для пакета №
-DocType: DocType,System,Система
 DocType: Warranty Claim,Issue Date,Дата выдачи
 DocType: Activity Cost,Activity Cost,Стоимость активность
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потребляемая Кол-во
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекоммуникации
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекоммуникации
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 DocType: Payment Tool,Make Payment Entry,Произвести оплату запись
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Расходная накладная тенденции
 DocType: Leave Application,Apply / Approve Leaves,Применить / Утвердить Листья
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Для
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 DocType: Stock Settings,Allowance Percent,Резерв Процент
@@ -1576,33 +1457,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продажа должна быть проверена, если выбран Применимо для как {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Поставщик Цитата Пункт
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Сделать Зарплата Структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Сдвиг
 DocType: Item,Has Variants,Имеет Варианты
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Нажмите на кнопку ""Создать Расходная накладная», чтобы создать новый счет-фактуру."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка и маркировка
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Секретный ключ
 DocType: Purchase Invoice,Recurring Invoice,Периодическое Счет
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управление проектами
 DocType: Supplier,Supplier of Goods or Services.,Поставщик товаров или услуг.
 DocType: Budget Detail,Fiscal Year,Отчетный год
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Достигнутый
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Достигнутый
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Область / клиентов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"например, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Ряд {0}: суммы, выделенной {1} должен быть меньше или равен счета-фактуры сумма задолженности {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,"например, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Ряд {0}: суммы, выделенной {1} должен быть меньше или равен счета-фактуры сумма задолженности {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По словам будет виден только вы сохраните Расходная накладная.
 DocType: Item,Is Sales Item,Является продаж товара
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Техническое обслуживание Время
 ,Amount to Deliver,Сумма Доставка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или сервис
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Были ошибки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Нажатие
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Продукт или сервис
 DocType: Naming Series,Current Value,Текущее значение
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против заказ клиента
@@ -1617,15 +1493,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сайт Пункт Группа
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплаты не могут быть отфильтрованы по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица для элемента, который будет показан на веб-сайте"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляется Кол-во
 DocType: Material Request Item,Material Request Item,Материал Запрос товара
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево товарные группы.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Дерево товарные группы.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
 ,Item-wise Purchase History,Пункт мудрый История покупок
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Красный
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Красный
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
@@ -1635,12 +1511,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Режим {1} не завершены {2} Кол-во готовой продукции в производстве Приказ № {3}. Пожалуйста, обновите статус работы через журнал времени"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Изменение UOM для элемента.
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерий приемлемости
 DocType: Item Attribute,Attribute Name,Имя атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} должно быть продажи или в пункте СЕРВИС {1}
 DocType: Item Group,Show In Website,Показать на сайте
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Группа
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Группа
 DocType: Task,Expected Time (in hours),Ожидаемое время (в часах)
 ,Qty to Order,Кол-во в заказ
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Для отслеживания бренд в следующие документы накладной, редкая возможность, материал запрос, Пункт, покупка заказ, покупка ваучера, Покупатель получении, Котировальный, накладная, товаров Bundle, Продажи заказа, Серийный номер"
@@ -1649,78 +1524,67 @@
 DocType: Holiday List,Clear Table,Очистить таблицу
 DocType: Features Setup,Brands,Бренды
 DocType: C-Form Invoice Detail,Invoice No,Счет-фактура Нет
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,От Заказа
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,От Заказа
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставьте не могут быть применены / отменены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
 DocType: Activity Cost,Costing Rate,Калькуляция Оценить
 ,Customer Addresses And Contacts,Адреса клиентов и Контакты
 DocType: Employee,Resignation Letter Date,Отставка Письмо Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не указано
-DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторите Выручка клиентов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Сиди, пока система в настоящее время установки. Это может занять несколько секунд."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Утверждающего Расходы"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Носите
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Носите
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 DocType: Item,Has Batch No,"Имеет, серия №"
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
 DocType: Employee,Personal Details,Личные Данные
 ,Maintenance Schedules,Графики технического обслуживания
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Чеканка
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Присоединение
-DocType: Authorization Rule,Above Value,Выше стоимости
 ,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
 DocType: Purchase Order,Delivered,Доставлено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор. (Например jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всего выделенные листья {0} не может быть меньше, чем уже утвержденных листьев {1} за период"
 DocType: Journal Entry,Accounts Receivable,Дебиторская задолженность
 ,Supplier-Wise Sales Analytics,Поставщик-Wise продаж Аналитика
 DocType: Address Template,This format is used if country specific format is not found,"Этот формат используется, если конкретный формат страна не найден"
-DocType: Custom Field,Custom,Пользовательские
 DocType: Production Order,Use Multi-Level BOM,Использование Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Литье под давлением
 DocType: Bank Reconciliation,Include Reconciled Entries,Включите примириться Записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Оставьте пустым, если считать для всех типов сотрудников"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Распределите плату на основе
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа 'Основные средства', товар {1} является активом"
 DocType: HR Settings,HR Settings,Настройки HR
-apps/frappe/frappe/config/setup.py +130,Printing,Печать
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходов претензии ожидает одобрения. Только расходов утверждающий можете обновить статус.
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни), на котором вы подаете заявление на отпуск, отпуск. Вам не нужно обратиться за разрешением."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Общий фактический
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Единица
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Пожалуйста, установите ключи доступа Dropbox на своем сайте конфигурации"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Пожалуйста, сформулируйте Компания"
 ,Customer Acquisition and Loyalty,Приобретение и лояльности клиентов
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, где вы работаете запас отклоненных элементов"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваш финансовый год заканчивается
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваш финансовый год заканчивается
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходные Претензии
 DocType: Issue,Support,Поддержка
-DocType: Authorization Rule,Approving Role,Утверждении Роль
 ,BOM Search,Спецификация Поиск
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закрытие (открытие + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Пожалуйста, сформулируйте валюту в обществе"
 DocType: Workstation,Wages per hour,Заработная плата в час
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Фото баланс в пакетном {0} станет отрицательным {1} для п {2} на складе {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Показать / скрыть функции, такие как последовательный Нос, POS и т.д."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должны быть {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следующий материал запросы были подняты автоматически в зависимости от уровня повторного заказа элемента
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должны быть {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Вычет
 DocType: Address Template,Address Template,Шаблон адреса
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
@@ -1732,76 +1596,68 @@
 DocType: Opportunity,Quotation,Расценки
 DocType: Salary Slip,Total Deduction,Всего Вычет
 DocType: Quotation,Maintenance User,Уход за инструментом
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Стоимость Обновлено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Стоимость Обновлено
 DocType: Employee,Date of Birth,Дата рождения
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискальный год** представляет собой финансовый год. Все бухгалтерские записи и другие крупные сделки отслеживаются по **Фискальному году**.
 DocType: Opportunity,Customer / Lead Address,Заказчик / Ведущий Адрес
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описание Работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описание Работы
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол-во в соответствии со UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Пожалуйста, выберите правильный файл CSV с данными"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Покрытие
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите продаж кампаний. Следите за проводами, цитаты, заказа на закупку и т.д. из кампаний, чтобы оценить отдачу от инвестиций. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следите продаж кампаний. Следите за проводами, цитаты, заказа на закупку и т.д. из кампаний, чтобы оценить отдачу от инвестиций."
 DocType: Expense Claim,Approver,Утверждаю
 ,SO Qty,ТАК Кол-во
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток есть записи с склада {0}, следовательно, вы не сможете повторно назначить или изменить Склад"
 DocType: Appraisal,Calculate Total Score,Рассчитать общую сумму
 DocType: Supplier Quotation,Manufacturing Manager,Производство менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Поставки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Окунитесь литье
-DocType: Purchase Order,To be delivered to customer,Для поставляться заказчику
+apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
+DocType: Purchase Order Item,To be delivered to customer,Для поставляться заказчику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Время входа Статус должен быть представлен.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серийный номер {0} не принадлежит ни к одной Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Настройка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте)
 DocType: Pricing Rule,Supplier,Поставщик
 DocType: C-Form,Quarter,Квартал
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Прочие расходы
 DocType: Global Defaults,Default Company,Компания по умолчанию
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
 DocType: Employee,Bank Name,Название банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Выше
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Пользователь {0} отключен
 DocType: Leave Application,Total Leave Days,Всего Оставить дней
-DocType: Journal Entry Account,Credit in Account Currency,Кредит в валюте Счета
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примечание: E-mail не будет отправлен отключенному пользователю
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Из валюты
-DocType: DocField,Name,Имя
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суммы не отражается в системе
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Суммы не отражается в системе
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Другое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Другое
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете найти соответствующий пункт. Пожалуйста, выберите другое значение для {0}."
 DocType: POS Profile,Taxes and Charges,Налоги и сборы
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт или услуга, которая покупается, продается, или хранятся на складе."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завершено
-DocType: Web Form,Select DocType,Выберите тип документа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банковские операции
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банковские операции
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новый Центр Стоимость
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Новый Центр Стоимость
 DocType: Bin,Ordered Quantity,Заказанное количество
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","например ""Построить инструменты для строителей """
 DocType: Quality Inspection,In Process,В процессе
 DocType: Authorization Rule,Itemwise Discount,Itemwise Скидка
 DocType: Purchase Order Item,Reference Document Type,Ссылка Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против заказов клиентов {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против заказов клиентов {1}
 DocType: Account,Fixed Asset,Исправлена активами
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серийный Инвентарь
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серийный Инвентарь
 DocType: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 DocType: Time Log Batch,Total Billing Amount,Всего счетов Сумма
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Дебиторская задолженность аккаунт
@@ -1809,19 +1665,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажи Приказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Расходов претензии Подробно
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журналы Время создания:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Employee,Blood Group,Группа крови
 DocType: Purchase Invoice Item,Page Break,Разрыв страницы
 DocType: Production Order Operation,Pending,В ожидании
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Пользователи, которые могут утвердить отпуска приложения конкретного работника"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Вы не можете изменить по умолчанию Единица измерения варианта. Чтобы изменить стандартную UOM для Variant изменение по умолчанию Единица измерения шаблона
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол-во
 DocType: Fiscal Year,Companies,Компании
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Электроника
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Электроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Поднимите Материал запрос когда шток достигает уровня переупорядочиваем
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,С графиком технического обслуживания
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Полный рабочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Полный рабочий день
 DocType: Purchase Invoice,Contact Details,Контактная информация
 DocType: C-Form,Received Date,Поступило Дата
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Если вы создали стандартный шаблон в продажах налоги и сборы шаблон, выберите одну и нажмите на кнопку ниже."
@@ -1833,14 +1689,15 @@
 DocType: Job Applicant,Job Opening,Работа Открытие
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирение
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технология
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 DocType: Offer Letter,Offer Letter,Предложение письмо
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Создать запросы Материал (ППМ) и производственных заказов.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Всего в счете-фактуре Amt
 DocType: Time Log,To Time,Чтобы время
+DocType: Authorization Rule,Approving Role (above authorized value),Утверждении роль (выше уставного стоимости)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Чтобы добавить дочерние узлы, изучить дерево и нажмите на узле, при которых вы хотите добавить больше узлов."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завершено Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
@@ -1850,12 +1707,10 @@
 DocType: Item,Customer Item Codes,Заказчик Предмет коды
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Создание записей оплаты по заказам или счетов-фактур.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Сварка
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,На все товары уже выставлены счета
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,На все товары уже выставлены счета
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Пожалуйста, сформулируйте действительный 'От делу №'"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
 DocType: Features Setup,Item Serial Nos,Пункт Серийный Нос
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения
@@ -1865,15 +1720,13 @@
 DocType: Bin,Actual Quantity,Фактическое Количество
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серийный номер {0} не найден
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваши клиенты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Прессование
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Ваши клиенты
 DocType: Leave Block List Date,Block Date,Блок Дата
 DocType: Sales Order,Not Delivered,Не доставлен
 ,Bank Clearance Summary,Банк уплата по счетам итого
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные, еженедельные и ежемесячные дайджесты новостей."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Код товара> Товар Группа> Бренд
 DocType: Appraisal Goal,Appraisal Goal,Оценка Гол
-DocType: Event,Friday,Пятница
 DocType: Time Log,Costing Amount,Калькуляция Сумма
 DocType: Process Payroll,Submit Salary Slip,Представьте Зарплата Слип
 DocType: Salary Structure,Monthly Earning & Deduction,Ежемесячный Заработок & Вычет
@@ -1881,16 +1734,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Импорт наливом
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
 DocType: SMS Log,Sender Name,Имя отправителя
-DocType: Page,Title,Заголовок
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Выполнять по индивидуальному заказу
 DocType: POS Profile,[Select],[Выберите]
 DocType: SMS Log,Sent To,Отправить
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Сделать Расходная накладная
 DocType: Company,For Reference Only.,Только для справки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Неверный {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Неверный {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Предварительная сумма
 DocType: Manufacturing Settings,Capacity Planning,Планирование мощностей
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"Поле ""С даты"" является обязательным для заполнения"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"Поле ""С даты"" является обязательным для заполнения"
 DocType: Journal Entry,Reference Number,Номер для ссылок
 DocType: Employee,Employment Details,Подробности по трудоустройству
 DocType: Employee,New Workplace,Новый Место работы
@@ -1905,7 +1756,7 @@
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
 DocType: Item,End of Life,Конец срока службы
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Путешествия
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Путешествия
 DocType: Leave Block List,Allow Users,Разрешить пользователям
 DocType: Purchase Order,Customer Mobile No,Заказчик Мобильная Нет
 DocType: Sales Invoice,Recurring,Периодическая
@@ -1913,23 +1764,21 @@
 DocType: Rename Tool,Rename Tool,Переименование файлов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,О передаче материала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
 DocType: Installation Note,Installation Note,Установка Примечание
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Добавить налоги
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Добавить налоги
 ,Financial Analytics,Финансовая аналитика
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
 DocType: Quality Inspection,Purchase Receipt No,Покупка Получение Нет
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Задаток
-DocType: System Settings,In Hours,В час
 DocType: Process Payroll,Create Salary Slip,Создание Зарплата Слип
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Ожидаемое сальдо по состоянию на банк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полировка
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Ожидаемое сальдо по состоянию на банк
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования (обязательства)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Сотрудник
@@ -1942,15 +1791,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Sales Invoice,Mass Mailing,Массовая рассылка
-DocType: Page,Standard,Стандартный
 DocType: Rename Tool,File to Rename,Файл Переименовать
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показать платежи
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Размер
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 DocType: Notification Control,Expense Claim Approved,Расходов претензии Утверждено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Стоимость купленных изделий
 DocType: Selling Settings,Sales Order Required,Заказ на продажу Требуемые
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Создание клиентов
@@ -1960,30 +1807,25 @@
 DocType: Quality Inspection Reading,Reading 9,Чтение 9
 DocType: Supplier,Is Frozen,Замерз
 DocType: Buying Settings,Buying Settings,Настройка покупки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Масса отделка
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM номер для позиции готового изделия
 DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор. (Например sales@example.com)
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Tool,Payment Account,Оплата счета
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Черновик
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Принято
-DocType: User,Female,Жен
-DocType: Journal Entry Account,Debit in Account Currency,Дебет в валюте счета
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
-DocType: Print Settings,Modern,"модные,"
-DocType: Communication,Replied,Ответил
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
 DocType: Payment Tool,Total Payment Amount,Общая сумма оплаты
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сырье не может быть пустым.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Сырье не может быть пустым.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Как есть существующие биржевые операции по этому пункту, \ вы не можете изменить значения &#39;Имеет серийный номер &quot;,&quot; Имеет Batch Нет »,« Является ли со Пункт &quot;и&quot; Оценка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Быстрый журнал запись
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
@@ -1991,17 +1833,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запросы на предметы.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Отдельный производственный заказ будет создан для каждого готового хорошего пункта.
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершение установки
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожена до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Рассылка список рассылки
 DocType: Delivery Note,Transporter Name,Transporter Имя
+DocType: Authorization Rule,Authorized Value,Уставный Значение
 DocType: Contact,Enter department to which this Contact belongs,"Введите отдел, к которому принадлежит этого контакт"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всего Отсутствует
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Единица Измерения
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Единица Измерения
 DocType: Fiscal Year,Year End Date,Дата окончания года
 DocType: Task Depends On,Task Depends On,Задачи зависит от
 DocType: Lead,Opportunity,Возможность
@@ -2022,16 +1864,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (как в фондовой UOM)
 DocType: SMS Log,No of Requested SMS,Нет запрашиваемых SMS
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронзительный
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третья сторона дистрибьютор / дилер / комиссионер / филиал / реселлера, который продает продукты компании для комиссии."
 DocType: Customer Group,Has Child Node,Имеет дочерний узел
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против Заказа {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введите статические параметры адрес здесь (Например отправитель = ERPNext, имя пользователя = ERPNext, пароль = 1234 и т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, ни в каком-либо активном финансовом году. Для более подробной информации проверить {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старение Диапазон 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохимические обработки
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2073,11 +1914,9 @@
  8. Введите Row: Если на базе ""Предыдущая сумма по строке"" вы можете выбрать номер строки которой будет приниматься в качестве основы для такого расчета (по умолчанию предыдущего ряда).
  9. Рассмотрим налог или сбор для: В этом разделе вы можете указать, будет ли налог / налог на сбор только для оценки (не часть от общей суммы) или только для общей (не добавляет ценности объект) или для обоих.
  10. Добавить или вычесть: Если вы хотите, чтобы добавить или вычесть налог."
-DocType: Note,Note,Заметка
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
-DocType: Email Account,Email Ids,E-mail идентификаторы
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Фото Элемент {0} не представлены
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Биллинг Город
 DocType: Global Defaults,Hide Currency Symbol,Скрыть Символ Валюты
@@ -2085,40 +1924,36 @@
 DocType: Journal Entry,Credit Note,Кредит-нота
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Завершен Кол-во не может быть больше {0} для работы {1}
 DocType: Features Setup,Quality,Качество
-DocType: Contact Us Settings,Introduction,Введение
 DocType: Warranty Claim,Service Address,Адрес сервисного центра
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Максимальное 100 строк на фондовом примирения.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Максимальное 100 строк на фондовом примирения.
 DocType: Stock Entry,Manufacture,Производство
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Пожалуйста, накладной первый"
 DocType: Purchase Invoice,Currency and Price List,Валюта и прайс-лист
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Производство
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Клиренс Дата не упоминается
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Производство
 DocType: Item,Allow Production Order,Разрешить производственного заказа
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
 DocType: Installation Note Item,Installed Qty,Установленная Кол-во
 DocType: Lead,Fax,Факс:
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Представленный
 DocType: Salary Structure,Total Earning,Всего Заработок
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мои Адреса
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организация филиал мастер.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,По умолчанию Покупка Прайс-лист
-,Download Backups,Скачать Резервные копии
 DocType: Notification Control,Sales Order Message,Заказ на продажу Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Вид оплаты
 DocType: Process Payroll,Select Employees,Выберите Сотрудники
 DocType: Bank Reconciliation,To Date,Чтобы Дата
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Подробности
 DocType: Purchase Invoice,Total Taxes and Charges,Всего Налоги и сборы
 DocType: Employee,Emergency Contact,Экстренная связь
 DocType: Item,Quality Parameters,Параметры качества
@@ -2133,6 +1968,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
 DocType: Product Bundle,Parent Item,Родитель Пункт
 DocType: Account,Account Type,Тип учетной записи
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Оставьте Тип {0} не может быть перенос направлен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
@@ -2140,33 +1976,28 @@
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка чеков товары
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Настройка формы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Резка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Уплощение
 DocType: Account,Income Account,Счет Доходов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Документы
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,N
 DocType: Cost Center,Cost Center,Центр учета затрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Заказ на сообщение
 DocType: Tax Rule,Shipping Country,Доставка Страна
 DocType: Upload Attendance,Upload HTML,Загрузить HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Всего продвижение ({0}) Под заказ {1} не может быть больше \
  чем ВСЕГО ({2})"
 DocType: Employee,Relieving Date,Освобождение Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
 DocType: Employee Education,Class / Percentage,Класс / в процентах
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Подоходный налог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Лазерная инженерии чистый формирование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Подоходный налог
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Если выбран Цены правила делается для ""цена"", это приведет к перезаписи прайс-лист. Цены Правило цена окончательная цена, поэтому никакого скидка не следует применять. Таким образом, в таких сделках, как заказ клиента, Заказ и т.д., это будет выбрано в поле 'Rate', а не поле ""Прайс-лист Rate '."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
@@ -2174,10 +2005,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Акции Настройки
-DocType: User,Bio,Ваша Биография
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Новый Центр Стоимость Имя
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Нет умолчанию Адрес шаблона не найдено. Пожалуйста, создайте новый из Setup> Печать и брендинга> Адресная шаблон."
 DocType: Appraisal,HR User,HR Пользователь
@@ -2189,31 +2019,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
 DocType: Supplier,Billing Currency,Платежная валют
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Очень Большой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Очень Большой
 ,Profit and Loss Statement,Счет прибылей и убытков
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Количество
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Прессование
 DocType: Payment Tool Detail,Payment Tool Detail,"Деталь платежный инструмент,"
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Всего очков
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Локальные
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы (активы)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Должники
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Большой
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Сотрудник не найден!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Большой
 DocType: C-Form Invoice Detail,Territory,Территория
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Purchase Order,Customer Address Display,Заказчик Адрес Показать
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полировка
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что \ вы уже сделали некоторые сделки (сделок) с другим UOM. Чтобы изменить стандартную UOM, \ использование &quot;Единица измерения Заменить Utility &#39;инструмент под фондовой модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Укажите Курс конвертировать одну валюту в другую
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Общей суммой задолженности
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1}. Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Цели
@@ -2221,14 +2045,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Сделать временной лаг
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Пожалуйста, установите количество тональный"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Применимо для стран
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Электро-химический шлифование
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Пожалуйста, установите свой план счетов, прежде чем начать бухгалтерских проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Игнорировать Цены Правило
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отменено
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"С даты зарплаты структура не может быть меньше, чем Сотрудника Присоединение Дата."
 DocType: Employee Education,Graduate,Выпускник
 DocType: Leave Block List,Block Days,Блок дня
@@ -2265,7 +2088,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Убедитесь в том, повторяющихся счет, снимите, чтобы остановить повторяющиеся или поставить правильное Дата окончания"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Максимальные {0} строк разрешено
 DocType: C-Form Invoice Detail,Net Total,Чистая Всего
 DocType: Bin,FCFS Rate,FCFS Оценить
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Биллинг (счет-фактуру)
@@ -2282,20 +2104,19 @@
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,По крайней мере один элемент должен быть введен с отрицательным количеством в обратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Анодно-химическая обработка
 ,Requested,Запрошено
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Нет Замечания
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Просроченный
 DocType: Account,Stock Received But Not Billed,"Фото со получен, но не Объявленный"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корень аккаунт должна быть группа
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Валовой Платное + просроченной задолженности суммы + Инкассация Сумма - Всего Вычет
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 DocType: Features Setup,Sales and Purchase,Купли-продажи
 DocType: Supplier Quotation Item,Material Request No,Материал Запрос Нет
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Скорость, с которой валюта клиента превращается в базовой валюте компании"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} успешно отписались от этого списка.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистая скорость (Компания валют)
-apps/frappe/frappe/templates/base.html +134,Added,Добавленной
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Территория дерево.
 DocType: Journal Entry Account,Sales Invoice,Счет по продажам
 DocType: Journal Entry Account,Party Balance,Баланс партия
@@ -2309,11 +2130,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Финансовый год {0} не найден.
 DocType: Bank Reconciliation,Get Relevant Entries,Получить соответствующие записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Бухгалтерский учет Вход для запасе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продаж
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
-apps/frappe/frappe/desk/query_report.py +136,Total,Общая сумма
 DocType: Purchase Invoice,Apply Additional Discount On,Применить Дополнительная скидка на
 DocType: Account,Root Type,Корневая Тип
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
@@ -2323,14 +2142,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сумма налога после скидки Сумма (Компания валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Контроль качества
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формирования
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Очень Маленький
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL или BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимальный уровень запасов
 DocType: Stock Entry,Subcontract,Субподряд
@@ -2341,42 +2159,39 @@
 DocType: Item,Manufacturer Part Number,Номенклатурный код производителя
 DocType: Production Order Operation,Estimated Time and Cost,Расчетное время и стоимость
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Капотирование
 DocType: SMS Log,No of Sent SMS,Нет отправленных SMS
 DocType: Account,Company,Организация
 DocType: Account,Expense Account,Расходов счета
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Программное обеспечение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Цвет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Программное обеспечение
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Цвет
 DocType: Maintenance Visit,Scheduled,Запланированно
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Пожалуйста, выберите пункт, где &quot;ли со Пункт&quot; &quot;Нет&quot; и &quot;является продажа товара&quot; &quot;Да&quot;, и нет никакой другой Связка товаров"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Выберите ежемесячное распределение к неравномерно распределять цели по различным месяцам.
 DocType: Purchase Invoice Item,Valuation Rate,Оценка Оцените
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Пункт Row {0}: Покупка Получение {1}, не существует в таблице выше ""Купить ПОСТУПЛЕНИЯ"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата начала проекта
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Переименовать Входить
 DocType: Installation Note Item,Against Document No,Против Документ №
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Управление партнеры по сбыту.
 DocType: Quality Inspection,Inspection Type,Инспекция Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Пожалуйста, выберите {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Исследователь
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Обновить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Исследователь
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Пожалуйста, сохраните бюллетень перед отправкой"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Имя E-mail или является обязательным
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Входной контроль качества.
 DocType: Purchase Order Item,Returned Qty,Вернулся Кол-во
 DocType: Employee,Exit,Выход
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корневая Тип является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корневая Тип является обязательным
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибрационный отделка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для удобства клиентов, эти коды могут быть использованы в печатных форматов, таких как счета-фактуры и накладных"
 DocType: Employee,You can enter any date manually,Вы можете ввести любую дату вручную
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Испытательный Срок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Испытательный Срок
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Только листовые узлы допускаются в сделке
 DocType: Expense Claim,Expense Approver,Расходы утверждающим
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Получение товара Поставляется
@@ -2384,43 +2199,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Измельчение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочную пленку
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В ожидании Деятельность
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Подтвердил
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Поставщик > Тип поставщика
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетных издателей
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетных издателей
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Выберите финансовый год
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Выплавка
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Attendance,Attendance Date,Посещаемость Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата распада на основе Заработок и дедукции.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не может быть преобразован в регистр
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не может быть преобразован в регистр
 DocType: Address,Preferred Shipping Address,Популярные Адрес доставки
 DocType: Purchase Receipt Item,Accepted Warehouse,Принимающий склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата публикации
 DocType: Item,Valuation Method,Метод оценки
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Невозможно найти обменный курс {0} до {1}
 DocType: Sales Invoice,Sales Team,Отдел продаж
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Дублировать запись
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дублировать запись
 DocType: Serial No,Under Warranty,Под гарантии
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Ошибка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По словам будет виден только вы сохраните заказ клиента.
 ,Employee Birthday,Сотрудник День рождения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Венчурный капитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурный капитал
 DocType: UOM,Must be Whole Number,Должно быть Целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладной
-apps/erpnext/erpnext/hooks.py +70,Orders,Заказы
+apps/erpnext/erpnext/hooks.py +54,Orders,Заказы
 DocType: Leave Control Panel,Employee Type,Сотрудник Тип
 DocType: Employee Leave Approver,Leave Approver,Оставьте утверждающего
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Ковка
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Материал, переданный для производства"
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Пользователь с ""Расходы утверждающий"" роли"
 ,Issued Items Against Production Order,Выпущенные товары против производственного заказа
@@ -2432,7 +2244,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неверный период
 DocType: Customer,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Выберите тип сделки
 DocType: GL Entry,Voucher No,Ваучер №
@@ -2442,35 +2253,33 @@
 DocType: Customer,Address and Contact,Адрес и контактная
 DocType: Customer,Last Day of the Next Month,Последний день следующего месяца
 DocType: Employee,Feedback,Обратная связь
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставить не могут быть выделены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. График
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивной обработки струя
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. График
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
-DocType: Website Settings,Website Settings,Настройки сайта
 DocType: Item,Reorder level based on Warehouse,Уровень Изменение порядка на основе Склад
 DocType: Activity Cost,Billing Rate,Платежная Оценить
 ,Qty to Deliver,Кол-во для доставки
 DocType: Monthly Distribution Percentage,Month,Mесяц
-,Stock Analytics, Анализ запасов
+,Stock Analytics,Анализ запасов
 DocType: Installation Note Item,Against Document Detail No,Против деталях документа Нет
 DocType: Quality Inspection,Outgoing,Исходящий
 DocType: Material Request,Requested For,Запрашиваемая Для
 DocType: Quotation Item,Against Doctype,Против Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Подписка на Delivery Note против любого проекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показать изображения в дневнике
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управление адресов
 DocType: Pricing Rule,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
 DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
-DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закрытие (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закрытие (д-р)
 DocType: Contact,Passive,Пассивный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
@@ -2486,10 +2295,9 @@
 ,Billed Amount,Счетов выдано количество
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Получить обновления
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Добавить несколько пробных записей
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Добавить несколько пробных записей
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставить управления
-DocType: Event,Groups,Группы
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Полностью Поставляются
 DocType: Lead,Lower Income,Нижняя Доход
@@ -2498,40 +2306,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Быстрая помощь
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
 DocType: Features Setup,Sales Extras,Продажи Дополнительно
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} к МВЗ {2} будет превышать {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} к МВЗ {2} будет превышать {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 ,Stock Projected Qty,Фото со Прогнозируемый Количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значение или Кол-во
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Минута
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
 ,Qty to Receive,Кол-во на получение
 DocType: Leave Block List,Leave Block List Allowed,Оставьте Черный список животных
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коэффициент пересчета не может быть в долях
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Вы будете использовать его в Вход
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Вы будете использовать его в Вход
 DocType: Sales Partner,Retailer,Розничный торговец
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Все типы поставщиков
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк овердрафтовый счет
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Сделать Зарплата Слип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Просмотр спецификации
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие продукты
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие продукты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Открытие Баланс акций
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете одобрить отпуск, пока вы не уполномочен утверждать листья на блоке Даты"
 DocType: Appraisal,Appraisal,Оценка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Литья по выплавляемым пены
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Рисунок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторяется
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Право подписи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Workstation Working Hour,Start Time,Время
@@ -2545,12 +2350,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (Компания валют)
 DocType: BOM Operation,Hour Rate,Часовой разряд
 DocType: Stock Settings,Item Naming By,Пункт Именование По
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Из цитаты
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Из цитаты
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материал переведен на Производство
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Счет {0} не существует
 DocType: Purchase Receipt Item,Purchase Order Item No,Заказ товара Нет
-DocType: System Settings,System Settings,Настройки системы
 DocType: Project,Project Type,Тип проекта
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Стоимость различных видов деятельности
@@ -2559,36 +2363,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
 DocType: Sales Order,Fully Billed,Полностью Объявленный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + упаковочный материал вес. (Для печати)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
 DocType: Serial No,Is Cancelled,Является Отмененные
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мои заказы
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мои заказы
 DocType: Journal Entry,Bill Date,Дата оплаты
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
-DocType: Communication,Recipients,Получатели
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Завинчивание
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Накатки
 DocType: Expense Claim,Approval Status,Статус утверждения
 DocType: Hub Settings,Publish Items to Hub,Опубликовать товары в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше, чем значение в строке {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банковский перевод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Пожалуйста, выберите банковский счет"
 DocType: Newsletter,Create and Send Newsletters,Создание и отправка рассылки
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"С даты должны быть, прежде чем к дате"
 DocType: Sales Order,Recurring Order,Периодическая Заказать
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Группа клиентов / клиентов
 DocType: Item Group,Check this if you want to show in website,"Проверьте это, если вы хотите показать в веб-сайт"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добро пожаловать в ERPNext
+,Welcome to ERPNext,Добро пожаловать в ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Деталь Количество
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Привести к поставщику
 DocType: Lead,From Customer,От клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Звонки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото со UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,Проектированный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по-доставки и избыточного бронирования по пункту {0} как количестве 0
@@ -2596,13 +2396,10 @@
 DocType: Issue,Opening Date,Открытие Дата
 DocType: Journal Entry,Remark,Примечание
 DocType: Purchase Receipt Item,Rate and Amount,Ставку и сумму
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Скучный
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,От заказа клиента
-DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Не Объявленный
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Склад должены принадлежать одной Компании
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Нет контактов Пока еще не добавлено.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не действует
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Земельные стоимости путевки сумма
 DocType: Time Log,Batched for Billing,Укомплектовать для выставления счета
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекты, поднятые поставщиков."
@@ -2610,20 +2407,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"например, НДС"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"например, НДС"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Горячая металла газа формирования
 DocType: Sales Order Item,Sales Order Date,Продажи Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляется Кол-во
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Перейти к соответствующей группе (обычно источник средств&gt; Краткосрочные обязательства&gt; налогам и сборам и создать новую учетную запись (нажав на Добавить Ребенка) типа &quot;Налог&quot; и упоминают ставка налога.
 ,Payment Period Based On Invoice Date,Оплата период на основе Накладная Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерная резка
-DocType: Event,Monday,Понедельник
 DocType: Journal Entry,Stock Entry,Складская запись
 DocType: Account,Payable,К оплате
 DocType: Salary Slip,Arrear Amount,Просроченной задолженности Сумма
@@ -2636,7 +2430,6 @@
 DocType: Lead,Address Desc,Адрес по убыванию
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Где производственные операции проводятся.
-DocType: Page,All,Все
 DocType: Stock Entry Detail,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
 DocType: Employee,Confirmation Date,Дата подтверждения
@@ -2644,9 +2437,8 @@
 DocType: Account,Sales User,Продажи пользователя
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Мин Кол-во не может быть больше, чем максимальное Кол-во"
 DocType: Stock Entry,Customer or Supplier Details,Заказчик или Поставщик Подробности
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Задать
 DocType: Lead,Lead Owner,Ведущий Владелец
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Семейное положение
 DocType: Stock Settings,Auto Material Request,Авто Материал Запрос
 DocType: Time Log,Will be updated when billed.,Будет обновляться при счет.
@@ -2660,44 +2452,40 @@
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Заказ товара Поставляется
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Название компании не может быть компания
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Титулы для шаблонов печати, например, счет-проформа."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновление стока
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфиниширование
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто. Убедитесь, что вес нетто каждого элемента находится в том же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запись всех коммуникаций типа электронной почте, телефону, в чате, посещение и т.д."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Пожалуйста, укажите округлить МВЗ в компании"
 DocType: Purchase Invoice,Terms,Термины
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Создать новый
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Создать новый
 DocType: Buying Settings,Purchase Order Required,"Покупка порядке, предусмотренном"
 ,Item-wise Sales History,Пункт мудрый История продаж
 DocType: Expense Claim,Total Sanctioned Amount,Всего Санкционированный Количество
 ,Purchase Analytics,Покупка Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Доставка Примечание Пункт
 DocType: Expense Claim,Task,Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бритье
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка строка #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серийный номер является обязательным для п {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Это корень продавец и не могут быть изменены.
 ,Stock Ledger,Книга учета акций
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Оценить: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оценить: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата скольжения Вычет
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Заметки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Выберите узел группы в первую очередь.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заполните форму и сохранить его
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Скачать отчет содержащий все материал со статусом  последней инвентаризации
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Облицовочный
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Оставьте баланс перед нанесением
 DocType: SMS Center,Send SMS,Отправить SMS
 DocType: Company,Default Letter Head,По умолчанию бланке
 DocType: Time Log,Billable,Оплачиваемый
-DocType: Authorization Rule,This will be used for setting rule in HR module,Эта информация будет использоваться для установки правило в модуле HR
 DocType: Account,Rate at which this tax is applied,"Скорость, с которой этот налог применяется"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Изменить порядок Кол-во
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
@@ -2709,12 +2497,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Возможность Забыли
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Скидка Поля будут доступны в заказе на, покупка получение, в счете-фактуре"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Имя нового Пользователя. Примечание: Пожалуйста, не создавать учетные записи для клиентов и поставщиков"
-DocType: Report,Report Type,Тип отчета
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Идёт загрузка
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Заменить Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Шаблоны Страна мудрый адрес по умолчанию
 DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Показать налог распад
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Импорт и экспорт данных
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Если вы привлечь в производственной деятельности. Включает элемент 'производится'
@@ -2724,16 +2510,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Serial No,Out of AMC,Из КУА
 DocType: Purchase Order Item,Material Request Detail No,Материал Запрос Деталь №
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Жесткий поворотным
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
 DocType: Company,Default Cash Account,Расчетный счет по умолчанию
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым Номером Партии для позиции {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Примечание: Если оплата не будет произведена в отношении какой-либо ссылки, чтобы запись журнала вручную."
 DocType: Item,Supplier Items,Поставщик товары
 DocType: Opportunity,Opportunity Type,Возможность Тип
@@ -2745,7 +2530,7 @@
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старение запасов
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' отключен
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправить автоматические письма на Контакты О представлении операций.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2753,59 +2538,51 @@
  Доступно Кол-во: {4}, трансфер Количество: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
-DocType: Event,Sunday,Воскресенье
 DocType: Sales Team,Contribution (%),Вклад (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обязанности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Обязанности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Человек по продажам Имя
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Добавить пользователей
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Добавить пользователей
 DocType: Pricing Rule,Item Group,Пункт Группа
 DocType: Task,Actual Start Date (via Time Logs),Фактическая дата начала (с помощью журналов Time)
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
 DocType: Item,Default BOM,По умолчанию BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
 DocType: Time Log Batch,Total Hours,Общее количество часов
 DocType: Journal Entry,Printing Settings,Настройки печати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобилестроение
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Металл литья под давлением
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из накладной
 DocType: Time Log,From Time,От времени
 DocType: Notification Control,Custom Message,Текст сообщения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Выберите страну, часовой пояс и валюта"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционно-банковская деятельность
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Маринование
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Литье в песчаные
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Гальванопокрытие
 DocType: Purchase Invoice Item,Rate,Оценить
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Стажер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Стажер
 DocType: Newsletter,A Lead with this email id should exist,Руководитеть с таким email должен существовать
 DocType: Stock Entry,From BOM,Из спецификации
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основной
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Биржевые операции до {0} заморожены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Чтобы Дата должна быть такой же, как С даты в течение половины дня отпуска"
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Несколько Цена Правило существует с теми же критериями,, пожалуйста, решить \
  конфликта отдавая приоритет. Цена Правила: {0}"
 DocType: Account,Bank,Банк:
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Предложение Дата
 DocType: Hub Settings,Access Token,Маркер доступа
@@ -2814,45 +2591,37 @@
 DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Если у вас длинные форматы печати, эта функция может быть использована для разрезки страницу, которая будет напечатана на нескольких страниц со всеми верхние и нижние колонтитулы на каждой странице"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Все Территории
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 DocType: Fiscal Year,Year Name,Имя года
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Связка товара
 DocType: Sales Partner,Sales Partner Name,Партнер по продажам Имя
 DocType: Purchase Invoice Item,Image View,Просмотр изображения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Отделочные и промышленного отделка
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты, необходимых"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ценные бумаги и товарных бирж
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бурение
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Удар литье
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
 DocType: Tax Rule,Shipping City,Доставка Город
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Этот деталь Вариант {0} (шаблон). Атрибуты будет скопирован из шаблона, если ""не копировать"" не установлен"
 DocType: Account,Purchase User,Покупка пользователя
 DocType: Notification Control,Customize the Notification,Настроить уведомления
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Стук
-DocType: Web Page,Slideshow,Слайд-шоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Адрес по умолчанию шаблона не может быть удален
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Journal Entry,Print Heading,Распечатать Заголовок
 DocType: Quotation,Maintenance Manager,Менеджер обслуживания
-DocType: Workflow State,Search,Поиск
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дней с последнего Заказа"" должно быть больше или равно 0"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Пайка
 DocType: C-Form,Amended From,Измененный С
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Спецификации сырья
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Спецификации сырья
 DocType: Leave Application,Follow via Email,Следуйте по электронной почте
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи. Вы не можете удалить этот аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Открытие Дата должна быть, прежде чем Дата закрытия"
 DocType: Leave Control Panel,Carry Forward,Переносить
@@ -2861,45 +2630,44 @@
 ,Produced,Произведено
 DocType: Item,Item Code for Suppliers,Код товара для поставщиков
 DocType: Issue,Raised By (Email),Поднятый силу (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Основное
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепить бланк
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Основное
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Прикрепить бланк
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть, когда категория для ""Оценка"" или ""Оценка и Всего"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Перечислите ваши налоговые головы (например, НДС, таможенные и т.д., они должны иметь уникальные имена) и их стандартные ставки. Это создаст стандартный шаблон, который вы можете отредактировать и добавить позже."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Перечислите ваши налоговые головы (например, НДС, таможенные и т.д., они должны иметь уникальные имена) и их стандартные ставки. Это создаст стандартный шаблон, который вы можете отредактировать и добавить позже."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
-DocType: Blog Post,Blog Post,Пост блога
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Group By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на которую повторяющееся заказ будет остановить"
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} должен быть уменьшен на {1} или вы должны увеличить толерантность переполнения
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Итого Текущая
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Час
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Перевести Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Перевести Материал Поставщику
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Ведущий Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Создание цитаты
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило Доставка Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новая спецификация после замены
 DocType: Features Setup,Point of Sale,Точки продаж
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Керлинг
 DocType: Account,Tax,Налог
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ряд {0}: {1} не является допустимым {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафинирование
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ряд {0}: {1} не является допустимым {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,От Bundle продукта
 DocType: Production Planning Tool,Production Planning Tool,Планирование производства инструмента
 DocType: Quality Inspection,Report Date,Дата отчета
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Маршрутизация
 DocType: C-Form,Invoices,Счета
 DocType: Job Opening,Job Title,Должность
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} уже выделено Требуются {1} для периода {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Получатели
 DocType: Features Setup,Item Groups in Details,Группы товаров в деталях
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
@@ -2908,33 +2676,29 @@
 DocType: Stock Entry,Update Rate and Availability,Частота обновления и доступность
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент вы имеете право принимать или сдавать более против заказанного количества. Например: Если Вы заказали 100 единиц. и ваш Пособие 10%, то вы имеете право на получение 110 единиц."
 DocType: Pricing Rule,Customer Group,Группа клиентов
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Описание
 DocType: Serial No,AMC Expiry Date,КУА срок действия
 ,Sales Register,Продажи Зарегистрироваться
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
 DocType: Address,Plant,Завод
-DocType: DocType,Setup,Настройки
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Холодная прокатка
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
 DocType: GL Entry,Against Voucher Type,Против Сертификаты Тип
 DocType: Item,Attributes,Атрибуты
-DocType: Packing Slip,Get Items,Получить товары
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Получить товары
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последняя дата заказа
-DocType: DocField,Image,Изображение
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Сделать акцизного счет-фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
-DocType: Communication,Other,Другое
 DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операции не установлен
 DocType: Production Order,Planned Start Date,Планируемая дата начала
 DocType: Serial No,Creation Document Type,Создание типа документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Посещение
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Посещение
 DocType: Leave Type,Is Encash,Является Обналичивание
 DocType: Purchase Invoice,Mobile No,Мобильный номер
 DocType: Payment Tool,Make Journal Entry,Сделать запись журнала
@@ -2942,35 +2706,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Ожидаемая дата завершения
 DocType: Appraisal Template,Appraisal Template Title,Оценка шаблона Название
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Коммерческий сектор
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Коммерческий сектор
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитель товара {0} не должны быть со пункт
 DocType: Cost Center,Distribution Id,Распределение Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Все продукты или услуги.
 DocType: Purchase Invoice,Supplier Address,Адрес поставщика
-DocType: Contact Us Settings,Address Line 2,Адрес (2-я строка)
-DocType: ToDo,Reference,Ссылка на
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорирование
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Из Кол-во
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансовые услуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Соответствие атрибутов {0} должно быть в пределах {1} до {2} в приращений {3}
 DocType: Tax Rule,Sales,Скидки
 DocType: Stock Entry Detail,Basic Amount,Основное количество
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,По умолчанию Дебиторская задолженность
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Распиловка
 DocType: Tax Rule,Billing State,Государственный счетов
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинирование
 DocType: Item Reorder,Transfer,Переложить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Спекание
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
 DocType: Supplier,Contact HTML,Связаться с HTML
@@ -2981,9 +2739,8 @@
 DocType: Company,Retail,Розничная торговля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
-DocType: Product Bundle,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Связка товаров
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дробление
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
 DocType: GL Entry,Remarks,Примечания
@@ -2991,48 +2748,44 @@
 DocType: Journal Entry,Write Off Based On,Списание на основе
 DocType: Features Setup,POS View,POS Посмотреть
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Установка рекорд для серийный номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Непрерывная разливка
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Пожалуйста, сформулируйте"
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Выше
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодная размеров
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группой
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
 DocType: Holiday List,Weekly Off,Еженедельный Выкл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для, например 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Предварительная прибыль / убыток (Кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Вернуться против накладная
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Пункт 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в обществе {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в обществе {1}"
 DocType: Serial No,Creation Time,Время создания
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Общий доход
 DocType: Sales Invoice,Product Bundle Help,Продукт Связка Помощь
 ,Monthly Attendance Sheet,Ежемесячная посещаемость Лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не запись не найдено
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для п. {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Получить элементов из комплекта продукта
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Является Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Посещаемость С Дата и посещаемости на сегодняшний день является обязательным
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите 'Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контактный номер
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"Учетной записи типа {0} не позволено открытие ""Прибыль и Убытки"""
-DocType: Workflow State,Time,Время
 DocType: Features Setup,Sales Discounts,Продажи Купоны
 DocType: Hub Settings,Seller Country,Продавец Страна
 DocType: Authorization Rule,Authorization Rule,Авторизация Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажи Налоги и сборы шаблона
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одежда и аксессуары
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одежда и аксессуары
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Номер заказа
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Баннер который будет отображаться на верхней части списка товаров.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Укажите условия для расчета суммы доставки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Добавить дочерний
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль разрешено устанавливать замороженные счета & Редактировать Замороженные Записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге, как это имеет дочерние узлы"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коэффициент преобразования требуется
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Значение / Описание
@@ -3040,15 +2793,13 @@
 ,Customers Not Buying Since Long Time,Клиенты не покупать так как долгое время
 DocType: Production Order,Expected Delivery Date,Ожидаемая дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Выпуклый
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Литье испарительного-модель
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Возраст
 DocType: Time Log,Billing Amount,Биллинг Сумма
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Неверное количество, указанное для элемента {0}. Количество должно быть больше 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявки на отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Счет существующей проводки не может быть удален
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День месяца, в который автоматически заказ формируется например 05, 28 и т.д."
 DocType: Sales Invoice,Posting Time,Средняя Время
@@ -3062,26 +2813,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новый Выручка клиентов
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Командировочные Pасходы
 DocType: Maintenance Visit,Breakdown,Разбивка
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Счет: {0} с валютой: {1} не может быть выбран
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
-DocType: Feed,Full Name,Полное имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клинч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Испытательный срок
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всего уплаченной суммы
 ,Transferred Qty,Переведен Кол-во
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигационный
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планирование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планирование
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Найдите время Войдите Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Выпущен
 DocType: Project,Total Billing Amount (via Time Logs),Всего счетов Сумма (с помощью журналов Time)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Мы продаем этот товар
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Мы продаем этот товар
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Поставщик Id
 DocType: Journal Entry,Cash Entry,Денежные запись
 DocType: Sales Partner,Contact Desc,Связаться Описание изделия
@@ -3090,18 +2838,16 @@
 DocType: Brand,Item Manager,Состояние менеджер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Добавьте строки, чтобы установить годовые бюджеты на счетах."
 DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Карьер
 DocType: Production Order,Total Operating Cost,Общие эксплуатационные расходы
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} имеет несколько вхождений
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Все контакты.
 DocType: Newsletter,Test Email Id,Тест электронный идентификатор
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Аббревиатура компании
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Аббревиатура компании
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества. Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,Партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
 DocType: Item Attribute Value,Abbreviation,Сокращение
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротационного формования
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Шаблоном Зарплата.
 DocType: Leave Type,Max Days Leave Allowed,Максимальное количество дней отпуска разрешены
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Установите Налоговый Правило корзине
@@ -3115,15 +2861,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} является обязательным. Может быть, запись Обмен валюты не создана для {1} по {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Налоговый шаблона является обязательным.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Счет {0}: Родитель счета {1} не существует
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Прайс-лист Тариф (Компания Валюта)
 DocType: Account,Temporary,Временный
 DocType: Address,Preferred Billing Address,Популярные Адрес для выставления счета
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретарь
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретарь
 DocType: Serial No,Distinct unit of an Item,Отдельного подразделения из пункта
 DocType: Pricing Rule,Buying,Покупка
 DocType: HR Settings,Employee Records to be created by,Сотрудник отчеты должны быть созданные
@@ -3136,24 +2882,21 @@
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
 DocType: Purchase Order Item,Supplier Quotation,Поставщик цитаты
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По глажению одежды
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} остановлен
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстоящие События
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
-DocType: Letter Head,Letter Head,Заголовок письма
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Быстрый доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} является обязательным для возврата
 DocType: Purchase Order,To Receive,Получить
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термоусадочная Место
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Доходы / расходы
 DocType: Employee,Personal Email,Личная E-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Общей дисперсии
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Общей дисперсии
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Если включен, то система будет отправлять бухгалтерских проводок для инвентаризации автоматически."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Посредничество
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Посредничество
 DocType: Address,Postal Code,Почтовый индекс
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","в минутах 
@@ -3161,18 +2904,16 @@
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,"Заказы, выпущенные для производства."
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Hub Settings,Name Token,Имя маркера
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Строгание
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандартный Продажа
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандартный Продажа
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,"По крайней мере, один склад является обязательным"
 DocType: Serial No,Out of Warranty,По истечении гарантийного срока
 DocType: BOM Replace Tool,Replace,Заменить
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против чека {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против чека {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Название проекта
 DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
-DocType: Workflow State,Edit,Редактировать
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Features Setup,Item Batch Nos,Пункт Пакетное Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значение Разница
@@ -3180,13 +2921,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирение Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Налоговые активы
 DocType: BOM Item,BOM No,BOM №
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запись в журнале {0} не имеете учет {1} или уже сравнивается с другой ваучер
 DocType: Item,Moving Average,Скользящее среднее
 DocType: BOM Replace Tool,The BOM which will be replaced,"В спецификации, которые будут заменены"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Стоимость эксплуатации
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Добавить посещаемость от. Файл CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Выдающийся Amt
@@ -3202,10 +2941,7 @@
 DocType: Project,Default Cost Center,По умолчанию Центр Стоимость
 DocType: Purchase Invoice,End Date,Дата окончания
 DocType: Employee,Internal Work History,Внутренняя история Работа
-DocType: DocField,Column Break,Разрыв столбца
-DocType: Event,Thursday,Четверг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Превращение
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
 DocType: Sales Invoice,Exhibition,Показательный
@@ -3218,31 +2954,30 @@
 DocType: Employee,Held On,Состоявшемся
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производство товара
 ,Employee Information,Сотрудник Информация
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Окончание финансового периода 
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Окончание финансового периода
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Уменьшите Набор для отпуска без сохранения (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме этой недели
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} позиция должна быть куплена или получена на основе субподряда в строке {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Счет: {0} можно обновить только с помощью биржевых операций
 DocType: GL Entry,Party,Сторона
 DocType: Sales Order,Delivery Date,Дата поставки
-DocType: DocField,Currency,Валюта
 DocType: Opportunity,Opportunity Date,Возможность Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Вернуться Против покупки получении
 DocType: Purchase Order,To Bill,Для Билла
 DocType: Material Request,% Ordered,% Приказал
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Сдельная работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Сдельная работа
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ср. Покупка Оценить
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
 DocType: Employee,History In Company,История В компании
@@ -3252,84 +2987,75 @@
 DocType: Department,Leave Block List,Оставьте список есть
 DocType: Customer,Tax ID,ИНН
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
-DocType: Accounts Settings,Accounts Settings, Настройки аккаунта
+DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
 DocType: Customer,Sales Partner and Commission,Партнер и Комиссия по продажам
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Сооружения и оборудование
 DocType: Sales Partner,Partner's Website,Сайт партнера
 DocType: Opportunity,To Discuss,Для Обсудить
 DocType: SMS Settings,SMS Settings,Настройки SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Временные счета
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Черный
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Черный
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Взрыв Пункт
 DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата окончания периода текущего заказа
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Сделать предложение письмо
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Возвращение
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
-DocType: DocField,Fold,Сложить
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,"По умолчанию Единица измерения для варианта должны быть такими же, как шаблон"
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
 DocType: Project Task,Pending Review,В ожидании отзыв
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Пожалуйста, сформулируйте"
 DocType: Task,Total Expense Claim (via Expense Claim),Всего Заявить расходов (через Расход претензии)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Идентификатор клиента
-DocType: Page,Page Name,Имя страницы
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Времени должен быть больше, чем от времени"
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Родитель счета {1} не Bolong компании {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндель отделка
 DocType: BOM,Last Purchase Rate,Последний Покупка Оценить
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Задача ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","например ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","например ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фото существовать не может Пункт {0}, так как имеет варианты"
 ,Sales Person-wise Transaction Summary,Человек мудрый продаж Общая информация по сделкам
-DocType: System Settings,Time Zone,Часовой Пояс
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Склад {0} не существует
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зарегистрироваться на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ежемесячные Проценты распределения
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Выбранный элемент не может быть Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% материалов доставлено по данной Накладной
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Сшивание
 DocType: Customer,Customer Details,Данные клиента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Формирование
 DocType: Employee,Reports to,Доклады
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
 DocType: Sales Invoice,Paid Amount,Выплаченная сумма
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа ""ответственности"""
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс счета в Дебете, запрещена установка 'Баланс должен быть' как 'Кредит'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управление качеством
 DocType: Production Planning Tool,Filter based on customer,Фильтр на основе клиента
 DocType: Payment Tool Detail,Against Voucher No,На Сертификаты Нет
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
 DocType: Tax Rule,Purchase,Купить
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кол-во
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Баланс Кол-во
 DocType: Item Group,Parent Item Group,Родитель Пункт Группа
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,МВЗ
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Склады.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Склады.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Скорость, с которой валюта продукция превращается в базовой валюте компании"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: тайминги конфликты с рядом {1}
 DocType: Opportunity,Next Contact,Следующая Контактные
 DocType: Employee,Employment Type,Вид занятости
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Капитальные активы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Срок подачи заявлений не может быть по двум alocation записей
 DocType: Item Group,Default Expense Account,По умолчанию расходов счета
 DocType: Employee,Notice (days),Уведомление (дней)
-DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Налог с продаж шаблона
 DocType: Employee,Encashment Date,Инкассация Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Гальванопластика
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","На ваучере Тип должен быть одним из Заказа, накладная или Запись в журнале"
 DocType: Account,Stock Adjustment,Регулирование запасов
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},По умолчанию активность Стоимость существует для вида деятельности - {0}
 DocType: Production Order,Planned Operating Cost,Планируемые Эксплуатационные расходы
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Новый {0} Имя
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Прилагается {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Прилагается {0} # {1}
 DocType: Job Applicant,Applicant Name,Имя заявителя
 DocType: Authorization Rule,Customer / Item Name,Заказчик / Название товара
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серийный номер является обязательным для п. {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Пожалуйста, сформулируйте из / в диапазоне"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Созданный
 DocType: Serial No,Under AMC,Под КУА
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оценка пересчитывается с учетом приземлился затрат количество ваучеров
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок.
@@ -3354,17 +3079,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Минимальная сумма
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Обновление Готовые изделия
 DocType: Workstation,per hour,в час
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} уже используется в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Счет для склада (непрерывной инвентаризации) будет создан для этого счета.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Выплачиваемая сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Отправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Руководитель проекта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс скидка позволило пункта: {0} {1}%
 DocType: Customer,Default Taxes and Charges,По умолчанию Налоги и сборы
 DocType: Account,Receivable,Дебиторская задолженность
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, которая имеет право на представление операции, превышающие лимиты кредитования, установленные."
 DocType: Sales Invoice,Supplier Reference,Поставщик Ссылка
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Если отмечено, спецификации для суб-монтажными деталями будут рассмотрены для получения сырья. В противном случае, все элементы В сборе будет рассматриваться в качестве сырья."
@@ -3372,8 +3096,8 @@
 DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
 DocType: Item Price,Item Price,Пункт Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Мыло и моющих средств
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Кинофильм & Видео
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Мыло и моющих средств
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Кинофильм & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
@@ -3382,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,Оценить материалов на основе
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Поддержка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Фото со UOM Заменить Utility
 DocType: POS Profile,Terms and Conditions,Правила и условия
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Чтобы Дата должна быть в пределах финансового года. Предполагая To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Здесь вы можете поддерживать рост, вес, аллергии, медицинские проблемы и т.д."
@@ -3394,7 +3117,7 @@
 DocType: Sales Order Item,For Production,Для производства
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Пожалуйста, введите заказ клиента в таблице выше"
 DocType: Project Task,View Task,Посмотреть Задача
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваш финансовый год начинается
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ваш финансовый год начинается
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Пожалуйста, введите покупке расписок"
 DocType: Sales Invoice,Get Advances Received,Получить авансы полученные
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
@@ -3402,20 +3125,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор. (Например support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полировальный
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Создание упаковочные листы для пакетов будет доставлено. Используется для уведомления номер пакета, содержимое пакета и его вес."
 DocType: Sales Invoice Item,Sales Order Item,Заказ на продажу товара
 DocType: Salary Slip,Payment Days,Платежные дней
 DocType: BOM,Manage cost of operations,Управление стоимость операций
 DocType: Features Setup,Item Advanced,Пункт Расширенный
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Горячая прокатка
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Когда любой из проверенных операций ""Представленные"", по электронной почте всплывающее автоматически открывается, чтобы отправить письмо в соответствующий «Контакт» в этой транзакции, с транзакцией в качестве вложения. Пользователь может или не может отправить по электронной почте."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Общие настройки
 DocType: Employee Education,Employee Education,Сотрудник Образование
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
 DocType: Salary Slip,Net Pay,Чистая Платное
 DocType: Account,Account,Аккаунт
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже существует
@@ -3424,35 +3145,28 @@
 DocType: Customer,Sales Team Details,Описание отдела продаж
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенциальные возможности для продажи.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Неверный {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Адрес для выставления счета Имя
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Универмаги
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Система Баланс
-DocType: Workflow,Is Active,Активен
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универмаги
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Система Баланс
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Сохранить документ в первую очередь.
 DocType: Account,Chargeable,Ответственный
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Изменить Аббревиатура
-DocType: Workflow State,Primary,Основной
 DocType: Expense Claim Detail,Expense Date,Дата расхода
 DocType: Item,Max Discount (%),Макс Скидка (%)
-DocType: Communication,More Information,Больше информации
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Последнее Сумма заказа
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Взрывные работы
 DocType: Company,Warn,Warn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Пункт оценка обновляются
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
 DocType: BOM,Manufacturing User,Производство пользователя
 DocType: Purchase Order,Raw Materials Supplied,Давальческого сырья
 DocType: Purchase Invoice,Recurring Print Format,Периодическая Формат печати
-DocType: Communication,Series,Серии значений
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Оценка шаблона
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Классификация
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Менеджер по развитию бизнеса
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Менеджер по развитию бизнеса
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Техническое обслуживание Посетить Цель
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Период обновления
 ,General Ledger,Бухгалтерская книга
@@ -3462,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Пожалуйста, выберите {0} первый"
 DocType: Features Setup,To get Item Group in details table,Чтобы получить группу товаров в детали таблице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Перерисовка
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Пакетная {0} Пункт {1} истек.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Травление
 DocType: Sales Invoice,Commission,Комиссионный сбор
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3490,7 +3202,7 @@
  {%, если email_id%} E-mail: {{email_id}} & Lt; BR & GT ; {% ENDIF -%} 
  </ код> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,По умолчанию количество
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Склад не найден в системе
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Склад не найден в системе
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Резюме этого месяца
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
@@ -3509,13 +3221,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 DocType: Supplier,Address and Contacts,Адрес и контакты
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Держите его веб дружелюбны 900px (ш) на 100px (ч)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта
 DocType: Payment Tool,Get Outstanding Vouchers,Высочайшая ваучеры
 DocType: Warranty Claim,Resolved By,Решили По
 DocType: Appraisal,Start Date,Дата Начала
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Значение
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Нажмите здесь, чтобы проверить,"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
@@ -3525,55 +3236,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Среднее время принято поставщика доставить
 DocType: Time Log,Hours,Часов
 DocType: Project,Expected Start Date,Ожидаемая дата начала
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Подвижной
-DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Удалить элемент, если обвинения не относится к этому пункту"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox доступ разрешен
-DocType: Dropbox Backup,Weekly,Еженедельно
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Например. smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Получать
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Получать
 DocType: Maintenance Visit,Fully Completed,Полностью завершен
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}%
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} был успешно добавлен в список наших новостей.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Электронно-лучевая обработка
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основные отчеты
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото со Леджер записей остатки обновляются
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основные отчеты
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Добавить / Изменить цены
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,План МВЗ
 ,Requested Items To Be Ordered,Требуемые товары заказываются
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мои Заказы
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мои Заказы
 DocType: Price List,Price List Name,Цена Имя
 DocType: Time Log,For Manufacturing,Для изготовления
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Всего:
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Всего:
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Заказал детали быть поставленным
 DocType: Account,Income,Доход
-,Setup Wizard,Мастер установки
 DocType: Industry Type,Industry Type,Промышленность Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Что-то пошло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата завершения
 DocType: Purchase Invoice Item,Amount (Company Currency),Сумма (Компания Валюта)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Литье под давлением
-DocType: Email Alert,Reference Date,Ссылка Дата
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
 DocType: Budget Detail,Budget Detail,Бюджет Подробно
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
-DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Фото Единица измерения обновляется Пункт {0}
-DocType: Company History,Year,Год
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажи профиля
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Обновите SMS Настройки
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Время входа {0} уже выставлен
@@ -3586,76 +3285,71 @@
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
 DocType: Item,Unit of Measure Conversion,Единица измерения конверсии
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Сотрудник не может быть изменен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
 DocType: Naming Series,Help HTML,Помощь HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Учет по-{0} скрещенными за Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Имя лица или организации, что этот адрес принадлежит."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Поставщики
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Ваши Поставщики
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Еще Зарплата Структура {0} будет активна в течение сотрудника {1}. Пожалуйста, убедитесь, его статус «неактивные», чтобы продолжить."
 DocType: Purchase Invoice,Contact,Контакты
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Получено от
 DocType: Features Setup,Exports,! Экспорт
 DocType: Lead,Converted,Переделанный
 DocType: Item,Has Serial No,Имеет Серийный номер
 DocType: Employee,Date of Issue,Дата выдачи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: С {0} для {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 DocType: Issue,Content Type,Тип контента
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Компьютер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компьютер
 DocType: Item,List this Item in multiple groups on the website.,Перечислите этот пункт в нескольких группах на веб-сайте.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
 DocType: Cost Center,Budgets,Бюджеты
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Обновлено
 DocType: Employee,Emergency Contact Details,Аварийный Контактные данные
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Что оно делает?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Что оно делает?
 DocType: Delivery Note,To Warehouse,Для Склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Средний Комиссия курс
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Обновление дополнительных затрат для расчета приземлился стоимость товаров
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен для сотрудника {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Упрочнения
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,От претензий по гарантии
 DocType: Stock Entry,Default Source Warehouse,По умолчанию Источник Склад
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Напоминание о дне рождения для {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Притирка
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дни с последнего Заказать
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дни с последнего Заказать
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
-DocType: User,Enabled,Включено
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"Капитал запасов
-"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Капитал запасов
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите, чтобы представить все Зарплата Слип для месяца {0} и год {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Импорт подписчиков
 DocType: Target Detail,Target Qty,Целевая Кол-во
 DocType: Attendance,Present,Настоящее.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
 DocType: Notification Control,Sales Invoice Message,Счет по продажам Написать письмо
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закрытие счета {0} должен быть типа ответственностью / собственный капитал
 DocType: Authorization Rule,Based On,На основании
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектная деятельность / задачи.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Создать зарплат Slips
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не является допустимым E-mail ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка должна быть проверена, если выбран Применимо для как {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
-DocType: ToDo,Low,Низкий
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Спиннинг
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
@@ -3677,7 +3371,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Необходимо ввести имя компании
 DocType: Maintenance Visit,Maintenance Date,Техническое обслуживание Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Отклонен Серийный номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Глубокий рисунок
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Новый бюллетень
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Показать Баланс
@@ -3688,7 +3381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Сумма
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
 ,Sales Analytics,Продажи Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Настройки Производство
@@ -3700,28 +3392,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Новый Имя счета
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сырье Поставляется Стоимость
 DocType: Selling Settings,Settings for Selling Module,Настройки по продаже модуля
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслуживание Клиентов
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслуживание Клиентов
 DocType: Item,Thumbnail,Миниатюра
 DocType: Item Customer Detail,Item Customer Detail,Пункт Детальное клиентов
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Подтвердите Ваш Адрес Электронной Почты
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Предложение кандидата Работа.
 DocType: Notification Control,Prompt for Email on Submission of,Запрашивать Email по подаче
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Суммарное количество выделенных листья более дней в периоде
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,По умолчанию работы на складе Прогресс
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумная формовка
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
-DocType: Contact Us Settings,City,Город
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвуковой обработки
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Ошибка: Не действует ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Обновление Номер серии
 DocType: Account,Equity,Ценные бумаги
 DocType: Sales Order,Printing Details,Печать Подробности
 DocType: Task,Closing Date,Дата закрытия
 DocType: Sales Order Item,Produced Quantity,Добытое количество
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Инженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Инженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Поиск Sub сборки
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
@@ -3729,7 +3417,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Скидка
 DocType: Purchase Invoice,Against Expense Account,Против Expense Счет
 DocType: Production Order,Production Order,Производственный заказ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против DOCNAME
 DocType: SMS Center,All Employee (Active),Все Сотрудник (Активный)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Просмотр сейчас
@@ -3737,26 +3425,24 @@
 DocType: BOM,Raw Material Cost,Сырье Стоимость
 DocType: Item,Re-Order Level,Re-ордера и уровней
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Диаграмма Ганта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серийный Номер серии
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
 DocType: Issue,First Responded On,Впервые Ответил на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Крест Листинг пункта в нескольких группах
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Первый пользователя: Вы
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Первый пользователя: Вы
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Финансовый год Дата начала и финансовый год Дата окончания уже установлены в финансовый год {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успешно Примирение
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно Примирение
 DocType: Production Order,Planned End Date,Планируемая Дата завершения
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где элементы хранятся.
 DocType: Tax Rule,Validity,Период действия
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сумма по счетам
 DocType: Attendance,Attendance,Посещаемость
-DocType: Page,No,Нет
 DocType: BOM,Materials,Материалы
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Если не установлен, то список нужно будет добавлен в каждом департаменте, где он должен быть применен."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публикации и размещения время является обязательным
@@ -3764,55 +3450,46 @@
 ,Item Prices,Предмет цены
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,По словам будет виден только вы сохраните заказ на поставку.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Окончание Ваучер
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Мастер Прайс-лист.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Мастер Прайс-лист.
 DocType: Task,Review Date,Дата пересмотра
 DocType: Purchase Invoice,Advance Payments,Авансовые платежи
-DocType: DocPerm,Level,Уровень
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же, как производственного заказа"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезерный
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нет разрешения на использование платежного инструмента
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Email адрес для уведомлений"" не указан для повторяющихся %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валюта не может быть изменена после внесения записи, используя другой валюты"
 DocType: Company,Round Off Account,Округление аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нарезки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Административные затраты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родительский клиент Группа
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Изменение
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например ""Моя компания ООО """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например ""Моя компания ООО """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Срок Уведомления
 DocType: Bank Reconciliation Detail,Voucher ID,ID ваучера
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Это корень территории и не могут быть изменены.
 DocType: Packing Slip,Gross Weight UOM,Вес брутто Единица измерения
 DocType: Email Digest,Receivables / Payables,Кредиторской / дебиторской задолженности
 DocType: Delivery Note Item,Against Sales Invoice,Против продаж счета-фактуры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснение
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебиторская задолженность аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 DocType: Task,Actual End Date (via Time Logs),Фактическая Дата окончания (через журналы Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
 DocType: Delivery Note,Print Without Amount,Распечатать без суммы
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Налоговый Категория не может быть ""Оценка"" или ""Оценка и Всего», как все детали, нет в наличии"
-DocType: User,Last Name,Фамилия
-DocType: Web Page,Left,Слева
-DocType: Event,All Day,Весь день
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Налоговый Категория не может быть ""Оценка"" или ""Оценка и Всего», как все детали, нет в наличии"
 DocType: Issue,Support Team,Команда поддержки
 DocType: Appraisal,Total Score (Out of 5),Всего рейтинг (из 5)
-DocType: Contact Us Settings,State,Состояние
 DocType: Batch,Batch,Партия
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всего расходов претензии (с помощью расходные Претензии)
-DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Дебет-нота
 DocType: Stock Entry,As per Stock UOM,По фондовой UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не истек
@@ -3826,44 +3503,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Если флажок установлен, все время не. рабочих дней будет включать в себя праздники, и это приведет к снижению стоимости Зарплата в день"
 DocType: Purchase Invoice,Total Advance,Всего Advance
-DocType: Workflow State,User,Пользователь
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Расчета заработной платы
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Установить как Остаться в живых
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Получение Примечание
 DocType: Customer,Credit Days Based On,Кредитные дней основанных на
 DocType: Tax Rule,Tax Rule,Налоговое положение
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Поддержание же скоростью протяжении цикла продаж
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планировать время журналы за пределами рабочего времени рабочих станций.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже проведен
 ,Items To Be Requested,"Предметы, будет предложено"
-DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платежная Оценить на основе вида деятельности (за час)
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Закатки
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Не найден e-mail ID предприятия, поэтому почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 DocType: Production Planning Tool,Filter based on item,Фильтр на основе пункта
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 DocType: Purchase Common,Purchase Common,Покупка Common
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Из возможностей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гашение
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекты, поднятые для клиентов."
-DocType: DocField,Default,По умолчанию
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Нет {0}: Сумма не может быть больше, чем ожидании Сумма против Расход претензии {1}. В ожидании сумма {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} подписчики добавлены
 DocType: Maintenance Schedule,Schedule,Расписание
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Определить бюджет для этого МВЗ. Чтобы установить бюджета действие см &quot;Список компании&quot;
@@ -3874,70 +3547,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Expense Claim,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Выбор ""Да"" даст уникальную идентичность для каждого субъекта этого пункта, который можно рассматривать в серийный номер мастера."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
 DocType: Address,Office,Офис
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Чтобы создать налоговый учет
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Пожалуйста, введите Expense счет"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если деталь вариант другого элемента, то описание, изображение, ценообразование, налоги и т.д., будет установлен из шаблона, если явно не указано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Пакетная Инвентарь
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Пакетная Инвентарь
 DocType: Employee,Contract End Date,Конец контракта Дата
 DocType: Sales Order,Track this Sales Order against any Project,Подписка на заказ клиента против любого проекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Потяните заказы на продажу (в ожидании, чтобы доставить) на основе вышеуказанных критериев"
-DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,От поставщика цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,От поставщика цитаты
 DocType: Deduction Type,Deduction Type,Вычет Тип
 DocType: Attendance,Half Day,Полдня
 DocType: Pricing Rule,Min Qty,Мин Кол-во
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Чтобы отслеживать элементы в покупки и продажи документов с пакетных пп. &quot;Предпочтительный Промышленность: Химия&quot;
 DocType: GL Entry,Transaction Date,Сделка Дата
 DocType: Production Plan Item,Planned Qty,Планируемые Кол-во
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Совокупная налоговая
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Совокупная налоговая
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Количество (Изготовитель Количество) является обязательным
 DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистая Всего (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
 DocType: Notification Control,Purchase Receipt Message,Покупка Получение Сообщение
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Суммарное количество выделенных листья более периода
 DocType: Production Order,Actual Start Date,Фактическое Дата начала
 DocType: Sales Order,% of materials delivered against this Sales Order,% материалов доставлено по данному Заказу
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запись движений предмета.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Рассылка подписчика
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Услуга
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские уже были сделаны в валюте {0} для компании {1}. Пожалуйста, выберите дебиторской или кредиторской задолженности счет с валютой {0}."
 ,Monthly Salary Register,Заработная плата Зарегистрироваться
-apps/frappe/frappe/website/template.py +140,Next,Далее
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Электрополировка
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На предыдущей балансовой Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Пожалуйста, введите Сумма платежа в по крайней мере одном ряду"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Пожалуйста, введите Сумма платежа в по крайней мере одном ряду"
 DocType: POS Profile,POS Profile,POS-профиля
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сумма платежа не может быть больше, чем непогашенная сумма"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Всего Неоплаченный
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Всего Неоплаченный
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Время входа не оплачиваемое
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Покупатель
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Покупатель
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Чистая зарплата не может быть отрицательным
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Пожалуйста, введите против Ваучеры вручную"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Пожалуйста, введите против Ваучеры вручную"
 DocType: SMS Settings,Static Parameters,Статические параметры
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
@@ -3946,14 +3612,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Отправить массовый SMS в список контактов
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Рассмотрим налога или сбора для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Кросс-прокатки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитная карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Кредитная карта
 DocType: BOM,Item to be manufactured or repacked,Пункт должен быть изготовлен или перепакован
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций.
 DocType: Purchase Invoice,Next Date,Следующая дата
 DocType: Employee Education,Major/Optional Subjects,Основные / факультативных предметов
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Пожалуйста, введите налогов и сборов"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обработка
 DocType: Sales Invoice Item,Drop Ship,Корабль падения
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Здесь Вы можете сохранить семейные подробности, как имя и оккупации родитель, супруг и детей"
 DocType: Hub Settings,Seller Name,Продавец Имя
@@ -3963,47 +3627,44 @@
 DocType: Stock Entry,Repack,Перепаковать
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вы должны Сохраните форму, прежде чем продолжить"
 DocType: Item Attribute,Numeric Values,Числовые значения
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепить логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Прикрепить логотип
 DocType: Customer,Commission Rate,Комиссия
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок отпуска приложений отделом.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Корзина Пусто
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Корневая не могут быть изменены.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Выделенные количество не может превышать unadusted сумму
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корневая не могут быть изменены.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Выделенные количество не может превышать unadusted сумму
 DocType: Manufacturing Settings,Allow Production on Holidays,Позволяют производить на праздниках
 DocType: Sales Order,Customer's Purchase Order Date,Клиентам Дата Заказ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Капитал
 DocType: Packing Slip,Package Weight Details,Вес упаковки Подробнее
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Выберите файл CSV
-DocType: Dropbox Backup,Send Backups to Dropbox,Отправить резервных копий в Dropbox
 DocType: Purchase Order,To Receive and Bill,Для приема и Билл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Условия шаблона
 DocType: Serial No,Delivery Details,Подробности доставки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматическое создание материала Запрос если количество падает ниже этого уровня,"
 ,Item-wise Purchase Register,Пункт мудрый Покупка Зарегистрироваться
 DocType: Batch,Expiry Date,Срок годности:
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Чтобы установить уровень повторного заказа, деталь должна быть Покупка товара или товара Производство"
 ,Supplier Addresses and Contacts,Поставщик Адреса и контакты
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Мастер проекта.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Получить элементов из спецификации
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения дни
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Ведомость материалов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
-DocType: Dropbox Backup,Send Notifications To,Отправлять уведомления
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ссылка Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ссылка Дата
 DocType: Employee,Reason for Leaving,Причина увольнения
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Аккаунт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"

diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index a446c53..e693628 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode Plat
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Vyberte měsíční výplatou, pokud chcete sledovat na základě sezónnosti."
 DocType: Employee,Divorced,Rozvedený
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Upozornenie: Rovnaké položky bol zadaný viackrát.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Položky již synchronizovat
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Spotřební zboží
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party prvý"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žíhanie
 DocType: Item,Customer Items,Zákazník položky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Nechte schvalovatelů
 DocType: Sales Partner,Dealer,Dealer
 DocType: Employee,Rented,Pronajato
-DocType: About Us Settings,Website,Stránky
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zhutňovanie a spekanie
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
-DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude se vypočítá v transakci.
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude vypočítané v transakcii.
 DocType: Purchase Order,Customer Contact,Kontakt so zákazníkmi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Z materiálu Poptávka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Z materiálu Poptávka
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Strom
 DocType: Job Applicant,Job Applicant,Job Žadatel
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Žádné další výsledky.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Právní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Právní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Aktuálny typ daň nemôže byť zahrnutý v cene Položka v riadku {0}
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Řada Aktualizováno Úspěšně
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šitie
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametr
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Návrh
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1.Chcete-li zachovat zákazníkovo produktové číslo a také podle něj vyhledávat, použijte tuto možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Zobraziť Varianty
-DocType: Sales Invoice Item,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Vykonajte nové POS profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Péče o zdraví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 DocType: Purchase Invoice,Monthly,Měsíčně
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Oneskorenie s platbou (dni)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-mailová adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obrana
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-mailová adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Company,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Řádek # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Řádek # {0}:
 DocType: Delivery Note,Vehicle No,Vozidle
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Prosím, vyberte Ceník"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Spracovanie dreva
 DocType: Production Order Operation,Work In Progress,Work in Progress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tlač
 DocType: Employee,Holiday List,Dovolená Seznam
 DocType: Time Log,Time Log,Time Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Účetní
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Účetní
 DocType: Cost Center,Stock User,Sklad Užívateľ
 DocType: Company,Phone No,Telefon
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log činností vykonávaných uživateli proti úkoly, které mohou být použity pro sledování času, fakturaci."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nový {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Nový {0}: # {1}
 ,Sales Partners Commission,Obchodní partneři Komise
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Zkratka nesmí mít více než 5 znaků
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribút Hodnota {0} nemôže byť odstránený z {1} ako položka Varianty \ existovať tohto atribútu.
-DocType: Print Settings,Classic,Klasické
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
 DocType: Bin,Quantity Requested for Purchase,Požadovaného množství na nákup
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripojiť CSV súbor s dvomi stĺpci, jeden pre starý názov a jeden pre nový názov"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Prírastok
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Vyberte Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie je dovolené {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 DocType: Payment Reconciliation,Reconcile,Srovnat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Potraviny
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Proveďte Bank Vstup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Penzijní fondy
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Sklad je povinné, pokud typ účtu je Warehouse"
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se, zrušte zaškrtnutí políčka zastavit opakované nebo dát správné datum ukončení"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
-DocType: Blog Post,Guest,Host
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of materiálu
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je povinné
 DocType: Stock Entry,Additional Costs,Dodatočné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
-DocType: Standard Reply,Owner,Majitel
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosím, nejprave zadejte společnost"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosím, vyberte první firma"
 DocType: Employee Education,Under Graduate,Za absolventa
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Vystružovanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nemovitost
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Spotřební
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Spotřební
 DocType: Upload Attendance,Import Log,Záznam importu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Odeslat
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Ročné Plat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Ročné Plat
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Náklady
 DocType: Newsletter,Email Sent?,E-mail odeslán?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Záznamy
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pre nákup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Bod {0} musí být Nákup položky
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bude aktualizováno po odeslání faktury.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Rovnacie
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch čas Záznamy pro fakturaci.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity liatie
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter již byla odeslána
 DocType: Lead,Request Type,Typ požadavku
 DocType: Leave Application,Reason,Důvod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Vysílání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Provedení
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Provedení
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,První uživatel bude System Manager (lze později změnit).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o prováděných operací.
 DocType: Serial No,Maintenance Status,Status Maintenance
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Položky a Ceny
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Vyberte zaměstnance, pro kterého vytváříte hodnocení."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Náklady Center {0} nepatří do společnosti {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zľava na Cenník Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Meno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Liatie Full-forma
 DocType: Offer Letter,Select Terms and Conditions,Vyberte Podmienky
 DocType: Production Planning Tool,Sales Orders,Prodejní objednávky
 DocType: Purchase Taxes and Charges,Valuation,Ocenění
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankovní účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
 DocType: Selling Settings,Default Territory,Výchozí Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televize
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Rozsekne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Účet {0} nepatří do společnosti {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmienka v prípade neštandardnej pohľadávky účet použiteľná
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prijaté On
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Prosím, zadejte společnost"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Newsletter List,Total Subscribers,Celkom Odberatelia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Meno
+,Contact Name,Kontakt Meno
 DocType: Production Plan Item,SO Pending Qty,SO Pending Množství
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Žádost o koupi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Double bývanie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Listy za rok
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia&gt; Nastavenia&gt; Naming Séria
 DocType: Time Log,Will be updated when batched.,Bude aktualizována při dávkově.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
-DocType: Bulk Email,Message,Zpráva
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Referenční číslo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Roční
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Lead,Do Not Contact,Nekontaktujte
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Item,Publish in Hub,Publikovat v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire kefovanie
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvetovo doprava
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Náklady Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosím, vyberte druh tarifu první"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znaků
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zvolit jazyk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znaků
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Zakáže vytváranie časových protokolov proti výrobnej zákazky. Transakcie nesmú byť sledovaná proti výrobnej zákazky
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Položka {0} musí být Service Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
-DocType: DocType,Administrator,Správce
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserové vŕtanie
-DocType: Stock UOM Replace Utility,New Stock UOM,Nová skladová MJ
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Kruhové Referenčné Chyba
-DocType: Communication,Closed,Zavřeno
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Lead,Industry,Průmysl
 DocType: Employee,Job Profile,Job Profile
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Zúženie
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Viac mien
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Položka je aktualizována
-DocType: Async Task,System Manager,Správce systému
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
 DocType: Sales Invoice Item,Delivery Note,Dodací list
-DocType: Dropbox Backup,Allow Dropbox Access,Povolit přístup Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Nastavenie Dane
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Vstup Platba byla změněna poté, co ji vytáhl. Prosím, vytáhněte ji znovu."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Workstation,Rent Cost,Rent Cost
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vyberte měsíc a rok
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,E-mail spoločnosti
 DocType: GL Entry,Debit Amount in Account Currency,Debetné Čiastka v mene účtu
 DocType: Shipping Rule,Valid for Countries,"Platí pre krajiny,"
-DocType: Workflow State,Refresh,obnovit
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Všech souvisejících oblastech, jako je dovozní měně, přepočítací koeficient, dovoz celkem, dovoz celkovém součtu etc jsou k dispozici v dokladu o koupi, dodavatelů nabídky, faktury, objednávky apod"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","K dispozici v BOM, dodací list, fakturu, výrobní zakázky, objednávky, doklad o koupi, prodejní faktury odběratele, Stock vstupu, časový rozvrh"
 DocType: Item Tax,Tax Rate,Sadzba dane
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Příjmka musí být odeslána
-DocType: Stock UOM Replace Utility,Current Stock UOM,Terajšia skladová MJ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaše e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Prosím, viz příloha"
-DocType: Purchase Order,% Received,% Přijaté
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Rezanie vodným lúčom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup již dokončen !!
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Prosím, viz příloha"
+DocType: Purchase Order,% Received,% Prijaté
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup již dokončen !!
 ,Finished Goods,Hotové zboží
 DocType: Delivery Note,Instructions,Instrukce
 DocType: Quality Inspection,Inspected By,Zkontrolován
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosím, nie vytvárať účty pre zákazníkov a dodávateľmi. Sú vytvorené priamo od zákazníka / dodávateľa majstrov."
 DocType: Currency Exchange,Currency Exchange,Směnárna
 DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Authorization Rule,Approving User  (above authorized value),Schválenie užívateľa (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Položky, které je třeba požádat, které jsou ""Není skladem"" s ohledem na veškeré sklady na základě předpokládaného Množství a minimální Objednané množství"
@@ -380,22 +348,21 @@
 ,Purchase Register,Nákup Register
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ voľna"""
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Lékařský
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Lékařský
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Důvod ztráty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube navliekanie korálok
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 DocType: Employee,Single,Jednolůžkový
 DocType: Issue,Attachment,Príloha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Rozpočet nie je možné nastaviť pre skupinu nákladového strediska
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
 DocType: Purchase Invoice,Yearly,Ročne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Journal Entry Account,Sales Order,Predajné objednávky
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodej Rate
 DocType: Purchase Order,Start date of current order's period,Datum období současného objednávky Začátek
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a sadzba
 DocType: Delivery Note,% Installed,% Inštalovaných
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automaticky nastaviť sériových čísel na základe FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Tvarovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Kotúčová
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č ' nesmí být menší než ""Od Případu č '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Do Prípadu č ' nesmie byť menší ako ""Od Prípadu č '"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nezahájeno
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribút {0} vybraný niekoľkokrát v atribútoch tabuľke
+DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday master.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell liatie
 DocType: Material Request Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Je-li zaškrtnuto, bude částka daně považovat za již zahrnuty v tisku Rate / Tisk Částka"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
 DocType: Features Setup,Imports,Importy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepenie
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Nevybavené aktivity pre dnešok
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Účast rekord.
 DocType: Bank Reconciliation,Journal Entries,Zápisy do Deníku
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
-DocType: System Settings,Loading...,Nahrávám...
-DocType: DocField,Password,Heslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Nánosové modelovanie depozície
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba medzi operáciou (v min)
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Pridať predplatitelia
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Neexistuje"
 DocType: Pricing Rule,Valid Upto,Valid aľ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Správní ředitel
 DocType: Payment Tool,Received Or Paid,Přijaté nebo placené
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
-DocType: Communication,Subject,Předmět
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 ,Serial No Warranty Expiry,Pořadové č záruční lhůty
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Položka
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Správa Subdodávky
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Nová MJ NESMIE byť typu Celé číslo
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Správa Subdodávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Nábytek
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -482,32 +441,30 @@
 DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
 DocType: Company,Delete Company Transactions,Zmazať transakcií Company
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Položka {0} není Nákup položky
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
-					Email Address'","{0} je neplatná e-mailová adresa v ""Oznámení \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
+					Email Address'","{0} je neplatná e-mailová adresa v ""Oznámenie \
  E-mailová adresa"""
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Celkem Billing Tento rok:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Celkem Billing Tento rok:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nemožno odstrániť Poradové číslo {0}, ktorý sa používa na sklade transakciách"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Uzavření (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Uzavření (Cr)
 DocType: Serial No,Warranty Period (Days),Záruční doba (dny)
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 ,Pending Qty,Čakajúci Množstvo
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,Ignorovat
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
 DocType: Pricing Rule,Valid From,Platnost od
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
-To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Měsíční rozložení** vám pomůže váš rozpočet distribuovat do více měsíců, pokud Vaše podnikání ovlivňuje sezónnost.
-
- Chcete-li distribuovat rozpočet pomocí tohoto rozdělení, nastavte toto ** měsíční rozložení ** v ** nákladovém středisku **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
+To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesačné rozloženie** vám pomôže rozložiť váš rozpočet do vviac mesiacov, ak vaše podnikanie ovplyvňuje sezónnosť. Ak chcete rozložiť rozpočet pomocou tohto rozdelenia, nastavte toto ** mesačné rozloženie ** v ** nákladovom stredisku **"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Je nám líto, sériových čísel nelze sloučit"
@@ -515,7 +472,6 @@
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
-DocType: About Us Settings,Website Manager,Správce webu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Datum zahájení Fiskálního roku by nemělo být větší než datum ukončení
 DocType: Warranty Claim,Resolution,Řešení
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dodáva: {0}
@@ -523,25 +479,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturácie a Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Predchádzajúci
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Vyberte prodejní objednávky, ze kterého chcete vytvořit výrobní zakázky."
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Mzdové složky.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databáze potenciálních zákazníků.
+DocType: Authorization Rule,Customer or Item,Zákazník alebo položka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Databáze zákazníků.
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Přidělená částka nemůže být záporná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Východzí merná jednotka bodu {0} nemôže byť zmenená priamo, pretože ste už nejaké transakcie (y) s iným nerozpustených. Budete musieť vytvoriť novú položku použiť iný predvolený UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
-DocType: Event,Wednesday,Středa
 DocType: Sales Invoice,Customer's Vendor,Prodejce zákazníka
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Výrobní zakázka je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Návrh Psaní
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ďalšia predaja osoba {0} existuje s rovnakým id zamestnanca
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativní Sklad Error ({6}) k bodu {0} ve skladu {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -555,27 +510,23 @@
 DocType: Employee,Reason for Resignation,Důvod rezignace
 apps/erpnext/erpnext/config/hr.py +150,Template for performance appraisals.,Šablona pro hodnocení výkonu.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
+apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nie je vo fiškálnom roku {2}
 DocType: Buying Settings,Settings for Buying Module,Nastavenie pre modul Nákupy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
 DocType: Buying Settings,Supplier Naming By,Dodavatel Pojmenování By
 DocType: Activity Type,Default Costing Rate,Predvolené kalkulácie Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Prosím, nainstalujte dropbox python modul"
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manažer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Z příjemky
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manažer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Z příjemky
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
 DocType: SMS Settings,Receiver Parameter,Přijímač parametrů
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založeno Na"" a ""Seskupeno Podle"", nemůže být stejné"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Založené na"" a ""Zoskupené podľa"", nemôžu byť rovnaké"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,na
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Zadejte e-mailovou adresu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Koniec trubice tvoriaci
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -583,25 +534,20 @@
 DocType: Customer,Fixed Days,Pevné Dni
 DocType: Sales Invoice,Packing List,Balení Seznam
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Nákupní Objednávky odeslané Dodavatelům.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publikování
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publikování
 DocType: Activity Cost,Projects User,Projekty uživatele
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Spotřeba
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nebyla nalezena v tabulce Podrobnosti Faktury
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nenájdené v tabuľke Podrobnosti Faktúry
 DocType: Company,Round Off Cost Center,Zaokrúhliť nákladové stredisko
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Údržba Navštivte {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Material Request,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Nastavenia
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Více
 DocType: Pricing Rule,Sales Manager,Manažer prodeje
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Přejmenovat
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Ohýbanie
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Umožňuje uživateli
 DocType: Journal Entry,Bill No,Bill No
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
@@ -610,17 +556,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 DocType: Account,Accounts,Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Straight strihanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Chcete-li sledovat položky v oblasti prodeje a nákupu dokumentů na základě jejich sériových čísel. To je možné také použít ke sledování detailů produktu záruční.
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zamítnuto Warehouse je povinná proti regected položky
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Položka má varianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Položka {0} nebyl nalezen
 DocType: Bin,Stock Value,Reklamní Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -629,45 +574,38 @@
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti poukazu Type musí být jedním z prodejní objednávky, prodejní faktury nebo Journal Entry"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Nepodarilo sa nájsť kurz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Vítejte
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Vstup Kreditní karta
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Úkol Předmět
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Zboží od dodavatelů.
-DocType: Communication,Open,Otevřít
 DocType: Lead,Campaign Name,Název kampaně
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávok surovín
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Oběžná aktiva
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} není skladová položka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nie je skladová položka
 DocType: Mode of Payment Account,Default Account,Výchozí účet
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
-DocType: Contact Us Settings,Address Title,Označení adresy
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: Production Order Operation,Planned End Time,Plánované End Time
 ,Sales Person Target Variance Item Group-Wise,Prodej Osoba Cílová Odchylka Item Group-Wise
-DocType: Dropbox Backup,Daily,Denně
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Employee,Cell Number,Číslo buňky
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: Item Group,Website Specifications,Webových stránek Specifikace
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nový účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} typu {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Účtovné Prihlášky možno proti koncovej uzly. Záznamy proti skupinám nie sú povolené.
-DocType: ToDo,High,Vysoké
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
-DocType: User,Male,Muž
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodej kampaně.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -689,7 +627,7 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardní daň šablona, která může být použita pro všechny prodejních transakcí. Tato šablona může obsahovat seznam daňových hlav a také další náklady / příjmy hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standardní daň šablona, která může být použita pro všechny prodejních transakcí. Tato šablona může obsahovat seznam daňových hlav a také další náklady / příjmy hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
 
  #### Poznámka: 
 
@@ -715,10 +653,9 @@
 DocType: Address,Personal,Osobní
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnologie
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zápis do deníku {0} je spojen proti řádu {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Náklady Office údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
@@ -726,14 +663,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Process Payroll,Send Email,Odeslat email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nemáte oprávnění
 DocType: Company,Default Bank Account,Výchozí Bankovní účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Aktualizácia Sklad &#39;nedá skontrolovať, pretože položky nie sú dodané cez {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovať Sklad ' nie je možné skontrolovať, pretože položky nie sú dodané cez {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moje Faktúry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moje Faktúry
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Žádný zaměstnanec nalezeno
 DocType: Purchase Order,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
@@ -752,35 +690,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Ak chcete povoliť &quot;Point of Sale&quot; predstavuje
 DocType: Bin,Moving Average Rate,Klouzavý průměr
 DocType: Production Planning Tool,Select Items,Vyberte položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti účtu {1} ze dne {2}
-DocType: Comment,Reference Name,Název reference
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: Sales Invoice Item,Target Warehouse,Target Warehouse
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Očekávané datum dodání, nemůže být před Sales pořadí Datum"
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Trvalé odlievanie foriem
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} je stav {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} stav je {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Objednávka na platobné
 DocType: Sales Order Item,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
 DocType: Newsletter,Newsletter Manager,Newsletter Manažér
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Otvorenie&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Otváranie"""
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
 DocType: Expense Claim,Expenses,Výdaje
 DocType: Item Variant Attribute,Item Variant Attribute,Vlastnosť Variantu Položky
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Appraisal,Select template from which you want to get the Goals,"Vyberte šablonu, ze kterého chcete získat cílů"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Výzkum a vývoj
 ,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Sadiť
 DocType: Item,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Plánované poslat na {0}
@@ -791,18 +726,16 @@
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Mieste predaja
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nelze převést {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Báječný
 ,Available Qty,Množství k dispozici
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řady Celkem
 DocType: Salary Slip,Working Days,Pracovní dny
 DocType: Serial No,Incoming Rate,Příchozí Rate
 DocType: Packing Slip,Gross Weight,Hrubá hmotnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Zahrnout dovolenou v celkovém. pracovních dní
 DocType: Job Applicant,Hold,Držet
 DocType: Employee,Date of Joining,Datum přistoupení
@@ -812,30 +745,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Zobraziť Odberatelia
 DocType: Purchase Invoice Item,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazívne tryskanie
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Devizový kurz master.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} musí být aktivní
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
 DocType: Salary Slip,Leave Encashment Amount,Nechte inkasa Částka
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
 DocType: Bank Reconciliation,Total Amount,Celková částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Zůstatek Hodnota
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
-DocType: GL Entry,Account Currency,Mena účtu
+DocType: Bank Reconciliation,Account Currency,Mena účtu
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Prosím, uveďte zaokrúhliť účet v spoločnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Features Setup,Item Barcode,Položka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Address,Shop,Obchod
@@ -844,7 +776,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Značka
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Značka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Příspěvek na nadměrné {0} přešel k bodu {1}.
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 DocType: Item,Is Purchase Item,je Nákupní Položka
@@ -863,60 +795,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Položka vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Nepřímé příjmy
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Čiastka platby = dlžnej čiastky
-DocType: Contact Us Settings,Address Line 1,Adresní řádek 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Odchylka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Název společnosti
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Odchylka
+,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Vybrať položku pre prevod
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých nápovedy videí
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Povolit uživateli upravovat Ceník Cena při transakcích
 DocType: Pricing Rule,Max Qty,Max Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Platba na prodejní / nákupní objednávce by měly být vždy označeny jako předem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemický
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemický
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Všechny položky již byly převedeny na výrobu tohoto řádu.
 DocType: Process Payroll,Select Payroll Year and Month,Vyberte Payroll rok a mesiac
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Prejdite na príslušnej skupiny (zvyčajne využitia finančných prostriedkov&gt; obežných aktív&gt; bankových účtov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;Bank&quot;
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
-DocType: Comment,Unsubscribed,Odhlášen z odběru
 DocType: Opportunity,Walk In,Vejít
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Strom finanial nákladových středisek.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prevedené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Biela
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Pripojiť svoj obrázok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Dělat 
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Pripojiť svoj obrázok
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Dělat
 DocType: Journal Entry,Total Amount in Words,Celková částka slovy
-DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Došlo k chybě. Jedním z důvodů by mohlo být pravděpodobné, že jste uložili formulář. Obraťte se prosím na support@erpnext.com Pokud problém přetrvává."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Môj košík
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Typ objednávky musí být jedním z {0}
 DocType: Lead,Next Contact Date,Další Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otevření POČET
 DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Akciové opcie
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Leave Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Nechte přidělení nástroj
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ak Mesačný rozpočet prekročený (pre výdavkového účtu)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Orezávanie
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Východiskové podmienky
 DocType: Packing Slip Item,Packing Slip Item,Balení Slip Item
 DocType: POS Profile,Cash/Bank Account,Hotovostní / Bankovní účet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Podanie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nemôže byť záporné
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Sleva
 DocType: Features Setup,Purchase Discounts,Nákup Slevy
 DocType: Workstation,Wages,Mzdy
@@ -933,7 +860,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jste Expense schvalujícím pro tento záznam. Prosím aktualizujte ""stavu"" a Uložit"
 DocType: Serial No,Creation Document No,Tvorba dokument č
 DocType: Issue,Issue,Problém
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet nezodpovedá Company
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 DocType: BOM Operation,Operation,Operace
@@ -941,13 +869,13 @@
 DocType: Tax Rule,Shipping State,Prepravné State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidány pomocí ""získat předměty z kupní příjmy"" tlačítkem"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodejní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardní Nakupování
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Tvorba prírastkov zásob
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Tvorba prírastkov zásob
 DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Percento príspevkoch
@@ -962,29 +890,27 @@
 DocType: Time Log Batch,updated via Time Logs,aktualizovať cez čas Záznamy
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
 DocType: Company,Default Currency,Predvolená mena
 DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
-DocType: Contact Us Settings,Address,Adresa
 DocType: Expense Claim,From Employee,Od Zaměstnance
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Doprava
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok: 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,a rok:
 DocType: Email Digest,Annual Expense,Ročná Expense
 DocType: SMS Center,Total Characters,Celkový počet znaků
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Faktura Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Platba Odsouhlasení faktury
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Příspěvek%
 DocType: Item,website page link,webové stránky odkaz na stránku
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Pojďme připravit systém pro první použití.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registrace firmy čísla pro váš odkaz. Daňové čísla atd
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Nákupní košík Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Výrobní zakázka {0} musí být zrušena před zrušením této prodejní objednávky
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Vyberte Time protokolů a předložit k vytvoření nové prodejní faktury.
@@ -1003,68 +929,59 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Otvorenie účtovníctva Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nic požadovat
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Aktuální datum ukončení"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Řízení
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Řízení
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Typy činností pro Time listy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investičné liatie
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Buď debetní nebo kreditní částka je vyžadována pro {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktivní
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modrý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenník Krajina
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,"Další uzly mohou být pouze vytvořena v uzlech typu ""skupiny"""
 DocType: Item,UOMs,Merné Jednotky
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} už vytvorili pre užívateľov: {1} a spoločnosť {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Faktor konverzie MJ
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Vrstvené objektu výrobnej
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch tvárnenie
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Daňové a jiné platové srážky.
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
 DocType: Account,Warehouse,Sklad
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
 DocType: Holiday,Holiday,Dovolená
-DocType: Event,Saturday,Sobota
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
 ,Daily Time Log Summary,Denní doba prihlásenia - súhrn
-DocType: DocField,Label,Popisek
 DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
 DocType: Lead,Call,Volání
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Nastavenia pre modul Zamestnanci
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Grid """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosím, vyberte první prefix"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Uveďte aspoň jeden atribút v tabuľke atribúty
 DocType: Contact,User ID,User ID
-DocType: Communication,Sent,Odesláno
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,View Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
-DocType: Communication,Delivery Status,Delivery Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 DocType: Production Order,Manufacture against Sales Order,Výroba na odběratele
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Zbytek světa
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
@@ -1075,13 +992,11 @@
 DocType: BOM Item,Item Description,Položka Popis
 DocType: Payment Tool,Payment Mode,Způsob platby
 DocType: Purchase Invoice,Is Recurring,Je Opakující
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Priamy plechu laserom spekanie
 DocType: Purchase Order,Supplied Items,Dodávané položky
 DocType: Production Order,Qty To Manufacture,Množství K výrobě
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Dočasné Otvorenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaměstnanec Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
 DocType: Address,Address Type,Typ adresy
@@ -1090,42 +1005,41 @@
 DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Ak chcete získať to najlepšie z ERPNext, odporúčame vám nejaký čas trvať, a sledovať tieto nápovedy videa."
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +38,Item {0} must be Sales Item,Položka {0} musí být Sales Item
-apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,na
+apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +55, to ,k
 DocType: Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch
 ,Accounts Payable Summary,Splatné účty Shrnutí
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +193,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
 DocType: Journal Entry,Get Outstanding Invoices,Získat neuhrazených faktur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Zelená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Zelená
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Celkem Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Smlouva
-DocType: Report,Disabled,Vypnuto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Smlouva
+DocType: Email Digest,Add Quote,Pridať ponuku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Vaše Produkty nebo Služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Vaše Produkty nebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Meno je požadované
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
 DocType: Address,City/Town,Město / Město
 DocType: Email Digest,Annual Income,Ročný príjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Položka {0} musí být Subdodavatelské Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitálové Vybavení
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
@@ -1135,14 +1049,13 @@
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Očakávané dátum dodania je menšia ako plánovaný dátum začatia.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Pro Dodavatele
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavení typu účtu pomáhá při výběru tohoto účtu v transakcích.
 DocType: Purchase Invoice,Grand Total (Company Currency),Celkový součet (Měna společnosti)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Celkem Odchozí
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/frappe/frappe/config/desk.py +7,Tools,Nástroje
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Výrobní číslo objednávky je povinná pro legální vstup účelem výroby
 DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
@@ -1150,24 +1063,22 @@
 DocType: Journal Entry,Journal Entry,Zápis do deníku
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentáře
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Ocenění Rate potřebný k bodu {0}
 DocType: Quality Inspection Reading,Reading 8,Čtení 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Celkom {0} pre všetky položky je nula, môžete mali zmeniť &quot;Distribuovať poplatkov na základe&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,pracovna stanica
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Technické vybavení
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spoločnosť
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Musíte povolit Nákupní košík
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,No Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Posouzení Template Goal
 DocType: Salary Slip,Earning,Získávání
 DocType: Payment Tool,Party Account Currency,Party Mena účtu
@@ -1177,26 +1088,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Jídlo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Můžete udělat časový záznam pouze proti předložené výrobní objednávce
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",Newsletter kontaktom a obchodným iniciatívam
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Mena záverečného účtu, musí byť {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operace nemůže být prázdné.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operace nemůže být prázdné.
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
-DocType: DocField,Description,Popis
 DocType: Authorization Rule,Average Discount,Průměrná sleva
-DocType: Letter Head,Is Default,Je Výchozí
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účetnictví
 DocType: Features Setup,Features Setup,Nastavení Funkcí
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,View Ponuka List
-DocType: Communication,Communication,Komunikace
 DocType: Item,Is Service Item,Je Service Item
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 DocType: Activity Cost,Projects,Projekty
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosím, vyberte Fiskální rok"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1208,14 +1116,14 @@
 DocType: Pricing Rule,Campaign,Kampaň
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Purchase Invoice,Contact Person,Kontaktní osoba
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže být vetší ako ""Očekávaný Dátum Konca"""
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže byť väčší ako ""Očakávaný Dátum Ukončenia"""
 DocType: Holiday List,Holidays,Prázdniny
 DocType: Sales Order Item,Planned Quantity,Plánované Množství
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržiavať Zásoby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
@@ -1225,7 +1133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Diagram účtů
 DocType: Material Request,Terms and Conditions Content,Podmínky Content
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
@@ -1239,31 +1147,28 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Do List
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Záporné množství nie je dovolené
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Učeň
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Záporné množství nie je dovolené
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Žiadny aktívny Štruktúra Plat nájdených pre zamestnancov {0} a mesiac
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Táto položka sa kupuje
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Táto položka sa kupuje
 DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Obrubovanie
-DocType: Bulk Email,Not Sent,Neodesláno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Výbušné tvárnenie
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Plánované poslat na {0} příjemci
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Podsestavy
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Supplier,Stock Manager,Reklamný manažér
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
@@ -1273,105 +1178,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Řádek {0}: přidělené množství {1}, musí být menší než nebo se rovná hodnotě JV {2}"
 DocType: Item,Inventory,Inventář
 DocType: Features Setup,"To enable ""Point of Sale"" view",Ak chcete povoliť &quot;Point of Sale&quot; pohľadu
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Platba nemůže být pro prázdný košík
 DocType: Item,Sales Details,Prodejní Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripne
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Dátum, kedy bude vygenerovaný budúci faktúry. To je generovaný na odoslať."
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vláda
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Varianty Položky
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vláda
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Varianty Položky
 DocType: Company,Services,Služby
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Celkem ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Celkem ({0})
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
 DocType: Sales Invoice,Source,Zdroj
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Finanční rok Datum zahájení
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Finanční rok Datum zahájení
 DocType: Employee External Work History,Total Experience,Celková zkušenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Zahlbovanie
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Material Request Item,Sales Order No,Prodejní objednávky No
 DocType: Item Group,Item Group Name,Položka Název skupiny
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Zaujatý
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Přenos Materiály pro výrobu
 DocType: Pricing Rule,For Price List,Pro Ceník
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatočná zľava Suma (Mena Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Chyba: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Chyba: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Zákazník> Zákazník Group> Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozícii dávky Množstvo v sklade
 DocType: Time Log Batch Detail,Time Log Batch Detail,Time Log Batch Detail
-DocType: Workflow State,Tasks,úkoly
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
-DocType: Event,Tuesday,Úterý
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
 ,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listy typu {0} už pridelené pre zamestnancov {1} na dobu {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,Názov Mernej Jednotky
-DocType: Top Bar Item,Target,Cíl
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Výše příspěvku
 DocType: Sales Invoice,Shipping Address,Shipping Address
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Master Značky
-DocType: ToDo,Due Date,Datum splatnosti
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Master Značky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Krabice
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizace
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Krabice
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizace
 DocType: Monthly Distribution,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
 DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Účtovný záznam pre {0} možno vykonávať iba v mene: {1}
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Vystrihovanie
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankové účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
 DocType: Address,Lead Name,Meno Obchodnej iniciatívy
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Otvorenie Sklad Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} musí být uvedeny pouze jednou
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Otvorenie Sklad Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} môže byť uvedené iba raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nie je povolené, aby transfer viac {0} ako {1} proti objednanie {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Výrobní množství je povinné
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Částky nezohledněny v bance
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Částky nezohledněny v bance
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Odstredivé liatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetické pole-assisted dokončovanie
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Závazky
 DocType: Purchase Receipt,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 DocType: Production Planning Tool,Select Sales Orders,Vyberte Prodejní objednávky
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Chcete-li sledovat položky pomocí čárového kódu. Budete mít možnost zadat položky dodacího listu a prodejní faktury snímáním čárového kódu položky.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označiť ako Dodáva
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označiť ako Dodáva
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Značka Citácia
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 DocType: SMS Center,Receiver List,Přijímač Seznam
@@ -1379,31 +1275,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Zobraziť
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plat Struktura Odpočet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektívne laserové spekanie
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import byl úspěšný!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Množství nesmí být větší než {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Staroba (dni)
 DocType: Quotation Item,Quotation Item,Položka ponuky
 DocType: Account,Account Name,Název účtu
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Datum OD nemůže být vetší než datum DO
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Pořadové číslo {0} {1} množství nemůže být zlomek
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dodavatel Type master.
 DocType: Purchase Order Item,Supplier Part Number,Dodavatel Číslo dílu
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Přidat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Míra konverze nemůže být 0 nebo 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je zrušená alebo zastavená
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozidlo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Doklad o koupi {0} není předložena
 DocType: Company,Default Payable Account,Výchozí Splatnost účtu
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavení pro on-line nákupního košíku, jako jsou pravidla dopravu, ceník atd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% účtovaný
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% fakturované
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
 DocType: Journal Entry Account,Debit in Company Currency,Debetnej v spoločnosti Mena
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moje problémy
@@ -1412,12 +1304,9 @@
 DocType: Company,Default Values,Predvolené hodnoty
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Částka platby nemůže být záporný
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Tlačová kovania
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 DocType: Payment Reconciliation,Payments,Platby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Izostatické lisovanie
-DocType: ToDo,Medium,Střední
 DocType: Budget Detail,Budget Allocated,Přidělený Rozpočet
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1426,12 +1315,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 DocType: Quotation,Term Details,Termín Podrobnosti
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánovanie kapacít Pro (dni)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Žiadny z týchto položiek má žiadnu zmenu v množstve alebo hodnote.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Žiadny z týchto položiek má žiadnu zmenu v množstve alebo hodnote.
 DocType: Warranty Claim,Warranty Claim,Záruční reklamace
 ,Lead Details,Podrobnosti Obchodnej iniciatívy
-DocType: Authorization Rule,Approving User,Schvalování Uživatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovania
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Pokovovanie
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
 DocType: Bank Reconciliation,From Date,Od data
@@ -1453,64 +1339,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Společnost, měsíc a fiskální rok je povinný"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Single jednotka položky.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',"Time Log Batch {0} musí být ""Odesláno"""
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Warehouse vyžadované pri Row No {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Zadajte platnú finančný rok dátum začatia a ukončenia
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
 DocType: Address,Postal,Poštovní
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Baníctvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin liatie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Zákaznická Skupina existuje se stejným názvem, prosím změnit název zákazníka nebo přejmenujte skupinu zákazníků"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosím, vyberte {0} jako první."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Text {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Výrobky
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Výrobky
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Zadejte Party Party a je nutné pro pohledávky / závazky na účtu {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ak je táto položka má varianty, potom to nemôže byť vybraná v predajných objednávok atď"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,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 +85,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: Quotation,Order Type,Typ objednávky
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 DocType: Payment Tool,Find Invoices to Match,Nájsť faktúry zápas
 ,Item-wise Sales Register,Item-moudrý Sales Register
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","napríklad ""XYZ Národná Banka"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Celkem Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Celkem Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Nákupný košík je povolené
 DocType: Job Applicant,Applicant for a Job,Žadatel o zaměstnání
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Žádné výrobní zakázky vytvořené
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Plat Slip of zaměstnance {0} již vytvořili pro tento měsíc
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Sales Invoice Item,Batch No,Č. šarže
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Hlavné
-DocType: DocPerm,Delete,Smazat
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varianta
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Nový: {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Zastaveno příkaz nelze zrušit. Uvolnit zrušit.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
@@ -1519,53 +1403,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Žadatel o zaměstnání.
 DocType: Purchase Order Item,Warehouse and Reference,Sklad a reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární info a další obecné informace o váš dodavatel
-DocType: Country,Country,Země
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresy
-DocType: Communication,Received,Přijato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicitní Pořadové číslo vstoupil k bodu {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Podmínka pro pravidla dopravy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Položka nesmie mať výrobné zákazky.
-DocType: DocField,Attach Image,Pripojiť obrázok
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Ponechte prázdné, pokud žádná změna"
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Protokoly pre výrobu.
 DocType: Item,Apply Warehouse-wise Reorder Level,Použít Skladovací-moudrý Seřadit sezn Level
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Time Log pro úkoly.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Splátka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Splátka
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
-DocType: Communication,Rejected,Zamítnuto
 DocType: Pricing Rule,Brand,Značka
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Sales Order Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
 DocType: Quality Inspection Reading,Reading 10,Čtení 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Hodnota {0} pre atribút {1} neexistuje v zozname platného bodu Hodnoty atribútov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Spolupracovník
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Vypršela
 DocType: Packing Slip,To Package No.,Balit No.
-DocType: DocType,System,Systém
 DocType: Warranty Claim,Issue Date,Datum vydání
 DocType: Activity Cost,Activity Cost,Náklady Aktivita
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřeba Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikace
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikace
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 DocType: Payment Tool,Make Payment Entry,Učinit vstup platby
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
 ,Sales Invoice Trends,Prodejní faktury Trendy
 DocType: Leave Application,Apply / Approve Leaves,Použít / Schválit listy
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
 DocType: Stock Settings,Allowance Percent,Allowance Procento
@@ -1577,35 +1456,30 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Položka dodávateľskej ponuky
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Proveďte platovou strukturu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Strihanie
 DocType: Item,Has Variants,Má varianty
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klikněte na tlačítko "", aby se prodej na faktuře"" vytvořit nový prodejní faktury."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Balenie a označovanie
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Access Secret
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Správa projektov
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 DocType: Budget Detail,Fiscal Year,Fiskální rok
 DocType: Cost Center,Budget,Rozpočet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Dosažená
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,napríklad 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,napríklad 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
 DocType: Item,Is Sales Item,Je Sales Item
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Položka Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Suma, ktorá má dodávať"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Byly tam chyby.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Výčapné
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Produkt nebo Služba
 DocType: Naming Series,Current Value,Current Value
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvořil
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} vytvoril
 DocType: Delivery Note Item,Against Sales Order,Proti přijaté objednávce
 ,Serial No Status,Serial No Status
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +382,Item table can not be blank,Tabulka Položka nemůže být prázdný
@@ -1618,15 +1492,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
 DocType: Website Item Group,Website Item Group,Website Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Odvody a dane
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Prosím, zadejte Referenční den"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky môžu nie je možné filtrovať {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky nemôžu byť filtrované podľa {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
 DocType: Material Request Item,Material Request Item,Materiál Žádost o bod
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Strom skupiny položek.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Strom skupiny položek.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Červená
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Červená
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1636,12 +1510,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} není dokončen {2} Množství hotových výrobků ve výrobním procesu objednávky # {3}. Prosím aktualizujte provozní stav přes čas protokoly
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Zmeniť MJ na položke.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kritéria přijetí
 DocType: Item Attribute,Attribute Name,Název atributu
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Položka {0} musí být prodej či servis položku v {1}
 DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Skupina
 DocType: Task,Expected Time (in hours),Predpokladaná doba (v hodinách)
 ,Qty to Order,Množství k objednávce
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Ak chcete sledovať značku v nasledujúcich dokumentoch dodacom liste Opportunity, materiál Request, položka, objednávke, kúpnej poukazu, nakupujú potvrdenka, cenovú ponuku, predajné faktúry, Product Bundle, predajné objednávky, poradové číslo"
@@ -1650,159 +1523,140 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: Features Setup,Brands,Značky
 DocType: C-Form Invoice Detail,Invoice No,Faktúra č.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Z vydané objednávky
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 ,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Není nastaveno
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Vydržte, kým sa váš systém nastaví. Môže to pár chvíľ trvať."
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Pár
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Pár
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
 DocType: Employee,Personal Details,Osobní data
 ,Maintenance Schedules,Plány údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Razba
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,"Debetní Chcete-li v úvahu, musí být pohledávka účet"
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Jako výrobní objednávce lze provést za tuto položku, musí být skladem."
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Spájanie
-DocType: Authorization Rule,Above Value,Výše uvedená hodnota
 ,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre uchádzačov o prácu. (Napríklad praca@priklad.com)
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové pridelené listy {0} nemôže byť nižšia ako už schválených listy {1} pre obdobie
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
-DocType: Custom Field,Custom,Zvyk
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vstrekovanie
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Strom finanial účtů.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Ponechte prázdné, pokud se to považuje za ubytování ve všech typech zaměstnanců"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Účet {0} musí být typu ""dlouhodobého majetku"", protože položka {1} je majetková položka"
 DocType: HR Settings,HR Settings,Nastavení HR
-apps/frappe/frappe/config/setup.py +130,Printing,Tisk
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Úhrada výdajů čeká na schválení. Pouze schalovatel výdajů může aktualizovat stav.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Den (y), na které žádáte o dovolené jsou dovolenou. Potřebujete nevztahuje na dovolenou."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,a
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportovní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Celkem Aktuální
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Jednotka
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosím, nastavení přístupových klíčů Dropbox ve vašem webu config"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Jednotka
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Uveďte prosím, firmu"
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Váš finanční rok končí
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je teraz predvolený Fiškálny rok. Prosím aktualizujte svoj prehliadač, aby se prejavili zmeny."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Schvalování roli
 ,BOM Search,BOM Search
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Zobrazit / skrýt funkce, jako pořadová čísla, POS atd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nasledujúci materiál žiadosti boli automaticky zvýšená na základe úrovni re-poradie položky
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum vůle nemůže být před přihlášením dnem v řadě {0}
 DocType: Salary Slip,Deduction,Dedukce
 DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Prosím, zadajte ID zamestnanca z tohto predaja osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
-DocType: Project,% Tasks Completed,% splněných úkolů
+DocType: Project,% Tasks Completed,% splnených úloh
 DocType: Project,Gross Margin,Hrubá marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +140,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +72,disabled user,zakázané uživatelské
 DocType: Opportunity,Quotation,Ponuka
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 DocType: Quotation,Maintenance User,Údržba uživatele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Náklady Aktualizované
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Náklady Aktualizované
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Bod {0} již byla vrácena
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskální rok ** představuje finanční rok. Veškeré účetní záznamy a další významné transakce jsou sledovány proti ** fiskální rok **.
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiškálny rok ** predstavuje finančný rok. Všetky účtovné záznamy a ďalšie významné transakcie sú sledované pod ** Fiškálny rok **.
 DocType: Opportunity,Customer / Lead Address,Zákazník / Iniciatíva Adresa
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Popis Práca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Popis Práca
 DocType: Purchase Order Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vyberte prosím platný CSV soubor s daty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Náter
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravit Warehouse"
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Supplier Quotation,Manufacturing Manager,Výrobní ředitel
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Zásielky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip liatie
-DocType: Purchase Order,To be delivered to customer,Ak chcete byť doručený zákazníkovi
+apps/erpnext/erpnext/hooks.py +68,Shipments,Zásielky
+DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Time Log Status musí být předloženy.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavenia
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row # 
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Pricing Rule,Supplier,Dodavatel
 DocType: C-Form,Quarter,Čtvrtletí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Employee,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uživatel {0} je zakázána
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
-DocType: Journal Entry Account,Credit in Account Currency,Úver v mene účtu
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Currency Exchange,From Currency,Od Měny
-DocType: DocField,Name,Meno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Částky nejsou zohledněny v systému
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosím, vyberte alokovaná částka, typ faktury a číslo faktury v aspoň jedné řadě"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Prodejní objednávky potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Částky nejsou zohledněny v systému
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Ostatní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Ostatní
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dokončeno
-DocType: Web Form,Select DocType,Zvolte DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Preťahovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankovnictví
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nové Nákladové Středisko
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nové Nákladové Středisko
 DocType: Bin,Ordered Quantity,Objednané množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
 DocType: Quality Inspection,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 DocType: Purchase Order Item,Reference Document Type,Referenčná Typ dokumentu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Prodejní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
 DocType: Time Log Batch,Total Billing Amount,Celková suma fakturácie
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Pohledávky účtu
@@ -1810,19 +1664,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Predajné objednávky na platby
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Záznamy vytvořil:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Employee,Blood Group,Krevní Skupina
 DocType: Purchase Invoice Item,Page Break,Zalomení stránky
 DocType: Production Order Operation,Pending,Až do
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uživatelé, kteří si vyhoví žádosti konkrétního zaměstnance volno"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Nemôžete zmeniť predvolenú MJ pre Variant produktu. Ak chcete zmeniť predvolenú MJ pre Variant zmeňte predvolenú MJ šablóny produktu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kancelářské Vybavení
 DocType: Purchase Invoice Item,Qty,Množství
 DocType: Fiscal Year,Companies,Společnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronika
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Z plánu údržby
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Na plný úvazek
 DocType: Purchase Invoice,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ak ste vytvorili štandardné šablónu v predaji daní a poplatkov šablóny, vyberte jednu a kliknite na tlačidlo nižšie."
@@ -1834,47 +1688,44 @@
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Technologie
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 DocType: Offer Letter,Offer Letter,Ponuka Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Celkové fakturované Amt
 DocType: Time Log,To Time,Chcete-li čas
+DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Chcete-li přidat podřízené uzly, prozkoumat stromu a klepněte na položku, pod kterou chcete přidat více uzlů."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ceník {0} je zakázána
 DocType: Manufacturing Settings,Allow Overtime,Povoliť Nadčasy
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položky {1}. Poskytli ste {2}.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuálne ocenenie Rate
 DocType: Item,Customer Item Codes,Zákazník Položka Kódy
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Vytvořte Platební záznamy proti objednávky nebo faktury.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Zváranie
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Je potrebná nová skladová MJ
 DocType: Quality Inspection,Sample Size,Velikost vzorku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Všechny položky již byly fakturovány
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Uveďte prosím platný ""Od věci č '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
 DocType: Features Setup,Item Serial Nos,Položka sériových čísel
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Branch,Branch,Větev
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc: 
+apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No plat skluzu nalezen na měsíc:
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Lisovanie
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Vaši Zákazníci
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kód položky> Položka Group> Brand
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
-DocType: Event,Friday,Pátek
 DocType: Time Log,Costing Amount,Kalkulácie Čiastka
 DocType: Process Payroll,Submit Salary Slip,Odeslat výplatní pásce
 DocType: Salary Structure,Monthly Earning & Deduction,Měsíčního výdělku a dedukce
@@ -1882,16 +1733,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Dovoz hromadnú
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
 DocType: SMS Log,Sender Name,Jméno odesílatele
-DocType: Page,Title,Titulek
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Přizpůsobit
-DocType: POS Profile,[Select],[Vybrat]
+DocType: POS Profile,[Select],[Vybrať]
 DocType: SMS Log,Sent To,Odoslaná
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Proveďte prodejní faktuře
 DocType: Company,For Reference Only.,Pouze orientační.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neplatný {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
 DocType: Manufacturing Settings,Capacity Planning,Plánovanie kapacít
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Dátum od"" je povinný"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátum od"" je povinný"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
@@ -1906,7 +1755,7 @@
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Cestování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Cestování
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
 DocType: Sales Invoice,Recurring,Opakujúce sa
@@ -1914,44 +1763,40 @@
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Přenos materiálu
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Zadejte operací, provozní náklady a dávají jedinečnou operaci ne své operace."
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Pridajte dane
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Pridajte dane
 ,Financial Analytics,Finanční Analýza
 DocType: Quality Inspection,Verified By,Verified By
 DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
 DocType: Quality Inspection,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
-DocType: System Settings,In Hours,V hodinách
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Očekávaný zůstatek podle banky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Leštenie
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Očekávaný zůstatek podle banky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
 DocType: Appraisal,Employee,Zaměstnanec
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importovať e-maily z
 apps/erpnext/erpnext/utilities/doctype/contact/contact.js +67,Invite as User,Pozvať ako Užívateľ
 DocType: Features Setup,After Sale Installations,Po prodeji instalací
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je plně fakturováno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is fully billed,{0} {1} je úplne fakturované
 DocType: Workstation Working Hour,End Time,End Time
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Sales Invoice,Mass Mailing,Hromadné emaily
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Súbor premenovať
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Zobraziť Platby
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Veľkosť
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Vytvořit zákazníka
@@ -1961,48 +1806,43 @@
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
 DocType: Buying Settings,Buying Settings,Nákup Nastavení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass dokončovacie
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 DocType: Upload Attendance,Attendance To Date,Účast na data
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Nastavenie serveru prichádzajúcej pošty s ID emailom pre Predaj. (Napríklad obchod@priklad.com)
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Tool,Payment Account,Platební účet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Návrh
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Vyrovnávací Off
 DocType: Quality Inspection Reading,Accepted,Přijato
-DocType: User,Female,Žena
-DocType: Journal Entry Account,Debit in Account Currency,Debetné v mene účtu
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Uistite sa, že naozaj chcete vymazať všetky transakcie pre túto spoločnosť. Vaše kmeňové dáta zostanú, ako to je. Túto akciu nie je možné vrátiť späť."
-DocType: Print Settings,Modern,Moderní
-DocType: Communication,Replied,Odpovězeno
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neplatná referencie {0} {1}
 DocType: Payment Tool,Total Payment Amount,Celková Částka platby
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než Plánované Množství ({2}), ve Výrobní Objednávce {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemôže byť väčšie, ako plánované množstvo ({2}), vo Výrobnej Objednávke {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Ako tam sú existujúce skladové transakcie pre túto položku, \ nemôžete zmeniť hodnoty &quot;Má sériové číslo&quot;, &quot;má Batch Nie&quot;, &quot;Je skladom&quot; a &quot;ocenenie Method&quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Rýchly vstup Journal
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pre Množstvo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} není odesláno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} nie je odoslané
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Dokončiť nastavenie
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter adresár
 DocType: Delivery Note,Transporter Name,Přepravce Název
+DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
 DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Celkem Absent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Měrná jednotka
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
 DocType: Lead,Opportunity,Příležitost
@@ -2023,16 +1863,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa skladovej MJ)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
 DocType: Campaign,Campaign-.####,Kampaň-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Prenikavý
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
 DocType: Customer Group,Has Child Node,Má děti Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti Nákupní Objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti Objednávke {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom fiškálny rok. Pre zistiť viac informácií {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom Fiškálnom roku. Pre viac informácií pozrite {2}.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotochemický obrábanie
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2053,7 +1892,7 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","Standardní daň šablona, která může být použita pro všechny nákupních transakcí. Tato šablona může obsahovat seznam daňových hlav a také ostatní náklady hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standardní daň šablona, která může být použita pro všechny nákupních transakcí. Tato šablona může obsahovat seznam daňových hlav a také ostatní náklady hlavy jako ""doprava"", ""pojištění"", ""manipulace"" atd. 
 
  #### Poznámka: 
 
@@ -2074,11 +1913,9 @@
  8. Zadejte Row: Je-li na základě ""předchozí řady Total"" můžete zvolit číslo řádku, která bude přijata jako základ pro tento výpočet (výchozí je předchozí řádek).
  9. Zvažte daň či poplatek za: V této části můžete nastavit, zda daň / poplatek je pouze pro ocenění (není součástí celkem), nebo pouze pro celkem (není přidanou hodnotu do položky), nebo pro obojí.
  10. Přidat nebo odečítat: Ať už chcete přidat nebo odečíst daň."
-DocType: Note,Note,Poznámka
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
-DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturácia City
 DocType: Global Defaults,Hide Currency Symbol,Skrýt symbol měny
@@ -2086,40 +1923,36 @@
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Dokončenej množstvo nemôže byť viac ako {0} pre prevádzku {1}
 DocType: Features Setup,Quality,Kvalita
-DocType: Contact Us Settings,Introduction,Úvod
 DocType: Warranty Claim,Service Address,Servisní adresy
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 řádky pro Stock smíření.
 DocType: Stock Entry,Manufacture,Výroba
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Dodávka Vezměte prosím na vědomí první
 DocType: Purchase Invoice,Currency and Price List,Mana a cenník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Výprodej Datum není uvedeno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Výroba
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Výprodej Datum není uvedeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Výroba
 DocType: Item,Allow Production Order,Povolit výrobní objednávky
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Installation Note Item,Installed Qty,Instalované množství
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Vloženo
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moje Adresy
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizace větev master.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,alebo
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,alebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 Nad
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
-,Download Backups,K stiahnutiu Zálohy
 DocType: Notification Control,Sales Order Message,Prodejní objednávky Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Nastavit jako výchozí hodnoty, jako je společnost, měna, aktuálním fiskálním roce, atd"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Typ platby
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
 DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
 DocType: Employee,Emergency Contact,Kontakt v nouzi
 DocType: Item,Quality Parameters,Parametry kvality
@@ -2134,6 +1967,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
@@ -2141,33 +1975,28 @@
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prispôsobenie Formuláre
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Výstrižok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Sploštenie
 DocType: Account,Income Account,Účet příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Liatie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenty
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Nákladové středisko
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Zprávy vydané objenávky
 DocType: Tax Rule,Shipping Country,Prepravné Krajina
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Celkem předem ({0}) na objednávku {1} nemůže být větší než \
  celkovém součtu ({2})"
 DocType: Employee,Relieving Date,Uvolnění Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser technicky čisté tvarovanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Daň z příjmů
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
@@ -2175,10 +2004,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Nastavenie Skladu
-DocType: User,Bio,Biografie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Jméno Nového Nákladového Střediska
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Jméno Nového Nákladového Střediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No default šablony adresy nalezeno. Prosím, vytvořte nový z Nastavení> Tisk a značky> Adresa šablonu."
 DocType: Appraisal,HR User,HR User
@@ -2190,31 +2018,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 DocType: Supplier,Billing Currency,Mena fakturácie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Veľké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Veľké
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Stlačení
 DocType: Payment Tool Detail,Payment Tool Detail,Detail platební nástroj
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Veľký
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Žádný zaměstnanec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Veľký
 DocType: C-Form Invoice Detail,Territory,Území
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Purchase Order,Customer Address Display,Customer Address Display
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Leštenie
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Východzia merná jednotka položky {0} nemôže byť zmenená priamo, pretože \ ste už urobili nejaké transakcie s inou MJ. Ak chcete zmeniť predvolenú MJ, \ použite ""Nástroj na náhradu MJ"" v skladovom module."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Ponuka {0} je zrušená
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Ponuka {0} je zrušená
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
@@ -2222,14 +2044,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
 DocType: Production Order Operation,Make Time Log,Udělejte si čas Přihlásit
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Prosím nastavte množstvo objednávacie
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
 DocType: Price List,Applicable for Countries,Pre krajiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Počítače
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-chemické brúsenie
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosím, nastavit svůj účtový rozvrh, než začnete účetních zápisů"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Zrušené
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dátum vo mzdovú štruktúru nemôže byť menšia ako zamestnancov Spájanie Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
@@ -2266,7 +2087,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Zkontrolujte, zda je opakující se faktury, zrušte zaškrtnutí zastavit opakované nebo dát správné datum ukončení"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maximálně {0} řádků povoleno
 DocType: C-Form Invoice Detail,Net Total,Net Total
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Fakturace (Prodejní Faktura)
@@ -2274,7 +2094,7 @@
 DocType: Project Task,Working,Pracovní
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Sklad fronty (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Vyberte Time Protokoly.
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} nepatří do Společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +37,{0} does not belong to Company {1},{0} nepatrí do Spoločnosti {1}
 DocType: Account,Round Off,Zaokrúhliť
 ,Requested Qty,Požadované množství
 DocType: Tax Rule,Use for Shopping Cart,Použitie pre Košík
@@ -2283,20 +2103,19 @@
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Aspon jedna položka by mala byť zadaná s negatívnym množstvo vo vratnom dokumente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Prevádzka {0} dlhšie, než všetkých dostupných pracovných hodín v pracovnej stanici {1}, rozložiť prevádzku do niekoľkých operácií"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrochemické obrábanie
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Žádné poznámky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root účet musí byť skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Features Setup,Sales and Purchase,Prodej a nákup
 DocType: Supplier Quotation Item,Material Request No,Materiál Poptávka No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} bol úspešne odhlásený z tohto zoznamu.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company meny)
-apps/frappe/frappe/templates/base.html +134,Added,Pridané
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
@@ -2310,11 +2129,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Fiskální rok {0} nebyl nalezen.
 DocType: Bank Reconciliation,Get Relevant Entries,Získat příslušné zápisy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Účetní položka na skladě
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Razenie
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
-apps/frappe/frappe/desk/query_report.py +136,Total,Celkem
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Riadok # {0}: Nemožno vrátiť viac ako {1} pre bodu {2}
@@ -2324,14 +2141,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Suma dane po zľave Suma (Company meny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target sklad je povinná pro řadu {0}
 DocType: Quality Inspection,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray tvárnenie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Malé
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL nebo BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimální úroveň zásob
 DocType: Stock Entry,Subcontract,Subdodávka
@@ -2342,42 +2158,39 @@
 DocType: Item,Manufacturer Part Number,Typové označení
 DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
 DocType: Bin,Bin,Popelnice
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Zaoblená hrana
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Company,Spoločnosť
 DocType: Account,Expense Account,Účtet nákladů
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Farebné
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Farebné
 DocType: Maintenance Visit,Scheduled,Plánované
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladom,&quot; je &quot;Nie&quot; a &quot;je Sales Item&quot; &quot;Áno&quot; a nie je tam žiadny iný produkt Bundle"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vyberte měsíční výplatou na nerovnoměrně distribuovat cílů napříč měsíců.
 DocType: Purchase Invoice Item,Valuation Rate,Ocenění Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ceníková Měna není zvolena
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Bod Row {0}: doklad o koupi, {1} neexistuje v tabulce ""kupní příjmy"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
 DocType: Installation Note Item,Against Document No,Proti dokumentu č
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosím, vyberte {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Aktualizovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Výzkumník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Uložte Newsletter před odesláním
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Meno alebo e-mail je povinné
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrátené Množstvo
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type je povinné
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibračné dokončovacie
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Sales Invoice,Advertisement,Reklama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Skúšobná doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Skúšobná doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
@@ -2385,55 +2198,51 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brúsenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Zmenšiť balenia
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Nevybavené Aktivity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potvrdené
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dodavatel> Dodavatel Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Název je povinný.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Tavenie rudy
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Attendance,Attendance Date,Účast Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
 DocType: Item,Valuation Method,Ocenění Method
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Nepodarilo sa nájsť kurz pre {0} do {1}
 DocType: Sales Invoice,Sales Team,Prodejní tým
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicitní záznam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicitní záznam
 DocType: Serial No,Under Warranty,V rámci záruky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
 DocType: Pricing Rule,Discount Percentage,Sleva v procentech
 DocType: Payment Reconciliation Invoice,Invoice Number,Číslo faktúry
-apps/erpnext/erpnext/hooks.py +70,Orders,Objednávky
+apps/erpnext/erpnext/hooks.py +54,Orders,Objednávky
 DocType: Leave Control Panel,Employee Type,Type zaměstnanců
 DocType: Employee Leave Approver,Leave Approver,Nechte schvalovač
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Zužovanie
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Prevádza jadrový materiál pre Výroba
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Uživatel s rolí ""Schvalovatel výdajů"""
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
 DocType: Pricing Rule,Purchase Manager,Vedoucí nákupu
 DocType: Payment Tool,Payment Tool,Platebního nástroje
 DocType: Target Detail,Target Detail,Target Detail
-DocType: Sales Order,% of materials billed against this Sales Order,% Materiálů fakturovaných proti tomuto odběrateli
+DocType: Sales Order,% of materials billed against this Sales Order,% Materiálov fakturovaných proti tejto Predajnej objednávke
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neplatné obdobie
 DocType: Customer,Credit Limit,Úvěrový limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Vyberte typ transakce
 DocType: GL Entry,Voucher No,Voucher No
@@ -2443,11 +2252,10 @@
 DocType: Customer,Address and Contact,Adresa a Kontakt
 DocType: Customer,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Employee,Feedback,Zpětná vazba
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolenka nemôže byť pridelené pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Časový plán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Brúsne jet obrábanie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Časový plán
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
-DocType: Website Settings,Website Settings,Nastavení www stránky
 DocType: Item,Reorder level based on Warehouse,Úroveň Zmena poradia na základe Warehouse
 DocType: Activity Cost,Billing Rate,Fakturácia Rate
 ,Qty to Deliver,Množství k dodání
@@ -2458,20 +2266,19 @@
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root účet nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root účet nemůže být smazán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Zobrazit Stock Příspěvky
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Správa adries
 DocType: Pricing Rule,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Uzavření (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Uzavření (Dr)
 DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Daňové šablona na prodej transakce.
@@ -2487,10 +2294,9 @@
 ,Billed Amount,Fakturovaná částka
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Získať aktualizácie
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Pridať niekoľko ukážkových záznamov
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Pridať niekoľko ukážkových záznamov
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Nechajte Správa
-DocType: Event,Groups,Skupiny
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
@@ -2499,40 +2305,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Rychlá pomoc
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
 DocType: Features Setup,Sales Extras,Prodejní Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočt na účet {1} proti nákladovému středisku {2} bude vyšší o {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} rozpočet pre účet {1} proti nákladovému stredisku {2} prekročí o {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Hodnota nebo Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Konverzní faktor nemůže být ve zlomcích
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Budete ho používat k přihlášení
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Budete ho používat k přihlášení
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Proveďte výplatní pásce
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prechádzať BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Zajištěné úvěry
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Skvělé produkty
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Počiatočný stav Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nelze schválit dovolenou si nejste oprávněna schvalovat listy na blok Termíny
 DocType: Appraisal,Appraisal,Ocenění
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-pena liatie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Výkres
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se opakuje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
 DocType: Workstation Working Hour,Start Time,Start Time
@@ -2546,12 +2349,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá suma (Company Mena)
 DocType: BOM Operation,Hour Rate,Hodinová sadzba
 DocType: Stock Settings,Item Naming By,Položka Pojmenování By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Z ponuky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Z ponuky
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Další období Uzávěrka Entry {0} byla podána po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiál Prenesená pre výrobu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Účet {0} neexistuje
 DocType: Purchase Receipt Item,Purchase Order Item No,Číslo položky vydané objednávky
-DocType: System Settings,System Settings,Nastavenie systému
 DocType: Project,Project Type,Typ projektu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Buď cílové množství nebo cílová částka je povinná.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Náklady na rôznych aktivít
@@ -2560,36 +2362,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je zrušené
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje dodávky
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje dodávky
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
-DocType: Communication,Recipients,Příjemci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skrutkovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Vrúbkovanie
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Prosím, vyberte bankovní účet"
 DocType: Newsletter,Create and Send Newsletters,Vytvoření a odeslání Zpravodaje
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Datum od musí být dříve než datum do
 DocType: Sales Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Vitajte v ERPNext
+,Welcome to ERPNext,Vitajte v ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Voucher Detail Počet
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Obchodná iniciatíva na Ponuku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Volá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
 ,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
@@ -2597,13 +2395,10 @@
 DocType: Issue,Opening Date,Datum otevření
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Sadzba a množstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Nudný
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Z přijaté objednávky
-DocType: Blog Category,Parent Website Route,nadřazená cesta internetové stránky
 DocType: Sales Order,Not Billed,Ne Účtovaný
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Neaktivní
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 DocType: Time Log,Batched for Billing,Zarazeno pro fakturaci
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Směnky vznesené dodavately
@@ -2611,20 +2406,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Částka slevy
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,napríklad DPH
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,napríklad DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Tvárnenie Hot metal plyn
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Prejdite na príslušnej skupiny (zvyčajne zdrojom finančných prostriedkov&gt; krátkodobých záväzkov&gt; daní a poplatkov a vytvoriť nový účet (kliknutím na Pridať dieťa) typu &quot;dane&quot; a to nehovorím o daňovú sadzbu.
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserové rezanie
-DocType: Event,Monday,Pondělí
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Account,Payable,Splatný
 DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
@@ -2637,7 +2429,6 @@
 DocType: Lead,Address Desc,Popis adresy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
-DocType: Page,All,Vše
 DocType: Stock Entry Detail,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
 DocType: Employee,Confirmation Date,Potvrzení Datum
@@ -2645,9 +2436,8 @@
 DocType: Account,Sales User,Uživatel prodeje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Nastavit
 DocType: Lead,Lead Owner,Získateľ Obchodnej iniciatívy
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebná Warehouse
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Je potrebná Warehouse
 DocType: Employee,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Time Log,Will be updated when billed.,Bude aktualizována při účtovány.
@@ -2655,50 +2445,46 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% vyhlásené
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% dodané
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Položka {0}: Objednané množstvo {1} nemôže byť nižšia ako minimálna Objednané množstvo {2} (definovanej v bode).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Názov spoločnosti nemôže byť Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Načisto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všetkých oznámení typu e-mail, telefón, chát, návštevy, atď"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrúhliť nákladové stredisko v spoločnosti"
 DocType: Purchase Invoice,Terms,Podmínky
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Vytvořit nový
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Vytvořit nový
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
 ,Item-wise Sales History,Item-moudrý Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Celková částka potrestána
 ,Purchase Analytics,Nákup Analytika
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Holenie
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Sadzba: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Sadzba: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plat Slip Odpočet
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Poznámky
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Vyberte první uzel skupinu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cíl musí být jedním z {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Vyplňte formulář a uložte jej
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Stáhněte si zprávu, která obsahuje všechny suroviny s jejich aktuální stav zásob"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Obloženie
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 DocType: Leave Application,Leave Balance Before Application,Nechte zůstatek před aplikací
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Company,Default Letter Head,Výchozí hlavičkový
 DocType: Time Log,Billable,Zúčtovatelná
-DocType: Authorization Rule,This will be used for setting rule in HR module,Tato adresa bude použita pro nastavení pravidlo HR modul
 DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Změna pořadí Množství
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
@@ -2710,12 +2496,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Příležitost Ztracena
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Sleva Pole bude k dispozici v objednávce, doklad o koupi, nákupní faktury"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Názov nového účtu. Poznámka: Prosím, vytvárať účty pre zákazníkov a dodávateľmi"
-DocType: Report,Report Type,Typ výpisu
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nahrávám
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Nahradit Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Země moudrý výchozí adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Show daň break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dát a export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Pokud se zapojit do výrobní činnosti. Umožňuje Položka ""se vyrábí"""
@@ -2725,16 +2509,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Purchase Order Item,Material Request Detail No,Materiál Poptávka Detail No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard sústruženie
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Proveďte návštěv údržby
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,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}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nie je platné číslo Šarže pre Položku {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Poznámka: Není-li platba provedena proti jakémukoli rozhodnutí, jak položka deníku ručně."
 DocType: Item,Supplier Items,Dodavatele položky
 DocType: Opportunity,Opportunity Type,Typ Příležitosti
@@ -2746,7 +2529,7 @@
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
 ,Stock Ageing,Reklamní Stárnutí
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled, {0} '{1}' je zakázána
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastaviť ako Otvoriť
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Posílat automatické e-maily na Kontakty na předložení transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2537,51 @@
  Dispozici Množství: {4}, transfer Množství: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Položka 3
 DocType: Purchase Order,Customer Contact Email,Zákazník Kontaktný e-mail
-DocType: Event,Sunday,Neděle
 DocType: Sales Team,Contribution (%),Příspěvek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Poznámka: Položka Platba nebude vytvořili, protože ""v hotovosti nebo bankovním účtu"" nebyl zadán"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Zodpovednosť
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Pridať užívateľa
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Pridať užívateľa
 DocType: Pricing Rule,Item Group,Položka Group
 DocType: Task,Actual Start Date (via Time Logs),Skutočný dátum Start (cez Time Záznamy)
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
 DocType: Item,Default BOM,Výchozí BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Prosím re-typ názov spoločnosti na potvrdenie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Time Log Batch,Total Hours,Celkem hodin
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilový
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Položka je povinná
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kovové vstrekovanie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Z Dodacího Listu
 DocType: Time Log,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investiční bankovnictví
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Morenie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Liatia do piesku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Sadzba
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Internovat
 DocType: Newsletter,A Lead with this email id should exist,Obchodná iniciatíva s touto emailovou adresou by už mala existovať
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Základní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 DocType: Salary Structure,Salary Structure,Plat struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena existuje pravidlo se stejnými kritérii, prosím vyřešit \
  konflikt přiřazením prioritu. Cena Pravidla: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vydání Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Vydání Material
 DocType: Material Request Item,For Warehouse,Pro Sklad
 DocType: Employee,Offer Date,Dátum Ponuky
 DocType: Hub Settings,Access Token,Přístupový Token
@@ -2815,45 +2590,37 @@
 DocType: Item,Is Fixed Asset Item,Je dlouhodobého majetku Item
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Máte-li dlouhé formáty tisku, tato funkce může být použita k rozdělení stránku se bude tisknout na více stránek se všemi záhlaví a zápatí na každé straně"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Odvalovacie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 DocType: Fiscal Year,Year Name,Meno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Povrchová úprava a priemyselného spracovania
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Data OD a DO jsou vyžadována
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cenné papíry a komoditních burzách
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vŕtanie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Vyfukovanie
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Prepravné City
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
 DocType: Account,Purchase User,Nákup Uživatel
 DocType: Notification Control,Customize the Notification,Přizpůsobit oznámení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Vyklepaní
-DocType: Web Page,Slideshow,Promítání obrázků
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
 DocType: Journal Entry,Print Heading,Tisk záhlaví
 DocType: Quotation,Maintenance Manager,Správce údržby
-DocType: Workflow State,Search,Hledat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dny od posledního Objednávky"" musí být větší nebo rovny nule"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Spájkovanie
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dní od poslednej objednávky"" musí byť väčšie alebo rovnajúce sa nule"
 DocType: C-Form,Amended From,Platném znění
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Buď cílové množství nebo cílová částka je povinná
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
 DocType: Leave Control Panel,Carry Forward,Převádět
@@ -2862,46 +2629,45 @@
 ,Produced,Produkoval
 DocType: Item,Item Code for Suppliers,Položka Kód pre dodávateľa
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Všeobecný
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Pripojiť Hlavičku
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Všeobecný
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Pripojiť Hlavičku
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,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/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 DocType: Journal Entry,Bank Entry,Bank Entry
 DocType: Authorization Rule,Applicable To (Designation),Vztahující se na (označení)
-DocType: Blog Post,Blog Post,Příspěvek blogu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Seskupit podle
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Povolit / zakázat měny.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštovní náklady
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, ke kterému se opakující objednávka bude zastaví"
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí být sníženy o {1} nebo byste měli zvýšit toleranci přesahu
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} musí byť znížený o {1} alebo by ste mali zvýšiť toleranciu presahu
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Celkem Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hodina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Hodina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Preneste materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Preneste materiál Dodávateľovi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Vytvoriť Ponuku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po výměně
 DocType: Features Setup,Point of Sale,Místo Prodeje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Metaná
 DocType: Account,Tax,Daň
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinácia
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Řádek {0}: {1} není platný {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle tovar
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
 DocType: Quality Inspection,Report Date,Datum Reportu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Smerovanie
 DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} příjemci
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} už pridelené pre zamestnancov {1} na dobu {2} - {3}
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} príjemcov
 DocType: Features Setup,Item Groups in Details,Položka skupiny v detailech
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Start Point-of-Sale (POS)
@@ -2909,33 +2675,29 @@
 DocType: Stock Entry,Update Rate and Availability,Obnovovaciu rýchlosť a dostupnosť
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
 DocType: Pricing Rule,Customer Group,Zákazník Group
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: Item,Website Description,Popis webu
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,Sales Register,Sales Register
 DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
 DocType: Address,Plant,Rostlina
-DocType: DocType,Setup,Nastavenie
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Zhrnutie pre tento mesiac a prebiehajúcim činnostiam
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Valcovanie za studena
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atribúty
-DocType: Packing Slip,Get Items,Získat položky
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Posledná Dátum objednávky
-DocType: DocField,Image,Obrázok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Proveďte Spotřební faktury
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
-DocType: Communication,Other,Ostatní
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Prevádzka ID nie je nastavené
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Návšteva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Návšteva
 DocType: Leave Type,Is Encash,Je inkasovat
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Proveďte položka deníku
@@ -2943,35 +2705,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Obchodní
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 DocType: Cost Center,Distribution Id,Distribuce Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Skvělé služby
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Všechny výrobky nebo služby.
 DocType: Purchase Invoice,Supplier Address,Dodavatel Address
-DocType: Contact Us Settings,Address Line 2,Adresní řádek 2
-DocType: ToDo,Reference,reference
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforující
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Série je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finanční služby
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Pomer atribút {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3}
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
 DocType: Leave Allocation,Unused leaves,Nepoužité listy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Výchozí pohledávka účty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rezanie
 DocType: Tax Rule,Billing State,Fakturácia State
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminovanie
 DocType: Item Reorder,Transfer,Převod
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Dátum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Spekaniu
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2982,9 +2738,8 @@
 DocType: Company,Retail,Maloobchodní
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-DocType: Product Bundle,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Zdrvujúcu
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: GL Entry,Remarks,Poznámky
@@ -2992,48 +2747,44 @@
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Features Setup,POS View,Zobrazení POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Instalace rekord pro sériové číslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuálne liatie
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Vyššie
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Cold veľkosti
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Účet {0} nemůže být skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Kraj
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
 DocType: Holiday List,Weekly Off,Týdenní Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Prozatímní Zisk / ztráta (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Návrat proti predajnej faktúre
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Bod 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Prosím nastavte výchozí hodnotu {0} ve společnosti {1}
 DocType: Serial No,Creation Time,Čas vytvoření
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Celkový příjem
 DocType: Sales Invoice,Product Bundle Help,Product Bundle Help
 ,Monthly Attendance Sheet,Měsíční Účast Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinná k položce {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Získať predmety z Bundle Product
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Účet {0} je neaktivní
 DocType: GL Entry,Is Advance,Je Zálohová
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Účast Datum od a docházky do dnešního dne je povinná
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosím, zadejte ""subdodavatelům"" jako Ano nebo Ne"
 DocType: Sales Team,Contact No.,Kontakt Číslo
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a ztráty"" typ účtu {0} není povoleno pro Vstupní Údaj"
-DocType: Workflow State,Time,Čas
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Výkaz zisku a straty"" typ účtu {0} nie je privilegovaný pre Sprístupnenie Údajov"
 DocType: Features Setup,Sales Discounts,Prodejní Slevy
 DocType: Hub Settings,Seller Country,Prodejce Country
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Predaj Dane a poplatky šablóny
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Číslo objednávky
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Přidat dítě
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je nutná konverzní faktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Provize z prodeje
 DocType: Offer Letter Term,Value / Description,Hodnota / Popis
@@ -3041,15 +2792,13 @@
 ,Customers Not Buying Since Long Time,Zákazníci nekupujete Po dlouhou dobu
 DocType: Production Order,Expected Delivery Date,Očekávané datum dodání
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Vydutý
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Liatie Evaporative-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Výdaje na reprezentaci
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Věk
 DocType: Time Log,Billing Amount,Fakturácia Suma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Výdaje na právní služby
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto objednávka bude generován například 05, 28 atd"
 DocType: Sales Invoice,Posting Time,Čas zadání
@@ -3063,26 +2812,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nový zákazník Příjmy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Cestovní výdaje
 DocType: Maintenance Visit,Breakdown,Rozbor
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Úspešne vypúšťa všetky transakcie súvisiace s týmto spoločnosti!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Rovnako ako u Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Zkouška
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
-DocType: Feed,Full Name,Celé jméno/název
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Zkouška
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Výchozí Sklad je povinný pro živočišnou položky.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Platba platu za měsíc {0} a rok {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Cenník miera, ak chýba"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 ,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigácia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Plánování
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Udělejte si čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Vydané
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Táto položka je na predaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Táto položka je na predaj
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dodavatel Id
 DocType: Journal Entry,Cash Entry,Cash Entry
 DocType: Sales Partner,Contact Desc,Kontakt Popis
@@ -3091,18 +2837,16 @@
 DocType: Brand,Item Manager,Manažér Položka
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Přidat řádky stanovit roční rozpočty na účtech.
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Ťažba
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Všechny kontakty.
 DocType: Newsletter,Test Email Id,Testovací Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Zkratka Company
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Zkratka Company
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,"Pokud se budete řídit kontroly jakosti. Umožňuje položky QA požadovány, a QA No v dokladu o koupi"
 DocType: GL Entry,Party Type,Typ Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotačné tvárnenie
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plat master šablona.
 DocType: Leave Type,Max Days Leave Allowed,Max Days Leave povolena
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pre nákupného košíka
@@ -3116,15 +2860,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen Měnový Směnný záznam pro {1} až {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Daňová šablóna je povinné.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Account,Temporary,Dočasný
 DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretářka
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
 DocType: HR Settings,Employee Records to be created by,"Zaměstnanec Záznamy, které vytvořil"
@@ -3137,24 +2881,21 @@
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
 DocType: Purchase Order Item,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Žehlenie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastaven
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je zastavený
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
 DocType: Lead,Add to calendar on this date,Přidat do kalendáře k tomuto datu
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Pripravované akcie
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
-DocType: Letter Head,Letter Head,Záhlaví
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Rýchly vstup
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pre návrat
 DocType: Purchase Order,To Receive,Obdržať
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Zmenšiť kovania
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Výnosy / náklady
 DocType: Employee,Personal Email,Osobní e-mail
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Celkový rozptyl
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Makléřská
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
 DocType: Address,Postal Code,poštové smerovacie číslo
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
@@ -3162,18 +2903,16 @@
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Objednávky uvolněna pro výrobu.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Hub Settings,Name Token,Jméno Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hobľovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardní prodejní
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardní prodejní
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Alespoň jeden sklad je povinný
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} na Prodejní Faktuře {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Prosím, zadejte výchozí měrnou jednotku"
 DocType: Purchase Invoice Item,Project Name,Název projektu
 DocType: Supplier,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
-DocType: Workflow State,Edit,Upravit
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
 DocType: Features Setup,Item Batch Nos,Položka Batch Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3181,13 +2920,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
-DocType: Contact Us Settings,Pincode,PSČ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nová skladová MJ musí byť odlišná od existujúcich MJ
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Listy musí být přiděleny v násobcích 0,5"
 DocType: Production Order,Operation Cost,Provozní náklady
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Nahrajte účast ze souboru CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Vynikající Amt
@@ -3203,10 +2940,7 @@
 DocType: Project,Default Cost Center,Výchozí Center Náklady
 DocType: Purchase Invoice,End Date,Datum ukončení
 DocType: Employee,Internal Work History,Vnitřní práce History
-DocType: DocField,Column Break,Zalomení sloupce
-DocType: Event,Thursday,Čtvrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
 DocType: Sales Invoice,Exhibition,Výstava
@@ -3219,31 +2953,30 @@
 DocType: Employee,Held On,Které se konalo dne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Sadzba (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Sadzba (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Finanční rok Datum ukončení
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nelze filtrovat na základě poukazu ne, pokud seskupeny podle poukazu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Vytvořit nabídku dodavatele
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Snížit Zisk na vstup bez nároku na mzdu (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Pridanie používateľov do vašej organizácie, iné ako vy"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Pridanie používateľov do vašej organizácie, iné ako vy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tento týždeň Zhrnutie
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí být Zakoupená, nebo Subdodavatelská položka v řádku {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},"{0} musí byť Kúpená, alebo Subdodávateľská položka v riadku {1}"
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
-DocType: DocField,Currency,Mena
 DocType: Opportunity,Opportunity Date,Příležitost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Návrat Proti doklad o kúpe
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,Objednané%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Úkolová práce
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
@@ -3260,77 +2993,68 @@
 DocType: Opportunity,To Discuss,K projednání
 DocType: SMS Settings,SMS Settings,Nastavenie SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Čierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Datum ukončení doby aktuální objednávky
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Vytvorte ponuku Letter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Spiatočná
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
-DocType: DocField,Fold,Fold
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Východzí merná jednotka varianty musia byť rovnaké ako šablónu
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
 DocType: Project Task,Pending Review,Čeká Review
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Prosím specifikujte
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Zákazník Id
-DocType: Page,Page Name,Název stránky
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Ak chcete čas musí byť väčší ako From Time
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Úprava vretena
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","napríklad ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","napríklad ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
-DocType: System Settings,Time Zone,Časové pásmo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
-DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zošívanie
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiálov dodaných proti tomuto dodaciemu listu
 DocType: Customer,Customer Details,Podrobnosti zákazníků
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Tvarovanie
 DocType: Employee,Reports to,Zprávy
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Sales Invoice,Paid Amount,Uhrazené částky
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Závěrečný účet {0} musí být typu ""odpovědnosti"""
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Řízení kvality
 DocType: Production Planning Tool,Filter based on customer,Filtr dle zákazníka
 DocType: Payment Tool Detail,Against Voucher No,Proti poukaz č
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 DocType: Tax Rule,Purchase,Nákup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Zůstatek Množství
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
 DocType: Item Group,Parent Item Group,Parent Item Group
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} na {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pre {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Nákladové středisko
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Sklady.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Sklady.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Opportunity,Next Contact,Nasledujúce Kontakt
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Obdobie podávania žiadostí nemôže byť na dvoch alokácie záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
 DocType: Employee,Notice (days),Oznámení (dny)
-DocType: Page,Yes,Ano
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
 DocType: Employee,Encashment Date,Inkaso Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti poukazu Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Account,Stock Adjustment,Úprava skladových zásob
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existuje Náklady Predvolené aktivity pre Typ aktivity - {0}
 DocType: Production Order,Planned Operating Cost,Plánované provozní náklady
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Nový {0} Název
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},V příloze naleznete {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},V příloze naleznete {0} # {1}
 DocType: Job Applicant,Applicant Name,Žadatel Název
 DocType: Authorization Rule,Customer / Item Name,Zákazník / Název zboží
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3067,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribút
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Uveďte z / do rozmedzie
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Vytvořeno (kým)
 DocType: Serial No,Under AMC,Podle AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
@@ -3355,17 +3078,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimální částka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Dokončení aktualizace zboží
 DocType: Workstation,per hour,za hodinu
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Série {0} jsou již použity v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Východiskové Dane a poplatky
 DocType: Account,Receivable,Pohledávky
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
 DocType: Sales Invoice,Supplier Reference,Dodavatel Označení
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Je-li zaškrtnuto, bude BOM pro sub-montážní položky považují pro získání surovin. V opačném případě budou všechny sub-montážní položky být zacházeno jako surovinu."
@@ -3373,8 +3095,8 @@
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap & Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
@@ -3383,7 +3105,6 @@
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Nástroj na náhradu MJ
 DocType: POS Profile,Terms and Conditions,Podmínky
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Chcete-li data by měla být v rámci fiskálního roku. Za předpokladu, že To Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Zde si můžete udržet výšku, váhu, alergie, zdravotní problémy atd"
@@ -3395,7 +3116,7 @@
 DocType: Sales Order Item,For Production,Pro Výrobu
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosím, zadejte prodejní objednávky v tabulce výše"
 DocType: Project Task,View Task,Zobraziť Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Váš finanční rok začíná
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Váš finanční rok začíná
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Prosím, zadejte Nákup Příjmy"
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
@@ -3403,20 +3124,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Nastavenie serveru prichádzajúcej pošty pre email podpory. (Napríklad podpora@priklad.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Salary Slip,Salary Slip,Plat Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Leštenie
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Datum DO"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum Do"" je povinný"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Features Setup,Item Advanced,Položka Advanced
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Valcovanie
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globálne nastavenia
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3425,35 +3144,28 @@
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Obchodní domy
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Je Aktivní
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Zmeniť skratku
-DocType: Workflow State,Primary,Primární
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
-DocType: Communication,More Information,Viac informácií
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Poslední částka objednávky
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Odstrel
 DocType: Company,Warn,Varovat
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ocenění Item aktualizováno
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
 DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Order,Raw Materials Supplied,Dodává suroviny
 DocType: Purchase Invoice,Recurring Print Format,Opakujúce Print Format
-DocType: Communication,Series,Série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Období
 ,General Ledger,Hlavná Účtovná Kniha
@@ -3461,11 +3173,9 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0} "
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosím, nejprve vyberte {0}"
 DocType: Features Setup,To get Item Group in details table,Chcete-li získat položku Group v tabulce Rozpis
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Prekreslenie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Lept
 DocType: Sales Invoice,Commission,Provize
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3201,7 @@
  {%, pokud email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Výchozí částka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Sklad nebyl nalezen v systému
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Tento mesiac je zhrnutie
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
@@ -3510,13 +3220,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Snaťte sa o rozmer vhodný na web: 900px šírka a 100px výška
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Snaťte sa o rozmer vhodný na web: 900px šírka a 100px výška
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Payment Tool,Get Outstanding Vouchers,Získejte Vynikající poukazy
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Appraisal,Start Date,Datum zahájení
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Hodnota
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliknite tu pre overenie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
@@ -3526,55 +3235,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Priemerná doba zhotovená dodávateľom dodať
 DocType: Time Log,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Priorita
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Přístup povolen
-DocType: Dropbox Backup,Weekly,Týdenní
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Např. smsgateway.com/api/send-sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Príjem
 DocType: Maintenance Visit,Fully Completed,Plně Dokončeno
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Hotovo
 DocType: Employee,Educational Qualification,Vzdělávací Kvalifikace
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} bol úspešne pridaný do nášho zoznamu noviniek.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Lúč obrábanie Electron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Hlavné správy
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Sklad Ledger položky bilancí aktualizováno
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Hlavné správy
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Přidat / Upravit ceny
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moje objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moje objednávky
 DocType: Price List,Price List Name,Ceník Jméno
 DocType: Time Log,For Manufacturing,Pre výrobu
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Súčty
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Súčty
 DocType: BOM,Manufacturing,Výroba
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
-,Setup Wizard,Sprievodca nastavením
 DocType: Industry Type,Industry Type,Typ Průmyslu
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Die liatie
-DocType: Email Alert,Reference Date,Referenční data
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organizace jednotka (departement) master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
 DocType: Budget Detail,Budget Detail,Detail Rozpočtu
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
-DocType: Async Task,Status,Stav
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Skladová MJ pre položku {0} aktualizovaná
-DocType: Company History,Year,Rok
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Time Log {0} už účtoval
@@ -3587,55 +3284,52 @@
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
 DocType: Item,Unit of Measure Conversion,Jednotka miery konverzie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Zaměstnanec nemůže být změněn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Příspěvek na nadměrné {0} přešel k bodu {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Meno osoby alebo organizácie, ktorej patrí táto adresa."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaši Dodávatelia
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Vaši Dodávatelia
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Další platovou strukturu {0} je aktivní pro zaměstnance {1}. Prosím, aby jeho stav ""neaktivní"" pokračovat."
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Prijaté Od
 DocType: Features Setup,Exports,Vývoz
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} do {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 DocType: Issue,Content Type,Typ obsahu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Počítač
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
 DocType: Payment Reconciliation,Get Unreconciled Entries,Získat smířit záznamů
 DocType: Cost Center,Budgets,Rozpočty
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Aktualizováno
 DocType: Employee,Emergency Contact Details,Nouzové kontaktní údaje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Čo to robí?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Čo to robí?
 DocType: Delivery Note,To Warehouse,Do skladu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Účet {0} byl zadán více než jednou za fiskální rok {1}
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""ano"" pro neskladové zboží"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Aktualizace dodatečné náklady pro výpočet vyložené náklady položek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrický
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Od reklamačnímu
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Narozeninová připomínka pro {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Zabrušovací
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Počet dnů od poslední objednávky
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Počet dnů od poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
-DocType: User,Enabled,Zapnuto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Opravdu chcete, aby předložila všechny výplatní pásce za měsíc {0} a rok {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importovať Odberatelia
@@ -3643,19 +3337,18 @@
 DocType: Attendance,Present,Současnost
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záverečný účet {0} musí byť typu zodpovednosti / Equity
 DocType: Authorization Rule,Based On,Založeno na
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Obdobie od a obdobia, k dátam povinné pre opakované {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektová činnost / úkol.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generování výplatních páskách
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} není platné id emailu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
-DocType: ToDo,Low,Nízké
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
@@ -3667,7 +3360,7 @@
 DocType: Employee External Work History,Salary,Plat
 DocType: Serial No,Delivery Document Type,Dodávka Typ dokumentu
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Odeslat všechny výplatní pásky pro výše zvolených kritérií
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizovány
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} položky synchronizované
 DocType: Sales Order,Partly Delivered,Částečně vyhlášeno
 DocType: Sales Invoice,Existing Customer,Stávající zákazník
 DocType: Email Digest,Receivables,Pohledávky
@@ -3677,7 +3370,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je zapotřebí Název kampaně
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Receipt Item,Rejected Serial No,Zamítnuto Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Hlboké ťahanie
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Show Balance
@@ -3688,7 +3380,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Částka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitovanie
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
 ,Sales Analytics,Prodejní Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Nastavenia Výroby
@@ -3700,28 +3391,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Služby zákazníkům
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potvrdiť Váš e-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponuka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Celkové pridelené listy sú viac ako dní v období
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Východiskové prácu v sklade Progress
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je vyžadováno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vákuové tvarovanie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
-DocType: Contact Us Settings,City,Město
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrazvukové obrábanie
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Chyba: Nie je platný id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Bod {0} musí být prodejní položky
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
 DocType: Sales Order,Printing Details,Tlač detailov
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženýr
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhľadávanie Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3729,7 +3416,7 @@
 DocType: Authorization Rule,Customerwise Discount,Sleva podle zákazníka
 DocType: Purchase Invoice,Against Expense Account,Proti výdajového účtu
 DocType: Production Order,Production Order,Výrobní Objednávka
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Všichni zaměstnanci (Aktivní)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Zobrazit nyní
@@ -3737,26 +3424,24 @@
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,První Uživatel: Vy
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,První Uživatel: Vy
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Úspěšně smířeni
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Úspěšně smířeni
 DocType: Production Order,Planned End Date,Plánované datum ukončení
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Tax Rule,Validity,Platnosť
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná čiastka
 DocType: Attendance,Attendance,Účast
-DocType: Page,No,Ne
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Datum a čas zadání je povinný
@@ -3764,55 +3449,46 @@
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
 DocType: Period Closing Voucher,Period Closing Voucher,Období Uzávěrka Voucher
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Ceník master.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Ceník master.
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
-DocType: DocPerm,Level,Úroveň
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro Oznámení"", které nejsou uvedeny na opakující se %s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Frézovanie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nemáte oprávnění k použití platební nástroj
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pre oznámenie"" nie sú uvedené pre odpovedanie %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
 DocType: Company,Round Off Account,Zaokrúhliť účet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Okusovanie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativní náklady
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Zmena
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Výpovedná Lehota
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","napríklad ""Moja spoločnosť LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Výpovedná Lehota
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 DocType: Packing Slip,Gross Weight UOM,Hrubá Hmotnosť MJ
 DocType: Email Digest,Receivables / Payables,Pohledávky / Závazky
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Lisovanie
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Ukázat nulové hodnoty
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Množství položky získané po výrobě / přebalení z daných množství surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Pohledávky / závazky účet
 DocType: Delivery Note Item,Against Sales Order Item,Proti položce přijaté objednávky
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 DocType: Task,Actual End Date (via Time Logs),Skutočné Dátum ukončenia (cez Time Záznamy)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
-DocType: User,Last Name,Priezvisko
-DocType: Web Page,Left,Vlevo
-DocType: Event,All Day,Celý den
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
 DocType: Issue,Support Team,Tým podpory
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
-DocType: Contact Us Settings,State,Stav
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Zůstatek
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Zůstatek
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov)
-DocType: User,Gender,Pohlavie
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Podľa skladovej MJ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Neuplynula
@@ -3826,45 +3502,41 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 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"
 DocType: Purchase Invoice,Total Advance,Total Advance
-DocType: Workflow State,User,Uživatel
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Spracovanie miezd
 DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplatení Note
 DocType: Customer,Credit Days Based On,Úverové Dni Based On
 DocType: Tax Rule,Tax Rule,Daňové Pravidlo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Udržovat stejná sazba po celou dobu prodejního cyklu
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Naplánujte čas protokoly mimo Workstation pracovných hodín.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} již byla odeslána
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} už bolo odoslané
 ,Items To Be Requested,Položky se budou vyžadovat
-DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Účtovaná sadzba založená na typ aktivity (za hodinu)
 DocType: Company,Company Info,Informácie o spoločnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Zošívanie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Společnost E-mail ID nebyl nalezen, proto pošta neodeslána"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 DocType: Production Planning Tool,Filter based on item,Filtr dle položek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetné účet
 DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} bol zmenený. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Zaclonení
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zamestnanecké benefity
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Směnky vznesené zákazníkům.
-DocType: DocField,Default,Výchozí
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID projektu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odberatelia z pridanej
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} odberateľov pridaných
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definovať rozpočtu pre tento nákladového strediska. Ak chcete nastaviť rozpočet akcie, pozri &quot;Zoznam firiem&quot;"
 DocType: Account,Parent Account,Nadřazený účet
@@ -3874,70 +3546,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Expense Claim,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Voliteľné. Nastaví východiskovej mene spoločnosti, ak nie je uvedené."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Voliteľné. Nastaví východiskovej mene spoločnosti, ak nie je uvedené."
 DocType: Address,Office,Kancelář
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardní výpisy
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Zápisy v účetním deníku.
 DocType: Delivery Note Item,Available Qty at From Warehouse,K dispozícii Množstvo na Od Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Chcete-li vytvořit daňovém účtu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Batch Zásoby
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodejní Pull zakázky (čeká dodat), na základě výše uvedených kritérií"
-DocType: DocShare,Document Type,Typ dokumentu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Z ponuky dodávateľa
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Z ponuky dodávateľa
 DocType: Deduction Type,Deduction Type,Odpočet Type
 DocType: Attendance,Half Day,Půl den
 DocType: Pricing Rule,Min Qty,Min Množství
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Ak chcete sledovať položky v oblasti predaja a nákupných dokladoch s číslami šarží. &quot;Výhodné Priemysel: Chemicals&quot;
 DocType: GL Entry,Transaction Date,Transakce Datum
 DocType: Production Plan Item,Planned Qty,Plánované Množství
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Total Tax
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Total Tax
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Pre Množstvo (Vyrobené ks) je povinné
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Celkom pridelené listy sú viac než obdobie
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
-DocType: Sales Order,% of materials delivered against this Sales Order,% Materiálů doručeno proti tomuto odběrateli
+DocType: Sales Order,% of materials delivered against this Sales Order,% materiálov dodaných proti tejto Predajnej objednávke
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Záznam pohybu položka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter zoznamu účastníkov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dlabačky
-DocType: Email Account,Service,Služba
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 ,Monthly Salary Register,Měsíční plat Register
-apps/frappe/frappe/website/template.py +140,Next,Ďalej
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
 DocType: BOM Operation,BOM Operation,BOM Operation
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrolytické
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na předchozí řady Částka
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Prosím, zadejte částku platby aspoň jedné řadě"
 DocType: POS Profile,POS Profile,POS Profile
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Platba Částka nesmí být vyšší než dlužná částka
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Celkom Neplatené
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Celkom Neplatené
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Time Log není zúčtovatelné
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net plat nemůže být záporný
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Zadejte prosím podle dokladů ručně
 DocType: SMS Settings,Static Parameters,Statické parametry
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
@@ -3946,14 +3611,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-valcovanie
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Obrábanie
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
 DocType: Hub Settings,Seller Name,Prodejce Name
@@ -3963,47 +3626,44 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Pripojiť Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výše provize
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košík je prázdny
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root nelze upravovat.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Přidělená částka nemůže vyšší než částka unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Povolit Výrobu při dovolené
 DocType: Sales Order,Customer's Purchase Order Date,Zákazníka Objednávka Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Základný kapitál
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vyberte soubor csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Poslať zálohy na Dropbox
 DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Návrhář
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Návrhář
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Automatické vytvorenie Materiál žiadosti, pokiaľ množstvo klesne pod túto úroveň"
 ,Item-wise Purchase Register,Item-moudrý Nákup Register
 DocType: Batch,Expiry Date,Datum vypršení platnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Ak chcete nastaviť úroveň objednávacie, položka musí byť Nákup položka alebo výrobné položky"
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master Project.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Half Day)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Pol dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Získat předměty z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kusovník
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
-DocType: Dropbox Backup,Send Notifications To,Odeslat upozornění
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionována Částka
 DocType: GL Entry,Is Opening,Se otevírá
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Účet {0} neexistuje
 DocType: Account,Cash,V hotovosti
 DocType: Employee,Short biography for website and other publications.,Krátký životopis na internetové stránky a dalších publikací.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Prosím vytvořte platovou strukturu pro zaměstnance {0}

diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index c9b3c02..9748e23 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Način plače
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Izberite mesečnim izplačilom, če želite spremljati glede na sezono."
 DocType: Employee,Divorced,Ločen
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Opozorilo: Same postavka je bila vpisana večkrat.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Postavke že sinhronizirano
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Dovoli Postavka, ki se doda večkrat v transakciji"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Izberite Party Vrsta najprej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Žarjenje
 DocType: Item,Customer Items,Točke strank
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matično račun {1} ne more biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Pustite Approvers
 DocType: Sales Partner,Dealer,Trgovec
 DocType: Employee,Rented,Najemu
-DocType: About Us Settings,Website,Spletna stran
 DocType: POS Profile,Applicable for User,Velja za člane
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Zbijanje plus sintranje
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Od Material zahtevo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Od Material zahtevo
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ni več zadetkov.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Pravna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Pravna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Dejanska davčna vrsta ne more biti vključen v ceno postavko v vrstici {0}
 DocType: C-Form,Customer,Stranka
 DocType: Purchase Receipt Item,Required By,Zahtevani Z
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serija Posodobljeno Uspešno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Šivi
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Več cene postavko.
 ,Purchase Order Items To Be Received,Naročilnica Postavke da bodo prejete
 DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Leave Application
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bank Osnutek
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Da bi ohranili stranke pametno Koda in da bi jim iskanje, ki temelji na njihovi kode uporabite to možnost"
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Prikaži Variante
-DocType: Sales Invoice Item,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Posojili (obveznosti)
 DocType: Employee Education,Year of Passing,"Leto, ki poteka"
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na zalogi
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Naredite nov POS Profile
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Skrb za zdravje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 DocType: Purchase Invoice,Monthly,Mesečni
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Zamuda pri plačilu (dnevi)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Obramba
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email naslov
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Vrstica # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Vrstica # {0}:
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Izberite Cenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Lesno
 DocType: Production Order Operation,Work In Progress,V razvoju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D tiskanje
 DocType: Employee,Holiday List,Holiday Seznam
 DocType: Time Log,Time Log,Čas Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Računovodja
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Računovodja
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Company,Phone No,Telefon Ni
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Dnevnik aktivnosti, ki jih uporabniki zoper Naloge, ki se lahko uporabljajo za sledenje časa, zaračunavanje izvedli."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Partnerji Sales Komisija
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kratica ne more imeti več kot 5 znakov
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Lastnost Vrednost {0} ni mogoče odstraniti iz {1} kot postavko variante \ obstaja s tega atributa.
-DocType: Print Settings,Classic,Classic
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,To je račun root in jih ni mogoče urejati.
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ni mogoče nastaviti dovoljenja na podlagi popust za {0}
 DocType: Bin,Quantity Requested for Purchase,Količina za nabavo
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripni datoteko .csv z dvema stolpcema, eno za staro ime in enega za novim imenom"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Odpiranje za službo.
 DocType: Item Attribute,Increment,Prirastek
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Izberite Skladišče ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Oglaševanje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglaševanje
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ista družba je vpisana več kot enkrat
 DocType: Employee,Married,Poročen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ni dovoljeno za {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 DocType: Payment Reconciliation,Reconcile,Uskladite
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Trgovina z živili
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Naredite Bank Entry
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pokojninski skladi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Skladišče je obvezna, če tip račun skladišče"
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Preverite, če ponavljajoče se naročilo, počistite ustaviti ponavljajoče se ali dati ustrezno End Date"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska Operacija čas
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta
-DocType: Blog Post,Guest,Gost
 DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti
 DocType: Lead,Interested,Zanima
-apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Otvoritev
+apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Kosovnica
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Otvoritev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} je obvezna
 DocType: Stock Entry,Additional Costs,Dodatni stroški
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
 DocType: Lead,Product Enquiry,Povpraševanje izdelek
-DocType: Standard Reply,Owner,Lastnik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Prosimo, da najprej vnesete podjetje"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Prosimo, izberite Company najprej"
 DocType: Employee Education,Under Graduate,Pod Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Povrtavanje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Nepremičnina
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nepremičnina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izkaz računa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
 DocType: Expense Claim Detail,Claim Amount,Trditev Znesek
 DocType: Employee,Mr,gospod
-DocType: Custom Script,Client,Client
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
 DocType: Naming Series,Prefix,Predpona
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Potrošni
 DocType: Upload Attendance,Import Log,Uvoz Log
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Pošlji
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Letne plače
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Zaloga Stroški
 DocType: Newsletter,Email Sent?,Email Sent?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Prikaži Čas Dnevniki
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
 DocType: Delivery Note,Installation Status,Namestitev Status
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
 DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Postavka {0} mora biti Nakup postavka
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Bo treba posodobiti po Sales predložen račun.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Ravnanje
 DocType: BOM Replace Tool,New BOM,New BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Serija Čas Hlodovina za zaračunavanje.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity litje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Glasilo je bilo že poslano
 DocType: Lead,Request Type,Zahteva Type
 DocType: Leave Application,Reason,Razlog
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Izvedba
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Prvi uporabnik bo postala System Manager (lahko spremenite kasneje).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Izvedba
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Prvi uporabnik bo postala System Manager (lahko spremenite kasneje).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
 DocType: Serial No,Maintenance Status,Status vzdrževanje
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Predmeti in Pricing
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Predmeti in Pricing
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Izberite zaposlenega, za katerega ste ustvarili cenitve."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Stalo Center {0} ne pripada družbi {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Popust na ceno iz cenika Stopnja (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Začetek
-DocType: User,First Name,Ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-plesni litje
 DocType: Offer Letter,Select Terms and Conditions,Izberite Pogoji
 DocType: Production Planning Tool,Sales Orders,Prodajni Naročila
 DocType: Purchase Taxes and Charges,Valuation,Vrednotenje
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bančni račun
 DocType: Leave Type,Allow Negative Balance,Dovoli negativni saldo
 DocType: Selling Settings,Default Territory,Privzeto Territory
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizija
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Zarezam
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Posodobljeno preko &quot;Čas Logu&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Račun {0} ne pripada družbi {1}
 DocType: Naming Series,Series List for this Transaction,Serija Seznam za to transakcijo
 DocType: Sales Invoice,Is Opening Entry,Je vstopna odprtina
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Omemba če nestandardni terjatve račun, ki se uporablja"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Za skladišče je pred potreben Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prejetih Na
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vnesite Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
 DocType: Lead,Address & Contact,Naslov in kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
 DocType: Newsletter List,Total Subscribers,Skupaj Naročniki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktno ime
+,Contact Name,Kontaktno ime
 DocType: Production Plan Item,SO Pending Qty,SO Do Kol
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ustvari plačilni list za zgoraj omenjenih kriterijev.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Zaprosi za nakup.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dvojno ohišje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Listi na leto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Prosim, nastavite Poimenovanje Series za {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series"
 DocType: Time Log,Will be updated when batched.,"Bo treba posodobiti, če Posodi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite &quot;Je Advance&quot; proti račun {1}, če je to predujem vnos."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
-DocType: Bulk Email,Message,Sporočilo
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Dostop Key
 DocType: Payment Tool,Reference No,Referenčna številka
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Letno
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
 DocType: Material Request Item,Min Order Qty,Min naročilo Kol
 DocType: Lead,Do Not Contact,Ne Pišite
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Edinstven ID za sledenje vse ponavljajoče račune. To je ustvarila na oddajte.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Razvijalec programske opreme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Item,Publish in Hub,Objavite v Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Material Zahteva
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Material Zahteva
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire ščetkanje
 DocType: Employee,Relation,Razmerje
 DocType: Shipping Rule,Worldwide Shipping,Dostava po celem svetu
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Potrjeni naročila od strank.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Expense Head
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Prosimo, izberite Charge Vrsta najprej"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Zadnje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 znakov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Izberite svoj jezik
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 znakov
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Prvi Leave odobritelj na seznamu, bo nastavljen kot privzeti Leave odobritelja"
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Varianta
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Postavka {0} mora biti storitev Postavka
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lasersko vrtanje
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head
 DocType: Employee,External Work History,Zunanji Delo Zgodovina
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Krožna Reference Error
-DocType: Communication,Closed,Zaprto
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici."
 DocType: Lead,Industry,Industrija
 DocType: Employee,Job Profile,Job profila
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hidroformiranjem
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Točka je posodobljen
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
 DocType: Sales Invoice Item,Delivery Note,Poročilo o dostavi
-DocType: Dropbox Backup,Allow Dropbox Access,Dovoli Dropbox dostop
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Postavitev Davki
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Začetek Plačilo je bil spremenjen, ko je potegnil. Prosimo, še enkrat vleči."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Workstation,Rent Cost,Najem Stroški
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Prosimo, izberite mesec in leto"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Družba E-pošta
 DocType: GL Entry,Debit Amount in Account Currency,Debetno Znesek v Valuta računa
 DocType: Shipping Rule,Valid for Countries,Velja za države
-DocType: Workflow State,Refresh,Osveži
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Vse uvozne polja, povezana kot valuto, konverzijo, uvoz skupaj, uvoz skupni vsoti itd so na voljo v Potrdilo o nakupu, dobavitelj Kotacija, računu o nakupu, narocilo itd"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Skupaj naročite Upoštevani
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite &quot;Ponovi na dan v mesecu&quot; vrednosti polja"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite &quot;Ponovi na dan v mesecu&quot; vrednosti polja"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Na voljo v BOM, dobavnica, računu o nakupu, proizvodnje reda, narocilo, Potrdilo o nakupu, prodajni fakturi, Sales Order, Stock vstopu, Timesheet"
 DocType: Item Tax,Tax Rate,Davčna stopnja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Izberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Izberite Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Potrdilo o nakupu je treba predložiti
-DocType: Stock UOM Replace Utility,Current Stock UOM,Trenutni Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
-DocType: GL Entry,Debit Amount,Debetne Znesek
+DocType: GL Entry,Debit Amount,Debetni Znesek
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Vaš email naslov
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Glej prilogo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vodnim curkom
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Že Complete !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Že Complete !!
 ,Finished Goods,"Končnih izdelkov,"
 DocType: Delivery Note,Instructions,Navodila
 DocType: Quality Inspection,Inspected By,Pregledajo
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Prosimo, da ne ustvarjajo računov za kupce in dobavitelje. Ti so ustvarili neposredno od Stranka / dobavitelj mojstrov."
 DocType: Currency Exchange,Currency Exchange,Menjalnica
 DocType: Purchase Invoice Item,Item Name,Ime izdelka
+DocType: Authorization Rule,Approving User  (above authorized value),Odobritvi uporabnik (zgoraj pooblaščeni vrednosti)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovela
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Postavke, ki bodo zahtevana ki so &quot;Razprodan&quot; ob upoštevanju vseh skladišč, ki temelji na predvidenem kol in minimalnega naročila Kol"
@@ -378,22 +346,21 @@
 ,Purchase Register,Nakup Register
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
 DocType: Workstation,Consumable Cost,Potrošni Stroški
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medical
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razlog za izgubo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube Nizanje perli
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
 DocType: Employee,Single,Samski
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Proračun ni mogoče nastaviti za stroškovno mesto skupine
 DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga
 DocType: Purchase Invoice,Yearly,Letni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Vnesite stroškovni center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vnesite stroškovni center
 DocType: Journal Entry Account,Sales Order,Prodajno naročilo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Prodajni tečaj
 DocType: Purchase Order,Start date of current order's period,Datum začetka obdobja Trenutni vrstni red je
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Količina ne more biti del v vrstici {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Količina ne more biti del v vrstici {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja
 DocType: Delivery Note,% Installed,% Nameščeni
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja"
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Is Group
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Samodejno nastavi Serijska št temelji na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Toplo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Rezanje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Da Case No.&quot; ne more biti nižja od &quot;Od zadevi št &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Ni začelo
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stara Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Holiday gospodar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell modeliranje
 DocType: Material Request Item,Required Date,Zahtevani Datum
 DocType: Delivery Note,Billing Address,Naslov za pošiljanje računa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vnesite Koda.
 DocType: BOM,Costing,Stanejo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Če je omogočeno, se bo štela za znesek davka, kot je že vključena v Print Oceni / Print Znesek"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Skupaj Kol
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Da Domet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
 DocType: Features Setup,Imports,Uvoz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lepljenje
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,V čakanju na aktivnosti za danes
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Šivih.
 DocType: Bank Reconciliation,Journal Entries,Revija Vnosi
 DocType: Sales Order Item,Used for Production Plan,Uporablja se za proizvodnjo načrta
-DocType: System Settings,Loading...,Nalaganje ...
-DocType: DocField,Password,Geslo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Taljenega modeliranje odlaganje
 DocType: Manufacturing Settings,Time Between Operations (in mins),Čas med dejavnostmi (v minutah)
 DocType: Customer,Buyer of Goods and Services.,Kupec blaga in storitev.
 DocType: Journal Entry,Accounts Payable,Računi se plačuje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Dodaj naročnikov
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Ne obstaja
 DocType: Pricing Rule,Valid Upto,Valid Stanuje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Neposredne dohodkovne
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Upravni uradnik
 DocType: Payment Tool,Received Or Paid,Prejete ali plačane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry,Difference Account,Razlika račun
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetika
-DocType: DocField,Type,Tip
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
-DocType: Communication,Subject,Predmet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 ,Serial No Warranty Expiry,Zaporedna številka Garancija preteka
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Postavka
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Upravljanje Podizvajalci
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM ne sme biti tipa celo število
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Upravljanje Podizvajalci
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Pohištvo in koledarjev
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Obrestna mera, po kateri Cenik valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
@@ -478,23 +437,23 @@
 ,Gross Profit,Bruto dobiček
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +27,Increment cannot be 0,Prirastek ne more biti 0
 DocType: Production Planning Tool,Material Requirement,Material Zahteva
-DocType: Company,Delete Company Transactions,Izbriši Company transakcije
+DocType: Company,Delete Company Transactions,Izbriši transakcije družbe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Postavka {0} ni Nakup Item
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} je neveljaven e-poštni naslov v &quot;Obvestilo \ e-poštni naslov &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Skupaj plačevanja To leto:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Skupaj plačevanja To leto:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Ne morem izbrisati Serijska št {0}, saj je uporabljen v transakcijah zalogi"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Zapiranje (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Zapiranje (Cr)
 DocType: Serial No,Warranty Period (Days),Garancijski rok (dni)
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 ,Pending Qty,Pending Kol
 DocType: Job Applicant,Thread HTML,Nit HTML
 DocType: Company,Ignore,Ignoriraj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
 DocType: Pricing Rule,Valid From,Velja od
 DocType: Sales Invoice,Total Commission,Skupaj Komisija
 DocType: Pricing Rule,Sales Partner,Prodaja Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Mesečni Distribution ** vam pomaga pri razporejanju proračuna po mesecih, če imate sezonskost v vašem podjetju. Distribuirati proračun z uporabo te distribucije, nastavite to ** mesečnim izplačilom ** v ** Center stroškov **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Oprostite, Serijska št ni mogoče združiti"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Svinec Id
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
-DocType: About Us Settings,Website Manager,Spletna stran Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskalna Leto Datum začetka ne sme biti večja od poslovnega leta End Datum
 DocType: Warranty Claim,Resolution,Ločljivost
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dobava: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Prejšnja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Prodaja Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Izberite prodajnih nalogov, iz katerega želite ustvariti naročila za proizvodnjo."
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Deli plače.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Podatkovna baza potencialnih strank.
+DocType: Authorization Rule,Customer or Item,Stranka ali Postavka
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza podatkov o strankah.
 DocType: Quotation,Quotation To,Kotacija Da
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Gimnastika
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker ste že naredili nekaj transakcije (-e) z drugo UOM. Boste morali ustvariti nov element, da uporabi drugačno Privzeti UOM."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
-DocType: Event,Wednesday,Sreda
 DocType: Sales Invoice,Customer's Vendor,Prodajalec stranke
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Proizvodnja naročilo je Obvezno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Predlog Pisanje
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativno Stock Error ({6}) za postavko {0} v skladišču {1} na {2} {3} v {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna Leto Company
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Privzeto Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vzdrževanje Urnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Prosimo namestite varno shrambo python modul
 DocType: Employee,Passport Number,Številka potnega lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Od Potrdilo o nakupu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Manager
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Od Potrdilo o nakupu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
 DocType: SMS Settings,Receiver Parameter,Sprejemnik Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"&quot;Na podlagi&quot; in &quot;skupina, ki jo&quot; ne more biti enaka"
 DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Če želite
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Vnesite e-poštni naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Konec cevarne
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Pretvarjanje skupini
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Fiksni dnevi
 DocType: Sales Invoice,Packing List,Seznam pakiranja
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Naročila dati dobaviteljev.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Založništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Založništvo
 DocType: Activity Cost,Projects User,Projekti Uporabnik
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Porabljeno
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ni mogoče najti v računa Podrobnosti tabeli
 DocType: Company,Round Off Cost Center,Zaokrožijo stroškovni center
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Vzdrževanje obisk {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Material Request,Material Transfer,Prenos materialov
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Odprtje (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Napotitev žig mora biti po {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Nastavitve
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Iztovorjeni stroškov Davki in prispevki
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Operacija čas
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Več
 DocType: Pricing Rule,Sales Manager,Vodja prodaje
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Preimenovanje
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Upogibanje
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Dovoli Uporabnik
 DocType: Journal Entry,Bill No,Bill Ne
 DocType: Purchase Invoice,Quarterly,Četrtletno
 DocType: Selling Settings,Delivery Note Required,Dostava Opomba Obvezno
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosimo, vnesite podatke točko"
 DocType: Purchase Receipt,Other Details,Drugi podatki
 DocType: Account,Accounts,Računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Trženje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Naravnost striženje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Trženje
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,"Slediti element pri prodaji in nakupu listin, ki temelji na njihovih serijskih nos. To je mogoče uporabiti tudi za sledenje podrobnosti garancijske izdelka."
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Zavrnjeno Skladišče je obvezna proti regected postavki
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 DocType: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi"
 DocType: Hub Settings,Seller City,Prodajalec Mesto
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Element ima variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Postavka {0} ni bilo mogoče najti
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča
 DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Proti bon mora Vrsta biti eden od prodaje reda, Sales računa ali list Začetek"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Ni mogoče najti tečaja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Dobrodošli
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Začetek Credit Card
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Naloga Predmet
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Blago, prejetih od dobaviteljev."
-DocType: Communication,Open,Odpri
 DocType: Lead,Campaign Name,Ime kampanje
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Oskrba z Surovine
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ni zaloge Item
 DocType: Mode of Payment Account,Default Account,Privzeti račun
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
-DocType: Contact Us Settings,Address Title,Naslov Naslov
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: Production Order Operation,Planned End Time,Načrtovano Končni čas
 ,Sales Person Target Variance Item Group-Wise,Prodaja Oseba Target Varianca Postavka Group-Wise
-DocType: Dropbox Backup,Daily,Daily
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
 DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne
 DocType: Employee,Cell Number,Število celic
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto Material Zahteve Izdelano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energy
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
 DocType: Item Group,Website Specifications,Spletna Specifikacije
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nov račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Vknjižbe se lahko izvede pred listnimi vozlišč. Vpisi zoper skupin niso dovoljeni.
-DocType: ToDo,High,Visoka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
 DocType: Opportunity,Maintenance,Vzdrževanje
-DocType: User,Male,Moški
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Prodajne akcije.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Osebni
 DocType: Expense Claim Detail,Expense Claim Type,Expense Zahtevek Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Privzete nastavitve za Košarica
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezano proti odredbi {1}, preverite, če je treba potegniti kot vnaprej v tem računu."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotehnologija
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journal Entry {0} je povezano proti odredbi {1}, preverite, če je treba potegniti kot vnaprej v tem računu."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Process Payroll,Send Email,Pošlji e-pošto
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Ne Dovoljenje
-DocType: Company,Default Bank Account,Privzeto bančnega računa
+DocType: Company,Default Bank Account,Privzeti bančni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Update Stock&quot;, ni mogoče preveriti, ker so predmeti, ki niso dostavljena prek {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Moji računi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Moji računi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Najdenih ni delavec
 DocType: Purchase Order,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Da bi omogočili &quot;prodajno mesto&quot; funkcije
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Izberite Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
-DocType: Comment,Reference Name,Referenca Ime
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: Sales Invoice Item,Target Warehouse,Ciljna Skladišče
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pričakuje Dostava datum ne more biti pred Sales Order Datum
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Čisti dobiček / izguba
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
 DocType: Production Order,Item To Manufacture,Postavka za izdelavo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalup za vlivanje
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Nakup naročila do plačila
 DocType: Sales Order Item,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Plačilo Zaradi Datum
 DocType: Newsletter,Newsletter Manager,Newsletter Manager
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Odpiranje&quot;
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
 DocType: Expense Claim,Expenses,Stroški
 DocType: Item Variant Attribute,Item Variant Attribute,Postavka Variant Lastnost
 ,Purchase Receipt Trends,Nakup Prejem Trendi
 DocType: Appraisal,Select template from which you want to get the Goals,"Izberite predlogo, iz katere želite, da bi dobili tisočletja"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Raziskave in razvoj
 ,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Registracija Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Upravičuje
 DocType: Item,Re-Order Qty,Ponovno naročila Kol
 DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Načrtovano poslati {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Prodajno mesto
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},"Ne morejo opravljati naprej, {0}"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;bremenitev&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje na računu že v kreditu, ki vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;bremenitev&quot;"
 DocType: Account,Balance must be,Ravnotežju mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense zahtevek zavrnjen Sporočilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Žeblji
 ,Available Qty,Na voljo Količina
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na prejšnje vrstice Skupaj
 DocType: Salary Slip,Working Days,Delovni dnevi
 DocType: Serial No,Incoming Rate,Dohodni Rate
 DocType: Packing Slip,Gross Weight,Bruto Teža
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Vključi počitnice v Total no. delovnih dni
 DocType: Job Applicant,Hold,Držite
 DocType: Employee,Date of Joining,Datum pridružitve
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Poglej Naročniki
 DocType: Purchase Invoice Item,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Abrazivnega sredstva
 DocType: Employee,Ms,gospa
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} mora biti aktiven
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk
 DocType: Salary Slip,Leave Encashment Amount,Pustite unovčitve Znesek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol
 DocType: Bank Reconciliation,Total Amount,Skupni znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Založništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Založništvo
 DocType: Production Planning Tool,Production Orders,Proizvodne Naročila
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balance Vrednost
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite sinhronizirati elemente
-DocType: GL Entry,Account Currency,Valuta računa
+DocType: Bank Reconciliation,Account Currency,Valuta računa
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi
 DocType: Purchase Receipt,Range,Razpon
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Features Setup,Item Barcode,Postavka Barcode
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 DocType: Address,Shop,Trgovina
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeto Bank / Cash račun bo samodejno posodobi v POS računa, ko je izbrana ta način."
 DocType: Employee,Permanent Address Is,Stalni naslov je
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Brand
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Dodatek za prekomerno {0} prečkal za postavko {1}.
 DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti
 DocType: Item,Is Purchase Item,Je Nakup Postavka
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Naročilnica item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Posredna Prihodki
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Nastavite Znesek plačila = neporavnanega zneska
-DocType: Contact Us Settings,Address Line 1,Naslov Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ime podjetja
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Izberite Postavka za prenos
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Oglejte si seznam vseh videoposnetkov pomočjo
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Izberite račun vodja banke, kjer je bila deponirana pregled."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,"Dovoli uporabniku, da uredite Cenik Ocenite v transakcijah"
 DocType: Pricing Rule,Max Qty,Max Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Vrstica {0}: morala Plačilo proti prodaja / narocilo vedno označen kot vnaprej
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Chemical
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Vsi predmeti so že prenesli za to Production Order.
 DocType: Process Payroll,Select Payroll Year and Month,Izberite Payroll leto in mesec
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Pojdi na ustrezno skupino (običajno uporabo sredstev&gt; obratnih sredstev&gt; bančnih računov in ustvarite nov račun (s klikom na Dodaj Child) tipa &quot;banka&quot;
 DocType: Workstation,Electricity Cost,Stroški električne energije
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov
-DocType: Comment,Unsubscribed,Odjavljeni
 DocType: Opportunity,Walk In,Vstopiti
 DocType: Item,Inspection Criteria,Merila Inšpekcijske
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Drevo finanial centrov stalo.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Prenese
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Bela
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Bela
 DocType: SMS Center,All Lead (Open),Vse Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Priložite svojo sliko
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Poskrbite
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Priložite svojo sliko
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Poskrbite
 DocType: Journal Entry,Total Amount in Words,Skupni znesek v besedi
-DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Košarica
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Sklep Tip mora biti eden od {0}
 DocType: Lead,Next Contact Date,Naslednja Stik Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Odpiranje Količina
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Delniških opcij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Delniških opcij
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zapusti Application
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Pustite Orodje razdelitve emisijskih
 DocType: Leave Block List,Leave Block List Dates,Pustite Block List termini
 DocType: Company,If Monthly Budget Exceeded (for expense account),Če Mesečni proračun Presežena (za odhodek račun)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Obrezovanje
 DocType: Workstation,Net Hour Rate,Neto urna postavka
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Pristali Stroški Potrdilo o nakupu
 DocType: Company,Default Terms,Privzete Pogoji
 DocType: Packing Slip Item,Packing Slip Item,Pakiranje Slip Postavka
 DocType: POS Profile,Cash/Bank Account,Gotovina / bančni račun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Vložitev
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Popust
 DocType: Features Setup,Purchase Discounts,Odkupne Popusti
 DocType: Workstation,Wages,Plače
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite &quot;status&quot; in Shrani
 DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
 DocType: Issue,Issue,Težava
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun se ne ujema z družbo
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladišče
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
 DocType: BOM Operation,Operation,Delovanje
@@ -917,20 +847,20 @@
 DocType: Tax Rule,Shipping State,Dostava država
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Prodajna Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standardna Nakup
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standardna Nakup
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzeto Center Prodajni Stroški
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} je {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Izdelava Zaloga Entries
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
 DocType: Item,Default Supplier,Privzeto Dobavitelj
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek
 DocType: Shipping Rule Condition,Shipping Rule Condition,Dostava Pravilo Pogoj
 DocType: Features Setup,Miscelleneous,Miscelleneous
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Končni datum ne sme biti manj kot začetni dan
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Končni datum ne sme biti manjši kot začetni datum
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,posodablja preko Čas Dnevniki
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,"Vaš prodajni oseba, ki bo stopil v stik v prihodnosti"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
 DocType: Company,Default Currency,Privzeta valuta
 DocType: Contact,Enter designation of this Contact,Vnesite poimenovanje te Kontakt
-DocType: Contact Us Settings,Address,Naslov
 DocType: Expense Claim,From Employee,Od zaposlenega
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
 DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry
 DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma
 DocType: Appraisal Template Goal,Key Performance Area,Key Uspešnost Area
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Prevoz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Prevoz
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,in leto:
 DocType: Email Digest,Annual Expense,Letno Expense
 DocType: SMS Center,Total Characters,Skupaj Znaki
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Račun Detail
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Plačilo Sprava Račun
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Prispevek%
 DocType: Item,website page link,spletna stran link
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Oglejmo pripraviti sistem za prvo uporabo.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Registracija podjetja številke za vaše reference. Davčne številke itd
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Košarica Dostava Pravilo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Proizvodnja naročite {0} je treba preklicati pred preklicem te Sales Order
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Izberite Time Dnevniki in predložiti ustvariti nov prodajni fakturi.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodaja Račun Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Nič zahtevati
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Dejanski datum začetka&quot; ne more biti večja od &quot;dejanskim koncem Datum&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Vodstvo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Vodstvo
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Vrste dejavnosti za delo in odhodov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Litja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Bodisi debetna ali kreditna znesek je potreben za {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Active
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Modra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Modra
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenik Država
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nadaljnje vozlišča lahko ustvari samo na podlagi tipa vozlišča &quot;skupina&quot;
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} že ustvarili za uporabnika: {1} in podjetje {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lepljeno objekt za proizvodnjo
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Dobavitelj baze podatkov.
 DocType: Account,Balance Sheet,Bilanca stanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Natezno preoblikovanje
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Vaš prodajni oseba bo dobil opomin na ta dan, da se obrnete na stranko"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Davčna in drugi odbitki plače.
 DocType: Lead,Lead,Svinec
 DocType: Email Digest,Payables,Obveznosti
 DocType: Account,Warehouse,Skladišče
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zaloga Glavna knjiga Prijave in GL Vnosi se oglaša za izbrane Nakup Prejemki
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postavka 1
 DocType: Holiday,Holiday,Počitnice
-DocType: Event,Saturday,Sobota
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Pustite prazno, če velja za vse veje"
 ,Daily Time Log Summary,Dnevni Povzetek Čas Log
-DocType: DocField,Label,Label
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Plačilni Podrobnosti
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Global Defaults,Disable Rounded Total,Onemogoči Zaobljeni Skupaj
 DocType: Lead,Call,Call
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Navedbe&quot; ne more biti prazna
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Postavitev Zaposleni
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Mreža &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Prosimo, izberite predpono najprej"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Raziskave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Raziskave
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi
 DocType: Contact,User ID,Uporabniško ime
-DocType: Communication,Sent,Pošlje
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ogled Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
-DocType: Communication,Delivery Status,Dostava Status
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 DocType: Production Order,Manufacture against Sales Order,Izdelava zoper Sales Order
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Ostali svet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Postavka Opis
 DocType: Payment Tool,Payment Mode,Način Plačilo
 DocType: Purchase Invoice,Is Recurring,Je Ponavljajoči
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Neposrednega laserskega sintranja kovinskih
 DocType: Purchase Order,Supplied Items,Priložena Items
 DocType: Production Order,Qty To Manufacture,Količina za izdelavo
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ohraniti enako stopnjo celotni nabavni cikel
 DocType: Opportunity Item,Opportunity Item,Priložnost Postavka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Začasna Otvoritev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Zaposleni Leave Balance
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
 DocType: Address,Address Type,Naslov Type
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Pridobite neplačanih računov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} ni veljaven
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Majhno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Majhno
 DocType: Employee,Employee Number,Število zaposlenih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Postavka 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Glava račun {0} ustvaril
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Green
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Green
 DocType: Item,Auto re-order,Auto re-order
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Skupaj Doseženi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Skupaj Doseženi
 DocType: Employee,Place of Issue,Kraj izdaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Naročilo
-DocType: Report,Disabled,Onemogočeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Naročilo
+DocType: Email Digest,Add Quote,Dodaj Citiraj
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Kmetijstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Svoje izdelke ali storitve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Svoje izdelke ali storitve
 DocType: Mode of Payment,Mode of Payment,Način plačila
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
 DocType: Journal Entry Account,Purchase Order,Naročilnica
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Zahtevano je ime
 DocType: Purchase Invoice,Recurring Type,Ponavljajoči Type
 DocType: Address,City/Town,Mesto / Kraj
 DocType: Email Digest,Annual Income,Letni dohodek
 DocType: Serial No,Serial No Details,Serijska št Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Postavka {0} mora biti podizvajalcev item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapitalski Oprema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pričakuje Dobavni rok je manj od načrtovanega začetni datum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev Vrsta računa pomaga pri izbiri ta račun v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Skupaj Odhodni
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Obstaja lahko samo en prevoz pravilo Pogoj z 0 ali prazno vrednost za &quot;ceniti&quot;
 DocType: Authorization Rule,Transaction,Posel
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opomba: Ta Stroški Center je skupina. Ne more vknjižbe proti skupinam.
-apps/frappe/frappe/config/desk.py +7,Tools,Orodja
 DocType: Item,Website Item Groups,Spletna stran Element Skupine
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Število proizvodnja naročilo je obvezna za izdelavo vstopne stock namena
 DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Vnos v dnevnik
 DocType: Workstation,Workstation Name,Workstation Name
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komentarji
-DocType: Salary Slip,Bank Account No.,Bančni račun No.
+DocType: Salary Slip,Bank Account No.,Št. bančnega računa
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Oceni Vrednotenje potreben za postavko {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Oceni Vrednotenje potreben za postavko {0}
 DocType: Quality Inspection Reading,Reading 8,Branje 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli pristojbin na podlagi&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Davki in dajatve Izračun
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Strojna oprema
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izberite Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Morate omogočiti Košarica
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Ni podatkov
 DocType: Appraisal Template Goal,Appraisal Template Goal,Cenitev Predloga cilj
 DocType: Salary Slip,Earning,Služenje
 DocType: Payment Tool,Party Account Currency,Party Valuta računa
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Skupna vrednost naročila
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Hrana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,"Lahko naredite časovni dnevnik le zoper predložene proizvodnje, da bi"
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Glasila do stikov, vodi."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zaključni račun mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacije ne sme ostati prazen.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacije ne sme ostati prazen.
 ,Delivered Items To Be Billed,Dobavljeni artikli placevali
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
-DocType: DocField,Description,Opis
 DocType: Authorization Rule,Average Discount,Povprečen Popust
-DocType: Letter Head,Is Default,Je Privzeto
 DocType: Address,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Features Setup,Features Setup,Značilnosti Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ogled Ponudba Letter
-DocType: Communication,Communication,Sporočilo
 DocType: Item,Is Service Item,Je Service Postavka
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Prosimo, izberite poslovno leto"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1191,17 +1101,17 @@
 DocType: Item,Maintain Stock,Ohraniti park
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Od datetime
-DocType: Email Digest,For Company,Za podjetja
+DocType: Email Digest,For Company,Za podjetje
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Sporočilo dnevnik.
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +66,Buying Amount,Odkup Znesek
 DocType: Sales Invoice,Shipping Address Name,Dostava Naslov Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontnem
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Seznam opravil
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Vajenec
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Davčna podrobnosti tabela nerealne iz postavke mojstra kot vrvico in shranjena na tem področju. Uporablja se za davki in dajatve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ni aktivnega iskanja za zaposlenega {0} in meseca Plača Struktura
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Davčna pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta preimenovati.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Kupimo ta artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Kupimo ta artikel
 DocType: Address,Billing,Zaračunavanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Ni Poslano
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksplozivno oblikovanje
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Skupaj davki in dajatve (Company valuti)
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Načrtovano poslati {0} prejemnikov
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sklope
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sklope
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Supplier,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Vir skladišče je obvezna za vrstico {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analitik
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analitik
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka JV znesku {2}"
 DocType: Item,Inventory,Popis
 DocType: Features Setup,"To enable ""Point of Sale"" view",Da bi omogočili &quot;prodajno mesto&quot; pogled
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Plačilo ne more biti narejen za prazen voziček
 DocType: Item,Sales Details,Prodajna Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pripenjanje
 DocType: Opportunity,With Items,Z Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Kol
 DocType: Notification Control,Expense Claim Rejected,Expense zahtevek zavrnjen
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Datum, na katerega se bo ustvarila naslednji račun. To je ustvarila na oddajte."
 DocType: Item Attribute,Item Attribute,Postavka Lastnost
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Vlada
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Artikel Variante
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Vlada
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Artikel Variante
 DocType: Company,Services,Storitve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Skupaj ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Skupaj ({0})
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
 DocType: Sales Invoice,Source,Vir
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Proračunsko leto Start Date
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Proračunsko leto Start Date
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Grezenju
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Material Request Item,Sales Order No,Prodaja Zaporedna številka
 DocType: Item Group,Item Group Name,Item Name Group
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Transferji Materiali za Izdelava
 DocType: Pricing Rule,For Price List,Za cenik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno."
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Znesek (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Napaka: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Napaka: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Prosimo, ustvarite nov račun iz kontnega načrta."
 DocType: Maintenance Visit,Maintenance Visit,Vzdrževanje obisk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Stranka&gt; Skupina Customer&gt; Territory
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostopno Serija Količina na Warehouse
 DocType: Time Log Batch Detail,Time Log Batch Detail,Čas Log Serija Detail
-DocType: Workflow State,Tasks,Naloge
 DocType: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč
-DocType: Event,Tuesday,Torek
 DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni.
 ,Accounts Receivable Summary,Terjatve Povzetek
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Listi za tip {0} že dodeljene za Employee {1} za obdobje {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
 DocType: UOM,UOM Name,UOM Name
-DocType: Top Bar Item,Target,Target
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Prispevek Znesek
 DocType: Sales Invoice,Shipping Address,naslov za pošiljanje
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,To orodje vam pomaga posodobiti ali popravite količino in vrednotenje zalog v sistemu. To se ponavadi uporablja za sinhronizacijo sistemske vrednosti in kaj dejansko obstaja v vaših skladiščih.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"V besedi bo viden, ko boste shranite dobavnici."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Brand gospodar.
-DocType: ToDo,Due Date,Datum zapadlosti
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Brand gospodar.
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Škatla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizacija
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Škatla
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizacija
 DocType: Monthly Distribution,Monthly Distribution,Mesečni Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Sprejemnik Seznam je prazen. Prosimo, da ustvarite sprejemnik seznam"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodni načrt Sales Order
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Računovodstvo Vstop za {0} se lahko izvede samo v valuti: {1}
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Prepuščanjem
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material Zahteva za narocilo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bančni računi
 ,Bank Reconciliation Statement,Izjava Bank Sprava
 DocType: Address,Lead Name,Svinec Name
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Odpiranje Stock Balance
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Odpiranje Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} se morajo pojaviti le enkrat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ni prispevkov za pakiranje
 DocType: Shipping Rule Condition,From Value,Od vrednosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki"
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,"Zneski, ki se ne odraža v banki"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Terjatve za račun družbe.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalno litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetno polje pomaga oplemenitenje
 DocType: Company,Default Holiday List,Privzeto Holiday seznam
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Receipt,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 DocType: Production Planning Tool,Select Sales Orders,Izberite prodajnih nalogov
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Za sledenje predmetov s pomočjo črtne kode. Morda ne boste mogli vnesti elemente v dobavnice in prodajne fakture s skeniranjem črtne kode elementa.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Označi kot Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Označi kot Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Naredite predračun
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Pogled
 DocType: Salary Structure Deduction,Salary Structure Deduction,Plača Struktura Odbitek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektivno lasersko sintranje
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Uvoz uspešno!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Količina ne sme biti več kot {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Starost (dnevi)
 DocType: Quotation Item,Quotation Item,Kotacija Postavka
 DocType: Account,Account Name,Ime računa
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Dobavitelj Type gospodar.
 DocType: Purchase Order Item,Supplier Part Number,Dobavitelj Številka dela
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Dodaj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Menjalno razmerje ne more biti 0 ali 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} je odpovedan ali ustavi
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Vozilo Dispatch Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Potrdilo o nakupu {0} ni predložila
 DocType: Company,Default Payable Account,Privzeto plačljivo račun
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Nastavitve za spletni košarici, kot so predpisi v pomorskem prometu, cenik itd"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% zaračunali
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Človeški viri
 DocType: Lead,Upper Income,Zgornja Prihodki
 DocType: Journal Entry Account,Debit in Company Currency,Debetno v podjetju valuti
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Moja vprašanja
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Privzete vrednosti
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Vrstica {0}: Znesek plačila ne more biti negativna
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Sporočilo za vgradnjo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
 DocType: Payment Reconciliation,Payments,Plačila
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Vroče izostatično stiskanje
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Proračun Dodeljena
 DocType: Journal Entry,Entry Type,Začetek Type
 ,Customer Credit Balance,Stranka Credit Balance
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
 DocType: Quotation,Term Details,Izraz Podrobnosti
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapaciteta Načrtovanje Za (dnevi)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
 DocType: Warranty Claim,Warranty Claim,Garancija zahtevek
 ,Lead Details,Svinec Podrobnosti
-DocType: Authorization Rule,Approving User,Odobritvi Uporabnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Kovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
 DocType: Pricing Rule,Applicable For,Velja za
 DocType: Bank Reconciliation,From Date,Od datuma
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Dražbe
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Dražbe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Prosimo, navedite bodisi količina ali Ocenite vrednotenja ali oboje"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Podjetje, Mesec in poslovno leto je obvezna"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enotni enota točke.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Čas Log Serija {0} je treba &quot;Submitted&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Naredite vknjižba Za vsako borzno gibanje
 DocType: Leave Allocation,Total Leaves Allocated,Skupaj Listi Dodeljena
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Skladišče zahteva pri Row št {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Prosimo, vnesite veljaven proračunsko leto, datum začetka in konca"
 DocType: Employee,Date Of Retirement,Datum upokojitve
 DocType: Upload Attendance,Get Template,Get predlogo
 DocType: Address,Postal,Postal
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Rudarstvo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Resin litje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"A Skupina kupcev obstaja z istim imenom, prosimo spremenite ime stranke ali preimenovati skupino odjemalcev"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Prosimo, izberite {0} prvi."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Besedilo {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Besedilo {0}
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
 DocType: Stock Entry,Material Receipt,Material Prejem
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Izdelki
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Izdelki
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},"Vrsta stranka in stranka, ki je potrebna za terjatve / obveznosti račun {0}"
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Če ima ta postavka variante, potem ne more biti izbran v prodajnih naročil itd"
 DocType: Lead,Next Contact By,Naslednja Kontakt Z
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Skladišče {0} ni mogoče izbrisati, kot obstaja količina za postavko {1}"
 DocType: Quotation,Order Type,Sklep Type
 DocType: Purchase Invoice,Notification Email Address,Obvestilo e-poštni naslov
 DocType: Payment Tool,Find Invoices to Match,"Najdi račune, da se ujemajo"
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",npr &quot;XYZ National Bank&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",npr &quot;XYZ National Bank&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Skupaj Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Skupaj Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Košarica je omogočena
 DocType: Job Applicant,Applicant for a Job,Kandidat za službo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Ni Proizvodne Naročila ustvarjena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Plača listek delavca {0} že ustvarjena za ta mesec
 DocType: Stock Reconciliation,Reconciliation JSON,Sprava JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Sales Invoice Item,Batch No,Serija Ne
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Main
-DocType: DocPerm,Delete,Izbriši
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Ustavil naročila ni mogoče preklicati. Odčepiti preklicati.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Sprava
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Kandidat za službo.
 DocType: Purchase Order Item,Warehouse and Reference,Skladišče in Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutarna info in druge splošne informacije o vašem dobavitelju
-DocType: Country,Country,Država
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Naslovi
-DocType: Communication,Received,Prejetih
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Podvajati Zaporedna številka vpisana v postavko {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Pogoj za Shipping pravilu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Točka ni dovoljeno imeti Production Order.
-DocType: DocField,Attach Image,Priložite sliko
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto teža tega paketa. (samodejno izračuna kot vsota neto težo blaga)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Pustite prazno, če ni sprememb"
 DocType: Sales Order,To Deliver and Bill,Dostaviti in Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Čas Hlodi za proizvodnjo.
 DocType: Item,Apply Warehouse-wise Reorder Level,Uporabi skladišča pametno preuredite Raven
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Čas Prijava za naloge.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Plačilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Plačilo
 DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroški
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2}
 DocType: Employee,Salutation,Pozdrav
-DocType: Communication,Rejected,Zavrnjeno
 DocType: Pricing Rule,Brand,Brand
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle predmeti v času prodaje.
 DocType: Sales Order Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
 DocType: Quality Inspection Reading,Reading 10,Branje 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
 DocType: Hub Settings,Hub Node,Hub Node
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravi in poskusite znova."
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravi in poskusite znova."
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vrednost {0} za Attribute {1} ne obstaja na seznamu veljavnega Postavka vrednosti atributov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Sodelavec
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Potekel
 DocType: Packing Slip,To Package No.,Če želite Paket No.
-DocType: DocType,System,Sistem
 DocType: Warranty Claim,Issue Date,Datum izdaje
 DocType: Activity Cost,Activity Cost,Stroški dejavnost
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Porabljeno Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacije
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacije
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 DocType: Payment Tool,Make Payment Entry,Naredite Entry plačila
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
 ,Sales Invoice Trends,Prodajni fakturi Trendi
 DocType: Leave Application,Apply / Approve Leaves,Uporabi / Odobri Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Lahko sklicuje vrstico le, če je tip naboj &quot;Na prejšnje vrstice Znesek&quot; ali &quot;prejšnje vrstice Total&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče
 DocType: Stock Settings,Allowance Percent,Nadomestilo Odstotek
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Prodajanje je treba preveriti, če se uporablja za izbrana kot {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavitelj Kotacija Postavka
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Naredite plač Struktura
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Striženje
 DocType: Item,Has Variants,Ima Variante
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"S klikom na gumb &quot;Make Sales računu&quot;, da ustvarite nov prodajni fakturi."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Pakiranje in označevanje
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Prosimo, navedite privzeta valuta v podjetju mojstrom in globalne privzetih"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Dostop Secret
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Upravljanje projektov
 DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev.
 DocType: Budget Detail,Fiscal Year,Poslovno leto
 DocType: Cost Center,Budget,Proračun
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Doseženi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territory / Stranka
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,na primer 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,na primer 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"V besedi bo viden, ko boste prihranili prodajni fakturi."
 DocType: Item,Is Sales Item,Je Sales Postavka
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Element Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
 DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas
 ,Amount to Deliver,"Znesek, Deliver"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Izdelek ali storitev
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Tam so bile napake.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Prisluškovanje
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Izdelek ali storitev
 DocType: Naming Series,Current Value,Trenutna vrednost
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} ustvaril
 DocType: Delivery Note Item,Against Sales Order,Proti Sales Order
@@ -1592,30 +1468,29 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
 DocType: Website Item Group,Website Item Group,Spletna stran Element Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Dajatve in davki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vnesite Referenčni datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vnesite Referenčni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani"
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
 DocType: Material Request Item,Material Request Item,Material Zahteva Postavka
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Drevo Artikel skupin.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Drevo Artikel skupin.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Red
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Red
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Odprte Proizvodne Naročila
 DocType: Installation Note,Installation Time,Namestitev čas
 DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbriši vse transakcije za te družbe
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Izbriši vse transakcije za to družbo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Vrstica # {0}: Operacija {1} ni končana, za {2} Kol končnih izdelkov v proizvodnji naročite # {3}. Prosimo, posodobite statusa delovanja preko Čas Dnevniki"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Spremenite UOM za točko.
 DocType: Quality Inspection Reading,Acceptance Criteria,Merila sprejemljivosti
 DocType: Item Attribute,Attribute Name,Ime atributa
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Postavka {0} mora biti prodaja ali storitev postavka v {1}
 DocType: Item Group,Show In Website,Pokaži V Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Skupina
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Skupina
 DocType: Task,Expected Time (in hours),Pričakovani čas (v urah)
 ,Qty to Order,Količina naročiti
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Za sledenje blagovno znamko v naslednjih dokumentih dobavnica, Priložnost, Industrijska zahtevo postavki, narocilo, nakup kupona, kupec prejemu, navajanje, prodajne fakture, Product Bundle, Sales Order Zaporedna številka"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Jasno Tabela
 DocType: Features Setup,Brands,Blagovne znamke
 DocType: C-Form Invoice Detail,Invoice No,Račun št
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Od narocilo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Od narocilo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 DocType: Activity Cost,Costing Rate,Stanejo Rate
 ,Customer Addresses And Contacts,Naslovi strank in kontakti
 DocType: Employee,Resignation Letter Date,Odstop pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ni nastavljeno
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Sit tesen, medtem ko je vaš sistem pa nastavitev. To lahko traja nekaj trenutkov."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum
 DocType: Item,Has Batch No,Ima Serija Ne
 DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani
 DocType: Employee,Personal Details,Osebne podrobnosti
 ,Maintenance Schedules,Vzdrževanje Urniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Narekovaj Trendi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Kot je Produkcija naročilo lahko izvede za to postavko, mora biti točka parka."
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Pridružitev
-DocType: Authorization Rule,Above Value,Nad vrednostjo
 ,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
-DocType: Purchase Order,Delivered,Delivered
+DocType: Purchase Order,Delivered,Dostavljeno
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup dohodni strežnik za delovna mesta email id. (npr jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Število vozil
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Skupaj dodeljena listi {0} ne sme biti manjši od že odobrenih listov {1} za obdobje
 DocType: Journal Entry,Accounts Receivable,Terjatve
 ,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics
 DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo"
-DocType: Custom Field,Custom,Po meri
 DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Vbrizgavanje
 DocType: Bank Reconciliation,Include Reconciled Entries,Vključi uskladiti Entries
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Drevo finanial računov.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Pustite prazno, če velja za vse vrste zaposlenih"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirajo pristojbin na podlagi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Račun {0}, mora biti tipa &quot;osnovno sredstvo&quot;, kot {1} je postavka sredstvo Item"
 DocType: HR Settings,HR Settings,Nastavitve HR
-apps/frappe/frappe/config/setup.py +130,Printing,Tiskanje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so počitnice. Vam ni treba zaprositi za dopust."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,in
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr ne more biti prazen ali prostor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Šport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Skupaj Actual
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enota
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Prosim, nastavite tipke za dostop Dropbox v vašem mestu config"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Enota
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Prosimo, navedite Company"
 ,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vaš proračunsko leto konča na
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vaš proračunsko leto konča na
 DocType: POS Profile,Price List,Cenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
-DocType: Authorization Rule,Approving Role,Odobritvi vloge
 ,BOM Search,BOM Iskanje
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
 DocType: Workstation,Wages per hour,Plače na uro
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Prikaži / Skrij funkcije, kot zaporedne številke, POS itd"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Po Material Zahteve so bile samodejno dvigne temelji na ravni re-naročilnico elementa
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljavna. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Datum razdalja ne more biti pred datumom check zapored {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Datum razdalja ne more biti pred datumom check zapored {0}
 DocType: Salary Slip,Deduction,Odbitek
 DocType: Address Template,Address Template,Naslov Predloga
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Kotacija
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 DocType: Quotation,Maintenance User,Vzdrževanje Uporabnik
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Stroškovno Posodobljeno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Stroškovno Posodobljeno
 DocType: Employee,Date of Birth,Datum rojstva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so gosenicami proti ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Lead Naslov
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Opis dela
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Opis dela
 DocType: Purchase Order Item,Qty as per Stock UOM,Kol kot na borzi UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Izberite veljavno datoteko CSV s podatki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Premaz
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, in &quot;/&quot; ni dovoljena v poimenovanju serijo"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Vpisi Zaloga obstajajo proti skladišču {0}, zato vam ne more ponovno dodeliti ali spremeniti Skladišče"
 DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat
 DocType: Supplier Quotation,Manufacturing Manager,Proizvodnja Manager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Pošiljke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip modeliranje
-DocType: Purchase Order,To be delivered to customer,Ki jih je treba dostaviti kupcu
+apps/erpnext/erpnext/hooks.py +68,Shipments,Pošiljke
+DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Status čas Prijava je treba predložiti.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Nastavitev
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Vrstica #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Vrstica #
 DocType: Purchase Invoice,In Words (Company Currency),V besedi (družba Valuta)
 DocType: Pricing Rule,Supplier,Dobavitelj
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Razni stroški
-DocType: Global Defaults,Default Company,Privzeto Company
+DocType: Global Defaults,Default Company,Privzeto Podjetje
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve"
-DocType: Employee,Bank Name,Ime Bank
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve"
+DocType: Employee,Bank Name,Ime Banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Uporabnik {0} je onemogočena
 DocType: Leave Application,Total Leave Days,Skupaj dni dopusta
-DocType: Journal Entry Account,Credit in Account Currency,Kredit Valuta računa
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opomba: E-mail ne bo poslano uporabnike invalide
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Izberite Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Currency Exchange,From Currency,Iz valute
-DocType: DocField,Name,Name
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Sales Order potreben za postavko {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prosimo, izberite Dodeljeni znesek, fakture Vrsta in številka računa v atleast eno vrstico"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Sales Order potreben za postavko {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,"Zneski, ki se ne odraža v sistemu"
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Drugi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Drugi
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Dopolnil
-DocType: Web Form,Select DocType,Izberite DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Posnemanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bančništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bančništvo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;, da bi dobili razpored"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,New Center Stroški
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,New Center Stroški
 DocType: Bin,Ordered Quantity,Naročeno Količina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
 DocType: Quality Inspection,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 DocType: Purchase Order Item,Reference Document Type,Referenčni dokument Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} proti Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} proti Sales Order {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Zaporednimi Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Zaporednimi Inventory
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
 DocType: Time Log Batch,Total Billing Amount,Skupni znesek plačevanja
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Terjatev račun
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Sales Order do plačila
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Čas Dnevniki ustvaril:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
 DocType: Employee,Blood Group,Blood Group
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,V teku
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ne morete spremeniti privzeto UOM variante. Če želite spremeniti privzeto UOM za Variant privzeto sprememba UOM na predlogo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Pisarniška oprema
 DocType: Purchase Invoice Item,Qty,Količina
 DocType: Fiscal Year,Companies,Podjetja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Electronics
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronics
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Dvignite Material Zahtevaj ko stock doseže stopnjo ponovnega naročila
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Od razporedom vzdrževanja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Polni delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Polni delovni čas
 DocType: Purchase Invoice,Contact Details,Kontaktni podatki
 DocType: C-Form,Received Date,Prejela Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Če ste ustvarili standardno predlogo v prodaji davkov in dajatev predlogo, izberite eno in kliknite na gumb spodaj."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Job Otvoritev
 DocType: Payment Reconciliation,Payment Reconciliation,Plačilo Sprava
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Tehnologija
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
 DocType: Offer Letter,Offer Letter,Ponujamo Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Skupaj Fakturna Amt
 DocType: Time Log,To Time,Time
+DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Če želite dodati otrok vozlišča, raziskovanje drevo in kliknite na vozlišču, pod katero želite dodati več vozlišč."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
 DocType: Production Order Operation,Completed Qty,Dopolnil Kol
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Seznam Cena {0} je onemogočena
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Stranka Postavka Kode
 DocType: Opportunity,Lost Reason,Lost Razlog
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Ustvarite Plačilni Entries proti odločitvam ali računih.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Varjenje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM je potrebno
 DocType: Quality Inspection,Sample Size,Velikost vzorca
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Vsi predmeti so bili že obračunano
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Prosimo, navedite veljaven &quot;Od zadevi št &#39;"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
 DocType: Features Setup,Item Serial Nos,Postavka Serijska št
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Dejanska količina
 DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Vaše stranke
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Stiskanjem
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Vaše stranke
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Ne Delivered
 ,Bank Clearance Summary,Banka Potrditev Povzetek
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Oznaka&gt; Element Group&gt; Brand
 DocType: Appraisal Goal,Appraisal Goal,Cenitev cilj
-DocType: Event,Friday,Petek
 DocType: Time Log,Costing Amount,Stanejo Znesek
 DocType: Process Payroll,Submit Salary Slip,Predloži plačilni list
 DocType: Salary Structure,Monthly Earning & Deduction,Mesečni zaslužka &amp; Odbitek
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Uvoz v razsutem stanju
 DocType: Sales Partner,Address & Contacts,Naslov &amp; Kontakti
 DocType: SMS Log,Sender Name,Sender Name
-DocType: Page,Title,Naslov
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Prilagajanje
 DocType: POS Profile,[Select],[Izberite]
 DocType: SMS Log,Sent To,Poslano
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Naredite prodajni fakturi
 DocType: Company,For Reference Only.,Samo za referenco.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Neveljavna {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Neveljavna {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Znesek
 DocType: Manufacturing Settings,Capacity Planning,Načrtovanje zmogljivosti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"&quot;Od datuma&quot;, je potrebno"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"&quot;Od datuma&quot;, je potrebno"
 DocType: Journal Entry,Reference Number,Referenčna številka
 DocType: Employee,Employment Details,Podatki o zaposlitvi
 DocType: Employee,New Workplace,Novo delovno mesto
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Čas dostave
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na"
 DocType: Item,End of Life,End of Life
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Potovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Potovanja
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
 DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
 DocType: Sales Invoice,Recurring,Ponavljajoči
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje orodje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Prenos Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Določite operacij, obratovalne stroške in daje edinstveno Operacija ni na vaše poslovanje."
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
 DocType: Installation Note,Installation Note,Namestitev Opomba
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Dodaj Davki
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Dodaj Davki
 ,Financial Analytics,Finančni Analytics
 DocType: Quality Inspection,Verified By,Verified by
 DocType: Address,Subsidiary,Hčerinska družba
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne more spremeniti privzeto valuto družbe, saj so obstoječi posli. Transakcije se treba odpovedati, da spremenite privzeto valuto."
 DocType: Quality Inspection,Purchase Receipt No,Potrdilo o nakupu Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara
-DocType: System Settings,In Hours,V urah
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Pričakovana višina kot na banko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Brušenju
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Pričakovana višina kot na banko
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Vir sredstev (obveznosti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
 DocType: Appraisal,Employee,Zaposleni
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Skupina kupon
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Sales Invoice,Mass Mailing,Mass Mailing
-DocType: Page,Standard,Standardni
-DocType: Rename Tool,File to Rename,Datoteka Preimenuj
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
+DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Prikaži Plačila
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Velikost
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Nabavna vrednost kupljene izdelke
 DocType: Selling Settings,Sales Order Required,Sales Order Zahtevano
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Ustvarite stranko
@@ -1935,48 +1782,43 @@
 DocType: Quality Inspection Reading,Reading 9,Branje 9
 DocType: Supplier,Is Frozen,Je zamrznjena
 DocType: Buying Settings,Buying Settings,Nastavitve odkup
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass Dodelava
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. za Končni Good postavki
 DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup dohodni strežnik za prodajo email id. (npr sales@example.com)
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Plačilo računa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Osnutek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompenzacijske Off
 DocType: Quality Inspection Reading,Accepted,Sprejeto
-DocType: User,Female,Ženska
-DocType: Journal Entry Account,Debit in Account Currency,Debetno v Valuta računa
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prosimo, preverite, ali ste prepričani, da želite izbrisati vse posle, za te družbe. Vaši matični podatki bodo ostali kot je. Ta ukrep ni mogoče razveljaviti."
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Odgovorila
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Neveljavna referenčna {0} {1}
 DocType: Payment Tool,Total Payment Amount,Skupaj Znesek plačila
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Surovine ne more biti prazno.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Surovine ne more biti prazno.
 DocType: Newsletter,Test,Testna
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Kot že obstajajo transakcije zalog za to postavko, \ ne morete spremeniti vrednote &quot;Ima Zaporedna številka&quot;, &quot;Ima serija ni &#39;,&quot; je Stock Postavka &quot;in&quot; metoda vrednotenja &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hitro Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
-DocType: Stock Entry,For Quantity,Za Količina
+DocType: Stock Entry,For Quantity,Za Količino
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +211,{0} {1} is not submitted,{0} {1} ni predložena
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Prošnje za artikle.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko.
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Popolna Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Name
+DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
 DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Skupaj Odsoten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Merska enota
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Merska enota
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
 DocType: Lead,Opportunity,Priložnost
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovni tečaj (kot na borzi UOM)
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
 DocType: Campaign,Campaign-.####,Akcija -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo."
 DocType: Customer Group,Has Child Node,Ima otrok Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} proti narocilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v nobeni aktivnem poslovnem letu. Za več podrobnosti preverite {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Staranje Razpon 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemično strojna obdelava
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Standardna davčna predlogo, ki se lahko uporablja za vse nakupnih poslov. To predlogo lahko vsebuje seznam davčnih glavami in tudi drugih odhodkov glavah, kot so &quot;Shipping&quot;, &quot;zavarovanje&quot;, &quot;Ravnanje&quot; itd #### Opomba davčno stopnjo, ki jo določite tu bo standard davčna stopnja za vse ** Točke * *. Če obstajajo ** Items **, ki imajo različne stopnje, ki jih je treba dodati v ** Element davku ** miza v ** Element ** mojstra. #### Opis Stolpci 1. Vrsta Izračun: - To je lahko na ** Net Total ** (to je vsota osnovnega zneska). - ** Na prejšnje vrstice Total / Znesek ** (za kumulativnih davkov ali dajatev). Če izberete to možnost, bo davek treba uporabiti kot odstotek prejšnje vrstice (davčne tabele) znesek ali skupaj. - ** Dejanska ** (kot je omenjeno). 2. Račun Head: The knjiga račun, pod katerimi se bodo rezervirana ta davek 3. stroškovni center: Če davek / pristojbina je prihodek (kot ladijski promet) ali odhodek je treba rezervirana proti centru stroškov. 4. Opis: Opis davka (bo, da se natisne v faktur / narekovajev). 5. stopnja: Davčna stopnja. 6. Znesek: Davčna znesek. 7. Skupaj: Kumulativno do te točke. 8. Vnesite Row: Če je na osnovi &quot;Prejšnji Row Total&quot; lahko izberete številko vrstice, ki bo sprejet kot osnova za ta izračun (privzeta je prejšnja vrstica). 9. Razmislite davek ali dajatev za: V tem razdelku lahko določite, če je davek / pristojbina le za vrednotenje (ni del skupaj) ali samo za skupno (ne dodajajo vrednost za postavko), ali pa oboje. 10. Dodajte ali odštejemo: Ali želite dodati ali odbiti davek."
-DocType: Note,Note,Zapisek
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
-DocType: Email Account,Email Ids,E-pošta ID-ji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
 DocType: Global Defaults,Hide Currency Symbol,Skrij valutni simbol
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Dobropis
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Dopolnil Kol ne more biti več kot {0} za delovanje {1}
 DocType: Features Setup,Quality,Kakovost
-DocType: Contact Us Settings,Introduction,Predstavitev
 DocType: Warranty Claim,Service Address,Storitev Naslov
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Največ 100 vrstic za borzno spravo.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Največ 100 vrstic za borzno spravo.
 DocType: Stock Entry,Manufacture,Izdelava
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Prosimo Delivery Note prvi
 DocType: Purchase Invoice,Currency and Price List,Gotovina in Cenik
 DocType: Opportunity,Customer / Lead Name,Stranka / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Potrditev Datum ni omenjena
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Potrditev Datum ni omenjena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Proizvodnja
 DocType: Item,Allow Production Order,Dovoli Proizvodnja naročilo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Predložen
 DocType: Salary Structure,Total Earning,Skupaj zaslužka
 DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Moji Naslovi
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organizacija podružnica gospodar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ali
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Nad
 DocType: Buying Settings,Default Buying Price List,Privzeto Seznam odkupna cena
-,Download Backups,Prenesi Varnostne kopije
 DocType: Notification Control,Sales Order Message,Sales Order Sporočilo
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Privzeta nastavitev Vrednote, kot so podjetja, valuta, tekočem proračunskem letu, itd"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Način plačila
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
 DocType: Bank Reconciliation,To Date,Če želite Datum
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Podrobnosti
 DocType: Purchase Invoice,Total Taxes and Charges,Skupaj Davki in dajatve
 DocType: Employee,Emergency Contact,Zasilna Kontakt
 DocType: Item,Quality Parameters,Parametrov kakovosti
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Vrsta računa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Rezanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Uravnavanjem
 DocType: Account,Income Account,Prihodki račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Modeliranje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte &quot;Oceni materialov na osnovi&quot; v stanejo oddelku
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumenti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Stroškovno Center
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Voucher #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Naročilnica sporočilo
 DocType: Tax Rule,Shipping Country,Dostava Država
 DocType: Upload Attendance,Upload HTML,Naloži HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Skupaj predplačilo ({0}) proti odredbi {1} ne more biti večja \ od Grand Total ({2})
 DocType: Employee,Relieving Date,Lajšanje Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladišče je mogoče spremeniti samo prek borze Vstop / Delivery Note / Potrdilo o nakupu
 DocType: Employee Education,Class / Percentage,Razred / Odstotek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vodja marketinga in prodaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser inženirstva neto oblikovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Vodja marketinga in prodaje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Davek na prihodek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Če je izbrana Cene pravilo narejen za &quot;cena&quot;, bo prepisalo Cenik. Cen Pravilo cena je končna cena, zato je treba uporabiti pravšnji za popust. Zato v transakcijah, kot Sales Order, narocilo itd, da bodo nerealne v polje &quot;obrestna mera&quot;, namesto da polje »Cenik rate&quot;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Upravljanje skupine kupcev drevo.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,New Stroški Center Ime
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Ne privzeto Naslov Predloga našel. Prosimo, da ustvarite novega s Setup&gt; Printing in Branding&gt; Naslov predlogo."
 DocType: Appraisal,HR User,HR Uporabnik
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Large
 ,Profit and Loss Statement,Izkaz poslovnega izida
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Število
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Pritiskom
 DocType: Payment Tool Detail,Payment Tool Detail,Plačilo Tool Podrobnosti
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Velika
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Noben delavec našel!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Velika
 DocType: C-Form Invoice Detail,Territory,Ozemlje
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Purchase Order,Customer Address Display,Stranka Naslov Display
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Poliranje
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Privzeto mersko enoto za postavko {0} ni mogoče neposredno spremeniti, ker \ ste že naredili nekaj transakcije (-e) z drugo UOM. Če želite spremeniti privzeto UOM \ uporaba &quot;UOM Zamenjaj Utility&quot; orodje v okviru borze modula."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Kotacija {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Kotacija {0} je odpovedan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Skupni preostali znesek
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} je bil na dopustu {1}. Ne more označiti prisotnost.
 DocType: Sales Partner,Targets,Cilji
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev."
 ,S.O. No.,SO No.
 DocType: Production Order Operation,Make Time Log,Vzemite si čas Prijava
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Prosim, nastavite naročniško količino"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
 DocType: Price List,Applicable for Countries,Velja za države
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Računalniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-kemično brušenje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Prosimo nastavitev vaš kontni načrt, preden začnete vknjižbe"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignoriraj Pricing pravilo
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Preklicana
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma plače strukture ne more biti manjši od zaposlenih Vstop Datum.
 DocType: Employee Education,Graduate,Maturirati
 DocType: Leave Block List,Block Days,Block dnevi
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Preverite, če ponavljajoče račun, počistite ustaviti ponavljajoče se ali dati ustrezno End Date"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Največje {0} vrstice dovoljeno
 DocType: C-Form Invoice Detail,Net Total,Neto Skupaj
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Zaračunavanje (Sales Invoice)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Nameni
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,"Atleast en element, se vpiše z negativnim količino v povratni dokument"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemični strojna obdelava
 ,Requested,Zahteval
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Ni Opombe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Zapadle
 DocType: Account,Stock Received But Not Billed,Prejete Stock Ampak ne zaračuna
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root račun mora biti skupina
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plače + arrear Znesek + Vnovčevanje Znesek - Skupaj Odbitek
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Features Setup,Sales and Purchase,Prodaja in nakup
 DocType: Supplier Quotation Item,Material Request No,Material Zahteva Ne
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Obrestna mera, po kateri kupec je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} je bil uspešno odjavili iz tega seznama.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (družba Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Dodano
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Upravljanje Territory drevo.
 DocType: Journal Entry Account,Sales Invoice,Prodaja Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Poslovno leto {0} ni bilo mogoče najti.
 DocType: Bank Reconciliation,Get Relevant Entries,Pridobite ustreznimi vnosi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Kovanje
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Stranka Naslov
-apps/frappe/frappe/desk/query_report.py +136,Total,Skupaj
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Davčna Znesek Po Popust Znesek (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Ciljna skladišče je obvezna za vrstico {0}
 DocType: Quality Inspection,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray oblikovanje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim kontnem pripada organizaciji.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ali BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minimalna Inventory Raven
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Številka dela proizvajalca
 DocType: Production Order Operation,Estimated Time and Cost,Predvideni čas in stroški
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Njuškanje
 DocType: SMS Log,No of Sent SMS,Število poslanih SMS
 DocType: Account,Company,Podjetje
 DocType: Account,Expense Account,Expense račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programska oprema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Barva
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programska oprema
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Barva
 DocType: Maintenance Visit,Scheduled,Načrtovano
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosimo, izberite postavko, kjer &quot;Stock postavka je&quot; &quot;Ne&quot; in &quot;Je Sales Postavka&quot; je &quot;Yes&quot; in ni druge Bundle izdelka"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Izberite mesečnim izplačilom neenakomerno distribucijo ciljev po mesecih.
 DocType: Purchase Invoice Item,Valuation Rate,Oceni Vrednotenje
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Cenik Valuta ni izbran
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Postavka Row {0}: Potrdilo o nakupu {1} ne obstaja v zgornji tabeli &quot;nakup prejemki&quot;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
 DocType: Installation Note Item,Against Document No,Proti dokument št
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Upravljanje prodajne partnerje.
 DocType: Quality Inspection,Inspection Type,Inšpekcijski Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Prosimo, izberite {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Raziskovalec
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Raziskovalec
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Prosimo, shranite Newsletter pred pošiljanjem"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Ime ali E-pošta je obvezna
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Dohodni pregled kakovosti.
 DocType: Purchase Order Item,Returned Qty,Vrnjeno Kol
-DocType: Employee,Exit,Exit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Tip je obvezna
+DocType: Employee,Exit,Izhod
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Tip je obvezna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijska št {0} ustvaril
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibracijski zaključna
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za udobje kupcev lahko te kode se uporabljajo v tiskanih oblikah, kot so na računih in dobavnicah"
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
 DocType: Sales Invoice,Advertisement,Oglaševanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Poskusna doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Expense Claim,Expense Approver,Expense odobritelj
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Da datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Brušenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink zavijanje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Čakanju Dejavnosti
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Potrjen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Dobavitelj&gt; dobavitelj Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Naslov Naslov je obvezen.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vnesite ime oglaševalske akcije, če je vir preiskovalne akcije"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izberite Fiscal Year
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Taljenje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Attendance,Attendance Date,Udeležba Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
 DocType: Address,Preferred Shipping Address,Želeni Shipping Address
 DocType: Purchase Receipt Item,Accepted Warehouse,Accepted Skladišče
 DocType: Bank Reconciliation Detail,Posting Date,Napotitev Datum
 DocType: Item,Valuation Method,Metoda vrednotenja
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Ne morejo najti menjalni tečaj za {0} do {1}
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Dvojnik vnos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Dvojnik vnos
 DocType: Serial No,Under Warranty,Pod garancijo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"V besedi bo viden, ko boste shranite Sales Order."
 ,Employee Birthday,Zaposleni Rojstni dan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Tveganega kapitala
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tveganega kapitala
 DocType: UOM,Must be Whole Number,Mora biti celo število
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serijska št {0} ne obstaja
 DocType: Pricing Rule,Discount Percentage,Popust Odstotek
 DocType: Payment Reconciliation Invoice,Invoice Number,Številka računa
-apps/erpnext/erpnext/hooks.py +70,Orders,Naročila
+apps/erpnext/erpnext/hooks.py +54,Orders,Naročila
 DocType: Leave Control Panel,Employee Type,Vrsta delavec
 DocType: Employee Leave Approver,Leave Approver,Pustite odobritelju
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Litje
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Preneseno za Izdelava
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Uporabnik z &quot;Expense odobritelj&quot; vlogi
 ,Issued Items Against Production Order,Izdane Postavke proti proizvodnji reda
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Neveljavna obdobje
 DocType: Customer,Credit Limit,Kreditni limit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Izberite vrsto posla
 DocType: GL Entry,Voucher No,Voucher ni
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Naslov in Stik
 DocType: Customer,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Employee,Feedback,Povratne informacije
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dopusta ni mogoče dodeliti pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Vzdrževalec. Urnik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Abrazivni curek strojna obdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Vzdrževalec. Urnik
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
-DocType: Website Settings,Website Settings,Spletna stran Nastavitve
 DocType: Item,Reorder level based on Warehouse,Raven Preureditev temelji na Warehouse
 DocType: Activity Cost,Billing Rate,Zaračunavanje Rate
 ,Qty to Deliver,Količina na Deliver
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Zaprosila za
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root račun ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root račun ni mogoče izbrisati
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Prikaži Stock Vnosi
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenčna # {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Upravljanje naslovov
 DocType: Pricing Rule,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Zapiranje (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Zapiranje (Dr)
 DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Davčna predlogo za prodajo transakcije.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Zaračunavajo Znesek
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Dobite posodobitve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Dodajte nekaj zapisov vzorčnih
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Dodajte nekaj zapisov vzorčnih
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Pustite upravljanje
-DocType: Event,Groups,Skupine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun"
 DocType: Sales Order,Fully Delivered,Popolnoma Delivered
 DocType: Lead,Lower Income,Nižji od dobička
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Hitra pomoč
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Vir in cilj skladišče ne more biti enaka za vrstico {0}
 DocType: Features Setup,Sales Extras,Prodajna Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} proračun za račun {1} proti centru Cost {2} bo presegel s {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Od datuma&quot; mora biti po &quot;Da Datum &#39;
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vrednost ali Kol
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
 ,Qty to Receive,Količina za prejemanje
 DocType: Leave Block List,Leave Block List Allowed,Pustite Block Seznam Dovoljeno
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konverzije ne more biti v frakcijah
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lahko ga bodo uporabljali za prijavo
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Lahko ga bodo uporabljali za prijavo
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Vse vrste Dobavitelj
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Delivered
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Bančnem računu računa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Naredite plačilnega lista
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Prebrskaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Secured Posojila
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Super izdelki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Otvoritev Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Ne more odobriti dopusta, kot si ne dovoli, da odobri liste o skupinskih termini"
 DocType: Appraisal,Appraisal,Cenitev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Izgubljene pena litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Risanje
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum se ponovi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Pooblaščeni podpisnik
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
 DocType: Hub Settings,Seller Email,Prodajalec Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
 DocType: Workstation Working Hour,Start Time,Začetni čas
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta)
 DocType: BOM Operation,Hour Rate,Urni tečaj
 DocType: Stock Settings,Item Naming By,Postavka Poimenovanje S
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Od Kotacija
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Od Kotacija
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Drug zaključnem obdobju Začetek {0} je bil dosežen po {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Preneseno za Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Račun {0} ne obstaja
 DocType: Purchase Receipt Item,Purchase Order Item No,Naročilnica Art.-Št.
-DocType: System Settings,System Settings,Sistemske nastavitve
 DocType: Project,Project Type,Projekt Type
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Bodisi ciljna kol ali ciljna vrednost je obvezna.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Stroške različnih dejavnosti
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 DocType: Serial No,Is Cancelled,Je Preklicana
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Moje pošiljke
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Moje pošiljke
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:"
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
-DocType: Communication,Recipients,Prejemniki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vijačenje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Narebričenju
 DocType: Expense Claim,Approval Status,Stanje odobritve
 DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Izberite bančni račun
 DocType: Newsletter,Create and Send Newsletters,Ustvarjanje in pošiljanje glasila
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Od datuma mora biti pred Do Datum
 DocType: Sales Order,Recurring Order,Ponavljajoči naročilo
 DocType: Company,Default Income Account,Privzeto Prihodki račun
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka
 DocType: Item Group,Check this if you want to show in website,"Označite to, če želite, da kažejo na spletni strani"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Dobrodošli na ERPNext
+,Welcome to ERPNext,Dobrodošli na ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Bon Detail Število
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Privede do Kotacija
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Poziva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Poziva
 DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
 ,Projected,Predvidoma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Otvoritev Datum
 DocType: Journal Entry,Remark,Pripomba
 DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Boring
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Od Sales Order
-DocType: Blog Category,Parent Website Route,Parent Website Route
 DocType: Sales Order,Not Billed,Ne zaračunavajo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ni stikov še dodal.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Ni aktiven
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek
 DocType: Time Log,Batched for Billing,Posodi za plačevanja
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Popust Količina
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,npr DDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,npr DDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 DocType: Shopping Cart Settings,Quotation Series,Kotacija Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal plin oblikovanje
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
 DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Pojdi na ustrezno skupino (običajno vir sredstev&gt; kratkoročnimi obveznostmi&gt; davkov in dajatev ter ustvariti nov račun (s klikom na Dodaj Child) tipa &quot;davek&quot; in ne omenjam davčna stopnja.
 ,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserski razrez
-DocType: Event,Monday,Ponedeljek
 DocType: Journal Entry,Stock Entry,Stock Začetek
 DocType: Account,Payable,Plačljivo
 DocType: Salary Slip,Arrear Amount,Arrear Znesek
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Naslov opis izdelka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Kjer so proizvodni postopki.
-DocType: Page,All,Vsi
 DocType: Stock Entry Detail,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
 DocType: Employee,Confirmation Date,Potrditev Datum
@@ -2586,60 +2379,55 @@
 DocType: Account,Sales User,Prodaja Uporabnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Količina ne sme biti večja od Max Kol
 DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Svinec lastnika
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Je potrebno skladišče
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Je potrebno skladišče
 DocType: Employee,Marital Status,Zakonski stan
 DocType: Stock Settings,Auto Material Request,Auto Material Zahteva
 DocType: Time Log,Will be updated when billed.,"Bo treba posodobiti, če zaračunavajo."
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostopno Serija Količina na IZ SKLADIŠČA
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve sme biti večja od Datum pridružitve
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +69,{0}% Delivered,{0}% Delivered
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +78,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Postavka {0}: Ž Kol {1} ne more biti nižja od minimalne naročila Kol {2} (opredeljeno v točki).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nakup Sklep Postavka Priložena
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Ime podjetja ne more biti podjetje
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Letter Glave za tiskane predloge.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobitev Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Evidenca vseh komunikacij tipa elektronski pošti, telefonu, klepet, obisk, itd"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Navedite zaokrožijo stroškovno mesto v družbi
 DocType: Purchase Invoice,Terms,Pogoji
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Ustvari novo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Ustvari novo
 DocType: Buying Settings,Purchase Order Required,Naročilnica obvezno
 ,Item-wise Sales History,Element-pametno Sales Zgodovina
 DocType: Expense Claim,Total Sanctioned Amount,Skupaj sankcionirano Znesek
 ,Purchase Analytics,Odkupne Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Dostava Opomba Postavka
 DocType: Expense Claim,Task,Naloga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Britje
 DocType: Purchase Taxes and Charges,Reference Row #,Referenčna Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,To je koren prodaje oseba in jih ni mogoče urejati.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Stopnja: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Stopnja: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Plača Slip Odbitek
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Opombe
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Izberite skupino vozlišče prvi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Cilj mora biti eden od {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Izpolnite obrazec in ga shranite
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Prenesite poročilo, ki vsebuje vse surovine s svojo najnovejšo stanja zalog"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Soočenje
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Skupnost
 DocType: Leave Application,Leave Balance Before Application,Pustite Stanje pred uporabo
 DocType: SMS Center,Send SMS,Pošlji SMS
 DocType: Company,Default Letter Head,Privzeto glavi pisma
 DocType: Time Log,Billable,Plačljivo
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ta se bo uporabljal za vzpostavitev vladavine v HR modula
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Preureditev Kol
 DocType: Company,Stock Adjustment Account,Račun Prilagoditev Stock
@@ -2651,14 +2439,12 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Priložnost Lost
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Popust Polja bo na voljo v narocilo, Potrdilo o nakupu, nakup računa"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ime novega računa. Opomba: Prosimo, da ne ustvarjajo računov za kupce in dobavitelje"
-DocType: Report,Report Type,Poročilo Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Nalaganje
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Zamenjaj orodje
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Država pametno privzeti naslov Predloge
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Prikaži davek break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import Export
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz in izvoz podatkov
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Če se vključujejo v proizvodne dejavnosti. Omogoča Postavka &quot;izdeluje&quot;
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,Invoice Posting Date,Račun Napotitev Datum
 DocType: Sales Invoice,Rounded Total,Zaobljeni Skupaj
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Zahteva Detail Ne
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard turning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Naredite Maintenance obisk
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
 DocType: Company,Default Cash Account,Privzeto Cash račun
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Opomba: Če se plačilo ni izvedeno pred kakršno koli sklicevanje, da Journal Entry ročno."
 DocType: Item,Supplier Items,Dobavitelj Items
 DocType: Opportunity,Opportunity Type,Priložnost Type
@@ -2685,67 +2470,59 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nepravilno število General Ledger Entries našel. Morda ste izbrali napačen račun v transakciji.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Če želite ustvariti račun Bank
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večja, kot je danes."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
 ,Stock Ageing,Stock Staranje
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavi kot Odpri
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Pošlji samodejne elektronske pošte v Contacts o posredovanju transakcij.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Vrstica {0}: Kol ne avalable v skladišču {1} na {2} {3}. Na voljo Kol: {4}, Prenos Količina: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Postavka 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
-DocType: Event,Sunday,Nedelja
 DocType: Sales Team,Contribution (%),Prispevek (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Opomba: Začetek Plačilo se ne bodo ustvarili, saj &quot;gotovinski ali bančni račun&quot; ni bil podan"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Odgovornosti
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Dodaj uporabnike
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Dodaj uporabnike
 DocType: Pricing Rule,Item Group,Element Group
 DocType: Task,Actual Start Date (via Time Logs),Actual Start Date (via Čas Dnevniki)
 DocType: Stock Reconciliation Item,Before reconciliation,Pred sprave
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
 DocType: Item,Default BOM,Privzeto BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Time Log Batch,Total Hours,Skupaj ure
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Avtomobilizem
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Je potrebno postavko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal brizganje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Od dobavnica
 DocType: Time Log,From Time,Od časa
 DocType: Notification Control,Custom Message,Sporočilo po meri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investicijsko bančništvo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Izberite vašo državo, časovni pas in valuto"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bančništvo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Dekapiranje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Pesek litje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Galvanizacije
 DocType: Purchase Invoice Item,Rate,Stopnja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,Vodilno vlogo pri tem email id morala obstajati
 DocType: Stock Entry,From BOM,Od BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Osnovni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum Pridružil sme biti večja od Datum rojstva
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum pridružitva mora biti večji od datuma rojstva
 DocType: Salary Structure,Salary Structure,Plača Struktura
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Cena pravilo obstaja z istimi merili, prosim rešiti \ konflikt z dodeljevanjem prednost. Cena Pravila: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
 DocType: Hub Settings,Access Token,Dostopni žeton
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Je osnovno sredstvo Item
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Če imate dolge oblike tiskanja, lahko ta funkcija se uporablja za razdeliti stran se natisne na več straneh z vsemi glave in noge na vsaki strani"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Vse Territories
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 DocType: Fiscal Year,Year Name,Leto Name
 DocType: Process Payroll,Process Payroll,Proces na izplačane plače
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
 DocType: Product Bundle Item,Product Bundle Item,Izdelek Bundle Postavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name
 DocType: Purchase Invoice Item,Image View,Image View
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Dodelava in industrijsko obdelavo
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Od in Do datumov zahtevanih
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vrednostnih papirjev in blagovne borze
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Vrtanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Pihanje
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
 DocType: Tax Rule,Shipping City,Dostava Mesto
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen &quot;Ne Kopiraj«"
 DocType: Account,Purchase User,Nakup Uporabnik
 DocType: Notification Control,Customize the Notification,Prilagodite Obvestilo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Kovanje
-DocType: Web Page,Slideshow,Slideshow
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzeto Naslov Predloga ni mogoče izbrisati
+apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
 DocType: Journal Entry,Print Heading,Print Postavka
 DocType: Quotation,Maintenance Manager,Vzdrževanje Manager
-DocType: Workflow State,Search,Iskanje
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Skupaj ne more biti nič
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Dnevi od zadnjega reda&quot; mora biti večji ali enak nič
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Spajkanje
 DocType: C-Form,Amended From,Spremenjeni Od
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bodisi ciljna kol ali ciljna vrednost je obvezna
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2801,44 +2570,43 @@
 ,Produced,Proizvedena
 DocType: Item,Item Code for Suppliers,Oznaka za dobavitelje
 DocType: Issue,Raised By (Email),Postavljeno Z (e-naslov)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Splošno
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Priložite pisemski
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Splošno
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Priložite pisemski
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serijska št Zahtevano za zaporednimi postavki {0}
 DocType: Journal Entry,Bank Entry,Banka Začetek
 DocType: Authorization Rule,Applicable To (Designation),Ki se uporabljajo za (Oznaka)
-DocType: Blog Post,Blog Post,Blog Post
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Skupina S
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Omogoči / onemogoči valute.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Poštni stroški
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Purchase Order,The date on which recurring order will be stop,"Datum, na katerega se bodo ponavljajoče se naročilo ustavi"
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} je treba zmanjšati za {1} ali pa bi se morala povečati strpnost preliva
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Skupaj Present
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Ura
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Ura
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Prenos Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Prenos Material za dobavitelja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Svinec Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Ustvarite predračun
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Vsi ti predmeti so bili že obračunano
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Pravilo Pogoji
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
 DocType: Features Setup,Point of Sale,Prodajno mesto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Davčna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafiniranje
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Vrstica {0}: {1} ni veljaven {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Od Bundle izdelkov
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
 DocType: Quality Inspection,Report Date,Poročilo Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Usmerjanje
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Job Naslov
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} že dodeljenih za Employee {1} za obdobje {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Prejemniki
 DocType: Features Setup,Item Groups in Details,Postavka Skupine v Podrobnosti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Posodobitev Oceni in razpoložljivost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Odstotek ste dovoljeno prejemati ali dostaviti bolj proti količine naročenega. Na primer: Če ste naročili 100 enot. in vaš dodatek za 10%, potem ste lahko prejeli 110 enot."
 DocType: Pricing Rule,Customer Group,Skupina za stranke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: Item,Website Description,Spletna stran Opis
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
 ,Sales Register,Prodaja Register
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
 DocType: Address,Plant,Rastlina
-DocType: DocType,Setup,Nastaviti
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Povzetek za ta mesec in v teku dejavnosti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Hladno valjanje
 DocType: Customer Group,Customer Group Name,Skupina Ime stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
 DocType: GL Entry,Against Voucher Type,Proti bon Type
 DocType: Item,Attributes,Atributi
-DocType: Packing Slip,Get Items,Pridobite Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Vnesite Napišite Off račun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Pridobite Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Vnesite Napišite Off račun
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Zadnja Datum naročila
-DocType: DocField,Image,Image
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Naredite trošarine fakturo
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
-DocType: Communication,Other,Drugi
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacija ID ni nastavljen
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
 DocType: Serial No,Creation Document Type,Creation Document Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Vzdrževalec. Obisk
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Vzdrževalec. Obisk
 DocType: Leave Type,Is Encash,Je vnovči
 DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Payment Tool,Make Journal Entry,Naredite Journal Entry
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Commercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 DocType: Cost Center,Distribution Id,Porazdelitev Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Super Storitve
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Vse izdelke ali storitve.
 DocType: Purchase Invoice,Supplier Address,Dobavitelj Naslov
-DocType: Contact Us Settings,Address Line 2,Naslov Line 2
-DocType: ToDo,Reference,Sklicevanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforiranje
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serija je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finančne storitve
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vrednost za Attribute {0} mora biti v razponu od {1} na {2} v korakih po {3}
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
 DocType: Leave Allocation,Unused leaves,Neizkoriščene listi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Privzeto Terjatev računov
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Žaganje
 DocType: Tax Rule,Billing State,Država za zaračunavanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminiranje
 DocType: Item Reorder,Transfer,Prenos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintranje
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2920,58 +2678,53 @@
 DocType: Company,Retail,Maloprodaja
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Stranka {0} ne obstaja
 DocType: Attendance,Absent,Odsoten
-DocType: Product Bundle,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle izdelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Drobljenje
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
-DocType: Upload Attendance,Download Template,Download Predloga
+DocType: Upload Attendance,Download Template,Prenesi predlogo
 DocType: GL Entry,Remarks,Opombe
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 DocType: Features Setup,POS View,POS View
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Namestitev rekord Serial No.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Kontinuirano litje
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Prosimo, določite"
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Nad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Hladno dimenzioniranje
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Upoštevati {0} ne more biti skupina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Regija
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
 DocType: Holiday List,Weekly Off,Tedenski Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za primer leta 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Začasna dobiček / izguba (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Vrni proti prodajne fakture
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Postavka 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Prosim, nastavite privzeto vrednost {0} v družbi {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Prosim, nastavite privzeto vrednost {0} v družbi {1}"
 DocType: Serial No,Creation Time,Čas ustvarjanja
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Skupni prihodki
 DocType: Sales Invoice,Product Bundle Help,Izdelek Bundle Pomoč
 ,Monthly Attendance Sheet,Mesečni Udeležba Sheet
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nobenega zapisa najdenih
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Račun {0} je neaktiven
 DocType: GL Entry,Is Advance,Je Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Udeležba Od datuma in udeležba na Datum je obvezna
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Prosimo, vpišite &quot;Je v podizvajanje&quot;, kot DA ali NE"
 DocType: Sales Team,Contact No.,Kontakt No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Izkaz poslovnega izida&quot; tip račun {0} ni dovoljen v vstopna odprtina
-DocType: Workflow State,Time,Čas
 DocType: Features Setup,Sales Discounts,Prodajna Popusti
 DocType: Hub Settings,Seller Country,Prodajalec Država
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Število reda
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, ki se bo prikazal na vrhu seznama izdelkov."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Navedite pogoje za izračun zneska ladijskega
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Dodaj Child
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Vloga dovoliti, da določijo zamrznjenih računih in uredi Zamrznjen Entries"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Ni mogoče pretvoriti v stroškovni center za knjigo, saj ima otrok vozlišč"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Je potrebna pretvorba Factor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisija za prodajo
 DocType: Offer Letter Term,Value / Description,Vrednost / Opis
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,"Kupci ne kupujejo, saj dolgo časa"
 DocType: Production Order,Expected Delivery Date,Pričakuje Dostava Datum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Izbuljene
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Izhlapevanja-vzorec litje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Zabava Stroški
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} je treba preklicati pred ukinitvijo te Sales Order
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Starost
 DocType: Time Log,Billing Amount,Zaračunavanje Znesek
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Vloge za dopust.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Pravni stroški
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno naročilo ustvarila npr 05, 28, itd"
 DocType: Sales Invoice,Posting Time,Napotitev čas
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Customer Prihodki
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Potni stroški
 DocType: Maintenance Visit,Breakdown,Zlomiti se
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matično račun {1} ne pripada podjetju: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kot na datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honanje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
-DocType: Feed,Full Name,Polno ime
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Poskusno delo
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Privzeto Skladišče je obvezna za borzo točki.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Izplačilo plače za mesec {0} in leto {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek
 ,Transferred Qty,Prenese Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Krmarjenje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Načrtovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Načrtovanje
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Naredite Čas Log Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Izdala
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Prodamo ta artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Prodamo ta artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Dobavitelj Id
 DocType: Journal Entry,Cash Entry,Cash Začetek
 DocType: Sales Partner,Contact Desc,Kontakt opis izdelka
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Element Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Dodajte vrstice, da določijo letne proračune na računih."
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Kamnolomi
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Vsi stiki.
 DocType: Newsletter,Test Email Id,Testna Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Kratica podjetje
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Kratica podjetja
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Če sledite kontrolo kakovosti. Omogoča item QA obvezno in ZK ni v Potrdilo o nakupu
 DocType: GL Entry,Party Type,Vrsta Party
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element"
 DocType: Item Attribute Value,Abbreviation,Kratica
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotacijsko oblikovanje
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Plača predlogo gospodar.
 DocType: Leave Type,Max Days Leave Allowed,Max dni dopusta Dovoljeno
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Nastavite Davčna pravilo za nakupovalno košarico
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Citati za Interesenti ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Davčna Predloga je obvezna.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Račun {0}: Matično račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
 DocType: Account,Temporary,Začasna
 DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Serial No,Distinct unit of an Item,Ločena enota Postavka
 DocType: Pricing Rule,Buying,Odkup
 DocType: HR Settings,Employee Records to be created by,"Zapisi zaposlenih, ki ga povzročajo"
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
 DocType: Purchase Order Item,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Likanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} je ustavila
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
 DocType: Lead,Add to calendar on this date,Dodaj v koledar na ta dan
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Prihajajoči dogodki
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je potrebno kupca
-DocType: Letter Head,Letter Head,Pismo Head
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za vrnitev
 DocType: Purchase Order,To Receive,Prejeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink opremljanje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Prihodki / odhodki
 DocType: Employee,Personal Email,Osebna Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Skupne variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Skupne variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Posredništvo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
 DocType: Address,Postal Code,Poštna številka
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",v minutah Posodobljeno preko &quot;Čas Logu&quot;
 DocType: Customer,From Lead,Iz svinca
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Naročila sprosti za proizvodnjo.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Hub Settings,Name Token,Ime Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Inženiring
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardna Prodaja
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardna Prodaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast eno skladišče je obvezna
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} proti prodajne fakture {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vnesite privzeto mersko enoto
 DocType: Purchase Invoice Item,Project Name,Ime projekta
 DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
-DocType: Workflow State,Edit,Urejanje
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
 DocType: Features Setup,Item Batch Nos,Postavka Serija Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Davčni Sredstva
 DocType: BOM Item,BOM No,BOM Ne
-DocType: Contact Us Settings,Pincode,Kodi PIN
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM mora biti drugačna od trenutne zaloge UOM
-DocType: Account,Debit,Debetne
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
+DocType: Account,Debit,Debet
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Listi morajo biti dodeljen v večkratnikih 0.5
 DocType: Production Order,Operation Cost,Delovanje Stroški
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Naloži udeležbo iz .csv datoteke
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Izjemna Amt
@@ -3137,13 +2876,10 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Pustimo, da se naslednji uporabniki za odobritev dopusta Aplikacije za blok dni."
 apps/erpnext/erpnext/config/hr.py +155,Types of Expense Claim.,Vrste Expense zahtevka.
 DocType: Item,Taxes,Davki
-DocType: Project,Default Cost Center,Privzeto Center Stroški
+DocType: Project,Default Cost Center,Privzet Stroškovni Center
 DocType: Purchase Invoice,End Date,Končni datum
 DocType: Employee,Internal Work History,Notranji Delo Zgodovina
-DocType: DocField,Column Break,Stolpec Break
-DocType: Event,Thursday,Četrtek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Obračanja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
 DocType: Sales Invoice,Exhibition,Razstava
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Potekala v
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Postavka
 ,Employee Information,Informacije zaposleni
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Stopnja (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Stopnja (%)
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Proračunsko leto End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Proračunsko leto End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Filter ne more temeljiti na kupona št, če je združena s Voucher"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Zmanjšajte Služenje za dopust brez plačila (md)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Casual Zapusti
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Opomba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Povzetek Ta teden je
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} mora biti kupljena ali podizvajalcev Postavka v vrstici {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
 DocType: GL Entry,Party,Zabava
 DocType: Sales Order,Delivery Date,Datum dostave
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Priložnost Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Vrni Proti Potrdilo o nakupu
 DocType: Purchase Order,To Bill,Billu
 DocType: Material Request,% Ordered,% Ž
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Akord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Akord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Razpravljati
 DocType: SMS Settings,SMS Settings,Nastavitve SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Začasni računi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Črna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Črna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Končni datum obdobja Trenutni vrstni red je
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Naredite Pisna ponudba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Return
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
-DocType: DocField,Fold,Zložite
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Privzeto mersko enoto za Variant mora biti enaka kot predlogo
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
 DocType: Project Task,Pending Review,Dokler Pregled
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,"Prosimo, navedite"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID stranke
-DocType: Page,Page Name,Page Name
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Da mora biti čas biti večja od od časa
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} ni predložila
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Vreteno Dodelava
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Naloga ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",npr &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",npr &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant"
 ,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek
-DocType: System Settings,Time Zone,Časovni pas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Skladišče {0} ne obstaja
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracija Za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Spenjanje
 DocType: Customer,Customer Details,Podrobnosti strank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Oblikovanje
 DocType: Employee,Reports to,Poročila
 DocType: SMS Settings,Enter url parameter for receiver nos,Vnesite url parameter za sprejemnik nos
 DocType: Sales Invoice,Paid Amount,Plačan znesek
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Zapiranje račun {0}, mora biti tipa &quot;odgovornosti&quot;"
 ,Available Stock for Packing Items,Zaloga za Embalaža Items
 DocType: Item Variant,Item Variant,Postavka Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu že v obremenitve, se vam ni dovoljeno, da nastavite &quot;Stanje mora biti&quot; kot &quot;kredit&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Upravljanje kakovosti
 DocType: Production Planning Tool,Filter based on customer,"Filter, ki temelji na kupca"
 DocType: Payment Tool Detail,Against Voucher No,Proti kupona št
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
 DocType: Tax Rule,Purchase,Nakup
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balance Kol
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Kol
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} za {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Stroškovnih mestih
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Skladišča.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Skladišča.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Obrestna mera, po kateri dobavitelj je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Vrstica # {0}: čase v nasprotju z vrsto {1}
 DocType: Opportunity,Next Contact,Naslednja Kontakt
 DocType: Employee,Employment Type,Vrsta zaposlovanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Osnovna sredstva
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Prijavni rok ne more biti čez dve Razporejanje zapisov
 DocType: Item Group,Default Expense Account,Privzeto Expense račun
 DocType: Employee,Notice (days),Obvestilo (dni)
-DocType: Page,Yes,Da
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
 DocType: Employee,Encashment Date,Vnovčevanje Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Proti bon mora Vrsta biti eden narocilo, Nakup računa ali list Začetek"
 DocType: Account,Stock Adjustment,Prilagoditev Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Obstaja Stroški Privzeta aktivnost za vrsto dejavnosti - {0}
 DocType: Production Order,Planned Operating Cost,Načrtovana operacijski stroškov
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},V prilogi vam pošiljamo {0} # {1}
 DocType: Job Applicant,Applicant Name,Predlagatelj Ime
 DocType: Authorization Rule,Customer / Item Name,Stranka / Item Name
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Zaporedna številka je obvezna za postavko {0}
 DocType: Item Variant Attribute,Attribute,Lastnost
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Prosimo, navedite iz / v razponu"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Ustvaril
 DocType: Serial No,Under AMC,Pod AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Stopnja vrednotenje sredstev se preračuna razmišlja pristali stroškovno vrednost kupona
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimalni znesek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,"Posodobitev končnih izdelkov,"
 DocType: Workstation,per hour,na uro
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serija {0} že uporabljajo v {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladišče (Perpetual Inventory) bo nastala na podlagi tega računa.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 DocType: Company,Distribution,Porazdelitev
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Plačani znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 DocType: Customer,Default Taxes and Charges,Privzete Davki in dajatve
 DocType: Account,Receivable,Terjatev
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
 DocType: Sales Invoice,Supplier Reference,Dobavitelj Reference
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Če je omogočeno, bo BOM za podsklopov postavk šteti za pridobivanje surovin. V nasprotnem primeru bodo vsi podsklopi postavke se obravnavajo kot surovino."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Prodajalec Opis
 DocType: Employee Education,Qualification,Kvalifikacije
 DocType: Item Price,Item Price,Item Cena
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; Detergent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
 DocType: Warehouse,Warehouse Name,Skladišče Name
 DocType: Naming Series,Select Transaction,Izberite Transaction
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Podjetje manjka v skladiščih {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Zamenjaj Utility
 DocType: POS Profile,Terms and Conditions,Pravila in pogoji
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},"Do datuma mora biti v poslovnem letu. Ob predpostavki, da želite Datum = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Tukaj lahko ohranijo višino, težo, alergije, zdravstvene pomisleke itd"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,Za proizvodnjo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Prosimo, vnesite prodajno naročilo v zgornji tabeli"
 DocType: Project Task,View Task,Ogled Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vaš proračunsko leto se začne na
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vaš proračunsko leto se začne na
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vnesite Nakup Prejemki
 DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup dohodni strežnik za podporo email id. (npr support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Salary Slip,Salary Slip,Plača listek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Bruniranje
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Da Datum&quot; je potrebno
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Da Datum&quot; je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Ustvarjajo dobavnic, da paketi dostavi. Uporablja se za uradno številko paketa, vsebino paketa in njegovo težo."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Postavka
 DocType: Salary Slip,Payment Days,Plačilni dnevi
 DocType: BOM,Manage cost of operations,Upravljati stroške poslovanja
 DocType: Features Setup,Item Advanced,Postavka Napredno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Toplo valjanje
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ko kateri koli od pregledanih transakcij &quot;Objavil&quot;, e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim &quot;stik&quot; v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalni Nastavitve
 DocType: Employee Education,Employee Education,Izobraževanje delavec
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
 DocType: Salary Slip,Net Pay,Neto plača
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijska št {0} je že prejela
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potencialne možnosti za prodajo.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Bolniški dopust
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Neveljavna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Bolniški dopust
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Zaračunavanje Naslov Name
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Veleblagovnice
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Balance
-DocType: Workflow,Is Active,Je aktiven
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Veleblagovnice
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistem Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Spremeni Kratica
-DocType: Workflow State,Primary,Primarni
 DocType: Expense Claim Detail,Expense Date,Expense Datum
 DocType: Item,Max Discount (%),Max Popust (%)
-DocType: Communication,More Information,Več informacij
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Zadnja naročite Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Miniranje
 DocType: Company,Warn,Opozori
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Postavka vrednotenje posodobljeni
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
 DocType: BOM,Manufacturing User,Proizvodnja Uporabnik
 DocType: Purchase Order,Raw Materials Supplied,"Surovin, dobavljenih"
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajoči Print Format
-DocType: Communication,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Pričakuje Dostava datum ne more biti pred narocilo Datum
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
-DocType: Communication,Email,E-naslov
 DocType: Item Group,Item Classification,Postavka Razvrstitev
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vzdrževanje Obiščite Namen
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Obdobje
 ,General Ledger,Glavna knjiga
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Prosimo, izberite {0} najprej"
 DocType: Features Setup,To get Item Group in details table,Da bi dobili item Group v podrobnosti tabeli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Jedkanje
 DocType: Sales Invoice,Commission,Komisija
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3416,8 +3128,8 @@
 {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Privzeto Predloga </h4><p> Uporablja <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> in vsa področja naslov (vključno s po meri Fields če sploh) bo na voljo </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
-DocType: Salary Slip Deduction,Default Amount,Privzeto Znesek
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
+DocType: Salary Slip Deduction,Default Amount,Privzeti znesek
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Povzetek tega meseca je
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Zaloge Starejši Than` mora biti manjša od% d dni.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 DocType: Supplier,Address and Contacts,Naslov in kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
 DocType: Payment Tool,Get Outstanding Vouchers,Pridobite Neporavnane bonov
 DocType: Warranty Claim,Resolved By,Rešujejo s
 DocType: Appraisal,Start Date,Datum začetka
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vrednost
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Dodeli liste za obdobje.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Kliknite tukaj, da se preveri"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš sam dodeliti kot matično račun
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,"Povprečen čas, ki ga dobavitelj dostaviti"
 DocType: Time Log,Hours,Ur
 DocType: Project,Expected Start Date,Pričakovani datum začetka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Valjanje
-DocType: ToDo,Priority,Prednost
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko"
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox dostop dovoljen
-DocType: Dropbox Backup,Weekly,Tedenski
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Npr. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Prejeti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Prejeti
 DocType: Maintenance Visit,Fully Completed,V celoti končana
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} je bil uspešno dodan v seznam novice.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Strojna žarek elektronov
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Glavni Poročila
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger vnosi bilanc posodobljene
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Glavni Poročila
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Dodaj / Uredi Cene
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafikon stroškovnih mest
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Moja naročila
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Moja naročila
 DocType: Price List,Price List Name,Cenik Ime
 DocType: Time Log,For Manufacturing,Za Manufacturing
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Pri zaokrožanju
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Pri zaokrožanju
 DocType: BOM,Manufacturing,Predelovalne dejavnosti
 ,Ordered Items To Be Delivered,Naročeno Točke je treba dostaviti
 DocType: Account,Income,Prihodki
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industrija Type
-apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nekaj je šlo narobe!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
+apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Nekaj je šlo narobe!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Prodaja Račun {0} je že bila predložena
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja
 DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Litja
-DocType: Email Alert,Reference Date,Referenčni datum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vnesite veljavne mobilne nos
 DocType: Budget Detail,Budget Detail,Proračun Detail
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vnesite sporočilo pred pošiljanjem
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM posodobljena za postavko {0}
-DocType: Company History,Year,Leto
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale profila
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Čas Log {0} že zaračunavajo
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
 DocType: Item,Unit of Measure Conversion,Merska enota konverzijo
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Delavec se ne more spremeniti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
 DocType: Naming Series,Help HTML,Pomoč HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Dodatek za prekomerno {0} prečkal za postavko {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Vaše Dobavitelji
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Vaše Dobavitelji
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Drug Plača Struktura {0} je aktiven na zaposlenega {1}. Prosimo, da se njegov status &quot;neaktivno&quot; za nadaljevanje."
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Prejela od
 DocType: Features Setup,Exports,Izvoz
 DocType: Lead,Converted,Pretvorjena
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Od {0} za {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 DocType: Issue,Content Type,Vrsta vsebine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Računalnik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
 DocType: Payment Reconciliation,Get Unreconciled Entries,Pridobite Unreconciled Entries
 DocType: Cost Center,Budgets,Proračuni
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Posodobljeno
 DocType: Employee,Emergency Contact Details,Zasilna Kontaktni podatki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Kaj to naredi?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Kaj to naredi?
 DocType: Delivery Note,To Warehouse,Za skladišča
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Račun {0} je bila vpisan več kot enkrat za fiskalno leto {1}
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Posodobite dodatnih stroškov za izračun iztovori stroške predmetov
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Električno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Električno
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID uporabnika ni nastavljena za Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Iz garancijskega zahtevka
 DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lepanje
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dni od zadnjega reda
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dni od zadnjega naročila
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje serije
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
-DocType: User,Enabled,Omogočeno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Ali res želite, da predložijo vse plačilnega lista za mesec {0} in leto {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Uvozna Naročniki
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Present
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
 DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zapiranje račun {0} mora biti tipa odgovornosti / kapital
 DocType: Authorization Rule,Based On,Temelji na
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},"Obdobje Od in obdobje, da datumi obvezne za ponavljajoče {0}"
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektna dejavnost / naloga.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Ustvarjajo plače kombineže
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ni veljaven email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Odkup je treba preveriti, če se uporablja za izbrana kot {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100"
-DocType: ToDo,Low,Nizka
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Prosim, nastavite {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca
@@ -3595,7 +3290,7 @@
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Predložiti vse plačilne liste za zgoraj izbranih kriterijih
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Postavke sinhronizirano
 DocType: Sales Order,Partly Delivered,Delno Delivered
-DocType: Sales Invoice,Existing Customer,Obstoječih kupcev
+DocType: Sales Invoice,Existing Customer,Obstoječi kupec
 DocType: Email Digest,Receivables,Terjatve
 DocType: Customer,Additional information regarding the customer.,Dodatne informacije o kupcu.
 DocType: Quality Inspection Reading,Reading 5,Branje 5
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Je potrebno Ime akcija
 DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum
 DocType: Purchase Receipt Item,Rejected Serial No,Zavrnjeno Zaporedna številka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Globoko vlečenje
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Prikaži Balance
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Znesek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Kovičenje
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
 ,Sales Analytics,Prodajna Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Proizvodne Nastavitve
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Ime računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
 DocType: Selling Settings,Settings for Selling Module,Nastavitve za prodajo Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Storitev za stranke
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Potrdite svoj e-poštni
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Ponudba kandidat Job.
 DocType: Notification Control,Prompt for Email on Submission of,Vprašal za e-poštni ob predložitvi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Skupaj dodeljena listi so več kot dni v obdobju
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} je potrebno
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vacuum modeliranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum
-DocType: Contact Us Settings,City,Kraj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonic strojna obdelava
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Napaka: Ni veljaven id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Postavka {0} mora biti Sales postavka
 DocType: Naming Series,Update Series Number,Posodobitev Series Število
 DocType: Account,Equity,Kapital
 DocType: Sales Order,Printing Details,Tiskanje Podrobnosti
 DocType: Task,Closing Date,Zapiranje Datum
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inženir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inženir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
 DocType: Sales Partner,Partner Type,Partner Type
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Popust
 DocType: Purchase Invoice,Against Expense Account,Proti Expense račun
 DocType: Production Order,Production Order,Proizvodnja naročilo
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Je že bil predložen Namestitev Opomba {0}
 DocType: Quotation Item,Against Docname,Proti Docname
 DocType: SMS Center,All Employee (Active),Vsi zaposlenih (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Oglejte si zdaj
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Raw Material Stroški
 DocType: Item,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Krajši delovni čas
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serija Posodobljeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Vrsta poročila je obvezna
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Prva Uporabnik: You
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Prva Uporabnik: You
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Uspešno Pobotano
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Uspešno Pobotano
 DocType: Production Order,Planned End Date,Načrtovan End Date
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Če so predmeti shranjeni.
 DocType: Tax Rule,Validity,Veljavnost
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Obračunani znesek
 DocType: Attendance,Attendance,Udeležba
-DocType: Page,No,Ne
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
@@ -3689,55 +3376,46 @@
 ,Item Prices,Postavka Cene
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"V besedi bo viden, ko boste prihranili naročilnico."
 DocType: Period Closing Voucher,Period Closing Voucher,Obdobje Closing bon
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Cenik gospodar.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Cenik gospodar.
 DocType: Task,Review Date,Pregled Datum
 DocType: Purchase Invoice,Advance Payments,Predplačila
-DocType: DocPerm,Level,Stopnja
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Obvestilo o e-poštni naslovi&quot; niso določeni za ponavljajoče% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Rezkanje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ni dovoljenja za uporabo plačilnega orodje
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Obvestilo o e-poštni naslovi&quot; niso določeni za ponavljajoče% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
 DocType: Company,Round Off Account,Zaokrožijo račun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Grizljanjem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativni stroški
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Consulting
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consulting
 DocType: Customer Group,Parent Customer Group,Parent Customer Group
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Spremeni
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",na primer &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",na primer &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Odpovedni rok
 DocType: Bank Reconciliation Detail,Voucher ID,Bon ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,To je koren ozemlje in ga ni mogoče urejati.
 DocType: Packing Slip,Gross Weight UOM,Bruto Teža UOM
 DocType: Email Digest,Receivables / Payables,Terjatve / obveznosti
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodajni fakturi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Žigosanje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Prikaži ničelnimi vrednostmi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Količina postavke pridobljeno po proizvodnji / prepakiranja iz danih količin surovin
 DocType: Payment Reconciliation,Receivable / Payable Account,Terjatve / plačljivo račun
 DocType: Delivery Note Item,Against Sales Order Item,Proti Sales Order Postavka
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 DocType: Task,Actual End Date (via Time Logs),Dejanski končni datum (via Čas Dnevniki)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vnesite stroškovno mesto matično
 DocType: Delivery Note,Print Without Amount,Natisni Brez Znesek
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Davčna kategorija ne more biti &quot;Vrednotenje&quot; ali &quot;Vrednotenje in celokupni&quot;, saj so vsi predmeti brez zalogi"
-DocType: User,Last Name,Priimek
-DocType: Web Page,Left,Levo
-DocType: Event,All Day,Cel dan
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Davčna kategorija ne more biti &quot;Vrednotenje&quot; ali &quot;Vrednotenje in celokupni&quot;, saj so vsi predmeti brez zalogi"
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5)
-DocType: Contact Us Settings,State,Država
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bilanca
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov)
-DocType: User,Gender,Spol
 DocType: Journal Entry,Debit Note,Opomin
 DocType: Stock Entry,As per Stock UOM,Kot je na borzi UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ni potekel
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,"Ustvarite pravila za omejitev transakcije, ki temeljijo na vrednotah."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Če je označeno, Total no. delovnih dni bo vključeval praznike, in to se bo zmanjšala vrednost plač dan na"
 DocType: Purchase Invoice,Total Advance,Skupaj Advance
-DocType: Workflow State,User,Uporabnik
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Predelava na izplačane plače
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Nastavi kot Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Prejem plačilnih Note
 DocType: Customer,Credit Days Based On,Kreditne dni na podlagi
 DocType: Tax Rule,Tax Rule,Davčna Pravilo
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ohraniti ista stopnja V celotnem ciklu prodaje
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Načrtujte čas dnevnike zunaj Workstation delovnih ur.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} je že bil predložen
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
-DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Zaračunavanje Ocena temelji na vrsto dejavnosti (na uro)
-DocType: Company,Company Info,Podjetje Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
+DocType: Company,Company Info,Informacije o podjetju
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Družba E-pošta ID ni mogoče najti, zato pošta ni poslala"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 DocType: Production Planning Tool,Filter based on item,"Filter, ki temelji na točki"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Debetni račun
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
 DocType: Purchase Common,Purchase Common,Nakup Splošno
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Od Priložnost
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Slepimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Zaslužki zaposlencev
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Računi zbrana strankam.
-DocType: DocField,Default,Privzeto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id projekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} naročnikov dodane
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Določite proračun za to stroškovno mesto. Če želite nastaviti proračunske ukrepe, glejte &quot;Seznam Company&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Expense Claim,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izbira &quot;Yes&quot; bo dala edinstveno identiteto za vse subjekte te točke, ki jih lahko preberete v Serijska št mojstra."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
 DocType: Employee,Education,Izobraževanje
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
 DocType: Address,Office,Pisarna
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardne Poročila
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Če želite ustvariti davčnem obračunu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vnesite Expense račun
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Trenutni naslov
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno"
 DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Serija Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Serija Inventory
 DocType: Employee,Contract End Date,Naročilo End Date
 DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Prodajne Pull naročil (v pričakovanju, da poda), na podlagi zgornjih meril"
-DocType: DocShare,Document Type,Vrsta dokumenta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Od dobavitelja Kotacija
-DocType: Deduction Type,Deduction Type,Odbitek Type
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Od dobavitelja Kotacija
+DocType: Deduction Type,Deduction Type,Vrsta Odbitka
 DocType: Attendance,Half Day,Poldnevni
 DocType: Pricing Rule,Min Qty,Min Kol
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Za sledenje izdelkov v prodajnih in nabavnih dokumentov z šaržnih nos. &quot;Prednostna industrija: Kemikalije&quot;
 DocType: GL Entry,Transaction Date,Transakcijski Datum
 DocType: Production Plan Item,Planned Qty,Načrtovano Kol
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Skupna davčna
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Skupna davčna
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Za Količina (Izdelano Kol) obvezna
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
 DocType: Notification Control,Purchase Receipt Message,Potrdilo o nakupu Sporočilo
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Skupaj dodeljena listi so bolj kot obdobje
 DocType: Production Order,Actual Start Date,Dejanski datum začetka
 DocType: Sales Order,% of materials delivered against this Sales Order,% Materialov podal proti tej Sales Order
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Record gibanje postavka.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Seznam Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Dolbenje
-DocType: Email Account,Service,Storitev
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 ,Monthly Salary Register,Mesečni Plača Register
-apps/frappe/frappe/website/template.py +140,Next,Naslednja
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
 DocType: BOM Operation,BOM Operation,BOM Delovanje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Na prejšnje vrstice Znesek
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vnesite znesek plačila v atleast eno vrstico
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vnesite znesek plačila v atleast eno vrstico
 DocType: POS Profile,POS Profile,POS profila
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Vrstica {0}: Plačilo Znesek ne sme biti večja od neporavnanega zneska
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Skupaj Neplačana
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Skupaj Neplačana
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Čas Log ni plačljivih
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Kupec
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Kupec
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Neto plača ne more biti negativna
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Prosimo ročno vnesti s knjigovodskimi
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Prosimo ročno vnesti s knjigovodskimi
 DocType: SMS Settings,Static Parameters,Statični Parametri
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Postavka Tax
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-rolling
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana"
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
 DocType: Purchase Invoice,Next Date,Naslednja Datum
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vnesite davki in dajatve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Strojna
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
 DocType: Hub Settings,Seller Name,Prodajalec Name
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Zapakirajte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Morate Shranite obrazec, preden nadaljujete"
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Priložite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Priložite Logo
 DocType: Customer,Commission Rate,Komisija Rate
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacije blok dopustu oddelka.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Košarica je Prazna
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root ni mogoče urejati.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,"Lahko dodeli znesek, ki ni večja od unadusted zneska"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root ni mogoče urejati.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,"Lahko dodeli znesek, ki ni večja od unadusted zneska"
 DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah
 DocType: Sales Order,Customer's Purchase Order Date,Stranke Naročilo Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Osnovni kapital
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Izberite csv datoteko
-DocType: Dropbox Backup,Send Backups to Dropbox,Pošlji varnostne kopije na Dropbox
 DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Oblikovalec
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Item,Automatically create Material Request if quantity falls below this level,Samodejno ustvari Material Zahtevaj če količina pade pod to raven
 ,Item-wise Purchase Register,Element-pametno Nakup Registriraj se
 DocType: Batch,Expiry Date,Rok uporabnosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Če želite nastaviti raven naročanje, mora postavka biti Nakup Postavka ali Manufacturing Postavka"
 ,Supplier Addresses and Contacts,Dobavitelj Naslovi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Master projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Dobili predmetov iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Dobili predmetov iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
-apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Kosovnica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
-DocType: Dropbox Backup,Send Notifications To,Pošiljanje obvestil
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: Expense Claim Detail,Sanctioned Amount,Sankcionirano Znesek
 DocType: GL Entry,Is Opening,Je Odpiranje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Račun {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Račun {0} ne obstaja
 DocType: Account,Cash,Gotovina
 DocType: Employee,Short biography for website and other publications.,Kratka biografija za spletne strani in drugih publikacij.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Prosimo, da ustvarite plač strukturo za zaposlenega {0}"

diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index a7a9831..280aabb 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Mode paga
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Zgjidh Shpërndarja mujore, në qoftë se ju doni për të ndjekur në bazë të sezonalitetit."
 DocType: Employee,Divorced,I divorcuar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Warning: Same artikull është futur shumë herë.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Gjërat tashmë synced
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Consumer Products
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Ju lutem, përzgjidhni Partisë Lloji i parë"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Pjekja
 DocType: Item,Customer Items,Items të konsumatorëve
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
 DocType: Item,Publish Item to hub.erpnext.com,Publikojë pika për hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Lini Aprovuesit
 DocType: Sales Partner,Dealer,Tregtar
 DocType: Employee,Rented,Me qira
-DocType: About Us Settings,Website,Faqja kryesore
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Compaction plus sintering
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Nga Kërkesë materiale
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Nga Kërkesë materiale
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nuk ka rezultate shumë.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Legal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Tatimi aktual lloji nuk mund të përfshihen në normë Item në rresht {0}
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Kërkohet nga
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seria Përditësuar sukses
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Qepur
 DocType: Pricing Rule,Apply On,Apliko On
 DocType: Item Price,Multiple Item prices.,Çmimet shumta artikull.
 ,Purchase Order Items To Be Received,Items Rendit Blerje të pranohen
 DocType: SMS Center,All Supplier Contact,Të gjitha Furnizuesi Kontakt
 DocType: Quality Inspection Reading,Parameter,Parametër
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,New Pushimi Aplikimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,New Pushimi Aplikimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Draft Bank
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. Për të ruajtur të konsumatorëve kodin mençur pika dhe për t&#39;i bërë ato të kërkueshme në bazë të përdorimit të tyre të Kodit, ky opsion"
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Shfaq Variantet
-DocType: Sales Invoice Item,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Sasi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Kredi (obligimeve)
 DocType: Employee Education,Year of Passing,Viti i kalimit
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Në magazinë
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Bëni POS re Profilin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Kujdes shëndetësor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 DocType: Purchase Invoice,Monthly,Mujor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Vonesa në pagesa (ditë)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Email Adresa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Mbrojtje
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Email Adresa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Njoftime
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,Shtypjen 3D
 DocType: Employee,Holiday List,Festa Lista
 DocType: Time Log,Time Log,Koha Identifikohu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Llogaritar
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Llogaritar
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefoni Asnjë
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Log të aktiviteteve të kryera nga përdoruesit ndaj detyrave që mund të përdoret për ndjekjen kohë, faturimit."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: # {1}
 ,Sales Partners Commission,Shitjet Partnerët Komisioni
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Shkurtesa nuk mund të ketë më shumë se 5 karaktere
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Atribut Vlera {0} nuk mund të hiqet nga {1} si pika Variante \ ekzistojnë me këtë atribut.
-DocType: Print Settings,Classic,Klasik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Kjo është një llogari rrënjë dhe nuk mund të redaktohen.
 DocType: BOM,Operations,Operacionet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nuk mund të vendosni autorizim në bazë të zbritje për {0}
 DocType: Bin,Quantity Requested for Purchase,Sasia e kërkuar për Blerje
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bashkangjit CSV fotografi me dy kolona, njëra për emrin e vjetër dhe një për emrin e ri"
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bashkangjit CSV fotografi me dy kolona, njëra për emrin e vjetër dhe një për emrin e ri"
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Hapja për një punë.
 DocType: Item Attribute,Increment,Rritje
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Zgjidh Magazina ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamat
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamat
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Njëjta kompani është futur më shumë se një herë
 DocType: Employee,Married,I martuar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nuk lejohet për {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 DocType: Payment Reconciliation,Reconcile,Pajtojë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Ushqimore
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Bëni Banka Hyrja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Fondet pensionale
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Magazina është i detyrueshëm nëse lloji i llogarisë është Magazina
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontrolloni nëse përsëritura rendit, zgjidhni për të ndaluar përsëritura ose të vënë duhur End Date"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
 DocType: SMS Log,SMS Log,SMS Identifikohu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostoja e Artikujve dorëzohet
-DocType: Blog Post,Guest,Mysafir
 DocType: Quality Inspection,Get Specification Details,Get Specifikimi Details
 DocType: Lead,Interested,I interesuar
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill e materialit
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Hapje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Hapje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Nga {0} në {1}
 DocType: Item,Copy From Item Group,Kopje nga grupi Item
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} është e detyrueshme
 DocType: Stock Entry,Additional Costs,Kostot shtesë
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
 DocType: Lead,Product Enquiry,Produkt Enquiry
-DocType: Standard Reply,Owner,Pronar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ju lutemi shkruani kompani parë
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Ju lutemi zgjidhni kompania e parë
 DocType: Employee Education,Under Graduate,Nën diplomuar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Identifikohu Aktiviteti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Real Estate
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Deklarata e llogarisë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Farmaceutike
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutike
 DocType: Expense Claim Detail,Claim Amount,Shuma Claim
 DocType: Employee,Mr,Mr
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
 DocType: Naming Series,Prefix,Parashtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Harxhuese
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Harxhuese
 DocType: Upload Attendance,Import Log,Import Identifikohu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Dërgoj
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Paga vjetore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Paga vjetore
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Shpenzimet
 DocType: Newsletter,Email Sent?,Email dërguar?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Shfaq Koha Shkrime
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
 DocType: Delivery Note,Installation Status,Instalimi Statusi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
 DocType: Item,Supply Raw Materials for Purchase,Furnizimit të lëndëve të para për Blerje
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Item {0} duhet të jetë një Item Blerje
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Do të rifreskohet pas Sales Fatura është dorëzuar.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Straightening
 DocType: BOM Replace Tool,New BOM,Bom i ri
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch Koha Shkrime për faturim.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Hedh Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Newsletter tashmë është dërguar
 DocType: Lead,Request Type,Kërkesë Type
 DocType: Leave Application,Reason,Arsye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Transmetimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ekzekutim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Përdorues i parë do të bëhet i Sistemit Menaxher (ju mund ta ndryshoni këtë më vonë).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmetimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Ekzekutim
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Përdorues i parë do të bëhet i Sistemit Menaxher (ju mund ta ndryshoni këtë më vonë).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detajet e operacioneve të kryera.
 DocType: Serial No,Maintenance Status,Mirëmbajtja Statusi
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Artikuj dhe Çmimeve
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Artikuj dhe Çmimeve
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Nga Data duhet të jetë brenda vitit fiskal. Duke supozuar Nga Data = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Zgjidhni punonjës për të cilin ju jeni duke krijuar vlerësimit.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kosto Qendra {0} nuk i përket kompanisë {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista çmimi duhet të jetë i zbatueshëm për blerjen ose shitjen e
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Data Instalimi nuk mund të jetë para datës së dorëzimit për pika {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Zbritje në listën e çmimeve Norma (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Fillim
-DocType: User,First Name,Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Hedh plotë-myk
 DocType: Offer Letter,Select Terms and Conditions,Zgjidhni Termat dhe Kushtet
 DocType: Production Planning Tool,Sales Orders,Sales Urdhërat
 DocType: Purchase Taxes and Charges,Valuation,Vlerësim
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Llogarisë Bankare
 DocType: Leave Type,Allow Negative Balance,Lejo bilancit negativ
 DocType: Selling Settings,Default Territory,Gabim Territorit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizion
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizion
 DocType: Production Order Operation,Updated via 'Time Log',Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Llogaria {0} nuk i përket kompanisë {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: Sales Invoice,Is Opening Entry,Është Hapja Hyrja
 DocType: Customer Group,Mention if non-standard receivable account applicable,Përmend në qoftë se jo-standarde llogari të arkëtueshme të zbatueshme
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Për Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Marrë më
 DocType: Sales Partner,Reseller,Reseller
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Ju lutemi shkruani Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
 DocType: Lead,Address & Contact,Adresa &amp; Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
 DocType: Newsletter List,Total Subscribers,Totali i regjistruar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontakt Emri
+,Contact Name,Kontakt Emri
 DocType: Production Plan Item,SO Pending Qty,SO pritje Qty
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Krijon shqip pagave për kriteret e përmendura më sipër.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Kërkesë për blerje.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Strehim të dyfishtë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lë në vit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lë në vit
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Series
 DocType: Time Log,Will be updated when batched.,Do të përditësohet kur batched.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni &#39;A Advance&#39; kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
-DocType: Bulk Email,Message,Mesazh
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Qasja kryesore
 DocType: Payment Tool,Reference No,Referenca Asnjë
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Vjetor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
 DocType: Material Request Item,Min Order Qty,Rendit min Qty
 DocType: Lead,Do Not Contact,Mos Kontaktoni
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID unike për ndjekjen e të gjitha faturave të përsëritura. Ajo është krijuar për të paraqitur.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Item,Publish in Hub,Publikojë në Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
 DocType: Item,Purchase Details,Detajet Blerje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Wire brushing
 DocType: Employee,Relation,Lidhje
 DocType: Shipping Rule,Worldwide Shipping,Shipping në mbarë botën
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Urdhra të konfirmuara nga konsumatorët.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 DocType: Maintenance Schedule,Generate Schedule,Generate Orari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Shpenzim Shef
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Ju lutem, përzgjidhni Ngarkesa Lloji i parë"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Fundit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 karaktere
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Zgjidh Gjuhën
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 karaktere
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Aprovuesi i parë Leave në listë do të jetë vendosur si default Leave aprovuesi
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Pamundëson krijimin e kohës shkrimet kundër urdhërat e prodhimit. Operacionet nuk do të gjurmuar kundër Rendit Production
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Variant i
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Item {0} duhet të jetë i Shërbimit Item
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
-DocType: DocType,Administrator,Administrator
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Shpimit Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,New Stock UOM
 DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria
 DocType: Employee,External Work History,Historia e jashtme
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Qarkorja Referenca Gabim
-DocType: Communication,Closed,Mbyllur
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Me fjalë (eksport) do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Profile Job
 DocType: Newsletter,Newsletter,Newsletter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,HYDROFORMING
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Puthje
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
 DocType: Journal Entry,Multi Currency,Multi Valuta
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Item është përditësuar
-DocType: Async Task,System Manager,Sistemi Menaxher
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
 DocType: Sales Invoice Item,Delivery Note,Ofrimit Shënim
-DocType: Dropbox Backup,Allow Dropbox Access,Lejo Dropbox Qasja
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ngritja Tatimet
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Pagesa Hyrja është ndryshuar, pasi që ju nxorrën atë. Ju lutemi të tërheqë atë përsëri."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Workstation,Rent Cost,Qira Kosto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Kompania Email
 DocType: GL Entry,Debit Amount in Account Currency,Shuma Debi në llogarinë në valutë
 DocType: Shipping Rule,Valid for Countries,I vlefshëm për vendet
-DocType: Workflow State,Refresh,Freskoj
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Të gjitha fushat e importit që kanë të bëjnë si monedhë, norma e konvertimit, gjithsej importit, importi i madh etj përgjithshëm janë në dispozicion në pranimin Blerje, Furnizuesi Kuotim, Blerje Faturës, Rendit Blerje etj"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Rendit Gjithsej konsideruar
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Ju lutemi shkruani &#39;Përsëriteni në Ditën e Muajit &quot;në terren vlerë
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Ju lutemi shkruani &#39;Përsëriteni në Ditën e Muajit &quot;në terren vlerë
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Në dispozicion në bom, ofrimit Shënim, Blerje Faturës, Rendit Prodhimi, Rendit Blerje, pranimin Blerje, Sales Faturës, Sales Rendit, Stock Hyrja, pasqyrë e mungesave"
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Zgjidh Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Zgjidh Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} menaxhohet grumbull-i mençur, nuk mund të pajtohen duke përdorur \ Stock pajtimit, në vend që të përdorin Stock Hyrja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Pranimi blerje duhet të dorëzohet
-DocType: Stock UOM Replace Utility,Current Stock UOM,Aktuale Stock UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Adresa juaj e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Ju lutem shikoni shtojcën
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Jet uji prerja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Setup Tashmë komplet !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Setup Tashmë komplet !!
 ,Finished Goods,Mallrat përfunduar
 DocType: Delivery Note,Instructions,Udhëzime
 DocType: Quality Inspection,Inspected By,Inspektohen nga
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Ju lutem mos krijojnë llogaritë për klientët dhe furnizuesit. Ata janë krijuar direkt nga zotërit Customer / Furnizuesi.
 DocType: Currency Exchange,Currency Exchange,Currency Exchange
 DocType: Purchase Invoice Item,Item Name,Item Emri
+DocType: Authorization Rule,Approving User  (above authorized value),Miratimi përdoruesin (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Bilanci krediti
 DocType: Employee,Widowed,Ve
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Gjërat që do të kërkohet të cilat janë &quot;jashtë të aksioneve&quot;, duke marrë parasysh të gjitha depot e bazuar në Qty projektuar dhe rendit Qty minimale"
@@ -378,22 +346,21 @@
 ,Purchase Register,Blerje Regjistrohu
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
 DocType: Workstation,Consumable Cost,Kosto harxhuese
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Mjekësor
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Arsyeja për humbjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 DocType: Employee,Single,I vetëm
 DocType: Issue,Attachment,Attachment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Buxheti nuk mund të vendosen për Qendrën Kosto Group
 DocType: Account,Cost of Goods Sold,Kostoja e mallrave të shitura
 DocType: Purchase Invoice,Yearly,Vjetor
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
 DocType: Journal Entry Account,Sales Order,Sales Order
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Shitja Rate
 DocType: Purchase Order,Start date of current order's period,Data e fillimit të periudhës së urdhrit aktual
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Sasi nuk mund të jetë një pjesë në rradhë {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Sasi nuk mund të jetë një pjesë në rradhë {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ju lutem shkruani emrin e kompanisë e parë
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Është grup
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikisht Set Serial Nos bazuar në FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Prerë
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Për Rasti Nr &#39; nuk mund të jetë më pak se &quot;nga rasti nr &#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Non Profit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Nuk ka filluar
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Vjetër Parent
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
+DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Mjeshtër pushime.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell derdhur
 DocType: Material Request Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
 DocType: BOM,Costing,Kushton
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nëse kontrolluar, shuma e taksave do të konsiderohen si të përfshirë tashmë në Printo Tarifa / Shuma Shtyp"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gjithsej Qty
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Në rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
 DocType: Features Setup,Imports,Importet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Lidhjes ngjitëse
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Aktivitetet në pritje për sot
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Pjesëmarrja rekord.
 DocType: Bank Reconciliation,Journal Entries,Journal Entries
 DocType: Sales Order Item,Used for Production Plan,Përdoret për Planin e prodhimit
-DocType: System Settings,Loading...,Duke u ngarkuar ...
-DocType: DocField,Password,Fjalëkalim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Modelimit te perziera depozitimi
 DocType: Manufacturing Settings,Time Between Operations (in mins),Koha Midis Operacioneve (në minuta)
 DocType: Customer,Buyer of Goods and Services.,Blerësi i mallrave dhe shërbimeve.
 DocType: Journal Entry,Accounts Payable,Llogaritë e pagueshme
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Shto abonentë
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Nuk ekziston
 DocType: Pricing Rule,Valid Upto,Valid Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Të ardhurat direkte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Zyrtar Administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Zyrtar Administrativ
 DocType: Payment Tool,Received Or Paid,Marrë ose e paguar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry,Difference Account,Llogaria Diferenca
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kozmetikë
-DocType: DocField,Type,Lloj
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
-DocType: Communication,Subject,Subjekt
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 ,Serial No Warranty Expiry,Serial No Garanci Expiry
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Artikull
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Menaxhimi Nënkontraktimi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,New UOM nuk duhet të jetë e tipit Numri Whole
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Menaxhimi Nënkontraktimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilje dhe instalime
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Kërkesa materiale
 DocType: Company,Delete Company Transactions,Fshij Transaksionet Company
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Item {0} nuk është Blerje Item
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} është një adresë e pavlefshme email në &quot;Njoftimi \ Email Address &#39;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Gjithsej Faturimi Kjo Viti:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Gjithsej Faturimi Kjo Viti:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Nuk mund të fshini serial {0}, ashtu siç është përdorur në transaksionet e aksioneve"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Mbyllja (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Mbyllja (Cr)
 DocType: Serial No,Warranty Period (Days),Garanci Periudha (ditë)
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 ,Pending Qty,Në pritje Qty
 DocType: Job Applicant,Thread HTML,Temë HTML
 DocType: Company,Ignore,Injoroj
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
 DocType: Pricing Rule,Valid From,Valid Nga
 DocType: Sales Invoice,Total Commission,Komisioni i përgjithshëm
 DocType: Pricing Rule,Sales Partner,Sales Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Shpërndarja mujore ** ju ndihmon të shpërndajë buxhetin tuaj në të gjithë muajt e nëse ju keni sezonalitetin në biznesin tuaj. Për të shpërndarë një buxhet të përdorur këtë shpërndarje, vendosur kjo shpërndarje ** ** mujore në ** Qendra Kosto **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Na vjen keq, Serial Nos nuk mund të bashkohen"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
-DocType: About Us Settings,Website Manager,Website Menaxher
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Fiskale Viti Data e Fillimit nuk duhet të jetë më i madh se vitin fiskal End Date
 DocType: Warranty Claim,Resolution,Zgjidhje
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Dorëzuar: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Faturimi dhe dorëzimit Statusi
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,I mëparshëm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Shitjet Kthehu
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Zgjidh urdhëron shitjet nga të cilat ju doni të krijoni urdhërat e prodhimit.
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Komponentët e pagave.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Baza e të dhënave të konsumatorëve potencial.
+DocType: Authorization Rule,Customer or Item,Customer ose Item
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Baza e të dhënave të konsumatorëve.
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Akrobaci
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse ju keni bërë tashmë një transaksioni (et) me një tjetër UOM. Ju do të duhet për të krijuar një artikull të ri për të përdorur një Default ndryshme UOM.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
-DocType: Event,Wednesday,E mërkurë
 DocType: Sales Invoice,Customer's Vendor,Vendor konsumatorit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Prodhimi Rendit është i detyrueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Propozimi Shkrimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Propozimi Shkrimi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Një person tjetër Sales {0} ekziston me të njëjtin id punonjës
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negative Stock Gabim ({6}) për Item {0} në Magazina {1} në {2} {3} në {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Viti i kompanisë
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Default kushton Vlerësoni
 DocType: Maintenance Schedule,Maintenance Schedule,Mirëmbajtja Orari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pastaj Çmimeve Rregullat janë filtruar në bazë të konsumatorëve, Grupi Customer, Territorit, Furnizuesin, Furnizuesi Lloji, fushatën, Sales Partner etj"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Ju lutem instaloni Dropbox python modulin
 DocType: Employee,Passport Number,Pasaporta Numri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Menaxher
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Nga marrja Blerje
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Menaxher
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Nga marrja Blerje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
 DocType: SMS Settings,Receiver Parameter,Marresit Parametri
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Bazuar Në &#39;dhe&#39; Grupit nga &#39;nuk mund të jetë e njëjtë
 DocType: Sales Person,Sales Person Targets,Synimet Sales Person
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Në
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Ju lutemi shkruani adresën e-mail
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Tub në fund formimin
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convert të Grupit
 DocType: Activity Cost,Activity Type,Aktiviteti Type
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Ditët fikse
 DocType: Sales Invoice,Packing List,Lista paketim
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Blerje Urdhërat jepet Furnizuesit.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Botime
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Botime
 DocType: Activity Cost,Projects User,Projektet i përdoruesit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Konsumuar
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} nuk u gjet në detaje Fatura tryezë
 DocType: Company,Round Off Cost Center,Rrumbullakët Off Qendra Kosto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Vizitoni {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Material Request,Material Transfer,Transferimi materiale
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Hapja (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Timestamp postimi duhet të jetë pas {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Cilësimet
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taksat zbarkoi Kosto dhe Tarifat
 DocType: Production Order Operation,Actual Start Time,Aktuale Koha e fillimit
 DocType: BOM Operation,Operation Time,Operacioni Koha
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Më shumë
 DocType: Pricing Rule,Sales Manager,Sales Manager
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Riemërtoj
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Lakimi
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Lejojë përdoruesin
 DocType: Journal Entry,Bill No,Bill Asnjë
 DocType: Purchase Invoice,Quarterly,Tremujor
 DocType: Selling Settings,Delivery Note Required,Ofrimit Shënim kërkuar
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ju lutem shkruani të dhënat pika
 DocType: Purchase Receipt,Other Details,Detaje të tjera
 DocType: Account,Accounts,Llogaritë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Krasitje Drejt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Për të gjetur pika në shitje dhe dokumentet e blerjes bazuar në nr e tyre serik. Kjo është gjithashtu mund të përdoret për të gjetur detajet garanci e produktit.
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Magazina refuzuar është e detyrueshme kundër artikull regected
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 DocType: Employee,Provide email id registered in company,Sigurojë id mail regjistruar në kompaninë
 DocType: Hub Settings,Seller City,Shitës qytetit
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Item ka variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} nuk u gjet
 DocType: Bin,Stock Value,Stock Vlera
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Type
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Sasia dhe Magazina
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Kundër Bonon Lloji duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Hyrja"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Në pamundësi për të gjetur kursin e këmbimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Hapësirës ajrore
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,I mirëpritur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hapësirës ajrore
 DocType: Journal Entry,Credit Card Entry,Credit Card Hyrja
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Detyra Subjekt
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Mallrat e marra nga furnizuesit.
-DocType: Communication,Open,Hapur
 DocType: Lead,Campaign Name,Emri fushatë
 ,Reserved,I rezervuar
 DocType: Purchase Order,Supply Raw Materials,Furnizimit të lëndëve të para
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} nuk është një gjendje Item
 DocType: Mode of Payment Account,Default Account,Gabim Llogaria
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
-DocType: Contact Us Settings,Address Title,Adresa Titulli
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: Production Order Operation,Planned End Time,Planifikuar Fundi Koha
 ,Sales Person Target Variance Item Group-Wise,Sales Person i synuar Varianca Item Grupi i urti
-DocType: Dropbox Backup,Daily,I përditshëm
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Employee,Cell Number,Numri Cell
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Deklarata mujore e pagave.
 DocType: Item Group,Website Specifications,Specifikimet Website
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Llogaria e Re
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Hyrjet e kontabilitetit mund të bëhet kundër nyjet fletë. Entries kundër grupeve nuk janë të lejuara.
-DocType: ToDo,High,I lartë
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Opportunity,Maintenance,Mirëmbajtje
-DocType: User,Male,Mashkull
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Shitjet fushata.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Shpenzimet e kërkesës Lloji
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Default settings për Shportë
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Gazeta {0} Hyrja është e lidhur kundër Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Bioteknologji
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Gazeta {0} Hyrja është e lidhur kundër Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Process Payroll,Send Email,Dërgo Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Nuk ka leje
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock &quot;nuk mund të kontrollohet, sepse sendet nuk janë dorëzuar nëpërmjet {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Faturat e mia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Faturat e mia
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Asnjë punonjës gjetur
 DocType: Purchase Order,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Për të mundësuar &quot;Pika e Shitjes&quot; karakteristika
 DocType: Bin,Moving Average Rate,Moving norma mesatare
 DocType: Production Planning Tool,Select Items,Zgjidhni Items
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
-DocType: Comment,Reference Name,Referenca Emri
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: Sales Invoice Item,Target Warehouse,Target Magazina
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Pritet Data e dorëzimit nuk mund të jetë e para Sales Rendit Data
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Fitimi neto / Humbja
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
 DocType: Production Order,Item To Manufacture,Item Për Prodhimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Hedh Përhershëm myk
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} statusi është {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Blerje Rendit për Pagesa
 DocType: Sales Order Item,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
 DocType: Newsletter,Newsletter Manager,Newsletter Menaxher
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Hapja&quot;
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
 DocType: Expense Claim,Expenses,Shpenzim
 DocType: Item Variant Attribute,Item Variant Attribute,Item Varianti Atributi
 ,Purchase Receipt Trends,Trendet Receipt Blerje
 DocType: Appraisal,Select template from which you want to get the Goals,Zgjidh shabllonin nga të cilat ju doni të merrni Objektivave
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Hulumtim dhe Zhvillim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Hulumtim dhe Zhvillim
 ,Amount to Bill,Shuma për Bill
 DocType: Company,Registration Details,Detajet e regjistrimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Staking
 DocType: Item,Re-Order Qty,Re-Rendit Qty
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planifikuar për të dërguar për {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Point-of-Sale
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Nuk mund të bart {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
 DocType: Account,Balance must be,Bilanci duhet të jetë
 DocType: Hub Settings,Publish Pricing,Publikimi i Çmimeve
 DocType: Notification Control,Expense Claim Rejected Message,Shpenzim Kërkesa Refuzuar mesazh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Ngulje
 ,Available Qty,Qty në dispozicion
 DocType: Purchase Taxes and Charges,On Previous Row Total,Në Previous Row Total
 DocType: Salary Slip,Working Days,Ditët e punës
 DocType: Serial No,Incoming Rate,Hyrëse Rate
 DocType: Packing Slip,Gross Weight,Peshë Bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Përfshijnë pushimet në total nr. i ditëve të punës
 DocType: Job Applicant,Hold,Mbaj
 DocType: Employee,Date of Joining,Data e Bashkimi
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Shiko Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Prish gërryes
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} duhet të jetë aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuloje Vizitat Materiale {0} para anulimit të kësaj vizite Mirëmbajtja
 DocType: Salary Slip,Leave Encashment Amount,Lini arkëtim Shuma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerkohet Qty
 DocType: Bank Reconciliation,Total Amount,Shuma totale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Botime Internet
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Botime Internet
 DocType: Production Planning Tool,Production Orders,Urdhërat e prodhimit
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Vlera e bilancit
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikimi i të sync artikuj
-DocType: GL Entry,Account Currency,Llogaria Valuta
+DocType: Bank Reconciliation,Account Currency,Llogaria Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Ju lutemi të përmendim rrumbullohem Llogari në Kompaninë
 DocType: Purchase Receipt,Range,Varg
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Features Setup,Item Barcode,Item Barkodi
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 DocType: Address,Shop,Dyqan
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Parazgjedhur llogari Banka / Cash do të rifreskohet automatikisht në POS Faturës kur kjo mënyrë është zgjedhur.
 DocType: Employee,Permanent Address Is,Adresa e përhershme është
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacioni përfundoi për mënyrën se si shumë mallra të gatshme?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Markë
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Markë
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Kompensimi për tejkalimin {0} kaloi për Item {1}.
 DocType: Employee,Exit Interview Details,Detajet Dil Intervista
 DocType: Item,Is Purchase Item,Është Blerje Item
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Rendit Blerje Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Të ardhurat indirekte
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Shuma e pagesës = shumën e papaguar
-DocType: Contact Us Settings,Address Line 1,Adresa Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Grindje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Emri i kompanisë
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Grindje
+,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Përzgjidh Item për transferimin
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Shiko një listë të të gjitha ndihmë videot
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Zgjidh llogaria kreu i bankës ku kontrolli ishte depozituar.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Lejo përdoruesit të redaktoni listën e çmimeve Vlerësoni në transaksionet
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Pagesa kundër Sales / Rendit Blerje gjithmonë duhet të shënohet si më parë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Të gjitha sendet janë tashmë të transferuar për këtë Rendit Production.
 DocType: Process Payroll,Select Payroll Year and Month,Zgjidh pagave vit dhe Muaji
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Shko në grupin e duhur (zakonisht Aplikimi i Fondeve&gt; asetet aktuale&gt; llogaritë bankare dhe për të krijuar një llogari të re (duke klikuar mbi Shto fëmijë) të tipit &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
 DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonjës Ditëlindja Përkujtesat
-DocType: Comment,Unsubscribed,Unsubscribed
 DocType: Opportunity,Walk In,Ecni Në
 DocType: Item,Inspection Criteria,Kriteret e Inspektimit
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Pema e Qendrave finanial kostos.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferuar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,E bardhë
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,E bardhë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bashkangjit foton tuaj
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Bëj
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bashkangjit foton tuaj
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Bëj
 DocType: Journal Entry,Total Amount in Words,Shuma totale në fjalë
-DocType: Workflow State,Stop,Stop
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Pati një gabim. Një arsye e mundshme mund të jetë që ju nuk e keni ruajtur formën. Ju lutemi te kontaktoni support@erpnext.com nëse problemi vazhdon.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Shporta ime
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Rendit Lloji duhet të jetë një nga {0}
 DocType: Lead,Next Contact Date,Tjetër Kontakt Data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Hapja Qty
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Qty për {0}
 DocType: Leave Application,Leave Application,Lini Aplikimi
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Lini Alokimi Tool
 DocType: Leave Block List,Leave Block List Dates,Dërgo Block Lista Datat
 DocType: Company,If Monthly Budget Exceeded (for expense account),Nëse tejkaluar buxhetin mujor (për llogari shpenzim)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Zvogëlimin
 DocType: Workstation,Net Hour Rate,Shkalla neto Ore
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kosto zbarkoi Blerje Receipt
 DocType: Company,Default Terms,Kushtet Default
 DocType: Packing Slip Item,Packing Slip Item,Paketimi Shqip Item
 DocType: POS Profile,Cash/Bank Account,Cash / Llogarisë Bankare
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivimi
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Zbritje
 DocType: Features Setup,Purchase Discounts,Blerje Zbritje
 DocType: Workstation,Wages,Pagat
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update &#39;Status&#39; dhe për të shpëtuar
 DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
 DocType: Issue,Issue,Çështje
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Llogaria nuk përputhet me Kompaninë
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazina
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
 DocType: BOM Operation,Operation,Operacion
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Shteti Shipping
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item duhet të shtohen duke përdorur &#39;të marrë sendet nga blerjen Pranimet&#39; button
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Shitjet Shpenzimet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Blerja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Blerja Standard
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Marrja e aksioneve Entries
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Marrja e aksioneve Entries
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
 DocType: Item,Default Supplier,Gabim Furnizuesi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Mbi prodhimin Allowance Përqindja
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,updated nëpërmjet Koha Shkrime
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Mesatare Moshë
 DocType: Opportunity,Your sales person who will contact the customer in future,Shitjes person i juaj i cili do të kontaktojë e konsumatorit në të ardhmen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
 DocType: Company,Default Currency,Gabim Valuta
 DocType: Contact,Enter designation of this Contact,Shkruani përcaktimin e këtij Kontakt
-DocType: Contact Us Settings,Address,Adresë
 DocType: Expense Claim,From Employee,Nga punonjësi
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
 DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja
 DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data
 DocType: Appraisal Template Goal,Key Performance Area,Key Zona Performance
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,dhe vit:
 DocType: Email Digest,Annual Expense,Shpenzimet vjetore
 DocType: SMS Center,Total Characters,Totali Figurë
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detail C-Forma Faturë
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagesa Pajtimi Faturë
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Kontributi%
 DocType: Item,website page link,faqe e internetit lidhje
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Le të përgatisë sistemin e përdorimit të parë.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Numrat e regjistrimit kompani për referencë tuaj. Numrat e taksave etj
 DocType: Sales Partner,Distributor,Shpërndarës
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shporta Transporti Rregulla
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Prodhimi Rendit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Zgjidh Koha Shkrime dhe Submit për të krijuar një Sales re Faturë.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Asgjë për të kërkuar
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Aktual Data e Fillimit&#39; nuk mund të jetë më i madh se &#39;Lajme End Date&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Drejtuesit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Drejtuesit
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Llojet e aktiviteteve për kohën Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Hedh e investimeve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Ose debiti ose krediti shuma është e nevojshme për {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blu
 DocType: Purchase Invoice,Is Return,Është Kthimi
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Nyjet e mëtejshme mund të krijohet vetëm në nyjet e tipit &#39;Grupit&#39;
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profilin {0} krijuar tashmë për përdorues: {1} dhe kompani {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Konvertimi Faktori
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Objekti prodhimit laminuara
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Bazës së të dhënave Furnizuesi.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch formimin
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Personi i shitjes juaj do të merrni një kujtesë në këtë datë të kontaktoni klientin
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Tatimore dhe zbritjet e tjera të pagave.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Hyrje dhe GL Entries janë reposted për Pranimeve zgjedhura Blerje
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pika 1
 DocType: Holiday,Holiday,Festë
-DocType: Event,Saturday,E shtunë
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lini bosh nëse konsiderohet për të gjitha degët
 ,Daily Time Log Summary,Daily Koha Identifikohu Përmbledhje
-DocType: DocField,Label,Etiketë
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detajet e pagesës Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
 DocType: Lead,Call,Thirrje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ngritja Punonjësit
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Hulumtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Hulumtim
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ju lutem specifikoni të paktën një atribut në tabelë Atributet
 DocType: Contact,User ID,User ID
-DocType: Communication,Sent,Dërguar
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Shiko Ledger
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
-DocType: Communication,Delivery Status,Ofrimit Statusi
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 DocType: Production Order,Manufacture against Sales Order,Prodhimi kundër Sales Rendit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Pjesa tjetër e botës
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Përshkrimi i artikullit
 DocType: Payment Tool,Payment Mode,Mode Pagesa
 DocType: Purchase Invoice,Is Recurring,Është i vazhdueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Lazer metalike drejtpërdrejtë sintering
 DocType: Purchase Order,Supplied Items,Artikujve të furnizuara
 DocType: Production Order,Qty To Manufacture,Qty Për Prodhimi
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ruajtja njëjtin ritëm gjatë gjithë ciklit të blerjes
 DocType: Opportunity Item,Opportunity Item,Mundësi Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Hapja e përkohshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
 DocType: Address,Address Type,Adresa Type
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Get Faturat e papaguara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,I vogël
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,I vogël
 DocType: Employee,Employee Number,Numri punonjës
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Kreu i llogarisë {0} krijuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,E gjelbër
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,E gjelbër
 DocType: Item,Auto re-order,Auto ri-qëllim
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Gjithsej Arritur
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gjithsej Arritur
 DocType: Employee,Place of Issue,Vendi i lëshimit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontratë
-DocType: Report,Disabled,I paaftë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontratë
+DocType: Email Digest,Add Quote,Shto Citim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Bujqësi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Produktet ose shërbimet tuaja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Produktet ose shërbimet tuaja
 DocType: Mode of Payment,Mode of Payment,Mënyra e pagesës
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Emri i kërkohet
 DocType: Purchase Invoice,Recurring Type,Përsëritur Type
 DocType: Address,City/Town,Qyteti / Qyteti
 DocType: Email Digest,Annual Income,Të ardhurat vjetore
 DocType: Serial No,Serial No Details,Serial No Detajet
 DocType: Purchase Invoice Item,Item Tax Rate,Item Tax Rate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Item {0} duhet të jetë një nënkontraktohet Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Pajisje kapitale
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Pritet Data e dorëzimit është më e vogël se sa ishte planifikuar Data e fillimit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Për Furnizuesin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Vendosja Tipi Llogarisë ndihmon në zgjedhjen e kësaj llogarie në transaksionet.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Kompania Valuta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Largohet Total
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Nuk mund të jetë vetëm një Transporti Rregulla Kushti me 0 ose vlerë bosh për &quot;vlerës&quot;
 DocType: Authorization Rule,Transaction,Transaksion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Shënim: Ky Qendra Kosto është një grup. Nuk mund të bëjë shënimet e kontabilitetit kundër grupeve.
-apps/frappe/frappe/config/desk.py +7,Tools,Mjete
 DocType: Item,Website Item Groups,Faqja kryesore Item Grupet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Numri i rendit prodhimit është e detyrueshme për hyrje të aksioneve qëllim prodhimin
 DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Journal Hyrja
 DocType: Workstation,Workstation Name,Workstation Emri
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Komente
 DocType: Salary Slip,Bank Account No.,Llogarisë Bankare Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ky është numri i transaksionit të fundit të krijuar me këtë prefiks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Rate Vlerësimi nevojshme për Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Rate Vlerësimi nevojshme për Item {0}
 DocType: Quality Inspection Reading,Reading 8,Leximi 8
 DocType: Sales Partner,Agent,Agjent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Gjithsej {0} për të gjitha sendet është zero, mund të ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar Në &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taksat dhe Tarifat Llogaritja
 DocType: BOM Operation,Workstation,Workstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Menaxher HR
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ju lutem zgjidhni një Company
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilegj Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Nuk ka të dhëna
 DocType: Appraisal Template Goal,Appraisal Template Goal,Vlerësimi Template Qëllimi
 DocType: Salary Slip,Earning,Fituar
 DocType: Payment Tool,Party Account Currency,Llogaria parti Valuta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kushtet e mbivendosjes gjenden në mes:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Vlera Totale Rendit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Ushqim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ju mund të bëni një regjistër kohë vetëm kundër një urdhër paraqitur prodhimit
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Buletinet të kontakteve, të çon."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Monedhën e llogarisë Mbyllja duhet të jetë {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Shuma e pikëve për të gjitha qëllimet duhet të jetë 100. Kjo është {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operacionet nuk mund të lihet bosh.
 ,Delivered Items To Be Billed,Items dorëzohet për t&#39;u faturuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
-DocType: DocField,Description,Përshkrim
 DocType: Authorization Rule,Average Discount,Discount mesatar
-DocType: Letter Head,Is Default,Është e albumit
 DocType: Address,Utilities,Shërbime komunale
 DocType: Purchase Invoice Item,Accounting,Llogaritje
 DocType: Features Setup,Features Setup,Features Setup
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Shiko Oferta Letër
-DocType: Communication,Communication,Komunikim
 DocType: Item,Is Service Item,Është Shërbimi i artikullit
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Ju lutem, përzgjidhni Viti Fiskal"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Nga {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Ruajtja Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Nga datetime
 DocType: Email Digest,For Company,Për Kompaninë
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Lista e Llogarive
 DocType: Material Request,Terms and Conditions Content,Termat dhe Kushtet Përmbajtja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Varet në pushim pa pagesë
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Për të bërë lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Nxënës
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Nxënës
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Detaje taksave tryezë sforcuar nga mjeshtri pika si një varg dhe të depozituara në këtë fushë. Përdoret për taksat dhe tatimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Asnjë Struktura Paga aktiv gjetur për punonjës {0} dhe muajit
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Rregulla taksë për transaksionet.
 DocType: Rename Tool,Type of document to rename.,Lloji i dokumentit për të riemërtoni.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ne blerë këtë artikull
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Ne blerë këtë artikull
 DocType: Address,Billing,Faturimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,Jo dërguar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Eksploziv formimin
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totali Taksat dhe Tarifat (Kompania Valuta)
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planifikuar për të dërguar për {0} marrësit
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Kuvendet Nën
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Kuvendet Nën
 DocType: Shipping Rule Condition,To Value,Të vlerës
 DocType: Supplier,Stock Manager,Stock Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Depo Burimi është i detyrueshëm për rresht {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e JV {2}
 DocType: Item,Inventory,Inventar
 DocType: Features Setup,"To enable ""Point of Sale"" view",Për të mundësuar &quot;Pika e Shitjes&quot; pikëpamje
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Pagesa nuk mund të bëhet për karrocë bosh
 DocType: Item,Sales Details,Shitjet Detajet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Pinning
 DocType: Opportunity,With Items,Me Items
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Në Qty
 DocType: Notification Control,Expense Claim Rejected,Shpenzim Kërkesa Refuzuar
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Data në të cilën fatura e ardhshme do të gjenerohet. Ajo është krijuar për të paraqitur.
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Qeveri
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Variantet pika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Qeveri
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Variantet pika
 DocType: Company,Services,Sherbime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
 DocType: Sales Invoice,Source,Burim
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Viti Financiar Data e Fillimit
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Viti Financiar Data e Fillimit
 DocType: Employee External Work History,Total Experience,Përvoja Total
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Material Request Item,Sales Order No,Rendit Sales Asnjë
 DocType: Item Group,Item Group Name,Item Emri i Grupit
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Marrë
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Materialet Transferimi për prodhimin e
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Ekzekutiv Kërko
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Shkalla Blerje për artikull: {0} nuk u gjet, e cila është e nevojshme për të librit hyrje të Kontabilitetit (shpenzimeve). Ju lutemi të përmendim së çmimit të artikullit kundër një listë të çmimeve blerjen."
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Shtesë Shuma Discount (Valuta Company)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Gabim: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Gabim: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Ju lutem të krijuar një llogari të re nga Chart e Llogarive.
 DocType: Maintenance Visit,Maintenance Visit,Mirëmbajtja Vizitoni
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Customer&gt; Grupi Customer&gt; Territori
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch dispozicion Qty në Magazina
 DocType: Time Log Batch Detail,Time Log Batch Detail,Koha Identifikohu Batch Detail
-DocType: Workflow State,Tasks,Detyrat
 DocType: Landed Cost Voucher,Landed Cost Help,Zbarkoi Kosto Ndihmë
-DocType: Event,Tuesday,E martë
 DocType: Leave Block List,Block Holidays on important days.,Festat bllok në ditë të rëndësishme.
 ,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lë për llojin {0} ndarë tashmë për punonjësit {1} për periudhën {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
 DocType: UOM,UOM Name,Emri UOM
-DocType: Top Bar Item,Target,Objektiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Shuma Kontribut
 DocType: Sales Invoice,Shipping Address,Transporti Adresa
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ky mjet ju ndihmon për të rinovuar ose të rregulluar sasinë dhe vlerësimin e aksioneve në sistemin. Ajo është përdorur zakonisht për të sinkronizuar vlerat e sistemit dhe çfarë në të vërtetë ekziston në depo tuaj.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Me fjalë do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Mjeshtër markë.
-DocType: ToDo,Due Date,Për shkak Date
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Mjeshtër markë.
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kuti
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizata
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kuti
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizata
 DocType: Monthly Distribution,Monthly Distribution,Shpërndarja mujore
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Marresit Lista është e zbrazët. Ju lutem krijoni Marresit Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Prodhimit Plani Rendit Sales
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Hyrja Kontabiliteti për {0} mund të bëhen vetëm në monedhën: {1}
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,E prerë
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Llogaritë bankare
 ,Bank Reconciliation Statement,Deklarata Banka Pajtimit
 DocType: Address,Lead Name,Emri Lead
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Hapja Stock Bilanci
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Hapja Stock Bilanci
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nuk lejohet të tranfer më {0} se {1} kundër Rendit Blerje {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Asnjë informacion që të dal
 DocType: Shipping Rule Condition,From Value,Nga Vlera
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Shuma nuk pasqyrohet në bankë
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Shuma nuk pasqyrohet në bankë
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Hedh centrifugale
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetike fushë-asistuar mbarimit
 DocType: Company,Default Holiday List,Default Festa Lista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Receipt,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 DocType: Production Planning Tool,Select Sales Orders,Zgjidh Sales urdhëron
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Për të gjetur objekte duke përdorur barcode. Ju do të jenë në gjendje për të hyrë artikuj në Shënimin shitjes dhe ofrimit të Faturës nga skanimi barcode e sendit.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark si Dorëzuar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark si Dorëzuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Bëni Kuotim
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 DocType: SMS Center,Receiver List,Marresit Lista
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Shiko
 DocType: Salary Structure Deduction,Salary Structure Deduction,Struktura e pagave Zbritje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Sintering selektive lazer
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Importi i suksesshëm!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Mosha (ditë)
 DocType: Quotation Item,Quotation Item,Citat Item
 DocType: Account,Account Name,Emri i llogarisë
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Nga Data nuk mund të jetë më i madh se deri më sot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial No {0} sasi {1} nuk mund të jetë një pjesë
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Furnizuesi Lloji mjeshtër.
 DocType: Purchase Order Item,Supplier Part Number,Furnizuesi Pjesa Numër
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Shtoj
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Shkalla e konvertimit nuk mund të jetë 0 ose 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} është anuluar ose ndaluar
 DocType: Accounts Settings,Credit Controller,Kontrolluesi krediti
 DocType: Delivery Note,Vehicle Dispatch Date,Automjeteve Dërgimi Data
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Blerje Pranimi {0} nuk është dorëzuar
 DocType: Company,Default Payable Account,Gabim Llogaria pagueshme
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cilësimet për internet shopping cart tilla si rregullat e transportit detar, lista e çmimeve etj"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Setup Complete
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% faturuar
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Burimeve Njerëzore
 DocType: Lead,Upper Income,Të ardhurat e sipërme
 DocType: Journal Entry Account,Debit in Company Currency,Debit në kompanisë Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Çështjet e mia
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Vlerat Default
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Shuma e pagesës nuk mund të jetë negative
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Montim shtyp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
 DocType: Payment Reconciliation,Payments,Pagesat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Hot isostatic ngutshme
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Buxheti i alokuar
 DocType: Journal Entry,Entry Type,Hyrja Lloji
 ,Customer Credit Balance,Bilanci Customer Credit
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
 DocType: Quotation,Term Details,Detajet Term
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planifikimi i kapaciteteve për (ditë)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
 DocType: Warranty Claim,Warranty Claim,Garanci Claim
 ,Lead Details,Detajet Lead
-DocType: Authorization Rule,Approving User,Miratimi i përdoruesit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Falsifikim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plating
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
 DocType: Pricing Rule,Applicable For,Të zbatueshme për
 DocType: Bank Reconciliation,From Date,Nga Data
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Auctions Online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Auctions Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ju lutem specifikoni ose Sasia apo vlerësimin Vlerësoni apo të dyja
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Kompani, muaji dhe viti fiskal është i detyrueshëm"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Njësi e vetme e një artikulli.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Koha Identifikohu Batch {0} duhet të jetë &#39;Dërguar&#39;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Bëni hyrje të kontabilitetit për çdo veprim Stock
 DocType: Leave Allocation,Total Leaves Allocated,Totali Lë alokuar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Magazina kërkohet në radhë nr {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Ju lutem shkruani Viti Financiar i vlefshëm Start dhe Datat Fundi
 DocType: Employee,Date Of Retirement,Data e daljes në pension
 DocType: Upload Attendance,Get Template,Get Template
 DocType: Address,Postal,Postar
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Miniere
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hedh rrëshirë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Një grup të konsumatorëve ekziston me të njëjtin emër, ju lutem të ndryshojë emrin Customer ose riemërtoni grup të konsumatorëve"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Ju lutem, përzgjidhni {0} parë."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Teksti {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Teksti {0}
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
 DocType: Stock Entry,Material Receipt,Pranimi materiale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkte
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkte
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogarisë {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nëse ky artikull ka variante, atëherë ajo nuk mund të zgjidhen në shitje urdhrat etj"
 DocType: Lead,Next Contact By,Kontakt Next By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazina {0} nuk mund të fshihet si ekziston sasia e artikullit {1}
 DocType: Quotation,Order Type,Rendit Type
 DocType: Purchase Invoice,Notification Email Address,Njoftimi Email Adresa
 DocType: Payment Tool,Find Invoices to Match,Gjej Faturat për ndeshjen
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",p.sh. &quot;XYZ Banka Kombëtare&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",p.sh. &quot;XYZ Banka Kombëtare&quot;
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,A është kjo Tatimore të përfshira në normën bazë?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Target Total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Target Total
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Shporta është aktivizuar
 DocType: Job Applicant,Applicant for a Job,Aplikuesi për një punë
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Nuk urdhërat e prodhimit të krijuara
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Shqip paga e punëtorit {0} krijuar tashmë për këtë muaj
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Shqip paga e punëtorit {0} krijuar tashmë për këtë muaj
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Sales Invoice Item,Batch No,Batch Asnjë
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Kryesor
-DocType: DocPerm,Delete,Fshij
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},New {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Urdhri u ndal nuk mund të anulohet. Heq tapën për të anulluar.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Item,Variants,Variantet
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Shuma e ndarë
 DocType: Sales Team,Contribution to Net Total,Kontributi në Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Aplikuesi për një punë.
 DocType: Purchase Order Item,Warehouse and Reference,Magazina dhe Referenca
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutore dhe informacione të tjera të përgjithshme në lidhje me furnizuesit tuaj
-DocType: Country,Country,Vend
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresat
-DocType: Communication,Received,Marrë
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial Asnjë hyrë për Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Një kusht për Sundimin Shipping
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item nuk i lejohet të ketë Rendit prodhimit.
-DocType: DocField,Attach Image,Bashkangjit Image
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Pesha neto i kësaj pakete. (Llogaritet automatikisht si shumë të peshës neto të artikujve)
-DocType: Stock Reconciliation Item,Leave blank if no change,Lini bosh nëse nuk ka ndryshim
 DocType: Sales Order,To Deliver and Bill,Për të ofruar dhe Bill
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Koha Shkrime për prodhimin.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplikoni Magazina-i mençur Reorder Niveli
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Koha Identifikohu për detyra.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Pagesa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Pagesa
 DocType: Production Order Operation,Actual Time and Cost,Koha aktuale dhe kostos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Kërkesa material i maksimumi {0} mund të jetë bërë për Item {1} kundër Sales Rendit {2}
 DocType: Employee,Salutation,Përshëndetje
-DocType: Communication,Rejected,Refuzuar
 DocType: Pricing Rule,Brand,Markë
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
 DocType: Sales Order Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
 DocType: Quality Inspection Reading,Reading 10,Leximi 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
 DocType: Hub Settings,Hub Node,Hub Nyja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Vlera {0} për Atributit {1} nuk ekziston në listën e artikullit vlefshme Atributeve Vlerat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Koleg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Koleg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Skaduar
 DocType: Packing Slip,To Package No.,Për paketën Nr
-DocType: DocType,System,Sistem
 DocType: Warranty Claim,Issue Date,Çështja Data
 DocType: Activity Cost,Activity Cost,Kosto Aktiviteti
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Konsumuar Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomunikacionit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomunikacionit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Tregon se paketa është pjesë e këtij ofrimit (Vetëm draft)
 DocType: Payment Tool,Make Payment Entry,Kryej pagesa Hyrja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Sasia e artikullit {0} duhet të jetë më pak se {1}
 ,Sales Invoice Trends,Shitjet Trendet faturave
 DocType: Leave Application,Apply / Approve Leaves,Aplikoni / Miratimi Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Për
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Mund t&#39;i referohet rresht vetëm nëse tipi është ngarkuar &quot;Për Previous Shuma Row &#39;ose&#39; Previous Row Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Ofrimit Magazina
 DocType: Stock Settings,Allowance Percent,Allowance Përqindja
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Shitja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Citat Furnizuesi Item
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Bëni strukturën e pagave
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Krasitje
 DocType: Item,Has Variants,Ka Variantet
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Klikoni mbi &#39;të shitjes Faturë &quot;butonin për të krijuar një Sales re Faturë.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketimin dhe etiketimin
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ju lutem specifikoni albumit Valuta në kompaninë Master dhe Defaults Global
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Qasja Sekret
 DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Menaxhimi i Projekteve
 DocType: Supplier,Supplier of Goods or Services.,Furnizuesi i mallrave ose shërbimeve.
 DocType: Budget Detail,Fiscal Year,Viti Fiskal
 DocType: Cost Center,Budget,Buxhet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Buxheti nuk mund të caktohet {0} kundër, pasi kjo nuk është një llogari të ardhura ose shpenzime"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Arritur
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territori / Customer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,p.sh. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,p.sh. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Me fjalë do të jetë i dukshëm një herë ju ruani Sales Faturë.
 DocType: Item,Is Sales Item,Është Item Sales
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Item Group Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
 DocType: Maintenance Visit,Maintenance Time,Mirëmbajtja Koha
 ,Amount to Deliver,Shuma për të Ofruar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Një produkt apo shërbim
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Ka pasur gabime.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Prerje
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Një produkt apo shërbim
 DocType: Naming Series,Current Value,Vlera e tanishme
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} krijuar
 DocType: Delivery Note Item,Against Sales Order,Kundër Sales Rendit
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
 DocType: Website Item Group,Website Item Group,Faqja kryesore Item Grupi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Detyrat dhe Taksat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ju lutem shkruani datën Reference
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ju lutem shkruani datën Reference
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela për çështje që do të shfaqet në Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
 DocType: Material Request Item,Material Request Item,Materiali Kërkesë Item
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Pema e sendit grupeve.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Pema e sendit grupeve.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
 ,Item-wise Purchase History,Historia Blerje pika-mençur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,I kuq
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,I kuq
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
 DocType: Account,Frozen,I ngrirë
 ,Open Production Orders,Urdhërat e hapur e prodhimit
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operacioni {1} nuk është përfunduar për {2} Qty e mallrave të kryer në prodhimin Order # {3}. Ju lutem Përditëso statusin operacion anë Koha Shkrime
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Ndryshojë UOM për një artikull.
 DocType: Quality Inspection Reading,Acceptance Criteria,Kriteret e pranimit
 DocType: Item Attribute,Attribute Name,Atribut Emri
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Item {0} duhet të jetë i Sales ose shërbimi i artikullit në {1}
 DocType: Item Group,Show In Website,Shfaq Në Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
 DocType: Task,Expected Time (in hours),Koha pritet (në orë)
 ,Qty to Order,Qty të Rendit
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Për të gjetur emrin e markës në Shënimin dokumentet e mëposhtme për dorëzim, Mundësi, Kërkesë materiale, Item, Rendit Blerje, Blerje Bonon, blerësi pranimin, citat, Sales Fatura, Produkt Bundle, Sales Rendit, Serial Asnjë"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Tabela e qartë
 DocType: Features Setup,Brands,Markat
 DocType: C-Form Invoice Detail,Invoice No,Fatura Asnjë
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Nga Rendit Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Nga Rendit Blerje
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 DocType: Activity Cost,Costing Rate,Kushton Rate
 ,Customer Addresses And Contacts,Adresat dhe kontaktet Customer
 DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Nuk është caktuar
-DocType: Communication,Date,Data
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Uluni të shtrënguar ndërsa sistemi juaj është duke u Setup. Kjo mund të marrë disa momente.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Palë
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Palë
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 DocType: Maintenance Schedule Detail,Actual Date,Aktuale Data
 DocType: Item,Has Batch No,Ka Serisë Asnjë
 DocType: Delivery Note,Excise Page Number,Akciza Faqja Numër
 DocType: Employee,Personal Details,Detajet personale
 ,Maintenance Schedules,Mirëmbajtja Oraret
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Embossing
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debiti te llogaria duhet të jetë një llogari të arkëtueshme
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Si mund të bëhet Urdhër prodhimit për këtë artikull, ajo duhet të jetë një çështje e aksioneve."
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Bashkim
-DocType: Authorization Rule,Above Value,Mbi Vlerën
 ,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
 DocType: Purchase Order,Delivered,Dorëzuar
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Setup server hyrje për Punë email id. (P.sh. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Gjithsej gjethet e ndara {0} nuk mund të jetë më pak se gjethet tashmë të miratuara {1} për periudhën
 DocType: Journal Entry,Accounts Receivable,Llogaritë e arkëtueshme
 ,Supplier-Wise Sales Analytics,Furnizuesi-i mençur Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Ky format përdoret në qoftë se format specifik i vendit nuk është gjetur
-DocType: Custom Field,Custom,Me porosi
 DocType: Production Order,Use Multi-Level BOM,Përdorni Multi-Level bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,I derdhur injeksion
 DocType: Bank Reconciliation,Include Reconciled Entries,Përfshini gjitha pajtuar
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Pema e llogarive finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lini bosh nëse konsiderohet për të gjitha llojet e punonjësve
 DocType: Landed Cost Voucher,Distribute Charges Based On,Shpërndarjen Akuzat Bazuar Në
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Llogaria {0} duhet të jetë e tipit &quot;aseteve fikse&quot; si i artikullit {1} është një çështje e Aseteve
 DocType: HR Settings,HR Settings,HR Cilësimet
-apps/frappe/frappe/config/setup.py +130,Printing,Shtypje
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Shpenzim Kërkesa është në pritje të miratimit. Vetëm aprovuesi shpenzimeve mund update statusin.
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Një ditë (s) në të cilin ju po aplikoni për leje janë pushime. Ju nuk duhet të aplikoni për leje.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,dhe
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sportiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gjithsej aktuale
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Njësi
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ju lutemi të vendosur çelësat Dropbox akses ne faqen config tuaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Njësi
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ju lutem specifikoni Company
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Magazina ku ju jeni mbajtjen e aksioneve të artikujve refuzuar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Vitin e juaj financiare përfundon në
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Vitin e juaj financiare përfundon në
 DocType: POS Profile,Price List,Tarifë
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} është tani default Viti Fiskal. Ju lutemi të rifreskoni shfletuesin tuaj për ndryshim të hyjnë në fuqi.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
-DocType: Authorization Rule,Approving Role,Miratimi Rolit
 ,BOM Search,Bom Kërko
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
 DocType: Workstation,Wages per hour,Rrogat në orë
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Trego / Fshih karakteristika si Serial Nr, POS etj"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pas kërkesave materiale janë ngritur automatikisht bazuar në nivelin e ri të rendit zërit
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Data Pastrimi nuk mund të jetë para datës Kontrolloni në rresht {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Data Pastrimi nuk mund të jetë para datës Kontrolloni në rresht {0}
 DocType: Salary Slip,Deduction,Zbritje
 DocType: Address Template,Address Template,Adresa Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Ju lutemi shkruani punonjës Id i këtij personi të shitjes
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Citat
 DocType: Salary Slip,Total Deduction,Zbritje Total
 DocType: Quotation,Maintenance User,Mirëmbajtja User
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kosto Përditësuar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kosto Përditësuar
 DocType: Employee,Date of Birth,Data e lindjes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Item {0} tashmë është kthyer
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Viti Fiskal ** përfaqëson një viti financiar. Të gjitha shënimet e kontabilitetit dhe transaksionet tjera të mëdha janë gjurmuar kundër Vitit Fiskal ** **.
 DocType: Opportunity,Customer / Lead Address,Customer / Adresa Lead
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Përshkrimi i punës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Përshkrimi i punës
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty sipas Stock UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Ju lutem, përzgjidhni një skedar CSV vlefshme me të dhënat"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Shtresë
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
 DocType: Expense Claim,Approver,Aprovuesi
 ,SO Qty,SO Qty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Entries Stock ekzistojnë kundër depo {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë Magazina"
 DocType: Appraisal,Calculate Total Score,Llogaritur Gjithsej Vota
 DocType: Supplier Quotation,Manufacturing Manager,Prodhim Menaxher
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Dërgesat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Derdhur Dip
-DocType: Purchase Order,To be delivered to customer,Që do të dërgohen për të klientit
+apps/erpnext/erpnext/hooks.py +68,Shipments,Dërgesat
+DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Koha Identifikohu Statusi duhet të dorëzohet.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Setting Up
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Me fjalë (Kompania Valuta)
 DocType: Pricing Rule,Supplier,Furnizuesi
 DocType: C-Form,Quarter,Çerek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Shpenzimet Ndryshme
 DocType: Global Defaults,Default Company,Gabim i kompanisë
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Shpenzim apo llogari Diferenca është e detyrueshme për Item {0} si ndikon vlerën e përgjithshme e aksioneve
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nuk mund të overbill për Item {0} në {1} rresht më shumë se {2}. Për të lejuar overbilling, ju lutem vendosur në Stock Settings"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nuk mund të overbill për Item {0} në {1} rresht më shumë se {2}. Për të lejuar overbilling, ju lutem vendosur në Stock Settings"
 DocType: Employee,Bank Name,Emri i Bankës
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Siper
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Përdoruesi {0} është me aftësi të kufizuara
 DocType: Leave Application,Total Leave Days,Ditët Totali i pushimeve
-DocType: Journal Entry Account,Credit in Account Currency,Credit në llogari në monedhë të
 DocType: Email Digest,Note: Email will not be sent to disabled users,Shënim: Email nuk do të dërgohet për përdoruesit me aftësi të kufizuara
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Zgjidh kompanisë ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lini bosh nëse konsiderohet për të gjitha departamentet
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Currency Exchange,From Currency,Nga Valuta
-DocType: DocField,Name,Emër
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Shuma nuk reflektohet në sistemin e
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ju lutem, përzgjidhni Shuma e ndarë, tip fature, si dhe numrin e faturës në atleast një rresht"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Rendit Shitjet e nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Shuma nuk reflektohet në sistemin e
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Të tjerët
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Të tjerët
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Një produkt apo një shërbim që është blerë, shitur apo mbajtur në magazinë."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,I përfunduar
-DocType: Web Form,Select DocType,Zgjidh DOCTYPE
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broaching
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankar
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Ju lutem klikoni në &quot;Generate&quot; Listën për të marrë orarin
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Qendra e re e kostos
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Qendra e re e kostos
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
 DocType: Quality Inspection,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 DocType: Purchase Order Item,Reference Document Type,Referenca Document Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Inventar serialized
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Inventar serialized
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
 DocType: Time Log Batch,Total Billing Amount,Shuma totale Faturimi
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Llogaria e arkëtueshme
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Rendit Shitjet për Pagesa
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Koha Shkrime krijuar:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Item,Weight UOM,Pesha UOM
 DocType: Employee,Blood Group,Grup gjaku
 DocType: Purchase Invoice Item,Page Break,Faqe Pushim
 DocType: Production Order Operation,Pending,Në pritje të
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Përdoruesit të cilët mund të miratojë aplikacione të lënë një punonjës të veçantë për
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ju nuk mund të ndryshoni parazgjedhje UOM e Varianti. Për të ndryshuar parazgjedhje UOM për Variant ndryshim parazgjedhur UOM të Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Zyra Pajisje
 DocType: Purchase Invoice Item,Qty,Qty
 DocType: Fiscal Year,Companies,Kompanitë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronikë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikë
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ngritja materiale Kërkesë kur bursës arrin nivel të ri-rendit
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Nga Mirëmbajtja Listën
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Me kohë të plotë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Me kohë të plotë
 DocType: Purchase Invoice,Contact Details,Detajet Kontakt
 DocType: C-Form,Received Date,Data e marra
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Nëse keni krijuar një template standarde në shitje taksave dhe detyrimeve Stampa, përzgjidh njërin dhe klikoni mbi butonin më poshtë."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Hapja Job
 DocType: Payment Reconciliation,Payment Reconciliation,Pajtimi Pagesa
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknologji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
 DocType: Offer Letter,Offer Letter,Oferta Letër
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generate Kërkesat materiale (MRP) dhe urdhërat e prodhimit.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Gjithsej faturuara Amt
 DocType: Time Log,To Time,Për Koha
+DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Për të shtuar nyje fëmijë, të shqyrtojë pemë dhe klikoni në nyjen nën të cilën ju doni të shtoni më shumë nyje."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Kodet Customer Item
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Krijo Entries pagesës ndaj urdhrave ose faturave.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Saldim
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,New Stock UOM është e nevojshme
 DocType: Quality Inspection,Sample Size,Shembull Madhësi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ju lutem specifikoni një të vlefshme &#39;nga rasti Jo&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
 DocType: Features Setup,Item Serial Nos,Item Serial Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Sasia aktuale
 DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Konsumatorët tuaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Derdhur Compression
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Konsumatorët tuaj
 DocType: Leave Block List Date,Block Date,Data bllok
 DocType: Sales Order,Not Delivered,Jo Dorëzuar
 ,Bank Clearance Summary,Pastrimi Përmbledhje Banka
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Kodi i artikullit&gt; Grupi i artikullit&gt; Markë
 DocType: Appraisal Goal,Appraisal Goal,Vlerësimi Qëllimi
-DocType: Event,Friday,E premte
 DocType: Time Log,Costing Amount,Kushton Shuma
 DocType: Process Payroll,Submit Salary Slip,Submit Kuponi pagave
 DocType: Salary Structure,Monthly Earning & Deduction,Fituar mujore dhe Zbritje
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importi në Bulk
 DocType: Sales Partner,Address & Contacts,Adresa dhe Kontaktet
 DocType: SMS Log,Sender Name,Sender Emri
-DocType: Page,Title,Titull
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Customize
 DocType: POS Profile,[Select],[Zgjidh]
 DocType: SMS Log,Sent To,Dërguar në
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Bëni Sales Faturë
 DocType: Company,For Reference Only.,Vetëm për referencë.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Invalid {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Advance Shuma
 DocType: Manufacturing Settings,Capacity Planning,Planifikimi i kapacitetit
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
 DocType: Journal Entry,Reference Number,Numri i referencës
 DocType: Employee,Employment Details,Detajet e punësimit
 DocType: Employee,New Workplace,New Workplace
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
 DocType: Item,End of Life,Fundi i jetës
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Udhëtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Udhëtim
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
 DocType: Sales Invoice,Recurring,Periodik
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Material Transferimi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Specifikoni operacionet, koston operative dhe të japë një operacion i veçantë nuk ka për operacionet tuaja."
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
 DocType: Installation Note,Installation Note,Instalimi Shënim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Shto Tatimet
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Shto Tatimet
 ,Financial Analytics,Analytics Financiare
 DocType: Quality Inspection,Verified By,Verifikuar nga
 DocType: Address,Subsidiary,Ndihmës
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nuk mund të ndryshojë monedhën parazgjedhje kompanisë, sepse ka transaksione ekzistuese. Transaksionet duhet të anulohet për të ndryshuar monedhën default."
 DocType: Quality Inspection,Purchase Receipt No,Pranimi Blerje Asnjë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
-DocType: System Settings,In Hours,Në orët
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Bilanci pritet si për banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Bilanci pritet si për banka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
 DocType: Appraisal,Employee,Punonjës
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupi nga Bonon
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Sales Invoice,Mass Mailing,Mailing Mass
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Trego Pagesat
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Madhësi
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Krijo Customer
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Leximi 9
 DocType: Supplier,Is Frozen,Është ngrira
 DocType: Buying Settings,Buying Settings,Blerja Cilësimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mass mbarimit
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Jo për një artikull përfundoi mirë
 DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Setup server hyrje për shitjet email id. (P.sh. sales@example.com)
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Tool,Payment Account,Llogaria e pagesës
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Draft
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensues Off
 DocType: Quality Inspection Reading,Accepted,Pranuar
-DocType: User,Female,Femër
-DocType: Journal Entry Account,Debit in Account Currency,Debi në llogarinë në valutë
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ju lutem sigurohuni që ju me të vërtetë dëshironi të fshini të gjitha transaksionet për këtë kompani. Të dhënat tuaja mjeshtër do të mbetet ashtu siç është. Ky veprim nuk mund të zhbëhet.
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,U përgjigj
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Referenca e pavlefshme {0} {1}
 DocType: Payment Tool,Total Payment Amount,Gjithsej shuma e pagesës
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nuk mund të jetë më i madh se quanitity planifikuar ({2}) në Prodhimi i rendit {3}
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
 DocType: Newsletter,Test,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Si ka transaksione ekzistuese të aksioneve për këtë artikull, \ ju nuk mund të ndryshojë vlerat e &#39;ka Serial&#39;, &#39;Has Serisë Jo&#39;, &#39;A Stock Item&#39; dhe &#39;Metoda Vlerësimi&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Hyrja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
 DocType: Stock Entry,For Quantity,Për Sasia
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Kërkesat për sendet.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Mënyrë e veçantë prodhimi do të krijohen për secilin artikull përfunduar mirë.
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Setup Complete
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rregjistrimi kontabël ngrirë deri në këtë datë, askush nuk mund të bëjë / modifikoj hyrjen përveç rolit të specifikuar më poshtë."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statusi i Projektit
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontrolloni këtë për të moslejuar fraksionet. (Për Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Newsletter Mailing List
 DocType: Delivery Note,Transporter Name,Transporter Emri
+DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
 DocType: Contact,Enter department to which this Contact belongs,Shkruani departamentin për të cilin kjo Kontakt takon
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Gjithsej Mungon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Njësia e Masës
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Njësia e Masës
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
 DocType: Lead,Opportunity,Mundësi
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Norma bazë (sipas Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
 DocType: Campaign,Campaign-.####,Fushata -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Depërtues
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Një shpërndarës i palës së tretë / tregtari / komision agjent / degë / reseller që shet produkte kompani për një komision.
 DocType: Customer Group,Has Child Node,Ka Nyja e fëmijëve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Shkruani parametrave statike url këtu (P.sh.. Dërguesi = ERPNext, emrin = ERPNext, fjalëkalimi = 1234, etj)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jo në çdo Viti Fiskal aktive. Për më shumë detaje shikoni {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gama plakjen 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Machining fotokimik
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Template Standard taksave që mund të aplikohet për të gjitha transaksionet e blerjes. Kjo template mund të përmbajë listë të krerëve të taksave si dhe kokat e tjera të shpenzimeve, si &quot;tregtar&quot;, &quot;Sigurimi&quot;, &quot;Trajtimi&quot; etj #### Shënim norma e tatimit që ju të përcaktuar këtu do të jetë norma standarde e taksave për të gjitha ** Items * *. Nëse ka Items ** ** që kanë norma të ndryshme, ato duhet të shtohet në ** Item Tatimit ** Tabela në ** Item ** zotit. #### Përshkrimi i Shtyllave 1. Llogaritja Type: - Kjo mund të jetë në ** neto totale ** (që është shuma e shumës bazë). - ** Në rreshtit të mëparshëm totalit / Shuma ** (për taksat ose tarifat kumulative). Në qoftë se ju zgjidhni këtë opsion, tatimi do të aplikohet si një përqindje e rreshtit të mëparshëm (në tabelën e taksave) shumën apo total. - ** ** Aktuale (siç u përmend). 2. Llogaria Udhëheqës: Libri Llogaria nën të cilat kjo taksë do të jetë e rezervuar 3. Qendra Kosto: Nëse tatimi i / Akuza është një ardhura (si anijet) ose shpenzime ajo duhet të jetë e rezervuar ndaj Qendrës kosto. 4. Përshkrimi: Përshkrimi i tatimit (që do të shtypen në faturat / thonjëza). 5. Rate: Shkalla tatimore. 6. Shuma: Shuma Tatimore. 7. Gjithsej: totale kumulative në këtë pikë. 8. Shkruani Row: Nëse në bazë të &quot;rreshtit të mëparshëm Total&quot; ju mund të zgjidhni numrin e rreshtit të cilat do të merren si bazë për këtë llogaritje (default është rreshtit të mëparshëm). 9. Konsideroni tatim apo detyrim per: Në këtë seksion ju mund të specifikoni nëse taksa / çmimi është vetëm për vlerësimin (jo një pjesë e totalit) apo vetëm për totalin (nuk shtojnë vlerën e sendit), ose për të dyja. 10. Add ose Zbres: Nëse ju dëshironi të shtoni ose të zbres tatimin."
-DocType: Note,Note,Shënim
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
-DocType: Email Account,Email Ids,Email IDS
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Nuk mund të prodhojë më shumë Item {0} se sasia Sales Rendit {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 DocType: Tax Rule,Billing City,Faturimi i qytetit
 DocType: Global Defaults,Hide Currency Symbol,Fshih Valuta size
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Credit Shënim
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Kompletuar Qty nuk mund të jetë më shumë se {0} për funksionimin {1}
 DocType: Features Setup,Quality,Cilësi
-DocType: Contact Us Settings,Introduction,Paraqitje
 DocType: Warranty Claim,Service Address,Shërbimi Adresa
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rreshta për Stock pajtimit.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rreshta për Stock pajtimit.
 DocType: Stock Entry,Manufacture,Prodhim
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Ju lutem dorëzimit Shënim parë
 DocType: Purchase Invoice,Currency and Price List,Valuta dhe Lista e Çmimeve
 DocType: Opportunity,Customer / Lead Name,Customer / Emri Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Pastrimi Data nuk përmendet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Prodhim
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Pastrimi Data nuk përmendet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Prodhim
 DocType: Item,Allow Production Order,Lejo Rendit Prodhimit
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Dërguar
 DocType: Salary Structure,Total Earning,Fituar Total
 DocType: Purchase Receipt,Time at which materials were received,Koha në të cilën janë pranuar materialet e
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Adresat e mia
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Mjeshtër degë organizatë.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,ose
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Mbi
 DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
-,Download Backups,Shkarko Backups
 DocType: Notification Control,Sales Order Message,Sales Rendit Mesazh
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Vlerat Default si Company, Valuta, vitin aktual fiskal, etj"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Lloji Pagesa
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
 DocType: Bank Reconciliation,To Date,Deri më sot
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detalet
 DocType: Purchase Invoice,Total Taxes and Charges,Totali Taksat dhe Tarifat
 DocType: Employee,Emergency Contact,Urgjencës Kontaktoni
 DocType: Item,Quality Parameters,Parametrave të cilësisë
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 DocType: Product Bundle,Parent Item,Item prind
 DocType: Account,Account Type,Lloji i Llogarisë
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Sasia e rezervuara
 DocType: Landed Cost Voucher,Purchase Receipt Items,Items Receipt Blerje
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Format customizing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Prerje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Rrafshim
 DocType: Account,Income Account,Llogaria ardhurat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,I derdhur
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih &quot;Shkalla e materialeve në bazë të&quot; në nenin kushton
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokumentet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Qendra Kosto
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Kupon #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Kupon #
 DocType: Notification Control,Purchase Order Message,Rendit Blerje mesazh
 DocType: Tax Rule,Shipping Country,Shipping Vendi
 DocType: Upload Attendance,Upload HTML,Ngarko HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})",Gjithsej paraprakisht ({0}) kundër Rendit {1} nuk mund të jetë më e madhe \ se Grand Total ({2})
 DocType: Employee,Relieving Date,Lehtësimin Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rregulla e Çmimeve është bërë për të prishësh LISTA E ÇMIMEVE / definojnë përqindje zbritje, në bazë të disa kritereve."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazina mund të ndryshohet vetëm përmes Stock Hyrja / dorëzimit Shënim / Pranimi Blerje
 DocType: Employee Education,Class / Percentage,Klasa / Përqindja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Tatimi mbi të ardhurat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered neto formësimin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Tatimi mbi të ardhurat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nëse Rregulla zgjedhur Çmimeve është bërë për &#39;Çmimi&#39;, ajo do të prishësh listën e çmimeve. Çmimi Rregulla e Çmimeve është çmimi përfundimtar, kështu që nuk ka zbritje të mëtejshme duhet të zbatohet. Për këtë arsye, në transaksione si Sales Rendit, Rendit Blerje etj, ajo do të sjellë në fushën e &#39;norma&#39;, në vend se të fushës &quot;listën e çmimeve normë &#39;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Qendra Kosto New Emri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Nuk ka parazgjedhur Adresa Template gjetur. Ju lutem të krijuar një të ri nga Setup&gt; Printime dhe quajtur&gt; Adresa Stampa.
 DocType: Appraisal,HR User,HR User
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
 DocType: Supplier,Billing Currency,Faturimi Valuta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Shumë i madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Shumë i madh
 ,Profit and Loss Statement,Fitimi dhe Humbja Deklarata
 DocType: Bank Reconciliation Detail,Cheque Number,Numri çek
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,I ngutshëm
 DocType: Payment Tool Detail,Payment Tool Detail,Detail Tool Pagesa
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,I madh
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Asnjë punonjës gjetur!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,I madh
 DocType: C-Form Invoice Detail,Territory,Territor
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Purchase Order,Customer Address Display,Customer Adresa Display
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Lustrim
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Default njësinë e matjes për artikullit {0} nuk mund të ndryshohet drejtpërdrejt sepse \ keni bërë tashmë një transaksioni (et) me një tjetër UOM. Për të ndryshuar parazgjedhje UOM, \ përdorimi &#39;UOM Replace Utility&#39; mjet nën Stock modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specifikoni Exchange Rate për të kthyer një monedhë në një tjetër
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Citat {0} është anuluar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Citat {0} është anuluar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Shuma totale Outstanding
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Punonjës {0} ka qenë në pushim në {1}. Nuk mund të shënojë pjesëmarrjen.
 DocType: Sales Partner,Targets,Synimet
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
 ,S.O. No.,SO Nr
 DocType: Production Order Operation,Make Time Log,Bëni kohë Kyçu
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Ju lutemi të vendosur sasinë Reorder
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
 DocType: Price List,Applicable for Countries,Të zbatueshme për vendet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Kompjuter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimike rëndë
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Ju lutem Setup kartelën tuaj të llogarive të para se të fillojë regjistrimeve kontabël
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignore Rregulla e Çmimeve
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Anullohen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Nga Data në strukturën e pagave nuk mund të jetë më e vogël se sa punonjës Data bashkuar.
 DocType: Employee Education,Graduate,I diplomuar
 DocType: Leave Block List,Block Days,Ditët Blloku
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kontrolloni nëse përsëritura faturë, zgjidhni për të ndaluar përsëritura ose të vënë duhur End Date"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimale {0} rreshtave lejohen
 DocType: C-Form Invoice Detail,Net Total,Net Total
 DocType: Bin,FCFS Rate,FCFS Rate
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Faturimi (Sales Fatura)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Qëllimet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Atleast një artikull duhet të lidhet me sasinë negativ në dokumentin e kthimit
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacioni {0} gjatë se çdo orë në dispozicion të punës në workstation {1}, prishen operacionin në operacione të shumta"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Përpunimit elektrokimik
 ,Requested,Kërkuar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Asnjë Vërejtje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,I vonuar
 DocType: Account,Stock Received But Not Billed,Stock Marrë Por Jo faturuar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Llogaria duhet të jetë një grup i
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + arrear Shuma + Arkëtim Shuma - Zbritje Total
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 DocType: Features Setup,Sales and Purchase,Shitjet dhe Blerje
 DocType: Supplier Quotation Item,Material Request No,Materiali Kërkesë Asnjë
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Shkalla në të cilën konsumatori e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ka qenë sukses unsubscribed nga kjo listë.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Kompania Valuta)
-apps/frappe/frappe/templates/base.html +134,Added,Shtuar
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Manage Territorit Tree.
 DocType: Journal Entry Account,Sales Invoice,Shitjet Faturë
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Viti Fiskal {0} nuk u gjet.
 DocType: Bank Reconciliation,Get Relevant Entries,Get gjitha relevante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
-apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
 DocType: Account,Root Type,Root Type
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nuk mund të kthehet më shumë se {1} për Item {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Shuma e taksave Pas Shuma ulje (Kompania Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Depo objektiv është i detyrueshëm për rresht {0}
 DocType: Quality Inspection,Quality Inspection,Cilësia Inspektimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray formimin
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Vogla
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL ose BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Niveli minimal Inventari
 DocType: Stock Entry,Subcontract,Nënkontratë
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Prodhuesi Pjesa Numër
 DocType: Production Order Operation,Estimated Time and Cost,Koha e vlerësuar dhe Kosto
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Nr i SMS dërguar
 DocType: Account,Company,Kompani
 DocType: Account,Expense Account,Llogaria shpenzim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Program
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Ngjyra
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Program
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Ngjyra
 DocType: Maintenance Visit,Scheduled,Planifikuar
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Ju lutem zgjidhni Item ku &quot;A Stock Pika&quot; është &quot;Jo&quot; dhe &quot;është pika e shitjes&quot; është &quot;Po&quot;, dhe nuk ka asnjë tjetër Bundle Produktit"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Zgjidh Shpërndarja mujore të pabarabartë shpërndarë objektiva të gjithë muajve.
 DocType: Purchase Invoice Item,Valuation Rate,Vlerësimi Rate
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Item Row {0}: Pranimi Blerje {1} nuk ekziston në tabelën e mësipërme &quot;Blerje Pranimet &#39;
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
 DocType: Installation Note Item,Against Document No,Kundër Dokumentin Nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Manage Shitje Partnerët.
 DocType: Quality Inspection,Inspection Type,Inspektimi Type
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Ju lutem, përzgjidhni {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Studiues
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Update
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Studiues
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Ju lutemi ruani Newsletter para se të dërgonte
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Emri ose adresa është e detyrueshme
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspektimit të cilësisë hyrëse.
 DocType: Purchase Order Item,Returned Qty,U kthye Qty
 DocType: Employee,Exit,Dalje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Lloji është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Lloji është i detyrueshëm
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Asnjë {0} krijuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Dridhës mbarimit
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Për komoditetin e klientëve, këto kode mund të përdoren në formate të shtypura si faturat dhe ofrimit të shënimeve"
 DocType: Employee,You can enter any date manually,Ju mund të hyjë në çdo datë me dorë
 DocType: Sales Invoice,Advertisement,Reklamë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Periudha provuese
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Periudha provuese
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Expense Claim,Expense Approver,Shpenzim aprovuesi
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Fatura Blerje Item furnizuar
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Për datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Bluarje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Tkurret mbështjellës
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Aktivitetet në pritje
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,I konfirmuar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Furnizuesi&gt; Furnizuesi Type
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Sasia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adresa Titulli është i detyrueshëm.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shkruani emrin e fushatës nëse burimi i hetimit është fushatë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Zgjidh Viti Fiskal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Bashkëshkrirje
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
 DocType: Address,Preferred Shipping Address,Preferuar Transporti Adresa
 DocType: Purchase Receipt Item,Accepted Warehouse,Magazina pranuar
 DocType: Bank Reconciliation Detail,Posting Date,Posting Data
 DocType: Item,Valuation Method,Vlerësimi Metoda
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Në pamundësi për të gjetur kursin e këmbimit për {0} në {1}
 DocType: Sales Invoice,Sales Team,Sales Ekipi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Hyrja Duplicate
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Hyrja Duplicate
 DocType: Serial No,Under Warranty,Nën garanci
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Gabim]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Me fjalë do të jetë i dukshëm një herë ju ruani Rendit Sales.
 ,Employee Birthday,Punonjës Ditëlindja
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Venture Capital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
 DocType: Pricing Rule,Discount Percentage,Përqindja Discount
 DocType: Payment Reconciliation Invoice,Invoice Number,Numri i faturës
-apps/erpnext/erpnext/hooks.py +70,Orders,Urdhërat
+apps/erpnext/erpnext/hooks.py +54,Orders,Urdhërat
 DocType: Leave Control Panel,Employee Type,Lloji punonjës
 DocType: Employee Leave Approver,Leave Approver,Lini aprovuesi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferuar për Prodhime
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Një përdorues me &quot;Shpenzimi aprovuesi&quot; rolin
 ,Issued Items Against Production Order,Items lëshuara kundër rendit Production
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Periudha e pavlefshme
 DocType: Customer,Credit Limit,Limit Credit
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Përzgjidhni llojin e transaksionit
 DocType: GL Entry,Voucher No,Voucher Asnjë
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Adresa dhe Kontakt
 DocType: Customer,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Employee,Feedback,Reagim
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lënë nuk mund të ndahen përpara {0}, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Orar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Përpunimit gërryes jet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Orar
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
-DocType: Website Settings,Website Settings,Website Cilësimet
 DocType: Item,Reorder level based on Warehouse,Niveli Reorder bazuar në Magazina
 DocType: Activity Cost,Billing Rate,Rate Faturimi
 ,Qty to Deliver,Qty të Dorëzojë
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Kërkuar Për
 DocType: Quotation Item,Against Doctype,Kundër DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Përcjell këtë notën shpërndarëse kundër çdo Projektit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Llogari rrënjë nuk mund të fshihet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Shfaq Stock Entries
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referenca # {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Manage Adresat
 DocType: Pricing Rule,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Mbyllja (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Mbyllja (Dr)
 DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Shuma e faturuar
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Get Updates
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Shto një pak të dhënat mostër
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Shto një pak të dhënat mostër
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lini Menaxhimi
-DocType: Event,Groups,Grupet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi nga Llogaria
 DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
 DocType: Lead,Lower Income,Të ardhurat më të ulëta
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ndihmë Quick
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Burimi dhe depo objektiv nuk mund të jetë i njëjtë për të rresht {0}
 DocType: Features Setup,Sales Extras,Shitjet Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} buxheti për llogaria {1} kundër Qendra Kosto {2} do të kalojë nga {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} buxheti për llogaria {1} kundër Qendra Kosto {2} do të kalojë nga {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Vlera ose Qty
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minutë
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minutë
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
 ,Qty to Receive,Qty të marrin
 DocType: Leave Block List,Leave Block List Allowed,Dërgo Block Lista Lejohet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Faktor konvertimit nuk mund të jetë në fraksione
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Ju do të përdorin atë për Hyr
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ju do të përdorin atë për Hyr
 DocType: Sales Partner,Retailer,Shitës me pakicë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Gjitha llojet Furnizuesi
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Llogaria Overdraft Banka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Bëni Kuponi pagave
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Shfleto bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Kredi të siguruara
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produkte tmerrshëm
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Produkte tmerrshëm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Hapja Bilanci ekuitetit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Nuk mund të miratojë lejen e si ju nuk jeni i autorizuar të miratojë lë në datat Block
 DocType: Appraisal,Appraisal,Vlerësim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Hedh humbur-shkumë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vizatim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Data përsëritet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Nënshkrues i autorizuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
 DocType: Hub Settings,Seller Email,Shitës Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
 DocType: Workstation Working Hour,Start Time,Koha e fillimit
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Shuma neto (Kompania Valuta)
 DocType: BOM Operation,Hour Rate,Ore Rate
 DocType: Stock Settings,Item Naming By,Item Emërtimi By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Nga Kuotim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Nga Kuotim
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Një tjetër Periudha Mbyllja Hyrja {0} është bërë pas {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiali Transferuar për Prodhim
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Llogaria {0} nuk ekziston
 DocType: Purchase Receipt Item,Purchase Order Item No,Rendit Blerje artikull Nuk ka
-DocType: System Settings,System Settings,Parametrat e Sistemit
 DocType: Project,Project Type,Lloji i projektit
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ose Qty objektiv ose objektiv shuma është e detyrueshme.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kosto e aktiviteteve të ndryshme
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Para në dorë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 DocType: Serial No,Is Cancelled,Është anuluar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Dërgesat e mia
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Dërgesat e mia
 DocType: Journal Entry,Bill Date,Bill Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Edhe në qoftë se ka rregulla të shumta çmimeve me prioritet më të lartë, prioritetet e brendshme atëherë në vijim aplikohen:"
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
-DocType: Communication,Recipients,Marrësit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vidhosje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Knurling
 DocType: Expense Claim,Approval Status,Miratimi Statusi
 DocType: Hub Settings,Publish Items to Hub,Botojë artikuj për Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Nga Vlera duhet të jetë më pak se të vlerës në rresht {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Ju lutem, përzgjidhni llogarinë bankare"
 DocType: Newsletter,Create and Send Newsletters,Krijoni dhe dërgoni Buletinet
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Nga Data duhet të jetë përpara se deri më sot
 DocType: Sales Order,Recurring Order,Rendit përsëritur
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupi Customer / Customer
 DocType: Item Group,Check this if you want to show in website,Kontrolloni këtë në qoftë se ju doni të tregojnë në faqen e internetit
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Mirë se vini në ERPNext
+,Welcome to ERPNext,Mirë se vini në ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Numri Detail Voucher
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Lead për Kuotim
 DocType: Lead,From Customer,Nga Klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Telefonatat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Telefonatat
 DocType: Project,Total Costing Amount (via Time Logs),Shuma kushton (nëpërmjet Koha Shkrime)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
 ,Projected,Projektuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Hapja Data
 DocType: Journal Entry,Remark,Vërejtje
 DocType: Purchase Receipt Item,Rate and Amount,Shkalla dhe Shuma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,I mërzitshëm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Nga Sales Rendit
-DocType: Blog Category,Parent Website Route,Prind Faqja Route
 DocType: Sales Order,Not Billed,Jo faturuar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Të dyja Magazina duhet t&#39;i përkasë njëjtës kompani
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nuk ka kontakte të shtuar ende.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Jo aktiv
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Kosto zbarkoi Voucher Shuma
 DocType: Time Log,Batched for Billing,Batched për faturim
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Shuma Discount
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,p.sh. TVSH
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,p.sh. TVSH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Metalike të nxehtë gazit formimin
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
 DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Magazina {0}: Kompania është e detyrueshme
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Shko në grupin e duhur (zakonisht burimin e fondeve&gt; detyrime rrjedhëse&gt; tatimet dhe taksat dhe për të krijuar një llogari të re (duke klikuar mbi Shto Fëmija) i tipit &quot;tatim&quot; dhe të bëjë përmend normën tatimore.
 ,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Missing Currency Exchange Rates për {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laser prerja
-DocType: Event,Monday,E hënë
 DocType: Journal Entry,Stock Entry,Stock Hyrja
 DocType: Account,Payable,Për t&#39;u paguar
 DocType: Salary Slip,Arrear Amount,Shuma arrear
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Adresuar Përshkrimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Atleast një nga shitjen apo blerjen duhet të zgjidhen
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Ku operacionet prodhuese janë kryer.
-DocType: Page,All,Të gjithë
 DocType: Stock Entry Detail,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
 DocType: Employee,Confirmation Date,Konfirmimi Data
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Sales i përdoruesit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Qty nuk mund të jetë më i madh se Max Qty
 DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Lead Owner
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Magazina është e nevojshme
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Magazina është e nevojshme
 DocType: Employee,Marital Status,Statusi martesor
 DocType: Stock Settings,Auto Material Request,Auto materiale Kërkesë
 DocType: Time Log,Will be updated when billed.,Do të përditësohet kur faturuar.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Blerje Rendit Item furnizuar
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Emri i kompanisë nuk mund të jetë i kompanisë
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kryetarët letër për të shtypura templates.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titujt për shtypura templates p.sh. ProFORMA faturë.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Rekord të të gjitha komunikimeve të tipit mail, telefon, chat, vizita, etj"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ju lutemi të përmendim Round Off Qendra kushtojë në Kompaninë
 DocType: Purchase Invoice,Terms,Kushtet
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Krijo ri
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Krijo ri
 DocType: Buying Settings,Purchase Order Required,Blerje urdhër që nevojitet
 ,Item-wise Sales History,Pika-mençur Historia Sales
 DocType: Expense Claim,Total Sanctioned Amount,Shuma totale e sanksionuar
 ,Purchase Analytics,Analytics Blerje
 DocType: Sales Invoice Item,Delivery Note Item,Ofrimit Shënim Item
 DocType: Expense Claim,Task,Detyrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rruajtje
 DocType: Purchase Taxes and Charges,Reference Row #,Referenca Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Ky është një person i shitjes rrënjë dhe nuk mund të redaktohen.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Shkalla: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Shkalla: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Paga Shqip Zbritje
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Shënime
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Zgjidh një nyje grupi i parë.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Shkarko një raport që përmban të gjitha lëndëve të para me statusin e tyre të fundit inventar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Duke u përballur me
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forumi Komuniteti
 DocType: Leave Application,Leave Balance Before Application,Dërgo Bilanci para aplikimit
 DocType: SMS Center,Send SMS,Dërgo SMS
 DocType: Company,Default Letter Head,Default Letër Shef
 DocType: Time Log,Billable,Billable
-DocType: Authorization Rule,This will be used for setting rule in HR module,Kjo do të përdoren për vendosjen e sundimit në modulin HR
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Reorder Qty
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Mundësi e humbur
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Zbritje Fushat do të jenë në dispozicion në Rendit Blerje, pranimin Blerje, Blerje Faturës"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Emri i llogarisë së re. Shënim: Ju lutem mos krijoni llogari për klientët dhe furnizuesit
-DocType: Report,Report Type,Raporti Type
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Ngarkim
 DocType: BOM Replace Tool,BOM Replace Tool,Bom Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Shteti parazgjedhur i mençur Adresa Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Trego taksave break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importi dhe Eksporti i të dhënave
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Në qoftë se ju të përfshijë në aktivitete prodhuese. Mundëson Item &quot;është prodhuar &#39;
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
 DocType: Serial No,Out of AMC,Nga AMC
 DocType: Purchase Order Item,Material Request Detail No,Detail materiale Kërkesë Jo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hard kthese
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
 DocType: Company,Default Cash Account,Gabim Llogaria Cash
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ju lutemi shkruani &#39;datës së pritshme dorëzimit&#39;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Shënim: Në qoftë se pagesa nuk është bërë kundër çdo referencë, e bëjnë Journal Hyrja dorë."
 DocType: Item,Supplier Items,Items Furnizuesi
 DocType: Opportunity,Opportunity Type,Mundësi Type
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
 ,Stock Ageing,Stock plakjen
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Bëje si Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Dërgo email automatike në Kontaktet për transaksionet Dorëzimi.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Row {0}: Qty nuk avalable në magazinë {1} në {2} {3}. Në dispozicion Qty: {4}, Transferimi Qty: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Pika 3
 DocType: Purchase Order,Customer Contact Email,Customer Contact Email
-DocType: Event,Sunday,E diel
 DocType: Sales Team,Contribution (%),Kontributi (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Shënim: Pagesa Hyrja nuk do të jetë krijuar që nga &#39;Cash ose Llogarisë Bankare &quot;nuk ishte specifikuar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Përgjegjësitë
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ju lutemi shkruani atleast 1 faturën në tryezë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Shto Përdoruesit
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Shto Përdoruesit
 DocType: Pricing Rule,Item Group,Grupi i artikullit
 DocType: Task,Actual Start Date (via Time Logs),Aktuale Data e Fillimit (nëpërmjet Koha Shkrime)
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
 DocType: Item,Default BOM,Gabim bom
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Ju lutem ri-lloj emri i kompanisë për të konfirmuar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Outstanding Amt Total
 DocType: Time Log Batch,Total Hours,Totali Orë
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Automobilistik
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Item është e nevojshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Injeksion i derdhur metalike
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilistik
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Nga dorëzim Shënim
 DocType: Time Log,From Time,Nga koha
 DocType: Notification Control,Custom Message,Custom Mesazh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investimeve Bankare
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Zgjidh vendin tuaj, Time Zone dhe monedhës"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Cash ose Banka Llogaria është e detyrueshme për të bërë hyrjen e pagesës
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Pickling
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Hedh rërë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Electroplating
 DocType: Purchase Invoice Item,Rate,Normë
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Mjek praktikant
 DocType: Newsletter,A Lead with this email id should exist,Një Lead me këtë id email duhet të ekzistojë
 DocType: Stock Entry,From BOM,Nga bom
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Themelor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Deri më sot duhet të jetë i njëjtë si Nga Data për pushim gjysmë dite
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
 DocType: Salary Structure,Salary Structure,Struktura e pagave
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Multiple Rregulla Çmimi ekziston me kritere të njëjta, ju lutemi të zgjidhur \ konfliktin me jepte prioritet. Rregullat Çmimi: {0}"
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Materiali çështje
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Materiali çështje
 DocType: Material Request Item,For Warehouse,Për Magazina
 DocType: Employee,Offer Date,Oferta Data
 DocType: Hub Settings,Access Token,Qasja Token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Është pika fikse të aseteve
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Nëse keni formate të gjata të shtypura, ky funksion mund të përdoret për të ndarë faqe të jenë të shtypura në faqet e shumta me të gjitha headers dhe footers në çdo faqe"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Të gjitha Territoret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Të gjitha Territoret
 DocType: Purchase Invoice,Items,Artikuj
 DocType: Fiscal Year,Year Name,Viti Emri
 DocType: Process Payroll,Process Payroll,Procesi i Pagave
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Emri Sales Partner
 DocType: Purchase Invoice Item,Image View,Image Shiko
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Mbarimi &amp; industriale mbarimit
 DocType: Issue,Opening Time,Koha e hapjes
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Nga dhe në datat e kërkuara
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Letrave me Vlerë dhe Shkëmbimeve të Mallrave
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Shpim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Goditje derdhur
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
 DocType: Tax Rule,Shipping City,Shipping Qyteti
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ky artikull është një variant i {0} (Stampa). Atributet do të kopjohet gjatë nga template nëse &#39;Jo Copy &quot;është vendosur
 DocType: Account,Purchase User,Blerje User
 DocType: Notification Control,Customize the Notification,Customize Njoftimin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Goditje me çekan
-DocType: Web Page,Slideshow,Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
 DocType: Journal Entry,Print Heading,Printo Kreu
 DocType: Quotation,Maintenance Manager,Mirëmbajtja Menaxher
-DocType: Workflow State,Search,Kërkim
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Gjithsej nuk mund të jetë zero
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Ditët Që Rendit Fundit&quot; duhet të jetë më e madhe se ose e barabartë me zero
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Brazing
 DocType: C-Form,Amended From,Ndryshuar Nga
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ose Qty objektiv ose shuma e synuar është e detyrueshme
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
 DocType: Leave Control Panel,Carry Forward,Bart
@@ -2801,44 +2570,43 @@
 ,Produced,Prodhuar
 DocType: Item,Item Code for Suppliers,Item Kodi për Furnizuesit
 DocType: Issue,Raised By (Email),Ngritur nga (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,I përgjithshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Bashkangjit letër me kokë
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,I përgjithshëm
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Bashkangjit letër me kokë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista kokat tuaja tatimore (p.sh. TVSH, doganore etj, ata duhet të kenë emra të veçantë) dhe normat e tyre standarde. Kjo do të krijojë një template standarde, të cilat ju mund të redaktoni dhe shtoni më vonë."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista kokat tuaja tatimore (p.sh. TVSH, doganore etj, ata duhet të kenë emra të veçantë) dhe normat e tyre standarde. Kjo do të krijojë një template standarde, të cilat ju mund të redaktoni dhe shtoni më vonë."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos kërkuar për Item serialized {0}
 DocType: Journal Entry,Bank Entry,Banka Hyrja
 DocType: Authorization Rule,Applicable To (Designation),Për të zbatueshme (Përcaktimi)
-DocType: Blog Post,Blog Post,Blog Post
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grupi Nga
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Enable / disable monedhave.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Shpenzimet postare
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Purchase Order,The date on which recurring order will be stop,Data në të cilën mënyrë periodike do të ndalet
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} duhet të reduktohet me {1} ose ju duhet të rritet toleranca del nga shtrati
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,I pranishëm Total
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Orë
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Orë
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Krijo Kuotim
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
 DocType: Features Setup,Point of Sale,Pika e Shitjes
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Për të bërë kaçurrela
 DocType: Account,Tax,Tatim
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rresht {0}: {1} nuk eshte e vlefshme {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Rafinim
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rresht {0}: {1} nuk eshte e vlefshme {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Nga Bundle produktit
 DocType: Production Planning Tool,Production Planning Tool,Planifikimi Tool prodhimit
 DocType: Quality Inspection,Report Date,Raporti Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Kurs
 DocType: C-Form,Invoices,Faturat
 DocType: Job Opening,Job Title,Titulli Job
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Marrësit
 DocType: Features Setup,Item Groups in Details,Grupet pika në detaje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Update Vlerësoni dhe Disponueshmëria
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Përqindja ju keni të drejtë për të marrë ose të japë më shumë kundër sasi të urdhëruar. Për shembull: Nëse ju keni urdhëruar 100 njësi. dhe Allowance juaj është 10%, atëherë ju keni të drejtë për të marrë 110 njësi."
 DocType: Pricing Rule,Customer Group,Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: Item,Website Description,Website Përshkrim
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
 ,Sales Register,Shitjet Regjistrohu
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
 DocType: Address,Plant,Fabrikë
-DocType: DocType,Setup,Setup
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Rolling Ftohtë
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
 DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
 DocType: Item,Attributes,Atributet
-DocType: Packing Slip,Get Items,Get Items
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Rendit fundit Date
-DocType: DocField,Image,Imazh
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Bëni Akciza Faturë
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
-DocType: Communication,Other,Tjetër
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Operacioni ID nuk është caktuar
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Vizitë
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Vizitë
 DocType: Leave Type,Is Encash,Është marr me para në dorë
 DocType: Purchase Invoice,Mobile No,Mobile Asnjë
 DocType: Payment Tool,Make Journal Entry,Bëni Journal Hyrja
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Komercial
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 DocType: Cost Center,Distribution Id,Shpërndarja Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Sherbime tmerrshëm
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Të gjitha prodhimet ose shërbimet.
 DocType: Purchase Invoice,Supplier Address,Furnizuesi Adresa
-DocType: Contact Us Settings,Address Line 2,Adresa Line 2
-DocType: ToDo,Reference,Referim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Nga Qty
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seria është i detyrueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Shërbimet Financiare
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3}
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
 DocType: Leave Allocation,Unused leaves,Gjethet e papërdorura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Default llogarive të arkëtueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Rrethore
 DocType: Tax Rule,Billing State,Shteti Faturimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminating
 DocType: Item Reorder,Transfer,Transferim
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintering
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Supplier,Contact HTML,Kontakt HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Me pakicë
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Customer {0} nuk ekziston
 DocType: Attendance,Absent,Që mungon
-DocType: Product Bundle,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle produkt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Shkatërrimtar
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
 DocType: Upload Attendance,Download Template,Shkarko Template
 DocType: GL Entry,Remarks,Vërejtje
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 DocType: Features Setup,POS View,POS Shiko
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Derdhjen e vazhdueshme
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ju lutem specifikoni një
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Sipër
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Sizing Ftohtë
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Llogaria {0} nuk mund të jetë një grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Rajon
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
 DocType: Holiday List,Weekly Off,Weekly Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Për shembull 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Fitimi / Humbja e Përkohshme (Credit)
 DocType: Sales Invoice,Return Against Sales Invoice,Kthehu kundër Sales Faturë
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Pika 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Ju lutemi të vendosur vlera e parazgjedhur {0} në Kompaninë {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Ju lutemi të vendosur vlera e parazgjedhur {0} në Kompaninë {1}
 DocType: Serial No,Creation Time,Krijimi Koha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Të ardhurat totale
 DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Ndihmë
 ,Monthly Attendance Sheet,Mujore Sheet Pjesëmarrja
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nuk ka Record gjetur
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Llogaria {0} është joaktiv
 DocType: GL Entry,Is Advance,Është Advance
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Pjesëmarrja Nga Data dhe Pjesëmarrja deri më sot është e detyrueshme
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,Ju lutemi shkruani &#39;është nënkontraktuar&#39; si Po apo Jo
 DocType: Sales Team,Contact No.,Kontakt Nr
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Fitimi dhe Humbja &#39;llogaria lloj {0} nuk lejohen në Hapja Hyrja
-DocType: Workflow State,Time,Kohë
 DocType: Features Setup,Sales Discounts,Shitjet Zbritje
 DocType: Hub Settings,Seller Country,Shitës Vendi
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
 DocType: Sales Invoice,Terms and Conditions Details,Termat dhe Kushtet Detajet
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Shitjet Taksat dhe Tarifat Stampa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Numri i Rendit
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner që do të tregojnë në krye të listës së produktit.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Specifikoni kushtet për të llogaritur shumën e anijeve
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Shto Fëmija
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roli i lejohet të Accounts ngrirë dhe Edit ngrira gjitha
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Nuk mund të konvertohet Qendra Kosto të librit si ajo ka nyje fëmijë
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Faktori i konvertimit është e nevojshme
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Komisioni për Shitje
 DocType: Offer Letter Term,Value / Description,Vlera / Përshkrim
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Konsumatorët Jo Blerja Që nga kohë të gjatë
 DocType: Production Order,Expected Delivery Date,Pritet Data e dorëzimit
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,I fryrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Hedhjes avullues-model
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Shpenzimet Argëtim
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Moshë
 DocType: Time Log,Billing Amount,Shuma Faturimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Sasia e pavlefshme specifikuar për pika {0}. Sasia duhet të jetë më i madh se 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Aplikimet për leje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Shpenzimet ligjore
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin rendi auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Sales Invoice,Posting Time,Posting Koha
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Të ardhurat New Customer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Shpenzimet e udhëtimit
 DocType: Maintenance Visit,Breakdown,Avari
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Si në Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Provë
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
-DocType: Feed,Full Name,Emri i plotë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Provë
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Gabim Magazina është e detyrueshme për aksioneve Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Pagesa e pagës për muajin {0} dhe vitin {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
 ,Transferred Qty,Transferuar Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Vozitja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planifikim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planifikim
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Bëni Koha Identifikohu Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Lëshuar
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ne shesim këtë artikull
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Ne shesim këtë artikull
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Furnizuesi Id
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 DocType: Sales Partner,Contact Desc,Kontakt Përshkrimi
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Item Menaxher
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Shto rreshtave për të vendosur buxhetet vjetore në llogaritë.
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Gurore
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Të gjitha kontaktet.
 DocType: Newsletter,Test Email Id,Test Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Shkurtesa kompani
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Shkurtesa kompani
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Në qoftë se ju ndiqni të Cilësisë Inspektimit. Mundëson Item QA nevojshme dhe QA Jo në pranimin Blerje
 DocType: GL Entry,Party Type,Lloji Partia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Lëndë e parë nuk mund të jetë i njëjtë si pika kryesore
 DocType: Item Attribute Value,Abbreviation,Shkurtim
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Formim rrotulluese
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Mjeshtër paga template.
 DocType: Leave Type,Max Days Leave Allowed,Max Ditët Pushimi Lejohet
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Set Rregulla Taksa për shopping cart
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
 DocType: Account,Temporary,I përkohshëm
 DocType: Address,Preferred Billing Address,Preferuar Faturimi Adresa
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekretar
 DocType: Serial No,Distinct unit of an Item,Njësi të dallueshme nga një artikull
 DocType: Pricing Rule,Buying,Blerje
 DocType: HR Settings,Employee Records to be created by,Të dhënat e punonjësve që do të krijohet nga
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
 DocType: Purchase Order Item,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Hekurosje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} është ndalur
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
 DocType: Lead,Add to calendar on this date,Shtoni në kalendarin në këtë datë
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Ngjarje të ardhshme
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Konsumatorit është e nevojshme
-DocType: Letter Head,Letter Head,Letër Shef
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hyrja shpejtë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} është e detyrueshme për Kthim
 DocType: Purchase Order,To Receive,Për të marrë
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink përshtatshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Të ardhurat / shpenzimeve
 DocType: Employee,Personal Email,Personale Email
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Ndryshimi Total
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Ndryshimi Total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nëse aktivizuar, sistemi do të shpallë shënimet e kontabilitetit për inventarizimin automatikisht."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerimi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerimi
 DocType: Address,Postal Code,Kodi Postar
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",në minuta Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Urdhërat lëshuar për prodhim.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Hub Settings,Name Token,Emri Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Planifikim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Shitja Standard
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Shitja Standard
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Atleast një depo është e detyrueshme
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ju lutem shkruani Njësia e parazgjedhur e Masës
 DocType: Purchase Invoice Item,Project Name,Emri i Projektit
 DocType: Supplier,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
-DocType: Workflow State,Edit,Redaktoj
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
 DocType: Features Setup,Item Batch Nos,Item Serisë Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pajtimi Pagesa Pagesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Pasuritë tatimore
 DocType: BOM Item,BOM No,Bom Asnjë
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,New Stock UOM duhet të jenë të ndryshme nga e aksioneve UOM tanishme
 DocType: Account,Debit,Debi
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,Lë duhet të ndahen në shumëfisha e 0.5
 DocType: Production Order,Operation Cost,Operacioni Kosto
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ngarko pjesëmarrjen nga një skedar CSV
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt Outstanding
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Qendra Kosto e albumit
 DocType: Purchase Invoice,End Date,End Date
 DocType: Employee,Internal Work History,Historia e brendshme
-DocType: DocField,Column Break,Pushim Column
-DocType: Event,Thursday,E enjte
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Ekuiteti privat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Duke u kthyer
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiteti privat
 DocType: Maintenance Visit,Customer Feedback,Feedback Customer
 DocType: Account,Expense,Shpenzim
 DocType: Sales Invoice,Exhibition,Ekspozitë
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Mbajtur më
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Prodhimi Item
 ,Employee Information,Informacione punonjës
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Shkalla (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Shkalla (%)
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Viti Financiar End Date
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Viti Financiar End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Nuk mund të filtruar në bazë të Voucher Jo, qoftë të grupuara nga Bonon"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ulja e Fituar për pushim pa pagesë (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Lini Rastesishme
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Shënim: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Përmbledhja e kësaj jave
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} duhet të jetë një element i blerë ose nën-kontraktuar në rresht {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Ofrimit Data
-DocType: DocField,Currency,Monedhë
 DocType: Opportunity,Opportunity Date,Mundësi Data
 DocType: Purchase Receipt,Return Against Purchase Receipt,Kthehu përkundrejt marrjes Blerje
 DocType: Purchase Order,To Bill,Për Bill
 DocType: Material Request,% Ordered,% Urdhërohet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Punë me copë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Punë me copë
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Për të diskutuar
 DocType: SMS Settings,SMS Settings,SMS Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Llogaritë e përkohshme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,E zezë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,E zezë
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Shpërthimi i artikullit
 DocType: Account,Auditor,Revizor
 DocType: Purchase Order,End date of current order's period,Data e fundit e periudhës së urdhrit aktual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Të bëjë ofertën Letër
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Kthimi
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
-DocType: DocField,Fold,Dele
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Default njësinë e matjes për Varianti duhet të jetë i njëjtë si Template
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
 DocType: Project Task,Pending Review,Në pritje Rishikimi
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Ju lutem specifikoni
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Customer Id
-DocType: Page,Page Name,Faqe
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Për Koha duhet të jetë më e madhe se sa nga koha
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Gisht mbarimit
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
 DocType: Project Task,Task ID,Detyra ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",p.sh. &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",p.sh. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nuk mund të ekzistojë për Item {0} pasi ka variante
 ,Sales Person-wise Transaction Summary,Sales Person-i mençur Përmbledhje Transaction
-DocType: System Settings,Time Zone,Time Zone
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Magazina {0} nuk ekziston
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regjistrohu Për Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Përqindjet mujore Shpërndarjes
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% E materialeve dorëzuar kundër këtij notën shpërndarëse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,Detajet e klientit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formësimin
 DocType: Employee,Reports to,Raportet për
 DocType: SMS Settings,Enter url parameter for receiver nos,Shkruani parametër url për pranuesit nos
 DocType: Sales Invoice,Paid Amount,Paid Shuma
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Llogarisë {0} mbylljes duhet të jenë të tipit &quot;Përgjegjësia&quot;
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Menaxhimit të Cilësisë
 DocType: Production Planning Tool,Filter based on customer,Filter bazuar në klient
 DocType: Payment Tool Detail,Against Voucher No,Kundër Voucher Nr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
 DocType: Tax Rule,Purchase,Blerje
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Bilanci Qty
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanci Qty
 DocType: Item Group,Parent Item Group,Grupi prind Item
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} për {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Qendrat e kostos
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Depot.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Depot.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Shkalla në të cilën furnizuesit e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konfliktet timings me radhë {1}
 DocType: Opportunity,Next Contact,Kontaktoni Next
 DocType: Employee,Employment Type,Lloji Punësimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Mjetet themelore
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Periudha e aplikimit nuk mund të jetë në dy regjistrave alokimin
 DocType: Item Group,Default Expense Account,Llogaria e albumit shpenzimeve
 DocType: Employee,Notice (days),Njoftim (ditë)
-DocType: Page,Yes,Po
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
 DocType: Employee,Encashment Date,Arkëtim Data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformim
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Kundër Bonon Lloji duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Hyrja"
 DocType: Account,Stock Adjustment,Stock Rregullimit
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Kosto e albumit Aktiviteti ekziston për Aktivizimi Tipi - {0}
 DocType: Production Order,Planned Operating Cost,Planifikuar Kosto Operative
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Emri
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Ju lutem gjeni bashkangjitur {0} # {1}
 DocType: Job Applicant,Applicant Name,Emri i aplikantit
 DocType: Authorization Rule,Customer / Item Name,Customer / Item Emri
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Asnjë Serial është i detyrueshëm për Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ju lutemi specifikoni nga / në varg
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Krijuar nga
 DocType: Serial No,Under AMC,Sipas AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Shkalla e vlerësimit Item rillogaritet duke marrë parasysh ul sasinë kuponave kosto
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Shuma minimale
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Update Mbaroi Mallrat
 DocType: Workstation,per hour,në orë
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seria {0} përdorur tashmë në {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Llogaria për depo (Inventari pandërprerë) do të krijohet në bazë të kësaj llogarie.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 DocType: Company,Distribution,Shpërndarje
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Shuma e paguar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Menaxher i Projektit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 DocType: Customer,Default Taxes and Charges,Taksat dhe tarifat Default
 DocType: Account,Receivable,Arkëtueshme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
 DocType: Sales Invoice,Supplier Reference,Furnizuesi Referenca
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Nëse kontrolluar, bom për artikujt nën-kuvendit do të konsiderohen për marrjen e lëndëve të para. Përndryshe, të gjitha sendet nën-kuvendit do të trajtohen si lëndë e parë."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Shitës Përshkrim
 DocType: Employee Education,Qualification,Kualifikim
 DocType: Item Price,Item Price,Item Çmimi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun dhe detergjent
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
 DocType: Warehouse,Warehouse Name,Magazina Emri
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Shkalla e materialeve në bazë të
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Mbështetje
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Kompania është e humbur në depo {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stock UOM Replace komunale
 DocType: POS Profile,Terms and Conditions,Termat dhe Kushtet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Deri më sot duhet të jetë brenda vitit fiskal. Duke supozuar në datën = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Këtu ju mund të mbajë lartësia, pesha, alergji, shqetësimet mjekësore etj"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,Për Prodhimit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ju lutem shkruani e rendit të shitjes në tabelën e mësipërme
 DocType: Project Task,View Task,Shiko Task
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Vitin e juaj financiare fillon më
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Vitin e juaj financiare fillon më
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ju lutemi shkruani Pranimet Blerje
 DocType: Sales Invoice,Get Advances Received,Get Përparimet marra
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Setup server hyrje për mbështetjen e email id. (P.sh. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Salary Slip,Salary Slip,Shqip paga
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Burnishing
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate paketim rrëshqet për paketat që do të dërgohen. Përdoret për të njoftuar numrin paketë, paketë përmbajtjen dhe peshën e saj."
 DocType: Sales Invoice Item,Sales Order Item,Sales Rendit Item
 DocType: Salary Slip,Payment Days,Ditët e pagesës
 DocType: BOM,Manage cost of operations,Menaxhuar koston e operacioneve
 DocType: Features Setup,Item Advanced,Item Avancuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Kodrina Hot
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kur ndonjë nga transaksionet e kontrolluara janë &quot;Dërguar&quot;, një email pop-up u hap automatikisht për të dërguar një email tek të lidhur &quot;Kontakt&quot; në këtë transaksion, me transaksionin si një shtojcë. Ky përdorues mund ose nuk mund të dërgoni email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cilësimet globale
 DocType: Employee Education,Employee Education,Arsimimi punonjës
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Llogari
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Mundësi potenciale për të shitur.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Pushimi mjekësor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Pushimi mjekësor
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Faturimi Adresa Emri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Dyqane
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Bilanci i Sistemit
-DocType: Workflow,Is Active,Është Aktiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Dyqane
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Bilanci i Sistemit
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
-DocType: Workflow State,Primary,Kryesor
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
 DocType: Item,Max Discount (%),Max Discount (%)
-DocType: Communication,More Information,Me shume informacion
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Shuma Rendit Fundit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Që prish
 DocType: Company,Warn,Paralajmëroj
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Vlerësimi Item updated
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
 DocType: BOM,Manufacturing User,Prodhim i përdoruesit
 DocType: Purchase Order,Raw Materials Supplied,Lëndëve të para furnizuar
 DocType: Purchase Invoice,Recurring Print Format,Format përsëritur Print
-DocType: Communication,Series,Seri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Pritet Data e dorëzimit nuk mund të jetë para se të Rendit Blerje Data
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Zhvillimin e Biznesit Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Zhvillimin e Biznesit Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Mirëmbajtja Vizitoni Qëllimi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Periudhë
 ,General Ledger,Përgjithshëm Ledger
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
 DocType: Features Setup,To get Item Group in details table,Për të marrë Group send në detaje tabelën e
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Rishikimin
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravurë
 DocType: Sales Invoice,Commission,Komision
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Gabim Template </h4><p> Përdor <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> dhe të gjitha fushat e Adresa (duke përfshirë Custom Fields nëse ka ndonjë) do të jenë në dispozicion </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Gabim Shuma
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Magazina nuk gjendet ne sistem
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Magazina nuk gjendet ne sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Përmbledhje këtij muaji
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspektimi Leximi Cilësia
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
 DocType: Payment Tool,Get Outstanding Vouchers,Get Vauçera papaguara
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
 DocType: Appraisal,Start Date,Data e Fillimit
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Vlerë
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Alokimi i lë për një periudhë.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Kliko këtu për të verifikuar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Koha mesatare e marra nga furnizuesi për të ofruar
 DocType: Time Log,Hours,Orë
 DocType: Project,Expected Start Date,Pritet Data e Fillimit
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Hiq pika në qoftë se akuza nuk është i zbatueshëm për këtë artikull
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Qasja e lejuar
-DocType: Dropbox Backup,Weekly,Javor
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,P.sh.. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Merre
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Merre
 DocType: Maintenance Visit,Fully Completed,Përfunduar Plotësisht
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Kualifikimi arsimor
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} është shtuar me sukses në listën tonë Newsletter.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Machining rreze elektron
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Ju lutem, përzgjidhni Data e Fillimit Data e Përfundimit Kohëzgjatja për Item {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Raportet kryesore
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stock Ledger entries balancat updated
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Raportet kryesore
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Add / Edit Çmimet
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Grafiku i Qendrave te Kostos
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Urdhërat e mia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Urdhërat e mia
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
 DocType: Time Log,For Manufacturing,Për Prodhim
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totalet
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totalet
 DocType: BOM,Manufacturing,Prodhim
 ,Ordered Items To Be Delivered,Items urdhëroi që do të dërgohen
 DocType: Account,Income,Të ardhura
-,Setup Wizard,Setup Wizard
 DocType: Industry Type,Industry Type,Industria Type
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Diçka shkoi keq!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data e përfundimit
 DocType: Purchase Invoice Item,Amount (Company Currency),Shuma (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Hedh vdesin
-DocType: Email Alert,Reference Date,Referenca Data
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ju lutemi shkruani nos celular vlefshme
 DocType: Budget Detail,Budget Detail,Detail Buxheti
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ju lutem shkruani mesazhin para se të dërgonte
-DocType: Async Task,Status,Gjendje
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM përditësuar për Item {0}
-DocType: Company History,Year,Vit
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale Profilin
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ju lutem Update SMS Settings
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Koha Identifikohu {0} tashmë faturuar
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
 DocType: Item,Unit of Measure Conversion,Njësia e masës këmbimit
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Punonjësi nuk mund të ndryshohet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
 DocType: Naming Series,Help HTML,Ndihmë HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Kompensimi për tejkalimin {0} kaloi për Item {1}
 DocType: Address,Name of person or organization that this address belongs to.,Emri i personit ose organizatës që kjo adresë takon.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Furnizuesit tuaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Furnizuesit tuaj
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Një tjetër Struktura Paga {0} është aktive për punonjës {1}. Ju lutemi të bëjë statusi i saj &quot;jo aktive&quot; për të vazhduar.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Marrë nga
 DocType: Features Setup,Exports,Eksportet
 DocType: Lead,Converted,Konvertuar
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Nga {0} për {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 DocType: Issue,Content Type,Përmbajtja Type
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Kompjuter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Entries
 DocType: Cost Center,Budgets,Buxhetet
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Përditësuar
 DocType: Employee,Emergency Contact Details,Detajet emergjente Kontakt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Çfarë do të bëni?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Çfarë do të bëni?
 DocType: Delivery Note,To Warehouse,Për Magazina
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Llogaria {0} ka hyrë më shumë se një herë për vitin fiskal {1}
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Update shpenzimet shtesë për të llogaritur koston ul të artikujve
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Përdoruesi ID nuk është caktuar për punonjësit {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Nga Garanci Kërkesës
 DocType: Stock Entry,Default Source Warehouse,Gabim Burimi Magazina
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Ditët Që Rendit Fundit
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Ditët Që Rendit Fundit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
-DocType: User,Enabled,Aktivizuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},A jeni të vërtetë duan të Paraqit të gjitha Kuponi pagave për muajin {0} dhe vitin {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Subscribers importit
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,I pranishëm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
 DocType: Notification Control,Sales Invoice Message,Mesazh Shitjet Faturë
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Llogarisë {0} Mbyllja duhet të jetë e tipit me Përgjegjësi / ekuitetit
 DocType: Authorization Rule,Based On,Bazuar në
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Periudha nga dhe periudha në datat e detyrueshme për të përsëritura {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Aktiviteti i projekt / detyra.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generate paga rrëshqet
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} nuk është një ID e vlefshme email
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Blerja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
-DocType: ToDo,Low,Ulët
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Tjerrje
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ju lutemi të vendosur {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Emri Fushata është e nevojshme
 DocType: Maintenance Visit,Maintenance Date,Mirëmbajtja Data
 DocType: Purchase Receipt Item,Rejected Serial No,Refuzuar Nuk Serial
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Vizatim të thellë
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,New Newsletter
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Shfaq Bilanci
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Sasi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Riveting
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
 ,Sales Analytics,Sales Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Prodhim Cilësimet
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,New Emri i llogarisë
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosto të lëndëve të para furnizuar
 DocType: Selling Settings,Settings for Selling Module,Cilësimet për shitjen Module
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Shërbimi ndaj klientit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Shërbimi ndaj klientit
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Detail Klientit
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Konfirmo Email juaj
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta kandidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt për Dërgoje në dorëzimin e
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Gjithsej gjethet e ndara janë më shumë se ditë në periudhën
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} është e nevojshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakum i derdhur
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data e pritshme nuk mund të jetë e para materiale Kërkesë Data
-DocType: Contact Us Settings,City,Qytet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Përpunimit tejzanor
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Item {0} duhet të jetë një Sales Item
 DocType: Naming Series,Update Series Number,Update Seria Numri
 DocType: Account,Equity,Barazia
 DocType: Sales Order,Printing Details,Shtypi Detajet
 DocType: Task,Closing Date,Data e mbylljes
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Inxhinier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Inxhinier
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Kuvendet Kërko Nën
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
 DocType: Sales Partner,Partner Type,Lloji Partner
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Discount
 DocType: Purchase Invoice,Against Expense Account,Kundër Llogaria shpenzimeve
 DocType: Production Order,Production Order,Rendit prodhimit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Instalimi Shënim {0} tashmë është dorëzuar
 DocType: Quotation Item,Against Docname,Kundër Docname
 DocType: SMS Center,All Employee (Active),Të gjitha Punonjës (Aktive)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Shiko Tani
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Raw Material Kosto
 DocType: Item,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Me kohë të pjesshme
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Seria Përditësuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Raporti Lloji është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Së pari Përdoruesi: Ju
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Së pari Përdoruesi: Ju
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Viti Fiskal Data e Fillimit dhe Viti Fiskal Fundi Data e janë vendosur tashmë në vitin fiskal {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Harmonizuar me sukses
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Harmonizuar me sukses
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Tax Rule,Validity,Vlefshmëri
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Shuma e faturuar
 DocType: Attendance,Attendance,Pjesëmarrje
-DocType: Page,No,Jo
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nëse nuk kontrollohet, lista do të duhet të shtohet për çdo Departamentit ku ajo duhet të zbatohet."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
@@ -3689,55 +3376,46 @@
 ,Item Prices,Çmimet pika
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Me fjalë do të jetë i dukshëm një herë ju ruani qëllim blerjen.
 DocType: Period Closing Voucher,Period Closing Voucher,Periudha Voucher Mbyllja
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Lista e Çmimeve mjeshtër.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Lista e Çmimeve mjeshtër.
 DocType: Task,Review Date,Data shqyrtim
 DocType: Purchase Invoice,Advance Payments,Pagesat e paradhënies
-DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Magazinë synuar në radhë {0} duhet të jetë i njëjtë si Rendit Prodhimi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,&quot;Njoftimi Email Adresat &#39;jo të specifikuara për përsëritura% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Mulliri
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Nuk ka leje për të përdorur mjet pagese
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,&quot;Njoftimi Email Adresat &#39;jo të specifikuara për përsëritura% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Shpenzimet administrative
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Këshillues
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Këshillues
 DocType: Customer Group,Parent Customer Group,Grupi prind Klientit
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Ndryshim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 DocType: Appraisal Goal,Score Earned,Vota fituara
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",p.sh. &quot;My Company LLC&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Periudha Njoftim
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",p.sh. &quot;My Company LLC&quot;
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Periudha Njoftim
 DocType: Bank Reconciliation Detail,Voucher ID,Voucher ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Kjo është një territor rrënjë dhe nuk mund të redaktohen.
 DocType: Packing Slip,Gross Weight UOM,Bruto Pesha UOM
 DocType: Email Digest,Receivables / Payables,Arketueshme / Te Pagueshme
 DocType: Delivery Note Item,Against Sales Invoice,Kundër Sales Faturës
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Vulosje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Trego zero vlerat
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Sasia e sendit të marra pas prodhimit / ripaketimin nga sasi të caktuara të lëndëve të para
 DocType: Payment Reconciliation,Receivable / Payable Account,Arkëtueshme / pagueshme Llogaria
 DocType: Delivery Note Item,Against Sales Order Item,Kundër Sales Rendit Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 DocType: Task,Actual End Date (via Time Logs),Aktuale End Date (nëpërmjet Koha Shkrime)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ju lutemi shkruani qendra kosto prind
 DocType: Delivery Note,Print Without Amount,Print Pa Shuma
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Tatimore Kategoria nuk mund të jetë &#39;vlerësim të&#39; ose &#39;Vlerësimi dhe Total&#39; si të gjitha sendet janë objekte jo-aksioneve
-DocType: User,Last Name,Mbiemër
-DocType: Web Page,Left,Majtas
-DocType: Event,All Day,Të gjitha Day
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Tatimore Kategoria nuk mund të jetë &#39;vlerësim të&#39; ose &#39;Vlerësimi dhe Total&#39; si të gjitha sendet janë objekte jo-aksioneve
 DocType: Issue,Support Team,Mbështetje Ekipi
 DocType: Appraisal,Total Score (Out of 5),Rezultati i përgjithshëm (nga 5)
-DocType: Contact Us Settings,State,Shtet
 DocType: Batch,Batch,Grumbull
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Ekuilibër
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Ekuilibër
 DocType: Project,Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime)
-DocType: User,Gender,Gjini
 DocType: Journal Entry,Debit Note,Debiti Shënim
 DocType: Stock Entry,As per Stock UOM,Sipas Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Jo Skaduar
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Krijo rregulla për të kufizuar transaksionet në bazë të vlerave.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nëse kontrolluar, Gjithsej nr. i ditëve të punës do të përfshijë pushimet, dhe kjo do të zvogëlojë vlerën e pagave Per Day"
 DocType: Purchase Invoice,Total Advance,Advance Total
-DocType: Workflow State,User,Përdorues
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Përpunimi Pagave
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Bëje si Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagesa Pranimi Shënim
 DocType: Customer,Credit Days Based On,Ditët e kredisë së bazuar në
 DocType: Tax Rule,Tax Rule,Rregulla Tatimore
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Ruajtja njëjtin ritëm Gjatë gjithë Sales Cikli
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifikoni kohë shkrimet jashtë orarit Workstation punës.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} tashmë është dorëzuar
 ,Items To Be Requested,Items të kërkohet
-DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Vlerësoni Faturimi bazuar në aktivitet të llojit (në orë)
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Kompania Email ID nuk u gjet, prandaj nuk mail dërguar"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 DocType: Production Planning Tool,Filter based on item,Filter bazuar në pikën
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Llogaria Debiti
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
 DocType: Sales Invoice,Rounded Total (Company Currency),Harmonishëm Total (Kompania Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
 DocType: Purchase Common,Purchase Common,Blerje përbashkët
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Nga Opportunity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Boshatisjes
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Përfitimet e Punonjësve
 DocType: Sales Invoice,Is POS,Është POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Faturat e ngritura për të Konsumatorëve.
-DocType: DocField,Default,Mospagim
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekti Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonentë shtuar
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Define Buxheti për këtë qendër kosto. Për të vendosur veprimin e buxhetit, shih &quot;Lista e Kompanive&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Expense Claim,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Përzgjedhja &quot;Po&quot; do të japë një identitet unik për çdo subjekt të këtij artikulli i cili mund të shihet në Serial Nr mjeshtri.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vlerësimi {0} krijuar për punonjësit {1} në datën e caktuar varg
 DocType: Employee,Education,Arsim
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
 DocType: Address,Office,Zyrë
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Raportet Standard
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Për të krijuar një Llogari Tatimore
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
 DocType: Employee,Current Address,Adresa e tanishme
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nëse pika është një variant i një tjetër çështje pastaj përshkrimin, imazhi, çmimi, taksat, etj do të vendoset nga template përveç nëse specifikohet shprehimisht"
 DocType: Serial No,Purchase / Manufacture Details,Blerje / Detajet Prodhimi
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Inventar Batch
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Inventar Batch
 DocType: Employee,Contract End Date,Kontrata Data e përfundimit
 DocType: Sales Order,Track this Sales Order against any Project,Përcjell këtë Urdhër Sales kundër çdo Projektit
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,"Shitjes tërheq urdhëron (në pritje për të ofruar), bazuar në kriteret e mësipërme"
-DocType: DocShare,Document Type,Dokumenti Type
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nga furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Nga furnizuesi Kuotim
 DocType: Deduction Type,Deduction Type,Zbritja Type
 DocType: Attendance,Half Day,Gjysma Dita
 DocType: Pricing Rule,Min Qty,Min Qty
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Për të ndjekur artikuj në shitje dhe dokumentet e blerjes me nr grumbull. &quot;Industria e preferuar: Kimikatet&quot;
 DocType: GL Entry,Transaction Date,Transaksioni Data
 DocType: Production Plan Item,Planned Qty,Planifikuar Qty
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Tatimi Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tatimi Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Për sasinë (Prodhuar Qty) është i detyrueshëm
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
 DocType: Notification Control,Purchase Receipt Message,Blerje Pranimi Mesazh
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Gjithsej gjethet e ndara janë më shumë se periudha
 DocType: Production Order,Actual Start Date,Aktuale Data e Fillimit
 DocType: Sales Order,% of materials delivered against this Sales Order,% E materialeve dorëzuar kundër këtij Rendit Shitje
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Lëvizja rekord pika.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Newsletter Lista Subscriber
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Shërbim
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 ,Monthly Salary Register,Paga mujore Regjistrohu
-apps/frappe/frappe/website/template.py +140,Next,Tjetër
 DocType: Warranty Claim,If different than customer address,Nëse është e ndryshme se sa adresën e konsumatorëve
 DocType: BOM Operation,BOM Operation,Bom Operacioni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Në Shuma Previous Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ju lutem shkruani Shuma për pagesë në atleast një rresht
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ju lutem shkruani Shuma për pagesë në atleast një rresht
 DocType: POS Profile,POS Profile,POS Profilin
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Shuma e pagesës nuk mund të jetë më e madhe se shuma e papaguar
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Gjithsej papaguar
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Gjithsej papaguar
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Koha Identifikohu nuk është billable
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Blerës
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Blerës
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Paguajnë neto nuk mund të jetë negative
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ju lutem shkruani kundër Vauçera dorë
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ju lutem shkruani kundër Vauçera dorë
 DocType: SMS Settings,Static Parameters,Parametrat statike
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Tatimi i artikullit
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Dërgo SMS në masë për kontaktet tuaja
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Konsideroni tatimit apo detyrimit për
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-kodrina
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Pika për të prodhuar apo ripaketohen
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
 DocType: Purchase Invoice,Next Date,Next Data
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ju lutemi shkruani taksat dhe tatimet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Machining
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
 DocType: Hub Settings,Seller Name,Shitës Emri
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Ripaketoi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ju duhet të ruani formën para se të vazhdoni
 DocType: Item Attribute,Numeric Values,Vlerat numerike
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Bashkangjit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Bashkangjit Logo
 DocType: Customer,Commission Rate,Rate Komisioni
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Shporta është bosh
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Shuma e ndarë nuk mund të më të madhe se shuma unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Shuma e ndarë nuk mund të më të madhe se shuma unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Lejo Prodhimi në pushime
 DocType: Sales Order,Customer's Purchase Order Date,Konsumatorit Rendit Blerje Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
-DocType: Dropbox Backup,Send Backups to Dropbox,Dërgo Backups të Dropbox
 DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Projektues
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Projektues
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Automatikisht të krijojë materiale Kërkesë nëse sasia bie nën këtë nivel
 ,Item-wise Purchase Register,Pika-mençur Blerje Regjistrohu
 DocType: Batch,Expiry Date,Data e Mbarimit
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Për të vendosur nivelin Reorder, pika duhet të jetë një artikull i blerë ose Prodhim Item"
 ,Supplier Addresses and Contacts,Adresat Furnizues dhe Kontaktet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Mjeshtër projekt.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill e materialeve
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
-DocType: Dropbox Backup,Send Notifications To,Dërgo Lajmërimet Për
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Data
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: Expense Claim Detail,Sanctioned Amount,Shuma e sanksionuar
 DocType: GL Entry,Is Opening,Është Hapja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Llogaria {0} nuk ekziston
 DocType: Account,Cash,Para
 DocType: Employee,Short biography for website and other publications.,Biografia e shkurtër për faqen e internetit dhe botime të tjera.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Ju lutem të krijuar strukturën e pagave për punonjës {0}

diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index b1ea991..f4af3e2 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Плата режим
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Изаберите мјесечни, ако желите да пратите на основу сезонског."
 DocType: Employee,Divorced,Разведен
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Упозорење: Исти предмет је ушао више пута.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Ставке које се већ синхронизовано
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволите тачка треба додати више пута у трансакцији
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Одбацити Материјал Посетите {0} пре отказивања ове гаранцији
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Производи широке потрошње
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Производи широке потрошње
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Молимо Вас да одаберете Парти Типе први
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Прекаљивање
 DocType: Item,Customer Items,Предмети Цустомер
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рачун {0}: {1 Родитељ рачун} не може бити књига
 DocType: Item,Publish Item to hub.erpnext.com,Објављивање ставку да хуб.ерпнект.цом
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Оставите Аппроверс
 DocType: Sales Partner,Dealer,Трговац
 DocType: Employee,Rented,Изнајмљени
-DocType: About Us Settings,Website,Вебсајт
 DocType: POS Profile,Applicable for User,Важи за кориснике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Набијања плус синтерирање
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Од материјала захтеву
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Од материјала захтеву
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дрво
 DocType: Job Applicant,Job Applicant,Посао захтева
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Нема више резултата.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,правни
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,правни
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Актуелне тип порез не може бити укључен у стопу тачка у низу {0}
 DocType: C-Form,Customer,Купац
 DocType: Purchase Receipt Item,Required By,Обавезно Би
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серия Обновлено Успешно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Шивење
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Више цене аукцији .
 ,Purchase Order Items To Be Received,Налог за куповину ставке које се примају
 DocType: SMS Center,All Supplier Contact,Све Снабдевач Контакт
 DocType: Quality Inspection Reading,Parameter,Параметар
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Нова апликација одсуство
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: курс мора да буде исти као {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Нова апликација одсуство
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банка Нацрт
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Да бисте задржали купца мудрог код ставке и да их претраживати на основу њиховог кода користили ову опцију
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Схов Варијанте
-DocType: Sales Invoice Item,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Количина
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,На складишту
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Направите нови ПОС Профиле
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,здравство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 DocType: Purchase Invoice,Monthly,Месечно
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Кашњење у плаћању (Дани)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Е-маил адреса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,одбрана
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Е-маил адреса
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
 DocType: Company,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ров # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ров # {0}:
 DocType: Delivery Note,Vehicle No,Нема возила
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Изаберите Ценовник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Обрада дрвета
 DocType: Production Order Operation,Work In Progress,Ворк Ин Прогресс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3Д штампање
 DocType: Employee,Holiday List,Холидаи Листа
 DocType: Time Log,Time Log,Време Лог
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,рачуновођа
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,рачуновођа
 DocType: Cost Center,Stock User,Сток Корисник
 DocType: Company,Phone No,Тел
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Лог активности обављају корисници против Задаци који се могу користити за праћење времена, наплату."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Нови {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Нови {0}: # {1}
 ,Sales Partners Commission,Продаја Партнери Комисија
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Аббревиатура не может иметь более 5 символов
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Атрибут Вредност {0} не може бити уклоњен из {1} као тачка Варијанте \ постоје у овај атрибут.
-DocType: Print Settings,Classic,Класик
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,То јекорен рачун и не може се мењати .
 DocType: BOM,Operations,Операције
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
 DocType: Bin,Quantity Requested for Purchase,Количина Затражено за куповину
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Отварање за посао.
 DocType: Item Attribute,Increment,Повећање
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Изабери Варехоусе ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,оглашавање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,оглашавање
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 DocType: Payment Reconciliation,Reconcile,помирити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,бакалница
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Маке Банк Ентри
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пензиони фондови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Магацин је обавезна ако аццоунт типе Магацин
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Проверите да ли се понављају ред, уклоните ознаку да заустави понављају или ставити одговарајућу од завршетка"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
 DocType: SMS Log,SMS Log,СМС Пријава
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Трошкови уручене пошиљке
-DocType: Blog Post,Guest,Гост
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Счет за материалы
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Отварање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Отварање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} {1} да
 DocType: Item,Copy From Item Group,Копирање из ставке групе
 DocType: Journal Entry,Opening Entry,Отварање Ентри
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} является обязательным
 DocType: Stock Entry,Additional Costs,Додатни трошкови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
 DocType: Lead,Product Enquiry,Производ Енкуири
-DocType: Standard Reply,Owner,власник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Молимо унесите прва компанија
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Одредите прво Компанија
 DocType: Employee Education,Under Graduate,Под Дипломац
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Циљна На
 DocType: BOM,Total Cost,Укупни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Развртање
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Активност Пријављивање :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Некретнине
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Некретнине
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Изјава рачуна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармација
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
-DocType: Custom Script,Client,Клијент
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,потребляемый
 DocType: Upload Attendance,Import Log,Увоз се
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Годишња плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Акции Расходы
 DocType: Newsletter,Email Sent?,Емаил Сент?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Схов Тиме Протоколи
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} должен быть Покупка товара
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Све датуми и запослени комбинација у одабраном периоду ће доћи у шаблону, са постојећим евиденцију"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Да ли ће бити ажурирани након продаје Рачун се подноси.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Исправљање
 DocType: BOM Replace Tool,New BOM,Нови БОМ
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Батцх Тиме трупци за наплату.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Цоунтергравити ливење
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Информационный бюллетень уже был отправлен
 DocType: Lead,Request Type,Захтев Тип
 DocType: Leave Application,Reason,Разлог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,радиодифузија
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,извршење
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,извршење
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Први корисник ће постати систем менаџер (можете променити ово касније).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детаљи о пословању спроведена.
 DocType: Serial No,Maintenance Status,Одржавање статус
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Предмети и цене
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Предмети и цене
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датума треба да буде у оквиру фискалне године. Под претпоставком Од датума = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Изаберите запосленог за кога правите процену.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не принадлежит компании {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не может быть до даты доставки для Пункт {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Попуст на цену Лист стопа (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,старт
-DocType: User,First Name,Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Пуно радно калупима
 DocType: Offer Letter,Select Terms and Conditions,Изаберите Услови
 DocType: Production Planning Tool,Sales Orders,Салес Ордерс
 DocType: Purchase Taxes and Charges,Valuation,Вредновање
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Банковни рачун
 DocType: Leave Type,Allow Negative Balance,Дозволи негативан салдо
 DocType: Selling Settings,Default Territory,Уобичајено Територија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,телевизија
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Гасхинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Счет {0} не принадлежит компании {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
 DocType: Customer Group,Mention if non-standard receivable account applicable,Спомените ако нестандардни потраживања рачуна примењује
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Для требуется Склад перед Отправить
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,На примљене
 DocType: Sales Partner,Reseller,Продавац
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Унесите фирму
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
 DocType: Newsletter List,Total Subscribers,Укупно Претплатници
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контакт Име
+,Contact Name,Контакт Име
 DocType: Production Plan Item,SO Pending Qty,СО чекању КТИ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Ствара плата листић за горе наведених критеријума.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Захтев за куповину.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Дупли становање
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Леавес по години
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; именовања серије
 DocType: Time Log,Will be updated when batched.,Да ли ће се ажурирати када дозирају.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ров {0}: Проверите 'Да ли је напредно ""против налог {1} ако је ово унапред унос."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Магацин {0} не припада фирми {1}
-DocType: Bulk Email,Message,Порука
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
-DocType: Dropbox Backup,Dropbox Access Key,Дропбок Приступни тастер
 DocType: Payment Tool,Reference No,Референца број
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,годовой
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
 DocType: Material Request Item,Min Order Qty,Минимална количина за поручивање
 DocType: Lead,Do Not Contact,Немојте Контакт
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Стеам ИД за праћење свих понавља фактуре. Генерише се на субмит.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Софтваре Девелопер
 DocType: Item,Minimum Order Qty,Минимална количина за поручивање
 DocType: Pricing Rule,Supplier Type,Снабдевач Тип
 DocType: Item,Publish in Hub,Објављивање у Хуб
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Металном жицом
 DocType: Employee,Relation,Однос
 DocType: Shipping Rule,Worldwide Shipping,Широм света Достава
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Потврђена наређења од купаца.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Хуббинг
 DocType: Purchase Invoice Item,Expense Head,Расходи шеф
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Изаберите Тип пуњења први
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,најновији
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знакова
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Выбор языка
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знакова
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Први одсуство одобраватељ на листи ће бити постављен као подразумевани Аппровер Леаве
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Онемогућава стварање временских трупаца против производних налога. Операције неће бити праћени против Продуцтион Ордер
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Варијанта
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} должно быть Service Элемент
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
-DocType: DocType,Administrator,Администратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Ласерски бушење
-DocType: Stock UOM Replace Utility,New Stock UOM,Нова берза УОМ
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циркуларне референце Грешка
-DocType: Communication,Closed,Затворено
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери.
 DocType: Lead,Industry,Индустрија
 DocType: Employee,Job Profile,Профиль работы
 DocType: Newsletter,Newsletter,Билтен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Хидроформинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Љубакање
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Пункт обновляется
-DocType: Async Task,System Manager,Систем менаџер
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
 DocType: Sales Invoice Item,Delivery Note,Обавештење о пријему пошиљке
-DocType: Dropbox Backup,Allow Dropbox Access,Дозволи Дропбок Аццесс
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Подешавање Порези
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Workstation,Rent Cost,Издавање Трошкови
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Изаберите месец и годину
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Компанија Е-маил
 DocType: GL Entry,Debit Amount in Account Currency,Дебитна Износ у валути рачуна
 DocType: Shipping Rule,Valid for Countries,Важи за земље
-DocType: Workflow State,Refresh,Освежити
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Все импорта смежных областях , как валюты, обменный курс , общий объем импорта , импорт общего итога и т.д. доступны в ТОВАРНЫЙ ЧЕК , поставщиков цитаты , счета-фактуры Заказа т.д."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Укупно Ордер Сматра
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Стопа по којој Купац Валута се претварају у основне валуте купца
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступный в спецификации , накладной , счете-фактуре, производственного заказа , заказа на поставку , покупка получение, счет-фактура , заказ клиента , фондовой въезда, расписания"
 DocType: Item Tax,Tax Rate,Пореска стопа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Избор артикла
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Избор артикла
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Куповина Потврда мора да се поднесе
-DocType: Stock UOM Replace Utility,Current Stock UOM,Тренутне залихе УОМ
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша имејл адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Воденим млазом
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Подешавање Већ Комплетна !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Подешавање Већ Комплетна !
 ,Finished Goods,готове робе
 DocType: Delivery Note,Instructions,Инструкције
 DocType: Quality Inspection,Inspected By,Контролисано Би
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Молимо вас, НЕМОЈТЕ правити рачуна за купцима и добављачима. Они су директно створен од стране клијената / добављач мајстора."
 DocType: Currency Exchange,Currency Exchange,Мењачница
 DocType: Purchase Invoice Item,Item Name,Назив
+DocType: Authorization Rule,Approving User  (above authorized value),Одобравање Корисник (изнад овлашћеног вредности)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Кредитни биланс
 DocType: Employee,Widowed,Удовички
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",Ставке се тражени који су &quot;Оут оф Стоцк&quot; с обзиром на све магацине засноване на пројектованом Кти и Минимална количина за поручивање
@@ -380,24 +348,23 @@
 ,Purchase Register,Куповина Регистрација
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,медицинский
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,медицинский
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Разлог за губљење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Тубе извлачење
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 DocType: Employee,Single,Самац
 DocType: Issue,Attachment,Прилог
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Буџет не може да се подеси за групу трошкова Центар
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
 DocType: Purchase Invoice,Yearly,Годишње
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Унесите трошка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Унесите трошка
 DocType: Journal Entry Account,Sales Order,Продаја Наручите
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Про. Продајни
 DocType: Purchase Order,Start date of current order's period,Старт датум периода постојећи поредак је
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
-DocType: Delivery Note,% Installed,Инсталирано % 
+DocType: Delivery Note,% Installed,Инсталирано %
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Молимо унесите прво име компаније
 DocType: BOM,Item Desription,Ставка Десриптион
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Је група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Аутоматски подешава серијски бр на основу ФИФО
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформирање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Резање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Да Предмет бр&#39; не може бити мањи од &#39;Од Предмет бр&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некоммерческое
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Није Стартед
 DocType: Lead,Channel Partner,Цханнел Партнер
 DocType: Account,Old Parent,Стари Родитељ
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Мастер отдыха .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Схелл лајсне
 DocType: Material Request Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Унесите Шифра .
 DocType: BOM,Costing,Коштање
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Укупно ком
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,У распону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Ценные бумаги и депозиты
 DocType: Features Setup,Imports,Увоз
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Лепљења
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Пендинг активности за данас
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Гледалаца рекорд.
 DocType: Bank Reconciliation,Journal Entries,Часопис Ентриес
 DocType: Sales Order Item,Used for Production Plan,Користи се за производни план
-DocType: System Settings,Loading...,Учитавање ...
-DocType: DocField,Password,Шифра
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Фусед таложење моделирање
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време између операција (у минута)
 DocType: Customer,Buyer of Goods and Services.,Купац робе и услуга.
 DocType: Journal Entry,Accounts Payable,Обавезе према добављачима
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додај претплатника
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" Не постоји"
 DocType: Pricing Rule,Valid Upto,Важи до
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Прямая прибыль
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете да филтрирате на основу налога , ако груписани по налогу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Административни службеник
 DocType: Payment Tool,Received Or Paid,Прими или исплати
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry,Difference Account,Разлика налог
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,козметика
-DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
-DocType: Communication,Subject,Предмет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 ,Serial No Warranty Expiry,Серијски Нема гаранције истека
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,ставка
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управљање Подуговарање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новый UOM НЕ должен иметь тип целого числа
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управљање Подуговарање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Мебель и приспособления
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Стопа по којој се Ценовник валута претвара у основну валуту компаније
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Материјал Захтев
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} не Приобретите товар
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} је неважећи емаил адреса у 'Обавештење \
  емаил адресе'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Укупно цард Ова Година:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Укупно цард Ова Година:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не могу да избришем серијски број {0}, као што се користи у промету акција"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Затварање (Цр)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Затварање (Цр)
 DocType: Serial No,Warranty Period (Days),Гарантни период (дани)
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 ,Pending Qty,Кол чекању
 DocType: Job Applicant,Thread HTML,Тема ХТМЛ
 DocType: Company,Ignore,Игнорисати
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},СМС порука на следеће бројеве телефона: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
 DocType: Pricing Rule,Valid From,Важи од
 DocType: Sales Invoice,Total Commission,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**Месечна Дистрибуција** помаже распоредите свој буџет по месецима ако је ваш посао сезонског типа.
 
  Да распоредите буџет користећи ову расподелу, поставите **Месечна расподела** у **Трошковни Центар**"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Нема резултата у фактури табели записи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
-DocType: About Us Settings,Website Manager,Сајт менаџер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Фискална година Датум почетка не би требало да буде већа од Фискална година Датум завршетка
 DocType: Warranty Claim,Resolution,Резолуција
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Достављено: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Обрачун и Статус испоруке
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,предыдущий
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продаја Ретурн
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Изаберите продајних налога из које желите да креирате налоге производњу.
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Плата компоненте.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База потенцијалних купаца.
+DocType: Authorization Rule,Customer or Item,Кориснички или артикла
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Кориснички базе података.
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Додељена сума не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Гимнастика
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Уобичајено јединица мере за тачке {0} не може директно мењати, јер сте већ направили неке трансакције (с) са другим УЦГ. Мораћете да креирате нову ставку да користи другачији Дефаулт УЦГ."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Додељена сума не може бити негативан
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
-DocType: Event,Wednesday,Среда
 DocType: Sales Invoice,Customer's Vendor,Купца Продавац
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Производња налог обавезујући
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Писање предлога
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Писање предлога
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Још једна особа Продаја {0} постоји са истим запослених ид
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Отрицательный Ошибка со ( {6} ) по пункту {0} в Склад {1} на {2} {3} в {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанија
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Уобичајено Кошта курс
 DocType: Maintenance Schedule,Maintenance Schedule,Одржавање Распоред
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Молимо вас да инсталирате Дропбок питон модул
 DocType: Employee,Passport Number,Пасош Број
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,менаџер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Од рачуном
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Исто аукција је ушао више пута.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,менаџер
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Од рачуном
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Исто аукција је ушао више пута.
 DocType: SMS Settings,Receiver Parameter,Пријемник Параметар
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""На основу"" и ""Групиши по"" не могу бити идентични"
 DocType: Sales Person,Sales Person Targets,Продаја Персон Мете
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,на
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Пожалуйста, введите адрес электронной почты,"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Крај цеви формирање
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Претвори у групи
 DocType: Activity Cost,Activity Type,Активност Тип
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Фиксни дана
 DocType: Sales Invoice,Packing List,Паковање Лист
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Куповина наређења према добављачима.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,објављивање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,објављивање
 DocType: Activity Cost,Projects User,Пројекти Упутства
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Цонсумед
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} није пронађен у табели Фактура Детаљи
 DocType: Company,Round Off Cost Center,Заокружују трошка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Техническое обслуживание Посетить {0} должно быть отменено до отмены этого заказ клиента
 DocType: Material Request,Material Transfer,Пренос материјала
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Открытие (д-р )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Подешавања
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Истовара порези и таксе
 DocType: Production Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Више
 DocType: Pricing Rule,Sales Manager,Менаџер продаје
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Преименовање
 DocType: Journal Entry,Write Off Amount,Отпис Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Савијање
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволите кориснику
 DocType: Journal Entry,Bill No,Бил Нема
 DocType: Purchase Invoice,Quarterly,Тромесечни
 DocType: Selling Settings,Delivery Note Required,Испорука Напомена Обавезно
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Purchase Receipt,Other Details,Остали детаљи
 DocType: Account,Accounts,Рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Равно сечење
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Да бисте пратили ставку у продаји и куповини докумената на основу њихових серијских бр. Ово се такође може користити за праћење детаље гаранције производа.
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Одбијен Магацин је обавезна против регецтед ставке
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Employee,Provide email id registered in company,Обезбедити ид е регистрован у предузећу
 DocType: Hub Settings,Seller City,Продавац Град
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дрво Тип
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Против Ваучер Тип мора бити један од продаје Реда, продаја Фактура или Јоурнал Ентри"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Биомацхининг
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Није могуће пронаћи курса
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ваздушно-космички простор
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,добро пожаловать
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ваздушно-космички простор
 DocType: Journal Entry,Credit Card Entry,Кредитна картица Ступање
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Задатак Предмет
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Роба примљена од добављача.
-DocType: Communication,Open,Отворено
 DocType: Lead,Campaign Name,Назив кампање
 ,Reserved,Резервисано
 DocType: Purchase Order,Supply Raw Materials,Суппли Сировине
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} не является акционерным Пункт
 DocType: Mode of Payment Account,Default Account,Уобичајено Рачун
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
-DocType: Contact Us Settings,Address Title,Адреса Наслов
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
-DocType: Dropbox Backup,Daily,Дневно
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Счет с существующей сделки не могут быть преобразованы в книге
 DocType: Delivery Note,Customer's Purchase Order No,Наруџбенице купца Нема
 DocType: Employee,Cell Number,Мобилни број
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Аутоматско Материјал Захтеви Генератед
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,изгубљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,енергија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Месечна плата изјава.
 DocType: Item Group,Website Specifications,Сајт Спецификације
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Нови налог
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Од {0} типа {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Аццоунтинг прилога може се против листа чворова. Записи против групе нису дозвољени.
-DocType: ToDo,High,Висок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
-DocType: User,Male,Мушки
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},"Покупка Получение число , необходимое для Пункт {0}"
 DocType: Item Attribute Value,Item Attribute Value,Итем Вредност атрибута
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампании по продажам .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Лични
 DocType: Expense Claim Detail,Expense Claim Type,Расходи потраживање Тип
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Дефаулт сеттингс фор Корпа
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Јоурнал Ентри {0} је повезан против Реда {1}, проверите да ли треба издвајали као унапред у овом рачуну."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,биотехнологија
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Јоурнал Ентри {0} је повезан против Реда {1}, проверите да ли треба издвајали као унапред у овом рачуну."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,биотехнологија
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Офис эксплуатационные расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хемминг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Process Payroll,Send Email,Сенд Емаил
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Без дозвола
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Ажурирање Сток &quot;не може се проверити, јер ствари нису достављене преко {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Нос
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Нос
 DocType: Item,Items with higher weightage will be shown higher,Предмети са вишим веигхтаге ће бити приказано више
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирење Детаљ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Моји рачуни
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Моји рачуни
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Не работник не найдено
 DocType: Purchase Order,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Да бисте омогућили &quot;Поинт оф Сале&quot; Феатурес
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
-DocType: Comment,Reference Name,Референтни Име
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: Sales Invoice Item,Target Warehouse,Циљна Магацин
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Ожидаемая дата поставки не может быть до даты заказа на продажу
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
 DocType: Production Order,Item To Manufacture,Ставка за производњу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Стална калупима
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Налог за куповину на исплату
 DocType: Sales Order Item,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
 DocType: Newsletter,Newsletter Manager,Билтен директор
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отварање&#39;
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
 DocType: Expense Claim,Expenses,расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Тачка Варијанта Атрибут
 ,Purchase Receipt Trends,Куповина Трендови Пријем
 DocType: Appraisal,Select template from which you want to get the Goals,Изаберите шаблон из којег желите да добијете циљеве
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Истраживање и развој
 ,Amount to Bill,Износ на Предлог закона
 DocType: Company,Registration Details,Регистрација Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Стакинг
 DocType: Item,Re-Order Qty,Поново поручивање
 DocType: Leave Block List Date,Leave Block List Date,Оставите Датум листу блокираних
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планируется отправить {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Сток Детаљи
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Пројекат Вредност
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Место продаје
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносить {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Стања на рачуну већ у Кредит, није вам дозвољено да поставите 'биланс треба да се' као 'Дебит """
 DocType: Account,Balance must be,Баланс должен быть
 DocType: Hub Settings,Publish Pricing,Објављивање Цене
 DocType: Notification Control,Expense Claim Rejected Message,Расходи потраживање Одбијен поруку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Закуцавање
 ,Available Qty,Доступно ком
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходни ред Укупно
 DocType: Salary Slip,Working Days,Радних дана
 DocType: Serial No,Incoming Rate,Долазни Оцени
 DocType: Packing Slip,Gross Weight,Бруто тежина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .
 DocType: HR Settings,Include holidays in Total no. of Working Days,Укључи одмор у Укупан бр. радних дана
 DocType: Job Applicant,Hold,Држати
 DocType: Employee,Date of Joining,Датум Придруживање
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Погледај Претплатници
 DocType: Purchase Invoice Item,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Брусни минирања
 DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Мастер Валютный курс .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,БОМ {0} мора бити активна
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
 DocType: Salary Slip,Leave Encashment Amount,Оставите Износ Енцасхмент
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серийный номер {0} не принадлежит Пункт {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обавезно Кол
 DocType: Bank Reconciliation,Total Amount,Укупан износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Интернет издаваштво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Интернет издаваштво
 DocType: Production Planning Tool,Production Orders,Налога за производњу
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Биланс Вредност
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продаја Ценовник
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Објављивање за синхронизацију ставки
-DocType: GL Entry,Account Currency,Рачун Валута
+DocType: Bank Reconciliation,Account Currency,Рачун Валута
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Молимо да наведете заокружују рачун у компанији
 DocType: Purchase Receipt,Range,Домет
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Features Setup,Item Barcode,Ставка Баркод
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Address,Shop,Продавница
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Employee,Permanent Address Is,Стална адреса је
 DocType: Production Order Operation,Operation completed for how many finished goods?,Операција завршена за колико готове робе?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Исправка за преко-{0} прешао за пункт {1}.
 DocType: Employee,Exit Interview Details,Екит Детаљи Интервју
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Куповина ставке поруџбине
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Косвенная прибыль
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Сет износ уплате преостали износ =
-DocType: Contact Us Settings,Address Line 1,Аддресс Лине 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Варијација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Име компаније
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Варијација
+,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Избор тачка за трансфер
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Погледајте листу сву помоћ видео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Изаберите главу рачуна банке у којој је депонован чек.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволите кориснику да измените Рате Ценовник у трансакцијама
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,хемијски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 DocType: Process Payroll,Select Payroll Year and Month,Изабери Паиролл година и месец
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Иди на одговарајуће групе (обично Примена средстава&gt; обртна имовина&gt; банковне рачуне и креирати нови налог (кликом на Додај Цхилд) типа &quot;Банка&quot;
 DocType: Workstation,Electricity Cost,Струја Трошкови
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
-DocType: Comment,Unsubscribed,Отказали
 DocType: Opportunity,Walk In,Шетња у
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial центры Стоимость .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Преносе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Бео
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикрепите свою фотографию
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Правити
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикрепите свою фотографию
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Правити
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
-DocType: Workflow State,Stop,стани
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Моја Корпа
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Наручи Тип мора бити један од {0}
 DocType: Lead,Next Contact Date,Следеће Контакт Датум
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Отварање Кол
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Количина за {0}
 DocType: Leave Application,Leave Application,Оставите апликацију
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Оставите Тоол доделе
 DocType: Leave Block List,Leave Block List Dates,Оставите Датуми листу блокираних
 DocType: Company,If Monthly Budget Exceeded (for expense account),Ако Месечни буџет Прекорачено (за расход рачун)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Скраћивање
 DocType: Workstation,Net Hour Rate,Нет час курс
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слетео набавну Пријем
 DocType: Company,Default Terms,Уобичајено Правила
 DocType: Packing Slip Item,Packing Slip Item,Паковање Слип Итем
 DocType: POS Profile,Cash/Bank Account,Готовина / банковног рачуна
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подношење
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Попуст
 DocType: Features Setup,Purchase Discounts,Куповина Попусти
 DocType: Workstation,Wages,Плате
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Issue,Issue,Емисија
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Рачун не одговара Цомпани
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ВИП Магацин
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 DocType: BOM Operation,Operation,Операција
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Достава Држава
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Коммерческие расходы
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандардна Куповина
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандардна Куповина
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Макинг Стоцк записи
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
 DocType: Item,Default Supplier,Уобичајено Снабдевач
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над производњом Исправка Проценат
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,упдатед преко Тиме Логс
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просек година
 DocType: Opportunity,Your sales person who will contact the customer in future,Ваш продавац који ће контактирати купца у будућности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Листанеколико ваших добављача . Они могу бити организације и појединци .
 DocType: Company,Default Currency,Уобичајено валута
 DocType: Contact,Enter designation of this Contact,Унесите назив овог контакта
-DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Од запосленог
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Направите унос Дифференце
 DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума
 DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,и година:
 DocType: Email Digest,Annual Expense,Годишњи трошак
 DocType: SMS Center,Total Characters,Укупно Карактери
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Ц-Форм Рачун Детаљ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Плаћање Помирење Фактура
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Допринос%
 DocType: Item,website page link,веб страница веза
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Хајде да припреми систем за прве употребе.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,. Компанија регистарски бројеви за референцу Порески бројеви итд
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Изаберите Протоколи време и слање да створи нову продајну фактуру.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Продаја Рачун Адванце
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ништа се захтевати
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,управљање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,управљање
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Врсте активности за време Схеетс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Ливење
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Либо дебетовая или кредитная сумма необходима для {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Плава
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Плава
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
 DocType: Price List Country,Price List Country,Ценовник Земља
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Даље чворови могу бити само створена под ' групе' типа чворова
@@ -1020,50 +946,43 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Шифра не може се мењати за серијским бројем
 DocType: Purchase Order Item,UOM Conversion Factor,УОМ конверзије фактор
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Ламинирано објекат производња
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Пружи формирање
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ваша особа продаја ће добити подсетник на овај датум да се контактира купца
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Порески и други плата одбитака.
 DocType: Lead,Lead,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Account,Warehouse,Магацин
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
 ,Purchase Order Items To Be Billed,Налог за куповину артикала буду наплаћени
 DocType: Purchase Invoice Item,Net Rate,Нето курс
 DocType: Purchase Invoice Item,Purchase Invoice Item,Фактури Итем
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ледгер уноси и ГЛ Пријаве се постављати за одабране куповине Примања
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Тачка 1
 DocType: Holiday,Holiday,Празник
-DocType: Event,Saturday,Субота
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставите празно ако се сматра за све гране
 ,Daily Time Log Summary,Дневни Време Лог Преглед
-DocType: DocField,Label,Налепница
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неусаглашена Детаљи плаћања
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
 DocType: Lead,Call,Позив
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Подешавање Запослени
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Мрежа """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Пожалуйста, выберите префикс первым"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,истраживање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Contact,User ID,Кориснички ИД
-DocType: Communication,Sent,Сент
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Погледај Леџер
-DocType: File,Lft,ЛФТ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
-DocType: Communication,Delivery Status,Статус испоруке
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 DocType: Production Order,Manufacture against Sales Order,Производња против налога за продају
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
@@ -1074,13 +993,11 @@
 DocType: BOM Item,Item Description,Ставка Опис
 DocType: Payment Tool,Payment Mode,Режим плаћања
 DocType: Purchase Invoice,Is Recurring,Је се понавља
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Директан метални ласерски синтерирање
 DocType: Purchase Order,Supplied Items,Додатна артикала
 DocType: Production Order,Qty To Manufacture,Кол Да Производња
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржавајте исту стопу током куповине циклуса
 DocType: Opportunity Item,Opportunity Item,Прилика шифра
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Привремени Отварање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Цриороллинг
 ,Employee Leave Balance,Запослени одсуство Биланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
 DocType: Address,Address Type,Врста адресе
@@ -1096,35 +1013,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Мали
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Мали
 DocType: Employee,Employee Number,Запослени Број
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Случай Нет (ы) уже используется. Попробуйте из дела № {0}
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Тачка 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Глава счета {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелен
 DocType: Item,Auto re-order,Ауто поново реда
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Укупно Постигнута
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Укупно Постигнута
 DocType: Employee,Place of Issue,Место издавања
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,уговор
-DocType: Report,Disabled,Онеспособљен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,уговор
+DocType: Email Digest,Add Quote,Додај Куоте
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,пољопривреда
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваши производи или услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Име је обавезно
 DocType: Purchase Invoice,Recurring Type,Понављајући Тип
 DocType: Address,City/Town,Град / Место
 DocType: Email Digest,Annual Income,Годишњи приход
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} должен быть Субдоговорная Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капитальные оборудование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
@@ -1134,14 +1050,13 @@
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Очекивани Датум испоруке је мањи од планираног почетка Датум.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Укупно Одлазећи
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Там может быть только один Правило Начальные с 0 или пустое значение для "" To Размер """
 DocType: Authorization Rule,Transaction,Трансакција
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примечание: Эта МВЗ является Группа . Невозможно сделать бухгалтерские проводки против групп .
-apps/frappe/frappe/config/desk.py +7,Tools,Алат
 DocType: Item,Website Item Groups,Сајт Итем Групе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Производња би број је обавезна за парк ентри намене производње
 DocType: Purchase Invoice,Total (Company Currency),Укупно (Фирма валута)
@@ -1149,24 +1064,22 @@
 DocType: Journal Entry,Journal Entry,Јоурнал Ентри
 DocType: Workstation,Workstation Name,Воркстатион Име
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментари
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
 DocType: Naming Series,This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Оценка Оцените требуется для Пункт {0}
 DocType: Quality Inspection Reading,Reading 8,Читање 8
 DocType: Sales Partner,Agent,Агент
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може ли треба променити &quot;дистрибуира пријава по &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Порези и накнаде израчунавање
 DocType: BOM Operation,Workstation,Воркстатион
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,аппаратные средства
 DocType: Attendance,HR Manager,ХР Менаџер
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изаберите Цомпани
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Потребно је да омогућите Корпа
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Нема података
 DocType: Appraisal Template Goal,Appraisal Template Goal,Процена Шаблон Гол
 DocType: Salary Slip,Earning,Стицање
 DocType: Payment Tool,Party Account Currency,Странка Рачун Валута
@@ -1176,26 +1089,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекрытие условия найдено между :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Укупна вредност поруџбине
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,еда
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Можете направити временску дневник само против поднетом производног како
 DocType: Maintenance Schedule Item,No of Visits,Број посета
-DocType: File,old_parent,олд_парент
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Билтене контактима, води."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Операције не може остати празно.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Операције не може остати празно.
 ,Delivered Items To Be Billed,Испоручени артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
-DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
-DocType: Letter Head,Is Default,Да ли Уобичајено
 DocType: Address,Utilities,Комуналне услуге
 DocType: Purchase Invoice Item,Accounting,Рачуноводство
 DocType: Features Setup,Features Setup,Функције за подешавање
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Погледај Понуда Писмо
-DocType: Communication,Communication,Комуникација
 DocType: Item,Is Service Item,Да ли је услуга шифра
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
 DocType: Activity Cost,Projects,Пројекти
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Пожалуйста, выберите финансовый год"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Од {0} | {1} {2}
@@ -1214,7 +1124,7 @@
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Leave Control Panel,Leave blank if considered for all designations,Оставите празно ако се сматра за све ознакама
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Мак: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Од датетиме
 DocType: Email Digest,For Company,За компаније
@@ -1224,7 +1134,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1238,31 +1148,28 @@
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,То до лист
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативна Количина није дозвољено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,шегрт
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативна Количина није дозвољено
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Пореска детаљ сто учитани из тачка мајстора у виду стринг и складиште у овој области.
  Користи се за таксама и накнадама"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Ланцинг
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Не активна структура плата фоунд фор запосленом {0} и месец
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Пореска Правило за трансакције.
 DocType: Rename Tool,Type of document to rename.,Врста документа да преименујете.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Купујемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Купујемо ову ставку
 DocType: Address,Billing,Обрачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Флангинг
-DocType: Bulk Email,Not Sent,Није Сент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Експлозив формирање
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Укупни порези и таксе (Друштво валута)
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планируется отправить {0} получателей
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub сборки
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Supplier,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
@@ -1272,104 +1179,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Адреса додао.
 DocType: Workstation Working Hour,Workstation Working Hour,Воркстатион радни сат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,аналитичар
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака количини ЈВ {2}
 DocType: Item,Inventory,Инвентар
 DocType: Features Setup,"To enable ""Point of Sale"" view",Да бисте омогућили &quot;Поинт Оф Сале&quot; поглед
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Плаћање не може се за празан корпу
 DocType: Item,Sales Details,Детаљи продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Пиннинг
 DocType: Opportunity,With Items,Са ставкама
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У Кол
 DocType: Notification Control,Expense Claim Rejected,Расходи потраживање Одбијен
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Датум који ће бити генерисан следећи рачун. То се генерише на достави.
 DocType: Item Attribute,Item Attribute,Итем Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,правительство
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Ставка Варијанте
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,правительство
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Ставка Варијанте
 DocType: Company,Services,Услуге
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Укупно ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Укупно ({0})
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Нема резултата у табели плаћања записи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Финансовый год Дата начала
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Нема резултата у табели плаћања записи
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Финансовый год Дата начала
 DocType: Employee External Work History,Total Experience,Укупно Искуство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Упуштања
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Material Request Item,Sales Order No,Продаја Наручите Нема
 DocType: Item Group,Item Group Name,Ставка Назив групе
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Такен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Трансфер материјал за производњу
 DocType: Pricing Rule,For Price List,Для Прейскурантом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Екецутиве Сеарцх
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Куповина стопа за ставку: {0} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додатне Износ попуста (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Ошибка: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Ошибка: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Молимо креирајте нови налог из контном оквиру .
 DocType: Maintenance Visit,Maintenance Visit,Одржавање посета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Кориснички> Кориснички Група> Територија
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступно партије Кол у складишту
 DocType: Time Log Batch Detail,Time Log Batch Detail,Време Лог Групно Детаљ
-DocType: Workflow State,Tasks,задаци
 DocType: Landed Cost Voucher,Landed Cost Help,Слетео Трошкови Помоћ
-DocType: Event,Tuesday,Уторак
 DocType: Leave Block List,Block Holidays on important days.,Блоцк Холидаис он важним данима.
 ,Accounts Receivable Summary,Потраживања од купаца Преглед
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Молимо поставите Усер ИД поље у запису запослених за постављање Емплоиее Роле
 DocType: UOM,UOM Name,УОМ Име
-DocType: Top Bar Item,Target,Мета
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Допринос Износ
 DocType: Sales Invoice,Shipping Address,Адреса испоруке
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Овај алат помаже вам да ажурирају и поправити количину и вредновање складишту у систему. Обично се користи за синхронизацију вредности система и шта заправо постоји у вашим складиштима.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,У речи ће бити видљив када сачувате напомену Деливери.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Бренд господар.
-DocType: ToDo,Due Date,Дуе Дате
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Бренд господар.
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,коробка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Организација
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,коробка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Организација
 DocType: Monthly Distribution,Monthly Distribution,Месечни Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производња Продаја план Наручи
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Књиговодство Ступање на {0} може се вршити само у валути: {1}
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Угаоно исецање
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банковни рачуни
 ,Bank Reconciliation Statement,Банка помирење Изјава
 DocType: Address,Lead Name,Олово Име
 ,POS,ПОС
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Отварање Сток Стање
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Отварање Сток Стање
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} мора појавити само једном
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Није дозвољено да транфер више {0} од {1} против нарудзбенице {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нет объектов для вьючных
 DocType: Shipping Rule Condition,From Value,Од вредности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Производња Количина је обавезно
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Износи не огледа у банци
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Износи не огледа у банци
 DocType: Quality Inspection Reading,Reading 4,Читање 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Центрифугална ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнетно поље уз помоћ завршни
 DocType: Company,Default Holiday List,Уобичајено Холидаи Лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Акции Обязательства
 DocType: Purchase Receipt,Supplier Warehouse,Снабдевач Магацин
 DocType: Opportunity,Contact Mobile No,Контакт Мобиле Нема
 DocType: Production Planning Tool,Select Sales Orders,Избор продајних налога
 ,Material Requests for which Supplier Quotations are not created,Материјални Захтеви за који Супплиер Цитати нису створени
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Да бисте пратили ставки помоћу баркод. Моћи ћете да унесете ставке у испоруци напомени и продаје фактуру за скенирање баркода на ставке.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Означи као Деливеред
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Означи као Деливеред
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Направи понуду
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 DocType: SMS Center,Receiver List,Пријемник Листа
@@ -1377,31 +1276,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Погледај
 DocType: Salary Structure Deduction,Salary Structure Deduction,Плата Структура Одбитак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективно ласерски синтерирање
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Увоз Успешна !
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Количина не сме бити више од {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Старост (Дани)
 DocType: Quotation Item,Quotation Item,Понуда шифра
 DocType: Account,Account Name,Име налога
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Од датума не може бити већа него до сада
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Тип Поставщик мастер .
 DocType: Purchase Order Item,Supplier Part Number,Снабдевач Број дела
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Додати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коэффициент конверсии не может быть 0 или 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} отказан или заустављен
 DocType: Accounts Settings,Credit Controller,Кредитни контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Отпрема Возила Датум
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
 DocType: Company,Default Payable Account,Уобичајено оплате рачуна
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Подешавања за онлине куповину као што су испоруке правила, ценовник итд"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершение установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Приходована
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Резервисано Кол
 DocType: Party Account,Party Account,Странка налог
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна у Компанија валути
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Моји проблеми
@@ -1410,12 +1305,9 @@
 DocType: Company,Default Values,Уобичајено Вредности
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ров {0}: Плаћање износ не може бити негативан
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Притисните Фиттинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 DocType: Payment Reconciliation,Payments,Исплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Хот изостатичко пресовање
-DocType: ToDo,Medium,Средњи
 DocType: Budget Detail,Budget Allocated,Буџет Издвојена
 DocType: Journal Entry,Entry Type,Ступање Тип
 ,Customer Credit Balance,Кориснички кредитни биланс
@@ -1424,12 +1316,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
 DocType: Quotation,Term Details,Орочена Детаљи
 DocType: Manufacturing Settings,Capacity Planning For (Days),Капацитет планирање за (дана)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 DocType: Warranty Claim,Warranty Claim,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
-DocType: Authorization Rule,Approving User,Одобравање корисника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Фалсификовање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Позлаћивање
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
 DocType: Pricing Rule,Applicable For,Применимо для
 DocType: Bank Reconciliation,From Date,Од датума
@@ -1451,64 +1340,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Онлине Аукције
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Онлине Аукције
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Наведите било Количина или вредновања оцену или обоје
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанија , месец и Фискална година је обавезно"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Једна јединица једне тачке.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Время входа Пакетная {0} должен быть ' Представленные '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направите Рачуноводство унос за сваки Стоцк Покрета
 DocType: Leave Allocation,Total Leaves Allocated,Укупно Лишће Издвојена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Магацин потребно на Ров Но {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Молимо Вас да унесете важи финансијске године датум почетка
 DocType: Employee,Date Of Retirement,Датум одласка у пензију
 DocType: Upload Attendance,Get Template,Гет шаблона
 DocType: Address,Postal,Поштански
 DocType: Item,Weightage,Веигхтаге
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Рударство
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола ливење
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Изаберите {0} прво.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
 DocType: Stock Entry,Material Receipt,Материјал Пријем
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукты
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Продукты
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Странка Тип и Странка је потребан за примања / обавезе обзир {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Магацин {0} не може бити обрисан јер постоји количина за Ставку {1}
 DocType: Quotation,Order Type,Врста поруџбине
 DocType: Purchase Invoice,Notification Email Address,Обавештење е-маил адреса
 DocType: Payment Tool,Find Invoices to Match,Пронађи фактуре да одговара
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","нпр ""КСИЗ Народна банка """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Укупно Циљна
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Укупно Циљна
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Корпа је омогућено
 DocType: Job Applicant,Applicant for a Job,Подносилац захтева за посао
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Нет Производственные заказы , созданные"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Зарплата скольжения работника {0} уже создано за этот месяц
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Sales Invoice Item,Batch No,Групно Нема
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,основной
-DocType: DocPerm,Delete,Избрисати
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варијанта
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Нови {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Остановился заказ не может быть отменен. Unstop отменить .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Item,Variants,Варијанте
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
 DocType: Sales Team,Contribution to Net Total,Допринос нето укупни
 DocType: Sales Invoice Item,Customer's Item Code,Шифра купца
 DocType: Stock Reconciliation,Stock Reconciliation,Берза помирење
@@ -1517,53 +1404,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Подносилац захтева за посао.
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
-DocType: Country,Country,Земља
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адресе
-DocType: Communication,Received,примљен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Дубликат Серийный номер вводится для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Услов за владавину Схиппинг
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Тачка није дозвољено да имају Продуцтион Ордер.
-DocType: DocField,Attach Image,Прикрепите изображение
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето тежина овог пакета. (Израчунава аутоматски као збир нето тежине предмета)
-DocType: Stock Reconciliation Item,Leave blank if no change,Оставите празно ако нема промене
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Тиме Протоколи за производњу.
 DocType: Item,Apply Warehouse-wise Reorder Level,Нанесите Варехоусе-Висе Реордер Левел
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Време Пријава за задатке.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Плаћање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Плаћање
 DocType: Production Order Operation,Actual Time and Cost,Тренутно време и трошак
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Поздрав
-DocType: Communication,Rejected,Одбијен
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Бундле ставке у време продаје.
 DocType: Sales Order Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
 DocType: Quality Inspection Reading,Reading 10,Читање 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",Наведите своје производе или услуге које купују или продају .
 DocType: Hub Settings,Hub Node,Хуб Ноде
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Унели дупликате . Молимо исправи и покушајте поново .
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Вредност {0} за Аттрибуте {1} не постоји у листи важећег тачке вредности атрибута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,помоћник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,помоћник
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Истекло
 DocType: Packing Slip,To Package No.,За Пакет број
-DocType: DocType,System,Систем
 DocType: Warranty Claim,Issue Date,Датум емитовања
 DocType: Activity Cost,Activity Cost,Активност Трошкови
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потрошено Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,телекомуникација
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,телекомуникација
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 DocType: Payment Tool,Make Payment Entry,Уплатите Ентри
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Продаје Фактура трендови
 DocType: Leave Application,Apply / Approve Leaves,Нанесите / Цоунт Леавес
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Због
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку , только если тип заряда «О Предыдущая сумма Row » или « Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Испорука Складиште
 DocType: Stock Settings,Allowance Percent,Исправка Проценат
@@ -1575,33 +1457,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаја се мора проверити, ако је применљиво Јер је изабрана као {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Снабдевач Понуда шифра
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Маке плата Структура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Стрижа
 DocType: Item,Has Variants,Хас Варијанте
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Кликните на &#39;да продаје Фактура&#39; дугме да бисте креирали нову продајну фактуру.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Паковање и етикетирање
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Пожалуйста, сформулируйте Базовая валюта в компании Мастер и общие настройки по умолчанию"
-DocType: Dropbox Backup,Dropbox Access Secret,Дропбок Приступ тајна
 DocType: Purchase Invoice,Recurring Invoice,Понављајући Рачун
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управљање пројектима
 DocType: Supplier,Supplier of Goods or Services.,Добављач робе или услуга.
 DocType: Budget Detail,Fiscal Year,Фискална година
 DocType: Cost Center,Budget,Буџет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Постигнута
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територија / Кориснички
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,например 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,например 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,У речи ће бити видљив када сачувате продаје фактуру.
 DocType: Item,Is Sales Item,Да ли продаје артикла
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ставка Група дрво
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не установка для мастера серийные номера Проверить товара
 DocType: Maintenance Visit,Maintenance Time,Одржавање време
 ,Amount to Deliver,Износ на Избави
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт или сервис
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Било је грешака .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Таппинг
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Продукт или сервис
 DocType: Naming Series,Current Value,Тренутна вредност
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} создан
 DocType: Delivery Note Item,Against Sales Order,Против продаје налога
@@ -1615,15 +1492,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
 DocType: Website Item Group,Website Item Group,Сајт тачка Група
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Пошлины и налоги
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} уноса плаћања не може да се филтрира од {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Табела за ставку која ће бити приказана у веб сајта
 DocType: Purchase Order Item Supplied,Supplied Qty,Додатна количина
 DocType: Material Request Item,Material Request Item,Материјал Захтев шифра
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево товарные группы .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Дерево товарные группы .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Црвен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Црвен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
@@ -1633,12 +1510,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Ров # {0}: Операција {1} није завршен за {2} кти готових производа у производњи заказа # {3}. Плеасе упдате статус операције преко временском дневнику
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Промена УОМ за артикал.
 DocType: Quality Inspection Reading,Acceptance Criteria,Критеријуми за пријем
 DocType: Item Attribute,Attribute Name,Назив атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} должно быть продажи или в пункте СЕРВИС {1}
 DocType: Item Group,Show In Website,Схов у сајт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Група
 DocType: Task,Expected Time (in hours),Очекивано време (у сатима)
 ,Qty to Order,Количина по поруџбини
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Да бисте пратили бренд име у следећим документима испоруци, прилика, материјалној Захтев тачка, нарудзбенице, купите ваучер, Наручилац пријему, цитат, Продаја фактура, Производ Бундле, Салес Ордер, Сериал Но"
@@ -1647,78 +1523,67 @@
 DocType: Holiday List,Clear Table,Слободан Табела
 DocType: Features Setup,Brands,Брендови
 DocType: C-Form Invoice Detail,Invoice No,Рачун Нема
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Од наруџбеницу
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Од наруџбеницу
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите се не може применити / отказана пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
 DocType: Activity Cost,Costing Rate,Кошта курс
 ,Customer Addresses And Contacts,Кориснички Адресе и контакти
 DocType: Employee,Resignation Letter Date,Оставка Писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Нот Сет
-DocType: Communication,Date,Датум
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Стрпите се док ваш систем бити подешавање . Ово може да потраје неколико тренутака .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,пара
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,пара
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
 DocType: Delivery Note,Excise Page Number,Акцизе Број странице
 DocType: Employee,Personal Details,Лични детаљи
 ,Maintenance Schedules,Планове одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Ембоссинг
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Как Производственный заказ можно сделать по этой статье, он должен быть запас пункт ."
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Спајање
-DocType: Authorization Rule,Above Value,Изнад Вредност
 ,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Испоручено
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Настройка сервера входящей подрабатывать электронный идентификатор . (например jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Укупно издвојена лишће {0} не може бити мањи од већ одобрених лишћа {1} за период
 DocType: Journal Entry,Accounts Receivable,Потраживања
 ,Supplier-Wise Sales Analytics,Добављач - Висе Салес Аналитика
 DocType: Address Template,This format is used if country specific format is not found,Овај формат се користи ако земља специфична формат није пронађен
-DocType: Custom Field,Custom,Обичај
 DocType: Production Order,Use Multi-Level BOM,Користите Мулти-Левел бом
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Бризгање
 DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial счетов.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Оставите празно ако се сматра за све типове запослених
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирају пријава по
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Счет {0} должен быть типа "" Fixed Asset "", как товара {1} является активом Пункт"
 DocType: HR Settings,HR Settings,ХР Подешавања
-apps/frappe/frappe/config/setup.py +130,Printing,Штампање
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"День (дни) , на котором вы подаете заявление на отпуск , отпуск . Вам не нужно обратиться за разрешением ."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,и
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Аббр не може бити празно или простор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,спортски
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Укупно Стварна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,блок
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Пожалуйста, установите ключи доступа Dropbox на своем сайте конфигурации"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,блок
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваша финансијска година се завршава
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваша финансијска година се завршава
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
-DocType: Authorization Rule,Approving Role,Одобравање улоге
 ,BOM Search,БОМ Тражи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Затварање (Опенинг + износи)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Молимо наведите валуту у Друштву
 DocType: Workstation,Wages per hour,Сатнице
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Сток стање у батцх {0} ће постати негативна {1} за {2} тачком у складишту {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Показать / скрыть функции, такие как последовательный Нос, POS и т.д."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следећи материјал захтеви су аутоматски подигнута на основу нивоа поновног реда ставке
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвет не может быть до даты регистрации в строке {0}
 DocType: Salary Slip,Deduction,Одузимање
 DocType: Address Template,Address Template,Адреса шаблона
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
@@ -1730,34 +1595,31 @@
 DocType: Opportunity,Quotation,Понуда
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 DocType: Quotation,Maintenance User,Одржавање Корисник
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Трошкови ажурирано
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Трошкови ажурирано
 DocType: Employee,Date of Birth,Датум рођења
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} уже вернулся
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Фискална година** представља Финансијску годину. Све рачуноводствене уносе и остале главне трансакције се прате наспрам **Фискалне фодине**.
 DocType: Opportunity,Customer / Lead Address,Кориснички / Олово Адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Опис посла
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Пожалуйста, выберите правильный файл CSV с данными"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Превлака
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Пратите продајне акције. Пратите води, Куотатионс, продаја Ордер итд из кампање да измери повраћај инвестиције."
 DocType: Expense Claim,Approver,Одобраватељ
 ,SO Qty,ТАКО Кол
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток уноси постоје против складишта {0}, стога не можете поново доделите или промени Варехоусе"
 DocType: Appraisal,Calculate Total Score,Израчунајте Укупна оцена
 DocType: Supplier Quotation,Manufacturing Manager,Производња директор
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Пошиљке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Дип лајсне
-DocType: Purchase Order,To be delivered to customer,Који ће бити достављен купца
+apps/erpnext/erpnext/hooks.py +68,Shipments,Пошиљке
+DocType: Purchase Order Item,To be delivered to customer,Који ће бити достављен купца
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Време Пријави статус мора да се поднесе.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серијски број {0} не припада ниједној Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Подешавање
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ров #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ров #
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
 DocType: Pricing Rule,Supplier,Добављач
 DocType: C-Form,Quarter,Четврт
@@ -1768,37 +1630,32 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Изнад
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Пользователь {0} отключена
 DocType: Leave Application,Total Leave Days,Укупно ЛЕАВЕ Дана
-DocType: Journal Entry Account,Credit in Account Currency,Кредит на рачуну Валута
 DocType: Email Digest,Note: Email will not be sent to disabled users,Напомена: Е-маил неће бити послат са инвалидитетом корисницима
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Currency Exchange,From Currency,Од валутног
-DocType: DocField,Name,Име
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Износи не огледа у систему
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Заказать продаж требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Износи не огледа у систему
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,другие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,другие
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
 DocType: POS Profile,Taxes and Charges,Порези и накнаде
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Производ или сервис који се купити, продати или држати у складишту."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завршен
-DocType: Web Form,Select DocType,Изаберите ДОЦТИПЕ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Броацхинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,банкарство
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы получить график"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Нови Трошкови Центар
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Нови Трошкови Центар
 DocType: Bin,Ordered Quantity,Наручено Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","например ""Build инструменты для строителей """
 DocType: Quality Inspection,In Process,У процесу
 DocType: Authorization Rule,Itemwise Discount,Итемвисе Попуст
 DocType: Purchase Order Item,Reference Document Type,Референтна Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} против Салес Ордер {1}
-DocType: Account,Fixed Asset,Исправлена активами
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серијализоване Инвентар
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} против Салес Ордер {1}
+DocType: Account,Fixed Asset,Исправлена активами
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серијализоване Инвентар
 DocType: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
 DocType: Time Log Batch,Total Billing Amount,Укупно обрачуна Износ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Потраживања рачуна
@@ -1806,19 +1663,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продаја Налог за плаћања
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Време трупци цреатед:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Employee,Blood Group,Крв Група
 DocType: Purchase Invoice Item,Page Break,Страна Пауза
 DocType: Production Order Operation,Pending,Нерешен
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Корисници који могу одобри одсуство апликације у конкретној запосленог
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ви не можете да промените подразумевани УЦГ варијанте. Да бисте променили подразумевани УЦГ за варијанту промене подразумевани УЦГ на Шаблон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,оборудование офиса
 DocType: Purchase Invoice Item,Qty,Кол
 DocType: Fiscal Year,Companies,Компаније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,електроника
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,електроника
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигните захтев залиха материјала када достигне ниво поновно наручивање
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Од распореду одржавања
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Пуно радно време
 DocType: Purchase Invoice,Contact Details,Контакт Детаљи
 DocType: C-Form,Received Date,Примљени Датум
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ако сте направили стандардни образац у продаји порези и таксе Темплате, изаберите један и кликните на дугме испод."
@@ -1830,14 +1687,15 @@
 DocType: Job Applicant,Job Opening,Посао Отварање
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,технологија
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
 DocType: Offer Letter,Offer Letter,Понуда Леттер
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Генеришите Захтеви материјал (МРП) и производних налога.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Укупно фактурисано Амт
 DocType: Time Log,To Time,За време
+DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Да бисте додали дете чворове , истражују дрво и кликните на чвору под којим желите да додате још чворова ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
 DocType: Production Order Operation,Completed Qty,Завршен Кол
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Прайс-лист {0} отключена
@@ -1847,12 +1705,10 @@
 DocType: Item,Customer Item Codes,Кориснички кодова
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Направи Оплата записи против налога или фактурама.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Заваривање
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новый фонда Единица измерения требуется
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Све ставке су већ фактурисано
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Наведите тачну &#39;Од Предмет бр&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
 DocType: Features Setup,Item Serial Nos,Итем Сериал Нос
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе
@@ -1862,15 +1718,13 @@
 DocType: Bin,Actual Quantity,Стварна Количина
 DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серијски број {0} није пронађен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваши Купци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Компресија лајсне
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Ваши Купци
 DocType: Leave Block List Date,Block Date,Блоцк Дате
 DocType: Sales Order,Not Delivered,Није Испоручено
 ,Bank Clearance Summary,Банка Чишћење Резиме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Создание и управление ежедневные , еженедельные и ежемесячные дайджесты новостей."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Код товара> товара Група> Бренд
 DocType: Appraisal Goal,Appraisal Goal,Процена Гол
-DocType: Event,Friday,Петак
 DocType: Time Log,Costing Amount,Кошта Износ
 DocType: Process Payroll,Submit Salary Slip,Пошаљи Слип платама
 DocType: Salary Structure,Monthly Earning & Deduction,Месечна зарада и дедукције
@@ -1878,16 +1732,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Увоз у расутом стању
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
 DocType: SMS Log,Sender Name,Сендер Наме
-DocType: Page,Title,Наслов
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Прилагодите
 DocType: POS Profile,[Select],[ Изаберите ]
 DocType: SMS Log,Sent To,Послат
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Маке Салес фактура
 DocType: Company,For Reference Only.,За справки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Неважећи {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Унапред Износ
 DocType: Manufacturing Settings,Capacity Planning,Капацитет Планирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Од датума"" је обавезно"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Од датума"" је обавезно"
 DocType: Journal Entry,Reference Number,Референтни број
 DocType: Employee,Employment Details,Детаљи за запошљавање
 DocType: Employee,New Workplace,Новом радном месту
@@ -1902,7 +1754,7 @@
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,путешествие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,путешествие
 DocType: Leave Block List,Allow Users,Дозволи корисницима
 DocType: Purchase Order,Customer Mobile No,Кориснички Мобилни број
 DocType: Sales Invoice,Recurring,Који се враћа
@@ -1910,23 +1762,21 @@
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Пренос материјала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
 DocType: Installation Note,Installation Note,Инсталација Напомена
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додај Порези
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Додај Порези
 ,Financial Analytics,Финансијски Аналитика
 DocType: Quality Inspection,Verified By,Верифиед би
 DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
 DocType: Quality Inspection,Purchase Receipt No,Куповина Пријем Нема
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,задаток
-DocType: System Settings,In Hours,У часовима
 DocType: Process Payroll,Create Salary Slip,Направи Слип платама
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Очекује стање као по банци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Брушење
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Очекује стање као по банци
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Источник финансирования ( обязательства)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
 DocType: Appraisal,Employee,Запосленик
@@ -1939,15 +1789,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Sales Invoice,Mass Mailing,Масовна Маилинг
-DocType: Page,Standard,Стандард
 DocType: Rename Tool,File to Rename,Филе Ренаме да
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Схов Плаћања
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Величина
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,График обслуживания {0} должно быть отменено до отмены этого заказ клиента
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,фармацевтический
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Трошкови Купљено
 DocType: Selling Settings,Sales Order Required,Продаја Наручите Обавезно
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Креирање корисника
@@ -1957,30 +1805,25 @@
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Је замрзнут
 DocType: Buying Settings,Buying Settings,Куповина Сеттингс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса обрада
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,БОМ Но за готових добре тачке
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Настройка сервера входящей для продажи электронный идентификатор . (например sales@example.com )
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Tool,Payment Account,Плаћање рачуна
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Наведите компанија наставити
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Нацрт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсационные Выкл
 DocType: Quality Inspection Reading,Accepted,Примљен
-DocType: User,Female,Женски
-DocType: Journal Entry Account,Debit in Account Currency,Дебитна у обзир Валута
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
-DocType: Print Settings,Modern,Модеран
-DocType: Communication,Replied,Одговорено
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неважећи референца {0} {1}
 DocType: Payment Tool,Total Payment Amount,Укупно Износ за плаћање
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може бити већи од планираног куанитити ({2}) у производњи Низ {3}
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировине не може бити празан.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Сировине не може бити празан.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Као што постоје постојеће трансакције стоцк за ову ставку, \ не можете променити вредности &#39;има серијски Не&#39;, &#39;Има серијски бр&#39;, &#39;Да ли лагеру предмета&#39; и &#39;Процена Метод&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Брзо Јоурнал Ентри
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
@@ -1988,17 +1831,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Захтеви за ставке.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Одвојена производња поруџбина ће бити направљен за сваку готовог добар ставке.
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,завершение установки
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Рачуноводствени унос замрзнуте до овог датума, нико не може / изменити унос осим улоге доле наведеном."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Билтен Маилинг листа
 DocType: Delivery Note,Transporter Name,Транспортер Име
+DocType: Authorization Rule,Authorized Value,Овлашћени Вредност
 DocType: Contact,Enter department to which this Contact belongs,Унесите одељење које се овај контакт припада
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Укупно Абсент
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Јединица мере
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Јединица мере
 DocType: Fiscal Year,Year End Date,Датум завршетка године
 DocType: Task Depends On,Task Depends On,Задатак Дубоко У
 DocType: Lead,Opportunity,Прилика
@@ -2019,16 +1862,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основни курс (по Стоцк УЦГ)
 DocType: SMS Log,No of Requested SMS,Нема тражених СМС
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Продоран
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Треће лице дистрибутер / дилер / заступника / сарадник / дистрибутер који продаје компанијама производе за провизију.
 DocType: Customer Group,Has Child Node,Има деце Ноде
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 1234 итд)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ни на који активно фискалној години. За више детаља проверите {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Это пример сайт автоматически сгенерированный из ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старење Опсег 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохемијског машинска обрада
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2070,11 +1912,9 @@
  8. Ентер Ров: Ако на основу ""Претходни ред Тотал"" можете одабрати редни који ће бити узет као основа за овај обрачун (дефаулт је претходни ред).
  9. Размислите порез или накнада за: У овом одељку можете да изаберете порески / наплаћује само за вредновање (не дио укупног) или само за укупно (не додају вредност ставке) или за обоје.
  10. Додајте или Одузети: Било да желите да додате или одбије порез."
-DocType: Note,Note,Приметити
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
-DocType: Email Account,Email Ids,Е-маил Идс
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Global Defaults,Hide Currency Symbol,Сакриј симбол валуте
@@ -2082,40 +1922,36 @@
 DocType: Journal Entry,Credit Note,Кредитни Напомена
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Завршен ком не може бити више од {0} за рад {1}
 DocType: Features Setup,Quality,Квалитет
-DocType: Contact Us Settings,Introduction,Увод
 DocType: Warranty Claim,Service Address,Услуга Адреса
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Мак 100 редови за Стоцк помирења.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Мак 100 редови за Стоцк помирења.
 DocType: Stock Entry,Manufacture,Производња
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Молимо вас да Достава Напомена прво
 DocType: Purchase Invoice,Currency and Price List,Валута и Ценовник
 DocType: Opportunity,Customer / Lead Name,Заказчик / Ведущий Имя
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Клиренс Дата не упоминается
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,производња
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Клиренс Дата не упоминается
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,производња
 DocType: Item,Allow Production Order,Дозволи Ордер Производња
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
 DocType: Lead,Fax,Фак
 DocType: Purchase Taxes and Charges,Parenttype,Паренттипе
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Поднет
 DocType: Salary Structure,Total Earning,Укупна Зарада
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Моје адресе
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Организация филиал мастер .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,или
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Изнад
 DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
-,Download Backups,Довнлоад Бацкуп
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Плаћање Тип
 DocType: Process Payroll,Select Employees,Изаберите Запослени
 DocType: Bank Reconciliation,To Date,За датум
 DocType: Opportunity,Potential Sales Deal,Потенцијални Продаја Деал
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Детаљи
 DocType: Purchase Invoice,Total Taxes and Charges,Укупно Порези и накнаде
 DocType: Employee,Emergency Contact,Хитна Контакт
 DocType: Item,Quality Parameters,Параметара квалитета
@@ -2130,6 +1966,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 DocType: Product Bundle,Parent Item,Родитељ шифра
 DocType: Account,Account Type,Тип налога
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Оставите Типе {0} не може носити-прослеђен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
@@ -2137,33 +1974,28 @@
 DocType: Bin,Reserved Quantity,Резервисани Количина
 DocType: Landed Cost Voucher,Purchase Receipt Items,Куповина Ставке пријема
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Прилагођавање Облици
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Сечење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Равнање
 DocType: Account,Income Account,Приходи рачуна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Обликовање
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Cost Center,Cost Center,Трошкови центар
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Куповина поруку Ордер
 DocType: Tax Rule,Shipping Country,Достава Земља
 DocType: Upload Attendance,Upload HTML,Уплоад ХТМЛ
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Укупно унапред ({0}) против Реда {1} не може бити већи од Великог \
  Укупно ({2})"
 DocType: Employee,Relieving Date,Разрешење Дате
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Шеф маркетинга и продаје
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Ласерски пројектована нето обликовање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Шеф маркетинга и продаје
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,подоходный налог
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако изабрана Правилник о ценама је направљен за '' Прице, он ће преписати Ценовник. Правилник о ценама цена је коначна цена, тако да би требало да се примени даље попуст. Стога, у трансакцијама као што продаје Реда, наруџбину итд, то ће бити продата у ""рате"" терену, а не области 'Ценовник рате'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
@@ -2171,10 +2003,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
-DocType: User,Bio,Био
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управление групповой клиентов дерево .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Нови Трошкови Центар Име
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Не стандардна Адреса шаблона пронађен. Молимо креирајте нови из Подешавања> Штампа и брендирања> Адреса шаблон.
 DocType: Appraisal,HR User,ХР Корисник
@@ -2186,31 +2017,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 DocType: Supplier,Billing Currency,Обрачун Валута
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Екстра велики
 ,Profit and Loss Statement,Биланс успјеха
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Притиском
 DocType: Payment Tool Detail,Payment Tool Detail,Плаћање Алат Детаљ
 ,Sales Browser,Браузер по продажам
 DocType: Journal Entry,Total Credit,Укупна кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,местный
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредиты и авансы ( активы )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Дужници
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Велики
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ниједан запослени фоунд !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Велики
 DocType: C-Form Invoice Detail,Territory,Територија
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Purchase Order,Customer Address Display,Кориснички Адреса Приказ
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полирање
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Уобичајено јединица мере за тачке {0} не могу директно мењати, јер \ већ сте направили неку трансакцију (с) са другим УЦГ. Да бисте променили подразумевани УЦГ, \ употреба &#39;УОМ Замените Утилити &quot;функције под Стоцк модула."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Наведите курс према претворити једну валуту у другу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} отменяется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} отменяется
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Преостали дио кредита
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Сотрудник {0} был в отпусках по {1} . Невозможно отметить посещаемость.
 DocType: Sales Partner,Targets,Мете
@@ -2218,14 +2043,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
 DocType: Production Order Operation,Make Time Log,Маке Тиме Пријави
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Молимо поставите количину преусмеравање
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Важи за земље
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Компьютеры
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хемијска брушење
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Молимо Поставите свој контни пре него што почнете Рачуноводство уносе
 DocType: Purchase Invoice,Ignore Pricing Rule,Игноре Правилник о ценама
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Отказан
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Од датума зараде, структура не може бити мањи од Радника Спајање Датум."
 DocType: Employee Education,Graduate,Пређите
 DocType: Leave Block List,Block Days,Блок Дана
@@ -2262,7 +2086,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Проверите да ли понавља фактура, поништите да се заустави или да се понавља правилан датум завршетка"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Ако више од једног пакета истог типа (за штампу)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Максимальные {0} строк разрешено
 DocType: C-Form Invoice Detail,Net Total,Нето Укупно
 DocType: Bin,FCFS Rate,Стопа ФЦФС
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Обрачун (Продаја Фактура)
@@ -2279,20 +2102,19 @@
 DocType: Maintenance Visit,Purposes,Сврхе
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Електрохемиски машинска обрада
 ,Requested,Тражени
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Но Примедбе
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Презадужен
 DocType: Account,Stock Received But Not Billed,Залиха примљена Али не наплати
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корен Рачун мора бити група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто Паи + Заостатак Износ + Енцасхмент Износ - Укупно дедукције
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Features Setup,Sales and Purchase,Продаја и Куповина
 DocType: Supplier Quotation Item,Material Request No,Материјал Захтев Нема
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Стопа по којој купца валута претвара у основну валуту компаније
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} је успешно претплату на овој листи.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Нето курс (Фирма валута)
-apps/frappe/frappe/templates/base.html +134,Added,Додато
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управление Территория дерево .
 DocType: Journal Entry Account,Sales Invoice,Продаја Рачун
 DocType: Journal Entry Account,Party Balance,Парти Стање
@@ -2306,11 +2128,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фискална година {0} није пронађен.
 DocType: Bank Reconciliation,Get Relevant Entries,Гет Релевантне уносе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Ковања
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
-apps/frappe/frappe/desk/query_report.py +136,Total,Укупан
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесите додатни попуст Он
 DocType: Account,Root Type,Корен Тип
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,заплет
@@ -2319,14 +2139,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Износ пореза Након Износ попуста (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Целевая склад является обязательным для ряда {0}
 DocType: Quality Inspection,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спраи формирање
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Ектра Смалл
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,ПЛ или БС
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Минимална Инвентар Ниво
 DocType: Stock Entry,Subcontract,Подуговор
@@ -2337,42 +2156,39 @@
 DocType: Item,Manufacturer Part Number,Произвођач Број дела
 DocType: Production Order Operation,Estimated Time and Cost,Процењена Вријеме и трошкови
 DocType: Bin,Bin,Бункер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Испуст
 DocType: SMS Log,No of Sent SMS,Број послатих СМС
 DocType: Account,Company,Компанија
 DocType: Account,Expense Account,Трошкови налога
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,софтвер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,софтвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Боја
 DocType: Maintenance Visit,Scheduled,Планиран
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Молимо одаберите ставку где &quot;је акционарско тачка&quot; је &quot;Не&quot; и &quot;Да ли је продаје Тачка&quot; &quot;Да&quot; и нема другог производа Бундле
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Изаберите мјесечни неравномерно дистрибуира широм мете месеци.
 DocType: Purchase Invoice Item,Valuation Rate,Процена Стопа
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Прайс-лист Обмен не выбран
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Ставка Ред {0}: Куповина Пријем {1} не постоји у табели 'пурцхасе примитака'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Пројекат Датум почетка
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Преименовање Лог
 DocType: Installation Note Item,Against Document No,Против документу Нема
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Управљање продајних партнера.
 DocType: Quality Inspection,Inspection Type,Инспекција Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Пожалуйста, выберите {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,истраживач
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Ажурирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,истраживач
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Пожалуйста, сохраните бюллетень перед отправкой"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Име или е-маил је обавезан
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Долазни контрола квалитета.
 DocType: Purchase Order Item,Returned Qty,Вратио ком
 DocType: Employee,Exit,Излаз
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корен Тип је обавезно
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корен Тип је обавезно
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серийный номер {0} создан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вибро дораде
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","За практичност потрошача, ови кодови могу да се користе у штампаним форматима као што су фактуре и отпремнице"
 DocType: Employee,You can enter any date manually,Можете да ручно унесете било који датум
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Пробни период
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само листа чворови су дозвољени у трансакцији
 DocType: Expense Claim,Expense Approver,Расходи одобраватељ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
@@ -2380,43 +2196,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Млевење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Скупи враппинг
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Пендинг Активности
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Потврђен
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Добављач> Добављач Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Амт
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Новински издавачи
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Топљење
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Attendance,Attendance Date,Гледалаца Датум
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Плата распада на основу зараде и дедукције.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Счет с дочерних узлов не могут быть преобразованы в книге
 DocType: Address,Preferred Shipping Address,Жељени Адреса испоруке
 DocType: Purchase Receipt Item,Accepted Warehouse,Прихваћено Магацин
 DocType: Bank Reconciliation Detail,Posting Date,Постављање Дате
 DocType: Item,Valuation Method,Процена Метод
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Није могуће пронаћи курс за {0} до {1}
 DocType: Sales Invoice,Sales Team,Продаја Тим
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Дупликат унос
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дупликат унос
 DocType: Serial No,Under Warranty,Под гаранцијом
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Вентуре Цапитал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серийный номер {0} не существует
 DocType: Pricing Rule,Discount Percentage,Скидка в процентах
 DocType: Payment Reconciliation Invoice,Invoice Number,Фактура број
-apps/erpnext/erpnext/hooks.py +70,Orders,Поруџбине
+apps/erpnext/erpnext/hooks.py +54,Orders,Поруџбине
 DocType: Leave Control Panel,Employee Type,Запослени Тип
 DocType: Employee Leave Approver,Leave Approver,Оставите Аппровер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Машина за савијање
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Материјал Пребачен за производњу
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Корисник са ""Расходи одобраватељ"" улози"
 ,Issued Items Against Production Order,Издате Артикли против редоследа израде
@@ -2428,7 +2241,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Неважећи Период
 DocType: Customer,Credit Limit,Кредитни лимит
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Изаберите тип трансакције
 DocType: GL Entry,Voucher No,Ваучер Бр.
@@ -2438,11 +2250,10 @@
 DocType: Customer,Address and Contact,Адреса и контакт
 DocType: Customer,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Employee,Feedback,Повратна веза
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Инцл. Распоред
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Брусни Јет машинска обрада
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Инцл. Распоред
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
-DocType: Website Settings,Website Settings,Сајт Подешавања
 DocType: Item,Reorder level based on Warehouse,Промени редослед ниво на основу Варехоусе
 DocType: Activity Cost,Billing Rate,Обрачун курс
 ,Qty to Deliver,Количина на Избави
@@ -2453,20 +2264,19 @@
 DocType: Material Request,Requested For,Тражени За
 DocType: Quotation Item,Against Doctype,Против ДОЦТИПЕ
 DocType: Delivery Note,Track this Delivery Note against any Project,Прати ову напомену Испорука против било ког пројекта
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корневая учетная запись не может быть удалена
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корневая учетная запись не может быть удалена
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Схов Сток уноси
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управљање адресе
 DocType: Pricing Rule,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
-DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Затварање (др)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Затварање (др)
 DocType: Contact,Passive,Пасиван
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Налоговый шаблон для продажи сделок.
@@ -2482,10 +2292,9 @@
 ,Billed Amount,Изграђена Износ
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Гет Упдатес
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додајте неколико узорака евиденцију
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Материал Запрос {0} отменяется или остановлен
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Додајте неколико узорака евиденцију
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Оставите Манагемент
-DocType: Event,Groups,Групе
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Потпуно Испоручено
 DocType: Lead,Lower Income,Доња прихода
@@ -2494,40 +2303,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Брзо Помоћ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
 DocType: Features Setup,Sales Extras,Продаја Екстра
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет на счет {1} против МВЗ {2} будет превышать {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,минут
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,минут
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
 ,Qty to Receive,Количина за примање
 DocType: Leave Block List,Leave Block List Allowed,Оставите Блоцк Лист Дозвољени
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коэффициент пересчета не может быть в долях
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Ви ћете га користити за Пријављивање
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Ви ћете га користити за Пријављивање
 DocType: Sales Partner,Retailer,Продавац на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Сви Типови добављача
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} не типа {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт счета
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Маке плата Слип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Обеспеченные кредиты
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Потрясающие Продукты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Почетно стање Капитал
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете одобрить отпуск , пока вы не уполномочен утверждать листья на блоке Даты"
 DocType: Appraisal,Appraisal,Процена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лост-пена ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Цртеж
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Датум се понавља
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овлашћени потписник
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Оставьте утверждающий должен быть одним из {0}
 DocType: Hub Settings,Seller Email,Продавац маил
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури)
 DocType: Workstation Working Hour,Start Time,Почетак Време
@@ -2541,12 +2347,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
 DocType: BOM Operation,Hour Rate,Стопа час
 DocType: Stock Settings,Item Naming By,Шифра назив под
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Од понуде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Од понуде
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Другой Период Окончание Вступление {0} был сделан после {1}
 DocType: Production Order,Material Transferred for Manufacturing,Материјал пребачени на Мануфацтуринг
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рачун {0} не постоји
 DocType: Purchase Receipt Item,Purchase Order Item No,Налог за куповину артикал број
-DocType: System Settings,System Settings,Систем Сеттингс
 DocType: Project,Project Type,Тип пројекта
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Либо целевой Количество или целевое количество является обязательным.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Трошкови различитих активности
@@ -2555,36 +2360,32 @@
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассовая
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 DocType: Serial No,Is Cancelled,Да ли Отказан
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Моје пошиљке
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Моје пошиљке
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 DocType: Supplier,Supplier Details,Добављачи Детаљи
-DocType: Communication,Recipients,Примаоци
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Сцревинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Кнурлинг
 DocType: Expense Claim,Approval Status,Статус одобравања
 DocType: Hub Settings,Publish Items to Hub,Објављивање артикле у Хуб
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"От значение должно быть меньше , чем значение в строке {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Изаберите банковни рачун
 DocType: Newsletter,Create and Send Newsletters,Стварање и слање Билтен
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Од датума мора да буде пре датума
 DocType: Sales Order,Recurring Order,Понављало Ордер
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
 DocType: Item Group,Check this if you want to show in website,Проверите ово ако желите да прикажете у Веб
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Добродошли у ЕРПНект
+,Welcome to ERPNext,Добродошли у ЕРПНект
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Детаљ Број
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Олово и цитата
 DocType: Lead,From Customer,Од купца
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Звонки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Укупно Кошта Износ (преко Тиме Протоколи)
 DocType: Purchase Order Item Supplied,Stock UOM,Берза УОМ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Заказ на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Заказ на {0} не представлено
 ,Projected,пројектован
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серийный номер {0} не принадлежит Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Примечание: Система не будет проверять по - доставки и избыточного бронирования по пункту {0} как количестве 0
@@ -2592,13 +2393,10 @@
 DocType: Issue,Opening Date,Датум отварања
 DocType: Journal Entry,Remark,Примедба
 DocType: Purchase Receipt Item,Rate and Amount,Стопа и износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Досадан
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Од продајних налога
-DocType: Blog Category,Parent Website Route,Родитель Сайт Маршрут
 DocType: Sales Order,Not Billed,Није Изграђена
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Оба Магацин мора припадати истој компанији
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Нема контаката додао.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Није активна
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Слетео Трошкови Ваучер Износ
 DocType: Time Log,Batched for Billing,Дозирана за наплату
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Рачуни подигао Добављачи.
@@ -2606,20 +2404,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сумма скидки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,например НДС
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,например НДС
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Тачка 4
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Врелог метала гаса формирање
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
 DocType: Sales Invoice Item,Delivered Qty,Испоручено Кол
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Магацин {0}: Фирма је обавезна
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Иди на одговарајуће групе (обично извор средстава&gt; садашње пасиве&gt; порезе и царине и креирати нови налог (кликом на Додај Цхилд) типа &quot;порез&quot; и помињу пореска стопа.
 ,Payment Period Based On Invoice Date,Период отплате Басед Он Фактура Дате
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Ласерски сечење
-DocType: Event,Monday,Понедељак
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Account,Payable,к оплате
 DocType: Salary Slip,Arrear Amount,Заостатак Износ
@@ -2632,7 +2427,6 @@
 DocType: Lead,Address Desc,Адреса Десц
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Барем један од продајете или купујете морају бити изабрани
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Где се обавља производњу операције.
-DocType: Page,All,Све
 DocType: Stock Entry Detail,Source Warehouse,Извор Магацин
 DocType: Installation Note,Installation Date,Инсталација Датум
 DocType: Employee,Confirmation Date,Потврда Датум
@@ -2640,9 +2434,8 @@
 DocType: Account,Sales User,Продаја Корисник
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Минимална Кол не може бити већи од Мак Кол
 DocType: Stock Entry,Customer or Supplier Details,Купца или добављача Детаљи
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,набор
 DocType: Lead,Lead Owner,Олово Власник
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Је потребно Складиште
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Је потребно Складиште
 DocType: Employee,Marital Status,Брачни статус
 DocType: Stock Settings,Auto Material Request,Ауто Материјал Захтев
 DocType: Time Log,Will be updated when billed.,Да ли ће се ажурирати када наплаћени.
@@ -2656,44 +2449,40 @@
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Наруџбенице артикла у комплету
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Назив компаније не може бити Фирма
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфинисхинг
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Јоурнал Ентриес {0} су УН-линкед
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Јоурнал Ентриес {0} су УН-линкед
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Снимање свих комуникација типа е-маил, телефон, цхат, посете, итд"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Молимо да наведете заокружују трошка у компанији
 DocType: Purchase Invoice,Terms,услови
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Цреате Нев
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Цреате Нев
 DocType: Buying Settings,Purchase Order Required,Наруџбенице Обавезно
 ,Item-wise Sales History,Тачка-мудар Продаја Историја
 DocType: Expense Claim,Total Sanctioned Amount,Укупан износ санкционисан
 ,Purchase Analytics,Куповина Аналитика
 DocType: Sales Invoice Item,Delivery Note Item,Испорука Напомена Ставка
 DocType: Expense Claim,Task,Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Бријање
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Број партије је обавезна за ставку {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,То јекорен продаје човек и не може се мењати .
 ,Stock Ledger,Берза Леџер
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Оцени: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оцени: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Плата Слип Одбитак
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Белешке
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Изаберите групу чвор прво.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Цель должна быть одна из {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Попуните формулар и да га сачувате
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Преузмите извештај садржи све сировине са њиховим најновијим инвентара статусу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Фацинг
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Оставите биланс Пре пријаве
 DocType: SMS Center,Send SMS,Пошаљи СМС
 DocType: Company,Default Letter Head,Уобичајено Леттер Хеад
 DocType: Time Log,Billable,Уплатилац
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ово ће се користити за постављање правила у ХР модулу
 DocType: Account,Rate at which this tax is applied,Стопа по којој се примењује овај порез
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Реордер ком
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
@@ -2705,12 +2494,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Прилика Лост
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Попуст Поља ће бити доступан у нарудзбенице, Куповина записа, фактури"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име новог налога. Напомена: Молимо вас да не стварају налоге за купцима и добављачима
-DocType: Report,Report Type,Врста извештаја
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Утовар
 DocType: BOM Replace Tool,BOM Replace Tool,БОМ Замена алата
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Земља мудар подразумевана адреса шаблон
 DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Покажи пореза распада
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Подаци Увоз и извоз
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Если вы привлечь в производственной деятельности. Включает элемент ' производится '
@@ -2720,16 +2507,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Purchase Order Item,Material Request Detail No,Материјал Захтев Детаљ Нема
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Хард окретања
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Маке одржавање Посетите
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
 DocType: Company,Default Cash Account,Уобичајено готовински рачун
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платные сумма + списания сумма не может быть больше, чем общий итог"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не является допустимым номер партии по пункту {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Напомена: Ако се плаћање не врши против било референце, чине Јоурнал Ентри ручно."
 DocType: Item,Supplier Items,Супплиер артикала
 DocType: Opportunity,Opportunity Type,Прилика Тип
@@ -2741,64 +2527,56 @@
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' је онемогућен
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' је онемогућен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави као Опен
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Пошаљи аутоматске поруке е-поште у Контакте о достављању трансакцијама.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
-DocType: Event,Sunday,Недеља
 DocType: Sales Team,Contribution (%),Учешће (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Одговорности
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додај корисника
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Додај корисника
 DocType: Pricing Rule,Item Group,Ставка Група
 DocType: Task,Actual Start Date (via Time Logs),Стварна Датум почетка (преко Тиме Протоколи)
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
 DocType: Item,Default BOM,Уобичајено БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Децамберинг
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
 DocType: Time Log Batch,Total Hours,Укупно време
 DocType: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,аутомобилски
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Пункт требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метални бризгање
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Из доставница
 DocType: Time Log,From Time,Од времена
 DocType: Notification Control,Custom Message,Прилагођена порука
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Инвестиционо банкарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Инвестиционо банкарство
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Стављање у туршију
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Песак ливење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Елецтроплатинг
 DocType: Purchase Invoice Item,Rate,Стопа
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,стажиста
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,стажиста
 DocType: Newsletter,A Lead with this email id should exist,Олово са овом е ид треба да постоје
 DocType: Stock Entry,From BOM,Од БОМ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,основной
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Да Дате треба да буде исти као Од датума за полудневни одсуство
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
 DocType: Salary Structure,Salary Structure,Плата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Вишеструки Цена Правило постоји са истим критеријумима, молимо реши конфликт \
 , са приоритетом. Цена Правила: {0}"
 DocType: Account,Bank,Банка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Питање Материјал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 DocType: Hub Settings,Access Token,Приступ токен
@@ -2807,45 +2585,37 @@
 DocType: Item,Is Fixed Asset Item,Является основного средства дня Пункт
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Ако сте дуго штампање формата, ова функција може да се користи да подели страница на којој се штампа на више страница са свим заглавља и подножја на свакој страници"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Хоббинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Все территории
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
 DocType: Product Bundle Item,Product Bundle Item,Производ Бундле артикла
 DocType: Sales Partner,Sales Partner Name,Продаја Име партнера
 DocType: Purchase Invoice Item,Image View,Слика Погледај
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Дорада и индустријска обрада
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"От и До даты , необходимых"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Хартије од вредности и робним берзама
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Бушење
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Дување
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
 DocType: Tax Rule,Shipping City,Достава Град
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Account,Purchase User,Куповина Корисник
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Закуцавање
-DocType: Web Page,Slideshow,Слидесхов
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Уобичајено Адреса Шаблон не може бити обрисан
 DocType: Sales Invoice,Shipping Rule,Достава Правило
 DocType: Journal Entry,Print Heading,Штампање наслова
 DocType: Quotation,Maintenance Manager,Менаџер Одржавање
-DocType: Workflow State,Search,Претрага
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всего не может быть нулевым
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дана од последње поруџбине"" мора бити веће или једнако нули"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Лемљење
 DocType: C-Form,Amended From,Измењена од
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,сырье
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,сырье
 DocType: Leave Application,Follow via Email,Пратите преко е-поште
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сумма налога После скидка сумма
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Детский учетная запись существует для этой учетной записи . Вы не можете удалить этот аккаунт .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Либо целевой Количество или целевое количество является обязательным
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Молимо Вас да изаберете датум постања први
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
 DocType: Leave Control Panel,Carry Forward,Пренети
@@ -2854,43 +2624,41 @@
 ,Produced,произведен
 DocType: Item,Item Code for Suppliers,Код за добављаче артикла
 DocType: Issue,Raised By (Email),Подигао (Е-маил)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Општи
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикрепите бланке
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Општи
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Прикрепите бланке
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа пореске главе (нпр ПДВ, царине, итд, они треба да имају јединствена имена) и њихове стандардне цене. Ово ће створити стандардни модел, који можете уредити и додати још касније."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Листа пореске главе (нпр ПДВ, царине, итд, они треба да имају јединствена имена) и њихове стандардне цене. Ово ће створити стандардни модел, који можете уредити и додати још касније."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серийный Нос Требуется для сериализованный элемент {0}
 DocType: Journal Entry,Bank Entry,Банка Унос
 DocType: Authorization Rule,Applicable To (Designation),Важећи Да (Именовање)
-DocType: Blog Post,Blog Post,Блог пост
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група По
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включение / отключение валюты.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Почтовые расходы
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Purchase Order,The date on which recurring order will be stop,Датум када се понавља налог ће бити зауставити
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} мора бити смањена за {1} или би требало да повећа толеранцију преливања
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Укупно Поклон
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,час
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Пребаци Материјал добављачу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Пребаци Материјал добављачу
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Направи понуду
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Все эти предметы уже выставлен счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Все эти предметы уже выставлен счет
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Может быть одобрено {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
 DocType: Features Setup,Point of Sale,Поинт оф Сале
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Коврђжаст
 DocType: Account,Tax,Порез
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Ред {0}: {1} није валидан {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Прерада
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Ред {0}: {1} није валидан {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Од производа Бундле
 DocType: Production Planning Tool,Production Planning Tool,Планирање производње алата
 DocType: Quality Inspection,Report Date,Извештај Дате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Роутинг
 DocType: C-Form,Invoices,Рачуни
 DocType: Job Opening,Job Title,Звање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Примаоци
@@ -2901,33 +2669,29 @@
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и доступност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Проценат вам је дозвољено да примају или испоручи више од количине наредио. На пример: Ако сте наредили 100 јединица. и ваш додатак је 10% онда вам је дозвољено да примају 110 јединица.
 DocType: Pricing Rule,Customer Group,Кориснички Група
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: Item,Website Description,Вебсајт Опис
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
 ,Sales Register,Продаја Регистрација
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
 DocType: Address,Plant,Биљка
-DocType: DocType,Setup,Намештаљка
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Преглед за овај месец и чекају активности
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Хладно ваљање
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
 DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
 DocType: Item,Attributes,Атрибути
-DocType: Packing Slip,Get Items,Гет ставке
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Пожалуйста, введите списать счет"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Гет ставке
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Последњи Низ Датум
-DocType: DocField,Image,Слика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Маке Акциза фактура
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
-DocType: Communication,Other,Други
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Операција ИД није сет
 DocType: Production Order,Planned Start Date,Планирани датум почетка
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Инцл. Посета
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Инцл. Посета
 DocType: Leave Type,Is Encash,Да ли уновчити
 DocType: Purchase Invoice,Mobile No,Мобилни Нема
 DocType: Payment Tool,Make Journal Entry,Маке Јоурнал Ентри
@@ -2935,35 +2699,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Проект мудрый данные не доступны для коммерческого предложения
 DocType: Project,Expected End Date,Очекивани датум завршетка
 DocType: Appraisal Template,Appraisal Template Title,Процена Шаблон Наслов
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,коммерческий
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,коммерческий
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Родитељ артикла {0} не сме бити лагеру предмета
 DocType: Cost Center,Distribution Id,Дистрибуција Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Потрясающие услуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Сви производи или услуге.
 DocType: Purchase Invoice,Supplier Address,Снабдевач Адреса
-DocType: Contact Us Settings,Address Line 2,Аддресс Лине 2
-DocType: ToDo,Reference,Упућивање
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфоратинг
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серия является обязательным
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Финансијске услуге
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Вредност атрибута за {0} мора бити у распону од {1} {2} да у корацима од {3}
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Кр
 DocType: Customer,Default Receivable Accounts,Уобичајено Рецеивабле Аццоунтс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Тестерисање
 DocType: Tax Rule,Billing State,Тецх Стате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламинација
 DocType: Item Reorder,Transfer,Пренос
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Синтеровање
 DocType: Journal Entry,Pay To / Recd From,Плати Да / Рецд Од
 DocType: Naming Series,Setup Series,Подешавање Серија
 DocType: Supplier,Contact HTML,Контакт ХТМЛ
@@ -2974,9 +2732,8 @@
 DocType: Company,Retail,Малопродаја
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Одсутан
-DocType: Product Bundle,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Црусхинг
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
 DocType: GL Entry,Remarks,Примедбе
@@ -2984,48 +2741,44 @@
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
 DocType: Features Setup,POS View,ПОС Погледај
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Инсталација рекорд за серијским бр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Континуирано ливење
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Наведите
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Горе
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Хладно димензионисање
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Счет {0} не может быть группа
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Регија
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
 DocType: Holiday List,Weekly Off,Недељни Искључено
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За нпр 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Привремени Добитак / Губитак (кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Повратак против продаје фактуру
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Тачка 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Молимо поставите подразумевану вредност {0} у компанији {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Молимо поставите подразумевану вредност {0} у компанији {1}
 DocType: Serial No,Creation Time,Време креирања
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Укупан приход
 DocType: Sales Invoice,Product Bundle Help,Производ Бундле Помоћ
 ,Monthly Attendance Sheet,Гледалаца Месечни лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Нема података фоунд
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Гет ставки из производа Бундле
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Счет {0} неактивен
 DocType: GL Entry,Is Advance,Да ли Адванце
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Гледалаца Од Датум и радног То Дате је обавезна
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Пожалуйста, введите ' Является субподряду "", как Да или Нет"
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,""" Прибыль и убытки "" тип счета {0} не допускаются в Открытие запись"
-DocType: Workflow State,Time,Време
 DocType: Features Setup,Sales Discounts,Продаја Попусти
 DocType: Hub Settings,Seller Country,Продавац Земља
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продаја Порези и накнаде Темплате
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одећа и прибор
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одећа и прибор
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Број Реда
 DocType: Item Group,HTML / Banner that will show on the top of product list.,ХТМЛ / банер који ће се појавити на врху листе производа.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Наведите услове да може да израчуна испоруку износ
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додај Цхилд
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Улога дозвољено да постављају блокада трансакцијских рачуна & Едит Фрозен записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге , как это имеет дочерние узлы"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коэффициент преобразования требуется
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Сериал #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Вредност / Опис
@@ -3033,15 +2786,13 @@
 ,Customers Not Buying Since Long Time,Купци не купују јер дуго времена
 DocType: Production Order,Expected Delivery Date,Очекивани Датум испоруке
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Испупчен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Евапоративе-образац ливење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,представительские расходы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Счет Продажи {0} должно быть отменено до отмены этого заказ клиента
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Старост
 DocType: Time Log,Billing Amount,Обрачун Износ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Неверный количество, указанное для элемента {0} . Количество должно быть больше 0 ."
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Пријаве за одмор.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Счет с существующей сделки не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,судебные издержки
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Дан у месецу на којем би аутоматски ће се генерисати нпр 05, 28 итд"
 DocType: Sales Invoice,Posting Time,Постављање Време
@@ -3055,26 +2806,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Нови Кориснички Приход
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Командировочные расходы
 DocType: Maintenance Visit,Breakdown,Слом
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Рачун: {0} са валутом: {1} не може бити изабран
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонинг
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,пробни рад
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
-DocType: Feed,Full Name,Пуно име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Цлинцхинг
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,пробни рад
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,По умолчанию Склад является обязательным для складе Пункт .
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Выплата заработной платы за месяц {0} и год {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Укупно Плаћени износ
 ,Transferred Qty,Пренето Кти
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,планирање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,планирање
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Маке Тиме Лог Батцх
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Издато
 DocType: Project,Total Billing Amount (via Time Logs),Укупно цард Износ (преко Тиме Протоколи)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ми продајемо ову ставку
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Ми продајемо ову ставку
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Добављач Ид
 DocType: Journal Entry,Cash Entry,Готовина Ступање
 DocType: Sales Partner,Contact Desc,Контакт Десц
@@ -3083,18 +2831,16 @@
 DocType: Brand,Item Manager,Тачка директор
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Додајте редове одређује годишње буџете на рачунима.
 DocType: Buying Settings,Default Supplier Type,Уобичајено Снабдевач Тип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Вађење
 DocType: Production Order,Total Operating Cost,Укупни оперативни трошкови
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примечание: Пункт {0} вошли несколько раз
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Сви контакти.
 DocType: Newsletter,Test Email Id,Тест маил Ид
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Компанија Скраћеница
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Компанија Скраћеница
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Если вы будете следовать осмотра качества . Разрешает Item требуется и QA QA Нет в ТОВАРНЫЙ ЧЕК
 DocType: GL Entry,Party Type,партия Тип
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Сырье не может быть такой же, как главный пункт"
 DocType: Item Attribute Value,Abbreviation,Скраћеница
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротациона лајсне
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Шаблоном Зарплата .
 DocType: Leave Type,Max Days Leave Allowed,Мак Дани Оставите животиње
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Сет Пореска Правило за куповину
@@ -3108,15 +2854,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
 ,Territory Target Variance Item Group-Wise,Территория Целевая Разница Пункт Группа Мудрого
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Все Группы клиентов
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} је обавезно. Можда Мењачница запис није створен за {1} на {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Пореска Шаблон је обавезно.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рачун {0}: {1 Родитељ рачун} не постоји
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ценовник Цена (Друштво валута)
 DocType: Account,Temporary,Привремен
 DocType: Address,Preferred Billing Address,Жељени Адреса за наплату
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,секретар
 DocType: Serial No,Distinct unit of an Item,Разликује јединица стране јединице
 DocType: Pricing Rule,Buying,Куповина
 DocType: HR Settings,Employee Records to be created by,Евиденција запослених које ће креирати
@@ -3129,24 +2875,21 @@
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
 DocType: Purchase Order Item,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Пеглање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} је заустављена
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Предстојећи догађаји
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Требуется клиентов
-DocType: Letter Head,Letter Head,Писмо Глава
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Брзо Ступање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} је обавезна за повратак
 DocType: Purchase Order,To Receive,Примити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Скупи Фиттинг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,усер@екампле.цом
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,усер@екампле.цом
 DocType: Email Digest,Income / Expense,Приходи / расходи
 DocType: Employee,Personal Email,Лични Е-маил
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Укупна разлика
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Укупна разлика
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако је укључен, систем ће писати уносе рачуноводствене инвентар аутоматски."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,посредништво
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,посредништво
 DocType: Address,Postal Code,поштански код
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","у Минутес 
@@ -3154,18 +2897,16 @@
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Поруџбине пуштен за производњу.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Hub Settings,Name Token,Име токен
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Планирање
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандардна Продаја
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандардна Продаја
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Атлеаст једно складиште је обавезно
 DocType: Serial No,Out of Warranty,Од гаранције
 DocType: BOM Replace Tool,Replace,Заменити
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Пожалуйста, введите умолчанию единицу измерения"
 DocType: Purchase Invoice Item,Project Name,Назив пројекта
 DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
-DocType: Workflow State,Edit,Едит
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Features Setup,Item Batch Nos,Итем Батцх Нос
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
@@ -3173,13 +2914,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Плаћање Плаћање Помирење
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,налоговые активы
 DocType: BOM Item,BOM No,БОМ Нема
-DocType: Contact Us Settings,Pincode,Пинцоде
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Јоурнал Ентри {0} нема налог {1} или већ упарен против другог ваучера
 DocType: Item,Moving Average,Мовинг Авераге
 DocType: BOM Replace Tool,The BOM which will be replaced,БОМ који ће бити замењен
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новый фонда единица измерения должна отличаться от текущей фондовой UOM
 DocType: Account,Debit,Задужење
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листья должны быть выделены несколько 0,5"
 DocType: Production Order,Operation Cost,Операција кошта
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Постави присуство из ЦСВ датотеке.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Изузетан Амт
@@ -3195,10 +2934,7 @@
 DocType: Project,Default Cost Center,Уобичајено Трошкови Центар
 DocType: Purchase Invoice,End Date,Датум завршетка
 DocType: Employee,Internal Work History,Интерни Рад Историја
-DocType: DocField,Column Break,Колона Пауза
-DocType: Event,Thursday,Четвртак
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Приватни капитал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Скретање
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
 DocType: Sales Invoice,Exhibition,Изложба
@@ -3211,31 +2947,30 @@
 DocType: Employee,Held On,Одржана
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Производња артикла
 ,Employee Information,Запослени Информације
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Финансовый год Дата окончания
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Смањите Зарада за дозволу без плате (ЛВП)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Овонедељном Преглед
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} должен быть куплены или субподрядчиком Пункт в строке {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Рачун: {0} може да се ажурира само преко Стоцк промету
 DocType: GL Entry,Party,Странка
 DocType: Sales Order,Delivery Date,Датум испоруке
-DocType: DocField,Currency,Валута
 DocType: Opportunity,Opportunity Date,Прилика Датум
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повратак против рачуном
 DocType: Purchase Order,To Bill,Билу
 DocType: Material Request,% Ordered,% Од А до Ж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,рад плаћен на акорд
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Про. Куповни
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
 DocType: Employee,History In Company,Историја У друштву
@@ -3252,77 +2987,68 @@
 DocType: Opportunity,To Discuss,Да Дисцусс
 DocType: SMS Settings,SMS Settings,СМС подешавања
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Привремене рачуни
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Црн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
 DocType: Purchase Order,End date of current order's period,Датум завршетка периода постојећи поредак је
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Маке Оффер Леттер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повратак
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
-DocType: DocField,Fold,Преклопити
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Уобичајено Јединица мере за варијанту морају бити исти као шаблон
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
 DocType: Project Task,Pending Review,Чека критику
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Наведите
 DocType: Task,Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Екпенсе потраживања)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Кориснички Ид
-DocType: Page,Page Name,Страница Име
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Да Време мора бити већи од Фром Тиме
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Вретена обрада
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task ID,Задатак ИД
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","например ""МС """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","например ""МС """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Стоцк не може постојати за ставку {0} од има варијанте
 ,Sales Person-wise Transaction Summary,Продавац у питању трансакција Преглед
-DocType: System Settings,Time Zone,Временска зона
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Магацин {0} не постоји
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистер За ЕРПНект Хуб
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Изабрана опција не може имати Батцх
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Стаплинг
 DocType: Customer,Customer Details,Кориснички Детаљи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Обликовање
 DocType: Employee,Reports to,Извештаји
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Sales Invoice,Paid Amount,Плаћени Износ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Закрытие счета {0} должен быть типа "" ответственности """
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Стање рачуна већ у задуживање, није вам дозвољено да поставите 'Стање Муст Бе' као 'Кредит'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управљање квалитетом
 DocType: Production Planning Tool,Filter based on customer,Филтер на бази купца
 DocType: Payment Tool Detail,Against Voucher No,Против ваучера Но
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
 DocType: Tax Rule,Purchase,Куповина
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Стање Кол
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Стање Кол
 DocType: Item Group,Parent Item Group,Родитељ тачка Група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Цост центри
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Складишта.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Складишта.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Стопа по којој је добављач валута претвара у основну валуту компаније
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ров # {0}: ТИМИНГС сукоби са редом {1}
 DocType: Opportunity,Next Contact,Следећа Контакт
 DocType: Employee,Employment Type,Тип запослења
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,капитальные активы
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
 DocType: Item Group,Default Expense Account,Уобичајено Трошкови налога
 DocType: Employee,Notice (days),Обавештење ( дана )
-DocType: Page,Yes,Да
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
 DocType: Employee,Encashment Date,Датум Енцасхмент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Елецтроформинг
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Против Ваучер Тип мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Account,Stock Adjustment,Фото со Регулировка
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Уобичајено активност Трошкови постоји за тип активности - {0}
 DocType: Production Order,Planned Operating Cost,Планирани Оперативни трошкови
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Нови {0} Име
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},У прилогу {0} {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},У прилогу {0} {1} #
 DocType: Job Applicant,Applicant Name,Подносилац захтева Име
 DocType: Authorization Rule,Customer / Item Name,Кориснички / Назив
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3335,7 +3061,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серийный номер является обязательным для п. {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Наведите из / у распону
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Креирао
 DocType: Serial No,Under AMC,Под АМЦ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Ставка вредновање стопа израчунава обзиром слетео трошкова ваучера износ
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок .
@@ -3347,17 +3072,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Минимални износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Ажурирање готове робе
 DocType: Workstation,per hour,на сат
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серия {0} уже используется в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рачун за складишта ( сталне инвентуре ) ће бити направљен у оквиру овог рачуна .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Износ Плаћени
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Пројецт Манагер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
 DocType: Customer,Default Taxes and Charges,Уобичајено таксе и накнаде
 DocType: Account,Receivable,Дебиторская задолженность
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
 DocType: Sales Invoice,Supplier Reference,Снабдевач Референтна
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Ако је проверен, бом за под-монтаже ставки ће бити узети у обзир за добијање сировина. Иначе, сви суб-монтажни ставке ће бити третирани као сировина."
@@ -3365,8 +3089,8 @@
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
 DocType: Item Price,Item Price,Артикал Цена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Сапун и детерџент
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Сапун и детерџент
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Мотион Пицтуре & Видео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
@@ -3375,7 +3099,6 @@
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Подршка Аналтиицс
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компания на складах отсутствует {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Берза УОМ Замени комунално
 DocType: POS Profile,Terms and Conditions,Услови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Да би требало да буде дата у фискалну годину. Под претпоставком То Дате = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Овде можете одржавати висина, тежина, алергија, медицинску забринутост сл"
@@ -3387,7 +3110,7 @@
 DocType: Sales Order Item,For Production,За производњу
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Унесите продаје ред у табели
 DocType: Project Task,View Task,Погледај Задатак
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваша финансијска година почиње
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ваша финансијска година почиње
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Молимо Вас да унесете куповини Приливи
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
@@ -3395,20 +3118,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Настройка сервера входящей для поддержки электронный идентификатор . (например support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Salary Slip,Salary Slip,Плата Слип
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Брунирање
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' To Date ' требуется
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' требуется
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
 DocType: BOM,Manage cost of operations,Управљање трошкове пословања
 DocType: Features Setup,Item Advanced,Ставка Напредна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Топло ваљање
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Када неки од селектираних трансакција &quot;Послао&quot;, е поп-уп аутоматски отворила послати емаил на вези &quot;Контакт&quot; у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальные настройки
 DocType: Employee Education,Employee Education,Запослени Образовање
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
 DocType: Salary Slip,Net Pay,Нето плата
 DocType: Account,Account,рачун
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серийный номер {0} уже получил
@@ -3417,35 +3138,28 @@
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенцијалне могућности за продају.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Неважећи {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,Е-маил Дигест
 DocType: Delivery Note,Billing Address Name,Адреса за наплату Име
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Робне куце
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Систем Стање
-DocType: Workflow,Is Active,Је активан
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Систем Стање
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Први Сачувајте документ.
 DocType: Account,Chargeable,Наплатив
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Линисхинг
 DocType: Company,Change Abbreviation,Промена скраћеница
-DocType: Workflow State,Primary,Основни
 DocType: Expense Claim Detail,Expense Date,Расходи Датум
 DocType: Item,Max Discount (%),Максимална Попуст (%)
-DocType: Communication,More Information,Више информација
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Последњи Наручи Количина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Бластинг
 DocType: Company,Warn,Упозорити
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Пункт оценка обновляются
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
 DocType: BOM,Manufacturing User,Производња Корисник
 DocType: Purchase Order,Raw Materials Supplied,Сировине комплету
 DocType: Purchase Invoice,Recurring Print Format,Поновни Принт Формат
-DocType: Communication,Series,серија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Ожидаемая дата поставки не может быть до заказа на Дата
 DocType: Appraisal,Appraisal Template,Процена Шаблон
-DocType: Communication,Email,Е-маил
 DocType: Item Group,Item Classification,Итем Класификација
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Менаџер за пословни развој
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Одржавање посета Сврха
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,период
 ,General Ledger,Главна књига
@@ -3455,9 +3169,7 @@
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Изаберите {0} први
 DocType: Features Setup,To get Item Group in details table,Да бисте добили групу ставка у табели детаљније
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Прекрајање
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Гравура
 DocType: Sales Invoice,Commission,комисија
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3483,7 +3195,7 @@
  {% ако емаил_ид%} е-маил: {{емаил_ид}} & лт; бр & гт ; {% ЕНДИФ -%} 
  </ цоде> </ пре>"
 DocType: Salary Slip Deduction,Default Amount,Уобичајено Износ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Складиште није пронађен у систему
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Складиште није пронађен у систему
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Овај месец је Преглед
 DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
@@ -3502,13 +3214,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Payment Tool,Get Outstanding Vouchers,Гет Изванредна ваучери
 DocType: Warranty Claim,Resolved By,Решен
 DocType: Appraisal,Start Date,Датум почетка
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Вредност
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Кликните овде да бисте проверили
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
@@ -3518,55 +3229,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Просечно време које је добављач за испоруку
 DocType: Time Log,Hours,Радно време
 DocType: Project,Expected Start Date,Очекивани датум почетка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Роллинг
-DocType: ToDo,Priority,Приоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
-DocType: Dropbox Backup,Dropbox Access Allowed,Дропбок дозвољен приступ
-DocType: Dropbox Backup,Weekly,Недељни
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Пријем
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Пријем
 DocType: Maintenance Visit,Fully Completed,Потпуно Завршено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Комплетна
 DocType: Employee,Educational Qualification,Образовни Квалификације
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} је успешно додат у нашој листи билтен.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронски сноп машинска обрада
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Главни Извештаји
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото со Леджер записей остатки обновляются
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Главни Извештаји
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Purchase Receipt Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Додај / измени Прицес
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Дијаграм трошкова центара
 ,Requested Items To Be Ordered,Тражени ставке за Ж
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Ми Ордерс
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Ми Ордерс
 DocType: Price List,Price List Name,Ценовник Име
 DocType: Time Log,For Manufacturing,За производњу
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Укупно
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Укупно
 DocType: BOM,Manufacturing,Производња
 ,Ordered Items To Be Delivered,Ж Ставке да буде испоручена
 DocType: Account,Income,доход
-,Setup Wizard,Мастер установки
 DocType: Industry Type,Industry Type,Индустрија Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Нешто није у реду!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Завршетак датум
 DocType: Purchase Invoice Item,Amount (Company Currency),Износ (Друштво валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Ливеног
-DocType: Email Alert,Reference Date,Референтни датум
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Название подразделения (департамент) хозяин.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
 DocType: Budget Detail,Budget Detail,Буџет Детаљ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
-DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Стоцк УОМ упдатед за ставку {0}
-DocType: Company History,Year,Година
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Поинт-оф-Сале Профиле
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Молимо Упдате СМС Сеттингс
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Време се {0} већ наплаћено
@@ -3579,55 +3278,52 @@
 ,Serial No Service Contract Expiry,Серијски број услуга Уговор Истек
 DocType: Item,Unit of Measure Conversion,Јединица мере Цонверсион
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Запослени не може да се промени
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Исправка за преко-{0} {прешао за тачке 1}
 DocType: Address,Name of person or organization that this address belongs to.,Име особе или организације која је ова адреса припада.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваши Добављачи
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Ваши Добављачи
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Још један Плата Структура {0} је активан за запосленог {1}. Молимо вас да се његов статус као неактивне за наставак.
 DocType: Purchase Invoice,Contact,Контакт
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Primio od
 DocType: Features Setup,Exports,Извоз
 DocType: Lead,Converted,Претворено
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Од {0} {1} за
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 DocType: Issue,Content Type,Тип садржаја
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,рачунар
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,рачунар
 DocType: Item,List this Item in multiple groups on the website.,Наведи ову ставку у више група на сајту.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Итем: {0} не постоји у систему
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Cost Center,Budgets,Буџети
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Ажурирано
 DocType: Employee,Emergency Contact Details,Хитна Контакт
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Шта он ради ?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Шта он ради ?
 DocType: Delivery Note,To Warehouse,Да Варехоусе
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Счет {0} был введен более чем один раз в течение финансового года {1}
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,электрический
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID пользователя не установлен Требуются {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Бомбирању
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Од право на гаранцију
 DocType: Stock Entry,Default Source Warehouse,Уобичајено Извор Магацин
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Подсетник за рођендан за {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Лаппинг
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дана Од Последња Наручи
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дана Од Последња Наручи
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
-DocType: User,Enabled,Омогућено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,фондовые активы
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},"Вы действительно хотите , чтобы представить все Зарплата Слип для месяца {0} и год {1}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Увоз Претплатници
@@ -3635,19 +3331,18 @@
 DocType: Attendance,Present,Представљање
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
 DocType: Notification Control,Sales Invoice Message,Продаја Рачун Порука
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Затварање рачуна {0} мора бити типа одговорности / Екуити
 DocType: Authorization Rule,Based On,На Дана
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Пројекат активност / задатак.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Генериши стаје ПЛАТА
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не является допустимым ID E-mail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Куповина се мора проверити, ако је применљиво Јер је изабрана као {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Скидка должна быть меньше 100
-DocType: ToDo,Low,Низак
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Предење
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
@@ -3669,7 +3364,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Название кампании требуется
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Receipt Item,Rejected Serial No,Одбијен Серијски број
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Дубоко уздисање
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Нови билтен
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Схов Стање
@@ -3680,7 +3374,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Износ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Риветинг
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
 ,Sales Analytics,Продаја Аналитика
 DocType: Manufacturing Settings,Manufacturing Settings,Производња Подешавања
@@ -3692,28 +3385,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Нови налог Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировине комплету Цост
 DocType: Selling Settings,Settings for Selling Module,Подешавања за Селлинг Модуле
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Кориснички сервис
 DocType: Item,Thumbnail,Умањени
 DocType: Item Customer Detail,Item Customer Detail,Ставка Кориснички Детаљ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Потврди Емаил
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Понуда кандидат посла.
 DocType: Notification Control,Prompt for Email on Submission of,Упитај Емаил за подношење
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Укупно издвојена листови су више него дана у периоду
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Уобичајено Ворк Ин Прогресс Варехоусе
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} требуется
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумско калупљење
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
-DocType: Contact Us Settings,City,Град
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ултразвучна машинска обрада
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Грешка: Не важи? Ид?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} должен быть Продажи товара
 DocType: Naming Series,Update Series Number,Упдате Број
 DocType: Account,Equity,капитал
 DocType: Sales Order,Printing Details,Штампање Детаљи
 DocType: Task,Closing Date,Датум затварања
 DocType: Sales Order Item,Produced Quantity,Произведена количина
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,инжењер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,инжењер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Тражи Суб скупштине
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
 DocType: Sales Partner,Partner Type,Партнер Тип
@@ -3721,7 +3410,7 @@
 DocType: Authorization Rule,Customerwise Discount,Цустомервисе Попуст
 DocType: Purchase Invoice,Against Expense Account,Против трошковником налог
 DocType: Production Order,Production Order,Продуцтион Ордер
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примечание {0} уже представлен
 DocType: Quotation Item,Against Docname,Против Доцнаме
 DocType: SMS Center,All Employee (Active),Све Запослени (активна)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Погледај Сада
@@ -3729,26 +3418,24 @@
 DocType: BOM,Raw Material Cost,Сировина Трошак
 DocType: Item,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Гантт Цхарт
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серия Обновлено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип отчета является обязательным
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип отчета является обязательным
 DocType: Item,Serial Number Series,Серијски број серија
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад является обязательным для складе Пункт {0} в строке {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Малопродаја и велепродаја
 DocType: Issue,First Responded On,Прво одговорила
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Оглас крст од предмета на више група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Први Корисник : Ви
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Први Корисник : Ви
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успешно помирили
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успешно помирили
 DocType: Production Order,Planned End Date,Планирани Датум Крај
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Где ставке су ускладиштене.
 DocType: Tax Rule,Validity,Рок важења
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Фактурисани износ
 DocType: Attendance,Attendance,Похађање
-DocType: Page,No,Не
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако се не проверава, листа ће морати да се дода сваком одељењу где има да се примењује."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публикации и постављање време је обавезна
@@ -3756,55 +3443,46 @@
 ,Item Prices,Итем Цене
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,У речи ће бити видљив када сачувате поруџбеницу.
 DocType: Period Closing Voucher,Period Closing Voucher,Период Затварање ваучера
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Мастер Прайс-лист .
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Мастер Прайс-лист .
 DocType: Task,Review Date,Прегледајте Дате
 DocType: Purchase Invoice,Advance Payments,Адванце Плаћања
-DocType: DocPerm,Level,Ниво
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Целевая склад в строке {0} должно быть таким же , как производственного заказа"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Глодање
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Нема дозволе за коришћење средства наплате
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Нотифицатион Емаил Аддрессес' не указано се понављају и% с
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Валута не може да се промени након што уносе користите неки други валуте
 DocType: Company,Round Off Account,Заокружити рачун
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нибловање
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,административные затраты
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Родитељ групу потрошача
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","например "" Моя компания ООО """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","например "" Моя компания ООО """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Отказни рок
 DocType: Bank Reconciliation Detail,Voucher ID,Шифра ваучера
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,То јекорен територија и не могу да се мењају .
 DocType: Packing Slip,Gross Weight UOM,Бруто тежина УОМ
 DocType: Email Digest,Receivables / Payables,Потраживања / Обавезе
 DocType: Delivery Note Item,Against Sales Invoice,Против продаје фактура
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Жигосање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 DocType: Task,Actual End Date (via Time Logs),Стварна Датум завршетка (преко Тиме Протоколи)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
 DocType: Delivery Note,Print Without Amount,Принт Без Износ
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
-DocType: User,Last Name,Презиме
-DocType: Web Page,Left,Лево
-DocType: Event,All Day,Целодневни
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Пореска Категорија не може бити "" Процена "" или "" Вредновање и Тотал "" , као сви предмети су не- залихама"
 DocType: Issue,Support Team,Тим за подршку
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
-DocType: Contact Us Settings,State,Држава
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
-DocType: User,Gender,Пол
 DocType: Journal Entry,Debit Note,Задужењу
 DocType: Stock Entry,As per Stock UOM,По берза ЗОЦГ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Није истекао
@@ -3818,118 +3496,107 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Уколико је означено, Укупно нема. радних дана ће се укључити празника, а то ће смањити вредност зараде по дану"
 DocType: Purchase Invoice,Total Advance,Укупно Адванце
-DocType: Workflow State,User,Корисник
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Обрада платног списка
 DocType: Opportunity Item,Basic Rate,Основна стопа
 DocType: GL Entry,Credit Amount,Износ кредита
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Постави као Лост
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаћање Пријем Напомена
 DocType: Customer,Credit Days Based On,Кредитни дана по основу
 DocType: Tax Rule,Tax Rule,Пореска Правило
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Одржавајте исту стопу Широм продајног циклуса
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,План време дневнике ван Воркстатион радног времена.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} уже представлен
 ,Items To Be Requested,Артикли бити затражено
-DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Обрачун курс заснован на врсти дјелатности (по сату)
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,СЕАМИНГ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Компании e-mail ID не найден, следовательно, Почта не отправляется"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 DocType: Production Planning Tool,Filter based on item,Филтер на бази ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Не могу да цоверт групи јер је изабран Тип рачуна.
 DocType: Purchase Common,Purchase Common,Куповина Заједнички
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} был изменен. Обновите .
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Оппортунити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Слепи
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Рачуни подигао купцима.
-DocType: DocField,Default,Уобичајено
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} је додао претплатници
 DocType: Maintenance Schedule,Schedule,Распоред
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Дефинисати буџет за ову трошкова Центра. Да бисте поставили буџета акцију, погледајте &quot;Компанија Листа&quot;"
 DocType: Account,Parent Account,Родитељ рачуна
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
-DocType: GL Entry,Voucher Type,Тип ваучера 
+DocType: GL Entry,Voucher Type,Тип ваучера
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Expense Claim,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избор &quot;Да&quot; ће дати јединствени идентитет сваком ентитету ове тачке које се могу видети у серијским Но мајстора.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
 DocType: Address,Office,Канцеларија
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартные отчеты
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Да бисте креирали пореском билансу
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Унесите налог Екпенсе
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Серија Инвентар
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Серија Инвентар
 DocType: Employee,Contract End Date,Уговор Датум завршетка
 DocType: Sales Order,Track this Sales Order against any Project,Прати овај продајни налог против било ког пројекта
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Повуците продајне налоге (чека да испоручи) на основу наведених критеријума
-DocType: DocShare,Document Type,Доцумент Типе
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Од понуде добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Од понуде добављача
 DocType: Deduction Type,Deduction Type,Одбитак Тип
 DocType: Attendance,Half Day,Пола дана
 DocType: Pricing Rule,Min Qty,Мин Кол-во
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Да бисте пратили ставке у продаји и куповини документе у којима батцх бр. &quot;Преферред Индустрија Хемија&quot;
 DocType: GL Entry,Transaction Date,Трансакција Датум
 DocType: Production Plan Item,Planned Qty,Планирани Кол
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Укупно Пореска
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Укупно Пореска
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,За Количина (Мануфацтуред Кти) је обавезан
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
 DocType: Notification Control,Purchase Receipt Message,Куповина примање порука
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Укупно издвојена листови су више од периода
 DocType: Production Order,Actual Start Date,Сунце Датум почетка
 DocType: Sales Order,% of materials delivered against this Sales Order,% испоручених материјала на основу овог Налога за продају
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Снимање покрета ставку.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Билтен Листа претплатника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Дубљење
-DocType: Email Account,Service,служба
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 ,Monthly Salary Register,Месечна плата Регистрација
-apps/frappe/frappe/website/template.py +140,Next,следующий
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,БОМ Операција
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополирање
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На претходни ред Износ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Молимо вас да унесете Износ уплате у атлеаст једном реду
 DocType: POS Profile,POS Profile,ПОС Профил
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Ров {0}: Плаћање Износ не може бити већи од преосталог износа
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Укупно Неплаћено
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Укупно Неплаћено
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Време Пријави се не наплаћују
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Купац
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Купац
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Чистая зарплата не может быть отрицательным
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Молимо Вас да унесете против ваучери ручно
 DocType: SMS Settings,Static Parameters,Статички параметри
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
@@ -3938,14 +3605,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Пошаљи СМС масовне вашим контактима
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Размислите пореза или оптужба за
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Цросс-ваљање
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,кредитна картица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,кредитна картица
 DocType: BOM,Item to be manufactured or repacked,Ставка да буду произведени или препакује
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Настройки по умолчанию для биржевых операций .
 DocType: Purchase Invoice,Next Date,Следећи датум
 DocType: Employee Education,Major/Optional Subjects,Мајор / Опциони предмети
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Молимо вас да унесете таксе и трошкове
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обрада
 DocType: Sales Invoice Item,Drop Ship,Дроп Схип
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
 DocType: Hub Settings,Seller Name,Продавац Име
@@ -3955,47 +3620,44 @@
 DocType: Stock Entry,Repack,Препаковати
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Вы должны Сохраните форму , прежде чем приступить"
 DocType: Item Attribute,Numeric Values,Нумеричке вредности
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикрепите логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок оставите апликације по одељењу.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Корпа је празна
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Корневая не могут быть изменены .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Додељена сума не може већи од износа унадустед
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корневая не могут быть изменены .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Додељена сума не може већи од износа унадустед
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволите производња на празницима
 DocType: Sales Order,Customer's Purchase Order Date,Наруџбенице купца Датум
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Капитал Сток
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Изаберите ЦСВ датотеку
-DocType: Dropbox Backup,Send Backups to Dropbox,Пошаљи Бацкупи на Дропбок
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,дизајнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,дизајнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Услови коришћења шаблона
 DocType: Serial No,Delivery Details,Достава Детаљи
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Аутоматско креирање Материал захтев ако количина падне испод тог нивоа
 ,Item-wise Purchase Register,Тачка-мудар Куповина Регистрација
 DocType: Batch,Expiry Date,Датум истека
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",Да бисте поставили ниво преусмеравање тачка мора бити Куповина јединица или Производња артикла
 ,Supplier Addresses and Contacts,Добављач Адресе и контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Пројекат господар.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Саставница
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
-DocType: Dropbox Backup,Send Notifications To,Слање обавештења
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Реф Датум
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Реф Датум
 DocType: Employee,Reason for Leaving,Разлог за напуштање
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Счет {0} не существует
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Счет {0} не существует
 DocType: Account,Cash,Готовина
 DocType: Employee,Short biography for website and other publications.,Кратка биографија за сајт и других публикација.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Пожалуйста, создайте Зарплата Структура для работника {0}"

diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 49dd3a2..585c41d 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Lön Läge
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Välj Månads Distribution, om du vill spåra beroende på årstider."
 DocType: Employee,Divorced,Skild
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Varning: Samma objekt har angetts flera gånger.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Produkter redan synkroniserade
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Konsumentprodukter
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Konsumentprodukter
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Välj Partityp först
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Glödgning
 DocType: Item,Customer Items,Kundartiklar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
 DocType: Item,Publish Item to hub.erpnext.com,Publish Post som hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Ledighetsgodkännare
 DocType: Sales Partner,Dealer,Återförsäljare
 DocType: Employee,Rented,Hyrda
-DocType: About Us Settings,Website,Webbplats
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Vibrator plus sintring
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundkontakt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Från Materialförfrågan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Från Materialförfrågan
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Trä
 DocType: Job Applicant,Job Applicant,Arbetssökande
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Inga fler resultat.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Rättslig
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Rättslig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Verklig typskatt kan inte ingå i produktomsättning i rad {0}
 DocType: C-Form,Customer,Kunden
 DocType: Purchase Receipt Item,Required By,Krävs av
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Serie uppdaterats
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Sömmar
 DocType: Pricing Rule,Apply On,Applicera på
 DocType: Item Price,Multiple Item prices.,Flera produktpriser.
 ,Purchase Order Items To Be Received,Inköpsorder Artiklar att ta emot
 DocType: SMS Center,All Supplier Contact,Alla Leverantörskontakter
 DocType: Quality Inspection Reading,Parameter,Parameter
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Ny Ledighets ansökningan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Ny Ledighets ansökningan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Bankväxel
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,"1. För att upprätthålla kunden unika prodkt kod och att göra den sökbar baseras på deras kod, använd detta alternativ"
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Visar varianter
-DocType: Sales Invoice Item,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Kvantitet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Lån (skulder)
 DocType: Employee Education,Year of Passing,Passerande År
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,I Lager
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Skapa ny POS Profil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sjukvård
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 DocType: Purchase Invoice,Monthly,Månadsvis
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Försenad betalning (dagar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E-Postadress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Försvar
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E-Postadress
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
 DocType: Company,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Rad # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Rad # {0}:
 DocType: Delivery Note,Vehicle No,Fordons nr
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Välj Prislista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Träbearbetning
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-utskrift
 DocType: Employee,Holiday List,Holiday Lista
 DocType: Time Log,Time Log,Tid Log
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Revisor
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Company,Phone No,Telefonnr
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Loggar av aktiviteter som utförs av användare mot uppgifter som kan användas för att spåra tid, fakturering."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Ny {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Försäljning Partners kommissionen
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Förkortning kan inte ha mer än 5 tecken
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Attribut Värde {0} kan inte tas bort från {1} som punkt Varianter \ finns med detta attribut.
-DocType: Print Settings,Classic,Klassisk
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Detta är en root-kontot och kan inte ändras.
 DocType: BOM,Operations,Verksamhet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Det går inte att ställa in tillstånd på grund av rabatt för {0}
 DocType: Bin,Quantity Requested for Purchase,Mängder som begärs för inköp
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bifoga CSV-fil med två kolumner, en för det gamla namnet och en för det nya namnet"
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Öppning för ett jobb.
 DocType: Item Attribute,Increment,Inkrement
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Välj Warehouse ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklam
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklam
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samma Företaget anges mer än en gång
 DocType: Employee,Married,Gift
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ej tillåtet för {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 DocType: Payment Reconciliation,Reconcile,Avstämma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Matvaror
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Skapa Bank inlägg
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Pensionsfonder
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Lagret är obligatoriskt om kontotyp är Lager
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Lead,Person Name,Namn
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Markera om återkommande order, avmarkera för att stoppa återkommande eller ange Slutdatum"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
 DocType: SMS Log,SMS Log,SMS-logg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad levererat gods
-DocType: Blog Post,Guest,Gäst
 DocType: Quality Inspection,Get Specification Details,Hämta Specifikation Detaljer
 DocType: Lead,Interested,Intresserad
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Öppning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Öppning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Från {0} till {1}
 DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
 DocType: Journal Entry,Opening Entry,Öppnings post
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} är obligatoriskt
 DocType: Stock Entry,Additional Costs,Merkostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
 DocType: Lead,Product Enquiry,Produkt Förfrågan
-DocType: Standard Reply,Owner,Ägare
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Ange företaget först
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Välj Företaget först
 DocType: Employee Education,Under Graduate,Enligt Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Brotschning
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Aktivitets Logg:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Fastighet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fastighet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutdrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Läkemedel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Läkemedel
 DocType: Expense Claim Detail,Claim Amount,Fordringsbelopp
 DocType: Employee,Mr,Herr
-DocType: Custom Script,Client,Klient
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverantör Typ / leverantör
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Förbrukningsartiklar
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Förbrukningsartiklar
 DocType: Upload Attendance,Import Log,Import logg
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Skicka
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Årslön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Årslön
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stock Kostnader
 DocType: Newsletter,Email Sent?,E-post Skickat?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Visa Time Loggar
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
 DocType: Item,Supply Raw Materials for Purchase,Leverera råvaror för köp
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Produkt {0} måste vara en beställningsprodukt
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Kommer att uppdateras efter fakturan skickas.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Räta
 DocType: BOM Replace Tool,New BOM,Ny BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Batch tidsloggar för fakturering.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Antigravitions gjutning
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Nyhetsbrev har redan skickats
 DocType: Lead,Request Type,Typ av förfrågan
 DocType: Leave Application,Reason,Anledning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Sändning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Exekvering
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Den första användaren blir System Manager (du kan ändra detta senare).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Sändning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Exekvering
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Den första användaren blir System Manager (du kan ändra detta senare).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
 DocType: Serial No,Maintenance Status,Underhåll Status
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Produkter och prissättning
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Produkter och prissättning
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Från Datum bör ligga inom räkenskapsåret. Förutsatt Från Datum = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Välj anställd för vilken du skapar bedömning.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Kostnadsställe {0} tillhör inte bolaget {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prislista måste gälla för att köpa eller sälja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Installationsdatum kan inte vara före leveransdatum för punkt {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Rabatt på Prislista Andel (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Start
-DocType: User,First Name,Förnamn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Full-formgjutning
 DocType: Offer Letter,Select Terms and Conditions,Välj Villkor
 DocType: Production Planning Tool,Sales Orders,Kundorder
 DocType: Purchase Taxes and Charges,Valuation,Värdering
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillåt negativt saldo
 DocType: Selling Settings,Default Territory,Standard Område
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Tv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tv
 DocType: Production Order Operation,Updated via 'Time Log',Uppdaterad via &quot;Time Log&quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Kontot {0} tillhör inte ett företag {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: Sales Invoice,Is Opening Entry,Är öppen anteckning
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nämn om icke-standard mottagningskonto tillämpat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,För Lagerkrävs innan du kan skicka
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottog den
 DocType: Sales Partner,Reseller,Återförsäljare
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Ange Företag
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
 DocType: Lead,Address & Contact,Adress och kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
 DocType: Newsletter List,Total Subscribers,Totalt Medlemmar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Kontaktnamn
+,Contact Name,Kontaktnamn
 DocType: Production Plan Item,SO Pending Qty,SO Väntar Antal
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Skapar lönebesked för ovan nämnda kriterier.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Begäran om köp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Dubbel hölje
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Avgångar per år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Avgångar per år
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Ställ in namnserie för {0} via Inställningar> Inställningar> Namnge Serier
 DocType: Time Log,Will be updated when batched.,Kommer att uppdateras när den tillverkas.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
-DocType: Bulk Email,Message,Meddelande
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Åtkomstnyckel
 DocType: Payment Tool,Reference No,Referensnummer
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Årlig
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
 DocType: Material Request Item,Min Order Qty,Min Order kvantitet
 DocType: Lead,Do Not Contact,Kontakta ej
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unika ID för att spåra alla återkommande fakturor. Det genereras på skicka.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Mjukvaruutvecklare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Item,Publish in Hub,Publicera i Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
 DocType: Item,Purchase Details,Inköpsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Stålborstning
 DocType: Employee,Relation,Förhållande
 DocType: Shipping Rule,Worldwide Shipping,Världsomspännande sändnings
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Bekräftade ordrar från kunder.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 DocType: Maintenance Schedule,Generate Schedule,Generera Schema
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Utgiftshuvud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Välj Avgiftstyp först
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Senaste
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Max 5 tecken
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Välj Ditt Språk
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Max 5 tecken
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Den första Lämna godkännare i listan kommer att anges som standard Lämna godkännare
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Inaktiverar skapandet av tids stockar mot produktionsorder . Verksamheten får inte spåras mot produktionsorder
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Variant av
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Produkt  {0} måste vara serviceprodukt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
-DocType: DocType,Administrator,Administratör
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Laserborrning
-DocType: Stock UOM Replace Utility,New Stock UOM,Ny Lager UOM
 DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud
 DocType: Employee,External Work History,Extern Arbetserfarenhet
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Cirkelreferens fel
-DocType: Communication,Closed,Stängt
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I ord (Export) kommer att vara synlig när du sparar följesedel.
 DocType: Lead,Industry,Industri
 DocType: Employee,Job Profile,Jobbprofilen
 DocType: Newsletter,Newsletter,Nyhetsbrev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Insnörning
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
 DocType: Journal Entry,Multi Currency,Flera valutor
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Produkten uppdateras
-DocType: Async Task,System Manager,System Manager
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
 DocType: Sales Invoice Item,Delivery Note,Följesedel
-DocType: Dropbox Backup,Allow Dropbox Access,Tillåt Dropbox Tillgång
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Ställa in skatter
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Betalningsposten har ändrats efter att du hämtade den. Vänligen hämta igen.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Workstation,Rent Cost,Hyr Kostnad
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Välj månad och år
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Företagets e-post
 DocType: GL Entry,Debit Amount in Account Currency,Betal-Belopp i konto Valuta
 DocType: Shipping Rule,Valid for Countries,Gäller för länder
-DocType: Workflow State,Refresh,Uppdatera
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Alla importrelaterade områden som valuta, växelkurs, import totalt importtotalsumma osv finns i inköpskvitto, leverantör Offert, Inköp Faktura, inköpsorder mm"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Den totala order Anses
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Ange &quot;Upprepa på Dag i månaden&quot; fältvärde
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Ange &quot;Upprepa på Dag i månaden&quot; fältvärde
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Finns i BOM, följesedel, Inköp Faktura, produktionsorder, inköpsorder, inköpskvitto, Försäljning Faktura, kundorder, införande i lager, Tidrapport"
 DocType: Item Tax,Tax Rate,Skattesats
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Välj Punkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Välj Punkt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Produkt: {0} förvaltade satsvis, kan inte förenas med \ Lagersammansättning, använd istället Lageranteckning"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Inköpskvitto måste lämnas in
-DocType: Stock UOM Replace Utility,Current Stock UOM,Nuvarande lager UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Din e-postadress
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Se bifogad fil
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Vattenskärning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Inställning Redan Komplett !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Inställning Redan Komplett !!
 ,Finished Goods,Färdiga Varor
 DocType: Delivery Note,Instructions,Instruktioner
 DocType: Quality Inspection,Inspected By,Inspekteras av
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Vänligen skapa inte konton för kunder och leverantörer. De skapas direkt från kund / leverantörsledning.
 DocType: Currency Exchange,Currency Exchange,Valutaväxling
 DocType: Purchase Invoice Item,Item Name,Produktnamn
+DocType: Authorization Rule,Approving User  (above authorized value),Godkännande Användare (ovan auktoriserad värde)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Tillgodohavande
 DocType: Employee,Widowed,Änka
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Produkter som skall begäras som är ""Slut på lagret"" med tanke på alla lager på kalkylerade antal och minsta beställningsantal"
@@ -378,22 +346,21 @@
 ,Purchase Register,Inköpsregistret
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
 DocType: Workstation,Consumable Cost,Förbrukningsartiklar Kostnad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
 DocType: Purchase Receipt,Vehicle Date,Fordons Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Medicinsk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Anledning till att förlora
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tube beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 DocType: Employee,Single,Singel
 DocType: Issue,Attachment,Bifogning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Budget kan inte ställas in för koncernens kostnadsställe
 DocType: Account,Cost of Goods Sold,Kostnad för sålda varor
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Ange kostnadsställe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ange kostnadsställe
 DocType: Journal Entry Account,Sales Order,Kundorder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Säljkurs
 DocType: Purchase Order,Start date of current order's period,Startdatum för aktuell beställning period
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Kvantitet kan inte vara en bråkdel i rad {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Kvantitet kan inte vara en bråkdel i rad {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
 DocType: Delivery Note,% Installed,% Installerad
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Ange företagetsnamn först
@@ -402,11 +369,9 @@
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Läs ERPNext Manual
 DocType: Account,Is Group,Är grupperad
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatiskt Serial Nos baserat på FIFO
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoformning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Skärsystem
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Till Ärende nr."" kan inte vara mindre än ""Från ärende nr"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Välgörenhets
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Välgörenhets
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Inte Startat
 DocType: Lead,Channel Partner,Kanalpartner
 DocType: Account,Old Parent,Gammalt mål
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
+DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Semester topp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Skalformning
 DocType: Material Request Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ange Artikelkod.
 DocType: BOM,Costing,Kostar
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Om markerad, kommer skattebeloppet anses redan ingå i Skriv värdet / Skriv beloppet"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totalt Antal
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
 DocType: Features Setup,Imports,Import
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Limning
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,I avvaktan på aktiviteter för dag
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Närvaro lista
 DocType: Bank Reconciliation,Journal Entries,Journalanteckningar
 DocType: Sales Order Item,Used for Production Plan,Används för produktionsplan
-DocType: System Settings,Loading...,Laddar ...
-DocType: DocField,Password,Lösenord
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Fused Deposition modellering
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minuter)
 DocType: Customer,Buyer of Goods and Services.,Köpare av varor och tjänster.
 DocType: Journal Entry,Accounts Payable,Leverantörsreskontra
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Lägg till Abonnenter
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Existerar inte
 DocType: Pricing Rule,Valid Upto,Giltig Upp till
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Direkt inkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Handläggare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Handläggare
 DocType: Payment Tool,Received Or Paid,Erhålls eller betalas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Välj Företag
 DocType: Stock Entry,Difference Account,Differenskonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Kosmetika
-DocType: DocField,Type,Typ
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
-DocType: Communication,Subject,Ämne
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 ,Serial No Warranty Expiry,Serial Ingen garanti löper ut
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Objekt
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Hantera Underleverantörer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Ny UOM får inte vara av typen heltal
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Hantera Underleverantörer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Möbler och Armaturer
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,I takt med vilket Prislistans valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Material Krav
 DocType: Company,Delete Company Transactions,Radera Företagstransactions
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Produkt {0} är inte ett beställningsobjekt
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} är en ogiltig e-postadress i &quot;Anmälan \ e-postadress&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Totalt Billing detta år:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Totalt Billing detta år:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan inte ta bort Löpnummer {0}, eftersom det används i aktietransaktioner"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Closing (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Closing (Cr)
 DocType: Serial No,Warranty Period (Days),Garantiperiod (dagar)
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 ,Pending Qty,Väntar Antal
 DocType: Job Applicant,Thread HTML,Gäng HTML
 DocType: Company,Ignore,Ignorera
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
 DocType: Pricing Rule,Valid From,Giltig Från
 DocType: Sales Invoice,Total Commission,Totalt kommissionen
 DocType: Pricing Rule,Sales Partner,Försäljnings Partner
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Månatlig Distribution ** hjälper dig att distribuera din budget över månader om du har säsonger i din verksamhet. För att fördela en budget med hjälp av denna fördelning, ställ in ** Månatlig Distribution ** i ** Kostnadscenter **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Inga träffar i Faktura tabellen
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Tyvärr, kan serienumren inte slås samman"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
-DocType: About Us Settings,Website Manager,Webbplats ägare
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Räkenskapsårets Startdatum får inte vara större än Räkenskapsårets Slutdatum
 DocType: Warranty Claim,Resolution,Åtgärd
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Levereras: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Fakturering och leveransstatus
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Föregående
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Sales Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Välj kundorder som du vill skapa produktionsorder.
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Lönedelar.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Databas för potentiella kunder.
+DocType: Authorization Rule,Customer or Item,Kund eller föremål
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Kunddatabas.
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Trumling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Standard mätenhet för punkt {0} kan inte ändras direkt eftersom du redan har gjort vissa transaktioner (s) med en annan UOM. Du måste skapa en ny punkt för att använda en annan standard UOM.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
-DocType: Event,Wednesday,Onsdag
 DocType: Sales Invoice,Customer's Vendor,Kundens Säljare
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Produktionsorder är Obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Förslagsskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Förslagsskrivning
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annan säljare {0} finns med samma anställningsid
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativt lager Fel ({6}) till punkt {0} i centrallager {1} på {2} {3} i {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Räkenskapsårets Företag
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,Standardkalkyl betyg
 DocType: Maintenance Schedule,Maintenance Schedule,Underhållsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sedan prissättningsregler filtreras bort baserat på kundens, Customer Group, Territory, leverantör, leverantör typ, kampanj, Sales Partner etc."
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Installera dropbox python-modul
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Chef
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Från inköpskvitto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chef
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Från inköpskvitto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
 DocType: SMS Settings,Receiver Parameter,Mottagare Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Baserad på"" och ""Gruppera efter"" kan inte vara samma"
 DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Till
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Ange e-postadress
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ändröret bildande
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 DocType: Selling Settings,Customer Naming By,Kundnamn på
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Konvertera till gruppen
 DocType: Activity Cost,Activity Type,Aktivitetstyp
@@ -578,25 +531,20 @@
 DocType: Customer,Fixed Days,Fasta Dagar
 DocType: Sales Invoice,Packing List,Packlista
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Inköprsorder som ges till leverantörer.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Publicering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicering
 DocType: Activity Cost,Projects User,Projekt Användare
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Förbrukat
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} hittades inte i Fakturainformationslistan
 DocType: Company,Round Off Cost Center,Avrunda kostnadsställe
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Servicebesök {0} måste avbrytas innan man kan avbryta kundorder
 DocType: Material Request,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Öppning (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Bokningstidsstämpel måste vara efter {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Inställningar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Cost skatter och avgifter
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Drifttid
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Mer
 DocType: Pricing Rule,Sales Manager,FÖRSÄLJNINGSCHEF
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Byt namn
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Böjning
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Tillåt användaren
 DocType: Journal Entry,Bill No,Fakturanr
 DocType: Purchase Invoice,Quarterly,Kvartals
 DocType: Selling Settings,Delivery Note Required,Följesedel Krävs
@@ -605,17 +553,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ange produktdetaljer
 DocType: Purchase Receipt,Other Details,Övriga detaljer
 DocType: Account,Accounts,Konton
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marknadsföring
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Rak skjuvning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marknadsföring
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Om du vill spåra objekt i försäljnings- och inköps dokument som grundar sig på deras serienummer nos. Detta är kan också användas för att spåra garanti detaljerad information om produkten.
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Avvisade Lager är obligatoriskt mot avvisade artiklar
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 DocType: Employee,Provide email id registered in company,Ange E-post ID registrerat i bolaget
 DocType: Hub Settings,Seller City,Säljaren stad
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Produkten har varianter.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Produkt  {0} hittades inte
 DocType: Bin,Stock Value,Stock Värde
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tree Typ
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet och Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionsandel (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Mot kupongtyp måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Det går inte att hitta växelkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Aerospace
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Välkommen
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Kreditkorts logg
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Uppgift Ämne
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Varor som erhållits från leverantörer.
-DocType: Communication,Open,Öppen
 DocType: Lead,Campaign Name,Kampanjens namn
 ,Reserved,Reserverat
 DocType: Purchase Order,Supply Raw Materials,Supply Råvaror
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} är inte en lagervara
 DocType: Mode of Payment Account,Default Account,Standard konto
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
-DocType: Contact Us Settings,Address Title,Adress Titel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Välj helgdagar
 DocType: Production Order Operation,Planned End Time,Planerat Sluttid
 ,Sales Person Target Variance Item Group-Wise,Försäljningen Person Mål Varians Post Group-Wise
-DocType: Dropbox Backup,Daily,Dagligen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Employee,Cell Number,Mobilnummer
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Automaterial Framställningar Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Energi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Månadslön uttalande.
 DocType: Item Group,Website Specifications,Webbplats Specifikationer
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Nytt Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Bokföringsposter kan göras mot huvudnoder. Inlägg mot grupper är inte tillåtna.
-DocType: ToDo,High,Hög
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Opportunity,Maintenance,Underhåll
-DocType: User,Male,Man
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Säljkampanjer.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -691,10 +631,9 @@
 DocType: Address,Personal,Personligt
 DocType: Expense Claim Detail,Expense Claim Type,Räknings Typ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinställningarna för Varukorgen
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalanteckning {0} är kopplad mot Beställning {1}, kolla om det ska dras i förskott i denna faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biotechnology
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Journalanteckning {0} är kopplad mot Beställning {1}, kolla om det ska dras i förskott i denna faktura."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Kontor underhållskostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
@@ -702,14 +641,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Process Payroll,Send Email,Skicka Epost
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Inget Tillstånd
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Uppdatera Stock"" kan inte kontrolleras eftersom produkter som inte levereras via {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Mina Fakturor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Mina Fakturor
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Ingen anställd hittades
 DocType: Purchase Order,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
@@ -728,35 +668,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",För att aktivera &quot;Point of Sale&quot; funktioner
 DocType: Bin,Moving Average Rate,Rörligt medelvärdes hastighet
 DocType: Production Planning Tool,Select Items,Välj objekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
-DocType: Comment,Reference Name,Referensnamn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: Sales Invoice Item,Target Warehouse,Target Lager
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Förväntad leveransdatum kan inte vara före säljorders datum
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Netto Vinst / Förlust
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
 DocType: Production Order,Item To Manufacture,Produkt för att tillverka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Permanent formgjutning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} status är {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Inköpsorder till betalning
 DocType: Sales Order Item,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
 DocType: Newsletter,Newsletter Manager,Nyhetsbrevsansvarig
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Öppna&quot;
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
 DocType: Expense Claim,Expenses,Kostnader
 DocType: Item Variant Attribute,Item Variant Attribute,Punkt Variant Attribut
 ,Purchase Receipt Trends,Kvitto Trender
 DocType: Appraisal,Select template from which you want to get the Goals,Välj mall som du vill få mål
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Utveckling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Forskning &amp; Utveckling
 ,Amount to Bill,Belopp till fakturera
 DocType: Company,Registration Details,Registreringsdetaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Utsättning
 DocType: Item,Re-Order Qty,Återuppta Antal
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Planerad att skicka till {0}
@@ -767,18 +704,16 @@
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Butiksförsäljnig
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Det går inte att föra fram {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
 DocType: Account,Balance must be,Balans måste vara
 DocType: Hub Settings,Publish Pricing,Publicera prissättning
 DocType: Notification Control,Expense Claim Rejected Message,Räkning avvisas meddelande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Spikning
 ,Available Qty,Tillgång Antal
 DocType: Purchase Taxes and Charges,On Previous Row Total,På föregående v Totalt
 DocType: Salary Slip,Working Days,Arbetsdagar
 DocType: Serial No,Incoming Rate,Inkommande betyg
 DocType: Packing Slip,Gross Weight,Bruttovikt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Inkludera semester i Totalt antal. Arbetsdagar
 DocType: Job Applicant,Hold,Håll
 DocType: Employee,Date of Joining,Datum för att delta
@@ -788,30 +723,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Se Medlemmar
 DocType: Purchase Invoice Item,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Blästring
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Valutakurs mästare.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} måste vara aktiv
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material {0} innan du avbryter detta Underhållsbesök
 DocType: Salary Slip,Leave Encashment Amount,Lämna inlösningsmängd
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Obligatorisk Antal
 DocType: Bank Reconciliation,Total Amount,Totala Summan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsorder
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Balans Värde
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicera till synkroniseringsobjekt
-DocType: GL Entry,Account Currency,Konto Valuta
+DocType: Bank Reconciliation,Account Currency,Konto Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Ango Avrundningskonto i bolaget
 DocType: Purchase Receipt,Range,Intervall
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Features Setup,Item Barcode,Produkt Streckkod
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 DocType: Address,Shop,Shop
@@ -820,7 +754,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / Kontant konto kommer att uppdateras automatiskt i POS faktura när detta läge är valt.
 DocType: Employee,Permanent Address Is,Permanent Adress är
 DocType: Production Order Operation,Operation completed for how many finished goods?,Driften färdig för hur många färdiga varor?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Varumärket
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Varumärket
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Ersättning för över {0} korsade till punkt {1}.
 DocType: Employee,Exit Interview Details,Avsluta intervju Detaljer
 DocType: Item,Is Purchase Item,Är beställningsobjekt
@@ -839,60 +773,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Inköpsorder Artikeln
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Indirekt inkomst
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Ställ Betalningsbelopp = utestående belopp
-DocType: Contact Us Settings,Address Line 1,Adress Linje 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varians
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Företagsnamn
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varians
+,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Välj föremål för Transfer
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Visa en lista över alla hjälp videos
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Välj konto chefen för banken, där kontrollen avsattes."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillåt användare att redigera prislista i transaktioner
 DocType: Pricing Rule,Max Qty,Max Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Rad {0}: Betalning mot Försäljning / inköpsorder bör alltid märkas i förskott
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kemisk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kemisk
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 DocType: Process Payroll,Select Payroll Year and Month,Välj Lön År och Månad
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""","Gå till lämplig grupp (vanligtvis Tillämpning av fonder> Omsättningstillgångar> bankkonton och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""Bank"""
 DocType: Workstation,Electricity Cost,Elkostnad
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
-DocType: Comment,Unsubscribed,Otecknade
 DocType: Opportunity,Walk In,Gå In
 DocType: Item,Inspection Criteria,Inspektionskriterier
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Tree of finanial kostnadsställen.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Överfört
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Vit
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Bifoga din bild
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Göra
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Bifoga din bild
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Göra
 DocType: Journal Entry,Total Amount in Words,Total mängd i ord
-DocType: Workflow State,Stop,Stoppa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Det var ett problem. En trolig orsak kan vara att du inte har sparat formuläret. Vänligen kontakta support@erpnext.com om problemet kvarstår.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Min kundvagn
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Beställd Typ måste vara en av {0}
 DocType: Lead,Next Contact Date,Nästa Kontakt Datum
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Öppning Antal
 DocType: Holiday List,Holiday List Name,Semester Listnamn
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Optioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Optioner
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Antal för {0}
 DocType: Leave Application,Leave Application,Ledighetsansöknan
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Ledighet Tilldelningsverktyget
 DocType: Leave Block List,Leave Block List Dates,Lämna Block Lista Datum
 DocType: Company,If Monthly Budget Exceeded (for expense account),Om månadsbudgeten överskrids (för utgiftskonto)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Putsning
 DocType: Workstation,Net Hour Rate,Netto timmekostnad
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landad kostnad inköpskvitto
 DocType: Company,Default Terms,Standardvillkor
 DocType: Packing Slip Item,Packing Slip Item,Följesedels artikel
 DocType: POS Profile,Cash/Bank Account,Kontant / Bankkonto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Arkivering
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Rabatt
 DocType: Features Setup,Purchase Discounts,Inköpsrabatter
 DocType: Workstation,Wages,Löner
@@ -909,7 +838,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
 DocType: Serial No,Creation Document No,Skapande Dokument nr
 DocType: Issue,Issue,Problem
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontot inte överens med bolaget
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Lager
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
 DocType: BOM Operation,Operation,Funktion
@@ -917,13 +847,13 @@
 DocType: Tax Rule,Shipping State,Frakt State
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,"Produkt måste tillsättas med hjälp av ""få produkter  från kvitton"" -knappen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Försäljnings Kostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standard handla
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standard handla
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Göra Stock Inlägg
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Göra Stock Inlägg
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
 DocType: Item,Default Supplier,Standard Leverantör
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Överproduktion Tillåter Procent
@@ -938,29 +868,27 @@
 DocType: Time Log Batch,updated via Time Logs,uppdateras via Time Loggar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Medelålder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din säljare som kommer att kontakta kunden i framtiden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
 DocType: Company,Default Currency,Standard Valuta
 DocType: Contact,Enter designation of this Contact,Ange beteckning för denna Kontakt
-DocType: Contact Us Settings,Address,Adress
 DocType: Expense Claim,From Employee,Från anställd
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
 DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg
 DocType: Upload Attendance,Attendance From Date,Närvaro Från datum
 DocType: Appraisal Template Goal,Key Performance Area,Nyckelperformance Områden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Transportfordon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportfordon
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,och år:
 DocType: Email Digest,Annual Expense,Årlig Expense
 DocType: SMS Center,Total Characters,Totalt Tecken
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form faktura Detalj
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalning Avstämning Faktura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Bidrag%
 DocType: Item,website page link,webbsida länk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Låt oss förbereda systemet för första användning.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Organisationsnummer som referens. Skattenummer etc.
 DocType: Sales Partner,Distributor,Distributör
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Varukorgen frakt Regel
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Produktionsorder {0} måste avbrytas innan du kan avbryta kundorder
 ,Ordered Items To Be Billed,Beställda varor att faktureras
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Välj Time Loggar och skicka för att skapa en ny försäljnings faktura.
@@ -980,14 +908,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Ingenting att begära
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Ledning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Ledning
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Olika typer av aktiviteter för tidrapporter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Investeringar gjutning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Antingen betal- eller kreditbeloppet krävs för {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Aktiv
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Blå
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Blå
 DocType: Purchase Invoice,Is Return,Är Returnerad
 DocType: Price List Country,Price List Country,Prislista Land
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ytterligare noder kan endast skapas under &quot;grupp&quot; typ noder
@@ -997,50 +923,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} redan skapats för användare: {1} och företag {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Omvandlingsfaktor
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Laminerad objekt tillverkning
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Leverantörsdatabas.
 DocType: Account,Balance Sheet,Balansräkning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Sträckformning
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din säljare kommer att få en påminnelse om detta datum att kontakta kunden
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Skatt och andra löneavdrag.
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
 DocType: Account,Warehouse,Lager
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger inlägg och GL Posterna reposted för valda kvitton
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Produkt  1
 DocType: Holiday,Holiday,Sommar
-DocType: Event,Saturday,Lördag
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lämna tomt om det anses vara för alla grenar
 ,Daily Time Log Summary,Sammanfattning Daglig tidslog
-DocType: DocField,Label,Etikett
 DocType: Payment Reconciliation,Unreconciled Payment Details,Sonade Betalningsinformation
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
 DocType: Lead,Call,Ring
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Ställa in Anställda
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Grid &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Välj prefix först
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ange minst ett attribut i tabellen attribut
 DocType: Contact,User ID,Användar ID
-DocType: Communication,Sent,Skickat
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Se journal
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
-DocType: Communication,Delivery Status,Leveransstatus
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 DocType: Production Order,Manufacture against Sales Order,Tillverkning mot kundorder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Resten av världen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
@@ -1051,13 +970,11 @@
 DocType: BOM Item,Item Description,Produktbeskrivning
 DocType: Payment Tool,Payment Mode,Betalningsläget
 DocType: Purchase Invoice,Is Recurring,Är återkommande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Direkt metall lasersintring
 DocType: Purchase Order,Supplied Items,Medföljande tillbehör
 DocType: Production Order,Qty To Manufacture,Antal att tillverka
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Behåll samma takt hela inköpscykeln
 DocType: Opportunity Item,Opportunity Item,Möjlighet Punkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Tillfällig Öppning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Anställd Avgångskostnad
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
 DocType: Address,Address Type,Adresstyp
@@ -1073,35 +990,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Hämta utestående fakturor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Kundorder {0} är inte giltig
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Liten
 DocType: Employee,Employee Number,Anställningsnummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Produkt  2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Konto huvudet {0} skapades
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Grön
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Grön
 DocType: Item,Auto re-order,Auto återbeställning
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Totalt Uppnått
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totalt Uppnått
 DocType: Employee,Place of Issue,Utgivningsplats
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
-DocType: Report,Disabled,Inaktiverad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Kontrakt
+DocType: Email Digest,Add Quote,Lägg Citat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Jordbruk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Dina produkter eller tjänster
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Dina produkter eller tjänster
 DocType: Mode of Payment,Mode of Payment,Betalningssätt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Namn krävs
 DocType: Purchase Invoice,Recurring Type,Återkommande Typ
 DocType: Address,City/Town,Stad / Town
 DocType: Email Digest,Annual Income,Årlig inkomst
 DocType: Serial No,Serial No Details,Serial Inga detaljer
 DocType: Purchase Invoice Item,Item Tax Rate,Produkt Skattesats
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Produkt  {0} måste vara ett underleverantörs produkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Kapital Utrustning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
@@ -1111,14 +1027,13 @@
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Förväntad leveransdatum är mindre än planerat startdatum.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,För Leverantör
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ställa Kontotyp hjälper i att välja detta konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Totalsumma (Företagsvaluta)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Totalt Utgående
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Det kan bara finnas en frakt Regel skick med 0 eller blank värde för &quot;till värde&quot;
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Obs! Detta här kostnadsställe är en grupp. Det går inte att göra bokföringsposter mot grupper.
-apps/frappe/frappe/config/desk.py +7,Tools,Verktyg
 DocType: Item,Website Item Groups,Webbplats artikelgrupper
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Produktionsordernummer är obligatoriskt för införande i lager för ändamålet för tillverkning
 DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
@@ -1126,24 +1041,22 @@
 DocType: Journal Entry,Journal Entry,Journalanteckning
 DocType: Workstation,Workstation Name,Arbetsstation Namn
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
 DocType: Sales Partner,Target Distribution,Target Fördelning
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Kommentarer
 DocType: Salary Slip,Bank Account No.,Bankkonto nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Detta är numret på den senast skapade transaktionen med detta prefix
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Värderings takt som krävs för produkt {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Värderings takt som krävs för produkt {0}
 DocType: Quality Inspection Reading,Reading 8,Avläsning 8
 DocType: Sales Partner,Agent,Agent
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Totalt {0} för alla objekt är noll, kan du bör ändra &quot;Fördela avgifter som grundas på&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter och avgifter Beräkning
 DocType: BOM Operation,Workstation,Arbetsstation
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hårdvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hårdvara
 DocType: Attendance,HR Manager,HR-chef
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Välj ett företag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Enskild ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Du måste aktivera Varukorgen
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Inga Data
 DocType: Appraisal Template Goal,Appraisal Template Goal,Bedömning Mall Mål
 DocType: Salary Slip,Earning,Tjänar
 DocType: Payment Tool,Party Account Currency,Party konto Valuta
@@ -1153,26 +1066,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Överlappande förhållanden som råder mellan:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Totalt ordervärde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Mat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Du kan endast göra tidsloggar mot en inlämnad produktionsorder
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
-DocType: File,old_parent,gammalt_mål
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Nyhetsbrev till kontakter, prospekts."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta avslutnings Hänsyn måste vara {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summan av poäng för alla mål bör vara 100. Det är {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Verksamheten kan inte lämnas tomt.
 ,Delivered Items To Be Billed,Levererade artiklar att faktureras
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
-DocType: DocField,Description,Beskrivning
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
-DocType: Letter Head,Is Default,Är Standard
 DocType: Address,Utilities,Verktyg
 DocType: Purchase Invoice Item,Accounting,Redovisning
 DocType: Features Setup,Features Setup,Funktioner Inställning
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Visa erbjudande
-DocType: Communication,Communication,Kommunikation
 DocType: Item,Is Service Item,Är Serviceobjekt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Välj Räkenskapsårets
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Från {0} | {1} {2}
@@ -1191,7 +1101,7 @@
 DocType: Item,Maintain Stock,Behåll Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Från Daterad tid
 DocType: Email Digest,For Company,För Företag
@@ -1201,7 +1111,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Beror på avgång utan lön
@@ -1215,30 +1125,27 @@
 DocType: HR Settings,Employee Settings,Personal Inställningar
 ,Batch-Wise Balance History,Batchvis Balans Historik
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Att Göra Lista
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Lärling
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Lärling
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skatte detalj tabell hämtas från punkt mästare som en sträng och lagras i detta område. Används för skatter och avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Ingen aktiv lönesättning hittades för anställd {0} och månaden
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Skatte Regel för transaktioner.
 DocType: Rename Tool,Type of document to rename.,Typ av dokument för att byta namn.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Vi köper detta objekt
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Vi köper detta objekt
 DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flänsning
-DocType: Bulk Email,Not Sent,Inte Skickade
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Explosivt formning
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totala skatter och avgifter (Företags valuta)
 DocType: Shipping Rule,Shipping Account,Frakt konto
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Planerad att skicka till {0} mottagare
 DocType: Quality Inspection,Readings,Avläsningar
 DocType: Stock Entry,Total Additional Costs,Totalt Merkostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Assemblies
 DocType: Shipping Rule Condition,To Value,Att Värdera
 DocType: Supplier,Stock Manager,Lagrets direktör
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Källa lager är obligatoriskt för rad {0}
@@ -1248,105 +1155,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analytiker
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med JV mängd {2}
 DocType: Item,Inventory,Inventering
 DocType: Features Setup,"To enable ""Point of Sale"" view",För att aktivera &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Betalning kan inte göras för tomma kundvagnar
 DocType: Item,Sales Details,Försäljnings Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Nålning
 DocType: Opportunity,With Items,Med artiklar
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antal
 DocType: Notification Control,Expense Claim Rejected,Räkning avvisas
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Det datum då nästa faktura kommer att genereras. Det genereras på skicka.
 DocType: Item Attribute,Item Attribute,Produkt Attribut
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Regeringen
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Produkt Varianter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Regeringen
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Produkt Varianter
 DocType: Company,Services,Tjänster
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Totalt ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Totalt ({0})
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
 DocType: Sales Invoice,Source,Källa
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Inga träffar i betalningstabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Budgetåret Startdatum
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Inga träffar i betalningstabellen
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Budgetåret Startdatum
 DocType: Employee External Work History,Total Experience,Total Experience
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Försänkning
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Följesedlar avbryts
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Följesedlar avbryts
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Material Request Item,Sales Order No,Kundorder Ingen
 DocType: Item Group,Item Group Name,Produkt  Gruppnamn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Taken
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Överför Material Tillverkning
 DocType: Pricing Rule,For Price List,För prislista
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Inköpsomsätting för artikel: {0} hittades inte, som krävs för att boka konterings (kostnad). Nämn artikelpris mot en inköpslista."
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ytterligare rabattbeloppet (Företagsvaluta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Fel: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Fel: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Skapa nytt konto från kontoplan.
 DocType: Maintenance Visit,Maintenance Visit,Servicebesök
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Kund> Kundgrupp > Område
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tillgänglig Batch Antal vid Lager
 DocType: Time Log Batch Detail,Time Log Batch Detail,Tid Log Batch Detalj
-DocType: Workflow State,Tasks,Uppgifter
 DocType: Landed Cost Voucher,Landed Cost Help,Landad kostnad Hjälp
-DocType: Event,Tuesday,Tisdag
 DocType: Leave Block List,Block Holidays on important days.,Block Semester på viktiga dagar.
 ,Accounts Receivable Summary,Kundfordringar Sammanfattning
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Lämnar för typ {0} redan avsatts för anställd {1} för perioden {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
 DocType: UOM,UOM Name,UOM Namn
-DocType: Top Bar Item,Target,Mål
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Bidragsbelopp
 DocType: Sales Invoice,Shipping Address,Leverans Adress
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Detta verktyg hjälper dig att uppdatera eller rätta mängden och värdering av lager i systemet. Det är oftast används för att synkronisera systemvärden och vad som faktiskt finns i dina lager.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,I Ord kommer att synas när du sparar följesedel.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Huvudmärke
-DocType: ToDo,Due Date,Förfallodatum
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Huvudmärke
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Låda
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organisationen
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Låda
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organisationen
 DocType: Monthly Distribution,Monthly Distribution,Månads Fördelning
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottagare Lista är tom. Skapa Mottagare Lista
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan för kundorder
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Kontering för {0} kan endast göras i valuta: {1}
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Stansning
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Material begäran om att inköpsorder
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte i {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonton
 ,Bank Reconciliation Statement,Bank Avstämning Uttalande
 DocType: Address,Lead Name,Prospekt Namn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Ingående lagersaldo
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Ingående lagersaldo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} måste bara finnas en gång
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ej tillåtet att flytta mer {0} än {1} mot beställning {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Inga produkter att packa
 DocType: Shipping Rule Condition,From Value,Från Värde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Belopp som inte återspeglas i bank
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Belopp som inte återspeglas i bank
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Anspråk på företagets bekostnad.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Centrifugalgjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetfält assisterad efterbehandling
 DocType: Company,Default Holiday List,Standard kalender
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stock Skulder
 DocType: Purchase Receipt,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 DocType: Production Planning Tool,Select Sales Orders,Välj kundorder
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Om du vill spåra objekt med streckkod. Du kommer att kunna komma in poster i följesedeln och fakturan genom att skanna streckkoder av objekt.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Markera som levereras
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Markera som levereras
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Skapa offert
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 DocType: SMS Center,Receiver List,Mottagare Lista
@@ -1354,31 +1252,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Visa
 DocType: Salary Structure Deduction,Salary Structure Deduction,Lönestruktur Avdrag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektiv lasersintring
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Import lyckades!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Antal får inte vara mer än {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Ålder (dagar)
 DocType: Quotation Item,Quotation Item,Offert Artikel
 DocType: Account,Account Name,Kontonamn
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Från Datum kan inte vara större än Till Datum
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} kvantitet {1} inte kan vara en fraktion
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Leverantör Typ mästare.
 DocType: Purchase Order Item,Supplier Part Number,Leverantör Artikelnummer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Lägga till
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Konverteringskurs kan inte vara 0 eller 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} avbryts eller stoppas
 DocType: Accounts Settings,Credit Controller,Kreditcontroller
 DocType: Delivery Note,Vehicle Dispatch Date,Fordon Avgångs Datum
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Inköpskvitto {0} är inte lämnat
 DocType: Company,Default Payable Account,Standard betalkonto
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Inställningar för webbutik som fraktregler, prislista mm"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Installationen är klar
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Fakturerad
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Personal Resurser
 DocType: Lead,Upper Income,Övre inkomst
 DocType: Journal Entry Account,Debit in Company Currency,Debet i bolaget Valuta
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mina Frågor
@@ -1387,12 +1281,9 @@
 DocType: Company,Default Values,Standardvärden
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Rad {0}: Betalningsbelopp kan inte vara negativ
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Presspassning
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
 DocType: Payment Reconciliation,Payments,Betalningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Varm isostatisk pressning
-DocType: ToDo,Medium,Medium
 DocType: Budget Detail,Budget Allocated,Budget
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kund tillgodohavande
@@ -1401,12 +1292,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Uppdatera bankbetalningsdagar med tidskrifter.
 DocType: Quotation,Term Details,Term Detaljer
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitetsplanering för (Dagar)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
 DocType: Warranty Claim,Warranty Claim,Garantianspråk
 ,Lead Details,Prospekt Detaljer
-DocType: Authorization Rule,Approving User,Godkänn användare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Smide
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Plätering
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
 DocType: Pricing Rule,Applicable For,Tillämplig för
 DocType: Bank Reconciliation,From Date,Från Datum
@@ -1428,64 +1316,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Auktioner
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Auktioner
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Ange antingen Kvantitet eller Värderingsomsättning eller båda
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Företag, månad och räkenskapsår är obligatorisk"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Enda enhet av ett objekt.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Tid Log Batch {0} måste &quot;Avsändare&quot;
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Skapa kontering för varje lagerförändring
 DocType: Leave Allocation,Total Leaves Allocated,Totala Löv Avsatt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Lager krävs vid Rad nr {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Ange ett giltigt räkenskapsåret start- och slutdatum
 DocType: Employee,Date Of Retirement,Datum för pensionering
 DocType: Upload Attendance,Get Template,Hämta mall
 DocType: Address,Postal,Post
 DocType: Item,Weightage,Vikt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Gruv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Hartsgjutning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Välj {0} först.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Överordnat område
 DocType: Quality Inspection Reading,Reading 2,Avläsning 2
 DocType: Stock Entry,Material Receipt,Material Kvitto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Produkter
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Produkter
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Partityp och Parti krävs för mottagare / Betalnings konto {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Om denna artikel har varianter, så det kan inte väljas i kundorder etc."
 DocType: Lead,Next Contact By,Nästa Kontakt Vid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Lager {0} kan inte tas bort då kvantitet existerar för artiklar {1}
 DocType: Quotation,Order Type,Beställ Type
 DocType: Purchase Invoice,Notification Email Address,Anmälan E-postadress
 DocType: Payment Tool,Find Invoices to Match,Hitta fakturor för att matcha
 ,Item-wise Sales Register,Produktvis säljregister
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","t.ex. ""Swedbank"""
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","t.ex. ""Swedbank"""
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Är denna skatt inkluderar i Basic kursen?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Totalt Target
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Totalt Target
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Varukorgen är aktiverad
 DocType: Job Applicant,Applicant for a Job,Sökande för ett jobb
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Inga produktionsorder skapas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Lönebesked av personal {0} redan skapats för denna månad
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Lönebesked av personal {0} redan skapats för denna månad
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Sales Invoice Item,Batch No,Batch nr
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Huvud
-DocType: DocPerm,Delete,Radera
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Variant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Ny {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Stoppad ordning kan inte avbrytas. Unstop att avbryta.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Avsatt mängd
 DocType: Sales Team,Contribution to Net Total,Bidrag till Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
@@ -1494,53 +1380,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Sökande av ett jobb.
 DocType: Purchase Order Item,Warehouse and Reference,Lager och referens
 DocType: Supplier,Statutory info and other general information about your Supplier,Lagstadgad information och annan allmän information om din leverantör
-DocType: Country,Country,Land
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresser
-DocType: Communication,Received,Mottagna
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicera Löpnummer upp till punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,En förutsättning för en frakt Regel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Produkten är inte tillåten att ha produktionsorder.
-DocType: DocField,Attach Image,Bifoga bild
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovikten av detta paket. (Beräknas automatiskt som summan av nettovikt av objekt)
-DocType: Stock Reconciliation Item,Leave blank if no change,Lämna tomt om ingen förändring
 DocType: Sales Order,To Deliver and Bill,Att leverera och Bill
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Time Loggar för tillverkning.
 DocType: Item,Apply Warehouse-wise Reorder Level,Applicera Lagermässiga förändringar på annan nivå
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Tid Log för uppgifter.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Betalning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Betalning
 DocType: Production Order Operation,Actual Time and Cost,Faktisk tid och kostnad
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Begäran om maximalt {0} kan göras till punkt {1} mot kundorder {2}
 DocType: Employee,Salutation,Salutation
-DocType: Communication,Rejected,Avvisad
 DocType: Pricing Rule,Brand,Märke
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundlade poster vid tidpunkten för försäljning.
 DocType: Sales Order Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
 DocType: Quality Inspection Reading,Reading 10,Avläsning 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
 DocType: Hub Settings,Hub Node,Nav Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Värde {0} för Attribut {1} finns inte i listan över giltiga Punkt Attribut Värderingar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Associate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Utgånget
 DocType: Packing Slip,To Package No.,Förpackningens Nej
-DocType: DocType,System,System
 DocType: Warranty Claim,Issue Date,Utgivningsdatum
 DocType: Activity Cost,Activity Cost,Aktivitetskostnad
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Förbrukad Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekommunikation
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 DocType: Payment Tool,Make Payment Entry,Skapa inbetalninginlägg
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
 ,Sales Invoice Trends,Fakturan Trender
 DocType: Leave Application,Apply / Approve Leaves,Ansök / Godkänn ledigheter
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,För
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Kan hänvisa till rad endast om avgiften är ""På föregående v Belopp"" eller ""Föregående rad Total"""
 DocType: Sales Order Item,Delivery Warehouse,Leverans Lager
 DocType: Stock Settings,Allowance Percent,Ersättningsprocent
@@ -1552,33 +1433,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Försäljnings måste kontrolleras, i förekommande fall för väljs som {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Leverantör offert Punkt
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Skapa lönestruktur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Klippning
 DocType: Item,Has Variants,Har Varianter
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Klicka på ""Skapa försäljningsfakturan"" knappen för att skapa en ny försäljnings faktura."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Förpackning och märkning
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Ange standardvaluta i huvudbolaget och Global inställningar
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Tillträde Secret
 DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Hantera projekt
 DocType: Supplier,Supplier of Goods or Services.,Leverantör av varor eller tjänster.
 DocType: Budget Detail,Fiscal Year,Räkenskapsår
 DocType: Cost Center,Budget,Budget
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan inte tilldelas mot {0}, eftersom det inte är en intäkt eller kostnad konto"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Uppnått
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Territorium / Kund
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,t.ex. 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,t.ex. 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord kommer att synas när du sparar fakturan.
 DocType: Item,Is Sales Item,Är Försäljningsobjekt
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Produktgruppträdet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
 DocType: Maintenance Visit,Maintenance Time,Servicetid
 ,Amount to Deliver,Belopp att leverera
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,En produkt eller tjänst
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Det fanns fel.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Gäng
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,En produkt eller tjänst
 DocType: Naming Series,Current Value,Nuvarande Värde
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} skapad
 DocType: Delivery Note Item,Against Sales Order,Mot kundorder
@@ -1592,15 +1468,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
 DocType: Website Item Group,Website Item Group,Webbplats Produkt Grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Tullar och skatter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Ange Referensdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Ange Referensdatum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell för punkt som kommer att visas i Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
 DocType: Material Request Item,Material Request Item,Material Begäran Produkt
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Träd artikelgrupper.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Träd artikelgrupper.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
 ,Item-wise Purchase History,Produktvis Köphistorik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Röd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Röd
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
 DocType: Account,Frozen,Fryst
 ,Open Production Orders,Öppna produktionsorder
@@ -1610,12 +1486,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Rad # {0}: Operation {1} är inte klar för {2} st av färdiga varor i produktionsorder # {3}. Uppdatera driftstatus via Tidsloggar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Ändra UOM för ett objekt.
 DocType: Quality Inspection Reading,Acceptance Criteria,Acceptanskriterier
 DocType: Item Attribute,Attribute Name,Attribut Namn
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Produkt {0} måste vara försäljning eller serviceprodukt i {1}
 DocType: Item Group,Show In Website,Visa i Webbsida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupp
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grupp
 DocType: Task,Expected Time (in hours),Förväntad tid (i timmar)
 ,Qty to Order,Antal till Ordern
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Om du vill spåra varumärke i följande dokument följesedel, Möjlighet, Materialhantering Request, punkt, inköpsorder, inköps Voucher, inköpare Kvitto, Offert, Försäljning Faktura, Produkt Bundle, kundorder, Löpnummer"
@@ -1624,78 +1499,67 @@
 DocType: Holiday List,Clear Table,Rensa Tabell
 DocType: Features Setup,Brands,Varumärken
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Från beställning
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Från beställning
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 DocType: Activity Cost,Costing Rate,Kalkylfrekvens
 ,Customer Addresses And Contacts,Kund adresser och kontakter
 DocType: Employee,Resignation Letter Date,Avskedsbrev Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Inte Inställd
-DocType: Communication,Date,Datum
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Upprepa kund Intäkter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sitt tight medan systemet håller på att installationsprogrammet. Det kan ta en liten stund.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskt Datum
 DocType: Item,Has Batch No,Har Sats nr
 DocType: Delivery Note,Excise Page Number,Punktnotering sidnummer
 DocType: Employee,Personal Details,Personliga Detaljer
 ,Maintenance Schedules,Underhålls scheman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Prägling
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Som produktionsorder kan göras för denna post, måste det vara en lagervara."
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Går med
-DocType: Authorization Rule,Above Value,Ovan Värde
 ,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
 DocType: Purchase Order,Delivered,Levereras
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Inställning inkommande server jobb e-id. (T.ex. jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt tilldelade blad {0} kan inte vara mindre än redan godkända blad {1} för perioden
 DocType: Journal Entry,Accounts Receivable,Kundreskontra
 ,Supplier-Wise Sales Analytics,Leverantör-Wise Sales Analytics
 DocType: Address Template,This format is used if country specific format is not found,Det här formatet används om landsspecifika format inte hittas
-DocType: Custom Field,Custom,Anpassad
 DocType: Production Order,Use Multi-Level BOM,Använd Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Formsprutning
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkludera avstämnignsanteckningar
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Träd finanial konton.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lämna tomt om det anses vara för alla typer  av anställda
 DocType: Landed Cost Voucher,Distribute Charges Based On,Fördela avgifter som grundas på
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Kontot {0} måste vara av typen ""Fast tillgång"" som punkt {1} är en tillgångspost"
 DocType: HR Settings,HR Settings,HR Inställningar
-apps/frappe/frappe/config/setup.py +130,Printing,Tryckning
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Räkning väntar på godkännande. Endast Utgiftsgodkännare kan uppdatera status.
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Dagen (er) som du ansöker om ledighet är semester. Du behöver inte ansöka om tjänstledighet.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,och
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Förkortning kan inte vara tomt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Sport
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Totalt Faktisk
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Enhet
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Ställ Dropbox snabbtangenter på din sida config
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Enhet
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Ange Företag
 ,Customer Acquisition and Loyalty,Kundförvärv och Lojalitet
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Lager där du hanterar lager av avvisade föremål
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Din räkenskapsår slutar
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Din räkenskapsår slutar
 DocType: POS Profile,Price List,Prislista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} är nu standard räkenskapsår. Vänligen uppdatera din webbläsare för att ändringen ska träda i kraft.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
-DocType: Authorization Rule,Approving Role,Godkännande Roll
 ,BOM Search,BOM Sök
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Stänger (Öppna + Totals)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Ange valuta i bolaget
 DocType: Workstation,Wages per hour,Löner per timme
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagersaldo i Batch {0} kommer att bli negativ {1} till punkt {2} på Warehouse {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Visa / Göm funktioner som serienumren, POS etc."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Efter Material Framställningar har höjts automatiskt baserat på punkt re-order nivå
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Utförsäljningsdatumet kan inte vara före markerat datum i rad {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Utförsäljningsdatumet kan inte vara före markerat datum i rad {0}
 DocType: Salary Slip,Deduction,Avdrag
 DocType: Address Template,Address Template,Adress Mall
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Ange anställnings Id för denna säljare
@@ -1707,76 +1571,68 @@
 DocType: Opportunity,Quotation,Offert
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 DocType: Quotation,Maintenance User,Serviceanvändare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Kostnad Uppdaterad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Kostnad Uppdaterad
 DocType: Employee,Date of Birth,Födelsedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Punkt {0} redan har returnerat
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Räkenskapsårets ** representerar budgetåret. Alla bokföringsposter och andra större transaktioner spåras mot ** räkenskapsår **.
 DocType: Opportunity,Customer / Lead Address,Kund / Huvudadress
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Arbetsbeskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Arbetsbeskrivning
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal per lager UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Välj en giltig csv-fil med data
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Beläggning
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkännare
 ,SO Qty,SO Antal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Arkiv poster finns mot lager {0}, därför du kan inte åter tilldela eller ändra Warehouse"
 DocType: Appraisal,Calculate Total Score,Beräkna Totalsumma
 DocType: Supplier Quotation,Manufacturing Manager,Tillverkningsansvarig
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Split följesedel i paket.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Doppgjutning
-DocType: Purchase Order,To be delivered to customer,Som skall levereras till kund
+apps/erpnext/erpnext/hooks.py +68,Shipments,Transporter
+DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Tid Log Status måste lämnas in.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Konfigurera
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Rad #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Rad #
 DocType: Purchase Invoice,In Words (Company Currency),I ord (Företagsvaluta)
 DocType: Pricing Rule,Supplier,Leverantör
 DocType: C-Form,Quarter,Kvartal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Diverse Utgifter
 DocType: Global Defaults,Default Company,Standard Company
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Utgift eller differens konto är obligatoriskt för punkt {0} som den påverkar totala lagervärdet
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan inte överdebitera till punkt {0} i rad {1} mer än {2}. För att möjliggöra överdebitering, ställ in i lager Inställningar"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan inte överdebitera till punkt {0} i rad {1} mer än {2}. För att möjliggöra överdebitering, ställ in i lager Inställningar"
 DocType: Employee,Bank Name,Bank Namn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Ovan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Användare {0} är inaktiverad
 DocType: Leave Application,Total Leave Days,Totalt semesterdagar
-DocType: Journal Entry Account,Credit in Account Currency,Kredit i konto Valuta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Obs: E-post kommer inte att skickas till inaktiverade användare
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Välj Företaget ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lämna tomt om det anses vara för alla avdelningar
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Currency Exchange,From Currency,Från Valuta
-DocType: DocField,Name,Namn
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Kundorder krävs för punkt {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Belopp som inte återspeglas i systemet
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Välj tilldelade beloppet, Faktura Typ och fakturanumret i minst en rad"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Kundorder krävs för punkt {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Belopp som inte återspeglas i systemet
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Annat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Annat
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En produkt eller en tjänst som köps, säljs eller hålls i lager."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Avslutade
-DocType: Web Form,Select DocType,Välj DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Brotschning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bank
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bank
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Klicka på ""Skapa schema"" för att få schemat"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Nytt kostnadsställe
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Nytt kostnadsställe
 DocType: Bin,Ordered Quantity,Beställd kvantitet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
 DocType: Quality Inspection,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
 DocType: Purchase Order Item,Reference Document Type,Referensdokument Typ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} mot kundorder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serial numrerade Inventory
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serial numrerade Inventory
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
 DocType: Time Log Batch,Total Billing Amount,Totalt Fakturerings Mängd
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Fordran Konto
@@ -1784,19 +1640,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Kundorder till betalning
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Tid Loggar skapat:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Välj rätt konto
 DocType: Item,Weight UOM,Vikt UOM
 DocType: Employee,Blood Group,Blodgrupp
 DocType: Purchase Invoice Item,Page Break,Sidbrytning
 DocType: Production Order Operation,Pending,Väntar
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Användare som kan godkänna en specifik arbetstagarens ledighet applikationer
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Du kan inte ändra standard UOM av variant. Om du vill ändra standard UOM för Variant ändra standard UOM av mall
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontorsutrustning
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Företag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Höj material Begäran när lager når ombeställningsnivåer
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Från underhållsschema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Heltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Heltid
 DocType: Purchase Invoice,Contact Details,Kontaktuppgifter
 DocType: C-Form,Received Date,Mottaget Datum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Om du har skapat en standardmall i skatter och avgifter Mall, välj en och klicka på knappen nedan."
@@ -1808,14 +1664,15 @@
 DocType: Job Applicant,Job Opening,Arbetsöppning
 DocType: Payment Reconciliation,Payment Reconciliation,Betalning Avstämning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Välj Ansvariges namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknik
 DocType: Offer Letter,Offer Letter,Erbjudande Brev
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generera Material Begäran (GMB) och produktionsorder.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Sammanlagt fakturerat Amt
 DocType: Time Log,To Time,Till Time
+DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Om du vill lägga ordnade noder, utforska träd och klicka på noden där du vill lägga till fler noder."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Prislista {0} är inaktiverad
@@ -1825,12 +1682,10 @@
 DocType: Item,Customer Item Codes,Kund artikelnummer
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Skapa Betalnings inlägg mot Order eller Fakturor.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Svetsning
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Nytt Lager UOM krävs
 DocType: Quality Inspection,Sample Size,Provstorlek
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Alla objekt har redan fakturerats
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ange ett giltigt Från ärende nr &quot;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
 DocType: Features Setup,Item Serial Nos,Produkt serie nr
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter
@@ -1840,15 +1695,13 @@
 DocType: Bin,Actual Quantity,Verklig Kvantitet
 DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Löpnummer {0} hittades inte
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Dina kunder
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Formpressning
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Dina kunder
 DocType: Leave Block List Date,Block Date,Block Datum
 DocType: Sales Order,Not Delivered,Inte Levererad
 ,Bank Clearance Summary,Banken Clearance Sammanfattning
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Punkt kod&gt; Artikel Group&gt; Brand
 DocType: Appraisal Goal,Appraisal Goal,Bedömning Mål
-DocType: Event,Friday,Fredag
 DocType: Time Log,Costing Amount,Kalkyl Mängd
 DocType: Process Payroll,Submit Salary Slip,Skicka lönebeskedet
 DocType: Salary Structure,Monthly Earning & Deduction,Månads Vinst &amp; Avdrag
@@ -1856,16 +1709,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import av Bulk
 DocType: Sales Partner,Address & Contacts,Adress och kontakter
 DocType: SMS Log,Sender Name,Avsändarnamn
-DocType: Page,Title,Titel
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Anpassa
 DocType: POS Profile,[Select],[Välj]
 DocType: SMS Log,Sent To,Skickat Till
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Skapa fakturan
 DocType: Company,For Reference Only.,För referens.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Ogiltigt {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Ogiltigt {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Förskottsmängd
 DocType: Manufacturing Settings,Capacity Planning,Kapacitetsplanering
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;Från datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Från datum&quot; krävs
 DocType: Journal Entry,Reference Number,Referensnummer
 DocType: Employee,Employment Details,Personaldetaljer
 DocType: Employee,New Workplace,Ny Arbetsplats
@@ -1880,7 +1731,7 @@
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
 DocType: Item,End of Life,Uttjänta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Resa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Resa
 DocType: Leave Block List,Allow Users,Tillåt användare
 DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
 DocType: Sales Invoice,Recurring,Återkommande
@@ -1888,23 +1739,21 @@
 DocType: Rename Tool,Rename Tool,Ändrings Verktyget
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfermaterial
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Ange verksamhet, driftskostnad och ger en unik drift nej till din verksamhet."
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
 DocType: Installation Note,Installation Note,Installeringsnotis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Lägg till skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Lägg till skatter
 ,Financial Analytics,Finansiella Analyser
 DocType: Quality Inspection,Verified By,Verifierad Av
 DocType: Address,Subsidiary,Dotterbolag
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Det går inte att ändra bolagets standardvaluta, eftersom det redan finns transaktioner. Transaktioner måste avbokas att ändra valuta."
 DocType: Quality Inspection,Purchase Receipt No,Inköpskvitto Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
-DocType: System Settings,In Hours,I Timmar
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Förväntad balans per bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Förväntad balans per bank
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Källa fonderna (skulder)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
 DocType: Appraisal,Employee,Anställd
@@ -1917,15 +1766,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupp av Voucher
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Sales Invoice,Mass Mailing,Massutskick
-DocType: Page,Standard,Standard
 DocType: Rename Tool,File to Rename,Fil att byta namn på
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Visa Betalningar
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Storlek
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmaceutiska
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Skapa kund
@@ -1935,30 +1782,25 @@
 DocType: Quality Inspection Reading,Reading 9,Avläsning 9
 DocType: Supplier,Is Frozen,Är Frozen
 DocType: Buying Settings,Buying Settings,Köpinställningar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Mäss efterbehandling
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nr för ett Färdigt objekt
 DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Inställning inkommande server för försäljning e-id. (T.ex. sales@example.com)
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Tool,Payment Account,Betalningskonto
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Ange vilket bolag för att fortsätta
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Förslag
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Kompensations Av
 DocType: Quality Inspection Reading,Accepted,Godkända
-DocType: User,Female,Kvinna
-DocType: Journal Entry Account,Debit in Account Currency,Betal i konto Valuta
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Se till att du verkligen vill ta bort alla transaktioner för företag. Dina basdata kommer att förbli som det är. Denna åtgärd kan inte ångras.
-DocType: Print Settings,Modern,Modern
-DocType: Communication,Replied,Svarade
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Ogiltig referens {0} {1}
 DocType: Payment Tool,Total Payment Amount,Totalt Betalningsbelopp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan inte vara större än planerad kvantitet ({2}) i produktionsorder {3}
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Eftersom det redan finns lagertransaktioner för denna artikel, \ kan du inte ändra värdena för ""Har Löpnummer"", ""Har Batch Nej"", ""Är Lagervara"" och ""Värderingsmetod"""
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Quick Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
 DocType: Stock Entry,For Quantity,För Antal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
@@ -1966,17 +1808,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Begäran efter artiklar
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produktionsorder kommer att skapas för varje färdig bra objekt.
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Avsluta Setup
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frysta fram till detta datum, ingen kan göra / ändra posten förutom ange roll nedan."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Nyhetsbrev e-postlista
 DocType: Delivery Note,Transporter Name,Transportör Namn
+DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
 DocType: Contact,Enter department to which this Contact belongs,Ange avdelning som denna Kontakt tillhör
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Totalt Frånvarande
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Måttenhet
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Måttenhet
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
 DocType: Lead,Opportunity,Möjlighet
@@ -1997,16 +1839,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (enligt Stock UOM)
 DocType: SMS Log,No of Requested SMS,Antal Begärd SMS
 DocType: Campaign,Campaign-.####,Kampanj -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nästa steg
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,En tredje parts distributör / återförsäljare / bonusagent / affiliate / återförsäljare som säljer företagens produkter för en provision.
 DocType: Customer Group,Has Child Node,Har Under Node
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} mot beställning {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ange statiska url parametrar här (T.ex.. Avsändare = ERPNext, användarnamn = ERPNext, lösenord = 1234 mm)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} inte någon aktiv räkenskapsår. För mer information kolla {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Åldringsräckvidd 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokemisk bearbetning
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2028,11 +1869,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Schablonskatt mall som kan tillämpas på alla köptransaktioner. Denna mall kan innehålla en lista över skatte huvuden och även andra kostnadshuvuden som &quot;Shipping&quot;, &quot;Försäkring&quot;, &quot;Hantera&quot; etc. #### Obs Skattesatsen du definierar här kommer att bli den schablonskatt för alla ** artiklar * *. Om det finns ** artiklar ** som har olika priser, måste de läggas till i ** Punkt skatt ** tabellen i ** Punkt ** mästare. #### Beskrivning av kolumner 1. Beräkning Typ: - Det kan vara på ** Net Totalt ** (som är summan av grundbeloppet). - ** I föregående v Totalt / Belopp ** (för kumulativa skatter eller avgifter). Om du väljer det här alternativet, kommer skatten att tillämpas som en procentandel av föregående rad (i skattetabellen) belopp eller total. - ** Faktisk ** (som nämns). 2. Konto Head: Konto huvudbok enligt vilket denna skatt kommer att bokas 3. Kostnadsställe: Om skatten / avgiften är en inkomst (som sjöfarten) eller kostnader det måste bokas mot ett kostnadsställe. 4. Beskrivning: Beskrivning av skatten (som ska skrivas ut i fakturor / citationstecken). 5. Sätt betyg: skattesats. 6. Belopp Momsbelopp. 7. Totalt: Ackumulerad total till denna punkt. 8. Skriv Row: Om baserad på &quot;Föregående rad Total&quot; kan du välja radnumret som kommer att tas som en bas för denna beräkning (standard är föregående rad). 9. Tänk skatt eller avgift för: I det här avsnittet kan du ange om skatten / avgiften är endast för värdering (inte en del av den totala) eller endast för total (inte tillföra värde till objektet) eller för båda. 10. Lägg till eller dra av: Oavsett om du vill lägga till eller dra av skatten."
-DocType: Note,Note,Notera
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
-DocType: Email Account,Email Ids,E-post Ids
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Det går inte att producera mer artiklar {0} än kundorderns mängd {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 DocType: Tax Rule,Billing City,Fakturerings Ort
 DocType: Global Defaults,Hide Currency Symbol,Dölj Valutasymbol
@@ -2040,40 +1879,36 @@
 DocType: Journal Entry,Credit Note,Kreditnota
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Avslutat Antal kan inte vara mer än {0} för drift {1}
 DocType: Features Setup,Quality,Kvalitet
-DocType: Contact Us Settings,Introduction,Introduktion
 DocType: Warranty Claim,Service Address,Serviceadress
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 rader för Lagersammansättning.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 rader för Lagersammansättning.
 DocType: Stock Entry,Manufacture,Tillverkning
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vänligen Följesedel först
 DocType: Purchase Invoice,Currency and Price List,Valuta och prislista
 DocType: Opportunity,Customer / Lead Name,Kund / Huvudnamn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Produktion
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Produktion
 DocType: Item,Allow Production Order,Tillåt produktionsorder
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Installation Note Item,Installed Qty,Installerat antal
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Avsändare
 DocType: Salary Structure,Total Earning,Totalt Tjänar
 DocType: Purchase Receipt,Time at which materials were received,Tidpunkt för material mottogs
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Mina adresser
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Organisation gren ledare.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,eller
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Ovan
 DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
-,Download Backups,Hämta säkerhetskopior
 DocType: Notification Control,Sales Order Message,Kundorder Meddelande
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ange standardvärden som bolaget, Valuta, varande räkenskapsår, etc."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Betalning Typ
 DocType: Process Payroll,Select Employees,Välj Anställda
 DocType: Bank Reconciliation,To Date,Till Datum
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Detaljer
 DocType: Purchase Invoice,Total Taxes and Charges,Totala skatter och avgifter
 DocType: Employee,Emergency Contact,Kontaktinformation I En Nödsituation
 DocType: Item,Quality Parameters,Kvalitetsparametrar
@@ -2088,6 +1923,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Löpnummer / Batch
 DocType: Product Bundle,Parent Item,Överordnad produkt
 DocType: Account,Account Type,Användartyp
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
@@ -2095,32 +1931,27 @@
 DocType: Bin,Reserved Quantity,Reserverad Kvantitet
 DocType: Landed Cost Voucher,Purchase Receipt Items,Inköpskvitto artiklar
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Anpassa formulären
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Skärning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Plattning
 DocType: Account,Income Account,Inkomst konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Formning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate of Materials Based On&quot; i kalkyl avsnitt
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Dokument
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Kostnadscenter
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Rabatt #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Rabatt #
 DocType: Notification Control,Purchase Order Message,Inköpsorder Meddelande
 DocType: Tax Rule,Shipping Country,Frakt Land
 DocType: Upload Attendance,Upload HTML,Ladda upp HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
-				than the Grand Total ({2})",Totalt förskott ({0}) mot Beställ {1} kan inte vara större \ än totalsumma ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
+				than the Grand Total ({2})",Totalt förskott ({0}) mot Beställ {1} kan inte vara större \ än totalsumma ({2})
 DocType: Employee,Relieving Date,Avgångs Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prissättning regel görs för att skriva Prislista / definiera rabatt procentsats baserad på vissa kriterier.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan endast ändras via lagerposter / följesedel / inköpskvitto
 DocType: Employee Education,Class / Percentage,Klass / Procent
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef för Marknad och Försäljning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstskatt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser engineered nettoformnings
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Chef för Marknad och Försäljning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Inkomstskatt
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Om du väljer prissättningsregel för ""Pris"", kommer det att överskriva Prislistas. Prissättningsregel priset är det slutliga priset, så ingen ytterligare rabatt bör tillämpas. Därför, i de transaktioner som kundorder, inköpsorder mm, kommer det att hämtas i ""Betygsätt fältet, snarare än"" Prislistavärde fältet."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Spår leder med Industry Type.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
@@ -2128,10 +1959,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Hantera Kundgruppsträd.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Nytt kostnadsställe Namn
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Ingen standard Adress Mall hittades. Skapa en ny från Inställningar&gt; Tryck och Branding&gt; Adress mall.
 DocType: Appraisal,HR User,HR-Konto
@@ -2143,31 +1973,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
 DocType: Supplier,Billing Currency,Faktureringsvaluta
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Extra Stor
 ,Profit and Loss Statement,Resultaträkning
 DocType: Bank Reconciliation Detail,Cheque Number,Check Nummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Genom att trycka
 DocType: Payment Tool Detail,Payment Tool Detail,Betalning Verktygs Detalj
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Lokal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Stor
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ingen anställd hittas!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Stor
 DocType: C-Form Invoice Detail,Territory,Territorium
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Purchase Order,Customer Address Display,Kund Adress Display
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Polering
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Standard mätenhet för punkt {0} kan inte ändras direkt eftersom \ du redan har gjort vissa transaktioner (s) med en annan UOM. Om du vill ändra standard UOM, \ användning &quot;UOM Byt Utility&quot; verktyg i Stock-modul."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Ange växelkursen för att konvertera en valuta till en annan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Offert {0} avbryts
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Offert {0} avbryts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totala utestående beloppet
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Anställd {0} var på permission på {1}. Det går inte att markera närvaro.
 DocType: Sales Partner,Targets,Mål
@@ -2175,14 +1999,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
 ,S.O. No.,SÅ Nej
 DocType: Production Order Operation,Make Time Log,Skapa tidslogg
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Ställ beställnings kvantitet
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
 DocType: Price List,Applicable for Countries,Gäller Länder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Datorer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektrokemisk slipning
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Vänligen ställa in dina kontoplaner innan du börjar bokföringsposter
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorera Prisregler
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Avbruten
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Från datum i lönestruktur kan inte vara mindre än den anställdes Inträdesdatum.
 DocType: Employee Education,Graduate,Examinera
 DocType: Leave Block List,Block Days,Block Dagar
@@ -2207,7 +2030,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Markera om återkommande faktura, avmarkera för att stoppa återkommande eller ange Slutdatum"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Max {0} rader tillåts
 DocType: C-Form Invoice Detail,Net Total,Netto Totalt
 DocType: Bin,FCFS Rate,FCFS betyg
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Faktura (försäljningsfaktura)
@@ -2224,20 +2046,19 @@
 DocType: Maintenance Visit,Purposes,Ändamål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Minst ett objekt ska anges med negativt kvantitet i returdokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} längre än alla tillgängliga arbetstiden i arbetsstation {1}, bryta ner verksamheten i flera operationer"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokemiska bearbetnings
 ,Requested,Begärd
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Anmärkningar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Försenad
 DocType: Account,Stock Received But Not Billed,Stock mottagits men inte faktureras
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Root Hänsyn måste vara en grupp
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolön + efterskott Belopp + inlösen Belopp - Totalt Avdrag
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Features Setup,Sales and Purchase,Försäljning och Inköp
 DocType: Supplier Quotation Item,Material Request No,Material Ansökaningsnr
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,I takt med vilket vilken kundens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} har avslutat prenumerationen på den här listan.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto kostnad (Företagsvaluta)
-apps/frappe/frappe/templates/base.html +134,Added,Inkom
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Hantera Områden.
 DocType: Journal Entry Account,Sales Invoice,Försäljning Faktura
 DocType: Journal Entry Account,Party Balance,Parti Balans
@@ -2251,11 +2072,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Räkenskapsårets {0} hittades inte.
 DocType: Bank Reconciliation,Get Relevant Entries,Hämta relevanta uppgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Kontering för lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Prägling
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
-apps/frappe/frappe/desk/query_report.py +136,Total,Totalt
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
 DocType: Account,Root Type,Root Typ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Rad # {0}: Det går inte att returnera mer än {1} till artikel {2}
@@ -2265,14 +2084,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skattebelopp efter rabatt Belopp (Company valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lager är obligatoriskt för rad {0}
 DocType: Quality Inspection,Quality Inspection,Kvalitetskontroll
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Spray bildande
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Liten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL eller BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Minsta lagernivå
 DocType: Stock Entry,Subcontract,Subkontrakt
@@ -2283,42 +2101,39 @@
 DocType: Item,Manufacturer Part Number,Tillverkarens varunummer
 DocType: Production Order Operation,Estimated Time and Cost,Beräknad tid och kostnad
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Antal skickade SMS
 DocType: Account,Company,Företaget
 DocType: Account,Expense Account,Utgiftskonto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Programvara
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Färg
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvara
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Färg
 DocType: Maintenance Visit,Scheduled,Planerad
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Välj punkt där ""Är Lagervara"" är ""Nej"" och ""Är försäljningsprodukt"" är ""Ja"" och det finns ingen annat produktpaket"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Välj Månads Distribution till ojämnt fördela målen mellan månader.
 DocType: Purchase Invoice Item,Valuation Rate,Värderings betyg
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Prislista Valuta inte valt
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Produktrad {0}: inköpskvitto {1} finns inte i ovanstående ""kvitton"""
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
 DocType: Installation Note Item,Against Document No,Mot Dokument nr
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Hantera Försäljning Partners.
 DocType: Quality Inspection,Inspection Type,Inspektionstyp
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Välj {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Forskare
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Uppdatera
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Forskare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Spara nyhetsbrevet innan du skickar
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Namn eller e-post är obligatoriskt
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inkommande kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Återvände Antal
 DocType: Employee,Exit,Utgång
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Root Type är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Root Type är obligatorisk
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Löpnummer {0} skapades
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Vibrerande efterbehandling
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","För att underlätta för kunderna, kan dessa koder användas i utskriftsformat som fakturor och följesedlar"
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
 DocType: Sales Invoice,Advertisement,Annons
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Provanställning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Provanställning
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Expense Claim,Expense Approver,Utgiftsgodkännare
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Inköpskvitto Artikel Levereras
@@ -2326,43 +2141,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Till Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway webbadress
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Slipning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Krymp inslag
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Väntande Verksamhet
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Bekräftat
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Leverantör&gt; Leverantör Typ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Ant
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adress titel är obligatorisk.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ange namnet på kampanjen om källförfrågan är kampanjen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Välj Räkenskapsårets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smältning
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Attendance,Attendance Date,Närvaro Datum
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
 DocType: Address,Preferred Shipping Address,Önskad leveransadress
 DocType: Purchase Receipt Item,Accepted Warehouse,Godkänt Lager
 DocType: Bank Reconciliation Detail,Posting Date,Bokningsdatum
 DocType: Item,Valuation Method,Värderingsmetod
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Det går inte att hitta växelkursen för {0} till {1}
 DocType: Sales Invoice,Sales Team,Sales Team
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Duplicera post
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Duplicera post
 DocType: Serial No,Under Warranty,Under garanti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Fel]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord kommer att synas när du sparar kundorder.
 ,Employee Birthday,Anställd Födelsedag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Tilldelningskapital
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Serienummer {0} inte existerar
 DocType: Pricing Rule,Discount Percentage,Rabatt Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
-apps/erpnext/erpnext/hooks.py +70,Orders,Beställningar
+apps/erpnext/erpnext/hooks.py +54,Orders,Beställningar
 DocType: Leave Control Panel,Employee Type,Anställningstyp
 DocType: Employee Leave Approver,Leave Approver,Ledighetsgodkännare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Stukning
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Överfört för tillverkning
 DocType: Expense Claim,"A user with ""Expense Approver"" role","En användare med ""Utgiftsgodkännare"" roll"
 ,Issued Items Against Production Order,Utfärdarde objekt mot produktionsorder
@@ -2374,7 +2186,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Kostnadsställe med befintliga transaktioner kan inte omvandlas till grupp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Ogiltig period
 DocType: Customer,Credit Limit,Kreditgräns
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Välj typ av transaktion
 DocType: GL Entry,Voucher No,Rabatt nr
@@ -2384,11 +2195,10 @@
 DocType: Customer,Address and Contact,Adress och Kontakt
 DocType: Customer,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Employee,Feedback,Respons
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan fördelas före {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Tidtabell
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Maskinbearbetning Stråle
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Tidtabell
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
-DocType: Website Settings,Website Settings,Webbplatsinställningar
 DocType: Item,Reorder level based on Warehouse,Beställningsnivå baserat på Warehouse
 DocType: Activity Cost,Billing Rate,Faktureringsfrekvens
 ,Qty to Deliver,Antal att leverera
@@ -2399,20 +2209,19 @@
 DocType: Material Request,Requested For,Begärd För
 DocType: Quotation Item,Against Doctype,Mot Doctype
 DocType: Delivery Note,Track this Delivery Note against any Project,Prenumerera på det här följesedel mot någon Project
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Root-kontot kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Root-kontot kan inte tas bort
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Visa Stock Inlägg
 ,Is Primary Address,Är Primär adress
 DocType: Production Order,Work-in-Progress Warehouse,Pågående Arbete - Lager
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referens # {0} den {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Hantera Adresser
 DocType: Pricing Rule,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Closing (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Closing (Dr)
 DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Löpnummer {0} inte i lager
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
@@ -2428,10 +2237,9 @@
 ,Billed Amount,Fakturerat antal
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Hämta uppdateringar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Lägg till några exempeldokument
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Lägg till några exempeldokument
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Lämna ledning
-DocType: Event,Groups,Grupper
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupp per konto
 DocType: Sales Order,Fully Delivered,Fullt Levererad
 DocType: Lead,Lower Income,Lägre intäkter
@@ -2440,40 +2248,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Snabbhjälp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Källa och mål lager kan inte vara samma för rad {0}
 DocType: Features Setup,Sales Extras,Försäljnings Extras
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget för Konto {1} mot kostnadsställe {2} kommer att överstiga med {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} budget för Konto {1} mot kostnadsställe {2} kommer att överstiga med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Värde eller Antal
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
 ,Qty to Receive,Antal att ta emot
 DocType: Leave Block List,Leave Block List Allowed,Lämna Block List tillåtna
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Omvandlingsfaktor kan inte vara i fraktioner
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Du kommer att använda den för att logga in
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Du kommer att använda den för att logga in
 DocType: Sales Partner,Retailer,Återförsäljare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alla Leverantörs Typer
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Offert {0} inte av typen {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Checkräknings konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Skapa lönebeskedet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Bläddra BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Säkrade lån
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Grymma Produkter
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Grymma Produkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Ingående balans kapital
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Det går inte att godkänna ledighet eftersom du inte har behörighet att godkänna lediget på Block Datum
 DocType: Appraisal,Appraisal,Värdering
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost-skum gjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Ritning
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Datum upprepas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmatecknare
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
 DocType: Hub Settings,Seller Email,Säljare E-post
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Workstation Working Hour,Start Time,Starttid
@@ -2487,12 +2292,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobelopp (Företagsvaluta)
 DocType: BOM Operation,Hour Rate,Tim värde
 DocType: Stock Settings,Item Naming By,Produktnamn Genom
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Från Offert
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Från Offert
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En annan period Utgående anteckning {0} har gjorts efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Överfört för tillverkning
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Konto {0} existerar inte
 DocType: Purchase Receipt Item,Purchase Order Item No,Inköpsorder Artikelnr
-DocType: System Settings,System Settings,Systeminställningar
 DocType: Project,Project Type,Projekt Typ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Antingen mål antal eller målbeloppet är obligatorisk.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Kostnader för olika aktiviteter
@@ -2501,36 +2305,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt fakturerad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontant i hand
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 DocType: Serial No,Is Cancelled,Är Inställd
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Mina Transporter
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Mina Transporter
 DocType: Journal Entry,Bill Date,Faktureringsdatum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Även om det finns flera prissättningsregler med högsta prioritet, kommer följande interna prioriteringar tillämpas:"
 DocType: Supplier,Supplier Details,Leverantör Detaljer
-DocType: Communication,Recipients,Mottagare
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Skruvning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Räffling
 DocType: Expense Claim,Approval Status,Godkännandestatus
 DocType: Hub Settings,Publish Items to Hub,Publicera produkter i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Från Talet måste vara lägre än värdet i rad {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronisk Överföring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Välj bankkonto
 DocType: Newsletter,Create and Send Newsletters,Skapa och skicka nyhetsbrev
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Från Datum måste vara före Till Datum
 DocType: Sales Order,Recurring Order,Återkommande Order
 DocType: Company,Default Income Account,Standard Inkomstkonto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundgrupp / Kunder
 DocType: Item Group,Check this if you want to show in website,Markera det här om du vill visa i hemsida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Välkommen till oss
+,Welcome to ERPNext,Välkommen till oss
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Rabatt Detalj Antal
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Prospekt till offert
 DocType: Lead,From Customer,Från Kunden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Samtal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Samtal
 DocType: Project,Total Costing Amount (via Time Logs),Totalt kalkyl Belopp (via Time Loggar)
 DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
 ,Projected,Projicerad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
@@ -2538,13 +2338,10 @@
 DocType: Issue,Opening Date,Öppningsdatum
 DocType: Journal Entry,Remark,Anmärkning
 DocType: Purchase Receipt Item,Rate and Amount,Andel och Belopp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Borning
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Från kundorder
-DocType: Blog Category,Parent Website Route,Överordnad Webbplatsrutt
 DocType: Sales Order,Not Billed,Inte Billed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Inga kontakter inlagda ännu.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Inte aktiv
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landad Kostnad rabattmängd
 DocType: Time Log,Batched for Billing,Batchad för fakturering
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
@@ -2552,20 +2349,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Rabattbelopp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,t.ex. moms
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,t.ex. moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Hot metal gas bildar
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
 DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Lager {0}: Företaget är obligatoriskt
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.","Gå till lämplig grupp (vanligtvis Kostnadskälla> Kortfristiga skulder> skatter och avgifter och skapa ett nytt konto (genom att klicka på Lägg till typ) av typen ""skatt"" och nämn skattesatsen."
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Saknas valutakurser för {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Laserskärning
-DocType: Event,Monday,Måndag
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Account,Payable,Betalning sker
 DocType: Salary Slip,Arrear Amount,Efterskott Mängd
@@ -2578,7 +2372,6 @@
 DocType: Lead,Address Desc,Adress fallande
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Minst en av de sålda eller köpta måste väljas
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Där tillverkningsprocesser genomförs.
-DocType: Page,All,Allt
 DocType: Stock Entry Detail,Source Warehouse,Källa Lager
 DocType: Installation Note,Installation Date,Installations Datum
 DocType: Employee,Confirmation Date,Bekräftelsedatum
@@ -2586,9 +2379,8 @@
 DocType: Account,Sales User,Försäljningsanvändar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Antal kan inte vara större än Max Antal
 DocType: Stock Entry,Customer or Supplier Details,Kund eller leverantör Detaljer
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Set
 DocType: Lead,Lead Owner,Prospekt ägaren
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Lager krävs
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Lager krävs
 DocType: Employee,Marital Status,Civilstånd
 DocType: Stock Settings,Auto Material Request,Automaterialförfrågan
 DocType: Time Log,Will be updated when billed.,Kommer att uppdateras när den faktureras.
@@ -2602,44 +2394,40 @@
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inköpsorder Artikelleverans
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Företagsnamn kan inte vara företag
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhuvuden för utskriftsmallar.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar för utskriftsmallar t.ex. Proforma faktura.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Register över alla meddelanden av typen e-post, telefon, chatt, besök, etc."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Ange kostnadsställe för avrundning i bolaget
 DocType: Purchase Invoice,Terms,Villkor
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Skapa Ny
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Skapa Ny
 DocType: Buying Settings,Purchase Order Required,Inköpsorder krävs
 ,Item-wise Sales History,Produktvis försäljnings historia
 DocType: Expense Claim,Total Sanctioned Amount,Totalt sanktione Mängd
 ,Purchase Analytics,Inköps analyser
 DocType: Sales Invoice Item,Delivery Note Item,Följesedel Anteckningspunkt
 DocType: Expense Claim,Task,Uppgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Rakning
 DocType: Purchase Taxes and Charges,Reference Row #,Referens Rad #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Detta är en rot säljare och kan inte ändras.
 ,Stock Ledger,Stock Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Betyg: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Betyg: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lön Slip Avdrag
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Anmärkningar
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Välj en grupp nod först.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Syfte måste vara en av {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Fyll i formuläret och spara det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Hämta en rapport som innehåller alla råvaror med deras senaste lagerstatus
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Facing
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Ledighets balans innan Ansökan
 DocType: SMS Center,Send SMS,Skicka SMS
 DocType: Company,Default Letter Head,Standard Brev
 DocType: Time Log,Billable,Fakturerbar
-DocType: Authorization Rule,This will be used for setting rule in HR module,Detta kommer att användas för att ställa in regeln i HR-modul
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Ombeställningskvantitet
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
@@ -2651,12 +2439,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Förlorad möjlighet
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Rabatt fält kommer att finnas tillgänglig i inköpsorder, inköpskvitto, Inköpsfaktura"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Namn på ett nytt konto. Obs: Vänligen inte skapa konton för kunder och leverantörer
-DocType: Report,Report Type,Rapporttyp
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Laddar
 DocType: BOM Replace Tool,BOM Replace Tool,BOM ersättnings verktyg
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Landsvis standard adressmallar
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Visa skatte uppbrott
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import och export
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',"Om du engagerar industrikonjunkturen. Aktiverar Punkt ""tillverkas"""
@@ -2666,16 +2452,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
 DocType: Serial No,Out of AMC,Slut på AMC
 DocType: Purchase Order Item,Material Request Detail No,Material Begär Detalj nr
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Hårdsvarvning
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Skapa Servicebesök
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0} 
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
 DocType: Company,Default Cash Account,Standard Konto
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Notera: Om betalning inte sker mot någon referens, gör Journalpost manuellt."
 DocType: Item,Supplier Items,Leverantör artiklar
 DocType: Opportunity,Opportunity Type,Möjlighet Typ
@@ -2687,65 +2472,57 @@
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
 ,Stock Ageing,Lager Åldrande
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ange som Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Skicka automatiska meddelanden till kontakter på Skickar transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Rad {0}: Antal inte tillgängligt i lager {1} på {2} {3}. Tillgängliga Antal: {4}, Transfer Antal: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
-DocType: Event,Sunday,Söndag
 DocType: Sales Team,Contribution (%),Bidrag (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Obs: Betalningpost kommer inte skapas eftersom ""Kontanter eller bankkonto"" angavs inte"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Ansvarsområden
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ange minst 1 faktura i tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Lägg till användare
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Lägg till användare
 DocType: Pricing Rule,Item Group,Produkt Grupp
 DocType: Task,Actual Start Date (via Time Logs),Faktiskt startdatum (via Tidslogg)
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
 DocType: Item,Default BOM,Standard BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Vänligen ange företagsnamn igen för att bekräfta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Time Log Batch,Total Hours,Totalt antal timmar
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Fordon
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Produkt krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metall formsprutning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fordon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Från Följesedel
 DocType: Time Log,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Investment Banking
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Välj ditt land, tidszon och valuta"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Betning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Sandgjutning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektroplätering
 DocType: Purchase Invoice Item,Rate,Betygsätt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Intern
 DocType: Newsletter,A Lead with this email id should exist,En start med denna epost-id ska finnas
 DocType: Stock Entry,From BOM,Från BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Grundläggande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Grundläggande
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Till Datum bör vara densamma som från Datum för halv dag ledighet
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
 DocType: Salary Structure,Salary Structure,Lönestruktur
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Flera prisregler finns med samma kriterier, vänligen lös \ konflikten genom att prioritera. Pris Regler: {0}"
 DocType: Account,Bank,Bank
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Problem Material
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flygbolag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Problem Material
 DocType: Material Request Item,For Warehouse,För Lager
 DocType: Employee,Offer Date,Erbjudandet Datum
 DocType: Hub Settings,Access Token,Tillträde token
@@ -2754,45 +2531,37 @@
 DocType: Item,Is Fixed Asset Item,Är Fast tillgångspost
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Om du har långa utskriftsformat, kan denna funktionen användas för att dela sidan som ska skrivas ut på flera sidor med alla sidhuvud och sidfot på varje sida"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Alla territorierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Alla territorierna
 DocType: Purchase Invoice,Items,Produkter
 DocType: Fiscal Year,Year Name,År namn
 DocType: Process Payroll,Process Payroll,Process Lön
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
 DocType: Product Bundle Item,Product Bundle Item,Produktpaket Punkt
 DocType: Sales Partner,Sales Partner Name,Försäljnings Partner Namn
 DocType: Purchase Invoice Item,Image View,Visa bild
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Finishing &amp; industriell ytbehandling
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Från och Till datum krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Värdepapper och råvarubörserna
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Borrning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Formblåsning
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
 DocType: Tax Rule,Shipping City,Shipping stad
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denna punkt är en variant av {0} (Template). Attribut kopieras över från mallen om &quot;No Copy &#39;är inställd
 DocType: Account,Purchase User,Inköpsanvändare
 DocType: Notification Control,Customize the Notification,Anpassa Anmälan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Hammrering
-DocType: Web Page,Slideshow,Bildspel
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
 DocType: Journal Entry,Print Heading,Utskrifts Rubrik
 DocType: Quotation,Maintenance Manager,Underhållschef
-DocType: Workflow State,Search,Sök
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan inte vara noll
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dagar sedan senaste order"" måste vara större än eller lika med noll"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Hårdlödning
 DocType: C-Form,Amended From,Ändrat Från
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Råmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Antingen mål antal eller målbeloppet är obligatorisk
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Välj Publiceringsdatum först
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
@@ -2801,44 +2570,43 @@
 ,Produced,Producerat
 DocType: Item,Item Code for Suppliers,Produkt kod för leverantörer
 DocType: Issue,Raised By (Email),Höjt av (e-post)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Allmänt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Fäst Brev
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Allmänt
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Fäst Brev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista dina skattehuvuden (t.ex. moms, tull etc, de bör ha unika namn) och deras standardpriser. Detta kommer att skapa en standardmall som du kan redigera och lägga till fler senare."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Lista dina skattehuvuden (t.ex. moms, tull etc, de bör ha unika namn) och deras standardpriser. Detta kommer att skapa en standardmall som du kan redigera och lägga till fler senare."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos krävs för Serialiserad Punkt {0}
 DocType: Journal Entry,Bank Entry,Bank anteckning
 DocType: Authorization Rule,Applicable To (Designation),Är tillämpligt för (Destination)
-DocType: Blog Post,Blog Post,Blogginlägg
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Gruppera efter
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Aktivera / inaktivera valutor.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Post Kostnader
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Purchase Order,The date on which recurring order will be stop,Den dag då återkommande beställning kommer att stoppa
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} måste minskas med {1} eller om du bör öka överfödstolerans
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Totalt Närvarande
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Timme
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Timme
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Överföra material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Överföra material till leverantören
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Skapa offert
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
 DocType: Features Setup,Point of Sale,Butiksförsäljning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Curling
 DocType: Account,Tax,Skatt
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Rad {0}: {1} är inte en giltig {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Raffinering
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Rad {0}: {1} är inte en giltig {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Från produkt Bundle
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplaneringsverktyg
 DocType: Quality Inspection,Report Date,Rapportdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Fakturor
 DocType: Job Opening,Job Title,Jobbtitel
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} som redan tilldelats för anställd {1} för perioden {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Mottagare
 DocType: Features Setup,Item Groups in Details,Produktgrupper i Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
@@ -2847,33 +2615,29 @@
 DocType: Stock Entry,Update Rate and Availability,Uppdateringsfrekvens och tillgänglighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Andel som är tillåtet att ta emot eller leverera mer mot beställt antal. Till exempel: Om du har beställt 100 enheter. och din ersättning är 10% då du får ta emot 110 enheter.
 DocType: Pricing Rule,Customer Group,Kundgrupp
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: Item,Website Description,Webbplats Beskrivning
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
 ,Sales Register,Försäljningsregistret
 DocType: Quotation,Quotation Lost Reason,Anledning förlorad Offert
 DocType: Address,Plant,Fastighet
-DocType: DocType,Setup,Inställning
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Kallvals
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Item,Attributes,Attributer
-DocType: Packing Slip,Get Items,Hämta artiklar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Ange avskrivningskonto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Hämta artiklar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Sista beställningsdatum
-DocType: DocField,Image,Bild
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Skapa punktfaktura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
-DocType: Communication,Other,Annat
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Drift ID inte satt
 DocType: Production Order,Planned Start Date,Planerat startdatum
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Besök
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Besök
 DocType: Leave Type,Is Encash,Är incheckad
 DocType: Purchase Invoice,Mobile No,Mobilnummer
 DocType: Payment Tool,Make Journal Entry,Skapa journalanteckning
@@ -2881,35 +2645,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Kommersiell
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 DocType: Cost Center,Distribution Id,Fördelning Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Grymma Tjänster
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Alla produkter eller tjänster.
 DocType: Purchase Invoice,Supplier Address,Leverantör Adress
-DocType: Contact Us Settings,Address Line 2,Adress Linje 2
-DocType: ToDo,Reference,Referens
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforerings
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antal
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Serien är obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansiella Tjänster
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3}
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
 DocType: Leave Allocation,Unused leaves,Oanvända blad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Standard Mottagarkonton
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Sågning
 DocType: Tax Rule,Billing State,Faktureringsstaten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Lamine
 DocType: Item Reorder,Transfer,Överföring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sintring
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
 DocType: Supplier,Contact HTML,Kontakta HTML
@@ -2920,9 +2678,8 @@
 DocType: Company,Retail,Detaljhandeln
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Kund {0} existerar inte
 DocType: Attendance,Absent,Frånvarande
-DocType: Product Bundle,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Produktpaket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Krossning
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
 DocType: Upload Attendance,Download Template,Hämta mall
 DocType: GL Entry,Remarks,Anmärkningar
@@ -2930,48 +2687,44 @@
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 DocType: Features Setup,POS View,POS Vy
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Installationsinfo för ett serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Stränggjutning
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ange en
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ovan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Kall limnings
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Kontot {0} kan inte vara en grupp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Region
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
 DocType: Holiday List,Weekly Off,Veckovis Av
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","För t.ex. 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Preliminär vinst / förlust (Kredit)
 DocType: Sales Invoice,Return Against Sales Invoice,Återgå mot fakturan
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Produkt  5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Ställ in standardvärdet {0} i bolaget {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Ställ in standardvärdet {0} i bolaget {1}
 DocType: Serial No,Creation Time,Skapelsetid
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Totala intäkter
 DocType: Sales Invoice,Product Bundle Help,Produktpaket Hjälp
 ,Monthly Attendance Sheet,Månads Närvaroblad
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post hittades
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Få artiklar från produkt Bundle
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Konto {0} är inaktivt
 DocType: GL Entry,Is Advance,Är Advancerad
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Närvaro Från Datum och närvaro hittills är obligatorisk
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Ange ""Är underleverantör"" som Ja eller Nej"
 DocType: Sales Team,Contact No.,Kontakt nr
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Resultaträkning"" kontotyp {0} inte tillåtna i öppna poster"
-DocType: Workflow State,Time,Tid
 DocType: Features Setup,Sales Discounts,Försäljnings Rabatter
 DocType: Hub Settings,Seller Country,Säljare Land
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Försäljnings Skatter och avgifter Mall
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Antal Beställningar
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner som visar på toppen av produktlista.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Ange villkor för att beräkna fraktbeloppet
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Lägg till underval
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Roll tillåtas att fastställa frysta konton och Redigera Frysta Inlägg
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Det går inte att konvertera kostnadsställe till huvudbok då den har underordnade noder
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Omräkningsfaktor
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seriell #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Försäljningsprovision
 DocType: Offer Letter Term,Value / Description,Värde / Beskrivning
@@ -2979,15 +2732,13 @@
 ,Customers Not Buying Since Long Time,Kunder köper inte sedan lång tid
 DocType: Production Order,Expected Delivery Date,Förväntat leveransdatum
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Utbuktning
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporativ mönster gjutning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Representationskostnader
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Ålder
 DocType: Time Log,Billing Amount,Fakturerings Mängd
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ogiltig mängd som anges för produkten {0}. Kvantitet bör vara större än 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ansökan om ledighet.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Rättsskydds
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Den dagen i den månad som auto beställning kommer att genereras t.ex. 05, 28 etc"
 DocType: Sales Invoice,Posting Time,Boknings Tid
@@ -3001,26 +2752,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nya kund Intäkter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Resekostnader
 DocType: Maintenance Visit,Breakdown,Nedbrytning
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Som på Date
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Hening
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
-DocType: Feed,Full Name,Fullständigt Namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Skyddstillsyn
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standard Lager är obligatoriskt för lagervara.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Utbetalning av lön för månaden {0} och år {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
 ,Transferred Qty,Överfört Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigera
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planering
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Skapa tidsloggsbatch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Utfärdad
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vi säljer detta objekt
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Vi säljer detta objekt
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Leverantör Id
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 DocType: Sales Partner,Contact Desc,Kontakt Desc
@@ -3029,18 +2777,16 @@
 DocType: Brand,Item Manager,Produktansvarig
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Lägg rader för att ställa in årsbudgetar på konton.
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Brytning
 DocType: Production Order,Total Operating Cost,Totala driftskostnaderna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Alla kontakter.
 DocType: Newsletter,Test Email Id,Test e-post ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Företagetsförkortning
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Företagetsförkortning
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Om du följer kvalitetskontroll. Aktiverar Punkt QA krävs och QA nr i inköpskvitto
 DocType: GL Entry,Party Type,Parti Typ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Råvaror kan inte vara samma som huvudartikel
 DocType: Item Attribute Value,Abbreviation,Förkortning
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Rotationsgjutning
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lön mall mästare.
 DocType: Leave Type,Max Days Leave Allowed,Max dagars ledighet tillåtna
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Ställ skatt Regel för varukorgen
@@ -3054,15 +2800,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Skatte Mall är obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
 DocType: Account,Temporary,Tillfällig
 DocType: Address,Preferred Billing Address,Önskad faktureringsadress
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuell Fördelning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreterare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreterare
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet för en försändelse
 DocType: Pricing Rule,Buying,Köpa
 DocType: HR Settings,Employee Records to be created by,Personal register som skall skapas av
@@ -3075,42 +2821,37 @@
 ,Item-wise Price List Rate,Produktvis Prislistavärde
 DocType: Purchase Order Item,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Stryk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} är stoppad
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
 DocType: Lead,Add to calendar on this date,Lägg till i kalender på denna dag
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,uppkommande händelser
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden är obligatoriskt
-DocType: Letter Head,Letter Head,Brev
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Snabbinmatning
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} är obligatorisk för Retur
 DocType: Purchase Order,To Receive,Att Motta
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Krymppassning
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Intäkt / kostnad
 DocType: Employee,Personal Email,Personligt E-post
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Totalt Varians
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Totalt Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Om det är aktiverat, kommer systemet att skicka bokföringsposter för inventering automatiskt."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Brokerage
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
 DocType: Address,Postal Code,Postkod
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","i protokollet Uppdaterad via ""Tidslog"""
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Order släppts för produktion.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Hub Settings,Name Token,Namn token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Hyvla
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standardförsäljnings
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standardförsäljnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Minst ett lager är obligatorisk
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} mot faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} mot faktura {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Ange standardmåttenhet
 DocType: Purchase Invoice Item,Project Name,Projektnamn
 DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
-DocType: Workflow State,Edit,Redigera
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
 DocType: Features Setup,Item Batch Nos,Produkt Sats nr
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
@@ -3118,13 +2859,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betalning Avstämning Betalning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordringar
 DocType: BOM Item,BOM No,BOM nr
-DocType: Contact Us Settings,Pincode,Pinkod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som kommer att ersättas
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Nytt Lager UOM måste skilja sig från nuvarande Lager UOM
 DocType: Account,Debit,Debit-
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Ledigheter ska fördelas i multiplar av 0,5"
 DocType: Production Order,Operation Cost,Driftkostnad
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Ladda upp närvaro från en CSV-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Utestående Amt
@@ -3140,10 +2879,7 @@
 DocType: Project,Default Cost Center,Standardkostnadsställe
 DocType: Purchase Invoice,End Date,Slutdatum
 DocType: Employee,Internal Work History,Intern Arbetserfarenhet
-DocType: DocField,Column Break,Spaltbrytning
-DocType: Event,Thursday,Torsdag
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Privatkapital
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Turning
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Privatkapital
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
 DocType: Sales Invoice,Exhibition,Utställning
@@ -3156,31 +2892,30 @@
 DocType: Employee,Held On,Höll På
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions artikel
 ,Employee Information,Anställd Information
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Andel (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Andel (%)
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Budgetåret Slutdatum
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Budgetåret Slutdatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",Kan inte filtrera baserat på kupong nr om grupperad efter kupong
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Minska tjänat belopp för ledighet utan lön (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Tillfällig ledighet
 DocType: Batch,Batch ID,Batch-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Obs: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Veckans Sammanfattning
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} måste vara ett Köpt eller underleverantörers föremål i rad {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Leveransdatum
-DocType: DocField,Currency,Valuta
 DocType: Opportunity,Opportunity Date,Möjlighet Datum
 DocType: Purchase Receipt,Return Against Purchase Receipt,Återgå mot inköpskvitto
 DocType: Purchase Order,To Bill,Till Bill
 DocType: Material Request,% Ordered,% Beordrade
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Ackord
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Ackord
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
@@ -3197,77 +2932,68 @@
 DocType: Opportunity,To Discuss,Att Diskutera
 DocType: SMS Settings,SMS Settings,SMS Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tillfälliga konton
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosions Punkt
 DocType: Account,Auditor,Redigerare
 DocType: Purchase Order,End date of current order's period,Slutdatum för nuvarande order period
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Skapa ett anbudsbrev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Återgå
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
-DocType: DocField,Fold,Vika
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Standard mätenhet för Variant måste vara densamma som mall
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
 DocType: Project Task,Pending Review,Väntar På Granskning
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Vänligen specificera
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Kundnummer
-DocType: Page,Page Name,Sidnamn
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Till tid måste vara större än From Time
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Spindel efterbehandling
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
 DocType: Project Task,Task ID,Aktivitets-ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",t.ex. &quot;MC&quot;
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",t.ex. &quot;MC&quot;
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan inte existera till punkt {0} sedan har varianter
 ,Sales Person-wise Transaction Summary,Försäljningen person visa transaktion Sammanfattning
-DocType: System Settings,Time Zone,Tidszon
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Lager {0} existerar inte
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrera För ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månadsdistributions Procentsatser
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av material som levereras mot detta följesedel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Häftning
 DocType: Customer,Customer Details,Kunduppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Formning
 DocType: Employee,Reports to,Rapporter till
 DocType: SMS Settings,Enter url parameter for receiver nos,Ange url parameter för mottagaren
 DocType: Sales Invoice,Paid Amount,Betalt belopp
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',"Stänger konto {0} måste vara av typen ""Ansvar"""
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kvalitetshantering
 DocType: Production Planning Tool,Filter based on customer,Filter utifrån kundernas
 DocType: Payment Tool Detail,Against Voucher No,Mot kupongnr
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
 DocType: Tax Rule,Purchase,Inköp
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Balans Antal
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balans Antal
 DocType: Item Group,Parent Item Group,Överordnad produktgrupp
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} för {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Kostnadsställen
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Lager.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Lager.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,I takt med vilket leverantörens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rad # {0}: Konflikt med tider rad {1}
 DocType: Opportunity,Next Contact,Nästa Kontakta
 DocType: Employee,Employment Type,Anställnings Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fasta tillgångar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Ansökningstiden kan inte vara över två alocation register
 DocType: Item Group,Default Expense Account,Standardutgiftskonto
 DocType: Employee,Notice (days),Observera (dagar)
-DocType: Page,Yes,Ja
 DocType: Tax Rule,Sales Tax Template,Moms Mall
 DocType: Employee,Encashment Date,Inlösnings Datum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroformning
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Mot kupongtyp måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
 DocType: Account,Stock Adjustment,Lager för justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitetskostnad existerar för Aktivitetstyp - {0}
 DocType: Production Order,Planned Operating Cost,Planerade driftkostnader
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Ny {0} Namn
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Härmed bifogas {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Härmed bifogas {0} # {1}
 DocType: Job Applicant,Applicant Name,Sökandes Namn
 DocType: Authorization Rule,Customer / Item Name,Kund / artikelnamn
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3280,7 +3006,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Löpnummer är obligatoriskt för punkt {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Ange från / till intervallet
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Skapad Av
 DocType: Serial No,Under AMC,Enligt AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Produkt värderingsvärdet omräknas pga angett rabattvärde
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
@@ -3292,17 +3017,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimibelopp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Uppdatera färdiga varor
 DocType: Workstation,per hour,per timme
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Serie {0} används redan i {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto för lagret (Perpetual Inventory) kommer att skapas inom ramen för detta konto.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 DocType: Company,Distribution,Fördelning
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Betald Summa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Projektledare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 DocType: Customer,Default Taxes and Charges,Standard skatter och avgifter
 DocType: Account,Receivable,Fordran
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
 DocType: Sales Invoice,Supplier Reference,Leverantör Referens
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Om markerad, kommer BOM för underenhet poster övervägas för att få råvaror. Annars kommer alla undermonterings poster behandlas som en råvara."
@@ -3310,8 +3034,8 @@
 DocType: Hub Settings,Seller Description,Säljare Beskrivning
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Produkt Pris
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap &amp; tvättmedel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
@@ -3320,7 +3044,6 @@
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stöd Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Företaget saknas i lager {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Lager UOM Ersätt Utility
 DocType: POS Profile,Terms and Conditions,Villkor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Till Datum bör ligga inom räkenskapsåret. Förutsatt att Dag = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Här kan du behålla längd, vikt, allergier, medicinska problem etc"
@@ -3332,7 +3055,7 @@
 DocType: Sales Order Item,For Production,För produktion
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Ange kundorder i ovanstående tabell
 DocType: Project Task,View Task,Se uppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Din räkenskapsår som börjar på
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Din räkenskapsår som börjar på
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Ange kvitton
 DocType: Sales Invoice,Get Advances Received,Få erhållna förskott
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
@@ -3340,20 +3063,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på &quot;Ange som standard&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Inställning inkommande server stöd e-id. (T.ex. support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Salary Slip,Salary Slip,Lön Slip
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Polerings
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Till datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Till datum&quot; krävs
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Skapa följesedlar efter paket som skall levereras. Används för att meddela kollinummer, paketets innehåll och dess vikt."
 DocType: Sales Invoice Item,Sales Order Item,Försäljning Beställningsvara
 DocType: Salary Slip,Payment Days,Betalningsdagar
 DocType: BOM,Manage cost of operations,Hantera kostnaderna för verksamheten
 DocType: Features Setup,Item Advanced,Produkt Avancerad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Varmvalsning
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","När någon av de kontrollerade transaktionerna  är""Skickat"", en e-post pop-up öppnas automatiskt för att skicka ett mail till den tillhörande ""Kontakt"" i denna transaktion, med transaktionen som en bifogad fil. Användaren kan eller inte kan skicka e-post."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globala inställningar
 DocType: Employee Education,Employee Education,Anställd Utbildning
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
 DocType: Salary Slip,Net Pay,Nettolön
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} redan har mottagits
@@ -3362,35 +3083,28 @@
 DocType: Customer,Sales Team Details,Försäljnings Team Detaljer
 DocType: Expense Claim,Total Claimed Amount,Totalt yrkade beloppet
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Sjukskriven
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Ogiltigt {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Sjukskriven
 DocType: Email Digest,Email Digest,E-postutskick
 DocType: Delivery Note,Billing Address Name,Faktureringsadress Namn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Varuhus
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,System Balance
-DocType: Workflow,Is Active,Är Aktiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varuhus
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,System Balance
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Ändra Förkortning
-DocType: Workflow State,Primary,Primär
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
 DocType: Item,Max Discount (%),Max rabatt (%)
-DocType: Communication,More Information,Mer information
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Sista beställningsmängd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Blästring
 DocType: Company,Warn,Varna
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Produkt beräkning uppdateras
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
 DocType: BOM,Manufacturing User,Tillverkningsanvändare
 DocType: Purchase Order,Raw Materials Supplied,Råvaror Levereras
 DocType: Purchase Invoice,Recurring Print Format,Återkommande Utskriftsformat
-DocType: Communication,Series,Serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Förväntad leveransdatum kan inte vara före beställningsdatum
 DocType: Appraisal,Appraisal Template,Bedömning mall
-DocType: Communication,Email,E-post
 DocType: Item Group,Item Classification,Produkt Klassificering
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Servicebesökets syfte
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Period
 ,General Ledger,Allmän huvudbok
@@ -3400,9 +3114,7 @@
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Välj {0} först
 DocType: Features Setup,To get Item Group in details table,För att få Post Group i detalj tabellen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Omritning
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etsning
 DocType: Sales Invoice,Commission,Kommissionen
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3417,7 +3129,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Standardmall </h4><p> Använder <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Mallar</a> och alla områden adress (inklusive anpassade fält om någon) kommer att finnas tillgängligt </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,Standard Mängd
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Lagret hittades inte i systemet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Lagret hittades inte i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Månadens Sammanfattning
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontroll Läsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
@@ -3436,13 +3148,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 DocType: Supplier,Address and Contacts,Adress och kontakter
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
 DocType: Payment Tool,Get Outstanding Vouchers,Hämta Utestående Kuponger
 DocType: Warranty Claim,Resolved By,Åtgärdad av
 DocType: Appraisal,Start Date,Start Datum
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Värde
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Tilldela avgångar under en period.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Klicka här för att kontrollera
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
@@ -3452,55 +3163,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Genomsnittlig tid det tar för leverantören att leverera
 DocType: Time Log,Hours,Timmar
 DocType: Project,Expected Start Date,Förväntat startdatum
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rullande
-DocType: ToDo,Priority,Prioritet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ta bort alternativ om avgifter inte är tillämpade för denna post
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Tillträde tillåtet
-DocType: Dropbox Backup,Weekly,Veckovis
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,T.ex. smsgateway.com/api/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Receive
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Receive
 DocType: Maintenance Visit,Fully Completed,Helt Avslutad
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Färdig
 DocType: Employee,Educational Qualification,Utbildnings Kvalificering
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} har lagts till vårt nyhetsbrev lista.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektronstråle bearbetning
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Huvud Rapporter
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Lager Ledger inmatningar balanser uppdaterade
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Huvud Rapporter
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Lägg till / redigera priser
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Kontoplan på Kostnadsställen
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Mina beställningar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Mina beställningar
 DocType: Price List,Price List Name,Pris Listnamn
 DocType: Time Log,For Manufacturing,För tillverkning
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Totals
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Totals
 DocType: BOM,Manufacturing,Tillverkning
 ,Ordered Items To Be Delivered,Beställda varor som skall levereras
 DocType: Account,Income,Inkomst
-,Setup Wizard,Installationsguiden
 DocType: Industry Type,Industry Type,Industrityp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Något gick snett!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Slutförande Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Belopp (Företagsvaluta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Gjutning
-DocType: Email Alert,Reference Date,Referensdatum
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ange giltiga mobil nos
 DocType: Budget Detail,Budget Detail,Budgetdetalj
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ange meddelandet innan du skickar
-DocType: Async Task,Status,Status
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stock UOM uppdaterad till punkt {0}
-DocType: Company History,Year,År
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Butikförsäljnings profil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Uppdatera SMS Inställningar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Tid Logga {0} redan faktureras
@@ -3513,55 +3212,52 @@
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
 DocType: Item,Unit of Measure Conversion,Enhet Omvandling
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Anställd kan inte ändras
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
 DocType: Naming Series,Help HTML,Hjälp HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Ersättning för över {0} korsade till punkt {1}
 DocType: Address,Name of person or organization that this address belongs to.,Namn på den person eller organisation som den här adressen tillhör.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Dina Leverantörer
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Dina Leverantörer
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,En annan lönestruktur {0} är aktiv anställd {1}. Gör sin status &quot;Inaktiv&quot; för att fortsätta.
 DocType: Purchase Invoice,Contact,Kontakt
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Mottagen från
 DocType: Features Setup,Exports,Export
 DocType: Lead,Converted,Konverterad
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Från {0} för {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 DocType: Issue,Content Type,Typ av innehåll
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Dator
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
 DocType: Payment Reconciliation,Get Unreconciled Entries,Hämta ej verifierade Anteckningar
 DocType: Cost Center,Budgets,Budgetar
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Uppdaterad
 DocType: Employee,Emergency Contact Details,Akut Kontaktuppgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Vad gör den?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Vad gör den?
 DocType: Delivery Note,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Kontot {0} har angetts mer än en gång för räkenskapsåret {1}
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Uppdatera merkostnader för att beräkna landade kostnaden för objekt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrisk
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Användar-ID inte satt för anställd {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Från garantianspråk
 DocType: Stock Entry,Default Source Warehouse,Standardkälla Lager
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Påminnelse födelsedag för {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Läppning
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Dagar sedan senast Order
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Dagar sedan senast Order
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
-DocType: User,Enabled,Aktiverat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Vill du verkligen skicka in alla lönebesked för månad {0} och år {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Import Abonnenter
@@ -3569,19 +3265,18 @@
 DocType: Attendance,Present,Närvarande
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
 DocType: Notification Control,Sales Invoice Message,Fakturan Meddelande
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Utgående konto {0} måste vara av typen Ansvar / Equity
 DocType: Authorization Rule,Based On,Baserat På
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Period Från och period datum obligatoriska för återkommande {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Projektverksamhet / uppgift.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generera lönebesked
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} är inte ett giltig epost-id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Köp måste anges, i förekommande fall väljs som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
-DocType: ToDo,Low,Låg
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Ställ in {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
@@ -3603,7 +3298,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanjens namn krävs
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Receipt Item,Rejected Serial No,Avvisat Serienummer
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Djupdragning
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nytt Nyhetsbrev
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Visa Balans
@@ -3613,7 +3307,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Mängd
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Nitning
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
 ,Sales Analytics,Försäljnings Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Tillverknings Inställningar
@@ -3625,28 +3318,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Nytt kontonamn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvaror Levererans Kostnad
 DocType: Selling Settings,Settings for Selling Module,Inställningar för att sälja Modul
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Kundtjänst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Kundtjänst
 DocType: Item,Thumbnail,Miniatyr
 DocType: Item Customer Detail,Item Customer Detail,Produktdetaljer kund
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Bekräfta din e-post
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Erbjud kandidaten ett jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Fråga för e-post på Inlämning av
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Totalt tilldelade bladen är mer än dagar under perioden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} krävs
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakuumformning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Förväntad Datum kan inte vara före Material Begäran Datum
-DocType: Contact Us Settings,City,Stad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultraljuds bearbetning
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Fel: Inte ett giltigt id?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Produkt {0} måste vara ett försäljningsprodukt
 DocType: Naming Series,Update Series Number,Uppdatera Serie Nummer
 DocType: Account,Equity,Eget kapital
 DocType: Sales Order,Printing Details,Utskrifter Detaljer
 DocType: Task,Closing Date,Slutdatum
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingenjör
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingenjör
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Sök Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
 DocType: Sales Partner,Partner Type,Partner Typ
@@ -3654,7 +3343,7 @@
 DocType: Authorization Rule,Customerwise Discount,Kundrabatt
 DocType: Purchase Invoice,Against Expense Account,Mot utgiftskonto
 DocType: Production Order,Production Order,Produktionsorder
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Installeringsnotis {0} har redan lämnats in
 DocType: Quotation Item,Against Docname,Mot doknamn
 DocType: SMS Center,All Employee (Active),Personal (aktiv)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Visa nu
@@ -3662,26 +3351,24 @@
 DocType: BOM,Raw Material Cost,Råvarukostnad
 DocType: Item,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt-Schema
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serie Uppdaterad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapporttyp är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Den första användaren: Du
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Den första användaren: Du
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Räkenskapsårets Startdatum och Räkenskapsårets Slutdatum är redan inställd under räkenskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Framgångsrikt Avstämt
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Production Order,Planned End Date,Planerat Slutdatum
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Där artiklar lagras.
 DocType: Tax Rule,Validity,Giltighet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerade belopp
 DocType: Attendance,Attendance,Närvaro
-DocType: Page,No,Nej
 DocType: BOM,Materials,Material
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Om inte markerad, måste listan läggas till varje avdelning där den måste tillämpas."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
@@ -3689,55 +3376,46 @@
 ,Item Prices,Produktpriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord kommer att synas när du sparar beställningen.
 DocType: Period Closing Voucher,Period Closing Voucher,Period Utgående Rabattkoder
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Huvudprislista.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Huvudprislista.
 DocType: Task,Review Date,Kontroll Datum
 DocType: Purchase Invoice,Advance Payments,Förskottsbetalningar
-DocType: DocPerm,Level,Nivå
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Fräsning
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Ingen tillåtelse att använda betalningsverktyg
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
 DocType: Company,Round Off Account,Avrunda konto
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Administrativa kostnader
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Konsultering
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Konsultering
 DocType: Customer Group,Parent Customer Group,Överordnad kundgrupp
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Byta
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Uppsägningstid
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","t.ex. ""Mitt Företag LLC"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Uppsägningstid
 DocType: Bank Reconciliation Detail,Voucher ID,Rabatt-ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Detta är en rot territorium och kan inte ändras.
 DocType: Packing Slip,Gross Weight UOM,Bruttovikt UOM
 DocType: Email Digest,Receivables / Payables,Fordringar / skulder
 DocType: Delivery Note Item,Against Sales Invoice,Mot fakturan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Prägling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Visa nollvärden
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Antal av objekt som erhålls efter tillverkning / ompackning från givna mängder av råvaror
 DocType: Payment Reconciliation,Receivable / Payable Account,Fordran / Betal konto
 DocType: Delivery Note Item,Against Sales Order Item,Mot Försäljningvara
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 DocType: Task,Actual End Date (via Time Logs),Faktiskt Slutdatum (via Tidslogg)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Ange huvud kostnadsställe
 DocType: Delivery Note,Print Without Amount,Skriv ut utan Belopp
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skatte Kategori kan inte vara &quot;Värdering&quot; eller &quot;Värdering och Total&quot; som alla artiklar är icke-lager
-DocType: User,Last Name,Efternamn
-DocType: Web Page,Left,Vänster
-DocType: Event,All Day,Hela Dagen
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,Skatte Kategori kan inte vara &quot;Värdering&quot; eller &quot;Värdering och Total&quot; som alla artiklar är icke-lager
 DocType: Issue,Support Team,Support Team
 DocType: Appraisal,Total Score (Out of 5),Totalt Betyg (Out of 5)
-DocType: Contact Us Settings,State,Status
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balans
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balans
 DocType: Project,Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar)
-DocType: User,Gender,Kön
 DocType: Journal Entry,Debit Note,Debetnota
 DocType: Stock Entry,As per Stock UOM,Per Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Inte Utgången
@@ -3751,44 +3429,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Skapa regler för att begränsa transaktioner som grundar sig på värderingar.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Om markerad, Totalt antal. arbetsdagar kommer att omfatta helgdagar, och detta kommer att minska värdet av lönen per dag"
 DocType: Purchase Invoice,Total Advance,Totalt Advance
-DocType: Workflow State,User,Användare
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Bearbetning Lön
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Ange som förlorade
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Kvitto Notera
 DocType: Customer,Credit Days Based On,Kredit dagar baserat på
 DocType: Tax Rule,Tax Rule,Skatte Rule
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Behåll samma takt hela säljcykeln
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planera tidsloggar utanför planerad arbetstid.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} har redan lämnats in
 ,Items To Be Requested,Produkter att begäras
-DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Billing Pris baseras på Aktivitetstyp (per timme)
 DocType: Company,Company Info,Företagsinfo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Falsning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Företagets epost-ID hittades inte, darför inte epost skickas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 DocType: Production Planning Tool,Filter based on item,Filter baserat på objektet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Bankkortkonto
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundat Totalt (Företagsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
 DocType: Purchase Common,Purchase Common,Gemensamma inköp
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Från Möjlighet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Blind
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Ersättningar till anställda
 DocType: Sales Invoice,Is POS,Är POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Fakturor till kunder.
-DocType: DocField,Default,Standard
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} abonnenter tillagda
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Definiera budget för detta kostnadsställe. Om du vill ställa budget action, se &quot;Företag Lista&quot;"
@@ -3799,70 +3473,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Expense Claim,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Om du väljer &quot;Yes&quot; kommer att ge en unik identitet för varje enhet i denna punkt som kan ses i Löpnummer mästare.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
 DocType: Employee,Education,Utbildning
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
 DocType: Address,Office,Kontors
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standardrapporter
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Välj Anställningsregister först.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,För att skapa en skattekontot
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Ange utgiftskonto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
 DocType: Employee,Current Address,Nuvarande Adress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Om artikeln är en variant av ett annat objekt kommer beskrivning, bild, prissättning, skatter etc att ställas från mallen om inte annat uttryckligen anges"
 DocType: Serial No,Purchase / Manufacture Details,Inköp / Tillverknings Detaljer
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Sats Inventory
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Sats Inventory
 DocType: Employee,Contract End Date,Kontrakts Slutdatum
 DocType: Sales Order,Track this Sales Order against any Project,Prenumerera på det här kundorder mot varje Project
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Hämta försäljningsorder (i avvaktan på att leverera) baserat på ovanstående kriterier
-DocType: DocShare,Document Type,Dokumentstyp
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Från leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Från leverantör Offert
 DocType: Deduction Type,Deduction Type,Avdragstyp
 DocType: Attendance,Half Day,Halv Dag
 DocType: Pricing Rule,Min Qty,Min Antal
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Om du vill spåra objekt i försäljnings- och inköpsdokument med sats nos. &quot;Önskad Bransch: Kemikalier&quot;
 DocType: GL Entry,Transaction Date,Transaktionsdatum
 DocType: Production Plan Item,Planned Qty,Planerade Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Totalt Skatt
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Totalt Skatt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,För Kvantitet (Tillverkad Antal) är obligatorisk
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
 DocType: Notification Control,Purchase Receipt Message,Inköpskvitto Meddelande
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Totalt tilldelade bladen är mer än period
 DocType: Production Order,Actual Start Date,Faktiskt startdatum
 DocType: Sales Order,% of materials delivered against this Sales Order,% Av material som levereras mot denna kundorder
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Regsiterobjektets rörelse.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Nyhetsbrev listade Abonnenter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Tapphåls
-DocType: Email Account,Service,Tjänsten
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 ,Monthly Salary Register,Månadslön Register
-apps/frappe/frappe/website/template.py +140,Next,Nästa
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
 DocType: BOM Operation,BOM Operation,BOM Drift
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektrisk polering
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På föregående v Belopp
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Ange Betalningsbelopp i minst en rad
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Ange Betalningsbelopp i minst en rad
 DocType: POS Profile,POS Profile,POS-Profil
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Rad {0}: Betalningsbeloppet kan inte vara större än utestående beloppet
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Totalt Obetald
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Totalt Obetald
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Tid Log är inte debiterbar
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Inköparen
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Inköparen
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Nettolön kan inte vara negativ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Ange mot mot vilken rabattkod manuellt
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Ange mot mot vilken rabattkod manuellt
 DocType: SMS Settings,Static Parameters,Statiska Parametrar
 DocType: Purchase Order,Advance Paid,Förskottsbetalning
 DocType: Item,Item Tax,Produkt Skatt
@@ -3871,14 +3538,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Skicka mass SMS till dina kontakter
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Värdera skatt eller avgift för
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Korsvalsning
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Produkt som skall tillverkas eller packas
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
 DocType: Purchase Invoice,Next Date,Nästa Datum
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ange skatter och avgifter
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Bearbetning
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
 DocType: Hub Settings,Seller Name,Säljaren Namn
@@ -3888,47 +3553,44 @@
 DocType: Stock Entry,Repack,Packa om
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du måste spara formuläret innan du fortsätter
 DocType: Item Attribute,Numeric Values,Numeriska värden
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Fäst Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Fäst Logo
 DocType: Customer,Commission Rate,Provisionbetyg
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Kundvagnen är tom
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Root kan inte redigeras.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Avsatt belopp kan inte större än icke redigerat belopp
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Root kan inte redigeras.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Avsatt belopp kan inte större än icke redigerat belopp
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillåt Produktion på helgdagar
 DocType: Sales Order,Customer's Purchase Order Date,Kundens inköpsorder Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Kapital Lager
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Välj en csv-fil
-DocType: Dropbox Backup,Send Backups to Dropbox,Skicka säkerhetskopior till Dropbox
 DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Designer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Skapa automatiskt Material Begäran om kvantitet understiger denna nivå
 ,Item-wise Purchase Register,Produktvis Inköpsregister
 DocType: Batch,Expiry Date,Utgångsdatum
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","För att ställa in beställningsnivå, måste objektet vara en inköpsobjekt eller tillverkning Punkt"
 ,Supplier Addresses and Contacts,Leverantör adresser och kontakter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Projektchef.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
-DocType: Dropbox Backup,Send Notifications To,Skicka meddelanden till
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Datum
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktionerade Belopp
 DocType: GL Entry,Is Opening,Är Öppning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Kontot {0} existerar inte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Kontot {0} existerar inte
 DocType: Account,Cash,Kontanter
 DocType: Employee,Short biography for website and other publications.,Kort biografi för webbplatsen och andra publikationer.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Skapa lönestruktur för arbetstagare {0}

diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index c2356b7..0ff2dd5 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,சம்பளம் முறை
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","நீங்கள் பருவகாலம் அடிப்படையில் கண்காணிக்க வேண்டும் என்றால், மாதாந்திர, விநியோகம் தேர்ந்தெடுக்கவும்."
 DocType: Employee,Divorced,விவாகரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,எச்சரிக்கை: ஒரே பொருளைப் பலமுறை உள்ளிட்ட வருகிறது.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,எச்சரிக்கை: ஒரே பொருளைப் பலமுறை உள்ளிட்ட வருகிறது.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,பொருட்கள் ஏற்கனவே ஒத்திசைக்கப்படாது
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,பொருள் ஒரு பரிமாற்றத்தில் பல முறை சேர்க்க அனுமதி
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,பொருள் வருகை {0} இந்த உத்தரவாதத்தை கூறுகின்றனர் ரத்து முன் ரத்து
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,நுகர்வோர் தயாரிப்புகள்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,முதல் கட்சி வகையைத் தேர்வு செய்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,தூண்டு
 DocType: Item,Customer Items,வாடிக்கையாளர் பொருட்கள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,கணக்கு {0}: பெற்றோர் கணக்கு {1} ஒரு பேரேட்டில் இருக்க முடியாது
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com செய்ய உருப்படியை வெளியிட
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,குற்றம் விட்டு
 DocType: Sales Partner,Dealer,வாணிகம் செய்பவர்
 DocType: Employee,Rented,வாடகைக்கு
-DocType: About Us Settings,Website,இணையதளம்
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,சுருக்கம் பிளஸ் வெப்பப்படுத்தலுக்கு
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,பொருள் கோரிக்கையை இருந்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,பொருள் கோரிக்கையை இருந்து
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} மரம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,மேலும் முடிவுகள் இல்லை.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,சட்ட
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,சட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},உண்மையான வகை வரி வரிசையில் மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது {0}
 DocType: C-Form,Customer,வாடிக்கையாளர்
 DocType: Purchase Receipt Item,Required By,By தேவை
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் Default
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,தையல்
 DocType: Pricing Rule,Apply On,விண்ணப்பிக்க
 DocType: Item Price,Multiple Item prices.,பல பொருள் விலை .
 ,Purchase Order Items To Be Received,"பெறப்பட்டுள்ள இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: SMS Center,All Supplier Contact,அனைத்து சப்ளையர் தொடர்பு
 DocType: Quality Inspection Reading,Parameter,அளவுரு
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ரோ # {0}: விகிதம் அதே இருக்க வேண்டும் {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,வங்கி உண்டியல்
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. வாடிக்கையாளர் வாரியாக உருப்படியை குறியீடு பராமரிக்க மற்றும் அவற்றின் குறியீடு அடிப்படையில் அவர்களை தேடும் செய்ய இந்த விருப்பத்தை பயன்படுத்த
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,காட்டு மாறிகள்
-DocType: Sales Invoice Item,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,அளவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,பங்கு
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,புதிய பிஓஎஸ் செய்தது செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,உடல்நலம்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
 DocType: Purchase Invoice,Monthly,மாதாந்தர
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,மின்னஞ்சல் முகவரி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,பாதுகாப்பு
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,மின்னஞ்சல் முகவரி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,ரோ # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,ரோ # {0}:
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,மரப்பொருட்கள்
 DocType: Production Order Operation,Work In Progress,முன்னேற்றம் வேலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D அச்சிடும்
 DocType: Employee,Holiday List,விடுமுறை பட்டியல்
 DocType: Time Log,Time Log,நேரம் புகுபதிகை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,கணக்கர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,கணக்கர்
 DocType: Cost Center,Stock User,பங்கு பயனர்
 DocType: Company,Phone No,இல்லை போன்
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","செயல்பாடுகள் பரிசீலனை, பில்லிங் நேரம் கண்காணிப்பு பயன்படுத்த முடியும் என்று பணிகளை எதிராக செய்த செய்யப்படுகிறது."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},புதிய {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},புதிய {0}: # {1}
 ,Sales Partners Commission,விற்பனை பங்குதாரர்கள் ஆணையம்
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,சுருக்கமான விட 5 எழுத்துக்கள் முடியாது
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",மதிப்பு {0} {1} பொருள் என மாறிகள் \ இருந்து அகற்ற முடியாது பண்பு இந்த கற்பிதம் கொண்டு இருக்கிறது.
-DocType: Print Settings,Classic,தரமான
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,இந்த ரூட் கணக்கு மற்றும் திருத்த முடியாது .
 DocType: BOM,Operations,நடவடிக்கைகள்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},தள்ளுபடி அடிப்படையில் அங்கீகாரம் அமைக்க முடியாது {0}
 DocType: Bin,Quantity Requested for Purchase,அளவு கொள்முதல் செய்ய கோரப்பட்ட
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","இரண்டு பத்திகள், பழைய பெயர் ஒரு புதிய பெயர் ஒன்று CSV கோப்பு இணைக்கவும்"
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,கிலோ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,கிலோ
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,ஒரு வேலை திறப்பு.
 DocType: Item Attribute,Increment,சம்பள உயர்வு
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,விளம்பரம்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,விளம்பரம்
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Employee,Married,திருமணம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதிக்கப்பட்ட {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,மளிகை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,வங்கி நுழைவு செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,கணக்கு வகை கிடங்கு என்றால் கிடங்கு கட்டாய ஆகிறது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","பாருங்கள் பொருட்டு மீண்டும் மீண்டும் என்றால், மீண்டும் நிறுத்த அல்லது முறையான முடிவு தேதி வைத்து தேர்வு நீக்கவும்"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,வழங்கப்படுகிறது பொருட்களை செலவு
-DocType: Blog Post,Guest,விருந்தினர்
 DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
 DocType: Lead,Interested,அக்கறை உள்ள
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,பொருள் பில்
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,திறப்பு
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,திறப்பு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},இருந்து {0} {1}
 DocType: Item,Copy From Item Group,பொருள் குழு நகல்
 DocType: Journal Entry,Opening Entry,நுழைவு திறந்து
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} கட்டாய ஆகிறது
 DocType: Stock Entry,Additional Costs,கூடுதல் செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
-DocType: Standard Reply,Owner,சொந்தக்காரர்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
 DocType: Employee Education,Under Graduate,பட்டதாரி கீழ்
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,இலக்கு
 DocType: BOM,Total Cost,மொத்த செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,செயல்பாடு : புகுபதிகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,வீடு
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,வீடு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,கணக்கு அறிக்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
 DocType: Expense Claim Detail,Claim Amount,உரிமை தொகை
 DocType: Employee,Mr,திரு
-DocType: Custom Script,Client,கிளையன்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,வழங்குபவர் வகை / வழங்குபவர்
 DocType: Naming Series,Prefix,முற்சேர்க்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,நுகர்வோர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,நுகர்வோர்
 DocType: Upload Attendance,Import Log,புகுபதிகை இறக்குமதி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,அனுப்பு
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,ஆண்டு சம்பளம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,ஆண்டு சம்பளம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,பங்கு செலவுகள்
 DocType: Newsletter,Email Sent?,அனுப்பிய மின்னஞ்சல்?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,காட்டு நேரத்தில் பதிவுகள்
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},அக்செப்டட் + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},அக்செப்டட் + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
 DocType: Item,Supply Raw Materials for Purchase,வழங்கல் மூலப்பொருட்கள் வாங்க
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,பொருள் {0} ஒரு கொள்முதல் பொருள் இருக்க வேண்டும்
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  தேர்வு காலம் இருக்கும் அனைத்து தேதிகளும் ஊழியர் இணைந்து ஏற்கனவே உள்ள வருகைப் பதிவேடுகள் கொண்டு, டெம்ப்ளேட் வரும்"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,விற்பனை விலைப்பட்டியல் சமர்பிக்கப்பட்டதும் புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","வரிசையில் வரி ஆகியவை அடங்கும் {0} பொருள் விகிதம் , வரிசைகளில் வரிகளை {1} சேர்க்கப்பட்டுள்ளது"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,நேராக்க
 DocType: BOM Replace Tool,New BOM,புதிய BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,தொகுதி பில்லிங் நேரம் பதிவுகள்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity நடிப்பதற்கு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,செய்திமடல் ஏற்கனவே அனுப்பப்பட்டுள்ளது
 DocType: Lead,Request Type,கோரிக்கை வகை
 DocType: Leave Application,Reason,காரணம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,நிர்வாகத்தினருக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,கணினி மேலாளர் மாறும் முதல் பயனர் (இந்த பிறகு மாற்றலாம்).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,நிர்வாகத்தினருக்கு
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,கணினி மேலாளர் மாறும் முதல் பயனர் (இந்த பிறகு மாற்றலாம்).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
 DocType: Serial No,Maintenance Status,பராமரிப்பு நிலைமை
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,பொருட்கள் மற்றும் விலை
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,பொருட்கள் மற்றும் விலை
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},வரம்பு தேதி நிதியாண்டு க்குள் இருக்க வேண்டும். தேதி அனுமானம் = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,நீங்கள் மதிப்பீடு உருவாக்கும் யாருக்காக பணியாளர் தேர்வு.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},செலவு மையம் {0} அல்ல நிறுவனத்தின் {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,விலை பட்டியல் கொள்முதல் அல்லது விற்பனை பொருந்தும் வேண்டும்
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},நிறுவல் தேதி உருப்படி பிரசவ தேதி முன் இருக்க முடியாது {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),விலை பட்டியல் விகிதம் தள்ளுபடி (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,தொடக்கம்
-DocType: User,First Name,முதல் பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,முழு அச்சு வார்ப்பு
 DocType: Offer Letter,Select Terms and Conditions,தேர்வு விதிமுறைகள் மற்றும் நிபந்தனைகள்
 DocType: Production Planning Tool,Sales Orders,விற்பனை ஆணைகள்
 DocType: Purchase Taxes and Charges,Valuation,மதிப்பு மிக்க
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,வங்கி கணக்கு
 DocType: Leave Type,Allow Negative Balance,எதிர்மறை இருப்பு அனுமதி
 DocType: Selling Settings,Default Territory,முன்னிருப்பு மண்டலம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,தொலை காட்சி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,தொலை காட்சி
 DocType: Production Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
 DocType: Customer Group,Mention if non-standard receivable account applicable,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு பொருந்தினால்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,கிடங்கு தேவையாக முன் சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,அன்று பெறப்பட்டது
 DocType: Sales Partner,Reseller,மறுவிற்பனையாளர்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,நிறுவனத்தின் உள்ளிடவும்
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
 DocType: Newsletter List,Total Subscribers,மொத்த சந்தாதாரர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,பெயர் தொடர்பு
+,Contact Name,பெயர் தொடர்பு
 DocType: Production Plan Item,SO Pending Qty,எனவே அளவு நிலுவையில்
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,மேலே குறிப்பிட்டுள்ள அடிப்படை சம்பளம் சீட்டு உருவாக்குகிறது.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,இரட்டை வீடுகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,வருடத்திற்கு இலைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,வருடத்திற்கு இலைகள்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்க தயவு செய்து
 DocType: Time Log,Will be updated when batched.,Batched போது புதுப்பிக்கப்படும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ரோ {0}: சரிபார்க்கவும் கணக்கு எதிராக 'அட்வான்ஸ்' என்ற {1} இந்த ஒரு முன்கூட்டியே நுழைவு என்றால்.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},கிடங்கு {0} அல்ல நிறுவனம் {1}
-DocType: Bulk Email,Message,செய்தி
 DocType: Item Website Specification,Item Website Specification,உருப்படியை வலைத்தளம் குறிப்புகள்
-DocType: Dropbox Backup,Dropbox Access Key,டிரா பாக்ஸ் அணுகல் விசை
 DocType: Payment Tool,Reference No,குறிப்பு இல்லை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,வருடாந்திர
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
 DocType: Material Request Item,Min Order Qty,Min ஆர்டர் அளவு
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,அனைத்து மீண்டும் பொருள் தேடும் தனிப்பட்ட ஐடி. அதை சமர்ப்பிக்க இல் உருவாக்கப்பட்டது.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,மென்பொருள் டெவலப்பர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,மென்பொருள் டெவலப்பர்
 DocType: Item,Minimum Order Qty,குறைந்தபட்ச ஆணை அளவு
 DocType: Pricing Rule,Supplier Type,வழங்குபவர் வகை
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,வயர் துலக்குதல்
 DocType: Employee,Relation,உறவு
 DocType: Shipping Rule,Worldwide Shipping,உலகம் முழுவதும் கப்பல்
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,வாடிக்கையாளர்கள் இருந்து உத்தரவுகளை உறுதி.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
 DocType: Maintenance Schedule,Generate Schedule,அட்டவணை உருவாக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,இழப்பில் தலைமை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,பொறுப்பு வகை முதல் தேர்வு செய்க
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,சமீபத்திய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,மேக்ஸ் 5 எழுத்துக்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,உங்கள் மொழி தேர்வு
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,மேக்ஸ் 5 எழுத்துக்கள்
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,பட்டியலில் முதல் விடுப்பு சர்க்கார் தரப்பில் சாட்சி இயல்புநிலை விடுப்பு சர்க்கார் தரப்பில் சாட்சி என அமைக்க வேண்டும்
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",உற்பத்தி உத்தரவுகளுக்கு எதிராக நேரத்தில் பதிவுகள் உருவாக்கம் முடக்குகிறது. ஆபரேஷன்ஸ் உத்தரவு எதிராக தொடர்ந்து கண்காணிக்கப்படுகிறது
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,மாறுபாடு
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,பொருள் {0} சேவை பொருளாக இருக்க வேண்டும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
-DocType: DocType,Administrator,நிர்வாகி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,லேசர் தோண்டுதல்
-DocType: Stock UOM Replace Utility,New Stock UOM,புதிய பங்கு மொறட்டுவ பல்கலைகழகம்
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,வட்ட குறிப்பு பிழை
-DocType: Communication,Closed,மூடிய
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை வேர்ட்ஸ் (ஏற்றுமதி) காண முடியும்.
 DocType: Lead,Industry,தொழில்
 DocType: Employee,Job Profile,வேலை விவரம்
 DocType: Newsletter,Newsletter,செய்தி மடல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Necking
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,பொருள் மேம்படுத்தப்பட்டது
-DocType: Async Task,System Manager,கணினி மேலாளர்
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
 DocType: Sales Invoice Item,Delivery Note,டெலிவரி குறிப்பு
-DocType: Dropbox Backup,Allow Dropbox Access,டிராப்பாக்ஸ் அணுகல் அனுமதி
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,வரி அமைத்தல்
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Workstation,Rent Cost,வாடகை செலவு
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,நிறுவனத்தின் மின்னஞ்சல்
 DocType: GL Entry,Debit Amount in Account Currency,கணக்கு நாணய பற்று தொகை
 DocType: Shipping Rule,Valid for Countries,நாடுகள் செல்லுபடியாகும்
-DocType: Workflow State,Refresh,இளைப்பா (ற்) று
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","நாணய , மாற்று விகிதம் , இறக்குமதி மொத்த இறக்குமதி பெரும் மொத்த போன்ற அனைத்து இறக்குமதி சார்ந்த துறைகள் கொள்முதல் ரசீது , வழங்குபவர் மேற்கோள் கொள்முதல் விலைப்பட்டியல் , கொள்முதல் ஆணை முதலியன உள்ளன"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,விகிதம் இது வாடிக்கையாளர் நாணயத்தின் வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும்
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Bom, டெலிவரி குறிப்பு , கொள்முதல் விலைப்பட்டியல் , உத்தரவு , கொள்முதல் ஆணை , கொள்முதல் ரசீது , கவிஞருக்கு , விற்பனை , பங்கு நுழைவு , எங்கோ கிடைக்கும்"
 DocType: Item Tax,Tax Rate,வரி விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,உருப்படி தேர்வுசெய்க
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","பொருள்: {0} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,வாங்கும் ரசீது சமர்ப்பிக்க வேண்டும்
-DocType: Stock UOM Replace Utility,Current Stock UOM,தற்போதைய பங்கு மொறட்டுவ பல்கலைகழகம்
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,உங்கள் மின்னஞ்சல் முகவரியை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,இணைப்பு பார்க்கவும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,வாட்டர் ஜெட் அறுக்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
 ,Finished Goods,முடிக்கப்பட்ட பொருட்கள்
 DocType: Delivery Note,Instructions,அறிவுறுத்தல்கள்
 DocType: Quality Inspection,Inspected By,மூலம் ஆய்வு
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"வாடிக்கையாளர்கள் மற்றும் சப்ளையர்கள் கணக்குகளை உருவாக்கி, வேண்டாம். அவர்கள் வாடிக்கையாளர் / சப்ளையர் முதுநிலை நேரடியாக உருவாக்கப்படுகின்றன."
 DocType: Currency Exchange,Currency Exchange,நாணய பரிவர்த்தனை
 DocType: Purchase Invoice Item,Item Name,உருப்படி பெயர்
+DocType: Authorization Rule,Approving User  (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பயனர் அனுமதி
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,கடன் நிலுவை
 DocType: Employee,Widowed,விதவை
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",&quot;அவுட் பங்கு பற்றிய&quot; எந்த கோரிய வேண்டும் பொருட்களை உத்தேச அளவு மற்றும் குறைந்த ஆர்டர் அளவு அடிப்படையில் அனைத்து கிடங்குகள் பரிசீலித்து
@@ -380,22 +348,21 @@
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
 DocType: Workstation,Consumable Cost,நுகர்வோர் விலை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,மருத்துவம்
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,இழந்து காரணம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,குழாய் ஓரம்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 DocType: Employee,Single,ஒற்றை
 DocType: Issue,Attachment,இணைப்பு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,பட்ஜெட் குழு செலவு மையம் அமைக்க
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
 DocType: Purchase Invoice,Yearly,வருடாந்திர
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
 DocType: Journal Entry Account,Sales Order,விற்பனை ஆணை
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
 DocType: Purchase Order,Start date of current order's period,தற்போதைய பொருட்டு காலத்தில் தேதி தொடங்கும்
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},அளவு வரிசையில் ஒரு பகுதியை இருக்க முடியாது {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},அளவு வரிசையில் ஒரு பகுதியை இருக்க முடியாது {0}
 DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
 DocType: Delivery Note,% Installed,% நிறுவப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,குழு
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,தானாகவே மற்றும் FIFO அடிப்படையில் நாம் சீரியல் அமை
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,காசோலை சப்ளையர் விலைப்பட்டியல் எண் தனித்துவம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,அறுத்துக்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;வழக்கு எண் வேண்டும்&#39; &#39;வழக்கு எண் வரம்பு&#39; விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,லாபம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,லாபம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,தொடங்குதல்
 DocType: Lead,Channel Partner,சேனல் வரன்வாழ்க்கை துணை
 DocType: Account,Old Parent,பழைய பெற்றோர்
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,கணக்குகள் வரை உறை
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,விடுமுறை மாஸ்டர் .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ஷெல் வடிவமைத்தல்
 DocType: Material Request Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
 DocType: BOM,Costing,செலவு
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,மொத்த அளவு
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,வரையறைக்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,பத்திரங்கள் மற்றும் வைப்பு
 DocType: Features Setup,Imports,இறக்குமதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ஒட்டு பிணைப்பு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Job Opening,Description of a Job Opening,ஒரு வேலை ஆரம்பிப்பு விளக்கம்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,வருகை பதிவு.
 DocType: Bank Reconciliation,Journal Entries,ஜர்னல் பதிவுகள்
 DocType: Sales Order Item,Used for Production Plan,உற்பத்தி திட்டத்தை பயன்படுத்திய
-DocType: System Settings,Loading...,ஏற்றுகிறது ...
-DocType: DocField,Password,கடவுச்சொல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,இணைந்தது படிவு மாடலிங்
 DocType: Manufacturing Settings,Time Between Operations (in mins),(நிமிடங்கள்) செயல்களுக்கு இடையே நேரம்
 DocType: Customer,Buyer of Goods and Services.,பொருட்கள் மற்றும் சேவைகள் வாங்குபவர்.
 DocType: Journal Entry,Accounts Payable,கணக்குகள் செலுத்த வேண்டிய
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,சந்தாதாரர்கள் சேர்க்கவும்
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" உள்ளது இல்லை"
 DocType: Pricing Rule,Valid Upto,வரை செல்லுபடியாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,நேரடி வருமானம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","கணக்கு மூலம் தொகுக்கப்பட்டுள்ளது என்றால் , கணக்கு அடிப்படையில் வடிகட்ட முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,நிர்வாக அதிகாரி
 DocType: Payment Tool,Received Or Paid,பெறப்படும் அல்லது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Stock Entry,Difference Account,வித்தியாசம் கணக்கு
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,ஒப்பனை
-DocType: DocField,Type,மாதிரி
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
-DocType: Communication,Subject,பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 ,Serial No Warranty Expiry,தொடர் இல்லை உத்தரவாதத்தை காலாவதியாகும்
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,உருப்படி
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,புதிய மொறட்டுவ பல்கலைகழகம் வகை முழு எண் இருக்க கூடாது
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,"மரச்சாமான்கள் , திருவோணம்,"
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,விலை பட்டியல் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,பொருள் தேவை
 DocType: Company,Delete Company Transactions,நிறுவனத்தின் பரிவர்த்தனைகள் நீக்கு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,பொருள் {0} பொருள் கொள்முதல் இல்லை
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'அறிவித்தல் \
  மின்னஞ்சல் முகவரி' இருக்கும் ஒரு தவறான மின்னஞ்சல் முகவரி ஆகிறது"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,மொத்த பில்லிங் இந்த வருடம்:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,மொத்த பில்லிங் இந்த வருடம்:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","நீக்க முடியாது தொ.எ. {0}, அது பங்கு பரிவர்த்தனைகள் பயன்படுத்தப்படும் விதத்தில்"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),நிறைவு (CR)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),நிறைவு (CR)
 DocType: Serial No,Warranty Period (Days),உத்தரவாதத்தை காலம் (நாட்கள்)
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 ,Pending Qty,நிலுவையில் அளவு
 DocType: Job Applicant,Thread HTML,Thread HTML
 DocType: Company,Ignore,புறக்கணி
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},எஸ்எம்எஸ் எண்களில் அனுப்பப்பட்டது: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
 DocType: Pricing Rule,Valid From,செல்லுபடியான
 DocType: Sales Invoice,Total Commission,மொத்த ஆணையம்
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** மாதந்திர விநியோகம் ** உங்கள் தொழிலுக்கு பருவகாலம் வேண்டும் என்றால் நீங்கள் மாதங்களுக்கு முழுவதும் உங்கள் வரவு செலவு திட்டம் விநியோகிக்க உதவுகிறது.
 
 , இந்த விநியோக பயன்படுத்தி ஒரு பட்ஜெட் விநியோகிக்க ** விலை மையத்தில் ** இந்த ** மாதந்திர விநியோகம் அமைக்க **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
-DocType: About Us Settings,Website Manager,இணைய மேலாளர்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,நிதி ஆண்டு தொடக்கம் தேதி நிதி ஆண்டு இறுதியில் தேதி விட அதிகமாக இருக்க கூடாது
 DocType: Warranty Claim,Resolution,தீர்மானம்
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},வழங்கப்படுகிறது {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,பில்லிங் மற்றும் டெலிவரி நிலை
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,முந்தைய
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,விற்பனை Return
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,நீங்கள் உற்பத்தி ஆணைகள் உருவாக்க வேண்டிய இருந்து விற்பனை ஆணைகள் தேர்ந்தெடுக்கவும்.
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,சம்பளம் கூறுகள்.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,வாடிக்கையாளர்கள் பற்றிய தகவல்.
+DocType: Authorization Rule,Customer or Item,வாடிக்கையாளர் அல்லது பொருள்
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,வாடிக்கையாளர் தகவல்.
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),துவாரம் ( CR)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,தரைமட்டத்திற்கு
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. நீங்கள் வேறு ஒரு இயல்புநிலை UOM பயன்படுத்த ஒரு புதிய பொருள் உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
-DocType: Event,Wednesday,புதன்கிழமை
 DocType: Sales Invoice,Customer's Vendor,வாடிக்கையாளர் விற்பனையாளர்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,உற்பத்தி ஓட்டப் ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,மானசாவுடன்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,மானசாவுடன்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,மற்றொரு விற்பனைப் {0} அதே பணியாளர் ஐடி கொண்டு உள்ளது
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},எதிர்மறை பங்கு பிழை ( {6} ) உருப்படி {0} கிடங்கு உள்ள {1} ம் {2} {3} ல் {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,நிதியாண்டு நிறுவனத்தின்
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,இயல்புநிலை செலவு மதிப்பீடு
 DocType: Maintenance Schedule,Maintenance Schedule,பராமரிப்பு அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,டிரா பாக்ஸ் பைதான் தொகுதி நிறுவவும்
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,கொள்முதல் ரசீது இருந்து
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,மேலாளர்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,கொள்முதல் ரசீது இருந்து
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
 DocType: SMS Settings,Receiver Parameter,ரிசீவர் அளவுரு
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
 DocType: Sales Person,Sales Person Targets,விற்பனை நபர் இலக்குகள்
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,செய்ய
-apps/frappe/frappe/templates/base.html +145,Please enter email address,மின்னஞ்சல் முகவரியை உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,உருவாக்கும் முடிவு குழாய்
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,குழு மாற்ற
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,நிலையான நாட்கள்
 DocType: Sales Invoice,Packing List,பட்டியல் பொதி
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,விநியோகஸ்தர்கள் கொடுக்கப்பட்ட ஆணைகள் வாங்க.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,வெளியீடு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,வெளியீடு
 DocType: Activity Cost,Projects User,திட்டங்கள் பயனர்
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,உட்கொள்ளுகிறது
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0} {1} விலைப்பட்டியல் விவரம் அட்டவணையில் இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0} {1} விலைப்பட்டியல் விவரம் அட்டவணையில் இல்லை
 DocType: Company,Round Off Cost Center,விலை மையம் ஆஃப் சுற்றுக்கு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு வருகை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 DocType: Material Request,Material Transfer,பொருள் மாற்றம்
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),துவாரம் ( டாக்டர் )
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},பதிவுசெய்ய நேர முத்திரை பின்னர் இருக்க வேண்டும் {0}
-apps/frappe/frappe/config/setup.py +59,Settings,அமைப்புகள்
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed செலவு வரிகள் மற்றும் கட்டணங்கள்
 DocType: Production Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,அதிக
 DocType: Pricing Rule,Sales Manager,விற்பனை மேலாளர்
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,மறுபெயரிடு
 DocType: Journal Entry,Write Off Amount,மொத்த தொகை இனிய எழுத
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,வளைக்கும்
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,பயனர் அனுமதி
 DocType: Journal Entry,Bill No,பில் இல்லை
 DocType: Purchase Invoice,Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற
 DocType: Selling Settings,Delivery Note Required,டெலிவரி குறிப்பு தேவை
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
 DocType: Account,Accounts,கணக்குகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,மார்கெட்டிங்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,நேராக வெட்டுதல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,மார்கெட்டிங்
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,அவர்களின் தொடர் இலக்கங்கள் அடிப்படையில் விற்பனை மற்றும் கொள்முதல் ஆவணங்களில் உருப்படியை தடமறிய. இந்த உற்பத்தியில் உத்தரவாதத்தை விவரங்களை கண்டறிய பயன்படுகிறது.
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,நிராகரிக்கப்பட்டது கிடங்கு regected உருப்படியை எதிராக கட்டாய ஆகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 DocType: Employee,Provide email id registered in company,நிறுவனத்தின் பதிவு மின்னஞ்சல் ஐடி வழங்கும்
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால ஆஃபர்
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,மரம் வகை
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,அளவு மற்றும் சேமிப்பு கிடங்கு
 DocType: Sales Invoice,Commission Rate (%),கமிஷன் விகிதம் (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","வவுச்சர் எதிராக வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,ஏரோஸ்பேஸ்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,நல்வரவு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,ஏரோஸ்பேஸ்
 DocType: Journal Entry,Credit Card Entry,கடன் அட்டை நுழைவு
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,பணி தலைப்பு
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,பொருட்கள் விநியோகஸ்தர்கள் இருந்து பெற்றார்.
-DocType: Communication,Open,திறந்த
 DocType: Lead,Campaign Name,பிரச்சாரம் பெயர்
 ,Reserved,முன்பதிவு
 DocType: Purchase Order,Supply Raw Materials,வழங்கல் மூலப்பொருட்கள்
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ஒரு பங்கு பொருள் அல்ல
 DocType: Mode of Payment Account,Default Account,முன்னிருப்பு கணக்கு
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
-DocType: Contact Us Settings,Address Title,முகவரி தலைப்பு
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,வாராந்திர ஆஃப் நாள் தேர்வு செய்க
 DocType: Production Order Operation,Planned End Time,திட்டமிட்ட நேரம்
 ,Sales Person Target Variance Item Group-Wise,விற்பனை நபர் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-DocType: Dropbox Backup,Daily,தினசரி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,ஏற்கனவே பரிவர்த்தனை கணக்கு பேரேடு மாற்றப்பட முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,ஏற்கனவே பரிவர்த்தனை கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Delivery Note,Customer's Purchase Order No,வாடிக்கையாளர் கொள்முதல் ஆர்டர் இல்லை
 DocType: Employee,Cell Number,செல் எண்
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,ஆட்டோ பொருள் கோரிக்கைகள் உருவாக்கிய
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,லாஸ்ட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,சக்தி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
 DocType: Item Group,Website Specifications,இணையத்தளம் விருப்பம்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,புதிய கணக்கு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,கணக்கியல் உள்ளீடுகள் இலை முனைகளில் எதிராகவும். குழுக்களுக்கு எதிராக பதிவுகள் அனுமதி இல்லை.
-DocType: ToDo,High,உயர்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
-DocType: User,Male,ஆண்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},பொருள் தேவை கொள்முதல் ரசீது எண் {0}
 DocType: Item Attribute Value,Item Attribute Value,பொருள் மதிப்பு பண்பு
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,விற்பனை பிரச்சாரங்களை .
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,தனிப்பட்ட
 DocType: Expense Claim Detail,Expense Claim Type,இழப்பில் உரிமைகோரல் வகை
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,வண்டியில் இயல்புநிலை அமைப்புகளை
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","பத்திரிகை நுழைவு {0} இந்த விலைப்பட்டியல் முன்கூட்டியே என இழுக்கப்பட்டு வேண்டும் என்றால் {1}, பார்க்கலாம் ஒழுங்குக்கு எதிரான இணைக்கப்பட்டுள்ளது."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,பயோடெக்னாலஜி
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","பத்திரிகை நுழைவு {0} இந்த விலைப்பட்டியல் முன்கூட்டியே என இழுக்கப்பட்டு வேண்டும் என்றால் {1}, பார்க்கலாம் ஒழுங்குக்கு எதிரான இணைக்கப்பட்டுள்ளது."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,பயோடெக்னாலஜி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,அலுவலகம் பராமரிப்பு செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,ஹெம்மிங்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Account,Liability,கடமை
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Process Payroll,Send Email,மின்னஞ்சல் அனுப்ப
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,இல்லை அனுமதி
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"பொருட்களை வழியாக இல்லை, ஏனெனில் &#39;மேம்படுத்தல் பங்கு&#39; சோதிக்க முடியாது, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,இலக்கங்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,இலக்கங்கள்
 DocType: Item,Items with higher weightage will be shown higher,அதிக வெயிட்டேஜ் உருப்படிகள் அதிக காட்டப்படும்
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,வங்கி நல்லிணக்க விரிவாக
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,என் பொருள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,என் பொருள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,எதுவும் ஊழியர்
 DocType: Purchase Order,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;விற்பனை செய்யுமிடம்&quot; அம்சங்களை செயல்படுத்த
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
-DocType: Comment,Reference Name,குறிப்பு பெயர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: Sales Invoice Item,Target Warehouse,இலக்கு கிடங்கு
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,எதிர்பார்க்கப்படுகிறது பிரசவ தேதி முன் விற்பனை ஆணை தேதி இருக்க முடியாது
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை புகுபதிகை
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
 DocType: Production Order,Item To Manufacture,உற்பத்தி பொருள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,நிரந்தர அச்சு வார்ப்பு
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 DocType: Sales Order Item,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
 DocType: Newsletter,Newsletter Manager,செய்திமடல் மேலாளர்
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;திறந்து&#39;
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
 DocType: Expense Claim,Expenses,செலவுகள்
 DocType: Item Variant Attribute,Item Variant Attribute,பொருள் மாற்று கற்பிதம்
 ,Purchase Receipt Trends,ரிசிப்ட் போக்குகள் வாங்குவதற்கு
 DocType: Appraisal,Select template from which you want to get the Goals,நீங்கள் இலக்குகள் பெற விரும்பும் டெம்ப்ளேட்டை தேர்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
 ,Amount to Bill,பில் தொகை
 DocType: Company,Registration Details,பதிவு விவரங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,பெற்றுக்கொள்வதில் உறுதியாக
 DocType: Item,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
 DocType: Leave Block List Date,Leave Block List Date,பிளாக் பட்டியல் தேதி விட்டு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},அனுப்ப திட்டமிடப்பட்டுள்ளது {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,பங்கு விபரங்கள்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,திட்ட மதிப்பு
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,புள்ளி விற்பனை
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},முன்னோக்கி செல்ல முடியாது {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","கணக்கு நிலுவை ஏற்கனவே கடன், நீங்கள் அமைக்க அனுமதி இல்லை 'டெபிட்' என 'சமநிலை இருக்க வேண்டும்'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","கணக்கு நிலுவை ஏற்கனவே கடன், நீங்கள் அமைக்க அனுமதி இல்லை 'டெபிட்' என 'சமநிலை இருக்க வேண்டும்'"
 DocType: Account,Balance must be,இருப்பு இருக்க வேண்டும்
 DocType: Hub Settings,Publish Pricing,விலை வெளியிடு
 DocType: Notification Control,Expense Claim Rejected Message,இழப்பில் கோரிக்கை செய்தி நிராகரிக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,தட்டுதல்
 ,Available Qty,கிடைக்கும் அளவு
 DocType: Purchase Taxes and Charges,On Previous Row Total,முந்தைய வரிசை மொத்த மீது
 DocType: Salary Slip,Working Days,வேலை நாட்கள்
 DocType: Serial No,Incoming Rate,உள்வரும் விகிதம்
 DocType: Packing Slip,Gross Weight,மொத்த எடை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .
 DocType: HR Settings,Include holidays in Total no. of Working Days,மொத்த எந்த விடுமுறை அடங்கும். வேலை நாட்கள்
 DocType: Job Applicant,Hold,பிடி
 DocType: Employee,Date of Joining,சேர்வது தேதி
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,பார்வை சந்தாதாரர்கள்
 DocType: Purchase Invoice Item,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,ஊது சிராய்ப்பு
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
 DocType: Salary Slip,Leave Encashment Amount,பணமாக்கல் தொகை விட்டு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},தொடர் இல {0} பொருள் அல்ல {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,தேவையான அளவு
 DocType: Bank Reconciliation,Total Amount,மொத்த தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,இணைய பப்ளிஷிங்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,இணைய பப்ளிஷிங்
 DocType: Production Planning Tool,Production Orders,தயாரிப்பு ஆணைகள்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,இருப்பு மதிப்பு
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,விற்பனை விலை பட்டியல்
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,பொருட்களை ஒத்திசைக்க வெளியிடு
-DocType: GL Entry,Account Currency,கணக்கு நாணய
+DocType: Bank Reconciliation,Account Currency,கணக்கு நாணய
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,நிறுவனத்தின் வட்ட இனிய கணக்கு குறிப்பிடவும்
 DocType: Purchase Receipt,Range,எல்லை
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Features Setup,Item Barcode,உருப்படியை பார்கோடு
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Address,Shop,ஷாப்பிங்
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
 DocType: Employee,Permanent Address Is,நிரந்தர முகவரி
 DocType: Production Order Operation,Operation completed for how many finished goods?,ஆபரேஷன் எத்தனை முடிக்கப்பட்ட பொருட்கள் நிறைவு?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,பிராண்ட்
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,பிராண்ட்
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}.
 DocType: Employee,Exit Interview Details,பேட்டி விவரம் வெளியேற
 DocType: Item,Is Purchase Item,கொள்முதல் உருப்படி உள்ளது
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,ஆர்டர் பொருள் வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,மறைமுக வருமானம்
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,அமை செலுத்தும் தொகை = மிகச்சிறந்த தொகை
-DocType: Contact Us Settings,Address Line 1,முகவரி வரி 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,மாறுபாடு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,நிறுவனத்தின் பெயர்
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,மாறுபாடு
+,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,அனைத்து உதவி வீடியோக்களை பட்டியலை காண்க
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,பயனர் நடவடிக்கைகளில் விலை பட்டியல் விகிதம் திருத்த அனுமதி
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,இரசாயன
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,இரசாயன
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 DocType: Process Payroll,Select Payroll Year and Month,சம்பளப்பட்டியல் ஆண்டு மற்றும் மாத தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",அதற்கான குழு (பொதுவாக நிதிகள் விண்ணப்ப&gt; நடப்பு சொத்துக்கள்&gt; வங்கி கணக்குகள் சென்று வகை) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க &quot;வங்கி&quot;
 DocType: Workstation,Electricity Cost,மின்சார செலவு
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
-DocType: Comment,Unsubscribed,குழுவிலகப்பட்டது
 DocType: Opportunity,Walk In,ல் நடக்க
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finanial செலவு மையங்கள் மரம் .
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,மாற்றப்பட்டால்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,வெள்ளை
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,வெள்ளை
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,உங்கள் படம் இணைக்கவும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,செய்ய
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,உங்கள் படம் இணைக்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,செய்ய
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
-DocType: Workflow State,Stop,நிறுத்த
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ஒரு பிழை ஏற்பட்டது . ஒரு சாத்தியமான காரணம் நீங்கள் வடிவம் காப்பாற்ற முடியாது என்று இருக்க முடியும் . சிக்கல் தொடர்ந்தால் support@erpnext.com தொடர்பு கொள்ளவும்.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,என் வண்டியில்
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ஒழுங்கு வகை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Lead,Next Contact Date,அடுத்த தொடர்பு தேதி
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,திறந்து அளவு
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},ஐந்து அளவு {0}
 DocType: Leave Application,Leave Application,விண்ணப்ப விட்டு
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ஒதுக்கீடு கருவி விட்டு
 DocType: Leave Block List,Leave Block List Dates,பிளாக் பட்டியல் தினங்கள் விட்டு
 DocType: Company,If Monthly Budget Exceeded (for expense account),மாதாந்திர பட்ஜெட் (செலவு கணக்கு க்கான) மீறிவிட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Trimming
 DocType: Workstation,Net Hour Rate,நிகர ஹவர் விகிதம்
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,இறங்கினார் செலவு கொள்முதல் ரசீது
 DocType: Company,Default Terms,இயல்புநிலை நெறிமுறைகள்
 DocType: Packing Slip Item,Packing Slip Item,ஸ்லிப் பொருள் பொதி
 DocType: POS Profile,Cash/Bank Account,பண / வங்கி கணக்கு
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,தாக்கல்
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,தள்ளுபடி
 DocType: Features Setup,Purchase Discounts,கொள்முதல் தள்ளுபடி
 DocType: Workstation,Wages,ஊதியங்கள்
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
 DocType: Serial No,Creation Document No,உருவாக்கம் ஆவண இல்லை
 DocType: Issue,Issue,சிக்கல்
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,கணக்கு நிறுவனத்தின் பொருந்தவில்லை
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,காதல் களம் கிடங்கு
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
 DocType: BOM Operation,Operation,ஆபரேஷன்
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,விற்பனை செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,ஸ்டாண்டர்ட் வாங்குதல்
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Item,Default Supplier,இயல்புநிலை சப்ளையர்
 DocType: Manufacturing Settings,Over Production Allowance Percentage,உற்பத்தி கொடுப்பனவான சதவீதம் ஓவர்
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,நேரத்தில் பதிவுகள் வழியாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,சராசரி வயது
 DocType: Opportunity,Your sales person who will contact the customer in future,எதிர்காலத்தில் வாடிக்கையாளர் தொடர்பு யார் உங்கள் விற்பனை நபர்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,உங்கள் சப்ளையர்கள் ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,உங்கள் சப்ளையர்கள் ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 DocType: Company,Default Currency,முன்னிருப்பு நாணயத்தின்
 DocType: Contact,Enter designation of this Contact,இந்த தொடர்பு பதவி உள்ளிடவும்
-DocType: Contact Us Settings,Address,முகவரி
 DocType: Expense Claim,From Employee,பணியாளர் இருந்து
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
 DocType: Journal Entry,Make Difference Entry,வித்தியாசம் நுழைவு செய்ய
 DocType: Upload Attendance,Attendance From Date,வரம்பு தேதி வருகை
 DocType: Appraisal Template Goal,Key Performance Area,முக்கிய செயல்திறன் பகுதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,போக்குவரத்து
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,போக்குவரத்து
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ஆண்டு:
 DocType: Email Digest,Annual Expense,வருடாந்த செலவு
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,சி படிவம் விலைப்பட்டியல் விரிவாக
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,கொடுப்பனவு நல்லிணக்க விலைப்பட்டியல்
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,பங்களிப்பு%
 DocType: Item,website page link,இணைய பக்கம் இணைப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,முதல் பயன்படுத்த அமைப்பு தயார் செய்யட்டும்.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,உங்கள் குறிப்பு நிறுவனத்தில் பதிவு எண்கள். வரி எண்கள் போன்ற
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,நேரம் பதிவுகள் தேர்ந்தெடுத்து ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க சமர்ப்பிக்கவும்.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,விற்பனை விலைப்பட்டியல் முன்பணம்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,கேட்டு எதுவும்
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி ' விட முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,மேலாண்மை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,மேலாண்மை
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,நேரம் தாள்கள் செயல்பாடுகளை வகைகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,முதலீட்டு நடிப்பதற்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},பற்று அல்லது கடன் அளவு ஒன்று தேவை {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பளம் ஸ்லிப் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,செயலில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,ப்ளூ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,ப்ளூ
 DocType: Purchase Invoice,Is Return,திரும்பி இருக்கிறது
 DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,மேலும் முனைகளில் ஒரே 'குரூப்' வகை முனைகளில் கீழ் உருவாக்கப்பட்ட
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},பிஓஎஸ் சுயவிவரம் {0} ஏற்கனவே பயனர் உருவாக்கப்பட்டது: {1} நிறுவனத்தின் {2}
 DocType: Purchase Order Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
 DocType: Stock Settings,Default Item Group,முன்னிருப்பு உருப்படி குழு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,லேமினேட் பொருள் உற்பத்தி
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,வழங்குபவர் தரவுத்தள.
 DocType: Account,Balance Sheet,ஐந்தொகை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,உருவாக்கும் நீட்சி
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,உங்கள் விற்பனை நபர் வாடிக்கையாளர் தொடர்பு கொள்ள இந்த தேதியில் ஒரு நினைவூட்டல் வரும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,வரி மற்றும் பிற சம்பளம் கழிவுகள்.
 DocType: Lead,Lead,தலைமை
 DocType: Email Digest,Payables,Payables
 DocType: Account,Warehouse,கிடங்கு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
 ,Purchase Order Items To Be Billed,"பில்லிங் செய்யப்படும் விதமே இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: Purchase Invoice Item,Net Rate,நிகர விகிதம்
 DocType: Purchase Invoice Item,Purchase Invoice Item,விலைப்பட்டியல் பொருள் வாங்க
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,பங்கு லெட்ஜர் பதிவுகள் மற்றும் GL பதிவுகள் தேர்வு கொள்முதல் ரசீதுகள் இடுகையிட்டார்கள்
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,பொருள் 1
 DocType: Holiday,Holiday,விடுமுறை
-DocType: Event,Saturday,சனிக்கிழமை
 DocType: Leave Control Panel,Leave blank if considered for all branches,அனைத்து கிளைகளையும் கருத்தில் இருந்தால் வெறுமையாக
 ,Daily Time Log Summary,தினமும் நேரம் புகுபதிகை சுருக்கம்
-DocType: DocField,Label,சிட்டை
 DocType: Payment Reconciliation,Unreconciled Payment Details,ஒப்புரவாகவேயில்லை கொடுப்பனவு விபரங்கள்
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
 DocType: Lead,Call,அழைப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,ஊழியர் அமைத்தல்
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","கிரிட் """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,ஆராய்ச்சி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,ஆராய்ச்சி
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Contact,User ID,பயனர் ஐடி
-DocType: Communication,Sent,அனுப்பப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,காட்சி லெட்ஜர்
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
-DocType: Communication,Delivery Status,விநியோக நிலைமை
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 DocType: Production Order,Manufacture against Sales Order,விற்பனை அமைப்புக்கு எதிராக உற்பத்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,உருப்படி விளக்கம்
 DocType: Payment Tool,Payment Mode,பணம் செலுத்தும் முறை
 DocType: Purchase Invoice,Is Recurring,மீண்டும் மீண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,நேரடி உலோக லேசர் வெப்பப்படுத்தலுக்கு
 DocType: Purchase Order,Supplied Items,வழங்கப்பட்ட பொருட்கள்
 DocType: Production Order,Qty To Manufacture,உற்பத்தி அளவு
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,கொள்முதல் சுழற்சி முழுவதும் ஒரே விகிதத்தை பராமரிக்க
 DocType: Opportunity Item,Opportunity Item,வாய்ப்பு தகவல்கள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,தற்காலிக திறப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,பணியாளர் விடுப்பு இருப்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
 DocType: Address,Address Type,முகவரி வகை
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,சிறிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,சிறிய
 DocType: Employee,Employee Number,பணியாளர் எண்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},வழக்கு எண் (கள்) ஏற்கனவே பயன்பாட்டில் உள்ளது. வழக்கு எண் இருந்து முயற்சி {0}
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,பொருள் 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,கணக்கு தலையில் {0} உருவாக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,பச்சை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,பச்சை
 DocType: Item,Auto re-order,வாகன மறு ஒழுங்கு
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,மொத்த Achieved
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,மொத்த Achieved
 DocType: Employee,Place of Issue,இந்த இடத்தில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
-DocType: Report,Disabled,முடக்கப்பட்டது
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,ஒப்பந்த
+DocType: Email Digest,Add Quote,ஆனால் சேர்க்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,விவசாயம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
 DocType: Journal Entry Account,Purchase Order,ஆர்டர் வாங்க
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,பெயர் தேவை
 DocType: Purchase Invoice,Recurring Type,மீண்டும் வகை
 DocType: Address,City/Town,நகரம் / டவுன்
 DocType: Email Digest,Annual Income,ஆண்டு வருமானம்
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,பொருள் {0} ஒரு துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,மூலதன கருவிகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,எதிர்பார்த்த வழங்குதல் தேதி திட்டமிட்ட தொடக்க தேதி விட குறைந்த உள்ளது.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,சப்ளையர்
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,அமைத்தல் கணக்கு வகை பரிமாற்றங்கள் இந்த கணக்கு தேர்வு உதவுகிறது.
 DocType: Purchase Invoice,Grand Total (Company Currency),கிராண்ட் மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,மொத்த வெளிச்செல்லும்
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","மட்டுமே "" மதிப்பு "" 0 அல்லது வெற்று மதிப்பு ஒரு கப்பல் விதி நிலை இருக்க முடியாது"
 DocType: Authorization Rule,Transaction,பரிவர்த்தனை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,குறிப்பு: இந்த விலை மையம் ஒரு குழு உள்ளது. குழுக்களுக்கு எதிராக கணக்கியல் உள்ளீடுகள் செய்ய முடியாது .
-apps/frappe/frappe/config/desk.py +7,Tools,கருவிகள்
 DocType: Item,Website Item Groups,இணைய தகவல்கள் குழுக்கள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,உற்பத்தி ஆர்டர் எண் பங்கு நுழைவு நோக்கத்திற்காக உற்பத்தி அத்தியாவசியமானதாகும்
 DocType: Purchase Invoice,Total (Company Currency),மொத்த (நிறுவனத்தின் நாணயம்)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,பத்திரிகை நுழைவு
 DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
 DocType: Sales Partner,Target Distribution,இலக்கு விநியோகம்
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,கருத்துரைகள்
 DocType: Salary Slip,Bank Account No.,வங்கி கணக்கு எண்
 DocType: Naming Series,This is the number of the last created transaction with this prefix,இந்த முன்னொட்டு கடந்த உருவாக்கப்பட்ட பரிவர்த்தனை எண்ணிக்கை
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},பொருள் தேவை மதிப்பீட்டு விகிதம் {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},பொருள் தேவை மதிப்பீட்டு விகிதம் {0}
 DocType: Quality Inspection Reading,Reading 8,8 படித்தல்
 DocType: Sales Partner,Agent,முகவர்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","மொத்த {0} அனைத்தையும் நீங்கள் அடிப்படையாகக் கட்டணங்கள் பகிர்ந்தளிப்பதற்காக &#39;மாற்ற வேண்டும் இருக்கலாம், பூஜ்யம் என்ற"
 DocType: Purchase Invoice,Taxes and Charges Calculation,வரிகள் மற்றும் கட்டணங்கள் கணக்கிடுதல்
 DocType: BOM Operation,Workstation,பணிநிலையம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,வன்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,வன்பொருள்
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,தனிச்சலுகை விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,தரவு இல்லை
 DocType: Appraisal Template Goal,Appraisal Template Goal,மதிப்பீட்டு வார்ப்புரு கோல்
 DocType: Salary Slip,Earning,சம்பாதித்து
 DocType: Payment Tool,Party Account Currency,கட்சி கணக்கு நாணய
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,இடையே காணப்படும் ஒன்றுடன் ஒன்று நிலைமைகள் :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,மொத்த ஒழுங்கு மதிப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,உணவு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,உணவு
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,வயதான ரேஞ்ச் 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,நீ மட்டும் ஒரு சமர்ப்பிக்க உத்தரவு எதிராக நேரம் பதிவு செய்ய முடியும்
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","தொடர்புகள் செய்திமடல்கள், வழிவகுக்கிறது."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,செயல்பாடுகள் காலியாக இருக்கக் கூடாது.
 ,Delivered Items To Be Billed,கட்டணம் வழங்கப்படும் பொருட்கள்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
-DocType: DocField,Description,விளக்கம்
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
-DocType: Letter Head,Is Default,இது இயல்பு
 DocType: Address,Utilities,பயன்பாடுகள்
 DocType: Purchase Invoice Item,Accounting,கணக்கு வைப்பு
 DocType: Features Setup,Features Setup,அம்சங்கள் அமைப்பு
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,சலுகையைப் கடிதம்
-DocType: Communication,Communication,தகவல்
 DocType: Item,Is Service Item,சேவை பொருள் ஆகும்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
 DocType: Activity Cost,Projects,திட்டங்கள்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,நிதியாண்டு தேர்வு செய்க
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},இருந்து {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 DocType: Leave Control Panel,Leave blank if considered for all designations,அனைத்து வடிவ கருத்தில் இருந்தால் வெறுமையாக
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},அதிகபட்சம்: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,நாள்நேரம் இருந்து
 DocType: Email Digest,For Company,நிறுவனத்தின்
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 ,Batch-Wise Balance History,தொகுதி-வைஸ் இருப்பு வரலாறு
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,பட்டியல் செய்ய வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,வேலை கற்க நியமி
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,வேலை கற்க நியமி
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,எதிர்மறை அளவு அனுமதி இல்லை
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ஒரு சரம் போன்ற உருப்படியை மாஸ்டர் இருந்து எடுத்தது இந்த துறையில் சேமிக்கப்படும் வரி விவரம் அட்டவணை.
  வரிகள் மற்றும் கட்டணங்கள் பயன்படுத்திய"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","கணக்கு முடக்கப்படும் என்றால், உள்ளீடுகளை தடை செய்த அனுமதிக்கப்படுகிறது ."
 DocType: Email Digest,Bank Balance,வங்கி மீதி
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,ஊழியர் {0} மற்றும் மாதம் எண் எதுவும் இல்லை செயலில் சம்பளம் அமைப்பு
 DocType: Job Opening,"Job profile, qualifications required etc.","Required வேலை சுயவிவரத்தை, தகுதிகள் முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
 DocType: Rename Tool,Type of document to rename.,மறுபெயர் ஆவணம் வகை.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,நாம் இந்த பொருள் வாங்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,நாம் இந்த பொருள் வாங்க
 DocType: Address,Billing,பட்டியலிடல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanging
-DocType: Bulk Email,Not Sent,அனுப்பப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,உருவாக்கும் வெடிப்பு
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),மொத்த வரி மற்றும் கட்டணங்கள் (நிறுவனத்தின் கரன்சி)
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} பெறுபவர்கள் அனுப்ப திட்டமிடப்பட்டுள்ளது
 DocType: Quality Inspection,Readings,அளவீடுகளும்
 DocType: Stock Entry,Total Additional Costs,மொத்த கூடுதல் செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,துணை சபைகளின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,துணை சபைகளின்
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Supplier,Stock Manager,பங்கு மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,இல்லை முகவரி இன்னும் கூறினார்.
 DocType: Workstation Working Hour,Workstation Working Hour,பணிநிலையம் வேலை செய்யும் நேரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,ஆய்வாளர்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது கூட்டுத் தொழில் தொகை சமம் வேண்டும் {2}
 DocType: Item,Inventory,சரக்கு
 DocType: Features Setup,"To enable ""Point of Sale"" view",பார்வை &quot;விற்பனை செய்யுமிடம்&quot; செயல்படுத்த
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,கொடுப்பனவு காலியாக வண்டி முடியாது
 DocType: Item,Sales Details,விற்பனை விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,பின்செய்யப்படுகிறது
 DocType: Opportunity,With Items,பொருட்களை கொண்டு
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,அளவு உள்ள
 DocType: Notification Control,Expense Claim Rejected,இழப்பில் கோரிக்கை நிராகரிக்கப்பட்டது
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",அடுத்து விலைப்பட்டியல் உருவாக்கப்படும் எந்த தேதி. அதை சமர்ப்பிக்க உருவாக்கப்படும்.
 DocType: Item Attribute,Item Attribute,பொருள் கற்பிதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,பொருள் மாறிகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,அரசாங்கம்
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,பொருள் மாறிகள்
 DocType: Company,Services,சேவைகள்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),மொத்த ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),மொத்த ({0})
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,நிதி ஆண்டு தொடக்கம் தேதி
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,மெலிதமரிடல்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Material Request Item,Sales Order No,விற்பனை ஆணை இல்லை
 DocType: Item Group,Item Group Name,உருப்படியை குழு பெயர்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,எடுக்கப்பட்ட
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,உற்பத்தி இடமாற்றத் பொருட்கள்
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","உருப்படியை கொள்முதல் விகிதம்: {0} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM விரிவாக இல்லை
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),கூடுதல் தள்ளுபடி தொகை (நிறுவனத்தின் நாணயம்)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},பிழை: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},பிழை: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,கணக்கு பட்டியலில் இருந்து புதிய கணக்கை உருவாக்கு .
 DocType: Maintenance Visit,Maintenance Visit,பராமரிப்பு வருகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,வாடிக்கையாளர்> வாடிக்கையாளர் குழு> மண்டலம்
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,கிடங்கு உள்ள கிடைக்கும் தொகுதி அளவு
 DocType: Time Log Batch Detail,Time Log Batch Detail,நேரம் புகுபதிகை தொகுப்பு விரிவாக
-DocType: Workflow State,Tasks,பணிகளை
 DocType: Landed Cost Voucher,Landed Cost Help,Landed செலவு உதவி
-DocType: Event,Tuesday,செவ்வாய்க்கிழமை
 DocType: Leave Block List,Block Holidays on important days.,முக்கிய நாட்களில் பிளாக் விடுமுறை.
 ,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ஏற்கனவே காலம் பணியாளர் {1} ஒதுக்கப்பட்ட வகை {0} திரும்புதல் {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
 DocType: UOM,UOM Name,மொறட்டுவ பல்கலைகழகம் பெயர்
-DocType: Top Bar Item,Target,இலக்கு
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,பங்களிப்பு தொகை
 DocType: Sales Invoice,Shipping Address,கப்பல் முகவரி
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"இந்த கருவியை நீங்கள் புதுப்பிக்க அல்லது அமைப்பு பங்கு அளவு மற்றும் மதிப்பீட்டு சரி செய்ய உதவுகிறது. இது பொதுவாக கணினியில் மதிப்புகள் என்ன, உண்மையில் உங்கள் கிடங்குகள் நிலவும் ஒருங்கிணைக்க பயன்படுகிறது."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,பிராண்ட் மாஸ்டர்.
-DocType: ToDo,Due Date,காரணம் தேதி
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,பிராண்ட் மாஸ்டர்.
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,பெட்டி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,அமைப்பு
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,பெட்டி
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,அமைப்பு
 DocType: Monthly Distribution,Monthly Distribution,மாதாந்திர விநியோகம்
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
 DocType: Production Plan Sales Order,Production Plan Sales Order,உற்பத்தி திட்டம் விற்பனை ஆணை
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},{0} பைனான்ஸ் உள்நுழைய மட்டும் நாணய முடியும்: {1}
 DocType: Pricing Rule,Pricing Rule,விலை விதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,"போதினும்,"
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},ரோ # {0}: திரும்பினார் பொருள் {1} இல்லை நிலவும் {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,வங்கி கணக்குகள்
 ,Bank Reconciliation Statement,வங்கி நல்லிணக்க அறிக்கை
 DocType: Address,Lead Name,பெயர் இட்டு
 ,POS,பிஓஎஸ்
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,ஆரம்ப இருப்பு இருப்பு
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,ஆரம்ப இருப்பு இருப்பு
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ஒரு முறை மட்டுமே தோன்றும் வேண்டும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் tranfer அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},இலைகள் வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,வங்கி பிரதிபலித்தது
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,வங்கி பிரதிபலித்தது
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,மையவிலக்கு வார்ப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,காந்தப் புலம் உதவியுடனான முடித்த
 DocType: Company,Default Holiday List,விடுமுறை பட்டியல் இயல்புநிலை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,பங்கு பொறுப்புகள்
 DocType: Purchase Receipt,Supplier Warehouse,வழங்குபவர் கிடங்கு
 DocType: Opportunity,Contact Mobile No,இல்லை மொபைல் தொடர்பு
 DocType: Production Planning Tool,Select Sales Orders,விற்பனை ஆணைகள் தேர்வு
 ,Material Requests for which Supplier Quotations are not created,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,பார்கோடு பயன்படுத்தி பொருட்களை கண்காணிக்க வேண்டும். நீங்கள் உருப்படியின் பார்கோடு ஸ்கேனிங் மூலம் வினியோகம் குறிப்பு மற்றும் விற்பனை விலைப்பட்டியல் உள்ள பொருட்களை நுழைய முடியும்.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,மார்க் வழங்கப்படுகிறது என
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,விலைப்பட்டியல் செய்ய
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} காண்க
 DocType: Salary Structure Deduction,Salary Structure Deduction,சம்பளம் அமைப்பு பொருத்தியறிதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,தேர்ந்தெடுக்கப்பட்ட லேசர் வெப்பப்படுத்தல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,வெற்றிகரமான இறக்குமதி!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),வயது (நாட்கள்)
 DocType: Quotation Item,Quotation Item,மேற்கோள் பொருள்
 DocType: Account,Account Name,கணக்கு பெயர்
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,தேதி முதல் இன்று வரை விட முடியாது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,தொடர் இல {0} அளவு {1} ஒரு பகுதியை இருக்க முடியாது
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,வழங்குபவர் வகை மாஸ்டர் .
 DocType: Purchase Order Item,Supplier Part Number,வழங்குபவர் பாகம் எண்
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,சேர்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,மாற்று விகிதம் 0 அல்லது 1 இருக்க முடியாது
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ரத்து அல்லது நிறுத்தி உள்ளது
 DocType: Accounts Settings,Credit Controller,கடன் கட்டுப்பாட்டாளர்
 DocType: Delivery Note,Vehicle Dispatch Date,வாகன அனுப்புகை தேதி
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,கொள்முதல் ரசீது {0} சமர்ப்பிக்க
 DocType: Company,Default Payable Account,இயல்புநிலை செலுத்த வேண்டிய கணக்கு
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","அத்தகைய கப்பல் விதிகள், விலை பட்டியல் முதலியன போன்ற ஆன்லைன் வணிக வண்டி அமைப்புகள்"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,அமைப்பு முழு
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% கூறப்பட்டு
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,பாதுகாக்கப்பட்டவை அளவு
 DocType: Party Account,Party Account,கட்சி கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,மனித வளங்கள்
 DocType: Lead,Upper Income,உயர் வருமானம்
 DocType: Journal Entry Account,Debit in Company Currency,நிறுவனத்தின் நாணய பற்று
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,என் சிக்கல்கள்
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,இயல்புநிலை கலாச்சாரம்
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,ரோ {0}: கட்டணம் அளவு எதிர்மறையாக இருக்க முடியாது
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,பிரஸ் பொருத்தி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 DocType: Payment Reconciliation,Payments,பணம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,அழுத்தி சூடான isostatic
-DocType: ToDo,Medium,ஊடகம்
 DocType: Budget Detail,Budget Allocated,பட்ஜெட் ஒதுக்கப்பட்ட
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,மேம்படுத்தல் வங்கி பணம் பத்திரிகைகள் மூலம் செல்கிறது.
 DocType: Quotation,Term Details,கால விவரம்
 DocType: Manufacturing Settings,Capacity Planning For (Days),(நாட்கள்) கொள்ளளவு திட்டமிடுதல்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
 DocType: Warranty Claim,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
 ,Lead Details,விவரம் இட்டு
-DocType: Authorization Rule,Approving User,பயனர் ஒப்புதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,மோசடி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,முலாம்
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
 DocType: Pricing Rule,Applicable For,பொருந்தும்
 DocType: Bank Reconciliation,From Date,தேதி
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,ஆன்லைன் ஏலங்களில்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,அளவு அல்லது மதிப்பீட்டு விகிதம் அல்லது இரண்டு அல்லது குறிப்பிடவும்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","நிறுவனத்தின் , மாதம் மற்றும் நிதியாண்டு கட்டாயமாகும்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,இந்த பங்கு நுழைவு செய்ய பயன்படுத்தப்படும் பொருள் கோரிக்கை
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',நேரம் பதிவு தொகுப்பு {0} ' Submitted'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,"ஒவ்வொரு பங்கு இயக்கம் , பைனான்ஸ் உள்ளீடு செய்ய"
 DocType: Leave Allocation,Total Leaves Allocated,மொத்த இலைகள் ஒதுக்கப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},ரோ இல்லை தேவையான கிடங்கு {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,செல்லுபடியாகும் நிதி ஆண்டின் தொடக்க மற்றும் முடிவு தேதிகளை உள்ளிடவும்
 DocType: Employee,Date Of Retirement,ஓய்வு தேதி
 DocType: Upload Attendance,Get Template,வார்ப்புரு கிடைக்கும்
 DocType: Address,Postal,தபால் அலுவலகம் சார்ந்த
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,சுரங்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,ரெசின் நடிப்பதற்கு
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,முதல் {0} தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},உரை {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},உரை {0}
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
 DocType: Stock Entry,Material Receipt,பொருள் ரசீது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,தயாரிப்புகள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,தயாரிப்புகள்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},கட்சி டைப் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கு தேவையான {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","இந்த உருப்படியை வகைகள் உண்டு என்றால், அது விற்பனை ஆணைகள் முதலியன தேர்வு"
 DocType: Lead,Next Contact By,அடுத்த தொடர்பு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},அளவு பொருள் உள்ளது என கிடங்கு {0} நீக்க முடியாது {1}
 DocType: Quotation,Order Type,வரிசை வகை
 DocType: Purchase Invoice,Notification Email Address,அறிவிப்பு மின்னஞ்சல் முகவரி
 DocType: Payment Tool,Find Invoices to Match,போட்டி வேண்டும் பொருள் காணவும்
 ,Item-wise Sales Register,உருப்படியை வாரியான விற்பனை பதிவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","எ.கா. ""இஸ்ஸட் தேசிய வங்கி """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","எ.கா. ""இஸ்ஸட் தேசிய வங்கி """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,இந்த வரி அடிப்படை விகிதம் சேர்க்கப்பட்டுள்ளது?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,மொத்த இலக்கு
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,மொத்த இலக்கு
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,வண்டியில் செயல்படுத்தப்படும்
 DocType: Job Applicant,Applicant for a Job,ஒரு வேலை விண்ணப்பதாரர்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,உருவாக்கப்பட்ட எந்த உற்பத்தி ஆணைகள்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,ஊழியர் சம்பள {0} ஏற்கனவே இந்த மாதம் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,ஊழியர் சம்பள {0} ஏற்கனவே இந்த மாதம் உருவாக்கப்பட்ட
 DocType: Stock Reconciliation,Reconciliation JSON,சமரசம் JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Sales Invoice Item,Batch No,தொகுதி இல்லை
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,முதன்மை
-DocType: DocPerm,Delete,நீக்கு
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,மாற்று
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},புதிய {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,நிறுத்தி பொருட்டு ரத்து செய்ய முடியாது . ரத்து செய்ய தடை இல்லாத .
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,செய்ய கொள்முதல் ஆணை
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,செய்ய கொள்முதல் ஆணை
 DocType: SMS Center,Send To,அனுப்பு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
 DocType: Sales Team,Contribution to Net Total,நிகர மொத்த பங்களிப்பு
 DocType: Sales Invoice Item,Customer's Item Code,வாடிக்கையாளர் பொருள் குறியீடு
 DocType: Stock Reconciliation,Stock Reconciliation,பங்கு நல்லிணக்க
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,ஒரு வேலை விண்ணப்பதாரர்.
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
-DocType: Country,Country,நாடு
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,முகவரிகள்
-DocType: Communication,Received,பெற்றார்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},நகல் சீரியல் இல்லை உருப்படி உள்ளிட்ட {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,ஒரு கப்பல் ஆட்சிக்கு ஒரு நிலையில்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,பொருள் உத்தரவு அனுமதி இல்லை.
-DocType: DocField,Attach Image,படத்தை இணைக்கவும்
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),இந்த தொகுப்பு நிகர எடை. (பொருட்களை நிகர எடை கூடுதல் போன்ற தானாக கணக்கிடப்படுகிறது)
-DocType: Stock Reconciliation Item,Leave blank if no change,எந்த மாற்றமும் இல்லை என்றால் காலியாக விடவும்
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,உற்பத்தி நேரம் மற்றும் பதிவுகள்.
 DocType: Item,Apply Warehouse-wise Reorder Level,கிடங்கு வாரியான மறுவரிசைப்படுத்துக நிலை விண்ணப்பிக்கவும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,பணிகளை நேரம் புகுபதிகை.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,கொடுப்பனவு
 DocType: Production Order Operation,Actual Time and Cost,உண்மையான நேரம் மற்றும் செலவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},அதிகபட்ச பொருள் கோரிக்கை {0} உருப்படி {1} எதிராகவிற்பனை ஆணை {2}
 DocType: Employee,Salutation,வணக்கம் தெரிவித்தல்
-DocType: Communication,Rejected,நிராகரிக்கப்பட்டது
 DocType: Pricing Rule,Brand,பிராண்ட்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,விற்பனை நேரத்தில் பொருட்களை மூட்டை.
 DocType: Sales Order Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
 DocType: Quality Inspection Reading,Reading 10,10 படித்தல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",உங்கள் தயாரிப்புகள் அல்லது நீங்கள் வாங்க அல்லது விற்க என்று சேவைகள் பட்டியலில் .
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",உங்கள் தயாரிப்புகள் அல்லது நீங்கள் வாங்க அல்லது விற்க என்று சேவைகள் பட்டியலில் .
 DocType: Hub Settings,Hub Node,ஹப் கணு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,நீங்கள் போலி பொருட்களை நுழைந்தது. சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,மதிப்பு {0} பண்பு {1} செல்லுபடியாகும் பொருள் பட்டியலில் இல்லை கற்பித மதிப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,இணை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,இணை
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,காலாவதியான
 DocType: Packing Slip,To Package No.,இல்லை தொகுப்பு வேண்டும்
-DocType: DocType,System,முறை
 DocType: Warranty Claim,Issue Date,பிரச்சினை தேதி
 DocType: Activity Cost,Activity Cost,நடவடிக்கை செலவு
 DocType: Purchase Receipt Item Supplied,Consumed Qty,நுகரப்படும் அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,தொலைத்தொடர்பு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,தொலைத்தொடர்பு
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 DocType: Payment Tool,Make Payment Entry,கொடுப்பனவு உள்ளீடு செய்ய
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
 ,Sales Invoice Trends,விற்பனை விலைப்பட்டியல் போக்குகள்
 DocType: Leave Application,Apply / Approve Leaves,இலைகள் ஒப்புதல் / விண்ணப்பிக்கவும்
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,ஐந்து
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',கட்டணம் வகை அல்லது ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசை அளவு ' மட்டுமே வரிசையில் பார்க்கவும் முடியும்
 DocType: Sales Order Item,Delivery Warehouse,டெலிவரி கிடங்கு
 DocType: Stock Settings,Allowance Percent,கொடுப்பனவு விகிதம்
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் விற்பனை, சரிபார்க்கப்பட வேண்டும் {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,வழங்குபவர் மேற்கோள் பொருள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,சம்பள கட்டமைப்பு செய்ய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,வெட்டுதல்
 DocType: Item,Has Variants,இல்லை வகைகள் உள்ளன
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,ஒரு புதிய விற்பனை விலைப்பட்டியல் உருவாக்க பொத்தானை &#39;விற்பனை விலைப்பட்டியல் கொள்ளுங்கள்&#39; கிளிக்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,பேக்கேஜிங் மற்றும் பெயரிடல்
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,நிறுவனத்தின் மாஸ்டர் மற்றும் உலகளாவிய செலுத்தமுடியாத இயல்புநிலை நாணய குறிப்பிடவும்
-DocType: Dropbox Backup,Dropbox Access Secret,டிரா பாக்ஸ் அணுகல் ரகசியம்
 DocType: Purchase Invoice,Recurring Invoice,மீண்டும் விலைப்பட்டியல்
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,திட்டங்கள் நிர்வாக
 DocType: Supplier,Supplier of Goods or Services.,பொருட்கள் அல்லது சேவைகள் சப்ளையர்.
 DocType: Budget Detail,Fiscal Year,நிதியாண்டு
 DocType: Cost Center,Budget,வரவு செலவு திட்டம்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Achieved
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Achieved
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,மண்டலம் / வாடிக்கையாளர்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"உதாரணமாக, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது நிலுவை தொகை விலைப்பட்டியல் சமம் வேண்டும் {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,"உதாரணமாக, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது நிலுவை தொகை விலைப்பட்டியல் சமம் வேண்டும் {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,நீங்கள் விற்பனை விலைப்பட்டியல் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 DocType: Item,Is Sales Item,விற்பனை பொருள் ஆகும்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,பொருள் குழு மரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,பொருள் {0} சீரியல் எண்கள் சோதனை பொருள் மாஸ்டர் அமைப்பு அல்ல
 DocType: Maintenance Visit,Maintenance Time,பராமரிப்பு நேரம்
 ,Amount to Deliver,அளவு வழங்க வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,ஒரு பொருள் அல்லது சேவை
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,பிழைகள் இருந்தன .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,தட்டுவதன்
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,ஒரு பொருள் அல்லது சேவை
 DocType: Naming Series,Current Value,தற்போதைய மதிப்பு
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} உருவாக்கப்பட்டது
 DocType: Delivery Note Item,Against Sales Order,விற்னையாளர் எதிராக
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
 DocType: Website Item Group,Website Item Group,இணைய தகவல்கள் குழு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,கடமைகள் மற்றும் வரி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} கட்டணம் உள்ளீடுகளை வடிகட்டி {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,வலை தளத்தில் காட்டப்படும் என்று பொருள் அட்டவணை
 DocType: Purchase Order Item Supplied,Supplied Qty,வழங்கப்பட்ட அளவு
 DocType: Material Request Item,Material Request Item,பொருள் கோரிக்கை பொருள்
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,பொருள் குழுக்கள் மரம் .
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,பொருள் குழுக்கள் மரம் .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
 ,Item-wise Purchase History,உருப்படியை வாரியான கொள்முதல் வரலாறு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,ரெட்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,ரெட்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,ரோ # {0}: ஆபரேஷன் {1} உற்பத்தி முடிந்ததும் பொருட்களின் {2} கொத்தமல்லி நிறைவு இல்லை ஒழுங்கு # {3}. நேரம் பதிவுகள் வழியாக அறுவை சிகிச்சை நிலையை மேம்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,ஒரு பொருள் ஒரு மொறட்டுவ பல்கலைகழகம் மாற்ற.
 DocType: Quality Inspection Reading,Acceptance Criteria,ஏற்று வரையறைகள்
 DocType: Item Attribute,Attribute Name,பெயர் பண்பு
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},பொருள் {0} விற்பனை அல்லது சேவை பொருளாக இருக்க வேண்டும் {1}
 DocType: Item Group,Show In Website,இணையத்தளம் காண்பி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,தொகுதி
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,தொகுதி
 DocType: Task,Expected Time (in hours),(மணி) இடைவெளியைத்
 ,Qty to Order,அளவு ஒழுங்கிற்கு
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","பின்வரும் ஆவணங்களை விநியோகக் குறிப்பு, Opportunity பொருள் கோரிக்கை, பொருள், கொள்முதல் ஆணை, கொள்முதல் ரசீது, வாங்குபவர் சீட்டு, மேற்கோள், விற்பனை விலைப்பட்டியல், தயாரிப்பு மூட்டை, விற்பனை, தொ.எ. உள்ள பிராண்ட் பெயர் கண்காணிக்க"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,தெளிவான அட்டவணை
 DocType: Features Setup,Brands,பிராண்ட்கள்
 DocType: C-Form Invoice Detail,Invoice No,இல்லை விலைப்பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,கொள்முதல் ஆணை இருந்து
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,கொள்முதல் ஆணை இருந்து
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு சாதனை வருகிறது போல், முன் {0} ரத்து / பயன்படுத்த முடியாது விடவும் {1}"
 DocType: Activity Cost,Costing Rate,இதற்கான செலவு மதிப்பீடு
 ,Customer Addresses And Contacts,வாடிக்கையாளர் முகவரிகள் மற்றும் தொடர்புகள்
 DocType: Employee,Resignation Letter Date,ராஜினாமா கடிதம் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,அமை
-DocType: Communication,Date,தேதி
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,மீண்டும் வாடிக்கையாளர் வருவாய்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,உங்கள் கணினி அமைப்பு என்றாலும் அமர்ந்து . இந்த ஒரு சில நிமிடங்கள் ஆகலாம்.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) பங்கு செலவில் தரப்பில் சாட்சி 'வேண்டும்;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,இணை
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,இணை
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
 DocType: Maintenance Schedule Detail,Actual Date,உண்மையான தேதி
 DocType: Item,Has Batch No,கூறு எண் உள்ளது
 DocType: Delivery Note,Excise Page Number,கலால் பக்கம் எண்
 DocType: Employee,Personal Details,தனிப்பட்ட விவரங்கள்
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,பொறித்தல்
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","உத்தரவு இந்த உருப்படிக்கு செய்து கொள்ள முடியும் என , அது ஒரு பங்கு பொருளாக இருக்க வேண்டும் ."
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,சேர்வது
-DocType: Authorization Rule,Above Value,மதிப்பு மேலே
 ,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
 DocType: Purchase Order,Delivered,வழங்கினார்
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),வேலைகள் மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,மொத்த ஒதுக்கீடு இலைகள் {0} குறைவாக இருக்க முடியாது காலம் ஏற்கனவே ஒப்புதல் இலைகள் {1} விட
 DocType: Journal Entry,Accounts Receivable,கணக்குகள்
 ,Supplier-Wise Sales Analytics,வழங்குபவர் - தம்பதியினர் அனலிட்டிக்ஸ்
 DocType: Address Template,This format is used if country specific format is not found,நாட்டின் குறிப்பிட்ட வடிவமைப்பில் இல்லை என்றால் இந்த வடிவமைப்பு பயன்படுத்தப்படும்
-DocType: Custom Field,Custom,வழக்கம்
 DocType: Production Order,Use Multi-Level BOM,மல்டி லெவல் BOM பயன்படுத்த
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,ஊசி மருந்து வடிவமைத்தல்
 DocType: Bank Reconciliation,Include Reconciled Entries,ஆர தழுவி பதிவுகள் சேர்க்கிறது
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finanial கணக்குகளின் மரம் .
 DocType: Leave Control Panel,Leave blank if considered for all employee types,அனைத்து பணியாளர் வகையான கருதப்படுகிறது என்றால் வெறுமையாக
 DocType: Landed Cost Voucher,Distribute Charges Based On,விநியோகிக்க குற்றச்சாட்டுக்களை அடிப்படையாகக் கொண்டு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,பொருள் {1} சொத்து பொருள் என கணக்கு {0} வகை ' நிலையான சொத்து ' இருக்க வேண்டும்
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
-apps/frappe/frappe/config/setup.py +130,Printing,அச்சிடுதல்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை இருக்கிறது . நீங்கள் விடுப்பு விண்ணப்பிக்க தேவையில்லை .
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,மற்றும்
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,விளையாட்டு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,உண்மையான மொத்த
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,அலகு
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,உங்கள் தளத்தில் கட்டமைப்பு டிராப்பாக்ஸ் அணுகல் விசைகள் அமைக்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,அலகு
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
 ,Customer Acquisition and Loyalty,வாடிக்கையாளர் கையகப்படுத்துதல் மற்றும் லாயல்டி
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,நீங்கள் நிராகரித்து பொருட்களை பங்கு வைத்து எங்கே கிடங்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
 DocType: POS Profile,Price List,விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,செலவு சட்டக்கோரல்கள்
 DocType: Issue,Support,ஆதரவு
-DocType: Authorization Rule,Approving Role,பங்கு ஒப்புதல்
 ,BOM Search,"BOM, தேடல்"
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,நிறுவனத்தின் நாணய குறிப்பிடவும்
 DocType: Workstation,Wages per hour,ஒரு மணி நேரத்திற்கு ஊதியங்கள்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},தொகுதி பங்குச் சமநிலை {0} மாறும் எதிர்மறை {1} கிடங்கு உள்ள பொருள் {2} ஐந்து {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","பல தொடர் இலக்கங்கள் , பிஓஎஸ் போன்ற காட்டு / மறை அம்சங்கள்"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,பொருள் கோரிக்கைகள் தொடர்ந்து பொருள் மறு ஒழுங்கு நிலை அடிப்படையில் தானாக எழுப்பினார்
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},இசைவு தேதி வரிசையில் காசோலை தேதி முன் இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},இசைவு தேதி வரிசையில் காசோலை தேதி முன் இருக்க முடியாது {0}
 DocType: Salary Slip,Deduction,கழித்தல்
 DocType: Address Template,Address Template,முகவரி டெம்ப்ளேட்
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,மேற்கோள்
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 DocType: Quotation,Maintenance User,பராமரிப்பு பயனர்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Employee,Date of Birth,பிறந்த நாள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,பொருள் {0} ஏற்கனவே திரும்பினார்
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** நிதியாண்டு ** ஒரு நிதி ஆண்டு பிரதிபலிக்கிறது. அனைத்து உள்ளீடுகளை மற்றும் பிற முக்கிய பரிமாற்றங்கள் ** ** நிதியாண்டு எதிரான கண்காணிக்கப்படும்.
 DocType: Opportunity,Customer / Lead Address,வாடிக்கையாளர் / முன்னணி முகவரி
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,தள்ளு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,வேலை விபரம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,வேலை விபரம்
 DocType: Purchase Order Item,Qty as per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி அளவு
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,தரவு ஒரு செல்லுபடியாகும் CSV கோப்பை தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,பூச்சு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. லீட்ஸ், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","விற்பனை பிரச்சாரங்கள் கண்காணிக்க. லீட்ஸ், மேற்கோள்கள் கண்காணிக்கவும், விற்பனை போன்றவை பிரச்சாரங்கள் இருந்து முதலீட்டு மீது மீண்டும் அளவிடுவதற்கு."
 DocType: Expense Claim,Approver,சர்க்கார் தரப்பில் சாட்சி சொல்லும் குற்றவாளி
 ,SO Qty,எனவே அளவு
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","பங்கு உள்ளீடுகளை கிடங்கில் எதிரான உள்ளன {0}, எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது கிடங்கு மாற்ற முடியாது"
 DocType: Appraisal,Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட
 DocType: Supplier Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
-apps/erpnext/erpnext/hooks.py +84,Shipments,படுவதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,சாய்வு வடிவமைத்தல்
-DocType: Purchase Order,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
+apps/erpnext/erpnext/hooks.py +68,Shipments,படுவதற்கு
+DocType: Purchase Order Item,To be delivered to customer,வாடிக்கையாளர் வழங்க வேண்டும்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,நேரம் பதிவு நிலைமை சமர்ப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,தொ.எ. {0} எந்த கிடங்கு சொந்தம் இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,அமைக்கிறது
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,ரோ #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,ரோ #
 DocType: Purchase Invoice,In Words (Company Currency),வேர்ட்ஸ் (நிறுவனத்தின் கரன்சி)
 DocType: Pricing Rule,Supplier,கொடுப்பவர்
 DocType: C-Form,Quarter,காலாண்டு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,இதர செலவுகள்
 DocType: Global Defaults,Default Company,முன்னிருப்பு நிறுவனத்தின்
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
 DocType: Employee,Bank Name,வங்கி பெயர்
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,மேலே
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,பயனர் {0} முடக்கப்பட்டுள்ளது
 DocType: Leave Application,Total Leave Days,மொத்த விடுப்பு நாட்கள்
-DocType: Journal Entry Account,Credit in Account Currency,கணக்கு நாணய கடன்
 DocType: Email Digest,Note: Email will not be sent to disabled users,குறிப்பு: மின்னஞ்சல் ஊனமுற்ற செய்த அனுப்ப முடியாது
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Currency Exchange,From Currency,நாணய இருந்து
-DocType: DocField,Name,பெயர்
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,அமைப்பு பிரதிபலித்தது
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},பொருள் தேவை விற்பனை ஆணை {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,அமைப்பு பிரதிபலித்தது
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,மற்றவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,மற்றவை
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.
 DocType: POS Profile,Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள்
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","ஒரு தயாரிப்பு அல்லது, வாங்கி விற்று, அல்லது பங்குச் வைக்கப்படும் என்று ஒரு சேவை."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,நிறைவு
-DocType: Web Form,Select DocType,DOCTYPE தேர்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,கொந்துதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,வங்கி
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,வங்கி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"அட்டவணை பெற ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,புதிய செலவு மையம்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,புதிய செலவு மையம்
 DocType: Bin,Ordered Quantity,உத்தரவிட்டார் அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
 DocType: Quality Inspection,In Process,செயல்முறை உள்ள
 DocType: Authorization Rule,Itemwise Discount,இனவாரியாக தள்ளுபடி
 DocType: Purchase Order Item,Reference Document Type,குறிப்பு ஆவண வகை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
 DocType: Account,Fixed Asset,நிலையான சொத்து
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,தொடர் சரக்கு
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,தொடர் சரக்கு
 DocType: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
 DocType: Time Log Batch,Total Billing Amount,மொத்த பில்லிங் அளவு
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,பெறத்தக்க கணக்கு
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
 DocType: Expense Claim Detail,Expense Claim Detail,இழப்பில் உரிமைகோரல் விவரம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,நேரம் பதிவுகள் உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Employee,Blood Group,குருதி பகுப்பினம்
 DocType: Purchase Invoice Item,Page Break,பக்கம் பிரேக்
 DocType: Production Order Operation,Pending,முடிவுபெறாத
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ஒரு குறிப்பிட்ட ஊழியர் விடுப்பு விண்ணப்பங்கள் ஒப்புதல் முடியும் பயனர்கள்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,நீங்கள் மாற்று இயல்புநிலை UOM மாற்ற முடியாது. டெம்ப்ளேட் மாற்று மாற்றம் இயல்புநிலை UOM இயல்புநிலை UOM மாற்ற
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,அலுவலக உபகரணங்கள்
 DocType: Purchase Invoice Item,Qty,அளவு
 DocType: Fiscal Year,Companies,நிறுவனங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,மின்னணுவியல்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,மின்னணுவியல்
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,பங்கு மறு ஒழுங்கு நிலை அடையும் போது பொருள் கோரிக்கை எழுப்ப
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,பராமரிப்பு அட்டவணை இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,முழு நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,முழு நேர
 DocType: Purchase Invoice,Contact Details,விபரங்கள்
 DocType: C-Form,Received Date,பெற்ற தேதி
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","நீங்கள் விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட் ஒரு நிலையான டெம்ப்ளேட் கொண்டிருக்கிறீர்கள் என்றால், ஒரு தேர்வு, கீழே உள்ள பொத்தானை கிளிக் செய்யவும்."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,வேலை திறக்கிறது
 DocType: Payment Reconciliation,Payment Reconciliation,கொடுப்பனவு நல்லிணக்க
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,தொழில்நுட்ப
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
 DocType: Offer Letter,Offer Letter,கடிதம் ஆஃபர்
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,பொருள் கோரிக்கைகள் (எம்ஆர்பி) மற்றும் உற்பத்தி ஆணைகள் உருவாக்க.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,மொத்த விலை விவரம் விவரங்கள்
 DocType: Time Log,To Time,டைம்
+DocType: Authorization Rule,Approving Role (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பாத்திரம் அப்ரூவிங்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","குழந்தை முனைகள் சேர்க்க, மரம் ஆராய நீங்கள் மேலும் முனைகளில் சேர்க்க வேண்டும் கீழ் முனை மீது கிளிக் செய்யவும்."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
 DocType: Production Order Operation,Completed Qty,நிறைவு அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,வாடிக்கையாளர் பொருள் குறியீடுகள்
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,ஆணைகள் அல்லது பொருள் எதிரான கொடுப்பனவு பதிவுகள் உருவாக்கவும்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,வெல்டிங்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தேவை
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',&#39;வழக்கு எண் வரம்பு&#39; சரியான குறிப்பிடவும்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
 DocType: Features Setup,Item Serial Nos,உருப்படியை தொடர் இலக்கங்கள்
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,உண்மையான அளவு
 DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,இல்லை தொ.இல. {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,உங்கள் வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,சுருக்க மூடப்பட்ட
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,உங்கள் வாடிக்கையாளர்கள்
 DocType: Leave Block List Date,Block Date,தேதி தடை
 DocType: Sales Order,Not Delivered,அனுப்பப்பட்டது
 ,Bank Clearance Summary,வங்கி இசைவு சுருக்கம்
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் digests நிர்வகிக்க ."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,பொருள் கோட்> பொருள் பிரிவு> பிராண்ட்
 DocType: Appraisal Goal,Appraisal Goal,மதிப்பீட்டு கோல்
-DocType: Event,Friday,வெள்ளி
 DocType: Time Log,Costing Amount,இதற்கான செலவு தொகை
 DocType: Process Payroll,Submit Salary Slip,சம்பளம் ஸ்லிப் &#39;to
 DocType: Salary Structure,Monthly Earning & Deduction,மாத வருமானம் &amp; பொருத்தியறிதல்
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,மொத்த உள்ள இறக்குமதி
 DocType: Sales Partner,Address & Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: SMS Log,Sender Name,அனுப்புநர் பெயர்
-DocType: Page,Title,தலைப்பு
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,தனிப்பயனாக்கு
 DocType: POS Profile,[Select],[ தேர்ந்தெடு ]
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,கவிஞருக்கு செய்ய
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},தவறான {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},தவறான {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,முன்கூட்டியே தொகை
 DocType: Manufacturing Settings,Capacity Planning,கொள்ளளவு திட்டமிடுதல்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,' வரம்பு தேதி ' தேவைப்படுகிறது
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,தொடங்கப்பட்ட தேதி அவசியம்
 DocType: Journal Entry,Reference Number,குறிப்பு எண்
 DocType: Employee,Employment Details,வேலை விவரம்
 DocType: Employee,New Workplace,புதிய பணியிடத்தை
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அன்று Based
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,சுற்றுலா
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,சுற்றுலா
 DocType: Leave Block List,Allow Users,பயனர்கள் அனுமதி
 DocType: Purchase Order,Customer Mobile No,வாடிக்கையாளர் கைப்பேசி
 DocType: Sales Invoice,Recurring,ரெக்கியூரிங்
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,மாற்றம் பொருள்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
 DocType: Installation Note,Installation Note,நிறுவல் குறிப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,வரிகளை சேர்க்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,வரிகளை சேர்க்க
 ,Financial Analytics,நிதி பகுப்பாய்வு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 DocType: Address,Subsidiary,உப
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
 DocType: Quality Inspection,Purchase Receipt No,இல்லை சீட்டு வாங்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,பிணை உறுதி பணம்
-DocType: System Settings,In Hours,மணி
 DocType: Process Payroll,Create Salary Slip,சம்பளம் ஸ்லிப் உருவாக்க
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,வங்கி படி எதிர்பார்க்கப்படுகிறது சமநிலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,மெருகேற்றும்
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,வங்கி படி எதிர்பார்க்கப்படுகிறது சமநிலை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),நிதி ஆதாரம் ( கடன்)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
 DocType: Appraisal,Employee,ஊழியர்
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,வவுச்சர் மூலம் குழு
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Sales Invoice,Mass Mailing,வெகுஜன அஞ்சல்
-DocType: Page,Standard,நிலையான
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,காட்டு கொடுப்பனவு
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,அளவு
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,பராமரிப்பு அட்டவணை {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 DocType: Notification Control,Expense Claim Approved,இழப்பில் கோரிக்கை ஏற்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,மருந்து
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,மருந்து
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,வாங்கிய பொருட்களை செலவு
 DocType: Selling Settings,Sales Order Required,விற்பனை ஆர்டர் தேவை
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,உருவாக்கு
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,9 படித்தல்
 DocType: Supplier,Is Frozen,உறைந்திருக்கும்
 DocType: Buying Settings,Buying Settings,அமைப்புகள் வாங்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,மாஸ் முடித்த
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,ஒரு முடிந்தது நல்ல தகவல்கள் கிடைக்கும் BOM இல்லை
 DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),விற்பனை மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: sales@example.com )
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Tool,Payment Account,கொடுப்பனவு கணக்கு
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,காற்று வீச்சு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Quality Inspection Reading,Accepted,ஏற்று
-DocType: User,Female,பெண்
-DocType: Journal Entry Account,Debit in Account Currency,கணக்கு நாணய பற்று
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
-DocType: Print Settings,Modern,நவீன
-DocType: Communication,Replied,பதில்
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
 DocType: Payment Tool,Total Payment Amount,மொத்த பணம் அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) திட்டமிட்ட quanitity விட அதிகமாக இருக்க முடியாது ({2}) உற்பத்தி ஆணை {3}
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
 DocType: Newsletter,Test,சோதனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","இருக்கும் பங்கு பரிவர்த்தனைகள் நீங்கள் மதிப்புகள் மாற்ற முடியாது \ இந்த உருப்படி, உள்ளன &#39;என்பதைப் தொ.எ. உள்ளது&#39;, &#39;தொகுதி எவ்வித&#39;, &#39;பங்கு உருப்படியை&#39; மற்றும் &#39;மதிப்பீட்டு முறை&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
 DocType: Stock Entry,For Quantity,அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,பொருட்கள் கோரிக்கைகள்.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,தனி உற்பத்தி வரிசையில் ஒவ்வொரு முடிக்கப்பட்ட நல்ல உருப்படியை செய்தது.
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,அமைவு
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","இந்த தேதி வரை உறைநிலையில் பைனான்ஸ் நுழைவு, யாரும் / கீழே குறிப்பிட்ட பங்கை தவிர நுழைவு மாற்ற முடியும்."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,திட்டம் நிலை
 DocType: UOM,Check this to disallow fractions. (for Nos),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,செய்திமடல் மடலாடற்
 DocType: Delivery Note,Transporter Name,இடமாற்றி பெயர்
+DocType: Authorization Rule,Authorized Value,அங்கீகரிக்கப்பட்ட மதிப்பு
 DocType: Contact,Enter department to which this Contact belongs,இந்த தொடர்பு சார்ந்த துறை உள்ளிடவும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,மொத்த இருக்காது
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,அளவிடத்தக்க அலகு
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,அளவிடத்தக்க அலகு
 DocType: Fiscal Year,Year End Date,ஆண்டு முடிவு தேதி
 DocType: Task Depends On,Task Depends On,பணி பொறுத்தது
 DocType: Lead,Opportunity,சந்தர்ப்பம்
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),அடிப்படை வீத (பங்கு UOM படி)
 DocType: SMS Log,No of Requested SMS,கோரப்பட்ட எஸ்எம்எஸ் இல்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,குத்திக்கொள்வது
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,கமிஷன் நிறுவனங்கள் பொருட்கள் விற்கும் ஒரு மூன்றாம் தரப்பு விநியோகஸ்தராக / வியாபாரி / கமிஷன் முகவர் / இணைப்பு / விற்பனையாளரை.
 DocType: Customer Group,Has Child Node,குழந்தை கணு உள்ளது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","இங்கே நிலையான URL அளவுருக்கள் (எ.கா. அனுப்புநர் = ERPNext, பயனர்பெயர் = ERPNext, கடவுச்சொல்லை = 1234 முதலியன) உள்ளிடவும்"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} எந்த செயலில் நிதி ஆண்டில். மேலும் விவரங்களுக்கு பார்க்கவும் {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,இந்த ERPNext இருந்து தானாக உருவாக்கப்பட்ட ஒரு உதாரணம் இணையதளம் உள்ளது
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,வயதான ரேஞ்ச் 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,போட்டோகெமிக்கல் எந்திர
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. உள்ளிடவும் ரோ: ""முந்தைய வரிசை மொத்த"" அடிப்படையில் என்றால் நீங்கள் இந்த கணக்கீடு ஒரு அடிப்படை (இயல்புநிலை முந்தைய வரிசை) என எடுக்கப்படும் வரிசை எண் தேர்ந்தெடுக்க முடியும்.
  9. வரி அல்லது கட்டணம் கவனியுங்கள்: வரி / கட்டணம் மதிப்பீட்டு மட்டும் தான் (மொத்தம் ஒரு பகுதி) அல்லது மட்டுமே (உருப்படியை மதிப்பு சேர்க்க இல்லை) மொத்தம் அல்லது இரண்டு என்றால் இந்த பகுதியில் நீங்கள் குறிப்பிட முடியும்.
  10. சேர் அல்லது கழித்து: நீங்கள் சேர்க்க அல்லது வரி கழித்து வேண்டும் என்பதை."
-DocType: Note,Note,குறிப்பு
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
-DocType: Email Account,Email Ids,மின்னஞ்சல் ஐடிகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Global Defaults,Hide Currency Symbol,நாணய சின்னம் மறைக்க
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,வரவுக்குறிப்பு
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},நிறைவு அளவு அதிகமாக இருக்க முடியாது {0} அறுவை சிகிச்சை {1}
 DocType: Features Setup,Quality,பண்பு
-DocType: Contact Us Settings,Introduction,அறிமுகப்படுத்துதல்
 DocType: Warranty Claim,Service Address,சேவை முகவரி
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,பங்கு நல்லிணக்க மாக்ஸ் 100 வரிசைகள்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,பங்கு நல்லிணக்க மாக்ஸ் 100 வரிசைகள்.
 DocType: Stock Entry,Manufacture,உற்பத்தி
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"தயவு செய்து டெலிவரி முதல் குறிப்பு,"
 DocType: Purchase Invoice,Currency and Price List,நாணயம் மற்றும் விலை பட்டியல்
 DocType: Opportunity,Customer / Lead Name,வாடிக்கையாளர் / முன்னணி பெயர்
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,உற்பத்தி
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,உற்பத்தி
 DocType: Item,Allow Production Order,உற்பத்தி ஆர்டர் அனுமதி
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
 DocType: Lead,Fax,தொலைநகல்
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,சமர்ப்பிக்கப்பட்டது
 DocType: Salary Structure,Total Earning,மொத்த வருமானம்
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,என்னுடைய ஒரு முகவரிக்கு
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,அல்லது
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,பயன்பாட்டு செலவுகள்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 மேலே
 DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
-,Download Backups,பதிவிறக்க காப்பு
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,கொடுப்பனவு வகை
 DocType: Process Payroll,Select Employees,தேர்வு ஊழியர்
 DocType: Bank Reconciliation,To Date,தேதி
 DocType: Opportunity,Potential Sales Deal,சாத்தியமான விற்பனை ஒப்பந்தம்
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,விவரம்
 DocType: Purchase Invoice,Total Taxes and Charges,மொத்த வரி மற்றும் கட்டணங்கள்
 DocType: Employee,Emergency Contact,அவசர தொடர்பு
 DocType: Item,Quality Parameters,தர அளவுகள்
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,சீரியல் இல்லை / தொகுப்பு
 DocType: Product Bundle,Parent Item,பெற்றோர் பொருள்
 DocType: Account,Account Type,கணக்கு வகை
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} செயல்படுத்த-முன்னோக்கி இருக்க முடியாது வகை விடவும்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
 DocType: Landed Cost Voucher,Purchase Receipt Items,ரசீது பொருட்கள் வாங்க
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,தனிப்பயனாக்குதலில் படிவங்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,கட்டிங்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,சமதளமாக
 DocType: Account,Income Account,வருமான கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,மோல்டிங்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,டெலிவரி
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
-apps/frappe/frappe/desk/moduleview.py +61,Documents,ஆவணங்கள்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,குறிப்
 DocType: Cost Center,Cost Center,செலவு மையம்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,வவுச்சர் #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,வவுச்சர் #
 DocType: Notification Control,Purchase Order Message,ஆர்டர் செய்தி வாங்க
 DocType: Tax Rule,Shipping Country,கப்பல் நாடு
 DocType: Upload Attendance,Upload HTML,HTML பதிவேற்று
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","மொத்த முன்கூட்டியே ({0}) அமைப்புக்கு எதிராக {1} \
  அதிகமாக இருக்க முடியும் ஆக மொத்தம் விட ({2})"
 DocType: Employee,Relieving Date,தேதி நிவாரணத்தில்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,கிடங்கு மட்டுமே பங்கு நுழைவு / டெலிவரி குறிப்பு / கொள்முதல் ரசீது மூலம் மாற்ற முடியும்
 DocType: Employee Education,Class / Percentage,வர்க்கம் / சதவீதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,வருமான வரி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,லேசர் நிகர வடிவமைப்பதில் வடிவமைக்கப்பட்டுள்ளன
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,வருமான வரி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","தேர்ந்தெடுக்கப்பட்ட விலை விதி 'விலை' செய்யப்படுகிறது என்றால், அது விலை பட்டியல் மேலெழுதும். விலை விதி விலை இறுதி விலை ஆகிறது, அதனால் எந்த மேலும் தள்ளுபடி பயன்படுத்த வேண்டும். எனவே, போன்றவை விற்பனை ஆணை, கொள்முதல் ஆணை போன்ற நடவடிக்கைகளில், அதை விட 'விலை பட்டியல் விகிதம்' துறையில் விட, 'விலை' துறையில் தந்தது."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
 DocType: Item Supplier,Item Supplier,உருப்படியை சப்ளையர்
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
-DocType: User,Bio,உயிரி
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,புதிய செலவு மையம் பெயர்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படுகிறது. அமைப்பு> அச்சிடுதல் மற்றும் பிராண்டிங் இருந்து ஒரு புதிய ஒரு> முகவரி டெம்ப்ளேட் உருவாக்க தயவுசெய்து.
 DocType: Appraisal,HR User,அலுவலக பயனர்
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,மிகப் பெரியவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,மிகப் பெரியவை
 ,Profit and Loss Statement,இலாப நட்ட அறிக்கை
 DocType: Bank Reconciliation Detail,Cheque Number,காசோலை எண்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,"அழுத்தினால்,"
 DocType: Payment Tool Detail,Payment Tool Detail,கொடுப்பனவு கருவி விபரம்
 ,Sales Browser,விற்னையாளர் உலாவி
 DocType: Journal Entry,Total Credit,மொத்த கடன்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,உள்ளூர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),கடன்கள் ( சொத்துக்கள் )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,"இருப்பினும், கடனாளிகள்"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,பெரிய
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,இல்லை ஊழியர் இல்லை!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,பெரிய
 DocType: C-Form Invoice Detail,Territory,மண்டலம்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Purchase Order,Customer Address Display,வாடிக்கையாளர் முகவரி காட்சி
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,பாலிஷ்
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","நீங்கள் ஏற்கனவே மற்றொரு UOM சில பரிவர்த்தனை (ங்கள்) செய்துவிட்டேன் \ ஏனெனில் பொருள் நடவடிக்கையாக, இயல்புநிலை பிரிவு {0} நேரடியாக மாற்ற முடியாது. இயல்புநிலை UOM மாற்ற, \ பயன்படுத்த பங்கு தொகுதி கீழ் கருவி &#39;UOM பயனீட்டு மாற்றவும்."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,நாணயமாற்று வீத மற்றொரு வகையில் ஒரு நாணயத்தை மாற்ற குறிப்பிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,மேற்கோள் {0} ரத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,மொத்த நிலுவை தொகை
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,பணியாளர் {0} {1} ம் விடுப்பு இருந்தது. வருகை குறிக்க முடியாது.
 DocType: Sales Partner,Targets,இலக்குகள்
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
 ,S.O. No.,S.O. இல்லை
 DocType: Production Order Operation,Make Time Log,நேரம் பதிவு செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,", ஆர்டர் அளவு அமைக்க, தயவு செய்து"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,கணினி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,மின்-ரசாயன அரைக்கும்
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,நீங்கள் கணக்கியல் உள்ளீடுகள் தொடங்கும் முன் அமைப்பு உங்கள் மீது கணக்குகளின் அட்டவணை ப்ளீஸ்
 DocType: Purchase Invoice,Ignore Pricing Rule,விலை சொல்கிறேன்
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ரத்து
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,சம்பளம் அமைப்பு தேதி பணியாளர் சேர்ந்த தேதி விட குறைந்த இருக்க முடியாது.
 DocType: Employee Education,Graduate,பல்கலை கழக பட்டம் பெற்றவர்
 DocType: Leave Block List,Block Days,தொகுதி நாட்கள்
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","மீண்டும் விலைப்பட்டியல் என்றால் மீண்டும் நிறுத்த அல்லது சரியான முடிவு தேதி வைத்து தேர்வை நீக்குக, சோதனை"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
 DocType: Packing Slip,If more than one package of the same type (for print),அதே வகை மேற்பட்ட தொகுப்பு (அச்சுக்கு)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,அதிகபட்ச {0} வரிசைகள் அனுமதி
 DocType: C-Form Invoice Detail,Net Total,நிகர மொத்தம்
 DocType: Bin,FCFS Rate,FCFS விகிதம்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),பில்லிங் (விற்பனை விலைப்பட்டியல்)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,நோக்கங்கள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ஆபரேஷன் {0} பணிநிலையம் உள்ள எந்த கிடைக்க வேலை மணி நேரத்திற்கு {1}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,மின்வேதியியல் எந்திர
 ,Requested,கோரப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,எந்த கருத்துக்கள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,காலங்கடந்த
 DocType: Account,Stock Received But Not Billed,"பங்கு பெற்றார், ஆனால் கணக்கில் இல்லை"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,மொத்த சம்பளம் + நிலுவை தொகை + பணமாக்கல் தொகை - மொத்தம் பொருத்தியறிதல்
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Features Setup,Sales and Purchase,விற்பனை மற்றும் கொள்முதல்
 DocType: Supplier Quotation Item,Material Request No,பொருள் வேண்டுகோள் இல்லை
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,விகிதம் இது வாடிக்கையாளர் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} இந்த பட்டியலில் இருந்து வெற்றிகரமாக குழுவிலக்கப்பட்டது.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),நிகர விகிதம் (நிறுவனத்தின் நாணயம்)
-apps/frappe/frappe/templates/base.html +134,Added,சேர்க்கப்பட்டது
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,மண்டலம் மரம் நிர்வகி .
 DocType: Journal Entry Account,Sales Invoice,விற்பனை விலை விவரம்
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,நிதியாண்டு {0} காணப்படும்.
 DocType: Bank Reconciliation,Get Relevant Entries,தொடர்புடைய பதிவுகள் பெற
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,கோர்ர்க்கும்
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
-apps/frappe/frappe/desk/query_report.py +136,Total,மொத்தம்
 DocType: Purchase Invoice,Apply Additional Discount On,கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும்
 DocType: Account,Root Type,ரூட் வகை
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},ரோ # {0}: விட திரும்ப முடியாது {1} பொருள் {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),தள்ளுபடி தொகை பின்னர் வரி அளவு (நிறுவனத்தின் நாணயம்)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Quality Inspection,Quality Inspection,தரமான ஆய்வு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,உருவாக்கும் தெளிக்கவும்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,கூடுதல் சிறிய
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL அல்லது BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,குறைந்தபட்ச சரக்கு நிலை
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,தயாரிப்பாளர் பாகம் எண்
 DocType: Production Order Operation,Estimated Time and Cost,கணக்கிடப்பட்ட நேரம் மற்றும் செலவு
 DocType: Bin,Bin,தொட்டி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,அனுப்பிய எஸ்எம்எஸ் இல்லை
 DocType: Account,Company,நிறுவனம்
 DocType: Account,Expense Account,செலவு கணக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,மென்பொருள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,வர்ண
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,மென்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,வர்ண
 DocType: Maintenance Visit,Scheduled,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","&quot;இல்லை&quot; மற்றும் &quot;விற்பனை பொருள் இது&quot;, &quot;பங்கு உருப்படியை&quot; எங்கே &quot;ஆம்&quot; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,ஒரே சீராக பரவி மாதங்கள் முழுவதும் இலக்குகளை விநியோகிக்க மாதாந்திர விநியோகம் தேர்ந்தெடுக்கவும்.
 DocType: Purchase Invoice Item,Valuation Rate,மதிப்பீட்டு விகிதம்
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,பொருள் வரிசை {0}: {1} மேலே 'வாங்குதல் ரசீதுகள்' அட்டவணை இல்லை வாங்கும் ரசீது
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,திட்ட தொடக்க தேதி
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,வரை
 DocType: Rename Tool,Rename Log,பதிவு மறுபெயர்
 DocType: Installation Note Item,Against Document No,ஆவண எதிராக இல்லை
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,விற்னையாளர் பங்குதாரர்கள் நிர்வகி.
 DocType: Quality Inspection,Inspection Type,ஆய்வு அமைப்பு
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},தேர்வு செய்க {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,இல்லை சி படிவம்
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,ஆராய்ச்சியாளர்
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,புதுப்பிக்க
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,ஆராய்ச்சியாளர்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"அனுப்பும் முன் செய்திமடல் சேமிக்க , தயவு செய்து"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,பெயர் அல்லது மின்னஞ்சல் அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,உள்வரும் தரத்தை ஆய்வு.
 DocType: Purchase Order Item,Returned Qty,திரும்பி அளவு
 DocType: Employee,Exit,மரணம்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ரூட் வகை கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ரூட் வகை கட்டாய ஆகிறது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,தொடர் இல {0} உருவாக்கப்பட்டது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,அதிர்வுண்டாக்குகிற முடித்த
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","வாடிக்கையாளர்களின் வசதிக்காக, இந்த குறியீடுகள் பற்றுச்சீட்டுகள் மற்றும் டெலிவரி குறிப்புகள் போன்ற அச்சு வடிவங்கள் பயன்படுத்த முடியும்"
 DocType: Employee,You can enter any date manually,நீங்கள் கைமுறையாக எந்த தேதி நுழைய முடியும்
 DocType: Sales Invoice,Advertisement,விளம்பரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ப்ரொபேஷ்னரி காலம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ப்ரொபேஷ்னரி காலம்
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ஒரே இலை முனைகள் பரிமாற்றத்தில் அனுமதிக்கப்படுகிறது
 DocType: Expense Claim,Expense Approver,செலவின தரப்பில் சாட்சி
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,கொள்முதல் ரசீது பொருள் வழங்கியது
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,நாள்நேரம் செய்ய
 DocType: SMS Settings,SMS Gateway URL,எஸ்எம்எஸ் வாயில் URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,அரைக்கும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,போர்த்தி சுருக்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,நிலுவையில் நடவடிக்கைகள்
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,உறுதிப்படுத்தப்பட்டுள்ளதாகவும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,வழங்குபவர்> வழங்குபவர் வகை
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,விவரங்கள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,உருக்கு
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Attendance,Attendance Date,வருகை தேதி
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,சம்பளம் கலைத்தல் வருமானம் மற்றும் துப்பறியும் அடிப்படையாக கொண்டது.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,குழந்தை முனைகளில் கணக்கு பேரேடு மாற்றப்பட முடியாது
 DocType: Address,Preferred Shipping Address,விருப்பமான கப்பல் முகவரி
 DocType: Purchase Receipt Item,Accepted Warehouse,ஏற்று கிடங்கு
 DocType: Bank Reconciliation Detail,Posting Date,தேதி தகவல்களுக்கு
 DocType: Item,Valuation Method,மதிப்பீட்டு முறை
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} க்கான மாற்று விகிதம் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Sales Invoice,Sales Team,விற்பனை குழு
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,நுழைவு நகல்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,நுழைவு நகல்
 DocType: Serial No,Under Warranty,உத்தரவாதத்தின் கீழ்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[பிழை]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,நீங்கள் விற்பனை ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,துணிகர முதலீடு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய இலைகள் (டேஸ்) ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,தொடர் இல {0} இல்லை
 DocType: Pricing Rule,Discount Percentage,தள்ளுபடி சதவீதம்
 DocType: Payment Reconciliation Invoice,Invoice Number,விலைப்பட்டியல் எண்
-apps/erpnext/erpnext/hooks.py +70,Orders,ஆணைகள்
+apps/erpnext/erpnext/hooks.py +54,Orders,ஆணைகள்
 DocType: Leave Control Panel,Employee Type,பணியாளர் அமைப்பு
 DocType: Employee Leave Approver,Leave Approver,சர்க்கார் தரப்பில் சாட்சி விட்டு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,பொருள் உற்பத்தி மாற்றப்பட்டது
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""மன்றங்கள்கூட தரப்பில் சாட்சி"" பாத்திரம் ஒரு பயனர்"
 ,Issued Items Against Production Order,உற்பத்தி ஆர்டர் எதிராக வழங்கப்படும் பொருட்கள்
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,தவறான காலம்
 DocType: Customer,Credit Limit,கடன் எல்லை
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,பரிவர்த்தனை தேர்ந்தெடுக்கவும்
 DocType: GL Entry,Voucher No,ரசீது இல்லை
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,முகவரி மற்றும் தொடர்பு
 DocType: Customer,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Employee,Feedback,கருத்து
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","முன் ஒதுக்கீடு செய்யப்படும் {0}, விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு பதிவில் இருந்து வருகிறது {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. அட்டவணை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,சிராய்ப்பு ஜெட் எந்திர
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. அட்டவணை
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
-DocType: Website Settings,Website Settings,இணைய அமைப்புகள்
 DocType: Item,Reorder level based on Warehouse,கிடங்கில் அடிப்படையில் மறுவரிசைப்படுத்துக நிலை
 DocType: Activity Cost,Billing Rate,பில்லிங் விகிதம்
 ,Qty to Deliver,அடித்தளத்திருந்து அளவு
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,கோரப்பட்ட
 DocType: Quotation Item,Against Doctype,Doctype எதிராக
 DocType: Delivery Note,Track this Delivery Note against any Project,எந்த திட்டம் எதிரான இந்த டெலிவரி குறிப்பு கண்காணிக்க
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,ரூட் கணக்கை நீக்க முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,காட்டு பங்கு பதிவுகள்
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Pricing Rule,Item Code,உருப்படியை கோட்
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
-DocType: Communication,Phone,தொலைபேசி
 DocType: Employee Internal Work History,Employee Internal Work History,ஊழியர் உள்நாட்டு வேலை வரலாறு
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),நிறைவு (டாக்டர்)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Contact,Passive,மந்தமான
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,பரிவர்த்தனைகள் விற்பனை வரி வார்ப்புரு .
@@ -2487,10 +2296,9 @@
 ,Billed Amount,கூறப்படுவது தொகை
 DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லிணக்க
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,பொருள் கோரிக்கை {0} ரத்து அல்லது நிறுத்தி
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,மேலாண்மை விடவும்
-DocType: Event,Groups,குழுக்கள்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,கணக்கு குழு
 DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
 DocType: Lead,Lower Income,குறைந்த வருமானம்
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,விரைவு உதவி
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
 DocType: Features Setup,Sales Extras,விற்பனை உபரி
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} கணக்கு வரவு செலவு {1} செலவு மையம் எதிரான {2} {3} அதிகமாக இருக்கும்
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} கணக்கு வரவு செலவு {1} செலவு மையம் எதிரான {2} {3} அதிகமாக இருக்கும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,மதிப்பு அல்லது அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,நிமிஷம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,நிமிஷம்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
 ,Qty to Receive,மதுரையில் அளவு
 DocType: Leave Block List,Leave Block List Allowed,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,மாற்ற காரணி உராய்வுகள் இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,நீங்கள் உள்நுழைய அதை பயன்படுத்த வேண்டும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,நீங்கள் உள்நுழைய அதை பயன்படுத்த வேண்டும்
 DocType: Sales Partner,Retailer,சில்லறை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை உருப்படி
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,சம்பள செய்ய
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,பிணை கடன்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,அழகிய பொருட்களை
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,அழகிய பொருட்களை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகளில் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை விடுப்பு அங்கீகரிக்க முடியாது
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,லாஸ்ட்-நுரை நடிப்பதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,வரைதல்
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,தேதி மீண்டும்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},"விட்டு வீடு, ஒன்றாக இருக்க வேண்டும் {0}"
 DocType: Hub Settings,Seller Email,விற்பனையாளர் மின்னஞ்சல்
 DocType: Project,Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக)
 DocType: Workstation Working Hour,Start Time,தொடக்க நேரம்
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),நிகர (நிறுவனத்தின் நாணயம்)
 DocType: BOM Operation,Hour Rate,மணி விகிதம்
 DocType: Stock Settings,Item Naming By,மூலம் பெயரிடுதல் உருப்படியை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,கூறியவை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,கூறியவை
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},மற்றொரு காலம் நிறைவு நுழைவு {0} பின்னர் செய்யப்பட்ட {1}
 DocType: Production Order,Material Transferred for Manufacturing,பொருள் தயாரிப்பு இடமாற்றம்
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,கணக்கு {0} இல்லை உள்ளது
 DocType: Purchase Receipt Item,Purchase Order Item No,ஆர்டர் பொருள் இல்லை வாங்க
-DocType: System Settings,System Settings,கணினி அமைப்புகள்
 DocType: Project,Project Type,திட்ட வகை
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,இலக்கு அளவு அல்லது இலக்கு அளவு அல்லது கட்டாயமாகும்.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,பல்வேறு நடவடிக்கைகள் செலவு
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,கைப்பணம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
 DocType: Serial No,Is Cancelled,ரத்து
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,என் படுவதற்கு
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,என் படுவதற்கு
 DocType: Journal Entry,Bill Date,பில் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
-DocType: Communication,Recipients,பெறுநர்கள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,பொளை
 DocType: Expense Claim,Approval Status,ஒப்புதல் நிலைமை
 DocType: Hub Settings,Publish Items to Hub,மையம் வெளியிடு
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},மதிப்பு வரிசையில் மதிப்பு குறைவாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,வயர் மாற்றம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,வங்கி கணக்கு தேர்ந்தெடுக்கவும்
 DocType: Newsletter,Create and Send Newsletters,உருவாக்க மற்றும் அனுப்பவும் செய்தி
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,தேதி முதல் தேதி முன் இருக்க வேண்டும்
 DocType: Sales Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
 DocType: Company,Default Income Account,முன்னிருப்பு வருமானம் கணக்கு
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
 DocType: Item Group,Check this if you want to show in website,நீங்கள் இணையதளத்தில் காட்ட வேண்டும் என்றால் இந்த சோதனை
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ERPNext வரவேற்கிறோம்
+,Welcome to ERPNext,ERPNext வரவேற்கிறோம்
 DocType: Payment Reconciliation Payment,Voucher Detail Number,வவுச்சர் விரிவாக எண்
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,மேற்கோள் லீட்
 DocType: Lead,From Customer,வாடிக்கையாளர் இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,கால்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,கால்ஸ்
 DocType: Project,Total Costing Amount (via Time Logs),மொத்த செலவு தொகை (நேரத்தில் பதிவுகள் வழியாக)
 DocType: Purchase Order Item Supplied,Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
 ,Projected,திட்டமிடப்பட்ட
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},தொடர் இல {0} கிடங்கு அல்ல {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"குறிப்பு: இந்த அமைப்பு பொருள் விநியோகம் , மேல் முன்பதிவு பார்க்க மாட்டேன் {0} அளவு அல்லது அளவு 0 ஆகிறது"
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,தேதி திறப்பு
 DocType: Journal Entry,Remark,குறிப்பு
 DocType: Purchase Receipt Item,Rate and Amount,விகிதம் மற்றும் தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,போரிங்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,விற்பனை ஆர்டர் இருந்து
-DocType: Blog Category,Parent Website Route,பெற்றோர் இணையத்தளம் வழி
 DocType: Sales Order,Not Billed,கட்டணம்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,இரண்டு கிடங்கு அதே நிறுவனத்திற்கு சொந்தமானது வேண்டும்
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,தொடர்புகள் இல்லை இன்னும் சேர்க்கப்படவில்லை.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,செயலில்
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed செலவு ரசீது தொகை
 DocType: Time Log,Batched for Billing,பில்லிங் Batched
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,தள்ளுபடி தொகை
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"உதாரணமாக, வரி"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"உதாரணமாக, வரி"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,பொருள் 4
 DocType: Journal Entry Account,Journal Entry Account,பத்திரிகை நுழைவு கணக்கு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,உருவாக்கும் ஹாட் மெட்டல் எரிவாயு
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
 DocType: Sales Invoice Item,Delivered Qty,வழங்கப்படும் அளவு
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,கிடங்கு {0}: நிறுவனத்தின் கட்டாய ஆகிறது
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",வரி விகிதம் பற்றி அதற்கான குழு (நிதிகள்&gt; நடப்பு சொத்துகள்&gt; வரி மற்றும் கடமைகள் வழக்கமாக மூலத்தின் சென்று வகை &quot;வரி&quot; என்ற) குழந்தை சேர் கிளிக் செய்வதன் மூலம் (ஒரு புதிய கணக்கு உருவாக்க மற்றும் செய்ய.
 ,Payment Period Based On Invoice Date,விலைப்பட்டியல் தேதியின் அடிப்படையில் கொடுப்பனவு காலம்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},காணாமல் செலாவணி விகிதங்கள் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,லேசர் வெட்டும்
-DocType: Event,Monday,திங்கட்கிழமை
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Account,Payable,செலுத்த வேண்டிய
 DocType: Salary Slip,Arrear Amount,நிலுவை தொகை
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,DESC முகவரி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,விற்பனை அல்லது வாங்கும் குறைந்தபட்சம் ஒரு தேர்வு வேண்டும்
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,உற்பத்தி இயக்கங்களை எங்கே கொண்டுவரப்படுகின்றன.
-DocType: Page,All,அனைத்து
 DocType: Stock Entry Detail,Source Warehouse,மூல கிடங்கு
 DocType: Installation Note,Installation Date,நிறுவல் தேதி
 DocType: Employee,Confirmation Date,உறுதிப்படுத்தல் தேதி
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,விற்பனை பயனர்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min அளவு மேக்ஸ் அளவு அதிகமாக இருக்க முடியாது
 DocType: Stock Entry,Customer or Supplier Details,வாடிக்கையாளருக்கு அல்லது விபரங்கள்
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,அமை
 DocType: Lead,Lead Owner,உரிமையாளர் இட்டு
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,கிடங்கு தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,கிடங்கு தேவைப்படுகிறது
 DocType: Employee,Marital Status,திருமண தகுதி
 DocType: Stock Settings,Auto Material Request,கார் பொருள் கோரிக்கை
 DocType: Time Log,Will be updated when billed.,கணக்கில் போது புதுப்பிக்கப்படும்.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
 DocType: Delivery Note,Transporter Info,போக்குவரத்து தகவல்
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,கொள்முதல் ஆணை பொருள் வழங்கியது
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,நிறுவனத்தின் பெயர் நிறுவனத்தின் இருக்க முடியாது
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,அச்சு வார்ப்புருக்கள் லெடர்ஹெட்ஸ் .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"அச்சு வார்ப்புருக்கள் தலைப்புகள் , எ.கா. செய்யறதுன்னு ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
 DocType: POS Profile,Update Stock,பங்கு புதுப்பிக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"டெலிவரி குறிப்பு இருந்து உருப்படிகள் இழுக்க , தயவு செய்து"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,ஜர்னல் பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,ஜர்னல் பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","வகை மின்னஞ்சல், தொலைபேசி, அரட்டை, வருகை, முதலியன அனைத்து தகவல் பதிவு"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,நிறுவனத்தின் வட்ட இனிய விலை மையம் குறிப்பிடவும்
 DocType: Purchase Invoice,Terms,விதிமுறைகள்
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,புதிய உருவாக்கவும்
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,புதிய உருவாக்கவும்
 DocType: Buying Settings,Purchase Order Required,தேவையான கொள்முதல் ஆணை
 ,Item-wise Sales History,உருப்படியை வாரியான விற்பனை வரலாறு
 DocType: Expense Claim,Total Sanctioned Amount,மொத்த ஒப்புதல் தொகை
 ,Purchase Analytics,கொள்முதல் ஆய்வு
 DocType: Sales Invoice Item,Delivery Note Item,டெலிவரி குறிப்பு பொருள்
 DocType: Expense Claim,Task,பணி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,சவர
 DocType: Purchase Taxes and Charges,Reference Row #,குறிப்பு வரிசை #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},தொகுதி எண் பொருள் கட்டாயமாக {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,இந்த ஒரு ரூட் விற்பனை நபர் மற்றும் திருத்த முடியாது .
 ,Stock Ledger,பங்கு லெட்ஜர்
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},மதிப்பீடு: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},மதிப்பீடு: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,சம்பளம் ஸ்லிப் பொருத்தியறிதல்
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,குறிப்புகள்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,முதல் ஒரு குழு முனை தேர்ந்தெடுக்கவும்.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,அவர்களின் சமீபத்திய சரக்கு நிலை அனைத்து மூலப்பொருட்கள் கொண்ட ஒரு அறிக்கையை பதிவிறக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,எதிர்கொள்ளும்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,கருத்துக்களம்
 DocType: Leave Application,Leave Balance Before Application,விண்ணப்ப முன் இருப்பு விட்டு
 DocType: SMS Center,Send SMS,எஸ்எம்எஸ் அனுப்ப
 DocType: Company,Default Letter Head,கடிதத் தலைப்பில் இயல்புநிலை
 DocType: Time Log,Billable,பில்
-DocType: Authorization Rule,This will be used for setting rule in HR module,இந்த அலுவலக தொகுதி உள்ள அமைப்பு விதி பயன்படுத்தப்படும்
 DocType: Account,Rate at which this tax is applied,இந்த வரி செலுத்தப்படுகிறது விகிதத்தில்
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,வாய்ப்பை இழந்த
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","தள்ளுபடி புலங்கள் கொள்முதல் ஆணை, கொள்முதல் ரசீது, கொள்முதல் விலை விவரம் கிடைக்கும்"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,புதிய கணக்கு பெயர். குறிப்பு: வாடிக்கையாளர்களும் விநியோகத்தர்களும் கணக்குகள் உருவாக்க வேண்டாம்
-DocType: Report,Report Type,வகை புகார்
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,சுமையேற்றம்
 DocType: BOM Replace Tool,BOM Replace Tool,BOM பதிலாக கருவி
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,நாடு வாரியாக இயல்புநிலை முகவரி டெம்ப்ளேட்கள்
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,தரவு இறக்குமதி மற்றும் ஏற்றுமதி
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',நீங்கள் உற்பத்தி துறையில் உள்ளடக்கியது என்றால் . பொருள் இயக்கும் ' உற்பத்தி செய்யப்படுகிறது '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
 DocType: Serial No,Out of AMC,AMC வெளியே
 DocType: Purchase Order Item,Material Request Detail No,பொருள் கோரிக்கை விரிவாக இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,ஹார்ட் திருப்பு
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
 DocType: Company,Default Cash Account,இயல்புநிலை பண கணக்கு
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,பணம் அளவு + அளவு தள்ளுபடி கிராண்ட் மொத்த விட முடியாது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} உருப்படி ஒரு செல்லுபடியாகும் தொகுதி எண் அல்ல {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","குறிப்பு: பணம் எந்த குறிப்பு எதிராக செய்த எனில், கைமுறையாக பத்திரிகை பதிவு செய்ய."
 DocType: Item,Supplier Items,வழங்குபவர் பொருட்கள்
 DocType: Opportunity,Opportunity Type,வாய்ப்பு வகை
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,திறந்த அமை
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,சமர்ப்பிக்கும் பரிமாற்றங்கள் மீது தொடர்புகள் தானியங்கி மின்னஞ்சல்களை அனுப்ப.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  கிடைக்கும் அளவு: {4}, அளவு மாற்றம்: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
-DocType: Event,Sunday,ஞாயிற்றுக்கிழமை
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,பொறுப்புகள்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,பொறுப்புகள்
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,அட்டவணையில் குறைந்தது 1 விலைப்பட்டியல் உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,பயனர்கள் சேர்க்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,பயனர்கள் சேர்க்கவும்
 DocType: Pricing Rule,Item Group,உருப்படியை குழு
 DocType: Task,Actual Start Date (via Time Logs),உண்மையான தொடங்கும் தேதி (நேரத்தில் பதிவுகள் வழியாக)
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},எப்படி {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி ரோ {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
 DocType: Time Log Batch,Total Hours,மொத்த நேரம்
 DocType: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,வாகன
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,பொருள் தேவைப்படுகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,மெட்டல் ஊசி மருந்து வடிவமைத்தல்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,வாகன
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Time Log,From Time,நேரம் இருந்து
 DocType: Notification Control,Custom Message,தனிப்பயன் செய்தி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","உங்கள் நாடு, நேர மண்டலம் மற்றும் நாணய வாய்ப்புகள்"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,முதலீட்டு வங்கி
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,ஊறுகாய்களிலும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,மணல் நடிப்பதற்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,மின்முலாம்
 DocType: Purchase Invoice Item,Rate,விலை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,நடமாட்டத்தை கட்டுபடுத்து
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,நடமாட்டத்தை கட்டுபடுத்து
 DocType: Newsletter,A Lead with this email id should exist,இந்த மின்னஞ்சல் ஐடியை கொண்ட ஒரு முன்னணி இருக்க வேண்டும்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,தேதி அரை நாள் விடுப்பு வரம்பு தேதி அதே இருக்க வேண்டும்
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,சேர தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
 DocType: Salary Structure,Salary Structure,சம்பளம் அமைப்பு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","பல விலை விதி அதே அளவுகோலை கொண்டு உள்ளது, முன்னுரிமை ஒதுக்க மூலம் \
  மோதல் தீர்க்க செய்யவும். விலை விதிகள்: {0}"
 DocType: Account,Bank,வங்கி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,சேமிப்பு
 DocType: Employee,Offer Date,ஆஃபர் தேதி
 DocType: Hub Settings,Access Token,அணுகல் டோக்கன்
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,நிலையான சொத்து பொருள் ஆகிறது
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","நீங்கள் நீண்ட வடிவங்கள் அச்சிட வேண்டும் என்றால், இந்த அம்சம் பக்கம் ஒவ்வொரு பக்கத்தில் அனைத்து தலைப்புகள் மற்றும் அடிக்குறிப்புகளும் பல பக்கங்களில் அச்சிடப்பட்ட வேண்டும் பிரித்து பயன்படுத்தலாம்"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,திருகால் வெட்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,அனைத்து பிரதேசங்களையும்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,உருப்படிகள்
 DocType: Fiscal Year,Year Name,ஆண்டு பெயர்
 DocType: Process Payroll,Process Payroll,செயல்முறை சம்பளப்பட்டியல்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
 DocType: Product Bundle Item,Product Bundle Item,தயாரிப்பு மூட்டை பொருள்
 DocType: Sales Partner,Sales Partner Name,விற்பனை வரன்வாழ்க்கை துணை பெயர்
 DocType: Purchase Invoice Item,Image View,பட காட்சி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,முடித்த மற்றும் தொழில்துறை முடித்த
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,செக்யூரிட்டிஸ் & பண்ட பரிமாற்ற
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,துளையிடும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,ஊதி வடிவமைத்தல்
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
 DocType: Tax Rule,Shipping City,கப்பல் நகரம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாறுபாடு உள்ளது. 'இல்லை நகல் அமைக்க வரை காரணிகள் டெம்ப்ளேட் இருந்து நகல்
 DocType: Account,Purchase User,கொள்முதல் பயனர்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,சுத்தியால்
-DocType: Web Page,Slideshow,ஸ்லைடுஷோ
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,இயல்புநிலை முகவரி டெம்ப்ளேட் நீக்க முடியாது
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
 DocType: Journal Entry,Print Heading,தலைப்பு அச்சிட
 DocType: Quotation,Maintenance Manager,பராமரிப்பு மேலாளர்
-DocType: Workflow State,Search,தேடல்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,மொத்த பூஜ்ஜியமாக இருக்க முடியாது
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,' கடைசி ஆர்டர் நாட்களில் ' அதிகமாக அல்லது பூஜ்ஜியத்திற்கு சமமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,பற்ற வைத்தல்
 DocType: C-Form,Amended From,முதல் திருத்தப்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,மூலப்பொருட்களின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,மூலப்பொருட்களின்
 DocType: Leave Application,Follow via Email,மின்னஞ்சல் வழியாக பின்பற்றவும்
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,தள்ளுபடி தொகை பிறகு வரி தொகை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,குழந்தை கணக்கு இந்த கணக்கு உள்ளது . நீங்கள் இந்த கணக்கை நீக்க முடியாது .
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,இலக்கு அளவு அல்லது இலக்கு அளவு அல்லது கட்டாய
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
@@ -2862,45 +2631,44 @@
 ,Produced,உற்பத்தி
 DocType: Item,Item Code for Suppliers,சப்ளையர்கள் பொருள் குறியீடு
 DocType: Issue,Raised By (Email),(மின்னஞ்சல்) மூலம் எழுப்பப்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,பொதுவான
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,லெட்டர் இணைக்கவும்
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,பொதுவான
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,லெட்டர் இணைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',வகை ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' உள்ளது போது கழித்து முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","உங்கள் வரி தலைகள் பட்டியல் (எ.கா. வரி, சுங்க போன்றவை; அவர்கள் தனிப்பட்ட பெயர்கள் இருக்க வேண்டும்) மற்றும் அவர்களது தரத்தை விகிதங்கள். இந்த நீங்கள் திருத்தலாம் மற்றும் மேலும் பின்னர் சேர்க்க நிலைப்படுத்தப்பட்ட டெம்ப்ளேட், உருவாக்கும்."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","உங்கள் வரி தலைகள் பட்டியல் (எ.கா. வரி, சுங்க போன்றவை; அவர்கள் தனிப்பட்ட பெயர்கள் இருக்க வேண்டும்) மற்றும் அவர்களது தரத்தை விகிதங்கள். இந்த நீங்கள் திருத்தலாம் மற்றும் மேலும் பின்னர் சேர்க்க நிலைப்படுத்தப்பட்ட டெம்ப்ளேட், உருவாக்கும்."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},தொடராக பொருள் தொடர் இலக்கங்கள் தேவையான {0}
 DocType: Journal Entry,Bank Entry,வங்கி நுழைவு
 DocType: Authorization Rule,Applicable To (Designation),பொருந்தும் (பதவி)
-DocType: Blog Post,Blog Post,வலைப்பதிவு இடுகை
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,குழு மூலம்
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ முடக்கு நாணயங்கள் செயல்படுத்து.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,தபால் செலவுகள்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம் (விவரங்கள்)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Purchase Order,The date on which recurring order will be stop,மீண்டும் மீண்டும் வரும் பொருட்டு நிறுத்த வேண்டும் எந்த தேதி
 DocType: Quality Inspection,Item Serial No,உருப்படி இல்லை தொடர்
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} {1} குறைக்கப்பட வேண்டும் அல்லது நீங்கள் வழிதல் சகிப்புத்தன்மை அதிகரிக்க வேண்டும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,மொத்த தற்போதைய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,மணி
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,மணி
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,வகை இட்டு
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,மேற்கோள் உருவாக்கவும்
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,இந்த பொருட்கள் ஏற்கனவே விலை விவரம்
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ஒப்புதல்
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
 DocType: BOM Replace Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
 DocType: Features Setup,Point of Sale,விற்பனை செய்யுமிடம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,கர்லிங்
 DocType: Account,Tax,வரி
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},ரோ {0}: {1} ஒரு செல்லுபடியாகும் அல்ல {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,சுத்திகரிப்பில்
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},ரோ {0}: {1} ஒரு செல்லுபடியாகும் அல்ல {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,தயாரிப்பு மூட்டை இருந்து
 DocType: Production Planning Tool,Production Planning Tool,உற்பத்தி திட்டமிடல் கருவி
 DocType: Quality Inspection,Report Date,தேதி அறிக்கை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,வழிப்பாதை
 DocType: C-Form,Invoices,பொருள்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} ஏற்கனவே காலத்தில் பணியாளர் {1} ஒதுக்கப்பட்ட {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} பெற்றவர்கள்
 DocType: Features Setup,Item Groups in Details,விவரங்கள் உருப்படியை குழுக்கள்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,மேம்படுத்தல் விகிதம் மற்றும் கிடைக்கும்
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,நீங்கள் அளவு எதிராக இன்னும் பெற அல்லது வழங்க அனுமதிக்கப்படுகிறது சதவீதம் உத்தரவிட்டது. எடுத்துக்காட்டாக: நீங்கள் 100 அலகுகள் உத்தரவிட்டார் என்றால். உங்கள் அலவன்ஸ் 10% நீங்கள் 110 அலகுகள் பெற அனுமதிக்கப்படும்.
 DocType: Pricing Rule,Customer Group,வாடிக்கையாளர் பிரிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: Item,Website Description,இணையதளத்தில் விளக்கம்
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
 ,Sales Register,விற்பனை பதிவு
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
 DocType: Address,Plant,தாவரம்
-DocType: DocType,Setup,அமைப்பு முறை
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,தண் உருட்டல்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
 DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
 DocType: Item,Attributes,கற்பிதங்கள்
-DocType: Packing Slip,Get Items,பொருட்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,பொருட்கள் கிடைக்கும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
-DocType: DocField,Image,படம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,கலால் விலைப்பட்டியல் செய்ய
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
-DocType: Communication,Other,வேறு
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ஆபரேஷன் ஐடி அமைக்க
 DocType: Production Order,Planned Start Date,திட்டமிட்ட தொடக்க தேதி
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. வருகை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. வருகை
 DocType: Leave Type,Is Encash,ரொக்கமான மாற்று இல்லை
 DocType: Purchase Invoice,Mobile No,இல்லை மொபைல்
 DocType: Payment Tool,Make Journal Entry,பத்திரிகை பதிவு செய்ய
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,திட்ட வாரியான தரவு மேற்கோள் கிடைக்கவில்லை
 DocType: Project,Expected End Date,எதிர்பார்க்கப்படுகிறது முடிவு தேதி
 DocType: Appraisal Template,Appraisal Template Title,மதிப்பீட்டு வார்ப்புரு தலைப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,வர்த்தகம்
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,வர்த்தகம்
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,பெற்றோர் பொருள் {0} ஒரு பங்கு பொருள் இருக்க கூடாது
 DocType: Cost Center,Distribution Id,விநியோக அடையாளம்
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,வியப்பா சேவைகள்
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,அனைத்து தயாரிப்புகள் அல்லது சேவைகள்.
 DocType: Purchase Invoice,Supplier Address,வழங்குபவர் முகவரி
-DocType: Contact Us Settings,Address Line 2,முகவரி வரி 2
-DocType: ToDo,Reference,குறிப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,துளையிடுதல்
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,தொடர் கட்டாயமாகும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,நிதி சேவைகள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,நிதி சேவைகள்
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} கற்பிதம் மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3}
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,கணக்குகள் இயல்புநிலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,அறுக்கும்
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,லேமினேட்டிங்
 DocType: Item Reorder,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,வெப்பப்படுத்தல்
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
 DocType: Supplier,Contact HTML,தொடர்பு HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,சில்லறை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,வாடிக்கையாளர் {0} இல்லை
 DocType: Attendance,Absent,வராதிரு
-DocType: Product Bundle,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,தயாரிப்பு மூட்டை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,நசுக்கிய
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
 DocType: GL Entry,Remarks,கருத்துக்கள்
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
 DocType: Features Setup,POS View,பிஓஎஸ் பார்வையிடு
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,தொடர்வார்ப்பு
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,குறிப்பிடவும் ஒரு
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,மேலே
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,குளிர் அளவு
 DocType: Salary Slip,Earning & Deduction,சம்பளம் மற்றும் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,கணக்கு {0} ஒரு குழு இருக்க முடியாது
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,பகுதி
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
 DocType: Holiday List,Weekly Off,இனிய வாராந்திர
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","உதாரணமாக 2012, 2012-13 க்கான"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),இடைக்கால லாபம் / நஷ்டம் (கடன்)
 DocType: Sales Invoice,Return Against Sales Invoice,எதிராக விற்பனை விலைப்பட்டியல் திரும்ப
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,பொருள் 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},நிறுவனத்தின் இயல்புநிலை மதிப்பு {0} அமைக்க தயவு செய்து {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},நிறுவனத்தின் இயல்புநிலை மதிப்பு {0} அமைக்க தயவு செய்து {1}
 DocType: Serial No,Creation Time,உருவாக்கம் நேரம்
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,மொத்த வருவாய்
 DocType: Sales Invoice,Product Bundle Help,தயாரிப்பு மூட்டை உதவி
 ,Monthly Attendance Sheet,மாதாந்திர பங்கேற்கும் தாள்
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,எந்த பதிவும் இல்லை
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் கட்டாய {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,கணக்கு {0} செயலற்று
 DocType: GL Entry,Is Advance,முன்பணம்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,தேதி தேதி மற்றும் வருகை வருகை கட்டாய ஆகிறது
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,உள்ளிடவும் ஆம் அல்லது இல்லை என ' துணை ஒப்பந்தம்'
 DocType: Sales Team,Contact No.,இல்லை தொடர்பு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' இலாப நட்ட ' வகை கணக்கு {0} நுழைவு திறந்து அனுமதி இல்லை
-DocType: Workflow State,Time,காலம்
 DocType: Features Setup,Sales Discounts,விற்பனை தள்ளுபடி
 DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
 DocType: Sales Invoice,Terms and Conditions Details,நிபந்தனைகள் விவரம்
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,விற்பனை வரி மற்றும் கட்டணங்கள் டெம்ப்ளேட்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,ஆடை & ஆபரனங்கள்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ஆடை & ஆபரனங்கள்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,ஆணை எண்
 DocType: Item Group,HTML / Banner that will show on the top of product list.,தயாரிப்பு பட்டியலில் காண்பிக்கும் என்று HTML / பதாகை.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,கப்பல் அளவு கணக்கிட நிலைமைகளை குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,குழந்தை சேர்
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,பங்கு உறைந்த கணக்குகள் & திருத்து உறைந்த பதிவுகள் அமைக்க அனுமதி
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,அது குழந்தை முனைகள் என லெட்ஜரிடம் செலவு மையம் மாற்ற முடியாது
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,மாற்று காரணி தேவை
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,தொடர் #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,விற்பனையில் கமிஷன்
 DocType: Offer Letter Term,Value / Description,மதிப்பு / விளக்கம்
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,வாடிக்கையாளர்கள் நீண்ட நாட்களாக வாங்குதல்
 DocType: Production Order,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,வீக்கம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,ஆவியாக்கல் மாதிரி நடிப்பதற்கு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,பொழுதுபோக்கு செலவினங்கள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,கவிஞருக்கு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,கவிஞருக்கு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,வயது
 DocType: Time Log,Billing Amount,பில்லிங் அளவு
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,உருப்படி குறிப்பிடப்பட்டது அளவு {0} . அளவு 0 அதிகமாக இருக்க வேண்டும் .
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,விடுமுறை விண்ணப்பங்கள்.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,ஏற்கனவே பரிவர்த்தனை கணக்கு நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,சட்ட செலவுகள்
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","கார் பொருட்டு 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Sales Invoice,Posting Time,நேரம் தகவல்களுக்கு
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,புதிய வாடிக்கையாளர் வருவாய்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,போக்குவரத்து செலவுகள்
 DocType: Maintenance Visit,Breakdown,முறிவு
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,கணக்கு: {0} நாணயத்துடன்: {1} தேர்வு செய்ய முடியாது
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,"இதனையடுத்து,"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
-DocType: Feed,Full Name,முழு பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,பெற்றுக்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,சோதனை காலம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,இயல்புநிலை கிடங்கு பங்கு பொருள் கட்டாயமாகும்.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},மாதம் சம்பளம் கொடுப்பனவு {0} மற்றும் ஆண்டு {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,மொத்த கட்டண தொகை
 ,Transferred Qty,அளவு மாற்றம்
 apps/erpnext/erpnext/config/learn.py +11,Navigating,வழிநடத்தல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,திட்டமிடல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,திட்டமிடல்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,நேரம் பதிவு தொகுதி செய்ய
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,வெளியிடப்படுகிறது
 DocType: Project,Total Billing Amount (via Time Logs),மொத்த பில்லிங் அளவு (நேரத்தில் பதிவுகள் வழியாக)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,நாம் இந்த பொருளை விற்க
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,நாம் இந்த பொருளை விற்க
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,வழங்குபவர் அடையாளம்
 DocType: Journal Entry,Cash Entry,பண நுழைவு
 DocType: Sales Partner,Contact Desc,தொடர்பு DESC
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,பொருள் மேலாளர்
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,கணக்கு ஆண்டு வரவு செலவு திட்டம் அமைக்க வரிசைகளை சேர்க்க.
 DocType: Buying Settings,Default Supplier Type,முன்னிருப்பு சப்ளையர் வகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,குவாரி
 DocType: Production Order,Total Operating Cost,மொத்த இயக்க செலவு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,குறிப்பு: பொருள் {0} பல முறை உள்ளிட்ட
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,அனைத்து தொடர்புகள்.
 DocType: Newsletter,Test Email Id,டெஸ்ட் மின்னஞ்சல் விலாசம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,நிறுவனத்தின் சுருக்கமான
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,நீங்கள் தரமான ஆய்வு பின்பற்ற என்றால் . எந்த கொள்முதல் ரசீது பொருள் QA தேவையான மற்றும் QA இயக்கும்
 DocType: GL Entry,Party Type,கட்சி வகை
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,மூலப்பொருள் முக்கிய பொருள் அதே இருக்க முடியாது
 DocType: Item Attribute Value,Abbreviation,சுருக்கமான
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} வரம்புகளை அதிகமாக இருந்து authroized
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,சுழற்சி மூடப்பட்ட
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,சம்பளம் வார்ப்புரு மாஸ்டர் .
 DocType: Leave Type,Max Days Leave Allowed,மேக்ஸ் நாட்கள் அனுமதிக்கப்பட்ட விடவும்
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,வண்டியை அமைக்க வரி விதி
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
 ,Territory Target Variance Item Group-Wise,மண்டலம் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,வரி டெம்ப்ளேட் கட்டாயமாகும்.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,கணக்கு {0}: பெற்றோர் கணக்கு {1} இல்லை
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),விலை பட்டியல் விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Account,Temporary,தற்காலிக
 DocType: Address,Preferred Billing Address,விருப்பமான பில்லிங் முகவரி
 DocType: Monthly Distribution Percentage,Percentage Allocation,சதவீத ஒதுக்கீடு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,காரியதரிசி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,காரியதரிசி
 DocType: Serial No,Distinct unit of an Item,"ஒரு பொருள், மாறுபட்ட அலகு"
 DocType: Pricing Rule,Buying,வாங்குதல்
 DocType: HR Settings,Employee Records to be created by,பணியாளர் ரெக்கார்ட்ஸ் விவரங்களை வேண்டும்
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
 DocType: Purchase Order Item,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,சலவை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} நிறுத்தி உள்ளது
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,எதிர்வரும் நிகழ்வுகள்
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,வாடிக்கையாளர் தேவை
-DocType: Letter Head,Letter Head,முகவரியடங்கல்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,விரைவு நுழைவு
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} திரும்ப அத்தியாவசியமானதாகும்
 DocType: Purchase Order,To Receive,பெற
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,பொருத்தி சுருக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,வருமான / செலவின
 DocType: Employee,Personal Email,தனிப்பட்ட மின்னஞ்சல்
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,மொத்த மாற்றத்துடன்
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,மொத்த மாற்றத்துடன்
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","இயலுமைப்படுத்த என்றால், கணினி தானாக சரக்கு கணக்கியல் உள்ளீடுகள் பதிவு."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,தரக
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,தரக
 DocType: Address,Postal Code,அஞ்சல் குறியீடு
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","மினிட்ஸ் 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,முன்பேர
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,குறைந்தது ஒரு கிடங்கில் அவசியமானதாகும்
 DocType: Serial No,Out of Warranty,உத்தரவாதத்தை வெளியே
 DocType: BOM Replace Tool,Replace,பதிலாக
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,நடவடிக்கை இயல்புநிலை அலகு உள்ளிடவும்
 DocType: Purchase Invoice Item,Project Name,திட்டம் பெயர்
 DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
-DocType: Workflow State,Edit,திருத்த
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Features Setup,Item Batch Nos,உருப்படியை தொகுப்பு இலக்கங்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,கொடுப்பனவு நல்லிணக்க கொடுப்பனவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,வரி சொத்துகள்
 DocType: BOM Item,BOM No,BOM இல்லை
-DocType: Contact Us Settings,Pincode,ப ன்ேகா
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரி நகரும்
 DocType: BOM Replace Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,புதிய பங்கு மொறட்டுவ பல்கலைகழகம் தற்போதைய பங்கு மொறட்டுவ பல்கலைகழகம் வித்தியாசமாக இருக்க வேண்டும்
 DocType: Account,Debit,பற்று
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,இலைகள் 0.5 மடங்குகள் ஒதுக்கீடு
 DocType: Production Order,Operation Cost,அறுவை சிகிச்சை செலவு
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,ஒரு. Csv கோப்பு இருந்து வருகை பதிவேற்று
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,மிகச்சிறந்த விவரங்கள்
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,இயல்புநிலை விலை மையம்
 DocType: Purchase Invoice,End Date,இறுதி நாள்
 DocType: Employee,Internal Work History,உள் வேலை வரலாறு
-DocType: DocField,Column Break,நெடுவரிசை பிரிப்பு
-DocType: Event,Thursday,வியாழக்கிழமை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,தனியார் சமபங்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,திருப்பு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,தனியார் சமபங்கு
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
 DocType: Sales Invoice,Exhibition,கண்காட்சி
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,இல் நடைபெற்றது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,உற்பத்தி பொருள்
 ,Employee Information,பணியாளர் தகவல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),விகிதம் (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),விகிதம் (%)
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,அடுத்து வருகிற
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),சம்பளம் (LWP) இல்லாமல் விடுமுறை ஆதாயம் குறைக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},குறிப்பு: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,இந்த வார சுருக்கம்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} வரிசையில் ஒரு வாங்கப்பட்டது அல்லது துணை ஒப்பந்தம் பொருள் இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,கணக்கு: {0} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
 DocType: GL Entry,Party,கட்சி
 DocType: Sales Order,Delivery Date,டெலிவரி தேதி
-DocType: DocField,Currency,நாணய
 DocType: Opportunity,Opportunity Date,வாய்ப்பு தேதி
 DocType: Purchase Receipt,Return Against Purchase Receipt,வாங்கும் ரசீது எதிராக திரும்ப
 DocType: Purchase Order,To Bill,மசோதாவுக்கு
 DocType: Material Request,% Ordered,% உத்தரவிட்டார்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,சிறுதுண்டு வேலைக்கு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,சிறுதுண்டு வேலைக்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
 DocType: SMS Settings,SMS Settings,SMS அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,தற்காலிக கணக்குகளை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,கருப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,கருப்பு
 DocType: BOM Explosion Item,BOM Explosion Item,BOM வெடிப்பு பொருள்
 DocType: Account,Auditor,ஆடிட்டர்
 DocType: Purchase Order,End date of current order's period,தற்போதைய ஆர்டரை கால இறுதியில் தேதி
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ஆஃபர் கடிதம் செய்ய
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,திரும்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
-DocType: DocField,Fold,மடி
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,மாற்று அளவீடு இயல்புநிலை யூனிட் டெம்ப்ளேட் அதே இருக்க வேண்டும்
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
 DocType: Project Task,Pending Review,விமர்சனம் நிலுவையில்
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,குறிப்பிடவும்
 DocType: Task,Total Expense Claim (via Expense Claim),(செலவு கூறுகின்றனர் வழியாக) மொத்த செலவு கூறுகின்றனர்
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,வாடிக்கையாளர் அடையாள
-DocType: Page,Page Name,பக்கம் பெயர்
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,நேரம் இருந்து விட பெரியதாக இருக்க வேண்டும் வேண்டும்
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},கிடங்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனம் bolong இல்லை {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,சுழல் முடித்த
 DocType: BOM,Last Purchase Rate,கடந்த கொள்முதல் விலை
 DocType: Account,Asset,சொத்து
 DocType: Project Task,Task ID,பணி ஐடி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","உதாரணமாக, ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","உதாரணமாக, ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,பொருள் இருக்க முடியாது பங்கு {0} என்பதால் வகைகள் உண்டு
 ,Sales Person-wise Transaction Summary,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
-DocType: System Settings,Time Zone,நேரம் மண்டல
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext மையம் பதிவு
 DocType: Monthly Distribution,Monthly Distribution Percentages,மாதாந்திர விநியோகம் சதவீதங்கள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
 DocType: Delivery Note,% of materials delivered against this Delivery Note,இந்த டெலிவரி குறிப்பு எதிராக அளிக்கப்பட்ட பொருட்களை%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Stapling
 DocType: Customer,Customer Details,வாடிக்கையாளர் விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,வடிவமைத்தல்
 DocType: Employee,Reports to,அறிக்கைகள்
 DocType: SMS Settings,Enter url parameter for receiver nos,ரிசீவர் இலக்கங்கள் URL ஐ அளவுரு உள்ளிடவும்
 DocType: Sales Invoice,Paid Amount,பணம் தொகை
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',கணக்கு {0} நிறைவு வகை ' பொறுப்பு ' இருக்க வேண்டும்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ஏற்கனவே பற்று உள்ள கணக்கு நிலுவை, நீங்கள் 'கடன்' இருப்பு வேண்டும் 'அமைக்க அனுமதி இல்லை"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,தர மேலாண்மை
 DocType: Production Planning Tool,Filter based on customer,வாடிக்கையாளர் அடிப்படையில் வடிகட்ட
 DocType: Payment Tool Detail,Against Voucher No,ரசீது இல்லை எதிராக
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Employee External Work History,Employee External Work History,ஊழியர் புற வேலை வரலாறு
 DocType: Tax Rule,Purchase,கொள்முதல்
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,இருப்பு அளவு
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,இருப்பு அளவு
 DocType: Item Group,Parent Item Group,பெற்றோர் பொருள் பிரிவு
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} க்கான {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,செலவு மையங்கள்
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,வரப்புயர .
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,வரப்புயர .
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,அளிப்பாளரின் நாணய நிறுவனத்தின் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},ரோ # {0}: வரிசையில் நேரம் மோதல்கள் {1}
 DocType: Opportunity,Next Contact,அடுத்த தொடர்பு
 DocType: Employee,Employment Type,வேலை வகை
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,நிலையான சொத்துக்கள்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,விண்ணப்ப காலம் இரண்டு alocation பதிவுகள் முழுவதும் இருக்க முடியாது
 DocType: Item Group,Default Expense Account,முன்னிருப்பு செலவு கணக்கு
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
-DocType: Page,Yes,ஆம்
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,மின்முறை
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","வவுச்சர் எதிராக வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},இயல்புநிலை நடவடிக்கை செலவு நடவடிக்கை வகை உள்ளது - {0}
 DocType: Production Order,Planned Operating Cost,திட்டமிட்ட இயக்க செலவு
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,புதிய {0} பெயர்
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},தயவு செய்து இணைக்கப்பட்ட {0} # {1}
 DocType: Job Applicant,Applicant Name,விண்ணப்பதாரர் பெயர்
 DocType: Authorization Rule,Customer / Item Name,வாடிக்கையாளர் / உருப்படி பெயர்
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},சீரியல் இல்லை பொருள் கட்டாய {0}
 DocType: Item Variant Attribute,Attribute,கற்பிதம்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,வரை / இருந்து குறிப்பிடவும்
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,மூலம் உருவாக்கப்பட்டது
 DocType: Serial No,Under AMC,AMC கீழ்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,பொருள் மதிப்பீட்டு விகிதம் தரையிறங்கியது செலவு ரசீது அளவு கருத்தில் கணக்கீடு செய்யப்பட்டது
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,பரிவர்த்தனைகள் விற்பனை இயல்புநிலை அமைப்புகளை.
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,குறைந்தபட்ச தொகை
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,புதுப்பி முடிந்தது பொருட்கள்
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},தொடர் {0} ஏற்கனவே பயன்படுத்தப்படுகிறது {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,கிடங்கு ( நிரந்தர இருப்பு ) கணக்கு இந்த கணக்கு கீழ் உருவாக்கப்பட்டது.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,கட்டண தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,கொல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,திட்ட மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,கொல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
 DocType: Customer,Default Taxes and Charges,இயல்புநிலை வரி மற்றும் கட்டணங்கள்
 DocType: Account,Receivable,பெறத்தக்க
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
 DocType: Sales Invoice,Supplier Reference,வழங்குபவர் குறிப்பு
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","தேர்வுசெய்யப்பட்டால், துணை சட்டசபை பொருட்கள் BOM மூலப்பொருட்கள் பெற கருதப்படுகிறது. மற்றபடி, அனைத்து துணை சட்டசபை பொருட்களை மூலப்பொருளாக கருதப்படுகிறது."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
 DocType: Item Price,Item Price,உருப்படியை விலை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,சோப் & சோப்பு
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,மோஷன் பிக்சர் & வீடியோ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,ஆனால் அடிப்படையில் பொருட்களின் விகிதம்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,ஆதரவு Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},நிறுவனத்தின் கிடங்குகளில் காணவில்லை {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,பங்கு மொறட்டுவ பல்கலைகழகம் பதிலாக பயன்பாட்டு
 DocType: POS Profile,Terms and Conditions,நிபந்தனைகள்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},தேதி நிதி ஆண்டின் க்குள் இருக்க வேண்டும். தேதி நிலையினை = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","இங்கே நீங்கள் உயரம், எடை, ஒவ்வாமை, மருத்துவ கவலைகள் ஹிப்ரு பராமரிக்க முடியும்"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,உற்பத்திக்கான
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,மேலே உள்ள அட்டவணையில் விற்பனை பொருட்டு உள்ளிடவும்
 DocType: Project Task,View Task,காண்க பணி
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,உங்கள் நிதி ஆண்டு தொடங்கும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,உங்கள் நிதி ஆண்டு தொடங்கும்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,கொள்முதல் ரசீதுகள் உள்ளிடவும்
 DocType: Sales Invoice,Get Advances Received,முன்னேற்றம் பெற்ற கிடைக்கும்
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),ஆதரவு மின்னஞ்சல் ஐடி அமைப்பு உள்வரும் சர்வர் . (எ. கா: support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,துலக்குதல்
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,' தேதி ' தேவைப்படுகிறது
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
 DocType: Sales Invoice Item,Sales Order Item,விற்பனை ஆணை உருப்படி
 DocType: Salary Slip,Payment Days,கட்டணம் நாட்கள்
 DocType: BOM,Manage cost of operations,நடவடிக்கைகள் செலவு மேலாண்மை
 DocType: Features Setup,Item Advanced,உருப்படியை மேம்பட்ட
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,சூடாக்கி உருட்டல்
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","சரி நடவடிக்கைகள் எந்த &quot;Submitted&quot; போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய &quot;தொடர்பு&quot; ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,உலகளாவிய அமைப்புகள்
 DocType: Employee Education,Employee Education,ஊழியர் கல்வி
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
 DocType: Salary Slip,Net Pay,நிகர சம்பளம்
 DocType: Account,Account,கணக்கு
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,தொடர் இல {0} ஏற்கனவே பெற்றுள்ளது
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,விற்பனை குழு விவரம்
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,விடுப்பு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},தவறான {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,விடுப்பு
 DocType: Email Digest,Email Digest,மின்னஞ்சல் டைஜஸ்ட்
 DocType: Delivery Note,Billing Address Name,பில்லிங் முகவரி பெயர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,கணினி இருப்பு
-DocType: Workflow,Is Active,செயலில் உள்ளது
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,கணினி இருப்பு
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,முதல் ஆவணம் சேமிக்கவும்.
 DocType: Account,Chargeable,குற்றம் சாட்டப்பட தக்க
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,மாற்றம் சுருக்கமான
-DocType: Workflow State,Primary,முதல்
 DocType: Expense Claim Detail,Expense Date,இழப்பில் தேதி
 DocType: Item,Max Discount (%),மேக்ஸ் தள்ளுபடி (%)
-DocType: Communication,More Information,மேலும் தகவல்
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,கடைசி ஆர்டர் தொகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,வெடித்தல்
 DocType: Company,Warn,எச்சரிக்கை
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,பொருள் மதிப்பீடு மேம்படுத்தப்பட்டது
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
 DocType: BOM,Manufacturing User,உற்பத்தி பயனர்
 DocType: Purchase Order,Raw Materials Supplied,மூலப்பொருட்கள் வழங்கியது
 DocType: Purchase Invoice,Recurring Print Format,பெரும்பாலும் உடன் அச்சு வடிவம்
-DocType: Communication,Series,தொடர்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி கொள்முதல் ஆணை தேதி முன் இருக்க முடியாது
 DocType: Appraisal,Appraisal Template,மதிப்பீட்டு வார்ப்புரு
-DocType: Communication,Email,மின்னஞ்சல்
 DocType: Item Group,Item Classification,பொருள் பிரிவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,வணிக மேம்பாட்டு மேலாளர்
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,பராமரிப்பு சென்று நோக்கம்
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,காலம்
 ,General Ledger,பொது லெட்ஜர்
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,இனவாரியாக நிலை மறுவரிசைப்படுத்துக பரிந்துரைக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,முதல் {0} தேர்வு செய்க
 DocType: Features Setup,To get Item Group in details table,விவரங்கள் அட்டவணையில் உருப்படி குழு பெற
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,மாற்றியமைத்துள்ளது
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,ஓவிய
 DocType: Sales Invoice,Commission,தரகு
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3203,7 @@
  {% என்றால் email_id%} மின்னஞ்சல்: {{email_id}}; & lt; br & gt {% Endif -%} 
  </ குறியீடு> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,இயல்புநிலை தொகை
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,இந்த மாதம் சுருக்கம்
 DocType: Quality Inspection Reading,Quality Inspection Reading,தரமான ஆய்வு படித்தல்
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px வலை நட்பு 900px ( W ) வைத்து ( H )
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
 DocType: Payment Tool,Get Outstanding Vouchers,மிகச்சிறந்த உறுதி சீட்டு கிடைக்கும்
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
 DocType: Appraisal,Start Date,தொடக்க தேதி
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,மதிப்பு
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,ஒரு காலத்தில் இலைகள் ஒதுக்க.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,சரிபார்க்க இங்கே கிளிக் செய்யவும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,சப்ளையர் எடுக்கப்படும் சராசரி நேரம் வழங்க
 DocType: Time Log,Hours,மணி
 DocType: Project,Expected Start Date,எதிர்பார்க்கப்படுகிறது தொடக்க தேதி
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,ரோலிங்
-DocType: ToDo,Priority,முதன்மை
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
-DocType: Dropbox Backup,Dropbox Access Allowed,டிரா பாக்ஸ் அனுமதி
-DocType: Dropbox Backup,Weekly,வாரந்தோறும்
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,உதாரணம். smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,பெறவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,பெறவும்
 DocType: Maintenance Visit,Fully Completed,முழுமையாக பூர்த்தி
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% முழுமையான
 DocType: Employee,Educational Qualification,கல்வி தகுதி
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு சர்க்கார் தரப்பில் சாட்சி
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} வெற்றிகரமாக எங்கள் செய்திமடல் பட்டியலில் சேர்க்க.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,எலக்ட்ரான் கற்றை எந்திர
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,முக்கிய செய்திகள்
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,பங்கு லெட்ஜர் மேம்படுத்தப்பட்டது நிலுவைகளை உள்ளீட்டுகளின்
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,முக்கிய செய்திகள்
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,செலவு மையங்கள் விளக்கப்படம்
 ,Requested Items To Be Ordered,கேட்டு கேட்டு விடயங்கள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,என்னுடைய கட்டளைகள்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,என்னுடைய கட்டளைகள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
 DocType: Time Log,For Manufacturing,உற்பத்தி
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,மொத்த
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,மொத்த
 DocType: BOM,Manufacturing,உருவாக்கம்
 ,Ordered Items To Be Delivered,விநியோகிப்பதற்காக உத்தரவிட்டார் உருப்படிகள்
 DocType: Account,Income,வருமானம்
-,Setup Wizard,அமைவு வழிகாட்டி
 DocType: Industry Type,Industry Type,தொழில் அமைப்பு
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,ஏதோ தவறு நடந்து!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,நிறைவு நாள்
 DocType: Purchase Invoice Item,Amount (Company Currency),அளவு (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,அச்சு வார்ப்பு
-DocType: Email Alert,Reference Date,குறிப்பு தேதி
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,சரியான மொபைல் இலக்கங்கள் உள்ளிடவும்
 DocType: Budget Detail,Budget Detail,வரவு செலவு திட்ட விரிவாக
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,அனுப்புவதற்கு முன் செய்தி உள்ளிடவும்
-DocType: Async Task,Status,அந்தஸ்து
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},பங்கு UOM பொருள் மேம்படுத்தப்பட்டது {0}
-DocType: Company History,Year,ஆண்டு
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS அமைப்புகள் மேம்படுத்த
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,ஏற்கனவே படியாக நேரம் பரிசீலனை {0}
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,தொடர் எண் சேவை ஒப்பந்தம் காலாவதியாகும்
 DocType: Item,Unit of Measure Conversion,நடவடிக்கையாக மாற்றும் அலகு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,பணியாளர் மாற்ற முடியாது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
 DocType: Naming Series,Help HTML,HTML உதவி
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},அலவன்ஸ் அதிகமாக {0} பொருள் கடந்து ஐந்து {1}
 DocType: Address,Name of person or organization that this address belongs to.,நபர் அல்லது இந்த முகவரியை சொந்தமானது என்று நிறுவனத்தின் பெயர்.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,உங்கள் சப்ளையர்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,உங்கள் சப்ளையர்கள்
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,மற்றொரு சம்பள {0} ஊழியர் செயலில் உள்ளது {1}. அதன் நிலை 'செயலற்ற' தொடர உறுதி செய்து கொள்ளவும்.
 DocType: Purchase Invoice,Contact,தொடர்பு
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,பெறப்படும்
 DocType: Features Setup,Exports,ஏற்றுமதி
 DocType: Lead,Converted,மாற்றப்படுகிறது
 DocType: Item,Has Serial No,இல்லை வரிசை உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0} இருந்து: {0} ஐந்து {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 DocType: Issue,Content Type,உள்ளடக்க வகை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,கம்ப்யூட்டர்
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கம்ப்யூட்டர்
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,பொருள்: {0} அமைப்பின் இல்லை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Cost Center,Budgets,"வரவு செலவு திட்டம்,"
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,புதுப்பிக்கப்பட்ட
 DocType: Employee,Emergency Contact Details,அவசர தொடர்பு விவரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,அது என்ன?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,அது என்ன?
 DocType: Delivery Note,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},கணக்கு {0} மேலும் நிதியாண்டில் முறை உள்ளிட்ட{1}
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,மின்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,மின்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},பயனர் ஐடி பணியாளர் அமைக்க{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர் இருந்து
 DocType: Stock Entry,Default Source Warehouse,முன்னிருப்பு மூல கிடங்கு
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,படிதல்
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
-DocType: User,Enabled,இயலுமைப்படுத்த
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,பங்கு சொத்துக்கள்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},நீங்கள் உண்மையில் {0} மற்றும் ஆண்டு {1} மாதத்தில் சம்பள சமர்ப்பிக்க விரும்புகிறீர்களா
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,இறக்குமதி சந்தாதாரர்கள்
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,தற்போது
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க கூடாது
 DocType: Notification Control,Sales Invoice Message,விற்பனை விலைப்பட்டியல் செய்தி
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,கணக்கு {0} நிறைவு வகை பொறுப்பு / ஈக்விட்டி இருக்க வேண்டும்
 DocType: Authorization Rule,Based On,அடிப்படையில்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,திட்ட செயல்பாடு / பணி.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,சம்பளம் தவறிவிடும் உருவாக்க
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} சரியான மின்னஞ்சல் ஐடி அல்ல
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","பொருந்துகின்ற என தேர்வு என்றால் வாங்குதல், சரிபார்க்கப்பட வேண்டும் {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,தள்ளுபடி 100 க்கும் குறைவான இருக்க வேண்டும்
-DocType: ToDo,Low,குறைந்த
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,ஸ்பின்னிங்
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,பிரச்சாரம் பெயர் தேவைப்படுகிறது
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Receipt Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,டீப் வரைதல்
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,புதிய செய்திமடல்
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,காட்டு இருப்பு
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,வயதான ரேஞ்ச் 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,குடையாணி
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
 ,Sales Analytics,விற்பனை அனலிட்டிக்ஸ்
 DocType: Manufacturing Settings,Manufacturing Settings,உற்பத்தி அமைப்புகள்
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,புதிய கணக்கு பெயர்
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,மூலப்பொருட்கள் விலை வழங்கியது
 DocType: Selling Settings,Settings for Selling Module,தொகுதி விற்பனையான அமைப்புகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,வாடிக்கையாளர் சேவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,வாடிக்கையாளர் சேவை
 DocType: Item,Thumbnail,சிறு
 DocType: Item Customer Detail,Item Customer Detail,உருப்படியை வாடிக்கையாளர் விரிவாக
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,உங்கள் மின்னஞ்சலை உறுதிப்படுத்துக
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ஆஃபர் வேட்பாளர் ஒரு வேலை.
 DocType: Notification Control,Prompt for Email on Submission of,இந்த சமர்ப்பிக்கும் மீது மின்னஞ்சல் கேட்டு
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,மொத்த ஒதுக்கீடு இலைகள் காலத்தில் நாட்கள் விட
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,பொருள் {0} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,முன்னேற்றம் கிடங்கில் இயல்புநிலை வேலை
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} தேவைப்படுகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,வாக்குவம் வடிவமைத்தல்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
-DocType: Contact Us Settings,City,நகரம்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,மீயொலி எந்திர
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,பொருள் {0} ஒரு விற்பனை பொருளாக இருக்க வேண்டும்
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
 DocType: Account,Equity,ஈக்விட்டி
 DocType: Sales Order,Printing Details,அச்சிடுதல் விபரங்கள்
 DocType: Task,Closing Date,தேதி மூடுவது
 DocType: Sales Order Item,Produced Quantity,உற்பத்தி அளவு
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,பொறியாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,பொறியாளர்
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,தேடல் துணை கூட்டங்கள்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
 DocType: Sales Partner,Partner Type,வரன்வாழ்க்கை துணை வகை
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise தள்ளுபடி
 DocType: Purchase Invoice,Against Expense Account,செலவு கணக்கு எதிராக
 DocType: Production Order,Production Order,உற்பத்தி ஆணை
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,நிறுவல் குறிப்பு {0} ஏற்கனவே சமர்ப்பித்த
 DocType: Quotation Item,Against Docname,Docname எதிராக
 DocType: SMS Center,All Employee (Active),அனைத்து பணியாளர் (செயலில்)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,இப்போது காண்க
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,மூலப்பொருட்களின் செலவு
 DocType: Item,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,காண்ட் விளக்கப்படம்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,தொடர் இற்றை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,புகார் வகை கட்டாய ஆகிறது
 DocType: Item,Serial Number Series,வரிசை எண் தொடர்
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},கிடங்கு பங்கு பொருள் கட்டாய {0} வரிசையில் {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,சில்லறை & விற்பனை
 DocType: Issue,First Responded On,முதல் தேதி இணையம்
 DocType: Website Item Group,Cross Listing of Item in multiple groups,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,முதல் பயனர் : நீங்கள்
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,முதல் பயனர் : நீங்கள்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,வெற்றிகரமாக ஒருமைப்படுத்திய
 DocType: Production Order,Planned End Date,திட்டமிட்ட தேதி
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
 DocType: Tax Rule,Validity,ஏற்றுக்கொள்ளக்கூடிய
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,விலை விவரம் தொகை
 DocType: Attendance,Attendance,கவனம்
-DocType: Page,No,இல்லை
 DocType: BOM,Materials,மூலப்பொருள்கள்
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","சரி இல்லை என்றால், பட்டியலில் அதை பயன்படுத்த வேண்டும் ஒவ்வொரு துறை சேர்க்க வேண்டும்."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,தகவல்களுக்கு தேதி மற்றும் தகவல்களுக்கு நேரம் கட்டாய ஆகிறது
@@ -3764,55 +3451,46 @@
 ,Item Prices,உருப்படியை விலைகள்
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 DocType: Period Closing Voucher,Period Closing Voucher,காலம் முடிவுறும் வவுச்சர்
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,விலை பட்டியல் மாஸ்டர் .
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,விலை பட்டியல் மாஸ்டர் .
 DocType: Task,Review Date,தேதி
 DocType: Purchase Invoice,Advance Payments,அட்வான்ஸ் கொடுப்பனவு
-DocType: DocPerm,Level,நிலை
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம் உள்ள
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,வரிசையில் இலக்கு கிடங்கில் {0} அதே இருக்க வேண்டும் உத்தரவு
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,அரைக்கும்
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,அனுமதி இல்லை கொடுப்பனவு கருவி பயன்படுத்த
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,% கள் மீண்டும் மீண்டும் குறிப்பிடப்படவில்லை 'அறிவிப்பு மின்னஞ்சல் முகவரிகளில்'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,நாணய வேறு நாணயங்களுக்கு பயன்படுத்தி உள்ளீடுகள் செய்வதில் பிறகு மாற்றிக்கொள்ள
 DocType: Company,Round Off Account,கணக்கு ஆஃப் சுற்றுக்கு
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,நிப்பிலிங்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,நிர்வாக செலவுகள்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,ஆலோசனை
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ஆலோசனை
 DocType: Customer Group,Parent Customer Group,பெற்றோர் வாடிக்கையாளர் பிரிவு
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,மாற்றம்
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,அறிவிப்பு காலம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","உதாரணமாக, ""என் கம்பெனி எல்எல்சி"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,அறிவிப்பு காலம்
 DocType: Bank Reconciliation Detail,Voucher ID,ரசீது அடையாள
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,இந்த வேர் பகுதியில் மற்றும் திருத்த முடியாது .
 DocType: Packing Slip,Gross Weight UOM,மொத்த எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Email Digest,Receivables / Payables,வரவுகள் / Payables
 DocType: Delivery Note Item,Against Sales Invoice,விற்பனை விலைப்பட்டியல் எதிராக
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,ஸ்டாம்பிங்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு உருப்படி
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 DocType: Task,Actual End Date (via Time Logs),உண்மையான தேதி (நேரத்தில் பதிவுகள் வழியாக)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,பெற்றோர் செலவு சென்டர் உள்ளிடவும்
 DocType: Delivery Note,Print Without Amount,மொத்த தொகை இல்லாமல் அச்சிட
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,வரி பகுப்பு ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' அனைத்து பொருட்களை அல்லாத பங்கு பொருட்களை இருக்க முடியாது
-DocType: User,Last Name,கடந்த பெயர்
-DocType: Web Page,Left,விட்டு
-DocType: Event,All Day,அனைத்து தினம்
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,வரி பகுப்பு ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' அனைத்து பொருட்களை அல்லாத பங்கு பொருட்களை இருக்க முடியாது
 DocType: Issue,Support Team,ஆதரவு குழு
 DocType: Appraisal,Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்)
-DocType: Contact Us Settings,State,நிலை
 DocType: Batch,Batch,கூட்டம்
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,இருப்பு
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,இருப்பு
 DocType: Project,Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக)
-DocType: User,Gender,பாலினம்
 DocType: Journal Entry,Debit Note,பற்றுக்குறிப்பு
 DocType: Stock Entry,As per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,காலாவதி
@@ -3826,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,மதிப்புகள் அடிப்படையில் நடவடிக்கைகளை கட்டுப்படுத்த விதிகளை உருவாக்க .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","சரி என்றால், மொத்த இல்லை. வேலை நாட்கள் விடுமுறை அடங்கும், இந்த நாள் ஒன்றுக்கு சம்பளம் மதிப்பு குறையும்"
 DocType: Purchase Invoice,Total Advance,மொத்த முன்பணம்
-DocType: Workflow State,User,பயனர்
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,லாஸ்ட் அமை
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,கட்டணம் ரசீது குறிப்பு
 DocType: Customer,Credit Days Based On,கடன் நாட்கள் அடிப்படையில்
 DocType: Tax Rule,Tax Rule,வரி விதி
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,விற்பனை சைக்கிள் முழுவதும் அதே விகிதத்தில் பராமரிக்க
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,வர்க்ஸ்டேஷன் பணிநேரம் தவிர்த்து நேரத்தில் பதிவுகள் திட்டமிட்டுள்ளோம்.
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ஏற்கனவே சமர்ப்பித்த
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ஏற்கனவே சமர்ப்பிக்கபட்டது
 ,Items To Be Requested,கோரிய பொருட்களை
-DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Time Log,Billing Rate based on Activity Type (per hour),நடவடிக்கை வகை அடிப்படையில் பில்லிங் விகிதம் (ஒரு நாளைக்கு)
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","நிறுவனத்தின் மின்னஞ்சல் ஐடி இல்லை , எனவே அனுப்பிய மின்னஞ்சல்"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 DocType: Production Planning Tool,Filter based on item,உருப்படியை அடிப்படையில் வடிகட்ட
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
 DocType: Purchase Common,Purchase Common,பொதுவான வாங்க
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} மாற்றப்பட்டுள்ளது . புதுப்பிக்கவும்.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,வாய்ப்பை இருந்து
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,வெற்று
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,ஏற்று அளவு
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} இல்லை உள்ளது
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
-DocType: DocField,Default,தவறுதல்
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} சந்தாதாரர்கள் சேர்ந்தன
 DocType: Maintenance Schedule,Schedule,அனுபந்தம்
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","இந்த செலவு மையம் பட்ஜெட் வரையறை. பட்ஜெட் அமைக்க, பார்க்க &quot;நிறுவனத்தின் பட்டியல்&quot;"
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;ஆமாம்&quot; தேர்வு தொடர் மாஸ்டர் இல்லை காணலாம் இந்த உருப்படியை ஒவ்வொரு நிறுவனம் ஒரு தனிப்பட்ட அடையாள கொடுக்கும்.
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
 DocType: Address,Office,அலுவலகம்
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,ஸ்டாண்டர்ட் அறிக்கைகள்
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,பைனான்ஸ் ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,ஒரு வரி கணக்கு உருவாக்க
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,தொகுதி சரக்கு
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,தொகுதி சரக்கு
 DocType: Employee,Contract End Date,ஒப்பந்தம் முடிவு தேதி
 DocType: Sales Order,Track this Sales Order against any Project,எந்த திட்டம் எதிரான இந்த விற்பனை ஆணை கண்காணிக்க
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,மேலே அடிப்படை அடிப்படையில் விற்பனை ஆணைகள் (வழங்க நிலுவையில்) இழுக்க
-DocType: DocShare,Document Type,ஆவண வகை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,வழங்குபவர் கூறியவை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,வழங்குபவர் கூறியவை
 DocType: Deduction Type,Deduction Type,துப்பறியும் வகை
 DocType: Attendance,Half Day,அரை நாள்
 DocType: Pricing Rule,Min Qty,min அளவு
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",தொகுதி இலக்கங்கள் கொண்ட விற்பனை மற்றும் கொள்முதல் ஆவணங்களில் பொருட்களை கண்காணிக்க. &quot;விருப்பமான தொழில்: கெமிக்கல்ஸ்&quot;
 DocType: GL Entry,Transaction Date,பரிவர்த்தனை தேதி
 DocType: Production Plan Item,Planned Qty,திட்டமிட்ட அளவு
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,மொத்த வரி
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,மொத்த வரி
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,அளவு (அளவு உற்பத்தி) என்பது கட்டாயம்
 DocType: Stock Entry,Default Target Warehouse,முன்னிருப்பு அடைவு கிடங்கு
 DocType: Purchase Invoice,Net Total (Company Currency),நிகர மொத்தம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
 DocType: Notification Control,Purchase Receipt Message,ரசீது செய்தி வாங்க
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,மொத்த ஒதுக்கீடு இலைகள் காலம் விட
 DocType: Production Order,Actual Start Date,உண்மையான தொடக்க தேதி
 DocType: Sales Order,% of materials delivered against this Sales Order,இந்த விற்பனை அமைப்புக்கு எதிராக அளிக்கப்பட்ட பொருட்களை%
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,உருப்படியை இயக்கம் பதிவு.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,செய்திமடல் பட்டியல் சந்தாதாரர்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,சேவை
 DocType: Hub Settings,Hub Settings,ஹப் அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 ,Monthly Salary Register,மாத சம்பளம் பதிவு
-apps/frappe/frappe/website/template.py +140,Next,அடுத்து
 DocType: Warranty Claim,If different than customer address,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
 DocType: BOM Operation,BOM Operation,BOM ஆபரேஷன்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Electropolishing
 DocType: Purchase Taxes and Charges,On Previous Row Amount,முந்தைய வரிசை தொகை
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,குறைந்தது ஒரு வரிசையில் செலுத்தும் தொகை உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,குறைந்தது ஒரு வரிசையில் செலுத்தும் தொகை உள்ளிடவும்
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,ரோ {0}: பணம் அளவு நிலுவை தொகை விட அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,செலுத்தப்படாத மொத்த
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,செலுத்தப்படாத மொத்த
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,நேரம் பதிவு பில் இல்லை
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,வாங்குபவர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,வாங்குபவர்
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,நிகர ஊதியம் எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,கைமுறையாக எதிராக உறுதி சீட்டு உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,கைமுறையாக எதிராக உறுதி சீட்டு உள்ளிடவும்
 DocType: SMS Settings,Static Parameters,நிலையான அளவுருக்களை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,உருப்படியை வரி
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,உங்கள் தொடர்புகள் வெகுஜன எஸ்எம்எஸ் அனுப்ப
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,வரி அல்லது பொறுப்பு கருத்தில்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,குறுக்கு உருட்டல்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,கடன் அட்டை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது repacked வேண்டும்
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,பங்கு பரிவர்த்தனை இயல்புநிலை அமைப்புகளை .
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,பங்கு பரிவர்த்தனை இயல்புநிலை அமைப்புகளை .
 DocType: Purchase Invoice,Next Date,அடுத்த நாள்
 DocType: Employee Education,Major/Optional Subjects,முக்கிய / விருப்ப பாடங்கள்
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் உள்ளிடவும்
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,எந்திர
 DocType: Sales Invoice Item,Drop Ship,டிராப் கப்பல்
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","இங்கே நீங்கள் பெற்றோர், மனைவி மற்றும் குழந்தைகள் பெயர் மற்றும் ஆக்கிரமிப்பு போன்ற குடும்ப விவரங்கள் பராமரிக்க முடியும்"
 DocType: Hub Settings,Seller Name,விற்பனையாளர் பெயர்
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,RePack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,தொடர்வதற்கு முன் படிவத்தை சேமிக்க வேண்டும்
 DocType: Item Attribute,Numeric Values,எண்மதிப்பையும்
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,லோகோ இணைக்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,லோகோ இணைக்கவும்
 DocType: Customer,Commission Rate,கமிஷன் விகிதம்
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ரூட் திருத்த முடியாது .
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,ஒதுக்கப்பட்ட தொகை unadusted தொகையை விட கூடுதலான முடியாது
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ரூட் திருத்த முடியாது .
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,ஒதுக்கப்பட்ட தொகை unadusted தொகையை விட கூடுதலான முடியாது
 DocType: Manufacturing Settings,Allow Production on Holidays,விடுமுறை உற்பத்தி அனுமதி
 DocType: Sales Order,Customer's Purchase Order Date,வாடிக்கையாளர் கொள்முதல் ஆர்டர் தேதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,மூலதன கையிருப்பு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
-DocType: Dropbox Backup,Send Backups to Dropbox,டிராப்பாக்ஸ் காப்பு அனுப்பவும்
 DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்றும் பில்
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,வடிவமைப்புகள்
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
 DocType: Serial No,Delivery Details,விநியோக விவரம்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,அளவு இந்த அளவு கீழே விழும் என்றால் தானாக பொருள் வேண்டுதல் உருவாக்க
 ,Item-wise Purchase Register,உருப்படியை வாரியான வாங்குதல் பதிவு
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","மீள் கட்டளை நிலை அமைக்க, உருப்படி ஒரு கொள்முதல் பொருள் அல்லது தயாரிப்பு பொருள் இருக்க வேண்டும்"
 ,Supplier Addresses and Contacts,வழங்குபவர் முகவரிகள் மற்றும் தொடர்புகள்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +18,Project master.,திட்டம் மாஸ்டர்.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் இட்டு
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,பொருட்களின் பில்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
-DocType: Dropbox Backup,Send Notifications To,அறிவிப்புகளை அனுப்பவும்
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref தேதி
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref தேதி
 DocType: Employee,Reason for Leaving,விட்டு காரணம்
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,கணக்கு {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},ஊழியர் சம்பள கட்டமைப்பை உருவாக்க தயவுசெய்து {0}

diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 9de493d..5dc9a83 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,โหมดเงินเดือน
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",เลือกการกระจายรายเดือนถ้าคุณต้องการที่จะติดตามการขึ้นอยู่กับฤดูกาล
 DocType: Employee,Divorced,หย่าร้าง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,คำเตือน: รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,คำเตือน: รายการเดียวกันได้รับการป้อนหลายครั้ง
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,รายการซิงค์แล้ว
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,อนุญาตให้รายการที่จะเพิ่มหลายครั้งในการทำธุรกรรม
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ยกเลิกวัสดุเยี่ยมชม {0} ก่อนที่จะยกเลิกการรับประกันเรียกร้องนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,สินค้าอุปโภคบริโภค
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,กรุณาเลือกประเภทพรรคแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,การหลอม
 DocType: Item,Customer Items,รายการลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่สามารถแยกประเภท
 DocType: Item,Publish Item to hub.erpnext.com,เผยแพร่รายการที่จะ hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,ฝากผู้อนุมัติ
 DocType: Sales Partner,Dealer,เจ้ามือ
 DocType: Employee,Rented,เช่า
-DocType: About Us Settings,Website,เว็บไซต์
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,รถบดรวมทั้งการเผา
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะได้รับการคำนวณในการทำธุรกรรม
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,ขอ จาก วัสดุ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,ขอ จาก วัสดุ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} ต้นไม้
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,ไม่มีผลมากขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,ถูกกฎหมาย
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,ถูกกฎหมาย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},ประเภทภาษีที่เกิดขึ้นจริงไม่สามารถรวมอยู่ในราคาสินค้าในแถว {0}
 DocType: C-Form,Customer,ลูกค้า
 DocType: Purchase Receipt Item,Required By,ที่จำเป็นโดย
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,เย็บ
 DocType: Pricing Rule,Apply On,สมัคร เมื่อวันที่
 DocType: Item Price,Multiple Item prices.,ราคา หลายรายการ
 ,Purchase Order Items To Be Received,รายการสั่งซื้อที่จะได้รับ
 DocType: SMS Center,All Supplier Contact,ติดต่อผู้ผลิตทั้งหมด
 DocType: Quality Inspection Reading,Parameter,พารามิเตอร์
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,แอพลิเคชันออกใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,แถว # {0}: ให้คะแนนจะต้องเป็นเช่นเดียวกับ {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,แอพลิเคชันออกใหม่
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,ตั๋วแลกเงิน
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 เพื่อรักษารหัสรายการลูกค้าที่ฉลาดและจะทำให้พวกเขาค้นหาตามรหัสของพวกเขาใช้ตัวเลือกนี้
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,แสดงหลากหลายรูปแบบ
-DocType: Sales Invoice Item,Quantity,ปริมาณ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,ปริมาณ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ในสต็อก
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,ให้รายละเอียด POS ใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,การดูแลสุขภาพ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
 DocType: Purchase Invoice,Monthly,รายเดือน
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,ที่อยู่อีเมล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,ฝ่ายจำเลย
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,ที่อยู่อีเมล
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
 DocType: Company,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,แถว # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,แถว # {0}:
 DocType: Delivery Note,Vehicle No,รถไม่มี
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,เลือกรายชื่อราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,งานไม้
 DocType: Production Order Operation,Work In Progress,ทำงานในความคืบหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,การพิมพ์ 3 มิติ
 DocType: Employee,Holiday List,รายการวันหยุด
 DocType: Time Log,Time Log,บันทึกเวลา
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,นักบัญชี
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,นักบัญชี
 DocType: Cost Center,Stock User,หุ้นผู้ใช้
 DocType: Company,Phone No,โทรศัพท์ไม่มี
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",บันทึกกิจกรรมที่ดำเนินการโดยผู้ใช้ ในงานต่างๆ ซึ่งสามารถใช้ติดตามเวลา หรือออกใบเสร็จได้
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},ใหม่ {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},ใหม่ {0}: # {1}
 ,Sales Partners Commission,สำนักงานคณะกรรมการกำกับการขายหุ้นส่วน
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,ตัวอักษรย่อ ห้ามมีความยาวมากกว่า 5 ตัวอักษร
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",ค่าแอตทริบิวต์ {0} ไม่สามารถลบออกจาก {1} เป็นรายการที่แตกต่าง \ อยู่กับคุณสมบัตินี้
-DocType: Print Settings,Classic,คลาสสิก
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,นี่คือบัญชี รากและ ไม่สามารถแก้ไขได้
 DocType: BOM,Operations,การดำเนินงาน
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ไม่สามารถตั้งค่า การอนุญาต บนพื้นฐานของ ส่วนลดพิเศษสำหรับ {0}
 DocType: Bin,Quantity Requested for Purchase,ปริมาณที่ขอซื้อ
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",แนบไฟล์ csv ที่มีสองคอลัมน์หนึ่งชื่อเก่าและหนึ่งสำหรับชื่อใหม่
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,กิโลกรัม
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,กิโลกรัม
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,เปิดงาน
 DocType: Item Attribute,Increment,การเพิ่มขึ้น
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,เลือกคลังสินค้า ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,การโฆษณา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,การโฆษณา
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Employee,Married,แต่งงาน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 DocType: Payment Reconciliation,Reconcile,คืนดี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,ร้านขายของชำ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,ให้ธนาคารเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,คลังสินค้ามีผลบังคับใช้ถ้าเป็นประเภทบัญชีคลังสินค้า
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",ตรวจสอบว่าคำสั่งที่เกิดขึ้นยกเลิกการเลือกที่จะหยุดการเกิดขึ้นอีกหรือวางที่เหมาะสมวันที่สิ้นสุด
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ชั่วโมงอัตราค่าโทร / 60) * เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
-DocType: Blog Post,Guest,แขก
 DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
 DocType: Lead,Interested,สนใจ
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,รายการวัสดุ
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,การเปิด
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,การเปิด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},จาก {0} เป็น {1}
 DocType: Item,Copy From Item Group,คัดลอกจากกลุ่มสินค้า
 DocType: Journal Entry,Opening Entry,เปิดรายการ
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} มีผลบังคับใช้
 DocType: Stock Entry,Additional Costs,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 DocType: Lead,Product Enquiry,สอบถามสินค้า
-DocType: Standard Reply,Owner,เจ้าของ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,กรุณากรอก บริษัท แรก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,กรุณาเลือก บริษัท แรก
 DocType: Employee Education,Under Graduate,ภายใต้บัณฑิต
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,เป้าหมาย ที่
 DocType: BOM,Total Cost,ค่าใช้จ่ายรวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,คว้าน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,บันทึกกิจกรรม:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,อสังหาริมทรัพย์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,งบบัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,ยา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
 DocType: Expense Claim Detail,Claim Amount,จำนวนการเรียกร้อง
 DocType: Employee,Mr,นาย
-DocType: Custom Script,Client,ลูกค้า
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
 DocType: Naming Series,Prefix,อุปสรรค
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,วัสดุสิ้นเปลือง
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,วัสดุสิ้นเปลือง
 DocType: Upload Attendance,Import Log,นำเข้าสู่ระบบ
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,ส่ง
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,เงินเดือนประจำปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,เงินเดือนประจำปี
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 DocType: Newsletter,Email Sent?,อีเมลที่ส่ง?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,แสดงบันทึกเวลา
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
 DocType: Item,Supply Raw Materials for Purchase,วัตถุดิบสำหรับการซื้อวัสดุสิ้นเปลือง
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,รายการ {0} จะต้องมี การสั่งซื้อ สินค้า
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,จะมีการปรับปรุงหลังจากที่ใบแจ้งหนี้การขายมีการส่ง
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",จะรวมถึง ภาษี ในแถว {0} ใน อัตรา รายการ ภาษี ใน แถว {1} จะต้องรวม
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,ยืด
 DocType: BOM Replace Tool,New BOM,BOM ใหม่
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,บันทึกเวลา Batch สำหรับการเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,หล่อ Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,จดหมายข่าว ได้ถูกส่งไป แล้ว
 DocType: Lead,Request Type,ชนิดของการร้องขอ
 DocType: Leave Application,Reason,เหตุผล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,การปฏิบัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,ผู้ใช้คนแรกจะกลายเป็นตัวจัดการระบบ (คุณสามารถเปลี่ยนภายหลัง)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,การปฏิบัติ
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,ผู้ใช้คนแรกจะกลายเป็นตัวจัดการระบบ (คุณสามารถเปลี่ยนภายหลัง)
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
 DocType: Serial No,Maintenance Status,สถานะการบำรุงรักษา
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,รายการและราคา
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,รายการและราคา
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},จากวันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่าตั้งแต่วันที่ = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,เลือกพนักงานสำหรับคนที่คุณกำลังสร้างการประเมิน
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},ศูนย์ต้นทุน {0} ไม่ได้เป็นของ บริษัท {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,รายการราคา จะต้องใช้ได้กับ การซื้อ หรือการขาย
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},วันที่ การติดตั้ง ไม่สามารถ ก่อนวันที่ จัดส่ง สินค้า {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),ส่วนลดราคา Rate (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,เริ่มต้น
-DocType: User,First Name,ชื่อแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,หล่อเต็มแม่พิมพ์
 DocType: Offer Letter,Select Terms and Conditions,เลือกข้อตกลงและเงื่อนไข
 DocType: Production Planning Tool,Sales Orders,ใบสั่งขาย
 DocType: Purchase Taxes and Charges,Valuation,การประเมินค่า
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,บัญชีเงินฝาก
 DocType: Leave Type,Allow Negative Balance,อนุญาตให้ยอดคงเหลือติดลบ
 DocType: Selling Settings,Default Territory,ดินแดนเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,โทรทัศน์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,โทรทัศน์
 DocType: Production Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ถ้าพูดถึงไม่ได้มาตรฐานลูกหนี้บังคับ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,สำหรับ คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,ที่ได้รับใน
 DocType: Sales Partner,Reseller,ผู้ค้าปลีก
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,กรุณาใส่ บริษัท
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 DocType: Lead,Address & Contact,ที่อยู่และติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
 DocType: Newsletter List,Total Subscribers,สมาชิกทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,ชื่อผู้ติดต่อ
+,Contact Name,ชื่อผู้ติดต่อ
 DocType: Production Plan Item,SO Pending Qty,ดังนั้นรอจำนวน
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,ขอซื้อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,ที่อยู่อาศัยที่มีเตียงคู่
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,ใบต่อปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,ใบต่อปี
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรีส์
 DocType: Time Log,Will be updated when batched.,จะมีการปรับปรุงเมื่อ batched
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,แถว {0}: โปรดตรวจสอบ 'เป็นล่วงหน้า' กับบัญชี {1} ถ้านี้เป็นรายการล่วงหน้า
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},คลังสินค้า {0} ไม่ได้เป็นของ บริษัท {1}
-DocType: Bulk Email,Message,ข่าวสาร
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
-DocType: Dropbox Backup,Dropbox Access Key,ที่สำคัญในการเข้าถึง Dropbox
 DocType: Payment Tool,Reference No,อ้างอิง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,ประจำปี
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
 DocType: Material Request Item,Min Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Lead,Do Not Contact,ไม่ ติดต่อ
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID ไม่ซ้ำกันสำหรับการติดตามใบแจ้งหนี้ที่เกิดขึ้นทั้งหมด มันถูกสร้างขึ้นเมื่อส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,นักพัฒนาซอฟต์แวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,นักพัฒนาซอฟต์แวร์
 DocType: Item,Minimum Order Qty,จำนวนสั่งซื้อขั้นต่ำ
 DocType: Pricing Rule,Supplier Type,ประเภทผู้ผลิต
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,แปรงลวด
 DocType: Employee,Relation,ความสัมพันธ์
 DocType: Shipping Rule,Worldwide Shipping,การจัดส่งสินค้าทั่วโลก
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
 DocType: Maintenance Schedule,Generate Schedule,สร้างตาราง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,หัวหน้าค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,กรุณาเลือก ประเภท ค่าใช้จ่าย ครั้งแรก
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ล่าสุด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,สูงสุด 5 ตัวอักษร
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,เลือกภาษา ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,สูงสุด 5 ตัวอักษร
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,อนุมัติไว้ครั้งแรกในรายการจะถูกกำหนดเป็นค่าเริ่มต้นอนุมัติไว้
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",ปิดการใช้งานการสร้างบันทึกเวลากับการสั่งซื้อการผลิต การดำเนินงานจะไม่ได้รับการติดตามกับใบสั่งผลิต
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,แตกต่างจาก
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,รายการ {0} จะต้อง บริการ รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
-DocType: DocType,Administrator,ผู้บริหาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,การขุดเจาะด้วยเลเซอร์
-DocType: Stock UOM Replace Utility,New Stock UOM,ใหม่ UOM สต็อก
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
-DocType: Communication,Closed,ปิด
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ในคำพูดของ (ส่งออก) จะปรากฏเมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
 DocType: Lead,Industry,อุตสาหกรรม
 DocType: Employee,Job Profile,รายละเอียด งาน
 DocType: Newsletter,Newsletter,จดหมายข่าว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,การกอดคอ
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,รายการที่ มีการปรับปรุง
-DocType: Async Task,System Manager,จัดการระบบ
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
 DocType: Sales Invoice Item,Delivery Note,หมายเหตุจัดส่งสินค้า
-DocType: Dropbox Backup,Allow Dropbox Access,ที่อนุญาตให้เข้าถึง Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,การตั้งค่าภาษี
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} เข้ามา เป็นครั้งที่สอง ใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,กรุณาเลือกเดือนและปี
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,อีเมล์ บริษัท
 DocType: GL Entry,Debit Amount in Account Currency,จำนวนเงินเดบิตในสกุลเงินในบัญชี
 DocType: Shipping Rule,Valid for Countries,ที่ถูกต้องสำหรับประเทศ
-DocType: Workflow State,Refresh,รีเฟรช
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","ทุก สาขา ที่เกี่ยวข้องกับ การนำเข้า เช่น สกุลเงิน อัตราการแปลง ทั้งหมด นำเข้า นำเข้า อื่น ๆ รวมใหญ่ ที่มีอยู่ใน การซื้อ ใบเสร็จรับเงิน ใบเสนอราคา ของผู้ผลิต , การสั่งซื้อ ใบแจ้งหนี้ ใบสั่งซื้อ ฯลฯ"
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
+apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,อัตราที่สกุลเงินลูกค้าจะแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","ที่มีจำหน่ายใน BOM , หมายเหตุ การจัดส่ง ใบแจ้งหนี้ การซื้อ , การผลิต สั่งซื้อ สั่ง ซื้อ รับซื้อ , ขายใบแจ้งหนี้ การขายสินค้า สต็อก เข้า Timesheet"
 DocType: Item Tax,Tax Rate,อัตราภาษี
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,เลือกรายการ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,เลือกรายการ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","รายการ: {0} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,ใบเสร็จรับเงินจะต้องส่ง
-DocType: Stock UOM Replace Utility,Current Stock UOM,UOM ต็อกสินค้าปัจจุบัน
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,ที่อยู่ อีเมลของคุณ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,โปรดดูสิ่งที่แนบมา
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,ตัดดำน้ำ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
 ,Finished Goods,สินค้า สำเร็จรูป
 DocType: Delivery Note,Instructions,คำแนะนำ
 DocType: Quality Inspection,Inspected By,การตรวจสอบโดย
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,โปรดอย่าสร้างบัญชีสำหรับลูกค้าและซัพพลายเออร์ พวกเขาจะสร้างขึ้นโดยตรงจากลูกค้า / ผู้ผลิตโท
 DocType: Currency Exchange,Currency Exchange,แลกเปลี่ยนเงินตรา
 DocType: Purchase Invoice Item,Item Name,ชื่อรายการ
+DocType: Authorization Rule,Approving User  (above authorized value),อนุมัติผู้ใช้ (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,เครดิตบาลานซ์
 DocType: Employee,Widowed,เป็นม่าย
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",รายการที่จะได้รับการร้องขอซึ่งเป็น &quot;ออกจากสต็อก&quot; พิจารณาโกดังทั้งหมดขึ้นอยู่กับจำนวนที่คาดการณ์ไว้และจำนวนสั่งซื้อขั้นต่ำ
@@ -380,22 +348,21 @@
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
 DocType: Workstation,Consumable Cost,ค่าใช้จ่ายที่ สิ้นเปลือง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) จะต้องมีบทบาท 'ออกอนุมัติ'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,ทางการแพทย์
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,เหตุผล สำหรับการสูญเสีย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,ประดับด้วยลูกปัดหลอด
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 DocType: Employee,Single,เดียว
 DocType: Issue,Attachment,ความผูกพัน
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,งบประมาณไม่สามารถตั้งค่าสำหรับศูนย์ต้นทุนกลุ่ม
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
 DocType: Purchase Invoice,Yearly,ประจำปี
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
 DocType: Journal Entry Account,Sales Order,สั่งซื้อขาย
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,เฉลี่ย อัตราการขาย
 DocType: Purchase Order,Start date of current order's period,วันที่เริ่มต้นของระยะเวลาการสั่งซื้อในปัจจุบัน
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},จำนวน ไม่สามารถเป็น ส่วนหนึ่ง ในแถวที่ {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},จำนวน ไม่สามารถเป็น ส่วนหนึ่ง ในแถวที่ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
 DocType: Delivery Note,% Installed,% ที่ติดตั้งแล้ว
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,มีกลุ่ม
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,ตั้งโดยอัตโนมัติอนุกรมเลขที่อยู่บนพื้นฐานของ FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ผู้ตรวจสอบใบแจ้งหนี้จำนวนเอกลักษณ์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,ตัด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;to คดีหมายเลข&#39; ไม่สามารถจะน้อยกว่า &#39;จากคดีหมายเลข&#39;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,องค์กรไม่แสวงหากำไร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,องค์กรไม่แสวงหากำไร
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,ยังไม่เริ่มต้น
 DocType: Lead,Channel Partner,พันธมิตรช่องทาง
 DocType: Account,Old Parent,ผู้ปกครองเก่า
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,นาย ฮอลิเดย์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,ปั้นเชลล์
 DocType: Material Request Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,กรุณากรอก รหัสสินค้า
 DocType: BOM,Costing,ต้นทุน
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,จำนวนรวม
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,ช่วง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,หลักทรัพย์และ เงินฝาก
 DocType: Features Setup,Imports,การนำเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,ทำให้ติด
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Job Opening,Description of a Job Opening,คำอธิบายของการเปิดงาน
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,บันทึกการเข้าร่วมประชุม
 DocType: Bank Reconciliation,Journal Entries,บันทึกรายการแบบรวม
 DocType: Sales Order Item,Used for Production Plan,ที่ใช้ในการวางแผนการผลิต
-DocType: System Settings,Loading...,กำลังโหลด ...
-DocType: DocField,Password,รหัสผ่าน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,การสร้างแบบจำลองการสะสมผสม
 DocType: Manufacturing Settings,Time Between Operations (in mins),เวลาระหว่างการดำเนินงาน (ในนาที)
 DocType: Customer,Buyer of Goods and Services.,ผู้ซื้อสินค้าและบริการ
 DocType: Journal Entry,Accounts Payable,บัญชีเจ้าหนี้
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,เพิ่มสมาชิก
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“ ไม่พบข้อมูล
 DocType: Pricing Rule,Valid Upto,ที่ถูกต้องไม่เกิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,รายได้ โดยตรง
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",ไม่สามารถกรอง ตาม บัญชี ถ้า จัดกลุ่มตาม บัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,พนักงานธุรการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,พนักงานธุรการ
 DocType: Payment Tool,Received Or Paid,ที่ได้รับหรือชำระ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,กรุณาเลือก บริษัท
 DocType: Stock Entry,Difference Account,บัญชี ที่แตกต่างกัน
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,เครื่องสำอาง
-DocType: DocField,Type,ชนิด
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
-DocType: Communication,Subject,เรื่อง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,สินค้า
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,รับเหมาช่วงการจัดการ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,ใหม่ UOM ไม่ ต้องเป็นชนิด ทั้ง จำนวน
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,รับเหมาช่วงการจัดการ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,เฟอร์นิเจอร์และ ตารางการแข่งขัน
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,ความต้องการวัสดุ
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,รายการที่ {0} ไม่ได้ ซื้อ สินค้า
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} เป็นที่อยู่อีเมลที่ไม่ถูกต้องใน 'ประกาศ \
  ที่อยู่อีเมลล์'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,การเรียกเก็บเงินรวมในปีนี้:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,การเรียกเก็บเงินรวมในปีนี้:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",ไม่สามารถลบไม่มี Serial {0} เป็นมันถูกนำมาใช้ในการทำธุรกรรมหุ้น
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),ปิด (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),ปิด (Cr)
 DocType: Serial No,Warranty Period (Days),ระยะเวลารับประกัน (วัน)
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 ,Pending Qty,รอดำเนินการจำนวน
 DocType: Job Applicant,Thread HTML,HTML กระทู้
 DocType: Company,Ignore,ไม่สนใจ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
 DocType: Pricing Rule,Valid From,ที่ถูกต้อง จาก
 DocType: Sales Invoice,Total Commission,คณะกรรมการรวม
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** การกระจายรายเดือน ** จะช่วยให้คุณกระจายงบประมาณของคุณในเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
 
  ต้องการกระจายงบประมาณโดยใช้การกระจายนี้ตั้งนี้การกระจายรายเดือน ** ** ** ในศูนย์ต้นทุน **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
-DocType: About Us Settings,Website Manager,เว็บไซต์ผู้จัดการ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,วันเริ่มต้นปีงบประมาณไม่ควรจะสูงกว่าปีงบประมาณที่สิ้นสุดวันที่
 DocType: Warranty Claim,Resolution,ความละเอียด
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},จัดส่ง: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,เรียกเก็บเงินและสถานะการจัดส่ง
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
 DocType: Leave Control Panel,Allocate,จัดสรร
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,ก่อน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,ขายกลับ
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,เลือกขายที่คุณต้องการที่จะสร้างคำสั่งการผลิตสั่งซื้อ
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,ส่วนประกอบเงินเดือน
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,ฐานข้อมูลของลูกค้าที่มีศักยภาพ
+DocType: Authorization Rule,Customer or Item,ลูกค้าหรือรายการ
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,ฐานข้อมูลลูกค้า
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,ไม้ลอย
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะคุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น คุณจะต้องสร้างรายการใหม่ที่จะใช้ที่แตกต่างกันเริ่มต้น UOM
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
-DocType: Event,Wednesday,วันพุธ
 DocType: Sales Invoice,Customer's Vendor,ผู้ขายของลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,การสั่งซื้อการผลิตบังคับ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,การเขียน ข้อเสนอ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,การเขียน ข้อเสนอ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,อีกคนขาย {0} อยู่กับรหัสพนักงานเดียวกัน
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},ข้อผิดพลาด หุ้น ลบ ( {6}) กับ รายการ {0} ใน คลังสินค้า {1} ใน {2} {3} ใน {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,ปีงบประมาณ บริษัท
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,เริ่มต้นอัตราการคิดต้นทุน
 DocType: Maintenance Schedule,Maintenance Schedule,กำหนดการซ่อมบำรุง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,กรุณาติดตั้ง dropbox หลามโมดูล
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,จากการรับซื้อ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,ผู้จัดการ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,จากการรับซื้อ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: SMS Settings,Receiver Parameter,พารามิเตอร์รับ
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,' อยู่ ใน ' และ ' จัดกลุ่มตาม ' ต้องไม่เหมือนกัน
 DocType: Sales Person,Sales Person Targets,ขายเป้าหมายคน
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,ไปยัง
-apps/frappe/frappe/templates/base.html +145,Please enter email address,กรุณากรอกอีเมล์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,หลอดสิ้นสุดการขึ้นรูป
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,แปลงเป็น กลุ่ม
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,วันคงที่
 DocType: Sales Invoice,Packing List,รายการบรรจุ
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,ใบสั่งซื้อให้กับซัพพลายเออร์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,การประกาศ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,การประกาศ
 DocType: Activity Cost,Projects User,ผู้ใช้โครงการ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,ถูกใช้
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} ไม่พบในตารางรายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} ไม่พบในตารางรายละเอียดใบแจ้งหนี้
 DocType: Company,Round Off Cost Center,ออกรอบศูนย์ต้นทุน
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,การบำรุงรักษา ไปที่ {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 DocType: Material Request,Material Transfer,โอนวัสดุ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),เปิด ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},การโพสต์ จะต้องมี การประทับเวลา หลังจาก {0}
-apps/frappe/frappe/config/setup.py +59,Settings,การตั้งค่า
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ที่ดินภาษีต้นทุนและค่าใช้จ่าย
 DocType: Production Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,ขึ้น
 DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,ตั้งชื่อใหม่
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,การดัด
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,อนุญาตให้ผู้ใช้
 DocType: Journal Entry,Bill No,ไม่มีบิล
 DocType: Purchase Invoice,Quarterly,ทุกสามเดือน
 DocType: Selling Settings,Delivery Note Required,หมายเหตุจัดส่งสินค้าที่จำเป็น
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
 DocType: Account,Accounts,บัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,การตลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,ตัดตรง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,การตลาด
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,เพื่อติดตามรายการในเอกสารการขายและการซื้อจาก Nos อนุกรมของพวกเขา นี้สามารถใช้ในการติดตามรายละเอียดการรับประกันของผลิตภัณฑ์
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,คลังสินค้า ปฏิเสธ มีผลบังคับใช้ กับ รายการ regected
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 DocType: Employee,Provide email id registered in company,ให้ ID อีเมลที่ลงทะเบียนใน บริษัท
 DocType: Hub Settings,Seller City,ผู้ขายเมือง
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,ประเภท ต้นไม้
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,ปริมาณและคลังสินค้า
 DocType: Sales Invoice,Commission Rate (%),อัตราค่าคอมมิชชั่น (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","กับคูปองประเภทต้องเป็นหนึ่งในการสั่งซื้อการขาย, การขายใบแจ้งหนี้หรือวารสารเข้า"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,ไม่สามารถหาอัตราแลกเปลี่ยน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,การบินและอวกาศ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,ยินดีต้อนรับ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,การบินและอวกาศ
 DocType: Journal Entry,Credit Card Entry,เข้าบัตรเครดิต
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,ชื่องาน
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,สินค้าที่ได้รับจากผู้จำหน่าย
-DocType: Communication,Open,เปิด
 DocType: Lead,Campaign Name,ชื่อแคมเปญ
 ,Reserved,ที่สงวนไว้
 DocType: Purchase Order,Supply Raw Materials,ซัพพลายวัตถุดิบ
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} ไม่ได้เป็น รายการ สต็อก
 DocType: Mode of Payment Account,Default Account,บัญชีเริ่มต้น
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
-DocType: Contact Us Settings,Address Title,หัวข้อที่อยู่
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,กรุณาเลือก วันหยุด ประจำสัปดาห์
 DocType: Production Order Operation,Planned End Time,เวลาสิ้นสุดการวางแผน
 ,Sales Person Target Variance Item Group-Wise,คน ขาย เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-DocType: Dropbox Backup,Daily,ประจำวัน
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Delivery Note,Customer's Purchase Order No,ใบสั่งซื้อของลูกค้าไม่มี
 DocType: Employee,Cell Number,จำนวนเซลล์
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Auto วัสดุการขอสร้าง
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,พลังงาน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,งบเงินเดือน
 DocType: Item Group,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,บัญชีผู้ใช้ใหม่
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,รายการทางบัญชีสามารถทำกับโหนดใบ คอมเมนต์กับกลุ่มไม่ได้รับอนุญาต
-DocType: ToDo,High,สูง
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
-DocType: User,Male,ชาย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},จำนวน รับซื้อ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Item Attribute Value,Item Attribute Value,รายการค่าแอตทริบิวต์
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,แคมเปญ การขาย
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,ส่วนตัว
 DocType: Expense Claim Detail,Expense Claim Type,เรียกร้องประเภทค่าใช้จ่าย
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,การตั้งค่าเริ่มต้นสำหรับรถเข็น
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","อนุทิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1}, ตรวจสอบว่ามันควรจะถูกดึงเป็นล่วงหน้าในใบแจ้งหนี้นี้"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,เทคโนโลยีชีวภาพ
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","อนุทิน {0} มีการเชื่อมโยงกับการสั่งซื้อ {1}, ตรวจสอบว่ามันควรจะถูกดึงเป็นล่วงหน้าในใบแจ้งหนี้นี้"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,เทคโนโลยีชีวภาพ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,ริม
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Account,Liability,ความรับผิดชอบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Process Payroll,Send Email,ส่งอีเมล์
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,ไม่ได้รับอนุญาต
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;การปรับปรุงสต็อก&#39; ไม่สามารถตรวจสอบได้เพราะรายการที่ไม่ได้จัดส่งผ่านทาง {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,ใบแจ้งหนี้ของฉัน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,ใบแจ้งหนี้ของฉัน
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Purchase Order,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; คุณสมบัติ
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
-DocType: Comment,Reference Name,ชื่ออ้างอิง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: Sales Invoice Item,Target Warehouse,คลังสินค้าเป้าหมาย
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ ขายสินค้า
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
 DocType: Production Order,Item To Manufacture,รายการที่จะผลิต
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,แม่พิมพ์ถาวร
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 DocType: Sales Order Item,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
 DocType: Newsletter,Newsletter Manager,ผู้จัดการจดหมายข่าว
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','กำลังเปิด'
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
 DocType: Expense Claim,Expenses,รายจ่าย
 DocType: Item Variant Attribute,Item Variant Attribute,รายการตัวแปรคุณสมบัติ
 ,Purchase Receipt Trends,ซื้อแนวโน้มใบเสร็จรับเงิน
 DocType: Appraisal,Select template from which you want to get the Goals,เลือกแม่แบบที่คุณต้องการที่จะได้รับเป้าหมาย
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,การวิจัยและพัฒนา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,การวิจัยและพัฒนา
 ,Amount to Bill,จำนวนเงินที่จะเรียกเก็บเงิน
 DocType: Company,Registration Details,รายละเอียดการลงทะเบียน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,ปักหลัก
 DocType: Item,Re-Order Qty,Re สั่งซื้อจำนวน
 DocType: Leave Block List Date,Leave Block List Date,ฝากวันที่รายการบล็อก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},กำหนดให้ ส่งไปที่ {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,หุ้นรายละเอียด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,มูลค่าโครงการ
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,จุดขาย
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},ไม่สามารถดำเนินการ ไปข้างหน้า {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ยอดเงินในบัญชีแล้วในเครดิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เดบิต'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",ยอดเงินในบัญชีแล้วในเครดิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เดบิต'
 DocType: Account,Balance must be,จะต้องมี ความสมดุล
 DocType: Hub Settings,Publish Pricing,เผยแพร่ราคา
 DocType: Notification Control,Expense Claim Rejected Message,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธข้อความ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,เก่ง
 ,Available Qty,จำนวนที่มีจำหน่าย
 DocType: Purchase Taxes and Charges,On Previous Row Total,เมื่อรวมแถวก่อนหน้า
 DocType: Salary Slip,Working Days,วันทำการ
 DocType: Serial No,Incoming Rate,อัตราเข้า
 DocType: Packing Slip,Gross Weight,น้ำหนักรวม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้
 DocType: HR Settings,Include holidays in Total no. of Working Days,รวมถึงวันหยุดในไม่รวม ของวันทําการ
 DocType: Job Applicant,Hold,ถือ
 DocType: Employee,Date of Joining,วันที่ของการเข้าร่วม
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,ดูสมาชิก
 DocType: Purchase Invoice Item,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,พ่นขัด
 DocType: Employee,Ms,ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} จะต้องใช้งาน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
 DocType: Salary Slip,Leave Encashment Amount,ฝากเงินการได้เป็นเงินสด
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน รายการ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,จำนวนที่ต้องการ
 DocType: Bank Reconciliation,Total Amount,รวมเป็นเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
 DocType: Production Planning Tool,Production Orders,คำสั่งซื้อการผลิต
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,ความสมดุลของ ความคุ้มค่า
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,ขายราคาตามรายการ
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,เผยแพร่เพื่อซิงค์รายการ
-DocType: GL Entry,Account Currency,สกุลเงินในบัญชี
+DocType: Bank Reconciliation,Account Currency,สกุลเงินในบัญชี
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,กรุณาระบุบัญชีรอบปิด บริษัท
 DocType: Purchase Receipt,Range,เทือกเขา
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Features Setup,Item Barcode,บาร์โค้ดสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Address,Shop,ร้านค้า
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,เริ่มต้นบัญชีธนาคาร / เงินสดจะถูกปรับปรุงโดยอัตโนมัติในใบแจ้งหนี้ POS เมื่อโหมดนี้ถูกเลือก
 DocType: Employee,Permanent Address Is,ที่อยู่ ถาวร เป็น
 DocType: Production Order Operation,Operation completed for how many finished goods?,การดำเนินการเสร็จสมบูรณ์สำหรับวิธีการหลายสินค้าสำเร็จรูป?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,ยี่ห้อ
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,ยี่ห้อ
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Employee,Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,สั่งซื้อสินค้าสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,รายได้ ทางอ้อม
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,ระบุจำนวนเงินที่ชำระ = จำนวนเงินที่โดดเด่น
-DocType: Contact Us Settings,Address Line 1,ที่อยู่บรรทัดที่ 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,ความแปรปรวน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,ชื่อ บริษัท
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,ความแปรปรวน
+,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,ดูรายการทั้งหมดวิดีโอความช่วยเหลือที่
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,ช่วยให้ผู้ใช้ในการแก้ไขอัตราราคาปกติในการทำธุรกรรม
 DocType: Pricing Rule,Max Qty,แม็กซ์ จำนวน
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,สารเคมี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,สารเคมี
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 DocType: Process Payroll,Select Payroll Year and Month,เลือกเงินเดือนปีและเดือน
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",ไปที่กลุ่มที่เหมาะสม (โดยปกติแอพลิเคชันของกองทุน&gt; สินทรัพย์หมุนเวียน&gt; บัญชีธนาคารและสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ธนาคาร&quot;
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
-DocType: Comment,Unsubscribed,ยกเลิกการสมัคร
 DocType: Opportunity,Walk In,Walk In
 DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,ต้นไม้ ของ ศูนย์ ต้นทุน finanial
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,โอน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,ขาว
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,ขาว
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,แนบ รูปของคุณ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,ทำ
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,แนบ รูปของคุณ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,ทำ
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
-DocType: Workflow State,Stop,หยุด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,เกิดข้อผิดพลาด น่าจะเป็น เหตุผลหนึ่งที่ อาจ เป็นไปได้ว่า คุณ ยังไม่ได้บันทึก ในรูปแบบ โปรดติดต่อ support@erpnext.com ถ้า ปัญหายังคงอยู่
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,รถเข็นของฉัน
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},ประเภทการสั่งซื้อต้องเป็นหนึ่งใน {0}
 DocType: Lead,Next Contact Date,วันที่ถัดไปติดต่อ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,เปิด จำนวน
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,ตัวเลือกหุ้น
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},จำนวนสำหรับ {0}
 DocType: Leave Application,Leave Application,ฝากแอพลิเคชัน
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,ฝากเครื่องมือการจัดสรร
 DocType: Leave Block List,Leave Block List Dates,ไม่ระบุวันที่รายการบล็อก
 DocType: Company,If Monthly Budget Exceeded (for expense account),หากเกินงบประมาณรายเดือน (สำหรับบัญชีค่าใช้จ่าย)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,การพ่ายแพ้
 DocType: Workstation,Net Hour Rate,อัตราชั่วโมงสุทธิ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ค่าใช้จ่ายใบเสร็จรับเงินลงซื้อ
 DocType: Company,Default Terms,ข้อกำหนดในการเริ่มต้น
 DocType: Packing Slip Item,Packing Slip Item,บรรจุรายการสลิป
 DocType: POS Profile,Cash/Bank Account,เงินสด / บัญชีธนาคาร
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,ยื่น
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,ส่วนลด
 DocType: Features Setup,Purchase Discounts,ส่วนลดการซื้อ
 DocType: Workstation,Wages,ค่าจ้าง
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ ประหยัด
 DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
 DocType: Issue,Issue,ปัญหา
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,บัญชีไม่ตรงกับ บริษัท
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP คลังสินค้า
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
 DocType: BOM Operation,Operation,การทำงาน
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,ค่าใช้จ่ายใน การขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,การซื้อมาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,การซื้อมาตรฐาน
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,ทำรายการสต็อก
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
 DocType: Item,Default Supplier,ผู้ผลิตเริ่มต้น
 DocType: Manufacturing Settings,Over Production Allowance Percentage,การผลิตกว่าร้อยละค่าเผื่อ
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,อัปเดตผ่านทางบันทึกเวลา
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,อายุเฉลี่ย
 DocType: Opportunity,Your sales person who will contact the customer in future,คนขายของคุณที่จะติดต่อกับลูกค้าในอนาคต
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,รายการ บางส่วนของ ซัพพลายเออร์ ของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,รายการ บางส่วนของ ซัพพลายเออร์ ของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 DocType: Company,Default Currency,สกุลเงินเริ่มต้น
 DocType: Contact,Enter designation of this Contact,ใส่ชื่อของเราได้ที่นี่
-DocType: Contact Us Settings,Address,ที่อยู่
 DocType: Expense Claim,From Employee,จากพนักงาน
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
 DocType: Journal Entry,Make Difference Entry,ทำรายการที่แตกต่าง
 DocType: Upload Attendance,Attendance From Date,ผู้เข้าร่วมจากวันที่
 DocType: Appraisal Template Goal,Key Performance Area,พื้นที่การดำเนินงานหลัก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,การขนส่ง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,การขนส่ง
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,และปี:
 DocType: Email Digest,Annual Expense,ค่าใช้จ่ายประจำปี
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form รายละเอียดใบแจ้งหนี้
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,กระทบยอดใบแจ้งหนี้การชำระเงิน
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,เงินสมทบ%
 DocType: Item,website page link,การเชื่อมโยงหน้าเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,ลองจัดเตรียมระบบสำหรับการใช้งานครั้งแรก
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,เลขทะเบียน บริษัท สำหรับการอ้างอิงของคุณ ตัวเลขภาษี ฯลฯ
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,เลือกบันทึกเวลา และส่งมาเพื่อสร้างเป็นใบแจ้งหนี้การขายใหม่
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,ขายใบแจ้งหนี้ล่วงหน้า
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,ไม่มีอะไรที่จะ ขอ
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,การจัดการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,การจัดการ
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,ประเภทของกิจกรรมสำหรับแผ่นเวลา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,การหล่อการลงทุน
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},ทั้ง บัตรเดบิตหรือ เครดิต เงิน เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,ใช้งาน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,สีน้ำเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,สีน้ำเงิน
 DocType: Purchase Invoice,Is Return,คือการกลับมา
 DocType: Price List Country,Price List Country,ราคาประเทศ
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,โหนด เพิ่มเติมสามารถ ถูกสร้างขึ้น ภายใต้ โหนด ' กลุ่ม ประเภท
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},รายละเอียด POS {0} สร้างไว้แล้วสำหรับผู้ใช้: {1} และ บริษัท {2}
 DocType: Purchase Order Item,UOM Conversion Factor,ปัจจัยการแปลง UOM
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,การผลิตวัตถุลามิเนต
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,ฐานข้อมูลผู้ผลิต
 DocType: Account,Balance Sheet,งบดุล
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,ยืดการขึ้นรูป
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,คนขายของคุณจะรับการแจ้งเตือนในวันนี้ที่จะติดต่อลูกค้า
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,ภาษีและอื่น ๆ หักเงินเดือน
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
 DocType: Account,Warehouse,คลังสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
 ,Purchase Order Items To Be Billed,รายการใบสั่งซื้อที่จะได้รับจำนวนมากที่สุด
 DocType: Purchase Invoice Item,Net Rate,อัตราการสุทธิ
 DocType: Purchase Invoice Item,Purchase Invoice Item,สั่งซื้อสินค้าใบแจ้งหนี้
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,รายการบัญชีแยกประเภทหุ้นและ GL รายการที่ reposted สำหรับซื้อรายรับที่เลือก
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,รายการที่ 1
 DocType: Holiday,Holiday,วันหยุด
-DocType: Event,Saturday,วันเสาร์
 DocType: Leave Control Panel,Leave blank if considered for all branches,เว้นไว้หากพิจารณาสำหรับทุกสาขา
 ,Daily Time Log Summary,สรุปบันทึกเวลาประจำวัน
-DocType: DocField,Label,ฉลาก
 DocType: Payment Reconciliation,Unreconciled Payment Details,รายละเอียดการชำระเงิน Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
 DocType: Lead,Call,โทรศัพท์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,การตั้งค่าพนักงาน
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","ตาราง """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,การวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,การวิจัย
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Contact,User ID,รหัสผู้ใช้
-DocType: Communication,Sent,ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,ดู บัญชีแยกประเภท
-DocType: File,Lft,ซ้าย
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
-DocType: Communication,Delivery Status,สถานะการจัดส่งสินค้า
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 DocType: Production Order,Manufacture against Sales Order,การผลิตกับการสั่งซื้อการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,รายละเอียดสินค้า
 DocType: Payment Tool,Payment Mode,วิธีการชำระเงิน
 DocType: Purchase Invoice,Is Recurring,เป็นที่เกิดขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,โลหะโดยตรงเผาเลเซอร์
 DocType: Purchase Order,Supplied Items,จัดรายการ
 DocType: Production Order,Qty To Manufacture,จำนวนการผลิต
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,รักษาอัตราเดียวกันตลอดวงจรการซื้อ
 DocType: Opportunity Item,Opportunity Item,รายการโอกาส
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,เปิดชั่วคราว
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,ยอดคงเหลือพนักงานออก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
 DocType: Address,Address Type,ประเภทของที่อยู่
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,เล็ก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,เล็ก
 DocType: Employee,Employee Number,จำนวนพนักงาน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},กรณีที่ ไม่ ( s) การใช้งานแล้ว ลอง จาก กรณี ไม่มี {0}
 ,Invoiced Amount (Exculsive Tax),จำนวนเงินที่ ออกใบแจ้งหนี้ ( Exculsive ภาษี )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,รายการที่ 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,หัวบัญชีสำหรับ {0} ได้ถูกสร้างขึ้น
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,สีเขียว
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,สีเขียว
 DocType: Item,Auto re-order,Auto สั่งซื้อใหม่
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,รวมประสบความสำเร็จ
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,รวมประสบความสำเร็จ
 DocType: Employee,Place of Issue,สถานที่ได้รับการรับรอง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,สัญญา
-DocType: Report,Disabled,พิการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,สัญญา
+DocType: Email Digest,Add Quote,เพิ่มอ้าง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,การเกษตร
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,สินค้า หรือ บริการของคุณ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
 DocType: Journal Entry Account,Purchase Order,ใบสั่งซื้อ
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลการติดต่อคลังสินค้า
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,ชื่อจะต้อง
 DocType: Purchase Invoice,Recurring Type,ประเภทที่เกิดขึ้น
 DocType: Address,City/Town,เมือง / จังหวัด
 DocType: Email Digest,Annual Income,รายได้ต่อปี
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,รายการ {0} จะต้องเป็น รายการ ย่อย หด
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,อุปกรณ์ ทุน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,วันที่จัดส่งสินค้าที่คาดว่าจะน้อยกว่าวันเริ่มต้นการวางแผน
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
 DocType: Purchase Invoice,Grand Total (Company Currency),แกรนด์รวม (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,ขาออกทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","มีเพียงสามารถเป็น สภาพ กฎ การจัดส่งสินค้า ที่มี 0 หรือ ค่าว่าง สำหรับ "" ค่า """
 DocType: Authorization Rule,Transaction,การซื้อขาย
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,หมายเหตุ : ศูนย์ต้นทุน นี้เป็น กลุ่ม ไม่สามารถสร้าง รายการบัญชี กับ กลุ่ม
-apps/frappe/frappe/config/desk.py +7,Tools,เครื่องมือ
 DocType: Item,Website Item Groups,กลุ่มรายการเว็บไซต์
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,จำนวนการสั่งซื้อการผลิตมีผลบังคับใช้สำหรับวัตถุประสงค์หุ้นรายการผลิต
 DocType: Purchase Invoice,Total (Company Currency),รวม (บริษัท สกุลเงิน)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,บันทึกรายการค้า
 DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตชัน
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
 DocType: Sales Partner,Target Distribution,การกระจายเป้าหมาย
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,ความเห็น
 DocType: Salary Slip,Bank Account No.,เลขที่บัญชีธนาคาร
 DocType: Naming Series,This is the number of the last created transaction with this prefix,นี่คือหมายเลขของรายการที่สร้างขึ้นล่าสุดกับคำนำหน้านี้
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},อัตรา การประเมิน ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},อัตรา การประเมิน ที่จำเป็นสำหรับ รายการ {0}
 DocType: Quality Inspection Reading,Reading 8,อ่าน 8
 DocType: Sales Partner,Agent,ตัวแทน
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",รวม {0} สำหรับทุกรายการเป็นศูนย์คุณอาจจะเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,ภาษีและการคำนวณค่าใช้จ่าย
 DocType: BOM Operation,Workstation,เวิร์คสเตชั่
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,ฮาร์ดแวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,ฮาร์ดแวร์
 DocType: Attendance,HR Manager,HR Manager
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,กรุณาเลือก บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,สิทธิ ออก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,ไม่มีข้อมูล
 DocType: Appraisal Template Goal,Appraisal Template Goal,เป้าหมายเทมเพลทประเมิน
 DocType: Salary Slip,Earning,รายได้
 DocType: Payment Tool,Party Account Currency,พรรคบัญชีเงินฝากเงินตรา
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,เงื่อนไข ที่ทับซ้อนกัน ระหว่าง พบ :
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,มูลค่าการสั่งซื้อทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,อาหาร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,อาหาร
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ช่วงสูงอายุ 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,คุณสามารถสร้างบันทึกเวลา กับคำสั่งผลิตที่บันทึกไว้แล้วเท่านั้น
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",จดหมายข่าวไปยังรายชื่อนำไปสู่
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,การดำเนินงานที่ไม่สามารถปล่อยให้ว่างไว้
 ,Delivered Items To Be Billed,รายการที่ส่งไปถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
-DocType: DocField,Description,ลักษณะ
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
-DocType: Letter Head,Is Default,เป็นค่าเริ่มต้น
 DocType: Address,Utilities,ยูทิลิตี้
 DocType: Purchase Invoice Item,Accounting,การบัญชี
 DocType: Features Setup,Features Setup,การติดตั้งสิ่งอำนวยความสะดวก
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,ดูจดหมายเสนอ
-DocType: Communication,Communication,การสื่อสาร
 DocType: Item,Is Service Item,รายการบริการเป็น
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
 DocType: Activity Cost,Projects,โครงการ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,กรุณาเลือก ปีงบประมาณ
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},จาก {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,รักษาสต็อก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 DocType: Leave Control Panel,Leave blank if considered for all designations,เว้นไว้หากพิจารณากำหนดทั้งหมด
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},แม็กซ์: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,จาก Datetime
 DocType: Email Digest,For Company,สำหรับ บริษัท
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,ไม่สามารถจะมากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,รายการสิ่งที่ต้องทำ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,เด็กฝึกงาน
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,เด็กฝึกงาน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,จำนวน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","ตารางรายละเอียดภาษีเรียกจากต้นแบบรายการเป็นสตริงและเก็บไว้ในฟิลด์นี้
  ใช้สำหรับภาษีและค่าใช้จ่าย"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,การกรีด
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ธนาคาร Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,ไม่มีโครงสร้างเงินเดือนที่ต้องการใช้งานพบว่าพนักงาน {0} และเดือน
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
 DocType: Journal Entry Account,Account Balance,ยอดเงินในบัญชี
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
 DocType: Rename Tool,Type of document to rename.,ประเภทของเอกสารที่จะเปลี่ยนชื่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,เราซื้อ รายการ นี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,เราซื้อ รายการ นี้
 DocType: Address,Billing,การเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,จับเจ่า
-DocType: Bulk Email,Not Sent,ส่งไม่ได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,ระเบิดขึ้นรูป
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),รวมภาษีและค่าบริการ (สกุลเงิน บริษัท )
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,กำหนดให้ ส่งไปที่ {0} ผู้รับ
 DocType: Quality Inspection,Readings,อ่าน
 DocType: Stock Entry,Total Additional Costs,รวมค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,ประกอบ ย่อย
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,ประกอบ ย่อย
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Supplier,Stock Manager,ผู้จัดการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,นักวิเคราะห์
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่ JV {2}
 DocType: Item,Inventory,รายการสินค้า
 DocType: Features Setup,"To enable ""Point of Sale"" view",ต้องการเปิดใช้งาน &quot;จุดขาย&quot; มุมมอง
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,การชำระเงินไม่สามารถทำรถว่างเปล่า
 DocType: Item,Sales Details,รายละเอียดการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,ปักหมุด
 DocType: Opportunity,With Items,กับรายการ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,ใน จำนวน
 DocType: Notification Control,Expense Claim Rejected,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธ
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",วันที่ใบแจ้งหนี้ต่อไปจะถูกสร้างขึ้น มันถูกสร้างขึ้นบนส่ง
 DocType: Item Attribute,Item Attribute,รายการแอตทริบิวต์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,รายการที่แตกต่าง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,รัฐบาล
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,รายการที่แตกต่าง
 DocType: Company,Services,การบริการ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),รวม ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),รวม ({0})
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,วันเริ่มต้น ปี การเงิน
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Material Request Item,Sales Order No,สั่งซื้อยอดขาย
 DocType: Item Group,Item Group Name,ชื่อกลุ่มสินค้า
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,ยึด
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,วัสดุการโอนเงินสำหรับการผลิต
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",ไม่พบราคาซื้อของรายการ: {0} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),จำนวนส่วนลดเพิ่มเติม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},ข้อผิดพลาด: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,กรุณาสร้างบัญชีใหม่ จากผังบัญชี
 DocType: Maintenance Visit,Maintenance Visit,ชมการบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,ลูกค้า> กลุ่มลูกค้า> มณฑล
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,จำนวนชุดที่โกดัง
 DocType: Time Log Batch Detail,Time Log Batch Detail,รายละเอียดชุดบันทึกเวลา
-DocType: Workflow State,Tasks,งาน
 DocType: Landed Cost Voucher,Landed Cost Help,Landed ช่วยเหลือค่าใช้จ่าย
-DocType: Event,Tuesday,วันอังคาร
 DocType: Leave Block List,Block Holidays on important days.,วันหยุดที่ถูกบล็อกในวันสำคัญ
 ,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},ใบสำหรับประเภท {0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
 DocType: UOM,UOM Name,ชื่อ UOM
-DocType: Top Bar Item,Target,เป้า
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,จํานวนเงินสมทบ
 DocType: Sales Invoice,Shipping Address,ที่อยู่จัดส่ง
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,เครื่องมือนี้จะช่วยให้คุณในการปรับปรุงหรือแก้ไขปริมาณและมูลค่าของหุ้นในระบบ มันมักจะใช้ในการประสานระบบค่าและสิ่งที่มีอยู่จริงในคลังสินค้าของคุณ
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,ต้นแบบแบรนด์
-DocType: ToDo,Due Date,วันที่ครบกำหนด
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,ต้นแบบแบรนด์
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,กล่อง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,องค์การ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,กล่อง
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,องค์การ
 DocType: Monthly Distribution,Monthly Distribution,การกระจายรายเดือน
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
 DocType: Production Plan Sales Order,Production Plan Sales Order,แผนสั่งซื้อขาย
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},รายการบัญชีสำหรับ {0} สามารถทำได้ในสกุลเงิน: {1}
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},แถว # {0}: กลับรายการ {1} ไม่อยู่ใน {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,บัญชีธนาคาร
 ,Bank Reconciliation Statement,งบกระทบยอดธนาคาร
 DocType: Address,Lead Name,ชื่อช่องทาง
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,เปิดหุ้นคงเหลือ
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,เปิดหุ้นคงเหลือ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} ต้องปรากฏเพียงครั้งเดียว
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ไม่อนุญาตให้โอนมากขึ้น {0} กว่า {1} กับใบสั่งซื้อ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},ใบ จัดสรร ประสบความสำเร็จ ในการ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ไม่มี รายการ ที่จะแพ็ค
 DocType: Shipping Rule Condition,From Value,จากมูลค่า
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,จำนวนเงินไม่ได้สะท้อนให้เห็นในธนาคาร
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,จำนวนเงินไม่ได้สะท้อนให้เห็นในธนาคาร
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,หล่อแบบแรงเหวี่ยง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,การตกแต่งสนามแม่เหล็กช่วย
 DocType: Company,Default Holiday List,เริ่มต้นรายการที่ฮอลิเดย์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,หนี้สิน หุ้น
 DocType: Purchase Receipt,Supplier Warehouse,คลังสินค้าผู้จัดจำหน่าย
 DocType: Opportunity,Contact Mobile No,เบอร์มือถือไม่มี
 DocType: Production Planning Tool,Select Sales Orders,เลือกคำสั่งซื้อขาย
 ,Material Requests for which Supplier Quotations are not created,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,เพื่อติดตามรายการโดยใช้บาร์โค้ด คุณจะสามารถป้อนรายการในหมายเหตุจัดส่งสินค้าและขายใบแจ้งหนี้โดยการสแกนบาร์โค้ดของรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,มาร์คส่ง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,มาร์คส่ง
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,ทำให้ใบเสนอราคา
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} ดู
 DocType: Salary Structure Deduction,Salary Structure Deduction,หักโครงสร้างเงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,เผาเลเซอร์เลือก
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,นำ ที่ประสบความสำเร็จ
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),อายุ (วัน)
 DocType: Quotation Item,Quotation Item,รายการใบเสนอราคา
 DocType: Account,Account Name,ชื่อบัญชี
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,จากวันที่ไม่สามารถจะมากกว่านัด
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,อนุกรม ไม่มี {0} ปริมาณ {1} ไม่สามารถเป็น ส่วนหนึ่ง
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,ประเภท ผู้ผลิต หลัก
 DocType: Purchase Order Item,Supplier Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,เพิ่ม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,อัตราการแปลง ไม่สามารถเป็น 0 หรือ 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} จะถูกยกเลิกหรือหยุด
 DocType: Accounts Settings,Credit Controller,ควบคุมเครดิต
 DocType: Delivery Note,Vehicle Dispatch Date,วันที่ส่งรถ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,รับซื้อ {0} ไม่ได้ ส่ง
 DocType: Company,Default Payable Account,เริ่มต้นเจ้าหนี้การค้า
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",การตั้งค่าสำหรับตะกร้าช้อปปิ้งออนไลน์เช่นกฎการจัดส่งรายการราคา ฯลฯ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้ง เสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,สงวนไว้ จำนวน
 DocType: Party Account,Party Account,บัญชีพรรค
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,ทรัพยากรบุคคล
 DocType: Lead,Upper Income,รายได้บน
 DocType: Journal Entry Account,Debit in Company Currency,เดบิตใน บริษัท สกุล
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,ปัญหาของฉัน
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,เริ่มต้นค่า
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,แถว {0}: จำนวนการชำระเงินไม่สามารถเป็นเชิงลบ
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,กดที่เหมาะสม
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 DocType: Payment Reconciliation,Payments,วิธีการชำระเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,isostatic ร้อนกด
-DocType: ToDo,Medium,กลาง
 DocType: Budget Detail,Budget Allocated,งบประมาณที่จัดสรร
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,การชำระเงินของธนาคารปรับปรุงวันที่มีวารสาร
 DocType: Quotation,Term Details,รายละเอียดคำ
 DocType: Manufacturing Settings,Capacity Planning For (Days),การวางแผนสำหรับความจุ (วัน)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
 DocType: Warranty Claim,Warranty Claim,รับประกันเรียกร้อง
 ,Lead Details,รายละเอียดของช่องทาง
-DocType: Authorization Rule,Approving User,อนุมัติผู้ใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,ปลอม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,การชุบ
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
 DocType: Pricing Rule,Applicable For,สามารถใช้งานได้ สำหรับ
 DocType: Bank Reconciliation,From Date,จากวันที่
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,การประมูล ออนไลน์
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,โปรดระบุ ทั้ง จำนวน หรือ อัตรา การประเมิน หรือทั้งสองอย่าง
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",บริษัท เดือน และ ปีงบประมาณ มีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ขอวัสดุที่ใช้เพื่อให้รายการสินค้านี้
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,หน่วยเดียวของรายการ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',ต้อง 'ส่ง' ชุดบันทึกเวลา {0}
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ทำให้ รายการ บัญชี สำหรับ ทุก การเคลื่อนไหวของ หุ้น
 DocType: Leave Allocation,Total Leaves Allocated,ใบรวมจัดสรร
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},โกดังสินค้าจำเป็นที่แถวไม่มี {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,กรุณากรอกเริ่มต้นปีงบการเงินที่ถูกต้องและวันที่สิ้นสุด
 DocType: Employee,Date Of Retirement,วันที่ของการเกษียณอายุ
 DocType: Upload Attendance,Get Template,รับแม่แบบ
 DocType: Address,Postal,ไปรษณีย์
 DocType: Item,Weightage,weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,การทำเหมืองแร่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,การหล่อเรซิ่น
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,กรุณาเลือก {0} ครั้งแรก
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},ข้อความ {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},ข้อความ {0}
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,ใบเสร็จรับเงินวัสดุ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,ผลิตภัณฑ์
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,ผลิตภัณฑ์
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้ {0}
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",หากรายการนี้มีสายพันธุ์แล้วมันไม่สามารถเลือกในการสั่งซื้อการขายอื่น ๆ
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",หากรายการนี้มีสายพันธุ์แล้วมันไม่สามารถเลือกในการสั่งซื้อการขายอื่น ๆ
 DocType: Lead,Next Contact By,ติดต่อถัดไป
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},คลังสินค้า {0} ไม่สามารถลบได้ เป็น ปริมาณ ที่มีอยู่สำหรับ รายการ {1}
 DocType: Quotation,Order Type,ประเภทสั่งซื้อ
 DocType: Purchase Invoice,Notification Email Address,ที่อยู่อีเมลการแจ้งเตือน
 DocType: Payment Tool,Find Invoices to Match,ค้นหาใบแจ้งหนี้เพื่อให้ตรงกับ
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","เช่น ""XYZ ธนาคารแห่งชาติ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","เช่น ""XYZ ธนาคารแห่งชาติ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,คือภาษีนี้รวมอยู่ในอัตราขั้นพื้นฐาน?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,เป้าหมายรวม
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,เป้าหมายรวม
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,รถเข็นถูกเปิดใช้งาน
 DocType: Job Applicant,Applicant for a Job,สำหรับผู้สมัครงาน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,ไม่มี ใบสั่ง ผลิต สร้างขึ้น
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,สลิป เงินเดือน ของ พนักงาน {0} สร้างไว้แล้ว ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,สลิป เงินเดือน ของ พนักงาน {0} สร้างไว้แล้ว ในเดือนนี้
 DocType: Stock Reconciliation,Reconciliation JSON,JSON สมานฉันท์
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Sales Invoice Item,Batch No,หมายเลขชุด
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,หลัก
-DocType: DocPerm,Delete,ลบ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,ตัวแปร
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},ใหม่ {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,เพื่อ หยุด ไม่สามารถยกเลิกได้ เปิดจุก ที่จะยกเลิก
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Item,Variants,สายพันธุ์
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,ทำให้ การสั่งซื้อ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,ทำให้ การสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
 DocType: Sales Team,Contribution to Net Total,สมทบสุทธิ
 DocType: Sales Invoice Item,Customer's Item Code,รหัสสินค้าของลูกค้า
 DocType: Stock Reconciliation,Stock Reconciliation,สมานฉันท์สต็อก
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,ผู้สมัครงาน
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
-DocType: Country,Country,ประเทศ
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,ที่อยู่
-DocType: Communication,Received,ที่ได้รับ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ซ้ำ หมายเลขเครื่อง ป้อนสำหรับ รายการ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,เงื่อนไขสำหรับกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,รายการสินค้าที่ไม่ได้รับอนุญาตให้มีการสั่งซื้อการผลิต
-DocType: DocField,Attach Image,แนบ ภาพ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),น้ำหนักสุทธิของแพคเกจนี้ (คำนวณโดยอัตโนมัติเป็นที่รวมของน้ำหนักสุทธิของรายการ)
-DocType: Stock Reconciliation Item,Leave blank if no change,ปล่อยว่างไว้ถ้าไม่มีการเปลี่ยนแปลง
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,บันทึกเวลาในการผลิต
 DocType: Item,Apply Warehouse-wise Reorder Level,สมัครโกดังฉลาดสั่งซื้อใหม่ระดับ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,บันทึกเวลาสำหรับงานต่างๆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,วิธีการชำระเงิน
 DocType: Production Order Operation,Actual Time and Cost,เวลาที่เกิดขึ้นจริงและค่าใช้จ่าย
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ขอ วัสดุ สูงสุด {0} สามารถทำ รายการ {1} กับ การขายสินค้า {2}
 DocType: Employee,Salutation,ประณม
-DocType: Communication,Rejected,ปฏิเสธ
 DocType: Pricing Rule,Brand,ยี่ห้อ
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,กำรายการในเวลาของการขาย
 DocType: Sales Order Item,Actual Qty,จำนวนที่เกิดขึ้นจริง
 DocType: Sales Invoice Item,References,อ้างอิง
 DocType: Quality Inspection Reading,Reading 10,อ่าน 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",รายการสินค้า หรือบริการที่คุณ ซื้อหรือขาย ของคุณ
 DocType: Hub Settings,Hub Node,Hub โหนด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อน รายการที่ซ้ำกัน กรุณา แก้ไข และลองอีกครั้ง
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,มูลค่า {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่า
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,ภาคี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,ภาคี
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,หมดอายุ
 DocType: Packing Slip,To Package No.,กับแพคเกจหมายเลข
-DocType: DocType,System,ระบบ
 DocType: Warranty Claim,Issue Date,วันที่ออก
 DocType: Activity Cost,Activity Cost,ค่าใช้จ่ายในกิจกรรม
 DocType: Purchase Receipt Item Supplied,Consumed Qty,จำนวนการบริโภค
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 DocType: Payment Tool,Make Payment Entry,ทำ รายการ ชำระเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
 ,Sales Invoice Trends,แนวโน้มการขายใบแจ้งหนี้
 DocType: Leave Application,Apply / Approve Leaves,สมัคร / อนุมัติใบ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,สำหรับ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',สามารถดู แถว เฉพาะในกรณีที่ ค่าใช้จ่าย ประเภทคือ ใน แถว หน้า จำนวน 'หรือ' แล้ว แถว รวม
 DocType: Sales Order Item,Delivery Warehouse,คลังสินค้าจัดส่งสินค้า
 DocType: Stock Settings,Allowance Percent,ร้อยละค่าเผื่อ
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",ขายจะต้องตรวจสอบถ้าใช้สำหรับการถูกเลือกเป็น {0}
 DocType: Purchase Order Item,Supplier Quotation Item,รายการใบเสนอราคาของผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,ทำให้ โครงสร้าง เงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,การตัด
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,คลิกที่ &#39;ให้ขายใบแจ้งหนี้&#39; เพื่อสร้างใบแจ้งหนี้การขายใหม่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,บรรจุภัณฑ์และการติดฉลาก
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,โปรดระบุ สกุลเงิน เริ่มต้นใน บริษัท โท และ เริ่มต้น ทั่วโลก
-DocType: Dropbox Backup,Dropbox Access Secret,ความลับในการเข้าถึง Dropbox
 DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,การจัดการโครงการ
 DocType: Supplier,Supplier of Goods or Services.,ผู้ผลิตสินค้าหรือบริการ
 DocType: Budget Detail,Fiscal Year,ปีงบประมาณ
 DocType: Cost Center,Budget,งบ
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,ที่ประสบความสำเร็จ
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,มณฑล / ลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,เช่นผู้ 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับใบแจ้งหนี้ยอดคงค้าง {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,เช่นผู้ 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับใบแจ้งหนี้ยอดคงค้าง {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบแจ้งหนี้การขาย
 DocType: Item,Is Sales Item,รายการขาย
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,กลุ่มสินค้า ต้นไม้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,รายการที่ {0} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
 DocType: Maintenance Visit,Maintenance Time,เวลาการบำรุงรักษา
 ,Amount to Deliver,ปริมาณการส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,สินค้าหรือบริการ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,มีข้อผิดพลาด ได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,แตะ
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,สินค้าหรือบริการ
 DocType: Naming Series,Current Value,ค่าปัจจุบัน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} สร้าง
 DocType: Delivery Note Item,Against Sales Order,กับ การขายสินค้า
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
 DocType: Website Item Group,Website Item Group,กลุ่มสินค้าเว็บไซต์
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,หน้าที่ และภาษี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} รายการชำระเงินไม่สามารถกรองโดย {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ตารางสำหรับรายการที่จะแสดงในเว็บไซต์
 DocType: Purchase Order Item Supplied,Supplied Qty,จำหน่ายจำนวน
 DocType: Material Request Item,Material Request Item,รายการวัสดุขอ
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,ต้นไม้ ของ กลุ่ม รายการ
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,ต้นไม้ ของ กลุ่ม รายการ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
 ,Item-wise Purchase History,ประวัติการซื้อสินค้าที่ชาญฉลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,สีแดง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,สีแดง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
@@ -1636,12 +1512,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสมบูรณ์สำหรับ {2} จำนวนของสินค้าที่เสร็จแล้วตามคำสั่งผลิต # {3} โปรดปรับปรุงสถานะการทำงานผ่านทางบันทึกเวลา
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,เปลี่ยน UOM สำหรับรายการ
 DocType: Quality Inspection Reading,Acceptance Criteria,เกณฑ์การยอมรับ กําหนดเกณฑ์ การยอมรับ
 DocType: Item Attribute,Attribute Name,ชื่อแอตทริบิวต์
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},รายการ {0} จะต้องมี การขายหรือการ บริการ ใน รายการ {1}
 DocType: Item Group,Show In Website,แสดงในเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,กลุ่ม
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,กลุ่ม
 DocType: Task,Expected Time (in hours),เวลาที่คาดว่าจะ (ชั่วโมง)
 ,Qty to Order,จำนวน การสั่งซื้อสินค้า
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","เพื่อติดตามชื่อแบรนด์ในเอกสารดังต่อไปหมายเหตุการจัดส่งสินค้า, โอกาส, วัสดุขอรายการสั่งซื้อ, ซื้อคูปอง, ใบเสร็จรับเงินซื้อใบเสนอราคา, ใบแจ้งหนี้การขาย, Bundle สินค้า, การขายสินค้า, ไม่มี Serial"
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,ตารางที่ชัดเจน
 DocType: Features Setup,Brands,แบรนด์
 DocType: C-Form Invoice Detail,Invoice No,ใบแจ้งหนี้ไม่มี
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,จากการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,จากการสั่งซื้อ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ฝากไม่สามารถใช้ / ยกเลิกก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
 DocType: Activity Cost,Costing Rate,อัตราการคิดต้นทุน
 ,Customer Addresses And Contacts,ที่อยู่ของลูกค้าและการติดต่อ
 DocType: Employee,Resignation Letter Date,วันที่ใบลาออก
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,ยังไม่ได้ระบุ
-DocType: Communication,Date,วันที่
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ซ้ำรายได้ของลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,นั่งตึงตัว ในขณะที่ ระบบของคุณ จะถูก ติดตั้ง ซึ่งอาจใช้เวลา สักครู่
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) จะต้องมีบทบาท 'ค่าใช้จ่ายอนุมัติ'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,คู่
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,คู่
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 DocType: Item,Has Batch No,ชุดมีไม่มี
 DocType: Delivery Note,Excise Page Number,หมายเลขหน้าสรรพสามิต
 DocType: Employee,Personal Details,รายละเอียดส่วนบุคคล
 ,Maintenance Schedules,ตารางการบำรุงรักษา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,ลายนูน
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",ในขณะที่ การผลิต สามารถสั่ง ทำ สำหรับรายการ นี้จะต้อง เป็นรายการ สต็อก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,การร่วม
-DocType: Authorization Rule,Above Value,สูงกว่าค่า
 ,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
 DocType: Purchase Order,Delivered,ส่ง
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับงาน อีเมล์ ของคุณ (เช่น jobs@example.com )
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ใบจัดสรรรวม {0} ไม่สามารถจะน้อยกว่าการอนุมัติแล้วใบ {1} สําหรับงวด
 DocType: Journal Entry,Accounts Receivable,ลูกหนี้
 ,Supplier-Wise Sales Analytics,ผู้ผลิต ฉลาด Analytics ขาย
 DocType: Address Template,This format is used if country specific format is not found,รูปแบบนี้ใช้ในกรณีที่รูปแบบเฉพาะของประเทศจะไม่พบ
-DocType: Custom Field,Custom,ประเพณี
 DocType: Production Order,Use Multi-Level BOM,ใช้ BOM หลายระดับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,การฉีดขึ้นรูป
 DocType: Bank Reconciliation,Include Reconciled Entries,รวมถึง คอมเมนต์ Reconciled
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,ผังต้นไม้ของบัญชีการเงิน
 DocType: Leave Control Panel,Leave blank if considered for all employee types,เว้นไว้หากพิจารณาให้พนักงานทุกประเภท
 DocType: Landed Cost Voucher,Distribute Charges Based On,กระจายค่าใช้จ่ายขึ้นอยู่กับ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,บัญชี {0} ต้องเป็นชนิด ' สินทรัพย์ถาวร ' เป็น รายการ {1} เป็น รายการสินทรัพย์
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
-apps/frappe/frappe/config/setup.py +130,Printing,การพิมพ์
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,วัน(s) ที่ คุณจะใช้สำหรับ การลา เป็น วันหยุด คุณไม่จำเป็นต้อง ใช้สำหรับการ ออก
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,และ
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,กีฬา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,หน่วย
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,โปรดตั้งค่า คีย์ การเข้าถึง Dropbox ใน การตั้งค่า เว็บไซต์ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,หน่วย
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,โปรดระบุ บริษัท
 ,Customer Acquisition and Loyalty,การซื้อ ของลูกค้าและ ความจงรักภักดี
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,คลังสินค้าที่คุณจะรักษาสต็อกของรายการปฏิเสธ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
 DocType: POS Profile,Price List,บัญชีแจ้งราคาสินค้า
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้ก็คือ การเริ่มต้น ปีงบประมาณ กรุณารีเฟรช เบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะ มีผลบังคับใช้
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,ค่าใช้จ่ายในการเรียกร้อง
 DocType: Issue,Support,สนับสนุน
-DocType: Authorization Rule,Approving Role,อนุมัติบทบาท
 ,BOM Search,BOM ค้นหา
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,โปรดระบุสกุลเงินใน บริษัท
 DocType: Workstation,Wages per hour,ค่าจ้างต่อชั่วโมง
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},สมดุลหุ้นใน Batch {0} จะกลายเป็นเชิงลบ {1} สำหรับรายการ {2} ที่โกดัง {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","แสดง / ซ่อน คุณสมบัติเช่น อนุกรม Nos , POS ฯลฯ"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},วันที่ โปรโมชั่น ไม่สามารถเป็น ก่อนวันที่ เช็คอิน แถว {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},วันที่ โปรโมชั่น ไม่สามารถเป็น ก่อนวันที่ เช็คอิน แถว {0}
 DocType: Salary Slip,Deduction,การหัก
 DocType: Address Template,Address Template,แม่แบบที่อยู่
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,ใบเสนอราคา
 DocType: Salary Slip,Total Deduction,หักรวม
 DocType: Quotation,Maintenance User,ผู้ใช้งานบำรุงรักษา
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,รายการ {0} ได้รับ กลับมา แล้ว
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ปีงบประมาณ ** หมายถึงปีทางการเงิน ทุกรายการบัญชีและการทำธุรกรรมอื่น ๆ ที่สำคัญมีการติดตามต่อปี ** ** การคลัง
 DocType: Opportunity,Customer / Lead Address,ลูกค้า / ที่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,รายละเอียดตำแหน่งงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,รายละเอียดตำแหน่งงาน
 DocType: Purchase Order Item,Qty as per Stock UOM,จำนวนตามสต็อก UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,กรุณาเลือก csv ที่ถูกต้อง กับข้อมูล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,การเคลือบผิว
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",ติดตามงานส่งเสริมการขาย ติดตามช่องทาง ใบเสนอราคา ใบสั่งขายต่างๆ ฯลฯ จากงานส่งเสริมการตลาดเพื่อวัดอัตราผลตอบแทนจากการลงทุน
 DocType: Expense Claim,Approver,อนุมัติ
 ,SO Qty,ดังนั้น จำนวน
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ด้วยเหตุนี้คุณจะไม่สามารถกำหนดหรือปรับเปลี่ยนคลังสินค้า
 DocType: Appraisal,Calculate Total Score,คำนวณคะแนนรวม
 DocType: Supplier Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
-apps/erpnext/erpnext/hooks.py +84,Shipments,การจัดส่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,จุ่มปั้น
-DocType: Purchase Order,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
+apps/erpnext/erpnext/hooks.py +68,Shipments,การจัดส่ง
+DocType: Purchase Order Item,To be delivered to customer,ที่จะส่งมอบให้กับลูกค้า
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,ต้องส่งสถานะของบันทึกเวลา
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,การตั้งค่า
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,แถว #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,แถว #
 DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท )
 DocType: Pricing Rule,Supplier,ผู้จัดจำหน่าย
 DocType: C-Form,Quarter,หนึ่งในสี่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,ค่าใช้จ่าย เบ็ดเตล็ด
 DocType: Global Defaults,Default Company,บริษัท เริ่มต้น
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
 DocType: Employee,Bank Name,ชื่อธนาคาร
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,- ขึ้นไป
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,ผู้ใช้ {0} ถูกปิดใช้งาน
 DocType: Leave Application,Total Leave Days,วันที่เดินทางทั้งหมด
-DocType: Journal Entry Account,Credit in Account Currency,เครดิตสกุลเงินในบัญชี
 DocType: Email Digest,Note: Email will not be sent to disabled users,หมายเหตุ: อีเมล์ของคุณจะไม่ถูกส่งไปยังผู้ใช้คนพิการ
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} จำเป็นสำหรับ รายการ {1}
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
-DocType: DocField,Name,ชื่อ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,จำนวนเงินไม่ได้สะท้อนให้เห็นในระบบ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},การสั่งซื้อสินค้า ที่จำเป็นสำหรับการ ขาย สินค้า {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,จำนวนเงินไม่ได้สะท้อนให้เห็นในระบบ
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,คนอื่น ๆ
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0}
 DocType: POS Profile,Taxes and Charges,ภาษีและค่าบริการ
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",สินค้าหรือบริการที่มีการซื้อขายหรือเก็บไว้ในสต็อก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,เสร็จ
-DocType: Web Form,Select DocType,เลือก DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,เจาะ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,การธนาคาร
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,การธนาคาร
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,กรุณา คลิกที่ 'สร้าง ตาราง ' ที่จะได้รับ ตารางเวลา
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,ศูนย์ต้นทุน ใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,ศูนย์ต้นทุน ใหม่
 DocType: Bin,Ordered Quantity,จำนวนสั่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","เช่นผู้ ""สร้าง เครื่องมือสำหรับการ สร้าง """
 DocType: Quality Inspection,In Process,ในกระบวนการ
 DocType: Authorization Rule,Itemwise Discount,ส่วนลด Itemwise
 DocType: Purchase Order Item,Reference Document Type,เอกสารประเภท
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} กับคำสั่งขาย {1}
 DocType: Account,Fixed Asset,สินทรัพย์ คงที่
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,เนื่องสินค้าคงคลัง
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,เนื่องสินค้าคงคลัง
 DocType: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
 DocType: Time Log Batch,Total Billing Amount,การเรียกเก็บเงินจำนวนเงินรวม
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,ลูกหนี้การค้า
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,สร้างบันทึกเวลาเมื่อ:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Employee,Blood Group,กรุ๊ปเลือด
 DocType: Purchase Invoice Item,Page Break,แบ่งหน้า
 DocType: Production Order Operation,Pending,คาราคาซัง
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,ผู้ใช้ที่สามารถอนุมัติพนักงานเฉพาะแอพพลิเคลา
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,คุณไม่สามารถเปลี่ยน UOM เริ่มต้นของตัวแปร ในการเปลี่ยน UOM เริ่มต้นสำหรับการเปลี่ยนแปลงตัวแปรเริ่มต้น UOM ของแม่แบบ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,อุปกรณ์ สำนักงาน
 DocType: Purchase Invoice Item,Qty,จำนวน
 DocType: Fiscal Year,Companies,บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,อิเล็กทรอนิกส์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,อิเล็กทรอนิกส์
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ยกคำขอวัสดุเมื่อหุ้นถึงระดับใหม่สั่ง
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,จาก ตาราง การบำรุงรักษา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,เต็มเวลา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,เต็มเวลา
 DocType: Purchase Invoice,Contact Details,รายละเอียดการติดต่อ
 DocType: C-Form,Received Date,วันที่ได้รับ
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",ถ้าคุณได้สร้างแม่แบบมาตรฐานในการภาษีขายและค่าใช้จ่ายแม่แบบให้เลือกและคลิกที่ปุ่มด้านล่าง
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,เปิดงาน
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,เทคโนโลยี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
 DocType: Offer Letter,Offer Letter,จดหมายเสนอ
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,สร้างคำขอวัสดุ (MRP) และคำสั่งการผลิต
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,รวมใบแจ้งหนี้ Amt
 DocType: Time Log,To Time,ถึงเวลา
+DocType: Authorization Rule,Approving Role (above authorized value),อนุมัติบทบาท (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",ในการเพิ่ม โหนด เด็ก สำรวจ ต้นไม้ และคลิกที่ โหนด ตามที่ คุณต้องการเพิ่ม โหนด เพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
 DocType: Production Order Operation,Completed Qty,จำนวนเสร็จ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,ลูกค้ารหัสสินค้า
 DocType: Opportunity,Lost Reason,เหตุผลที่หายไป
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,สร้างรายการการชำระเงินกับคำสั่งซื้อหรือใบแจ้งหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,การเชื่อมโลหะ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,มาใหม่พร้อมส่ง UOM จะต้อง
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',โปรดระบุที่ถูกต้อง &#39;จากคดีหมายเลข&#39;
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
 DocType: Features Setup,Item Serial Nos,Nos อนุกรมรายการ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง
 DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,ลูกค้าของคุณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,การปั้นการบีบอัด
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,ลูกค้าของคุณ
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
 DocType: Sales Order,Not Delivered,ไม่ได้ส่ง
 ,Bank Clearance Summary,ข้อมูลอย่างย่อ Clearance ธนาคาร
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",การสร้างและจัดการ รายวันรายสัปดาห์ และรายเดือน ย่อยสลาย ทางอีเมล์
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,รหัสสินค้า> กลุ่มสินค้า> ยี่ห้อ
 DocType: Appraisal Goal,Appraisal Goal,เป้าหมายการประเมิน
-DocType: Event,Friday,วันศุกร์
 DocType: Time Log,Costing Amount,ต้นทุนปริมาณ
 DocType: Process Payroll,Submit Salary Slip,ส่งสลิปเงินเดือน
 DocType: Salary Structure,Monthly Earning & Deduction,กำไรสุทธิรายเดือนและหัก
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,การนำเข้าสินค้าในกลุ่ม
 DocType: Sales Partner,Address & Contacts,ที่อยู่ติดต่อ &amp;
 DocType: SMS Log,Sender Name,ชื่อผู้ส่ง
-DocType: Page,Title,ชื่อเรื่อง
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,ปรับแต่ง
 DocType: POS Profile,[Select],[เลือก ]
 DocType: SMS Log,Sent To,ส่งไปยัง
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,ทำให้การ ขายใบแจ้งหนี้
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,จำนวนล่วงหน้า
 DocType: Manufacturing Settings,Capacity Planning,การวางแผนกำลังการผลิต
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'จาก วันที่ ' จะต้อง
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'จาก วันที่ ' จะต้อง
 DocType: Journal Entry,Reference Number,เลขที่อ้างอิง
 DocType: Employee,Employment Details,รายละเอียดการจ้างงาน
 DocType: Employee,New Workplace,สถานที่ทำงานใหม่
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,การเดินทาง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,การเดินทาง
 DocType: Leave Block List,Allow Users,อนุญาตให้ผู้ใช้งาน
 DocType: Purchase Order,Customer Mobile No,มือถือของลูกค้าไม่มี
 DocType: Sales Invoice,Recurring,การคืน
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,โอน วัสดุ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
 DocType: Installation Note,Installation Note,หมายเหตุการติดตั้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,เพิ่ม ภาษี
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,เพิ่ม ภาษี
 ,Financial Analytics,Analytics การเงิน
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 DocType: Address,Subsidiary,บริษัท สาขา
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
 DocType: Quality Inspection,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,เงินมัดจำ
-DocType: System Settings,In Hours,ในชั่วโมง
 DocType: Process Payroll,Create Salary Slip,สร้างสลิปเงินเดือน
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,ยอดเงินที่คาดว่าจะเป็นต่อธนาคาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,ขัด
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,ยอดเงินที่คาดว่าจะเป็นต่อธนาคาร
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),แหล่งที่มาของ เงินทุน ( หนี้สิน )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
 DocType: Appraisal,Employee,ลูกจ้าง
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,กลุ่ม โดย คูปอง
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Sales Invoice,Mass Mailing,จดหมายมวล
-DocType: Page,Standard,มาตรฐาน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,แสดงการชำระเงิน
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,ขนาด
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ตาราง การบำรุงรักษา {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,เภสัชกรรม
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,เภสัชกรรม
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ค่าใช้จ่ายของรายการที่ซื้อ
 DocType: Selling Settings,Sales Order Required,สั่งซื้อยอดขายที่ต้องการ
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,สร้าง ลูกค้า
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,อ่าน 9
 DocType: Supplier,Is Frozen,ถูกแช่แข็ง
 DocType: Buying Settings,Buying Settings,ตั้งค่าการซื้อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,ตกแต่งมวล
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,หมายเลข BOM สำหรับรายการที่ดีสำเร็จรูป
 DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับอีเมล ขาย รหัส ของคุณ (เช่น sales@example.com )
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Tool,Payment Account,บัญชีการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,ร่าง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,ชดเชย ปิด
 DocType: Quality Inspection Reading,Accepted,ได้รับการยอมรับ
-DocType: User,Female,หญิง
-DocType: Journal Entry Account,Debit in Account Currency,เดบิตในสกุลเงินในบัญชี
-apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
-DocType: Print Settings,Modern,ทันสมัย
-DocType: Communication,Replied,Replied
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
 DocType: Payment Tool,Total Payment Amount,จำนวนเงินที่ชำระทั้งหมด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ไม่สามารถจะสูงกว่าที่วางแผนไว้ quanitity ({2}) ในการสั่งซื้อการผลิต {3}
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
 DocType: Newsletter,Test,ทดสอบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
-							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;มีไม่มี Serial&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;เป็นรายการสต็อก &quot;และ&quot; วิธีการประเมิน&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
+							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","เนื่องจากมีการทำธุรกรรมที่มีอยู่สต็อกสำหรับรายการนี้ \ คุณไม่สามารถเปลี่ยนค่าของ &#39;มีไม่มี Serial&#39;, &#39;มีรุ่นที่ไม่มี&#39;, &#39;เป็นรายการสต็อก &quot;และ&quot; วิธีการประเมิน&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,วารสารรายการด่วน
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
 DocType: Stock Entry,For Quantity,สำหรับจำนวน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,ขอรายการ
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,เพื่อผลิตแยกจะถูกสร้างขึ้นสำหรับรายการที่ดีในแต่ละสำเร็จรูป
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,การติดตั้ง เสร็จสมบูรณ์
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",รายการบัญชีแช่แข็งถึงวันนี้ไม่มีใครสามารถทำ / แก้ไขรายการยกเว้นบทบาทที่ระบุไว้ด้านล่าง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,จดหมายข่าวรายชื่อผู้รับจดหมาย
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
+DocType: Authorization Rule,Authorized Value,มูลค่าที่ได้รับอนุญาต
 DocType: Contact,Enter department to which this Contact belongs,ใส่แผนกที่ติดต่อนี้เป็นของ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,ขาดทั้งหมด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,หน่วยของการวัด
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,หน่วยของการวัด
 DocType: Fiscal Year,Year End Date,ปีที่จบ วันที่
 DocType: Task Depends On,Task Depends On,ขึ้นอยู่กับงาน
 DocType: Lead,Opportunity,โอกาส
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),อัตราขั้นพื้นฐาน (ตามหุ้น UOM)
 DocType: SMS Log,No of Requested SMS,ไม่มีของ SMS ขอ
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,แหลม
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,จำหน่ายบุคคลที่สาม / ตัวแทนจำหน่าย / ตัวแทนคณะกรรมการ / พันธมิตร / ผู้ค้าปลีกที่ขายสินค้า บริษัท สำหรับคณะกรรมการ
 DocType: Customer Group,Has Child Node,มีโหนดลูก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",ป้อนพารามิเตอร์คงที่ URL ที่นี่ (เช่นผู้ส่ง = ERPNext ชื่อผู้ใช้ = ERPNext รหัสผ่าน = 1234 ฯลฯ )
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ไม่ได้อยู่ในปีงบประมาณที่ใช้งานใด ๆ สำหรับรายละเอียดเพิ่มเติมตรวจ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,เว็บไซต์ นี้เป็น ตัวอย่างที่สร้างขึ้นโดยอัตโนมัติ จาก ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,ช่วงสูงอายุ 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,เครื่องจักรกลเคมี
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8 ใส่แถว: ถ้าอยู่บนพื้นฐานของ ""ก่อนหน้าแถวทั้งหมด"" คุณสามารถเลือกหมายเลขแถวซึ่งจะนำมาเป็นฐานในการคำนวณนี้ (ค่าปกติคือแถวก่อนหน้า)
  9 พิจารณาภาษีหรือค่าใช้จ่ายสำหรับ: ในส่วนนี้คุณสามารถระบุหากภาษี / ค่าใช้จ่ายเป็นเพียงสำหรับการประเมินมูลค่า (ไม่ใช่ส่วนหนึ่งของทั้งหมด) หรือเฉพาะรวม (ไม่ได้เพิ่มคุณค่าให้กับรายการ) หรือทั้ง
  10 เพิ่มหรือหัก: ไม่ว่าคุณต้องการที่จะเพิ่มหรือหักภาษี"
-DocType: Note,Note,หมายเหตุ
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
-DocType: Email Account,Email Ids,อีเมล์หมายเลข
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีธนาคาร / เงินสด
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Global Defaults,Hide Currency Symbol,ซ่อนสัญลักษณ์สกุลเงิน
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,หมายเหตุเครดิต
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},ที่เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {0} สำหรับการดำเนินงาน {1}
 DocType: Features Setup,Quality,คุณภาพ
-DocType: Contact Us Settings,Introduction,การแนะนำ
 DocType: Warranty Claim,Service Address,ที่อยู่บริการ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,แม็กซ์ 100 แถวสำหรับการกระทบยอดสต็อก
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,แม็กซ์ 100 แถวสำหรับการกระทบยอดสต็อก
 DocType: Stock Entry,Manufacture,ผลิต
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,กรุณาหมายเหตุการจัดส่งครั้งแรก
 DocType: Purchase Invoice,Currency and Price List,สกุลเงินและรายชื่อราคา
 DocType: Opportunity,Customer / Lead Name,ลูกค้า / ชื่อ
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,การผลิต
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,การผลิต
 DocType: Item,Allow Production Order,อนุญาตให้สั่งซื้อการผลิต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
 DocType: Lead,Fax,แฟกซ์
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Submitted
 DocType: Salary Structure,Total Earning,กำไรรวม
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,ที่อยู่ของฉัน
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,ปริญญาโท สาขา องค์กร
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,หรือ
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-ขึ้นไป
 DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
-,Download Backups,ดาวน์โหลดสำรอง
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,ประเภท การชำระเงิน
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
 DocType: Bank Reconciliation,To Date,นัด
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,รายละเอียด
 DocType: Purchase Invoice,Total Taxes and Charges,ภาษีและค่าบริการรวม
 DocType: Employee,Emergency Contact,ติดต่อฉุกเฉิน
 DocType: Item,Quality Parameters,ดัชนีคุณภาพ
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,หมายเลขเครื่อง / ชุด
 DocType: Product Bundle,Parent Item,รายการหลัก
 DocType: Account,Account Type,ประเภทบัญชี
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,ฝากประเภท {0} ไม่สามารถดำเนินการส่งต่อ-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,จำนวนสงวน
 DocType: Landed Cost Voucher,Purchase Receipt Items,ซื้อสินค้าใบเสร็จรับเงิน
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,การปรับรูปแบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,ตัด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,ความแฟบ
 DocType: Account,Income Account,บัญชีรายได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,การปั้น
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
 DocType: Item Reorder,Material Request Type,ชนิดของการร้องขอวัสดุ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
-apps/frappe/frappe/desk/moduleview.py +61,Documents,เอกสาร
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,อ้าง
 DocType: Cost Center,Cost Center,ศูนย์ต้นทุน
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,บัตรกำนัล #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,บัตรกำนัล #
 DocType: Notification Control,Purchase Order Message,ข้อความใบสั่งซื้อ
 DocType: Tax Rule,Shipping Country,การจัดส่งสินค้าประเทศ
 DocType: Upload Attendance,Upload HTML,อัพโหลด HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","ล่วงหน้ารวม ({0}) กับการสั่งซื้อ {1} ไม่สามารถจะสูงกว่า \
  แกรนด์รวม ({2})"
 DocType: Employee,Relieving Date,บรรเทาวันที่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,คลังสินค้า สามารถ เปลี่ยน ผ่านทาง หุ้น เข้า / ส่ง หมายเหตุ / รับซื้อ
 DocType: Employee Education,Class / Percentage,ระดับ / ร้อยละ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,ภาษีเงินได้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,เลเซอร์ออกแบบสร้างสุทธิ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,ภาษีเงินได้
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",ถ้ากฎการกำหนดราคาที่เลือกจะทำเพื่อ 'ราคา' มันจะเขียนทับราคา กำหนดราคากฎเป็นราคาสุดท้ายจึงไม่มีส่วนลดต่อไปควรจะนำมาใช้ ดังนั้นในการทำธุรกรรมเช่นสั่งซื้อการขาย ฯลฯ สั่งซื้อจะถูกเรียกในสาขา 'อัตรา' มากกว่าข้อมูล 'ราคาอัตรา'
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
-DocType: User,Bio,ไบโอ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบ กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า> การพิมพ์และการสร้างแบรนด์> แม่แบบที่อยู่
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 DocType: Supplier,Billing Currency,การเรียกเก็บเงินสกุลเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,ขนาดใหญ่พิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,ขนาดใหญ่พิเศษ
 ,Profit and Loss Statement,งบกำไรขาดทุน
 DocType: Bank Reconciliation Detail,Cheque Number,จำนวนเช็ค
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,การกด
 DocType: Payment Tool Detail,Payment Tool Detail,รายละเอียดการชำระเงินเครื่องมือ
 ,Sales Browser,ขาย เบราว์เซอร์
 DocType: Journal Entry,Total Credit,เครดิตรวม
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,ในประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),เงินให้กู้ยืม และ เงินทดรอง ( สินทรัพย์ )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,ลูกหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,ใหญ่
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,พนักงาน ไม่พบ !
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,ใหญ่
 DocType: C-Form Invoice Detail,Territory,อาณาเขต
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Purchase Order,Customer Address Display,ที่อยู่ของลูกค้าแสดง
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,ขัด
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",เริ่มต้นหน่วยวัดสำหรับรายการ {0} ไม่สามารถเปลี่ยนแปลงได้โดยตรงเพราะ \ คุณได้ทำแล้วการทำธุรกรรมบาง (s) กับ UOM อื่น การเปลี่ยนค่าเริ่มต้น UOM \ ใช้ &#39;UOM แทนที่ยูทิลิตี้&#39; เครื่องมือภายใต้โมดูลสต็อก
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,ระบุอัตราแลกเปลี่ยนการแปลงสกุลเงินหนึ่งไปยังอีก
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,ใบเสนอราคา {0} จะถูกยกเลิก
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,ยอดคงค้างทั้งหมด
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,พนักงาน {0} ได้ลา ใน {1} ไม่ สามารถทำเครื่องหมาย การเข้าร่วม
 DocType: Sales Partner,Targets,เป้าหมาย
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
 DocType: Production Order Operation,Make Time Log,สร้างบันทึกเวลา
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,กรุณาตั้งค่าปริมาณการสั่งซื้อ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,คอมพิวเตอร์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,ไฟฟ้าเคมีบด
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,กรุณาตั้งค่า ผังบัญชี ก่อนที่จะเริ่ม รายการบัญชี
 DocType: Purchase Invoice,Ignore Pricing Rule,ละเว้นกฎการกำหนดราคา
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,ยกเลิก
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,จากวันที่ในโครงสร้างเงินเดือนที่ต้องการไม่สามารถจะน้อยกว่าพนักงานเข้าร่วมวันที่
 DocType: Employee Education,Graduate,จบการศึกษา
 DocType: Leave Block List,Block Days,วันที่ถูกบล็อก
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",ตรวจสอบว่าใบแจ้งหนี้ที่เกิดขึ้นให้ยกเลิกการหยุดที่เกิดขึ้นหรือใส่วันที่สิ้นสุดที่เหมาะสม
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
 DocType: Packing Slip,If more than one package of the same type (for print),หากมีมากกว่าหนึ่งแพคเกจประเภทเดียวกัน (พิมพ์)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,สูงสุด {0} แถว รับอนุญาต
 DocType: C-Form Invoice Detail,Net Total,สุทธิ
 DocType: Bin,FCFS Rate,อัตรา FCFS
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),การเรียกเก็บเงิน (ขายใบแจ้งหนี้)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,วัตถุประสงค์
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",การดำเนินงาน {0} นานกว่าชั่วโมงการทำงานใด ๆ ที่มีอยู่ในเวิร์กสเตชัน {1} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,เครื่องจักรกลไฟฟ้า
 ,Requested,ร้องขอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,หมายเหตุไม่มี
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,เกินกำหนด
 DocType: Account,Stock Received But Not Billed,สินค้าที่ได้รับ แต่ไม่ได้เรียกเก็บ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,จ่ายขั้นต้น + จำนวน Arrear + จำนวนการได้เป็นเงินสด - หักรวม
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Features Setup,Sales and Purchase,การขายและการซื้อ
 DocType: Supplier Quotation Item,Material Request No,ขอวัสดุไม่มี
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,อัตราที่สกุลเงินของลูกค้าจะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ได้รับการยกเลิกการสมัครที่ประสบความสำเร็จจากรายการนี้
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} ได้รับการยกเลิกการสมัครที่ประสบความสำเร็จจากรายการนี้
 DocType: Purchase Invoice Item,Net Rate (Company Currency),อัตราการสุทธิ (บริษัท สกุลเงิน)
-apps/frappe/frappe/templates/base.html +134,Added,ที่เพิ่ม
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,จัดการ ต้นไม้ มณฑล
 DocType: Journal Entry Account,Sales Invoice,ขายใบแจ้งหนี้
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,ปีงบประมาณ {0} ไม่พบ
 DocType: Bank Reconciliation,Get Relevant Entries,ได้รับ คอมเมนต์ ที่เกี่ยวข้อง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,การสร้าง
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
-apps/frappe/frappe/desk/query_report.py +136,Total,ทั้งหมด
 DocType: Purchase Invoice,Apply Additional Discount On,สมัครสมาชิกเพิ่มเติมส่วนลด
 DocType: Account,Root Type,ประเภท ราก
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},แถว # {0}: ไม่สามารถกลับมามากกว่า {1} สำหรับรายการ {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
 DocType: Quality Inspection,Quality Inspection,การตรวจสอบคุณภาพ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,สเปรย์สร้าง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,ขนาดเล็กเป็นพิเศษ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL หรือ BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,ระดับสินค้าคงคลังต่ำสุด
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
@@ -2342,42 +2160,39 @@
 DocType: Item,Manufacturer Part Number,หมายเลขชิ้นส่วนของผู้ผลิต
 DocType: Production Order Operation,Estimated Time and Cost,เวลาโดยประมาณและค่าใช้จ่าย
 DocType: Bin,Bin,ถัง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,จมูก
 DocType: SMS Log,No of Sent SMS,ไม่มี SMS ที่ส่ง
 DocType: Account,Company,บริษัท
 DocType: Account,Expense Account,บัญชีค่าใช้จ่าย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,ซอฟต์แวร์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,สี
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,ซอฟต์แวร์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,สี
 DocType: Maintenance Visit,Scheduled,กำหนด
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",กรุณาเลือกรายการที่ &quot;เป็นสต็อกสินค้า&quot; เป็น &quot;ไม่&quot; และ &quot;ขายเป็นรายการ&quot; คือ &quot;ใช่&quot; และไม่มีการ Bundle สินค้าอื่น ๆ
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,เลือกการกระจายรายเดือนที่จะไม่สม่ำเสมอกระจายเป้าหมายข้ามเดือน
 DocType: Purchase Invoice Item,Valuation Rate,อัตราการประเมิน
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,รายการแถว {0}: ใบเสร็จรับเงินซื้อ {1} ไม่อยู่ในด้านบนของตาราง 'ซื้อใบเสร็จรับเงิน'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,วันที่เริ่มต้นโครงการ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,จนกระทั่ง
 DocType: Rename Tool,Rename Log,เปลี่ยนชื่อเข้าสู่ระบบ
 DocType: Installation Note Item,Against Document No,กับเอกสารเลขที่
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,การจัดการหุ้นส่วนขาย
 DocType: Quality Inspection,Inspection Type,ประเภทการตรวจสอบ
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},กรุณาเลือก {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,นักวิจัย
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,อัพเดท
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,นักวิจัย
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,กรุณาบันทึก ข่าวก่อนที่จะส่ง
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,ชื่อหรืออีเมล์มีผลบังคับใช้
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,การตรวจสอบคุณภาพที่เข้ามา
 DocType: Purchase Order Item,Returned Qty,จำนวนกลับ
 DocType: Employee,Exit,ทางออก
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,ประเภท ราก มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,ประเภท ราก มีผลบังคับใช้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,อนุกรม ไม่มี {0} สร้าง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,การตกแต่งแบบสั่นสะเทือน
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",เพื่อความสะดวกของลูกค้า รหัสเหล่านี้จะถูกใช้ในการพิมพ์เอกสาร เช่น ใบแจ้งหนี้ และใบนำส่งสินค้า
 DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ใด ๆ ด้วยตนเอง
 DocType: Sales Invoice,Advertisement,การโฆษณา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,ระยะเวลาการฝึกงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,ระยะเวลาการฝึกงาน
 DocType: Customer Group,Only leaf nodes are allowed in transaction,โหนดใบเท่านั้นที่จะเข้าในการทำธุรกรรม
 DocType: Expense Claim,Expense Approver,ค่าใช้จ่ายที่อนุมัติ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,รายการรับซื้อจำหน่าย
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,เพื่อ Datetime
 DocType: SMS Settings,SMS Gateway URL,URL เกตเวย์ SMS
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,ที่บด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,หดห่อ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,ที่รอดำเนินการกิจกรรม
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,ได้รับการยืนยัน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,ผู้ผลิต> ประเภทผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,เลือกปีงบประมาณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,ถลุง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,การล่มสลายเงินเดือนขึ้นอยู่กับกำไรและหัก
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,บัญชีที่มี ต่อมน้ำเด็ก ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Address,Preferred Shipping Address,ที่อยู่การจัดส่งสินค้าที่ต้องการ
 DocType: Purchase Receipt Item,Accepted Warehouse,คลังสินค้าได้รับการยอมรับ
 DocType: Bank Reconciliation Detail,Posting Date,โพสต์วันที่
 DocType: Item,Valuation Method,วิธีการประเมิน
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1}
 DocType: Sales Invoice,Sales Team,ทีมขาย
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,รายการ ที่ซ้ำกัน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,รายการ ที่ซ้ำกัน
 DocType: Serial No,Under Warranty,ภายใต้การรับประกัน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[ข้อผิดพลาด]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกการสั่งซื้อการขาย
 ,Employee Birthday,วันเกิดของพนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
 DocType: Pricing Rule,Discount Percentage,ร้อยละ ส่วนลด
 DocType: Payment Reconciliation Invoice,Invoice Number,จำนวนใบแจ้งหนี้
-apps/erpnext/erpnext/hooks.py +70,Orders,คำสั่งซื้อ
+apps/erpnext/erpnext/hooks.py +54,Orders,คำสั่งซื้อ
 DocType: Leave Control Panel,Employee Type,ประเภทพนักงาน
 DocType: Employee Leave Approver,Leave Approver,ฝากอนุมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,วัสดุสำหรับการผลิตโอน
 DocType: Expense Claim,"A user with ""Expense Approver"" role","ผู้ใช้ที่มีบทบาท ""ค่าใช้จ่ายอนุมัติ"""
 ,Issued Items Against Production Order,รายการที่ออกมาต่อต้านการสั่งซื้อการผลิต
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,ระยะเวลาที่ไม่ถูกต้อง
 DocType: Customer,Credit Limit,วงเงินสินเชื่อ
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,เลือกประเภทของการทำธุรกรรม
 DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,ที่อยู่และการติดต่อ
 DocType: Customer,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Employee,Feedback,ข้อเสนอแนะ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ออกจากไม่สามารถได้รับการจัดสรรก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint ตารางการแข่งขัน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,เครื่องจักรกลเจ็ทที่มีฤทธิ์กัดกร่อน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint ตารางการแข่งขัน
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
-DocType: Website Settings,Website Settings,การตั้งค่าเว็บไซต์
 DocType: Item,Reorder level based on Warehouse,ระดับสั่งซื้อใหม่บนพื้นฐานของคลังสินค้า
 DocType: Activity Cost,Billing Rate,อัตราการเรียกเก็บเงิน
 ,Qty to Deliver,จำนวน ที่จะ ส่งมอบ
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,สำหรับ การร้องขอ
 DocType: Quotation Item,Against Doctype,กับ ประเภทเอกสาร
 DocType: Delivery Note,Track this Delivery Note against any Project,ติดตามการจัดส่งสินค้าหมายเหตุนี้กับโครงการใด ๆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,บัญชี ราก ไม่สามารถลบได้
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,แสดงรายการสต็อก
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,การจัดการที่อยู่
 DocType: Pricing Rule,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
-DocType: Communication,Phone,โทรศัพท์
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),ปิด (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),ปิด (Dr)
 DocType: Contact,Passive,ไม่โต้ตอบ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,แม่แบบ ภาษี สำหรับการขาย ในการทำธุรกรรม
@@ -2487,10 +2296,9 @@
 ,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
 DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธนาคาร
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,ได้รับการปรับปรุง
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,ขอ วัสดุ {0} จะถูกยกเลิก หรือ หยุด
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,ออกจากการบริหารจัดการ
-DocType: Event,Groups,กลุ่ม
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,โดย กลุ่ม บัญชี
 DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
 DocType: Lead,Lower Income,รายได้ต่ำ
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,ความช่วยเหลือด่วน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
 DocType: Features Setup,Sales Extras,พิเศษขาย
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} งบประมาณสำหรับ บัญชี {1} กับ ศูนย์ต้นทุน {2} จะเกิน โดย {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} งบประมาณสำหรับ บัญชี {1} กับ ศูนย์ต้นทุน {2} จะเกิน โดย {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,ค่าหรือ จำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,นาที
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,นาที
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
 ,Qty to Receive,จำนวน การรับ
 DocType: Leave Block List,Leave Block List Allowed,ฝากรายการบล็อกอนุญาตให้นำ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,ปัจจัย การแปลง ไม่สามารถอยู่ใน เศษส่วน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,คุณจะใช้มันเพื่อเข้าสู่ระบบ
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,คุณจะใช้มันเพื่อเข้าสู่ระบบ
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,ทุก ประเภท ของผู้ผลิต
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,ให้ เงินเดือน สลิป
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,ผลิตภัณฑ์ที่ดีเลิศ
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,ผลิตภัณฑ์ที่ดีเลิศ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,เปิดทุนคงเหลือ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,ไม่ สามารถอนุมัติ การลา ในขณะที่คุณ ไม่ได้รับอนุญาต ในการอนุมัติ ใบ ใน วัน ที่ถูกบล็อก
 DocType: Appraisal,Appraisal,การตีราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Lost หล่อโฟม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,การวาดภาพ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ผู้มีอำนาจลงนาม
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},ออกจาก ผู้อนุมัติ ต้องเป็นหนึ่งใน {0}
 DocType: Hub Settings,Seller Email,อีเมล์ผู้ขาย
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้)
 DocType: Workstation Working Hour,Start Time,เวลา
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
 DocType: BOM Operation,Hour Rate,อัตราชั่วโมง
 DocType: Stock Settings,Item Naming By,รายการการตั้งชื่อตาม
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,จาก ใบเสนอราคา
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,จาก ใบเสนอราคา
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},อีก รายการ ระยะเวลา ปิด {0} ได้รับการทำ หลังจาก {1}
 DocType: Production Order,Material Transferred for Manufacturing,วัสดุสำหรับการผลิตโอน
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,บัญชี {0} ไม่อยู่
 DocType: Purchase Receipt Item,Purchase Order Item No,สั่งซื้อสินค้าสั่งซื้อไม่มี
-DocType: System Settings,System Settings,การตั้งค่าระบบ
 DocType: Project,Project Type,ประเภทโครงการ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,ค่าใช้จ่ายของกิจกรรมต่างๆ
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,เงินสด ใน มือ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
 DocType: Serial No,Is Cancelled,เป็นยกเลิก
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,การจัดส่งของฉัน
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,การจัดส่งของฉัน
 DocType: Journal Entry,Bill Date,วันที่บิล
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
-DocType: Communication,Recipients,ผู้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,การกวดขัน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,knurling
 DocType: Expense Claim,Approval Status,สถานะการอนุมัติ
 DocType: Hub Settings,Publish Items to Hub,เผยแพร่รายการไปยัง Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},จากค่า ต้องน้อยกว่า ค่า ในแถว {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,โอนเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,เลือกบัญชีธนาคาร
 DocType: Newsletter,Create and Send Newsletters,สร้างและส่งจดหมายข่าว
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,นับ แต่วันที่ต้องอยู่ก่อนวันที่ต้องการ
 DocType: Sales Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
 DocType: Item Group,Check this if you want to show in website,ตรวจสอบนี้ถ้าคุณต้องการที่จะแสดงในเว็บไซต์
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,ขอต้อนรับสู่ ERPNext
+,Welcome to ERPNext,ขอต้อนรับสู่ ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,จำนวนรายละเอียดบัตรกำนัล
-apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,นำไปสู่การเสนอราคา
+apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,นำไปสู่การเสนอราคา
 DocType: Lead,From Customer,จากลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,โทร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,โทร
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
 ,Projected,ที่คาดการณ์ไว้
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},อนุกรม ไม่มี {0} ไม่ได้อยู่ใน โกดัง {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,หมายเหตุ : ระบบ จะไม่ตรวจสอบ มากกว่าการ ส่งมอบและ มากกว่าการ จอง รายการ {0} เป็น ปริมาณ หรือจำนวน เป็น 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,เปิดวันที่
 DocType: Journal Entry,Remark,คำพูด
 DocType: Purchase Receipt Item,Rate and Amount,อัตราและปริมาณ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,น่าเบื่อ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,จากการสั่งซื้อการขาย
-DocType: Blog Category,Parent Website Route,ผู้ปกครอง เว็บไซต์ เส้นทาง
 DocType: Sales Order,Not Billed,ไม่ได้เรียกเก็บ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,ทั้ง คลังสินค้า ต้องอยู่ใน บริษัท เดียวกัน
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,ไม่มีที่ติดต่อเข้ามาเลย
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,ที่ใช้งานไม่ได้
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,ที่ดินจํานวนเงินค่าใช้จ่ายคูปอง
 DocType: Time Log,Batched for Billing,batched สำหรับการเรียกเก็บเงิน
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,ตั๋วเงินยกโดยซัพพลายเออร์
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,จำนวน ส่วนลด
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,เช่นผู้ ภาษีมูลค่าเพิ่ม
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,วาระที่ 4
 DocType: Journal Entry Account,Journal Entry Account,วารสารบัญชีเข้า
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,ก๊าซร้อนขึ้นรูปโลหะ
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
 DocType: Sales Invoice Item,Delivered Qty,จำนวนส่ง
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,คลังสินค้า {0}: บริษัท มีผลบังคับใช้
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",ไปที่กลุ่มที่เหมาะสม (โดยปกติแหล่งเงินทุน&gt; หนี้สินหมุนเวียน&gt; ภาษีและหน้าที่และสร้างบัญชีใหม่ (โดยการคลิกที่เพิ่มเด็ก) ประเภท &quot;ภาษี&quot; และจะพูดถึงอัตราภาษี
 ,Payment Period Based On Invoice Date,ระยะเวลา ในการชำระเงิน ตาม ใบแจ้งหนี้ ใน วันที่
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,ตัดเลเซอร์
-DocType: Event,Monday,วันจันทร์
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Account,Payable,ที่ต้องชำระ
 DocType: Salary Slip,Arrear Amount,จำนวน Arrear
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,ลักษณะ ของ ที่อยู่
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,อย่างน้อยต้องเลือกหนึ่งในการขาย หรือการซื้อ
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,สถานที่ที่ดำเนินการผลิต
-DocType: Page,All,ทั้งหมด
 DocType: Stock Entry Detail,Source Warehouse,คลังสินค้าที่มา
 DocType: Installation Note,Installation Date,วันที่ติดตั้ง
 DocType: Employee,Confirmation Date,ยืนยัน วันที่
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,ผู้ขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,นาที จำนวน ไม่สามารถ จะมากกว่า จำนวน สูงสุด
 DocType: Stock Entry,Customer or Supplier Details,ลูกค้าหรือผู้ผลิตรายละเอียด
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,ชุด
 DocType: Lead,Lead Owner,เจ้าของช่องทาง
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,โกดังสินค้าที่จำเป็น
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,โกดังสินค้าที่จำเป็น
 DocType: Employee,Marital Status,สถานภาพการสมรส
 DocType: Stock Settings,Auto Material Request,ขอวัสดุอัตโนมัติ
 DocType: Time Log,Will be updated when billed.,จะมีการปรับปรุงเมื่อเรียกเก็บเงิน
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
 DocType: Delivery Note,Transporter Info,ข้อมูลการขนย้าย
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,รายการสั่งซื้อที่จำหน่าย
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,ชื่อ บริษัท ที่ไม่สามารถเป็น บริษัท
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,หัว จดหมาย สำหรับการพิมพ์ แม่แบบ
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ชื่อ แม่แบบ สำหรับการพิมพ์ เช่นผู้ Proforma Invoice
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,อัตรา BOM
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,กรุณา ดึง รายการจาก การจัดส่งสินค้า หมายเหตุ
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,รายการบันทึก {0} จะยกเลิกการเชื่อมโยง
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,รายการบันทึก {0} จะยกเลิกการเชื่อมโยง
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",บันทึกการสื่อสารทั้งหมดของอีเมลประเภทโทรศัพท์แชทเข้าชม ฯลฯ
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,กรุณาระบุรอบปิดศูนย์ต้นทุนของ บริษัท
 DocType: Purchase Invoice,Terms,ข้อตกลงและเงื่อนไข
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,สร้างใหม่
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,สร้างใหม่
 DocType: Buying Settings,Purchase Order Required,ใบสั่งซื้อที่ต้องการ
 ,Item-wise Sales History,รายการที่ชาญฉลาดขายประวัติการ
 DocType: Expense Claim,Total Sanctioned Amount,จำนวนรวมตามทำนองคลองธรรม
 ,Purchase Analytics,Analytics ซื้อ
 DocType: Sales Invoice Item,Delivery Note Item,รายการจัดส่งสินค้าหมายเหตุ
 DocType: Expense Claim,Task,งาน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,การโกน
 DocType: Purchase Taxes and Charges,Reference Row #,อ้างอิง แถว #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,นี้เป็น คนขาย ราก และ ไม่สามารถแก้ไขได้
 ,Stock Ledger,บัญชีแยกประเภทสินค้า
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},ราคา: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},ราคา: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,หักเงินเดือนสลิป
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,บันทึก
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,เลือกโหนดกลุ่มแรก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,ดาวน์โหลดรายงานที่มีวัตถุดิบทั้งหมดที่มีสถานะสินค้าคงคลังของพวกเขาล่าสุด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,หันหน้าไปทาง
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,ฟอรั่มชุมชน
 DocType: Leave Application,Leave Balance Before Application,ฝากคงเหลือก่อนที่โปรแกรมประยุกต์
 DocType: SMS Center,Send SMS,ส่ง SMS
 DocType: Company,Default Letter Head,หัวหน้าเริ่มต้นจดหมาย
 DocType: Time Log,Billable,ที่เรียกเก็บเงิน
-DocType: Authorization Rule,This will be used for setting rule in HR module,นี้จะถูกใช้สำหรับกฎการตั้งค่าในโมดูลทรัพยากรบุคคล
 DocType: Account,Rate at which this tax is applied,อัตราที่ภาษีนี้จะถูกใช้
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,สั่งซื้อใหม่จำนวน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,สูญเสียโอกาส
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","ทุ่งส่วนลดจะสามารถใช้ได้ในใบสั่งซื้อรับซื้อ, ใบกำกับซื้อ"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ชื่อของบัญชีใหม่ หมายเหตุ: กรุณาอย่าสร้างบัญชีสำหรับลูกค้าและผู้จำหน่าย
-DocType: Report,Report Type,ประเภทรายงาน
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,โหลด
 DocType: BOM Replace Tool,BOM Replace Tool,เครื่องมือแทนที่ BOM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,แม่แบบของประเทศที่อยู่เริ่มต้นอย่างชาญฉลาด
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,แสดงภาษีผิดขึ้น
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ข้อมูลนำเข้าและส่งออก
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',หากคุณ มีส่วนร่วมใน กิจกรรมการผลิต ให้เปิดใช้ตัวเลือก 'เป็นผลิตภัณฑ์ที่ถูกผลิต '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
 DocType: Serial No,Out of AMC,ออกของ AMC
 DocType: Purchase Order Item,Material Request Detail No,รายละเอียดขอวัสดุไม่มี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,เปลี่ยนยาก
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
 DocType: Company,Default Cash Account,บัญชีเงินสดเริ่มต้น
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,ชำระ เงิน + เขียน ปิด จำนวน ไม่สามารถ จะสูงกว่า แกรนด์ รวม
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ไม่ได้เป็น จำนวน ชุดที่ถูกต้องสำหรับ รายการ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",หมายเหตุ: หากการชำระเงินไม่ได้ทำกับการอ้างอิงใด ๆ ให้วารสารเข้าด้วยตนเอง
 DocType: Item,Supplier Items,ผู้ผลิตรายการ
 DocType: Opportunity,Opportunity Type,ประเภทโอกาส
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ตั้งเป็นเปิด
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,ส่งอีเมลโดยอัตโนมัติไปยังรายชื่อในการทำธุรกรรมการส่ง
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  จำนวนที่ยังอยู่: {4} โอนจำนวน: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
-DocType: Event,Sunday,วันอาทิตย์
 DocType: Sales Team,Contribution (%),สมทบ (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,ความรับผิดชอบ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,ความรับผิดชอบ
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,กรุณากรอก atleast 1 ใบแจ้งหนี้ ในตาราง
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,เพิ่มผู้ใช้
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,เพิ่มผู้ใช้
 DocType: Pricing Rule,Item Group,กลุ่มสินค้า
 DocType: Task,Actual Start Date (via Time Logs),เริ่มต้นวันที่เกิดขึ้นจริง (ผ่านบันทึกเวลา)
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ไปที่ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
 DocType: Item,Default BOM,BOM เริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
 DocType: Time Log Batch,Total Hours,รวมชั่วโมง
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,ยานยนต์
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,รายการที่ จะต้อง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,การฉีดขึ้นรูปโลหะ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ยานยนต์
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Time Log,From Time,ตั้งแต่เวลา
 DocType: Notification Control,Custom Message,ข้อความที่กำหนดเอง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,วาณิชธนกิจ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",เลือกประเทศของคุณโซนเวลาและสกุลเงิน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,วาณิชธนกิจ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,กัดกรด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,ทรายหล่อ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,ไฟฟ้า
 DocType: Purchase Invoice Item,Rate,อัตรา
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,แพทย์ฝึกหัด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,แพทย์ฝึกหัด
 DocType: Newsletter,A Lead with this email id should exist,ควรมีช่องทางที่ใช้อีเมลนี้อยู่
 DocType: Stock Entry,From BOM,จาก BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,วันที่ ควรจะเป็น เช่นเดียวกับการ จาก วันที่ ลา ครึ่งวัน
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","กิโลกรัมเช่นหน่วย Nos, ม."
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","กิโลกรัมเช่นหน่วย Nos, ม."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
 DocType: Salary Structure,Salary Structure,โครงสร้างเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","กฎข้อที่ราคาหลายอยู่กับเกณฑ์เดียวกันกรุณาแก้ปัญหาความขัดแย้ง \
  โดยการกำหนดลำดับความสำคัญ ราคากฎ: {0}"
 DocType: Account,Bank,ธนาคาร
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 DocType: Hub Settings,Access Token,เข้าสู่ Token
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,เป็น รายการ สินทรัพย์ถาวร
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",หากคุณมีความยาวพิมพ์รูปแบบคุณลักษณะนี้สามารถใช้ในการแยกหน้าเว็บที่จะพิมพ์บนหน้าเว็บหลายหน้ากับส่วนหัวและท้ายกระดาษทั้งหมดในแต่ละหน้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,ดินแดน ทั้งหมด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 DocType: Fiscal Year,Year Name,ปีชื่อ
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
 DocType: Product Bundle Item,Product Bundle Item,Bundle รายการสินค้า
 DocType: Sales Partner,Sales Partner Name,ชื่อพันธมิตรขาย
 DocType: Purchase Invoice Item,Image View,ดูภาพ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,การตกแต่งและการตกแต่งอุตสาหกรรม
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,จากและถึง วันที่คุณต้องการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,หลักทรัพย์และ การแลกเปลี่ยน สินค้าโภคภัณฑ์
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,เจาะ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,เป่า
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
 DocType: Tax Rule,Shipping City,การจัดส่งสินค้าเมือง
-apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
+apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 DocType: Account,Purchase User,ผู้ซื้อ
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,การตอก
-DocType: Web Page,Slideshow,สไลด์โชว์
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,แม่แบบเริ่มต้นที่อยู่ไม่สามารถลบได้
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
 DocType: Journal Entry,Print Heading,พิมพ์หัวเรื่อง
 DocType: Quotation,Maintenance Manager,ผู้จัดการซ่อมบำรุง
-DocType: Workflow State,Search,ค้นหา
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,รวม ไม่ สามารถเป็นศูนย์
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,' ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด ' ต้องมากกว่า หรือเท่ากับศูนย์
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,ประสาน
 DocType: C-Form,Amended From,แก้ไขเพิ่มเติมจาก
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,วัตถุดิบ
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,วัตถุดิบ
 DocType: Leave Application,Follow via Email,ผ่านทางอีเมล์ตาม
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,บัญชีของเด็ก ที่มีอยู่ สำหรับบัญชีนี้ คุณไม่สามารถลบ บัญชีนี้
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2862,45 +2631,44 @@
 ,Produced,ผลิต
 DocType: Item,Item Code for Suppliers,รหัสสินค้าสำหรับซัพพลายเออร์
 DocType: Issue,Raised By (Email),โดยยก (อีเมล์)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,ทั่วไป
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,แนบ จดหมาย
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,ทั่วไป
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,แนบ จดหมาย
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ไม่ สามารถหัก เมื่อ เป็น หมวดหมู่ สำหรับ ' ประเมิน ' หรือ ' การประเมิน และการ รวม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",ชื่อหัวภาษีของคุณ (เช่นภาษีมูลค่าเพิ่มศุลกากร ฯลฯ พวกเขาควรจะมีชื่อไม่ซ้ำกัน) และอัตรามาตรฐานของพวกเขา นี้จะสร้างแม่แบบมาตรฐานซึ่งคุณสามารถแก้ไขและเพิ่มมากขึ้นในภายหลัง
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",ชื่อหัวภาษีของคุณ (เช่นภาษีมูลค่าเพิ่มศุลกากร ฯลฯ พวกเขาควรจะมีชื่อไม่ซ้ำกัน) และอัตรามาตรฐานของพวกเขา นี้จะสร้างแม่แบบมาตรฐานซึ่งคุณสามารถแก้ไขและเพิ่มมากขึ้นในภายหลัง
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
 DocType: Authorization Rule,Applicable To (Designation),ที่ใช้บังคับกับ (จุด)
-DocType: Blog Post,Blog Post,โพสต์บล็อก
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,กลุ่มตาม
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,เปิด / ปิดการใช้งาน สกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,ค่าใช้จ่าย ไปรษณีย์
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Purchase Order,The date on which recurring order will be stop,วันที่เกิดขึ้นเป็นประจำเพื่อที่จะหยุด
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} จะต้องลดลงโดย {1} หรือคุณควรจะเพิ่มความอดทนล้น
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,ปัจจุบันทั้งหมด
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,ชั่วโมง
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,ชั่วโมง
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,สร้าง ใบเสนอราคา
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,รายการทั้งหมด เหล่านี้ได้รับ ใบแจ้งหนี้ แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},สามารถ ได้รับการอนุมัติ โดย {0}
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
 DocType: Features Setup,Point of Sale,จุดขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,การดัดผม
 DocType: Account,Tax,ภาษี
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},แถว {0}: {1} ไม่ถูกต้อง {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,การฟอก
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},แถว {0}: {1} ไม่ถูกต้อง {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,จาก Bundle สินค้า
 DocType: Production Planning Tool,Production Planning Tool,เครื่องมือการวางแผนการผลิต
 DocType: Quality Inspection,Report Date,รายงานวันที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,สายงานการผลิต
 DocType: C-Form,Invoices,ใบแจ้งหนี้
 DocType: Job Opening,Job Title,ตำแหน่งงาน
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} จัดสรรแล้วสำหรับพนักงาน {1} สำหรับรอบระยะเวลา {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} ผู้รับ
 DocType: Features Setup,Item Groups in Details,กลุ่มรายการในรายละเอียด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,ปรับปรุงอัตราและความพร้อมใช้งาน
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,เปอร์เซ็นต์ที่คุณได้รับอนุญาตให้ได้รับหรือส่งมอบมากขึ้นกับปริมาณที่สั่งซื้อ ตัวอย่างเช่นหากคุณได้สั่งซื้อ 100 หน่วย และค่าเผื่อของคุณจะ 10% แล้วคุณจะได้รับอนุญาตจะได้รับ 110 หน่วย
 DocType: Pricing Rule,Customer Group,กลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: Item,Website Description,คำอธิบายเว็บไซต์
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
 DocType: Address,Plant,พืช
-DocType: DocType,Setup,การติดตั้ง
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,รีดเย็น
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,เลือกดำเนินการต่อถ้าคุณยังต้องการที่จะรวมถึงความสมดุลในปีงบประมาณก่อนหน้านี้ออกไปในปีงบการเงิน
 DocType: GL Entry,Against Voucher Type,กับประเภทบัตร
 DocType: Item,Attributes,คุณลักษณะ
-DocType: Packing Slip,Get Items,รับสินค้า
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,รับสินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
-DocType: DocField,Image,ภาพ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,ให้ สรรพสามิต ใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
-DocType: Communication,Other,อื่น ๆ
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,รหัสการดำเนินงานไม่ได้ตั้งค่า
 DocType: Production Order,Planned Start Date,เริ่มต้นการวางแผนวันที่สมัคร
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint เยี่ยมชม
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint เยี่ยมชม
 DocType: Leave Type,Is Encash,เป็นได้เป็นเงินสด
 DocType: Purchase Invoice,Mobile No,มือถือไม่มี
 DocType: Payment Tool,Make Journal Entry,ทำให้อนุทิน
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,ข้อมูล โครงการ ฉลาด ไม่สามารถใช้ได้กับ ใบเสนอราคา
 DocType: Project,Expected End Date,คาดว่าวันที่สิ้นสุด
 DocType: Appraisal Template,Appraisal Template Title,หัวข้อแม่แบบประเมิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,เชิงพาณิชย์
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,เชิงพาณิชย์
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,ผู้ปกครองรายการ {0} ต้องไม่เป็นรายการสต็อก
 DocType: Cost Center,Distribution Id,รหัสกระจาย
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,บริการ ที่น่ากลัว
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,ผลิตภัณฑ์หรือบริการ  ทั้งหมด
 DocType: Purchase Invoice,Supplier Address,ที่อยู่ผู้ผลิต
-DocType: Contact Us Settings,Address Line 2,ที่อยู่บรรทัดที่ 2
-DocType: ToDo,Reference,การอ้างอิง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforating
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,ชุด มีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,บริการทางการเงิน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,บริการทางการเงิน
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},ราคาแอตทริบิวต์ {0} &#39;จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3}
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,บัญชีลูกหนี้เริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,เลื่อย
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,ลามิเนต
 DocType: Item Reorder,Transfer,โอน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,การเผา
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
 DocType: Supplier,Contact HTML,HTML ติดต่อ
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,ค้าปลีก
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,ลูกค้า {0} ไม่อยู่
 DocType: Attendance,Absent,ขาด
-DocType: Product Bundle,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,ย่อยยับ
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
 DocType: GL Entry,Remarks,ข้อคิดเห็น
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
 DocType: Features Setup,POS View,ดู POS
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,หล่ออย่างต่อเนื่อง
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,โปรดระบุ
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,ดังกล่าวข้างต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,ขนาดเย็น
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,บัญชี {0} ไม่สามารถเป็น กลุ่ม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,ภูมิภาค
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
 DocType: Holiday List,Weekly Off,สัปดาห์ปิด
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","สำหรับเช่น 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),กำไรเฉพาะกาล / ขาดทุน (เครดิต)
 DocType: Sales Invoice,Return Against Sales Invoice,กลับไปกับใบแจ้งหนี้การขาย
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,ข้อ 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
 DocType: Serial No,Creation Time,เวลาที่ สร้าง
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,รายได้รวม
 DocType: Sales Invoice,Product Bundle Help,Bundle สินค้าช่วยเหลือ
 ,Monthly Attendance Sheet,แผ่นผู้เข้าร่วมรายเดือน
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,บันทึกไม่พบ
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ศูนย์ต้นทุนจำเป็นสำหรับรายการ {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,บัญชี {0} ไม่ได้ใช้งาน
 DocType: GL Entry,Is Advance,ล่วงหน้า
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,เข้าร่วมประชุม จาก วันที่และ การเข้าร่วมประชุม เพื่อให้ มีผลบังคับใช้ วันที่
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,กรุณากรอก ' คือ รับเหมา ' เป็น ใช่หรือไม่ใช่
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,' กำไรขาดทุน ประเภท บัญชี {0} ไม่ได้รับอนุญาต ใน การเปิด รายการ
-DocType: Workflow State,Time,เวลา
 DocType: Features Setup,Sales Discounts,ส่วนลดการขาย
 DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
 DocType: Sales Invoice,Terms and Conditions Details,ข้อตกลงและเงื่อนไขรายละเอียด
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,ภาษีการขายและค่าใช้จ่ายแม่แบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,เครื่องแต่งกาย และอุปกรณ์เสริม
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,เครื่องแต่งกาย และอุปกรณ์เสริม
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,จำนวนการสั่งซื้อ
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / แบนเนอร์ที่จะแสดงอยู่ด้านบนของรายการสินค้า
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,ระบุเงื่อนไขในการคำนวณปริมาณการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,เพิ่ม เด็ก
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,บทบาทที่ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็ง และแก้ไขรายการแช่แข็ง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,ไม่สามารถแปลง ศูนย์ต้นทุน ไปยัง บัญชีแยกประเภท ที่มี ต่อมน้ำเด็ก
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,ปัจจัย การแปลง ที่จำเป็น
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,สำนักงานคณะกรรมการกำกับ การขาย
 DocType: Offer Letter Term,Value / Description,ค่า / รายละเอียด
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,ลูกค้าที่ไม่ได้สั่งซื้อเป็นเวลานาน
 DocType: Production Order,Expected Delivery Date,คาดว่าวันที่ส่ง
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,ปูด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,หล่อระเหยรูปแบบ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,ค่าใช้จ่ายใน ความบันเทิง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ใบแจ้งหนี้ การขาย {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ใบแจ้งหนี้ การขาย {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,อายุ
 DocType: Time Log,Billing Amount,จำนวนเงินที่เรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,ปริมาณ ที่ไม่ถูกต้อง ที่ระบุไว้ สำหรับรายการที่ {0} ปริมาณ ที่ควรจะเป็น มากกว่า 0
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,โปรแกรมประยุกต์สำหรับการลา
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,บัญชี ที่มีอยู่ กับการทำธุรกรรม ไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,ค่าใช้จ่าย ทางกฎหมาย
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","วันของเดือนที่สั่งซื้อรถยนต์จะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Sales Invoice,Posting Time,โพสต์เวลา
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,รายได้ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,ค่าใช้จ่ายใน การเดินทาง
 DocType: Maintenance Visit,Breakdown,การเสีย
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,บัญชี: {0} กับสกุลเงิน: {1} ไม่สามารถเลือกได้
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,สร้างเสริม
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
-DocType: Feed,Full Name,ชื่อเต็ม
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,นัง
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,การทดลอง
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,โกดัง เริ่มต้น มีผลบังคับใช้ กับ รายการ สต็อก
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},การชำระเงิน ของเงินเดือน สำหรับเดือน{0} และปี {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 ,Transferred Qty,โอน จำนวน
 apps/erpnext/erpnext/config/learn.py +11,Navigating,การนำ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,การวางแผน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,การวางแผน
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,ทำให้เวลาที่เข้าสู่ระบบชุด
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,ออก
 DocType: Project,Total Billing Amount (via Time Logs),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านบันทึกเวลา)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,เราขาย สินค้า นี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,เราขาย สินค้า นี้
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Id ผู้ผลิต
 DocType: Journal Entry,Cash Entry,เงินสดเข้า
 DocType: Sales Partner,Contact Desc,Desc ติดต่อ
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,เพิ่มแถวเพื่อตั้งงบประมาณประจำปีของบัญชี
 DocType: Buying Settings,Default Supplier Type,ซัพพลายเออร์ชนิดเริ่มต้น
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,การระเบิดหิน
 DocType: Production Order,Total Operating Cost,ค่าใช้จ่ายการดำเนินงานรวม
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,หมายเหตุ : รายการ {0} เข้ามา หลายครั้ง
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,ติดต่อทั้งหมด
 DocType: Newsletter,Test Email Id,Email รหัสการทดสอบ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,ชื่อย่อ บริษัท
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,ชื่อย่อ บริษัท
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,ถ้าคุณทำตาม การตรวจสอบคุณภาพ ช่วยให้ รายการ ที่จำเป็น และ QA QA ไม่มี ใน การซื้อ ใบเสร็จรับเงิน
 DocType: GL Entry,Party Type,ประเภท บุคคล
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,วัตถุดิบที่ ไม่สามารถเป็น เช่นเดียวกับ รายการ หลัก
 DocType: Item Attribute Value,Abbreviation,ตัวย่อ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ไม่ authroized ตั้งแต่ {0} เกินขีด จำกัด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,การปั้นการหมุน
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,แม่ เงินเดือน หลัก
 DocType: Leave Type,Max Days Leave Allowed,วันแม็กซ์ฝากอนุญาตให้นำ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,ตั้งกฎภาษีสำหรับรถเข็น
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
 ,Territory Target Variance Item Group-Wise,มณฑล เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,ทุกกลุ่ม ลูกค้า
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} มีผลบังคับใช้ อาจจะบันทึกแลกเปลี่ยนเงินตราไม่ได้สร้างขึ้นสำหรับ {1} เป็น {2}
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,แม่แบบภาษีมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่อยู่
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),อัตราราคาปกติ (สกุลเงิน บริษัท )
 DocType: Account,Temporary,ชั่วคราว
 DocType: Address,Preferred Billing Address,ที่อยู่การเรียกเก็บเงินที่ต้องการ
 DocType: Monthly Distribution Percentage,Percentage Allocation,การจัดสรรร้อยละ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,เลขา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,เลขา
 DocType: Serial No,Distinct unit of an Item,หน่วยที่แตกต่างของสินค้า
 DocType: Pricing Rule,Buying,การซื้อ
 DocType: HR Settings,Employee Records to be created by,ระเบียนพนักงานที่จะถูกสร้างขึ้นโดย
@@ -3137,42 +2883,37 @@
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
 DocType: Purchase Order Item,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,รีดผ้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} หยุดทำงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},บาร์โค้ด {0} ใช้แล้ว ใน รายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,เหตุการณ์ที่จะเกิดขึ้น
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ลูกค้า จะต้อง
-DocType: Letter Head,Letter Head,หัวจดหมาย
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,รายการด่วน
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} เป็นข้อบังคับสำหรับการกลับมา
 DocType: Purchase Order,To Receive,ที่จะได้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,หดตัวที่เหมาะสม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,รายได้ / ค่าใช้จ่าย
 DocType: Employee,Personal Email,อีเมลส่วนตัว
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,ความแปรปรวนทั้งหมด
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,ความแปรปรวนทั้งหมด
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",ถ้าเปิดใช้งานระบบจะโพสต์รายการบัญชีสำหรับสินค้าคงคลังโดยอัตโนมัติ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,ค่านายหน้า
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ค่านายหน้า
 DocType: Address,Postal Code,รหัสไปรษณีย์
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",เป็นนาที ปรับปรุงผ่านทาง 'บันทึกเวลา'
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,คำสั่งปล่อยให้การผลิต
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
 DocType: Hub Settings,Name Token,ชื่อ Token
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,วางแผน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,ขาย มาตรฐาน
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,ขาย มาตรฐาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,อย่างน้อยหนึ่งคลังสินค้ามีผลบังคับใช้
 DocType: Serial No,Out of Warranty,ออกจากการรับประกัน
 DocType: BOM Replace Tool,Replace,แทนที่
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,กรุณาใส่ หน่วย เริ่มต้น ของการวัด
 DocType: Purchase Invoice Item,Project Name,ชื่อโครงการ
 DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
-DocType: Workflow State,Edit,แก้ไข
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Features Setup,Item Batch Nos,Nos Batch รายการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
@@ -3180,17 +2921,15 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,กระทบยอดการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,สินทรัพย์ ภาษี
 DocType: BOM Item,BOM No,BOM ไม่มี
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,มาใหม่พร้อมส่ง UOM ต้องแตกต่างจาก UOM ปัจจุบัน
 DocType: Account,Debit,หักบัญชี
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,ใบ จะต้องมีการ จัดสรร หลายรายการ 0.5
 DocType: Production Order,Operation Cost,ค่าใช้จ่ายในการดำเนินงาน
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,อัพโหลดการดูแลรักษาจาก. csv ที่
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Amt ดีเด่น
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั้งเป้ากลุ่มสินค้าที่ชาญฉลาดสำหรับการนี้คนขาย
+DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั้งเป้ากลุ่มสินค้าที่ชาญฉลาดสำหรับการนี้คนขาย
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.",เพื่อกำหนดปัญหานี้ให้ใช้ปุ่ม &quot;กำหนด&quot; ในแถบด้านข้าง
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ตรึง หุ้น เก่า กว่า [ วัน ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",ถ้าสองคนหรือมากกว่ากฎการกำหนดราคาจะพบตามเงื่อนไขข้างต้นลำดับความสำคัญถูกนำไปใช้ ลำดับความสำคัญเป็นจำนวนระหว่าง 0-20 ในขณะที่ค่าเริ่มต้นเป็นศูนย์ (ว่าง) จำนวนที่สูงขึ้นหมายความว่ามันจะมีความสำคัญถ้ามีกฎกำหนดราคาหลายเงื่อนไขเดียวกัน
@@ -3202,10 +2941,7 @@
 DocType: Project,Default Cost Center,เริ่มต้นที่ศูนย์ต้นทุน
 DocType: Purchase Invoice,End Date,วันที่สิ้นสุด
 DocType: Employee,Internal Work History,ประวัติการทำงานภายใน
-DocType: DocField,Column Break,ตัวแบ่งคอลัมน์
-DocType: Event,Thursday,วันพฤหัสบดี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,การหมุน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
 DocType: Sales Invoice,Exhibition,งานมหกรรม
@@ -3218,31 +2954,30 @@
 DocType: Employee,Held On,จัดขึ้นเมื่อวันที่
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,การผลิตสินค้า
 ,Employee Information,ข้อมูลของพนักงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),อัตรา (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),อัตรา (%)
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),ลดรายได้สำหรับการออกโดยไม่จ่าย (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},หมายเหตุ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,ข้อมูลอย่างนี้สัปดาห์
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} จะต้องเป็น รายการ ที่จัดซื้อ หรือ ย่อย สัญญา ในแถว {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,บัญชี: {0} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
 DocType: GL Entry,Party,งานเลี้ยง
 DocType: Sales Order,Delivery Date,วันที่ส่ง
-DocType: DocField,Currency,เงินตรา
 DocType: Opportunity,Opportunity Date,วันที่มีโอกาส
 DocType: Purchase Receipt,Return Against Purchase Receipt,กลับต่อต้านการซื้อใบเสร็จรับเงิน
 DocType: Purchase Order,To Bill,บิล
 DocType: Material Request,% Ordered,% สั่ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,งานเหมา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,งานเหมา
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,ราคาซื้อเฉลี่ย
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
 DocType: Employee,History In Company,ประวัติใน บริษัท
@@ -3259,77 +2994,68 @@
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
 DocType: SMS Settings,SMS Settings,การตั้งค่า SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,บัญชีชั่วคราว
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,สีดำ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,สีดำ
 DocType: BOM Explosion Item,BOM Explosion Item,รายการระเบิด BOM
 DocType: Account,Auditor,ผู้สอบบัญชี
 DocType: Purchase Order,End date of current order's period,วันที่สิ้นสุดระยะเวลาการสั่งซื้อของ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,ทำให้หนังสือเสนอ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,กลับ
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
-DocType: DocField,Fold,พับ
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,เริ่มต้นหน่วยวัดสำหรับตัวแปรจะต้องเป็นแม่แบบเดียวกับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
 DocType: Project Task,Pending Review,รอตรวจทาน
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,โปรดระบุ
 DocType: Task,Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,รหัสลูกค้า
-DocType: Page,Page Name,ชื่อเพจ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,เวลาที่จะต้องมากกว่าจากเวลา
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},คลังสินค้า {0}: บัญชีผู้ปกครอง {1} ไม่ bolong บริษัท {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,ตกแต่ง Spindle
 DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
 DocType: Account,Asset,สินทรัพย์
 DocType: Project Task,Task ID,รหัสงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","เช่นผู้ "" MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","เช่นผู้ "" MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,หุ้นไม่สามารถที่มีอยู่สำหรับรายการ {0} ตั้งแต่มีสายพันธุ์
 ,Sales Person-wise Transaction Summary,การขายอย่างย่อรายการคนฉลาด
-DocType: System Settings,Time Zone,โซนเวลา
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,คลังสินค้า {0} ไม่อยู่
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ลงทะเบียนสำหรับ ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,เปอร์เซ็นต์การกระจายรายเดือน
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ของวัสดุที่ส่งกับส่งหมายเหตุนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,เย็บ
 DocType: Customer,Customer Details,รายละเอียดลูกค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,การสร้าง
 DocType: Employee,Reports to,รายงานไปยัง
 DocType: SMS Settings,Enter url parameter for receiver nos,ป้อนพารามิเตอร์ URL สำหรับ Nos รับ
 DocType: Sales Invoice,Paid Amount,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',ปิด บัญชี {0} ต้องเป็นชนิด ' รับผิด '
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ยอดเงินในบัญชีแล้วในเดบิตคุณไม่ได้รับอนุญาตให้ตั้ง 'ยอดดุลต้องเป็น' เป็น 'เครดิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,การบริหารจัดการ ที่มีคุณภาพ
 DocType: Production Planning Tool,Filter based on customer,กรองขึ้นอยู่กับลูกค้า
 DocType: Payment Tool Detail,Against Voucher No,กับคูปองไม่มี
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
 DocType: Tax Rule,Purchase,ซื้อ
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,คงเหลือ จำนวน
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,คงเหลือ จำนวน
 DocType: Item Group,Parent Item Group,กลุ่มสินค้าหลัก
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} สำหรับ {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,ศูนย์ต้นทุน
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,โกดัง
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,โกดัง
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,อัตราที่สกุลเงินของซัพพลายเออร์จะถูกแปลงเป็นสกุลเงินหลักของ บริษัท
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},แถว # {0}: ความขัดแย้งกับจังหวะแถว {1}
 DocType: Opportunity,Next Contact,ติดต่อถัดไป
 DocType: Employee,Employment Type,ประเภทการจ้างงาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,สินทรัพย์ถาวร
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,รับสมัครไม่สามารถบันทึกในสอง alocation
 DocType: Item Group,Default Expense Account,บัญชีค่าใช้จ่ายเริ่มต้น
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
-DocType: Page,Yes,ใช่
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",กับคูปองประเภทต้องเป็นหนึ่งในใบสั่งซื้อใบแจ้งหนี้หรือซื้ออนุทิน
 DocType: Account,Stock Adjustment,การปรับ สต็อก
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},ค่าใช้จ่ายเริ่มต้นกิจกรรมที่มีอยู่สำหรับประเภทกิจกรรม - {0}
 DocType: Production Order,Planned Operating Cost,ต้นทุนการดำเนินงานตามแผน
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,ใหม่ {0} ชื่อ
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},กรุณาหาแนบ {0} # {1}
 DocType: Job Applicant,Applicant Name,ชื่อผู้ยื่นคำขอ
 DocType: Authorization Rule,Customer / Item Name,ชื่อลูกค้า / รายการ
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3342,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},อนุกรม ไม่มี ผลบังคับใช้สำหรับ รายการ {0}
 DocType: Item Variant Attribute,Attribute,คุณลักษณะ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,โปรดระบุจาก / ไปยังช่วง
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,สร้างโดย
 DocType: Serial No,Under AMC,ภายใต้ AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,รายการอัตราการประเมินราคาจะคำนวณพิจารณาจำนวนเงินค่าใช้จ่ายบัตรกำนัลที่ดิน
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,ตั้งค่าเริ่มต้น สำหรับการขาย ในการทำธุรกรรม
@@ -3354,17 +3079,16 @@
 DocType: Payment Reconciliation,Minimum Amount,จำนวนขั้นต่ำ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,ปรับปรุง สินค้า สำเร็จรูป
 DocType: Workstation,per hour,ต่อชั่วโมง
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},ชุด {0} ใช้แล้ว ใน {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เป็นรายการ บัญชีแยกประเภท หุ้น ที่มีอยู่สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,ผู้จัดการโครงการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
 DocType: Customer,Default Taxes and Charges,ภาษีและค่าใช้จ่ายเริ่มต้น
 DocType: Account,Receivable,ลูกหนี้
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
 DocType: Sales Invoice,Supplier Reference,อ้างอิงจำหน่าย
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",หากการตรวจสอบรายการวัสดุสำหรับรายการย่อยประกอบจะได้รับการพิจารณาสำหรับการใช้วัตถุดิบ มิฉะนั้นทุกรายการย่อยประกอบจะได้รับการปฏิบัติเป็นวัตถุดิบ
@@ -3372,8 +3096,8 @@
 DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
 DocType: Employee Education,Qualification,คุณสมบัติ
 DocType: Item Price,Item Price,ราคาสินค้า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,สบู่ และ ผงซักฟอก
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,ภาพยนตร์ และวิดีโอ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
@@ -3382,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,อัตราวัสดุตาม
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics สนับสนุน
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},บริษัท ที่ขาดหายไป ในคลังสินค้า {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,สต็อกยูทิลิตี้แทนที่ UOM
 DocType: POS Profile,Terms and Conditions,ข้อตกลงและเงื่อนไข
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},วันที่ควรจะเป็นภายในปีงบประมาณ สมมติว่านัด = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","ที่นี่คุณสามารถรักษาความสูงน้ำหนัก, ภูมิแพ้, ฯลฯ ปัญหาด้านการแพทย์"
@@ -3394,7 +3117,7 @@
 DocType: Sales Order Item,For Production,สำหรับการผลิต
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,กรุณาใส่ คำสั่งขาย ใน ตารางข้างต้น
 DocType: Project Task,View Task,ดูงาน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,ปี การเงินของคุณ จะเริ่มต้นใน
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,ปี การเงินของคุณ จะเริ่มต้นใน
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,กรุณากรอกตัวอักษรซื้อรายรับ
 DocType: Sales Invoice,Get Advances Received,รับเงินรับล่วงหน้า
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
@@ -3402,20 +3125,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),การตั้งค่า เซิร์ฟเวอร์ขาเข้า สำหรับการสนับสนุน อีเมล์ ของคุณ (เช่น support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,ปั่นเงา
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
 DocType: Sales Invoice Item,Sales Order Item,รายการสั่งซื้อการขาย
 DocType: Salary Slip,Payment Days,วันชำระเงิน
 DocType: BOM,Manage cost of operations,จัดการค่าใช้จ่ายในการดำเนินงาน
 DocType: Features Setup,Item Advanced,ขั้นสูงรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,รีดร้อน
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น &quot;Submitted&quot; อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง &quot;ติดต่อ&quot; ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,การตั้งค่าสากล
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
 DocType: Salary Slip,Net Pay,จ่ายสุทธิ
 DocType: Account,Account,บัญชี
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,อนุกรม ไม่มี {0} ได้รับ อยู่แล้ว
@@ -3424,35 +3145,28 @@
 DocType: Customer,Sales Team Details,ขายรายละเอียดทีม
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,ป่วย ออกจาก
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},ไม่ถูกต้อง {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,ป่วย ออกจาก
 DocType: Email Digest,Email Digest,ข่าวสารทางอีเมล
 DocType: Delivery Note,Billing Address Name,ชื่อที่อยู่การเรียกเก็บเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,ยอดคงเหลือระบบ
-DocType: Workflow,Is Active,มีการใช้งาน
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,ยอดคงเหลือระบบ
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,บันทึกเอกสารครั้งแรก
 DocType: Account,Chargeable,รับผิดชอบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,เปลี่ยนชื่อย่อ
-DocType: Workflow State,Primary,ประถม
 DocType: Expense Claim Detail,Expense Date,วันที่ค่าใช้จ่าย
 DocType: Item,Max Discount (%),ส่วนลดสูงสุด (%)
-DocType: Communication,More Information,ข้อมูลมากกว่านี้
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,คำสั่งสุดท้ายจำนวนเงิน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,การระเบิด
 DocType: Company,Warn,เตือน
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,การประเมินมูลค่า รายการ ปรับปรุง
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
 DocType: BOM,Manufacturing User,ผู้ใช้การผลิต
 DocType: Purchase Order,Raw Materials Supplied,วัตถุดิบ
 DocType: Purchase Invoice,Recurring Print Format,รูปแบบที่เกิดขึ้นประจำพิมพ์
-DocType: Communication,Series,ชุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,วันที่ส่ง ที่คาดว่าจะ ไม่สามารถเป็น วัน ก่อนที่จะ สั่งซื้อ
 DocType: Appraisal,Appraisal Template,แม่แบบการประเมิน
-DocType: Communication,Email,อีเมล์
 DocType: Item Group,Item Classification,การจัดประเภทรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,ผู้จัดการฝ่ายพัฒนาธุรกิจ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,วัตถุประสงค์ชมการบำรุงรักษา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,ระยะเวลา
 ,General Ledger,บัญชีแยกประเภททั่วไป
@@ -3462,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 DocType: Features Setup,To get Item Group in details table,ที่จะได้รับกลุ่มสินค้าในตารางรายละเอียด
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,การแกะสลัก
 DocType: Sales Invoice,Commission,ค่านายหน้า
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3490,7 +3202,7 @@
  {% ถ้า email_id%} อีเมล์: {{email_id}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,จำนวนเงินที่เริ่มต้น
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,โกดัง ไม่พบใน ระบบ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,โกดัง ไม่พบใน ระบบ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,ข้อมูลอย่างเดือนนี้
 DocType: Quality Inspection Reading,Quality Inspection Reading,การตรวจสอบคุณภาพการอ่าน
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,` ตรึง หุ้น เก่า กว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
@@ -3509,13 +3221,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
 DocType: Payment Tool,Get Outstanding Vouchers,รับบัตรกำนัลที่โดดเด่น
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
 DocType: Appraisal,Start Date,วันที่เริ่มต้น
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,มูลค่า
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,จัดสรร ใบ เป็นระยะเวลา
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,คลิกที่นี่เพื่อตรวจสอบ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
@@ -3525,55 +3236,43 @@
 DocType: Item,Average time taken by the supplier to deliver,เวลาเฉลี่ยที่ถ่ายโดยผู้ผลิตเพื่อส่งมอบ
 DocType: Time Log,Hours,ชั่วโมง
 DocType: Project,Expected Start Date,วันที่เริ่มต้นคาดว่า
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,กลิ้ง
-DocType: ToDo,Priority,บุริมสิทธิ์
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox เข็น
-DocType: Dropbox Backup,Weekly,รายสัปดาห์
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,เช่น smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,รับ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,รับ
 DocType: Maintenance Visit,Fully Completed,เสร็จสมบูรณ์
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% แล้วเสร็จ
 DocType: Employee,Educational Qualification,วุฒิการศึกษา
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} ได้รับการเพิ่มประสบความสำเร็จในรายการจดหมายข่าวของเรา
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,เครื่องจักรกลลำแสงอิเล็กตรอน
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,รายงานหลัก
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,หุ้น บัญชีแยกประเภท รายการ ยอดคงเหลือ การปรับปรุง
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,รายงานหลัก
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,เพิ่ม / แก้ไขราคา
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,แผนภูมิของศูนย์ต้นทุน
 ,Requested Items To Be Ordered,รายการที่ได้รับการร้องขอที่จะสั่งซื้อ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,คำสั่งซื้อของฉัน
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,คำสั่งซื้อของฉัน
 DocType: Price List,Price List Name,ชื่อรายการราคา
 DocType: Time Log,For Manufacturing,สำหรับการผลิต
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,ผลรวม
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,ผลรวม
 DocType: BOM,Manufacturing,การผลิต
 ,Ordered Items To Be Delivered,รายการที่สั่งซื้อจะถูกส่ง
 DocType: Account,Income,เงินได้
-,Setup Wizard,ตัวช่วยสร้าง การติดตั้ง
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,สิ่งที่ผิดพลาด!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,วันที่เสร็จสมบูรณ์
 DocType: Purchase Invoice Item,Amount (Company Currency),จำนวนเงิน (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,หล่อตาย
-DocType: Email Alert,Reference Date,วันที่อ้างอิง
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,กรุณากรอก กัดกร่อน มือถือ ที่ถูกต้อง
 DocType: Budget Detail,Budget Detail,รายละเอียดงบประมาณ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,กรุณาใส่ข้อความ ก่อนที่จะส่ง
-DocType: Async Task,Status,สถานะ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},หุ้น UOM ปรับปรุงสำหรับรายการ {0}
-DocType: Company History,Year,ปี
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,กรุณาอัปเดตการตั้งค่า SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,เวลาเข้าสู่ระบบ {0} เรียกเก็บเงินแล้ว
@@ -3586,55 +3285,52 @@
 ,Serial No Service Contract Expiry,อนุกรมไม่มีหมดอายุสัญญาบริการ
 DocType: Item,Unit of Measure Conversion,หน่วยวัดแปลง
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,พนักงานไม่สามารถเปลี่ยนแปลงได้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
 DocType: Naming Series,Help HTML,วิธีใช้ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},ค่าเผื่อเกิน {0} ข้ามกับรายการ {1}
 DocType: Address,Name of person or organization that this address belongs to.,ชื่อบุคคลหรือองค์กรที่อยู่นี้เป็นของ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,ซัพพลายเออร์ ของคุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,ซัพพลายเออร์ ของคุณ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,อีกโครงสร้างเงินเดือน {0} เป็นงานสำหรับพนักงาน {1} กรุณาตรวจสถานะ 'ใช้งาน' เพื่อดำเนินการต่อไป
 DocType: Purchase Invoice,Contact,ติดต่อ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,ที่ได้รับจาก
 DocType: Features Setup,Exports,การส่งออก
 DocType: Lead,Converted,แปลง
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 DocType: Issue,Content Type,ประเภทเนื้อหา
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,คอมพิวเตอร์
-DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
+DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,รายการ: {0} ไม่อยู่ในระบบ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Cost Center,Budgets,งบประมาณ
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,อัพเดต
 DocType: Employee,Emergency Contact Details,รายละเอียดการติดต่อในกรณีฉุกเฉิน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,มัน ทำอะไรได้บ้าง
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,มัน ทำอะไรได้บ้าง
 DocType: Delivery Note,To Warehouse,ไปที่โกดัง
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},บัญชี {0} ได้รับการป้อน มากกว่าหนึ่งครั้ง ในรอบปี {1}
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'มี ซีเรียล ไม่' ไม่สามารถ 'ใช่' สำหรับรายการ ที่ไม่มี สต็อก
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},รหัสผู้ใช้ ไม่ได้ ตั้งไว้สำหรับ พนักงาน {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,จากการรับประกันเรียกร้อง
 DocType: Stock Entry,Default Source Warehouse,คลังสินค้าที่มาเริ่มต้น
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,การทับ
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
-DocType: User,Enabled,เปิดการใช้งาน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,สินทรัพย์ หุ้น
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},คุณ ต้องการที่จะ ส่ง สลิป เงินเดือน ทุก เดือน {0} และปี {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,นำเข้าสมาชิก
@@ -3642,19 +3338,18 @@
 DocType: Attendance,Present,นำเสนอ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,หมายเหตุ การจัดส่ง {0} จะต้องไม่ถูก ส่งมา
 DocType: Notification Control,Sales Invoice Message,ข้อความขายใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,บัญชีปิด {0} ต้องเป็นชนิดรับผิด / ผู้ถือหุ้น
 DocType: Authorization Rule,Based On,ขึ้นอยู่กับ
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,กิจกรรมของโครงการ / งาน
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,สร้าง Slips เงินเดือน
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} ไม่ได้เป็น id ของ อีเมลที่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",ต้องเลือก การซื้อ ถ้าเลือก ใช้ได้กับ เป็น {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,ส่วนลด จะต้อง น้อยกว่า 100
-DocType: ToDo,Low,ต่ำ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,การปั่นด้าย
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
@@ -3662,7 +3357,7 @@
 DocType: Offer Letter,Offer Letter Terms,เสนอเงื่อนไขจดหมาย
 DocType: Features Setup,To track any installation or commissioning related work after sales,เพื่อติดตามการติดตั้งใด ๆ หรืองานที่เกี่ยวข้องกับการว่าจ้างหลังการขาย
 DocType: Project,Estimated Costing,ต้นทุนโดยประมาณ
-DocType: Purchase Invoice Advance,Journal Entry Detail No,วารสารรายละเอียดรายการที่ไม่มี
+DocType: Purchase Invoice Advance,Journal Entry Detail No,วารสารรายละเอียดรายการที่ไม่มี
 DocType: Employee External Work History,Salary,เงินเดือน
 DocType: Serial No,Delivery Document Type,ประเภทเอกสารการจัดส่งสินค้า
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,ส่งบิลเงินเดือนทั้งหมดสำหรับเกณฑ์ที่เลือกข้างต้น
@@ -3676,51 +3371,45 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,ชื่อแคมเปญ จะต้อง
 DocType: Maintenance Visit,Maintenance Date,วันที่การบำรุงรักษา
 DocType: Purchase Receipt Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,การวาดภาพลึก
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,จดหมายข่าวใหม่
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,แสดงยอดคงเหลือ
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ตัวอย่าง:. ABCD ##### 
- ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
+ ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
 DocType: Upload Attendance,Upload Attendance,อัพโหลดผู้เข้าร่วม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,จำนวน
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,โลดโผน
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
 ,Sales Analytics,Analytics ขาย
 DocType: Manufacturing Settings,Manufacturing Settings,การตั้งค่าการผลิต
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,การตั้งค่าอีเมล์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +90,Please enter default currency in Company Master,กรุณาใส่ สกุลเงินเริ่มต้น ใน บริษัท มาสเตอร์
-DocType: Stock Entry Detail,Stock Entry Detail,รายละเอียดรายการสินค้า
+DocType: Stock Entry Detail,Stock Entry Detail,รายละเอียดรายการสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Daily Reminders,การแจ้งเตือนทุกวัน
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +82,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,ชื่อ บัญชีผู้ใช้ใหม่
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,วัตถุดิบที่จำหน่ายค่าใช้จ่าย
 DocType: Selling Settings,Settings for Selling Module,การตั้งค่าสำหรับการขายโมดูล
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,บริการลูกค้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,บริการลูกค้า
 DocType: Item,Thumbnail,รูปขนาดย่อ
 DocType: Item Customer Detail,Item Customer Detail,รายละเอียดรายการของลูกค้า
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,ยืนยันอีเมล์ของคุณ
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,ผู้สมัครเสนองาน
 DocType: Notification Control,Prompt for Email on Submission of,แจ้งอีเมลในการยื่น
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,ใบจัดสรรรวมมากกว่าวันในช่วงเวลา
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,รายการ {0} จะต้องมี รายการ หุ้น
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,เริ่มต้นการทำงานในความคืบหน้าโกดัง
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} จะต้อง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,ปั้นสูญญากาศ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
-DocType: Contact Us Settings,City,เมือง
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,เครื่องจักรกลอัลตราโซนิก
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,รายการ {0} จะต้องเป็น รายการ ขาย
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
 DocType: Account,Equity,ความเสมอภาค
 DocType: Sales Order,Printing Details,รายละเอียดการพิมพ์
 DocType: Task,Closing Date,ปิดวันที่
 DocType: Sales Order Item,Produced Quantity,จำนวนที่ผลิต
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,วิศวกร
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,วิศวกร
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,ค้นหาประกอบย่อย
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
 DocType: Sales Partner,Partner Type,ประเภทคู่
@@ -3728,7 +3417,7 @@
 DocType: Authorization Rule,Customerwise Discount,ส่วนลด Customerwise
 DocType: Purchase Invoice,Against Expense Account,กับบัญชีค่าใช้จ่าย
 DocType: Production Order,Production Order,สั่งซื้อการผลิต
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,หมายเหตุ การติดตั้ง {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Quotation Item,Against Docname,กับ ชื่อเอกสาร
 DocType: SMS Center,All Employee (Active),พนักงาน (Active) ทั้งหมด
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,ดู ตอนนี้
@@ -3736,26 +3425,24 @@
 DocType: BOM,Raw Material Cost,วัตถุดิบต้นทุน
 DocType: Item,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,แผนภูมิแกนต์
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,ชุด ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,ประเภทรายงาน มีผลบังคับใช้
 DocType: Item,Serial Number Series,ชุด หมายเลข
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},คลังสินค้า จำเป็นสำหรับ รายการ หุ้น {0} ในแถว {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ค้าปลีกและ ขายส่ง
 DocType: Issue,First Responded On,ครั้งแรกเมื่อวันที่ง่วง
 DocType: Website Item Group,Cross Listing of Item in multiple groups,รายชื่อครอสของรายการในหลายกลุ่ม
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,ผู้ใช้งาน ครั้งแรก: คุณ
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,ผู้ใช้งาน ครั้งแรก: คุณ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Reconciled ประสบความสำเร็จ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Reconciled ประสบความสำเร็จ
 DocType: Production Order,Planned End Date,วันที่สิ้นสุดการวางแผน
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,ที่รายการจะถูกเก็บไว้
 DocType: Tax Rule,Validity,ความถูกต้อง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
 DocType: Attendance,Attendance,การดูแลรักษา
-DocType: Page,No,ไม่
 DocType: BOM,Materials,วัสดุ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ถ้าไม่ได้ตรวจสอบรายชื่อจะต้องมีการเพิ่มแต่ละแผนกที่มันจะต้องมีการใช้
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,วันที่โพสต์และโพสต์เวลามีผลบังคับใช้
@@ -3763,55 +3450,46 @@
 ,Item Prices,รายการราคาสินค้า
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
 DocType: Period Closing Voucher,Period Closing Voucher,บัตรกำนัลปิดงวด
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,หลัก ราคาตามรายการ
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,หลัก ราคาตามรายการ
 DocType: Task,Review Date,ทบทวนวันที่
 DocType: Purchase Invoice,Advance Payments,การชำระเงินล่วงหน้า
-DocType: DocPerm,Level,ชั้น
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,คลังสินค้า เป้าหมาย ในแถว {0} จะต้อง เป็นเช่นเดียวกับ การผลิต การสั่งซื้อ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,การสี
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,ไม่อนุญาตให้ใช้เครื่องมือการชำระเงิน
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'ประกาศที่อยู่อีเมล' ไม่ระบุที่เกิดขึ้นสำหรับ% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,สกุลเงินไม่สามารถเปลี่ยนแปลงได้หลังจากการทำรายการโดยใช้เงินสกุลอื่น
 DocType: Company,Round Off Account,ปิดรอบบัญชี
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,ค่าใช้จ่ายใน การดูแลระบบ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,การให้คำปรึกษา
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,การให้คำปรึกษา
 DocType: Customer Group,Parent Customer Group,กลุ่มลูกค้าผู้ปกครอง
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,เปลี่ยนแปลง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","เช่นผู้ ""บริษัท LLC ของฉัน"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 DocType: Bank Reconciliation Detail,Voucher ID,ID บัตรกำนัล
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,นี่คือ ดินแดนของ รากและ ไม่สามารถแก้ไขได้
 DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
 DocType: Email Digest,Receivables / Payables,ลูกหนี้ / เจ้าหนี้
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,การกระแทก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 DocType: Task,Actual End Date (via Time Logs),วันที่สิ้นสุดที่เกิดขึ้นจริง (ผ่านบันทึกเวลา)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,กรุณาใส่ ศูนย์ ค่าใช้จ่าย ของผู้ปกครอง
 DocType: Delivery Note,Print Without Amount,พิมพ์ที่ไม่มีจำนวน
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,หมวดหมู่ ภาษี ไม่สามารถ ' ประเมิน ' หรือ ' การประเมิน และ รวม เป็นรายการ ทุก รายการที่ไม่ สต็อก
-DocType: User,Last Name,นามสกุล
-DocType: Web Page,Left,ซ้าย
-DocType: Event,All Day,ทั้งวัน
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,หมวดหมู่ ภาษี ไม่สามารถ ' ประเมิน ' หรือ ' การประเมิน และ รวม เป็นรายการ ทุก รายการที่ไม่ สต็อก
 DocType: Issue,Support Team,ทีมสนับสนุน
 DocType: Appraisal,Total Score (Out of 5),คะแนนรวม (out of 5)
-DocType: Contact Us Settings,State,รัฐ
 DocType: Batch,Batch,ชุด
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,สมดุล
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,สมดุล
 DocType: Project,Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
-DocType: User,Gender,เพศ
 DocType: Journal Entry,Debit Note,หมายเหตุเดบิต
 DocType: Stock Entry,As per Stock UOM,เป็นต่อสต็อก UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ไม่หมดอายุ
@@ -3823,46 +3501,42 @@
 DocType: Maintenance Schedule Item,Half Yearly,ประจำปีครึ่ง
 DocType: Lead,Blog Subscriber,สมาชิกบล็อก
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,สร้างกฎ เพื่อ จำกัด การ ทำธุรกรรม ตามค่า
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",ถ้าการตรวจสอบรวมกัน ของวันทําการจะรวมถึงวันหยุดและนี้จะช่วยลดค่าของเงินเดือนที่ต้องการต่อวัน
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",ถ้าการตรวจสอบรวมกัน ของวันทําการจะรวมถึงวันหยุดและนี้จะช่วยลดค่าของเงินเดือนที่ต้องการต่อวัน
 DocType: Purchase Invoice,Total Advance,ล่วงหน้ารวม
-DocType: Workflow State,User,ผู้ใช้งาน
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,การประมวลผลเงินเดือน
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,ตั้งเป็น ที่หายไป
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ใบเสร็จรับเงินการชำระเงินหมายเหตุ
 DocType: Customer,Credit Days Based On,วันขึ้นอยู่กับเครดิต
 DocType: Tax Rule,Tax Rule,กฎภาษี
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,รักษาอัตราเดียวตลอดวงจรการขาย
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,บันทึกเวลานอกแผนเวิร์คสเตชั่ชั่วโมงทำงาน
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} ถูกส่งมา อยู่แล้ว
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
-DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Time Log,Billing Rate based on Activity Type (per hour),อัตราการเรียกเก็บเงินขึ้นอยู่กับประเภทกิจกรรม (ต่อชั่วโมง)
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,seaming
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",บริษัท ID อีเมล์ ไม่พบ จึง ส่ง ไม่ได้ส่ง
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 DocType: Production Planning Tool,Filter based on item,กรองขึ้นอยู่กับสินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
 DocType: Purchase Common,Purchase Common,ซื้อสามัญ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} ได้รับการแก้ไข กรุณารีเฟรช
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,จากโอกาส
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,blanking
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,ผลประโยชน์ของพนักงาน
 DocType: Sales Invoice,Is POS,POS เป็น
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ไม่อยู่
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
-DocType: DocField,Default,ผิดนัด
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} สมาชิกเพิ่ม
 DocType: Maintenance Schedule,Schedule,กำหนดการ
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",กำหนดงบประมาณสำหรับศูนย์ต้นทุนนี้ การดำเนินการในการตั้งงบประมาณให้ดูรายการ &quot;บริษัท ฯ &quot;
@@ -3873,70 +3547,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Expense Claim,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",เลือก &quot;Yes&quot; จะให้เอกลักษณ์เฉพาะของแต่ละองค์กรเพื่อรายการนี้ซึ่งสามารถดูได้ในหลักหมายเลขเครื่อง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",เลือก &quot;Yes&quot; จะให้เอกลักษณ์เฉพาะของแต่ละองค์กรเพื่อรายการนี้ซึ่งสามารถดูได้ในหลักหมายเลขเครื่อง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
 DocType: Address,Office,สำนักงาน
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,รายงาน มาตรฐาน
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,รายการบัญชีวารสาร
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,เพื่อสร้างบัญชีภาษี
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,รุ่นที่สินค้าคงคลัง
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,รุ่นที่สินค้าคงคลัง
 DocType: Employee,Contract End Date,วันที่สิ้นสุดสัญญา
 DocType: Sales Order,Track this Sales Order against any Project,ติดตามนี้สั่งซื้อขายกับโครงการใด ๆ
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,ดึงยอดขาย (รอการส่งมอบ) คำสั่งตามเกณฑ์ดังกล่าวข้างต้น
-DocType: DocShare,Document Type,ประเภทเอกสาร
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,ใบเสนอราคา จาก ผู้ผลิต
 DocType: Deduction Type,Deduction Type,ประเภทหัก
 DocType: Attendance,Half Day,ครึ่งวัน
 DocType: Pricing Rule,Min Qty,นาที จำนวน
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",เพื่อติดตามรายการในการขายและเอกสารการจัดซื้อที่มีเลขชุด &quot;ที่ต้องการอุตสาหกรรม: สารเคมี&quot;
 DocType: GL Entry,Transaction Date,วันที่ทำรายการ
 DocType: Production Plan Item,Planned Qty,จำนวนวางแผน
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,ภาษีทั้งหมด
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,ภาษีทั้งหมด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,สำหรับปริมาณ (ผลิตจำนวน) มีผลบังคับใช้
 DocType: Stock Entry,Default Target Warehouse,คลังสินค้าเป้าหมายเริ่มต้น
 DocType: Purchase Invoice,Net Total (Company Currency),รวมสุทธิ (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
 DocType: Notification Control,Purchase Receipt Message,ซื้อใบเสร็จรับเงินข้อความ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,ใบที่จัดสรรทั้งหมดมีมากขึ้นกว่าช่วงเวลา
 DocType: Production Order,Actual Start Date,วันที่เริ่มต้นจริง
 DocType: Sales Order,% of materials delivered against this Sales Order,% ของวัสดุที่ส่งต่อนี้สั่งซื้อขาย
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,การเคลื่อนไหวระเบียนรายการ
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,จดหมายข่าวรายชื่อสมาชิก
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,ให้บริการ
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,อัตรากำไรขั้นต้น%
 DocType: BOM,With Operations,กับการดำเนินงาน
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 ,Monthly Salary Register,สมัครสมาชิกเงินเดือน
-apps/frappe/frappe/website/template.py +140,Next,ต่อไป
 DocType: Warranty Claim,If different than customer address,หาก แตกต่างจาก ที่อยู่ของลูกค้า
 DocType: BOM Operation,BOM Operation,การดำเนินงาน BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,ไฟฟ้า
 DocType: Purchase Taxes and Charges,On Previous Row Amount,เกี่ยวกับจำนวนเงินแถวก่อนหน้า
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,กรุณากรอกจำนวนเงินที่ชำระในอย่างน้อยหนึ่งแถว
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,กรุณากรอกจำนวนเงินที่ชำระในอย่างน้อยหนึ่งแถว
 DocType: POS Profile,POS Profile,รายละเอียด POS
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,แถว {0}: จำนวนเงินที่ชำระไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,รวมค้างชำระ
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,รวมค้างชำระ
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,บันทึกเวลาออกใบเสร็จไม่ได้
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,ผู้ซื้อ
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,ผู้ซื้อ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,จ่ายสุทธิ ไม่สามารถ ลบ
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,กรุณากรอกตัวกับบัตรกำนัลด้วยตนเอง
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,กรุณากรอกตัวกับบัตรกำนัลด้วยตนเอง
 DocType: SMS Settings,Static Parameters,พารามิเตอร์คง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
@@ -3945,14 +3612,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,ส่ง SMS มวลการติดต่อของคุณ
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,พิจารณาภาษีหรือคิดค่าบริการสำหรับ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,ข้ามกลิ้ง
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,บัตรเครดิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ repacked
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม หุ้น
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม หุ้น
 DocType: Purchase Invoice,Next Date,วันที่ถัดไป
 DocType: Employee Education,Major/Optional Subjects,วิชาเอก / เสริม
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,กรุณากรอกตัวอักษรภาษีและค่าใช้จ่าย
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,เครื่องจักรกล
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
 DocType: Hub Settings,Seller Name,ชื่อผู้ขาย
@@ -3962,47 +3627,44 @@
 DocType: Stock Entry,Repack,หีบห่ออีกครั้ง
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,คุณต้อง บันทึกแบบฟอร์ม ก่อนที่จะดำเนิน
 DocType: Item Attribute,Numeric Values,ค่าที่เป็นตัวเลข
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,แนบ โลโก้
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,จำนวนเงินที่จัดสรร ไม่สามารถ มากกว่าจำนวนที่ยังไม่ปรับปรุง
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,จำนวนเงินที่จัดสรร ไม่สามารถ มากกว่าจำนวนที่ยังไม่ปรับปรุง
 DocType: Manufacturing Settings,Allow Production on Holidays,อนุญาตให้ผลิตในวันหยุด
 DocType: Sales Order,Customer's Purchase Order Date,วันที่สั่งซื้อของลูกค้าสั่งซื้อ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,ทุนหลักทรัพย์
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,เลือกไฟล์ CSV
-DocType: Dropbox Backup,Send Backups to Dropbox,ส่งสำรองข้อมูลไปยัง Dropbox
 DocType: Purchase Order,To Receive and Bill,การรับและบิล
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,นักออกแบบ
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
 DocType: Serial No,Delivery Details,รายละเอียดการจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,โดยอัตโนมัติสร้างวัสดุขอถ้าปริมาณต่ำกว่าระดับนี้
 ,Item-wise Purchase Register,สมัครสมาชิกสั่งซื้อสินค้าที่ชาญฉลาด
 DocType: Batch,Expiry Date,วันหมดอายุ
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",การตั้งค่าระดับสั่งซื้อสินค้าจะต้องเป็นรายการการซื้อหรือการผลิตรายการ
 ,Supplier Addresses and Contacts,ที่อยู่ ของผู้ผลิต และผู้ติดต่อ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +18,Project master.,ต้นแบบโครงการ
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Bill of Materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
-DocType: Dropbox Backup,Send Notifications To,แจ้งเตือนไปให้
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref วันที่สมัคร
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref วันที่สมัคร
 DocType: Employee,Reason for Leaving,เหตุผลที่ลาออก
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,บัญชี {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,บัญชี {0} ไม่อยู่
 DocType: Account,Cash,เงินสด
 DocType: Employee,Short biography for website and other publications.,ชีวประวัติสั้นสำหรับเว็บไซต์และสิ่งพิมพ์อื่น ๆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},กรุณาสร้าง โครงสร้าง เงินเดือน สำหรับพนักงาน {0}

diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index d87bba4..f4b1857 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv

@@ -2,13 +2,12 @@
 DocType: Employee,Salary Mode,Maaş Modu
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Eğer mevsimsellik dayalı izlemek istiyorsanız, Aylık Dağıtım seçin."
 DocType: Employee,Divorced,Ayrılmış
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Uyarı: Aynı madde birden çok kez girildi.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Öğeler zaten senkronize
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Öğe bir işlemde birden çok kez eklenecek izin ver
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Tüketici Ürünleri
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Tüketici Ürünleri
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,İlk Parti Türünü seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Tavlama
 DocType: Item,Customer Items,Müşteri Öğeler
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
@@ -22,20 +21,17 @@
 DocType: Sales Partner,Dealer,Satıcı
 DocType: Employee,Rented,Kiralanmış
 DocType: Employee,Rented,Kiralanmış
-DocType: About Us Settings,Website,Web sitesi
-DocType: About Us Settings,Website,Web sitesi
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Sıkıştırma artı sinterleme
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Malzeme talebinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Malzeme talebinden
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Ağaç
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Daha fazla sonuç.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Yasal
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Yasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Yasal
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Gerçek tip vergi satırda Öğe fiyatına dahil edilemez {0}
 DocType: C-Form,Customer,Müşteri
 DocType: C-Form,Customer,Müşteri
@@ -53,7 +49,6 @@
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Seri Başarıyla güncellendi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Dikiş
 DocType: Pricing Rule,Apply On,Uygula
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
@@ -61,16 +56,16 @@
 DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi Kişiler
 DocType: Quality Inspection Reading,Parameter,Parametre
 DocType: Quality Inspection Reading,Parameter,Parametre
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Yeni İzin Uygulaması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Yeni İzin Uygulaması
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Banka poliçesi
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1.Müşteriye bilgilendirme sağlamak için Malzeme kodu ve bu seçenek kullanılarak onları kodları ile araştırılabilir yapmak
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Hesabının Mod
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Göster Varyantlar
-DocType: Sales Invoice Item,Quantity,Miktar
-DocType: Sales Invoice Item,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Miktar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
@@ -80,44 +75,40 @@
 DocType: Production Plan Item,Production Plan Item,Üretim Planı nesnesi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Yeni POS Profili Yap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sağlık hizmeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Sağlık hizmeti
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 DocType: Purchase Invoice,Monthly,Aylık
 DocType: Purchase Invoice,Monthly,Aylık
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Ödeme Gecikme (Gün)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,E
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Savunma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Savunma
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,E
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Savunma
 DocType: Company,Abbr,Kısaltma
 DocType: Company,Abbr,Kısaltma
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Satır # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Satır # {0}:
 DocType: Delivery Note,Vehicle No,Araç No
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Fiyat Listesi seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Ağaç
 DocType: Production Order Operation,Work In Progress,Devam eden iş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D baskı
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Time Log,Time Log,Günlük
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Muhasebeci
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Muhasebeci
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Company,Phone No,Telefon No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Etkinlikler Günlüğü, fatura zamanlı izleme için kullanılabilir Görevler karşı kullanıcılar tarafından seslendirdi."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Yeni {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Yeni {0}: # {1}
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 ,Sales Partners Commission,Satış Ortakları Komisyonu
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Kısaltma 5 karakterden fazla olamaz.
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Değer {0} {1} Öğe olarak Varyantlar \ kaldırıldı olamaz Özellik bu Öznitelik ile var.
-DocType: Print Settings,Classic,Klasik
-DocType: Print Settings,Classic,Klasik
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Bu bir kök hesabıdır ve düzenlenemez.
 DocType: BOM,Operations,Operasyonlar
 DocType: BOM,Operations,Operasyonlar
@@ -125,25 +116,27 @@
 DocType: Bin,Quantity Requested for Purchase,Alım için İstenen miktar
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Iki sütun, eski adı diğeri yeni isim biriyle .csv dosya eklemek"
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogram
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kilogram
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kilogram
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,İş Açılışı.
 DocType: Item Attribute,Increment,Artım
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Warehouse Seçiniz ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aynı şirket birden fazla girilir
 DocType: Employee,Married,Evli
 DocType: Employee,Married,Evli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Izin verilmez {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Bakkal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
 DocType: Quality Inspection Reading,Reading 1,1 Okuma
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Banka Girişi Yap
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Emeklilik Fonları
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Hesap türü Depo ise Depo zorunludur
 DocType: SMS Center,All Sales Person,Bütün Satış Kişileri
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kontrol düzeni yinelenen eğer, yinelenen durdurmak veya uygun Bitiş Tarihi koymak için işaretini kaldırın"
@@ -160,52 +153,45 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
 DocType: SMS Log,SMS Log,SMS Kayıtları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Teslim Öğeler Maliyeti
-DocType: Blog Post,Guest,Konuk
 DocType: Quality Inspection,Get Specification Details,Şartname Detaylarını alın
 DocType: Lead,Interested,İlgili
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Ürün Ağacı
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Açılış
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Açılış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Gönderen {0} için {1}
 DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
 DocType: Journal Entry,Opening Entry,Giriş Girdisi
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} alanı zorunludur
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} alanı zorunludur
 DocType: Stock Entry,Additional Costs,Ek maliyetler
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Lead,Product Enquiry,Ürün Sorgulama
-DocType: Standard Reply,Owner,Sahibi
-DocType: Standard Reply,Owner,Sahibi
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Lütfen ilk önce şirketi girin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,İlk Şirket seçiniz
 DocType: Employee Education,Under Graduate,Lisans
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: BOM,Total Cost,Toplam Maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Oyma
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Etkinlik Günlüğü:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Etkinlik Günlüğü:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Gayrimenkul
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Gayrimenkul
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Hesap Beyanı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Ecza
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Ecza
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Expense Claim Detail,Claim Amount,Hasar Tutarı
 DocType: Employee,Mr,Bay
 DocType: Employee,Mr,Bay
-DocType: Custom Script,Client,Müşteri:
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
 DocType: Naming Series,Prefix,Önek
 DocType: Naming Series,Prefix,Önek
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tüketilir
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Tüketilir
 DocType: Upload Attendance,Import Log,İthalat Günlüğü
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gönder
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Yıllık Gelir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Yıllık Gelir
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Stok Giderleri
@@ -214,7 +200,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Show Time Kayıtlar
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
 DocType: Delivery Note,Installation Status,Kurulum Durumu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
 DocType: Item,Supply Raw Materials for Purchase,Tedarik Hammadde Satın Alma için
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Ürün {0} Satın alma ürünü olmalıdır
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -222,28 +208,26 @@
  Seçilen dönemde tüm tarihler ve çalışan kombinasyonu mevcut katılım kayıtları ile, şablonda gelecek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Satış Faturası verildikten sonra güncellenecektir.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: SMS Center,SMS Center,SMS Merkezi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Doğrultma
 DocType: BOM Replace Tool,New BOM,Yeni BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Toplu Fatura Zaman Kayıtlar.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Countergravity döküm
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bülten zaten gönderildi
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
 DocType: Leave Application,Reason,Nedeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Yayın
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Yayın
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Sistem Yöneticisi olacak ilk kullanıcı (bu daha sonra değiştirebilirsiniz).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Yerine Getirme
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Sistem Yöneticisi olacak ilk kullanıcı (bu daha sonra değiştirebilirsiniz).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Operasyonların detayları gerçekleştirdi.
 DocType: Serial No,Maintenance Status,Bakım Durumu
 DocType: Serial No,Maintenance Status,Bakım Durumu
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Öğeleri ve Fiyatlandırma
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Öğeleri ve Fiyatlandırma
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Tarihten itibaren Mali yıl içinde olmalıdır Tarihten itibaren  = {0} varsayılır
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Değerlendirme oluşturduğunuz Çalışanı seçin
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Maliyet Merkezi {0} Şirket {1} e ait değildir.
@@ -257,11 +241,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Kurulum tarih Ürün için teslim tarihinden önce olamaz {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Fiyat Listesi Puan İndirim (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Başlangıç
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Başlangıç
-DocType: User,First Name,Ad
-DocType: User,First Name,Ad
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Tam kalıba döküm
 DocType: Offer Letter,Select Terms and Conditions,Şartlar ve Koşulları Seç
 DocType: Production Planning Tool,Sales Orders,Satış Siparişleri
 DocType: Purchase Taxes and Charges,Valuation,Değerleme
@@ -276,9 +255,8 @@
 DocType: Bank Reconciliation,Bank Account,Banka Hesabı
 DocType: Leave Type,Allow Negative Balance,Negatif Bakiye izni
 DocType: Selling Settings,Default Territory,Standart Bölge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Televizyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
 DocType: Production Order Operation,Updated via 'Time Log','Zaman Log' aracılığıyla Güncelleme
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Hesap {0} Şirkete ait değil {1}
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
@@ -286,6 +264,7 @@
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mansiyon standart dışı alacak hesabı varsa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Sunulmadan önce gerekli depo için
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Açık Alınan
 DocType: Sales Partner,Reseller,Bayi
 DocType: Sales Partner,Reseller,Bayi
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Şirket girin
@@ -293,50 +272,44 @@
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 DocType: Lead,Address & Contact,Adres ve İrtibat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
 DocType: Newsletter List,Total Subscribers,Toplam Aboneler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,İletişim İsmi
+,Contact Name,İletişim İsmi
 DocType: Production Plan Item,SO Pending Qty,SO Bekleyen Miktar
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Yukarıda belirtilen kriterler için maaş makbuzu oluştur.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Satın alma isteği.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Çift konut
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Yıl başına bırakır
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Yıl başına bırakır
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,{0} Ayarlar&gt; Ayarlar yoluyla&gt; Adlandırma Serisi Serisi adlandırma set Lütfen
 DocType: Time Log,Will be updated when batched.,Serilendiğinde güncellenecektir.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
-DocType: Bulk Email,Message,Mesaj
-DocType: Bulk Email,Message,Mesaj
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Erişim Anahtarı
 DocType: Payment Tool,Reference No,Referans No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Yıllık
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
 DocType: Stock Entry,Sales Invoice No,Satış Fatura No
 DocType: Material Request Item,Min Order Qty,Minimum sipariş miktarı
 DocType: Lead,Do Not Contact,İrtibata Geçmeyin
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Bütün mükerrer faturaları izlemek için özel kimlik. Teslimatta oluşturulacaktır.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Yazılım Geliştirici
 DocType: Item,Minimum Order Qty,Minimum Sipariş Miktarı
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Item,Publish in Hub,Hub Yayınla
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
 DocType: Item,Purchase Details,Satın alma Detayları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Tel fırçalama
 DocType: Employee,Relation,İlişki
 DocType: Shipping Rule,Worldwide Shipping,Dünya çapında Nakliye
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Müşteriler Siparişi Onaylandı.
@@ -356,14 +329,11 @@
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
 DocType: Maintenance Schedule,Generate Schedule,Program Oluşturun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Daldırma ile elektro
 DocType: Purchase Invoice Item,Expense Head,Gider Başlığı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,İlk şarj türünü seçiniz
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Son
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,En fazla 5 karakter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Dil Seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Dil Seçiniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,En fazla 5 karakter
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,İlk kullanıcı sistem yöneticisi olacaktır (daha sonra değiştirebilirsiniz)
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Üretim Siparişleri karşı gerçek zamanlı günlükleri oluşturulmasını devre dışı bırakır. Operasyonlar Üretim Emri karşı izlenen edilmez
@@ -374,34 +344,23 @@
 DocType: Item,Variant Of,Of Varyant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Ürün {0} Hizmet ürünü olmalıdır
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
-DocType: DocType,Administrator,Yönetici
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Lazer delme
-DocType: Stock UOM Replace Utility,New Stock UOM,Yeni Stok UOM
 DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı
 DocType: Employee,External Work History,Dış Çalışma Geçmişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Dairesel Referans Hatası
-DocType: Communication,Closed,Kapalı
-DocType: Communication,Closed,Kapalı
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sözlü (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır.
 DocType: Lead,Industry,Sanayi
 DocType: Employee,Job Profile,İş Profili
 DocType: Employee,Job Profile,İş Profili
 DocType: Newsletter,Newsletter,Bülten
 DocType: Newsletter,Newsletter,Bülten
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Sarmaş dolaş olma
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Otomatik Malzeme Talebi oluşturulması durumunda e-posta ile bildir
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Ürün güncellenir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Ürün güncellenir
-DocType: Async Task,System Manager,Sistem Yöneticisi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Sales Invoice Item,Delivery Note,İrsaliye
-DocType: Dropbox Backup,Allow Dropbox Access,Dropbox erişim izni
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Vergiler kurma
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Bunu çekti sonra Ödeme Giriş modifiye edilmiştir. Tekrar çekin lütfen.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Workstation,Rent Cost,Kira Bedeli
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -410,26 +369,22 @@
 DocType: Employee,Company Email,Şirket e-posta
 DocType: GL Entry,Debit Amount in Account Currency,Hesap Para Bankamatik Tutar
 DocType: Shipping Rule,Valid for Countries,Ülkeler için geçerli
-DocType: Workflow State,Refresh,Yenile
-DocType: Workflow State,Refresh,Yenile
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Para birimi, kur oranı,ithalat toplamı, bütün ithalat toplamı vb. Satın Alma Fişinde, Tedarikçi Fiyat Teklifinde, Satış Faturasında, Alım Emrinde vb. mevcuttur."
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Dikkat Toplam Sipariş
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,Ayın 'Belli Gününde Tekrarla' alanına değer giriniz
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,Ayın 'Belli Gününde Tekrarla' alanına değer giriniz
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","BOM,İrsaliye, Satın Alma Faturası, Satın Alma Makbuzu, Satış Faturası, Satış Emri, Stok Girdisi, Zaman Çizelgesinde Mevcut"
 DocType: Item Tax,Tax Rate,Vergi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Öğe Seç
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Öğe Seç
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Ürün: {0} toplu-bilge, bunun yerine kullanmak Stok Girişi \
  Stok Uzlaşma kullanılarak uzlaşma olamaz yönetilen"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Satınalma Makbuzu teslim edilmelidir
-DocType: Stock UOM Replace Utility,Current Stock UOM,Cari Stok UOM
-DocType: Stock UOM Replace Utility,Current Stock UOM,Cari Stok UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Bir Öğe toplu (lot).
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
@@ -437,11 +392,10 @@
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,E-posta adresiniz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Eke bakın
-DocType: Purchase Order,% Received,% Alınan
-DocType: Purchase Order,% Received,% Alınan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Su jeti kesme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Kurulum Tamamlandı!
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Eke bakın
+DocType: Purchase Order,% Received,% Alındı
+DocType: Purchase Order,% Received,% Alındı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Kurulum Tamamlandı!
 ,Finished Goods,Mamüller
 ,Finished Goods,Mamüller
 DocType: Delivery Note,Instructions,Talimatlar
@@ -461,24 +415,24 @@
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Purchase Invoice Item,Item Name,Nesne Adı
+DocType: Authorization Rule,Approving User  (above authorized value),(Yetkili değerin üstünde) Kullanıcı onaylanması
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Alacak bakiyesi
 DocType: Employee,Widowed,Dul
 DocType: Employee,Widowed,Dul
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Öngörülen miktar ve minimum sipariş miktarına dayalı olarak bütün depolarda ""Stokta bulunmayan"" istenecek Ürünler"
 DocType: Workstation,Working Hours,Iş saatleri
-DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
+DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
 ,Purchase Register,Satın alma kaydı
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
 DocType: Purchase Receipt,Vehicle Date,Araç Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Tıbbi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Tüp boncuk
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
 DocType: Employee,Single,Tek
 DocType: Employee,Single,Tek
@@ -487,13 +441,13 @@
 DocType: Account,Cost of Goods Sold,Satışların Maliyeti
 DocType: Purchase Invoice,Yearly,Yıllık
 DocType: Purchase Invoice,Yearly,Yıllık
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Maliyet Merkezi giriniz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Ort. Satış Oranı
-DocType: Purchase Order,Start date of current order's period,Cari Siparişin dönem başlangıç tarihi
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Satır{0} daki miktar kesir olamaz
+DocType: Purchase Order,Start date of current order's period,Cari Siparişin dönem başlangıç tarihi
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Satır{0} daki miktar kesir olamaz
 DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
 DocType: Delivery Note,% Installed,% Montajlanan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Lütfen ilk önce şirket adını girin
@@ -504,10 +458,8 @@
 DocType: Account,Is Group,Is Grubu
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Otomatik olarak FIFO göre Nos Seri Set
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrol Tedarikçi Fatura Numarası Teklik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Termoform
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Dilme
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Son Olay No' 'İlk Olay No'  dan küçük olamaz.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Kar Yok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Kar Yok
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Başlatan Değil
 DocType: Lead,Channel Partner,Kanal Ortağı
 DocType: Lead,Channel Partner,Kanal Ortağı
@@ -517,16 +469,16 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Özellik {0} Nitelikler Tablo birden çok kez seçilmiş
+DocType: HR Settings,Employee record is created using selected field. ,Çalışan kaydı seçilen alan kullanılarak yapılmıştır
 DocType: Sales Order,Not Applicable,Uygulanamaz
 DocType: Sales Order,Not Applicable,Uygulanamaz
-apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ana tatil. 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Kabuk kalıplama
+apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Ana tatil.
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Material Request Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","İşaretli ise, vergi miktarının hali hazırda Basım Oranında/Basım Miktarında dahil olduğu düşünülecektir"
@@ -538,29 +490,25 @@
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
 DocType: Features Setup,Imports,İthalat
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Yapıştırma
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Bugün için Bekleyen faaliyetler
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Katılım kaydı.
 DocType: Bank Reconciliation,Journal Entries,Kayıt Girdileri
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
 DocType: Sales Order Item,Used for Production Plan,Üretim Planı için kullanılan
-DocType: System Settings,Loading...,Yükleniyor...
-DocType: System Settings,Loading...,Yükleniyor...
-DocType: DocField,Password,Parola
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Sigortalı birikim modelleme
 DocType: Manufacturing Settings,Time Between Operations (in mins),(Dakika içinde) Operasyonlar Arası Zaman
 DocType: Customer,Buyer of Goods and Services.,Mal ve Hizmet Alıcı.
 DocType: Journal Entry,Accounts Payable,Vadesi gelmiş hesaplar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Abone Ekle
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",""" mevcut değildir"
 DocType: Pricing Rule,Valid Upto,Tarihine kadar geçerli
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,İdari Memur
 DocType: Payment Tool,Received Or Paid,Alınan Veya Ücretli
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Firma seçiniz
 DocType: Stock Entry,Difference Account,Fark Hesabı
@@ -568,13 +516,9 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Bakım ürünleri
-DocType: DocField,Type,Türü
-DocType: DocField,Type,Türü
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
-DocType: Communication,Subject,Konu
-DocType: Communication,Subject,Konu
-DocType: Shipping Rule,Net Weight,Net Ağırlık 
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Birleştirmek için, aşağıdaki özellikler her iki Ürün için de aynı olmalıdır"
+DocType: Shipping Rule,Net Weight,Net Ağırlık
 DocType: Employee,Emergency Phone,Acil Telefon
 DocType: Employee,Emergency Phone,Acil Telefon
 ,Serial No Warranty Expiry,Seri No Garanti Bitiş tarihi
@@ -585,8 +529,7 @@
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Account,Profit and Loss,Kar ve Zarar
 DocType: Account,Profit and Loss,Kar ve Zarar
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Yönetme Taşeronluk
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Yeni UOM tam sayı tipi olmamalıdır
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Yönetme Taşeronluk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Mobilya ve Fikstürü
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Fiyat listesi para biriminin şirketin temel para birimine dönüştürülme oranı
@@ -600,17 +543,17 @@
 DocType: Production Planning Tool,Material Requirement,Malzeme İhtiyacı
 DocType: Company,Delete Company Transactions,Şirket İşlemleri sil
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Ürün {0} Satın alma ürünü değildir
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} 'Bildirim \
  E-posta Adresi' geçersiz e-posta adresi"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Toplam Fatura Bu Yıl:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Toplam Fatura Bu Yıl:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Territory,For reference,Referans için
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Silinemiyor Seri No {0}, hisse senedi işlemlerinde kullanıldığı gibi"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Kapanış (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Kapanış (Cr)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Serial No,Warranty Period (Days),Garanti Süresi (Gün)
 DocType: Installation Note Item,Installation Note Item,Kurulum Notu Maddesi
@@ -620,7 +563,7 @@
 DocType: Company,Ignore,Yoksay
 DocType: Company,Ignore,Yoksay
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
 DocType: Pricing Rule,Valid From,Itibaren geçerli
 DocType: Pricing Rule,Valid From,Itibaren geçerli
 DocType: Sales Invoice,Total Commission,Toplam Komisyon
@@ -633,8 +576,8 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Aylık Dağılımı ** işinizde size mevsimsellik varsa ay boyunca bütçenizi dağıtmak yardımcı olur.
 
 , Bu dağılım kullanılarak bir bütçe dağıtmak ** Maliyet Merkezi'nde ** ** Bu Aylık Dağıtım ayarlamak için **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
@@ -643,7 +586,6 @@
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
-DocType: About Us Settings,Website Manager,Web Yöneticisi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Mali Yıl başlangıç tarihi Mali Yıl bitiş tarihinden ileri olmamalıdır
 DocType: Warranty Claim,Resolution,Karar
 DocType: Warranty Claim,Resolution,Karar
@@ -652,14 +594,13 @@
 DocType: Sales Order,Billing and Delivery Status,Fatura ve Teslimat Durumu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
 DocType: Leave Control Panel,Allocate,Tahsis
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Önceki
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Satış İade
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Üretim Emri oluşturmak istediğiniz Satış Siparişlerini seçiniz.
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Maaş bileşenleri.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Potansiyel müşterilerin Veritabanı.
+DocType: Authorization Rule,Customer or Item,Müşteri ya da Öğe
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Müşteri veritabanı.
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Müşteri veritabanı.
 DocType: Quotation,Quotation To,Teklif Etmek
@@ -667,17 +608,15 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Tumbling
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Zaten başka UOM bazı işlem (ler) yaptık çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Farklı Standart UOM kullanmak için yeni bir öğe oluşturmanız gerekecektir.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
-DocType: Event,Wednesday,Çarşamba
-DocType: Event,Wednesday,Çarşamba
 DocType: Sales Invoice,Customer's Vendor,Müşterinin Satıcısı
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Üretim Sipariş Zorunlu olan
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Başka Satış Kişi {0} aynı Çalışan kimliği ile var
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negatif Stok Hatası ({6}) Ürün {0} için {4} {5} de {2} {3} üzerindeki Depoda
 DocType: Fiscal Year Company,Fiscal Year Company,Mali Yıl Şirketi
@@ -697,31 +636,27 @@
 apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' mali yıl {2} içinde değil
 DocType: Buying Settings,Settings for Buying Module,Modülü satın almak için Ayarlar
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +62,Please enter Purchase Receipt first,İlk Satınalma Faturası giriniz
-DocType: Buying Settings,Supplier Naming By,Tedarikçi İsimlendirme 
+DocType: Buying Settings,Supplier Naming By,Tedarikçi İsimlendirme
 DocType: Activity Type,Default Costing Rate,Standart Maliyetlendirme Oranı
 DocType: Maintenance Schedule,Maintenance Schedule,Bakım Programı
 DocType: Maintenance Schedule,Maintenance Schedule,Bakım Programı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Dropbox python modunu kurun
 DocType: Employee,Passport Number,Pasaport Numarası
 DocType: Employee,Passport Number,Pasaport Numarası
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Yönetici
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Yönetici
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Satın Alma Makbuzundan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Yönetici
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Satın Alma Makbuzundan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 DocType: SMS Settings,Receiver Parameter,Alıcı Parametre
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dayalıdır' ve 'Grubundadır' aynı olamaz
 DocType: Sales Person,Sales Person Targets,Satış Personeli Hedefleri
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Şu kişiye
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Lütfen E-posta adresinizi girin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Oluşturan boru ucu
 DocType: Production Order Operation,In minutes,Dakika içinde
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
-DocType: Selling Settings,Customer Naming By,Adlandırılan Müşteri 
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
+DocType: Selling Settings,Customer Naming By,Adlandırılan Müşteri
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Gruba Dönüştürmek
 DocType: Activity Cost,Activity Type,Faaliyet Türü
 DocType: Activity Cost,Activity Type,Faaliyet Türü
@@ -729,30 +664,24 @@
 DocType: Customer,Fixed Days,Sabit Günleri
 DocType: Sales Invoice,Packing List,Paket listesi
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Tedarikçilere verilen Satın alma Siparişleri.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Yayıncılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Yayıncılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Yayıncılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Yayıncılık
 DocType: Activity Cost,Projects User,Projeler Kullanıcı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tüketilen
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} Fatura Ayrıntıları tablosunda bulunamadı
 DocType: Company,Round Off Cost Center,Maliyet Merkezi Kapalı Yuvarlak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bakım Ziyareti {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Material Request,Material Transfer,Materyal Transfer
 DocType: Material Request,Material Transfer,Materyal Transfer
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Açılış (Dr)
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Açılış (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Gönderme zamanı damgası {0}'dan sonra olmalıdır
-apps/frappe/frappe/config/setup.py +59,Settings,Ayarlar
-apps/frappe/frappe/config/setup.py +59,Settings,Ayarlar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Indi Maliyet Vergiler ve Ücretler
-DocType: Production Order Operation,Actual Start Time,Gerçek Başlangıç Zamanı
+DocType: Production Order Operation,Actual Start Time,Gerçek Başlangıç Zamanı
 DocType: BOM Operation,Operation Time,Çalışma Süresi
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Daha fazla
 DocType: Pricing Rule,Sales Manager,Satış Müdürü
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Yeniden adlandır
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Bükme
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Kullanıcı izni
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Journal Entry,Bill No,Fatura No
 DocType: Purchase Invoice,Quarterly,Üç ayda bir
@@ -765,19 +694,18 @@
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
 DocType: Account,Accounts,Hesaplar
 DocType: Account,Accounts,Hesaplar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Düz kesme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Pazarlama
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Ürünleri seri numaralarına bağlı olarak alım ve satış belgelerinde izlemek için. Bu aynı zamanda ürünün garanti ayarları için de kullanılabilir.
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Reddedilen Depo reddedilen Ürün karşılığı zorunludur
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 DocType: Employee,Provide email id registered in company,Şirkette kayıtlı e-posta adresini veriniz
 DocType: Hub Settings,Seller City,Satıcı Şehri
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Öğe varyantları vardır.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Ürün {0} bulunamadı
 DocType: Bin,Stock Value,Stok Değeri
 DocType: Bin,Stock Value,Stok Değeri
@@ -790,15 +718,10 @@
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Fiş karşı Tipi Satış Sipariş biri, Satış Faturası veya günlük girdisi olmalıdır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Döviz kurunu bulunamıyor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Havacılık ve Uzay;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgeldiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Hoşgeldiniz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Havacılık ve Uzay;
 DocType: Journal Entry,Credit Card Entry,Kredi Kartı Girişi
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Görev Konusu
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Tedarikçilerden alınan mallar.
-DocType: Communication,Open,Aç
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Lead,Campaign Name,Kampanya Adı
 ,Reserved,Ayrılmış
@@ -810,21 +733,18 @@
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
-DocType: Contact Us Settings,Address Title,Adres Başlığı
-DocType: Contact Us Settings,Address Title,Adres Başlığı
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Haftalık izin gününü seçiniz
 DocType: Production Order Operation,Planned End Time,Planlanan Bitiş Zamanı
 ,Sales Person Target Variance Item Group-Wise,Satış Personeli Hedef Varyans Ürün Grup Bilgisi
-DocType: Dropbox Backup,Daily,Günlük
-DocType: Dropbox Backup,Daily,Günlük
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
 DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numarası
 DocType: Employee,Cell Number,Hücre sayısı
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Enerji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Aylık maaş beyanı.
@@ -832,16 +752,12 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Yeni Hesap
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Yeni Hesap
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Muhasebe Girişler yaprak düğümleri karşı yapılabilir. Gruplar karşı Girişler izin verilmez.
-DocType: ToDo,High,Yüksek
-DocType: ToDo,High,Yüksek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
 DocType: Opportunity,Maintenance,Bakım
 DocType: Opportunity,Maintenance,Bakım
-DocType: User,Male,Erkek
-DocType: User,Male,Erkek
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Satış kampanyaları.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -891,11 +807,10 @@
 DocType: Address,Personal,Kişisel
 DocType: Expense Claim Detail,Expense Claim Type,Gideri Talebi Türü
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alışveriş Sepeti Varsayılan ayarları
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Günlük girdisi {0} bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol Sipariş karşı bağlantılıdır."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biyoteknoloji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Biyoteknoloji
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Günlük girdisi {0} bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol Sipariş karşı bağlantılıdır."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biyoteknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biyoteknoloji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Ofis Bakım Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Ürün Kodu girin
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
@@ -905,16 +820,17 @@
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Process Payroll,Send Email,E-posta Gönder
 DocType: Process Payroll,Send Email,E-posta Gönder
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",Parti dayalı filtrelemek için seçin Parti ilk yazınız
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0}, 'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Numaralar
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş.
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Numaralar
 DocType: Item,Items with higher weightage will be shown higher,Yüksek weightage Öğeler yüksek gösterilir
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Benim Faturalar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Benim Faturalar
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Çalışan bulunmadı
 DocType: Purchase Order,Stopped,Durduruldu
 DocType: Purchase Order,Stopped,Durduruldu
@@ -936,29 +852,26 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",&quot;Point of Sale&quot; özellikleri etkinleştirmek için
 DocType: Bin,Moving Average Rate,Hareketli Ortalama Kuru
 DocType: Production Planning Tool,Select Items,Ürünleri Seçin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
-DocType: Comment,Reference Name,Referans Adı
-DocType: Comment,Reference Name,Referans Adı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Sales Invoice Item,Target Warehouse,Hedef Depo
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Beklenen Teslim Tarihi satış siparişi tarihinden önce olamaz
-DocType: Upload Attendance,Import Attendance,İthalat Katılımı 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
+DocType: Upload Attendance,Import Attendance,İthalat Katılımı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Net Kar / Zarar
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Production Order,Item To Manufacture,Üretilecek Ürün
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Kalıcı kalıba döküm
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} durum {2} olduğu
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Ödeme Satınalma Siparişi
 DocType: Sales Order Item,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Newsletter,Newsletter Manager,Bülten Müdürü
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Açılış&#39;
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
 DocType: Expense Claim,Expenses,Giderler
@@ -966,12 +879,11 @@
 DocType: Item Variant Attribute,Item Variant Attribute,Öğe Varyant Özellik
 ,Purchase Receipt Trends,Satın alma makbuzu eğilimleri
 DocType: Appraisal,Select template from which you want to get the Goals,Hedefleri almak istediğiniz şablonu seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Araştırma ve Geliştirme
 ,Amount to Bill,Faturalanacak Tutar
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Company,Registration Details,Kayıt Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Esnetme
 DocType: Item,Re-Order Qty,Yeniden sipariş Adet
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programlandı ve şuna gönderildi {0}
@@ -985,12 +897,10 @@
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Satış Noktası
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Ileriye taşıyamaz {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
 DocType: Account,Balance must be,Bakiye şu olmalıdır
 DocType: Hub Settings,Publish Pricing,Fiyatlandırma Yayınla
 DocType: Notification Control,Expense Claim Rejected Message,Gider Talebi Reddedildi Mesajı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Çivisi
 ,Available Qty,Mevcut Adet
 DocType: Purchase Taxes and Charges,On Previous Row Total,Önceki satır toplamı
 DocType: Salary Slip,Working Days,Çalışma Günleri
@@ -998,7 +908,7 @@
 DocType: Serial No,Incoming Rate,Gelen Oranı
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
 DocType: Packing Slip,Gross Weight,Brüt Ağırlık
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı
 DocType: HR Settings,Include holidays in Total no. of Working Days,Çalışma günlerinin toplam sayısı ile tatilleri dahil edin
 DocType: Job Applicant,Hold,Muhafaza et
 DocType: Employee,Date of Joining,Katılma Tarihi
@@ -1009,13 +919,12 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Aboneleri Göster
 DocType: Purchase Invoice Item,Purchase Receipt,Satın Alma makbuzu
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Raspa
 DocType: Employee,Ms,Bayan
 DocType: Employee,Ms,Bayan
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Ana Döviz Kuru.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} aktif olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} aktif olmalıdır
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Bu Bakım Ziyaretini iptal etmeden önce Malzeme Ziyareti {0} iptal edin
 DocType: Salary Slip,Leave Encashment Amount,İzin Tahsilat Miktarı
@@ -1023,13 +932,13 @@
 DocType: Purchase Receipt Item Supplied,Required Qty,Gerekli Adet
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
 DocType: Production Planning Tool,Production Orders,Üretim Siparişleri
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Denge Değeri
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Satış Fiyat Listesi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Öğeleri senkronize Yayınla
-DocType: GL Entry,Account Currency,Hesabın Döviz Cinsi
+DocType: Bank Reconciliation,Account Currency,Hesabın Döviz Cinsi
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Şirket Yuvarlak Kapalı Hesabı belirtin
 DocType: Purchase Receipt,Range,Aralık
 DocType: Purchase Receipt,Range,Aralık
@@ -1037,7 +946,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Features Setup,Item Barcode,Ürün Barkodu
 DocType: Features Setup,Item Barcode,Ürün Barkodu
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 DocType: Address,Shop,Mağaza
@@ -1047,10 +956,10 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Bu mod seçildiğinde Varsayılan Banka / Kasa hesabı otomatik olarak POS Faturada güncellenecektir.
 DocType: Employee,Permanent Address Is,Kalıcı Adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyon kaç mamul tamamlandı?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Marka
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Employee,Exit Interview Details,Çıkış Görüşmesi Detayları
-DocType: Item,Is Purchase Item,Satın Alma Maddesi 
+DocType: Item,Is Purchase Item,Satın Alma Maddesi
 DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
 DocType: Journal Entry Account,Purchase Invoice,Satınalma Faturası
 DocType: Stock Ledger Entry,Voucher Detail No,Föy Detay no
@@ -1062,7 +971,7 @@
 DocType: Salary Slip,Total in words,Sözlü Toplam
 DocType: Material Request Item,Lead Time Date,Talep Yaratma Zaman Tarihi
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,zorunludur. Belki Döviz rekor için oluşturulmadı
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz 
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","&#39;Ürün Bundle&#39; öğeler, Depo, Seri No ve Toplu No &#39;Ambalaj Listesi&#39; tablodan kabul edilecektir. Depo ve Toplu Hayır herhangi bir &#39;Ürün Bundle&#39; öğe için tüm ambalaj öğeler için aynı ise, bu değerler ana Öğe tabloda girilebilir, değerler tablosu &#39;Listesi Ambalaj&#39; kopyalanacaktır."
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
@@ -1070,40 +979,36 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Dolaylı Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Dolaylı Gelir
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Set Ödeme Tutarı = Üstün Tutar
-DocType: Contact Us Settings,Address Line 1,Adres Satırı 1
-DocType: Contact Us Settings,Address Line 1,Adres Satırı 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Varyans
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firma Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Firma Adı
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Varyans
+,Company Name,Firma Adı
+,Company Name,Firma Adı
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
 DocType: SMS Center,Total Message(s),Toplam Mesaj (lar)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Transferi için seçin Öğe
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Tüm yardım videoların bir listesini görüntüleyin
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Çekin yatırıldığı bankadaki hesap başlığını seçiniz
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Kullanıcıya işlemlerdeki Fiyat Listesi Oranını düzenlemek için izin ver
 DocType: Pricing Rule,Max Qty,En fazla miktar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Kimyasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 DocType: Process Payroll,Select Payroll Year and Month,Bordro Yılı ve Ay Seçiniz
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Uygun bir grup (genellikle Fonların Uygulama&gt; Dönen Varlıklar&gt; Banka Hesapları gidin ve Çeşidi) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak &quot;Banka&quot;
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Doğumgünü Hatırlatmalarını gönderme
-DocType: Comment,Unsubscribed,Kaydolmamış
 DocType: Opportunity,Walk In,Rezervasyonsuz Müşteri
 DocType: Item,Inspection Criteria,Muayene Kriterleri
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Finansal Maliyet Merkezleri Ağacı
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Aktarılan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Beyaz
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Resminizi Ekleyin
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Yapmak
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Resminizi Ekleyin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Yapmak
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
-DocType: Workflow State,Stop,dur
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Benim Sepeti
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Sipariş türü şunlardan biri olmalıdır {0}
@@ -1111,7 +1016,7 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Açılış Miktarı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Stok Seçenekleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Stok Seçenekleri
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Için Adet {0}
@@ -1119,20 +1024,18 @@
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,İzin Tahsis Aracı
 DocType: Leave Block List,Leave Block List Dates,İzin engel listesi tarihleri
 DocType: Company,If Monthly Budget Exceeded (for expense account),Aylık Bütçe (gider hesabı için) aşıldı ise
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Süsleme
 DocType: Workstation,Net Hour Rate,Net Saat Hızı
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,İnen Maliyet Alım Makbuzu
 DocType: Company,Default Terms,Standart Şartları
 DocType: Packing Slip Item,Packing Slip Item,Ambalaj Makbuzu Ürünleri
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
 DocType: POS Profile,Cash/Bank Account,Kasa / Banka Hesabı
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Dosyalama
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Indirim
 DocType: Features Setup,Purchase Discounts,Satın Alma indirimleri
 DocType: Workstation,Wages,Ücret
@@ -1150,7 +1053,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
 DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
 DocType: Issue,Issue,Sayı
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Hesap firması ile eşleşmiyor
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
 DocType: BOM Operation,Operation,Operasyon
@@ -1160,8 +1064,8 @@
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Ürün düğmesi 'satın alma makbuzlarını Öğeleri alın' kullanılarak eklenmelidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Satış Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standart Satın Alma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standart Satın Alma
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Standart Satın Alma
 DocType: GL Entry,Against,Karşı
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
@@ -1169,7 +1073,7 @@
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Stok Girişleri Yapımı
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Stok Girişleri Yapımı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık UOM
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Item,Default Supplier,Standart Tedarikçi
@@ -1186,31 +1090,29 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 DocType: Opportunity,Your sales person who will contact the customer in future,Müşteriyle ileride irtibat kuracak satış kişiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 DocType: Company,Default Currency,Varsayılan Para Birimi
 DocType: Contact,Enter designation of this Contact,Bu irtibatın görevini girin
-DocType: Contact Us Settings,Address,Adres
 DocType: Expense Claim,From Employee,Çalışanlardan
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
 DocType: Journal Entry,Make Difference Entry,Fark Girişi yapın
 DocType: Upload Attendance,Attendance From Date,Tarihten itibaren katılım
 DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Taşıma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,ve yıl
 DocType: Email Digest,Annual Expense,Yıllık Gider
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Ürün için BOM BOM alanında seçiniz {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Ürün için BOM BOM alanında seçiniz {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Form Fatura Ayrıntısı
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Ödeme Mutabakat Faturası
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Katkı%
 DocType: Item,website page link,web sayfa linki
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Ilk kullanım için sistemi hazırlamak edelim.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Referans için şirket kayıt numaraları. Vergi numaraları vb
 DocType: Sales Partner,Distributor,Dağıtımcı
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Alışveriş Sepeti Nakliye Kural
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Üretim Siparişi {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Günlükleri seçin ve yeni Satış Faturası oluşturmak için teslim edin.
@@ -1232,18 +1134,15 @@
 apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Açılış Muhasebe Dengesi
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Talep edecek bir şey yok
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Yönetim
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Yönetim
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Yönetim
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Zaman Cetveli için faaliyet türleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Yatırım döküm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},{0} için borç ya da kredi hesabı gereklidir
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Etkin
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Etkin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Mavi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Mavi
 DocType: Purchase Invoice,Is Return,İade mi
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Ek kısımlar ancak 'Grup' tipi kısımlar altında oluşturulabilir
@@ -1254,12 +1153,10 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Profili {0} zaten kullanıcı için oluşturulan: {1} ve şirket {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Dönüşüm Katsayısı
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Lamine nesne imalatı
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Tedarikçi Veritabanı.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Oluşturucu Streç
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Satış kişiniz bu tarihte müşteriyle irtibata geçmek için bir hatırlama alacaktır
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Vergi ve diğer Maaş kesintileri.
@@ -1268,7 +1165,7 @@
 DocType: Email Digest,Payables,Borçlar
 DocType: Account,Warehouse,Depo
 DocType: Account,Warehouse,Depo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
@@ -1276,19 +1173,15 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Madde 1
 DocType: Holiday,Holiday,Tatil
 DocType: Holiday,Holiday,Tatil
-DocType: Event,Saturday,Cumartesi
-DocType: Event,Saturday,Cumartesi
 DocType: Leave Control Panel,Leave blank if considered for all branches,Tüm branşlarda için kabul ise boş bırakın
 ,Daily Time Log Summary,Günlük Saat Günlük Özet
-DocType: DocField,Label,Etiket
-DocType: DocField,Label,Etiket
 DocType: Payment Reconciliation,Unreconciled Payment Details,Uzlaşmayan Ödeme Ayrıntıları
 DocType: Payment Reconciliation,Unreconciled Payment Details,Uzlaşmayan Ödeme Ayrıntıları
 DocType: Global Defaults,Current Fiscal Year,Cari Mali Yılı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Lead,Call,Çağrı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Girdiler' boş olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
@@ -1296,21 +1189,17 @@
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Izgara """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Önce Ön ek seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Araştırma
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Nitelikler masada en az bir özellik belirtin
 DocType: Contact,User ID,Kullanıcı Kimliği
-DocType: Communication,Sent,Gönderilen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Değerlendirme Defteri
-DocType: File,Lft,lft
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
-DocType: Communication,Delivery Status,Teslim Durumu
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 DocType: Production Order,Manufacture against Sales Order,Satış Emrine Karşı Üretim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Dünyanın geri kalanı
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
@@ -1321,13 +1210,11 @@
 DocType: BOM Item,Item Description,Ürün Tanımı
 DocType: Payment Tool,Payment Mode,Ödeme Modu
 DocType: Purchase Invoice,Is Recurring,Dönüşümlü mı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Doğrudan metal lazer sinterleme
 DocType: Purchase Order,Supplied Items,Verilen Öğeler
 DocType: Production Order,Qty To Manufacture,Üretilecek Miktar
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Alım döngüsü boyunca aynı oranı koruyun
 DocType: Opportunity Item,Opportunity Item,Fırsat Ürünü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Geçici Açma
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Çalışanın Kalan İzni
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
 DocType: Address,Address Type,Adres Tipi
@@ -1345,34 +1232,33 @@
 DocType: Journal Entry,Get Outstanding Invoices,Bekleyen Faturaları alın
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Küçük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Küçük
 DocType: Employee,Employee Number,Çalışan sayısı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Madde 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Hesap başlığı {0} oluşturuldu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Yeşil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Yeşil
 DocType: Item,Auto re-order,Otomatik yeniden sipariş
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Toplam Elde
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Toplam Elde
 DocType: Employee,Place of Issue,Verildiği yer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
-DocType: Report,Disabled,Devredışı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Sözleşme
+DocType: Email Digest,Add Quote,Alıntı ekle
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de UOM: {0} için UOM dönüştürme katsayısı gereklidir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ürünleriniz veya hizmetleriniz
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Ürünleriniz veya hizmetleriniz
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 DocType: Mode of Payment,Mode of Payment,Ödeme Şekli
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Adı gerekli
 DocType: Purchase Invoice,Recurring Type,Tekrarlanma Türü
 DocType: Address,City/Town,İl / İlçe
 DocType: Email Digest,Annual Income,Yıllık gelir
@@ -1381,7 +1267,7 @@
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Ürün {0} bir taşeron ürünü olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Sermaye Ekipmanları
@@ -1395,7 +1281,7 @@
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Beklenen Teslim Tarihi Planlanan Başlama Tarihi daha az olduğunu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Tedarikçi İçin
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Hesap Türünü ayarlamak işlemlerde bu hesabı seçeren yardımcı olur
 DocType: Purchase Invoice,Grand Total (Company Currency),Genel Toplam (Şirket para birimi)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Toplam Giden
@@ -1403,8 +1289,6 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sadece ""değerini"" için 0 veya boş değere sahip bir Nakliye Kural Durumu olabilir"
 DocType: Authorization Rule,Transaction,İşlem
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Not: Bu Maliyet Merkezi bir Grup. Gruplara karşı muhasebe kayıtları yapamazsınız.
-apps/frappe/frappe/config/desk.py +7,Tools,Araçlar
-apps/frappe/frappe/config/desk.py +7,Tools,Araçlar
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Üretim sipariş numarası stok girişi amaçlı üretimi için zorunludur
@@ -1414,30 +1298,27 @@
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Yorumlar
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Yorumlar
 DocType: Salary Slip,Bank Account No.,Banka Hesap No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Bu ön ekle son oluşturulmuş işlemlerin sayısıdır
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Ürün {0} için gerekli Değereme Oranı
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Ürün {0} için gerekli Değereme Oranı
 DocType: Quality Inspection Reading,Reading 8,8 Okuma
 DocType: Sales Partner,Agent,Temsilci
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Toplam {0} tüm öğeler için size &#39;Dayalı Ücretleri dağıtın&#39; değiştirmek gerekir olabilir, sıfır"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Vergiler ve Ücretleri Hesaplama
 DocType: BOM Operation,Workstation,İş İstasyonu
 DocType: BOM Operation,Workstation,İş İstasyonu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Donanım
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Donanım
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bir Şirket seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Privilege bırak
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Sen Alışveriş Sepeti etkinleştirmeniz gerekir
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Hiçbir veri
 DocType: Appraisal Template Goal,Appraisal Template Goal,Değerlendirme Şablonu Hedefi
 DocType: Salary Slip,Earning,Kazanma
 DocType: Payment Tool,Party Account Currency,Parti Hesap Döviz
@@ -1447,31 +1328,27 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Şunların arasında çakışan koşullar bulundu:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Toplam Sipariş Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Yiyecek Grupları
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Yaşlanma Aralığı 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Sadece bir gönderilen üretim düzenine karşı bir süre kayıtlarını yapabilir
 DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
-DocType: File,old_parent,old_parent
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","İrtibatlara, müşterilere bülten"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Kapanış Hesap Para olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Tüm hedefler için puan toplamı It is 100. olmalıdır {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Operasyon boş bırakılamaz.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Operasyon boş bırakılamaz.
 ,Delivered Items To Be Billed,Faturalanacak Teslim edilen Ürünler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo Seri No için değiştirilemez
-DocType: DocField,Description,Açıklama
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
-DocType: Letter Head,Is Default,Standart
 DocType: Address,Utilities,Programlar
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Features Setup,Features Setup,Özellik  Kurulumu
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Teklif Mektubunu Göster
-DocType: Communication,Communication,Iletişim becerisi
 DocType: Item,Is Service Item,Hizmet Maddesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Mali Yıl seçiniz
@@ -1479,7 +1356,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Gönderen {0} | {1} {2}
 DocType: BOM Operation,Operation Description,İşletme Tanımı
 DocType: Item,Will also apply to variants,Ayrıca varyant için de geçerlidir
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Mali Yıl Başlangıç Tarihi ve Mali Yılı kaydedildikten sonra Mali Yıl Sonu Tarihi değiştiremezsiniz.
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +30,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Mali Yıl Başlangıç Tarihi ve Mali Yılı kaydedildikten sonra Mali Yıl Sonu Tarihi değiştiremezsiniz.
 DocType: Quotation,Shopping Cart,Alışveriş Sepeti
 DocType: Quotation,Shopping Cart,Alışveriş Sepeti
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ort Günlük Giden
@@ -1487,8 +1364,8 @@
 DocType: Pricing Rule,Campaign,Kampanya
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +30,Approval Status must be 'Approved' or 'Rejected',Onay Durumu 'Onaylandı' veya 'Reddedildi' olmalıdır
 DocType: Purchase Invoice,Contact Person,İrtibat Kişi
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
 DocType: Holiday List,Holidays,Bayram
 DocType: Holiday List,Holidays,Bayram
 DocType: Sales Order Item,Planned Quantity,Planlanan Miktar
@@ -1498,7 +1375,7 @@
 DocType: Item,Maintain Stock,Stok koruyun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,DateTime Gönderen
 DocType: Email Digest,For Company,Şirket için
@@ -1510,7 +1387,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Hesap Tablosu
 DocType: Material Request,Terms and Conditions Content,Şartlar ve Koşullar İçeriği
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
@@ -1528,36 +1405,33 @@
 ,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Yapılacaklar Listesi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Negatif Miktara izin verilmez
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Çırak
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Negatif Miktara izin verilmez
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Bir dize olarak madde ustadan getirilen ve bu alanda depolanan vergi detay tablo.
  Vergi ve Ücretleri için kullanılır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
 DocType: Email Digest,Bank Balance,Banka hesap bakiyesi
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Çalışan {0} ve ay bulunamadı aktif Maaş Yapısı
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Işlemler için vergi Kural.
 DocType: Rename Tool,Type of document to rename.,Yeniden adlandırılacak Belge Türü.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Bu ürünü alıyoruz
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Bu ürünü alıyoruz
 DocType: Address,Billing,Faturalama
 DocType: Address,Billing,Faturalama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Flanş
-DocType: Bulk Email,Not Sent,Gönderilen Değil
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Şekillendirme Patlayıcı
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Toplam Vergi ve Harçlar (Şirket Para Birimi)
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,{0} gönderilmek üzere programlandı
 DocType: Quality Inspection,Readings,Okumalar
 DocType: Stock Entry,Total Additional Costs,Toplam Ek Maliyetler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Alt Kurullar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Alt Kurullar
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Supplier,Stock Manager,Stok Müdürü
@@ -1570,84 +1444,75 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İthalat Başarısız oldu
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analist
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analist
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Satır {0}: Tahsis miktar {1} daha az olması veya JV miktarı eşittir gerekir {2}
 DocType: Item,Inventory,Stok
 DocType: Features Setup,"To enable ""Point of Sale"" view",Bakış &quot;Sale Noktası&quot; etkinleştirmek için
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Boş sepet için ödeme yapılamaz
 DocType: Item,Sales Details,Satış Ayrıntılar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Iğneleme
 DocType: Opportunity,With Items,Öğeler ile
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Miktarında
 DocType: Notification Control,Expense Claim Rejected,Gider Talebi Reddedildi
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",Bir sonraki fatura oluşturulur tarih. Bu teslim oluşturulur.
 DocType: Item Attribute,Item Attribute,Ürün Özellik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Devlet
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Öğe Türevleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Devlet
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 DocType: Company,Services,Servisler
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Toplam ({0})
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Toplam ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Toplam ({0})
 DocType: Cost Center,Parent Cost Center,Ana Maliyet Merkezi
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Mali Yıl Başlangıç Tarihi
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Mali Yıl Başlangıç Tarihi
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Havşa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Material Request Item,Sales Order No,Satış Sipariş No
 DocType: Item Group,Item Group Name,Ürün Grup Adı
 DocType: Item Group,Item Group Name,Ürün Grup Adı
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Alınmış
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Alınmış
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Üretim için Aktarım Malzemeleri
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Yürütücü Arama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Öğe için satın alma oranı: {0} bulunamadı, muhasebe girişi (gideri) kitap için gereklidir. Bir satın alma fiyat listesi karşı madde fiyatı belirtiniz."
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ek İndirim Tutarı (Şirket Para)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hata: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Hata: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Lütfen hesap tablosundan yeni hesap oluşturunuz
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 DocType: Maintenance Visit,Maintenance Visit,Bakım Ziyareti
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Müşteri> Müşteri Grubu> Eyalet
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Depo Available at Toplu Adet
 DocType: Time Log Batch Detail,Time Log Batch Detail,Günlük Seri Detayı
-DocType: Workflow State,Tasks,görevler
-DocType: Workflow State,Tasks,Görevler
 DocType: Landed Cost Voucher,Landed Cost Help,Indi Maliyet Yardım
-DocType: Event,Tuesday,Salı
-DocType: Event,Tuesday,Salı
 DocType: Leave Block List,Block Holidays on important days.,Önemli günlerde Blok Tatil.
 ,Accounts Receivable Summary,Alacak Hesapları Özeti
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Zaten bir süre için Çalışanı {1} için ayrılan tip {0} için bırakır {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
 DocType: UOM,UOM Name,UOM Adı
-DocType: Top Bar Item,Target,Hedef
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Katkı Tutarı
 DocType: Sales Invoice,Shipping Address,Teslimat Adresi
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Bu araç, güncellemek veya sistemde stok miktarı ve değerleme düzeltmek için yardımcı olur. Genellikle sistem değerlerini ve ne aslında depolarda var eşitlemek için kullanılır."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Sözlü İrsaliyeyi kaydettiğinizde görünür olacaktır
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Esas marka.
-DocType: ToDo,Due Date,Bitiş tarihi
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Esas marka.
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Purchase Receipt,Transporter Details,Taşıyıcı Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizasyon
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Organizasyon
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kutu
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Kutu
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizasyon
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Organizasyon
 DocType: Monthly Distribution,Monthly Distribution,Aylık Dağılımı
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Alıcı listesi boş. Alıcı listesi oluşturunuz
 DocType: Production Plan Sales Order,Production Plan Sales Order,Üretim Planı Satış Siparişi
@@ -1655,7 +1520,6 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},"{0} için muhasebe kayıt, sadece para yapılabilir: {1}"
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
@@ -1664,7 +1528,7 @@
 ,Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
 DocType: Address,Lead Name,Talep Yaratma Adı
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Açılış Stok Dengesi
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Açılış Stok Dengesi
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} sadece bir kez yer almalıdır
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Daha fazla tranfer izin yok {0} daha {1} Satınalma Siparişi karşı {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
@@ -1672,11 +1536,9 @@
 DocType: Shipping Rule Condition,From Value,Değerden
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Bankaya yansıyan değil tutarlar
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Bankaya yansıyan değil tutarlar
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Şirket Gideri Talepleri.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Savurma döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Manyetik alan destekli bitirme
 DocType: Company,Default Holiday List,Tatil Listesini Standart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Stok Yükümlülükleri
 DocType: Purchase Receipt,Supplier Warehouse,Tedarikçi Deposu
@@ -1684,12 +1546,13 @@
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
 DocType: Production Planning Tool,Select Sales Orders,Satış Siparişleri Seçiniz
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Ürünleri barkod kullanarak aramak için. Ürünlerin barkodunu taratarak Ürünleri İrsaliye ev Satış Faturasına girebilirsiniz
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Mark Teslim olarak
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Mark Teslim olarak
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Teklifi Yap
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 DocType: SMS Center,Receiver List,Alıcı Listesi
@@ -1699,37 +1562,30 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Görüntüle
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
 DocType: Salary Structure Deduction,Salary Structure Deduction,Maaş Yapısı Kesintisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selektif Lazer sinterleme
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Başarılı İthalat!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Yaş (Gün)
 DocType: Quotation Item,Quotation Item,Teklif Ürünü
 DocType: Account,Account Name,Hesap adı
 DocType: Account,Account Name,Hesap adı
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Tarihten itibaren tarihe kadardan ileride olamaz
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Seri No {0} miktar {1} kesir olamaz
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Tedarikçi Türü Alanı.
 DocType: Purchase Order Item,Supplier Part Number,Tedarikçi Parti Numarası
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Ekle
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Ekle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Dönüşüm oranı 0 veya 1 olamaz
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} iptal edilmiş veya durdurulmuş
 DocType: Accounts Settings,Credit Controller,Kredi Kontrolü
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
 DocType: Delivery Note,Vehicle Dispatch Date,Araç Sevk Tarihi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Satın alma makbuzu {0} teslim edilmedi
 DocType: Company,Default Payable Account,Standart Ödenecek Hesap
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Böyle nakliye kuralları, fiyat listesi vb gibi online alışveriş sepeti için Ayarlar"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Kurulum Tamamlandı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Faturalandırıldı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,İnsan Kaynakları
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Journal Entry Account,Debit in Company Currency,Şirket Para Birimi Bankamatik
@@ -1739,31 +1595,24 @@
 DocType: Company,Default Values,Varsayılan Değerler
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Satır {0}: Ödeme tutarı negatif olamaz
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Preslenerek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Tedarikçi karşı Fatura {0} tarihli {1}
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Payment Reconciliation,Payments,Ödemeler
 DocType: Payment Reconciliation,Payments,Ödemeler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Presleme Sıcak izostatik
-DocType: ToDo,Medium,Orta
-DocType: ToDo,Medium,Orta
 DocType: Budget Detail,Budget Allocated,Ayrılan Bütçe
 DocType: Budget Detail,Budget Allocated,Ayrılan Bütçe
 DocType: Journal Entry,Entry Type,Girdi Türü
 ,Customer Credit Balance,Müşteri Kredi Bakiyesi
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +137,Please verify your email id,E-posta id doğrulayın
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount', 'Müşteri indirimi' için gereken müşteri
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Müşteri indirimi' için gereken müşteri
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Günlüklerle ödeme tarihlerini güncelle.
 DocType: Quotation,Term Details,Dönem Ayrıntıları
 DocType: Quotation,Term Details,Dönem Ayrıntıları
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Gün) için Kapasite Planlama
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
 DocType: Warranty Claim,Warranty Claim,Garanti Talebi
 ,Lead Details,Talep Yaratma Detayları
-DocType: Authorization Rule,Approving User,Onaylayan Kullanıcı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Dövme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Kaplama
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
 DocType: Pricing Rule,Applicable For,İçin uygulanabilir
 DocType: Bank Reconciliation,From Date,Tarihinden itibaren
@@ -1787,42 +1636,41 @@
 DocType: Delivery Note Item,To Warehouse (Optional),Depo (İsteğe bağlı)
 DocType: Sales Invoice,Paid Amount (Company Currency),Ücretli Tutar (Şirket Para)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
-DocType: Selling Settings,Selling Settings,Satış Ayarları 
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Müzayede
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Online Müzayede
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
+DocType: Selling Settings,Selling Settings,Satış Ayarları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online Müzayede
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Miktar veya Değerleme Br.Fiyatı ya da her ikisini de belirtiniz
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Şirket, Ay ve Mali Yıl zorunludur"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Pazarlama Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün yetersizliği Raporu
 ,Item Shortage Report,Ürün yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık UoM"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık UoM"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Bir Ürünün tek birimi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Günlük Seri {0} 'Teslim edilmelidir'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Her Stok Hareketi için Muhasebe kaydı oluştur
 DocType: Leave Allocation,Total Leaves Allocated,Ayrılan toplam izinler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Satır No gerekli Depo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Satır No gerekli Depo {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Geçerli Mali Yılı Başlangıç ve Bitiş Tarihleri girin
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Upload Attendance,Get Template,Şablon alın
 DocType: Address,Postal,Posta
 DocType: Address,Postal,Posta
 DocType: Item,Weightage,Ağırlık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Madencilik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Reçine döküm
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Aynı adda bir Müşteri Grubu bulunmaktadır. Lütfen Müşteri Grubu ismini değiştirin.
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Önce {0} seçiniz
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Metin {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Metin {0}
 DocType: Territory,Parent Territory,Ana Bölge
 DocType: Quality Inspection Reading,Reading 2,2 Okuma
 DocType: Stock Entry,Material Receipt,Malzeme Alındısı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Ürünler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Ürünler
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Ürünler
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Ürünler
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Parti Tipi ve Parti Alacak / Borç hesabı için gereklidir {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Bu öğeyi varyantları varsa, o zaman satış siparişleri vb seçilemez"
 DocType: Lead,Next Contact By,Sonraki İrtibat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Ürün {1} için miktar mevcut olduğundan depo {0} silinemez
 DocType: Quotation,Order Type,Sipariş Türü
 DocType: Quotation,Order Type,Sipariş Türü
@@ -1830,13 +1678,13 @@
 DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
 DocType: Payment Tool,Find Invoices to Match,Maç için Faturalar bul
 ,Item-wise Sales Register,Ürün bilgisi Satış Kaydı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","örneğin ""XYZ Ulusal Bankası """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","örneğin ""XYZ Ulusal Bankası """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Bu Vergi Temel Br.Fiyata dahil mi?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Toplam Hedef
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Toplam Hedef
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Alışveriş Sepeti etkindir
 DocType: Job Applicant,Applicant for a Job,İş için aday
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Üretim Emri Oluşturulmadı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Çalışan {0} için Maaş makbuzu bu ay için zaten oluşturuldu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Çalışan {0} için Maaş makbuzu bu ay için zaten oluşturuldu
 DocType: Stock Reconciliation,Reconciliation JSON,Uzlaşma JSON
 DocType: Stock Reconciliation,Reconciliation JSON,Uzlaşma JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
@@ -1845,18 +1693,17 @@
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Bir Müşterinin Satınalma Siparişi karşı birden Satış Siparişine izin ver
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Ana
-DocType: DocPerm,Delete,Sil
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Varyant
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Yeni {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Durdurulan Sipariş iptal edilemez. İptali kaldırın
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Item,Variants,Varyantlar
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
+DocType: Payment Reconciliation Payment,Allocated amount,Ayrılan miktarı
 DocType: Sales Team,Contribution to Net Total,Net Toplam Katkı
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
@@ -1868,33 +1715,26 @@
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Supplier,Statutory info and other general information about your Supplier,Tedarikçiniz hakkında yasal bilgiler ve diğer genel bilgiler
-DocType: Country,Country,Ülke
-DocType: Country,Country,Ülke
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Adresleri
-DocType: Communication,Received,Alınan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Çoğaltın Seri No Ürün için girilen {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Nakliye Kuralı için koşul
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Ürün Üretim Siparişi için izin verilmez.
-DocType: DocField,Attach Image,Görüntü Ekleyin
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Bu paketin net ağırlığı (Ürünlerin net toplamından otomatik olarak hesaplanır)
-DocType: Stock Reconciliation Item,Leave blank if no change,Hiçbir değişiklik ise boş bırakın
 DocType: Sales Order,To Deliver and Bill,Sunun ve Bill için
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Üretim için Time Kayıtlar.
 DocType: Item,Apply Warehouse-wise Reorder Level,Depo-bilge Yeniden Sipariş Seviyesi Uygula
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} teslim edilmelidir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} teslim edilmelidir
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Görevler için günlük.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Ücret
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Ücret
 DocType: Production Order Operation,Actual Time and Cost,Gerçek Zaman ve Maliyet
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Maksimum {0} Malzeme Talebi Malzeme {1} için Satış Emri {2} karşılığında yapılabilir
 DocType: Employee,Salutation,Hitap
 DocType: Employee,Salutation,Hitap
-DocType: Communication,Rejected,Reddedildi
-DocType: Communication,Rejected,Reddedildi
 DocType: Pricing Rule,Brand,Marka
 DocType: Pricing Rule,Brand,Marka
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
@@ -1902,29 +1742,28 @@
 DocType: Sales Order Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
 DocType: Quality Inspection Reading,Reading 10,10 Okuma
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
 DocType: Hub Settings,Hub Node,Hub Düğüm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Yinelenen Ürünler girdiniz. Lütfen düzeltip yeniden deneyin.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Değeri {0} özniteliği için {1} geçerli Öğe listesinde yok Değerler Özellik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Ortak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Ortak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Ortak
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Ürün {0} bir seri Ürün değildir
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Süresi Doldu
 DocType: Packing Slip,To Package No.,Ambalaj No.
-DocType: DocType,System,Sistem
-DocType: DocType,System,Sistem
 DocType: Warranty Claim,Issue Date,Veriliş tarihi
 DocType: Activity Cost,Activity Cost,Etkinlik Maliyeti
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Tüketilen Adet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomünikasyon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Telekomünikasyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekomünikasyon
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 DocType: Payment Tool,Make Payment Entry,Ödeme Girdisi Oluştur
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
 ,Sales Invoice Trends,Satış Faturası Trendler
 ,Sales Invoice Trends,Satış Faturası Trendler
 DocType: Leave Application,Apply / Approve Leaves,Yapraklar Onayla / Uygula
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,İçin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Eğer ücret biçimi 'Önceki Ham Miktar' veya 'Önceki Ham Totk' ise referans verebilir
 DocType: Sales Order Item,Delivery Warehouse,Teslim Depo
 DocType: Stock Settings,Allowance Percent,Ödenek Yüzdesi
@@ -1937,14 +1776,11 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",Uygulanabilir {0} olarak seçildiyse satış işaretlenmelidir
 DocType: Purchase Order Item,Supplier Quotation Item,Tedarikçi Teklif ürünü
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Maaş Yapısı oluşturun
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Makaslama
 DocType: Item,Has Variants,Varyasyoları var
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,Yeni Satış Faturası oluşturmak için 'Satış Fatura Yap' butonuna tıklayın.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Paketleme ve etiketleme
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Şirket Alanı ve Küresel Standartlardaki Para Birimini belirtiniz
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox Erişimi Gizli
 DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Projeleri yönetme
 DocType: Supplier,Supplier of Goods or Services.,Mal veya Hizmet alanı.
@@ -1952,11 +1788,11 @@
 DocType: Cost Center,Budget,Bütçe
 DocType: Cost Center,Budget,Bütçe
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bir gelir ya da gider hesabı değil gibi Bütçe, karşı {0} atanamaz"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Arşivlendi
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arşivlendi
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Bölge / Müşteri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,örneğin 5
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,örneğin 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,örneğin 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,örneğin 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Satış faturasını kaydettiğinizde görünür olacaktır.
 DocType: Item,Is Sales Item,Satış Maddesi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Ürün Grubu Ağacı
@@ -1965,9 +1801,7 @@
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 ,Amount to Deliver,Tutar sunun
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Ürün veya Hizmet
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Hatalar vardı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Vurma
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Ürün veya Hizmet
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} oluşturuldu
@@ -1987,15 +1821,15 @@
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Harç ve Vergiler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Referrans tarihi girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Referrans tarihi girin
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Sitesi gösterilir Öğe için Tablo
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
 DocType: Material Request Item,Material Request Item,Malzeme Talebi Kalemi
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Ürün Grupları Ağacı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type, Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Ürün Grupları Ağacı
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
 ,Item-wise Purchase History,Ürün bilgisi Satın Alma Geçmişi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Kırmızı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Kırmızı
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
 DocType: Account,Frozen,Dondurulmuş
 ,Open Production Orders,Üretim Siparişlerini Aç
@@ -2008,13 +1842,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Yatırımlar
 DocType: Issue,Resolution Details,Karar Detayları
 DocType: Issue,Resolution Details,Karar Detayları
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Bir madde için uom değiştirin.
 DocType: Quality Inspection Reading,Acceptance Criteria,Onaylanma Kriterleri
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Ürün {0} {1} de Satış veya Hizmet ürünü olmalıdır
 DocType: Item Group,Show In Website,Web sitesinde Göster
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Grup
 DocType: Task,Expected Time (in hours),(Saat) Beklenen Zaman
 ,Qty to Order,Sipariş Miktarı
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Aşağıdaki belgeler İrsaliye, Fırsat, Malzeme Request, Öğe, Satınalma Siparişi, Satınalma Fiş, Makbuz Alıcı, Kotasyon, Satış Faturası, Ürün Paketi, Satış Sipariş, Seri No markası izlemek için"
@@ -2025,21 +1858,18 @@
 DocType: Features Setup,Brands,Markalar
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Satın Alma Emrinden
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Satın Alma Emrinden
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
 DocType: Activity Cost,Costing Rate,Maliyet Oranı
 ,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim
 ,Customer Addresses And Contacts,Müşteri Adresleri Ve İletişim
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Ayarlanmadı
-DocType: Communication,Date,Tarih
-DocType: Communication,Date,Tarih
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Tekrar Müşteri Gelir
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Sistem kurulurken birkaç dakika bekleyiniz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Çift
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Çift
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Çift
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Çift
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 DocType: Maintenance Schedule Detail,Actual Date,Gerçek Tarih
 DocType: Item,Has Batch No,Parti No Var
@@ -2047,15 +1877,11 @@
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Employee,Personal Details,Kişisel Bilgiler
 ,Maintenance Schedules,Bakım Programları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Kabartma
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Hesaba için Bankamatik bir Alacak hesabı olması gerekir
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Bu Ürün içim Üretim Emri verilebilmesi için, Ürün stok Ürünü olmalıdır."
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Birleştirme
-DocType: Authorization Rule,Above Value,Değerin üstünde
 ,Pending Amount,Bekleyen Tutar
 ,Pending Amount,Bekleyen Tutar
 DocType: Purchase Invoice Item,Conversion Factor,Katsayı
@@ -2063,14 +1889,12 @@
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Toplam ayrılan yapraklar {0} az olamaz dönem için önceden onaylanmış yaprakları {1} den
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 ,Supplier-Wise Sales Analytics,Tedarikçi Satış Analizi
 DocType: Address Template,This format is used if country specific format is not found,Ülkeye özgü format bulunamazsa bu format kullanılır
-DocType: Custom Field,Custom,Özel
-DocType: Custom Field,Custom,Özel
 DocType: Production Order,Use Multi-Level BOM,Çok Seviyeli BOM kullan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Enjeksiyon kalıplama
 DocType: Bank Reconciliation,Include Reconciled Entries,Mutabık girdileri dahil edin
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Finansal Hesaplar Ağacı
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Tüm çalışan tipleri için kabul ise boş bırakın
@@ -2078,42 +1902,37 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Hesap {0} Madde {1} Varlık Maddesi olmak üzere 'Sabit Varlık' türünde olmalıdır
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
-apps/frappe/frappe/config/setup.py +130,Printing,Baskı
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Listedeki ilk izin onaylayıcı varsayılan izin onaylayıcı olarak atanacaktır.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,ve
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Spor
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Spor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Gerçek Toplam
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Birim
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Birim
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Lütfen site yapılandırmanızda Dropbox erişim anahtarı ayarlayınız
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Birim
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Birim
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Şirket belirtiniz
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Şirket belirtiniz
 ,Customer Acquisition and Loyalty,Müşteri Edinme ve Sadakat
 ,Customer Acquisition and Loyalty,Müşteri Edinme ve Sadakat
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Reddedilen Ürün stoklarını muhafaza ettiğiniz depo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
 DocType: POS Profile,Price List,Fiyat listesi
 DocType: POS Profile,Price List,Fiyat listesi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} varsayılan Mali Yıldır. Değiştirmek için tarayıcınızı yenileyiniz
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Gider İddiaları
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
-DocType: Authorization Rule,Approving Role,Onaylama Rolü
 ,BOM Search,BOM Arama
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Şirket para belirtiniz
 DocType: Workstation,Wages per hour,Saatlik ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Seri No, POS vb gibi özellikleri göster/sakla"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Malzeme İstekleri ardından öğesinin yeniden sipariş seviyesine göre otomatik olarak gündeme gelmiş
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Dönüşüm katsayısı satır {0} da gereklidir
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Gümrükleme tarihi {0} satırındaki kontrol tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Gümrükleme tarihi {0} satırındaki kontrol tarihinden önce olamaz
 DocType: Salary Slip,Deduction,Kesinti
 DocType: Salary Slip,Deduction,Kesinti
 DocType: Address Template,Address Template,Adres Şablonu
@@ -2127,38 +1946,35 @@
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Quotation,Maintenance User,Bakım Kullanıcı
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Maliyet Güncelleme
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Maliyet Güncelleme
 DocType: Employee,Date of Birth,Doğum tarihi
 DocType: Employee,Date of Birth,Doğum tarihi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Ürün {0} zaten iade edilmiş
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Mali Yılı ** Mali Yılı temsil eder. Tüm muhasebe kayıtları ve diğer önemli işlemler ** ** Mali Yılı karşı izlenir.
 DocType: Opportunity,Customer / Lead Address,Müşteri / Adres
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,İş Tanımı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,İş Tanımı
 DocType: Purchase Order Item,Qty as per Stock UOM,Her Stok UOM(birim) için miktar
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Veri içeren geçerli bir csv dosyası seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Tabaka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Satış Kampanyaları Takip Edin. İlanlar, Özlü Sözler takip edin, Satış Sipariş vb Kampanyalar dan Yatırım Dönüş ölçmek için. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Satış Kampanyaları Takip Edin. İlanlar, Özlü Sözler takip edin, Satış Sipariş vb Kampanyalar dan Yatırım Dönüş ölçmek için."
 DocType: Expense Claim,Approver,Onaylayan
 DocType: Expense Claim,Approver,Onaylayan
 ,SO Qty,SO Adet
 ,SO Qty,SO Adet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Stok girişleri ambarında mevcut {0}, dolayısıyla yeniden atamak ya da Depo değiştiremezsiniz"
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Supplier Quotation,Manufacturing Manager,Üretim Müdürü
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Gönderiler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Dip kalıplama
-DocType: Purchase Order,To be delivered to customer,Müşteriye teslim edilmek üzere
+apps/erpnext/erpnext/hooks.py +68,Shipments,Gönderiler
+DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Günlük durumu Teslim Edildi olmalıdır.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Kurma
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Satır #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Satır #
 DocType: Purchase Invoice,In Words (Company Currency),Sözlü (Firma para birimi) olarak
 DocType: Pricing Rule,Supplier,Tedarikçi
 DocType: Pricing Rule,Supplier,Tedarikçi
@@ -2168,49 +1984,43 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Çeşitli Giderler
 DocType: Global Defaults,Default Company,Standart Firma
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Ürün {0} için gider veya fark hesabı bütün stok değerini etkilediği için zorunludur
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Arka arkaya Ürün {0} için Overbill olamaz {1} daha {2}. Overbilling, Stok Ayarları ayarlamak lütfen izin vermek için"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Arka arkaya Ürün {0} için Overbill olamaz {1} daha {2}. Overbilling, Stok Ayarları ayarlamak lütfen izin vermek için"
 DocType: Employee,Bank Name,Banka Adı
 DocType: Employee,Bank Name,Banka Adı
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Üstte
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Kullanıcı {0} devre dışı
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Kullanıcı {0} devre dışı
 DocType: Leave Application,Total Leave Days,Toplam bırak Günler
-DocType: Journal Entry Account,Credit in Account Currency,Hesap Para Kredi
 DocType: Email Digest,Note: Email will not be sent to disabled users,Not: E-posta engelli kullanıcılara gönderilmeyecektir
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Firma Seçin ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tüm bölümler için kabul ise boş bırakın
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur 
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Currency Exchange,From Currency,Para biriminden
-DocType: DocField,Name,İsim
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli 
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Sistemde yer almamaktadır tutarlar
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","En az bir satırda Tahsis Tutar, Fatura Türü ve Fatura Numarası seçiniz"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Ürün {0}için Satış Sipariş  gerekli
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Sistemde yer almamaktadır tutarlar
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Rate (Company Currency),Oranı (Şirket para birimi)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Diğer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Diğer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Diğer
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bir Ürün veya satın alınan, satılan veya stokta tutulan bir hizmet."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,İlk satır için ücret tipi 'Önceki satır tutarında' veya 'Önceki satır toplamında' olarak seçilemez
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Tamamlandı
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Tamamlandı
-DocType: Web Form,Select DocType,Belge Tipi seçine
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Broş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Bankacılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Programı almak için 'Program Oluştura' tıklayınız
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Yeni Maliyet Merkezi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Yeni Maliyet Merkezi
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Yeni Maliyet Merkezi
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
 DocType: Quality Inspection,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
 DocType: Purchase Order Item,Reference Document Type,Referans Belge Türü
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Serileştirilmiş Envanteri
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Serileştirilmiş Envanteri
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
 DocType: Time Log Batch,Total Billing Amount,Toplam Fatura Tutarı
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Alacak Hesabı
@@ -2219,22 +2029,22 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Ödeme Satış Sipariş
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Zaman Günlükleri oluşturuldu:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Doğru hesabı seçin
 DocType: Item,Weight UOM,Ağırlık UOM
 DocType: Employee,Blood Group,Kan grubu
 DocType: Employee,Blood Group,Kan grubu
 DocType: Purchase Invoice Item,Page Break,Sayfa Sonu
 DocType: Production Order Operation,Pending,Bekliyor
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Belirli bir çalışanın izni uygulamalarını onaylayabilir Kullanıcılar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Sen Variant varsayılan UOM değiştiremezsiniz. Şablon Varyant değişiklik varsayılan UOM varsayılan UOM değiştirmek için
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Ofis Gereçleri
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Purchase Invoice Item,Qty,Miktar
 DocType: Fiscal Year,Companies,Şirketler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Stok yeniden sipariş düzeyine ulaştığında Malzeme talebinde bulun
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Bakım Programından
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Tam zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Tam zamanlı
 DocType: Purchase Invoice,Contact Details,İletişim Bilgileri
 DocType: C-Form,Received Date,Alınan Tarih
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Satış Vergi ve Harçlar Şablon standart bir şablon oluşturdu varsa, birini seçin ve aşağıdaki butona tıklayın."
@@ -2246,16 +2056,17 @@
 DocType: Job Applicant,Job Opening,İş Açılışı
 DocType: Payment Reconciliation,Payment Reconciliation,Ödeme Mutabakat
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknoloji
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Teknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 DocType: Offer Letter,Offer Letter,Mektubu Teklif
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Toplam Faturalandırılan Tutarı
 DocType: Time Log,To Time,Zamana
+DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",Alt devreler 'node' eklemek için tüm devreye bakarak eklemek istediğiniz alana tıklayın
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Hesaba için Kredi bir Ödenecek hesabı olması gerekir
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
@@ -2268,13 +2079,10 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Siparişler veya Faturalar karşı Ödeme Girişleri oluşturun.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Kaynak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Yeni Stok UoM gereklidir
 DocType: Quality Inspection,Sample Size,Numune Boyu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Lütfen geçerlli bir 'durum nodan başlayarak' belirtiniz
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
 DocType: Features Setup,Item Serial Nos,Ürün Seri Numaralar
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler
@@ -2285,9 +2093,8 @@
 DocType: Bin,Actual Quantity,Gerçek Miktar
 DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Bulunamadı Seri No {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Sıkıştırma kalıplamada
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Müşterileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Müşterileriniz
 DocType: Leave Block List Date,Block Date,Blok Tarih
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
@@ -2296,30 +2103,24 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Ürün Kodu> Ürün Grubu> Marka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Ürün Kodu> Ürün Grubu> Marka
 DocType: Appraisal Goal,Appraisal Goal,Değerlendirme Hedefi
-DocType: Event,Friday,Cuma
-DocType: Event,Friday,Cuma
 DocType: Time Log,Costing Amount,Maliyet Tutarı
 DocType: Process Payroll,Submit Salary Slip,Bordro Gönder
 DocType: Salary Structure,Monthly Earning & Deduction,Aylık Kazanç & Kesinti
-apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}% 
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Maxiumm discount for Item {0} is {1}%,Malzeme {0} için maksimum indirim {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Toplu İthalat
 DocType: Sales Partner,Address & Contacts,Adresler ve Kontaklar
 DocType: SMS Log,Sender Name,Gönderenin Adı
 DocType: SMS Log,Sender Name,Gönderenin Adı
-DocType: Page,Title,Başlık
-DocType: Page,Title,Başlık
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Özelleştirme
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Özelleştirme
 DocType: POS Profile,[Select],[Seç]
 DocType: POS Profile,[Select],[Seç]
 DocType: SMS Log,Sent To,Gönderildiği Kişi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Satış Faturası Oluştur
 DocType: Company,For Reference Only.,Başvuru için sadece.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Geçersiz {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Geçersiz {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Avans miktarı
 DocType: Sales Invoice Advance,Advance Amount,Avans Tutarı
 DocType: Manufacturing Settings,Capacity Planning,Kapasite Planlama
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,'Tarihten itibaren' gereklidir
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Tarihten itibaren' gereklidir
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Employee,Employment Details,İstihdam Detayları
@@ -2338,8 +2139,8 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
 DocType: Item,End of Life,Kullanım süresi Sonu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Gezi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Gezi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Gezi
 DocType: Leave Block List,Allow Users,Kullanıcılara İzin Ver
 DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
 DocType: Sales Invoice,Recurring,Yinelenen
@@ -2348,7 +2149,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Transfer Malzemesi
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","İşlemleri, işlem maliyetlerini belirtiniz ve işlemlerinize kendilerine özgü işlem numaraları veriniz."
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
@@ -2356,8 +2157,8 @@
 DocType: Stock Settings,Allow Negative Stock,Negatif Stok izni
 DocType: Installation Note,Installation Note,Kurulum Not
 DocType: Installation Note,Installation Note,Kurulum Not
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Vergi Ekle
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Vergi Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Vergi Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Vergi Ekle
 ,Financial Analytics,Mali Analitik
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 DocType: Address,Subsidiary,Yardımcı
@@ -2366,11 +2167,8 @@
 DocType: Quality Inspection,Purchase Receipt No,Satın alma makbuzu numarası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
-DocType: System Settings,In Hours,Saatleri
-DocType: System Settings,In Hours,Saatleri
 DocType: Process Payroll,Create Salary Slip,Maaş Makbuzu Oluştur
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Banka başına beklendiği gibi denge
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Parlatıcı
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Banka başına beklendiği gibi denge
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
 DocType: Appraisal,Employee,Çalışan
@@ -2385,16 +2183,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Dekont Grubu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Sales Invoice,Mass Mailing,Toplu Posta
-DocType: Page,Standard,Standart
-DocType: Page,Standard,Standart
 DocType: Rename Tool,File to Rename,Rename Dosya
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Göster Ödemeleri
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Boyut
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Ecza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Müşteri Oluştur
@@ -2407,7 +2202,6 @@
 DocType: Quality Inspection Reading,Reading 9,9 Okuma
 DocType: Supplier,Is Frozen,Donmuş
 DocType: Buying Settings,Buying Settings,Satınalma Ayarları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Kitle bitirme
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Biten İyi Ürün için BOM numarası
 DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),İş e-mail kimliği için gelen sunucu kurulumu (örneğin: sales@example.com)
@@ -2415,27 +2209,20 @@
 DocType: Payment Tool,Payment Account,Ödeme Hesabı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Taslak
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Telafi İzni
 DocType: Quality Inspection Reading,Accepted,Onaylanmış
-DocType: User,Female,Kadın
-DocType: User,Female,Kadın
-DocType: Journal Entry Account,Debit in Account Currency,Hesap Para Bankamatik
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Eğer gerçekten bu şirket için tüm işlemleri silmek istediğinizden emin olun. Olduğu gibi sizin ana veriler kalacaktır. Bu işlem geri alınamaz.
-DocType: Print Settings,Modern,Çağdaş
-DocType: Print Settings,Modern,Çağdaş
-DocType: Communication,Replied,Cevap
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Geçersiz referans {0} {1}
 DocType: Payment Tool,Total Payment Amount,Toplam Ödeme Tutarı
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) planlanan quanitity daha büyük olamaz ({2}) Üretim Sipariş {3}
 DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
 DocType: Newsletter,Test,Test
 DocType: Newsletter,Test,Test
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Mevcut stok işlemleri size değerlerini değiştiremezsiniz \ Bu öğe, orada olduğundan &#39;Seri No Has&#39;, &#39;Toplu Has Hayır&#39;, &#39;Stok Öğe mı&#39; ve &#39;Değerleme Metodu&#39;"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hızlı Dergisi Girişi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Hızlı Kayıt Girdisi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Stock Entry,For Quantity,Miktar
@@ -2444,19 +2231,18 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Ürün istekleri.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Her mamül madde için ayrı üretim emri oluşturulacaktır.
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Kurulum Tamamlandı
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Muhasebe entry bu tarihe kadar dondurulmuş, kimse / aşağıda belirtilen rolü dışında girdisini değiştirin yapabilirsiniz."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bülten Posta Listesi
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
+DocType: Authorization Rule,Authorized Value,Yetkili Değer
 DocType: Contact,Enter department to which this Contact belongs,Bu irtibatın ait olduğu departmanı girin
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Toplam Yok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Ölçü Birimi
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Ölçü Birimi
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Ölçü Birimi
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Ölçü Birimi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Task Depends On,Task Depends On,Görev Bağlıdır
@@ -2484,16 +2270,15 @@
 DocType: SMS Log,No of Requested SMS,İstenen SMS Sayısı
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Delici
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Bir komisyon için şirketlerin ürünlerini satan bir üçüncü taraf dağıtıcı / bayi / komisyon ajan / ortaklık / bayi.
 DocType: Customer Group,Has Child Node,Çocuk Kısmı Var
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Buraya statik url parametreleri girin (Örn. gönderen = ERPNext, kullanıcı adı = ERPNext, Şifre = 1234 vb)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} değil herhangi bir aktif Mali Yılı içinde. Daha fazla bilgi kontrol ediniz {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Yaşlanma Aralığı 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Fotokimyasal işleme
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2535,12 +2320,9 @@
  8. Enter Satır: ""Önceki Satır Toplam"" dayalı Eğer bu hesaplama için bir üs (varsayılan bir önceki satır olduğu) olarak alınacaktır satır numarasını seçebilirsiniz.
  9. Için Vergi veya şarj düşünün: Vergi / şarj değerlemesi için sadece (toplam bir parçası) veya sadece (öğeye değer katmıyor) toplam veya her ikisi için bu bölümde belirtebilirsiniz.
  10. Ekle veya Düşebilme: eklemek veya vergi kesintisi etmek isteyin."
-DocType: Note,Note,Not
-DocType: Note,Note,Not
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
-DocType: Email Account,Email Ids,E-posta Noları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Tax Rule,Billing City,Fatura Şehir
@@ -2551,19 +2333,17 @@
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Tamamlanan Miktar fazla olamaz {0} çalışması için {1}
 DocType: Features Setup,Quality,Kalite
 DocType: Features Setup,Quality,Kalite
-DocType: Contact Us Settings,Introduction,Giriş
-DocType: Contact Us Settings,Introduction,Giriş
 DocType: Warranty Claim,Service Address,Servis Adresi
 DocType: Warranty Claim,Service Address,Servis Adresi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Stok Uzlaşma Max 100 satır.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Stok Uzlaşma Max 100 satır.
 DocType: Stock Entry,Manufacture,Üretim
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Lütfen İrsaliye ilk
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Opportunity,Customer / Lead Name,Müşteri/ İlk isim
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Üretim
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Üretim
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Üretim
 DocType: Item,Allow Production Order,Üretim Emri izni
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
@@ -2571,15 +2351,13 @@
 DocType: Lead,Fax,Faks
 DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Ana Tip
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Tanzim Edildi
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Tanzim Edildi
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Purchase Receipt,Time at which materials were received,Malzemelerin alındığı zaman
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Benim Adresleri
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Kuruluş Şube Alanı
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,veya
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Yardımcı Giderleri
@@ -2587,7 +2365,6 @@
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90 üzerinde
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
-,Download Backups,İndir Yedekler
 DocType: Notification Control,Sales Order Message,Satış Sipariş Mesajı
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Ödeme Şekli
@@ -2595,8 +2372,6 @@
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
 DocType: Bank Reconciliation,To Date,Tarihine kadar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Ayrıntılar
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Ayrıntılar
 DocType: Purchase Invoice,Total Taxes and Charges,Toplam Vergi ve Harçlar
 DocType: Employee,Emergency Contact,Acil Durum İrtibat Kişisi
 DocType: Item,Quality Parameters,Kalite Parametreleri
@@ -2613,6 +2388,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Seri No / Parti
 DocType: Product Bundle,Parent Item,Ana Ürün
 DocType: Account,Account Type,Hesap Tipi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
@@ -2620,11 +2396,8 @@
 DocType: Bin,Reserved Quantity,Ayrılan Miktar
 DocType: Landed Cost Voucher,Purchase Receipt Items,Satın alma makbuzu Ürünleri
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Özelleştirme Formları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Kesme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Düzleşme
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Döküm
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Teslimat
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
@@ -2632,16 +2405,15 @@
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: UOM Dönüşüm Faktörü zorunludur
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Belgeler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Cost Center,Cost Center,Maliyet Merkezi
 DocType: Cost Center,Cost Center,Maliyet Merkezi
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Föy #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Föy #
 DocType: Notification Control,Purchase Order Message,Satınalma Siparişi Mesajı
 DocType: Tax Rule,Shipping Country,Nakliye Ülke
 DocType: Upload Attendance,Upload HTML,HTML Yükle
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Toplam avans ({0}) Sipariş karşı {1} \
  büyük olamaz Büyük Toplam den ({2})"
 DocType: Employee,Relieving Date,Ayrılma Tarihi
@@ -2649,10 +2421,9 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depo yalnızca Stok Girdisi / İrsaliye / Satın Alım Makbuzu üzerinden değiştirilebilir
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Lazer net şekillendirme mühendislik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Gelir vergisi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Seçilen Fiyatlandırma Kural 'Fiyat' için yapılırsa, bu fiyat listesi üzerine yazılır. Fiyatlandırma Kural fiyat nihai fiyat, bu yüzden başka indirim uygulanmalıdır. Dolayısıyla, vb Satış Siparişi, Satınalma Siparişi gibi işlemlerde, oldukça 'Fiyat Listesi Oranı' alanına daha, 'Oranı' alanına getirilen edilecektir."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Sanayi Tipine Göre izleme talebi.
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
@@ -2663,11 +2434,10 @@
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
 DocType: Company,Stock Settings,Stok Ayarları
-DocType: User,Bio,Bio
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Yeni Maliyet Merkezi Adı
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Yeni Maliyet Merkezi Adı
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Yeni Maliyet Merkezi Adı
 DocType: Leave Control Panel,Leave Control Panel,İzin Kontrol Paneli
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Varsayılan adres şablonu bulunamadı. Lütfen Ayarlar> Basım ve Markalaştırma> Adres Şablonunu kullanarak şablon oluşturun.
 DocType: Appraisal,HR User,İK Kullanıcı
@@ -2679,37 +2449,31 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
 DocType: Supplier,Billing Currency,Fatura Döviz
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Ekstra Büyük
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Presleme
 DocType: Payment Tool Detail,Payment Tool Detail,Ödeme Aracı Detayı
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Büyük
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Çalışan bulunmadı!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Büyük
 DocType: C-Form Invoice Detail,Territory,Bölge
 DocType: C-Form Invoice Detail,Territory,Bölge
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
 DocType: Purchase Order,Customer Address Display,Müşteri Adresi Ekran
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Parlatma
-DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç Zamanı
+DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç Zamanı
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Zaten başka UOM bazı işlem (ler) yaptık \ çünkü Öğe için Ölçü Varsayılan Birim {0} doğrudan değiştirilemez. Varsayılan UOM değiştirmek için, \ kullanımı Stok modülü altında araç &#39;UOM Programı Değiştir&#39;."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Döviz Kuru içine başka bir para birimi dönüştürme belirtin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Teklif {0} iptal edildi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Teklif {0} iptal edildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Toplam Üstün Tutar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Çalışan {0} {1} tarihinde izinli oldu. Katılım işaretlenemez.
 DocType: Sales Partner,Targets,Hedefler
@@ -2718,15 +2482,14 @@
 ,S.O. No.,SO No
 ,S.O. No.,SO No
 DocType: Production Order Operation,Make Time Log,Zaman Giriş Yap
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Yeniden sipariş miktarını ayarlamak Lütfen
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
 DocType: Price List,Applicable for Countries,Ülkeler için geçerlidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Bilgisayarlar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Elektro-kimyasal taşlama
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Muhasebe girdilerine başlamadan önce hesap şemanızı kurunuz
 DocType: Purchase Invoice,Ignore Pricing Rule,Fiyatlandırma Kuralı Yoksay
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,İptal Edilmiş
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Maaş Yapısı Tarihten itibaren Çalışan Katılma Tarihi daha az olamaz.
 DocType: Employee Education,Graduate,Mezun
 DocType: Leave Block List,Block Days,Blok Gün
@@ -2763,7 +2526,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Tekrar eden fatura varsa kontrol edin, tekrar eden faturayı durdurun veya uygun bitiş tarihi ekleyin."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Maksimum {0} satıra izin verilir
 DocType: C-Form Invoice Detail,Net Total,Net Toplam
 DocType: C-Form Invoice Detail,Net Total,Net Toplam
 DocType: Bin,FCFS Rate,FCFS Oranı
@@ -2781,23 +2543,22 @@
 DocType: Maintenance Visit,Purposes,Amaçları
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Çalışma {0} iş istasyonunda herhangi bir mevcut çalışma saatleri daha uzun {1}, birden operasyonlarına operasyon yıkmak"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Elektrokimyasal işleme
 ,Requested,Talep
 ,Requested,Talep
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Hiçbir Açıklamalar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Vadesi geçmiş
 DocType: Account,Stock Received But Not Billed,Alınmış ancak faturalanmamış stok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Kök Hesabı bir grup olmalı
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Büt Ücret + geciken Tutar + Nakit Çekim Tutarı - Toplam Kesinti
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
 DocType: Features Setup,Sales and Purchase,Satış ve Satın Alma
 DocType: Supplier Quotation Item,Material Request No,Malzeme Talebi No
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Müşterinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} isimli kişi başarı ile listeden çıkarıldı.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Oranı (Şirket Para)
-apps/frappe/frappe/templates/base.html +134,Added,Eklendi
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Bölge Ağacını Yönetin.
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
@@ -2812,14 +2573,11 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Mali Yılı {0} bulunamadı.
 DocType: Bank Reconciliation,Get Relevant Entries,İlgili girdileri alın
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Stokta Muhasebe Giriş
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Para basma
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Ürün {0} yoktur
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
-apps/frappe/frappe/desk/query_report.py +136,Total,Toplam
-apps/frappe/frappe/desk/query_report.py +136,Total,Toplam
 DocType: Purchase Invoice,Apply Additional Discount On,Ek İndirim On Uygula
 DocType: Account,Root Type,Kök Tipi
 DocType: Account,Root Type,Kök Tipi
@@ -2832,17 +2590,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Satır {0} için hedef depo zorunludur
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
 DocType: Quality Inspection,Quality Inspection,Kalite Kontrol
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Şekillendirme Sprey
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Extra Small
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL veya BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Asgari Stok Seviyesi
 DocType: Stock Entry,Subcontract,Alt sözleşme
@@ -2855,14 +2612,13 @@
 DocType: Production Order Operation,Estimated Time and Cost,Tahmini Süre ve Maliyet
 DocType: Bin,Bin,Kutu
 DocType: Bin,Bin,Kutu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Nosing
 DocType: SMS Log,No of Sent SMS,Gönderilen SMS sayısı
 DocType: Account,Company,Şirket
 DocType: Account,Expense Account,Gider Hesabı
 DocType: Account,Expense Account,Gider Hesabı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Renk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Renk
 DocType: Maintenance Visit,Scheduled,Planlandı
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;Hayır&quot; ve &quot;Satış Öğe mı&quot; &quot;Stok Öğe mı&quot; nerede &quot;Evet&quot; ise Birimini seçmek ve başka hiçbir Ürün Paketi var Lütfen
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Dengesiz ay boyunca hedefleri dağıtmak için Aylık Dağıtım seçin.
@@ -2870,21 +2626,20 @@
 DocType: Purchase Invoice Item,Valuation Rate,Değerleme Oranı
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Öğe Satır {0}: {1} Yukarıdaki 'satın alma makbuzlarını' tablosunda yok Satınalma Makbuzu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç Tarihi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
 DocType: Installation Note Item,Against Document No,Belge No Karşılığı
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Satış Ortaklarını Yönetin.
 DocType: Quality Inspection,Inspection Type,Muayene Türü
 DocType: Quality Inspection,Inspection Type,Muayene Türü
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Lütfen  {0} seçiniz
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Lütfen  {0} seçiniz
 DocType: C-Form,C-Form No,C-Form No
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Güncelleme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Araştırmacı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Lütfen göndermeden önce bülteni kaydedin
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Adı veya E-posta zorunludur
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Gelen kalite kontrol.
@@ -2892,15 +2647,14 @@
 DocType: Purchase Order Item,Returned Qty,İade edilen Adet
 DocType: Employee,Exit,Çıkış
 DocType: Employee,Exit,Çıkış
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Kök Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Kök Tipi zorunludur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Titreşimli bitirme
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Müşterilerinin rahatlığı için, bu kodlar faturalarda ve irsaliyelerde olduğu gibi basılı formatta kullanılabilir."
 DocType: Employee,You can enter any date manually,Elle tarih girebilirsiniz
 DocType: Sales Invoice,Advertisement,Reklâm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Deneme süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Deneme süresi
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Expense Claim,Expense Approver,Gider Approver
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
@@ -2909,34 +2663,32 @@
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Öğütme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Bekleyen Etkinlikleri
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Onaylı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Tedarikçi> Tedarikçi Türü
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Adres Başlığı zorunludur.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sorgu kaynağı kampanya ise kampanya adı girin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Mali Yıl Seçin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Döküm
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Yeniden Sipariş Seviyesi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Attendance,Attendance Date,Katılım Tarihi
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Kazanç ve Kesintiye göre Maaş Aralığı.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
 DocType: Address,Preferred Shipping Address,Tercih edilen Teslimat Adresi
 DocType: Purchase Receipt Item,Accepted Warehouse,Kabul edilen depo
 DocType: Bank Reconciliation Detail,Posting Date,Gönderme Tarihi
 DocType: Bank Reconciliation Detail,Posting Date,Gönderme Tarihi
 DocType: Item,Valuation Method,Değerleme Yöntemi
 DocType: Item,Valuation Method,Değerleme Yöntemi
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},{0} için döviz kurunu bulamayan {1}
 DocType: Sales Invoice,Sales Team,Satış Ekibi
 DocType: Sales Invoice,Sales Team,Satış Ekibi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Girdiyi Kopyala
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Girdiyi Kopyala
 DocType: Serial No,Under Warranty,Garanti Altında
 DocType: Serial No,Under Warranty,Garanti Altında
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Hata]
@@ -2944,8 +2696,8 @@
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Satış emrini kaydettiğinizde görünür olacaktır.
 ,Employee Birthday,Çalışan Doğum Günü
 ,Employee Birthday,Çalışan Doğum Günü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Girişim Sermayesi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Girişim Sermayesi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 DocType: UOM,Must be Whole Number,Tam Numara olmalı
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Seri No {0} yok
@@ -2954,11 +2706,10 @@
 DocType: Pricing Rule,Discount Percentage,İndirim Yüzdesi
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
 DocType: Payment Reconciliation Invoice,Invoice Number,Fatura Numarası
-apps/erpnext/erpnext/hooks.py +70,Orders,Siparişler
+apps/erpnext/erpnext/hooks.py +54,Orders,Siparişler
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Leave Control Panel,Employee Type,Çalışan Tipi
 DocType: Employee Leave Approver,Leave Approver,İzin Onaylayan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Dövme
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Malzeme imalatı için transfer
 DocType: Expense Claim,"A user with ""Expense Approver"" role","""Gider Onaylayıcısı"" rolü ile bir kullanıcı"
 ,Issued Items Against Production Order,Üretim Emrine Karşı verilmiş maddeler
@@ -2971,7 +2722,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Geçersiz dönemi
 DocType: Customer,Credit Limit,Kredi Limiti
 DocType: Customer,Credit Limit,Kredi Limiti
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Işlemin türünü seçin
@@ -2982,12 +2732,10 @@
 DocType: Customer,Address and Contact,Adresler ve Kontaklar
 DocType: Customer,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Employee,Feedback,Geri bildirim
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Önce tahsis edilemez bırakın {0}, izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Bakım. Program
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Zımpara jet işleme
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Bakım. Program
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
-DocType: Website Settings,Website Settings,Web Sitesi Ayarları
-DocType: Website Settings,Website Settings,Web Sitesi Ayarları
 DocType: Item,Reorder level based on Warehouse,Depo dayalı Yeniden Sipariş seviyeli
 DocType: Activity Cost,Billing Rate,Fatura Oranı
 ,Qty to Deliver,Teslim Edilecek Miktar
@@ -3001,12 +2749,12 @@
 DocType: Material Request,Requested For,Için talep
 DocType: Quotation Item,Against Doctype,Belge Tipi Karşılığı
 DocType: Delivery Note,Track this Delivery Note against any Project,Bu irsaliyeyi bütün Projelere karşı takip et
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Kök hesabı silinemez
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Kök hesabı silinemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Göster Stok Girişler
 ,Is Primary Address,Birincil Adres mı
 DocType: Production Order,Work-in-Progress Warehouse,Devam eden depo işi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Adresleri yönetin
 DocType: Pricing Rule,Item Code,Ürün Kodu
 DocType: Pricing Rule,Item Code,Ürün Kodu
@@ -3015,11 +2763,9 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
-DocType: Communication,Phone,Telefon
-DocType: Communication,Phone,Telefon
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Kapanış (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Kapanış (Dr)
 DocType: Contact,Passive,Pasif
 DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seri No {0} stokta değil
@@ -3037,11 +2783,9 @@
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Güncellemeler Alın
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Birkaç örnek kayıtları ekle
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Birkaç örnek kayıtları ekle
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Yönetim bırakın
-DocType: Event,Groups,Gruplar
-DocType: Event,Groups,Gruplar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Hesap Grubu
 DocType: Sales Order,Fully Delivered,Tamamen Teslim Edilmiş
 DocType: Lead,Lower Income,Alt Gelir
@@ -3053,28 +2797,27 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Kaynak ve hedef depo Satır {0} için aynu olamaz
 DocType: Features Setup,Sales Extras,Satış Ekstralar
 DocType: Features Setup,Sales Extras,Satış Ekstralar
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Maliyet Merkezi {2}'ye karşı {1} hesabı için {0} bütçesi {3} ile aşılmıştır.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},Maliyet Merkezi {2}'ye karşı {1} hesabı için {0} bütçesi {3} ile aşılmıştır.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Değer veya Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Dakika
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Dakika
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
 ,Qty to Receive,Alınacak Miktar
 DocType: Leave Block List,Leave Block List Allowed,Müsaade edilen izin engel listesi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Dönüşüm faktörü kesirler olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Giriş yapmak için kullanılacak
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Giriş yapmak için kullanılacak
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Bütün Tedarikçi Tipleri
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Teklif {0} {1} türünde
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
@@ -3083,18 +2826,16 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Araştır BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Teminatlı Krediler
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Başarılı Ürünler
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Başarılı Ürünler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Açılış Bakiyesi Hisse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Engel tarihlerinde izin onaylamaya yetkiniz olmadığından izin onaylanamaz
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Kayıp köpük döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Çizim
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Tarih tekrarlanır
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Yetkili imza
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 DocType: Hub Settings,Seller Email,Satıcı E-
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
-DocType: Workstation Working Hour,Start Time,Başlangıç Zamanı
+DocType: Workstation Working Hour,Start Time,Başlangıç Zamanı
 DocType: Item Price,Bulk Import Help,Toplu İthalat Yardım
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +200,Select Quantity,",Miktar Seç"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Onaylama Rolü kuralın uygulanabilir olduğu rolle aynı olamaz
@@ -3107,13 +2848,11 @@
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: BOM Operation,Hour Rate,Saat Hızı
 DocType: Stock Settings,Item Naming By,Ürün adlandırma
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Fiyat Teklifinden
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Fiyat Teklifinden
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},{1} den sonra başka bir dönem kapatma girdisi {0} yapılmıştır
 DocType: Production Order,Material Transferred for Manufacturing,Malzeme İmalat transfer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Hesap {0} yok
 DocType: Purchase Receipt Item,Purchase Order Item No,Satınalma Siparişi Ürün No
-DocType: System Settings,System Settings,Sistem Ayarları
-DocType: System Settings,System Settings,Sistem Ayarları
 DocType: Project,Project Type,Proje Tipi
 DocType: Project,Project Type,Proje Tipi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hedef miktarı veya hedef tutarı zorunludur.
@@ -3123,42 +2862,37 @@
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
 DocType: Sales Order,Fully Billed,Tam Faturalı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Eldeki Nakit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 DocType: Serial No,Is Cancelled,İptal edilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Benim Gönderiler
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Benim Gönderiler
 DocType: Journal Entry,Bill Date,Fatura tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Eğer yüksek öncelikli birden çok Fiyatlandırma Kuralı varsa, şu iç öncelikler geçerli olacaktır."
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
-DocType: Communication,Recipients,Alıcılar
-DocType: Communication,Recipients,Alıcılar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Vidalama
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Tırtık
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Hub Settings,Publish Items to Hub,Hub Öğe yayınlayın
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Değerden, {0} satırındaki değerden az olmalıdır"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Banka Hesabı seçiniz
 DocType: Newsletter,Create and Send Newsletters,Oluşturun ve gönderin Haber
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Tarihten itibaren tarihe kadardan önce olmalıdır
 DocType: Sales Order,Recurring Order,Tekrarlayan Sipariş
 DocType: Company,Default Income Account,Standart Gelir Hesabı
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
 DocType: Item Group,Check this if you want to show in website,Web sitesinde göstermek istiyorsanız işaretleyin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Hoşgeldiniz
+,Welcome to ERPNext,Hoşgeldiniz
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Föy Detay Numarası
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Teklif yol
 DocType: Lead,From Customer,Müşteriden
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Aramalar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Aramalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Aramalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Aramalar
 DocType: Project,Total Costing Amount (via Time Logs),Toplam Maliyet Tutarı (Zaman Kayıtlar üzerinden)
 DocType: Purchase Order Item Supplied,Stock UOM,Stok Uom
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
 ,Projected,Öngörülen
 ,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
@@ -3168,13 +2902,10 @@
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Journal Entry,Remark,Dikkat
 DocType: Purchase Receipt Item,Rate and Amount,Br.Fiyat ve Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Sıkıcı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Satış Emrinden
-DocType: Blog Category,Parent Website Route,Ana Site Rotası
 DocType: Sales Order,Not Billed,Faturalanmamış
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Aktif Değil
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Indi Maliyet Çeki Miktarı
 DocType: Time Log,Batched for Billing,Faturalanmak için partiler haline getirilmiş
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
@@ -3183,12 +2914,11 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,İndirim Tutarı
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
 DocType: Item,Warranty Period (in days),(Gün) Garanti Süresi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,Örneğin KDV
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,Örneğin KDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
-DocType: Journal Entry Account,Journal Entry Account,Dergi Girişi Hesabı
+DocType: Journal Entry Account,Journal Entry Account,Kayıt Girdisi Hesabı
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Oluşturan sıcak metal gaz
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Invoice Item,Delivered Qty,Teslim Edilen Miktar
@@ -3197,9 +2927,6 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Vergi oranı söz uygun grubuna (Fon&gt; Güncel Yükümlülüklerin&gt; Vergi ve Görevleri genellikle Kaynak gidin ve türü &quot;Vergi&quot; nin) Çocuk ekle üzerine tıklayarak (yeni Hesabı oluşturmak ve mutlaka.
 ,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Eksik Döviz Kurları {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Lazer kesim
-DocType: Event,Monday,Pazartesi
-DocType: Event,Monday,Pazartesi
 DocType: Journal Entry,Stock Entry,Stok Girdisi
 DocType: Account,Payable,Borç
 DocType: Salary Slip,Arrear Amount,Bakiye Tutarı
@@ -3212,7 +2939,6 @@
 DocType: Lead,Address Desc,Azalan Adres
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Satış veya Alıştan en az biri seçilmelidir
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Üretim operasyonları nerede yapılmaktadır.
-DocType: Page,All,Tümü
 DocType: Stock Entry Detail,Source Warehouse,Kaynak Depo
 DocType: Stock Entry Detail,Source Warehouse,Kaynak Depo
 DocType: Installation Note,Installation Date,Kurulum Tarihi
@@ -3223,10 +2949,8 @@
 DocType: Account,Sales User,Satış Kullanıcı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Minimum Miktar Maksimum Miktardan Fazla olamaz
 DocType: Stock Entry,Customer or Supplier Details,Müşteri ya da Tedarikçi Detayları
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Ayarla
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Ayarla
 DocType: Lead,Lead Owner,Talep Yaratma Sahibi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Depo gereklidir
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Depo gereklidir
 DocType: Employee,Marital Status,Medeni durum
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
@@ -3243,20 +2967,20 @@
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Delivery Note,Transporter Info,Taşıyıcı Bilgisi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Tedarik edilen Satınalma Siparişi Ürünü
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Şirket Adı olamaz
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Baskı şablonları için antetli kağıtlar
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Baskı Şablonları için başlıklar, örneğin Proforma Fatura"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Süperfiniş
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı UOM yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Tip e-posta, telefon, chat, ziyaretin, vb her iletişimin Kayıt"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Şirket Yuvarlak Off Maliyet Merkezi&#39;ni belirtiniz
 DocType: Purchase Invoice,Terms,Şartlar
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Yeni Oluştur
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Yeni Oluştur
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Yeni Oluştur
 DocType: Buying Settings,Purchase Order Required,gerekli Satın alma Siparişi
 ,Item-wise Sales History,Ürün bilgisi Satış Geçmişi
 DocType: Expense Claim,Total Sanctioned Amount,Toplam Tasdiklenmiş Tutar
@@ -3264,27 +2988,22 @@
 DocType: Sales Invoice Item,Delivery Note Item,Ürün İrsaliyesi
 DocType: Expense Claim,Task,Görev
 DocType: Expense Claim,Task,Görev
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Tıraş
 DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Toplu numarası Ürün için zorunludur {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Bu bir kök satış kişisidir ve düzenlenemez.
 ,Stock Ledger,Stok defteri
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Puan: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Puan: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Bordro Dahili Kesinti
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notlar
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notlar
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,İlk grup düğümünü seçin.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Formu doldurun ve kaydedin
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,En son stok durumu ile bütün ham maddeleri içeren bir rapor indir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Kaplama
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum
 DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
 DocType: SMS Center,Send SMS,SMS Gönder
 DocType: Company,Default Letter Head,Mektubu Başkanı Standart
 DocType: Time Log,Billable,Faturalandırılabilir
 DocType: Time Log,Billable,Faturalandırılabilir
-DocType: Authorization Rule,This will be used for setting rule in HR module,Bu İK modunda ayarlama kuralı için kullanılacaktır
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Yeniden Sipariş Adet
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
@@ -3292,18 +3011,15 @@
 DocType: Journal Entry,Write Off,Silmek
 DocType: Time Log,Operation ID,Operasyon Kimliği
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem kullanıcı (giriş) kimliği, bütün İK formları için varsayılan olacaktır"
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1} 
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1}
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Kayıp Fırsat
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","İndirim Alanları Satın alma Emrinde, Satın alma makbuzunda, satın alma faturasında mevcut olacaktır"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Yeni Hesap Adı. Not: Müşteriler ve Tedarikçiler için hesapları oluşturmak etmeyin
-DocType: Report,Report Type,Rapor Türü
-DocType: Report,Report Type,Rapor Türü
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Yükleme
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Aracı değiştirin
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Ülke bilgisi varsayılan adres şablonları
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Göster vergi break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,İçeri/Dışarı Aktar
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Üretim faaliyetlerinde bulunuyorsanız Ürünlerin 'Üretilmiş' olmasını sağlar
@@ -3313,19 +3029,18 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
 DocType: Serial No,Out of AMC,Çıkış AMC
 DocType: Purchase Order Item,Material Request Detail No,Malzeme Talebi Detay No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Sert bir dönüm
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Bakım Ziyareti Yapın
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Not: Ödeme herhangi bir referansa karşı yapılmış değilse, elle Dergisi girişi yapmak."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Not: Ödeme herhangi bir referansa karşı yapılmış değilse, elle Kayıt Girdisi yap."
 DocType: Item,Supplier Items,Tedarikçi Öğeler
 DocType: Opportunity,Opportunity Type,Fırsat Türü
 DocType: Opportunity,Opportunity Type,Fırsat Türü
@@ -3339,81 +3054,71 @@
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
 ,Stock Ageing,Stok Yaşlanması
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' devre dışı
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' devre dışı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Açık olarak ayarlayın
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gönderilmesi işlemlere Kişiler otomatik e-postalar gönderin.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
-					Available Qty: {4}, Transfer Qty: {5}","Satır {0}: Adet depo avalable değil {1} üzerinde {2} {3}.
+					Available Qty: {4}, Transfer Qty: {5}","Satır {0}: Adet depo avalable değil {1} üzerinde {2} {3}.
  Mevcut Adet: {4}, Miktar Transferi: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Madde 3
 DocType: Purchase Order,Customer Contact Email,Müşteri İletişim E-mail
-DocType: Event,Sunday,Pazar
-DocType: Event,Sunday,Pazar
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"'Nakit veya Banka Hesabı' belirtilmediğinden ötürü, Ödeme Girdisi oluşturulmayacaktır"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Sorumluluklar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Şablon
 DocType: Sales Person,Sales Person Name,Satış Personeli Adı
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tabloya en az 1 fatura girin
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Kullanıcı Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Kullanıcı Ekle
 DocType: Pricing Rule,Item Group,Ürün Grubu
 DocType: Pricing Rule,Item Group,Ürün Grubu
-DocType: Task,Actual Start Date (via Time Logs),Fiili Başlangıç Tarihi (Saat Kayıtlar üzerinden)
+DocType: Task,Actual Start Date (via Time Logs),Fiili Başlangıç Tarihi (Saat Kayıtlar üzerinden)
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
 DocType: Item,Default BOM,Standart BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Toplam Üstün Tutarı
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Time Log Batch,Total Hours,Toplam Saat
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Otomotiv
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Ürün gereklidir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Metal enjeksiyon kalıplama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,İrsaliyeden
 DocType: Time Log,From Time,Zamandan
 DocType: Notification Control,Custom Message,Özel Mesaj
 DocType: Notification Control,Custom Message,Özel Mesaj
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Ülkenizi, Zaman Dilimi ve Para Birimi Seçiniz"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Yatırım Bankacılığı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Asitle temizleme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Kum döküm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Elektrokaplama
-DocType: Purchase Invoice Item,Rate, Br.Fiyat
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stajyer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Stajyer
+DocType: Purchase Invoice Item,Rate,Br.Fiyat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Stajyer
 DocType: Newsletter,A Lead with this email id should exist,Bu e-posta sistemde zaten kayıtlı
 DocType: Stock Entry,From BOM,BOM Gönderen
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Temel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Temel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Temel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Tarihine Kadar ile Tarihinden itibaren aynı olmalıdır
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
 DocType: Salary Structure,Salary Structure,Maaş Yapısı
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kural aynı kriterlerle var, öncelik atayarak \
  çatışmayı çözmek lütfen. Fiyat Kuralları: {0}"
 DocType: Account,Bank,Banka
 DocType: Account,Bank,Banka
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Havayolu
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Havayolu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Sayı Malzeme
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Material Request Item,For Warehouse,Depo için
 DocType: Employee,Offer Date,Teklif Tarihi
@@ -3425,53 +3130,45 @@
 DocType: Item,Is Fixed Asset Item,Sabit Varlık Maddesi
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Uzun baskı formatlarınız varsa, bu özellik basılacak sayfayı başlıkları ve dipnotları her sayfada olmak üzere birden fazla sayfaya bölmek için kullanılabilir"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Azdırma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Bütün Bölgeler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Bütün Bölgeler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Process Payroll,Process Payroll,Süreç Bordrosu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
 DocType: Product Bundle Item,Product Bundle Item,Ürün Paketi Ürün
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
 DocType: Purchase Invoice Item,Image View,Resim Görüntüle
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Terbiye ve endüstriyel bitirme
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Tarih aralığı gerekli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Teminatlar ve Emtia Borsaları
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Delme
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Şişirme
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Tax Rule,Shipping City,Nakliye Şehri
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Bu Öğe {0} (Şablon) bir Variant olduğunu. 'Hayır Kopyala' ayarlanmadığı sürece Öznitelikler şablon üzerinden kopyalanır
 DocType: Account,Purchase User,Satınalma Kullanıcı
 DocType: Notification Control,Customize the Notification,Bildirim özelleştirin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Dövme
-DocType: Web Page,Slideshow,Slayt Gösterisi
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
 DocType: Journal Entry,Print Heading,Baskı Başlığı
 DocType: Quotation,Maintenance Manager,Bakım Müdürü
-DocType: Workflow State,Search,Arama
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,'Son Siparişten bu yana geçen süre' sıfırdan büyük veya sıfıra eşit olmalıdır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Lehimleme
 DocType: C-Form,Amended From,İtibaren değiştirilmiş
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Hammadde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Hammadde
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hedef miktarı veya hedef tutarı zorunludur
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
 DocType: Leave Control Panel,Carry Forward,Nakletmek
@@ -3482,63 +3179,62 @@
 ,Produced,Üretilmiş
 DocType: Item,Item Code for Suppliers,Tedarikçi Ürün Kodu
 DocType: Issue,Raised By (Email),(Email)  ile talep edilen
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Genel
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Genel
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Antetli Kağıt Ekleyin
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Genel
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Antetli Kağıt Ekleyin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Vergi kafaları Liste (örn KDV, gümrük vb; onlar benzersiz adlara sahip olmalıdır) ve bunların standart oranları. Bu düzenlemek ve daha sonra ekleyebilirsiniz standart bir şablon oluşturmak olacaktır."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Vergi kafaları Liste (örn KDV, gümrük vb; onlar benzersiz adlara sahip olmalıdır) ve bunların standart oranları. Bu düzenlemek ve daha sonra ekleyebilirsiniz standart bir şablon oluşturmak olacaktır."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Seri Ürün{0} için Seri numaraları gereklidir
 DocType: Journal Entry,Bank Entry,Banka Girişi
 DocType: Authorization Rule,Applicable To (Designation),(Görev) için uygulanabilir
-DocType: Blog Post,Blog Post,Blog postası
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grup tarafından
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,/ Para birimlerini etkinleştir/devre dışı bırak.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Posta Giderleri
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Toplam (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
 DocType: Purchase Order,The date on which recurring order will be stop,yinelenen sipariş durdurmak hangi tarih
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
-apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır 
+apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} değeri {1} oranında azaltılmalıdır veya tolerans durumu artırılmalıdır
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Toplam Mevcut
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Saat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Saat
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Saat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Teklif oluşturma
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Blok Tarihlerde yaprakları onaylama yetkiniz yok
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Shipping Rule,Shipping Rule Conditions,Kargo Kural Koşulları
 DocType: BOM Replace Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
 DocType: Features Setup,Point of Sale,Satış Noktası
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Kıvırma
 DocType: Account,Tax,Vergi
 DocType: Account,Tax,Vergi
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Satır {0}: {1} geçerli değil {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Inceltme
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Satır {0}: {1} geçerli değil {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Ürün Bundle Gönderen
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Production Planning Tool,Production Planning Tool,Üretim Planlama Aracı
 DocType: Quality Inspection,Report Date,Rapor Tarihi
 DocType: Quality Inspection,Report Date,Rapor Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Yönlendirme
 DocType: C-Form,Invoices,Faturalar
 DocType: Job Opening,Job Title,İş Unvanı
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} zaten dönem için Çalışanı {1} için ayrılan {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Alıcılar
 DocType: Features Setup,Item Groups in Details,Ayrıntılı Ürün Grupları
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Başlangıç Point-of-Sale (POS)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Başlangıç Point-of-Sale (POS)
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Bakım araması için ziyaret raporu.
 DocType: Stock Entry,Update Rate and Availability,Güncelleme Oranı ve Kullanılabilirlik
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Sipariş edilen miktara karşı alabileceğiniz veya teslim edebileceğiniz daha fazla miktar. Örneğin, 100 birim sipariş verdiyseniz,izniniz %10'dur, bu durumda 110 birim almaya izniniz vardır."
 DocType: Pricing Rule,Customer Group,Müşteri Grubu
 DocType: Pricing Rule,Customer Group,Müşteri Grubu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: Item,Website Description,Web Sitesi Açıklaması
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
 ,Sales Register,Satış Kayıt
@@ -3546,76 +3242,61 @@
 DocType: Quotation,Quotation Lost Reason,Teklif Kayıp Nedeni
 DocType: Address,Plant,Tesis
 DocType: Address,Plant,Tesis
-DocType: DocType,Setup,Kurulum
-DocType: DocType,Setup,Kurulum
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Düzenlenecek bir şey yok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Bu ay ve bekleyen aktiviteler için Özet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Soğuk haddeleme
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
 DocType: Customer Group,Customer Group Name,Müşteri Grup Adı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont  Tipi Karşılığı
 DocType: Item,Attributes,Nitelikler
-DocType: Packing Slip,Get Items,Ürünleri alın
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Borç Silme Hesabı Girin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Ürünleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Son Sipariş Tarihi
-DocType: DocField,Image,Resim
-DocType: DocField,Image,Resim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Tüketim faturası yapın
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
-DocType: Communication,Other,Diğer
-DocType: Communication,Other,Diğer
 DocType: C-Form,C-Form,C-Formu
 DocType: C-Form,C-Form,C-Formu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Çalışma kimliği ayarlanmamış
-DocType: Production Order,Planned Start Date,Planlanan Başlangıç Tarihi
+DocType: Production Order,Planned Start Date,Planlanan Başlangıç Tarihi
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Bakım. Ziyaret
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Bakım. Ziyaret
 DocType: Leave Type,Is Encash,Bozdurulmuş
 DocType: Purchase Invoice,Mobile No,Mobil No
-DocType: Payment Tool,Make Journal Entry,Dergi Girişi Yap
-DocType: Leave Allocation,New Leaves Allocated,Tahsis Edilen Yeni İzinler 
+DocType: Payment Tool,Make Journal Entry,Kayıt Girdisi Yap
+DocType: Leave Allocation,New Leaves Allocated,Tahsis Edilen Yeni İzinler
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Appraisal Template,Appraisal Template Title,Değerlendirme Şablonu Başlığı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Ticari
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
 DocType: Cost Center,Distribution Id,Dağıtım Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Başarılı Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Başarılı Hizmetler
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Bütün Ürünler veya Hizmetler.
 DocType: Purchase Invoice,Supplier Address,Tedarikçi Adresi
 DocType: Purchase Invoice,Supplier Address,Tedarikçi Adresi
-DocType: Contact Us Settings,Address Line 2,Adres Satırı 2
-DocType: Contact Us Settings,Address Line 2,Adres Satırı 2
-DocType: ToDo,Reference,Referans
-DocType: ToDo,Reference,Referans
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Perforan
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Çıkış Miktarı
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Seri zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansal Hizmetler
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Finansal Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3}
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
 DocType: Leave Allocation,Unused leaves,Kullanılmayan yapraklar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Alacak Hesapları Standart
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Testere
 DocType: Tax Rule,Billing State,Fatura Devlet
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Laminasyon
 DocType: Item Reorder,Transfer,Transfer
 DocType: Item Reorder,Transfer,Transfer
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Sinterleme
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -3629,9 +3310,8 @@
 DocType: Company,Retail,Perakende
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Müşteri {0} yok
 DocType: Attendance,Absent,Eksik
-DocType: Product Bundle,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Ürün Paketi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Ezme
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
 DocType: Upload Attendance,Download Template,Şablonu İndir
 DocType: GL Entry,Remarks,Açıklamalar
@@ -3641,17 +3321,14 @@
 DocType: Features Setup,POS View,POS görüntüle
 DocType: Features Setup,POS View,POS görüntüle
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Sürekli döküm
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Yukarıdaki
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Soğuk boyutlandırma
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Hesap {0} Grup olamaz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Bölge
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
 DocType: Holiday List,Weekly Off,Haftalık İzin
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Örneğin 2012 için, 2012-13"
@@ -3659,7 +3336,7 @@
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Geçici Kar / Zarar (Kredi)
 DocType: Sales Invoice,Return Against Sales Invoice,Karşı Satış Fatura Dönüş
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Madde 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Şirket varsayılan değeri {0} set Lütfen {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Şirket varsayılan değeri {0} set Lütfen {1}
 DocType: Serial No,Creation Time,Oluşturma Zamanı
 DocType: Serial No,Creation Time,Oluşturma Zamanı
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Toplam Gelir
@@ -3667,13 +3344,13 @@
 ,Monthly Attendance Sheet,Aylık Katılım Cetveli
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kayıt bulunamAdı
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Hesap {0} etkin değil
 DocType: GL Entry,Is Advance,Avans
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,tarihinden  Tarihine kadar katılım zorunludur
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,'Taşeron var mı' alanına Evet veya Hayır giriniz
 DocType: Sales Team,Contact No.,İletişim No
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,'Kar ve Zarar' tipi hesaba {0} izin verilmez
-DocType: Workflow State,Time,Zaman
 DocType: Features Setup,Sales Discounts,Satış İndirimleri
 DocType: Features Setup,Sales Discounts,Satış İndirimleri
 DocType: Hub Settings,Seller Country,Satıcı Ülke
@@ -3681,15 +3358,14 @@
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Satış Vergi ve Harçlar Şablon
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Sipariş Sayısı
 DocType: Item Group,HTML / Banner that will show on the top of product list.,Ürün listesinin tepesinde görünecek HTML / Banner.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Nakliye miktarını hesaplamak için koşulları belirtin
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Alt öğe ekle
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol Dondurulmuş Hesaplar ve Düzenleme Dondurulmuş Girişleri Set İzin
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Çocuk nodları olduğundan Maliyet Merkezi ana deftere dönüştürülemez
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Katsayı gereklidir
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Seri #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Satış Komisyonu
@@ -3699,16 +3375,14 @@
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Production Order,Expected Delivery Date,Beklenen Teslim Tarihi
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Şişkin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Evaporatif-model döküm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Eğlence Giderleri
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Yaş
 DocType: Time Log,Billing Amount,Fatura Tutarı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ürün {0} için geçersiz miktar belirtildi. Miktar 0 dan fazla olmalıdır
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,İzin başvuruları.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Yasal Giderler
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Otomatik sipariş 05, 28 vb gibi oluşturulur hangi ayın günü"
@@ -3729,29 +3403,25 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Seyahat Giderleri
 DocType: Maintenance Visit,Breakdown,Arıza
 DocType: Maintenance Visit,Breakdown,Arıza
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Tarihinde gibi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Honlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
-DocType: Feed,Full Name,Tam Adı
-DocType: Feed,Full Name,Tam Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Deneme Süresi
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Standart Depo stok Ürünleri için zorunludur.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Ay {0} ve yıl {1} için maaş ödemesi
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
 ,Transferred Qty,Transfer Edilen Miktar
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Gezinme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlama
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Planlama
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Günlük Parti oluşturun
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Veriliş
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Bu ürünü satıyoruz
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Bu ürünü satıyoruz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Tedarikçi Kimliği
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 DocType: Sales Partner,Contact Desc,İrtibat Desc
@@ -3760,22 +3430,20 @@
 DocType: Brand,Item Manager,Ürün Yöneticisi
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Hesaplarda yıllık bütçeleri ayarlamak için kolon ekle.
 DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Taşocakçılığı
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Not: Ürün {0} birden çok kez girilmiş
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tüm Kişiler.
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
 DocType: Newsletter,Test Email Id,Test E-posta Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Şirket Kısaltma
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Şirket Kısaltma
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Kalite Denetimini izlerseniz Alım Makbuzunda Ürünlerin Kalite Güvencesini ve Kalite Güvence numarasını verir.
 DocType: GL Entry,Party Type,Taraf Türü
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Hammadde ana Malzeme ile aynı olamaz
 DocType: Item Attribute Value,Abbreviation,Kısaltma
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Dönme kalıplama
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Maaş Şablon Alanı.
 DocType: Leave Type,Max Days Leave Allowed,En fazla izin günü
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Alışveriş sepeti için ayarla Vergi Kural
@@ -3789,8 +3457,8 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Vergi Şablon zorunludur.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
@@ -3799,8 +3467,8 @@
 DocType: Address,Preferred Billing Address,Tercih edilen Fatura Adresi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Sekreter
 DocType: Serial No,Distinct unit of an Item,Bir Öğe Farklı birim
 DocType: Pricing Rule,Buying,Satın alma
 DocType: HR Settings,Employee Records to be created by,Oluşturulacak Çalışan Kayıtları
@@ -3809,32 +3477,29 @@
 DocType: Salary Slip Earning,Salary Slip Earning,Bordro Dahili Kazanç
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Alacaklılar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Satır # {0}: Seri No zorunludur
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail, Ürün Vergi Detayları
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Ürün Vergi Detayları
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
 DocType: Purchase Order Item,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Ütü
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} durduruldu
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
 DocType: Lead,Add to calendar on this date,Bu tarihe Takvime ekle
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Yaklaşan Etkinlikler
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
-DocType: Letter Head,Letter Head,Antetli Kağıt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Hızlı Girişi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} Dönüş için zorunludur
 DocType: Purchase Order,To Receive,Almak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Uydurma Shrink
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Gelir / Gider
 DocType: Email Digest,Income / Expense,Gelir / Gider
 DocType: Employee,Personal Email,Kişisel E-posta
 DocType: Employee,Personal Email,Kişisel E-posta
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Toplam Varyans
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Toplam Varyans
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Etkinse, sistem otomatik olarak envanter için muhasebe kayıtlarını yayınlayacaktır"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Komisyonculuk
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Komisyonculuk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
 DocType: Address,Postal Code,Posta Kodu
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Dakika 
@@ -3843,23 +3508,20 @@
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Üretim için verilen emirler.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Hub Settings,Name Token,İsim Jetonu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Rendeleme
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standart Satış
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standart Satış
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Standart Satış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,En az bir depo zorunludur
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Lütfen Varsayılan Ölçü birimini girin
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Purchase Invoice Item,Project Name,Proje Adı
 DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
-DocType: Workflow State,Edit,Düzenle
-DocType: Workflow State,Edit,Düzenle
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
 DocType: Features Setup,Item Batch Nos,Ürün Parti Numaraları
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
@@ -3868,21 +3530,19 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Ödeme Mutabakat Ödemesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Vergi Varlıkları
 DocType: BOM Item,BOM No,BOM numarası
-DocType: Contact Us Settings,Pincode,Pinkodu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Replace Tool,The BOM which will be replaced,Değiştirilecek BOM
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Yeni Stok UOM mevcut stok UOM dan farklı olmalıdır
 DocType: Account,Debit,Borç
 DocType: Account,Debit,Borç
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,İzinler 0.5 katlanarak tahsis edilmelidir
 DocType: Production Order,Operation Cost,Operasyon Maliyeti
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Bir. Csv dosyasından devamlılığı yükle
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Üstün Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Bu Satış Kişisi için Ürün Grubu hedefleri ayarlayın
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Bu konuyu atamak için, yan taraftaki ""Ata"" butonunu kullanın"
-DocType: Stock Settings,Freeze Stocks Older Than [Days], [Days] daha eski donmuş stoklar
+DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] daha eski donmuş stoklar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Mali Yılı: {0} does not var
 DocType: Currency Exchange,To Currency,Para Birimi
@@ -3895,13 +3555,8 @@
 DocType: Purchase Invoice,End Date,Bitiş Tarihi
 DocType: Purchase Invoice,End Date,Bitiş Tarihi
 DocType: Employee,Internal Work History,İç Çalışma Geçmişi
-DocType: DocField,Column Break,Sütun Arası
-DocType: DocField,Column Break,Sütun Arası
-DocType: Event,Thursday,Perşembe
-DocType: Event,Thursday,Perşembe
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Özel Sermaye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Özel Sermaye
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Dönme
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Özel Sermaye
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Özel Sermaye
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
 DocType: Account,Expense,Gider
@@ -3918,36 +3573,34 @@
 DocType: Employee,Held On,Yapılan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Üretim Öğe
 ,Employee Information,Çalışan Bilgileri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Oranı (%)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Oranı (%)
 DocType: Stock Entry Detail,Additional Cost,Ek maliyet
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Mali Yıl Bitiş Tarihi
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Dekont, olarak gruplandırıldı ise Makbuz numarasına dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Ücretsiz İzin (Üİ) için Kazancı azalt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Mazeret İzni
 DocType: Batch,Batch ID,Seri Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Bu Haftanın Özeti
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} satır {1} de Alınan veya Taşerona verilen bir Ürün olmalıdır.
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
 DocType: GL Entry,Party,Taraf
 DocType: Sales Order,Delivery Date,Teslimat Tarihi
-DocType: DocField,Currency,Para birimi
-DocType: DocField,Currency,Para birimi
 DocType: Opportunity,Opportunity Date,Fırsat tarihi
 DocType: Purchase Receipt,Return Against Purchase Receipt,Satınalma Makbuzu Karşı dön
 DocType: Purchase Order,To Bill,Bill için
 DocType: Material Request,% Ordered,% Sipariş edildi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Parça başı iş
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Task,Actual Time (in Hours),(Saati) Gerçek Zaman
 DocType: Employee,History In Company,Şirketteki Geçmişi
@@ -3967,69 +3620,59 @@
 DocType: SMS Settings,SMS Settings,SMS Ayarları
 DocType: SMS Settings,SMS Settings,SMS Ayarları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Geçici Hesaplar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Siyah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Siyah
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Patlatılmış Malzemeler
 DocType: Account,Auditor,Denetçi
 DocType: Purchase Order,End date of current order's period,Cari Siparişin dönemi bitiş tarihi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Teklif Mektubu Yap
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Dönüş
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
-DocType: DocField,Fold,Kat
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Variant için Ölçü Varsayılan Birim Şablon aynı olmalıdır
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
 DocType: Project Task,Pending Review,Bekleyen İnceleme
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Lütfen belirtiniz
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Lütfen belirtiniz
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Müşteri Kimliği
-DocType: Page,Page Name,Sayfa Adı
-DocType: Page,Page Name,Sayfa Adı
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Zaman Zaman itibaren daha büyük olmalıdır için
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Mil bitirme
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
 DocType: Account,Asset,Varlık
 DocType: Project Task,Task ID,Görev Kimliği
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","örneğin ""MC """
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","örneğin ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","örneğin ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","örneğin ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Ürün için var olamaz Stok {0} yana varyantları vardır
 ,Sales Person-wise Transaction Summary,Satış Personeli bilgisi İşlem Özeti
-DocType: System Settings,Time Zone,Saat Dilimi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Depo {0} yoktur
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub için Kayıt
 DocType: Monthly Distribution,Monthly Distribution Percentages,Aylık Dağılımı Yüzdeler
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% malzeme bu İrsaliye karşılığında teslim edildi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Zımbalama
 DocType: Customer,Customer Details,Müşteri Detayları
 DocType: Customer,Customer Details,Müşteri Detayları
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Şekillendirme
 DocType: Employee,Reports to,Raporlar
 DocType: Employee,Reports to,Raporlar
 DocType: SMS Settings,Enter url parameter for receiver nos,Alıcı numaraları için url parametresi girin
 DocType: Sales Invoice,Paid Amount,Ödenen Tutar
 DocType: Sales Invoice,Paid Amount,Ödenen Tutar
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Kapanan Hesap {0} 'Yükümlülük' tipi olmalıdır
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Kalite Yönetimi
 DocType: Production Planning Tool,Filter based on customer,Müşteriye dayalı filtre
 DocType: Payment Tool Detail,Against Voucher No,Çeki No Karşı
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
 DocType: Tax Rule,Purchase,Satın Alım
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Denge Adet
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Denge Adet
 DocType: Item Group,Parent Item Group,Ana Ürün Grubu
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} için {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Maliyet Merkezleri
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Depolar.
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Depolar.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Depolar.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Depolar.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tedarikçinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Satır # {0}: satır ile Gecikme çatışmalar {1}
 DocType: Opportunity,Next Contact,Sonraki İletişim
@@ -4037,21 +3680,19 @@
 DocType: Employee,Employment Type,İstihdam Tipi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Uygulama süresi iki alocation kayıtları arasında olamaz
 DocType: Item Group,Default Expense Account,Standart Gider Hesabı
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
-DocType: Page,Yes,Evet
-DocType: Page,Yes,Evet
 DocType: Tax Rule,Sales Tax Template,Satış Vergisi Şablon
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Elektroform
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fiş karşı Tipi Satınalma Siparişi biri, Alış Fatura veya günlük girdisi olmalıdır"
 DocType: Account,Stock Adjustment,Stok Ayarı
 DocType: Account,Stock Adjustment,Stok Ayarı
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standart Etkinliği Maliyet Etkinlik Türü için var - {0}
 DocType: Production Order,Planned Operating Cost,Planlı İşletme Maliyeti
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Yeni {0} Adı
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Bulmak Lütfen ekli {0} # {1}
 DocType: Job Applicant,Applicant Name,Başvuru sahibinin adı
 DocType: Authorization Rule,Customer / Item Name,Müşteri / Ürün İsmi
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -4064,7 +3705,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Ürün {0} için Seri no zorunludur
 DocType: Item Variant Attribute,Attribute,Nitelik
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Menzil / dan belirtiniz
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Tarafından oluşturulan
 DocType: Serial No,Under AMC,AMC altında
 DocType: Serial No,Under AMC,AMC altında
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Ürün değerleme oranı indi maliyet çeki miktarı dikkate hesaplanır
@@ -4082,21 +3722,20 @@
 DocType: Payment Reconciliation,Minimum Amount,Minimum Tutar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Mamülleri Güncelle
 DocType: Workstation,per hour,saat başına
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Seriler {0} {1} de zaten kullanılmıştır
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Depo hesabı (Devamlı Envanter) bu hesap altında oluşturulacaktır.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Ödenen Tutar;
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Malzeme {0 }için izin verilen maksimum indirim} {1}% 
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Sevk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Malzeme {0 }için izin verilen maksimum indirim} {1}%
 DocType: Customer,Default Taxes and Charges,Standart Vergi ve Harçlar
 DocType: Account,Receivable,Alacak
 DocType: Account,Receivable,Alacak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
 DocType: Sales Invoice,Supplier Reference,Tedarikçi Referansı
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Eğer işaretli ise, alt-montaj kalemleri için BOM hammadde almak için kabul edilecektir. Aksi takdirde, tüm alt-montaj ögeleri bir hammadde olarak kabul edilecektir."
@@ -4105,10 +3744,10 @@
 DocType: Employee Education,Qualification,{0}Yeterlilik{/0} {1} {/1}
 DocType: Item Price,Item Price,Ürün Fiyatı
 DocType: Item Price,Item Price,Ürün Fiyatı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun ve Deterjan
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 DocType: Warehouse,Warehouse Name,Depo Adı
@@ -4120,7 +3759,6 @@
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Destek Analizi
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Şirket depolarda eksik {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Stok UOM Değiştirme
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
 DocType: POS Profile,Terms and Conditions,Şartlar ve Koşullar
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Tarih Mali Yıl içinde olmalıdır. Tarih = {0}
@@ -4135,7 +3773,7 @@
 DocType: Sales Order Item,For Production,Üretim için
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Lütfen Yukarıdaki tabloya satış siparişi giriniz
 DocType: Project Task,View Task,Görevleri Göster
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Mali yılınız şu tarihte başlıyor:
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Mali yılınız şu tarihte başlıyor:
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Satınalma Makbuzlar giriniz
 DocType: Sales Invoice,Get Advances Received,Avansların alınmasını sağla
 DocType: Email Digest,Add/Remove Recipients,Alıcı Ekle/Kaldır
@@ -4144,21 +3782,19 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Destek e-mail kimliği için gelen sunucu kurulumu (örneğin:support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Salary Slip,Salary Slip,Bordro
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Cilalama
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,'Tarihine Kadar' gereklidir
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Paketleri teslim edilmek üzere fişleri ambalaj oluşturun. Paket numarası, paket içeriğini ve ağırlığını bildirmek için kullanılır."
 DocType: Sales Invoice Item,Sales Order Item,Satış Sipariş Ürünü
 DocType: Salary Slip,Payment Days,Ödeme Günleri
 DocType: BOM,Manage cost of operations,İşlem Maliyetlerini Yönetin
 DocType: Features Setup,Item Advanced,İleri Madde
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Sıcak haddeleme
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","İşaretli işlemlerden biri ""Teslim Edildiğinde"" işlemdeki ilgili ""Kişi""ye e-mail gönderecek bir e-mail penceresi açılacaktır, işlemi ekte gönderecektir."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 DocType: Employee Education,Employee Education,Çalışan Eğitimi
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
 DocType: Salary Slip,Net Pay,Net Ödeme
 DocType: Account,Account,Hesap
 DocType: Account,Account,Hesap
@@ -4169,40 +3805,31 @@
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
 DocType: Expense Claim,Total Claimed Amount,Toplam İade edilen Tutar
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Geçersiz {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Hastalık izni
 DocType: Email Digest,Email Digest,E-Mail Bülteni
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Departman mağazaları
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Sistem Dengesi
-DocType: Workflow,Is Active,Aktif
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departman mağazaları
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Sistem Dengesi
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Değişim Kısaltma
-DocType: Workflow State,Primary,Birincil
 DocType: Expense Claim Detail,Expense Date,Gider Tarih
 DocType: Item,Max Discount (%),En fazla İndirim (%
-DocType: Communication,More Information,Daha fazla bilgi
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Son Sipariş Miktarı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Patlatma
 DocType: Company,Warn,Uyarmak
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ürün değerleme güncellendi
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Ürün değerleme güncellendi
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
 DocType: BOM,Manufacturing User,Üretim Kullanıcı
 DocType: Purchase Order,Raw Materials Supplied,Tedarik edilen Hammaddeler
 DocType: Purchase Invoice,Recurring Print Format,Tekrarlayan Baskı Biçimi
-DocType: Communication,Series,Seriler
-DocType: Communication,Series,Seriler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Beklenen Teslim Tarihi Siparii Tarihinden önce olamaz
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
-DocType: Communication,Email,E-posta;
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,İş Geliştirme Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,İş Geliştirme Müdürü
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bakım ziyareti Amacı
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Dönem
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Dönem
@@ -4214,9 +3841,7 @@
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Önce {0} seçiniz
 DocType: Features Setup,To get Item Group in details table,Detaylar tablosunda Ürün Grubu almak için
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Redrawing
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Gravür
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Address Template,"<h4>Default Template</h4>
@@ -4244,7 +3869,7 @@
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Standart Tutar
 DocType: Salary Slip Deduction,Default Amount,Standart Tutar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Sistemde depo bulunmadı
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Sistemde depo bulunmadı
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Bu Ayın Özeti
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
@@ -4269,15 +3894,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
 DocType: Supplier,Address and Contacts,Adresler ve Kontaklar
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dönüşüm Detayı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
 DocType: Payment Tool,Get Outstanding Vouchers,Üstün Fişler alın
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
 DocType: Appraisal,Start Date,Başlangıç Tarihi
 DocType: Appraisal,Start Date,Başlangıç Tarihi
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Değer
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Değer
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Bir dönemlik tahsis izni.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Doğrulamak için buraya tıklayın
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
@@ -4289,69 +3912,52 @@
 DocType: Time Log,Hours,Saat
 DocType: Time Log,Hours,Saat
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Rolling
-DocType: ToDo,Priority,Öncelik
-DocType: ToDo,Priority,Öncelik
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox Erişimine İzin verildi
-DocType: Dropbox Backup,Weekly,Haftalık
-DocType: Dropbox Backup,Weekly,Haftalık
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Örn. msgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Alma
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Alma
 DocType: Maintenance Visit,Fully Completed,Tamamen Tamamlanmış
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Tamamlandı
 DocType: Employee,Educational Qualification,Eğitim Yeterliliği
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} başarıyla Haber listesine eklendi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Elektron ışın işleme
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Ana Raporlar
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Ana Raporlar
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Stok Defteri girdi bakiyeleri güncellendi
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Ana Raporlar
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Ana Raporlar
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tarihine kadar kısmı tarihinden itibaren kısmından önce olamaz
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Fiyatları Ekle / Düzenle
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Siparişlerim
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Siparişlerim
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Time Log,For Manufacturing,Üretim için
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Toplamlar
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Toplamlar
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Toplamlar
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Toplamlar
 DocType: BOM,Manufacturing,Üretim
 DocType: BOM,Manufacturing,Üretim
 ,Ordered Items To Be Delivered,Teslim edilecek Sipariş Edilen Ürünler
 DocType: Account,Income,Gelir
 DocType: Account,Income,Gelir
-,Setup Wizard,Kurulum Sihirbazı
-,Setup Wizard,Kurulum Sihirbazı
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Bir şeyler yanlış gitti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Basınçlı döküm
-DocType: Email Alert,Reference Date,Referans Tarihi
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Lütfen Geçerli bir cep telefonu numarası giriniz
 DocType: Budget Detail,Budget Detail,Bütçe Detay
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Lütfen Göndermeden önce mesajı giriniz
-DocType: Async Task,Status,Durum
-DocType: Async Task,Status,Durum
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Stok UOM Ürün için güncelleştirilmiş {0}
-DocType: Company History,Year,Yıl
-DocType: Company History,Year,Yıl
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Satış Noktası Profili
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Lütfen SMS ayarlarını güncelleyiniz
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Zaten fatura Zaman Günlüğü {0}
@@ -4366,16 +3972,17 @@
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
 DocType: Item,Unit of Measure Conversion,Ölçü Dönüşüm Birimi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Çalışan değiştirilemez
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
 DocType: Naming Series,Help HTML,Yardım HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},{1} den fazla Ürün için {0} üzerinde ödenek
 DocType: Address,Name of person or organization that this address belongs to.,Bu adresin ait olduğu kişi veya kurumun adı.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Tedarikçileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Tedarikçileriniz
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Başka Maaş Yapısı {0} çalışan için aktif {1}. Onun durumu 'Etkin değil' devam etmek olun.
 DocType: Purchase Invoice,Contact,İletişim
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Dan alındı
 DocType: Features Setup,Exports,İhracat
 DocType: Features Setup,Exports,İhracat
 DocType: Lead,Converted,Dönüştürülmüş
@@ -4383,51 +3990,45 @@
 DocType: Employee,Date of Issue,Veriliş tarihi
 DocType: Employee,Date of Issue,Veriliş tarihi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Bilgisayar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Donmuş değer ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
 DocType: Cost Center,Budgets,Bütçeler
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Güncellenmiş
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Güncellenmiş
 DocType: Employee,Emergency Contact Details,Acil Durum İrtibat Kişisi Bilgileri
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ne yapar?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Ne yapar?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Ne yapar?
 DocType: Delivery Note,To Warehouse,Depoya
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Hesap {0} bir mali yıl içerisinde birden fazla girildi {1}
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Öğelerin indi maliyetini hesaplamak için ek maliyetler güncelleyin
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Elektrik
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Çalışan {0} için kullanıcı kimliği ayarlanmamış
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Garanti İstem itibaren
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Item,Customer Code,Müşteri Kodu
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Rodaj
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Son siparişten bu yana geçen günler
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
-DocType: User,Enabled,Etkin
-DocType: User,Enabled,Etkin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Gerçekten ay {0} ve yıl {1} için Maaş Makbuzu vermek istiyor musunuz
@@ -4437,22 +4038,20 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
 DocType: Notification Control,Sales Invoice Message,Satış Faturası Mesajı
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Hesap {0} Kapanış tipi Sorumluluk / Özkaynak olmalıdır
 DocType: Authorization Rule,Based On,Göre
 DocType: Authorization Rule,Based On,Göre
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Kimden ve Dönemi yinelenen için zorunlu tarihler için Dönem {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Proje faaliyeti / görev.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Maaş Makbuzu Oluşturun
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} geçerli bir e-posta adresi değildir
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Eğer Uygulanabilir {0} olarak seçilirse, alım kontrol edilmelidir."
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,İndirim 100'den az olmalıdır
-DocType: ToDo,Low,Düşük
-DocType: ToDo,Low,Düşük
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Döndürme
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Lütfen {0} ayarlayınız
 DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
@@ -4461,7 +4060,7 @@
 DocType: Offer Letter,Offer Letter Terms,Harf Şartları Teklif
 DocType: Features Setup,To track any installation or commissioning related work after sales,Satış sonrası bütün kurulum veya işletmeye alma işlerini izlemek için
 DocType: Project,Estimated Costing,Tahmini Maliyetleme
-DocType: Purchase Invoice Advance,Journal Entry Detail No,Dergi Giriş Detayı Hayır
+DocType: Purchase Invoice Advance,Journal Entry Detail No,Kayıt Girdisi Detay No
 DocType: Employee External Work History,Salary,Maaş
 DocType: Employee External Work History,Salary,Maaş
 DocType: Serial No,Delivery Document Type,Teslim Belge Türü
@@ -4480,9 +4079,8 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Kampanya Adı gereklidir
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Receipt Item,Rejected Serial No,Seri No Reddedildi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Derin çekme
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Yeni Haber
-apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır 
+apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Balansı Göster
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Örnek:. Serisi ayarlanır ve Seri No işlemlerinde belirtilen değilse ABCD ##### 
@@ -4491,7 +4089,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Tutar
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Perçinleme
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
 ,Sales Analytics,Satış Analizleri
 DocType: Manufacturing Settings,Manufacturing Settings,Üretim Ayarları
@@ -4504,24 +4101,18 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Yeni Hesap Adı
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tedarik edilen Hammadde  Maliyeti
 DocType: Selling Settings,Settings for Selling Module,Modülü Satış için Ayarlar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Müşteri Hizmetleri
 DocType: Item,Thumbnail,Başparmak tırnağı
 DocType: Item Customer Detail,Item Customer Detail,Ürün Müşteri Detayı
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,E-posta adresiniz Onayla
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Teklif aday İş.
 DocType: Notification Control,Prompt for Email on Submission of,Başvuru üzerine E-posta cevabı
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Toplam ayrılan yapraklar dönemde gün daha vardır
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Muhasebe işlemleri için Varsayılan ayarlar.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} gereklidir
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} gereklidir
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Vakum kalıplama
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Beklenen Tarih Malzeme Talep Tarihinden önce olamaz
-DocType: Contact Us Settings,City,İl
-DocType: Contact Us Settings,City,İl
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ultrasonik işleme
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Hata: Geçerli bir kimliği?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Ürün {0} Satış ürünü olmalı
 DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
 DocType: Account,Equity,Özkaynak
@@ -4531,8 +4122,8 @@
 DocType: Task,Closing Date,Kapanış Tarihi
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Mühendis
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Arama Alt Kurullar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
 DocType: Sales Partner,Partner Type,Ortak Türü
@@ -4543,8 +4134,8 @@
 DocType: Purchase Invoice,Against Expense Account,Gider Hesabı Karşılığı
 DocType: Production Order,Production Order,Üretim Siparişi
 DocType: Production Order,Production Order,Üretim Siparişi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Kurulum Not {0} zaten gönderildi
 DocType: Quotation Item,Against Docname,Belge adı karşılığı
 DocType: SMS Center,All Employee (Active),Tüm Çalışanlar (Aktif)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Şimdi görüntüle
@@ -4554,35 +4145,31 @@
 DocType: Item,Re-Order Level,Yeniden sipariş seviyesi
 DocType: Item,Re-Order Level,Yeniden Sipariş Seviyesi
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Kendisi için üretim emri vermek istediğiniz Malzemeleri girin veya analiz için ham maddeleri indirin.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Gantt Şeması
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Yarı Zamanlı
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Cheque,Çek
 DocType: Employee,Cheque,Çek
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Serisi Güncellendi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapor Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Rapor Tipi zorunludur
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,İlk Kullanıcı: Sen
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,İlk Kullanıcı: Sen
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,İlk Kullanıcı: Sen
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Mali Yıl {0} da Mali Yıl Başlangıç Tarihi ve Mali Yıl Bitiş Tarihi zaten ayarlanmış
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Başarıyla Uzlaştırıldı
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Ürünlerin saklandığı yer
 DocType: Tax Rule,Validity,Geçerlilik
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Faturalanan Tutar
 DocType: Attendance,Attendance,Katılım
 DocType: Attendance,Attendance,Katılım
-DocType: Page,No,Hayır
-DocType: Page,No,Hayır
 DocType: BOM,Materials,Materyaller
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","İşaretli değilse, liste uygulanması gereken her Departmana eklenmelidir"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
@@ -4591,62 +4178,50 @@
 ,Item Prices,Ürün Fiyatları
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Sözlü Alım belgesini kaydettiğinizde görünür olacaktır.
 DocType: Period Closing Voucher,Period Closing Voucher,Dönem Kapanış Makbuzu
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Fiyat Listesi alanı
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Fiyat Listesi alanı
 DocType: Task,Review Date,İnceleme tarihi
 DocType: Purchase Invoice,Advance Payments,Peşin Ödeme
-DocType: DocPerm,Level,Seviye
-DocType: DocPerm,Level,Seviye
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Değirmencilik
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Hiçbir izin Ödeme Aracı kullanmak için
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
 DocType: Company,Round Off Account,Hesap Off Yuvarlak
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Nibbling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Yönetim Giderleri
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Danışmanlık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Danışmanlık
 DocType: Customer Group,Parent Customer Group,Ana Müşteri Grubu
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Değişiklik
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,İhbar Süresi
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","Örneğin ""Benim Şirketim LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,İhbar Süresi
 DocType: Bank Reconciliation Detail,Voucher ID,Föy Kimliği
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Bu bir kök bölgedir ve düzenlenemez.
 DocType: Packing Slip,Gross Weight UOM,Brüt Ağırlık UOM
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Email Digest,Receivables / Payables,Alacaklar / Borçlar
 DocType: Delivery Note Item,Against Sales Invoice,Satış Faturası Karşılığı
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Presleme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Sıfır değerleri göster
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Üretimden sonra elde edilen Ürün miktarı/ ham maddelerin belli miktarlarında yeniden ambalajlama
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Sipariş Ürün Karşı
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Task,Actual End Date (via Time Logs),Gerçek Bitiş Tarihi (Saat Kayıtlar üzerinden)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Lütfen ana maliyet merkezi giriniz
 DocType: Delivery Note,Print Without Amount,Tutarı olmadan yazdır
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"'Değerleme', 'Değerlendirme ve Toplam stok maddeleri olduğundan ötürü Vergi kategorisi bunlardan biri olamaz."
-DocType: User,Last Name,Soyadı
-DocType: Web Page,Left,Bırakmak
-DocType: Event,All Day,Bütün Gün
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"'Değerleme', 'Değerlendirme ve Toplam stok maddeleri olduğundan ötürü Vergi kategorisi bunlardan biri olamaz."
 DocType: Issue,Support Team,Destek Ekibi
 DocType: Appraisal,Total Score (Out of 5),Toplam Puan (5 üzerinden)
-DocType: Contact Us Settings,State,Devlet
-DocType: Contact Us Settings,State,Devlet
 DocType: Batch,Batch,Yığın
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Bakiye
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Bakiye
 DocType: Project,Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla)
-DocType: User,Gender,Cinsiyet
-DocType: User,Gender,Cinsiyet
 DocType: Journal Entry,Debit Note,Borç dekontu
 DocType: Stock Entry,As per Stock UOM,Stok UOM gereğince
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Süresi Doldu Değil
@@ -4664,52 +4239,46 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Değerlere dayalı işlemleri kısıtlamak için kurallar oluşturun.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Seçili ise,toplam çalışma günleri sayısı tatilleri içerecektir ve bu da Günlük ücreti düşürecektir"
 DocType: Purchase Invoice,Total Advance,Toplam Advance
-DocType: Workflow State,User,Kullanıcı
-DocType: Workflow State,User,Kullanıcı
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,İşleme Bordro
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Kayıp olarak ayarla
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Kayıp olarak ayarla
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ödeme Makbuzu Not
 DocType: Customer,Credit Days Based On,Kredi Günleri Dayalı
 DocType: Tax Rule,Tax Rule,Vergi Kuralı
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Satış döngüsü boyunca aynı oranı koruyun
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Workstation Çalışma Saatleri dışında zaman günlükleri planlayın.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} zaten Gönderildi
 ,Items To Be Requested,İstenecek Ürünler
-DocType: Purchase Order,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Etkinlik Türü dayalı Fatura Oranı (saatte)
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Dikiş
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Şirket e-posta kimliği bulunamadı, mail gönderilemedi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 DocType: Production Planning Tool,Filter based on item,Ürüne dayalı filtre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Borç Hesabı
-DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
-DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
+DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
+DocType: Fiscal Year,Year Start Date,Yıl Başlangıç Tarihi
 DocType: Attendance,Employee Name,Çalışan Adı
 DocType: Attendance,Employee Name,Çalışan Adı
 DocType: Sales Invoice,Rounded Total (Company Currency),Yuvarlanmış Toplam (Şirket para birimi)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
 DocType: Purchase Common,Purchase Common,Ortak Satın Alma
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0}, {1} düzenlenmiştir. Lütfen yenileyin."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Fırsattan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Karartma
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Çalışanlara Sağlanan Faydalar
 DocType: Sales Invoice,Is POS,POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},{1} Paketli miktar satır {1} deki Ürün {0} a eşit olmalıdır
 DocType: Production Order,Manufactured Qty,Üretilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 DocType: Purchase Receipt Item,Accepted Quantity,Kabul edilen Miktar
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} mevcut değil
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Müşterilere artırılan faturalar
-DocType: DocField,Default,Varsayılan
-DocType: DocField,Default,Varsayılan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Proje Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} aboneler eklendi
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Bu Maliyet Merkezi için Bütçe tanımlayın. Bütçe eylemi ayarlamak için, bkz: &quot;Şirket Listesi&quot;"
@@ -4722,39 +4291,35 @@
 DocType: Expense Claim,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Evet"" işaretlemek Seri no alanında görüntülenebilecek Ürünnin her elemanını tanımlayacak ayrı kimlik verecektir"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
 DocType: Employee,Education,Eğitim
 DocType: Employee,Education,Eğitim
 DocType: Selling Settings,Campaign Naming By,Tarafından Kampanya İsimlendirmesi
 DocType: Employee,Current Address Is,Güncel Adresi
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
 DocType: Address,Office,Ofis
 DocType: Address,Office,Ofis
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standart Raporlar
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Standart Raporlar
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Vergi Hesabı oluşturmak için
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Gider Hesabı girin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
 DocType: Account,Stock,Stok
 DocType: Account,Stock,Stok
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Toplu Envanteri
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Toplu Envanteri
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Sales Order,Track this Sales Order against any Project,Bu satış emrini bütün Projelere karşı takip et
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Yukarıdaki kriterlere dayalı olarak (teslimat bekleyen) satış emirlerini çek
-DocType: DocShare,Document Type,Belge Türü
-DocType: DocShare,Document Type,Belge Türü
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Tedarikçi fiyat teklifinden
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Tedarikçi fiyat teklifinden
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Deduction Type,Deduction Type,Kesinti Türü
 DocType: Attendance,Half Day,Yarım Gün
@@ -4765,22 +4330,18 @@
 DocType: GL Entry,Transaction Date,İşlem Tarihi
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
 DocType: Production Plan Item,Planned Qty,Planlanan Miktar
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Toplam Vergi
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Toplam Vergi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Miktar (Adet Üretilen) zorunludur
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (Şirket para birimi)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
 DocType: Notification Control,Purchase Receipt Message,Satın alma makbuzu mesajı
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Toplam ayrılan yapraklar dönem daha vardır
-DocType: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
-DocType: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
+DocType: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
+DocType: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
 DocType: Sales Order,% of materials delivered against this Sales Order,% malzeme bu satış emri karşılığında teslim edildi
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Tutanak madde hareketi.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Bülten Listesi Abone
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Servis
-DocType: Email Account,Service,Servis
 DocType: Hub Settings,Hub Settings,Hub Ayarları
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
@@ -4788,23 +4349,20 @@
 DocType: BOM,With Operations,Operasyon ile
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 ,Monthly Salary Register,Aylık Maaş Kaydı
-apps/frappe/frappe/website/template.py +140,Next,Sonraki
-apps/frappe/frappe/website/template.py +140,Next,Sonraki
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
 DocType: BOM Operation,BOM Operation,BOM Operasyonu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Elektro
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Önceki satır toplamı
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,En az bir satır Ödeme Tutarı giriniz
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,En az bir satır Ödeme Tutarı giriniz
 DocType: POS Profile,POS Profile,POS Profili
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Satır {0}: Ödeme Bakiye Tutarı daha büyük olamaz
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Ödenmemiş Toplam
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Ödenmemiş Toplam
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Günlük faturalandırılamaz
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Alıcı
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Alıcı
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ödeme negatif olamaz
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Net ödeme negatif olamaz
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,El Karşı Fişler giriniz
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,El Karşı Fişler giriniz
 DocType: SMS Settings,Static Parameters,Statik Parametreleri
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
@@ -4814,14 +4372,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Kişilerinize toplu SMS Gönder
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Vergi veya Ücret
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Çapraz haddeleme
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Kredi kartı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Kredi kartı
 DocType: BOM,Item to be manufactured or repacked,Üretilecek veya yeniden paketlenecek Ürün
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
 DocType: Purchase Invoice,Next Date,Sonraki Tarihi
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vergi ve Ücretleri giriniz
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,İşleme
 DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
 DocType: Hub Settings,Seller Name,Satıcı Adı
@@ -4831,55 +4387,52 @@
 DocType: Stock Entry,Repack,Yeniden paketlemek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Devam etmeden önce formu kaydetmelisiniz
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo Ekleyin
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Logo Ekleyin
 DocType: Customer,Commission Rate,Komisyon Oranı
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Variant olun
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Sepet Boş
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Kök düzenlenemez.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Kök düzenlenemez.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Tahsis edilen miktar ayarlanmamış miktardan fazla olamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Tahsis edilen miktar ayarlanmamış miktardan fazla olamaz
 DocType: Manufacturing Settings,Allow Production on Holidays,Holidays Üretim izin ver
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Öz sermaye
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Bir csv dosyası seçiniz
-DocType: Dropbox Backup,Send Backups to Dropbox,Yedeklerinizi Dropboxa gönderin
 DocType: Purchase Order,To Receive and Bill,Alma ve Bill için
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Tasarımcı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Tasarımcı
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Miktar, bu seviyenin altına düşerse otomatik olarak Malzeme İsteği oluşturmak"
 ,Item-wise Purchase Register,Ürün bilgisi Alım Kaydı
 DocType: Batch,Expiry Date,Son kullanma tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Yeniden sipariş düzeyini ayarlamak için, öğenin bir Satınalma Ürün ve Üretim Öğe olmalı"
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Proje alanı.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Yarım Gün)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Talep Yaratma Gün Saati
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Malzeme Listesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
-DocType: Dropbox Backup,Send Notifications To,Bildirimlerin Gönderileceği Kişi
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref Tarihi
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref Tarihi
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Expense Claim Detail,Sanctioned Amount,tasdik edilmiş tutar
 DocType: GL Entry,Is Opening,Açılır
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Hesap {0} yok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Hesap {0} yok
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Lütfen çalışan {0} için Maaş Yapısı oluşturunuz

diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index fdfbdfc..47b2ac9 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv

@@ -1,15 +1,14 @@
 DocType: Employee,Salary Mode,Режим Зарплата
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Виберіть щомісячний розподіл, якщо ви хочете, щоб відстежувати на основі сезонності."
 DocType: Employee,Divorced,У розлученні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Увага: Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Увага: Такий же деталь був введений кілька разів.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Товари вже синхронізовані
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Дозволити пункт буде додано кілька разів в угоді
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Скасувати Матеріал Відвідати {0} до скасування Дана гарантія претензії
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Споживацькі товари
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Споживацькі товари
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Будь ласка, виберіть партії першого типу"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Відпал
 DocType: Item,Customer Items,Предмети з клієнтами
-apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} не може бути книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Рахунок {0}: Батьки рахунку {1} не може бути книга
 DocType: Item,Publish Item to hub.erpnext.com,Опублікувати пункт в hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Повідомлення по електронній пошті
 DocType: Item,Default Unit of Measure,За замовчуванням Одиниця виміру
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Залишити Затверджую
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Орендовані
-DocType: About Us Settings,Website,Сайт
 DocType: POS Profile,Applicable for User,Стосується для користувача
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Зупинився виробничого замовлення не може бути скасовано, відкорковувати спочатку скасувати"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Ущільнення плюс спікання
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Валюта необхідна для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Буде розраховується в угоді.
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,З матеріалів Запит
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,З матеріалів Запит
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Дерево
 DocType: Job Applicant,Job Applicant,Робота Заявник
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Немає більше результатів.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,Правовий
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Правовий
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Фактичний тип податку не може бути включений у вартість товару в рядку {0}
 DocType: C-Form,Customer,Клієнт
 DocType: Purchase Receipt Item,Required By,Потрібно За
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Залиште Тип Назва
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Серія Оновлене Успішно
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Зшивання
 DocType: Pricing Rule,Apply On,Нанесіть на
 DocType: Item Price,Multiple Item prices.,Кілька ціни товару.
 ,Purchase Order Items To Be Received,"Купівля Замовити товари, які будуть отримані"
 DocType: SMS Center,All Supplier Contact,Всі постачальником Зв&#39;язатися
 DocType: Quality Inspection Reading,Parameter,Параметр
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Новий Залишити заявку
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Ряд # {0}: ціна повинна бути такою ж, як {1}: {2} ({3} / {4})"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Новий Залишити заявку
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Банківський чек
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1. Для підтримки клієнтської мудрий код пункт і зробити їх пошуку на основі їх використання коду цю опцію
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Показати варіанти
-DocType: Sales Invoice Item,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Кількість
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Кредити (зобов&#39;язання)
 DocType: Employee Education,Year of Passing,Рік Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В наявності
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Виробничий план товару
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Створіть новий POS профілю
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Охорона здоров&#39;я
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 DocType: Purchase Invoice,Monthly,Щомісяця
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Затримка в оплаті (дні)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Адреса електронної пошти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Захист
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Адреса електронної пошти
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
 DocType: Company,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Ряд # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Ряд # {0}:
 DocType: Delivery Note,Vehicle No,Автомобіль Немає
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,"Будь ласка, виберіть Прайс-лист"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Деревообробний
 DocType: Production Order Operation,Work In Progress,В роботі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D-друк
 DocType: Employee,Holiday List,Список свят
 DocType: Time Log,Time Log,Час входу
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Бухгалтер
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Бухгалтер
 DocType: Cost Center,Stock User,Фото користувача
 DocType: Company,Phone No,Телефон Немає
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Журнал діяльності здійснюється користувачами проти Завдання, які можуть бути використані для відстеження часу, виставлення рахунків."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Новий {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},Новий {0}: # {1}
 ,Sales Partners Commission,Партнери по збуту комісія
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,"Абревіатура не може бути більше, ніж 5 символів"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Атрибут Значення {0} не може бути вилучена з {1} як пункту Варіанти \ існують з цим атрибутом.
-DocType: Print Settings,Classic,Класичний
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Це корінь рахунку і не можуть бути змінені.
 DocType: BOM,Operations,Операції
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не вдається встановити дозвіл на основі Знижка на {0}
 DocType: Bin,Quantity Requested for Purchase,Кількість просив для покупки
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикріпіть файл .csv з двома колонами, одна для старого імені і один для нової назви"
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Кг
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Кг
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Відкриття на роботу.
 DocType: Item Attribute,Increment,Приріст
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Виберіть Склад ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Employee,Married,Одружений
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Фото не можуть бути оновлені проти накладної {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Продуктовий
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовий
 DocType: Quality Inspection Reading,Reading 1,Читання 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Зробити запис банку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Пенсійні фонди
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,"Склад є обов&#39;язковим, якщо тип рахунку Склад"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,"Склад є обов&#39;язковим, якщо тип рахунку Склад"
 DocType: SMS Center,All Sales Person,Всі Продажі Особа
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Перевірте, якщо повторювані порядок, зніміть, щоб зупинити повторюваних або поставити правильне Дата закінчення"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Година Оцінити / 60) * Фактична Час роботи
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Вартість комплектності
-DocType: Blog Post,Guest,Гість
 DocType: Quality Inspection,Get Specification Details,Отримати специфікація подробиці
 DocType: Lead,Interested,Зацікавлений
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Рахунок за матеріали
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Відкриття
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Відкриття
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},З {0} до {1}
 DocType: Item,Copy From Item Group,Копіювати з групи товарів
 DocType: Journal Entry,Opening Entry,Відкриття запис
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} є обов&#39;язковим
 DocType: Stock Entry,Additional Costs,Додаткові витрати
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Рахунок з існуючою транзакції не можуть бути перетворені в групі.
 DocType: Lead,Product Enquiry,Запит про продукт
-DocType: Standard Reply,Owner,Власник
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,"Будь ласка, введіть компанія вперше"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,"Будь ласка, виберіть компанія вперше"
 DocType: Employee Education,Under Graduate,Під Випускник
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Цільова На
 DocType: BOM,Total Cost,Загальна вартість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Розгортання
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Журнал активності:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Нерухомість
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Нерухомість
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Виписка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Фармацевтика
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
 DocType: Expense Claim Detail,Claim Amount,Сума претензії
 DocType: Employee,Mr,Містер
-DocType: Custom Script,Client,Клієнт
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Постачальник Тип / Постачальник
 DocType: Naming Series,Prefix,Префікс
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Споживаний
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Споживаний
 DocType: Upload Attendance,Import Log,Імпорт Ввійти
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Послати
 DocType: Sales Invoice Item,Delivered By Supplier,Поставляється Постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Річна заробітна плата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Річна заробітна плата
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття фінансового року
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Сток Витрати
 DocType: Newsletter,Email Sent?,Листа відправлено?
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Показати журнали Час
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
 DocType: Delivery Note,Installation Status,Стан установки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнято Відхилено + Кількість має дорівнювати кількості Надійшло у пункті {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнято Відхилено + Кількість має дорівнювати кількості Надійшло у пункті {0}
 DocType: Item,Supply Raw Materials for Purchase,Постачання сировини для покупки
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Пункт {0} повинен бути Купівля товару
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажити шаблон, заповнити відповідні дані і прикласти змінений файл. Всі дати і співробітник поєднання в обраний період прийде в шаблоні, з існуючими відвідуваності"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або кінець життя був досягнутий
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Буде оновлюватися після Рахунок продажів представлений.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Налаштування модуля HR для
 DocType: SMS Center,SMS Center,SMS-центр
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Випрямлення
 DocType: BOM Replace Tool,New BOM,Новий специфікації
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Пакетна Журнали Час для виставлення рахунків.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Лиття сифонной
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Розсилка вже відправлено
 DocType: Lead,Request Type,Тип запиту
 DocType: Leave Application,Reason,Причина
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Радіомовлення
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Виконання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Перший користувач стане System Manager (ви можете змінити це пізніше).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радіомовлення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Виконання
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Перший користувач стане System Manager (ви можете змінити це пізніше).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Детальна інформація про виконані операції.
 DocType: Serial No,Maintenance Status,Технічне обслуговування Статус
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Товари та ціни
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Товари та ціни
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},З дати повинні бути протягом фінансового року. Припускаючи З дати = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,"Виберіть Employee, для якого ви створюєте оцінка."
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},МВЗ {0} не належать компанії {1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ціни повинні бути застосовні для купівлі або продажу
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Дата установки не може бути до дати доставки по пункту {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Знижка на Прайс-лист ставка (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Початок
-DocType: User,First Name,Ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Лиття Повний цвілі
 DocType: Offer Letter,Select Terms and Conditions,Виберіть Терміни та умови
 DocType: Production Planning Tool,Sales Orders,Замовлення
 DocType: Purchase Taxes and Charges,Valuation,Оцінка
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,Банківський рахунок
 DocType: Leave Type,Allow Negative Balance,Дозволити негативний баланс
 DocType: Selling Settings,Default Territory,За замовчуванням Територія
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Телебачення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Наносить розріз
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телебачення
 DocType: Production Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Рахунок {0} не належать компанії {1}
 DocType: Naming Series,Series List for this Transaction,Список серії для даної транзакції
 DocType: Sales Invoice,Is Opening Entry,Відкриває запис
 DocType: Customer Group,Mention if non-standard receivable account applicable,Згадка якщо нестандартна заборгованість рахунок застосовно
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Для складу потрібно перед Розмістити
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Надійшло На
 DocType: Sales Partner,Reseller,Торговий посередник
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,"Будь ласка, введіть компанія"
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладна Пункт
 ,Production Orders in Progress,Виробничі замовлення у Прогрес
 DocType: Lead,Address & Contact,Адреса &amp; Контактна
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористовувані листя від попередніх асигнувань
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
 DocType: Newsletter List,Total Subscribers,Всього Передплатники
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Контактна особа
+,Contact Name,Контактна особа
 DocType: Production Plan Item,SO Pending Qty,ТАК В очікуванні Кількість
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює зарплати ковзання для згаданих вище критеріїв.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Запит на покупку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Двомісний житла
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний Залишити затверджує може представити цей Залишити заявку
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,"Звільнення Дата повинна бути більше, ніж дата вступу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Листя на рік
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Листя на рік
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Будь ласка, встановіть іменування серія для {0} через Setup&gt; Установки&gt; іменування серії"
 DocType: Time Log,Will be updated when batched.,Буде оновлюватися при пакетному.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Будь ласка, перевірте &#39;Як Предварительная &quot;проти рахунки {1}, якщо це заздалегідь запис."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Склад {0} не належить компанії {1}
-DocType: Bulk Email,Message,повідомлення
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox ключ доступу
 DocType: Payment Tool,Reference No,Посилання Немає
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Річний
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Пункт {0} досяг кінець життя на {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Фото Примирення товару
 DocType: Stock Entry,Sales Invoice No,Видаткова накладна Немає
 DocType: Material Request Item,Min Order Qty,Мінімальне замовлення Кількість
 DocType: Lead,Do Not Contact,Чи не Контакти
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Унікальний ідентифікатор для відстеження всі повторювані рахунків-фактур. Він створюється на форму.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Розробник програмного забезпечення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Розробник програмного забезпечення
 DocType: Item,Minimum Order Qty,Мінімальне замовлення Кількість
 DocType: Pricing Rule,Supplier Type,Постачальник Тип
 DocType: Item,Publish in Hub,Опублікувати в Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Матеріал Запит
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Матеріал Запит
 DocType: Bank Reconciliation,Update Clearance Date,Оновлення оформлення Дата
 DocType: Item,Purchase Details,Купівля Деталі
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} знайдений в &quot;давальницька сировина&quot; таблиці в Замовленні {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Дротяною щіткою
 DocType: Employee,Relation,Ставлення
 DocType: Shipping Rule,Worldwide Shipping,Доставка по всьому світу
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 DocType: Maintenance Schedule,Generate Schedule,Створити розклад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Вдавлення
 DocType: Purchase Invoice Item,Expense Head,Витрати Керівник
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Будь ласка, виберіть Charge першого типу"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Останній
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Макс 5 знаків
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Виберіть мову
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Макс 5 знаків
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Залишити затверджує в списку буде встановлено стандартним Залишити який стверджує
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order","Відключення створення тимчасових журналів проти виробничих замовлень. Операції, що не буде відслідковуватися відносно виробничого замовлення"
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,Варіант
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Пункт {0} повинен бути служба товару
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',"Завершений Кількість не може бути більше, ніж &quot;Кількість для виробництва&quot;"
-DocType: DocType,Administrator,Адміністратор
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Лазерне буріння
-DocType: Stock UOM Replace Utility,New Stock UOM,Новий зі UOM
 DocType: Period Closing Voucher,Closing Account Head,Закриття рахунку Керівник
 DocType: Employee,External Work History,Зовнішній роботи Історія
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Циклічна посилання Помилка
-DocType: Communication,Closed,Закрито
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"За словами (експорт) будуть видні, як тільки ви збережете накладну."
 DocType: Lead,Industry,Промисловість
 DocType: Employee,Job Profile,Профіль роботи
 DocType: Newsletter,Newsletter,Інформаційний бюлетень
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Дегідрогенізація нафтопродуктів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Освіта шийки
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичної матеріалів Запит
 DocType: Journal Entry,Multi Currency,Мульти валют
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Стан оновлюється
-DocType: Async Task,System Manager,Менеджер системи
 DocType: Payment Reconciliation Invoice,Invoice Type,Рахунок Тип
 DocType: Sales Invoice Item,Delivery Note,Накладна
-DocType: Dropbox Backup,Allow Dropbox Access,Дозволити доступ Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Налаштування Податки
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} введений двічі на п податку
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запис була змінена після витягнув його. Ласка, витягнути його знову."
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} введений двічі на п податку
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Резюме на цьому тижні і в очікуванні діяльності
 DocType: Workstation,Rent Cost,Вартість оренди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,"Ласка, виберіть місяць та рік"
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,Компанія E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Дебет Сума в валюті рахунку
 DocType: Shipping Rule,Valid for Countries,Дійсно для країнам
-DocType: Workflow State,Refresh,Оновлення
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Всі імпортні суміжних областях, як валюти, коефіцієнт конверсії, загальний обсяг імпорту, імпорт ВСЬОГО т.д. доступні в отриманні покупки, постачальник цитата рахунку-фактурі, і т.д. Замовлення"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей пункт є шаблоном і не можуть бути використані в операціях. Атрибути товару буде копіюватися в варіантах, якщо &quot;Ні Копіювати&quot; не встановлений"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Всього Замовити вважається
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Співробітник позначення (наприклад, генеральний директор, директор і т.д.)."
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Швидкість, з якою Клієнт валюта конвертується в базову валюту замовника"
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Доступний в специфікації, накладної, рахунку-фактурі, замовлення продукції, покупки замовлення, покупка отриманні, накладна, замовлення клієнта, Фото в&#39;їзду, розкладі"
 DocType: Item Tax,Tax Rate,Ставка податку
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Вибрати пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Вибрати пункт
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Стан: {0} вдалося порційно, не можуть бути узгоджені з допомогою \ зі примирення, а не використовувати зі запис"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Купівля Рахунок {0} вже представили
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетне Немає повинно бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Купівля Надходження повинні бути представлені
-DocType: Stock UOM Replace Utility,Current Stock UOM,Наявність на складі Одиниця виміру
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Пакетний (багато) з п.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Ваша електронна адреса
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,"Будь ласка, див вкладення"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,Отримане%
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Різка струменем води
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Налаштування Вже Повний !!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Налаштування Вже Повний !!
 ,Finished Goods,Готові вироби
 DocType: Delivery Note,Instructions,Інструкції
 DocType: Quality Inspection,Inspected By,Перевірено
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,"Будь ласка, не створюйте облікових записів для клієнтів і постачальників. Вони створюються безпосередньо з клієнта / постачальника майстрів."
 DocType: Currency Exchange,Currency Exchange,Обмін валюти
 DocType: Purchase Invoice Item,Item Name,Назва виробу
+DocType: Authorization Rule,Approving User  (above authorized value),Затвердження користувач (вище статутного вартості)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Залишок кредиту
 DocType: Employee,Widowed,Овдовілий
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Пункти, які просили &quot;на складі&quot; з урахуванням всіх складів на основі прогнозованих Кол і мінімальної Кіл замовлення"
@@ -378,22 +346,21 @@
 ,Purchase Register,Купівля Реєстрація
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
 DocType: Workstation,Consumable Cost,Вартість витратних
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) повинен мати роль &quot;Залишити затверджує&quot;
 DocType: Purchase Receipt,Vehicle Date,Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Медична
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Медична
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Причина втрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Труба бісером
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно курортні Список: {0}
 DocType: Employee,Single,Одиночний
 DocType: Issue,Attachment,Прихильність
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Бюджет не може бути встановлений для групи МВЗ
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
 DocType: Purchase Invoice,Yearly,Річний
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,"Будь ласка, введіть Обліковий центр"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Будь ласка, введіть Обліковий центр"
 DocType: Journal Entry Account,Sales Order,Замовлення клієнта
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,СР Продаж Оцінити
 DocType: Purchase Order,Start date of current order's period,Дату періоду поточного замовлення Почніть
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Кількість не може бути фракція в рядку {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Кількість не може бути фракція в рядку {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Кількість і швидкість
 DocType: Delivery Note,% Installed,Встановлена%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,Є Група
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Автоматично вказаний серійний пп на основі FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Перевірте Постачальник Номер рахунку Унікальність
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Термоформування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Поздовжня різка
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"&quot;Щоб Справа №&quot; не може бути менше, ніж &quot;З справі № &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Некомерційне
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Некомерційне
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Не розпочато
 DocType: Lead,Channel Partner,Канал Партнер
 DocType: Account,Old Parent,Старий Батько
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заморожені Upto
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Майстер відпочинку.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell лиття
 DocType: Material Request Item,Required Date,Потрібно Дата
 DocType: Delivery Note,Billing Address,Платіжний адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,"Будь ласка, введіть код предмета."
 DocType: BOM,Costing,Калькуляція
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Якщо встановлено, то сума податку буде вважатися вже включені у пресі / швидкість друку Сума"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Всього Кількість
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,Для Діапазон
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Цінні папери та депозити
 DocType: Features Setup,Imports,Імпорт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Склеювання
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Job Opening,Description of a Job Opening,Опис роботу Відкриття
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,В очікуванні діяльність на сьогоднішній день
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Відвідуваність запис.
 DocType: Bank Reconciliation,Journal Entries,Журнал Записів
 DocType: Sales Order Item,Used for Production Plan,Використовується для виробничого плану
-DocType: System Settings,Loading...,Завантаження ...
-DocType: DocField,Password,Пароль
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Плавлений осадження Моделювання
 DocType: Manufacturing Settings,Time Between Operations (in mins),Час між операціями (в хв)
 DocType: Customer,Buyer of Goods and Services.,Покупець товарів і послуг.
 DocType: Journal Entry,Accounts Payable,Рахунки кредиторів
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Додати Передплатники
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",&quot;Існує не
 DocType: Pricing Rule,Valid Upto,Дійсно Upto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Пряма прибуток
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Не можете фільтрувати на основі рахунку, якщо рахунок згруповані по"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Адміністративний співробітник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Адміністративний співробітник
 DocType: Payment Tool,Received Or Paid,Отримані або сплачені
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Stock Entry,Difference Account,Рахунок різниці
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для яких Матеріал Запит буде піднято"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Косметика
-DocType: DocField,Type,Тип
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
-DocType: Communication,Subject,Предмет
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 ,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,Пункт
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Управління субпідряду
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Новий Одиниця виміру не повинна бути типу ціле число
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Управління субпідряду
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Меблі й пристосування
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Швидкість, з якою Прайс-лист валюта конвертується в базову валюту компанії"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,Вимога Матеріал
 DocType: Company,Delete Company Transactions,Видалити скоєнні Товариством угод
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Пункт {0} Купівля товару
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",{0} є неприпустимим адресу електронної пошти в &quot;Повідомлення \ адресу електронної пошти&quot;
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Всього рахунків у цьому році:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Всього рахунків у цьому році:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки і збори
 DocType: Purchase Invoice,Supplier Invoice No,Постачальник Рахунок Немає
 DocType: Territory,For reference,Для довідки
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Не вдається видалити Серійний номер {0}, так як він використовується в угодах з акціями"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Закриття (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Закриття (Cr)
 DocType: Serial No,Warranty Period (Days),Гарантійний термін (днів)
 DocType: Installation Note Item,Installation Note Item,Установка Примітка Пункт
 ,Pending Qty,В очікуванні Кількість
 DocType: Job Applicant,Thread HTML,Автор HTML-
 DocType: Company,Ignore,Ігнорувати
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS відправлено наступних номерів: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Постачальник Склад обов&#39;язковим для суб-контракту купівлі отриманні
 DocType: Pricing Rule,Valid From,Діє з
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Партнер по продажах
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Щомісячна поширення ** допомагає розподілити свій бюджет по місяців, якщо у вас є сезонність у вашому бізнесі. Щоб розподілити бюджет за допомогою цього розподілу, встановіть цей ** ** щомісячний розподіл в ** ** МВЗ"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Записи не знайдені в таблиці рахунків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Будь ласка, виберіть компаній і партії першого типу"
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, послідовний пп не можуть бути об&#39;єднані"
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Ведучий Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
-DocType: About Us Settings,Website Manager,Сайт менеджер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,"Фінансовий рік Дата початку не повинна бути більше, ніж фінансовий рік Дата закінчення"
 DocType: Warranty Claim,Resolution,Дозвіл
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Поставляється: {0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,Біллінг і доставка Статус
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Попередній
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Продажі Повернутися
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,"Виберіть замовлень клієнта, з якого ви хочете створити виробничі замовлення."
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Drop кораблів)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Зарплата компоненти.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,База даних потенційних клієнтів.
+DocType: Authorization Rule,Customer or Item,Клієнт або товару
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Бази даних клієнтів.
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Відкриття (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Позначена сума не може бути негативним
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Акробатика
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що ви вже зробили деякі угоди (угод) з іншим UOM. Вам потрібно буде створити новий пункт для використання іншого замовчуванням одиниця виміру."
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Позначена сума не може бути негативним
 DocType: Purchase Order Item,Billed Amt,Оголошений Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логічний склад, на якому акції записів зроблені."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Посилання № &amp; Посилання Дата потрібно для {0}
-DocType: Event,Wednesday,Середа
 DocType: Sales Invoice,Customer's Vendor,Виробник Клієнтам
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Виробничий замовлення є обов&#39;язковим
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Пропозиція Написання
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Пропозиція Написання
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Інша людина Продажі {0} існує з тим же ідентифікатором Співробітника
 DocType: Fiscal Year Company,Fiscal Year Company,Фінансовий рік компанії
 DocType: Packing Slip Item,DN Detail,DN Деталь
@@ -556,20 +513,16 @@
 DocType: Activity Type,Default Costing Rate,За замовчуванням Калькуляція Оцінити
 DocType: Maintenance Schedule,Maintenance Schedule,Графік регламентних робіт
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тоді ціноутворення Правила фільтруються на основі Замовника, Група покупців, краю, постачальник, Тип постачальник, кампанії, і т.д. Sales Partner"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,"Будь ласка, встановіть модуль пітона Dropbox"
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Менеджер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Від покупки отриманні
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Менеджер
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Від покупки отриманні
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
 DocType: SMS Settings,Receiver Parameter,Приймач Параметр
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Ґрунтуючись на &#39;і&#39; Group By&quot; не може бути таким же
 DocType: Sales Person,Sales Person Targets,Продавець Цілі
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,Для
-apps/frappe/frappe/templates/base.html +145,Please enter email address,"Будь ласка, введіть адресу електронної пошти"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Кінець трубки формування
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 DocType: Selling Settings,Customer Naming By,Неймінг клієнтів по
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Перетворити в групі
 DocType: Activity Cost,Activity Type,Тип діяльності
@@ -577,25 +530,20 @@
 DocType: Customer,Fixed Days,Основні Дні
 DocType: Sales Invoice,Packing List,Список Упаковка
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,"Замовлення, видані постачальникам."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Видавнича
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Видавнича
 DocType: Activity Cost,Projects User,Проекти Користувач
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Споживана
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} не найден в рахунку-фактурі таблиці
 DocType: Company,Round Off Cost Center,Округлення Вартість центр
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Обслуговування Відвідати {0} має бути скасований до скасування цього замовлення клієнта
 DocType: Material Request,Material Transfer,Матеріал Передача
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Відкриття (д-р)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Проводка повинна бути відмітка після {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Налаштування
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Вартість приземлився Податки і збори
 DocType: Production Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Більш
 DocType: Pricing Rule,Sales Manager,Менеджер з продажу
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Перейменувати
 DocType: Journal Entry,Write Off Amount,Списання Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Вигин
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Дозволити користувачеві
 DocType: Journal Entry,Bill No,Білл Немає
 DocType: Purchase Invoice,Quarterly,Щоквартальний
 DocType: Selling Settings,Delivery Note Required,Доставка Примітка Потрібно
@@ -604,17 +552,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Purchase Receipt,Other Details,Інші подробиці
 DocType: Account,Accounts,Рахунки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Прямо ножиці
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Маркетинг
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Щоб відстежувати пункт продажів і покупки документів на основі їх заводським номером. Це також може використовуватися для відстеження гарантійні деталі продукту.
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов&#39;язковим проти відкинуті пункту
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Відхилено Склад є обов&#39;язковим проти відкинуті пункту
 DocType: Account,Expenses Included In Valuation,"Витрат, що включаються в оцінці"
 DocType: Employee,Provide email id registered in company,Забезпечити електронний ідентифікатор зареєстрованого в компанії
 DocType: Hub Settings,Seller City,Продавець Місто
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Пункт має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Пункт має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Вартість акцій
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Дерево Тип
@@ -623,14 +570,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
 DocType: Sales Invoice,Commission Rate (%),Комісія ставка (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","На ваучері Тип повинен бути одним із замовлення клієнта, накладна або журнал запис"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Неможливо знайти обмінний курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Авіаційно-космічний
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Ласкаво просимо
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Авіаційно-космічний
 DocType: Journal Entry,Credit Card Entry,Вступ Кредитна карта
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Тема Завдання
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,"Товари, отримані від постачальників."
-DocType: Communication,Open,Відкритим
 DocType: Lead,Campaign Name,Назва кампанії
 ,Reserved,Зарезервований
 DocType: Purchase Order,Supply Raw Materials,Постачання сировини
@@ -639,29 +582,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} не є акціонерним товару
 DocType: Mode of Payment Account,Default Account,За замовчуванням обліковий запис
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,"Ведучий повинен бути встановлений, якщо Можливість зроблений зі свинцю"
-DocType: Contact Us Settings,Address Title,Адреса Назва
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,"Будь ласка, виберіть вихідний день на тиждень"
 DocType: Production Order Operation,Planned End Time,Плановані Час закінчення
 ,Sales Person Target Variance Item Group-Wise,Людина обсяг продажів Різниця Пункт Група Мудрий
-DocType: Dropbox Backup,Daily,Щодня
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Рахунок з існуючою транзакції не можуть бути перетворені в бухгалтерській книзі
 DocType: Delivery Note,Customer's Purchase Order No,Клієнтам Замовлення Немає
 DocType: Employee,Cell Number,Кількість стільникових
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,"Запити Авто матеріал, отриманий"
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Втрачений
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести поточний ваучер в «Проти Запис у журналі &#39;колонці
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Енергія
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Можливість Від
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Щомісячна виписка зарплата.
 DocType: Item Group,Website Specifications,Сайт характеристики
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Новий акаунт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: З {0} типу {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Бухгалтерські записи можна з листовими вузлами. Записи проти груп не допускається.
-DocType: ToDo,High,Високий
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати специфікації, як вона пов&#39;язана з іншими специфікаціями"
 DocType: Opportunity,Maintenance,Технічне обслуговування
-DocType: User,Male,Чоловік
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Купівля Надходження номер потрібно для пункту {0}
 DocType: Item Attribute Value,Item Attribute Value,Стан Значення атрибуту
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Кампанії з продажу.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -690,10 +630,9 @@
 DocType: Address,Personal,Особистий
 DocType: Expense Claim Detail,Expense Claim Type,Витрати Заявити Тип
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Налаштування за замовчуванням для кошик
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запис у щоденнику {0} пов&#39;язана з наказом {1}, перевірити, якщо він повинен бути підтягнутий, як просунутися в цьому рахунку-фактурі."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Біотехнологія
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Запис у щоденнику {0} пов&#39;язана з наказом {1}, перевірити, якщо він повинен бути підтягнутий, як просунутися в цьому рахунку-фактурі."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Біотехнологія
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Витрати офісу обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Хеммінг
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Account,Liability,Відповідальність
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
@@ -701,14 +640,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Ціни не обраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Process Payroll,Send Email,Відправити лист
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Увага: Невірний Додаток {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Немає доступу
 DocType: Company,Default Bank Account,За замовчуванням Банківський рахунок
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Оновлення зі &#39;не може бути перевірено, тому що речі не поставляється через {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Пп
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Пп
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банк примирення Подробиці
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Мої Рахунки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Мої Рахунки
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Жоден працівник не знайдено
 DocType: Purchase Order,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо по субпідряду постачальника
@@ -727,35 +667,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Щоб включити &quot;Точки продажу&quot; Особливості
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
-DocType: Comment,Reference Name,Ім&#39;я посилання
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} проти Білла {1} від {2}
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: Sales Invoice Item,Target Warehouse,Цільова Склад
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити доставку по квитанції або Шифрування до цього відсотка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,"Очікувана дата поставки не може бути, перш ніж Sales Order Дата"
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
 DocType: Production Order,Item To Manufacture,Елемент Виробництво
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Постійна ливарна форма
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} статус {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Замовлення на Оплата
 DocType: Sales Order Item,Projected Qty,Прогнозований Кількість
 DocType: Sales Invoice,Payment Due Date,Дата платежу
 DocType: Newsletter,Newsletter Manager,Розсилка менеджер
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Пункт Варіант {0} вже існує ж атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Відкриття&quot;
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
 DocType: Expense Claim,Expenses,Витрати
 DocType: Item Variant Attribute,Item Variant Attribute,Варіант Пункт Атрибут
 ,Purchase Receipt Trends,Купівля розписок Тенденції
 DocType: Appraisal,Select template from which you want to get the Goals,"Виберіть шаблон, з якого ви хочете отримати тисячоліття"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Дослідження і розвиток
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Дослідження і розвиток
 ,Amount to Bill,Сума Білла
 DocType: Company,Registration Details,Реєстраційні дані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Розбивка
 DocType: Item,Re-Order Qty,Re-Order Кіл
 DocType: Leave Block List Date,Leave Block List Date,Залишити Чорний список Реєстрація
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Планується відправити {0}
@@ -766,18 +703,16 @@
 DocType: Sales Invoice Item,Stock Details,Фото Деталі
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Вартість проекту
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Касовий термінал
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Не можете переносити {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
 DocType: Account,Balance must be,Баланс повинен бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
 DocType: Notification Control,Expense Claim Rejected Message,Витрати Заявити Відхилено повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Чудовий
 ,Available Qty,Доступно Кількість
 DocType: Purchase Taxes and Charges,On Previous Row Total,На попередньому рядку Total
 DocType: Salary Slip,Working Days,Робочі дні
 DocType: Serial No,Incoming Rate,Вхідний Оцінити
 DocType: Packing Slip,Gross Weight,Вага брутто
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Включити відпустку в Total No. робочих днів
 DocType: Job Applicant,Hold,Тримати
 DocType: Employee,Date of Joining,Дата вступу
@@ -787,30 +722,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Подивитися Передплатники
 DocType: Purchase Invoice Item,Purchase Receipt,Купівля Надходження
 ,Received Items To Be Billed,"Надійшли пунктів, які будуть Оголошений"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Абразивний вибухових
 DocType: Employee,Ms,Міссісіпі
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Валютний курс майстер.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,Специфікація {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,Специфікація {0} повинен бути активним
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
 DocType: Salary Slip,Leave Encashment Amount,Залишити інкасації Кількість
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Серійний номер {0} не належить до пункту {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Обов&#39;язково Кількість
 DocType: Bank Reconciliation,Total Amount,Загальна кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Інтернет видання
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Інтернет видання
 DocType: Production Planning Tool,Production Orders,Виробничі замовлення
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Валюта балансу
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Продажі Прайс-лист
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Опублікувати синхронізувати елементи
-DocType: GL Entry,Account Currency,Валюта рахунку
+DocType: Bank Reconciliation,Account Currency,Валюта рахунку
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,"Будь ласка, вкажіть округлити рахунок в Компанії"
 DocType: Purchase Receipt,Range,Діапазон
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Співробітник {0} не є активним або не існує
 DocType: Features Setup,Item Barcode,Пункт Штрих
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Пункт Варіанти {0} оновлюються
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Рахунок покупки Advance
 DocType: Address,Shop,Магазин
@@ -819,7 +753,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Обліковий запис за замовчуванням банк / Ксерокопіювання буде автоматично оновлюватися в POS фактурі коли обрано цей режим.
 DocType: Employee,Permanent Address Is,Постійна адреса Є
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Операція виконана для багатьох, як готової продукції?"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Бренд
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Посібник для пере- {0} схрещеними Пункт {1}.
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
 DocType: Item,Is Purchase Item,Хіба Купівля товару
@@ -838,60 +772,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Замовлення на пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Непряме прибуток
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Встановіть Сума платежу = сума Видатний
-DocType: Contact Us Settings,Address Line 1,Адресний рядок 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Дисперсія
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Назва компанії
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Дисперсія
+,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Всього повідомлень (їй)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Вибрати пункт трансферу
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Вибір рахунка керівник банку, в якому перевірка була зберігання."
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Дозволити користувачеві редагувати прайс-лист в угодах Оцінити
 DocType: Pricing Rule,Max Qty,Макс Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплата проти продажів / Замовлення повинні бути завжди заздалегідь відзначений як
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Хімічна
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хімічна
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 DocType: Process Payroll,Select Payroll Year and Month,Виберіть Payroll рік і місяць
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Перейти до відповідної групи (зазвичай використання коштів&gt; Поточні активи&gt; Банківські рахунки і створити новий акаунт (натиснувши на Додати Дитину) типу &quot;банк&quot;
 DocType: Workstation,Electricity Cost,Вартість електроенергії
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
-DocType: Comment,Unsubscribed,Підписка скасована
 DocType: Opportunity,Walk In,Заходити
 DocType: Item,Inspection Criteria,Інспекційні Критерії
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Дерево finanial МВЗ.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Всі передані
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Білий
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Завантажити лист голову і логотип. (ви можете редагувати їх пізніше).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Білий
 DocType: SMS Center,All Lead (Open),Всі Свинець (відкрито)
 DocType: Purchase Invoice,Get Advances Paid,"Отримати Аванси, видані"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Прикріпіть свою фотографію
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Зробити
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Прикріпіть свою фотографію
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Зробити
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
-DocType: Workflow State,Stop,Стоп
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв&#39;яжіться з support@erpnext.com якщо проблема не усунена."
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Мій кошик
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
 DocType: Lead,Next Contact Date,Наступна Контактні Дата
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Відкриття Кількість
 DocType: Holiday List,Holiday List Name,Ім&#39;я відпочинку Список
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Опціони
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Опціони
 DocType: Journal Entry Account,Expense Claim,Витрати Заявити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Кількість для {0}
 DocType: Leave Application,Leave Application,Залишити заявку
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Залишити Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Залишити Чорний список дат
 DocType: Company,If Monthly Budget Exceeded (for expense account),Якщо Щомісячний бюджет перевищено (за рахунок витрат)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Обрізки
 DocType: Workstation,Net Hour Rate,Чистий годину Оцінити
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Приземлився Вартість Купівля Надходження
 DocType: Company,Default Terms,Умови замовчуванням
 DocType: Packing Slip Item,Packing Slip Item,Упаковка товару ковзання
 DocType: POS Profile,Cash/Bank Account,Готівковий / Банківський рахунок
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати замовлень клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} не може бути негативним
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Подача
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Знижка
 DocType: Features Setup,Purchase Discounts,Купівля Знижки
 DocType: Workstation,Wages,Заробітна плата
@@ -908,7 +837,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви рахунок затверджує для цього запису. Оновіть &#39;Стан&#39; і збережіть
 DocType: Serial No,Creation Document No,Створення документа Немає
 DocType: Issue,Issue,Проблема
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для товара Variant. наприклад, розмір, колір і т.д."
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Рахунок не відповідає з Компанією
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для товара Variant. наприклад, розмір, колір і т.д."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,НЗП Склад
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} за контрактом Шифрування до обслуговування {1}
 DocType: BOM Operation,Operation,Операція
@@ -916,13 +846,13 @@
 DocType: Tax Rule,Shipping State,Державний Доставка
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Товар повинен бути додані за допомогою &quot;Отримати товари від покупки розписок&quot; кнопки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Продажі Витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Стандартний Купівля
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Стандартний Купівля
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,За замовчуванням Продаж МВЗ
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Продажі Замовити {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Створення зображення в щоденнику
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Створення зображення в щоденнику
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
 DocType: Item,Default Supplier,За замовчуванням Постачальник
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на виробництво Відсоток
@@ -937,29 +867,27 @@
 DocType: Time Log Batch,updated via Time Logs,оновлюється через журнали Time
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Середній вік
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш менеджер з продажу, який зв&#39;яжеться з вами в майбутньому"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
 DocType: Company,Default Currency,Базова валюта
 DocType: Contact,Enter designation of this Contact,Введіть позначення цього контакту
-DocType: Contact Us Settings,Address,Адреса
 DocType: Expense Claim,From Employee,Від працівника
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так суми за Пункт {0} {1} дорівнює нулю
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так суми за Пункт {0} {1} дорівнює нулю
 DocType: Journal Entry,Make Difference Entry,Зробити запис Difference
 DocType: Upload Attendance,Attendance From Date,Відвідуваність З дати
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площа Продуктивність
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Транспорт
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,і рік:
 DocType: Email Digest,Annual Expense,Річні витрати
 DocType: SMS Center,Total Characters,Всього Персонажі
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть специфікації в специфікації поля для Пункт {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,С-форма рахунки-фактури Подробиці
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Оплата рахунку-фактури Примирення
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Внесок%
 DocType: Item,website page link,сайт посилання на сторінку
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Давайте підготувати систему для першого використання.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Кошик Правило Доставка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Виробничий замовлення {0} має бути скасований до скасування цього замовлення клієнта
 ,Ordered Items To Be Billed,Замовлені товари To Be Оголошений
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Виберіть час і журнали Розмістити створити нову рахунок-фактуру.
@@ -979,14 +907,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Видаткова накладна Попередня
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Нічого не просити
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"&quot;Фактичний початок Дата&quot; не може бути більше, ніж «Фактичне Дата закінчення &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Управління
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Управління
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Види діяльності для табелів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Лиття по виплавлюваних моделях
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Або дебетова або кредитна сума необхідна для {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до Кодексу пункту варіанта. Наприклад, якщо ваш абревіатура «SM», і код пункт &quot;Футболки&quot;, пункт код варіанта буде &quot;Футболки-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистий Платне (на словах) будуть видні, як тільки ви збережете зарплата ковзання."
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Активний
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Синій
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Синій
 DocType: Purchase Invoice,Is Return,Є Повернутися
 DocType: Price List Country,Price List Country,Ціни Країна
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Подальші вузли можуть бути створені тільки під вузлами типу &quot;група&quot;
@@ -996,50 +922,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS-профілю {0} вже створена для користувача: {1} і компанія {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коефіцієнт перетворення Одиниця виміру
 DocType: Stock Settings,Default Item Group,За замовчуванням Об&#39;єкт Група
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Виробництво багатошарового об&#39;єкта
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Постачальник баз даних.
 DocType: Account,Balance Sheet,Бухгалтерський баланс
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Стретч формування
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш менеджер з продажу отримаєте нагадування в цей день, щоб зв&#39;язатися з клієнтом"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Податкові та інші відрахування заробітної плати.
 DocType: Lead,Lead,Вести
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Account,Warehouse,Склад
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилено Кількість не може бути введений в придбанні Повернутися
 ,Purchase Order Items To Be Billed,"Купівля Замовити пунктів, які будуть Оголошений"
 DocType: Purchase Invoice Item,Net Rate,Нетто-ставка
 DocType: Purchase Invoice Item,Purchase Invoice Item,Рахунок покупки пункт
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ledger Записи та GL Записи повторно відправив для обраних Купівля розписок
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
 DocType: Holiday,Holiday,Свято
-DocType: Event,Saturday,Субота
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Залиште порожнім, якщо розглядати для всіх галузей"
 ,Daily Time Log Summary,Щоденний Резюме Час Ввійти
-DocType: DocField,Label,Етикетка
 DocType: Payment Reconciliation,Unreconciled Payment Details,Неузгоджені Деталі оплати
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Global Defaults,Disable Rounded Total,Відключити Rounded Всього
 DocType: Lead,Call,Виклик
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Пробний баланс
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Налаштування Співробітники
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,Сітка &quot;
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Дослідження
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Дослідження
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Contact,User ID,ідентифікатор користувача
-DocType: Communication,Sent,Надісланий
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Подивитися Леджер
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
-DocType: Communication,Delivery Status,Статус поставки
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Група існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я пункту або перейменувати групу товарів"
 DocType: Production Order,Manufacture against Sales Order,Виробництво проти замовлення клієнта
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Решта світу
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Деталь {0} не може мати Batch
 ,Budget Variance Report,Бюджет Різниця Повідомити
 DocType: Salary Slip,Gross Pay,Повна Платне
@@ -1050,13 +969,11 @@
 DocType: BOM Item,Item Description,Опис товару
 DocType: Payment Tool,Payment Mode,Режим компенсації
 DocType: Purchase Invoice,Is Recurring,Повторюється
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Пряма металева лазерне спікання
 DocType: Purchase Order,Supplied Items,"Товари, що поставляються"
 DocType: Production Order,Qty To Manufacture,Кількість для виробництва
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Підтримувати ж швидкість протягом циклу покупки
 DocType: Opportunity Item,Opportunity Item,Можливість Пункт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Тимчасове відкриття
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Співробітник Залишити Баланс
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Ваги для рахунку {0} повинен бути завжди {1}
 DocType: Address,Address Type,Адреса Тип
@@ -1072,35 +989,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачених рахунків
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Продажі Замовити {0} не є допустимим
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Невеликий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Невеликий
 DocType: Employee,Employee Number,Кількість працівників
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Справа Ні (и) вже використовується. Спробуйте зі справи № {0}
 ,Invoiced Amount (Exculsive Tax),Сума за рахунками (Exculsive вартість)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Пункт 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Рахунок глава {0} створена
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Зелений
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Зелений
 DocType: Item,Auto re-order,Авто повторного замовлення
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Всього Виконано
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Всього Виконано
 DocType: Employee,Place of Issue,Місце видачі
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Контракт
-DocType: Report,Disabled,Інвалід
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Контракт
+DocType: Email Digest,Add Quote,Додати Цитата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Сільське господарство
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Ваші продукти або послуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
 DocType: Warehouse,Warehouse Contact Info,Склад Контактна інформація
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,Ім&#39;я потрібно
 DocType: Purchase Invoice,Recurring Type,Періодична Тип
 DocType: Address,City/Town,Місто / Місто
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Податкова ставка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Доставка Примітка {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Пункт {0} повинен бути субпідрядником товару
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Капітальні обладнання
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ціни Правило спочатку вибирається на основі &quot;Застосувати На&quot; поле, яке може бути Пункт, Пункт Група або Марка."
@@ -1110,14 +1026,13 @@
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,"Очікувана дата поставки менше, ніж Запланована дата початку."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Для Постачальника
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта допомагає у виборі цього рахунок в угодах.
 DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (Компанія валют)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Всього Вихідні
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Там може бути тільки один доставка Умови Правило з 0 або пусте значення для &quot;до значення&quot;
 DocType: Authorization Rule,Transaction,Угода
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Примітка: Ця Центр Вартість є група. Не можете зробити бухгалтерські проводки відносно груп.
-apps/frappe/frappe/config/desk.py +7,Tools,Інструментів
 DocType: Item,Website Item Groups,Сайт Групи товарів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Номер замовлення Продукція є обов&#39;язковим для виробництва фондового входу призначення
 DocType: Purchase Invoice,Total (Company Currency),Всього (Компанія валют)
@@ -1125,24 +1040,22 @@
 DocType: Journal Entry,Journal Entry,Запис в журналі
 DocType: Workstation,Workstation Name,Ім&#39;я робочої станції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},Специфікація {0} не належить до пункту {1}
 DocType: Sales Partner,Target Distribution,Цільова поширення
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Коментарі
 DocType: Salary Slip,Bank Account No.,Банк № рахунку
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Оцінка Оцініть потрібно для пункту {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Оцінка Оцініть потрібно для пункту {0}
 DocType: Quality Inspection Reading,Reading 8,Читання 8
 DocType: Sales Partner,Agent,Агент
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може, ви повинні змінити &quot;Розподілити плату на основі&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Податки і збори Розрахунок
 DocType: BOM Operation,Workstation,Робоча станція
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Апаратний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Апаратний
 DocType: Attendance,HR Manager,менеджер з персоналу
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Будь ласка, виберіть компанію"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Привілейований Залишити
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Постачальник Рахунок Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Вам необхідно включити Кошик
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Немає даних
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оцінка шаблону Мета
 DocType: Salary Slip,Earning,Заробіток
 DocType: Payment Tool,Party Account Currency,Партія Валюта рахунку
@@ -1152,26 +1065,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Перекриття умови знайдені між:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Проти журналі запис {0} вже налаштований щодо деяких інших ваучер
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Загальна вартість замовлення
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Їжа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Їжа
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старіння Діапазон 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Ви можете зробити журнал часу тільки проти представленого виробничого замовлення
 DocType: Maintenance Schedule Item,No of Visits,Немає відвідувань
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Розсилка контактам, веде."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Це {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,"Операції, що не може бути порожнім."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,"Операції, що не може бути порожнім."
 ,Delivered Items To Be Billed,"Поставляється пунктів, які будуть Оголошений"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
-DocType: DocField,Description,Опис
 DocType: Authorization Rule,Average Discount,Середня Знижка
-DocType: Letter Head,Is Default,За замовчуванням
 DocType: Address,Utilities,Комунальні послуги
 DocType: Purchase Invoice Item,Accounting,Облік
 DocType: Features Setup,Features Setup,Особливості установки
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Подивитися пропозицію Лист
-DocType: Communication,Communication,Зв&#39;язки
 DocType: Item,Is Service Item,Є служба товару
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути період розподілу межами відпустку
 DocType: Activity Cost,Projects,Проектів
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,"Будь ласка, виберіть фінансовий рік"
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},З {0} | {1} {2}
@@ -1190,7 +1100,7 @@
 DocType: Item,Maintain Stock,Підтримання складі
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Сток Записи вже створені для виробничого замовлення
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Залиште порожнім, якщо вважати всіх позначень"
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,З DateTime
 DocType: Email Digest,For Company,За компанію
@@ -1200,7 +1110,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Умови Вміст
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Пункт {0} не є акціонерним товару
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Залежить у відпустці без
@@ -1214,30 +1124,27 @@
 DocType: HR Settings,Employee Settings,Налаштування співробітників
 ,Batch-Wise Balance History,Пакетна Мудрий Баланс Історія
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Список справ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Учень
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Негативний Кількість не допускається
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Учень
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Негативний Кількість не допускається
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Податковий деталь стіл вуха від майстра пункт у вигляді рядка і зберігаються в цій галузі. Використовується з податків і зборів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Розтин
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Співробітник не може повідомити собі.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Якщо обліковий запис заморожується, записи дозволяється заборонених користувачів."
 DocType: Email Digest,Bank Balance,Банківський баланс
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Відсутність активного Зарплата Структура знайдено співробітника {0} і місяць
 DocType: Job Opening,"Job profile, qualifications required etc.","Профіль роботи, потрібна кваліфікація і т.д."
 DocType: Journal Entry Account,Account Balance,Баланс
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Податковий Правило для угод.
 DocType: Rename Tool,Type of document to rename.,Тип документа перейменувати.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Ми купуємо цей пункт
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Ми купуємо цей пункт
 DocType: Address,Billing,Біллінг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Загинання
-DocType: Bulk Email,Not Sent,Чи не Відправлено
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Вибухова формування
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Всього Податки і збори (Компанія) Валюта
 DocType: Shipping Rule,Shipping Account,Доставка рахунки
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Планується відправити {0} одержувачів
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub Асамблей
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Sub Асамблей
 DocType: Shipping Rule Condition,To Value,Оцінювати
 DocType: Supplier,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Джерело склад є обов&#39;язковим для ряду {0}
@@ -1247,105 +1154,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Немає адреса ще не додавали.
 DocType: Workstation Working Hour,Workstation Working Hour,Робоча станція Робоча годину
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Аналітик
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Рядок {0}: виділеної суми {1} повинен бути менше або дорівнює кількості СП {2}
 DocType: Item,Inventory,Інвентаризація
 DocType: Features Setup,"To enable ""Point of Sale"" view",Щоб включити &quot;Точка зору&quot; Продаж
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Оплата не може бути зроблено для порожньої кошик
 DocType: Item,Sales Details,Продажі Детальніше
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Закріплення
 DocType: Opportunity,With Items,З пунктами
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,У К
 DocType: Notification Control,Expense Claim Rejected,Витрати Заявити Відхилено
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Дата, на яку буде генеруватися наступний рахунок-фактура. Він створюється на форму."
 DocType: Item Attribute,Item Attribute,Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Уряд
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Предмет Варіанти
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Уряд
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Предмет Варіанти
 DocType: Company,Services,Послуги
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Всього ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Всього ({0})
 DocType: Cost Center,Parent Cost Center,Батько Центр Вартість
 DocType: Sales Invoice,Source,Джерело
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Записи не знайдені в таблиці Оплата
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Фінансовий рік Дата початку
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Записи не знайдені в таблиці Оплата
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Фінансовий рік Дата початку
 DocType: Employee External Work History,Total Experience,Загальний досвід
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Зенкування
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Вантажні та експедиторські Збори
 DocType: Material Request Item,Sales Order No,Продажі Замовити Немає
 DocType: Item Group,Item Group Name,Назва товару Група
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Взятий
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Передача матеріалів для виробництва
 DocType: Pricing Rule,For Price List,Для Прайс-лист
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Executive Search
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Курс покупки по пункту: {0} не знайдений, який необхідний для ведення бухгалтерського обліку запис (рахунок). Будь ласка, вкажіть ціна товару проти цінової покупка списку."
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Специфікація Деталь Немає
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Додаткова знижка Сума (валюта компанії)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Помилка: {0}&gt; {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Помилка: {0}&gt; {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Будь ласка, створіть новий обліковий запис з Планом рахунків бухгалтерського обліку."
 DocType: Maintenance Visit,Maintenance Visit,Обслуговування відвідування
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Замовник&gt; Група клієнтів&gt; Територія
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступні Пакетна Кількість на складі
 DocType: Time Log Batch Detail,Time Log Batch Detail,Час входу Пакетне Подробиці
-DocType: Workflow State,Tasks,Завдання
 DocType: Landed Cost Voucher,Landed Cost Help,Приземлився Вартість Допомога
-DocType: Event,Tuesday,Вівторок
 DocType: Leave Block List,Block Holidays on important days.,Блок Відпочинок на важливих днів.
 ,Accounts Receivable Summary,Дебіторська заборгованість Основна
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},"Листя для типу {0}, вже виділених на працівника {1} для періоду {2} - {3}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
 DocType: UOM,UOM Name,Ім&#39;я Одиниця виміру
-DocType: Top Bar Item,Target,Мета
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Внесок Сума
 DocType: Sales Invoice,Shipping Address,Адреса доставки
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Цей інструмент допоможе вам оновити або виправити кількість і оцінка запасів у системі. Це, як правило, використовується для синхронізації системних значень і що насправді існує у ваших складах."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"За словами будуть видні, як тільки ви збережете накладну."
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Марка майстер.
-DocType: ToDo,Due Date,Термін оплати
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Марка майстер.
 DocType: Sales Invoice Item,Brand Name,Бренд
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Коробка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Організація
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Коробка
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Організація
 DocType: Monthly Distribution,Monthly Distribution,Щомісячний поширення
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приймач Список порожній. Будь ласка, створіть список приймач"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Виробничий план з продажу Замовити
 DocType: Sales Partner,Sales Partner Target,Sales Partner Цільова
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Облік Вхід для {0} можуть бути зроблені тільки у валюті: {1}
 DocType: Pricing Rule,Pricing Rule,Ціни Правило
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Насічка
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Матеріал Запит Замовлення на
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Ряд # {0}: повернутий деталь {1} не існує в {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Банківські рахунки
 ,Bank Reconciliation Statement,Банк примирення собі
 DocType: Address,Lead Name,Ведучий Ім&#39;я
 ,POS,POS-
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Відкриття акції Залишок
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Відкриття акції Залишок
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} повинен з&#39;явитися тільки один раз
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Чи не дозволяється Tranfer більш {0}, ніж {1} проти Замовлення {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Листя номером Успішно для {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Немає нічого, щоб упакувати"
 DocType: Shipping Rule Condition,From Value,Від вартості
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Суми не відбивається у банку
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Суми не відбивається у банку
 DocType: Quality Inspection Reading,Reading 4,Читання 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Претензії рахунок компанії.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Відцентрове лиття
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Магнітне поле за сприяння обробка
 DocType: Company,Default Holiday List,За замовчуванням Список свят
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Сток зобов&#39;язання
 DocType: Purchase Receipt,Supplier Warehouse,Постачальник Склад
 DocType: Opportunity,Contact Mobile No,Зв&#39;язатися з мобільних Немає
 DocType: Production Planning Tool,Select Sales Orders,Виберіть замовлень клієнта
 ,Material Requests for which Supplier Quotations are not created,"Матеріал запити, для яких Постачальник Котирування не створюються"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку свята. Вам не потрібно звернутися за дозволом."
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,"Щоб відстежувати предмети, використовуючи штрих-код. Ви зможете ввести деталі в накладній та рахунки-фактури з продажу сканування штрих-кодів пункту."
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Відзначити як при поставці
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Відзначити як при поставці
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Зробіть цитати
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},"Залишити типу {0} не може бути більше, ніж {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте плануванні операцій для X днів.
 DocType: HR Settings,Stop Birthday Reminders,Стоп народження Нагадування
 DocType: SMS Center,Receiver List,Приймач Список
@@ -1353,31 +1251,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,Перегляд {0}
 DocType: Salary Structure Deduction,Salary Structure Deduction,Зарплата Структура Відрахування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Селективний лазерного спікання
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Імпорт успішно!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Вік (днів)
 DocType: Quotation Item,Quotation Item,Цитата товару
 DocType: Account,Account Name,Ім&#39;я рахунку
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,"Від Дата не може бути більше, ніж до дати"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серійний номер {0} кількість {1} не може бути частка
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Постачальник Тип майстром.
 DocType: Purchase Order Item,Supplier Part Number,Постачальник Номер деталі
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Додавати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Коефіцієнт конверсії не може бути 0 або 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} ануляції або зупинився
 DocType: Accounts Settings,Credit Controller,Кредитна контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Купівля Отримання {0} не представлено
 DocType: Company,Default Payable Account,За замовчуванням оплачується аккаунт
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Налаштування для онлайн Корзину, такі як правилами перевезень, прайс-лист і т.д."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Завершення установки
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Оголошений
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Кількість захищені
 DocType: Party Account,Party Account,Рахунок партії
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Людські ресурси
 DocType: Lead,Upper Income,Верхня прибуток
 DocType: Journal Entry Account,Debit in Company Currency,Дебет у валюті компанії
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Мої запитання
@@ -1386,12 +1280,9 @@
 DocType: Company,Default Values,Значення за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Ряд {0}: Сума платежу не може бути негативним
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Прес-фітинг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},На Постачальником рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,За замовчуванням Ціни
 DocType: Payment Reconciliation,Payments,Платежі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Гаряча ізостатичного пресування
-DocType: ToDo,Medium,Середній
 DocType: Budget Detail,Budget Allocated,Бюджету виділено
 DocType: Journal Entry,Entry Type,Тип запису
 ,Customer Credit Balance,Замовник Кредитний Баланс
@@ -1400,12 +1291,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Оновлення банківські платіжні дати з журналів.
 DocType: Quotation,Term Details,Термін Детальніше
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планування потужності протягом (днів)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
 DocType: Warranty Claim,Warranty Claim,Претензія по гарантії
 ,Lead Details,Провідні Детальніше
-DocType: Authorization Rule,Approving User,Користувач затвердження
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Кування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Обшивка
 DocType: Purchase Invoice,End date of current invoice's period,Дата закінчення періоду поточного рахунку-фактури в
 DocType: Pricing Rule,Applicable For,Стосується для
 DocType: Bank Reconciliation,From Date,З дати
@@ -1427,64 +1315,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Продаж Налаштування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Інтернет Аукціони
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,"Будь ласка, сформулюйте або кількість чи оцінка, експертиза Оцінити або обидва"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Інтернет Аукціони
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Будь ласка, сформулюйте або кількість чи оцінка, експертиза Оцінити або обидва"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Компанія, місяць і фінансовий рік є обов&#39;язковим"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Пункт Брак Повідомити
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вага згадується, \ nБудь ласка, кажучи &quot;Вага Одиниця виміру&quot; занадто"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Матеріал Запит використовується, щоб зробити цей запис зі"
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Одномісний блок елемента.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Час входу Пакетне {0} повинен бути «Передано»
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Зробіть обліку запис для кожного руху запасів
 DocType: Leave Allocation,Total Leaves Allocated,Всього Листя номером
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Склад требуется в рядку Немає {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,"Будь ласка, введіть дійсний фінансовий рік дати початку і закінчення"
 DocType: Employee,Date Of Retirement,Дата вибуття
 DocType: Upload Attendance,Get Template,Отримати шаблон
 DocType: Address,Postal,Поштовий
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Видобуток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Смола лиття
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"А Група клієнтів існує з таким же ім&#39;ям, будь ласка, змініть ім&#39;я клієнта або перейменувати групу клієнтів"
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,"Будь ласка, виберіть {0} перший."
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},Текст {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},Текст {0}
 DocType: Territory,Parent Territory,Батько Територія
 DocType: Quality Inspection Reading,Reading 2,Читання 2
 DocType: Stock Entry,Material Receipt,Матеріал Надходження
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Продукти
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Продукти
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Партія Тип і партія необхідна для / дебіторська заборгованість рахунок {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Якщо цей пункт має варіанти, то вона не може бути обраний в замовленнях і т.д."
 DocType: Lead,Next Contact By,Наступна Контактні За
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},"Склад {0} не може бути вилучена, поки існує кількість для пункту {1}"
 DocType: Quotation,Order Type,Тип замовлення
 DocType: Purchase Invoice,Notification Email Address,Повідомлення E-mail адреса
 DocType: Payment Tool,Find Invoices to Match,"Знайти фактури, щоб відповідати"
 ,Item-wise Sales Register,Пункт мудрий Продажі Реєстрація
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","наприклад, &quot;XYZ Національний банк&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","наприклад, &quot;XYZ Національний банк&quot;"
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Це податок Включено в базовій ставці?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Всього Цільовий
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Всього Цільовий
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Кошик включена
 DocType: Job Applicant,Applicant for a Job,Претендент на роботу
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,"Немає Виробничі замовлення, створені"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Зарплата ковзання працівника {0} вже створена за цей місяць
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Зарплата ковзання працівника {0} вже створена за цей місяць
 DocType: Stock Reconciliation,Reconciliation JSON,Примирення JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Sales Invoice Item,Batch No,Пакетна Немає
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень на продаж від Замовлення Клієнта
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Головна
-DocType: DocPerm,Delete,Видаляти
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Варіант
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Новий {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії на ваших угод
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,"Зупинився замовлення не може бути скасований. Відкорковувати, щоб скасувати."
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,За замовчуванням BOM ({0}) повинен бути активним для даного елемента або в шаблоні
 DocType: Employee,Leave Encashed?,Залишити інкасовано?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можливість поле Від обов&#39;язкове
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Зробити замовлення на
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Зробити замовлення на
 DocType: SMS Center,Send To,Відправити
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Асигнувати сума
 DocType: Sales Team,Contribution to Net Total,Внесок у Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Фото Примирення
@@ -1493,53 +1379,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Претендент на роботу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутний інформація і інша загальна інформація про вашу Постачальника
-DocType: Country,Country,Країна
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Адреси
-DocType: Communication,Received,Надійшло
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,"Проти журналі запис {0} не має ніякого неперевершену {1}, запис"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Повторювані Серійний номер вводиться для Пункт {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Умовою для правила судноплавства
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Деталь не дозволяється мати виробничого замовлення.
-DocType: DocField,Attach Image,Прикріпіть зображення
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Вага нетто цього пакета. (розраховується автоматично як сума чистого ваги товарів)
-DocType: Stock Reconciliation Item,Leave blank if no change,"Залиште порожнім, якщо не змінити"
 DocType: Sales Order,To Deliver and Bill,Щоб доставити і Білл
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Журнали Час для виготовлення.
 DocType: Item,Apply Warehouse-wise Reorder Level,Застосувати Склад-мудрий Reorder рівень
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,Специфікація {0} повинен бути представлений
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Час входу для завдань.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Оплата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Оплата
 DocType: Production Order Operation,Actual Time and Cost,Фактичний час і вартість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Матеріал Запит максимуму {0} можуть бути зроблені для Пункт {1} проти замовлення клієнта {2}
 DocType: Employee,Salutation,Привітання
-DocType: Communication,Rejected,Відхилено
 DocType: Pricing Rule,Brand,Марка
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bundle пунктів на момент продажу.
 DocType: Sales Order Item,Actual Qty,Фактична Кількість
 DocType: Sales Invoice Item,References,Посилання
 DocType: Quality Inspection Reading,Reading 10,Читання 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перелічіть ваші продукти або послуги, які ви купуєте або продаєте. Переконайтеся, що для перевірки предмета Group, Одиниця виміру та інших властивостей, коли ви починаєте."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Перелічіть ваші продукти або послуги, які ви купуєте або продаєте. Переконайтеся, що для перевірки предмета Group, Одиниця виміру та інших властивостей, коли ви починаєте."
 DocType: Hub Settings,Hub Node,Вузол концентратор
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ви ввели повторювані елементи. Ласка, виправити і спробувати ще раз."
-apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Значення {0} для атрибуту {1} не існує в списку дійсного значення Пункт Атрибут
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Асоціювати
+apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Значення {0} для атрибуту {1} не існує в списку дійсного значення Пункт Атрибут
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Асоціювати
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити приймач список
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Закінчився
 DocType: Packing Slip,To Package No.,Для пакету №
-DocType: DocType,System,Система
 DocType: Warranty Claim,Issue Date,Дата випуску
 DocType: Activity Cost,Activity Cost,Вартість активність
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Споживана Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Телекомунікаційних
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Телекомунікаційних
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 DocType: Payment Tool,Make Payment Entry,Зробити запис оплати
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
 ,Sales Invoice Trends,Видаткова накладна Тенденції
 DocType: Leave Application,Apply / Approve Leaves,Застосувати / Затвердити Листя
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Для
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете звернутися рядок, тільки якщо тип заряду &quot;На Попередня Сума Row» або «Попередня Row Усього&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
 DocType: Stock Settings,Allowance Percent,Посібник Відсоток
@@ -1551,33 +1432,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Продаж повинні бути перевірені, якщо вибраний Стосується для в {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Постачальник цитати товару
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Зробити зарплата структури
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Ножиці
 DocType: Item,Has Variants,Має Варіанти
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Натисніть на кнопку &quot;Створити рахунок-фактуру&quot; з продажу, щоб створити новий рахунок-фактуру."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Упаковка та маркування
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва щомісячний розподіл
 DocType: Sales Person,Parent Sales Person,Людина Батько продажів
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Будь ласка, сформулюйте замовчуванням Валюта в компанії Майстер і загальні налаштування за замовчуванням"
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox доступ до секретних
 DocType: Purchase Invoice,Recurring Invoice,Повторювані рахунки
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Управління проектами
 DocType: Supplier,Supplier of Goods or Services.,Постачальник товарів або послуг.
 DocType: Budget Detail,Fiscal Year,Звітний рік
 DocType: Cost Center,Budget,Бюджет
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Досягнутий
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Досягнутий
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Територія / клієнтів
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,"наприклад, 5"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ряд {0}: Виділена сума {1} повинен бути менше або дорівнює виставити суму заборгованості {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,"наприклад, 5"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ряд {0}: Виділена сума {1} повинен бути менше або дорівнює виставити суму заборгованості {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"За словами будуть видні, як тільки ви збережете рахунок-фактуру."
 DocType: Item,Is Sales Item,Є продаж товару
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Пункт Група Дерево
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Пункт {0} не налаштований на послідовний пп. Перевірити майстра предмета
 DocType: Maintenance Visit,Maintenance Time,Технічне обслуговування Час
 ,Amount to Deliver,Сума Поставте
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Продукт або послуга
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Були помилки.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Натискання
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Продукт або послуга
 DocType: Naming Series,Current Value,Поточна вартість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} створена
 DocType: Delivery Note Item,Against Sales Order,На замовлення клієнта
@@ -1591,15 +1467,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,"Завдяки Дата не може бути, перш ніж відправляти Реєстрація"
 DocType: Website Item Group,Website Item Group,Сайт групи товарів
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Мита і податки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,"Будь ласка, введіть дату Reference"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,"Будь ласка, введіть дату Reference"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записів оплати не можуть бути відфільтровані по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблиця для елемента, який буде показаний в веб-сайт"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставляється Кількість
 DocType: Material Request Item,Material Request Item,Матеріал Запит товару
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Дерево товарні групи.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Дерево товарні групи.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете звернутися номер рядка, перевищує або рівну поточної номер рядка для цього типу заряду"
 ,Item-wise Purchase History,Пункт мудрий Історія покупок
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Червоний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Червоний
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад принести Серійний номер доданий для Пункт {0}"
 DocType: Account,Frozen,Заморожені
 ,Open Production Orders,Відкриті Виробничі замовлення
@@ -1609,12 +1485,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Ряд # {0}: Операція {1} не завершені {2} Кількість готової продукції у виробництві Наказ № {3}. Будь ласка, поновіть статус роботи за допомогою журналів Time"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Змінити UOM для елемента.
 DocType: Quality Inspection Reading,Acceptance Criteria,Критерії приймання
 DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Пункт {0} повинен бути Продажі або в пункті СЕРВІС {1}
 DocType: Item Group,Show In Website,Показати на веб-сайті
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Група
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Група
 DocType: Task,Expected Time (in hours),Очікуваний час (в годинах)
 ,Qty to Order,Кількість для замовлення
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Для відстеження бренд в наступні документи накладної, рідкісна можливість, матеріал запит, Пункт, замовлення, покупка ваучера, Покупець отриманні, цитати, накладна, товарів Bundle, Продажі замовлення, Серійний номер"
@@ -1623,78 +1498,67 @@
 DocType: Holiday List,Clear Table,Ясно Таблиця
 DocType: Features Setup,Brands,Бренди
 DocType: C-Form Invoice Detail,Invoice No,Рахунок Немає
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Від Замовлення
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Від Замовлення
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Залиште не можуть бути застосовані / скасовані, перш ніж {0}, а відпустку баланс вже переносу направляються в майбутньому записи розподілу відпустки {1}"
 DocType: Activity Cost,Costing Rate,Калькуляція Оцінити
 ,Customer Addresses And Contacts,Адреси та контакти з клієнтами
 DocType: Employee,Resignation Letter Date,Відставка Лист Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Не вказаний
-DocType: Communication,Date,Дата
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторіть Виручка клієнтів
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,"Сиди, поки система є установка. Це може зайняти кілька хвилин."
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) повинен мати роль &quot;Expense який стверджує&quot;
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Пара
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Пара
 DocType: Bank Reconciliation Detail,Against Account,Проти Рахунок
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
 DocType: Item,Has Batch No,Має Пакетне Немає
 DocType: Delivery Note,Excise Page Number,Акцизний Номер сторінки
 DocType: Employee,Personal Details,Особиста інформація
 ,Maintenance Schedules,Режими технічного обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Вибивати
 ,Quotation Trends,Котирування Тенденції
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Пункт Група не згадується у майстри пункт за пунктом {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Як виробничого замовлення можуть бути зроблені за цією статтею, він повинен бути запас пункт."
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Приєднання
-DocType: Authorization Rule,Above Value,Вище вартості
 ,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
 DocType: Purchase Order,Delivered,Поставляється
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),"Налаштування сервера вхідної в робочі електронний ідентифікатор. (наприклад, jobs@example.com)"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку повторюваних рахунок буде зупинити"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всього виділені листя {0} не може бути менше, ніж вже затверджених листя {1} за період"
 DocType: Journal Entry,Accounts Receivable,Дебіторська заборгованість
 ,Supplier-Wise Sales Analytics,Постачальник-Мудрі продажів Аналітика
 DocType: Address Template,This format is used if country specific format is not found,"Цей формат використовується, якщо певний формат країна не знайдений"
-DocType: Custom Field,Custom,Звичай
 DocType: Production Order,Use Multi-Level BOM,Використовувати багаторівневе специфікації
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Лиття під тиском
 DocType: Bank Reconciliation,Include Reconciled Entries,Включити примиритися Записи
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Дерево finanial рахунків.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити плату на основі
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу &quot;основний актив&quot;, як товару {1} є активом товару"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Рахунок {0} повинен бути типу &quot;основний актив&quot;, як товару {1} є активом товару"
 DocType: HR Settings,HR Settings,Налаштування HR
-apps/frappe/frappe/config/setup.py +130,Printing,Друк
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,"Наступного дня (с), на якій ви подаєте заяву на відпустку в свято. Вам не потрібно звернутися за дозволом."
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,і
 DocType: Leave Block List Allow,Leave Block List Allow,Залишити Чорний список Дозволити
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Абревіатура не може бути порожнім або простір
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Спортивний
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Загальний фактичний
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Блок
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,"Будь ласка, встановіть ключі доступу Dropbox на вашому сайті конфігурації"
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Блок
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Будь ласка, сформулюйте компанії"
 ,Customer Acquisition and Loyalty,Придбання та лояльності клієнтів
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,"Склад, де ви підтримуєте акції відхилених елементів"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Ваш фінансовий рік закінчується
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Ваш фінансовий рік закінчується
 DocType: POS Profile,Price List,Прейскурант
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер за замовчуванням фінансовий рік. Будь ласка, поновіть ваш браузер для зміни вступили в силу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Витратні Претензії
 DocType: Issue,Support,Підтримка
-DocType: Authorization Rule,Approving Role,Затвердження роль
 ,BOM Search,Специфікація Пошук
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Закриття (відкриття + Итоги)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Будь ласка, сформулюйте валюту в Компанії"
 DocType: Workstation,Wages per hour,Заробітна плата на годину
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Фото баланс в пакетному {0} стане негативним {1} для п {2} на склад {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Показати / Приховати функції, такі як серійний Ніс, POS і т.д."
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Наступний матеріал запити були підняті автоматично залежно від рівня повторного замовлення елемента
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Дата просвіт не може бути до дати реєстрації в рядку {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Дата просвіт не може бути до дати реєстрації в рядку {0}
 DocType: Salary Slip,Deduction,Відрахування
 DocType: Address Template,Address Template,Адреса шаблону
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,"Будь ласка, введіть Employee Id цього менеджера з продажу"
@@ -1706,76 +1570,68 @@
 DocType: Opportunity,Quotation,Цитата
 DocType: Salary Slip,Total Deduction,Всього Відрахування
 DocType: Quotation,Maintenance User,Технічне обслуговування Користувач
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Вартість Оновлене
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Вартість Оновлене
 DocType: Employee,Date of Birth,Дата народження
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Пункт {0} вже повернулися
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Фінансовий рік ** являє собою фінансовий рік. Всі бухгалтерські та інші великі угоди відслідковуються проти ** ** фінансовий рік.
 DocType: Opportunity,Customer / Lead Address,Замовник / Провідний Адреса
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Описання роботи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Описання роботи
 DocType: Purchase Order Item,Qty as per Stock UOM,Кількість у відповідності зі UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,"Будь ласка, виберіть правильний файл CSV з даними"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Покриття
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім &quot;-&quot; &quot;.&quot;, &quot;#&quot;, і &quot;/&quot; не допускається в серію імен"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Слідкуйте продажів кампаній. Слідкуйте за проводами, цитати, Продажі замовлення і т.д. з кампаній, щоб оцінити повернення інвестицій."
 DocType: Expense Claim,Approver,Затверджуючий
 ,SO Qty,ТАК Кількість
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Сток записи існують щодо складу {0}, отже, ви не зможете повторно призначити або змінити Склад"
 DocType: Appraisal,Calculate Total Score,Розрахувати загальну кількість балів
 DocType: Supplier Quotation,Manufacturing Manager,Виробництво менеджер
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії Шифрування до {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Спліт накладної в пакети.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Поставки
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Пориньте лиття
-DocType: Purchase Order,To be delivered to customer,Для поставлятися замовнику
+apps/erpnext/erpnext/hooks.py +68,Shipments,Поставки
+DocType: Purchase Order Item,To be delivered to customer,Для поставлятися замовнику
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Час Статус журналу повинні бути представлені.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Серійний номер {0} не належить ні до однієї Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Налаштування
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Ряд #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),У Слів (Компанія валют)
 DocType: Pricing Rule,Supplier,Постачальник
 DocType: C-Form,Quarter,Чверть
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Різні витрати
 DocType: Global Defaults,Default Company,За замовчуванням Компанія
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Витрати або рахунок різниці є обов&#39;язковим для п {0}, як це впливає на вартість акцій в цілому"
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для Пункт {0} в рядку {1} більш {2}. Щоб overbilling, будь ласка, встановіть в налаштуваннях зображення"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для Пункт {0} в рядку {1} більш {2}. Щоб overbilling, будь ласка, встановіть в налаштуваннях зображення"
 DocType: Employee,Bank Name,Назва банку
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-вище
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Користувач {0} відключена
 DocType: Leave Application,Total Leave Days,Всього днів відпустки
-DocType: Journal Entry Account,Credit in Account Currency,Кредит у валюті Рахунки
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примітка: E-mail НЕ буде відправлено користувачів з обмеженими можливостями
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} є обов&#39;язковим для пп {1}
 DocType: Currency Exchange,From Currency,Від Валюта
-DocType: DocField,Name,Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Суми не відображається в системі
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть Виділена сума, рахунок-фактура Тип і номер рахунку-фактури в принаймні один ряд"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Продажі Замовити потрібно для пункту {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Суми не відображається в системі
 DocType: Purchase Invoice Item,Rate (Company Currency),Оцінити (Компанія валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Інші
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Інші
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}."
 DocType: POS Profile,Taxes and Charges,Податки і збори
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Продукт або послугу, яка купується, продається, або зберігається на складі."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Не можете обрати тип заряду, як «Про Попередня Сума Row» або «На попередньому рядку Total &#39;для першого рядка"
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Завершений
-DocType: Web Form,Select DocType,Виберіть DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Протяжні
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Банківські
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад, щоб отримати розклад"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Новий Центр Вартість
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Новий Центр Вартість
 DocType: Bin,Ordered Quantity,Замовлену кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","наприклад, &quot;Створення інструментів для будівельників&quot;"
 DocType: Quality Inspection,In Process,В процесі
 DocType: Authorization Rule,Itemwise Discount,Itemwise Знижка
 DocType: Purchase Order Item,Reference Document Type,Посилання Тип документа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
 DocType: Account,Fixed Asset,Основних засобів
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Серійний Інвентар
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Серійний Інвентар
 DocType: Activity Type,Default Billing Rate,За замовчуванням Платіжна Оцінити
 DocType: Time Log Batch,Total Billing Amount,Всього рахунків Сума
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Дебіторська заборгованість Рахунок
@@ -1783,19 +1639,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Продажі Наказ Оплата
 DocType: Expense Claim Detail,Expense Claim Detail,Витрати Заявити Подробиці
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Журнали Час створення:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Item,Weight UOM,Вага Одиниця виміру
 DocType: Employee,Blood Group,Група крові
 DocType: Purchase Invoice Item,Page Break,Розрив сторінки
 DocType: Production Order Operation,Pending,До
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Користувачі, які можуть затвердити відпустки додатки конкретного працівника"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Ви не можете змінити за замовчуванням Одиниця виміру варіанта. Щоб змінити стандартну UOM для Variant зміна за замовчуванням Одиниця виміру шаблону
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Устаткування офісу
 DocType: Purchase Invoice Item,Qty,Кількість
 DocType: Fiscal Year,Companies,Компанії
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Електроніка
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Електроніка
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Підняти Матеріальна запит коли шток досягає рівня повторного замовлення,"
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,З графіком технічного обслуговування
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Повний день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Повний день
 DocType: Purchase Invoice,Contact Details,Контактні дані
 DocType: C-Form,Received Date,Дата отримання
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Якщо ви створили стандартний шаблон в продажах податки і збори шаблон, виберіть одну і натисніть на кнопку нижче."
@@ -1807,14 +1663,15 @@
 DocType: Job Applicant,Job Opening,Робота Відкриття
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирення
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Ласка, виберіть назву InCharge людини"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Технологія
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологія
 DocType: Offer Letter,Offer Letter,Лист-пропозиція
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Створення запитів матеріал (ППМ) і виробничі замовлення.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Всього в рахунку-фактурі Amt
 DocType: Time Log,To Time,Часу
+DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Щоб додати дочірні вузли, досліджувати дерево і натисніть на вузол, в який хочете додати більше вузлів."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},Специфікація рекурсії: {0} не може бути батько або дитина {2}
 DocType: Production Order Operation,Completed Qty,Завершений Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Ціни {0} відключена
@@ -1824,12 +1681,10 @@
 DocType: Item,Customer Item Codes,Замовник Предмет коди
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Створити Записи оплати по замовленнях або рахунків-фактур.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Зварювання
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Новий зі Одиниця виміру потрібно
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Всі деталі вже виставлений
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Будь ласка, вкажіть дійсний &quot;Від справі № &#39;"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
 DocType: Project,External,Зовнішній
 DocType: Features Setup,Item Serial Nos,Пункт Серійний пп
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу
@@ -1839,15 +1694,13 @@
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,приклад: на наступний день відправка
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} знайдений
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Ваші клієнти
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Пресування
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Ваші клієнти
 DocType: Leave Block List Date,Block Date,Блок Дата
 DocType: Sales Order,Not Delivered,Чи не Поставляється
 ,Bank Clearance Summary,Банк оформлення Резюме
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Створення і управління щоденні, щотижневі та щомісячні дайджести новин."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Код товара&gt; Товар Група&gt; Марка
 DocType: Appraisal Goal,Appraisal Goal,Оцінка Мета
-DocType: Event,Friday,П&#39;ятниця
 DocType: Time Log,Costing Amount,Калькуляція Сума
 DocType: Process Payroll,Submit Salary Slip,Відправити зарплата Сліп
 DocType: Salary Structure,Monthly Earning & Deduction,Щомісячний Заробіток &amp; Відрахування
@@ -1855,16 +1708,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Імпорт наливом
 DocType: Sales Partner,Address & Contacts,Адреса та контакти
 DocType: SMS Log,Sender Name,Ім&#39;я відправника
-DocType: Page,Title,Назва
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Налаштувати
 DocType: POS Profile,[Select],[Виберіть]
 DocType: SMS Log,Sent To,Відправлено
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Зробити накладна
 DocType: Company,For Reference Only.,Для довідки тільки.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Невірний {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Невірний {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Авансу
 DocType: Manufacturing Settings,Capacity Planning,Планування потужностей
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,&quot;З дати&quot; потрібно
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;З дати&quot; потрібно
 DocType: Journal Entry,Reference Number,Номер для посилань
 DocType: Employee,Employment Details,Подробиці з працевлаштування
 DocType: Employee,New Workplace,Новий Робоче
@@ -1879,7 +1730,7 @@
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
 DocType: Item,End of Life,Кінець життя
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Подорож
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Подорож
 DocType: Leave Block List,Allow Users,Надання користувачам
 DocType: Purchase Order,Customer Mobile No,Замовник Мобільна Немає
 DocType: Sales Invoice,Recurring,Періодична
@@ -1887,23 +1738,21 @@
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Передача матеріалів
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 DocType: Purchase Invoice,Price List Currency,Ціни валют
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити негативний складі
 DocType: Installation Note,Installation Note,Установка Примітка
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Додати Податки
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Додати Податки
 ,Financial Analytics,Фінансова аналітика
 DocType: Quality Inspection,Verified By,Перевірено
 DocType: Address,Subsidiary,Дочірня компанія
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
 DocType: Quality Inspection,Purchase Receipt No,Купівля Отримання Немає
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Аванс-завдаток
-DocType: System Settings,In Hours,У годиннику
 DocType: Process Payroll,Create Salary Slip,Створити зарплата Сліп
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Очікуване сальдо за платіжними
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Полірування
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Очікуване сальдо за платіжними
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
 DocType: Appraisal,Employee,Співробітник
@@ -1916,15 +1765,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Група по Ваучер
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Sales Invoice,Mass Mailing,Розсилок
-DocType: Page,Standard,Стандарт
 DocType: Rename Tool,File to Rename,Файл Перейменувати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Purchse Номер замовлення необхідний для Пункт {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Показати платежі
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Розмір
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Зазначено специфікації {0} не існує для п {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Технічне обслуговування Розклад {0} має бути скасований до скасування цього замовлення клієнта
 DocType: Notification Control,Expense Claim Approved,Витрати Заявити Затверджено
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтична
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Фармацевтична
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Вартість куплених виробів
 DocType: Selling Settings,Sales Order Required,Продажі Замовити Обов&#39;язкові
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Створити клієнта
@@ -1934,30 +1781,25 @@
 DocType: Quality Inspection Reading,Reading 9,Читання 9
 DocType: Supplier,Is Frozen,Заморожене
 DocType: Buying Settings,Buying Settings,Налаштування Купівля
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Маса обробка
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Специфікація Номер для готового виробу Пункт
 DocType: Upload Attendance,Attendance To Date,Відвідуваність Для Дата
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),"Налаштування сервера вхідної у продажу електронний ідентифікатор. (наприклад, sales@example.com)"
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Оплата рахунку
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Проект
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Компенсаційні Викл
 DocType: Quality Inspection Reading,Accepted,Прийняті
-DocType: User,Female,Жінка
-DocType: Journal Entry Account,Debit in Account Currency,Дебет у валюті рахунку
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
-DocType: Print Settings,Modern,Сучасний
-DocType: Communication,Replied,Відповів
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Неприпустима посилання {0} {1}
 DocType: Payment Tool,Total Payment Amount,Загальна сума оплати
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не може бути більше, ніж планувалося quanitity ({2}) у виробничий замовлення {3}"
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлику
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Сировина не може бути порожнім.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Сировина не може бути порожнім.
 DocType: Newsletter,Test,Тест
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Як є існуючі біржові операції по цьому пункту, \ ви не можете змінити значення &#39;Має серійний номер &quot;,&quot; Має Batch Ні »,« Чи є зі Пункт &quot;і&quot; Оцінка Метод &quot;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Швидкий журнал запис
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити ставку, якщо специфікації згадується agianst будь-якого елементу"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть плановий Кількість для Пункт {0} в рядку {1}"
@@ -1965,17 +1807,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Запити для елементів.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Окрема виробничий замовлення буде створено для кожного готового виробу пункту.
 DocType: Purchase Invoice,Terms and Conditions1,Умови та условія1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Завершення установки
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерський запис заморожені до цієї дати, ніхто не може зробити / змінити запис крім ролі, зазначеної нижче."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати графік технічного обслуговування"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Розсилка розсилки
 DocType: Delivery Note,Transporter Name,Transporter Назва
+DocType: Authorization Rule,Authorized Value,Статутний Значення
 DocType: Contact,Enter department to which this Contact belongs,"Введіть відділ, до якого належить ця Зв&#39;язатися"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Всього Відсутня
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Елемент або Склад ряду {0} не відповідає матеріалів Запит
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Одиниця виміру
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Одиниця виміру
 DocType: Fiscal Year,Year End Date,Рік Дата закінчення
 DocType: Task Depends On,Task Depends On,Завдання залежить від
 DocType: Lead,Opportunity,Можливість
@@ -1996,16 +1838,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (як у фондовій UOM)
 DocType: SMS Log,No of Requested SMS,Немає запитуваних SMS
 DocType: Campaign,Campaign-.####,Кампанія -. ####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Пронизливий
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Наступні кроки
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,"Договір Кінцева дата повинна бути більше, ніж дата вступу"
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Третя сторона дистриб&#39;ютор / дилер / комісіонер / Партнери /, який продає продукти компаній на комісію."
 DocType: Customer Group,Has Child Node,Має дочірній вузол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} проти Замовлення {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} проти Замовлення {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введіть статичних параметрів URL тут (Напр., Відправник = ERPNext, ім&#39;я користувача = ERPNext, пароль = один тисяча двісті тридцять чотири і т.д.)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, не в якій-небудь активної фінансовий рік. Для більш детальної інформації перевірити {2}."
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Це приклад сайту генерується автоматично з ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Це приклад сайту генерується автоматично з ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Старіння Діапазон 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Фотохімічні обробки
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2027,11 +1868,9 @@
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
 10. Add or Deduct: Whether you want to add or deduct the tax.","Стандартний шаблон податок, який може бути застосований до всіх операцій купівлі. Цей шаблон може містити перелік податкових керівників, а також інших витрат керівників як &quot;Доставка&quot;, &quot;Insurance&quot;, &quot;Звернення&quot; і т.д. #### Примітка податкової ставки ви визначаєте тут буде стандартна ставка податку на прибуток для всіх ** Елементи * *. Якщо є ** ** товари, які мають різні ціни, вони повинні бути додані в ** Item податку ** стіл в ** ** Item майстра. #### Опис колонок 1. Розрахунок Тип: - Це може бути від ** ** Загальна Чистий (тобто сума основної суми). - ** На попередньому рядку Total / сума ** (за сукупністю податків або зборів). Якщо ви оберете цю опцію, податок буде застосовуватися, як у відсотках від попереднього ряду (у податковому таблиці) суми або загальної. - ** ** Фактичний (як уже згадувалося). 2. Рахунок Керівник: Рахунок книга, під яким цей податок будуть заброньовані 3. Вартість центр: Якщо податок / плата є доходом (як перевезення вантажу) або витрат це повинно бути заброньовано проти МВЗ. 4. Опис: Опис податку (які будуть надруковані в рахунках-фактурах / цитати). 5. Оцінити: Податкова ставка. 6. Сума: Сума податку. 7. Разом: Сумарне до цієї точки. 8. Введіть рядок: Якщо на базі &quot;Попередня рядок Усього&quot; ви можете вибрати номер рядка, який буде прийнято в якості основи для розрахунку цього (за замовчуванням це попереднє рядок). 9. Розглянемо податку або збору для: У цьому розділі ви можете поставити, якщо податок / плата тільки за оцінки (не частина всього) або тільки для загальної (не додати цінність пункту) або для обох. 10. Додати або відняти: Якщо ви хочете, щоб додати або відняти податок."
-DocType: Note,Note,Примітка
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
-DocType: Email Account,Email Ids,E-mail ідентифікатори
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Фото запис {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Фото запис {0} не представлено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / грошовий рахунок
 DocType: Tax Rule,Billing City,Біллінг Місто
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
@@ -2039,40 +1878,36 @@
 DocType: Journal Entry,Credit Note,Кредитове авізо
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},"Завершений Кількість не може бути більше, ніж {0} для роботи {1}"
 DocType: Features Setup,Quality,Якість
-DocType: Contact Us Settings,Introduction,Введення
 DocType: Warranty Claim,Service Address,Послуги Адреса
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Максимальне 100 рядків для стоку примирення.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Максимальне 100 рядків для стоку примирення.
 DocType: Stock Entry,Manufacture,Виробництво
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Будь ласка, в першу чергу поставки Примітка"
 DocType: Purchase Invoice,Currency and Price List,Валюта і Ціни
 DocType: Opportunity,Customer / Lead Name,Замовник / Провідний Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Зазор Дата не згадується
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Виробництво
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Зазор Дата не згадується
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Виробництво
 DocType: Item,Allow Production Order,Дозволити виробничого замовлення
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
-DocType: Installation Note Item,Installed Qty,Встановлена Кількість
+DocType: Installation Note Item,Installed Qty,Встановлена Кількість
 DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Представлений
 DocType: Salary Structure,Total Earning,Всього Заробіток
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Мої Адреси
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідні Оцінити
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Організація філії господар.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,або
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,або
 DocType: Sales Order,Billing Status,Статус рахунків
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Комунальні витрати
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Над
 DocType: Buying Settings,Default Buying Price List,За замовчуванням Купівля Прайс-лист
-,Download Backups,Завантажити Резервні копії
 DocType: Notification Control,Sales Order Message,Продажі Замовити повідомлення
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як компанія, валюта, поточний фінансовий рік і т.д."
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Тип оплати
 DocType: Process Payroll,Select Employees,Виберіть Співробітники
 DocType: Bank Reconciliation,To Date,Для Дата
 DocType: Opportunity,Potential Sales Deal,Угода потенційних продажів
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Подробиці
 DocType: Purchase Invoice,Total Taxes and Charges,Всього Податки і збори
 DocType: Employee,Emergency Contact,Для екстреного зв&#39;язку
 DocType: Item,Quality Parameters,Параметри якості
@@ -2087,6 +1922,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Серійний номер / партія
 DocType: Product Bundle,Parent Item,Батько товару
 DocType: Account,Account Type,Тип рахунку
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Залиште Тип {0} не може бути перенесення спрямований
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Графік проведення технічного обслуговування не генерується для всіх елементів. Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
@@ -2094,32 +1930,27 @@
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купівля розписок товари
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Налаштування форми
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Різка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Сплощення
 DocType: Account,Income Account,Рахунок Доходи
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Молдинг
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточний Кількість
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Див &quot;Оцінити матеріалів на основі&quot; в розділі калькуляції
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
 DocType: Item Reorder,Material Request Type,Матеріал Тип запиту
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Документи
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Посилання
 DocType: Cost Center,Cost Center,Центр витрат
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Ваучер #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Ваучер #
 DocType: Notification Control,Purchase Order Message,Замовлення на повідомлення
 DocType: Tax Rule,Shipping Country,Доставка Країна
 DocType: Upload Attendance,Upload HTML,Завантажити HTML-
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Всього аванс ({0}) проти ордена {1} не може бути більше \, ніж загальний підсумок ({2})"
 DocType: Employee,Relieving Date,Звільнення Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ціни правила робиться для перезапису Прайс-лист / визначити відсоток дисконтування на основі деяких критеріїв.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через фондовій входу / накладної / Купівля Надходження
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Податок на прибуток
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Лазерна інженерії чистий формування
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Податок на прибуток
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Якщо обрано Ціни Правило зроблено для &quot;ціна&quot;, це буде перезаписувати Прайс-лист. Ціни Правило ціна остаточна ціна, так що далі знижка не повинні застосовуватися. Отже, у таких угодах, як замовлення клієнта, замовлення і т.д., це буде вибрано в полі &#39;Rate&#39;, а не &#39;поле прайс-лист Rate&#39;."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Трек веде по промисловості Type.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
@@ -2127,10 +1958,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Сток Налаштування
-DocType: User,Bio,Біо
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Новий Центр Вартість Ім&#39;я
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Новий Центр Вартість Ім&#39;я
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"Немає за замовчуванням Адреса Шаблон не знайдене. Будь ласка, створіть новий з Setup&gt; Друк і брендингу&gt; Адреса шаблон."
 DocType: Appraisal,HR User,HR Користувач
@@ -2142,31 +1972,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична Кількість Угоди Після
 ,Pending SO Items For Purchase Request,В очікуванні SO предмети для покупки запит
 DocType: Supplier,Billing Currency,Платіжна валют
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Дуже великий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Дуже великий
 ,Profit and Loss Statement,Рахунок прибутків і збитків
 DocType: Bank Reconciliation Detail,Cheque Number,Чек Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Пресування
 DocType: Payment Tool Detail,Payment Tool Detail,"Подробиці платіжний інструмент,"
 ,Sales Browser,Браузер з продажу
 DocType: Journal Entry,Total Credit,Всього Кредитна
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,Місцевий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Увага: Ще {0} # {1} існує проти вступу фондовій {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,Місцевий
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Кредити та аванси (активів)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Боржники
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Великий
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Жоден працівник не знайдено!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Великий
 DocType: C-Form Invoice Detail,Territory,Територія
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Purchase Order,Customer Address Display,Замовник Адреса Показати
 DocType: Stock Settings,Default Valuation Method,Оцінка за замовчуванням метод
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Полірування
 DocType: Production Order Operation,Planned Start Time,Плановані Час
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","За замовчуванням Одиниця виміру для п {0} не може бути змінений безпосередньо, тому що \ ви вже зробили деякі угоди (угод) з іншим UOM. Щоб змінити стандартну UOM, \ використання &quot;Одиниця виміру Замінити Utility &#39;інструмент під фондовій модуля."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Вкажіть обмінний курс для перетворення однієї валюти в іншу
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Цитата {0} скасовується
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Цитата {0} скасовується
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Загальною сумою заборгованості
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Співробітник {0} був у відпустці на {1}. Не можете відзначити відвідуваність.
 DocType: Sales Partner,Targets,Цільові
@@ -2174,14 +1998,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всі Продажі Угоди можуть бути помічені проти кількох ** ** продажів осіб, так що ви можете встановити і контролювати цілі."
 ,S.O. No.,КО №
 DocType: Production Order Operation,Make Time Log,Зробити часу Вхід
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,"Будь ласка, встановіть кількість тональний"
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Будь ласка, створіть клієнт зі свинцю {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Комп&#39;ютери
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Електро-хімічний шліфування
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Будь ласка, встановіть ваш план рахунків, перш ніж почати бухгалтерських проводок"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ігнорувати Ціни правило
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Скасовано
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"З дати зарплати структура не може бути менше, ніж Співробітника Приєднання Дата."
 DocType: Employee Education,Graduate,Випускник
 DocType: Leave Block List,Block Days,Блок Дні
@@ -2206,7 +2029,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Перевірте, якщо повторювані рахунок, зніміть, щоб зупинити повторюваних або поставити правильне Дата закінчення"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Відвідуваність за співробітника {0} вже відзначений
 DocType: Packing Slip,If more than one package of the same type (for print),Якщо більш ніж один пакет того ж типу (для друку)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Максимум {0} рядків дозволено
 DocType: C-Form Invoice Detail,Net Total,Чистий Всього
 DocType: Bin,FCFS Rate,FCFS Оцінити
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Біллінг (Рахунок продажів)
@@ -2223,20 +2045,19 @@
 DocType: Maintenance Visit,Purposes,Мети
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операція {0} більше, ніж будь-яких наявних робочих годин на робочої станції {1}, зламати операції в кілька операцій"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Анодно-хімічна обробка
 ,Requested,Запитаний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Немає Зауваження
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Прострочені
 DocType: Account,Stock Received But Not Billed,"Фото отриманий, але не Оголошений"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Корінь аккаунт має бути група
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Повна Платне + недоїмки сума + Інкасація Сума - Загальна Відрахування
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 DocType: Features Setup,Sales and Purchase,Купівлі-продажу
 DocType: Supplier Quotation Item,Material Request No,Матеріал Запит Немає
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Швидкість, з якою клієнта валюті, конвертується в базову валюту компанії"
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} успішно відписалися від цього списку.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Чистий швидкість (Компанія валют)
-apps/frappe/frappe/templates/base.html +134,Added,Доданої
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Управління Територія дерево.
 DocType: Journal Entry Account,Sales Invoice,Рахунок по продажах
 DocType: Journal Entry Account,Party Balance,Баланс партія
@@ -2250,11 +2071,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Фінансовий рік {0} знайдений.
 DocType: Bank Reconciliation,Get Relevant Entries,Одержати відповідні записи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Облік Вхід для запасі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Coining
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Замовник Адреса
-apps/frappe/frappe/desk/query_report.py +136,Total,Загальна
 DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
 DocType: Account,Root Type,Корінь Тип
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Чи не можете повернути понад {1} для п {2}
@@ -2264,14 +2083,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Сума податку після скидки Сума (Компанія валют)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
 DocType: Quality Inspection,Quality Inspection,Контроль якості
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Спрей формування
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Дуже невеликий
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,"Увага: Матеріал Запитувана Кількість менше, ніж мінімальне замовлення Кількість"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Рахунок {0} заморожені
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюн"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюн"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL або BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Можу тільки здійснити платіж проти нефактурірованних {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,"Швидкість Комісія не може бути більше, ніж 100"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Мінімальний рівень запасів
 DocType: Stock Entry,Subcontract,Субпідряд
@@ -2282,42 +2100,39 @@
 DocType: Item,Manufacturer Part Number,Виробник Номер деталі
 DocType: Production Order Operation,Estimated Time and Cost,Розрахунковий час і вартість
 DocType: Bin,Bin,Бункер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Капотування
 DocType: SMS Log,No of Sent SMS,Немає відправлених SMS
 DocType: Account,Company,Компанія
 DocType: Account,Expense Account,Витрати аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Програмне забезпечення
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Колір
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Програмне забезпечення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Колір
 DocType: Maintenance Visit,Scheduled,Заплановане
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Будь ласка, виберіть пункт, де &quot;Чи зі Пункт&quot; &quot;Ні&quot; і &quot;є продаж товару&quot; &quot;Так&quot;, і немає ніякої іншої продукт Зв&#39;язка"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Виберіть щомісячний розподіл до нерівномірно розподілити цілі по місяців.
 DocType: Purchase Invoice Item,Valuation Rate,Оцінка Оцініть
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Ціни валют не визначена
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,"Пункт ряд {0}: Покупка Отримання {1}, не існує в таблиці вище &quot;Купити&quot; НАДХОДЖЕННЯ"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Дата початку
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,До
 DocType: Rename Tool,Rename Log,Перейменувати Вхід
 DocType: Installation Note Item,Against Document No,Проти Документ №
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Управління партнери по збуту.
 DocType: Quality Inspection,Inspection Type,Інспекція Тип
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Будь ласка, виберіть {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Дослідник
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Оновлення
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Дослідник
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,"Будь ласка, збережіть бюлетень перед відправкою"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Або адреса електронної пошти є обов&#39;язковим
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Вхідний контроль якості.
 DocType: Purchase Order Item,Returned Qty,Повернувся Кількість
 DocType: Employee,Exit,Вихід
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Корінь Тип обов&#39;язково
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Корінь Тип обов&#39;язково
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Серійний номер {0} створена
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Вібраційний обробка
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Для зручності клієнтів, ці коди можуть бути використані в друкованих форматів, таких як рахунки-фактури і доставки Нотатки"
 DocType: Employee,You can enter any date manually,Ви можете ввести дату вручну будь
 DocType: Sales Invoice,Advertisement,Реклама
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Випробувальний термін
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Випробувальний термін
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки вузли лист дозволені в угоді
 DocType: Expense Claim,Expense Approver,Витрати затверджує
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купівля Надходження товару Поставляється
@@ -2325,43 +2140,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Подрібнення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Упаковка в термоусадочну плівку
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,В очікуванні Діяльність
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Підтвердив
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Постачальник&gt; Постачальник Тип
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Тільки Залиште додатків зі статусом «Схвалено&quot; можуть бути представлені
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Адреса Назва є обов&#39;язковим.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Газетних видавців
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетних видавців
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Виберіть фінансовий рік
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Виплавка
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Змінити порядок Рівень
 DocType: Attendance,Attendance Date,Відвідуваність Дата
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Зарплата розпаду на основі Заробіток і дедукції.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,"Рахунок з дочірніх вузлів, не можуть бути перетворені в бухгалтерській книзі"
 DocType: Address,Preferred Shipping Address,Перевага Адреса доставки
 DocType: Purchase Receipt Item,Accepted Warehouse,Прийнято Склад
 DocType: Bank Reconciliation Detail,Posting Date,Дата розміщення
 DocType: Item,Valuation Method,Метод Оцінка
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Неможливо знайти обмінний курс {0} до {1}
 DocType: Sales Invoice,Sales Team,Відділ продажів
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Дублікат запис
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Дублікат запис
 DocType: Serial No,Under Warranty,Під гарантії
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Помилка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"За словами будуть видні, як тільки ви збережете замовлення клієнта."
 ,Employee Birthday,Співробітник народження
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Венчурний капітал
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Серійний номер {0} не існує
 DocType: Pricing Rule,Discount Percentage,Знижка у відсотках
 DocType: Payment Reconciliation Invoice,Invoice Number,Номер накладної
-apps/erpnext/erpnext/hooks.py +70,Orders,Замовлення
+apps/erpnext/erpnext/hooks.py +54,Orders,Замовлення
 DocType: Leave Control Panel,Employee Type,Співробітник Тип
 DocType: Employee Leave Approver,Leave Approver,Залишити який стверджує
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Кування
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Користувач з &quot;Витрати затверджує&quot; ролі
 ,Issued Items Against Production Order,Випущені товари з виробництвом ордена
@@ -2373,7 +2185,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,"Центр Вартість з існуючими операцій, не може бути перетворений в групі"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Невірний період
 DocType: Customer,Credit Limit,Кредитний ліміт
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Виберіть тип угоди
 DocType: GL Entry,Voucher No,Ваучер Немає
@@ -2383,11 +2194,10 @@
 DocType: Customer,Address and Contact,Адреса та контактна
 DocType: Customer,Last Day of the Next Month,Останній день наступного місяця
 DocType: Employee,Feedback,Зворотній зв&#39;язок
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Залишити не можуть бути виділені, перш ніж {0}, а відпустку баланс вже переносу направляються в майбутньому записи розподілу відпустки {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Графік
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Абразивної обробки струмінь
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Графік
 DocType: Stock Settings,Freeze Stock Entries,Заморожування зображення щоденнику
-DocType: Website Settings,Website Settings,Налаштування сайту
 DocType: Item,Reorder level based on Warehouse,Рівень Зміна порядку на основі Склад
 DocType: Activity Cost,Billing Rate,Платіжна Оцінити
 ,Qty to Deliver,Кількість для доставки
@@ -2398,20 +2208,19 @@
 DocType: Material Request,Requested For,Запитувана Для
 DocType: Quotation Item,Against Doctype,На DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Підписка на накладну проти будь-якого проекту
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Корінь рахунок не може бути видалений
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Корінь рахунок не може бути видалений
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Показати фонду Записи
 ,Is Primary Address,Є первинним Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Робота-в-Прогрес Склад
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Посилання # {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Управління адрес
 DocType: Pricing Rule,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
 DocType: Serial No,Warranty / AMC Details,Гарантія / КУА Детальніше
 DocType: Journal Entry,User Remark,Зауваження Користувач
 DocType: Lead,Market Segment,Сегмент ринку
-DocType: Communication,Phone,Телефон
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Закриття (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Закриття (д-р)
 DocType: Contact,Passive,Пасивний
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серійний номер {0} не в наявності
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Податковий шаблон для продажу угод.
@@ -2427,10 +2236,9 @@
 ,Billed Amount,Оголошений Сума
 DocType: Bank Reconciliation,Bank Reconciliation,Банк примирення
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Отримати оновлення
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Додати кілька пробних записів
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Матеріал Запит {0} ануляції або зупинився
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Додати кілька пробних записів
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Залишити управління
-DocType: Event,Groups,Групи
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група по рахунок
 DocType: Sales Order,Fully Delivered,Повністю Поставляється
 DocType: Lead,Lower Income,Нижня дохід
@@ -2439,40 +2247,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Швидка допомога
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Джерело і мета склад не може бути таким же для рядка {0}
 DocType: Features Setup,Sales Extras,Продажі Додатково
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за рахунок {1} проти МВЗ {2} буде перевищувати {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Різниця аккаунт повинен бути тип рахунки активів / пасивів, так як це зі Примирення є запис Відкриття"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} бюджет за рахунок {1} проти МВЗ {2} буде перевищувати {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Різниця аккаунт повинен бути тип рахунки активів / пасивів, так як це зі Примирення є запис Відкриття"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},"Купівля Номер замовлення, необхідну для п {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;З дати&quot; повинно бути після &quot;Для Дата&quot;
 ,Stock Projected Qty,Фото Прогнозований Кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Sales Order,Customer's Purchase Order,Замовлення клієнта
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Значення або Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Хвилин
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Хвилин
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купити податки і збори
 ,Qty to Receive,Кількість на отримання
 DocType: Leave Block List,Leave Block List Allowed,Залишити Чорний список тварин
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Коефіцієнт перетворення не можуть бути в фракцій
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,"Ви будете використовувати його, щоб Вхід"
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,"Ви будете використовувати його, щоб Вхід"
 DocType: Sales Partner,Retailer,Роздрібний торговець
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Цитата {0} типу {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Цитата {0} типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Технічне обслуговування Розклад товару
 DocType: Sales Order,%  Delivered,Поставляється%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Банк Овердрафт аккаунт
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Зробити зарплата Сліп
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Відображення специфікації
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Забезпечені кредити
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Високий Продукти
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Високий Продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Відкриття Баланс акцій
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,"Не можете схвалити відпустку, поки ви не уповноважений стверджувати листя на блокових Терміни"
 DocType: Appraisal,Appraisal,Оцінка
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Лиття по виплавлюваних піни
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Малюнок
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Дата повторюється
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,"Особа, яка має право підпису"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Залишити затверджує повинен бути одним з {0}
 DocType: Hub Settings,Seller Email,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Workstation Working Hour,Start Time,Час початку
@@ -2486,12 +2291,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
 DocType: BOM Operation,Hour Rate,Година Оцінити
 DocType: Stock Settings,Item Naming By,Пункт Іменування За
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,З цитати
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,З цитати
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},"Ще Період закриття входу {0} була зроблена після того, як {1}"
 DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Рахунок {0} не існує робить
 DocType: Purchase Receipt Item,Purchase Order Item No,Замовлення на товар Немає
-DocType: System Settings,System Settings,Системні налаштування
 DocType: Project,Project Type,Тип проекту
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Або мета або ціль Кількість Сума є обов&#39;язковим.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Вартість різних видів діяльності
@@ -2500,36 +2304,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
 DocType: Sales Order,Fully Billed,Повністю Оголошений
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Готівка касова
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Склад Доставка потрібно для фондового пункту {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
 DocType: Serial No,Is Cancelled,Скасовується
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Мої замовлення
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Мої замовлення
 DocType: Journal Entry,Bill Date,Білл Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 DocType: Supplier,Supplier Details,Постачальник Подробиці
-DocType: Communication,Recipients,Одержувачі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Загвинчування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,Накатки
 DocType: Expense Claim,Approval Status,Стан затвердження
 DocType: Hub Settings,Publish Items to Hub,Опублікувати товари в Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"З значення має бути менше, ніж значення в рядку в {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Банківський переказ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,"Будь ласка, виберіть банківський рахунок"
 DocType: Newsletter,Create and Send Newsletters,Створення і відправлення розсилки
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,"З дати повинні бути, перш ніж Дата"
 DocType: Sales Order,Recurring Order,Періодична Замовити
 DocType: Company,Default Income Account,За замовчуванням Рахунок Доходи
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
 DocType: Item Group,Check this if you want to show in website,"Перевірте це, якщо ви хочете, щоб показати на веб-сайті"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Ласкаво просимо в ERPNext
+,Welcome to ERPNext,Ласкаво просимо в ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Ваучер Деталь Кількість
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Свинець у Котирувальний
 DocType: Lead,From Customer,Від Замовника
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Дзвінки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Дзвінки
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Фото Одиниця виміру
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Замовлення на {0} не представлено
 ,Projected,Прогнозований
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Серійний номер {0} не належить Склад {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Примітка: Система не перевірятиме по-доставки і більш-бронювання для Пункт {0}, як кількість або сума 0"
@@ -2537,13 +2337,10 @@
 DocType: Issue,Opening Date,Дата розкриття
 DocType: Journal Entry,Remark,Зауваження
 DocType: Purchase Receipt Item,Rate and Amount,Темпи і обсяг
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Нудний
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Від замовлення клієнта
-DocType: Blog Category,Parent Website Route,Батько Сайт маршруту
 DocType: Sales Order,Not Billed,Чи не Оголошений
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Обидва Склад повинен належати тій же компанії
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Немає контактів ще не додавали.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Не активний
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Приземлився Вартість ваучера сума
 DocType: Time Log,Batched for Billing,Рулонірованние для рахунків
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,"Законопроекти, підняті постачальників."
@@ -2551,20 +2348,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Сума знижки
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернутися в рахунку-фактурі проти
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,"наприклад, ПДВ"
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,"наприклад, ПДВ"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Пункт 4
 DocType: Journal Entry Account,Journal Entry Account,Запис у щоденнику аккаунт
 DocType: Shopping Cart Settings,Quotation Series,Цитата серії
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Гаряча металу газу формування
 DocType: Sales Order Item,Sales Order Date,Продажі Порядок Дата
 DocType: Sales Invoice Item,Delivered Qty,Поставляється Кількість
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Склад {0}: Компанія є обов&#39;язковим
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Перейти до відповідної групи (зазвичай джерело коштів&gt; Короткострокові зобов&#39;язання&gt; податків і зборів та створити новий обліковий запис (натиснувши на Додати Дитину) типу &quot;Податок&quot; і згадують ставка податку.
 ,Payment Period Based On Invoice Date,Оплата період на основі рахунку-фактури Дата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Зниклих безвісти Курси валют на {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Лазерне різання
-DocType: Event,Monday,Понеділок
 DocType: Journal Entry,Stock Entry,Фото запис
 DocType: Account,Payable,До оплати
 DocType: Salary Slip,Arrear Amount,Сума недоїмки
@@ -2577,7 +2371,6 @@
 DocType: Lead,Address Desc,Адреса Опис вироби
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Принаймні один з продажу або покупки повинен бути обраний
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Де виробничі операції проводяться.
-DocType: Page,All,Всі
 DocType: Stock Entry Detail,Source Warehouse,Джерело Склад
 DocType: Installation Note,Installation Date,Дата установки
 DocType: Employee,Confirmation Date,Дата підтвердження
@@ -2585,9 +2378,8 @@
 DocType: Account,Sales User,Продажі Користувач
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,"Мінімальна Кількість не може бути більше, ніж Max Кількість"
 DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Встановіть
 DocType: Lead,Lead Owner,Ведучий Власник
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Склад требуется
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Склад требуется
 DocType: Employee,Marital Status,Сімейний стан
 DocType: Stock Settings,Auto Material Request,Авто Матеріал Запит
 DocType: Time Log,Will be updated when billed.,Буде оновлюватися при рахунок.
@@ -2601,44 +2393,40 @@
 DocType: Territory,Territory Targets,Територія Цілі
 DocType: Delivery Note,Transporter Info,Транспортер інформація
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Замовлення на поставлене продукт
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Назва компанії не може бути компанія
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Лист глави для шаблонів друку.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Назви для шаблонів друку, наприклад рахунок-проформа."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
 DocType: POS Profile,Update Stock,Оновлення зі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Суперфінішування
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Специфікація Оцінити
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Журнал Записів {0}-пов&#39;язана
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Журнал Записів {0}-пов&#39;язана
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Запис всіх комунікацій типу електронною поштою, телефоном, в чаті, відвідування і т.д."
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,"Будь ласка, вкажіть округлити МВЗ в Компанії"
 DocType: Purchase Invoice,Terms,Терміни
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Створити новий
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Створити новий
 DocType: Buying Settings,Purchase Order Required,"Купівля порядку, передбаченому"
 ,Item-wise Sales History,Пункт мудрий Історія продажів
 DocType: Expense Claim,Total Sanctioned Amount,Всього санкціоновані Сума
 ,Purchase Analytics,Купівля Аналітика
 DocType: Sales Invoice Item,Delivery Note Item,Доставка товару Примітка
 DocType: Expense Claim,Task,Завдання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Гоління
 DocType: Purchase Taxes and Charges,Reference Row #,Посилання ряд #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Серійний номер є обов&#39;язковим для пп {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Це корінь продавець і не можуть бути змінені.
 ,Stock Ledger,Книга обліку акцій
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Оцінити: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Оцінити: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Зарплата ковзання Відрахування
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Примітки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Виберіть вузол групи в першу чергу.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Мета повинна бути одним з {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Заповніть форму і зберегти його
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Завантажити звіт, що містить всю сировину з їх останньої інвентаризації статус"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Лицьова
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Форум
 DocType: Leave Application,Leave Balance Before Application,Залишити баланс перед нанесенням
 DocType: SMS Center,Send SMS,Відправити SMS
 DocType: Company,Default Letter Head,За замовчуванням бланку
 DocType: Time Log,Billable,Платіжні
-DocType: Authorization Rule,This will be used for setting rule in HR module,Ця інформація буде використовуватися для установки модуля правило в HR
 DocType: Account,Rate at which this tax is applied,"Швидкість, з якою цей податок застосовується"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Зміна порядку Кількість
 DocType: Company,Stock Adjustment Account,Фото коригування рахунку
@@ -2650,12 +2438,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Можливість Втрати
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Знижка Поля будуть доступні в Замовленні, покупка отриманні, в рахунку-фактурі"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Ім&#39;я нового Користувача. Примітка: Будь ласка, не створювати облікові записи для клієнтів і постачальників"
-DocType: Report,Report Type,Тип звіту
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Завантаження
 DocType: BOM Replace Tool,BOM Replace Tool,Специфікація Замінити інструмент
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Країна Шаблони Адреса мудрий замовчуванням
 DocType: Sales Order Item,Supplier delivers to Customer,Постачальник поставляє Покупцеві
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Показати податок розпад
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Імпорт та експорт даних
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Якщо ви залучати у виробничій діяльності. Дозволяє товару &quot;виробляється&quot;
@@ -2665,16 +2451,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Відсоток Розподіл має дорівнювати 100%
 DocType: Serial No,Out of AMC,З КУА
 DocType: Purchase Order Item,Material Request Detail No,Матеріал Запит Деталь Немає
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Жорсткий поворотним
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Зробіть обслуговування візит
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
 DocType: Company,Default Cash Account,За замовчуванням Грошовий рахунок
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,"Платні сума + Списання Сума не може бути більше, ніж загальний підсумок"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} не є допустимим Номер партії за Пункт {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Примітка: Якщо оплата не буде зроблена відносно будь-якого посилання, щоб запис журналу вручну."
 DocType: Item,Supplier Items,Постачальник товари
 DocType: Opportunity,Opportunity Type,Можливість Тип
@@ -2686,63 +2471,55 @@
 DocType: Hub Settings,Publish Availability,Опублікувати Наявність
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Фото Старіння
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} {1} &#39;відключений
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} {1} &#39;відключений
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
-DocType: Event,Sunday,Неділя
 DocType: Sales Team,Contribution (%),Внесок (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Обов&#39;язки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата запис не буде створена, так як &quot;Готівкою або банківський рахунок&quot; не було зазначено"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Обов&#39;язки
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажі Особа Ім&#39;я
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру в таблиці"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Додавання користувачів
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Додавання користувачів
 DocType: Pricing Rule,Item Group,Пункт Група
 DocType: Task,Actual Start Date (via Time Logs),Фактична дата початку (за допомогою журналів Time)
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирення
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Податки і збори Додав (Компанія валют)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Невелика Оголошений
 DocType: Item,Default BOM,За замовчуванням BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Будь ласка, повторіть введення назва компанії, щоб підтвердити"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна сума заборгованості з Amt
 DocType: Time Log Batch,Total Hours,Загальна кількість годин
 DocType: Journal Entry,Printing Settings,Налаштування друку
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Автомобільний
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Стан вимагається
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Метал лиття під тиском
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},"Всього Дебет повинна дорівнювати загальній виробленні. Різниця в тому, {0}"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобільний
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,З накладної
 DocType: Time Log,From Time,Від часу
 DocType: Notification Control,Custom Message,Текст повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Інвестиційний банкінг
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Виберіть вашу країну, часовий пояс і валюту"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Інвестиційний банкінг
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Готівкою або банківський рахунок є обов&#39;язковим для внесення запису оплата
 DocType: Purchase Invoice,Price List Exchange Rate,Ціни обмінний курс
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Маринування
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Лиття в піщані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Гальваніка
 DocType: Purchase Invoice Item,Rate,Ставка
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Інтерн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Інтерн
 DocType: Newsletter,A Lead with this email id should exist,Провід з цієї електронної пошти ID повинен існувати
 DocType: Stock Entry,From BOM,З специфікації
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Основний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Біржові операції до {0} заморожені
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку &quot;Generate&quot; Розклад"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,"Для Дата повинна бути такою ж, як від Дата для половини дня відпустки"
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,"Дата вступу повинні бути більше, ніж Дата народження"
 DocType: Salary Structure,Salary Structure,Зарплата Структура
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Кілька Ціна Правило існує з тими ж критеріями ,, будь ласка, вирішити \ конфлікту віддаючи пріоритет. Ціна Правила: {0}"
 DocType: Account,Bank,Банк
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Пропозиція Дата
 DocType: Hub Settings,Access Token,Маркер доступу
@@ -2751,45 +2528,37 @@
 DocType: Item,Is Fixed Asset Item,Фіксується активами товару
 DocType: Stock Entry,Including items for sub assemblies,У тому числі предмети для суб зібрань
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Якщо у вас довге формати друку, ця функція може бути використана, щоб розділити сторінку, яка буде надрукована на декількох сторінках з усіма колонтитули на кожній сторінці"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Всі території
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Всі території
 DocType: Purchase Invoice,Items,Предмети
 DocType: Fiscal Year,Year Name,Рік Назва
 DocType: Process Payroll,Process Payroll,Процес розрахунку заробітної плати
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,"Є більше свят, ніж робочих днів у цьому місяці."
 DocType: Product Bundle Item,Product Bundle Item,Продукт Зв&#39;язка товару
 DocType: Sales Partner,Sales Partner Name,Партнер по продажах Ім&#39;я
 DocType: Purchase Invoice Item,Image View,Перегляд зображення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Оздоблювальні та промислового обробка
 DocType: Issue,Opening Time,Відкриття Час
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Від і До дати, необхідних"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Цінні папери та бірж
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Буріння
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Видувна
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
 DocType: Tax Rule,Shipping City,Доставка Місто
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіант {0} (шаблон). Атрибути будуть скопійовані з шаблону, якщо &quot;Ні Копіювати&quot; не встановлений"
 DocType: Account,Purchase User,Купівля користувача
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Стук
-DocType: Web Page,Slideshow,Слайд-шоу
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,За замовчуванням Адреса Шаблон не може бути видалений
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
 DocType: Journal Entry,Print Heading,Роздрукувати товарної позиції
 DocType: Quotation,Maintenance Manager,Технічне обслуговування менеджер
-DocType: Workflow State,Search,Пошуковий
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Всього не може бути нульовим
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Дні з останнього ордена&quot; повинен бути більше або дорівнює нулю
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Пайка
 DocType: C-Form,Amended From,Змінений З
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Сирий матеріал
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Сирий матеріал
 DocType: Leave Application,Follow via Email,Дотримуйтесь по електронній пошті
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Сума податку після скидки Сума
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Дитячий рахунок існує для цього облікового запису. Ви не можете видалити цей аккаунт.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Або мета або ціль Кількість Сума є обов&#39;язковим
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Немає за замовчуванням специфікації не існує для п {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,"Будь ласка, виберіть проводки Дата першого"
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
 DocType: Leave Control Panel,Carry Forward,Переносити
@@ -2798,43 +2567,42 @@
 ,Produced,Вироблений
 DocType: Item,Item Code for Suppliers,Код товару для постачальників
 DocType: Issue,Raised By (Email),Raised By (E-mail)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Генеральна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Прикріпіть бланка
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Генеральна
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Прикріпіть бланка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Перелічіть ваші податкові голови (наприклад, ПДВ, митні і т.д., вони повинні мати унікальні імена) та їх стандартні ставки. Це створить стандартний шаблон, який ви можете відредагувати і додати пізніше."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Перелічіть ваші податкові голови (наприклад, ПДВ, митні і т.д., вони повинні мати унікальні імена) та їх стандартні ставки. Це створить стандартний шаблон, який ви можете відредагувати і додати пізніше."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Серійний пп Обов&#39;язково для серіалізовані елемент {0}
 DocType: Journal Entry,Bank Entry,Банк Стажер
 DocType: Authorization Rule,Applicable To (Designation),Застосовується до (Позначення)
-DocType: Blog Post,Blog Post,Повідомлення в блозі
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Група За
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Включити / відключити валюти.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Поштові витрати
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всього (АМТ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 DocType: Purchase Order,The date on which recurring order will be stop,"Дата, на яку повторюване замовлення буде зупинити"
 DocType: Quality Inspection,Item Serial No,Пункт Серійний номер
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Разом Поточна
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Година
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation",Серійний товару {0} не може бути оновлена \ на примирення зі
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Провести Матеріал Постачальнику
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Година
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+					using Stock Reconciliation",Серійний товару {0} не може бути оновлена \ на примирення зі
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Провести Матеріал Постачальнику
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може бути склад. Склад повинен бути встановлений на Фондовій запис або придбати отриманні
 DocType: Lead,Lead Type,Ведучий Тип
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Створити цитати
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Всі ці предмети вже виставлений
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Ви не уповноважений стверджувати листя на Блок Терміни
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Всі ці предмети вже виставлений
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Може бути схвалене {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Умови правил
 DocType: BOM Replace Tool,The new BOM after replacement,Новий специфікації після заміни
 DocType: Features Setup,Point of Sale,Касовий термінал
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Керлінг
 DocType: Account,Tax,Податок
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},"Ряд {0}: {1}, не є допустимим {2}"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Рафінування
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},"Ряд {0}: {1}, не є допустимим {2}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Від Bundle продукту
 DocType: Production Planning Tool,Production Planning Tool,Планування виробництва інструменту
 DocType: Quality Inspection,Report Date,Дата звіту
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Маршрутизація
 DocType: C-Form,Invoices,Рахунки
 DocType: Job Opening,Job Title,Професія
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} вже виділено Потрібні {1} для періоду {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} Одержувачі
 DocType: Features Setup,Item Groups in Details,Групи товарів в деталі
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
@@ -2843,33 +2611,29 @@
 DocType: Stock Entry,Update Rate and Availability,Частота оновлення і доступність
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Відсоток вам дозволено отримати або доставити більше порівняно з замовленої кількості. Наприклад: Якщо ви замовили 100 одиниць. і ваше допомога становить 10%, то ви маєте право отримати 110 одиниць."
 DocType: Pricing Rule,Customer Group,Група клієнтів
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: Item,Website Description,Сайт Опис
 DocType: Serial No,AMC Expiry Date,КУА Дата закінчення терміну дії
 ,Sales Register,Продажі Реєстрація
 DocType: Quotation,Quotation Lost Reason,Цитата Втрати Причина
 DocType: Address,Plant,Завод
-DocType: DocType,Setup,Установка
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там немає нічого, щоб змінити."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Резюме для цього місяця і в очікуванні діяльності
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Холодна прокатка
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Будь ласка, виберіть переносити, якщо ви також хочете включити баланс попереднього фінансового року залишає цей фінансовий рік"
 DocType: GL Entry,Against Voucher Type,На Сертифікати Тип
 DocType: Item,Attributes,Атрибути
-DocType: Packing Slip,Get Items,Отримати товари
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Отримати товари
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,"Будь ласка, введіть Списання аккаунт"
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Остання дата замовлення
-DocType: DocField,Image,Зображення
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Зробити акцизний Рахунок
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
-DocType: Communication,Other,Інший
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,Код операції не встановлений
 DocType: Production Order,Planned Start Date,Планована дата початку
 DocType: Serial No,Creation Document Type,Створення типу документа
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Візит
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Візит
 DocType: Leave Type,Is Encash,Є Обналічиваніє
 DocType: Purchase Invoice,Mobile No,Номер мобільного
 DocType: Payment Tool,Make Journal Entry,Зробити запис журналу
@@ -2877,35 +2641,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Дані проекту мудрий не доступні для цитати
 DocType: Project,Expected End Date,Очікувана Дата закінчення
 DocType: Appraisal Template,Appraisal Template Title,Оцінка шаблону Назва
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Комерційна
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Комерційна
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Батько товару {0} не повинні бути зі пункт
 DocType: Cost Center,Distribution Id,Розподіл Id
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Високий Послуги
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Всі продукти або послуги.
 DocType: Purchase Invoice,Supplier Address,Постачальник Адреса
-DocType: Contact Us Settings,Address Line 2,Адресний рядок 2
-DocType: ToDo,Reference,Посилання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Перфорування
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,З Кількість
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Серія є обов&#39;язковим
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Фінансові послуги
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Відповідність атрибутів {0} має бути в межах {1} до {2} в збільшень {3}
 DocType: Tax Rule,Sales,Продажів
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Склад необхідний для складі Пункт {0}
 DocType: Leave Allocation,Unused leaves,Невикористані листя
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,За замовчуванням заборгованість Дебіторська
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Розпилювання
 DocType: Tax Rule,Billing State,Державний рахунків
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ламінування
 DocType: Item Reorder,Transfer,Переклад
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Fetch розібраному специфікації (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Спікання
 DocType: Journal Entry,Pay To / Recd From,Зверніть Для / RECD Від
 DocType: Naming Series,Setup Series,Серія установки
 DocType: Supplier,Contact HTML,Зв&#39;язатися з HTML-
@@ -2916,9 +2674,8 @@
 DocType: Company,Retail,Роздрібна торгівля
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Замовник {0} не існує
 DocType: Attendance,Absent,Відсутнім
-DocType: Product Bundle,Product Bundle,Зв&#39;язка товарів
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Зв&#39;язка товарів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Дроблення
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купити податки і збори шаблон
 DocType: Upload Attendance,Download Template,Завантажити Шаблон
 DocType: GL Entry,Remarks,Зауваження
@@ -2926,48 +2683,44 @@
 DocType: Journal Entry,Write Off Based On,Списання заснований на
 DocType: Features Setup,POS View,POS Перегляд
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Установка рекорд для серійним номером
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Безперервне розливання
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Введи
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Вище
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Холодна розмірів
 DocType: Salary Slip,Earning & Deduction,Заробіток і дедукція
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Рахунок {0} не може бути група
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Область
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Необов&#39;язково. Ця установка буде використовуватися для фільтрації в різних угод.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Необов&#39;язково. Ця установка буде використовуватися для фільтрації в різних угод.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Негативний Оцінка Оцініть не допускається
 DocType: Holiday List,Weekly Off,Щотижневий Викл
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для наприклад 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Попередня прибуток / збиток (кредит)
 DocType: Sales Invoice,Return Against Sales Invoice,Повернутися проти накладна
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Пункт 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в Компанії {1}"
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в Компанії {1}"
 DocType: Serial No,Creation Time,Час створення
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Загальна виручка
 DocType: Sales Invoice,Product Bundle Help,Продукт Зв&#39;язка Допомога
 ,Monthly Attendance Sheet,Щомісячна відвідуваність лист
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,"Чи не запис, не знайдено"
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов&#39;язковим для пп {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Отримати елементів з комплекту продукту
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Рахунок {0} не діє
 DocType: GL Entry,Is Advance,Є Попередня
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Відвідуваність З Дата і відвідуваність Дата є обов&#39;язковим
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть &quot;субпідряду&quot;, як так чи ні"
 DocType: Sales Team,Contact No.,Зв&#39;язатися No.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,&quot;Прибуток і збитки&quot; тип рахунку {0} не допускаються в вхідний отвір
-DocType: Workflow State,Time,Час
 DocType: Features Setup,Sales Discounts,Продажі Знижки
 DocType: Hub Settings,Seller Country,Продавець Країна
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
 DocType: Sales Invoice,Terms and Conditions Details,Правила та умови подробиці
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Продажі Податки і збори шаблону
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Одяг та аксесуари
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Кількість ордена
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / банер, який буде відображатися у верхній частині списку продукції."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Вкажіть умови для розрахунку суми доставки
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Додати Дитину
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль тварин у зазначений заморожені рахунки &amp; Редагувати заморожені Записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити МВЗ книзі, як це має дочірні вузли"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Коефіцієнт перетворення потрібно
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Серійний #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Комісія з продажу
 DocType: Offer Letter Term,Value / Description,Значення / Опис
@@ -2975,15 +2728,13 @@
 ,Customers Not Buying Since Long Time,Клієнти не купувати з довгого часу
 DocType: Production Order,Expected Delivery Date,Очікувана дата поставки
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Опуклий
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Лиття випарного-модель
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Представницькі витрати
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Видаткова накладна {0} має бути скасований до скасування цього замовлення клієнта
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Видаткова накладна {0} має бути скасований до скасування цього замовлення клієнта
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Вік
 DocType: Time Log,Billing Amount,Сума рахунків
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Невірний кількість вказано за пунктом {0}. Кількість повинна бути більше 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Заявки на відпустку.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Рахунок з існуючою транзакції не можуть бути вилучені
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Судові витрати
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","День місяця, в який автоматично замовлення буде генеруватися, наприклад, 05, 28 і т.д."
 DocType: Sales Invoice,Posting Time,Проводка Час
@@ -2997,26 +2748,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Новий Клієнт Виручка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Витрати на відрядження
 DocType: Maintenance Visit,Breakdown,Зламатися
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Рахунок: {0} з валютою: {1} не може бути обраний
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
-apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} не належить компанії: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьки рахунку {1} не належить компанії: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,"Успішно видалений всі угоди, пов&#39;язані з цією компанією!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Хонингование
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
-DocType: Feed,Full Name,Повне ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Клінч
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Випробувальний термін
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,За замовчуванням Склад є обов&#39;язковим для фондового Пункт.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Виплата заробітної плати за місяць {0} і рік {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Швидкість Ціни, якщо не вистачає"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Всього сплачена сума
 ,Transferred Qty,Переведений Кількість
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навігаційний
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Планування
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Планування
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Зробіть Час Увійдіть Batch
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Виданий
 DocType: Project,Total Billing Amount (via Time Logs),Всього рахунків Сума (за допомогою журналів Time)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Ми продаємо цей пункт
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Ми продаємо цей пункт
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Постачальник Id
 DocType: Journal Entry,Cash Entry,Грошові запис
 DocType: Sales Partner,Contact Desc,Зв&#39;язатися Опис вироби
@@ -3025,18 +2773,16 @@
 DocType: Brand,Item Manager,Стан менеджер
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,"Додати рядки, щоб встановити щорічні бюджети на рахунках."
 DocType: Buying Settings,Default Supplier Type,За замовчуванням Тип Постачальник
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Кар&#39;єр
 DocType: Production Order,Total Operating Cost,Загальна експлуатаційна вартість
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Примітка: Пункт {0} введений кілька разів
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Всі контакти.
 DocType: Newsletter,Test Email Id,Тест Email ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Абревіатура Компанія
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Абревіатура Компанія
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Якщо ви будете слідувати контроль якості. Дозволяє предмета потрібно і QA QA Товар отриманні покупки
 DocType: GL Entry,Party Type,Тип партія
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,"Сировина не може бути таким же, як основний пункт"
 DocType: Item Attribute Value,Abbreviation,Скорочення
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не так Authroized {0} перевищує межі
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Ротаційного формування
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Зарплата шаблоном.
 DocType: Leave Type,Max Days Leave Allowed,Макс днів відпустки тварин
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Встановіть Податковий Правило кошику
@@ -3050,15 +2796,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Котирування на постачанні або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль тварин редагувати заморожені акції
 ,Territory Target Variance Item Group-Wise,Територія Цільова Різниця Пункт Група Мудрий
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Всі групи покупців
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} є обов&#39;язковим. Може бути, Обмін валюти запис не створена для {1} до {2}."
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Податковий шаблону є обов&#39;язковим.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Рахунок {0}: Батько не існує обліковий запис {1}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ціни Оцінити (Компанія валют)
 DocType: Account,Temporary,Тимчасовий
 DocType: Address,Preferred Billing Address,Перевага платіжний адреса
 DocType: Monthly Distribution Percentage,Percentage Allocation,Відсоток Розподіл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Секретар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Секретар
 DocType: Serial No,Distinct unit of an Item,Окремий підрозділ в пункті
 DocType: Pricing Rule,Buying,Купівля
 DocType: HR Settings,Employee Records to be created by,"Співробітник звіти, які будуть створені"
@@ -3071,41 +2817,36 @@
 ,Item-wise Price List Rate,Пункт мудрий Ціни Оцінити
 DocType: Purchase Order Item,Supplier Quotation,Постачальник цитати
 DocType: Quotation,In Words will be visible once you save the Quotation.,"За словами будуть видні, як тільки ви збережете цитати."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,По прасуванню одягу
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} зупинений
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Майбутні події
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Потрібно клієнтів
-DocType: Letter Head,Letter Head,Лист Керівник
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Швидкий доступ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} є обов&#39;язковим для повернення
 DocType: Purchase Order,To Receive,Отримати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Термозбіжна Місце
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Доходи / витрати
 DocType: Employee,Personal Email,Особиста пошта
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Всього Різниця
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Всього Різниця
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Якщо опція включена, то система буде відправляти бухгалтерських проводок з інвентаризації автоматично."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Брокерська діяльність
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерська діяльність
 DocType: Address,Postal Code,Поштовий індекс
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
 DocType: Customer,From Lead,Зі свинцю
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Замовлення випущений у виробництво.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,"POS-профілю потрібно, щоб зробити запис POS"
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Стругання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Стандартний Продаж
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Стандартний Продаж
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Принаймні одне склад є обов&#39;язковим
 DocType: Serial No,Out of Warranty,З гарантії
 DocType: BOM Replace Tool,Replace,Замінювати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} проти накладна {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} проти накладна {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,"Будь ласка, введіть замовчуванням Одиниця виміру"
 DocType: Purchase Invoice Item,Project Name,Назва проекту
 DocType: Supplier,Mention if non-standard receivable account,Згадка якщо нестандартна заборгованість рахунок
-DocType: Workflow State,Edit,Редагувати
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
 DocType: Features Setup,Item Batch Nos,Пункт Пакетне пп
 DocType: Stock Ledger Entry,Stock Value Difference,Фото Значення Різниця
@@ -3113,13 +2854,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирення Оплата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Податкові активи
 DocType: BOM Item,BOM No,Специфікація Немає
-DocType: Contact Us Settings,Pincode,PIN-код
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} або вже порівнюється з іншою ваучер
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Запис у щоденнику {0} не має облікового запису {1} або вже порівнюється з іншою ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,"Специфікації, які будуть замінені"
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Новий зі Одиниця виміру повинен відрізнятися від поточного запасу Одиниця виміру
 DocType: Account,Debit,Дебет
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Листя повинні бути виділені в упаковці 0,5"
 DocType: Production Order,Operation Cost,Операція Вартість
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Завантажити відвідуваність з CSV-файлу
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Видатний Amt
@@ -3135,10 +2874,7 @@
 DocType: Project,Default Cost Center,За замовчуванням Центр Вартість
 DocType: Purchase Invoice,End Date,Дата закінчення
 DocType: Employee,Internal Work History,Внутрішня Історія роботи
-DocType: DocField,Column Break,Розрив стовпця
-DocType: Event,Thursday,Четвер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Private Equity
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Звертаючись
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
 DocType: Sales Invoice,Exhibition,Виставка
@@ -3151,31 +2887,30 @@
 DocType: Employee,Held On,Відбудеться
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Виробництво товару
 ,Employee Information,Співробітник Інформація
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Фінансовий рік Дата закінчення
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Фінансовий рік Дата закінчення
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фільтрувати на основі Сертифікати Ні, якщо згруповані по Ваучер"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Зробити постачальників цитати
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Зробити постачальників цитати
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Скорочення Заробіток для відпустки без збереження (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Повсякденне Залишити
 DocType: Batch,Batch ID,Пакетна ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Примітка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Накладний Тенденції
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Резюме цього тижня
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} повинен бути куплені або субпідрядником товару в рядку {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} можуть бути оновлені тільки через біржових операцій
 DocType: GL Entry,Party,Вечірка
 DocType: Sales Order,Delivery Date,Дата доставки
-DocType: DocField,Currency,Валюта
 DocType: Opportunity,Opportunity Date,Можливість Дата
 DocType: Purchase Receipt,Return Against Purchase Receipt,Повернутися Проти покупки отриманні
 DocType: Purchase Order,To Bill,Для Білла
 DocType: Material Request,% Ordered,Замовив%
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Відрядна робота
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Відрядна робота
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,СР Купівля Оцінити
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
 DocType: Employee,History In Company,Історія У Компанії
@@ -3192,77 +2927,68 @@
 DocType: Opportunity,To Discuss,Обговорити
 DocType: SMS Settings,SMS Settings,Налаштування SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Тимчасові рахунки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Чорний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Специфікація Вибух товару
 DocType: Account,Auditor,Аудитор
 DocType: Purchase Order,End date of current order's period,Дата закінчення періоду поточного замовлення
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Зробити пропозицію лист
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Повернення
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
-DocType: DocField,Fold,Скласти
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,"За замовчуванням Одиниця виміру для варіанту повинні бути такими ж, як шаблон"
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
 DocType: Project Task,Pending Review,В очікуванні відгук
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Будь ласка уточніть
 DocType: Task,Total Expense Claim (via Expense Claim),Всього Заявити витрат (за допомогою Expense претензії)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Ідентифікатор клієнта
-DocType: Page,Page Name,Сторінку
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,"Часу повинен бути більше, ніж від часу"
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьки рахунку {1} НЕ Bolong компанії {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Шпиндель обробка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Продажі Замовити {0} не представлено
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьки рахунку {1} НЕ Bolong компанії {2}
 DocType: BOM,Last Purchase Rate,Остання Купівля Оцінити
 DocType: Account,Asset,Актив
 DocType: Project Task,Task ID,Завдання ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","наприклад, &quot;МК&quot;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","наприклад, &quot;МК&quot;"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Фото не може існувати Пункт {0}, так як має варіанти"
 ,Sales Person-wise Transaction Summary,Продажі Людина-мудрий Резюме угода
-DocType: System Settings,Time Zone,Часовий пояс
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Склад {0} не існує
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зареєструватися на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Щомісячні Відсотки розподілу
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Обраний елемент не може мати Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів поставляється на цьому накладної
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Зшивання
 DocType: Customer,Customer Details,Реквізити клієнта
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Формування
 DocType: Employee,Reports to,Доповіді
 DocType: SMS Settings,Enter url parameter for receiver nos,Введіть URL параметр для приймача ДАІ
 DocType: Sales Invoice,Paid Amount,Виплачена сума
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Закриття рахунку {0} повинен бути типу &quot;відповідальності&quot;
 ,Available Stock for Packing Items,Доступно для Упаковка зі Items
 DocType: Item Variant,Item Variant,Пункт Варіант
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,"Установка цього Адреса шаблон за замовчуванням, оскільки немає ніякого іншого замовчуванням"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Управління якістю
 DocType: Production Planning Tool,Filter based on customer,Фільтр на основі клієнта
 DocType: Payment Tool Detail,Against Voucher No,На Сертифікати Немає
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Будь ласка, введіть бажану кількість Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 DocType: Tax Rule,Purchase,Купівля
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Баланс Кількість
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Баланс Кількість
 DocType: Item Group,Parent Item Group,Батько товару Група
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,МВЗ
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Складські приміщення.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Складські приміщення.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Швидкість, з якою постачальника валюті, конвертується в базову валюту компанії"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ряд # {0}: таймінги конфлікти з низкою {1}
 DocType: Opportunity,Next Contact,Наступна Контактні
 DocType: Employee,Employment Type,Вид зайнятості
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Основні активи
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Термін подачі заяв не може бути з двох alocation записів
 DocType: Item Group,Default Expense Account,За замовчуванням Витрати аккаунт
 DocType: Employee,Notice (days),Примітка (днів)
-DocType: Page,Yes,Так
 DocType: Tax Rule,Sales Tax Template,Податок з продажу шаблону
 DocType: Employee,Encashment Date,Інкасація Дата
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Гальванопластика
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","На ваучері Тип повинен бути одним із Замовлення, накладна або журнал запис"
 DocType: Account,Stock Adjustment,Фото Регулювання
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},За замовчуванням активність Вартість існує для виду діяльності - {0}
 DocType: Production Order,Planned Operating Cost,Планована операційна Вартість
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,Новий {0} Ім&#39;я
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Додається {0} # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},Додається {0} # {1}
 DocType: Job Applicant,Applicant Name,Заявник Ім&#39;я
 DocType: Authorization Rule,Customer / Item Name,Замовник / Назва товару
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3275,7 +3001,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Серійний номер є обов&#39;язковим для пп {0}
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,"Будь ласка, сформулюйте з / в діапазоні"
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Створений
 DocType: Serial No,Under AMC,Під КУА
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оцінка перераховується з урахуванням витрат приземлився кількість ваучера
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Налаштування за замовчуванням для продажу угод.
@@ -3287,17 +3012,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Мінімальна сума
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Оновлення готової продукції
 DocType: Workstation,per hour,в годину
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Серія {0} вже використовується в {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки існує запис складі книга для цього складу."
 DocType: Company,Distribution,Розподіл
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Виплачувана сума
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Відправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Керівник проекту
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Відправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Макс знижка дозволило пункту: {0} {1}%
 DocType: Customer,Default Taxes and Charges,За замовчуванням Податки і збори
 DocType: Account,Receivable,Дебіторська заборгованість
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Чи не дозволено змінювати Постачальник як вже існує замовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Чи не дозволено змінювати Постачальник як вже існує замовлення
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, яка дозволила представити транзакції, які перевищують встановлені ліміти кредитування."
 DocType: Sales Invoice,Supplier Reference,Постачальник Посилання
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Якщо відзначене, специфікації на південь від складання деталей будуть розглядатися на отримання сировини. В іншому випадку, всі елементи під-монтажні буде розглядатися в якості сировинного матеріалу."
@@ -3305,8 +3029,8 @@
 DocType: Hub Settings,Seller Description,Продавець Опис
 DocType: Employee Education,Qualification,Кваліфікація
 DocType: Item Price,Item Price,Ціна товару
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Мило і миючих засобів
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Кінофільм &amp; Відео
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Мило і миючих засобів
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Кінофільм &amp; Відео
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Упорядкований
 DocType: Warehouse,Warehouse Name,Склад Ім&#39;я
 DocType: Naming Series,Select Transaction,Виберіть угода
@@ -3315,7 +3039,6 @@
 DocType: BOM,Rate Of Materials Based On,Оцінити матеріалів на основі
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Підтримка Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Компанія на складах не вистачає {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Фото Одиниця виміру Замінити Utility
 DocType: POS Profile,Terms and Conditions,Правила та умови
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Для Дата повинна бути в межах фінансового року. Припускаючи Дата = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Тут ви можете зберегти зріст, вага, алергії, медичні проблеми і т.д."
@@ -3327,7 +3050,7 @@
 DocType: Sales Order Item,For Production,Для виробництва
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,"Будь ласка, введіть замовлення клієнта в таблиці вище"
 DocType: Project Task,View Task,Подивитися Завдання
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Ваш фінансовий рік починається
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Ваш фінансовий рік починається
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,"Будь ласка, введіть Купівля розписок"
 DocType: Sales Invoice,Get Advances Received,Отримати аванси отримані
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
@@ -3335,20 +3058,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),"Налаштування сервера вхідної в підтримку електронний ідентифікатор. (наприклад, support@example.com)"
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Брак Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Стан варіант {0} існує з тими ж атрибутами
 DocType: Salary Slip,Salary Slip,Зарплата ковзання
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Полірувальний
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,&quot;Для Дата&quot; потрібно
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Для Дата&quot; потрібно
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
 DocType: Sales Invoice Item,Sales Order Item,Продажі замовлення Продукт
 DocType: Salary Slip,Payment Days,Дні оплати
 DocType: BOM,Manage cost of operations,Управління вартість операцій
 DocType: Features Setup,Item Advanced,Пункт Розширений
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Гаряча прокатка
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Коли будь-який з перевірених угод &quot;Передано&quot;, електронною поштою спливаюче автоматично відкривається, щоб відправити лист у відповідний &quot;Контакт&quot; в цій транзакції, з угоди ролі вкладення. Користувач може або не може відправити по електронній пошті."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальні налаштування
 DocType: Employee Education,Employee Education,Співробітник Освіта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
 DocType: Salary Slip,Net Pay,Чистий Платне
 DocType: Account,Account,Рахунок
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Серійний номер {0} вже отримав
@@ -3357,35 +3078,28 @@
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
 DocType: Expense Claim,Total Claimed Amount,Усього сума претензії
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Потенційні можливості для продажу.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Лікарняний
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Невірний {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Лікарняний
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Платіжний адреса Ім&#39;я
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Універмаги
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Система Баланс
-DocType: Workflow,Is Active,Активний
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Система Баланс
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Зберегти документ у першу чергу.
 DocType: Account,Chargeable,Оплаті
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Змінити Абревіатура
-DocType: Workflow State,Primary,Основний
 DocType: Expense Claim Detail,Expense Date,Витрати Дата
 DocType: Item,Max Discount (%),Макс Знижка (%)
-DocType: Communication,More Information,Більше інформації
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Останнє Сума замовлення
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Вибухові роботи
 DocType: Company,Warn,Попереджати
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Стан оцінка оновлюються
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
 DocType: BOM,Manufacturing User,Виробництво користувача
 DocType: Purchase Order,Raw Materials Supplied,Сировина постачається
 DocType: Purchase Invoice,Recurring Print Format,Періодична друку Формат
-DocType: Communication,Series,Серія
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,"Очікувана дата поставки не може бути, перш ніж Купівля Порядок Дата"
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
-DocType: Communication,Email,E-mail
 DocType: Item Group,Item Classification,Пункт Класифікація
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,менеджер з розвитку бізнесу
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,менеджер з розвитку бізнесу
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Технічне обслуговування Мета візиту
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Період
 ,General Ledger,Головна бухгалтерська книга
@@ -3395,9 +3109,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуємо Змінити порядок Рівень
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 DocType: Features Setup,To get Item Group in details table,Щоб отримати елемент групи в таблиці дані
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Перемальовування
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Пакетна {0} пункту {1} закінчився.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Травлення
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,Пакетна {0} пункту {1} закінчився.
 DocType: Sales Invoice,Commission,Комісія
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3412,7 +3124,7 @@
 {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
 </code></pre>","<h4> Шаблон за замовчуванням </h4><p> Використовує <a href=""http://jinja.pocoo.org/docs/templates/"">дзіндзя темплатним</a> і всі поля Адреса (включаючи Настроювані поля якщо такі є) будуть доступні </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Slip Deduction,Default Amount,За замовчуванням сума
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Склад не найден в системі
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Склад не найден в системі
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Резюме цього місяця
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль якості читання
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,"`Заморожування Акції Стара Than` повинна бути менше, ніж% D днів."
@@ -3431,13 +3143,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 DocType: Supplier,Address and Contacts,Адреса та контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Тримайте це веб-дружній 900px (W) по 100px (ч)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Тримайте це веб-дружній 900px (W) по 100px (ч)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Виробничий замовлення не може бути піднято проти Item Шаблон
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Збори оновлюються в отриманні покупки від кожного елемента
 DocType: Payment Tool,Get Outstanding Vouchers,Отримати Видатні Ваучери
 DocType: Warranty Claim,Resolved By,Вирішили За
 DocType: Appraisal,Start Date,Дата початку
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Значення
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Виділяють листя протягом.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,"Натисніть тут, щоб перевірити,"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити себе як батька рахунок
@@ -3447,55 +3158,43 @@
 DocType: Item,Average time taken by the supplier to deliver,"Середній час прийняті постачальником, щоб доставити"
 DocType: Time Log,Hours,Часів
 DocType: Project,Expected Start Date,Очікувана дата початку
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Рухомий
-DocType: ToDo,Priority,Пріоритет
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,"Видалити елемент, якщо звинувачення не застосовується до цього пункту"
-DocType: Dropbox Backup,Dropbox Access Allowed,Дозволено Dropbox доступу
-DocType: Dropbox Backup,Weekly,Щотижня
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,"Напр., smsgateway.com/api/send_sms.cgi"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Отримати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Отримати
 DocType: Maintenance Visit,Fully Completed,Повністю завершено
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Повний
 DocType: Employee,Educational Qualification,Освітня кваліфікація
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Employee Leave Approver,Employee Leave Approver,Співробітник Залишити затверджує
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} був успішно доданий в нашу розсилку.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Не можете оголосити як втрачений, бо цитати був зроблений."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Електронно-променева обробка
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Виробничий замовлення {0} повинен бути представлений
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Основні доповіді
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Фото Леджер записів залишки оновлюються
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Основні доповіді
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Додати / Редагувати Ціни
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Діаграма МВЗ
 ,Requested Items To Be Ordered,"Необхідні товари, які можна замовити"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Мої Замовлення
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Мої Замовлення
 DocType: Price List,Price List Name,Ціна Ім&#39;я
 DocType: Time Log,For Manufacturing,Для виготовлення
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,Загальні дані
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,Загальні дані
 DocType: BOM,Manufacturing,Виробництво
 ,Ordered Items To Be Delivered,Замовлені товари повинні бути доставлені
 DocType: Account,Income,Дохід
-,Setup Wizard,Майстер установки
 DocType: Industry Type,Industry Type,Промисловість Тип
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Щось пішло не так!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Увага: Залиште додаток містить наступні дати блок
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Видаткова накладна {0} вже були представлені
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Дата Виконання
 DocType: Purchase Invoice Item,Amount (Company Currency),Сума (Компанія валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Лиття під тиском
-DocType: Email Alert,Reference Date,Посилання Дата
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Організація блок (департамент) господар.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Будь ласка, введіть дійсні мобільних NOS"
 DocType: Budget Detail,Budget Detail,Бюджет Подробиці
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Будь ласка, введіть повідомлення перед відправкою"
-DocType: Async Task,Status,Статус
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Фото Одиниця виміру оновлюється Пункт {0}
-DocType: Company History,Year,Рік
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Точка-в-продажу Профіль
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Оновіть SMS Налаштування
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Час входу {0} вже виставлений
@@ -3508,74 +3207,70 @@
 ,Serial No Service Contract Expiry,Серійний номер Сервіс контракт Термін
 DocType: Item,Unit of Measure Conversion,Одиниця виміру конверсії
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Співробітник не може бути змінений
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Ви не можете кредитні та дебетові ж обліковий запис в той же час
 DocType: Naming Series,Help HTML,Допомога HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Посібник для пере- {0} схрещеними Пункт {1}
 DocType: Address,Name of person or organization that this address belongs to.,"Назва особі або організації, що ця адреса належить."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Ваші Постачальники
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Ваші Постачальники
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Інший Зарплата Структура {0} активним співробітником {1}. Будь ласка, його статус «Неактивний», щоб продовжити."
 DocType: Purchase Invoice,Contact,Контакт
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Отримано від
 DocType: Features Setup,Exports,Експорт
 DocType: Lead,Converted,Перероблений
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: З {0} для {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 DocType: Issue,Content Type,Тип вмісту
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Комп&#39;ютер
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
 DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Пункт: {0} не існує в системі
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,"Ви не авторизовані, щоб встановити значення Frozen"
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Cost Center,Budgets,Бюджети
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Оновлений
 DocType: Employee,Emergency Contact Details,Аварійний Контактні дані
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Що це робить?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Що це робить?
 DocType: Delivery Note,To Warehouse,На склад
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Рахунок {0} був введений більш ніж один раз для фінансового року {1}
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Має серійний номер &#39;не може бути&#39; Так &#39;для не-фондовій пункту
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Відвідуваність не можуть бути відзначені для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Ціни Правило Допомога
 DocType: Purchase Taxes and Charges,Account Head,Рахунок Керівник
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Оновлення додаткових витрат для розрахунку приземлився вартість товарів
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Електричний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Електричний
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна вартість Різниця (з - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Ідентифікатор користувача не встановлений Employee {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Зміцнення
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Від гарантії Претензії
 DocType: Stock Entry,Default Source Warehouse,Джерело за замовчуванням Склад
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Нагадування про день народження для {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Притирання
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Дні з останнього ордена
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Дні з останнього ордена
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
-DocType: User,Enabled,Включено
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Активи фонду
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Імпорт передплатників
 DocType: Target Detail,Target Qty,Цільова Кількість
 DocType: Attendance,Present,Теперішній час
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примітка {0} не повинні бути представлені
 DocType: Notification Control,Sales Invoice Message,Рахунок по продажах повідомлення
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Закриття рахунку {0} повинен бути типу відповідальністю / власний капітал
 DocType: Authorization Rule,Based On,Грунтуючись на
 DocType: Sales Order Item,Ordered Qty,Замовив Кількість
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Заморожені Upto
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Проектна діяльність / завдання.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Створення Зарплата ковзає
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} не є допустимим ID електронної пошти
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Покупка повинна бути перевірена, якщо вибраний Стосується для в {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Знижка повинна бути менше, ніж 100"
-DocType: ToDo,Low,Низький
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Спінінг
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Приземлився Вартість ваучера
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Будь ласка, встановіть {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
@@ -3597,7 +3292,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Назва кампанії потрібно
 DocType: Maintenance Visit,Maintenance Date,Технічне обслуговування Дата
 DocType: Purchase Receipt Item,Rejected Serial No,Відхилено Серійний номер
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Глибокий малюнок
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Новий бюлетень
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Показати Баланс
@@ -3607,7 +3301,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,Специфікація і виробництво Кількість потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Клепка
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Специфікація замінити
 ,Sales Analytics,Продажі Аналітика
 DocType: Manufacturing Settings,Manufacturing Settings,Налаштування Виробництво
@@ -3619,28 +3312,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Новий акаунт Ім&#39;я
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировина постачається Вартість
 DocType: Selling Settings,Settings for Selling Module,Налаштування для модуля Продаж
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Обслуговування клієнтів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Обслуговування клієнтів
 DocType: Item,Thumbnail,Мініатюра
 DocType: Item Customer Detail,Item Customer Detail,Пункт Подробиці клієнтів
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Підтвердіть Ваш E-mail
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Пропозиція кандидата на роботу.
 DocType: Notification Control,Prompt for Email on Submission of,Запитувати Email про подання
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Сумарна кількість виділених листя більше днів в періоді
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Пункт {0} повинен бути запас товару
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,За замовчуванням роботи на складі Прогрес
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0} вимагається
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Вакуумного формування
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути перед матеріалу Запит Дата
-DocType: Contact Us Settings,City,Місто
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Ультразвукової обробки
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Помилка: Чи не діє ID?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Пункт {0} повинен бути Продажі товару
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
 DocType: Account,Equity,Капітал
 DocType: Sales Order,Printing Details,Друк Подробиці
 DocType: Task,Closing Date,Дата закриття
 DocType: Sales Order Item,Produced Quantity,Здобуте кількість
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Інженер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Інженер
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Пошук Sub Асамблей
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
 DocType: Sales Partner,Partner Type,Тип Партнер
@@ -3648,7 +3337,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
 DocType: Production Order,Production Order,Виробничий замовлення
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Установка Примітка {0} вже були представлені
 DocType: Quotation Item,Against Docname,На DOCNAME
 DocType: SMS Center,All Employee (Active),Всі Співробітник (Активний)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Дивитися зараз
@@ -3656,26 +3345,24 @@
 DocType: BOM,Raw Material Cost,Сировина Вартість
 DocType: Item,Re-Order Level,Re-Order рівні
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть предметів і плановий Кількість, для якого ви хочете, щоб підняти виробничі замовлення або завантажити сировини для аналізу."
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Діаграма Ганта
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Неповний робочий день
 DocType: Employee,Applicable Holiday List,Стосується Список відпочинку
 DocType: Employee,Cheque,Чек
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Серія Оновлене
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Тип звіту є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Тип звіту є обов&#39;язковим
 DocType: Item,Serial Number Series,Серійний номер серії
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов&#39;язковим для фондового Пункт {0} в рядку {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Роздрібна та оптова
 DocType: Issue,First Responded On,По-перше відгукнувся на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Хрест Лістинг Пункт в декількох групах
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Перший користувача: Ви
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Перший користувача: Ви
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фінансовий рік Дата початку і фінансовий рік Дата закінчення вже встановлені у фінансовий рік {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Успішно Примирення
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Успішно Примирення
 DocType: Production Order,Planned End Date,Планована Дата закінчення
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Де елементи зберігаються.
 DocType: Tax Rule,Validity,Термін дії
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сума за рахунками
 DocType: Attendance,Attendance,Відвідуваність
-DocType: Page,No,Немає
 DocType: BOM,Materials,Матеріали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Якщо не встановлено, то список буде потрібно додати до кожного відділу, де він повинен бути застосований."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Дата публікації і розміщення час є обов&#39;язковим
@@ -3683,55 +3370,46 @@
 ,Item Prices,Предмет Ціни
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"За словами будуть видні, як тільки ви збережете замовлення."
 DocType: Period Closing Voucher,Period Closing Voucher,Період закриття Ваучер
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Майстер Ціни.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Майстер Ціни.
 DocType: Task,Review Date,Огляд Дата
 DocType: Purchase Invoice,Advance Payments,Авансові платежі
-DocType: DocPerm,Level,Рівень
 DocType: Purchase Taxes and Charges,On Net Total,На Net Total
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,"&quot;Повідомлення Адреси електронної пошти&quot;, не зазначені для повторюваних% S"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Фрезерний
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Немає дозволу на використання платіжного інструмента
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,"&quot;Повідомлення Адреси електронної пошти&quot;, не зазначені для повторюваних% S"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,"Валюта не може бути змінена після внесення запису, використовуючи інший валюти"
 DocType: Company,Round Off Account,Округлення аккаунт
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Нарізки
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Адміністративні витрати
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Консалтинг
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Консалтинг
 DocType: Customer Group,Parent Customer Group,Батько Група клієнтів
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Зміна
 DocType: Purchase Invoice,Contact Email,Контактний Email
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","наприклад, &quot;Моя компанія ТОВ&quot;"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Примітка Період
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","наприклад, &quot;Моя компанія ТОВ&quot;"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Примітка Період
 DocType: Bank Reconciliation Detail,Voucher ID,Ваучер ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Це корінь територія і не можуть бути змінені.
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
 DocType: Email Digest,Receivables / Payables,Дебіторська заборгованість Кредиторська заборгованість /
 DocType: Delivery Note Item,Against Sales Invoice,На рахунок продажу
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Тиснення
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Дебіторська заборгованість аккаунт
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,За замовчуванням Склад
 DocType: Task,Actual End Date (via Time Logs),Фактична Дата закінчення (через журнали Time)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Будь ласка, введіть МВЗ батьківський"
 DocType: Delivery Note,Print Without Amount,Друк без розмірі
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Податковий Категорія не може бути &quot;Оцінка&quot; або &quot;Оцінка і загальне&quot;, як всі елементи, немає в наявності"
-DocType: User,Last Name,Прізвище
-DocType: Web Page,Left,Зліва
-DocType: Event,All Day,Весь день
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Податковий Категорія не може бути &quot;Оцінка&quot; або &quot;Оцінка і загальне&quot;, як всі елементи, немає в наявності"
 DocType: Issue,Support Team,Команда підтримки
 DocType: Appraisal,Total Score (Out of 5),Всього балів (з 5)
-DocType: Contact Us Settings,State,Державний
 DocType: Batch,Batch,Партія
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Баланс
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Баланс
 DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат претензії (за допомогою витратні Претензії)
-DocType: User,Gender,Стать
 DocType: Journal Entry,Debit Note,Дебет-нота
 DocType: Stock Entry,As per Stock UOM,За стоку UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не минув
@@ -3745,44 +3423,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Створення правил по обмеженню угод на основі значень.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Якщо відзначене, Загальна немає. робочих днів буде включати в себе свята, і це призведе до зниження вартості Зарплата за день"
 DocType: Purchase Invoice,Total Advance,Всього Попередня
-DocType: Workflow State,User,Користувач
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Розрахунку заробітної плати
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Сума кредиту
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Встановити як Втрачений
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Отримання Примітка
 DocType: Customer,Credit Days Based On,Кредитні днів заснованих на
 DocType: Tax Rule,Tax Rule,Податкове положення
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Підтримувати ж швидкістю Протягом всієї цикл продажів
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планувати час журнали за межами робочої станції робочих годин.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} вже були представлені
 ,Items To Be Requested,Товари слід замовляти
-DocType: Purchase Order,Get Last Purchase Rate,Отримати останню покупку Оцінити
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Платіжна Оцінити на основі виду діяльності (за годину)
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Закачування
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Компанія Email ID не знайдений, отже, пошта не відправлено"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 DocType: Production Planning Tool,Filter based on item,Фільтр на основі пункту
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Рік Дата початку
 DocType: Attendance,Employee Name,Ім&#39;я співробітника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлі Всього (Компанія валют)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,"Не можете приховані в групу, тому що обрано тип рахунку."
 DocType: Purchase Common,Purchase Common,Купівля Загальні
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,"{0} {1} був змінений. Будь ласка, поновіть."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп користувачам вносити Залишити додатків на наступні дні.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Від можливостей
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Гасіння
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Виробник Кількість
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнято Кількість
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} існує не
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
-DocType: DocField,Default,Дефолт
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд Немає {0}: Сума не може бути більше, ніж очікуванні Сума проти Витрата претензії {1}. В очікуванні сума {2}"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} додав абоненти
 DocType: Maintenance Schedule,Schedule,Графік
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",Визначити бюджет для цього МВЗ. Щоб встановити бюджету дію см &quot;Список компанії&quot;
@@ -3793,70 +3467,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Ціни не знайдений або відключений
 DocType: Expense Claim,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Вибір &quot;Так&quot; дасть унікальну ідентичність кожного суб&#39;єкта цього пункту, який можна переглянути в серійний номер майстра."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
 DocType: Selling Settings,Campaign Naming By,Кампанія Неймінг За
 DocType: Employee,Current Address Is,Поточна адреса
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
 DocType: Address,Office,Офіс
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Стандартні звіти
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кількість на зі складу
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Щоб створити податковий облік
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Фондовий
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо деталь варіант іншого елемента, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Виробництво Детальніше
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Пакетна Інвентар
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Пакетна Інвентар
 DocType: Employee,Contract End Date,Дата закінчення контракту
 DocType: Sales Order,Track this Sales Order against any Project,Підписка на замовлення клієнта проти будь-якого проекту
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Замовлення на продаж Витягніть (до пологів) на основі вищеперелічених критеріїв
-DocType: DocShare,Document Type,Тип документа
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Від постачальника цитати
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Від постачальника цитати
 DocType: Deduction Type,Deduction Type,Відрахування Тип
 DocType: Attendance,Half Day,Половина дня
 DocType: Pricing Rule,Min Qty,Мінімальна Кількість
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Щоб відстежувати елементи в купівлі та продажу документів з пакетних пп. &quot;Переважний Промисловість: Хімія&quot;
 DocType: GL Entry,Transaction Date,Угода Дата
 DocType: Production Plan Item,Planned Qty,Плановані Кількість
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Загальні податкові
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Загальні податкові
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
 DocType: Stock Entry,Default Target Warehouse,Мета за замовчуванням Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистий Всього (Компанія валют)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партія Тип і партія застосовується лише щодо / дебіторська заборгованість рахунок
 DocType: Notification Control,Purchase Receipt Message,Купівля Надходження повідомлення
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Сумарна кількість виділених листя більш періоду
 DocType: Production Order,Actual Start Date,Фактична дата початку
 DocType: Sales Order,% of materials delivered against this Sales Order,% Матеріалів поставляється проти цього замовлення клієнта
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Запис руху пункт.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Розсилка передплатника
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Сервіс
 DocType: Hub Settings,Hub Settings,Налаштування Hub
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 ,Monthly Salary Register,Щомісячна зарплата Реєстрація
-apps/frappe/frappe/website/template.py +140,Next,Наступний
 DocType: Warranty Claim,If different than customer address,"Якщо відрізняється, ніж адресою замовника"
 DocType: BOM Operation,BOM Operation,Специфікація Операція
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Електрополіровка
 DocType: Purchase Taxes and Charges,On Previous Row Amount,На Попередня Сума Row
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,"Будь ласка, введіть Сума платежу в принаймні один ряд"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,"Будь ласка, введіть Сума платежу в принаймні один ряд"
 DocType: POS Profile,POS Profile,POS-профілю
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,"Ряд {0}: Сума платежу не може бути більше, ніж суми заборгованості"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Всього Неоплачений
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Всього Неоплачений
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Час входу не оплачується
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Пункт {0} шаблон, виберіть один з його варіантів"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Покупець
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Покупець
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Чистий зарплата не може бути негативною
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,"Будь ласка, введіть проти Ваучери вручну"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,"Будь ласка, введіть проти Ваучери вручну"
 DocType: SMS Settings,Static Parameters,Статичні параметри
 DocType: Purchase Order,Advance Paid,Попередня Платні
 DocType: Item,Item Tax,Стан податкової
@@ -3865,14 +3532,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Відправити SMS масового вашим контактам
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Розглянемо податку або збору для
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична Кількість обов&#39;язково
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Крос-прокатки
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Кредитна карта
 DocType: BOM,Item to be manufactured or repacked,Пункт має бути виготовлений чи перепакована
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Налаштування за замовчуванням для біржових операцій.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Налаштування за замовчуванням для біржових операцій.
 DocType: Purchase Invoice,Next Date,Наступна дата
 DocType: Employee Education,Major/Optional Subjects,Основні / Додаткові Суб&#39;єкти
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Будь ласка, введіть податків і зборів"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Обробка
 DocType: Sales Invoice Item,Drop Ship,Корабель падіння
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тут ви можете зберегти сімейні дані, як ім&#39;я та окупації батька, чоловіка і дітей"
 DocType: Hub Settings,Seller Name,Продавець Ім&#39;я
@@ -3882,47 +3547,44 @@
 DocType: Stock Entry,Repack,Перепакувати
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ви повинні зберегти форму перед продовженням
 DocType: Item Attribute,Numeric Values,Числові значення
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Прикріпіть логотип
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Прикріпіть логотип
 DocType: Customer,Commission Rate,Ставка комісії
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Зробити Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Блок відпустки додатки по кафедрі.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Кошик Пусто
 DocType: Production Order,Actual Operating Cost,Фактична Операційна Вартість
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Корінь не може бути змінений.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Позначена сума не може перевищувати суму unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Корінь не може бути змінений.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Позначена сума не може перевищувати суму unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Дозволити виробництво на канікули
 DocType: Sales Order,Customer's Purchase Order Date,Клієнтам Замовлення Дата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Капітал
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Будь ласка, виберіть файл CSV з"
-DocType: Dropbox Backup,Send Backups to Dropbox,Відправити резервних копій в Dropbox
 DocType: Purchase Order,To Receive and Bill,Для прийому і Білл
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Дизайнер
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Умови шаблону
 DocType: Serial No,Delivery Details,Деталі Доставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Вартість Центр потрібно в рядку {0} в таблиці податків для типу {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,"Автоматичне створення матеріалів запит, якщо кількість падає нижче цього рівня,"
 ,Item-wise Purchase Register,Пункт мудрий Купівля Реєстрація
 DocType: Batch,Expiry Date,Термін придатності
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Щоб встановити рівень повторного замовлення, деталь повинна бути Купівля товару або товару Виробництво"
 ,Supplier Addresses and Contacts,Постачальник Адреси та контакти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,"Ласка, виберіть категорію в першу чергу"
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Майстер проекту.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не відображати будь-який символ, як $ і т.д. поряд з валютами."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Отримати елементів із специфікації
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Отримати елементів із специфікації
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час виконання Дні
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Відомість матеріалів
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
-DocType: Dropbox Backup,Send Notifications To,Включити повідомлення
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Посилання Дата
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Посилання Дата
 DocType: Employee,Reason for Leaving,Причина виїзду
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонований Сума
 DocType: GL Entry,Is Opening,Відкриває
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Рахунок {0} не існує
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},"Будь ласка, створіть зарплата структури для співробітника {0}"

diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index ca4dc12..ee8f5d5 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,Chế độ tiền lương
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.","Chọn phân phối hàng tháng, nếu bạn muốn theo dõi dựa trên thời vụ."
 DocType: Employee,Divorced,Đa ly dị
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,Cảnh báo: Cùng một mục đã được nhập nhiều lần.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Mục đã được đồng bộ hóa
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hủy {0} Material Visit trước hủy bỏ yêu cầu bồi thường bảo hành này
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vui lòng chọn Đảng Loại đầu tiên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,Làm cho dẽo
 DocType: Item,Customer Items,Mục hàng
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: Cha mẹ tài khoản {1} không thể là một sổ cái
 DocType: Item,Publish Item to hub.erpnext.com,Publish khoản để hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,Để lại người phê duyệt
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Employee,Rented,Thuê
-DocType: About Us Settings,Website,Trang web
 DocType: POS Profile,Applicable for User,Áp dụng cho User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,Đầm cộng thiêu kết
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong các giao dịch.
 DocType: Purchase Order,Customer Contact,Khách hàng Liên hệ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,Từ vật liệu Yêu cầu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,Từ vật liệu Yêu cầu
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Tree
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Không có thêm kết quả.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,pháp lý
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,pháp lý
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},Thuế loại hình thực tế có thể không được bao gồm trong giá Item trong hàng {0}
 DocType: C-Form,Customer,Sự hài lòng của Khách hàng
 DocType: Purchase Receipt Item,Required By,Yêu cầu bởi
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,Loạt Cập nhật thành công
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,Khâu
 DocType: Pricing Rule,Apply On,Áp dụng trên
 DocType: Item Price,Multiple Item prices.,Nhiều giá Item.
 ,Purchase Order Items To Be Received,Tìm mua hàng để trở nhận
 DocType: SMS Center,All Supplier Contact,Tất cả các nhà cung cấp Liên hệ
 DocType: Quality Inspection Reading,Parameter,Thông số
-apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Dự kiến kết thúc ngày không thể nhỏ hơn so với dự kiến Ngày bắt đầu
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tỷ giá phải được giống như {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,Để lại ứng dụng mới
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Dự thảo ngân hàng
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Dự kiến kết thúc ngày không thể nhỏ hơn so với dự kiến Ngày bắt đầu
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tỷ giá phải được giống như {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,Để lại ứng dụng mới
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,Dự thảo ngân hàng
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 Để duy trì khách hàng mã hàng khôn ngoan và để làm cho họ tìm kiếm dựa trên mã sử dụng tùy chọn này
 DocType: Mode of Payment Account,Mode of Payment Account,Phương thức thanh toán Tài khoản
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,Hiện biến thể
-DocType: Sales Invoice Item,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,Số lượng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Các khoản vay (Nợ phải trả)
 DocType: Employee Education,Year of Passing,Năm Passing
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Sản phẩm trong kho
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Làm mới POS hồ sơ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,Chăm sóc sức khỏe
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 DocType: Purchase Invoice,Monthly,Hàng tháng
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,Hóa đơn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Địa chỉ Email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Quốc phòng
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,Địa chỉ Email
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Quốc phòng
 DocType: Company,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Row # {0}:
 DocType: Delivery Note,Vehicle No,Không có xe
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,Vui lòng chọn Bảng giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,Chế biến gỗ
 DocType: Production Order Operation,Work In Progress,Làm việc dở dang
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,In ấn 3D
 DocType: Employee,Holiday List,Danh sách kỳ nghỉ
 DocType: Time Log,Time Log,Giờ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Kế toán
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,Kế toán
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Company,Phone No,Không điện thoại
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Đăng nhập của hoạt động được thực hiện bởi người dùng chống lại tác vụ này có thể được sử dụng để theo dõi thời gian, thanh toán."
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},New {0}: {1} #
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},New {0}: {1} #
 ,Sales Partners Commission,Ủy ban Đối tác bán hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Tên viết tắt không thể có nhiều hơn 5 ký tự
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",Giá trị thuộc tính {0} không thể được gỡ bỏ từ {1} là biến thể mục \ tồn tại với Attribute này.
-DocType: Print Settings,Classic,Cổ điển
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,Đây là một tài khoản gốc và không thể được chỉnh sửa.
 DocType: BOM,Operations,Tác vụ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Không thể thiết lập ủy quyền trên cơ sở giảm giá cho {0}
 DocType: Bin,Quantity Requested for Purchase,Số lượng yêu cầu cho mua
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Đính kèm tập tin .csv với hai cột, một cho tên tuổi và một cho tên mới"
 DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,Kg
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Mở đầu cho một công việc.
 DocType: Item Attribute,Increment,Tăng
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,Chọn nhà kho ...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,Quảng cáo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Quảng cáo
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Cùng Công ty được nhập nhiều hơn một lần
 DocType: Employee,Married,Kết hôn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Không được phép cho {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},Chứng khoán không thể được cập nhật với giao hàng Lưu ý {0}
 DocType: Payment Reconciliation,Reconcile,Hòa giải
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,Cửa hàng tạp hóa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Cửa hàng tạp hóa
 DocType: Quality Inspection Reading,Reading 1,Đọc 1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,Hãy nhập Ngân hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,Quỹ lương hưu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,Kho là bắt buộc nếu loại tài khoản là kho
 DocType: SMS Center,All Sales Person,Tất cả các doanh Người
 DocType: Lead,Person Name,Tên người
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Kiểm tra nếu để tái diễn, bỏ chọn để ngăn chặn tái phát hoặc đặt đúng End ngày"
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Giờ Rate / 60) * Thời gian hoạt động thực tế
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Chi phí của mục Delivered
-DocType: Blog Post,Guest,Khách
 DocType: Quality Inspection,Get Specification Details,Thông số kỹ thuật chi tiết được
 DocType: Lead,Interested,Quan tâm
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Bill of Material
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,Mở ra
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,Mở ra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Từ {0} đến {1}
 DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
 DocType: Journal Entry,Opening Entry,Mở nhập
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0} là bắt buộc
 DocType: Stock Entry,Additional Costs,Chi phí bổ sung
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,Tài khoản với giao dịch hiện có không thể chuyển đổi sang nhóm.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,Tài khoản với giao dịch hiện có không thể chuyển đổi sang nhóm.
 DocType: Lead,Product Enquiry,Đặt hàng sản phẩm
-DocType: Standard Reply,Owner,Chủ sở hữu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,Vui lòng nhập công ty đầu tiên
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,Vui lòng chọn Công ty đầu tiên
 DocType: Employee Education,Under Graduate,Dưới đại học
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,Reaming
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Lần đăng nhập:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,Buôn bán bất động sản
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Buôn bán bất động sản
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Tuyên bố của Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,Dược phẩm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Dược phẩm
 DocType: Expense Claim Detail,Claim Amount,Số tiền yêu cầu bồi thường
 DocType: Employee,Mr,Ông
-DocType: Custom Script,Client,Khách hàng
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Loại nhà cung cấp / Nhà cung cấp
 DocType: Naming Series,Prefix,Tiền tố
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Tiêu hao
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,Tiêu hao
 DocType: Upload Attendance,Import Log,Nhập khẩu Đăng nhập
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Gửi
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Liên hệ với tất cả
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Mức lương hàng năm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,Mức lương hàng năm
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Chi phí chứng khoán
 DocType: Newsletter,Email Sent?,Email gửi?
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,Hiển thị Thời gian Logs
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Bị từ chối chấp nhận lượng phải bằng số lượng nhận cho hàng {0}
 DocType: Item,Supply Raw Materials for Purchase,Cung cấp nguyên liệu thô cho Purchase
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Mục {0} phải là mua hàng
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
  Tất cả các ngày và nhân viên kết hợp trong giai đoạn được chọn sẽ đến trong bản mẫu, hồ sơ tham dự với hiện tại"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Sẽ được cập nhật sau khi bán hàng hóa đơn được Gửi.
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,Thẳng
 DocType: BOM Replace Tool,New BOM,Mới BOM
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,Hàng loạt Time Logs cho Thanh toán.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,Đúc Countergravity
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Bản tin đã được gửi
 DocType: Lead,Request Type,Yêu cầu Loại
 DocType: Leave Application,Reason,Nguyên nhân
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,Phát thanh truyền hình
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Thực hiện
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,Người dùng đầu tiên sẽ trở thành quản lý hệ thống (bạn có thể thay đổi điều này sau).
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Phát thanh truyền hình
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,Thực hiện
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,Người dùng đầu tiên sẽ trở thành quản lý hệ thống (bạn có thể thay đổi điều này sau).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Serial No,Maintenance Status,Tình trạng bảo trì
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,Items Vật giá
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,Items Vật giá
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},Từ ngày phải được trong năm tài chính. Giả sử Từ ngày = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Chọn nhân viên cho người mà bạn đang tạo ra thẩm định.
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},Chi phí Trung tâm {0} không thuộc về Công ty {1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Danh sách giá phải được áp dụng cho việc mua hoặc bán hàng
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},Ngày cài đặt không thể trước ngày giao hàng cho hàng {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),Giảm giá Giá Tỷ lệ (%)
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,Bắt đầu
-DocType: User,First Name,Họ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,Đúc Full-mốc
 DocType: Offer Letter,Select Terms and Conditions,Chọn Điều khoản và Điều kiện
 DocType: Production Planning Tool,Sales Orders,Đơn đặt hàng bán hàng
 DocType: Purchase Taxes and Charges,Valuation,Định giá
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,Tài khoản ngân hàng
 DocType: Leave Type,Allow Negative Balance,Cho phép cân đối tiêu cực
 DocType: Selling Settings,Default Territory,Vui lòng ghi rõ tiền tệ tại Công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,Tivi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tivi
 DocType: Production Order Operation,Updated via 'Time Log',Cập nhật thông qua 'Giờ'
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},Tài khoản {0} không thuộc về Công ty {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: Sales Invoice,Is Opening Entry,Được mở cửa nhập
 DocType: Customer Group,Mention if non-standard receivable account applicable,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn áp dụng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,Kho cho là cần thiết trước khi Submit
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Nhận được Mở
 DocType: Sales Partner,Reseller,Đại lý bán lẻ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Vui lòng nhập Công ty
 DocType: Delivery Note Item,Against Sales Invoice Item,Chống bán hóa đơn hàng
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
 DocType: Lead,Address & Contact,Địa chỉ & Liên hệ
 DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
 DocType: Newsletter List,Total Subscribers,Tổng số thuê bao
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Tên liên lạc
+,Contact Name,Tên liên lạc
 DocType: Production Plan Item,SO Pending Qty,SO chờ Số lượng
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tạo phiếu lương cho các tiêu chí nêu trên.
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Yêu cầu để mua hàng.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,Nhà ở kép
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Lá mỗi năm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,Lá mỗi năm
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,Hãy đặt Naming Series cho {0} qua Setup&gt; Cài đặt&gt; Đặt tên series
 DocType: Time Log,Will be updated when batched.,Sẽ được cập nhật khi trộn.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
-DocType: Bulk Email,Message,Tin nhắn
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,Reference No
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,Hàng năm
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
 DocType: Material Request Item,Min Order Qty,Đặt mua tối thiểu Số lượng
 DocType: Lead,Do Not Contact,Không Liên
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id duy nhất để theo dõi tất cả các hoá đơn định kỳ. Nó được tạo ra trên trình.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Phần mềm phát triển
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Phần mềm phát triển
 DocType: Item,Minimum Order Qty,Đặt hàng tối thiểu Số lượng
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,Yêu cầu tài liệu
 DocType: Bank Reconciliation,Update Clearance Date,Cập nhật thông quan ngày
 DocType: Item,Purchase Details,Thông tin chi tiết mua
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,Dây đánh răng
 DocType: Employee,Relation,Mối quan hệ
 DocType: Shipping Rule,Worldwide Shipping,Vận chuyển trên toàn thế giới
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Đơn đặt hàng xác nhận từ khách hàng.
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
 DocType: Maintenance Schedule,Generate Schedule,Tạo Lịch
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,Hubbing
 DocType: Purchase Invoice Item,Expense Head,Chi phí đầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,Vui lòng chọn Charge Loại đầu tiên
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mới nhất
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Tối đa 5 ký tự
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Chọn ngôn ngữ của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,Tối đa 5 ký tự
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Người phê duyệt Để lại đầu tiên trong danh sách sẽ được thiết lập mặc định Để lại phê duyệt
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",Vô hiệu hóa việc tạo ra các bản ghi thời gian so với đơn đặt hàng sản xuất. Hoạt động sẽ không được theo dõi chống sản xuất hàng
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,Trong Variant
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,Mục {0} phải là dịch vụ hàng
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
-DocType: DocType,Administrator,Quản trị viên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,Khoan Laser
-DocType: Stock UOM Replace Utility,New Stock UOM,Mới Cổ UOM
 DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản
 DocType: Employee,External Work History,Bên ngoài Quá trình công tác
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Thông tư tham khảo Lỗi
-DocType: Communication,Closed,Đã đóng
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Trong từ (xuất khẩu) sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
 DocType: Lead,Industry,Ngành công nghiệp
 DocType: Employee,Job Profile,Hồ sơ công việc
 DocType: Newsletter,Newsletter,Đăng ký nhận tin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,Hydroforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,Sự nốc rượu
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,Mục được cập nhật
-DocType: Async Task,System Manager,Hệ thống quản lý
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
 DocType: Sales Invoice Item,Delivery Note,Giao hàng Ghi
-DocType: Dropbox Backup,Allow Dropbox Access,Cho phép truy cập Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Thiết lập Thuế
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,Nhập thanh toán đã được sửa đổi sau khi bạn kéo nó. Hãy kéo nó một lần nữa.
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0} vào hai lần tại khoản thuế
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Workstation,Rent Cost,Chi phí thuê
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,Vui lòng chọn tháng và năm
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,Email công ty
 DocType: GL Entry,Debit Amount in Account Currency,Nợ Số tiền trong tài khoản ngoại tệ
 DocType: Shipping Rule,Valid for Countries,Hợp lệ cho các nước
-DocType: Workflow State,Refresh,Cập nhật
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Tất cả các lĩnh vực liên quan nhập khẩu như tiền tệ, tỷ lệ chuyển đổi, tổng nhập khẩu, nhập khẩu lớn tổng số vv có sẵn trong mua hóa đơn, Nhà cung cấp báo giá, mua hóa đơn, Mua hàng, vv"
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Tổng số thứ tự coi
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,"Vui lòng nhập 'Lặp lại vào ngày của tháng ""giá trị trường"
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,"Vui lòng nhập 'Lặp lại vào ngày của tháng ""giá trị trường"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tốc độ mà khách hàng tệ được chuyển đổi sang tiền tệ cơ bản của khách hàng
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Có sẵn trong HĐQT, Giao hàng tận nơi Lưu ý, mua hóa đơn, sản xuất hàng, Mua hàng, mua hóa đơn, hóa đơn bán hàng, bán hàng đặt hàng, chứng khoán nhập cảnh, timesheet"
 DocType: Item Tax,Tax Rate,Tỷ lệ thuế
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} được quản lý theo từng đợt, không thể hòa giải được sử dụng \
  Cổ hòa giải, thay vì sử dụng cổ nhập"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,Mua hóa đơn phải được gửi
-DocType: Stock UOM Replace Utility,Current Stock UOM,Tình trạng hàng UOM
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Hàng loạt (rất nhiều) của một Item.
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Địa chỉ email của bạn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,Xin vui lòng xem file đính kèm
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,Cắt tia nước
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
 ,Finished Goods,Hoàn thành Hàng
 DocType: Delivery Note,Instructions,Hướng dẫn
 DocType: Quality Inspection,Inspected By,Kiểm tra bởi
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,Xin vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp. Chúng được tạo ra trực tiếp từ các chuyên gia hàng / Nhà cung cấp.
 DocType: Currency Exchange,Currency Exchange,Thu đổi ngoại tệ
 DocType: Purchase Invoice Item,Item Name,Tên hàng
+DocType: Authorization Rule,Approving User  (above authorized value),Phê duyệt tài (trên giá trị ủy quyền)
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,Balance tín dụng
 DocType: Employee,Widowed,Góa chồng
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty","Các mặt hàng được yêu cầu đó là ""Hết hàng"" xem xét tất cả các kho dựa trên SL dự và trật tự tối thiểu SL"
@@ -380,22 +348,21 @@
 ,Purchase Register,Đăng ký mua
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
 DocType: Workstation,Consumable Cost,Chi phí tiêu hao
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Leave Người phê duyệt'
 DocType: Purchase Receipt,Vehicle Date,Xe ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,Y khoa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,Y khoa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Lý do mất
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,Ống beading
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
 DocType: Employee,Single,Một lần
 DocType: Issue,Attachment,File đính kèm
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Ngân sách không thể được đặt cho Trung tâm chi phí Nhóm
 DocType: Account,Cost of Goods Sold,Chi phí hàng bán
 DocType: Purchase Invoice,Yearly,Hàng năm
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Vui lòng nhập Trung tâm Chi phí
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vui lòng nhập Trung tâm Chi phí
 DocType: Journal Entry Account,Sales Order,Bán hàng đặt hàng
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Avg. Tỷ giá bán
 DocType: Purchase Order,Start date of current order's period,Ngày thời gian để hiện bắt đầu
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},Số lượng không có thể là một phần nhỏ trong hàng {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},Số lượng không có thể là một phần nhỏ trong hàng {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Số lượng và lãi suất
 DocType: Delivery Note,% Installed,Cài đặt%
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,Vui lòng nhập tên công ty đầu tiên
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,Is Nhóm
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Tự động Đặt nối tiếp Nos dựa trên FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,Thermoforming
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,Xả băng
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"'Để Trường hợp số' không thể nhỏ hơn ""Từ trường hợp số '"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Không lợi nhuận
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Không lợi nhuận
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Chưa Bắt Đầu
 DocType: Lead,Channel Partner,Đối tác
 DocType: Account,Old Parent,Cũ Chánh
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,Cài đặt chung cho tất cả các quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,"Chiếm đông lạnh HCM,"
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
+DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,Chủ lễ.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,Shell đúc
 DocType: Material Request Item,Required Date,Ngày yêu cầu
 DocType: Delivery Note,Billing Address,Địa chỉ thanh toán
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,Vui lòng nhập Item Code.
 DocType: BOM,Costing,Chi phí
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Nếu được chọn, số tiền thuế sẽ được coi là đã có trong tiền lệ In / In"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Tổng số Số lượng
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,Thành vùng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
 DocType: Features Setup,Imports,Nhập khẩu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,Liên kết dính
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,Tổng số lá được giao là bắt buộc
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,Kỷ lục tham dự.
 DocType: Bank Reconciliation,Journal Entries,Tạp chí Entries
 DocType: Sales Order Item,Used for Production Plan,Sử dụng cho kế hoạch sản xuất
-DocType: System Settings,Loading...,Đang tải...
-DocType: DocField,Password,Mật khẩu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,Mô hình lắng đọng hợp nhất
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (trong phút)
 DocType: Customer,Buyer of Goods and Services.,Người mua hàng hoá và dịch vụ.
 DocType: Journal Entry,Accounts Payable,Tài khoản Phải trả
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Thêm Subscribers
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists","""Không tồn tại"
 DocType: Pricing Rule,Valid Upto,"HCM, đến hợp lệ"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,"Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức, cá nhân."
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,"Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức, cá nhân."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Thu nhập trực tiếp
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm lại theo tài khoản"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Nhân viên hành chính
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Nhân viên hành chính
 DocType: Payment Tool,Received Or Paid,Nhận Hoặc Paid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry,Difference Account,Tài khoản chênh lệch
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,Mỹ phẩm
-DocType: DocField,Type,Loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
-DocType: Communication,Subject,Chủ đề
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items","Sáp nhập, tài sản sau đây là giống nhau cho cả hai mục"
 DocType: Shipping Rule,Net Weight,Trọng lượng
 DocType: Employee,Emergency Phone,Điện thoại khẩn cấp
 ,Serial No Warranty Expiry,Nối tiếp Không có bảo hành hết hạn
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,Hạng mục
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,Quản lý Hợp đồng phụ
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,Mới UOM không phải là loại nguyên số
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,Quản lý Hợp đồng phụ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Đồ nội thất và đấu
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tốc độ mà danh sách Giá tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,Yêu cầu tài liệu
 DocType: Company,Delete Company Transactions,Xóa Giao dịch Công ty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,Mục {0} không được mua hàng
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} là một địa chỉ email hợp lệ trong '\
  Notification Địa chỉ Email'"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,Tổng Thanh toán Năm nay:
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Tổng Thanh toán Năm nay:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và lệ phí
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Không thể xóa tiếp Serial No {0}, vì nó được sử dụng trong các giao dịch chứng khoán"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),Đóng cửa (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),Đóng cửa (Cr)
 DocType: Serial No,Warranty Period (Days),Thời gian bảo hành (ngày)
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 ,Pending Qty,Pending Qty
 DocType: Job Applicant,Thread HTML,Chủ đề HTML
 DocType: Company,Ignore,Bỏ qua
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
 DocType: Pricing Rule,Valid From,Từ hợp lệ
 DocType: Sales Invoice,Total Commission,Tổng số Ủy ban
 DocType: Pricing Rule,Sales Partner,Đối tác bán hàng
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Phân phối hàng tháng ** giúp bạn phân phối ngân sách của bạn trên tháng nếu bạn có tính thời vụ trong kinh doanh của bạn.
 
  Để phân phối một ngân sách bằng cách sử dụng phân phối này, thiết lập phân phối hàng tháng ** ** này trong ** Trung tâm chi phí **"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,Không có hồ sơ được tìm thấy trong bảng hóa đơn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Xin lỗi, Serial Nos không thể được sáp nhập"
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,Id dẫn
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
-DocType: About Us Settings,Website Manager,Website Manager
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Năm tài chính bắt đầu ngày không nên lớn hơn tài chính năm Ngày kết thúc
 DocType: Warranty Claim,Resolution,Phân giải
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},Delivered: {0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,Thanh toán và giao hàng Status
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Khách hàng lặp lại
 DocType: Leave Control Panel,Allocate,Phân bổ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Trang trước
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,Bán hàng trở lại
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Chọn bán hàng đơn đặt hàng mà từ đó bạn muốn tạo ra đơn đặt hàng sản xuất.
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Thành phần lương.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Cơ sở dữ liệu khách hàng tiềm năng.
+DocType: Authorization Rule,Customer or Item,Khách hàng hoặc Khoản
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,Cơ sở dữ liệu khách hàng.
 DocType: Quotation,Quotation To,Để báo giá
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,Sự té nhào xuống
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp bởi vì bạn đã thực hiện một số giao dịch (s) với Ươm khác. Bạn sẽ cần phải tạo ra một khoản mới để sử dụng một định Ươm khác nhau.
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một kho hợp lý chống lại các entry chứng khoán được thực hiện.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
-DocType: Event,Wednesday,Thứ tư
 DocType: Sales Invoice,Customer's Vendor,Bán hàng của khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,Sản xuất theo thứ tự là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Đề nghị Viết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,Đề nghị Viết
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Một người bán hàng {0} tồn tại với cùng id viên
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Tiêu cực Cổ Lỗi ({6}) cho mục {0} trong kho {1} trên {2} {3} trong {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Công ty tài chính Năm
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,Mặc định Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Lịch trình bảo trì
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sau đó biết giá quy được lọc ra dựa trên khách hàng, Nhóm khách hàng, lãnh thổ, Nhà cung cấp, Loại Nhà cung cấp, vận động, đối tác kinh doanh, vv"
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,Hãy cài đặt Dropbox mô-đun python
 DocType: Employee,Passport Number,Số hộ chiếu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,Từ mua hóa đơn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Chi cục trưởng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,Từ mua hóa đơn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
 DocType: SMS Settings,Receiver Parameter,Nhận thông số
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Dựa trên"" và ""Nhóm bởi"" không thể giống nhau"
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,đến
-apps/frappe/frappe/templates/base.html +145,Please enter email address,Vui lòng nhập địa chỉ email
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,Ống End hình thành
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 DocType: Selling Settings,Customer Naming By,Khách hàng đặt tên By
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Chuyển đổi cho Tập đoàn
 DocType: Activity Cost,Activity Type,Loại hoạt động
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,Days cố định
 DocType: Sales Invoice,Packing List,Danh sách đóng gói
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Đơn đặt hàng mua cho nhà cung cấp.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,Xuất bản
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Xuất bản
 DocType: Activity Cost,Projects User,Dự án tài
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Tiêu thụ
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}: {1} không tìm thấy trong bảng hóa đơn chi tiết
 DocType: Company,Round Off Cost Center,Vòng Tắt Center Chi phí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Bảo trì đăng nhập {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Material Request,Material Transfer,Chuyển tài liệu
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Mở (Tiến sĩ)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Đăng dấu thời gian phải sau ngày {0}
-apps/frappe/frappe/config/setup.py +59,Settings,Cài đặt
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Thuế Chi phí hạ cánh và Lệ phí
 DocType: Production Order Operation,Actual Start Time,Thực tế Start Time
 DocType: BOM Operation,Operation Time,Thời gian hoạt động
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,Nhiều Hơn
 DocType: Pricing Rule,Sales Manager,Quản lý bán hàng
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,Đổi tên
 DocType: Journal Entry,Write Off Amount,Viết Tắt Số tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,Uốn
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Cho phép tài
 DocType: Journal Entry,Bill No,Bill Không
 DocType: Purchase Invoice,Quarterly,Quý
 DocType: Selling Settings,Delivery Note Required,Giao hàng Ghi bắt buộc
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
 DocType: Account,Accounts,Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,Cắt thẳng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,Để theo dõi mục trong bán hàng và giấy tờ mua bán dựa trên nos nối tiếp của họ. Này cũng có thể được sử dụng để theo dõi các chi tiết bảo hành của sản phẩm.
 DocType: Purchase Receipt Item Supplied,Current Stock,Cổ hiện tại
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,Kho từ chối là bắt buộc đối với mục regected
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 DocType: Employee,Provide email id registered in company,Cung cấp email id đăng ký tại công ty
 DocType: Hub Settings,Seller City,Người bán Thành phố
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Cung cấp văn Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,Mục có các biến thể.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Mục {0} không tìm thấy
 DocType: Bin,Stock Value,Giá trị cổ phiếu
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Loại cây
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,Số lượng và kho
 DocType: Sales Invoice,Commission Rate (%),Hoa hồng Tỷ lệ (%)
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Chống Voucher Loại phải là một trong bán hàng đặt hàng, bán hàng hoặc hóa đơn Journal nhập"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,Không tìm thấy tỷ giá hối đoái
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,Hàng không vũ trụ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Chào mừng bạn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Hàng không vũ trụ
 DocType: Journal Entry,Credit Card Entry,Thẻ tín dụng nhập
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,Nhiệm vụ đề
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,Hàng nhận được từ nhà cung cấp.
-DocType: Communication,Open,Mở
 DocType: Lead,Campaign Name,Tên chiến dịch
 ,Reserved,Ltd
 DocType: Purchase Order,Supply Raw Materials,Cung cấp Nguyên liệu thô
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0} không phải là một cổ phiếu hàng
 DocType: Mode of Payment Account,Default Account,Tài khoản mặc định
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,Dẫn phải được thiết lập nếu Cơ hội được làm từ chì
-DocType: Contact Us Settings,Address Title,Địa chỉ Tiêu đề
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,Vui lòng chọn ngày nghỉ hàng tuần
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Người bán hàng mục tiêu phương sai mục Nhóm-Wise
-DocType: Dropbox Backup,Daily,Hàng ngày
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,Tài khoản với giao dịch hiện tại không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,Tài khoản với giao dịch hiện tại không thể được chuyển đổi sang sổ cái
 DocType: Delivery Note,Customer's Purchase Order No,Của khách hàng Mua hàng Không
 DocType: Employee,Cell Number,Số di động
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện tại 'Against Journal nhập' cột
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,Năng lượng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
 DocType: Item Group,Website Specifications,Website Thông số kỹ thuật
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,Tài khoản mới
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,Kế toán Entries có thể được thực hiện đối với các nút lá. Entries chống lại nhóm không được phép.
-DocType: ToDo,High,Cao
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Opportunity,Maintenance,Bảo trì
-DocType: User,Male,Name
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
 DocType: Item Attribute Value,Item Attribute Value,Mục Attribute Value
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,Các chiến dịch bán hàng.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,Cá nhân
 DocType: Expense Claim Detail,Expense Claim Type,Loại chi phí yêu cầu bồi thường
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Các thiết lập mặc định cho Giỏ hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","{0} Journal Entry được liên kết chống lại thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,Công nghệ sinh học
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","{0} Journal Entry được liên kết chống lại thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Công nghệ sinh học
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Chi phí bảo trì văn phòng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,Hemming
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Vui lòng nhập mục đầu tiên
 DocType: Account,Liability,Trách nhiệm
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Process Payroll,Send Email,Gởi thư
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm không hợp lệ {0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,Không phép
 DocType: Company,Default Bank Account,Tài khoản Ngân hàng mặc định
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Cổ&#39; không thể được kiểm tra vì mục này không được cung cấp thông qua {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,lớp
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,lớp
 DocType: Item,Items with higher weightage will be shown higher,Mục weightage cao sẽ được hiển thị cao hơn
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ngân hàng hòa giải chi tiết
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,Hoá đơn của tôi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,Hoá đơn của tôi
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,Không có nhân viên tìm thấy
 DocType: Purchase Order,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",Để kích hoạt tính năng &quot;Point of Sale&quot; tính năng
 DocType: Bin,Moving Average Rate,Tỷ lệ trung bình di chuyển
 DocType: Production Planning Tool,Select Items,Chọn mục
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0} với Bill {1} {2} ngày
-DocType: Comment,Reference Name,Tên tài liệu tham khảo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0} với Bill {1} {2} ngày
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: Sales Invoice Item,Target Warehouse,Mục tiêu kho
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi bán hàng đặt hàng ngày
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Đăng nhập hoạt động
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Lợi nhuận ròng / lỗ
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
 DocType: Production Order,Item To Manufacture,Để mục Sản xuất
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,Đúc khuôn vĩnh viễn
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1} tình trạng là {2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,Mua hàng để thanh toán
 DocType: Sales Order Item,Projected Qty,Số lượng dự kiến
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
 DocType: Newsletter,Newsletter Manager,Bản tin Quản lý
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Mở&#39;
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
 DocType: Expense Claim,Expenses,Chi phí
 DocType: Item Variant Attribute,Item Variant Attribute,Mục Variant Attribute
 ,Purchase Receipt Trends,Xu hướng mua hóa đơn
 DocType: Appraisal,Select template from which you want to get the Goals,Chọn mẫu mà bạn muốn để có được các Mục tiêu
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Nghiên cứu & Phát triể
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Nghiên cứu & Phát triể
 ,Amount to Bill,Số tiền Bill
 DocType: Company,Registration Details,Thông tin chi tiết đăng ký
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,Khoanh vùng
 DocType: Item,Re-Order Qty,Re-trật tự Qty
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Dự kiến gửi đến {0}
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,Chi tiết chứng khoán
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,Điểm bán hàng
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},Không thể thực hiện chuyển tiếp {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Số dư tài khoản đã có trong tín dụng, bạn không được phép để thiết lập 'cân Must Be' là 'Nợ'"
 DocType: Account,Balance must be,Cân bằng phải
 DocType: Hub Settings,Publish Pricing,Xuất bản Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Thông báo yêu cầu bồi thường chi phí từ chối
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,Xuất chúng
 ,Available Qty,Số lượng có sẵn
 DocType: Purchase Taxes and Charges,On Previous Row Total,Trước trên Row Tổng số
 DocType: Salary Slip,Working Days,Ngày làm việc
 DocType: Serial No,Incoming Rate,Tỷ lệ đến
 DocType: Packing Slip,Gross Weight,Tổng trọng lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,Tên của công ty của bạn mà bạn đang thiết lập hệ thống này.
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,Tên của công ty của bạn mà bạn đang thiết lập hệ thống này.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Bao gồm các ngày lễ trong Tổng số không. Days làm việc
 DocType: Job Applicant,Hold,Giữ
 DocType: Employee,Date of Joining,Tham gia ngày
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,Xem Subscribers
 DocType: Purchase Invoice Item,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,Phun mài mòn
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,Tổng tỷ giá hối đoái.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
 DocType: Production Order,Plan material for sub-assemblies,Tài liệu kế hoạch cho các cụm chi tiết
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0} phải được hoạt động
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0} phải được hoạt động
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hủy bỏ {0} thăm Vật liệu trước khi hủy bỏ bảo trì đăng nhập này
 DocType: Salary Slip,Leave Encashment Amount,Để lại séc Số tiền
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Số lượng yêu cầu
 DocType: Bank Reconciliation,Total Amount,Tổng tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,Internet xuất bản
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet xuất bản
 DocType: Production Planning Tool,Production Orders,Đơn đặt hàng sản xuất
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Cân bằng giá trị gia tăng
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Xuất bản để đồng bộ các hạng mục
-DocType: GL Entry,Account Currency,Tài khoản ngoại tệ
+DocType: Bank Reconciliation,Account Currency,Tài khoản ngoại tệ
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,Xin đề cập đến Round tài khoản tại Công ty Tắt
 DocType: Purchase Receipt,Range,Dải
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Features Setup,Item Barcode,Mục mã vạch
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
 DocType: Address,Shop,Cửa hàng
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Mặc định tài khoản ngân hàng / tiền mặt sẽ được tự động cập nhật trong POS hóa đơn khi chế độ này được chọn.
 DocType: Employee,Permanent Address Is,Địa chỉ thường trú là
 DocType: Production Order Operation,Operation completed for how many finished goods?,Hoạt động hoàn thành cho bao nhiêu thành phẩm?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,Các thương hiệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,Các thương hiệu
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,Trợ cấp cho quá {0} vượt qua cho mục {1}.
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
@@ -863,60 +797,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,Mua hàng mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Thu nhập gián tiếp
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,Đặt Số tiền thanh toán = Số tiền xuất sắc
-DocType: Contact Us Settings,Address Line 1,Địa chỉ Line 1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variance
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Tên công ty
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,Variance
+,Company Name,Tên công ty
 DocType: SMS Center,Total Message(s),Tổng số tin nhắn (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,Chọn mục Chuyển giao
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Xem danh sách tất cả các video giúp đỡ
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Chọn đầu tài khoản của ngân hàng nơi kiểm tra đã được gửi.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Cho phép người dùng chỉnh sửa Giá liệt kê Tỷ giá giao dịch
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Thanh toán chống Bán hàng / Mua hàng nên luôn luôn được đánh dấu là trước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,Mối nguy hóa học
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Mối nguy hóa học
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,Tất cả các mặt hàng đã được chuyển giao cho đặt hàng sản xuất này.
 DocType: Process Payroll,Select Payroll Year and Month,Chọn Payroll Năm và Tháng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",Tới các nhóm thích hợp (thường là ứng dụng của Quỹ&gt; Tài sản ngắn hạn&gt; Tài khoản ngân hàng và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại &quot;Ngân hàng&quot;
 DocType: Workstation,Electricity Cost,Chi phí điện
 DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân viên sinh Nhắc nhở
-DocType: Comment,Unsubscribed,Bỏ đăng ký
 DocType: Opportunity,Walk In,Trong đi bộ
 DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Cây của Trung tâm Chi phí finanial.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Nhận chuyển nhượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Tải lên đầu thư của bạn và logo. (Bạn có thể chỉnh sửa chúng sau này).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Trắng
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,Tải lên đầu thư của bạn và logo. (Bạn có thể chỉnh sửa chúng sau này).
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,Trắng
 DocType: SMS Center,All Lead (Open),Tất cả chì (Open)
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Hình ảnh đính kèm của bạn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,Làm
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,Hình ảnh đính kèm của bạn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,Làm
 DocType: Journal Entry,Total Amount in Words,Tổng số tiền trong từ
-DocType: Workflow State,Stop,dừng lại
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Có một lỗi. Một lý do có thể xảy ra có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,Giỏ hàng
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Tiếp theo Liên lạc ngày
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
 DocType: Holiday List,Holiday List Name,Kỳ nghỉ Danh sách Tên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Tùy chọn chứng khoán
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,Tùy chọn chứng khoán
 DocType: Journal Entry Account,Expense Claim,Chi phí bồi thường
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},Số lượng cho {0}
 DocType: Leave Application,Leave Application,Để lại ứng dụng
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Công cụ để phân bổ
 DocType: Leave Block List,Leave Block List Dates,Để lại Danh sách Chặn Ngày
 DocType: Company,If Monthly Budget Exceeded (for expense account),Nếu ngân sách hàng tháng Vượt quá (đối với tài khoản chi phí)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,Cắt
 DocType: Workstation,Net Hour Rate,Tỷ Hour Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Chi phí hạ cánh mua hóa đơn
 DocType: Company,Default Terms,Mặc định khoản
 DocType: Packing Slip Item,Packing Slip Item,Đóng gói trượt mục
 DocType: POS Profile,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Nhận hàng đơn đặt hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} không bị âm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,Nộp hồ sơ
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,Giảm giá
 DocType: Features Setup,Purchase Discounts,Giảm giá mua
 DocType: Workstation,Wages,Tiền lương
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bạn là người phê duyệt chi phí cho hồ sơ này. Xin vui lòng cập nhật 'Trạng thái' và tiết kiệm
 DocType: Serial No,Creation Document No,Tạo ra văn bản số
 DocType: Issue,Issue,Nội dung:
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Các thuộc tính cho khoản biến thể. ví dụ như kích cỡ, màu sắc, vv"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tài khoản không phù hợp với Công ty
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.","Các thuộc tính cho khoản biến thể. ví dụ như kích cỡ, màu sắc, vv"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP kho
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
 DocType: BOM Operation,Operation,Hoạt động
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,Item phải được bổ sung bằng cách sử dụng 'Nhận Items từ Mua Tiền thu' nút
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Chi phí bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,Tiêu chuẩn mua
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,Tiêu chuẩn mua
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Trung tâm Chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},Bán hàng Đặt hàng {0} {1}
 DocType: Opportunity,Contact Info,Thông tin liên lạc
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,Làm Cổ Entries
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,Làm Cổ Entries
 DocType: Packing Slip,Net Weight UOM,Trọng lượng UOM
 DocType: Item,Default Supplier,Nhà cung cấp mặc định
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Trong sản xuất Allowance Tỷ
@@ -962,29 +892,27 @@
 DocType: Time Log Batch,updated via Time Logs,cập nhật thông qua Thời gian Logs
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Tuổi trung bình
 DocType: Opportunity,Your sales person who will contact the customer in future,"Người bán hàng của bạn, những người sẽ liên lạc với khách hàng trong tương lai"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
 DocType: Company,Default Currency,Mặc định tệ
 DocType: Contact,Enter designation of this Contact,Nhập chỉ định liên lạc này
-DocType: Contact Us Settings,Address,Địa chỉ
 DocType: Expense Claim,From Employee,Từ nhân viên
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra overbilling từ số tiền cho mục {0} trong {1} là số không
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra overbilling từ số tiền cho mục {0} trong {1} là số không
 DocType: Journal Entry,Make Difference Entry,Hãy khác biệt nhập
 DocType: Upload Attendance,Attendance From Date,Từ ngày tham gia
 DocType: Appraisal Template Goal,Key Performance Area,Hiệu suất chủ chốt trong khu vực
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,Vận chuyển
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vận chuyển
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,
 DocType: Email Digest,Annual Expense,Chi phí hàng năm
 DocType: SMS Center,Total Characters,Tổng số nhân vật
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},Vui lòng chọn BOM BOM trong lĩnh vực cho hàng {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-Mẫu hóa đơn chi tiết
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Hòa giải thanh toán hóa đơn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Đóng góp%
 DocType: Item,website page link,liên kết trang web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Hãy chuẩn bị hệ thống để sử dụng đầu tiên.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Số đăng ký công ty để bạn tham khảo. Số thuế vv
 DocType: Sales Partner,Distributor,Nhà phân phối
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,Đặt hàng sản xuất {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 ,Ordered Items To Be Billed,Ra lệnh tiêu được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Chọn Thời gian Logs và Submit để tạo ra một hóa đơn bán hàng mới.
@@ -1004,14 +932,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,Không có gì để yêu cầu
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu thực tế' không thể lớn hơn 'thực tế Ngày kết thúc'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Quản lý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Quản lý
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Loại hoạt động cho Thời gian Sheets
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,Đầu tư đúc
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},Hoặc thẻ ghi nợ hoặc tín dụng số tiền được yêu cầu cho {0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net phải trả tiền (bằng chữ) sẽ được hiển thị khi bạn lưu Phiếu lương.
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Chủ động
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Màu xanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,Màu xanh
 DocType: Purchase Invoice,Is Return,Là Return
 DocType: Price List Country,Price List Country,Giá Danh sách Country
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,Các nút khác có thể được chỉ tạo ra dưới các nút kiểu 'Nhóm'
@@ -1021,50 +947,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS Hồ sơ {0} đã được tạo ra cho người sử dụng: {1} và công ty {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM chuyển đổi yếu tố
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,Sản xuất vật Laminated
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: Account,Balance Sheet,Cân đối kế toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',Trung tâm chi phí Đối với mục Item Code '
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,Stretch hình thành
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Người bán hàng của bạn sẽ nhận được một lời nhắc nhở trong ngày này để liên lạc với khách hàng
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups","Tài khoản có thể tiếp tục được thực hiện theo nhóm, nhưng mục có thể được thực hiện đối với phi Groups"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Thuế và các khoản khấu trừ lương khác.
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Phải trả
 DocType: Account,Warehouse,Web App Ghi chú
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
 ,Purchase Order Items To Be Billed,Tìm mua hàng được lập hoá đơn
 DocType: Purchase Invoice Item,Net Rate,Tỷ Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Hóa đơn mua hàng
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Cổ Ledger Entries và GL Entries được đăng lại cho các biên nhận mua hàng lựa chọn
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Khoản 1
 DocType: Holiday,Holiday,Kỳ nghỉ
-DocType: Event,Saturday,Thứ bảy
 DocType: Leave Control Panel,Leave blank if considered for all branches,Để trống nếu xem xét tất cả các ngành
 ,Daily Time Log Summary,Hàng ngày Giờ Tóm tắt
-DocType: DocField,Label,Nhăn
 DocType: Payment Reconciliation,Unreconciled Payment Details,Chi tiết Thanh toán Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
 DocType: Lead,Call,Cuộc gọi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,'Entries' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,'Entries' không thể để trống
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,Xét xử dư
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,Thiết lập Nhân viên
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid ""","Lưới """
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,Nghiên cứu
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Xin vui lòng ghi rõ ít nhất một thuộc tính trong bảng thuộc tính
 DocType: Contact,User ID,ID người dùng
-DocType: Communication,Sent,Đã gửi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Xem Ledger
-DocType: File,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
-DocType: Communication,Delivery Status,Tình trạng giao
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 DocType: Production Order,Manufacture against Sales Order,Sản xuất với bán hàng đặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,Phần còn lại của Thế giới
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
 ,Budget Variance Report,Báo cáo ngân sách phương sai
 DocType: Salary Slip,Gross Pay,Tổng phải trả tiền
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,Mô tả hạng mục
 DocType: Payment Tool,Payment Mode,Chế độ thanh toán
 DocType: Purchase Invoice,Is Recurring,Là định kỳ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,Kim loại trực tiếp tia laser thiêu kết
 DocType: Purchase Order,Supplied Items,Hàng đã cung cấp
 DocType: Production Order,Qty To Manufacture,Số lượng Để sản xuất
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Duy trì cùng một tốc độ trong suốt chu kỳ mua
 DocType: Opportunity Item,Opportunity Item,Cơ hội mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Mở cửa tạm thời
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,Để lại cân nhân viên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},Cân bằng cho Tài khoản {0} luôn luôn phải có {1}
 DocType: Address,Address Type,Địa chỉ Loại
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,Được nổi bật Hoá đơn
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,Bán hàng đặt hàng {0} không hợp lệ
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,Nhỏ
 DocType: Employee,Employee Number,Số nhân viên
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Khoản 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Đầu tài khoản {0} tạo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Xanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,Xanh
 DocType: Item,Auto re-order,Auto lại trật tự
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Tổng số đã đạt được
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Tổng số đã đạt được
 DocType: Employee,Place of Issue,Nơi cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
-DocType: Report,Disabled,Đã tắt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,hợp đồng
+DocType: Email Digest,Add Quote,Thêm Quote
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,Nông nghiệp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
 DocType: Mode of Payment,Mode of Payment,Hình thức thanh toán
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
 DocType: Journal Entry Account,Purchase Order,Mua hàng
 DocType: Warehouse,Warehouse Contact Info,Kho Thông tin liên lạc
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,{0} không thể mua được bằng Giỏ hàng
 DocType: Purchase Invoice,Recurring Type,Định kỳ Loại
 DocType: Address,City/Town,Thành phố / thị xã
 DocType: Email Digest,Annual Income,Thu nhập hàng năm
 DocType: Serial No,Serial No Details,Không có chi tiết nối tiếp
 DocType: Purchase Invoice Item,Item Tax Rate,Mục Thuế suất
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Mục {0} phải là một mục phụ ký hợp đồng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Thiết bị vốn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Giá Rule là lần đầu tiên được lựa chọn dựa trên 'Áp dụng trên' lĩnh vực, có thể được Item, mục Nhóm hoặc thương hiệu."
@@ -1134,15 +1050,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +111,Production Order status is {0},Tình trạng tự sản xuất là {0}
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Dự kiến giao hàng ngày là ít hơn so với Planned Ngày bắt đầu.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Dự kiến giao hàng ngày là ít hơn so với Planned Ngày bắt đầu.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,Cho Nhà cung cấp
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Loại Cài đặt Tài khoản giúp trong việc lựa chọn tài khoản này trong các giao dịch.
 DocType: Purchase Invoice,Grand Total (Company Currency),Tổng cộng (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Tổng số Outgoing
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Chỉ có thể có một vận chuyển Quy tắc Điều kiện với 0 hoặc giá trị trống cho ""Để giá trị gia tăng"""
 DocType: Authorization Rule,Transaction,cô lập Giao dịch
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Lưu ý: Trung tâm Chi phí này là một nhóm. Không thể thực hiện ghi sổ kế toán chống lại các nhóm.
-apps/frappe/frappe/config/desk.py +7,Tools,Công cụ
 DocType: Item,Website Item Groups,Trang web mục Groups
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,Số thứ tự sản xuất là bắt buộc đối với sản xuất mục đích nhập cảnh chứng khoán
 DocType: Purchase Invoice,Total (Company Currency),Tổng số (Công ty tiền tệ)
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,Tạp chí nhập
 DocType: Workstation,Workstation Name,Tên máy trạm
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},{0} BOM không thuộc khoản {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},{0} BOM không thuộc khoản {1}
 DocType: Sales Partner,Target Distribution,Phân phối mục tiêu
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,Thẻ chú thích
 DocType: Salary Slip,Bank Account No.,Tài khoản ngân hàng số
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Đây là số lượng các giao dịch tạo ra cuối cùng với tiền tố này
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tỷ lệ đánh giá cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},Tỷ lệ đánh giá cần thiết cho mục {0}
 DocType: Quality Inspection Reading,Reading 8,Đọc 8
 DocType: Sales Partner,Agent,Đại lý
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Phân phối Phí Dựa trên&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Thuế và lệ phí tính
 DocType: BOM Operation,Workstation,Máy trạm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Phần cứng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Phần cứng
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Hãy lựa chọn một công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Để lại đặc quyền
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Bạn cần phải kích hoạt Giỏ hàng
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,Không có dữ liệu
 DocType: Appraisal Template Goal,Appraisal Template Goal,Thẩm định mẫu Mục tiêu
 DocType: Salary Slip,Earning,Thu nhập
 DocType: Payment Tool,Party Account Currency,Đảng Tài khoản ngoại tệ
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Điều kiện chồng chéo tìm thấy giữa:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Tổng giá trị theo thứ tự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Thực phẩm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,Bạn có thể tạo một bản ghi thời gian chỉ chống lại một lệnh sản xuất gửi
 DocType: Maintenance Schedule Item,No of Visits,Không có các chuyến thăm
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Các bản tin để liên lạc, dẫn."
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Đồng tiền của tài khoản bế phải là {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum điểm cho tất cả các mục tiêu phải 100. Nó là {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,Hoạt động không thể được bỏ trống.
 ,Delivered Items To Be Billed,Chỉ tiêu giao được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Kho không thể thay đổi cho Serial số
-DocType: DocField,Description,Mô tả
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
-DocType: Letter Head,Is Default,Mặc định là
 DocType: Address,Utilities,Tiện ích
 DocType: Purchase Invoice Item,Accounting,Kế toán
 DocType: Features Setup,Features Setup,Tính năng cài đặt
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Xem Offer Letter
-DocType: Communication,Communication,Liên lạc
 DocType: Item,Is Service Item,Là dịch vụ hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,Vui lòng chọn năm tài chính
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},Từ {0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,Duy trì Cổ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,Từ Datetime
 DocType: Email Digest,For Company,Đối với công ty
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Danh mục tài khoản
 DocType: Material Request,Terms and Conditions Content,Điều khoản và Điều kiện nội dung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
@@ -1239,31 +1149,28 @@
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 ,Batch-Wise Balance History,Lô-Wise cân Lịch sử
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Để làm Danh sách
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Người học việc
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Người học việc
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Thuế bảng chi tiết lấy từ chủ hàng là một chuỗi và lưu trữ trong lĩnh vực này.
  Được sử dụng cho thuế và phí"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,Lancing
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,Ngân hàng Balance
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},Nhập kế toán cho {0}: {1} chỉ có thể được thực hiện bằng tiền tệ: {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},Nhập kế toán cho {0}: {1} chỉ có thể được thực hiện bằng tiền tệ: {2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,Không có cấu lương cho người lao động tìm thấy {0} và tháng
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư tài khoản
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,Rule thuế cho các giao dịch.
 DocType: Rename Tool,Type of document to rename.,Loại tài liệu để đổi tên.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Chúng tôi mua sản phẩm này
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,Chúng tôi mua sản phẩm này
 DocType: Address,Billing,Thanh toán cước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,Gấp mép
-DocType: Bulk Email,Not Sent,Không gửi
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,Nổ hình thành
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Tổng số thuế và lệ phí (Công ty tiền tệ)
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Dự kiến gửi đến {0} người nhận
 DocType: Quality Inspection,Readings,Đọc
 DocType: Stock Entry,Total Additional Costs,Tổng chi phí bổ sung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Phụ hội
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,Phụ hội
 DocType: Shipping Rule Condition,To Value,Để giá trị gia tăng
 DocType: Supplier,Stock Manager,Cổ Quản lý
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Kho nguồn là bắt buộc đối với hàng {0}
@@ -1273,105 +1180,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Giờ làm việc
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Chuyên viên phân tích
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng số tiền JV {2}
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Features Setup,"To enable ""Point of Sale"" view",Để kích hoạt tính năng &quot;Point of Sale&quot; view
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,Thanh toán không thể được thực hiện cho hàng trống
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,Ghim
 DocType: Opportunity,With Items,Với mục
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Số lượng trong
 DocType: Notification Control,Expense Claim Rejected,Chi phí yêu cầu bồi thường bị từ chối
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ","Ngày, tháng, hóa đơn tiếp theo sẽ được tạo ra. Nó được tạo ra trên trình."
 DocType: Item Attribute,Item Attribute,Mục Attribute
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,Mục Biến thể
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Chính phủ.
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,Mục Biến thể
 DocType: Company,Services,Dịch vụ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Tổng số ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),Tổng số ({0})
 DocType: Cost Center,Parent Cost Center,Trung tâm Chi phí cha mẹ
 DocType: Sales Invoice,Source,Nguồn
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Năm tài chính bắt đầu ngày
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,Không có hồ sơ được tìm thấy trong bảng thanh toán
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,Năm tài chính bắt đầu ngày
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,Countersinking
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Material Request Item,Sales Order No,Không bán hàng đặt hàng
 DocType: Item Group,Item Group Name,Mục Group Name
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,Lấy
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lấy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,Chuyển Vật liệu cho sản xuất
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","Mua suất cho mặt hàng: {0} không tìm thấy, đó là cần thiết để đặt mục chiếm (chi phí). Xin đề cập đến giá mục với một danh sách giá mua."
 DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM chi tiết Không
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Thêm GIẢM Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},Lỗi: {0}> {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},Lỗi: {0}> {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,Xin vui lòng tạo tài khoản mới từ mục tài khoản.
 DocType: Maintenance Visit,Maintenance Visit,Bảo trì đăng nhập
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Khách hàng> Nhóm khách hàng> Lãnh thổ
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Hàng loạt sẵn Qty tại Kho
 DocType: Time Log Batch Detail,Time Log Batch Detail,Giờ hàng loạt chi tiết
-DocType: Workflow State,Tasks,nhiệm vụ
 DocType: Landed Cost Voucher,Landed Cost Help,Chi phí hạ cánh giúp
-DocType: Event,Tuesday,Thứ ba
 DocType: Leave Block List,Block Holidays on important days.,Khối Holidays vào những ngày quan trọng.
 ,Accounts Receivable Summary,Tóm tắt các tài khoản phải thu
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},Giữ cho loại {0} đã được phân bổ cho {1} Employee cho kỳ {2} - {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
 DocType: UOM,UOM Name,Tên UOM
-DocType: Top Bar Item,Target,File thiết kế nguồn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Số tiền đóng góp
 DocType: Sales Invoice,Shipping Address,Vận chuyển Địa chỉ
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Công cụ này sẽ giúp bạn cập nhật hoặc ấn định số lượng và giá trị của cổ phiếu trong hệ thống. Nó thường được sử dụng để đồng bộ hóa các giá trị hệ thống và những gì thực sự tồn tại trong kho của bạn.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Trong từ sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Chủ thương hiệu.
-DocType: ToDo,Due Date,Ngày đáo hạn
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,Chủ thương hiệu.
 DocType: Sales Invoice Item,Brand Name,Thương hiệu
 DocType: Purchase Receipt,Transporter Details,Chi tiết Transporter
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Box
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,Tổ chức
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,Box
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,Tổ chức
 DocType: Monthly Distribution,Monthly Distribution,Phân phối hàng tháng
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Danh sách người nhận có sản phẩm nào. Hãy tạo nhận Danh sách
 DocType: Production Plan Sales Order,Production Plan Sales Order,Kế hoạch sản xuất bán hàng đặt hàng
 DocType: Sales Partner,Sales Partner Target,Đối tác bán hàng mục tiêu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},Nhập kế toán cho {0} chỉ có thể được thực hiện bằng tiền tệ: {1}
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,Notching
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Tài khoản ngân hàng
 ,Bank Reconciliation Statement,Trữ ngân hàng hòa giải
 DocType: Address,Lead Name,Tên dẫn
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Mở Balance Cổ
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,Mở Balance Cổ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0} phải chỉ xuất hiện một lần
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Không được phép để tuyền hơn {0} {1} hơn so với mua hàng {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},Lá được phân bổ thành công cho {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Không có mục để đóng gói
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,Số đã không được phản ánh trong ngân hàng
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,Số đã không được phản ánh trong ngân hàng
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Tuyên bố cho chi phí công ty.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,Đúc ly tâm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,Magnetic hoàn thiện lĩnh vực hỗ trợ
 DocType: Company,Default Holiday List,Mặc định Danh sách khách sạn Holiday
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Nợ phải trả chứng khoán
 DocType: Purchase Receipt,Supplier Warehouse,Nhà cung cấp kho
 DocType: Opportunity,Contact Mobile No,Liên hệ điện thoại di động Không
 DocType: Production Planning Tool,Select Sales Orders,Chọn hàng đơn đặt hàng
 ,Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,Để theo dõi các mục sử dụng mã vạch. Bạn sẽ có thể nhập vào các mục trong giao hàng và hóa đơn bán hàng Lưu ý bằng cách quét mã vạch của sản phẩm.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,Đánh dấu như Delivered
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,Đánh dấu như Delivered
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hãy báo giá
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Hãy thử lên kế hoạch hoạt động cho ngày X trước.
 DocType: HR Settings,Stop Birthday Reminders,Ngừng sinh Nhắc nhở
 DocType: SMS Center,Receiver List,Danh sách người nhận
@@ -1379,31 +1277,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0} Xem
 DocType: Salary Structure Deduction,Salary Structure Deduction,Cơ cấu tiền lương trích
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,Selective thiêu kết bằng laser
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,Nhập khẩu thành công!
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Đơn vị đo {0} đã được nhập vào nhiều hơn một lần trong chuyển đổi yếu tố Bảng
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),Tuổi (Ngày)
 DocType: Quotation Item,Quotation Item,Báo giá hàng
 DocType: Account,Account Name,Tên tài khoản
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,Từ ngày không có thể lớn hơn Đến ngày
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Từ ngày không có thể lớn hơn Đến ngày
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Loại nhà cung cấp tổng thể.
 DocType: Purchase Order Item,Supplier Part Number,Nhà cung cấp Phần số
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Thêm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,Tỷ lệ chuyển đổi không thể là 0 hoặc 1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1} được huỷ bỏ hoặc dừng lại
 DocType: Accounts Settings,Credit Controller,Bộ điều khiển tín dụng
 DocType: Delivery Note,Vehicle Dispatch Date,Xe công văn ngày
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,Mua hóa đơn {0} không nộp
 DocType: Company,Default Payable Account,Mặc định Account Payable
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Cài đặt cho các giỏ hàng mua sắm trực tuyến chẳng hạn như các quy tắc vận chuyển, bảng giá, vv"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,การติดตั้งเสร็จสมบูรณ์
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}% Được xem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,Nhân sự
 DocType: Lead,Upper Income,Thu nhập trên
 DocType: Journal Entry Account,Debit in Company Currency,Nợ Công ty ngoại tệ
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Các vấn đề của tôi
@@ -1412,12 +1306,9 @@
 DocType: Company,Default Values,Giá trị mặc định
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,Row {0}: Số tiền thanh toán không thể phủ định
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,Nhấn lắp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},Chống lại Nhà cung cấp hóa đơn {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
 DocType: Payment Reconciliation,Payments,Thanh toán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,Đẳng tĩnh Hot nhấn
-DocType: ToDo,Medium,Trung bình
 DocType: Budget Detail,Budget Allocated,Phân bổ ngân sách
 DocType: Journal Entry,Entry Type,Loại mục
 ,Customer Credit Balance,Balance tín dụng của khách hàng
@@ -1426,12 +1317,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Cập nhật ngày thanh toán ngân hàng với các tạp chí.
 DocType: Quotation,Term Details,Thông tin chi tiết hạn
 DocType: Manufacturing Settings,Capacity Planning For (Days),Năng lực Kế hoạch Đối với (Ngày)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Không ai trong số các mặt hàng có bất kỳ sự thay đổi về số lượng hoặc giá trị.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,Không ai trong số các mặt hàng có bất kỳ sự thay đổi về số lượng hoặc giá trị.
 DocType: Warranty Claim,Warranty Claim,Bảo hành yêu cầu bồi thường
 ,Lead Details,Chi tiết yêu cầu
-DocType: Authorization Rule,Approving User,Phê duyệt danh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,Rèn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,Mạ
 DocType: Purchase Invoice,End date of current invoice's period,Ngày kết thúc của thời kỳ hóa đơn hiện tại của
 DocType: Pricing Rule,Applicable For,Đối với áp dụng
 DocType: Bank Reconciliation,From Date,Từ ngày
@@ -1453,64 +1341,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Giảm thêm
 DocType: Selling Settings,Selling Settings,Bán thiết lập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Đấu giá trực tuyến
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,Xin vui lòng chỉ định hoặc lượng hoặc Tỷ lệ định giá hoặc cả hai
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Công ty, tháng và năm tài chính là bắt buộc"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Yêu cầu vật liệu sử dụng để làm cho nhập chứng khoán này
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Đơn vị duy nhất của một Item.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',Giờ hàng loạt {0} phải được 'Gửi'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Làm kế toán nhập Đối với tất cả phong trào Cổ
 DocType: Leave Allocation,Total Leaves Allocated,Tổng Lá Phân bổ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},Kho yêu cầu tại Row Không {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,Vui lòng nhập tài chính hợp lệ Năm Start và Ngày End
 DocType: Employee,Date Of Retirement,Trong ngày hưu trí
 DocType: Upload Attendance,Get Template,Nhận Mẫu
 DocType: Address,Postal,Bưu chính
 DocType: Item,Weightage,Weightage
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,Khai thác mỏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,Đúc nhựa
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Một Nhóm khách hàng tồn tại với cùng một tên xin thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,Vui lòng chọn {0} đầu tiên.
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},text {0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},text {0}
 DocType: Territory,Parent Territory,Lãnh thổ cha mẹ
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
 DocType: Stock Entry,Material Receipt,Tiếp nhận tài liệu
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Sản phẩm
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,Sản phẩm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},Đảng Loại và Đảng là cần thiết cho thu / tài khoản phải trả {0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nếu mặt hàng này có các biến thể, sau đó nó có thể không được lựa chọn trong các đơn đặt hàng bán hàng vv"
 DocType: Lead,Next Contact By,Tiếp theo Liên By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Kho {0} không thể bị xóa như số lượng tồn tại cho mục {1}
 DocType: Quotation,Order Type,Loại thứ tự
 DocType: Purchase Invoice,Notification Email Address,Thông báo Địa chỉ Email
 DocType: Payment Tool,Find Invoices to Match,Tìm Hoá đơn to Match
 ,Item-wise Sales Register,Item-khôn ngoan doanh Đăng ký
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","ví dụ như ""Ngân hàng Quốc gia XYZ """
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""","ví dụ như ""Ngân hàng Quốc gia XYZ """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Là thuế này bao gồm trong suất cơ bản?
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,Tổng số mục tiêu
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,Tổng số mục tiêu
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,Giỏ hàng được kích hoạt
 DocType: Job Applicant,Applicant for a Job,Nộp đơn xin việc
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,Không có đơn đặt hàng sản xuất tạo ra
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Tiền lương của người lao động trượt {0} đã được tạo ra trong tháng này
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,Tiền lương của người lao động trượt {0} đã được tạo ra trong tháng này
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Sales Invoice Item,Batch No,Không có hàng loạt
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn đặt hàng bán hàng chống Purchase Order của khách hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,Chính
-DocType: DocPerm,Delete,Xóa
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,Biến thể
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},Mới {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,Để dừng lại không thể bị hủy bỏ. Tháo nút để hủy bỏ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,Mặc định BOM ({0}) phải được hoạt động cho mục này hoặc mẫu của mình
 DocType: Employee,Leave Encashed?,Để lại Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Cơ hội Từ trường là bắt buộc
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,Từ mua hóa đơn
 DocType: SMS Center,Send To,Để gửi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
+DocType: Payment Reconciliation Payment,Allocated amount,Số lượng phân bổ
 DocType: Sales Team,Contribution to Net Total,Đóng góp Net Tổng số
 DocType: Sales Invoice Item,Customer's Item Code,Của khách hàng Item Code
 DocType: Stock Reconciliation,Stock Reconciliation,Chứng khoán Hòa giải
@@ -1519,53 +1405,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Nộp đơn xin việc.
 DocType: Purchase Order Item,Warehouse and Reference,Kho và tham khảo
 DocType: Supplier,Statutory info and other general information about your Supplier,Thông tin theo luật định và các thông tin chung khác về nhà cung cấp của bạn
-DocType: Country,Country,Tại
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Địa chỉ
-DocType: Communication,Received,Nhận được
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Trùng lặp Serial No nhập cho hàng {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Một điều kiện cho một Rule Vận Chuyển
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,Item không được phép có thứ tự sản xuất.
-DocType: DocField,Attach Image,Hình ảnh đính kèm
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Trọng lượng tịnh của gói này. (Tính toán tự động như tổng khối lượng tịnh của sản phẩm)
-DocType: Stock Reconciliation Item,Leave blank if no change,Để trống nếu không có sự thay đổi
 DocType: Sales Order,To Deliver and Bill,Để Phân phối và Bill
 DocType: GL Entry,Credit Amount in Account Currency,Số tiền trong tài khoản ngoại tệ tín dụng
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Thời gian Logs cho sản xuất.
 DocType: Item,Apply Warehouse-wise Reorder Level,Áp dụng kho-khôn ngoan Reorder Cấp
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0} phải được đệ trình
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0} phải được đệ trình
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Giờ cho các nhiệm vụ.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,Thanh toán
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,Thanh toán
 DocType: Production Order Operation,Actual Time and Cost,Thời gian và chi phí thực tế
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Yêu cầu vật chất của tối đa {0} có thể được thực hiện cho mục {1} đối với bán hàng đặt hàng {2}
 DocType: Employee,Salutation,Sự chào
-DocType: Communication,Rejected,Từ chối
 DocType: Pricing Rule,Brand,Thương Hiệu
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Bó các mặt hàng tại thời điểm bán.
 DocType: Sales Order Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
 DocType: Quality Inspection Reading,Reading 10,Đọc 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mặt hàng trùng lặp. Xin khắc phục và thử lại.
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,Giá trị {0} cho thuộc tính {1} không tồn tại trong danh sách các mục có giá trị thuộc tính giá trị
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Liên kết
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,Liên kết
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Mục {0} không phải là một khoản đăng
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Hết hạn
 DocType: Packing Slip,To Package No.,Để Gói số
-DocType: DocType,System,Hệ thống
 DocType: Warranty Claim,Issue Date,Ngày phát hành
 DocType: Activity Cost,Activity Cost,Hoạt động Chi phí
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Số lượng tiêu thụ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,Viễn thông
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Viễn thông
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói là một phần của việc phân phối này (Chỉ có Dự thảo)
 DocType: Payment Tool,Make Payment Entry,Thực hiện thanh toán nhập
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
 ,Sales Invoice Trends,Hóa đơn bán hàng Xu hướng
 DocType: Leave Application,Apply / Approve Leaves,Áp dụng / Phê duyệt Leaves
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Đối với
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Có thể tham khảo hàng chỉ khi các loại phí là ""Ngày trước Row Số tiền"" hoặc ""Trước Row Tổng số '"
 DocType: Sales Order Item,Delivery Warehouse,Giao hàng tận kho
 DocType: Stock Settings,Allowance Percent,Trợ cấp Percent
@@ -1577,33 +1458,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}","Bán phải được kiểm tra, nếu áp dụng Đối với được chọn là {0}"
 DocType: Purchase Order Item,Supplier Quotation Item,Nhà cung cấp báo giá hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,Làm cho cấu trúc lương
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,Sự xén lông trừu
 DocType: Item,Has Variants,Có biến thể
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,"Bấm vào nút ""Thực hiện kinh doanh Hoá đơn 'để tạo ra một hóa đơn bán hàng mới."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,Đóng gói và ghi nhãn
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên của phân phối hàng tháng
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,Vui lòng chỉ định ngoại tệ tại Công ty Thạc sĩ và mặc định toàn cầu
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox truy cập bí mật
 DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,Quản lý dự án
 DocType: Supplier,Supplier of Goods or Services.,Nhà cung cấp hàng hóa hoặc dịch vụ.
 DocType: Budget Detail,Fiscal Year,Năm tài chính
 DocType: Cost Center,Budget,Ngân sách
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ngân sách không thể được chỉ định đối với {0}, vì nó không phải là một tài khoản thu nhập hoặc chi phí"
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Đạt được
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Lãnh thổ / khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,ví dụ như 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,ví dụ như 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Phân bổ số lượng {1} phải nhỏ hơn hoặc bằng cho hóa đơn số tiền còn nợ {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Trong từ sẽ được hiển thị khi bạn lưu các hóa đơn bán hàng.
 DocType: Item,Is Sales Item,Là bán hàng
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Nhóm mục Tree
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
 DocType: Maintenance Visit,Maintenance Time,Thời gian bảo trì
 ,Amount to Deliver,Số tiền để Cung cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Một sản phẩm hoặc dịch vụ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,Có một số lỗi.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,Khai thác
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,Một sản phẩm hoặc dịch vụ
 DocType: Naming Series,Current Value,Giá trị hiện tại
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0} tạo
 DocType: Delivery Note Item,Against Sales Order,So với bán hàng đặt hàng
@@ -1618,15 +1494,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,Do ngày không thể trước khi viết bài ngày
 DocType: Website Item Group,Website Item Group,Trang web mục Nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Nhiệm vụ và thuế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,Vui lòng nhập ngày tham khảo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,Vui lòng nhập ngày tham khảo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} mục thanh toán không thể được lọc bởi {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Bảng cho khoản đó sẽ được hiển thị trong trang Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
 DocType: Material Request Item,Material Request Item,Tài liệu Yêu cầu mục
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Cây khoản Groups.
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,Cây khoản Groups.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
 ,Item-wise Purchase History,Item-khôn ngoan Lịch sử mua hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Đỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,Đỏ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
 DocType: Account,Frozen,Đông lạnh
 ,Open Production Orders,Đơn đặt hàng mở sản xuất
@@ -1636,13 +1512,12 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,Row # {0}: Operation {1} không được hoàn thành cho {2} qty thành phẩm trong sản xuất theo thứ tự # {3}. Vui lòng cập nhật trạng thái hoạt động thông qua Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Thay đổi UOM cho một Item.
 DocType: Quality Inspection Reading,Acceptance Criteria,Các tiêu chí chấp nhận
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},Mục {0} phải bán hàng hoặc dịch vụ trong mục {1}
 DocType: Item Group,Show In Website,Hiện Trong Website
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Nhóm
-DocType: Task,Expected Time (in hours),Thời gian dự kiến (trong giờ)
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,Nhóm
+DocType: Task,Expected Time (in hours),Thời gian dự kiến (trong giờ)
 ,Qty to Order,Số lượng đặt hàng
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No","Để theo dõi các tên thương hiệu trong các tài liệu sau Delivery Note, Cơ hội, yêu cầu vật liệu, Item, Mua hàng, mua Voucher, mua hóa đơn, báo giá, bán hàng hóa đơn, gói sản phẩm, bán hàng đặt, Serial No"
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Gantt biểu đồ của tất cả các nhiệm vụ.
@@ -1650,78 +1525,67 @@
 DocType: Holiday List,Clear Table,Rõ ràng bảng
 DocType: Features Setup,Brands,Thương hiệu
 DocType: C-Form Invoice Detail,Invoice No,Không hóa đơn
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,Từ Mua hàng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,Từ Mua hàng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể áp dụng / hủy bỏ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 DocType: Activity Cost,Costing Rate,Chi phí Rate
 ,Customer Addresses And Contacts,Địa chỉ khách hàng và Liên hệ
 DocType: Employee,Resignation Letter Date,Thư từ chức ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,Không đặt
-DocType: Communication,Date,Năm
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Lặp lại Doanh thu khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,Ngồi chặt chẽ trong khi hệ thống của bạn đang được thiết lập. Điều này có thể mất một vài phút.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} ({1}) phải có vai trò 'Chi Người phê duyệt'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Đôi
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,Đôi
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 DocType: Maintenance Schedule Detail,Actual Date,Thực tế ngày
 DocType: Item,Has Batch No,Có hàng loạt Không
 DocType: Delivery Note,Excise Page Number,Tiêu thụ đặc biệt số trang
 DocType: Employee,Personal Details,Thông tin chi tiết cá nhân
 ,Maintenance Schedules,Lịch bảo trì
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,Dập nổi
 ,Quotation Trends,Xu hướng báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,Để ghi nợ tài khoản phải có một tài khoản phải thu
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.","Như sản xuất hàng có thể được thực hiện cho mặt hàng này, nó phải là một mục chứng khoán."
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,Tham gia
-DocType: Authorization Rule,Above Value,Trên giá trị gia tăng
 ,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
 DocType: Purchase Order,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),Thiết lập máy chủ đến cho công việc email id. (Ví dụ như jobs@example.com)
 DocType: Purchase Receipt,Vehicle Number,Số xe
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Tổng số lá được phân bổ {0} không thể ít hơn so với lá đã được phê duyệt {1} cho giai đoạn
 DocType: Journal Entry,Accounts Receivable,Tài khoản Phải thu
 ,Supplier-Wise Sales Analytics,Nhà cung cấp-Wise Doanh Analytics
 DocType: Address Template,This format is used if country specific format is not found,Định dạng này được sử dụng nếu định dạng quốc gia cụ thể không được tìm thấy
-DocType: Custom Field,Custom,Tuỳ chỉnh
 DocType: Production Order,Use Multi-Level BOM,Sử dụng Multi-Level BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,Ép phun
 DocType: Bank Reconciliation,Include Reconciled Entries,Bao gồm Entries hòa giải
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Cây tài khoản finanial.
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Để trống nếu xem xét tất cả các loại nhân viên
 DocType: Landed Cost Voucher,Distribute Charges Based On,Phân phối Phí Dựa Trên
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,"Tài khoản {0} phải là loại 'tài sản cố định ""như mục {1} là một khoản tài sản"
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
-apps/frappe/frappe/config/setup.py +130,Printing,In ấn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,Chi phí bồi thường đang chờ phê duyệt. Chỉ phê duyệt chi phí có thể cập nhật trạng thái.
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ là nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,và
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,Abbr không thể để trống hoặc không gian
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,Thể thao
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Tổng số thực tế
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Đơn vị
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,Xin vui lòng thiết lập các phím truy cập Dropbox trong cấu hình trang web của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,Đơn vị
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,Vui lòng ghi rõ Công ty
 ,Customer Acquisition and Loyalty,Mua hàng và trung thành
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Kho nơi bạn đang duy trì cổ phiếu của các mặt hàng từ chối
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
 DocType: POS Profile,Price List,"<a href=""#Sales Browser/Customer Group""> Add / Edit </ a>"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} bây giờ là mặc định năm tài chính. Xin vui lòng làm mới trình duyệt của bạn để thay đổi có hiệu lực.
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ trợ
-DocType: Authorization Rule,Approving Role,Phê duyệt Vai trò
 ,BOM Search,BOM Tìm kiếm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
 DocType: Workstation,Wages per hour,Tiền lương mỗi giờ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Số dư chứng khoán trong Batch {0} sẽ trở nên tiêu cực {1} cho khoản {2} tại Kho {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Show / Hide các tính năng như nối tiếp Nos, POS, vv"
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản tiền tệ phải {1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sau yêu cầu Chất liệu đã được nâng lên tự động dựa trên mức độ sắp xếp lại danh mục của
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản tiền tệ phải {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},Ngày giải phóng mặt bằng không có thể trước ngày kiểm tra trong hàng {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Ngày giải phóng mặt bằng không có thể trước ngày kiểm tra trong hàng {0}
 DocType: Salary Slip,Deduction,Khấu trừ
 DocType: Address Template,Address Template,Địa chỉ Template
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,Vui lòng nhập Id nhân viên của người bán hàng này
@@ -1733,76 +1597,68 @@
 DocType: Opportunity,Quotation,Báo giá
 DocType: Salary Slip,Total Deduction,Tổng số trích
 DocType: Quotation,Maintenance User,Bảo trì tài khoản
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Chi phí cập nhật
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,Chi phí cập nhật
 DocType: Employee,Date of Birth,Ngày sinh
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,Mục {0} đã được trả lại
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ** Năm tài chính đại diện cho một năm tài chính. Tất cả các bút toán và giao dịch lớn khác đang theo dõi chống lại năm tài chính ** **.
 DocType: Opportunity,Customer / Lead Address,Khách hàng / Chì Địa chỉ
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Giấy chứng nhận SSL không hợp lệ vào luyến {0}
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Mô Tả Công Việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,Mô Tả Công Việc
 DocType: Purchase Order Item,Qty as per Stock UOM,Số lượng theo chứng khoán UOM
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,Vui lòng chọn một tập tin csv hợp lệ với các dữ liệu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,Coating
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Nhân vật đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép đặt tên hàng loạt"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Giữ Theo dõi của Sales Chiến dịch. Theo dõi các Leads, Báo giá, bán hàng đặt hàng vv từ Chiến dịch để đánh giá lợi nhuận trên đầu tư. "
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Giữ Theo dõi của Sales Chiến dịch. Theo dõi các Leads, Báo giá, bán hàng đặt hàng vv từ Chiến dịch để đánh giá lợi nhuận trên đầu tư."
 DocType: Expense Claim,Approver,Người Xét Duyệt
 ,SO Qty,Số lượng SO
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Mục chứng khoán tồn tại đối với kho {0}, do đó bạn có thể không giao lại hoặc sửa đổi kho"
 DocType: Appraisal,Calculate Total Score,Tổng số điểm tính toán
 DocType: Supplier Quotation,Manufacturing Manager,Sản xuất Quản lý
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Giao hàng tận nơi chia Lưu ý thành các gói.
-apps/erpnext/erpnext/hooks.py +84,Shipments,Lô hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,Đúc Dip
-DocType: Purchase Order,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
+apps/erpnext/erpnext/hooks.py +68,Shipments,Lô hàng
+DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,Giờ trạng phải Đăng.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Thiết lập
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,Row #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Trong từ (Công ty tiền tệ)
 DocType: Pricing Rule,Supplier,Nhà cung cấp
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Chi phí linh tinh
 DocType: Global Defaults,Default Company,Công ty mặc định
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Chi phí hoặc khác biệt tài khoản là bắt buộc đối với mục {0} vì nó tác động tổng thể giá trị cổ phiếu
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Không thể overbill cho khoản {0} trong hàng {1} hơn {2}. Để cho phép overbilling, xin vui lòng thiết lập trong Settings Cổ"
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Không thể overbill cho khoản {0} trong hàng {1} hơn {2}. Để cho phép overbilling, xin vui lòng thiết lập trong Settings Cổ"
 DocType: Employee,Bank Name,Tên ngân hàng
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,Người sử dụng {0} bị vô hiệu hóa
 DocType: Leave Application,Total Leave Days,Để lại tổng số ngày
-DocType: Journal Entry Account,Credit in Account Currency,Có tài khoản ngoại tệ
 DocType: Email Digest,Note: Email will not be sent to disabled users,Lưu ý: Email sẽ không được gửi đến người khuyết tật
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Chọn Công ty ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Để trống nếu xem xét tất cả các phòng ban
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Currency Exchange,From Currency,Từ tệ
-DocType: DocField,Name,Tên
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,Số đã không được phản ánh trong hệ thống
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vui lòng chọn Số tiền phân bổ, Loại hóa đơn và hóa đơn số trong ít nhất một hàng"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},Đặt hàng bán hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,Số đã không được phản ánh trong hệ thống
 DocType: Purchase Invoice Item,Rate (Company Currency),Tỷ lệ (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,Các thông tin khác
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và lệ phí
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Một sản phẩm hay một dịch vụ được mua, bán hoặc lưu giữ trong kho."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Hoàn thành
-DocType: Web Form,Select DocType,Chọn DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,Chuốt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,Ngân hàng
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Ngân hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,Vui lòng click vào 'Tạo Lịch trình' để có được lịch trình
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,Trung tâm Chi phí mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,Trung tâm Chi phí mới
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
 DocType: Quality Inspection,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
 DocType: Purchase Order Item,Reference Document Type,Tài liệu tham chiếu Type
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0} với Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0} với Sales Order {1}
 DocType: Account,Fixed Asset,Tài sản cố định
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,Hàng tồn kho được tuần tự
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,Hàng tồn kho được tuần tự
 DocType: Activity Type,Default Billing Rate,Mặc định Thanh toán Rate
 DocType: Time Log Batch,Total Billing Amount,Tổng số tiền Thanh toán
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Tài khoản phải thu
@@ -1810,19 +1666,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
 DocType: Expense Claim Detail,Expense Claim Detail,Chi phí bồi thường chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,Thời gian Logs tạo:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,Vui lòng chọn đúng tài khoản
 DocType: Item,Weight UOM,Trọng lượng UOM
 DocType: Employee,Blood Group,Nhóm máu
 DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Production Order Operation,Pending,Chờ
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Người dùng có thể duyệt các ứng dụng nghỉ phép một nhân viên nào đó của
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,Bạn không thể thay đổi mặc định của Ươm Variant. Để thay đổi Ươm mặc định cho Variant Ươm thay đổi mặc định của Template
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Thiết bị văn phòng
 DocType: Purchase Invoice Item,Qty,Số lượng
 DocType: Fiscal Year,Companies,Các công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,Thiết bị điện tử
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Thiết bị điện tử
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Nâng cao Chất liệu Yêu cầu khi cổ phiếu đạt đến cấp độ sắp xếp lại
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Từ lịch bảo trì
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Toàn thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Toàn thời gian
 DocType: Purchase Invoice,Contact Details,Thông tin chi tiết liên hệ
 DocType: C-Form,Received Date,Nhận ngày
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Nếu bạn đã tạo ra một tiêu chuẩn mẫu trong thuế bán hàng và phí Template, chọn một và nhấp vào nút dưới đây."
@@ -1834,14 +1690,15 @@
 DocType: Job Applicant,Job Opening,Cơ hội nghề nghiệp
 DocType: Payment Reconciliation,Payment Reconciliation,Hòa giải thanh toán
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,Công nghệ
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
 DocType: Offer Letter,Offer Letter,Cung cấp Letter
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Các yêu cầu tạo ra vật liệu (MRP) và đơn đặt hàng sản xuất.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Tổng số Hoá đơn Amt
 DocType: Time Log,To Time,Giờ
+DocType: Authorization Rule,Approving Role (above authorized value),Phê duyệt Role (trên giá trị ủy quyền)
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.","Để thêm các nút con, khám phá cây và bấm vào nút dưới mà bạn muốn thêm các nút hơn."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},"BOM đệ quy: {0} không thể là cha mẹ, con của {2}"
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết chống lại mục tín dụng khác"
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
@@ -1851,12 +1708,10 @@
 DocType: Item,Customer Item Codes,Khách hàng mục Codes
 DocType: Opportunity,Lost Reason,Lý do bị mất
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,Tạo Entries thanh toán đối với đơn đặt hàng hoặc hoá đơn.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,Sự hàn
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,Mới Cổ UOM được yêu cầu
 DocType: Quality Inspection,Sample Size,Kích thước mẫu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Vui lòng xác định hợp lệ ""Từ trường hợp số '"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,Trung tâm chi phí có thể tiếp tục được thực hiện theo nhóm nhưng mục có thể được thực hiện đối với phi Groups
 DocType: Project,External,Bên ngoài
 DocType: Features Setup,Item Serial Nos,Mục nối tiếp Nos
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền
@@ -1866,15 +1721,13 @@
 DocType: Bin,Actual Quantity,Số lượng thực tế
 DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Số thứ tự {0} không tìm thấy
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Khách hàng của bạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,Đúc nén
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,Khách hàng của bạn
 DocType: Leave Block List Date,Block Date,Khối ngày
 DocType: Sales Order,Not Delivered,Không Delivered
 ,Bank Clearance Summary,Tóm tắt thông quan ngân hàng
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Item Code> mục Nhóm> Nhãn hiệu
 DocType: Appraisal Goal,Appraisal Goal,Thẩm định mục tiêu
-DocType: Event,Friday,Thứ sáu
 DocType: Time Log,Costing Amount,Chi phí tiền
 DocType: Process Payroll,Submit Salary Slip,Trình Lương trượt
 DocType: Salary Structure,Monthly Earning & Deduction,Thu nhập hàng tháng và khoản giảm trừ
@@ -1882,16 +1735,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Nhập khẩu với số lượng lớn
 DocType: Sales Partner,Address & Contacts,Địa chỉ & Liên hệ
 DocType: SMS Log,Sender Name,Tên người gửi
-DocType: Page,Title,Tiêu đề
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,Tuỳ chỉnh
 DocType: POS Profile,[Select],[Chọn]
 DocType: SMS Log,Sent To,Gửi Đến
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Làm Mua hàng
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},Không hợp lệ {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
 DocType: Manufacturing Settings,Capacity Planning,Kế hoạch công suất
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"""Từ ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Từ ngày"" là cần thiết"
 DocType: Journal Entry,Reference Number,Số tài liệu tham khảo
 DocType: Employee,Employment Details,Chi tiết việc làm
 DocType: Employee,New Workplace,Nơi làm việc mới
@@ -1906,7 +1757,7 @@
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
 DocType: Item,End of Life,Kết thúc của cuộc sống
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Du lịch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,Du lịch
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
 DocType: Purchase Order,Customer Mobile No,Khách hàng Điện thoại di động Không
 DocType: Sales Invoice,Recurring,Định kỳ
@@ -1914,23 +1765,21 @@
 DocType: Rename Tool,Rename Tool,Công cụ đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,Vật liệu chuyển
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Xác định các hoạt động, chi phí vận hành và cung cấp cho một hoạt động độc đáo không để các hoạt động của bạn."
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép Cổ âm
 DocType: Installation Note,Installation Note,Lưu ý cài đặt
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Thêm Thuế
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,Thêm Thuế
 ,Financial Analytics,Analytics tài chính
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 DocType: Address,Subsidiary,Công ty con
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
 DocType: Quality Inspection,Purchase Receipt No,Mua hóa đơn Không
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền một cách nghiêm túc
-DocType: System Settings,In Hours,Trong Hours
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,Cán cân dự kiến theo ngân hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,Buffing
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,Cán cân dự kiến theo ngân hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Nguồn vốn (nợ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
 DocType: Appraisal,Employee,Nhân viên
@@ -1943,15 +1792,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Nhóm theo Phiếu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Sales Invoice,Mass Mailing,Gửi thư hàng loạt
-DocType: Page,Standard,Tiêu chuẩn
 DocType: Rename Tool,File to Rename,File để Đổi tên
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,Hiện Thanh toán
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,Kích thước
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Notification Control,Expense Claim Approved,Chi phí bồi thường được phê duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Dược phẩm
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Selling Settings,Sales Order Required,Bán hàng đặt hàng yêu cầu
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Tạo ra khách hàng
@@ -1961,30 +1808,25 @@
 DocType: Quality Inspection Reading,Reading 9,Đọc 9
 DocType: Supplier,Is Frozen,Là đông lạnh
 DocType: Buying Settings,Buying Settings,Mua thiết lập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,Hoàn thiện hàng loạt
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM số cho một hoàn thiện tốt mục
 DocType: Upload Attendance,Attendance To Date,Tham gia Đến ngày
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Thiết lập máy chủ đến cho email bán hàng id. (Ví dụ như sales@example.com)
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Tool,Payment Account,Tài khoản thanh toán
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,Dự thảo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Đền bù Tắt
 DocType: Quality Inspection Reading,Accepted,Chấp nhận
-DocType: User,Female,Nữ
-DocType: Journal Entry Account,Debit in Account Currency,Nợ Tài khoản ngoại tệ
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Hãy chắc chắn rằng bạn thực sự muốn xóa tất cả các giao dịch cho công ty này. Dữ liệu tổng thể của bạn sẽ vẫn như nó được. Hành động này không thể được hoàn tác.
-DocType: Print Settings,Modern,Hiện đại
-DocType: Communication,Replied,Trả lời
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Tham chiếu không hợp lệ {0} {1}
 DocType: Payment Tool,Total Payment Amount,Tổng số tiền thanh toán
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn quanitity kế hoạch ({2}) trong sản xuất tự {3}
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trống.
 DocType: Newsletter,Test,K.tra
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'","Như có những giao dịch chứng khoán hiện có cho mặt hàng này, \ bạn không thể thay đổi các giá trị của &#39;Có tiếp Serial No&#39;, &#39;Có hàng loạt No&#39;, &#39;Liệu Cổ Mã&#39; và &#39;Phương pháp định giá&#39;"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,Tạp chí nhanh chóng nhập
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu HĐQT đã đề cập agianst bất kỳ mục nào
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
 DocType: Stock Entry,For Quantity,Đối với lượng
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
@@ -1992,17 +1834,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,Hoàn thành cài đặt
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Nhập kế toán đông lạnh đến ngày này, không ai có thể làm / sửa đổi nào ngoại trừ vai trò quy định dưới đây."
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,Bản tin danh sách gửi thư
 DocType: Delivery Note,Transporter Name,Tên vận chuyển
+DocType: Authorization Rule,Authorized Value,Giá trị được ủy quyền
 DocType: Contact,Enter department to which this Contact belongs,Nhập bộ phận mà mối liên lạc này thuộc về
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,Tổng số Vắng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Đơn vị đo
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,Đơn vị đo
 DocType: Fiscal Year,Year End Date,Ngày kết thúc năm
 DocType: Task Depends On,Task Depends On,Nhiệm vụ Phụ thuộc On
 DocType: Lead,Opportunity,Cơ hội
@@ -2023,16 +1865,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Tỷ lệ cơ bản (theo Cổ Ươm)
 DocType: SMS Log,No of Requested SMS,Không được yêu cầu của tin nhắn SMS
 DocType: Campaign,Campaign-.####,Chiến dịch.# # # #
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,Piercing
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Bước tiếp theo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày của Tham gia
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Một nhà phân phối của bên thứ ba / đại lý / hoa hồng đại lý / chi nhánh / đại lý bán lẻ chuyên bán các sản phẩm công ty cho một hoa hồng.
 DocType: Customer Group,Has Child Node,Có Node trẻ em
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0} chống Mua hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0} chống Mua hàng {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Nhập các thông số url tĩnh ở đây (Ví dụ người gửi = ERPNext, tên người dùng = ERPNext, mật khẩu = 1234, vv)"
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} không có trong bất kỳ năm tài chính đang hoạt động. Để biết thêm chi tiết kiểm tra {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Phạm vi Ageing 1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,Gia công quang hóa
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2074,11 +1915,9 @@
  8. Nhập Row: Nếu dựa vào ""Trước Row Total"" bạn có thể chọn số hàng đó sẽ được thực hiện như là một cơ sở cho việc tính toán này (mặc định là các dòng trước đó).
  9. Hãy xem xét thuế, phí đối với: Trong phần này, bạn có thể xác định nếu thuế / phí chỉ là xác định giá trị (không phải là một phần của tổng số) hoặc chỉ cho tổng số (không thêm giá trị cho các item) hoặc cho cả hai.
  10. Thêm hoặc trích lại: Cho dù bạn muốn thêm hoặc khấu trừ thuế."
-DocType: Note,Note,Nốt nhạc
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
-DocType: Email Account,Email Ids,Email Id
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất nhiều hàng {0} là số lượng bán hàng đặt hàng {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng Tiền mặt /
 DocType: Tax Rule,Billing City,Thanh toán Thành phố
 DocType: Global Defaults,Hide Currency Symbol,Ẩn tệ Ký hiệu
@@ -2086,40 +1925,36 @@
 DocType: Journal Entry,Credit Note,Tín dụng Ghi chú
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},Đã hoàn thành Số lượng không thể có nhiều hơn {0} cho hoạt động {1}
 DocType: Features Setup,Quality,Chất lượng
-DocType: Contact Us Settings,Introduction,Giới thiệu chung
 DocType: Warranty Claim,Service Address,Địa chỉ dịch vụ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Max 100 hàng cho Stock Hoà giải.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Max 100 hàng cho Stock Hoà giải.
 DocType: Stock Entry,Manufacture,Chế tạo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Hãy Delivery Note đầu tiên
 DocType: Purchase Invoice,Currency and Price List,Tiền tệ và Bảng giá
 DocType: Opportunity,Customer / Lead Name,Khách hàng / chì Tên
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,Giải phóng mặt bằng ngày không được đề cập
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Sản xuất
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Giải phóng mặt bằng ngày không được đề cập
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,Sản xuất
 DocType: Item,Allow Production Order,Cho phép sản xuất hàng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
 DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,Đã lần gửi
 DocType: Salary Structure,Total Earning,Tổng số Lợi nhuận
 DocType: Purchase Receipt,Time at which materials were received,Thời gian mà các tài liệu đã nhận được
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,Địa chỉ của tôi
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Chủ chi nhánh tổ chức.
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,hoặc là
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,hoặc là
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Chi phí tiện ích
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90-Trên
 DocType: Buying Settings,Default Buying Price List,Mặc định mua Bảng giá
-,Download Backups,Tải Backups
 DocType: Notification Control,Sales Order Message,Thông báo bán hàng đặt hàng
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Thiết lập giá trị mặc định như Công ty, tiền tệ, năm tài chính hiện tại, vv"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Loại thanh toán
 DocType: Process Payroll,Select Employees,Chọn nhân viên
 DocType: Bank Reconciliation,To Date,Đến ngày
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,Chi tiết
 DocType: Purchase Invoice,Total Taxes and Charges,Tổng số thuế và lệ phí
 DocType: Employee,Emergency Contact,Trường hợp khẩn cấp Liên hệ
 DocType: Item,Quality Parameters,Chất lượng thông số
@@ -2134,6 +1969,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,Không nối tiếp / hàng loạt
 DocType: Product Bundle,Parent Item,Cha mẹ mục
 DocType: Account,Account Type,Loại tài khoản
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,Để lại Loại {0} có thể không được thực hiện chuyển tiếp-
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
@@ -2141,33 +1977,28 @@
 DocType: Bin,Reserved Quantity,Ltd Số lượng
 DocType: Landed Cost Voucher,Purchase Receipt Items,Mua hóa đơn mục
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Các hình thức tùy biến
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,Cắt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,Làm lạt lẻo
 DocType: Account,Income Account,Tài khoản thu nhập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,Molding
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Xem ""Tỷ lệ Of Vật liệu Dựa trên"" trong mục Chi phí"
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
 DocType: Item Reorder,Material Request Type,Tài liệu theo yêu cầu Loại
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
-apps/frappe/frappe/desk/moduleview.py +61,Documents,Tài liệu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Tài liệu tham khảo
 DocType: Cost Center,Cost Center,Trung tâm chi phí
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Chứng từ #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Chứng từ #
 DocType: Notification Control,Purchase Order Message,Thông báo Mua hàng
 DocType: Tax Rule,Shipping Country,Vận Chuyển Country
 DocType: Upload Attendance,Upload HTML,Tải lên HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Tổng số trước ({0}) chống lại thứ tự {1} có thể không được lớn hơn \
  Grand Total ({2})"
 DocType: Employee,Relieving Date,Giảm ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Quy tắc định giá được thực hiện để ghi đè lên Giá liệt kê / xác định tỷ lệ phần trăm giảm giá, dựa trên một số tiêu chí."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Kho chỉ có thể được thay đổi thông qua chứng khoán Entry / Giao hàng tận nơi Lưu ý / mua hóa đơn
 DocType: Employee Education,Class / Percentage,Lớp / Tỷ lệ phần trăm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Thuế thu nhập
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,Laser thiết kế tạo hình net
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Thuế thu nhập
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nếu chọn giá Rule được làm cho 'giá', nó sẽ ghi đè lên giá List. Giá giá Rule là giá cuối cùng, do đó, không giảm giá hơn nữa nên được áp dụng. Do đó, trong các giao dịch như bán hàng đặt hàng, đặt hàng mua vv, nó sẽ được lấy trong trường 'Giá', chứ không phải là lĩnh vực 'Giá Giá'."
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Theo dõi Dẫn theo ngành Type.
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
@@ -2175,10 +2006,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},Vui lòng chọn một giá trị cho {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập chứng khoán
-DocType: User,Bio,Sinh học
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,Quản lý Nhóm khách hàng Tree.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,Tên mới Trung tâm Chi phí
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,Tên mới Trung tâm Chi phí
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,Không mặc định Địa chỉ Template được tìm thấy. Hãy tạo một cái mới từ Setup> In ấn và xây dựng thương hiệu> Địa chỉ Template.
 DocType: Appraisal,HR User,Nhân tài
@@ -2190,31 +2020,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
 DocType: Supplier,Billing Currency,Thanh toán ngoại tệ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Cực lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,Cực lớn
 ,Profit and Loss Statement,Lợi nhuận và mất Trữ
 DocType: Bank Reconciliation Detail,Cheque Number,Số séc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,Nhấn
 DocType: Payment Tool Detail,Payment Tool Detail,Công cụ thanh toán chi tiết
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # Một {1} tồn tại với mục cổ phiếu {2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Cho vay trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Lớn
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Không có nhân viên tìm thấy!
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,Lớn
 DocType: C-Form Invoice Detail,Territory,Lãnh thổ
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Purchase Order,Customer Address Display,Khách hàng Địa chỉ Display
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,Đánh bóng
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Gần Cân đối kế toán và lợi nhuận cuốn sách hay mất.
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.","Mặc định Đơn vị đo lường cho mục {0} không thể thay đổi trực tiếp vì \ bạn đã thực hiện một số giao dịch (s) với một ươm. Để thay đổi Ươm mặc định, \ sử dụng &#39;Ươm Thay Utility&#39; công cụ theo mô-đun Cổ."
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Xác định thị trường ngoại tệ để chuyển đổi một đồng tiền vào một
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tổng số tiền nợ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Nhân viên {0} đã nghỉ trên {1}. Không thể đánh dấu tham dự.
 DocType: Sales Partner,Targets,Mục tiêu
@@ -2222,14 +2046,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả mọi giao dịch bán hàng có thể được gắn với nhiều ** ** Người bán hàng để bạn có thể thiết lập và giám sát các mục tiêu.
 ,S.O. No.,SO số
 DocType: Production Order Operation,Make Time Log,Hãy Giờ
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,Hãy thiết lập số lượng đặt hàng
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Hãy tạo khách hàng từ chì {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Máy tính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,Electro-hóa chất mài
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Đây là một nhóm khách hàng gốc và không thể được chỉnh sửa.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,Xin vui lòng thiết lập biểu đồ của bạn của tài khoản trước khi bạn bắt đầu kế toán Entries
 DocType: Purchase Invoice,Ignore Pricing Rule,Bỏ qua giá Rule
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,Hủy
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Từ ngày ở Cơ cấu lương không thể thấp hơn so với nhân viên Tham gia ngày.
 DocType: Employee Education,Graduate,Sau đại học
 DocType: Leave Block List,Block Days,Khối ngày
@@ -2266,7 +2089,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Kiểm tra định kỳ hóa đơn, bỏ chọn để ngăn chặn tái phát hoặc đặt đúng Ngày kết thúc"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,Tối đa {0} hàng cho phép
 DocType: C-Form Invoice Detail,Net Total,Net Tổng số
 DocType: Bin,FCFS Rate,FCFS Tỷ giá
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),Thanh toán (Sales Invoice)
@@ -2283,20 +2105,19 @@
 DocType: Maintenance Visit,Purposes,Mục đích
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,Ít nhất một mặt hàng cần được nhập với số lượng tiêu cực trong tài liệu trở lại
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lâu hơn bất kỳ giờ làm việc có sẵn trong máy trạm {1}, phá vỡ các hoạt động vào nhiều hoạt động"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,Công điện
 ,Requested,Yêu cầu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,Không có Bình luận
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Quá hạn
 DocType: Account,Stock Received But Not Billed,Chứng khoán nhận Nhưng Không Được quảng cáo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,Tài khoản gốc phải là một nhóm
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Tổng phải trả tiền + tiền còn thiếu Số tiền + séc Số tiền - Tổng số trích
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 DocType: Features Setup,Sales and Purchase,Bán hàng và mua hàng
 DocType: Supplier Quotation Item,Material Request No,Yêu cầu tài liệu Không
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tốc độ tiền tệ của khách hàng được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0} đã được hủy đăng ký thành từ danh sách này.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tỷ Net (Công ty tiền tệ)
-apps/frappe/frappe/templates/base.html +134,Added,Thêm
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,Quản lý Lãnh thổ Tree.
 DocType: Journal Entry Account,Sales Invoice,Hóa đơn bán hàng
 DocType: Journal Entry Account,Party Balance,Balance Đảng
@@ -2310,11 +2131,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Năm tài chính {0} không tìm thấy.
 DocType: Bank Reconciliation,Get Relevant Entries,Được viết liên quan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,Nhập kế toán cho Stock
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,Đúc
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
-apps/frappe/frappe/desk/query_report.py +136,Total,Tổng sồ
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
 DocType: Account,Root Type,Loại gốc
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Không thể trả về nhiều hơn {1} cho khoản {2}
@@ -2324,14 +2143,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Số tiền thuế Sau GIẢM Số tiền (Công ty tiền tệ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Kho mục tiêu là bắt buộc đối với hàng {0}
 DocType: Quality Inspection,Quality Inspection,Kiểm tra chất lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,Phun hình thành
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,Tắm nhỏ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: Chất liệu được yêu cầu Số lượng ít hơn hàng tối thiểu Số lượng
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,Tài khoản {0} được đông lạnh
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL hoặc BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán đối với unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Tối thiểu hàng tồn kho Cấp
 DocType: Stock Entry,Subcontract,Cho thầu lại
@@ -2340,44 +2158,41 @@
 DocType: Production Order Operation,Actual End Time,Thực tế End Time
 DocType: Production Planning Tool,Download Materials Required,Tải về Vật liệu yêu cầu
 DocType: Item,Manufacturer Part Number,Nhà sản xuất Phần số
-DocType: Production Order Operation,Estimated Time and Cost,Thời gian dự kiến và chi phí
+DocType: Production Order Operation,Estimated Time and Cost,Thời gian dự kiến và chi phí
 DocType: Bin,Bin,Bin
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,Đang sục sạo
 DocType: SMS Log,No of Sent SMS,Không có tin nhắn SMS gửi
 DocType: Account,Company,Giỏ hàng Giá liệt kê
 DocType: Account,Expense Account,Tài khoản chi phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,Phần mềm
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Màu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Phần mềm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,Màu
 DocType: Maintenance Visit,Scheduled,Dự kiến
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vui lòng chọn mục nơi &quot;Là Cổ Item&quot; là &quot;Không&quot; và &quot;Có Sales Item&quot; là &quot;Có&quot; và không có Bundle sản phẩm khác
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Chọn phân phối không đồng đều hàng tháng để phân phối các mục tiêu ở tháng.
 DocType: Purchase Invoice Item,Valuation Rate,Tỷ lệ định giá
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,Mục Row {0}: Mua Receipt {1} không tồn tại trên bảng 'Mua Biên lai'
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
 DocType: Installation Note Item,Against Document No,Đối với văn bản số
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Quản lý bán hàng đối tác.
 DocType: Quality Inspection,Inspection Type,Loại kiểm tra
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},Vui lòng chọn {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},Vui lòng chọn {0}
 DocType: C-Form,C-Form No,C-Mẫu Không
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Nhà nghiên cứu
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,Cập nhật
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Nhà nghiên cứu
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,Xin vui lòng lưu bản tin trước khi gửi
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Tên hoặc Email là bắt buộc
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Kiểm tra chất lượng đầu vào.
 DocType: Purchase Order Item,Returned Qty,Số lượng trả lại
 DocType: Employee,Exit,Thoát
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,Loại rễ là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,Loại rễ là bắt buộc
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Không nối tiếp {0} tạo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,Hoàn thiện rung
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Để thuận tiện cho khách hàng, các mã có thể được sử dụng trong các định dạng như in hóa đơn và giao hàng Ghi chú"
 DocType: Employee,You can enter any date manually,Bạn có thể nhập bất kỳ ngày nào tay
 DocType: Sales Invoice,Advertisement,Quảng cáo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Thời gian thử việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,Thời gian thử việc
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Expense Claim,Expense Approver,Người phê duyệt chi phí
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Mua hóa đơn hàng Cung cấp
@@ -2385,43 +2200,40 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Để Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,Nghiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,Shrink gói
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Các hoạt động cấp phát
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,Xác nhận
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Nhà cung cấp> Nhà cung cấp Loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,Địa chỉ Tiêu đề là bắt buộc.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nhập tên của chiến dịch nếu nguồn gốc của cuộc điều tra là chiến dịch
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Chọn năm tài chính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,Smelting
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Sắp xếp lại Cấp
 DocType: Attendance,Attendance Date,Tham gia
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lương chia tay dựa trên Lợi nhuận và khấu trừ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,Tài khoản với các nút con không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,Tài khoản với các nút con không thể được chuyển đổi sang sổ cái
 DocType: Address,Preferred Shipping Address,Ưa thích Vận chuyển Địa chỉ
 DocType: Purchase Receipt Item,Accepted Warehouse,Chấp nhận kho
 DocType: Bank Reconciliation Detail,Posting Date,Báo cáo công đoàn
 DocType: Item,Valuation Method,Phương pháp định giá
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},Không tìm thấy tỷ giá hối đoái cho {0} đến {1}
 DocType: Sales Invoice,Sales Team,Đội ngũ bán hàng
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Trùng lặp mục
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Trùng lặp mục
 DocType: Serial No,Under Warranty,Theo Bảo hành
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[Lỗi]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Trong từ sẽ được hiển thị khi bạn lưu các thứ tự bán hàng.
 ,Employee Birthday,Nhân viên sinh nhật
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lá mới phân bổ (Trong ngày)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
 DocType: Pricing Rule,Discount Percentage,Tỷ lệ phần trăm giảm giá
 DocType: Payment Reconciliation Invoice,Invoice Number,Số hóa đơn
-apps/erpnext/erpnext/hooks.py +70,Orders,Đơn đặt hàng
+apps/erpnext/erpnext/hooks.py +54,Orders,Đơn đặt hàng
 DocType: Leave Control Panel,Employee Type,Loại nhân viên
 DocType: Employee Leave Approver,Leave Approver,Để phê duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,Swaging
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Chất liệu được chuyển giao cho sản xuất
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Một người dùng với ""Chi phí Người phê duyệt"" vai trò"
 ,Issued Items Against Production Order,Mục ban hành đối với sản xuất hàng
@@ -2433,7 +2245,6 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Trung tâm chi phí với các giao dịch hiện có không thể chuyển đổi sang nhóm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,Thời gian không hợp lệ
 DocType: Customer,Credit Limit,Hạn chế tín dụng
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Chọn loại giao dịch
 DocType: GL Entry,Voucher No,Không chứng từ
@@ -2443,11 +2254,10 @@
 DocType: Customer,Address and Contact,Địa chỉ và liên hệ
 DocType: Customer,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Employee,Feedback,Thông tin phản hồi
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể được phân bổ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý: Do / Reference ngày vượt quá cho phép ngày tín dụng của khách hàng bởi {0} ngày (s)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,Maint. Lịch trình
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,Gia công máy bay phản lực mài mòn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,Maint. Lịch trình
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
-DocType: Website Settings,Website Settings,Thiết lập trang web
 DocType: Item,Reorder level based on Warehouse,Mức độ sắp xếp lại dựa vào kho
 DocType: Activity Cost,Billing Rate,Tỷ giá thanh toán
 ,Qty to Deliver,Số lượng để Cung cấp
@@ -2458,20 +2268,19 @@
 DocType: Material Request,Requested For,Đối với yêu cầu
 DocType: Quotation Item,Against Doctype,Chống lại DOCTYPE
 DocType: Delivery Note,Track this Delivery Note against any Project,Giao hàng tận nơi theo dõi này Lưu ý đối với bất kỳ dự án
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,Tài khoản gốc không thể bị xóa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,Tài khoản gốc không thể bị xóa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,Hiện Cổ Entries
 ,Is Primary Address,Là Tiểu học Địa chỉ
 DocType: Production Order,Work-in-Progress Warehouse,Làm việc-trong-Tiến kho
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,Quản lý địa chỉ
 DocType: Pricing Rule,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
 DocType: Serial No,Warranty / AMC Details,Bảo hành / AMC chi tiết
 DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
 DocType: Lead,Market Segment,Phân khúc thị trường
-DocType: Communication,Phone,Chuyển tệp
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),Đóng cửa (Tiến sĩ)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Contact,Passive,Thụ động
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Mẫu thuế cho các giao dịch bán.
@@ -2487,10 +2296,9 @@
 ,Billed Amount,Số tiền hóa đơn
 DocType: Bank Reconciliation,Bank Reconciliation,Ngân hàng hòa giải
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Nhận thông tin cập nhật
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Thêm một vài biên bản lấy mẫu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,Thêm một vài biên bản lấy mẫu
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,Để quản lý
-DocType: Event,Groups,Nhóm
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Nhóm bởi tài khoản
 DocType: Sales Order,Fully Delivered,Giao đầy đủ
 DocType: Lead,Lower Income,Thu nhập thấp
@@ -2499,40 +2307,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Trợ giúp nhanh
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},Nguồn và kho mục tiêu không thể giống nhau cho hàng {0}
 DocType: Features Setup,Sales Extras,Extras bán hàng
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ngân sách cho tài khoản {1} chống lại Trung tâm Chi phí {2} sẽ vượt quá bởi {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} ngân sách cho tài khoản {1} chống lại Trung tâm Chi phí {2} sẽ vượt quá bởi {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ ngày' phải sau 'Đến ngày'
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Sales Order,Customer's Purchase Order,Mua hàng của khách hàng
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Giá trị hoặc lượng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Phút
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,Phút
 DocType: Purchase Invoice,Purchase Taxes and Charges,Thuế mua và lệ phí
 ,Qty to Receive,Số lượng để nhận
 DocType: Leave Block List,Leave Block List Allowed,Để lại Block List phép
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,Yếu tố chuyển đổi không có thể được trong phần
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Bạn sẽ sử dụng nó để đăng nhập
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,Bạn sẽ sử dụng nó để đăng nhập
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Nhà cung cấp tất cả các loại
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},Báo giá {0} không loại {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},Báo giá {0} không loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Giao
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Làm cho lương trượt
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Duyệt BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Các khoản cho vay được bảo đảm
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,Sản phẩm tuyệt vời
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,Sản phẩm tuyệt vời
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,Khai mạc Balance Equity
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,Không thể chấp nhận nghỉ như bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
 DocType: Appraisal,Appraisal,Thẩm định
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,Đúc Lost-xốp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,Vẽ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,Ngày được lặp đi lặp lại
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ký Ủy quyền
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
 DocType: Hub Settings,Seller Email,Người bán Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua mua Invoice)
 DocType: Workstation Working Hour,Start Time,Thời gian bắt đầu
@@ -2546,12 +2351,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Số tiền Net (Công ty tiền tệ)
 DocType: BOM Operation,Hour Rate,Tỷ lệ giờ
 DocType: Stock Settings,Item Naming By,Mục đặt tên By
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,Từ báo giá
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,Từ báo giá
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Thời gian đóng cửa khác nhập {0} đã được thực hiện sau khi {1}
 DocType: Production Order,Material Transferred for Manufacturing,Chất liệu được chuyển giao cho sản xuất
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,Tài khoản của {0} không tồn tại
 DocType: Purchase Receipt Item,Purchase Order Item No,Mua hàng Mã
-DocType: System Settings,System Settings,Cài đặt hệ thống
 DocType: Project,Project Type,Loại dự án
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Hoặc SL mục tiêu hoặc số lượng mục tiêu là bắt buộc.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Chi phí hoạt động khác nhau
@@ -2560,36 +2364,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường net trọng lượng đóng gói + trọng lượng vật liệu. (Đối với in)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
 DocType: Serial No,Is Cancelled,Được hủy bỏ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,Lô hàng của tôi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,Lô hàng của tôi
 DocType: Journal Entry,Bill Date,Hóa đơn ngày
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ngay cả khi có nhiều quy giá với ưu tiên cao nhất, ưu tiên nội bộ sau đó sau được áp dụng:"
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
-DocType: Communication,Recipients,Người nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,Screwing
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,-sự Cán vân
 DocType: Expense Claim,Approval Status,Tình trạng chính
 DocType: Hub Settings,Publish Items to Hub,Xuất bản Items để Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Từ giá trị phải nhỏ hơn giá trị trong hàng {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Chuyển khoản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Vui lòng chọn tài khoản ngân hàng
 DocType: Newsletter,Create and Send Newsletters,Tạo và Gửi Tin
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,Từ ngày phải trước Đến ngày
 DocType: Sales Order,Recurring Order,Đặt hàng theo định kỳ
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Nhóm khách hàng / khách hàng
 DocType: Item Group,Check this if you want to show in website,Kiểm tra này nếu bạn muốn hiển thị trong trang web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Chào mừng bạn đến ERPNext
+,Welcome to ERPNext,Chào mừng bạn đến ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Chứng từ chi tiết Số
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,Dẫn đến bảng báo giá
 DocType: Lead,From Customer,Từ khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Cuộc gọi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,Cuộc gọi
 DocType: Project,Total Costing Amount (via Time Logs),Tổng số tiền Chi phí (thông qua Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Chứng khoán UOM
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
 ,Projected,Dự kiến
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
@@ -2597,13 +2397,10 @@
 DocType: Issue,Opening Date,Mở ngày
 DocType: Journal Entry,Remark,Nhận xét
 DocType: Purchase Receipt Item,Rate and Amount,Tỷ lệ và Số tiền
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,Chán nản
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,Không có hồ sơ tìm thấy
-DocType: Blog Category,Parent Website Route,Mẹ Trang web Route
 DocType: Sales Order,Not Billed,Không Được quảng cáo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Cả kho phải thuộc cùng một công ty
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Không có liên hệ nào được bổ sung.
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,Không hoạt động
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Chi phí hạ cánh Voucher Số tiền
 DocType: Time Log,Batched for Billing,Trộn cho Thanh toán
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Hóa đơn đưa ra bởi nhà cung cấp.
@@ -2611,20 +2408,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,Số tiền giảm giá
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Mua hóa đơn
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong ngày)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,ví dụ như thuế GTGT
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,ví dụ như thuế GTGT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản nhập Journal
 DocType: Shopping Cart Settings,Quotation Series,Báo giá dòng
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,Khí kim loại nóng hình thành
 DocType: Sales Order Item,Sales Order Date,Bán hàng đặt hàng ngày
 DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Kho {0}: Công ty là bắt buộc
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",Đi đến các nhóm thích hợp (thường Nguồn vốn&gt; Nợ ngắn hạn&gt; Thuế và Nhiệm vụ và tạo một tài khoản mới (bằng cách nhấn vào Add Child) của loại &quot;thuế&quot; và làm đề cập đến tỷ lệ thuế.
 ,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Thiếu ngoại tệ Tỷ giá ngoại tệ cho {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,Cắt laser
-DocType: Event,Monday,Thứ Hai
 DocType: Journal Entry,Stock Entry,Chứng khoán nhập
 DocType: Account,Payable,Phải nộp
 DocType: Salary Slip,Arrear Amount,Tiền còn thiếu Số tiền
@@ -2637,7 +2431,6 @@
 DocType: Lead,Address Desc,Giải quyết quyết định
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Ít nhất một trong những bán hoặc mua phải được lựa chọn
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,Trường hợp hoạt động sản xuất được thực hiện.
-DocType: Page,All,Tất cả
 DocType: Stock Entry Detail,Source Warehouse,Nguồn Kho
 DocType: Installation Note,Installation Date,Cài đặt ngày
 DocType: Employee,Confirmation Date,Xác nhận ngày
@@ -2645,9 +2438,8 @@
 DocType: Account,Sales User,Bán tài khoản
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Min Số lượng không có thể lớn hơn Max Số lượng
 DocType: Stock Entry,Customer or Supplier Details,Khách hàng hoặc nhà cung cấp chi tiết
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,Cài đặt
 DocType: Lead,Lead Owner,Chủ đầu
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,Kho được yêu cầu
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,Kho được yêu cầu
 DocType: Employee,Marital Status,Tình trạng hôn nhân
 DocType: Stock Settings,Auto Material Request,Vật liệu tự động Yêu cầu
 DocType: Time Log,Will be updated when billed.,Sẽ được cập nhật khi lập hóa đơn.
@@ -2661,44 +2453,40 @@
 DocType: Territory,Territory Targets,Mục tiêu lãnh thổ
 DocType: Delivery Note,Transporter Info,Thông tin vận chuyển
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Mua hàng mục Cung cấp
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,Tên Công ty không thể công ty
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Thư đứng đầu cho các mẫu in.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tiêu đề cho các mẫu in, ví dụ như hóa đơn chiếu lệ."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là Inclusive
 DocType: POS Profile,Update Stock,Cập nhật chứng khoán
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,Superfinishing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến không chính xác (Tổng số) giá trị Trọng lượng. Hãy chắc chắn rằng Trọng lượng của mỗi mục là trong cùng một UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,Hãy kéo các mục từ giao hàng Lưu ý
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.","Ghi tất cả các thông tin liên lạc của loại email, điện thoại, chat, truy cập, vv"
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,Xin đề cập đến Round Tắt Trung tâm chi phí tại Công ty
 DocType: Purchase Invoice,Terms,Điều khoản
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,Tạo mới
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,Tạo mới
 DocType: Buying Settings,Purchase Order Required,Mua hàng yêu cầu
 ,Item-wise Sales History,Item-khôn ngoan Lịch sử bán hàng
 DocType: Expense Claim,Total Sanctioned Amount,Tổng số tiền bị xử phạt
 ,Purchase Analytics,Mua Analytics
 DocType: Sales Invoice Item,Delivery Note Item,Giao hàng Ghi mục
 DocType: Expense Claim,Task,Nhiệm vụ Tự tắt Lựa chọn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,Cạo
 DocType: Purchase Taxes and Charges,Reference Row #,Tài liệu tham khảo Row #
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch số là bắt buộc đối với hàng {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Đây là một người bán hàng gốc và không thể được chỉnh sửa.
 ,Stock Ledger,Chứng khoán Ledger
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},Rate: {0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},Rate: {0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,Lương trượt trích
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Chú thích:
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,Chọn một nút nhóm đầu tiên.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},Mục đích phải là một trong {0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,Điền vào mẫu và lưu nó
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Tải về một bản báo cáo có chứa tất cả các nguyên liệu với tình trạng hàng tồn kho mới nhất của họ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,Đối mặt
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Cộng đồng Diễn đàn
 DocType: Leave Application,Leave Balance Before Application,Trước khi rời khỏi cân ứng dụng
 DocType: SMS Center,Send SMS,Gửi tin nhắn SMS
 DocType: Company,Default Letter Head,Mặc định Letter Head
 DocType: Time Log,Billable,Lập hoá đơn
-DocType: Authorization Rule,This will be used for setting rule in HR module,Điều này sẽ được sử dụng để thiết lập quy tắc trong quản lý Nhân sự
 DocType: Account,Rate at which this tax is applied,Tốc độ thuế này được áp dụng
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,Sắp xếp lại Qty
 DocType: Company,Stock Adjustment Account,Tài khoản điều chỉnh chứng khoán
@@ -2710,12 +2498,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,Cơ hội bị mất
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Giảm giá Fields sẽ có sẵn trong Mua hàng, mua hóa đơn, mua hóa đơn"
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Tên tài khoản mới. Lưu ý: Vui lòng không tạo tài khoản cho khách hàng và nhà cung cấp
-DocType: Report,Report Type,Loại báo cáo
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,Đang tải STRING_0}
 DocType: BOM Replace Tool,BOM Replace Tool,Thay thế Hội đồng quản trị Công cụ
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Nước khôn ngoan Địa chỉ mặc định Templates
 DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,Hiện thuế break-up
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},Do / Reference ngày không được sau {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Số liệu nhập khẩu và xuất khẩu
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Nếu bạn tham gia vào hoạt động sản xuất. Cho phép Item là Sản xuất '
@@ -2725,16 +2511,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
 DocType: Serial No,Out of AMC,Của AMC
 DocType: Purchase Order Item,Material Request Detail No,Yêu cầu tài liệu chi tiết Không
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,Ngoặt cứng
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ để người sử dụng có doanh Thạc sĩ Quản lý {0} vai trò
 DocType: Company,Default Cash Account,Tài khoản mặc định tiền
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Công ty (không khách hàng hoặc nhà cung cấp) làm chủ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',Vui lòng nhập 'dự kiến giao hàng ngày'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Ghi chú giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} không phải là một số hợp lệ cho hàng loạt mục {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.","Lưu ý: Nếu thanh toán không được thực hiện đối với bất kỳ tài liệu tham khảo, làm Journal nhập bằng tay."
 DocType: Item,Supplier Items,Nhà cung cấp Items
 DocType: Opportunity,Opportunity Type,Loại cơ hội
@@ -2746,7 +2531,7 @@
 DocType: Hub Settings,Publish Availability,Xuất bản sẵn có
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
 ,Stock Ageing,Cổ người cao tuổi
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động đến hệ về giao dịch Trình.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2754,59 +2539,51 @@
  Sẵn Số lượng: {4}, Chuyển Số lượng: {5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
 DocType: Purchase Order,Customer Contact Email,Khách hàng Liên hệ Email
-DocType: Event,Sunday,Chủ Nhật
 DocType: Sales Team,Contribution (%),Đóng góp (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không quy định rõ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Lưu ý: Hiệu thanh toán sẽ không được tạo ra từ 'tiền mặt hoặc tài khoản ngân hàng' không quy định rõ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,Trách nhiệm
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vui lòng nhập ít nhất 1 hóa đơn trong bảng
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Thêm người dùng
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,Thêm người dùng
 DocType: Pricing Rule,Item Group,Nhóm hàng
 DocType: Task,Actual Start Date (via Time Logs),Ngày bắt đầu thực tế (thông qua Time Logs)
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi hòa giải
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và lệ phí nhập (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Mục thuế Row {0} phải có tài khoản của các loại thuế, thu nhập hoặc chi phí hoặc có thu phí"
 DocType: Sales Order,Partly Billed,Được quảng cáo một phần
 DocType: Item,Default BOM,Mặc định HĐQT
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,Hãy gõ lại tên công ty để xác nhận
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Time Log Batch,Total Hours,Tổng số giờ
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,Ô tô
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,Mục được yêu cầu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,Kim loại đúc phun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Ô tô
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Time Log,From Time,Thời gian từ
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Chọn quốc gia của bạn, Time Zone và ngoại tệ"
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách giá Tỷ giá
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,Sự ngâm trong muối
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,Đúc cát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,Mạ điện
 DocType: Purchase Invoice Item,Rate,Đánh giá
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Tập
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Tập
 DocType: Newsletter,A Lead with this email id should exist,Một chì với id email này nên tồn tại
 DocType: Stock Entry,From BOM,Từ BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Gói Cơ bản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Gói Cơ bản
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Giao dịch chứng khoán trước ngày {0} được đông lạnh
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,Đến ngày nên giống như Từ ngày cho nửa ngày nghỉ
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,Không tham khảo là bắt buộc nếu bạn bước vào tham khảo ngày
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Tham gia ngày phải lớn hơn ngày sinh
 DocType: Salary Structure,Salary Structure,Cơ cấu tiền lương
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Nhiều Giá Rule tồn tại với cùng một tiêu chí, xin vui lòng giải quyết xung đột bằng cách gán \
  ưu tiên. Quy định giá: {0}"
 DocType: Account,Bank,Tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,Hãng hàng không
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Hãng hàng không
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho
 DocType: Employee,Offer Date,Phục vụ ngày
 DocType: Hub Settings,Access Token,Truy cập Mã
@@ -2815,45 +2592,37 @@
 DocType: Item,Is Fixed Asset Item,Tài sản cố định là mục
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page","Nếu bạn có định dạng in dài, tính năng này có thể được sử dụng để phân chia các trang được in trên nhiều trang với tất cả các header và footer trên mỗi trang"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Tất cả các vùng lãnh thổ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Tất cả các vùng lãnh thổ
 DocType: Purchase Invoice,Items,Mục
 DocType: Fiscal Year,Year Name,Năm Tên
 DocType: Process Payroll,Process Payroll,Quá trình tính lương
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
 DocType: Product Bundle Item,Product Bundle Item,Gói sản phẩm hàng
 DocType: Sales Partner,Sales Partner Name,Đối tác bán hàng Tên
 DocType: Purchase Invoice Item,Image View,Xem hình ảnh
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,Hoàn thiện và hoàn thiện công nghiệp
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From và To ngày cần
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
 DocType: Shipping Rule,Calculate Based On,Dựa trên tính toán
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,Khoan
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,Thổi
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
 DocType: Tax Rule,Shipping City,Vận Chuyển Thành phố
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Mục này là một biến thể của {0} (Template). Các thuộc tính sẽ được sao chép từ các mẫu trừ 'Không Copy' được thiết lập
 DocType: Account,Purchase User,Mua tài khoản
 DocType: Notification Control,Customize the Notification,Tùy chỉnh thông báo
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,Đánh bằng búa
-DocType: Web Page,Slideshow,Ảnh Slideshow
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
 DocType: Sales Invoice,Shipping Rule,Này ! Đi trước và thêm một địa chỉ
 DocType: Journal Entry,Print Heading,In nhóm
 DocType: Quotation,Maintenance Manager,Quản lý bảo trì
-DocType: Workflow State,Search,Tìm kiếm
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Tổng số không có thể được không
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Kể từ ngày Last Order"" phải lớn hơn hoặc bằng số không"
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,Hàn thau
 DocType: C-Form,Amended From,Sửa đổi Từ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Nguyên liệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,Nguyên liệu
 DocType: Leave Application,Follow via Email,Theo qua email
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Số tiền thuế Sau khi giảm giá tiền
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Hoặc mục tiêu SL hoặc số lượng mục tiêu là bắt buộc
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},Không có Hội đồng quản trị mặc định tồn tại cho mục {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Khai mạc ngày nên trước ngày kết thúc
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -2862,45 +2631,44 @@
 ,Produced,Sản xuất
 DocType: Item,Item Code for Suppliers,Item Code cho nhà cung cấp
 DocType: Issue,Raised By (Email),Nâng By (Email)
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,Chung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Đính kèm thư của
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,Chung
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,Đính kèm thư của
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Danh sách đầu thuế của bạn (ví dụ như thuế GTGT, Hải vv; họ cần phải có tên duy nhất) và tỷ lệ tiêu chuẩn của họ. Điều này sẽ tạo ra một mẫu tiêu chuẩn, trong đó bạn có thể chỉnh sửa và thêm nhiều hơn sau này."
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Danh sách đầu thuế của bạn (ví dụ như thuế GTGT, Hải vv; họ cần phải có tên duy nhất) và tỷ lệ tiêu chuẩn của họ. Điều này sẽ tạo ra một mẫu tiêu chuẩn, trong đó bạn có thể chỉnh sửa và thêm nhiều hơn sau này."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nối tiếp Nos Yêu cầu cho In nhiều mục {0}
 DocType: Journal Entry,Bank Entry,Ngân hàng nhập
 DocType: Authorization Rule,Applicable To (Designation),Để áp dụng (Chỉ)
-DocType: Blog Post,Blog Post,Bài Blog
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Nhóm By
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,Cho phép / vô hiệu hóa tiền tệ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Chi phí bưu điện
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Purchase Order,The date on which recurring order will be stop,"Ngày, tháng, để định kỳ sẽ được dừng lại"
 DocType: Quality Inspection,Item Serial No,Mục Serial No
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0} phải được giảm {1} hoặc bạn nên tăng khả năng chịu tràn
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,Tổng số hiện tại
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Giờ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,Giờ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Mục đăng {0} không thể được cập nhật bằng cách sử dụng \
  Cổ hòa giải"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Mới Serial No không thể có Warehouse. Kho phải được thiết lập bởi Cổ nhập hoặc mua hóa đơn
 DocType: Lead,Lead Type,Loại chì
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,Tạo báo giá
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được chấp thuận bởi {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Điều kiện vận chuyển Rule
 DocType: BOM Replace Tool,The new BOM after replacement,Hội đồng quản trị mới sau khi thay thế
 DocType: Features Setup,Point of Sale,Điểm bán hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,Quăn
 DocType: Account,Tax,Thuế
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},Row {0}: {1} không phải là một giá trị {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,Refining
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},Row {0}: {1} không phải là một giá trị {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,Từ Bundle sản phẩm
 DocType: Production Planning Tool,Production Planning Tool,Công cụ sản xuất Kế hoạch
 DocType: Quality Inspection,Report Date,Báo cáo ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,Routing
 DocType: C-Form,Invoices,Hoá đơn
 DocType: Job Opening,Job Title,Chức vụ
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0} đã được phân bổ cho {1} Employee cho kỳ {2} - {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0} người nhận
 DocType: Features Setup,Item Groups in Details,Nhóm mục trong chi tiết
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
@@ -2909,33 +2677,29 @@
 DocType: Stock Entry,Update Rate and Availability,Tốc độ cập nhật và sẵn có
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Tỷ lệ phần trăm bạn được phép nhận hoặc cung cấp nhiều so với số lượng đặt hàng. Ví dụ: Nếu bạn đã đặt mua 100 đơn vị. và Trợ cấp của bạn là 10% sau đó bạn được phép nhận 110 đơn vị.
 DocType: Pricing Rule,Customer Group,Nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
 DocType: Item,Website Description,Website Description
 DocType: Serial No,AMC Expiry Date,AMC hết hạn ngày
 ,Sales Register,Đăng ký bán hàng
 DocType: Quotation,Quotation Lost Reason,Báo giá Lost Lý do
 DocType: Address,Plant,Cây
-DocType: DocType,Setup,Cài đặt
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa là.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,Cán nguội
 DocType: Customer Group,Customer Group Name,Nhóm khách hàng Tên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Item,Attributes,Thuộc tính
-DocType: Packing Slip,Get Items,Được mục
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,Được mục
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Last Order ngày
-DocType: DocField,Image,Hình
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,Làm cho tiêu thụ đặc biệt Hóa đơn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Tài khoản của {0} không thuộc về công ty {1}
-DocType: Communication,Other,Khác
 DocType: C-Form,C-Form,C-Mẫu
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,ID hoạt động không được thiết lập
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,Maint. Chuyến thăm
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,Maint. Chuyến thăm
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
 DocType: Purchase Invoice,Mobile No,Điện thoại di động Không
 DocType: Payment Tool,Make Journal Entry,Hãy Journal nhập
@@ -2943,35 +2707,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Dữ liệu dự án khôn ngoan là không có sẵn cho báo giá
 DocType: Project,Expected End Date,Dự kiến kết thúc ngày
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,Thương mại
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,Thương mại
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,Chánh mục {0} không phải là Cổ Mã
 DocType: Cost Center,Distribution Id,Id phân phối
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,Dịch vụ tuyệt vời
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Tất cả sản phẩm hoặc dịch vụ.
 DocType: Purchase Invoice,Supplier Address,Địa chỉ nhà cung cấp
-DocType: Contact Us Settings,Address Line 2,Địa chỉ Dòng 2
-DocType: ToDo,Reference,Tham chiếu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,Đục lỗ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Số lượng ra
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,Quy tắc để tính toán tiền vận chuyển để bán
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,Series là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,Dịch vụ tài chính
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},Giá trị {0} Thuộc tính phải nằm trong phạm vi của {1} để {2} trong gia số của {3}
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},Kho cần thiết cho chứng khoán hàng {0}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Mặc định thu khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,Cưa
 DocType: Tax Rule,Billing State,Thanh toán Nhà nước
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,Ép tấm nhiều lớp
 DocType: Item Reorder,Transfer,Truyền
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,Due Date là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,Quá trình thiêu kết
 DocType: Journal Entry,Pay To / Recd From,Để trả / Recd Từ
 DocType: Naming Series,Setup Series,Thiết lập Dòng
 DocType: Supplier,Contact HTML,Liên hệ với HTML
@@ -2982,9 +2740,8 @@
 DocType: Company,Retail,Lĩnh vực bán lẻ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,Khách hàng {0} không tồn tại
 DocType: Attendance,Absent,Vắng mặt
-DocType: Product Bundle,Product Bundle,Bundle sản phẩm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,Bundle sản phẩm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,Máy nghiền
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Mua Thuế và phí Template
 DocType: Upload Attendance,Download Template,Tải mẫu
 DocType: GL Entry,Remarks,Ghi chú
@@ -2992,48 +2749,44 @@
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
 DocType: Features Setup,POS View,POS Xem
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,Đúc liên tục
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vui lòng xác định
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,Ở trên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,Lạnh sizing
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,Tài khoản {0} không thể là một Tập đoàn
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Vùng
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc các giao dịch khác nhau.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc các giao dịch khác nhau.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
 DocType: Holiday List,Weekly Off,Tắt tuần
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ví dụ như năm 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Lợi nhuận tạm thời / lỗ (tín dụng)
 DocType: Sales Invoice,Return Against Sales Invoice,Return Against Sales Invoice
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Mục 5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},Xin hãy thiết lập giá trị mặc định {0} trong Công ty {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},Xin hãy thiết lập giá trị mặc định {0} trong Công ty {1}
 DocType: Serial No,Creation Time,Thời gian tạo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Tổng doanh thu
 DocType: Sales Invoice,Product Bundle Help,Sản phẩm Bundle Trợ giúp
 ,Monthly Attendance Sheet,Hàng tháng tham dự liệu
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rohit ERPNext Phần mở rộng (thường)
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Trung tâm chi phí là bắt buộc đối với hàng {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,Nhận Items từ Bundle sản phẩm
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,Tài khoản {0} không hoạt động
 DocType: GL Entry,Is Advance,Là Trước
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Từ ngày tham gia và tham dự Đến ngày là bắt buộc
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
 DocType: Sales Team,Contact No.,Liên hệ với số
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Lợi nhuận và mất 'loại tài khoản {0} không được phép vào khai nhập"
-DocType: Workflow State,Time,Thời gian
 DocType: Features Setup,Sales Discounts,Giảm giá bán hàng
 DocType: Hub Settings,Seller Country,Người bán Country
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 DocType: Sales Invoice,Terms and Conditions Details,Điều khoản và Điều kiện chi tiết
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Thuế doanh thu và lệ phí mẫu
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Số thứ tự
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner đó sẽ hiển thị trên đầu danh sách sản phẩm.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Xác định điều kiện để tính toán tiền vận chuyển
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Thêm trẻ em
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Vai trò Được phép Thiết lập Frozen Accounts & Edit Frozen Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,Không thể chuyển đổi Trung tâm Chi phí sổ cái vì nó có các nút con
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,Yếu tố chuyển đổi là cần thiết
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,Hoa hồng trên doanh
 DocType: Offer Letter Term,Value / Description,Giá trị / Mô tả
@@ -3041,15 +2794,13 @@
 ,Customers Not Buying Since Long Time,Khách hàng không mua từ Long Time
 DocType: Production Order,Expected Delivery Date,Dự kiến sẽ giao hàng ngày
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng cho {0} # {1}. Sự khác biệt là {2}.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,Lồi lên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,Casting bay hơi-pattern
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Chi phí Giải trí
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,Tuổi
 DocType: Time Log,Billing Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Số lượng không hợp lệ quy định cho mặt hàng {0}. Số lượng phải lớn hơn 0.
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,Ứng dụng cho nghỉ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,Tài khoản với giao dịch hiện có không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,Chi phí pháp lý
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc","Các ngày trong tháng mà trên đó để tự động sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Sales Invoice,Posting Time,Thời gian gửi bài
@@ -3063,26 +2814,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,New Doanh thu khách hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Chi phí đi lại
 DocType: Maintenance Visit,Breakdown,Hỏng
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,Tài khoản: {0} với tệ: {1} có thể không được lựa chọn
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,Tài khoản: {0} với tệ: {1} có thể không được lựa chọn
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: Cha mẹ tài khoản {1} không thuộc về công ty: {2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Xóa thành công tất cả các giao dịch liên quan đến công ty này!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Như trên ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,Mài giũa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,Quản chế
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
-DocType: Feed,Full Name,Tên đầy đủ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,Clinching
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Quản chế
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,Kho mặc định là bắt buộc đối với cổ phiếu Item.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},Thanh toán tiền lương trong tháng {0} và năm {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
 ,Transferred Qty,Số lượng chuyển giao
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Duyệt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Hoạch định
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,Hoạch định
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Giờ làm hàng loạt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Ban hành
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Time Logs)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Chúng tôi bán sản phẩm này
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,Chúng tôi bán sản phẩm này
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Nhà cung cấp Id
 DocType: Journal Entry,Cash Entry,Cash nhập
 DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
@@ -3091,18 +2839,16 @@
 DocType: Brand,Item Manager,Mã Manager
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Thêm hàng để thiết lập ngân sách hàng năm trên tài khoản.
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,Khai thác đá
 DocType: Production Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Tất cả các hệ.
 DocType: Newsletter,Test Email Id,Kiểm tra Email Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Công ty viết tắt
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,Công ty viết tắt
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Nếu bạn làm theo kiểm tra chất lượng. Cho phép hàng bảo đảm chất lượng yêu cầu và bảo đảm chất lượng Không có trong mua hóa đơn
 DocType: GL Entry,Party Type,Loại bên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,Nguyên liệu không thể giống nhau như mục chính
 DocType: Item Attribute Value,Abbreviation,Tên viết tắt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Không authroized từ {0} vượt quá giới hạn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,Khuôn đúc
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,Lương mẫu chủ.
 DocType: Leave Type,Max Days Leave Allowed,Để lại tối đa ngày phép
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Đặt Rule thuế cho giỏ hàng
@@ -3116,15 +2862,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Giá để chào hoặc khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ đông lạnh
 ,Territory Target Variance Item Group-Wise,Lãnh thổ mục tiêu phương sai mục Nhóm-Wise
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Tất cả các nhóm khách hàng
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Có thể đổi tiền kỷ lục không được tạo ra cho {1} đến {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,Template thuế là bắt buộc.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,Tài khoản {0}: Cha mẹ tài khoản {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
 DocType: Account,Temporary,Tạm thời
 DocType: Address,Preferred Billing Address,Địa chỉ ưa thích Thanh toán
 DocType: Monthly Distribution Percentage,Percentage Allocation,Tỷ lệ phần trăm phân bổ
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Thư ký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Thư ký
 DocType: Serial No,Distinct unit of an Item,Đơn vị riêng biệt của một khoản
 DocType: Pricing Rule,Buying,Mua
 DocType: HR Settings,Employee Records to be created by,Nhân viên ghi được tạo ra bởi
@@ -3137,24 +2883,21 @@
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
 DocType: Purchase Order Item,Supplier Quotation,Nhà cung cấp báo giá
 DocType: Quotation,In Words will be visible once you save the Quotation.,Trong từ sẽ được hiển thị khi bạn lưu các báo giá.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,Bàn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1} là dừng lại
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
 DocType: Lead,Add to calendar on this date,Thêm vào lịch trong ngày này
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,sự kiện sắp tới
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Khách hàng được yêu cầu
-DocType: Letter Head,Letter Head,Thư Head
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,Quick Entry
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} là bắt buộc đối với Return
 DocType: Purchase Order,To Receive,Nhận
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,Shrink lắp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Thu nhập / chi phí
 DocType: Employee,Personal Email,Email cá nhân
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Tổng số Variance
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,Tổng số Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nếu được kích hoạt, hệ thống sẽ gửi ghi sổ kế toán hàng tồn kho tự động."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,Môi giới
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Môi giới
 DocType: Address,Postal Code,Mã bưu chính
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","trong Minutes 
@@ -3162,18 +2905,16 @@
 DocType: Customer,From Lead,Từ chì
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Hub Settings,Name Token,Tên Mã
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,Kế hoạch
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,Tiêu chuẩn bán hàng
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,Tiêu chuẩn bán hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,Ít nhất một kho là bắt buộc
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0} với Sales Invoice {1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,Vui lòng nhập mặc định Đơn vị đo
 DocType: Purchase Invoice Item,Project Name,Tên dự án
 DocType: Supplier,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
-DocType: Workflow State,Edit,Sửa
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
 DocType: Features Setup,Item Batch Nos,Mục hàng loạt Nos
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
@@ -3181,13 +2922,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Hòa giải thanh toán thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Tài sản thuế
 DocType: BOM Item,BOM No,BOM Không
-DocType: Contact Us Settings,Pincode,Pincode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Replace Tool,The BOM which will be replaced,Hội đồng quản trị sẽ được thay thế
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,Mới Cổ UOM phải khác UOM cổ phiếu hiện tại
 DocType: Account,Debit,Thẻ ghi nợ
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,"Lá phải được phân bổ trong bội số của 0,5"
 DocType: Production Order,Operation Cost,Chi phí hoạt động
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Tải lên tham gia từ một tập tin csv.
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Nổi bật Amt
@@ -3203,10 +2942,7 @@
 DocType: Project,Default Cost Center,Trung tâm chi phí mặc định
 DocType: Purchase Invoice,End Date,Ngày kết thúc
 DocType: Employee,Internal Work History,Quá trình công tác nội bộ
-DocType: DocField,Column Break,Cột lao
-DocType: Event,Thursday,Thứ năm
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,Quay
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
 DocType: Maintenance Visit,Customer Feedback,Ý kiến khách hàng
 DocType: Account,Expense,chi tiêu
 DocType: Sales Invoice,Exhibition,Triển lam
@@ -3219,31 +2955,30 @@
 DocType: Employee,Held On,Tổ chức Ngày
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Sản xuất hàng
 ,Employee Information,Thông tin nhân viên
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tỷ lệ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),Tỷ lệ (%)
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Năm tài chính kết thúc ngày
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,Năm tài chính kết thúc ngày
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên Voucher Không, nếu nhóm theo Phiếu"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,Nhà cung cấp báo giá thực hiện
 DocType: Quality Inspection,Incoming,Đến
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Giảm Thu cho nghỉ việc không phải trả tiền (LWP)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Thêm người dùng để tổ chức của bạn, trừ chính mình"
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself","Thêm người dùng để tổ chức của bạn, trừ chính mình"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} không phù hợp với {2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Để lại bình thường
 DocType: Batch,Batch ID,ID hàng loạt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},Lưu ý: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Giao hàng Ghi Xu hướng
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,Tóm tắt tuần này
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} phải là một mục Mua hoặc Chi ký hợp đồng trong hàng {1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua giao dịch chứng khoán
 DocType: GL Entry,Party,Bên
 DocType: Sales Order,Delivery Date,Giao hàng ngày
-DocType: DocField,Currency,Tiền tệ
 DocType: Opportunity,Opportunity Date,Cơ hội ngày
 DocType: Purchase Receipt,Return Against Purchase Receipt,Return Against Mua Receipt
 DocType: Purchase Order,To Bill,Để Bill
 DocType: Material Request,% Ordered,% Có thứ tự
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,Việc làm ăn khoán
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Việc làm ăn khoán
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Avg. Tỷ giá mua
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (trong giờ)
 DocType: Employee,History In Company,Trong lịch sử Công ty
@@ -3260,77 +2995,68 @@
 DocType: Opportunity,To Discuss,Để thảo luận
 DocType: SMS Settings,SMS Settings,Thiết lập tin nhắn SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Tài khoản tạm thời
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Đen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,Đen
 DocType: BOM Explosion Item,BOM Explosion Item,BOM nổ hàng
 DocType: Account,Auditor,Người kiểm tra
 DocType: Purchase Order,End date of current order's period,Ngày kết thúc của thời kỳ hiện tại của trật tự
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hãy Letter Offer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Trở về
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
-DocType: DocField,Fold,Gập lại
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,Mặc định Đơn vị đo lường cho Variant phải được giống như Template
 DocType: Production Order Operation,Production Order Operation,Sản xuất tự Operation
 DocType: Pricing Rule,Disable,Vô hiệu hóa
 DocType: Project Task,Pending Review,Đang chờ xem xét
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,Vui lòng chỉ
 DocType: Task,Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua Chi Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,Id của khách hàng
-DocType: Page,Page Name,Tên trang
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,Giờ phải lớn hơn From Time
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,Bán hàng đặt hàng {0} không nộp
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Kho {0}: Cha mẹ tài khoản {1} không Bolong cho công ty {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,Hoàn thiện Spindle
 DocType: BOM,Last Purchase Rate,Cuối cùng Rate
 DocType: Account,Asset,Tài sản
 DocType: Project Task,Task ID,Nhiệm vụ ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","ví dụ như ""MC """
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""","ví dụ như ""MC """
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Cổ không thể tồn tại cho mục {0} vì có các biến thể
 ,Sales Person-wise Transaction Summary,Người khôn ngoan bán hàng Tóm tắt thông tin giao dịch
-DocType: System Settings,Time Zone,Múi giờ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Kho {0} không tồn tại
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Đăng ký các ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Tỷ lệ phân phối hàng tháng
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Nguyên liệu chuyển giao chống lại Giao hàng tận nơi này Lưu ý
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,Máy đóng ghim
 DocType: Customer,Customer Details,Chi tiết khách hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,Shaping
 DocType: Employee,Reports to,Báo cáo
 DocType: SMS Settings,Enter url parameter for receiver nos,Nhập tham số url cho người nhận nos
 DocType: Sales Invoice,Paid Amount,Số tiền thanh toán
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',Đóng tài khoản {0} phải là loại 'trách nhiệm'
 ,Available Stock for Packing Items,Có sẵn cổ phiếu cho mục đóng gói
 DocType: Item Variant,Item Variant,Mục Variant
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Số dư tài khoản đã được ghi nợ, bạn không được phép để thiết lập 'cân Must Be' là 'tín dụng'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Quản lý chất lượng
 DocType: Production Planning Tool,Filter based on customer,Bộ lọc dựa trên khách hàng
 DocType: Payment Tool Detail,Against Voucher No,Chống Voucher Không
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
 DocType: Tax Rule,Purchase,Mua
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Số lượng cân bằng
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Số lượng cân bằng
 DocType: Item Group,Parent Item Group,Cha mẹ mục Nhóm
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} cho {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,Trung tâm chi phí
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Kho.
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,Kho.
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tốc độ mà nhà cung cấp tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: xung đột Timings với hàng {1}
 DocType: Opportunity,Next Contact,Tiếp theo Liên lạc
 DocType: Employee,Employment Type,Loại việc làm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Tài sản cố định
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,Kỳ ứng dụng không thể được qua hai hồ sơ alocation
 DocType: Item Group,Default Expense Account,Tài khoản mặc định chi phí
 DocType: Employee,Notice (days),Thông báo (ngày)
-DocType: Page,Yes,Đồng ý
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
 DocType: Employee,Encashment Date,Séc ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,Electroforming
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Chống Voucher Loại phải là một trong lý Mua hàng, mua hóa đơn hoặc Journal nhập"
 DocType: Account,Stock Adjustment,Điều chỉnh chứng khoán
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Mặc định Hoạt động Chi phí tồn tại cho Type Hoạt động - {0}
 DocType: Production Order,Planned Operating Cost,Chi phí điều hành kế hoạch
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,New {0} Name
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},{0} # Xin vui lòng tìm thấy kèm theo {1}
 DocType: Job Applicant,Applicant Name,Tên đơn
 DocType: Authorization Rule,Customer / Item Name,Khách hàng / Item Name
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3343,7 +3069,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},Không nối tiếp là bắt buộc đối với hàng {0}
 DocType: Item Variant Attribute,Attribute,Đặc tính
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,Hãy xác định từ / dao
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,Tạo ra bởi
 DocType: Serial No,Under AMC,Theo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Tỷ lệ định giá mục được tính toán lại xem xét số lượng chứng từ chi phí hạ cánh
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Thiết lập mặc định cho bán giao dịch.
@@ -3355,17 +3080,16 @@
 DocType: Payment Reconciliation,Minimum Amount,Số tiền tối thiểu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,Cập nhật hoàn thành Hàng
 DocType: Workstation,per hour,mỗi giờ
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},Loạt {0} đã được sử dụng trong {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Tài khoản cho các kho (vĩnh viễn tồn kho) sẽ được tạo ra trong Tài khoản này.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Kho không thể bị xóa sổ cái như nhập chứng khoán tồn tại cho kho này.
 DocType: Company,Distribution,Gửi đến:
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,Số tiền trả
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Giám đốc dự án
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 DocType: Customer,Default Taxes and Charges,Thuế mặc định và lệ phí
 DocType: Account,Receivable,Thu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
 DocType: Sales Invoice,Supplier Reference,Nhà cung cấp tham khảo
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.","Nếu được chọn, Hội đồng quản trị cho các hạng mục phụ lắp ráp sẽ được xem xét để có được nguyên liệu. Nếu không, tất cả các mục phụ lắp ráp sẽ được coi như một nguyên liệu thô."
@@ -3373,8 +3097,8 @@
 DocType: Hub Settings,Seller Description,Người bán Mô tả
 DocType: Employee Education,Qualification,Trình độ chuyên môn
 DocType: Item Price,Item Price,Giá mục
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Xà phòng và chất tẩy rửa
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Điện ảnh & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
@@ -3383,7 +3107,6 @@
 DocType: BOM,Rate Of Materials Based On,Tỷ lệ Of Vật liệu Dựa trên
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Hỗ trợ Analtyics
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Công ty là mất tích trong kho {0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Chứng khoán UOM Thay Tiện ích
 DocType: POS Profile,Terms and Conditions,Điều khoản/Điều kiện thi hành
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},Đến ngày phải được trong năm tài chính. Giả sử Đến ngày = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ở đây bạn có thể duy trì chiều cao, cân nặng, dị ứng, mối quan tâm y tế vv"
@@ -3395,7 +3118,7 @@
 DocType: Sales Order Item,For Production,Cho sản xuất
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,Vui lòng nhập đơn đặt hàng trong bảng trên
 DocType: Project Task,View Task,Xem Nhiệm vụ
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Năm tài chính của bạn bắt đầu từ ngày
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,Năm tài chính của bạn bắt đầu từ ngày
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Vui lòng nhập Mua Tiền thu
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Add / Remove người nhận
@@ -3403,20 +3126,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Thiết lập năm tài chính này như mặc định, nhấp vào 'Set as Default'"
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Thiết lập máy chủ cho đến hỗ trợ email id. (Ví dụ như support@example.com)
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,Mục biến {0} tồn tại với cùng một thuộc tính
 DocType: Salary Slip,Salary Slip,Lương trượt
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,Đánh bóng
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,"""Đến ngày"" là cần thiết"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Đến ngày"" là cần thiết"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Tạo phiếu đóng gói các gói sẽ được chuyển giao. Được sử dụng để thông báo cho số gói phần mềm, nội dung gói và trọng lượng của nó."
 DocType: Sales Invoice Item,Sales Order Item,Bán hàng đặt hàng
 DocType: Salary Slip,Payment Days,Ngày thanh toán
 DocType: BOM,Manage cost of operations,Quản lý chi phí hoạt động
 DocType: Features Setup,Item Advanced,Mục chi tiết
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,Cán nóng
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Khi bất cứ giao dịch kiểm tra được ""Gửi"", một email pop-up tự động mở để gửi một email đến các liên kết ""Liên hệ"" trong giao dịch, với các giao dịch như là một tập tin đính kèm. Người sử dụng có thể hoặc không có thể gửi email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cài đặt toàn cầu
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
 DocType: Salary Slip,Net Pay,Net phải trả tiền
 DocType: Account,Account,Tài khoản
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
@@ -3425,35 +3146,28 @@
 DocType: Customer,Sales Team Details,Thông tin chi tiết Nhóm bán hàng
 DocType: Expense Claim,Total Claimed Amount,Tổng số tiền tuyên bố chủ quyền
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Cơ hội tiềm năng để bán.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Để lại bệnh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},Không hợp lệ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Để lại bệnh
 DocType: Email Digest,Email Digest,Email thông báo
 DocType: Delivery Note,Billing Address Name,Địa chỉ thanh toán Tên
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,Cửa hàng bách
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,Hệ thống cân bằng
-DocType: Workflow,Is Active,Là hoạt động
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Cửa hàng bách
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,Hệ thống cân bằng
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
-DocType: Workflow State,Primary,Vũ khí chinh
 DocType: Expense Claim Detail,Expense Date,Chi phí ngày
 DocType: Item,Max Discount (%),Giảm giá tối đa (%)
-DocType: Communication,More Information,Thêm thông tin
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Số tiền Last Order
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,Nổ mìn
 DocType: Company,Warn,Cảnh báo
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,Mục định giá được cập nhật
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
 DocType: BOM,Manufacturing User,Sản xuất tài
 DocType: Purchase Order,Raw Materials Supplied,Nguyên liệu thô Cung cấp
 DocType: Purchase Invoice,Recurring Print Format,Định kỳ Print Format
-DocType: Communication,Series,Tùng thư
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,Dự kiến sẽ giao hàng ngày không thể trước khi Mua hàng ngày
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
-DocType: Communication,Email,Email
 DocType: Item Group,Item Classification,Phân mục
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Giám đốc phát triển kinh doanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Giám đốc phát triển kinh doanh
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bảo trì đăng nhập Mục đích
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Thời gian
 ,General Ledger,Sổ cái chung
@@ -3463,9 +3177,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise Đê Sắp xếp lại Cấp
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,Vui lòng chọn {0} đầu tiên
 DocType: Features Setup,To get Item Group in details table,Để có được mục Nhóm trong bảng chi tiết
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,Vẽ lại
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,{0} lô hàng {1} đã hết hạn.
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,Etching
 DocType: Sales Invoice,Commission,Huê hồng
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3491,7 +3203,7 @@
  {% nếu email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -}% 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Số tiền mặc định
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Kho không tìm thấy trong hệ thống
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,Kho không tìm thấy trong hệ thống
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,Tóm tắt của tháng này
 DocType: Quality Inspection Reading,Quality Inspection Reading,Đọc kiểm tra chất lượng
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Đóng băng cổ phiếu cũ hơn` nên nhỏ hơn% d ngày.
@@ -3510,13 +3222,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
 DocType: Supplier,Address and Contacts,Địa chỉ và liên hệ
 DocType: UOM Conversion Detail,UOM Conversion Detail,Xem chi tiết UOM Chuyển đổi
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Đặt hàng sản xuất không thể được đưa ra chống lại một khoản Template
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật tại Purchase Receipt với mỗi mục
 DocType: Payment Tool,Get Outstanding Vouchers,Nhận chứng từ xuất sắc
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
 DocType: Appraisal,Start Date,Ngày bắt đầu
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,Giá trị
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Phân bổ lá trong một thời gian.
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,Nhấn vào đây để xác minh
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,Tài khoản {0}: Bạn không thể chỉ định chính nó như là tài khoản phụ huynh
@@ -3526,55 +3237,43 @@
 DocType: Item,Average time taken by the supplier to deliver,Thời gian trung bình thực hiện bởi các nhà cung cấp để cung cấp
 DocType: Time Log,Hours,Giờ
 DocType: Project,Expected Start Date,Dự kiến sẽ bắt đầu ngày
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,Lăn
-DocType: ToDo,Priority,Ưu tiên
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,Xóa item này nếu chi phí là không áp dụng đối với mặt hàng đó
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox truy cập được phép
-DocType: Dropbox Backup,Weekly,Hàng tuần
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,Nhận
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,Nhận
 DocType: Maintenance Visit,Fully Completed,Hoàn thành đầy đủ
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Complete
 DocType: Employee,Educational Qualification,Trình độ chuyên môn giáo dục
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0} đã được thêm thành công vào danh sách tin của chúng tôi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo như bị mất, bởi vì báo giá đã được thực hiện."
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,Gia công tia điện tử
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vui lòng chọn ngày bắt đầu và ngày kết thúc cho hàng {0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Báo cáo chính
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,Chứng khoán Ledger các mục dư cập nhật
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,Báo cáo chính
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,Thêm / Sửa giá
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,Biểu đồ của Trung tâm Chi phí
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,Đơn hàng của tôi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,Đơn hàng của tôi
 DocType: Price List,Price List Name,Danh sách giá Tên
 DocType: Time Log,For Manufacturing,Đối với sản xuất
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
 DocType: BOM,Manufacturing,Sản xuất
 ,Ordered Items To Be Delivered,Ra lệnh tiêu được giao
 DocType: Account,Income,Thu nhập
-,Setup Wizard,Trình cài đặt
 DocType: Industry Type,Industry Type,Loại công nghiệp
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,Một cái gì đó đã đi sai!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,Cảnh báo: Để lại ứng dụng có chứa khối ngày sau
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ngày kết thúc
 DocType: Purchase Invoice Item,Amount (Company Currency),Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,Đúc Die
-DocType: Email Alert,Reference Date,Tài liệu tham khảo ngày
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vui lòng nhập nos điện thoại di động hợp lệ
 DocType: Budget Detail,Budget Detail,Ngân sách chi tiết
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vui lòng nhập tin nhắn trước khi gửi
-DocType: Async Task,Status,Trạng thái
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},Cổ Ươm cập nhật cho khoản {0}
-DocType: Company History,Year,Năm
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,Point-of-Sale hồ sơ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Xin vui lòng cập nhật cài đặt tin nhắn SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,Giờ {0} đã lập hóa đơn
@@ -3587,55 +3286,52 @@
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
 DocType: Item,Unit of Measure Conversion,Đơn vị chuyển đổi đo lường
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Nhân viên không thể thay đổi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,Bạn không thể tín dụng và ghi nợ cùng một tài khoản cùng một lúc
 DocType: Naming Series,Help HTML,Giúp đỡ HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},Trợ cấp cho quá {0} vượt qua cho mục {1}
 DocType: Address,Name of person or organization that this address belongs to.,Tên của người hoặc tổ chức địa chỉ này thuộc về.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Các nhà cung cấp của bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,Các nhà cung cấp của bạn
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Không thể thiết lập như Lost như bán hàng đặt hàng được thực hiện.
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,Một cấu trúc lương {0} là hoạt động cho nhân viên {1}. Hãy làm cho tình trạng của nó 'hoạt động' để tiến hành.
 DocType: Purchase Invoice,Contact,Liên hệ
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,Nhận được từ
 DocType: Features Setup,Exports,Xuất khẩu
 DocType: Lead,Converted,Chuyển đổi
 DocType: Item,Has Serial No,Có Serial No
 DocType: Employee,Date of Issue,Ngày phát hành
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}: Từ {0} cho {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},Row # {0}: Thiết lập Nhà cung cấp cho mặt hàng {1}
 DocType: Issue,Content Type,Loại nội dung
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,Máy tính
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đông lạnh
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
 DocType: Cost Center,Budgets,Ngân sách
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Xin vui lòng viết một cái gì đó
 DocType: Employee,Emergency Contact Details,Chi tiết liên lạc khẩn cấp
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,Nó làm gì?
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,Nó làm gì?
 DocType: Delivery Note,To Warehouse,Để kho
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Tài khoản {0} đã được nhập vào nhiều hơn một lần cho năm tài chính {1}
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,'Có Serial No' không thể 'Có' cho mục chứng khoán không
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Tham dự không thể được đánh dấu cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: Purchase Taxes and Charges,Account Head,Trưởng tài khoản
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Cập nhật chi phí bổ sung để tính toán chi phí hạ cánh của các mặt hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,Hệ thống điện
 DocType: Stock Entry,Total Value Difference (Out - In),Tổng giá trị khác biệt (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate là bắt buộc
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID người dùng không thiết lập cho nhân viên {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,Từ Bảo hành yêu cầu bồi thường
 DocType: Stock Entry,Default Source Warehouse,Mặc định Nguồn Kho
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},Birthday Reminder cho {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,Lapping
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Kể từ ngày thứ tự cuối
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,Nợ Để tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Buying Settings,Naming Series,Đặt tên dòng
 DocType: Leave Block List,Leave Block List Name,Để lại Block List Tên
-DocType: User,Enabled,Đã bật
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản chứng khoán
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},Bạn có thực sự muốn để gửi tất cả các Phiếu lương cho tháng {0} và năm {1}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Subscribers nhập
@@ -3643,19 +3339,18 @@
 DocType: Attendance,Present,Nay
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Giao hàng Ghi {0} không phải nộp
 DocType: Notification Control,Sales Invoice Message,Hóa đơn bán hàng nhắn
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Đóng tài khoản {0} phải được loại trách nhiệm pháp lý / Vốn chủ sở hữu
 DocType: Authorization Rule,Based On,Dựa trên
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,Mục {0} bị vô hiệu hóa
 DocType: Stock Settings,Stock Frozen Upto,"Cổ đông lạnh HCM,"
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},Từ giai đoạn và thời gian Để ngày bắt buộc cho kỳ {0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Hoạt động dự án / nhiệm vụ.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Tạo ra lương Trượt
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0} không phải là một id email hợp lệ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Mua phải được kiểm tra, nếu áp dụng Đối với được chọn là {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
-DocType: ToDo,Low,Thấp
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,Spinning
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},Hãy đặt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Lặp lại vào ngày của tháng
@@ -3677,7 +3372,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Tên chiến dịch là cần thiết
 DocType: Maintenance Visit,Maintenance Date,Bảo trì ngày
 DocType: Purchase Receipt Item,Rejected Serial No,Từ chối Serial No
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,Sâu vẽ
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Bản tin mới
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,Hiện Balance
@@ -3688,7 +3382,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM và Sản xuất Số lượng được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,Giá trị
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,Tán đinh
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,HĐQT thay thế
 ,Sales Analytics,Bán hàng Analytics
 DocType: Manufacturing Settings,Manufacturing Settings,Cài đặt sản xuất
@@ -3700,28 +3393,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,Tài khoản mới Tên
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Chi phí nguyên vật liệu Cung cấp
 DocType: Selling Settings,Settings for Selling Module,Cài đặt cho bán Mô-đun
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Dịch vụ khách hàng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Dịch vụ khách hàng
 DocType: Item,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Mục chi tiết khách hàng
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,Xác nhận Email của bạn
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Offer ứng cử viên một công việc.
 DocType: Notification Control,Prompt for Email on Submission of,Nhắc nhở cho Email trên thông tin của
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,Tổng số lá được giao rất nhiều so với những ngày trong kỳ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Mục {0} phải là một cổ phiếu hàng
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Mặc định Work In Progress Kho
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
-apps/frappe/frappe/model/naming.py +40,{0} is required,Cho phép Giỏ hàng
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,Chân không đúc
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Dự kiến ngày không thể trước khi vật liệu Yêu cầu ngày
-DocType: Contact Us Settings,City,Thành phố
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,Công bằng siêu âm
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Mục {0} phải là một mục bán hàng
 DocType: Naming Series,Update Series Number,Cập nhật Dòng Số
 DocType: Account,Equity,Vốn chủ sở hữu
 DocType: Sales Order,Printing Details,Các chi tiết in ấn
 DocType: Task,Closing Date,Đóng cửa ngày
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Kỹ sư
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Kỹ sư
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblies Tìm kiếm Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
 DocType: Sales Partner,Partner Type,Loại đối tác
@@ -3729,7 +3418,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Giảm giá
 DocType: Purchase Invoice,Against Expense Account,Đối với tài khoản chi phí
 DocType: Production Order,Production Order,Đặt hàng sản xuất
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,Lưu ý cài đặt {0} đã được gửi
 DocType: Quotation Item,Against Docname,Chống lại Docname
 DocType: SMS Center,All Employee (Active),Tất cả các nhân viên (Active)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Bây giờ xem
@@ -3737,26 +3426,24 @@
 DocType: BOM,Raw Material Cost,Chi phí nguyên liệu thô
 DocType: Item,Re-Order Level,Re-tự cấp
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Nhập các mặt hàng và qty kế hoạch mà bạn muốn nâng cao các đơn đặt hàng sản xuất hoặc tải nguyên liệu để phân tích.
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,Biểu đồ Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Bán thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Bán thời gian
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Cập nhật hàng loạt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,Loại Báo cáo là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,Loại Báo cáo là bắt buộc
 DocType: Item,Serial Number Series,Serial Number Dòng
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Kho là bắt buộc đối với cổ phiếu hàng {0} trong hàng {1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,Những thành viên đầu tiên: Bạn
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,Những thành viên đầu tiên: Bạn
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Năm tài chính Ngày bắt đầu và tài chính cuối năm ngày đã được thiết lập trong năm tài chính {0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,Hòa giải thành công
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,Hòa giải thành công
 DocType: Production Order,Planned End Date,Kế hoạch End ngày
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,Nơi các mặt hàng được lưu trữ.
 DocType: Tax Rule,Validity,Hiệu lực
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Số tiền ghi trên hoá đơn
 DocType: Attendance,Attendance,Tham gia
-DocType: Page,No,Không đồng ý
 DocType: BOM,Materials,Nguyên liệu
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nếu không kiểm tra, danh sách sẽ phải được thêm vào mỗi Bộ, nơi nó đã được áp dụng."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
@@ -3764,55 +3451,46 @@
 ,Item Prices,Giá mục
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Trong từ sẽ được hiển thị khi bạn lưu các Mua hàng.
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher thời gian đóng cửa
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Danh sách giá tổng thể.
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,Danh sách giá tổng thể.
 DocType: Task,Review Date,Ngày đánh giá
 DocType: Purchase Invoice,Advance Payments,Thanh toán trước
-DocType: DocPerm,Level,Mức độ
 DocType: Purchase Taxes and Charges,On Net Total,Trên Net Tổng số
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Kho hàng mục tiêu trong {0} phải được giống như sản xuất theo thứ tự
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,Không được phép sử dụng công cụ thanh toán
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,'Thông báo địa chỉ email không định kỳ cho% s
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,Phay
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,Không được phép sử dụng công cụ thanh toán
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,'Thông báo địa chỉ email không định kỳ cho% s
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
 DocType: Company,Round Off Account,Vòng Tắt tài khoản
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,Tỉa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Chi phí hành chính
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,Tư vấn
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Cha mẹ Nhóm khách hàng
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,Thay đổi
 DocType: Purchase Invoice,Contact Email,Liên hệ Email
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Thông báo Thời gian
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""","ví dụ như ""Công ty của tôi LLC """
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,Thông báo Thời gian
 DocType: Bank Reconciliation Detail,Voucher ID,ID chứng từ
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Đây là một lãnh thổ gốc và không thể được chỉnh sửa.
 DocType: Packing Slip,Gross Weight UOM,Tổng trọng lượng UOM
 DocType: Email Digest,Receivables / Payables,Các khoản phải thu / phải trả
 DocType: Delivery Note Item,Against Sales Invoice,Chống bán hóa đơn
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,Stamping
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,Tài khoản tín dụng
 DocType: Landed Cost Item,Landed Cost Item,Chi phí hạ cánh hàng
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,Hiện không có giá trị
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Số lượng mặt hàng thu được sau khi sản xuất / đóng gói lại từ số lượng nhất định của nguyên liệu
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Chống bán hàng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 DocType: Task,Actual End Date (via Time Logs),Thực tế End Date (qua Thời gian Logs)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,Vui lòng nhập trung tâm chi phí cha mẹ
 DocType: Delivery Note,Print Without Amount,In Nếu không có tiền
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Thuế Thể loại không thể được ""định giá"" hay ""Định giá và Total 'như tất cả các mục là những mặt hàng không cổ"
-DocType: User,Last Name,Tên
-DocType: Web Page,Left,Trái
-DocType: Event,All Day,Tất cả các ngày
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Thuế Thể loại không thể được ""định giá"" hay ""Định giá và Total 'như tất cả các mục là những mặt hàng không cổ"
 DocType: Issue,Support Team,Hỗ trợ trong team
 DocType: Appraisal,Total Score (Out of 5),Tổng số điểm (Out of 5)
-DocType: Contact Us Settings,State,Trạng thái
 DocType: Batch,Batch,Hàng loạt
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua Tuyên bố Expense)
-DocType: User,Gender,Giới Tính
 DocType: Journal Entry,Debit Note,nợ Ghi
 DocType: Stock Entry,As per Stock UOM,Theo Cổ UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Không hết hạn
@@ -3826,44 +3504,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Tạo các quy tắc để hạn chế các giao dịch dựa trên giá trị.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nếu được chọn, Tổng số không. của ngày làm việc sẽ bao gồm ngày lễ, và điều này sẽ làm giảm giá trị của Lương trung bình mỗi ngày"
 DocType: Purchase Invoice,Total Advance,Tổng số trước
-DocType: Workflow State,User,Người dùng
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,Chế biến lương
 DocType: Opportunity Item,Basic Rate,Tỷ lệ cơ bản
 DocType: GL Entry,Credit Amount,Số tiền tín dụng
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Thiết lập như Lost
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Thanh toán Phiếu tiếp nhận
 DocType: Customer,Credit Days Based On,Days Credit Dựa Trên
 DocType: Tax Rule,Tax Rule,Rule thuế
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Duy trì Cùng Rate Trong suốt chu kỳ kinh doanh
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Kế hoạch thời gian bản ghi ngoài giờ làm việc Workstation.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1} đã được gửi
 ,Items To Be Requested,Mục To Be yêu cầu
-DocType: Purchase Order,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Time Log,Billing Rate based on Activity Type (per hour),Tỷ lệ thanh toán dựa trên Loại hoạt động (mỗi giờ)
 DocType: Company,Company Info,Thông tin công ty
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,Ghép mí lon
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent","Công ty Email ID không tìm thấy, do đó thư không gửi"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 DocType: Production Planning Tool,Filter based on item,Lọc dựa trên mục
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,Nợ TK
 DocType: Fiscal Year,Year Start Date,Ngày bắt đầu năm
 DocType: Attendance,Employee Name,Tên nhân viên
 DocType: Sales Invoice,Rounded Total (Company Currency),Tổng số tròn (Công ty tiền tệ)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
 DocType: Purchase Common,Purchase Common,Mua chung
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1} đã được sửa đổi. Xin vui lòng làm mới.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc ứng dụng Để lại vào những ngày sau.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,Cơ hội từ
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,Tẩy trống
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,Lợi ích của nhân viên
 DocType: Sales Invoice,Is POS,Là POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Hóa đơn tăng cho khách hàng.
-DocType: DocField,Default,Mặc định
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id dự án
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0} thuê bao thêm
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""","Xác định ngân sách cho Trung tâm chi phí này. Để thiết lập hành động ngân sách, xem &quot;Công ty List&quot;"
@@ -3874,70 +3548,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
 DocType: Expense Claim,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Chọn ""Có"" sẽ đưa ra một bản sắc độc đáo cho mỗi thực thể của mặt hàng này có thể được xem trong Serial No chủ."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Thẩm định {0} tạo ra cho nhân viên {1} trong phạm vi ngày cho
 DocType: Employee,Education,Đào tạo
 DocType: Selling Settings,Campaign Naming By,Cách đặt tên chiến dịch By
 DocType: Employee,Current Address Is,Địa chỉ hiện tại là
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.","Không bắt buộc. Thiết lập tiền tệ mặc định của công ty, nếu không quy định."
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.","Không bắt buộc. Thiết lập tiền tệ mặc định của công ty, nếu không quy định."
 DocType: Address,Office,Văn phòng
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,Báo cáo tiêu chuẩn
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Sổ nhật ký kế toán.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Số lượng có sẵn tại Từ kho
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Để tạo ra một tài khoản thuế
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
 DocType: Employee,Current Address,Địa chỉ hiện tại
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nếu tài liệu là một biến thể của một item sau đó mô tả, hình ảnh, giá cả, thuế vv sẽ được thiết lập từ các mẫu trừ khi được quy định một cách rõ ràng"
 DocType: Serial No,Purchase / Manufacture Details,Thông tin chi tiết mua / Sản xuất
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,Lô hàng tồn kho
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,Lô hàng tồn kho
 DocType: Employee,Contract End Date,Ngày kết thúc hợp đồng
 DocType: Sales Order,Track this Sales Order against any Project,Theo dõi đơn hàng bán hàng này chống lại bất kỳ dự án
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Kéo đơn bán hàng (đang chờ để cung cấp) dựa trên các tiêu chí trên
-DocType: DocShare,Document Type,Loại tài liệu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,Nhà cung cấp báo giá từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,Nhà cung cấp báo giá từ
 DocType: Deduction Type,Deduction Type,Loại trừ
 DocType: Attendance,Half Day,Nửa ngày
 DocType: Pricing Rule,Min Qty,Min Số lượng
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",Để theo dõi các mục trong bán hàng và giấy tờ mua bán với nos hàng loạt. &quot;Công nghiệp ưa thích: Hóa chất&quot;
 DocType: GL Entry,Transaction Date,Giao dịch ngày
 DocType: Production Plan Item,Planned Qty,Số lượng dự kiến
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Tổng số thuế
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,Tổng số thuế
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,Đối với lượng (Sản xuất Qty) là bắt buộc
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
 DocType: Notification Control,Purchase Receipt Message,Thông báo mua hóa đơn
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,Tổng số lá được giao rất nhiều so với cùng kỳ
 DocType: Production Order,Actual Start Date,Thực tế Ngày bắt đầu
 DocType: Sales Order,% of materials delivered against this Sales Order,% Nguyên liệu chuyển giao chống lại thứ tự bán hàng này
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,Phong trào kỷ lục mục.
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,Danh sách bản tin thuê bao
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,Dịch vụ
 DocType: Hub Settings,Hub Settings,Cài đặt Hub
 DocType: Project,Gross Margin %,Lợi nhuận gộp%
 DocType: BOM,With Operations,Với hoạt động
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng tiền {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả tiền với {0}.
 ,Monthly Salary Register,Hàng tháng Lương Đăng ký
-apps/frappe/frappe/website/template.py +140,Next,Tiếp theo
 DocType: Warranty Claim,If different than customer address,Nếu khác với địa chỉ của khách hàng
 DocType: BOM Operation,BOM Operation,BOM hoạt động
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,Đánh bóng điện
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Trước trên Row Số tiền
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,Vui lòng nhập Số tiền thanh toán trong ít nhất một hàng
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,Vui lòng nhập Số tiền thanh toán trong ít nhất một hàng
 DocType: POS Profile,POS Profile,POS hồ sơ
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.","Tính mùa vụ để thiết lập ngân sách, mục tiêu, vv"
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Row {0}: Số tiền thanh toán không thể lớn hơn số tiền nợ
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,Tổng số chưa được thanh toán
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Tổng số chưa được thanh toán
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Giờ không phải là lập hoá đơn
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Người mua
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,Người mua
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Trả tiền net không thể phủ định
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,Vui lòng nhập các Against Vouchers tay
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,Vui lòng nhập các Against Vouchers tay
 DocType: SMS Settings,Static Parameters,Các thông số tĩnh
 DocType: Purchase Order,Advance Paid,Trước Paid
 DocType: Item,Item Tax,Mục thuế
@@ -3946,14 +3613,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,Gửi tin nhắn SMS hàng loạt địa chỉ liên lạc của bạn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Xem xét thuế hoặc phí cho
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,Cross-cán
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Thẻ tín dụng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,Thẻ tín dụng
 DocType: BOM,Item to be manufactured or repacked,Mục được sản xuất hoặc đóng gói lại
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch chứng khoán.
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch chứng khoán.
 DocType: Purchase Invoice,Next Date,Tiếp theo ngày
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vui lòng nhập Thuế và phí
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,Máy
 DocType: Sales Invoice Item,Drop Ship,Thả tàu
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
 DocType: Hub Settings,Seller Name,Tên người bán
@@ -3963,47 +3628,44 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Bạn phải tiết kiệm các hình thức trước khi tiếp tục
 DocType: Item Attribute,Numeric Values,Giá trị Số
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Logo đính kèm
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,Logo đính kèm
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Ngăn chặn các ứng dụng của bộ phận nghỉ.
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,Giỏ hàng rỗng
 DocType: Production Order,Actual Operating Cost,Thực tế Chi phí điều hành
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,Gốc không thể được chỉnh sửa.
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,Số lượng phân bổ có thể không lớn hơn số tiền unadusted
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,Gốc không thể được chỉnh sửa.
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,Số lượng phân bổ có thể không lớn hơn số tiền unadusted
 DocType: Manufacturing Settings,Allow Production on Holidays,Cho phép sản xuất vào ngày lễ
 DocType: Sales Order,Customer's Purchase Order Date,Của khách hàng Mua hàng ngày
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Vốn Cổ
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,Vui lòng chọn một tập tin csv
-DocType: Dropbox Backup,Send Backups to Dropbox,Gửi Backups để Dropbox
 DocType: Purchase Order,To Receive and Bill,Nhận và Bill
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Nhà thiết kế
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Điều khoản và Điều kiện Template
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},Trung tâm chi phí là cần thiết trong hàng {0} trong bảng Thuế cho loại {1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,Tự động tạo Material Request nếu số lượng giảm xuống dưới mức này
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item","Để thiết lập mức độ sắp xếp lại, mục phải là một khoản mua hoặc sản xuất hàng"
 ,Supplier Addresses and Contacts,Địa chỉ nhà cung cấp và hệ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +18,Project master.,Chủ dự án.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),(Nửa ngày)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Thời gian dẫn ngày
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Hóa đơn nguyên vật liệu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
-DocType: Dropbox Backup,Send Notifications To,Gửi thông báo để
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Ref ngày
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Ref ngày
 DocType: Employee,Reason for Leaving,Lý do Rời
 DocType: Expense Claim Detail,Sanctioned Amount,Số tiền xử phạt
 DocType: GL Entry,Is Opening,Được mở cửa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,Tài khoản {0} không tồn tại
 DocType: Account,Cash,Tiền mặt
 DocType: Employee,Short biography for website and other publications.,Tiểu sử ngắn cho trang web và các ấn phẩm khác.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},Hãy tạo cấu trúc lương cho nhân viên {0}

diff --git a/erpnext/translations/zh-cn.csv b/erpnext/translations/zh-cn.csv
index 547237b..c4e5168 100644
--- a/erpnext/translations/zh-cn.csv
+++ b/erpnext/translations/zh-cn.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",如果需要按季节跟踪的话请选择“月度分布”。
 DocType: Employee,Divorced,离婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,警告：相同项目已经输入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,品目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许项目将在一个事务中多次添加
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消费类产品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消费类产品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,请选择党第一型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,退火
 DocType: Item,Customer Items,客户项目
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
@@ -17,24 +16,22 @@
 DocType: Employee,Leave Approvers,假期审批人
 DocType: Sales Partner,Dealer,经销商
 DocType: Employee,Rented,租
-DocType: About Us Settings,Website,网站
 DocType: POS Profile,Applicable for User,适用于用户
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,压实加烧结
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
 DocType: Purchase Order,Customer Contact,客户联系
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,来自物料申请
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,来自物料申请
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} 树
 DocType: Job Applicant,Job Applicant,求职者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,没有更多结果。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法律
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},实际类型税不能被包含在商品率排{0}
 DocType: C-Form,Customer,顾客
 DocType: Purchase Receipt Item,Required By,必选
 DocType: Delivery Note,Return Against Delivery Note,射向送货单
 DocType: Department,Department,部门
-DocType: Purchase Order,% Billed,％已开账单
+DocType: Purchase Order,% Billed,％已记账
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客户名称
 DocType: Features Setup,"All export related fields like currency, conversion rate, export total, export grand total etc are available in Delivery Note, POS, Quotation, Sales Invoice, Sales Order etc.",所有和出口相关的字段，例如货币，汇率，出口总额，出口总计等，都可以在送货单，POS，报价单，销售发票，销售订单等系统里面找到。
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,拼接
 DocType: Pricing Rule,Apply On,应用于
 DocType: Item Price,Multiple Item prices.,多个品目的价格。
 ,Purchase Order Items To Be Received,采购订单项目可收
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Quality Inspection Reading,Parameter,参数
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新建假期申请
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新建假期申请
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,银行汇票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。为了保持客户明智的项目代码，并使其搜索根据自己的代码中使用这个选项
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,显示变体
-DocType: Sales Invoice Item,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,库存
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,生产计划项目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,使新的POS简介
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,医疗保健
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 DocType: Purchase Invoice,Monthly,每月
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延迟支付（天）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,发票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,邮件提醒
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,Defense
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,邮件提醒
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Company,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,车辆编号
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,请选择价格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在制品
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D打印
 DocType: Employee,Holiday List,假期列表
 DocType: Time Log,Time Log,时间日志
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,会计
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,会计
 DocType: Cost Center,Stock User,股票用户
 DocType: Company,Phone No,电话号码
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",用户对任务的操作记录，可以用来追踪时间和付款。
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},新{0}：#{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},新{0}：#{1}
 ,Sales Partners Commission,销售合作伙伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",属性值{0}无法从{1}作为项目变体\删除存在这个属性。
-DocType: Print Settings,Classic,经典
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,这是一个root帐户，不能被编辑。
 DocType: BOM,Operations,操作
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能为{0}设置折扣授权
 DocType: Bin,Quantity Requested for Purchase,申请采购的数量
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,千克
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,千克
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,选择仓库...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,广告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,广告
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 DocType: Payment Reconciliation,Reconcile,调和
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,杂货
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,创建银行分录
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,养老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,类型为仓库的账户必须指定仓库
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Lead,Person Name,人姓名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",如果是周期性订单的话请勾选，不是周期性或有结束日期的订单请取消选择。
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
-DocType: Blog Post,Guest,访客
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清单
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,开盘
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,开盘
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},从{0}至 {1}
 DocType: Item,Copy From Item Group,从品目组复制
 DocType: Journal Entry,Opening Entry,开放报名
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}是必须项
 DocType: Stock Entry,Additional Costs,额外费用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
-DocType: Standard Reply,Owner,业主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,请先输入公司
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目标类型
 DocType: BOM,Total Cost,总成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,扩孔
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活动日志：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,房地产
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地产
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,对账单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,制药
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
 DocType: Expense Claim Detail,Claim Amount,报销金额
 DocType: Employee,Mr,先生
-DocType: Custom Script,Client,客户
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供应商类型/供应商
 DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,耗材
 DocType: Upload Attendance,Import Log,导入日志
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,发送
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,库存费用
 DocType: Newsletter,Email Sent?,邮件已发送？
@@ -169,29 +159,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,显示的时间记录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于品目{0}的接收数量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,品目{0}必须是采购品目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,销售发票提交后将会更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新建物料清单
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批处理的时间记录进行计费。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力铸造
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,通讯已发送过
 DocType: Lead,Request Type,请求类型
 DocType: Leave Application,Reason,原因
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,广播
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,执行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,第一个用户将成为系统管理员，你以后可以更改。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,执行
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,第一个用户将成为系统管理员，你以后可以更改。
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,项目和定价
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,项目和定价
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,选择该评估的雇员对象。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},成本中心{0}不属于公司{1}
@@ -203,9 +191,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},品目{0}的安装日期不能早于交付日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,开始
-DocType: User,First Name,姓
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模铸造
 DocType: Offer Letter,Select Terms and Conditions,选择条款和条件
 DocType: Production Planning Tool,Sales Orders,销售订单
 DocType: Purchase Taxes and Charges,Valuation,估值
@@ -217,57 +202,53 @@
 DocType: Bank Reconciliation,Bank Account,银行帐户
 DocType: Leave Type,Allow Negative Balance,允许负余额
 DocType: Selling Settings,Default Territory,默认地区
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,电视
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},科目{0}不属于公司{1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,经销商
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
 DocType: Newsletter List,Total Subscribers,用户总数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,联系人姓名
+,Contact Name,联系人姓名
 DocType: Production Plan Item,SO Pending Qty,销售订单待定数量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,依上述条件创建工资单
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,请求您的报价。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,双人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年叶
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,请设置命名序列{0}通过设置&gt;设置&gt;命名系列
 DocType: Time Log,Will be updated when batched.,批处理后将会更新。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
-DocType: Bulk Email,Message,信息
 DocType: Item Website Specification,Item Website Specification,品目网站规格
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox的Key
 DocType: Payment Tool,Reference No,参考编号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,已禁止请假
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
 DocType: Material Request Item,Min Order Qty,最小订货量
 DocType: Lead,Do Not Contact,不要联系
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,跟踪所有周期性发票的唯一ID，提交时自动生成。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,软件开发人员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Pricing Rule,Supplier Type,供应商类型
 DocType: Item,Publish in Hub,在发布中心
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,品目{0}已取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,钢丝刷
 DocType: Employee,Relation,关系
 DocType: Shipping Rule,Worldwide Shipping,全球航运
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,确认客户订单。
@@ -283,12 +264,10 @@
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 DocType: Maintenance Schedule,Generate Schedule,生成时间表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,枢纽
 DocType: Purchase Invoice Item,Expense Head,总支出
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,预计日期不能前材料申请日期
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最多5个字符
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,设置你的语言
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5个字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,假期审批人列表的第一个将被设为默认审批人
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",禁止对创作生产订单的时间日志。操作不得对生产订单追踪
@@ -299,29 +278,20 @@
 DocType: Item,Variant Of,变体自
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,品目{0}必须是服务品目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
-DocType: DocType,Administrator,管理员
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,激光打孔
-DocType: Stock UOM Replace Utility,New Stock UOM,新建库存计量单位
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循环引用错误
-DocType: Communication,Closed,已关闭
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
 DocType: Lead,Industry,行业
 DocType: Employee,Job Profile,工作简介
 DocType: Newsletter,Newsletter,通讯
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,液压成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,缩颈
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,品目已更新
-DocType: Async Task,System Manager,系统管理员
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
 DocType: Sales Invoice Item,Delivery Note,送货单
-DocType: Dropbox Backup,Allow Dropbox Access,允许访问Dropbox
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立税
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}输入两次项税
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0}输入两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本周和待活动总结
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,请选择年份和月份
@@ -329,32 +299,29 @@
 DocType: Employee,Company Email,企业邮箱
 DocType: GL Entry,Debit Amount in Account Currency,在账户币种借记金额
 DocType: Shipping Rule,Valid for Countries,有效的国家
-DocType: Workflow State,Refresh,刷新
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",所有和进口相关的字段，例如货币，汇率，进口总额，进口总计等，都可以在采购收据，供应商报价，采购发票，采购订单等系统里面找到。
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,总订货考虑
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,速率客户货币转换成客户的基础货币
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",可在物料清单，送货单，采购发票，生产订单，采购订单，采购收据，销售发票，销售订单，仓储记录，时间表里面找到
 DocType: Item Tax,Tax Rate,税率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,选择项目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,选择项目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",品目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,购买收据必须提交
-DocType: Stock UOM Replace Utility,Current Stock UOM,当前库存计量单位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的电子邮件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,请参阅附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,水射流切割
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,安装已经完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,安装已经完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,说明
 DocType: Quality Inspection,Inspected By,验货人
@@ -369,6 +336,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,请不要创建客户和供应商帐户。他们是直接从客户/供应商的主人创建的。
 DocType: Currency Exchange,Currency Exchange,货币兑换
 DocType: Purchase Invoice Item,Item Name,品目名称
+DocType: Authorization Rule,Approving User  (above authorized value),批准的用户（上述授权值）
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,贷方余额
 DocType: Employee,Widowed,丧偶
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",要申请的品目，这些品目基于实际存库量和最低订货量的结算结果为“库存量不足”
@@ -378,22 +346,21 @@
 ,Purchase Register,购买注册
 DocType: Landed Cost Item,Applicable Charges,适用费用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,医药
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丢失
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,管钉珠
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 DocType: Employee,Single,单身
 DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,预算不能为集团成本中心成立
 DocType: Account,Cost of Goods Sold,销货成本
 DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,请输入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,请输入成本中心
 DocType: Journal Entry Account,Sales Order,销售订单
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,平均卖出价
 DocType: Purchase Order,Start date of current order's period,当前订单周期的起始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},行{0}中的数量不能为分数
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},行{0}中的数量不能为分数
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,％已安装
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,请先输入公司名称
@@ -403,10 +370,8 @@
 DocType: Account,Is Group,是集团
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自动设置序列号的基础上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,检查供应商发票编号唯一性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,热成型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,纵剪
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','起始箱号'不能小于'结束箱号'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非营利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非营利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未开始
 DocType: Lead,Channel Partner,渠道合作伙伴
 DocType: Account,Old Parent,旧上级
@@ -415,13 +380,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假期大师
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外壳成型
 DocType: Material Request Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,请输入产品编号。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果勾选，税金将被当成已包括在打印税率/打印总额内。
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,总数量
@@ -431,35 +396,30 @@
 DocType: Item Attribute,To Range,为了范围
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,证券及存款
 DocType: Features Setup,Imports,导入
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,粘接
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,总叶分配是必须的
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,今天待定活动
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,考勤记录。
 DocType: Bank Reconciliation,Journal Entries,日记帐分录
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
-DocType: System Settings,Loading...,载入中...
-DocType: DocField,Password,密码
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熔融沉积成型
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
 DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加订阅
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,有效期至
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收益
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",按科目分类后不能根据科目过滤
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,行政主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,请选择公司
 DocType: Stock Entry,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妆品
-DocType: DocField,Type,类型
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
-DocType: Communication,Subject,主题
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 ,Serial No Warranty Expiry,序列号/保修到期
@@ -467,8 +427,7 @@
 DocType: Purchase Invoice Item,Item,品目
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理转包
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新计量单位的类型不能是整数
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理转包
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,factory furniture and fixtures
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,速率价目表货币转换为公司的基础货币
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
@@ -480,21 +439,21 @@
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,品目{0}不是采购品目
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'",“通知电子邮件地址”的{0}不是有效的电子邮件地址
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,总计费今年：
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,总计费今年：
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),结算(信用)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),结算(信用)
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
 DocType: Installation Note Item,Installation Note Item,安装单品目
 ,Pending Qty,待定数量
 DocType: Job Applicant,Thread HTML,主题HTML
 DocType: Company,Ignore,忽略
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信发送至以下号码：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
@@ -502,7 +461,7 @@
 DocType: Monthly Distribution,"**Monthly Distribution** helps you distribute your budget across months if you have seasonality in your business.
 
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**",如果你有季节性的业务，**月度分配**将帮助你按月分配预算。要使用这种分配方式，请在**成本中心**内设置**月度分配**。
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,没有在发票表中找到记录
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
@@ -510,7 +469,6 @@
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
-DocType: About Us Settings,Website Manager,网站管理员
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Warranty Claim,Resolution,决议
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},交货：{0}
@@ -518,25 +476,24 @@
 DocType: Sales Order,Billing and Delivery Status,结算和交货状态
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,以前
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,销售退货
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,选择该生产订单的源销售订单。
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工资构成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,潜在客户数据库。
+DocType: Authorization Rule,Customer or Item,客户或项目
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,调配数量不能为负
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,测度项目的默认单位{0}不能直接改变，因为你已经做了一些交易（S）与其他计量单位。您将需要创建一个新的项目，以使用不同的默认计量单位。
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,库存记录针对的逻辑仓库。
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},参考号与参考日期须为{0}
-DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客户的供应商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生产订单是强制性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案写作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案写作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},负库存错误({6})。品目{0}，仓库{1}，提交时间{2}{3}，凭证类型{4}，凭证编号{5}
 DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
@@ -557,20 +514,16 @@
 DocType: Activity Type,Default Costing Rate,默认成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,请安装Dropbox的Python模块
 DocType: Employee,Passport Number,护照号码
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,经理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,来自采购收据
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,相同的品目已输入多次
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,经理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,来自采购收据
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,相同的品目已输入多次
 DocType: SMS Settings,Receiver Parameter,接收机参数
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
-apps/frappe/frappe/templates/base.html +145,Please enter email address,请输入您的电子邮件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,转换为组
 DocType: Activity Cost,Activity Type,活动类型
@@ -578,44 +531,38 @@
 DocType: Customer,Fixed Days,固定天
 DocType: Sales Invoice,Packing List,包装清单
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,购买给供应商的订单。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,项目用户
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,已消耗
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
 DocType: Company,Round Off Cost Center,四舍五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Material Request,Material Transfer,物料转移
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),开幕（博士）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},发布时间标记必须经过{0}
-apps/frappe/frappe/config/setup.py +59,Settings,设置
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本税费
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,更多
 DocType: Pricing Rule,Sales Manager,销售经理
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核销金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,弯曲
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
 DocType: Purchase Invoice,Quarterly,季度
 DocType: Selling Settings,Delivery Note Required,送货单是必须项
-DocType: Sales Order Item,Basic Rate (Company Currency),基础税率（公司货币）
+DocType: Sales Order Item,Basic Rate (Company Currency),基础利率（公司货币）
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,请输入项目细节
 DocType: Purchase Receipt,Other Details,其他详细信息
 DocType: Account,Accounts,会计
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,市场营销
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市场营销
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基于其序列号的销售和采购文件跟踪的项目。这也可以用来跟踪商品的保修细节。
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒绝仓库是必须反对regected项目
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Employee,Provide email id registered in company,提供的电子邮件ID在公司注册
 DocType: Hub Settings,Seller City,卖家城市
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,项目已变种。
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,项目已变种。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,品目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,树类型
@@ -624,14 +571,10 @@
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",凭证类型必须是销售订单，销售发票或日记帐分录之一
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,找不到汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航天
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,欢迎
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 DocType: Journal Entry,Credit Card Entry,信用卡分录
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任务主题
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,来自供应商的已收入成品。
-DocType: Communication,Open,开
 DocType: Lead,Campaign Name,活动名称
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供应原料
@@ -640,29 +583,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0}不是一个库存品目
 DocType: Mode of Payment Account,Default Account,默认帐户
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
-DocType: Contact Us Settings,Address Title,地址名称
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,请选择每周休息日
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
-DocType: Dropbox Backup,Daily,每日
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Employee,Cell Number,手机号码
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽车材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,“对日记账分录”不能选择此凭证。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月度工资结算
 DocType: Item Group,Website Specifications,网站规格
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新建账户
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,会计分录可对叶节点。对组参赛作品是不允许的。
-DocType: ToDo,High,高
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
-DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
 DocType: Item Attribute Value,Item Attribute Value,品目属性值
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,销售活动。
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -702,25 +642,25 @@
 DocType: Address,Personal,个人
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日记帐分录{0}和订单{1}关联，请确认它是不是本发票的预付款。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,生物技术
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日记帐分录{0}和订单{1}关联，请确认它是不是本发票的预付款。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技术
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,办公维护费用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,海明
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
 DocType: Company,Default Cost of Goods Sold Account,销货账户的默认成本
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
-DocType: Process Payroll,Send Email,发送电子邮件
+DocType: Process Payroll,Send Email,发送电子邮件
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},警告：无效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“更新股票&#39;不能检验，因为项目没有通过传递{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Nos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐详细
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,我的发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,我的发票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,未找到任何雇员
 DocType: Purchase Order,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
@@ -739,35 +679,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",为了使“销售点”的特点
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
-DocType: Comment,Reference Name,参考名称
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Sales Invoice Item,Target Warehouse,目标仓库
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,预计交货日期不能早于销售订单日期
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
 DocType: Production Order,Item To Manufacture,要生产的品目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模铸造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的状态为{2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,采购订单到付款
 DocType: Sales Order Item,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通讯经理
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“开放”
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 DocType: Notification Control,Delivery Note Message,送货单留言
 DocType: Expense Claim,Expenses,开支
 DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
 ,Purchase Receipt Trends,购买收据趋势
-DocType: Appraisal,Select template from which you want to get the Goals, 选择要从中获得目标的模板
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
+DocType: Appraisal,Select template from which you want to get the Goals,选择要从中获得目标的模板
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究与发展
 ,Amount to Bill,帐单数额
 DocType: Company,Registration Details,报名详情
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,跑马圈地
 DocType: Item,Re-Order Qty,重新排序数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},计划发送到{0}
@@ -778,18 +715,16 @@
 DocType: Sales Invoice Item,Stock Details,股票详细信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,项目价值
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,销售点
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},无法顺延{0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方'，不能设置为'借方'
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方'，不能设置为'借方'
 DocType: Account,Balance must be,余额必须是
 DocType: Hub Settings,Publish Pricing,发布定价
 DocType: Notification Control,Expense Claim Rejected Message,报销拒绝消息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,钉
 ,Available Qty,可用数量
 DocType: Purchase Taxes and Charges,On Previous Row Total,基于前一行的总计
 DocType: Salary Slip,Working Days,工作日
 DocType: Serial No,Incoming Rate,入库价格
 DocType: Packing Slip,Gross Weight,毛重
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,贵公司的名称
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,贵公司的名称
 DocType: HR Settings,Include holidays in Total no. of Working Days,将假期包含在工作日内
 DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,入职日期
@@ -799,30 +734,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看订阅
 DocType: Purchase Invoice Item,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,收到的项目要被收取
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,喷砂
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,货币汇率大师
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM{0}处于非活动状态
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 DocType: Salary Slip,Leave Encashment Amount,假期已使用量
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
 DocType: Bank Reconciliation,Total Amount,总金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,互联网出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Production Planning Tool,Production Orders,生产订单
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,余额值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,销售价格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,发布同步项目
-DocType: GL Entry,Account Currency,账户币种
+DocType: Bank Reconciliation,Account Currency,账户币种
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,请注明舍入账户的公司
 DocType: Purchase Receipt,Range,范围
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Features Setup,Item Barcode,品目条码
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,品目变种{0}已更新
 DocType: Quality Inspection Reading,Reading 6,6阅读
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Address,Shop,商店
@@ -831,7 +765,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,选择此模式时POS发票的银行/现金账户将会被自动更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,你的品牌
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,你的品牌
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,品目{1}已经超过允许的超额{0}。
 DocType: Employee,Exit Interview Details,退出面试细节
 DocType: Item,Is Purchase Item,是否采购品目
@@ -850,60 +784,55 @@
 DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,间接收益
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,将付款金额=未偿还
-DocType: Contact Us Settings,Address Line 1,地址行1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名称
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
+,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,对于转让项目选择
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有帮助影片名单
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行账户头。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价目表率。
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化学品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 DocType: Process Payroll,Select Payroll Year and Month,选择薪资年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",转到相应的组（通常资金运用&gt;流动资产&gt;银行帐户，并创建一个新帐户（通过点击添加类型的儿童），“银行”
 DocType: Workstation,Electricity Cost,电力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
-DocType: Comment,Unsubscribed,已退订
 DocType: Opportunity,Walk In,主动上门
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,树finanial成本中心。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,转移
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,使
 DocType: Journal Entry,Total Amount in Words,总金额词
-DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,我的购物车
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,开放数量
 DocType: Holiday List,Holiday List Name,假期列表名称
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,股票期权
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,股票期权
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},{0}数量
 DocType: Leave Application,Leave Application,假期申请
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,假期调配工具
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出预算（用于报销）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,修剪
 DocType: Workstation,Net Hour Rate,净小时价格
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本采购收据
 DocType: Company,Default Terms,默认条款
 DocType: Packing Slip Item,Packing Slip Item,装箱单项目
 DocType: POS Profile,Cash/Bank Account,现金/银行账户
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,备案
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
 DocType: Features Setup,Purchase Discounts,购买折扣
 DocType: Workstation,Wages,薪金
@@ -917,10 +846,11 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,销售金额
 apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,时间日志
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本条目的开支审批人，请更新并保存其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客户不与公司匹配
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 DocType: BOM Operation,Operation,手术
@@ -928,13 +858,13 @@
 DocType: Tax Rule,Shipping State,运输状态
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,品目必须要由“从采购收据获取品目”添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,销售费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,标准采购
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,标准采购
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,制作Stock条目
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
@@ -948,30 +878,28 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},{0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,通过时间更新日志
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
-DocType: Opportunity,Your sales person who will contact the customer in future,联系未来客户的销售人员
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
+DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供应商，他们可以是组织或个人。
 DocType: Company,Default Currency,默认货币
 DocType: Contact,Enter designation of this Contact,输入联系人的职务
-DocType: Contact Us Settings,Address,地址
 DocType: Expense Claim,From Employee,来自员工
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,运输
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,运输
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年费用
 DocType: SMS Center,Total Characters,总字符
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,贡献％
 DocType: Item,website page link,网站页面链接
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,让我们为首次使用准备一下。
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,从范围必须小于要范围
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,选择时间记录然后提交来创建一个新的销售发票。
@@ -991,14 +919,12 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,没有申请内容
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,管理人员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理人员
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,活动的考勤表类型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,熔模铸造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},{0}需要指定借方或贷方金额
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,活动
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,蓝色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,蓝色
 DocType: Purchase Invoice,Is Return,再来
 DocType: Price List Country,Price List Country,价目表国家
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,只能在“组”节点下新建节点
@@ -1008,50 +934,43 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,计量单位换算系数
 DocType: Stock Settings,Default Item Group,默认品目群组
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,分层实体制造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,拉伸成型
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,税项及其他扣款。
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Account,Warehouse,仓库
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
 ,Purchase Order Items To Be Billed,采购订单的项目被标榜
 DocType: Purchase Invoice Item,Net Rate,净费率
 DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,项目1
 DocType: Holiday,Holiday,假日
-DocType: Event,Saturday,星期六
 DocType: Leave Control Panel,Leave blank if considered for all branches,如果针对所有分支请留空
 ,Daily Time Log Summary,每日时间记录汇总
-DocType: DocField,Label,标签
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款详情
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
 DocType: Lead,Call,通话
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立职工
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,网格“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,请选择前缀第一
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Contact,User ID,用户ID
-DocType: Communication,Sent,已发送
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看总帐
-DocType: File,Lft,Lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已经存在，请更名
-DocType: Communication,Delivery Status,交货状态
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 DocType: Production Order,Manufacture against Sales Order,按销售订单生产
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
@@ -1062,13 +981,11 @@
 DocType: BOM Item,Item Description,品目说明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是否周期性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金属激光烧结
 DocType: Purchase Order,Supplied Items,供应的品目
 DocType: Production Order,Qty To Manufacture,生产数量
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
 DocType: Opportunity Item,Opportunity Item,项目的机会
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,临时开通
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,雇员假期余量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
 DocType: Address,Address Type,地址类型
@@ -1084,35 +1001,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,销售订单{0}无效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",抱歉，公司不能合并
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,雇员编号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,账户头{0}已创建
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,绿
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,绿
 DocType: Item,Auto re-order,自动重新排序
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,总体上实现
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,总体上实现
 DocType: Employee,Place of Issue,签发地点
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
-DocType: Report,Disabled,已禁用
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
+DocType: Email Digest,Add Quote,添加报价
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,间接支出
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,行{0}：数量是强制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,您的产品或服务
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,请先输入项目
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名称是必须项
 DocType: Purchase Invoice,Recurring Type,经常性类型
 DocType: Address,City/Town,市/镇
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
 DocType: Purchase Invoice Item,Item Tax Rate,品目税率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
@@ -1122,14 +1038,13 @@
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,预计交付日期比计划开始日期较小。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计（公司货币）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,即将离任的总
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
 DocType: Authorization Rule,Transaction,交易
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：此成本中心是一个组，会计分录不能对组录入。
-apps/frappe/frappe/config/desk.py +7,Tools,工具
 DocType: Item,Website Item Groups,网站物件组
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,生产订单号码是强制性的股票入门目的制造
 DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
@@ -1137,24 +1052,22 @@
 DocType: Journal Entry,Journal Entry,日记帐分录
 DocType: Workstation,Workstation Name,工作站名称
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
 DocType: Sales Partner,Target Distribution,目标分布
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,评论
 DocType: Salary Slip,Bank Account No.,银行账号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,这就是以这个前缀的最后一个创建的事务数
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},物件{0}需要估值率
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},物件{0}需要估值率
 DocType: Quality Inspection Reading,Reading 8,阅读8
 DocType: Sales Partner,Agent,代理人
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能你应该改变“基于分布式费”
 DocType: Purchase Invoice,Taxes and Charges Calculation,税费计算
 DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,硬件
 DocType: Attendance,HR Manager,人力资源经理
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,请选择一个公司
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要启用购物车
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,无数据
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
 DocType: Salary Slip,Earning,盈余
 DocType: Payment Tool,Party Account Currency,党的账户币种
@@ -1164,26 +1077,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,之间存在重叠的条件：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,总订单价值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间记录操作
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,您只能对已提交的生产订单进行时间日志记录
 DocType: Maintenance Schedule Item,No of Visits,访问数量
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",发给联系人和潜在客户的通讯
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,操作不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,操作不能留空。
 ,Delivered Items To Be Billed,无开账单的已交付品目
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
-DocType: DocField,Description,描述
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
-DocType: Letter Head,Is Default,是否默认
 DocType: Address,Utilities,公用事业
 DocType: Purchase Invoice Item,Accounting,会计
 DocType: Features Setup,Features Setup,功能设置
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,查看录取通知书
-DocType: Communication,Communication,通讯
 DocType: Item,Is Service Item,是否服务品目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
 DocType: Activity Cost,Projects,项目
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,请选择会计年度
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},来自{0} | {1} {2}
@@ -1202,7 +1112,7 @@
 DocType: Item,Maintain Stock,维持股票
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生产订单已创建Stock条目
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,起始时间日期
 DocType: Email Digest,For Company,对公司
@@ -1212,7 +1122,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,品目{0}不是库存品目
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,品目{0}不是库存品目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依赖于无薪休假
@@ -1226,30 +1136,27 @@
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待办事项列表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,学徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,负数量是不允许的
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,学徒
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",从物件大师取得税项详细信息表，嵌入在此字段内。用作税金和费用。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,采血
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,发现员工{0}，而该月没有活动的薪酬结构
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,我们购买这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,我们购买这些物件
 DocType: Address,Billing,账单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,翻边
-DocType: Bulk Email,Not Sent,未发送
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆炸成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,计划发送到{0}个收件人
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,半成品
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,半成品
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
@@ -1259,105 +1166,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,未添加地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作时间
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析员
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析员
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必须小于或等于合资量{2}
 DocType: Item,Inventory,库存
 DocType: Features Setup,"To enable ""Point of Sale"" view",为了让观“销售点”
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,付款方式不能为空购物车制造
 DocType: Item,Sales Details,销售详情
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,钢钉
 DocType: Opportunity,With Items,随着项目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在数量
 DocType: Notification Control,Expense Claim Rejected,报销拒绝
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",在这接下来的发票将生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,品目属性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,项目变体
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,项目变体
 DocType: Company,Services,服务
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),总计（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),总计（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,没有在支付表中找到记录
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,财政年度开始日期
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,没有在支付表中找到记录
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,财政年度开始日期
 DocType: Employee External Work History,Total Experience,总经验
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,扩孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,装箱单（ S）取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,装箱单（ S）取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,货运及转运费
 DocType: Material Request Item,Sales Order No,销售订单编号
 DocType: Item Group,Item Group Name,品目群组名称
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,已经过
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,转移制造材料
 DocType: Pricing Rule,For Price List,对价格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,猎头
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",购买率的项目：{0}没有找到，这是需要预订会计分录（费用）。请注明项目价格对买入价格表。
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},错误： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},错误： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,请从科目表创建新帐户。
 DocType: Maintenance Visit,Maintenance Visit,维护访问
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客户>客户群组>地区
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 DocType: Time Log Batch Detail,Time Log Batch Detail,时间日志批量详情
-DocType: Workflow State,Tasks,任务
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
-DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
 ,Accounts Receivable Summary,应收账款汇总
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},叶为已分配给员工{1}的期间类型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
 DocType: UOM,UOM Name,计量单位名称
-DocType: Top Bar Item,Target,目标
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,贡献金额
 DocType: Sales Invoice,Shipping Address,送货地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可帮助您更新或修复系统中的库存数量和价值。它通常被用于同步系统值和实际存在于您的仓库。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,大写金额将在送货单保存后显示。
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,品牌大师
-DocType: ToDo,Due Date,到期日
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,主要品牌
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,本组织设置
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,本组织设置
 DocType: Monthly Distribution,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收器列表为空。请创建接收器列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生产计划销售订单
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},会计分录为{0}只能在货币进行：{1}
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,开槽
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求采购订单
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,银行账户
 ,Bank Reconciliation Statement,银行对帐表
 DocType: Address,Lead Name,线索姓名
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存货余额
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存货余额
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}只能出现一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允许转院更多{0}不是{1}对采购订单{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},已成功为{0}调配假期
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,未选择品目
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生产数量为必须项
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,银行无记录的数额
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,银行无记录的数额
 DocType: Quality Inspection Reading,Reading 4,4阅读
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,公司开支报销
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,离心铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁场辅助整理
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,库存负债
 DocType: Purchase Receipt,Supplier Warehouse,供应商仓库
 DocType: Opportunity,Contact Mobile No,联系人手机号码
 DocType: Production Planning Tool,Select Sales Orders,选择销售订单
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用条形码跟踪项目。您将能够通过扫描物品条码，进入交货单和销售发票的项目。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,标记为交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,标记为交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,请报价
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 DocType: SMS Center,Receiver List,接收器列表
@@ -1365,31 +1263,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬结构扣款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,选择性激光烧结
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,导入成功！
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},数量不能超过{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),时间（天）
 DocType: Quotation Item,Quotation Item,报价品目
 DocType: Account,Account Name,帐户名称
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,起始日期不能大于结束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,起始日期不能大于结束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
-apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,供应商类型大师。
+apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,主要的供应商类型。
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,添加
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,汇率不能为0或1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,外购入库单{0}未提交
 DocType: Company,Default Payable Account,默认应付账户
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格表等的设置
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安装完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％帐单
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留数量
 DocType: Party Account,Party Account,党的帐户
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
 DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的问题
@@ -1398,12 +1292,9 @@
 DocType: Company,Default Values,默认值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：付款金额不能为负
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,按拟合
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
 DocType: Payment Reconciliation,Payments,付款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,热等静压
-DocType: ToDo,Medium,中
 DocType: Budget Detail,Budget Allocated,已分配预算
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
@@ -1412,12 +1303,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,用日记账更新银行付款时间
 DocType: Quotation,Term Details,条款详情
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量规划的期限（天）
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
 DocType: Warranty Claim,Warranty Claim,保修申请
 ,Lead Details,线索详情
-DocType: Authorization Rule,Approving User,审批用户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,锻造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,电镀
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
 DocType: Bank Reconciliation,From Date,起始日期
@@ -1439,64 +1327,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,网上拍卖
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,网上拍卖
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司，月度和财年是必须项
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市场营销开支
 ,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,此品目的一件。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',时间日志批量{0}必须是'提交'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},在行无需仓库{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Address,Postal,邮政
 DocType: Item,Weightage,权重
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,矿业
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,树脂浇注
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户群组已经存在，请更改客户姓名或重命名客户集团
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,请选择{0}第一。
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},文字{0}
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
 DocType: Stock Entry,Material Receipt,物料收据
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,产品展示
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,产品展示
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},党的类型和党的需要应收/应付帐户{0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目已变种，那么它不能在销售订单等选择
 DocType: Lead,Next Contact By,下次联络人
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除，因为物件{1}有库存量
 DocType: Quotation,Order Type,订单类型
 DocType: Purchase Invoice,Notification Email Address,通知邮件地址
 DocType: Payment Tool,Find Invoices to Match,查找发票到匹配
 ,Item-wise Sales Register,品目特定的销售记录
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",例如“XYZ国家银行“
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",例如“XYZ国家银行“
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,总目标
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,总目标
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,购物车启用
 DocType: Job Applicant,Applicant for a Job,求职申请
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,暂无生产订单
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,雇员的本月工资单{0}已经创建过
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,雇员的本月工资单{0}已经创建过
 DocType: Stock Reconciliation,Reconciliation JSON,JSON对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Sales Invoice Item,Batch No,批号
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,主
-DocType: DocPerm,Delete,删除
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,变体
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新建{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止的订单无法取消，请先点击“重新开始”
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,机会从字段是强制性的
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
@@ -1505,53 +1391,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
-DocType: Country,Country,国家
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
-DocType: Communication,Received,收到
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
-DocType: Shipping Rule Condition,A condition for a Shipping Rule,航运规则的一个条件
+DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,项目是不允许有生产订单。
-DocType: DocField,Attach Image,附加图片
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
-DocType: Stock Reconciliation Item,Leave blank if no change,不更改的话请留空
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,时间日志制造。
 DocType: Item,Apply Warehouse-wise Reorder Level,使用仓库的再订购水平
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,时间日志中的任务。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
 DocType: Employee,Salutation,称呼
-DocType: Communication,Rejected,拒绝
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,会同时应用于变体
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Sales Order Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
 DocType: Quality Inspection Reading,Reading 10,阅读10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您采购或销售的产品或服务。请确认品目群组，计量单位或其他属性。
 DocType: Hub Settings,Hub Node,Hub节点
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入的项目有重复。请纠正然后重试。
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,值{0}的属性{1}不在有效的项目列表存在属性值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,协理
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,品目{0}不是一个序列品目
 DocType: SMS Center,Create Receiver List,创建接收人列表
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,已过期
 DocType: Packing Slip,To Package No.,以包号
-DocType: DocType,System,系统
 DocType: Warranty Claim,Issue Date,问题日期
 DocType: Activity Cost,Activity Cost,活动费用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,已消耗数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,电信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,电信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 DocType: Payment Tool,Make Payment Entry,创建付款分录
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
 ,Sales Invoice Trends,销售发票趋势
 DocType: Leave Application,Apply / Approve Leaves,申请/审批假期
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,对于
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
 DocType: Stock Settings,Allowance Percent,限额百分比
@@ -1563,33 +1444,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
 DocType: Purchase Order Item,Supplier Quotation Item,供应商报价品目
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,创建薪酬结构
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 DocType: Item,Has Variants,有变体
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,单击“创建销售发票”按钮来创建一个新的销售发票。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包装和标签
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,请在公司主及全球默认指定默认货币
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox的密码
 DocType: Purchase Invoice,Recurring Invoice,经常性发票
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,项目管理
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
 DocType: Budget Detail,Fiscal Year,财政年度
 DocType: Cost Center,Budget,预算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,已实现
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,区域/客户
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,例如5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,大写金额将在销售发票保存后显示。
 DocType: Item,Is Sales Item,是否销售品目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,品目群组树
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,品目{0}没有设置序列号，请进入品目大师中修改
 DocType: Maintenance Visit,Maintenance Time,维护时间
 ,Amount to Deliver,量交付
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,产品或服务
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,有错误发生
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,窃听
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,产品或服务
 DocType: Naming Series,Current Value,当前值
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已创建
 DocType: Delivery Note Item,Against Sales Order,对销售订单
@@ -1604,15 +1480,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能前于过账日期
 DocType: Website Item Group,Website Item Group,网站物件组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,关税与税项
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由过滤{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,参考日期请输入
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款项不能由{1}过滤
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
 DocType: Material Request Item,Material Request Item,物料申请品目
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,树的项目组。
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,树的项目组。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 ,Item-wise Purchase History,品目特定的采购历史
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,红
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,红
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
@@ -1622,12 +1498,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生产数量订单{3}。请通过时间日志更新运行状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投资
 DocType: Issue,Resolution Details,详细解析
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,更改品目的UOM(计量单位)。
 DocType: Quality Inspection Reading,Acceptance Criteria,验收标准
 DocType: Item Attribute,Attribute Name,属性名称
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},{1}中的品目{0}必须是销售或服务品目
 DocType: Item Group,Show In Website,在网站上显示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,组
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,组
 DocType: Task,Expected Time (in hours),预期时间（以小时计）
 ,Qty to Order,订购数量
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",在下列文件送货单，机遇，材料要求，项目，采购订单，采购凭证，买方收货，报价单，销售发票，产品捆绑，销售订单，序列号跟踪名牌
@@ -1636,78 +1511,67 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,发票号码
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,来自采购订单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,来自采购订单
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客户的地址和联系方式
 DocType: Employee,Resignation Letter Date,辞职信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,未设置
-DocType: Communication,Date,日期
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,系统正在安装设置，请稍后。这可能需要一段时间。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,对
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,对
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 DocType: Item,Has Batch No,有批号
 DocType: Delivery Note,Excise Page Number,Excise页码
 DocType: Employee,Personal Details,个人资料
 ,Maintenance Schedules,维护计划
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,压花
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",此品目必须是库存品目，因为它可以生成生产订单
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
-DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),设置接收简历的电子邮件地址 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Journal Entry,Accounts Receivable,应收帐款
 ,Supplier-Wise Sales Analytics,供应商特定的销售分析
 DocType: Address Template,This format is used if country specific format is not found,此格式用于如果找不到特定国家的格式
-DocType: Custom Field,Custom,习俗
 DocType: Production Order,Use Multi-Level BOM,采用多级物料清单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,注塑
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
-apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,树finanial帐户。
+apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,会计科目树
 DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产项目，所以科目{0}的类型必须为“固定资产”
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,因为账项{1}是一个资产条目，所以科目{0}的类型必须为“固定资产”
 DocType: HR Settings,HR Settings,人力资源设置
-apps/frappe/frappe/config/setup.py +130,Printing,印花
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,你要申请的假期位于假日内，无需请假。
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空间
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,体育
+apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,实际总
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,单位
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,请在您的网站配置设置Dropbox的访问键
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,单位
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的财政年度结束于
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,报销
 DocType: Issue,Support,支持
-DocType: Authorization Rule,Approving Role,审批者角色
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（开标+总计）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,请公司指定的货币
 DocType: Workstation,Wages per hour,时薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中品目{2}的库存余额将变为{1}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",显示或隐藏如序列号，POS等特性。
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列资料的要求已自动根据项目的重新排序水平的提高
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},行{0}中清拆日期不能在支票日期前
 DocType: Salary Slip,Deduction,扣款
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
@@ -1719,76 +1583,68 @@
 DocType: Opportunity,Quotation,报价
 DocType: Salary Slip,Total Deduction,扣除总额
 DocType: Quotation,Maintenance User,维护用户
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,品目{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,职位描述
 DocType: Purchase Order Item,Qty as per Stock UOM,按库存计量单位数量
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,请选择与数据的有效csv文件
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,涂层
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪销售活动。追踪来自活动的潜在客户，报价，销售订单等，统计投资回报率。
 DocType: Expense Claim,Approver,审批者
 ,SO Qty,销售订单数量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",此库存记录已经出现在仓库{0}中，所以你不能重新指定或更改仓库
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Supplier Quotation,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +84,Shipments,发货
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
-DocType: Purchase Order,To be delivered to customer,要传送给客户
+apps/erpnext/erpnext/hooks.py +68,Shipments,发货
+DocType: Purchase Order Item,To be delivered to customer,要传送给客户
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,时间日志状态必须被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,正在设置
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
 DocType: Pricing Rule,Supplier,供应商
 DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,杂项开支
 DocType: Global Defaults,Default Company,默认公司
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
 DocType: Employee,Bank Name,银行名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,用户{0}已禁用
 DocType: Leave Application,Total Leave Days,总休假天数
-DocType: Journal Entry Account,Credit in Account Currency,信用账户中的货币
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},品目{1}必须有{0}
 DocType: Currency Exchange,From Currency,源货币
-DocType: DocField,Name,名称
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},销售订单为品目{0}的必须项
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,系统无记录的数额
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,系统无记录的数额
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司货币）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
 DocType: POS Profile,Taxes and Charges,税项和收费
-DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",一个已购买、被出售或者保留在库存的产品或服务。
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",库存中已被购买，销售或保留的一个产品或服务。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,已完成
-DocType: Web Form,Select DocType,选择文档类型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,银行业
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新建成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,新建成本中心
 DocType: Bin,Ordered Quantity,订购数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Quality Inspection,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,品目特定的折扣
 DocType: Purchase Order Item,Reference Document Type,参考文档类型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}对销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}不允许销售订单{1}
 DocType: Account,Fixed Asset,固定资产
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化库存
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化库存
 DocType: Activity Type,Default Billing Rate,默认计费率
 DocType: Time Log Batch,Total Billing Amount,总结算金额
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,应收账款
@@ -1796,19 +1652,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,销售订单到付款
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,时间日志创建：
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Employee,Blood Group,血型
 DocType: Purchase Invoice Item,Page Break,分页符
 DocType: Production Order Operation,Pending,有待
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,可以为特定用户批准假期的用户
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,你不能改变变异的默认计量单位。要更改默认的计量单位为模板的变种改变默认的计量单位
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,办公设备
 DocType: Purchase Invoice Item,Qty,数量
 DocType: Fiscal Year,Companies,企业
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,电子
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,电子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,提高材料时，申请股票达到再订购水平
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,来自保养计划
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,全职
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全职
 DocType: Purchase Invoice,Contact Details,联系人详情
 DocType: C-Form,Received Date,收稿日期
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已经创建了销售税和费模板标准模板，选择一个，然后点击下面的按钮。
@@ -1820,29 +1676,28 @@
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,请选择Incharge人的名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技术
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 DocType: Offer Letter,Offer Letter,报价函
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,生成材料要求(MRP)和生产订单。
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,总开票金额
 DocType: Time Log,To Time,要时间
+DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子节点，探索树，然后单击要在其中添加更多节点的节点上。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
 DocType: Production Order Operation,Completed Qty,已完成数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,价格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允许加班
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的产品序列号{1}。您所提供{2}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,品目{1}需要{0}的序列号。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
 DocType: Item,Customer Item Codes,客户项目代码
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,创建订单或发票的支付分录。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新库存计量单位是必须项
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有品目已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,品目序列号
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
@@ -1852,15 +1707,13 @@
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,您的客户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,压缩成型
-DocType: Leave Block List Date,Block Date,禁离日
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,您的客户
+DocType: Leave Block List Date,Block Date,禁离日期
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,银行结算摘要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",创建和管理每日，每周和每月的电子邮件摘要。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,品目编号>品目群组>品牌
 DocType: Appraisal Goal,Appraisal Goal,评估目标
-DocType: Event,Friday,星期五
 DocType: Time Log,Costing Amount,成本核算金额
 DocType: Process Payroll,Submit Salary Slip,提交工资单
 DocType: Salary Structure,Monthly Earning & Deduction,月度收入和扣款
@@ -1868,16 +1721,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,进口散装
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
-DocType: Page,Title,标题
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,定制
 DocType: POS Profile,[Select],[选择]
 DocType: SMS Log,Sent To,发给
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,创建销售发票
 DocType: Company,For Reference Only.,仅供参考。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},无效的{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},无效的{0}：{1}
 DocType: Sales Invoice Advance,Advance Amount,预付款总额
 DocType: Manufacturing Settings,Capacity Planning,容量规划
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,“起始日期”是必需的
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,参考号码
 DocType: Employee,Employment Details,就职信息
 DocType: Employee,New Workplace,新建工作地点
@@ -1892,7 +1743,7 @@
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅游
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,旅游
 DocType: Leave Block List,Allow Users,允许用户(多个)
 DocType: Purchase Order,Customer Mobile No,客户手机号码
 DocType: Sales Invoice,Recurring,经常性
@@ -1900,23 +1751,21 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,品目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
 DocType: Installation Note,Installation Note,安装注意事项
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,添加税款
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,添加税款
 ,Financial Analytics,财务分析
 DocType: Quality Inspection,Verified By,认证机构
 DocType: Address,Subsidiary,子机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
 DocType: Quality Inspection,Purchase Receipt No,购买收据号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保证金
-DocType: System Settings,In Hours,以小时为单位
 DocType: Process Payroll,Create Salary Slip,建立工资单
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,银行预期结余
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,抛光
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,银行预期结余
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),资金来源（负债）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
 DocType: Appraisal,Employee,雇员
@@ -1929,15 +1778,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,基于凭证分组
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,邮件群发
-DocType: Page,Standard,标准
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,显示支付
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,医药
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,创建客户
@@ -1947,30 +1794,25 @@
 DocType: Quality Inspection Reading,Reading 9,9阅读
 DocType: Supplier,Is Frozen,被冻结
 DocType: Buying Settings,Buying Settings,采购设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,质量精加工
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),设置接收销售信息的电子邮件地址 。 （例如sales@example.com ）
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帐号
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,请注明公司进行
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,补假
 DocType: Quality Inspection Reading,Accepted,已接受
-DocType: User,Female,女
-DocType: Journal Entry Account,Debit in Account Currency,借记卡账户中的货币
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
-DocType: Print Settings,Modern,现代
-DocType: Communication,Replied,回答
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},无效的参考{0} {1}
 DocType: Payment Tool,Total Payment Amount,总付款金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料不能为空。
 DocType: Newsletter,Test,测试
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由于有存量交易为这个项目，\你不能改变的值&#39;有序列号&#39;，&#39;有批号&#39;，&#39;是股票项目“和”评估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日记帐分录
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,BOM被引用后你不能更改其税率
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
@@ -1978,18 +1820,18 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安装
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,时事通讯录
 DocType: Delivery Note,Transporter Name,转运名称
+DocType: Authorization Rule,Authorized Value,授权值
 DocType: Contact,Enter department to which this Contact belongs,输入此联系人所属的部门
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,计量单位
-DocType: Fiscal Year,Year End Date,年度开始日期
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,计量单位
+DocType: Fiscal Year,Year End Date,年度结束日期
 DocType: Task Depends On,Task Depends On,任务取决于
 DocType: Lead,Opportunity,机会
 DocType: Salary Structure Earning,Salary Structure Earning,薪酬结构收入
@@ -2006,19 +1848,18 @@
 DocType: Item,Will also apply for variants unless overrridden,除非手动指定，否则会同时应用于变体
 DocType: Purchase Invoice,Advances,进展
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,审批与被审批用户不能相同
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按库存计量单位）
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基础利率（按库存计量单位）
 DocType: SMS Log,No of Requested SMS,请求短信数量
 DocType: Campaign,Campaign-.####,活动-.####
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,冲孔
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,销售公司产品的第三方分销商/经销商/代理商/分支机构/分销商
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
 DocType: Customer Group,Has Child Node,有子节点
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}对采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}在没有任何活动的会计年度。详情查看{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
+apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不存在于任何活动的会计年度中。详情查看{2}。
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,账龄范围1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化学加工
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2052,11 +1893,9 @@
 8. 输入行： 如果选择了“基于前一行的总计/金额”，你可以选择此税项基于的行数(默认为前一行)。
 9. 税费应用于：你可以在这个部分指定此税费仅应用于评估(即不影响总计)， 或者仅应用于总计(即不会应用到单个品目)，或者两者。
 10. 添加或扣除： 添加还是扣除此税费。"
-DocType: Note,Note,注
 DocType: Purchase Receipt Item,Recd Quantity,RECD数量
-DocType: Email Account,Email Ids,电子邮件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票输入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,股票输入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
@@ -2064,40 +1903,36 @@
 DocType: Journal Entry,Credit Note,贷项通知单
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},完成数量不能超过{0}操作{1}
 DocType: Features Setup,Quality,质量
-DocType: Contact Us Settings,Introduction,介绍
 DocType: Warranty Claim,Service Address,服务地址
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,库存盘点，最多100行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,库存盘点，最多100行。
 DocType: Stock Entry,Manufacture,生产
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,请送货单第一
 DocType: Purchase Invoice,Currency and Price List,货币和价格表
 DocType: Opportunity,Customer / Lead Name,客户/潜在客户名称
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,生产
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,清拆日期未提及
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生产
 DocType: Item,Allow Production Order,允许生产订单
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Installation Note Item,Installed Qty,已安装数量
 DocType: Lead,Fax,传真
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,已提交
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,组织分支主。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,要么
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
-,Download Backups,下载备份
 DocType: Notification Control,Sales Order Message,销售订单信息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司，货币，当前财政年度等的默认值
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,针对选择您要分配款项的发票。
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,详细信息
 DocType: Purchase Invoice,Total Taxes and Charges,总营业税金及费用
 DocType: Employee,Emergency Contact,紧急联络人
 DocType: Item,Quality Parameters,质量参数
@@ -2112,6 +1947,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 DocType: Product Bundle,Parent Item,父项目
 DocType: Account,Account Type,账户类型
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
@@ -2119,33 +1955,28 @@
 DocType: Bin,Reserved Quantity,保留数量
 DocType: Landed Cost Voucher,Purchase Receipt Items,采购入库项目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定义表单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切割
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,压扁
 DocType: Account,Income Account,收益账户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
-apps/frappe/frappe/desk/moduleview.py +61,Documents,文档
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参考
 DocType: Cost Center,Cost Center,成本中心
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,凭证 #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,凭证 #
 DocType: Notification Control,Purchase Order Message,采购订单的消息
 DocType: Tax Rule,Shipping Country,航运国家
 DocType: Upload Attendance,Upload HTML,上传HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","预付款总额（{0}）反对令{1}不能大于\
 比总计（{2}）"
 DocType: Employee,Relieving Date,解除日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,营销和销售主管
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得税
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,激光直接成型
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,营销和销售主管
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得税
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,品目供应商
@@ -2153,10 +1984,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
-DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客户群组
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新建成本中心名称
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,没有找到默认的地址模板。请从设置 > 打印和品牌 >地址模板中创建一个。
 DocType: Appraisal,HR User,HR用户
@@ -2168,31 +1998,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 DocType: Supplier,Billing Currency,结算货币
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,特大号
 ,Profit and Loss Statement,损益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,压制
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的详细信息
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总积分
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告：另一个{0}＃{1}存在对股票入门{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,当地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),贷款及垫款（资产）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,债务人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,未找到任何雇员！
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
 DocType: C-Form Invoice Detail,Territory,区域
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
 DocType: Purchase Order,Customer Address Display,客户地址显示
 DocType: Stock Settings,Default Valuation Method,默认估值方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,抛光
 DocType: Production Order Operation,Planned Start Time,计划开始时间
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",测度项目的默认单位{0}不能直接改变，因为\你已经做了一些交易（S）与其他计量单位。要更改默认的计量单位，\使用“计量单位更换工具”下的股票模块工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,报价{0}已被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未偿还总额
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,雇员{0}在{1}日休假，不能标记考勤。
 DocType: Sales Partner,Targets,目标
@@ -2200,17 +2024,16 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
 DocType: Production Order Operation,Make Time Log,创建时间日志
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,请设置再订购数量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,电脑
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,电化学磨
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,请设置您的会计科目表你开始会计分录前
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定价规则
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,已取消
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,从薪酬结构日期不能高于员工加入日期较小。
 DocType: Employee Education,Graduate,研究生
-DocType: Leave Block List,Block Days,禁离日
+DocType: Leave Block List,Block Days,禁离天数
 DocType: Journal Entry,Excise Entry,Excise分录
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +62,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2232,7 +2055,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",如果是周期性发票的化请勾选，不是周期性或有结束日期的发票请取消选择。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,仅允许最多{0}行
 DocType: C-Form Invoice Detail,Net Total,总净
 DocType: Bin,FCFS Rate,FCFS率
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),账单(销售发票)
@@ -2249,20 +2071,19 @@
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,电化学加工
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,暂无说明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,过期的
 DocType: Account,Stock Received But Not Billed,已收货未开单的库存
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,根帐户必须是一组
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工资总额+欠费金额+兑现金额-总扣款金额
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Features Setup,Sales and Purchase,销售及采购
 DocType: Supplier Quotation Item,Material Request No,物料申请编号
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},品目{0}要求质量检验
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},品目{0}要求质量检验
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,速率客户的货币转换为公司的基础货币
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个名单退订成功！
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已经从这个清单退订成功！
 DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
-apps/frappe/frappe/templates/base.html +134,Added,添加
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
@@ -2276,11 +2097,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,财年{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,获取相关条目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,库存的会计分录
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,铸币
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,品目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,品目{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
-apps/frappe/frappe/desk/query_report.py +136,Total,总
 DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
 DocType: Account,Root Type,根类型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法返回超过{1}项{2}
@@ -2290,14 +2109,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Quality Inspection,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,喷射成形
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大于100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低库存水平
 DocType: Stock Entry,Subcontract,外包
@@ -2308,42 +2126,39 @@
 DocType: Item,Manufacturer Part Number,制造商零件编号
 DocType: Production Order Operation,Estimated Time and Cost,预计时间和成本
 DocType: Bin,Bin,仓位
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,减噪
 DocType: SMS Log,No of Sent SMS,发送短信数量
 DocType: Account,Company,公司
 DocType: Account,Expense Account,开支帐户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,软件
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,软件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,颜色
 DocType: Maintenance Visit,Scheduled,已计划
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,如果要不规则的按月分配，请选择“月度分布”。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,价格表货币没有选择
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,品目行{0}：采购收据{1}不存在于采购收据表中
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,项目开始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
 DocType: Installation Note Item,Against Document No,对文档编号
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},请选择{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,研究员
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究员
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,请在发送之前保存通讯
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,姓名或电子邮件是强制性
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,来料质量检验。
 DocType: Purchase Order Item,Returned Qty,返回的数量
 DocType: Employee,Exit,退出
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,根类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,根类型是强制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列号{0}已创建
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,震荡整理
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和送货单)中使用
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Sales Invoice,Advertisement,广告
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,试用期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,试用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
 DocType: Expense Claim,Expense Approver,开支审批人
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
@@ -2351,55 +2166,51 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日志维护短信发送状态
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收缩包装
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活动
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,确认
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供应商 > 供应商类型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,报纸出版商
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔炼
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
 DocType: Address,Preferred Shipping Address,首选送货地址
-DocType: Purchase Receipt Item,Accepted Warehouse,接收仓库
+DocType: Purchase Receipt Item,Accepted Warehouse,已接收的仓库
 DocType: Bank Reconciliation Detail,Posting Date,发布日期
 DocType: Item,Valuation Method,估值方法
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},找不到汇率{0} {1}
 DocType: Sales Invoice,Sales Team,销售团队
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,重复的条目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重复的条目
 DocType: Serial No,Under Warranty,在保修期内
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,创业投资
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列号{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
-apps/erpnext/erpnext/hooks.py +70,Orders,订单
+apps/erpnext/erpnext/hooks.py +54,Orders,订单
 DocType: Leave Control Panel,Employee Type,雇员类型
 DocType: Employee Leave Approver,Leave Approver,假期审批人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,模锻
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
 DocType: Expense Claim,"A user with ""Expense Approver"" role",有“费用审批人”角色的用户
 ,Issued Items Against Production Order,生产订单已发料的品目
 DocType: Pricing Rule,Purchase Manager,采购经理
 DocType: Payment Tool,Payment Tool,支付工具
 DocType: Target Detail,Target Detail,目标详细信息
-DocType: Sales Order,% of materials billed against this Sales Order,此销售订单％的材料已开账单。
+DocType: Sales Order,% of materials billed against this Sales Order,此销售订单％的材料已记账。
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末进入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,无效的时期
 DocType: Customer,Credit Limit,信用额度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,选择交易类型
 DocType: GL Entry,Voucher No,凭证编号
@@ -2409,11 +2220,10 @@
 DocType: Customer,Address and Contact,地址和联系方式
 DocType: Customer,Last Day of the Next Month,下个月的最后一天
 DocType: Employee,Feedback,反馈
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,维护手册。计划
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料喷射加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,维护手册。计划
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
-DocType: Website Settings,Website Settings,网站设置
 DocType: Item,Reorder level based on Warehouse,根据仓库订货点水平
 DocType: Activity Cost,Billing Rate,结算利率
 ,Qty to Deliver,交付数量
@@ -2424,20 +2234,19 @@
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帐号不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root帐号不能被删除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,显示库存记录
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},参考＃ {0}于{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},参考＃ {0}于{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,品目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
-DocType: Communication,Phone,电话
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),结算(借记)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),结算(借记)
 DocType: Contact,Passive,被动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,销售业务的税务模板。
@@ -2453,10 +2262,9 @@
 ,Billed Amount,已开票金额
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,获取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些样本记录
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,添加了一些样本记录
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,离开管理
-DocType: Event,Groups,组
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
@@ -2465,40 +2273,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,快速帮助
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
 DocType: Features Setup,Sales Extras,销售额外选项
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此股票和解是一个进入开幕
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} 成本中心{2}账户{1}的预算将超过{3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此股票和解是一个进入开幕
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,价值或数量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分钟
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
 ,Qty to Receive,接收数量
 DocType: Leave Block List,Leave Block List Allowed,禁离日例外用户
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,转换系数不能是分数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,用作登录名
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你将使用它来进行登录
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供应商类型
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,品目编号是必须项，因为品目没有自动编号
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},报价{0} 不属于{1}类型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,创建工资单
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押贷款
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,优质产品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,期初余额权益
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,无法批准，你没有在禁离日批准假期的权限
 DocType: Appraisal,Appraisal,评估
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,图纸
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重复
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},假期审批人有{0}的角色
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},假期审批人有{0}的角色
 DocType: Hub Settings,Seller Email,卖家电子邮件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
 DocType: Workstation Working Hour,Start Time,开始时间
@@ -2512,12 +2317,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
 DocType: BOM Operation,Hour Rate,时薪
 DocType: Stock Settings,Item Naming By,品目命名方式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,来自报价
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,来自报价
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,科目{0}不存在
 DocType: Purchase Receipt Item,Purchase Order Item No,采购订单编号
-DocType: System Settings,System Settings,系统设置
 DocType: Project,Project Type,项目类型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,各种活动的费用
@@ -2526,36 +2330,32 @@
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
 DocType: Serial No,Is Cancelled,是否注销
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出货量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出货量
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 DocType: Supplier,Supplier Details,供应商详情
-DocType: Communication,Recipients,受助人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,拧
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,滚花
 DocType: Expense Claim,Approval Status,审批状态
 DocType: Hub Settings,Publish Items to Hub,发布项目到集线器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},行{0}的起始值必须更小
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,电汇
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,请选择银行帐户
 DocType: Newsletter,Create and Send Newsletters,创建和发送新闻邮件
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期日期必须在结束日期之前
 DocType: Sales Order,Recurring Order,经常订购
 DocType: Company,Default Income Account,默认收益账户
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
 DocType: Item Group,Check this if you want to show in website,要显示在网站上，请勾选此项。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,欢迎使用ERPNext
+,Welcome to ERPNext,欢迎使用ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,凭证详情编号
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,导致报价
 DocType: Lead,From Customer,源客户
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,电话
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,电话
 DocType: Project,Total Costing Amount (via Time Logs),总成本核算金额（通过时间日志）
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,采购订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,采购订单{0}未提交
 ,Projected,预计
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
@@ -2563,13 +2363,10 @@
 DocType: Issue,Opening Date,开幕日期
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,率及金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,无聊
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,来自销售订单
-DocType: Blog Category,Parent Website Route,父网站路线
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,暂无联系人。
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,非活动
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本凭证金额
 DocType: Time Log,Batched for Billing,已为账单批次化
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,供应商开出的账单
@@ -2577,20 +2374,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金额
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值税
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,例如增值税
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
 DocType: Shopping Cart Settings,Quotation Series,报价系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,铁水形成气
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",转到相应的组（通常基金&gt;流动负债&gt;税和关税的来源，并创建一个新帐户（通过点击输入“税”添加儿童），做提税率。
 ,Payment Period Based On Invoice Date,已经提交。
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},{0}没有货币汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,激光切割
-DocType: Event,Monday,星期一
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Account,Payable,支付
 DocType: Salary Slip,Arrear Amount,欠款金额
@@ -2603,7 +2397,6 @@
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,生产流程进行的地方。
-DocType: Page,All,所有
 DocType: Stock Entry Detail,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
 DocType: Employee,Confirmation Date,确认日期
@@ -2611,9 +2404,8 @@
 DocType: Account,Sales User,销售用户
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,设置
 DocType: Lead,Lead Owner,线索所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,仓库是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,仓库是必需的
 DocType: Employee,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,汽车材料要求
 DocType: Time Log,Will be updated when billed.,出账被会更新。
@@ -2627,44 +2419,40 @@
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单项目提供
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,公司名称不能为公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,请送货单拉项目
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",类型电子邮件，电话，聊天，访问等所有通信记录
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,请提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,条款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,创建新的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,创建新的
 DocType: Buying Settings,Purchase Order Required,购货订单要求
 ,Item-wise Sales History,品目特定的销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
 ,Purchase Analytics,购买Analytics（分析）
 DocType: Sales Invoice Item,Delivery Note Item,送货单品目
 DocType: Expense Claim,Task,任务
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,刮
 DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},品目{0}必须指定批次号
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,您可以通过选择备份频率启动和\
 ,Stock Ledger,库存总帐
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},价格：{0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},价格：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工资单扣款
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,便签
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,请先选择一个组节点。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必须是一个{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填写表格并保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下载一个包含所有原材料及其库存状态的报告
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面对
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社区论坛
 DocType: Leave Application,Leave Balance Before Application,申请前假期余量
 DocType: SMS Center,Send SMS,发送短信
 DocType: Company,Default Letter Head,默认信头
 DocType: Time Log,Billable,可开票
-DocType: Authorization Rule,This will be used for setting rule in HR module,这将用于在人力资源模块的设置规则
 DocType: Account,Rate at which this tax is applied,速率此税适用
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再订购数量
 DocType: Company,Stock Adjustment Account,库存调整账户
@@ -2676,12 +2464,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,失去的机会
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣字段在采购订单，采购收据，采购发票可用。
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
-DocType: Report,Report Type,报告类型
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,载入中
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替换工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展会税分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,展会税分手
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果贵司涉及生产活动，将启动品目的“是否生产”属性
@@ -2691,19 +2477,18 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
 DocType: Serial No,Out of AMC,出资产管理公司
 DocType: Purchase Order Item,Material Request Detail No,物料申请详情编号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,硬车削
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,创建维护访问
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',请输入“预产期”
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',请输入“预产期”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是品目{1}的有效批次号
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注意：如果付款没有任何参考，请手动创建一个日记账分录。
 DocType: Item,Supplier Items,供应商品目
-DocType: Opportunity,Opportunity Type,机会型
+DocType: Opportunity,Opportunity Type,机会类型
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,新建公司
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,Cost Center is required for 'Profit and Loss' account {0},成本中心是“损益”科目{0}的必须项
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者被删除
@@ -2712,7 +2497,7 @@
 DocType: Hub Settings,Publish Availability,发布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,设置为打开
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,交易提交时自动向联系人发送电子邮件。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2720,58 +2505,50 @@
 可用数量：{4}，转让数量：{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
-DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,职责
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,职责
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用户
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,添加用户
 DocType: Pricing Rule,Item Group,品目群组
 DocType: Task,Actual Start Date (via Time Logs),实际开始日期（通过时间日志）
-DocType: Stock Reconciliation Item,Before reconciliation,前和解
+DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,品目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
 DocType: Item,Default BOM,默认的BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
 DocType: Time Log Batch,Total Hours,总时数
 DocType: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽车
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,品目是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金属注射成型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,来自送货单
 DocType: Time Log,From Time,起始时间
 DocType: Notification Control,Custom Message,自定义消息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投资银行业务
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",设置你的国家，时区和货币
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投资银行业务
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型铸造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,电镀
 DocType: Purchase Invoice Item,Rate,率
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,实习生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,实习生
 DocType: Newsletter,A Lead with this email id should exist,与此电子邮件关联的潜在客户不存在
 DocType: Stock Entry,From BOM,从BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',请点击“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期应该是一样的起始日期为半天假
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,参考编号是强制性的，如果你输入的参考日期
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Salary Structure,Salary Structure,薪酬结构
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}",存在多个符合条件的价格列表，请指定优先级来解决冲突。价格列表{0}
 DocType: Account,Bank,银行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,发料
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 DocType: Hub Settings,Access Token,访问令牌
@@ -2780,45 +2557,37 @@
 DocType: Item,Is Fixed Asset Item,是否固定资产项目
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",如果你的打印格式很长，这个功能可以被用来分割打印多个页面，每个页面上的都会有页眉和页脚。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,滚齿机
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,所有的区域
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,所有的区域
 DocType: Purchase Invoice,Items,品目
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,这个月的假期比工作日多。
 DocType: Product Bundle Item,Product Bundle Item,产品包项目
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
 DocType: Purchase Invoice Item,Image View,图像查看
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,精加工和精加工工业
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,必须指定起始和结束日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,证券及商品交易
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,钻孔
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
 DocType: Tax Rule,Shipping City,航运市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,该项目是{0}（模板）的变体。属性将被复制的模板，除非“不复制”设置
 DocType: Account,Purchase User,购买用户
 DocType: Notification Control,Customize the Notification,自定义通知
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,锻造
-DocType: Web Page,Slideshow,幻灯片
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,默认地址模板不能删除
 DocType: Sales Invoice,Shipping Rule,配送规则
 DocType: Journal Entry,Print Heading,打印标题
 DocType: Quotation,Maintenance Manager,维护经理
-DocType: Workflow State,Search,搜索
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,总不能为零
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“自从最后订购日”必须大于或等于零
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,铜焊
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
 DocType: C-Form,Amended From,修订源
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,原料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,此科目有子科目，无法删除。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},品目{0}没有默认的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,请选择发布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,顺延
@@ -2827,44 +2596,43 @@
 ,Produced,生产
 DocType: Item,Item Code for Suppliers,对于供应商产品编号
 DocType: Issue,Raised By (Email),提出（电子邮件）
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,附加信头
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,附加信头
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
 DocType: Journal Entry,Bank Entry,银行记录
 DocType: Authorization Rule,Applicable To (Designation),适用于(指定)
-DocType: Blog Post,Blog Post,博客文章
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,分组基于
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,启用/禁用货币。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,邮政费用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娱乐休闲
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Purchase Order,The date on which recurring order will be stop,经常性发票终止日期
 DocType: Quality Inspection,Item Serial No,品目序列号
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必须通过{1}会减少或应增加溢出宽容
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,总现
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小时
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,小时
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,转印材料供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,转印材料供应商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
 DocType: Lead,Lead Type,线索类型
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,创建报价
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,这些品目都已开具发票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,这些品目都已开具发票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
 DocType: Features Setup,Point of Sale,销售点
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,冰壶
 DocType: Account,Tax,税项
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精制
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,从产品包
 DocType: Production Planning Tool,Production Planning Tool,生产规划工具
 DocType: Quality Inspection,Report Date,报告日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,路由
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}已分配给员工{1}的时期{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}个收件人
 DocType: Features Setup,Item Groups in Details,详细品目群组
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
@@ -2873,33 +2641,29 @@
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
 DocType: Pricing Rule,Customer Group,客户群组
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},品目{0}必须指定开支账户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: Item,Website Description,网站简介
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 ,Sales Register,销售记录
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
 DocType: Address,Plant,厂
-DocType: DocType,Setup,设置
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活动总结
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷轧
 DocType: Customer Group,Customer Group Name,客户群组名称
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,请选择结转，如果你还需要包括上一会计年度的资产负债叶本财年
 DocType: GL Entry,Against Voucher Type,对凭证类型
 DocType: Item,Attributes,属性
-DocType: Packing Slip,Get Items,获取品目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最后订购日期
-DocType: DocField,Image,图像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,创建消费发票
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
-DocType: Communication,Other,其他
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID没有设置
 DocType: Production Order,Planned Start Date,计划开始日期
 DocType: Serial No,Creation Document Type,创建文件类型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,维护手册。访
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,维护手册。访
 DocType: Leave Type,Is Encash,是否兑现
 DocType: Purchase Invoice,Mobile No,手机号码
 DocType: Payment Tool,Make Journal Entry,创建日记帐分录
@@ -2907,35 +2671,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
 DocType: Project,Expected End Date,预计结束日期
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,广告
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,广告
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 DocType: Cost Center,Distribution Id,分配标识
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,优质服务
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,所有的产品或服务。
 DocType: Purchase Invoice,Supplier Address,供应商地址
-DocType: Contact Us Settings,Address Line 2,地址行2
-DocType: ToDo,Reference,参考
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,射孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,规则来计算销售运输量
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融服务
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},为属性{0}值必须的范围内{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,信用
 DocType: Customer,Default Receivable Accounts,默认应收账户(多个)
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,锯切
 DocType: Tax Rule,Billing State,计费状态
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,层压
 DocType: Item Reorder,Transfer,转让
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,烧结
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Supplier,Contact HTML,联系HTML
@@ -2946,9 +2704,8 @@
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
-DocType: Product Bundle,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,产品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：无效参考{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: GL Entry,Remarks,备注
@@ -2956,48 +2713,44 @@
 DocType: Journal Entry,Write Off Based On,核销基于
 DocType: Features Setup,POS View,POS机查看
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,一个序列号的安装记录
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,连铸
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,请指定一个
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上浆
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,科目{0}不能为组
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,区域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,负评估价格是不允许的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,负评估价格是不允许的
 DocType: Holiday List,Weekly Off,周末
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),临时溢利/（亏损）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向销售发票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,项目5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},请设置在公司默认值{0} {1}
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},请设置在公司默认值{0} {1}
 DocType: Serial No,Creation Time,创建时间
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,总收入
 DocType: Sales Invoice,Product Bundle Help,产品包帮助
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,获取从产品捆绑项目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,科目{0}已停用
 DocType: GL Entry,Is Advance,是否预付款
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,请输入'转包' YES或NO
 DocType: Sales Team,Contact No.,联络人电话
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录不允许有“损益”类型{0}的账户
-DocType: Workflow State,Time,时间
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,期初分录中不允许有“损益”类型的账户{0}
 DocType: Features Setup,Sales Discounts,销售折扣
 DocType: Hub Settings,Seller Country,卖家国家
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,营业税金及费用模板
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服装及配饰
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服装及配饰
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,订购次数
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML或横幅，将显示在产品列表的顶部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定用来计算运费金额的条件
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,添加子项
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,角色允许设置冻结帐户和编辑冷冻项
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为总账，因为它有子项。
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,转换系数是必须项
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,销售佣金
 DocType: Offer Letter Term,Value / Description,值/说明
@@ -3005,15 +2758,13 @@
 ,Customers Not Buying Since Long Time,长时间没有购买的客户
 DocType: Production Order,Expected Delivery Date,预计交货日期
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺着
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸发图案铸造
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娱乐费用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,账龄
 DocType: Time Log,Billing Amount,开票金额
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,品目{0}的数量无效，应为大于0的数字。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,假期申请。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,有交易的科目不能被删除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,有交易的科目不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律费用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Sales Invoice,Posting Time,发布时间
@@ -3027,26 +2778,23 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,帐号：{0}币种：{1}不能选择
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,缓刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
-DocType: Feed,Full Name,全名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,铆
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,缓刑
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,库存品目必须指定默认仓库。
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},支付工资的月{0}和年{1}
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,总支付金额
 ,Transferred Qty,转让数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,规划
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,规划
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,创建时间记录批次
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,发行
 DocType: Project,Total Billing Amount (via Time Logs),总结算金额（通过时间日志）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,我们卖这些物件
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,我们卖这些物件
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供应商编号
 DocType: Journal Entry,Cash Entry,现金分录
 DocType: Sales Partner,Contact Desc,联系人倒序
@@ -3055,18 +2803,16 @@
 DocType: Brand,Item Manager,项目经理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,添加新行为科目设定年度预算。
 DocType: Buying Settings,Default Supplier Type,默认供应商类别
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,采石
 DocType: Production Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有联系人。
 DocType: Newsletter,Test Email Id,测试电子邮件Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司缩写
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司缩写
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你使用质量检验的话。将启动采购收据内的“品目需要检验”和“QA编号”。
 DocType: GL Entry,Party Type,党的类型
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,原料不能同主项
 DocType: Item Attribute Value,Abbreviation,缩写
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许，因为{0}超出范围
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,滚塑成型
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪资模板大师。
 DocType: Leave Type,Max Days Leave Allowed,允许的最长假期天数
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,购物车设置税收规则
@@ -3080,15 +2826,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结股票
 ,Territory Target Variance Item Group-Wise,按物件组的区域目标波动
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必须项。可能是没有由{1}到{2}的货币转换记录。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客户群组
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。可能是没有由{1}到{2}的货币转换记录。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,税务模板是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
 DocType: Account,Temporary,临时
 DocType: Address,Preferred Billing Address,首选帐单地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘书
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘书
 DocType: Serial No,Distinct unit of an Item,品目的属性
 DocType: Pricing Rule,Buying,采购
 DocType: HR Settings,Employee Records to be created by,雇员记录创建于
@@ -3101,42 +2847,37 @@
 ,Item-wise Price List Rate,品目特定的价目表率
 DocType: Purchase Order Item,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,规则增加运输成本。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,即将举行的活动
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
-DocType: Letter Head,Letter Head,信头
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入门
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是强制性的回报
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是退货单的必填项
 DocType: Purchase Order,To Receive,接受
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷缩配合
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,收益/支出
 DocType: Employee,Personal Email,个人电子邮件
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,总方差
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,总方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,佣金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
 DocType: Address,Postal Code,邮政编码
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",单位为分钟，通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,发布生产订单。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Hub Settings,Name Token,名称令牌
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,刨
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,标准销售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更换
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}对销售发票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,请输入缺省的计量单位
 DocType: Purchase Invoice Item,Project Name,项目名称
 DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
-DocType: Workflow State,Edit,编辑
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Features Setup,Item Batch Nos,品目批号
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
@@ -3144,13 +2885,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得税资产
 DocType: BOM Item,BOM No,BOM编号
-DocType: Contact Us Settings,Pincode,PIN代码
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Replace Tool,The BOM which will be replaced,此物料清单将被替换
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,新库存计量单位必须于当前单位不同
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,假期天数必须为0.5的倍数
 DocType: Production Order,Operation Cost,运营成本
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,由.csv文件上传考勤记录
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,优秀的金额
@@ -3166,10 +2905,7 @@
 DocType: Project,Default Cost Center,默认成本中心
 DocType: Purchase Invoice,End Date,结束日期
 DocType: Employee,Internal Work History,内部工作经历
-DocType: DocField,Column Break,分栏符
-DocType: Event,Thursday,星期四
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,私募股权投资
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,车削
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股权投资
 DocType: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
 DocType: Sales Invoice,Exhibition,展览
@@ -3182,31 +2918,30 @@
 DocType: Employee,Held On,举行日期
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生产项目
 ,Employee Information,雇员资料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,额外费用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,财政年度结束日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留职（LWP）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本周的总结
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},行{1}中的{0}必须是“采购”或“转包”类型的品目
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: GL Entry,Party,一方
 DocType: Sales Order,Delivery Date,交货日期
-DocType: DocField,Currency,货币
 DocType: Opportunity,Opportunity Date,日期机会
 DocType: Purchase Receipt,Return Against Purchase Receipt,回到对外购入库单
 DocType: Purchase Order,To Bill,比尔
 DocType: Material Request,% Ordered,％有序
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,计件工作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,计件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均买入价
 DocType: Task,Actual Time (in Hours),实际时间（小时）
 DocType: Employee,History In Company,公司内历史
@@ -3223,77 +2958,68 @@
 DocType: Opportunity,To Discuss,为了讨论
 DocType: SMS Settings,SMS Settings,短信设置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,临时账户
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
 DocType: Purchase Order,End date of current order's period,当前订单周期的结束日期
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使录取通知书
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,回报
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
-DocType: DocField,Fold,折叠
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,测度变异的默认单位必须与模板
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
 DocType: Project Task,Pending Review,待审核
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,请注明
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客户ID
-DocType: Page,Page Name,网页名称
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到时间必须大于从时间
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,销售订单{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,主轴整理
 DocType: BOM,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例如“MC”
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存，因为他存在变体
 ,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
-DocType: System Settings,Time Zone,时区
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,仓库{0}不存在
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即注册ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所选项目不能有批次
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单％的材料已交货。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,装订
 DocType: Customer,Customer Details,客户详细信息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,成型
 DocType: Employee,Reports to,报告以
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Sales Invoice,Paid Amount,支付的金额
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',结算帐户{0}必须是'负债'类型
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,品目变体
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,质量管理
 DocType: Production Planning Tool,Filter based on customer,根据客户筛选
 DocType: Payment Tool Detail,Against Voucher No,对凭证号码
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Tax Rule,Purchase,采购
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,余额数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,余额数量
 DocType: Item Group,Parent Item Group,父项目组
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,仓库。
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,仓库。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,速率供应商的货币转换为公司的基础货币
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
 DocType: Opportunity,Next Contact,下一页联系
 DocType: Employee,Employment Type,就职类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定资产
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,申请期间不能跨两个alocation记录
 DocType: Item Group,Default Expense Account,默认支出账户
 DocType: Employee,Notice (days),通告（天）
-DocType: Page,Yes,是
 DocType: Tax Rule,Sales Tax Template,销售税模板
 DocType: Employee,Encashment Date,兑现日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,电铸
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",凭证类型必须是采购订单，采购发票或日记帐分录之一
 DocType: Account,Stock Adjustment,库存调整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默认情况下存在作业成本的活动类型 -  {0}
 DocType: Production Order,Planned Operating Cost,计划运营成本
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,新建{0}名称
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},随函附上{0}＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},随函附上{0}＃{1}
 DocType: Job Applicant,Applicant Name,申请人姓名
 DocType: Authorization Rule,Customer / Item Name,客户/项目名称
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3306,7 +3032,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},序列号是品目{0}的必须项
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,请从指定/至范围
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,创建人
 DocType: Serial No,Under AMC,在年度保养合同中
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,品目的评估价格将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,销售业务的默认设置。
@@ -3318,17 +3043,16 @@
 DocType: Payment Reconciliation,Minimum Amount,最低金额
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小时
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},系列{0}已经被{1}使用
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,仓库（永续盘存）的账户将在该帐户下创建。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款项
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,项目经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 DocType: Customer,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
 DocType: Sales Invoice,Supplier Reference,供应商推荐
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",如果勾选，获取原材料时将考虑半成品的BOM。否则会将半成品当作原材料。
@@ -3336,8 +3060,8 @@
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
 DocType: Item Price,Item Price,品目价格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,影视业
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,影视业
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
@@ -3346,7 +3070,6 @@
 DocType: BOM,Rate Of Materials Based On,率材料的基础上
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},仓库{0}缺少公司
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,库存计量单位替换工具
 DocType: POS Profile,Terms and Conditions,条款和条件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期应该是在财政年度内。假设终止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在这里，你可以保持身高，体重，过敏，医疗问题等
@@ -3358,7 +3081,7 @@
 DocType: Sales Order Item,For Production,对生产
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,小于等于零系统，估值率是强制性的资料
 DocType: Project Task,View Task,查看任务
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,您的会计年度开始于
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,您的会计年度开始于
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,请输入购买收据
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
@@ -3366,20 +3089,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),设置接收支持的电子邮件地址。 （例如support@example.com ）
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
 DocType: Salary Slip,Salary Slip,工资单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“结束日期”必需设置
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
 DocType: Salary Slip,Payment Days,金天
 DocType: BOM,Manage cost of operations,管理流程成本
 DocType: Features Setup,Item Advanced,品目高级设置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,热轧
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
 DocType: Employee Education,Employee Education,雇员教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,这是需要获取项目详细信息。
 DocType: Salary Slip,Net Pay,净支付金额
 DocType: Account,Account,账户
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列号{0}已收到过
@@ -3387,36 +3108,29 @@
 DocType: Purchase Invoice,Recurring Id,经常性标识
 DocType: Customer,Sales Team Details,销售团队详情
 DocType: Expense Claim,Total Claimed Amount,总索赔额
-apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,潜在的机会卖。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病假
+apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,销售的潜在机会
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},无效的{0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,病假
 DocType: Email Digest,Email Digest,邮件摘要
 DocType: Delivery Note,Billing Address Name,帐单地址名称
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,百货
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,系统余额
-DocType: Workflow,Is Active,是否活动
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,系统余额
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文档。
 DocType: Account,Chargeable,应课
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,更改缩写
-DocType: Workflow State,Primary,初级
 DocType: Expense Claim Detail,Expense Date,报销日期
 DocType: Item,Max Discount (%),最大折扣(%)
-DocType: Communication,More Information,更多信息
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,最后订单金额
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,爆破
 DocType: Company,Warn,警告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,品目评估价格已更新
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
 DocType: BOM,Manufacturing User,生产用户
 DocType: Purchase Order,Raw Materials Supplied,提供原料
 DocType: Purchase Invoice,Recurring Print Format,经常打印格式
-DocType: Communication,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,预计交货日期不能早于采购订单日期
 DocType: Appraisal,Appraisal Template,评估模板
-DocType: Communication,Email,邮件
 DocType: Item Group,Item Classification,品目分类
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,业务发展经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期
 ,General Ledger,总帐
@@ -3426,9 +3140,7 @@
 ,Itemwise Recommended Reorder Level,品目特定的推荐重订购级别
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,请选择{0}第一
 DocType: Features Setup,To get Item Group in details table,为了让项目组在详细信息表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,重绘
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,蚀刻
 DocType: Sales Invoice,Commission,佣金
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3454,7 +3166,7 @@
  {％，如果email_id％}电子邮件：{{email_id}}＆LT; BR＆GT {％ENDIF - ％} 
  </代码> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,默认金额
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,仓库在系统中未找到
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,仓库在系统中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报告
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
@@ -3473,13 +3185,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Payment Tool,Get Outstanding Vouchers,获取未清凭证
 DocType: Warranty Claim,Resolved By,议决
 DocType: Appraisal,Start Date,开始日期
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,值
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,点击这里核实
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
@@ -3489,55 +3200,43 @@
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
 DocType: Time Log,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,滚动
-DocType: ToDo,Priority,优先
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
-DocType: Dropbox Backup,Dropbox Access Allowed,Dropbox访问已允许
-DocType: Dropbox Backup,Weekly,每周
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：smsgateway.com/API/send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
 DocType: Employee,Educational Qualification,学历
 DocType: Workstation,Operating Costs,运营成本
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我们的新闻列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,电子束加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生产订单{0}必须提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,主报告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,存库分类帐分录的余额已更新
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,主报告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,添加/编辑价格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心表
 ,Requested Items To Be Ordered,要求项目要订购
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,我的订单
 DocType: Price List,Price List Name,价格列表名称
 DocType: Time Log,For Manufacturing,对于制造业
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,总计
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,总计
 DocType: BOM,Manufacturing,生产
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
-,Setup Wizard,设置向导
 DocType: Industry Type,Industry Type,行业类型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,发现错误！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金额（公司货币）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,压铸模具
-DocType: Email Alert,Reference Date,参考日期
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,组织单位（部门）的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,请输入有效的手机号
 DocType: Budget Detail,Budget Detail,预算详情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
-DocType: Async Task,Status,状态
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},品目{0}的库存计量单位已更新
-DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,简介销售点的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,请更新短信设置
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,时间日志{0}已结算
@@ -3550,55 +3249,52 @@
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
 DocType: Item,Unit of Measure Conversion,转换度量单位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,雇员不能更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你不能向一个账户同时输入贷方和借方记录。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},品目{1}已经超过允许的超额{0}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所属的人或组织的名称
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供应商
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,您的供应商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,雇员{1}已经有另一套薪金结构{0}，请将原来的薪金结构改为‘已停用’状态.
 DocType: Purchase Invoice,Contact,联系人
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,从......收到
 DocType: Features Setup,Exports,导出
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：申请者{0} 金额{1} 
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 DocType: Issue,Content Type,内容类型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,电脑
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,电脑
 DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,品目{0}不存在
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您没有权限设定冻结值
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Cost Center,Budgets,预算
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,已更新
 DocType: Employee,Emergency Contact Details,紧急联系方式
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,贵公司的标语
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,贵公司的标语
 DocType: Delivery Note,To Warehouse,到仓库
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},科目{0}已多次输入财年{1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},财年{1}中已多次输入科目{0}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,电气
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},员工设置{0}为设置用户ID
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,喷丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,来自保修申请
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},{0}的生日提醒
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,精研
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,自上次订购天数
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,自上次订购天数
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
-DocType: User,Enabled,已启用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,库存资产
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},确认要提交所有{1}年{8}的所有工资单吗？
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,进口认购
@@ -3606,19 +3302,18 @@
 DocType: Attendance,Present,现
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
 DocType: Authorization Rule,Based On,基于
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,项目活动/任务。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工资条
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}不是有效的电子邮件地址
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
-DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,纺织
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
@@ -3640,7 +3335,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,活动名称是必须项
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Receipt Item,Rejected Serial No,拒绝序列号
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深拉伸
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新的通讯
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,显示余额
@@ -3651,7 +3345,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,铆
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
 ,Sales Analytics,销售分析
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
@@ -3663,28 +3356,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新建账户名称
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料提供成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顾客服务
 DocType: Item,Thumbnail,缩略图
 DocType: Item Customer Detail,Item Customer Detail,品目客户详情
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,确认您的电子邮件
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,报价候选作业。
 DocType: Notification Control,Prompt for Email on Submission of,提示电子邮件的提交
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,分配的总叶多天的期限
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,品目{0}必须是库存品目
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,业务会计的默认设置。
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
-DocType: Contact Us Settings,City,城市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超声波加工
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,错误：没有有效的身份证？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,品目{0}必须是销售品目
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
 DocType: Sales Order,Printing Details,印刷详情
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,工程师
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程师
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},行{0}中的品目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
@@ -3692,7 +3381,7 @@
 DocType: Authorization Rule,Customerwise Discount,客户折扣
 DocType: Purchase Invoice,Against Expense Account,对开支账目
 DocType: Production Order,Production Order,生产订单
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安装单{0}已经提交过
 DocType: Quotation Item,Against Docname,对文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
@@ -3700,26 +3389,24 @@
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item,Re-Order Level,重新排序级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特图
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列已更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,报告类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,报告类型是强制性的
 DocType: Item,Serial Number Series,序列号系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批发
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,第一个用户：您
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,第一个用户：您
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,对账/盘点成功
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,对账/盘点成功
 DocType: Production Order,Planned End Date,计划的结束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,物件的存储位置。
 DocType: Tax Rule,Validity,有效性
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,已开票金额
 DocType: Attendance,Attendance,考勤
-DocType: Page,No,No
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,发布日期和发布时间是必需的
@@ -3727,55 +3414,46 @@
 ,Item Prices,品目价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,价格表师傅。
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,主价格表。
 DocType: Task,Review Date,评论日期
 DocType: Purchase Invoice,Advance Payments,预付款
-DocType: DocPerm,Level,级别
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行{0}的目标仓库必须与生产订单的仓库相同
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,没有使用付款工具的权限
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,周期性的%s没有设置“通知电子邮件地址”
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,磨
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,没有使用付款工具的权限
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,循环%s中未指定“通知电子邮件地址”
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Company,Round Off Account,四舍五入账户
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,嗑
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政开支
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,咨询
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,咨询
 DocType: Customer Group,Parent Customer Group,母公司集团客户
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“XX有限责任公司”
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“XX有限责任公司”
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期
 DocType: Bank Reconciliation Detail,Voucher ID,凭证ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,集团或Ledger ，借方或贷方，是特等帐户
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Email Digest,Receivables / Payables,应收/应付账款
 DocType: Delivery Note Item,Against Sales Invoice,对销售发票
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,冲压
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 DocType: Task,Actual End Date (via Time Logs),实际结束日期（通过时间日志）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,请输入父成本中心
 DocType: Delivery Note,Print Without Amount,打印量不
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
-DocType: User,Last Name,姓
-DocType: Web Page,Left,离开
-DocType: Event,All Day,全日
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,税项类型不能是“估值”或“估值和总计”，因为所有的物件都不是库存物件
 DocType: Issue,Support Team,支持团队
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
-DocType: Contact Us Settings,State,状态
 DocType: Batch,Batch,批次
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,余额
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,余额
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
-DocType: User,Gender,性别
 DocType: Journal Entry,Debit Note,借项通知单
 DocType: Stock Entry,As per Stock UOM,按库存计量单位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,未过期
@@ -3789,44 +3467,40 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,创建规则，根据属性值来限制交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，这将会降低“日工资”的值。
 DocType: Purchase Invoice,Total Advance,总垫款
-DocType: Workflow State,User,用户
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,设置为丧失
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收货注意事项
 DocType: Customer,Credit Days Based On,信贷天基于
 DocType: Tax Rule,Tax Rule,税务规则
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已经提交过
 ,Items To Be Requested,要申请的品目
-DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根据活动类型计费率（每小时）
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,封罐
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",公司电子邮件ID没有找到，因此邮件无法发送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 DocType: Production Planning Tool,Filter based on item,根据项目筛选
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年开始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
 DocType: Purchase Common,Purchase Common,购买普通
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}已被修改过，请刷新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,来自机会
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隐
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
-DocType: Purchase Receipt Item,Accepted Quantity,接收数量
+DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,对客户开出的账单。
-DocType: DocField,Default,默认
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用户
 DocType: Maintenance Schedule,Schedule,计划任务
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定义预算这个成本中心。要设置预算的行动，请参阅“企业名录”
@@ -3837,70 +3511,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,价格表未找到或禁用
 DocType: Expense Claim,Approved,已批准
 DocType: Pricing Rule,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",选择“Yes”将为此品目的所有实体创建唯一标识，你可以在序列号大师中查看他们的序列好。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 DocType: Address,Office,办公室
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,标准报告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,请选择员工记录第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要创建一个纳税帐户
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,请输入您的费用帐户
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量库存
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,批量库存
 DocType: Employee,Contract End Date,合同结束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基于上述标准拉销售订单（待定提供）
-DocType: DocShare,Document Type,文档类型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,来自供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,来自供应商报价
 DocType: Deduction Type,Deduction Type,扣款类型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小数量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",要跟踪与批次号的销售和采购文件的项目。 “首选行业：化工”
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,计划数量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,总税收
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,总税收
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
 DocType: Notification Control,Purchase Receipt Message,外购入库单信息
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的总叶多期
 DocType: Production Order,Actual Start Date,实际开始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单％的材料已交货。
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,记录项目的运动。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通讯订户名单
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,服务
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 ,Monthly Salary Register,月度工资记录
-apps/frappe/frappe/website/template.py +140,Next,下一个
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: BOM Operation,BOM Operation,BOM操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,电解
 DocType: Purchase Taxes and Charges,On Previous Row Amount,基于前一行的金额
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,请ATLEAST一行输入付款金额
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,请ATLEAST一行输入付款金额
 DocType: POS Profile,POS Profile,POS简介
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金额不能大于杰出金额
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,总未付
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,总未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,时间日志是不计费
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,购买者
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,购买者
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,净支付金额不能为负数
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,请手动输入对优惠券
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,请手动输入对优惠券
 DocType: SMS Settings,Static Parameters,静态参数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,品目税项
@@ -3909,14 +3576,12 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,向你的联系人群发短信。
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,交叉轧制
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的品目
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,仓储业务的默认设置。
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,仓储业务的默认设置。
 DocType: Purchase Invoice,Next Date,下次日期
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,请输入税费
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
 DocType: Sales Invoice Item,Drop Ship,落船
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
 DocType: Hub Settings,Seller Name,卖家名称
@@ -3926,47 +3591,44 @@
 DocType: Stock Entry,Repack,改装
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在继续之前，您必须保存表单
 DocType: Item Attribute,Numeric Values,数字值
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,附加标志
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,附加标志
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部门禁止假期申请。
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,车是空的
 DocType: Production Order,Actual Operating Cost,实际运行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,根不能被编辑。
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,调配的数量不能超过未调配数量
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,根不能被编辑。
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,调配的数量不能超过未调配数量
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Order,Customer's Purchase Order Date,客户的采购订单日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包装重量详情
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,请选择一个csv文件
-DocType: Dropbox Backup,Send Backups to Dropbox,发送到备份Dropbox的
 DocType: Purchase Order,To Receive and Bill,接收和比尔
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,设计师
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,设计师
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,条款和条件模板
 DocType: Serial No,Delivery Details,交货细节
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Item,Automatically create Material Request if quantity falls below this level,自动创建材料，如果申请数量低于这个水平
 ,Item-wise Purchase Register,品目特定的采购记录
 DocType: Batch,Expiry Date,到期时间
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要设置订货点水平，项目必须购买项目或生产项目
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +18,Project master.,项目主。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
-DocType: Dropbox Backup,Send Notifications To,将通知发给
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,参考日期
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,科目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},员工请建立薪酬结构{0}

diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 1b85f32..6d3cfe4 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv

@@ -1,13 +1,12 @@
 DocType: Employee,Salary Mode,薪酬模式
 DocType: Cost Center,"Select Monthly Distribution, if you want to track based on seasonality.",選擇月度分配，如果你想根據季節進行跟踪。
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +86,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +80,Warning: Same item has been entered multiple times.,警告：相同項目已經輸入多次。
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,項目已同步
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允許項目將在一個事務中多次添加
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,材質訪問{0}之前取消此保修索賠取消
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Consumer Products,消費類產品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,消費類產品
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,請選擇黨第一型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Annealing,退火
 DocType: Item,Customer Items,客戶項目
 apps/erpnext/erpnext/accounts/doctype/account/account.py +45,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總帳
 DocType: Item,Publish Item to hub.erpnext.com,發布項目hub.erpnext.com
@@ -17,18 +16,16 @@
 DocType: Employee,Leave Approvers,休假審批人
 DocType: Sales Partner,Dealer,零售商
 DocType: Employee,Rented,租
-DocType: About Us Settings,Website,網站
 DocType: POS Profile,Applicable for User,適用於用戶
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +169,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Compaction plus sintering,壓實加燒結
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},貨幣所需的價格表{0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯繫
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +549,From Material Request,從物料需求
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +660,From Material Request,從物料需求
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0}樹
 DocType: Job Applicant,Job Applicant,求職者
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Legal,法律
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +114,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
 DocType: C-Form,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
@@ -43,20 +40,19 @@
 DocType: Manufacturing Settings,Default 10 mins,預設為10分鐘
 DocType: Leave Type,Leave Type Name,休假類型名稱
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Series Updated Successfully,系列已成功更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +150,Stitching,拼接
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯繫
 DocType: Quality Inspection Reading,Parameter,參數
 apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
-apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +189,New Leave Application,新假期申請
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +204,New Leave Application,新假期申請
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +134,Bank Draft,銀行匯票
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1。使用這個選項來維護客戶的項目代碼，並可根據客戶的項目代碼做搜索。
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
 apps/erpnext/erpnext/stock/doctype/item/item.js +34,Show Variants,顯示變體
-DocType: Sales Invoice Item,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +478,Quantity,數量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),借款（負債）
 DocType: Employee Education,Year of Passing,路過的一年
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,庫存
@@ -64,53 +60,52 @@
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,建立新的POS簡介
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Health Care,保健
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
 DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +66,Delay in payment (Days),延遲支付（天）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +494,Invoice,發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +606,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,電子郵件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Defense,防禦
+apps/erpnext/erpnext/public/js/setup_wizard.js +107,Email Address,電子郵件地址
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Company,Abbr,縮寫
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +193,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,行＃{0}：
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,行＃{0}：
 DocType: Delivery Note,Vehicle No,車輛無
 apps/erpnext/erpnext/public/js/pos/pos.js +528,Please select Price List,請選擇價格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Woodworking,木工
 DocType: Production Order Operation,Work In Progress,在製品
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +153,3D printing,3D列印
 DocType: Employee,Holiday List,假日列表
 DocType: Time Log,Time Log,時間日誌
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,會計人員
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,Accountant,會計人員
 DocType: Cost Center,Stock User,股票用戶
 DocType: Company,Phone No,電話號碼
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.",活動日誌由用戶對任務可用於跟踪時間，計費執行。
-apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},新{0}：＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +124,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
 apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +56,"Attribute Value {0} cannot be removed from {1} as Item Variants \
 						exist with this Attribute.",屬性值{0}無法從{1}作為項目變體\刪除存在這個屬性。
-DocType: Print Settings,Classic,經典
 apps/erpnext/erpnext/accounts/doctype/account/account.js +27,This is a root account and cannot be edited.,這是一個root帳戶，不能被編輯。
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
 DocType: Bin,Quantity Requested for Purchase,需購買的數量
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列，一為舊名稱，一個用於新名稱
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,公斤
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Kg,公斤
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,開放的工作。
 DocType: Item Attribute,Increment,增量
 apps/erpnext/erpnext/public/js/stock_analytics.js +63,Select Warehouse...,選擇倉庫...
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Advertising,廣告
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
+apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +391,Stock cannot be updated against Delivery Note {0},股票不能對送貨單更新的{0}
 DocType: Payment Reconciliation,Reconcile,調和
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Grocery,雜貨
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +100,Make Bank Entry,使銀行進入
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pension Funds,養老基金
-apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫，其倉庫項目是強制要設定的，
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
+apps/erpnext/erpnext/accounts/doctype/account/account.py +149,Warehouse is mandatory if account type is Warehouse,如果帳戶類型是倉庫，其倉庫項目是強制要設定的，
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Lead,Person Name,人姓名
 DocType: Sales Order,"Check if recurring order, uncheck to stop recurring or put proper End Date",檢查經常性秩序，取消，停止經常性或將適當的結束日期
@@ -127,41 +122,36 @@
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
-DocType: Blog Post,Guest,客人
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,物料清單
-apps/erpnext/erpnext/public/js/stock_analytics.js +45,Opening,開盤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +158,Opening,開盤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
-apps/frappe/frappe/email/doctype/email_account/email_account.py +58,{0} is mandatory,{0}是強制性的
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +113,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
-DocType: Standard Reply,Owner,業主
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +13,Please enter company first,請先輸入公司
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Company first,請首先選擇公司
 DocType: Employee Education,Under Graduate,根據研究生
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +22,Target On,目標在
 DocType: BOM,Total Cost,總成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Reaming,擴孔
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,活動日誌：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Real Estate,房地產
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +194,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,房地產
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,帳戶狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +41,Pharmaceuticals,製藥
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
 DocType: Expense Claim Detail,Claim Amount,索賠金額
 DocType: Employee,Mr,先生
-DocType: Custom Script,Client,客戶
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供應商類型/供應商
 DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Consumable,耗材
 DocType: Upload Attendance,Import Log,導入日誌
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,發送
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯繫
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Annual Salary,年薪
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,庫存費用
 DocType: Newsletter,Email Sent?,郵件發送？
@@ -169,7 +159,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +92,Show Time Logs,顯示的時間記錄
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Delivery Note,Installation Status,安裝狀態
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +115,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +118,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,項{0}必須是一個採購項目
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
@@ -177,22 +167,20 @@
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +446,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,之後銷售發票已提交將被更新。
-apps/erpnext/erpnext/controllers/accounts_controller.py +493,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/controllers/accounts_controller.py +511,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,設定人力資源模塊
 DocType: SMS Center,SMS Center,短信中心
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Straightening,直
 DocType: BOM Replace Tool,New BOM,新的物料清單
 apps/erpnext/erpnext/config/projects.py +28,Batch Time Logs for billing.,批處理的時間記錄進行計費。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Countergravity casting,反重力鑄造
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,新聞已發送
 DocType: Lead,Request Type,請求類型
 DocType: Leave Application,Reason,原因
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,執行
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +364,The first user will become the System Manager (you can change this later).,第一個用戶將成為系統管理器（你可以改變這個版本）。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Execution,執行
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,The first user will become the System Manager (you can change this later).,第一個用戶將成為系統管理器（你可以改變這個版本）。
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
-apps/erpnext/erpnext/config/stock.py +263,Items and Pricing,項目和定價
+apps/erpnext/erpnext/config/stock.py +258,Items and Pricing,項目和定價
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期＝{0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,選擇要為其創建的考核員工。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
@@ -204,9 +192,6 @@
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +81,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
 DocType: Pricing Rule,Discount on Price List Rate (%),折扣價目表率（％）
-apps/frappe/frappe/public/js/frappe/form/print.js +96,Start,開始
-DocType: User,First Name,名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +12,Full-mold casting,全模鑄造
 DocType: Offer Letter,Select Terms and Conditions,選擇條款和條件
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
@@ -218,57 +203,53 @@
 DocType: Bank Reconciliation,Bank Account,銀行帳戶
 DocType: Leave Type,Allow Negative Balance,允許負平衡
 DocType: Selling Settings,Default Territory,預設地域
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Television,電視
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Gashing,Gashing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
 DocType: Production Order Operation,Updated via 'Time Log',通過“時間日誌”更新
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +82,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
 DocType: Sales Invoice,Is Opening Entry,是開放報名
 DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收賬款適用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +154,For Warehouse is required before Submit,對於倉庫之前，需要提交
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Sales Partner,Reseller,經銷商
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,請輸入公司名稱
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 ,Production Orders in Progress,製程中生產訂單
 DocType: Lead,Address & Contact,地址及聯繫方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +206,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +203,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
 DocType: Newsletter List,Total Subscribers,用戶總數
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,聯繫人姓名
+,Contact Name,聯繫人姓名
 DocType: Production Plan Item,SO Pending Qty,SO待定數量
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Double housing,雙人房
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +156,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +171,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Leaves per Year,每年葉
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup > Settings > Naming Series,請設置命名序列{0}通過設置&gt;設置&gt;命名系列
 DocType: Time Log,Will be updated when batched.,批處理時將被更新。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
-DocType: Bulk Email,Message,訊息
 DocType: Item Website Specification,Item Website Specification,項目網站規格
-DocType: Dropbox Backup,Dropbox Access Key,Dropbox Access Key
 DocType: Payment Tool,Reference No,參考編號
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +348,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/accounts/utils.py +339,Annual,全年
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +392,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +546,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/accounts/utils.py +341,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
 DocType: Lead,Do Not Contact,不要聯繫
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,軟件開發人員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
 DocType: Item,Publish in Hub,在發布中心
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +552,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +598,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +566,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +607,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +323,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +129,Wire brushing,鋼絲刷
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,確認客戶的訂單。
@@ -284,12 +265,10 @@
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +81,Hubbing,樞紐
 DocType: Purchase Invoice Item,Expense Head,總支出
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,請先選擇付款類別
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,最多5個字符
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,選擇您的語言
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,Max 5 characters,最多5個字符
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
 DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
 Operations shall not be tracked against Production Order",禁止對創作生產訂單的時間日誌。操作不得對生產訂單追踪
@@ -300,29 +279,20 @@
 DocType: Item,Variant Of,變種
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +34,Item {0} must be Service Item,項{0}必須是服務項目
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
-DocType: DocType,Administrator,管理員
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Laser drilling,激光打孔
-DocType: Stock UOM Replace Utility,New Stock UOM,新的庫存計量單位
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
-DocType: Communication,Closed,關閉
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Newsletter,Newsletter,新聞
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +84,Hydroforming,液壓成形
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +49,Necking,縮頸
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在創建自動材料需求時已電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +51,Item is updated,項目更新
-DocType: Async Task,System Manager,系統管理器
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
 DocType: Sales Invoice Item,Delivery Note,送貨單
-DocType: Dropbox Backup,Allow Dropbox Access,讓Dropbox的訪問
 apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,建立稅
-apps/erpnext/erpnext/accounts/utils.py +189,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/accounts/utils.py +191,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +347,{0} entered twice in Item Tax,{0}輸入兩次項目稅
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +105,Summary for this week and pending activities,本週和待活動總結
 DocType: Workstation,Rent Cost,租金成本
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +74,Please select month and year,請選擇年份和月份
@@ -330,33 +300,30 @@
 DocType: Employee,Company Email,企業郵箱
 DocType: GL Entry,Debit Amount in Account Currency,在賬戶幣種借記金額
 DocType: Shipping Rule,Valid for Countries,有效的國家
-DocType: Workflow State,Refresh,重新載入
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.",在採購入庫單，供應商報價單，採購發票，採購訂單等所有可像貨幣，轉換率，總進口，進口總計進口等相關領域
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,總訂貨考慮
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
-apps/erpnext/erpnext/controllers/recurring_document.py +199,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
+apps/erpnext/erpnext/controllers/recurring_document.py +196,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,公司貨幣被換算成客戶基礎貨幣的匯率
-DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單，送貨單，採購發票，生產訂單，採購訂單，採購入庫單，銷售發票，銷售訂單，股票，時間表
+DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet",存在於物料清單，送貨單，採購發票，生產訂單，採購訂單，採購入庫單，銷售發票，銷售訂單，股票，時間表
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Select Item,選擇項目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +143,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Select Item,選擇項目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
 庫存調整，而是使用庫存分錄。"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +259,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +262,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +54,Convert to non-Group,轉換為非集團
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Purchase Receipt must be submitted,購買收據必須提交
-DocType: Stock UOM Replace Utility,Current Stock UOM,目前的庫存計量單位
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,一批該產品的（很多）。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
 apps/erpnext/erpnext/accounts/party.py +223,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,您的電子郵件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +194,Please see attachment,請參閱附件
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +208,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Water jet cutting,水射流切割
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +24,Setup Already Complete!!,安裝已經完成！
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +18,Setup Already Complete!!,安裝已經完成！
 ,Finished Goods,成品
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
@@ -371,6 +338,7 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +29,Please do NOT create Accounts for Customers and Suppliers. They are created directly from the Customer / Supplier masters.,請不要創建客戶和供應商帳戶。他們是直接從客戶/供應商的主人創建的。
 DocType: Currency Exchange,Currency Exchange,外幣兌換
 DocType: Purchase Invoice Item,Item Name,項目名稱
+DocType: Authorization Rule,Approving User  (above authorized value),批准的用戶（上述授權值）
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Credit Balance,貸方餘額
 DocType: Employee,Widowed,寡
 DocType: Production Planning Tool,"Items to be requested which are ""Out of Stock"" considering all warehouses based on projected qty and minimum order qty",這是“缺貨”的項目被要求考慮根據預計數量和最小起訂量為所有倉庫
@@ -380,22 +348,21 @@
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
 DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +167,{0} ({1}) must have role 'Leave Approver',"{0}（{1}）必須有權限 ""假期審批“"
 DocType: Purchase Receipt,Vehicle Date,車日期
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +39,Medical,醫療
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +39,Medical,醫療
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,原因丟失
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +36,Tube beading,管釘珠
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 DocType: Employee,Single,單
 DocType: Issue,Attachment,附件
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,預算不能為集團成本中心成立
 DocType: Account,Cost of Goods Sold,銷貨成本
 DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,請輸入成本中心
 DocType: Journal Entry Account,Sales Order,銷售訂單
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,平均。賣出價
 DocType: Purchase Order,Start date of current order's period,啟動電流訂單的期限日期
-apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
+apps/erpnext/erpnext/utilities/transaction_base.py +131,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,％已安裝
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +59,Please enter company name first,請先輸入公司名稱
@@ -405,10 +372,8 @@
 DocType: Account,Is Group,是集團
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Thermoforming,熱成型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Slitting,縱剪
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,非營利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,非營利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,未啟動
 DocType: Lead,Channel Partner,渠道合作夥伴
 DocType: Account,Old Parent,老家長
@@ -417,13 +382,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +509,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +523,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +140,Holiday master.,假日高手。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Shell molding,外殼成型
 DocType: Material Request Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +644,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +735,Please enter Item Code.,請輸入產品編號。
 DocType: BOM,Costing,成本核算
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
@@ -433,35 +398,30 @@
 DocType: Item Attribute,To Range,為了範圍
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,證券及存款
 DocType: Features Setup,Imports,進口
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +144,Adhesive bonding,粘接
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +102,Pending activities for today,今天待定活動
 apps/erpnext/erpnext/config/hr.py +28,Attendance record.,考勤記錄。
 DocType: Bank Reconciliation,Journal Entries,日記帳分錄
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
-DocType: System Settings,Loading...,載入中...
-DocType: DocField,Password,密碼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Fused deposition modeling,熔融沉積成型
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,添加訂閱
 apps/erpnext/erpnext/public/js/feature_setup.js +220,""" does not exists",“不存在
 DocType: Pricing Rule,Valid Upto,到...為止有效
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +319,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,直接收入
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,政務主任
 DocType: Payment Tool,Received Or Paid,收到或支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +318,Please select Company,請選擇公司
 DocType: Stock Entry,Difference Account,差異帳戶
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +305,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Cosmetics,化妝品
-DocType: DocField,Type,類型
-apps/erpnext/erpnext/stock/doctype/item/item.py +414,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
-DocType: Communication,Subject,主題
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
+apps/erpnext/erpnext/stock/doctype/item/item.py +428,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
 ,Serial No Warranty Expiry,序列號保修到期
@@ -469,8 +429,7 @@
 DocType: Purchase Invoice Item,Item,項目
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +293,Managing Subcontracting,管理轉包
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +58,New UOM must NOT be of type Whole Number,新的計量單位不能是類型整數
+apps/erpnext/erpnext/config/stock.py +288,Managing Subcontracting,管理轉包
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,家具及固定裝置
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
@@ -482,22 +441,22 @@
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,刪除公司事務
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Item {0} is not Purchase Item,項目{0}不購買產品
-apps/erpnext/erpnext/controllers/recurring_document.py +188,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +185,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0}在“通知\
 電子郵件地址”中是無效的電子郵件地址"
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +43,Total Billing This Year:,本年總計費：
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,本年總計費：
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增／編輯稅金及費用
 DocType: Purchase Invoice,Supplier Invoice No,供應商發票號碼
 DocType: Territory,For reference,供參考
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions",無法刪除序列號{0}，因為它採用的是現貨交易
-apps/erpnext/erpnext/public/js/account_tree_grid.js +52,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +229,Closing (Cr),關閉（Cr）
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 ,Pending Qty,待定數量
 DocType: Job Applicant,Thread HTML,主題HTML
 DocType: Company,Ignore,忽略
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
+apps/erpnext/erpnext/controllers/buying_controller.py +126,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,佣金總計
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
@@ -507,7 +466,7 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","**月**分佈幫助你分配你整個月的預算，如果你有季節性的業務。
 
 要使用這種分佈分配預算，在**成本中心**設置這個**月**分佈"
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +183,No records found in the Invoice table,沒有在發票表中找到記錄
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +130,No records found in the Invoice table,沒有在發票表中找到記錄
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,財務／會計年度。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
@@ -515,7 +474,6 @@
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,鉛標識
 DocType: C-Form Invoice Detail,Grand Total,累計
-DocType: About Us Settings,Website Manager,網站管理
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
 DocType: Warranty Claim,Resolution,決議
 apps/erpnext/erpnext/templates/pages/order.html +51,Delivered: {0},交貨：{0}
@@ -523,25 +481,24 @@
 DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,上一筆
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +620,Sales Return,銷貨退回
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,要從創建生產訂單選擇銷售訂單。
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,工資組成部分。
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
+DocType: Authorization Rule,Customer or Item,客戶或項目
 apps/erpnext/erpnext/config/crm.py +17,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +58,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/accounts/utils.py +193,Allocated amount can not be negative,分配金額不能為負
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Tumbling,翻筋斗
+apps/erpnext/erpnext/stock/doctype/item/item.py +672,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,測度項目的默認單位{0}不能直接改變，因為你已經做了一些交易（S）與其他計量單位。您將需要創建一個新的項目，以使用不同的默認計量單位。
+apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not be negative,分配金額不能為負
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
-DocType: Event,Wednesday,星期三
 DocType: Sales Invoice,Customer's Vendor,客戶的供應商
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +214,Production Order is Mandatory,生產訂單是強制性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,提案寫作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Proposal Writing,提案寫作
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
 apps/erpnext/erpnext/stock/stock_ledger.py +336,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},負庫存錯誤（ {6}）的項目{0}在倉庫{1}在{2} {3} {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
@@ -562,20 +519,16 @@
 DocType: Activity Type,Default Costing Rate,默認成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,維護計劃
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +179,Please install dropbox python module,請安裝Dropbox的Python模塊
 DocType: Employee,Passport Number,護照號碼
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,經理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +494,From Purchase Receipt,從採購入庫單
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,經理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +581,From Purchase Receipt,從採購入庫單
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +214,Same item has been entered multiple times.,相同的項目已被輸入多次。
 DocType: SMS Settings,Receiver Parameter,收受方參數
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根據”和“分組依據”不能相同
 DocType: Sales Person,Sales Person Targets,銷售人員目標
-apps/frappe/frappe/public/js/frappe/form/workflow.js +116,To,到
-apps/frappe/frappe/templates/base.html +145,Please enter email address,請輸入您的電子郵件地址
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,End tube forming,尾管成型
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +635,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +637,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
 DocType: Selling Settings,Customer Naming By,客戶命名由
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
@@ -583,25 +536,20 @@
 DocType: Customer,Fixed Days,固定天
 DocType: Sales Invoice,Packing List,包裝清單
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Publishing,出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,項目用戶
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +198,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +203,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Material Request,Material Transfer,物料轉倉
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),開啟（Dr）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
-apps/frappe/frappe/config/setup.py +59,Settings,設定
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Production Order Operation,Actual Start Time,實際開始時間
 DocType: BOM Operation,Operation Time,操作時間
-apps/frappe/frappe/public/js/frappe/views/module/module_section.html +27,More,更多
 DocType: Pricing Rule,Sales Manager,銷售經理
-apps/frappe/frappe/public/js/frappe/model/model.js +492,Rename,重命名
 DocType: Journal Entry,Write Off Amount,核銷金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Bending,彎曲
-apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,允許用戶
 DocType: Journal Entry,Bill No,帳單號碼
 DocType: Purchase Invoice,Quarterly,每季
 DocType: Selling Settings,Delivery Note Required,要求送貨單
@@ -610,17 +558,16 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,請輸入項目細節
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Account,Accounts,會計
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Straight shearing,直剪
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,市場營銷
 DocType: Features Setup,To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.,在基於其序列號的銷售和採購文件跟踪的項目。這也可以用來跟踪商品的保修細節。
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +99,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +102,Rejected Warehouse is mandatory against regected item,拒絕倉庫是必須反對regected項目
 DocType: Account,Expenses Included In Valuation,支出計入估值
 DocType: Employee,Provide email id registered in company,提供的電子郵件ID在公司註冊
 DocType: Hub Settings,Seller City,賣家市
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +489,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/item/item.py +503,Item has variants.,項目已變種。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
@@ -629,14 +576,10 @@
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +172,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry",對憑證類型必須是一個銷售訂單，銷售發票或日記帳分錄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Biomachining,Biomachining
-apps/erpnext/erpnext/setup/utils.py +89,Unable to find exchange rate,找不到匯率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Aerospace,航天
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,歡迎
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +18,Task Subject,任務主題
 apps/erpnext/erpnext/config/stock.py +33,Goods received from Suppliers.,從供應商收到貨。
-DocType: Communication,Open,開
 DocType: Lead,Campaign Name,活動名稱
 ,Reserved,保留的
 DocType: Purchase Order,Supply Raw Materials,供應原料
@@ -645,29 +588,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +92,{0} is not a stock Item,{0}不是庫存項目
 DocType: Mode of Payment Account,Default Account,預設帳戶
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +157,Lead must be set if Opportunity is made from Lead,如果機會是由鉛製成鉛必須設置
-DocType: Contact Us Settings,Address Title,地址名稱
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +33,Please select weekly off day,請選擇每週休息日
 DocType: Production Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-DocType: Dropbox Backup,Daily,每日
-apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +112,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
 DocType: Employee,Cell Number,手機號碼
+apps/erpnext/erpnext/stock/reorder_item.py +171,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +120,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Energy,能源
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,月薪聲明。
 DocType: Item Group,Website Specifications,網站規格
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,New Account,新帳號
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +274,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +27,Accounting Entries can be made against leaf nodes. Entries against Groups are not allowed.,會計分錄可針對葉節點。不允許針對組的分錄。
-DocType: ToDo,High,高
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +356,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
 DocType: Opportunity,Maintenance,維護
-DocType: User,Male,男性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +182,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
 apps/erpnext/erpnext/config/crm.py +64,Sales campaigns.,銷售活動。
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -715,10 +655,9 @@
 DocType: Address,Personal,個人
 DocType: Expense Claim Detail,Expense Claim Type,費用報銷型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,對購物車的預設設定
-apps/erpnext/erpnext/controllers/accounts_controller.py +324,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1}，檢查它是否應該被拉到作為提前在此發票。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Biotechnology,生物技術
+apps/erpnext/erpnext/controllers/accounts_controller.py +342,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",日記條目{0}鏈接抗令{1}，檢查它是否應該被拉到作為提前在此發票。
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,生物技術
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Office維護費用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Hemming,海明
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +62,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
@@ -726,14 +665,15 @@
 apps/erpnext/erpnext/stock/get_item_details.py +262,Price List not selected,未選擇價格列表
 DocType: Employee,Family Background,家庭背景
 DocType: Process Payroll,Send Email,發送電子郵件
+apps/erpnext/erpnext/stock/doctype/item/item.py +108,Warning: Invalid Attachment {0},警告：無效的附件{0}
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +88,No Permission,無權限
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +627,My Invoices,我的發票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +629,My Invoices,我的發票
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +43,No employee found,無發現任何員工
 DocType: Purchase Order,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
@@ -752,35 +692,32 @@
 DocType: Features Setup,"To enable ""Point of Sale"" features",為了使“銷售點”的特點
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
-DocType: Comment,Reference Name,參考名稱
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +328,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
 DocType: Maintenance Visit,Completion Status,完成狀態
 DocType: Sales Invoice Item,Target Warehouse,目標倉庫
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +49,Expected Delivery Date cannot be before Sales Order Date,預計交貨日期不能早於銷售訂單日期
 DocType: Upload Attendance,Import Attendance,進口出席
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +17,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +16,Permanent mold casting,永久模鑄造
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +87,{0} {1} status is {2},{0} {1}的狀態為{2}
 apps/erpnext/erpnext/config/learn.py +172,Purchase Order to Payment,採購訂單到付款
 DocType: Sales Order Item,Projected Qty,預計數量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Newsletter,Newsletter Manager,通訊經理
-apps/erpnext/erpnext/stock/doctype/item/item.js +234,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +231,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Expense Claim,Expenses,開支
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
 DocType: Appraisal,Select template from which you want to get the Goals,選擇您想要得到的目標模板
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,研究與發展
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,研究與發展
 ,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +75,Staking,跑馬圈地
 DocType: Item,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},要寄送給{0}的排程
@@ -791,18 +728,16 @@
 DocType: Sales Invoice Item,Stock Details,股票詳細信息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
 apps/erpnext/erpnext/config/selling.py +304,Point-of-Sale,銷售點
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,Cannot carry forward {0},不能發揚{0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +91,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借記帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借記帳戶
 DocType: Account,Balance must be,餘額必須
 DocType: Hub Settings,Publish Pricing,發布定價
 DocType: Notification Control,Expense Claim Rejected Message,報銷回絕訊息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +145,Nailing,釘
 ,Available Qty,可用數量
 DocType: Purchase Taxes and Charges,On Previous Row Total,在上一行共
 DocType: Salary Slip,Working Days,工作日
 DocType: Serial No,Incoming Rate,傳入速率
 DocType: Packing Slip,Gross Weight,毛重
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +410,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
+apps/erpnext/erpnext/public/js/setup_wizard.js +158,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
 DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
 DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,加入日期
@@ -812,30 +747,29 @@
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +3,View Subscribers,查看訂閱
 DocType: Purchase Invoice Item,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Abrasive blasting,噴砂
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +148,Currency exchange rate master.,貨幣匯率的主人。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +253,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +421,BOM {0} must be active,BOM {0}必須是積極的
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
 DocType: Salary Slip,Leave Encashment Amount,假期兌現金額
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},序列號{0}不屬於項目{1}
 DocType: Purchase Receipt Item Supplied,Required Qty,所需數量
 DocType: Bank Reconciliation,Total Amount,總金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Internet Publishing,互聯網出版
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,平衡值
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,銷售價格表
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,發布同步項目
-DocType: GL Entry,Account Currency,賬戶幣種
+DocType: Bank Reconciliation,Account Currency,賬戶幣種
 apps/erpnext/erpnext/accounts/general_ledger.py +131,Please mention Round Off Account in Company,請註明舍入賬戶的公司
 DocType: Purchase Receipt,Range,範圍
 DocType: Supplier,Default Payable Accounts,預設應付帳款
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Features Setup,Item Barcode,商品條碼
-apps/erpnext/erpnext/stock/doctype/item/item.py +484,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
 DocType: Address,Shop,店
@@ -844,7 +778,7 @@
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
 DocType: Employee,Permanent Address Is,永久地址
 DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,品牌
+apps/erpnext/erpnext/public/js/setup_wizard.js +252,The Brand,品牌
 apps/erpnext/erpnext/controllers/status_updater.py +163,Allowance for over-{0} crossed for Item {1}.,備抵過{0}越過為項目{1}。
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
@@ -858,65 +792,60 @@
 DocType: Material Request Item,Lead Time Date,交貨時間日期
 apps/erpnext/erpnext/public/js/controllers/taxes_and_totals.js +54, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +538,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
 apps/erpnext/erpnext/config/stock.py +28,Shipments to customers.,發貨給客戶。
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,間接收入
 DocType: Payment Tool,Set Payment Amount = Outstanding Amount,將付款金額=未償還
-DocType: Contact Us Settings,Address Line 1,地址行1
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,方差
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,公司名稱
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +53,Variance,方差
+,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +515,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +626,Select Item for Transfer,對於轉讓項目選擇
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,查看所有幫助影片名單
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,選取支票存入該銀行帳戶的頭。
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允許用戶編輯價目表率的交易
 DocType: Pricing Rule,Max Qty,最大數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +106,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +16,Chemical,化學藥品
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化學藥品
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +693,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
 DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +32,"Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account (by clicking on Add Child) of type ""Bank""",轉到相應的群組（通常資金運用>流動資產>銀行帳戶，並新增一個新帳戶（通過點擊添加類型的兒童），“銀行”
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
-DocType: Comment,Unsubscribed,退訂
 DocType: Opportunity,Walk In,走在
 DocType: Item,Inspection Criteria,檢驗標準
 apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,樹finanial成本中心。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,白
+apps/erpnext/erpnext/public/js/setup_wizard.js +253,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,White,白
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,附上你的照片
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +517,Make ,使
+apps/erpnext/erpnext/public/js/setup_wizard.js +112,Attach Your Picture,附上你的照片
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +628,Make ,使
 DocType: Journal Entry,Total Amount in Words,總金額大寫
-DocType: Workflow State,Stop,停止
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
 apps/erpnext/erpnext/templates/pages/cart.html +3,My Cart,我的購物車
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Order Type must be one of {0},訂單類型必須是一個{0}
 DocType: Lead,Next Contact Date,下次聯絡日期
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,開放數量
 DocType: Holiday List,Holiday List Name,假日列表名稱
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,股票期權
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +168,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +181,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
 DocType: Company,If Monthly Budget Exceeded (for expense account),如果每月超出預算（用於報銷）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Trimming,修剪
 DocType: Workstation,Net Hour Rate,淨小時率
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本採購入庫單
 DocType: Company,Default Terms,默認條款
 DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: POS Profile,Cash/Bank Account,現金／銀行帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +520,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Filing,備案
 apps/erpnext/erpnext/templates/form_grid/item_grid.html +72,Discount,折扣
 DocType: Features Setup,Purchase Discounts,採購折扣
 DocType: Workstation,Wages,工資
@@ -933,7 +862,8 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +112,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,客戶不與公司匹配
+apps/erpnext/erpnext/config/stock.py +131,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP倉庫
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: BOM Operation,Operation,作業
@@ -941,13 +871,13 @@
 DocType: Tax Rule,Shipping State,運輸狀態
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行添加
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,銷售費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Buying,標準採購
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
 apps/erpnext/erpnext/controllers/selling_controller.py +227,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯繫方式
-apps/erpnext/erpnext/config/stock.py +278,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +273,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,對生產補貼比例
@@ -962,31 +892,29 @@
 DocType: Time Log Batch,updated via Time Logs,通過時間更新日誌
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
 DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯繫客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
 DocType: Company,Default Currency,預設貨幣
 DocType: Contact,Enter designation of this Contact,輸入該聯繫人指定
-DocType: Contact Us Settings,Address,地址
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +338,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +356,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +54,Transportation,運輸
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,運輸
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +67, and year: ,和年份：
 DocType: Email Digest,Annual Expense,年費用
 DocType: SMS Center,Total Characters,總字元數
-apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +130,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,貢獻％
 DocType: Item,website page link,網站頁面的鏈接
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,讓我們準備系統首次使用。
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司註冊號碼，供大家參考。稅務號碼等
 DocType: Sales Partner,Distributor,經銷商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,購物車運輸規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +209,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
 ,Ordered Items To Be Billed,預付款的訂購物品
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,從範圍必須小於要範圍
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +24,From Range has to be less than To Range,從範圍必須小於要範圍
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,選擇時間日誌並提交以創建一個新的銷售發票。
 DocType: Global Defaults,Global Defaults,全域預設值
 DocType: Salary Slip,Deductions,扣除
@@ -1004,67 +932,58 @@
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Nothing to request,無需求
 apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,管理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,管理
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,活動的考勤表類型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Investment casting,熔模鑄造
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +51,Either debit or credit amount is required for {0},無論是借方或貸方金額是必需的{0}
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
-apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,啟用
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,藍色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Blue,藍色
 DocType: Purchase Invoice,Is Return,退貨
 DocType: Price List Country,Price List Country,價目表國家
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +123,Further nodes can be only created under 'Group' type nodes,此外節點可以在&#39;集團&#39;類型的節點上創建
 DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0}有效的序列號的項目{1}
+apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,產品編號不能為序列號改變
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +22,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,計量單位換算係數
 DocType: Stock Settings,Default Item Group,預設項目群組
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laminated object manufacturing,分層實體製造
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +561,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Stretch forming,拉伸成型
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的銷售人員將在此日期被提醒去聯繫客戶
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +210,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,稅務及其他薪金中扣除。
 DocType: Lead,Lead,鉛
 DocType: Email Digest,Payables,應付賬款
 DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +90,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +93,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,Purchase Order Items To Be Billed,欲付款的採購訂單品項
 DocType: Purchase Invoice Item,Net Rate,淨費率
 DocType: Purchase Invoice Item,Purchase Invoice Item,採購發票項目
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,項目1
 DocType: Holiday,Holiday,節日
-DocType: Event,Saturday,星期六
 DocType: Leave Control Panel,Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
 ,Daily Time Log Summary,每日時間記錄匯總
-DocType: DocField,Label,標籤
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核銷付款明細
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
 DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +384,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +390,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
 apps/erpnext/erpnext/config/hr.py +205,Setting up Employees,建立職工
 apps/erpnext/erpnext/public/js/feature_setup.js +220,"Grid """,電網“
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,請先選擇前綴稱號
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,工作完成
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
 DocType: Contact,User ID,使用者 ID
-DocType: Communication,Sent,已送出
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,查看總帳
-DocType: File,Lft,LFT
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +388,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
-DocType: Communication,Delivery Status,交貨狀態
+apps/erpnext/erpnext/stock/doctype/item/item.py +405,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
 DocType: Production Order,Manufacture against Sales Order,對製造銷售訂單
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +517,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +429,Rest Of The World,世界其他地區
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
@@ -1075,13 +994,11 @@
 DocType: BOM Item,Item Description,項目說明
 DocType: Payment Tool,Payment Mode,付款方式
 DocType: Purchase Invoice,Is Recurring,是經常性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +154,Direct metal laser sintering,直接金屬激光燒結
 DocType: Purchase Order,Supplied Items,提供的物品
 DocType: Production Order,Qty To Manufacture,製造數量
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期保持同樣的速度
 DocType: Opportunity Item,Opportunity Item,項目的機會
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,臨時開通
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cryorolling,Cryorolling
 ,Employee Leave Balance,員工休假餘額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +128,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
 DocType: Address,Address Type,地址類型
@@ -1097,35 +1014,34 @@
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +63,Sales Order {0} is not valid,銷售訂單{0}無效
 apps/erpnext/erpnext/setup/doctype/company/company.py +172,"Sorry, companies cannot be merged",對不起，企業不能合併
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,小
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Small,小
 DocType: Employee,Employee Number,員工人數
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
 ,Invoiced Amount (Exculsive Tax),發票金額（Exculsive稅）
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,項目2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,帳戶頭{0}創建
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,綠
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Green,綠
 DocType: Item,Auto re-order,自動重新排序
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,實現總計
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,實現總計
 DocType: Employee,Place of Issue,簽發地點
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,合同
-DocType: Report,Disabled,殘
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,合同
+DocType: Email Digest,Add Quote,添加報價
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +490,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,間接費用
 apps/erpnext/erpnext/controllers/selling_controller.py +163,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
+apps/erpnext/erpnext/public/js/setup_wizard.js +362,Your Products or Services,您的產品或服務
 DocType: Mode of Payment,Mode of Payment,付款方式
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,請先輸入項目
 DocType: Journal Entry Account,Purchase Order,採購訂單
 DocType: Warehouse,Warehouse Contact Info,倉庫聯繫方式
-apps/frappe/frappe/public/js/frappe/form/save.js +78,Name is required,名稱是必需的
 DocType: Purchase Invoice,Recurring Type,經常性類型
 DocType: Address,City/Town,市/鎮
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +113,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +468,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +470,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,資本設備
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +31,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
@@ -1135,14 +1051,13 @@
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,預計交貨日期比計劃開始日期較早。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +579,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +690,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計（公司貨幣）
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,出貨總計
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
 DocType: Authorization Rule,Transaction,交易
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +45,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
-apps/frappe/frappe/config/desk.py +7,Tools,工具
 DocType: Item,Website Item Groups,網站項目群組
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,Production order number is mandatory for stock entry purpose manufacture,對入庫為目的製造行為，生產訂單號碼是強制要輸入的。
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
@@ -1150,24 +1065,22 @@
 DocType: Journal Entry,Journal Entry,日記帳分錄
 DocType: Workstation,Workstation Name,工作站名稱
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +432,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
 DocType: Sales Partner,Target Distribution,目標分佈
-apps/frappe/frappe/public/js/frappe/model/model.js +25,Comments,評論
 DocType: Salary Slip,Bank Account No.,銀行賬號
 DocType: Naming Series,This is the number of the last created transaction with this prefix,這就是以這個前綴的最後一個創建的事務數
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},所需物品估價速率{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item {0},所需物品估價速率{0}
 DocType: Quality Inspection Reading,Reading 8,閱讀8
 DocType: Sales Partner,Agent,代理人
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +74,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能你應該改變“基於分佈式費”
 DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
 DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,硬件
 DocType: Attendance,HR Manager,人力資源經理
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,特權休假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,特權休假
 DocType: Purchase Invoice,Supplier Invoice Date,供應商發票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,您需要啟用購物車
-apps/frappe/frappe/public/js/frappe/form/grid_body.html +6,No Data,無數據
 DocType: Appraisal Template Goal,Appraisal Template Goal,考核目標模板
 DocType: Salary Slip,Earning,盈利
 DocType: Payment Tool,Party Account Currency,黨的賬戶幣種
@@ -1177,26 +1090,23 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,存在重疊的條件：
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,食物
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +38,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +139,You can make a time log only against a submitted production order,您只能對已提交的生產訂單進行時間記錄
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
-DocType: File,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.",通訊，聯繫人，線索。
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,作業不能留空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +360,Operations cannot be left blank.,作業不能留空。
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-DocType: DocField,Description,描述
 DocType: Authorization Rule,Average Discount,平均折扣
-DocType: Letter Head,Is Default,是預設
 DocType: Address,Utilities,公用事業
 DocType: Purchase Invoice Item,Accounting,會計
 DocType: Features Setup,Features Setup,功能設置
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,查看錄取通知書
-DocType: Communication,Communication,通訊
 DocType: Item,Is Service Item,是服務項目
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +81,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +31,Please select Fiscal Year,請選擇會計年度
 apps/erpnext/erpnext/controllers/buying_controller.py +23,From {0} | {1} {2},從{0} | {1} {2}
@@ -1215,7 +1125,7 @@
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +213,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +499,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/controllers/accounts_controller.py +517,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +182,Max: {0},最大數量：{0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
@@ -1225,7 +1135,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +471,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +543,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/stock/doctype/item/item.py +557,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Slip Deduction,Depends on Leave Without Pay,依賴於無薪休假
@@ -1239,30 +1149,27 @@
 DocType: HR Settings,Employee Settings,員工設置
 ,Batch-Wise Balance History,間歇式平衡歷史
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,待辦事項列表
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,負數量是不允許
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,學徒
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,負數量是不允許
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",從項目主檔獲取的稅務詳細資訊表，成為字串並存儲在這欄位。用於稅賦及費用
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Lancing,採血
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/controllers/accounts_controller.py +435,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +453,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +43,No active Salary Structure found for employee {0} and the month,發現員工{0}，而該月沒有活動的薪酬結構
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
 apps/erpnext/erpnext/config/accounts.py +112,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/public/js/setup_wizard.js +381,We buy this Item,我們買這個項目
 DocType: Address,Billing,計費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Flanging,翻邊
-DocType: Bulk Email,Not Sent,未發送
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Explosive forming,爆炸成形
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
 DocType: Shipping Rule,Shipping Account,送貨帳戶
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,原定發送到{0}受助人
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,子組件
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Sub Assemblies,子組件
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Supplier,Stock Manager,庫存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
@@ -1272,105 +1179,96 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,尚未新增地址。
 DocType: Workstation Working Hour,Workstation Working Hour,工作站工作時間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,分析人士
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +202,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,分析人士
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +149,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},行{0}：分配量{1}必須小於或等於合資量{2}
 DocType: Item,Inventory,庫存
 DocType: Features Setup,"To enable ""Point of Sale"" view",為了讓觀“銷售點”
 apps/erpnext/erpnext/public/js/pos/pos.js +402,Payment cannot be made for empty cart,無法由空的購物車產生款項
 DocType: Item,Sales Details,銷售詳細資訊
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Pinning,鋼釘
 DocType: Opportunity,With Items,隨著項目
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,在數量
 DocType: Notification Control,Expense Claim Rejected,費用索賠被拒絕
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",在這接下來的發票將生成的日期。它在提交生成。
 DocType: Item Attribute,Item Attribute,項目屬性
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,政府
-apps/erpnext/erpnext/config/stock.py +268,Item Variants,項目變體
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,政府
+apps/erpnext/erpnext/config/stock.py +263,Item Variants,項目變體
 DocType: Company,Services,服務
-apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),總計（{0}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +151,Total ({0}),總計（{0}）
 DocType: Cost Center,Parent Cost Center,父成本中心
 DocType: Sales Invoice,Source,源
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +186,No records found in the Payment table,沒有在支付表中找到記錄
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,財政年度開始日期
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +133,No records found in the Payment table,沒有在支付表中找到記錄
+apps/erpnext/erpnext/public/js/setup_wizard.js +153,Financial Year Start Date,財政年度開始日期
 DocType: Employee External Work History,Total Experience,總經驗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Countersinking,擴孔
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +271,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +276,Packing Slip(s) cancelled,包裝單（ S）已取消
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,貨運代理費
 DocType: Material Request Item,Sales Order No,銷售訂單號
 DocType: Item Group,Item Group Name,項目群組名稱
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +50,Taken,拍攝
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +66,Transfer Materials for Manufacture,轉移製造材料
 DocType: Pricing Rule,For Price List,對於價格表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Executive Search,獵頭
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,獵頭
 apps/erpnext/erpnext/stock/stock_ledger.py +405,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.",購買率的項目：{0}沒有找到，這是需要預訂會計分錄（費用）。請註明項目價格對買入價格表。
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +537,Error: {0} > {1},錯誤： {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +628,Error: {0} > {1},錯誤： {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,客戶>客戶群組>領地
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
 DocType: Time Log Batch Detail,Time Log Batch Detail,時間日誌批量詳情
-DocType: Workflow State,Tasks,任務
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
-DocType: Event,Tuesday,星期二
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
 ,Accounts Receivable Summary,應收賬款匯總
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +43,Leaves for type {0} already allocated for Employee {1} for period {2} - {3},葉為已分配給員工{1}的期間類型{0} {2}  -  {3}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +187,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
-DocType: Top Bar Item,Target,目標
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,貢獻金額
 DocType: Sales Invoice,Shipping Address,送貨地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可幫助您更新或修復系統中的庫存數量和價值。它通常被用於同步系統值和實際存在於您的倉庫。
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,送貨單一被儲存，就會顯示出來。
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,品牌主檔。
-DocType: ToDo,Due Date,到期日
+apps/erpnext/erpnext/config/stock.py +115,Brand master.,品牌主檔。
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,轉運詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,箱
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,本組織
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Box,箱
+apps/erpnext/erpnext/public/js/setup_wizard.js +137,The Organization,本組織
 DocType: Monthly Distribution,Monthly Distribution,月度分佈
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,收受方列表為空。請創建收受方列表
 DocType: Production Plan Sales Order,Production Plan Sales Order,生產計劃銷售訂單
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +113,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行：{1}
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Notching,開槽
 apps/erpnext/erpnext/config/learn.py +167,Material Request to Purchase Order,材料要求採購訂單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +74,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,銀行帳戶
 ,Bank Reconciliation Statement,銀行對帳表
 DocType: Address,Lead Name,鉛名稱
 ,POS,POS
-apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/config/stock.py +268,Opening Stock Balance,期初存貨餘額
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,{0} must appear only once,{0}必須只出現一次
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +334,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +62,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +552,Manufacturing Quantity is mandatory,生產數量是必填的
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in bank,數額沒有反映在銀行
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Amounts not reflected in bank,數額沒有反映在銀行
 DocType: Quality Inspection Reading,Reading 4,4閱讀
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,索賠費用由公司負責。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Centrifugal casting,離心鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Magnetic field-assisted finishing,磁場輔助整理
 DocType: Company,Default Holiday List,預設假日表列
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,現貨負債
 DocType: Purchase Receipt,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯繫手機號碼
 DocType: Production Planning Tool,Select Sales Orders,選擇銷售訂單
 ,Material Requests for which Supplier Quotations are not created,對該供應商報價的材料需求尚未建立
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +117,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
 DocType: Features Setup,To track items using barcode. You will be able to enter items in Delivery Note and Sales Invoice by scanning barcode of item.,要使用條形碼跟踪項目。您將能夠通過掃描物品條碼，進入交貨單和銷售發票的項目。
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Mark as Delivered,標記為交付
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +588,Mark as Delivered,標記為交付
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,請報價
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +300,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +310,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +155,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試規劃X天行動提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 DocType: SMS Center,Receiver List,收受方列表
@@ -1378,31 +1276,27 @@
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/public/js/pos/pos.js +491,{0} View,{0}查看
 DocType: Salary Structure Deduction,Salary Structure Deduction,薪酬結構演繹
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +158,Selective laser sintering,選擇性激光燒結
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +108,Import Successful!,導入成功！
+apps/erpnext/erpnext/stock/doctype/item/item.py +305,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Quantity must not be more than {0},數量必須不超過{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +41,Age (Days),時間（天）
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Account,Account Name,帳戶名稱
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +41,From Date cannot be greater than To Date,起始日期不能大於結束日期
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,起始日期不能大於結束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,序列號{0}的數量量{1}不能是分數
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,新增
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 apps/erpnext/erpnext/controllers/stock_controller.py +247,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制器
 DocType: Delivery Note,Vehicle Dispatch Date,車輛調度日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +197,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +202,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.",設置網上購物車，如航運規則，價格表等
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,安裝完成
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +65,{0}% Billed,{0}％已開立帳單
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +17,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Human Resources,人力資源
 DocType: Lead,Upper Income,高收入
 DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
 apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,我的問題
@@ -1411,12 +1305,9 @@
 DocType: Company,Default Values,默認值
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +236,Row {0}: Payment amount can not be negative,行{0}：付款金額不能為負
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,Press fitting,按擬合
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +64,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
 DocType: Payment Reconciliation,Payments,付款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Hot isostatic pressing,熱等靜壓
-DocType: ToDo,Medium,中
 DocType: Budget Detail,Budget Allocated,預算分配
 DocType: Journal Entry,Entry Type,條目類型
 ,Customer Credit Balance,客戶信用平衡
@@ -1425,12 +1316,9 @@
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
 DocType: Quotation,Term Details,長期詳情
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量規劃的期限（天）
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
 DocType: Warranty Claim,Warranty Claim,保修索賠
 ,Lead Details,鉛詳情
-DocType: Authorization Rule,Approving User,批准用戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Forging,鍛造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Plating,電鍍
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
 DocType: Bank Reconciliation,From Date,從日期
@@ -1452,64 +1340,62 @@
 DocType: Sales Invoice,Paid Amount (Company Currency),支付的金額（公司貨幣）
 DocType: Purchase Invoice,Additional Discount,更多優惠
 DocType: Selling Settings,Selling Settings,銷售設置
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Online Auctions,網上拍賣
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,網上拍賣
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory",公司、月分與財務年度是必填的
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +185,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,該產品的一個單元。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +212,Time Log Batch {0} must be 'Submitted',時間日誌批量{0}必須是'提交'
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +384,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +386,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/public/js/setup_wizard.js +169,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
 DocType: Address,Postal,郵政
 DocType: Item,Weightage,權重
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Mining,礦業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Resin casting,樹脂澆注
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +91,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +147,Please select {0} first.,請先選擇{0}。
-apps/erpnext/erpnext/templates/pages/order.html +57,text {0},文字{0}
+apps/erpnext/erpnext/templates/pages/order.html +56,text {0},文字{0}
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
 DocType: Stock Entry,Material Receipt,收料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +373,Products,產品
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +47,Party Type and Party is required for Receivable / Payable account {0},黨的類型和黨的需要應收/應付帳戶{0}
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此項目已變種，那麼它不能在銷售訂單等選擇
 DocType: Lead,Next Contact By,下一個聯絡人由
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +210,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Quotation,Order Type,訂單類型
 DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
 DocType: Payment Tool,Find Invoices to Match,查找發票到匹配
 ,Item-wise Sales Register,項目明智的銷售登記
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""",例如“XYZ國家銀行“
+apps/erpnext/erpnext/public/js/setup_wizard.js +147,"e.g. ""XYZ National Bank""",例如“XYZ國家銀行“
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Target,總目標
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Target,總目標
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.js +22,Shopping Cart is enabled,購物車啟用
 DocType: Job Applicant,Applicant for a Job,申請人作業
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +173,No Production Orders created,沒有創建生產訂單
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,員工{0}於本月的工資單已經創建
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +145,Salary Slip of employee {0} already created for this month,員工{0}於本月的工資單已經創建
 DocType: Stock Reconciliation,Reconciliation JSON,JSON對賬
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
 DocType: Sales Invoice Item,Batch No,批號
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
 apps/erpnext/erpnext/setup/doctype/company/company.py +152,Main,主頁
-DocType: DocPerm,Delete,刪除
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +13,Variant,變種
-apps/frappe/frappe/public/js/frappe/form/toolbar.js +165,New {0},新的{0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +164,Stopped order cannot be cancelled. Unstop to cancel.,已停止訂單無法取消。 撤銷停止再取消。
+apps/erpnext/erpnext/stock/doctype/item/item.py +327,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +458,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +545,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +111,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +127,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,貢獻合計淨
 DocType: Sales Invoice Item,Customer's Item Code,客戶的產品編號
 DocType: Stock Reconciliation,Stock Reconciliation,庫存調整
@@ -1518,53 +1404,48 @@
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,申請職位
 DocType: Purchase Order Item,Warehouse and Reference,倉庫及參考
 DocType: Supplier,Statutory info and other general information about your Supplier,供應商的法定資訊和其他一般資料
-DocType: Country,Country,國家
 apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,地址
-DocType: Communication,Received,收到
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},重複的序列號輸入的項目{0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,為航運規則的條件
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,項目是不允許有生產訂單。
-DocType: DocField,Attach Image,附上圖片
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
-DocType: Stock Reconciliation Item,Leave blank if no change,離開，如果沒有變化的空白
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,時間日誌製造。
 DocType: Item,Apply Warehouse-wise Reorder Level,適用於倉庫明智的重新排序水平
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,時間日誌中的任務。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +474,Payment,付款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +561,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。 
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。
 DocType: Employee,Salutation,招呼
-DocType: Communication,Rejected,拒絕
 DocType: Pricing Rule,Brand,品牌
 DocType: Item,Will also apply for variants,同時將申請變種
 apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Sales Order Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +612,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +363,"List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
 DocType: Hub Settings,Hub Node,樞紐節點
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您輸入重複的項目。請糾正，然後再試一次。
 apps/erpnext/erpnext/controllers/item_variant.py +65,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values,值{0}的屬性{1}不在有效的項目列表存在屬性值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Associate,關聯
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,過期
 DocType: Packing Slip,To Package No.,以包號
-DocType: DocType,System,系統
 DocType: Warranty Claim,Issue Date,發行日期
 DocType: Activity Cost,Activity Cost,活動費用
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消耗的數量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Telecommunications,電信
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,電信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
 DocType: Payment Tool,Make Payment Entry,製作付款分錄
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +119,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
 ,Sales Invoice Trends,銷售發票趨勢
 DocType: Leave Application,Apply / Approve Leaves,申請/審批葉
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,對於
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
 DocType: Stock Settings,Allowance Percent,津貼百分比
@@ -1576,33 +1457,28 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
 DocType: Purchase Order Item,Supplier Quotation Item,供應商報價項目
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +27,Make Salary Structure,製作薪酬結構
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Shearing,剪毛
 DocType: Item,Has Variants,有變種
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +22,Click on 'Make Sales Invoice' button to create a new Sales Invoice.,單擊“製作銷售發票”按鈕來創建一個新的銷售發票。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +166,Packaging and labeling,包裝和標籤
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,請在公司主檔及全域性預設值指定預設貨幣
-DocType: Dropbox Backup,Dropbox Access Secret,Dropbox的訪問秘密
 DocType: Purchase Invoice,Recurring Invoice,經常性發票
 apps/erpnext/erpnext/config/projects.py +79,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget Detail,Fiscal Year,財政年度
 DocType: Cost Center,Budget,預算
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,實現
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,實現
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,區域/客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,例如5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +207,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,e.g. 5,例如5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +154,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,銷售發票一被儲存，就會顯示出來。
 DocType: Item,Is Sales Item,是銷售項目
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,由於生產訂單可以為這個項目， \作
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項{0}不是設置為序列號檢查項目主
 DocType: Maintenance Visit,Maintenance Time,維護時間
 ,Amount to Deliver,量交付
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,產品或服務
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +158,There were errors.,有錯誤。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Tapping,竊聽
+apps/erpnext/erpnext/public/js/setup_wizard.js +371,A Product or Service,產品或服務
 DocType: Naming Series,Current Value,當前值
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +171,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
@@ -1617,15 +1493,15 @@
 apps/erpnext/erpnext/accounts/party.py +275,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
 DocType: Website Item Group,Website Item Group,網站項目群組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Material Request Item,Material Request Item,物料需求項目
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,項目群組樹。
+apps/erpnext/erpnext/config/stock.py +98,Tree of Item Groups.,項目群組樹。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +100,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,項目明智的購買歷史
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,紅
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Red,紅
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開啟生產訂單
@@ -1635,12 +1511,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +191,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成的成品{2}在生產數量訂單{3}。請通過時間日誌更新運行狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
-apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,更改品項的計量單位。
 DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
 DocType: Item Attribute,Attribute Name,屬性名稱
 apps/erpnext/erpnext/controllers/selling_controller.py +236,Item {0} must be Sales or Service Item in {1},項{0}必須在銷售或服務項目{1}
 DocType: Item Group,Show In Website,顯示在網站
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,組
+apps/erpnext/erpnext/public/js/setup_wizard.js +372,Group,組
 DocType: Task,Expected Time (in hours),預期時間（以小時計）
 ,Qty to Order,訂購數量
 DocType: Features Setup,"To track brand name in the following documents Delivery Note, Opportunity, Material Request, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Sales Invoice, Product Bundle, Sales Order, Serial No",在下列文件送貨單，機遇，材料要求，項目，採購訂單，採購憑證，買方收貨，報價單，銷售發票，產品捆綁，銷售訂單，序列號跟踪名牌
@@ -1649,78 +1524,67 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: Features Setup,Brands,品牌
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +480,From Purchase Order,從採購訂單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +567,From Purchase Order,從採購訂單
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客戶的地址和聯繫方式
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,沒有設置
-DocType: Communication,Date,日期
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +651,Sit tight while your system is being setup. This may take a few moments.,坐好囉！您的系統正在安裝。這可能需要一些時間。
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +51,{0} ({1}) must have role 'Expense Approver',{0}（{1}）必須有權限 “費用審批”
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,對
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Pair,對
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
 DocType: Delivery Note,Excise Page Number,消費頁碼
 DocType: Employee,Personal Details,個人資料
 ,Maintenance Schedules,保養時間表
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Embossing,壓花
 ,Quotation Trends,報價趨勢
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +139,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +302,Debit To account must be a Receivable account,借記帳戶必須是應收賬款
-apps/erpnext/erpnext/stock/doctype/item/item.py +304,"As Production Order can be made for this item, it must be a stock item.",由於生產訂單可以為這個項目提出，它必須是一個股票項目。
 DocType: Shipping Rule Condition,Shipping Amount,航運量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Joining,加盟
-DocType: Authorization Rule,Above Value,上述值
 ,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
 DocType: Purchase Order,Delivered,交付
 apps/erpnext/erpnext/config/hr.py +160,Setup incoming server for jobs email id. (e.g. jobs@example.com),設置接收服務器的工作電子郵件ID 。 （例如jobs@example.com ）
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
 DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式
-DocType: Custom Field,Custom,自訂
 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Injection molding,注塑
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,樹finanial帳戶。
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +312,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,帳戶{0}的類型必須為“固定資產”作為項目{1}是一個資產項目
 DocType: HR Settings,HR Settings,人力資源設置
-apps/frappe/frappe/config/setup.py +130,Printing,列印
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +114,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +99,The day(s) on which you are applying for leave are holiday. You need not apply for leave.,在天在你申請許可的假期。你不需要申請許可。
-apps/frappe/frappe/public/js/frappe/misc/utils.js +110,and,和
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
 apps/erpnext/erpnext/setup/doctype/company/company.py +236,Abbr can not be blank or space,縮寫不能為空或空間
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Sports,體育
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,實際總計
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,單位
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.py +182,Please set Dropbox access keys in your site config,請在您的網站配置設定Dropbox的存取碼
+apps/erpnext/erpnext/public/js/setup_wizard.js +377,Unit,單位
 apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶獲得和忠誠度
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,您的財政年度結束於
+apps/erpnext/erpnext/public/js/setup_wizard.js +156,Your financial year ends on,您的財政年度結束於
 DocType: POS Profile,Price List,價格表
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}現在是預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +20,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
 apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,報銷
 DocType: Issue,Support,支持
-DocType: Authorization Rule,Approving Role,審批角色
 ,BOM Search,BOM搜索
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +176,Closing (Opening + Totals),截止（開標+總計）
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,請公司指定的貨幣
 DocType: Workstation,Wages per hour,時薪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.",顯示／隱藏功能。如序列號， POS等
-apps/erpnext/erpnext/controllers/accounts_controller.py +236,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
+apps/erpnext/erpnext/controllers/accounts_controller.py +254,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +53,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},清拆日期不能行檢查日期前{0}
 DocType: Salary Slip,Deduction,扣除
 DocType: Address Template,Address Template,地址模板
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +128,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
@@ -1732,76 +1596,68 @@
 DocType: Opportunity,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
 DocType: Quotation,Maintenance User,維護用戶
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Item {0} has already been returned,項{0}已被退回
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**財年**表示財政年度。所有的會計輸入項目和其他重大交易針對**財年**進行追蹤。
 DocType: Opportunity,Customer / Lead Address,客戶/鉛地址
+apps/erpnext/erpnext/stock/doctype/item/item.py +112,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,職位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,Job Description,職位描述
 DocType: Purchase Order Item,Qty as per Stock UOM,數量按庫存計量單位
-apps/frappe/frappe/model/rename_doc.py +343,Please select a valid csv file with data,請選擇有合格資料的csv檔案
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +92,Coating,塗層
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
 ,SO Qty,SO數量
-apps/erpnext/erpnext/accounts/doctype/account/account.py +155,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0}，因此你不能重新分配或修改倉庫
+apps/erpnext/erpnext/accounts/doctype/account/account.py +162,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse",Stock條目對倉庫存在{0}，因此你不能重新分配或修改倉庫
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Supplier Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,分裂送貨單成包。
-apps/erpnext/erpnext/hooks.py +84,Shipments,發貨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +29,Dip molding,浸成型
-DocType: Purchase Order,To be delivered to customer,要傳送給客戶
+apps/erpnext/erpnext/hooks.py +68,Shipments,發貨
+DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,時間日誌狀態必須被提交。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,序列號{0}不屬於任何倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,設置
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,Row # ,行＃
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
 DocType: Pricing Rule,Supplier,供應商
 DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
 apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,費用或差異帳戶是強制性的項目{0} ，因為它影響整個股票價值
-apps/erpnext/erpnext/controllers/accounts_controller.py +354,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
+apps/erpnext/erpnext/controllers/accounts_controller.py +372,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
 DocType: Employee,Bank Name,銀行名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,用戶{0}被禁用
 DocType: Leave Application,Total Leave Days,總休假天數
-DocType: Journal Entry Account,Credit in Account Currency,信用賬戶中的貨幣
 DocType: Email Digest,Note: Email will not be sent to disabled users,注：電子郵件將不會被發送到被禁用的用戶
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +355,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
-DocType: DocField,Name,名稱
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +211,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +104,Sales Order required for Item {0},所需的{0}項目銷售訂單
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +43,Amounts not reflected in system,量以不反映在系統
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +107,Sales Order required for Item {0},所需的{0}項目銷售訂單
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +50,Amounts not reflected in system,量以不反映在系統
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,他人
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +40,Others,他人
 apps/erpnext/erpnext/templates/includes/product_page.js +80,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
 DocType: POS Profile,Taxes and Charges,稅收和收費
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",產品或服務已購買，出售或持有的股票。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +94,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
-apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,已完成
-DocType: Web Form,Select DocType,選擇DocType
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +104,Broaching,拉床
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Banking,銀行業
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +38,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +283,New Cost Center,新的成本中心
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +297,New Cost Center,新的成本中心
 DocType: Bin,Ordered Quantity,訂購數量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""",例如「建設建設者工具“
+apps/erpnext/erpnext/public/js/setup_wizard.js +145,"e.g. ""Build tools for builders""",例如「建設建設者工具“
 DocType: Quality Inspection,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 DocType: Purchase Order Item,Reference Document Type,參考文檔類型
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +320,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/stock.py +283,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +278,Serialized Inventory,序列化庫存
 DocType: Activity Type,Default Billing Rate,默認計費率
 DocType: Time Log Batch,Total Billing Amount,總結算金額
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,應收賬款
@@ -1809,19 +1665,19 @@
 apps/erpnext/erpnext/config/selling.py +299,Sales Order to Payment,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +271,Time Logs created:,時間日誌創建：
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Employee,Blood Group,血型
 DocType: Purchase Invoice Item,Page Break,分頁符
 DocType: Production Order Operation,Pending,擱置
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +33,You cannot change default UOM of Variant. To change default UOM for Variant change default UOM of the Template,你不能改變變異的默認計量單位。要更改默認的計量單位為模板的變種改變默認的計量單位
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,辦公設備
 DocType: Purchase Invoice Item,Qty,數量
 DocType: Fiscal Year,Companies,企業
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Electronics,電子
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,電子
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,對維護期間
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,全日制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,全日制
 DocType: Purchase Invoice,Contact Details,聯繫方式
 DocType: C-Form,Received Date,接收日期
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.",如果您已經創建了銷售稅和費模板標準模板，選擇一個，然後點擊下面的按鈕。
@@ -1833,29 +1689,28 @@
 DocType: Job Applicant,Job Opening,開放職位
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,請選擇Incharge人的名字
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 DocType: Offer Letter,Offer Letter,報價函
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,生成物料需求（MRP）和生產訂單。
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,總開票金額
 DocType: Time Log,To Time,要時間
+DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +25,"To add child nodes, explore tree and click on the node under which you want to add more nodes.",要添加子節點，探索樹，然後單擊要在其中添加更多節點的節點上。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +102,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +228,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
 DocType: Production Order Operation,Completed Qty,完成數量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +116,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
 apps/erpnext/erpnext/stock/get_item_details.py +260,Price List {0} is disabled,價格表{0}被禁用
 DocType: Manufacturing Settings,Allow Overtime,允許加班
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}需要的產品序列號{1}。您所提供{2}。
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0}產品{1}需要的序號。您已提供{2}。
 DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值價格
 DocType: Item,Customer Item Codes,客戶項目代碼
 DocType: Opportunity,Lost Reason,失落的原因
 apps/erpnext/erpnext/config/accounts.py +68,Create Payment Entries against Orders or Invoices.,對訂單或發票建立付款分錄。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Welding,焊接
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +40,New Stock UOM is required,新的庫存計量單位是必需的
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +443,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +446,All items have already been invoiced,所有項目已開具發票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',請指定一個有效的“從案號”
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +287,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +301,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
 DocType: Project,External,外部
 DocType: Features Setup,Item Serial Nos,產品序列號
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
@@ -1865,15 +1720,13 @@
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,您的客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Compression molding,壓縮成型
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Your Customers,您的客戶
 DocType: Leave Block List Date,Block Date,封鎖日期
 DocType: Sales Order,Not Delivered,未交付
 ,Bank Clearance Summary,銀行結算摘要
 apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,產品編號>項目群組>品牌
 DocType: Appraisal Goal,Appraisal Goal,考核目標
-DocType: Event,Friday,星期五
 DocType: Time Log,Costing Amount,成本核算金額
 DocType: Process Payroll,Submit Salary Slip,提交工資單
 DocType: Salary Structure,Monthly Earning & Deduction,每月入息和扣除
@@ -1881,16 +1734,14 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,進口散裝
 DocType: Sales Partner,Address & Contacts,地址及聯繫方式
 DocType: SMS Log,Sender Name,發件人名稱
-DocType: Page,Title,標題
-apps/frappe/frappe/public/js/frappe/list/doclistview.js +418,Customize,客製化
 DocType: POS Profile,[Select],[選擇]
 DocType: SMS Log,Sent To,發給
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,做銷售發票
 DocType: Company,For Reference Only.,僅供參考。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +29,Invalid {0}: {1},無效的{0}：{1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},無效的{0}：{1}
 DocType: Sales Invoice Advance,Advance Amount,提前量
 DocType: Manufacturing Settings,Capacity Planning,容量規劃
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,“起始日期”是必需的
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,參考號碼
 DocType: Employee,Employment Details,就業資訊
 DocType: Employee,New Workplace,新工作空間
@@ -1905,7 +1756,7 @@
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
 DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,旅遊
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +41,Travel,旅遊
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
 DocType: Sales Invoice,Recurring,經常性
@@ -1913,23 +1764,21 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +489,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +576,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
 DocType: Purchase Invoice,Price List Currency,價格表貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
 DocType: Installation Note,Installation Note,安裝注意事項
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,添加稅賦
+apps/erpnext/erpnext/public/js/setup_wizard.js +298,Add Taxes,添加稅賦
 ,Financial Analytics,財務分析
 DocType: Quality Inspection,Verified By,認證機構
 DocType: Address,Subsidiary,副
 apps/erpnext/erpnext/setup/doctype/company/company.py +55,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
 DocType: Quality Inspection,Purchase Receipt No,採購入庫單編號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,保證金
-DocType: System Settings,In Hours,以小時為單位
 DocType: Process Payroll,Create Salary Slip,建立工資單
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Expected balance as per bank,預計結餘按銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Buffing,拋光
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +53,Expected balance as per bank,預計結餘按銀行
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),資金來源（負債）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +347,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
@@ -1942,15 +1791,13 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Sales Invoice,Mass Mailing,郵件群發
-DocType: Page,Standard,標準
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +176,Purchse Order number required for Item {0},項目{0}需要採購訂單號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +180,Purchse Order number required for Item {0},項目{0}需要採購訂單號
 apps/erpnext/erpnext/public/js/controllers/transaction.js +136,Show Payments,顯示支付
-apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +202,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
-apps/frappe/frappe/desk/page/backups/backups.html +13,Size,尺寸
+apps/erpnext/erpnext/controllers/buying_controller.py +236,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
 DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,製藥
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,建立客戶
@@ -1960,33 +1807,25 @@
 DocType: Quality Inspection Reading,Reading 9,9閱讀
 DocType: Supplier,Is Frozen,就是冰凍
 DocType: Buying Settings,Buying Settings,採購設定
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Mass finishing,質量精加工
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
 DocType: Upload Attendance,Attendance To Date,出席會議日期
 apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),設置接收服務器銷售的電子郵件ID 。 （例如sales@example.com ）
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Tool,Payment Account,付款帳號
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +713,Please specify Company to proceed,請註明公司以處理
-apps/frappe/frappe/public/js/frappe/model/indicator.js +30,Draft,草稿
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,補假
 DocType: Quality Inspection Reading,Accepted,接受的
-DocType: User,Female,女
-DocType: Journal Entry Account,Debit in Account Currency,借記卡賬戶中的貨幣
 apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
-DocType: Print Settings,Modern,現代
-DocType: Communication,Replied,回答
+apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},無效的參考{0} {1}
 DocType: Payment Tool,Total Payment Amount,總付款金額
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0}（{1}）不能大於計劃quanitity（{2}）的生產訂單{3}
-
-cannot be greater than planned quanitity in Production Order translates into
-不能大於生產訂單的計畫數量"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）不能大於計劃數量（{2}）生產訂單的{3}
 DocType: Shipping Rule,Shipping Rule Label,送貨規則標籤
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Raw Materials cannot be blank.,原材料不能為空。
 DocType: Newsletter,Test,測試
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"As there are existing stock transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +368,"As there are existing stock transactions for this item, \
 							you can not change the values of 'Has Serial No', 'Has Batch No', 'Is Stock Item' and 'Valuation Method'",由於有存量交易為這個項目，\你不能改變的值&#39;有序列號&#39;，&#39;有批號&#39;，&#39;是股票項目“和”評估方法“
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +448,Quick Journal Entry,快速日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +100,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
 DocType: Employee,Previous Work Experience,以前的工作經驗
 DocType: Stock Entry,For Quantity,對於數量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +157,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
@@ -1994,17 +1833,17 @@
 apps/erpnext/erpnext/config/stock.py +18,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目創建獨立的生產訂單。
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +18,Complete Setup,完成安裝
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +121,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
 apps/erpnext/erpnext/config/crm.py +96,Newsletter Mailing List,時事通訊錄
 DocType: Delivery Note,Transporter Name,轉運名稱
+DocType: Authorization Rule,Authorized Value,授權值
 DocType: Contact,Enter department to which this Contact belongs,輸入聯繫屬於的部門
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Absent,共缺席
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +746,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,計量單位
+apps/erpnext/erpnext/config/stock.py +104,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結日
 DocType: Task Depends On,Task Depends On,任務取決於
 DocType: Lead,Opportunity,機會
@@ -2025,16 +1864,15 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
 DocType: SMS Log,No of Requested SMS,無的請求短信
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Piercing,沖孔
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
 DocType: Customer Group,Has Child Node,有子節點
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +332,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",在這裡輸入靜態URL參數（如稱發件人= ERPNext，用戶名= ERPNext，密碼= 1234等）
 apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不在任何現有的會計年度。詳情查看{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個示例網站從ERPNext自動生成
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,這是一個示例網站從ERPNext自動生成
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,老齡範圍1
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Photochemical machining,光化學加工
 DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -2076,11 +1914,9 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
  10。添加或扣除：無論你是想增加或扣除的稅。"
-DocType: Note,Note,注釋
 DocType: Purchase Receipt Item,Recd Quantity,RECD數量
-DocType: Email Account,Email Ids,電子郵件ID
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +104,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +471,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +477,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
@@ -2088,40 +1924,36 @@
 DocType: Journal Entry,Credit Note,信用票據
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +221,Completed Qty cannot be more than {0} for operation {1},完成數量不能超過{0}操作{1}
 DocType: Features Setup,Quality,品質
-DocType: Contact Us Settings,Introduction,介紹
 DocType: Warranty Claim,Service Address,服務地址
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,庫存調整最多100行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,庫存調整最多100行。
 DocType: Stock Entry,Manufacture,製造
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +63,Clearance Date not mentioned,清拆日期未提及
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,生產
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,清拆日期未提及
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Production,生產
 DocType: Item,Allow Production Order,允許生產訂單
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
 DocType: Installation Note Item,Installed Qty,安裝數量
 DocType: Lead,Fax,傳真
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/frappe/frappe/public/js/frappe/model/indicator.js +43,Submitted,提交
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 apps/erpnext/erpnext/utilities/doctype/address/address.py +113,My Addresses,我的地址
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +237, or ,或
+apps/erpnext/erpnext/controllers/accounts_controller.py +255, or ,或
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,90-Above,90以上
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
-,Download Backups,下載備份
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,付款類型
 DocType: Process Payroll,Select Employees,選擇僱員
 DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
-apps/frappe/frappe/public/js/frappe/form/footer/timeline_item.html +39,Details,詳細資訊
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
 DocType: Employee,Emergency Contact,緊急聯絡人
 DocType: Item,Quality Parameters,質量參數
@@ -2136,6 +1968,7 @@
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +113,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +119,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
@@ -2143,33 +1976,28 @@
 DocType: Bin,Reserved Quantity,保留數量
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +62,Cutting,切割
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Flattening,壓扁
 DocType: Account,Income Account,收入帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Molding,模
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +632,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
 DocType: Item Reorder,Material Request Type,材料需求類型
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +84,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
-apps/frappe/frappe/desk/moduleview.py +61,Documents,文件
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
 DocType: Cost Center,Cost Center,成本中心
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,憑證＃
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證＃
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
 DocType: Upload Attendance,Upload HTML,上傳HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +409,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","預付款總額（{0}）反對令{1}不能大於\
 比總計（{2}）"
 DocType: Employee,Relieving Date,解除日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類／百分比
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,營銷和銷售主管
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,所得稅
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Laser engineered net shaping,激光直接成型
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,營銷和銷售主管
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,所得稅
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +15,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選擇的定價規則是由為'價格'，它將覆蓋價目表。定價規則價格是最終價格，所以沒有進一步的折扣應適用。因此，在像銷售訂單，採購訂單等交易，這將是“速度”字段進賬，而不是“價格單率”字段。
 apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
@@ -2177,10 +2005,9 @@
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +643,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,所有地址。
 DocType: Company,Stock Settings,庫存設定
-DocType: User,Bio,生物
-apps/erpnext/erpnext/accounts/doctype/account/account.py +194,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +201,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
 apps/erpnext/erpnext/config/crm.py +72,Manage Customer Group Tree.,管理客戶群組樹。
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +285,New Cost Center Name,新的成本中心名稱
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +299,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 apps/erpnext/erpnext/utilities/doctype/address/address.py +90,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,無預設的地址模板。請從設定＞列印與品牌＞地址模板 新增之。
 DocType: Appraisal,HR User,HR用戶
@@ -2192,31 +2019,25 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Extra Large,特大號
 ,Profit and Loss Statement,損益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Pressing,壓制
 DocType: Payment Tool Detail,Payment Tool Detail,支付工具的詳細資訊
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +474,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +459,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +480,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對股票入門{2}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +371,Local,當地
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),貸款及墊款（資產）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,債務人
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,大
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,無發現任何員工！
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Large,大
 DocType: C-Form Invoice Detail,Territory,領土
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,請註明無需訪問
 DocType: Purchase Order,Customer Address Display,客戶地址顯示
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,Polishing,拋光
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,"Default Unit of Measure for Item {0} cannot be changed directly because \
-			you have already made some transaction(s) with another UOM. To change default UOM, \
-			use 'UOM Replace Utility' tool under Stock module.",測度項目的默認單位{0}不能直接改變，因為\你已經做了一些交易（S）與其他計量單位。要更改默認的計量單位，\使用“計量單位更換工具”下的股票模塊工具。
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +146,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +141,Quotation {0} is cancelled,{0}報價被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,未償還總額
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,員工{0}於{1}休假。不能標記考勤。
 DocType: Sales Partner,Targets,目標
@@ -2224,14 +2045,13 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
 DocType: Production Order Operation,Make Time Log,讓時間日誌
+apps/erpnext/erpnext/stock/doctype/item/item.py +382,Please set reorder quantity,請設置再訂購數量
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,電腦
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Electro-chemical grinding,電化學磨
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,開始會計分錄前，請設定您的會計科目表
 DocType: Purchase Invoice,Ignore Pricing Rule,忽略定價規則
-apps/frappe/frappe/public/js/frappe/model/indicator.js +34,Cancelled,註銷
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,從薪酬結構日期不能高於員工加入日期較小。
 DocType: Employee Education,Graduate,畢業生
 DocType: Leave Block List,Block Days,封鎖天數
@@ -2268,7 +2088,6 @@
 DocType: Sales Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date",檢查經常性發票，取消，停止經常性或將適當的結束日期
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
-apps/frappe/frappe/model/rename_doc.py +348,Maximum {0} rows allowed,最多允許{0}列
 DocType: C-Form Invoice Detail,Net Total,總淨值
 DocType: Bin,FCFS Rate,FCFS率
 apps/erpnext/erpnext/accounts/page/pos/pos.js +15,Billing (Sales Invoice),計費（銷售發票）
@@ -2285,20 +2104,19 @@
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +103,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +67,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Electrochemical machining,電化學加工
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +66,No Remarks,暫無產品說明
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收，但不付款
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
+apps/erpnext/erpnext/accounts/doctype/account/account.py +80,Root Account must be a group,根帳戶必須是一組
+DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Features Setup,Sales and Purchase,買賣
 DocType: Supplier Quotation Item,Material Request No,材料需求編號
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +218,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +221,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +107,{0} has been successfully unsubscribed from this list.,{0}已經從這個清單退訂成功！
 DocType: Purchase Invoice Item,Net Rate (Company Currency),淨利率（公司貨幣）
-apps/frappe/frappe/templates/base.html +134,Added,添加
 apps/erpnext/erpnext/config/crm.py +81,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
@@ -2312,11 +2130,9 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,會計年度{0}未找到。
 DocType: Bank Reconciliation,Get Relevant Entries,獲取相關條目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +407,Accounting Entry for Stock,存貨的會計分錄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Coining,鑄幣
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/stock/doctype/item/item.py +423,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
-apps/frappe/frappe/desk/query_report.py +136,Total,總計
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
 DocType: Account,Root Type,root類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +84,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
@@ -2326,14 +2142,13 @@
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),稅額後，優惠金額（公司貨幣）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
 DocType: Quality Inspection,Quality Inspection,品質檢驗
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,超小
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Spray forming,噴射成形
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +458,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Extra Small,超小
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +545,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +191,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL或BS
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +535,Can only make payment against unbilled {0},只能使支付對未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +122,Commission rate cannot be greater than 100,佣金率不能大於100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,最低庫存水平
 DocType: Stock Entry,Subcontract,轉包
@@ -2344,42 +2159,39 @@
 DocType: Item,Manufacturer Part Number,製造商零件編號
 DocType: Production Order Operation,Estimated Time and Cost,估計時間和成本
 DocType: Bin,Bin,箱子
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Nosing,減噪
 DocType: SMS Log,No of Sent SMS,沒有發送短信
 DocType: Account,Company,公司
 DocType: Account,Expense Account,費用帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,顏色
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,軟件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Colour,顏色
 DocType: Maintenance Visit,Scheduled,預定
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 DocType: Purchase Invoice Item,Valuation Rate,估值率
 apps/erpnext/erpnext/stock/get_item_details.py +281,Price List Currency not selected,尚未選擇價格表貨幣
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {0}: Purchase Receipt {1} does not exist in above 'Purchase Receipts' table,項目行{0}：採購入庫{1}不在上述“採購入庫單”表中存在
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +134,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +145,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日誌
 DocType: Installation Note Item,Against Document No,對文件編號
 apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
-apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},請選擇{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +159,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,研究員
-apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +88,Update,更新
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,研究員
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +78,Please save the Newsletter before sending,請在發送之前保存信件
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,姓名或電子郵件是強制性
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,來料質量檢驗。
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +134,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +138,Root Type is mandatory,root類型是強制性的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Vibratory finishing,震盪整理
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
 DocType: Sales Invoice,Advertisement,廣告
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,試用期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Probationary Period,試用期
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有葉節點中允許交易
 DocType: Expense Claim,Expense Approver,費用審批
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
@@ -2387,55 +2199,51 @@
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
 apps/erpnext/erpnext/config/crm.py +53,Logs for maintaining sms delivery status,日誌維護短信發送狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Grinding,磨碎
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,Shrink wrapping,收縮包裝
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,Confirmed,確認
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,供應商>供應商類型
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +51,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
 apps/erpnext/erpnext/utilities/doctype/address/address.py +21,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Newspaper Publishers,報紙出版商
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +88,Smelting,熔煉
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
 DocType: Attendance,Attendance Date,考勤日期
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +103,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Address,Preferred Shipping Address,偏好的送貨地址
 DocType: Purchase Receipt Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
 DocType: Item,Valuation Method,估值方法
+apps/erpnext/erpnext/setup/utils.py +88,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
 DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,重複的條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重複的條目
 DocType: Serial No,Under Warranty,在保修期
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +414,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
 ,Employee Birthday,員工生日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +55,Venture Capital,創業投資
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,序列號{0}不存在
 DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
-apps/erpnext/erpnext/hooks.py +70,Orders,訂單
+apps/erpnext/erpnext/hooks.py +54,Orders,訂單
 DocType: Leave Control Panel,Employee Type,員工類型
 DocType: Employee Leave Approver,Leave Approver,休假審批人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Swaging,模鍛
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送製造
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
 ,Issued Items Against Production Order,發出對項目生產訂單
 DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Payment Tool,Payment Tool,支付工具
 DocType: Target Detail,Target Detail,目標詳細資訊
-DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已出帳物料的百分比(%)
+DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Invalid period,無效的時期
 DocType: Customer,Credit Limit,信用額度
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,交易的選擇類型
 DocType: GL Entry,Voucher No,憑證編號
@@ -2445,11 +2253,10 @@
 DocType: Customer,Address and Contact,地址和聯繫方式
 DocType: Customer,Last Day of the Next Month,下個月的最後一天
 DocType: Employee,Feedback,反饋
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +66,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
 apps/erpnext/erpnext/accounts/party.py +284,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：由於/參考日期由{0}天超過了允許客戶信用天（S）
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +621,Maint. Schedule,維護手冊。計劃
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Abrasive jet machining,磨料噴射加工
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +632,Maint. Schedule,維護手冊。計劃
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
-DocType: Website Settings,Website Settings,網站設置
 DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
 DocType: Activity Cost,Billing Rate,結算利率
 ,Qty to Deliver,數量交付
@@ -2460,20 +2267,19 @@
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/doctype/account/account.py +169,Root account can not be deleted,root帳號不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Root account can not be deleted,root帳號不能被刪除
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +75,Show Stock Entries,顯示Stock條目
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Reference #{0} dated {1},參考＃ {0}於{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +310,Reference #{0} dated {1},參考＃ {0}於{1}
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +13,Manage Addresses,管理地址
 DocType: Pricing Rule,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
-DocType: Communication,Phone,電話
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/public/js/account_tree_grid.js +50,Closing (Dr),關閉（Dr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +223,Closing (Dr),關閉（Dr）
 DocType: Contact,Passive,被動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
 apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,稅務模板賣出的交易。
@@ -2489,10 +2295,9 @@
 ,Billed Amount,帳單金額
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,獲取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +129,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,添加了一些樣本記錄
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +392,Add a few sample records,添加了一些樣本記錄
 apps/erpnext/erpnext/config/hr.py +210,Leave Management,離開管理
-DocType: Event,Groups,組
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,較低的收入
@@ -2501,40 +2306,37 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,快速幫助
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
 DocType: Features Setup,Sales Extras,額外銷售
-apps/erpnext/erpnext/accounts/utils.py +344,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +138,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+apps/erpnext/erpnext/accounts/utils.py +346,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0}預算帳戶{1}對成本中心{2}將超過{3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +147,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
 DocType: Warranty Claim,From Company,從公司
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,分鐘
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 ,Qty to Receive,未到貨量
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +61,Conversion factor cannot be in fractions,轉換係數不能在分數
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,你會用它來登入
+apps/erpnext/erpnext/public/js/setup_wizard.js +108,You will use it to Login,你會用它來登入
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
 apps/erpnext/erpnext/stock/doctype/item/item.py +37,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +99,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +93,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,銀行透支戶口
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,製作工資單
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,抵押貸款
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +3,Awesome Products,真棒產品
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +3,Awesome Products,真棒產品
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +189,Opening Balance Equity,期初餘額權益
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +80,Cannot approve leave as you are not authorized to approve leaves on Block Dates,不能批准休假，你無權在批准休假在被標記的日期
 DocType: Appraisal,Appraisal,評價
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Lost-foam casting,失模鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Drawing,圖紙
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +22,Date is repeated,日期重複
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +148,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +162,Leave approver must be one of {0},休假審批人必須是一個{0}
 DocType: Hub Settings,Seller Email,賣家電子郵件
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
 DocType: Workstation Working Hour,Start Time,開始時間
@@ -2548,12 +2350,11 @@
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
 DocType: BOM Operation,Hour Rate,小時率
 DocType: Stock Settings,Item Naming By,產品命名規則
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +642,From Quotation,從報價
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +655,From Quotation,從報價
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},另一個期末錄入{0}作出後{1}
 DocType: Production Order,Material Transferred for Manufacturing,物料轉倉用於製造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,帳戶{0}不存在
 DocType: Purchase Receipt Item,Purchase Order Item No,採購訂單編號
-DocType: System Settings,System Settings,系統設置
 DocType: Project,Project Type,專案類型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,各種活動的費用
@@ -2562,36 +2363,32 @@
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,手頭現金
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +72,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +119,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
 DocType: Serial No,Is Cancelled,被註銷
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +281,My Shipments,我的出貨量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +286,My Shipments,我的出貨量
 DocType: Journal Entry,Bill Date,帳單日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +43,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
 DocType: Supplier,Supplier Details,供應商詳細資訊
-DocType: Communication,Recipients,受助人
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Screwing,擰
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Knurling,滾花
 DocType: Expense Claim,Approval Status,審批狀態
 DocType: Hub Settings,Publish Items to Hub,發布項目到集線器
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},來源值必須小於列{0}的值
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,電匯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +133,Wire Transfer,電匯
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,請選擇銀行帳戶
 DocType: Newsletter,Create and Send Newsletters,建立和發送簡訊
-apps/frappe/frappe/public/js/frappe/views/reports/grid_report.js +305,From Date must be before To Date,起始日期必須早於終點日期
 DocType: Sales Order,Recurring Order,經常訂購
 DocType: Company,Default Income Account,預設之收入帳戶
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,歡迎來到ERPNext
+,Welcome to ERPNext,歡迎來到ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,憑單詳細人數
 apps/erpnext/erpnext/config/crm.py +146,Lead to Quotation,導致報價
 DocType: Lead,From Customer,從客戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,電話
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Calls,電話
 DocType: Project,Total Costing Amount (via Time Logs),總成本核算金額（通過時間日誌）
 DocType: Purchase Order Item Supplied,Stock UOM,庫存計量單位
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Purchase Order {0} is not submitted,採購訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +198,Purchase Order {0} is not submitted,採購訂單{0}未提交
 ,Projected,預計
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},序列號{0}不屬於倉庫{1}
 apps/erpnext/erpnext/controllers/status_updater.py +136,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
@@ -2599,13 +2396,10 @@
 DocType: Issue,Opening Date,開幕日期
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +95,Boring,無聊
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,從銷售訂單
-DocType: Blog Category,Parent Website Route,父網站路由
 DocType: Sales Order,Not Billed,不發單
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,尚未新增聯絡人。
-apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,不活躍
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,到岸成本憑證金額
 DocType: Time Log,Batched for Billing,批量計費
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,由供應商提出的帳單。
@@ -2613,20 +2407,17 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +28,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,例如增值稅
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,e.g. VAT,例如增值稅
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
 DocType: Shopping Cart Settings,Quotation Series,報價系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +52,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +82,Hot metal gas forming,鐵水形成氣
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +36,"Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account (by clicking on Add Child) of type ""Tax"" and do mention the Tax rate.",轉到相應的群組（通常基金>流動負債>稅和關稅的來源，並新增一個新帳戶（通過點擊輸入“稅”添加兒童），做提稅率。
 ,Payment Period Based On Invoice Date,基於發票日的付款期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser cutting,激光切割
-DocType: Event,Monday,星期一
 DocType: Journal Entry,Stock Entry,存貨分錄
 DocType: Account,Payable,支付
 DocType: Salary Slip,Arrear Amount,欠款金額
@@ -2639,7 +2430,6 @@
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,其中，生產操作進行。
-DocType: Page,All,所有
 DocType: Stock Entry Detail,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
 DocType: Employee,Confirmation Date,確認日期
@@ -2647,9 +2437,8 @@
 DocType: Account,Sales User,銷售用戶
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細信息
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,集合
 DocType: Lead,Lead Owner,鉛所有者
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Warehouse is required,倉庫是必需的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +254,Warehouse is required,倉庫是必需的
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Time Log,Will be updated when billed.,計費時將被更新。
@@ -2663,44 +2452,40 @@
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,轉運資訊
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
+apps/erpnext/erpnext/public/js/setup_wizard.js +174,Company Name cannot be Company,公司名稱不能為公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,信頭的列印模板。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Superfinishing,超精研
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +85,Please pull items from Delivery Note,請送貨單拉項目
-apps/erpnext/erpnext/accounts/utils.py +268,Journal Entries {0} are un-linked,日記條目{0}都是非聯
+apps/erpnext/erpnext/accounts/utils.py +270,Journal Entries {0} are un-linked,日記條目{0}都是非聯
 apps/erpnext/erpnext/config/crm.py +37,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
 apps/erpnext/erpnext/accounts/general_ledger.py +134,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +242,Create New,新建立
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +248,Create New,新建立
 DocType: Buying Settings,Purchase Order Required,購貨訂單要求
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
 ,Purchase Analytics,採購分析
 DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
 DocType: Expense Claim,Task,任務
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Shaving,刮
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
 ,Stock Ledger,庫存總帳
-apps/erpnext/erpnext/templates/pages/order.html +59,Rate: {0},價格：{0}
+apps/erpnext/erpnext/templates/pages/order.html +58,Rate: {0},價格：{0}
 DocType: Salary Slip Deduction,Salary Slip Deduction,工資單上扣除
-apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,筆記
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +199,Select a group node first.,首先選擇一組節點。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +74,Purpose must be one of {0},目的必須是一個{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +108,Fill the form and save it,填寫表格，並將其保存
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,下載一個包含所有原料一份報告，他們最新的庫存狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Facing,面對
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,社區論壇
 DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
 DocType: SMS Center,Send SMS,發送短信
 DocType: Company,Default Letter Head,預設信頭
 DocType: Time Log,Billable,計費
-DocType: Authorization Rule,This will be used for setting rule in HR module,這將用於在人力資源模塊的設置規則
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reorder Qty,再訂購數量
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
@@ -2712,12 +2497,10 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +86,Opportunity Lost,失去的機會
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice",折扣欄位出現在採購訂單，採購入庫單，採購發票
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
-DocType: Report,Report Type,報告類型
-apps/frappe/frappe/core/doctype/user/user.js +130,Loading,載入中
 DocType: BOM Replace Tool,BOM Replace Tool,BOM替換工具
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,依據國家別啟發式的預設地址模板
 DocType: Sales Order Item,Supplier delivers to Customer,供應商提供給客戶
-apps/erpnext/erpnext/public/js/controllers/transaction.js +726,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/public/js/controllers/transaction.js +735,Show tax break-up,展會稅分手
 apps/erpnext/erpnext/accounts/party.py +287,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,數據導入和導出
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',如果您涉及製造活動。啟動項目「製造的」
@@ -2727,16 +2510,15 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
 DocType: Serial No,Out of AMC,出資產管理公司
 DocType: Purchase Order Item,Material Request Detail No,物料需求詳細說明編號
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Hard turning,硬車削
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,使維護訪問
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +187,Please contact to the user who have Sales Master Manager {0} role,請聯繫，誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
 apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +106,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +187,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Please enter 'Expected Delivery Date',請輸入「預定交付日」
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +182,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +373,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +9,"Note: If payment is not made against any reference, make Journal Entry manually.",注：如果付款不反對任何參考製作，手工製作日記條目。
 DocType: Item,Supplier Items,供應商項目
 DocType: Opportunity,Opportunity Type,機會型
@@ -2748,7 +2530,7 @@
 DocType: Hub Settings,Publish Availability,發布房源
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +200,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/controllers/accounts_controller.py +218,{0} '{1}' is disabled,{0}“{1}”被禁用
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,發送電子郵件的自動對提交的交易聯繫。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +232,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
@@ -2756,60 +2538,52 @@
 可用數量：{4}，轉讓數量：{5}"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
 DocType: Purchase Order,Customer Contact Email,客戶聯繫電子郵件
-DocType: Event,Sunday,星期天
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +455,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,職責
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +457,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Responsibilities,職責
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Template,模板
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,添加用戶
+apps/erpnext/erpnext/public/js/setup_wizard.js +270,Add Users,添加用戶
 DocType: Pricing Rule,Item Group,項目群組
 DocType: Task,Actual Start Date (via Time Logs),實際開始日期（通過時間日誌）
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
+apps/erpnext/erpnext/stock/doctype/item/item.py +344,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
 DocType: Item,Default BOM,預設的BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Decambering,Decambering
 apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,請確認重新輸入公司名稱
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Time Log Batch,Total Hours,總時數
 DocType: Journal Entry,Printing Settings,打印設置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +268,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Automotive,汽車
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +37,Item is required,項目是必需的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +25,Metal injection molding,金屬注射成型
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +258,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,從送貨單
 DocType: Time Log,From Time,從時間
 DocType: Notification Control,Custom Message,自定義訊息
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency",選擇國家時區和貨幣
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +369,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Pickling,酸洗
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Sand casting,砂型鑄造
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +117,Electroplating,電鍍
 DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,實習生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,實習生
 DocType: Newsletter,A Lead with this email id should exist,與此電子郵件id一個鉛應該存在
 DocType: Stock Entry,From BOM,從BOM
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,基本的
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,基本的
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',請點擊“生成表”
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +61,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
+apps/erpnext/erpnext/config/stock.py +105,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Structure,Salary Structure,薪酬結構
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +242,"Multiple Price Rule exists with same criteria, please resolve \
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +246,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","多次價格規則存在著同樣的標準，請解決衝突\
 通過分配優先級。價格規則：{0}"
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +493,Issue Material,發行材料
-DocType: Material Request Item,For Warehouse,對於倉庫
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +580,Issue Material,發行材料
+DocType: Material Request Item,For Warehouse,對於倉庫
 DocType: Employee,Offer Date,到職日期
 DocType: Hub Settings,Access Token,存取 Token
 DocType: Sales Invoice Item,Serial No,序列號
@@ -2817,45 +2591,37 @@
 DocType: Item,Is Fixed Asset Item,是固定資產項目
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
 DocType: Features Setup,"If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page",如果你有很長的列印格式，這個功能可以被用來分割要列印多個頁面，每個頁面上的所有頁眉和頁腳的頁
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Hobbing,滾齒機
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,所有的領土
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
 DocType: Fiscal Year,Year Name,今年名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +73,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
 DocType: Purchase Invoice Item,Image View,圖像查看
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Finishing & industrial finishing,精加工和精加工工業
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Drilling,鑽孔
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Blow molding,吹塑
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
 DocType: Tax Rule,Shipping City,航運市
 apps/erpnext/erpnext/stock/doctype/item/item.js +43,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,該項目是{0}（模板）的變體。屬性將被複製的模板，除非“不複製”設置
 DocType: Account,Purchase User,購買用戶
 DocType: Notification Control,Customize the Notification,自定義通知
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +87,Hammering,鍛造
-DocType: Web Page,Slideshow,連續播放
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +24,Default Address Template cannot be deleted,預設地址模板不能被刪除
 DocType: Sales Invoice,Shipping Rule,送貨規則
 DocType: Journal Entry,Print Heading,列印標題
 DocType: Quotation,Maintenance Manager,維護經理
-DocType: Workflow State,Search,搜索
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總計不能為零
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Brazing,銅焊
 DocType: C-Form,Amended From,從修訂
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +374,Raw Material,原料
 DocType: Leave Application,Follow via Email,通過電子郵件跟隨
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +174,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,無論是數量目標或目標量是必需的
-apps/erpnext/erpnext/stock/get_item_details.py +449,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +452,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Posting Date first,請選擇發布日期第一
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,發揚
@@ -2864,45 +2630,44 @@
 ,Produced,生產
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),提出（電子郵件）
-apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +72,General,一般
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,附加信
+apps/erpnext/erpnext/setup/setup_wizard/default_website.py +72,General,一般
+apps/erpnext/erpnext/public/js/setup_wizard.js +256,Attach Letterhead,附加信
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +542,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的頭稅（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將創建一個標準的模板，你可以編輯和多以後添加。
+apps/erpnext/erpnext/public/js/setup_wizard.js +299,"List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.",列出你的頭稅（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將創建一個標準的模板，你可以編輯和多以後添加。
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},序列號為必填項序列為{0}
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
-DocType: Blog Post,Blog Post,網誌文章
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
 apps/erpnext/erpnext/config/accounts.py +143,Enable / disable currencies.,啟用／禁用的貨幣。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,郵政費用
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Entertainment & Leisure,娛樂休閒
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Purchase Order,The date on which recurring order will be stop,上反复出現的訂單將被終止日期
 DocType: Quality Inspection,Item Serial No,產品序列號
 apps/erpnext/erpnext/controllers/status_updater.py +142,{0} must be reduced by {1} or you should increase overflow tolerance,{0}必須減少{1}或應增加超量容許度
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +57,Total Present,總現
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,小時
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Hour,小時
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +488,Transfer Material to Supplier,轉印材料供應商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +600,Transfer Material to Supplier,轉印材料供應商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +82,Create Quotation,建立報價
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +306,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +311,All these items have already been invoiced,所有這些項目已開具發票
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以通過{0}的批准
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
 DocType: Features Setup,Point of Sale,銷售點
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +83,Curling,冰壺
 DocType: Account,Tax,稅
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +28,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Refining,精製
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +37,Row {0}: {1} is not a valid {2},行{0}：{1}不是有效的{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +438,From Product Bundle,從產品包
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
 DocType: Quality Inspection,Report Date,報告日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Routing,路由
 DocType: C-Form,Invoices,發票
 DocType: Job Opening,Job Title,職位
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} - {3},{0}已分配給員工{1}的時期{2}  -  {3}
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +80,{0} Recipients,{0}收件人
 DocType: Features Setup,Item Groups in Details,產品群組之詳細資訊
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +335,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
@@ -2911,33 +2676,29 @@
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如：如果你下定100個單位量，而你的許可額度是10%，那麼你可以收到最多110個單位量。
 DocType: Pricing Rule,Customer Group,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +164,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Expense account is mandatory for item {0},交際費是強制性的項目{0}
 DocType: Item,Website Description,網站簡介
 DocType: Serial No,AMC Expiry Date,AMC到期時間
 ,Sales Register,銷售登記
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
 DocType: Address,Plant,廠
-DocType: DocType,Setup,設定
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,對於如1美元= 100美分
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +108,Summary for this month and pending activities,本月和待活動總結
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Cold rolling,冷軋
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,請選擇結轉，如果你還需要包括上一會計年度的資產負債葉本財年
 DocType: GL Entry,Against Voucher Type,對憑證類型
 DocType: Item,Attributes,屬性
-DocType: Packing Slip,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +485,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +191,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,最後訂購日期
-DocType: DocField,Image,圖像
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +179,Make Excise Invoice,使消費稅發票
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-DocType: Communication,Other,其他
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +146,Operation ID not set,操作ID沒有設定
 DocType: Production Order,Planned Start Date,計劃開始日期
 DocType: Serial No,Creation Document Type,創建文件類型
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Maint. Visit,維護手冊。訪
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +631,Maint. Visit,維護手冊。訪
 DocType: Leave Type,Is Encash,為兌現
 DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Payment Tool,Make Journal Entry,使日記帳分錄
@@ -2945,35 +2706,29 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +440,Commercial,商業
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +352,Commercial,商業
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +23,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 DocType: Cost Center,Distribution Id,分配標識
-apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
+apps/erpnext/erpnext/setup/setup_wizard/data/sample_home_page.html +14,Awesome Services,真棒服務
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,所有的產品或服務。
 DocType: Purchase Invoice,Supplier Address,供應商地址
-DocType: Contact Us Settings,Address Line 2,地址行2
-DocType: ToDo,Reference,參考
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Perforating,射孔
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
 apps/erpnext/erpnext/config/accounts.py +128,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +29,Series is mandatory,系列是強制性的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,Financial Services,金融服務
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
 apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +178,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
 DocType: Leave Allocation,Unused leaves,未使用的葉子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +145,Cr,鉻
 DocType: Customer,Default Receivable Accounts,預設應收帳款
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Sawing,鋸切
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Laminating,層壓
 DocType: Item Reorder,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +549,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +636,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
 apps/erpnext/erpnext/controllers/accounts_controller.py +101,Due Date is mandatory,截止日期是強制性的
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +143,Sintering,燒結
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Supplier,Contact HTML,聯繫HTML
@@ -2984,9 +2739,8 @@
 DocType: Company,Retail,零售
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +108,Customer {0} does not exist,客戶{0}不存在
 DocType: Attendance,Absent,缺席
-DocType: Product Bundle,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +471,Product Bundle,產品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,Row {0}: Invalid reference {1},行{0}：無效參考{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Crushing,破碎
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購置稅和費模板
 DocType: Upload Attendance,Download Template,下載模板
 DocType: GL Entry,Remarks,備註
@@ -2994,48 +2748,44 @@
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
 DocType: Features Setup,POS View,POS機查看
 apps/erpnext/erpnext/config/stock.py +38,Installation record for a Serial No.,對於一個序列號安裝記錄
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Continuous casting,連鑄
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
 DocType: Offer Letter,Awaiting Response,正在等待回應
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +53,Above,以上
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +80,Cold sizing,冷上漿
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} cannot be a Group,帳戶{0}不能為集團
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,區域
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +213,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,負面評價率是不允許的
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +216,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
-apps/erpnext/erpnext/accounts/utils.py +276,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0} 
+apps/erpnext/erpnext/accounts/utils.py +278,Please set default value {0} in Company {1},請在公司{1}下設定預設值{0}
 DocType: Serial No,Creation Time,創作時間
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,總收入
 DocType: Sales Invoice,Product Bundle Help,產品包幫助
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
 apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +467,Get Items from Product Bundle,獲取從產品捆綁項目
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} is inactive,帳戶{0}為未啟用
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
-apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +122,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
 DocType: Sales Team,Contact No.,聯絡電話
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
-DocType: Workflow State,Time,時間
 DocType: Features Setup,Sales Discounts,銷售折扣
 DocType: Hub Settings,Seller Country,賣家國家
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Apparel & Accessories,服裝及配飾
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服裝及配飾
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,訂購數量
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,指定條件來計算運費金額
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,新增子項目
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允許設定凍結帳戶和編輯凍結分錄的角色
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,不能成本中心轉換為總賬，因為它有子節點
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +47,Conversion Factor is required,轉換係數是必需的
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,序列號
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +87,Commission on Sales,銷售佣金
 DocType: Offer Letter Term,Value / Description,值/說明
@@ -3043,15 +2793,13 @@
 ,Customers Not Buying Since Long Time,客戶已久未購買
 DocType: Production Order,Expected Delivery Date,預計交貨日期
 apps/erpnext/erpnext/accounts/general_ledger.py +121,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Bulging,挺著
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Evaporative-pattern casting,蒸發圖案鑄造
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +190,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +61,Age,年齡
 DocType: Time Log,Billing Amount,開票金額
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,為項目指定了無效的數量{0} 。量應大於0 。
 apps/erpnext/erpnext/config/hr.py +18,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +172,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +99,Legal Expenses,法律費用
 DocType: Sales Order,"The day of the month on which auto order will be generated e.g. 05, 28 etc",該月的一天，在這汽車的訂單將產生如05，28等
 DocType: Sales Invoice,Posting Time,登錄時間
@@ -3065,47 +2813,41 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客戶收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/controllers/accounts_controller.py +259,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +47,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Honing,珩磨
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,緩刑
-apps/erpnext/erpnext/stock/doctype/item/item.py +258,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
-DocType: Feed,Full Name,全名
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Clinching,鉚
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,緩刑
+apps/erpnext/erpnext/stock/doctype/item/item.py +268,Default Warehouse is mandatory for stock Item.,預設倉庫對庫存項目是強制性的。
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +173,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
 ,Transferred Qty,轉讓數量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,規劃
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +137,Planning,規劃
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,做時間記錄批
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,發行
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額（通過時間日誌）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,我們賣這種產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +380,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,供應商編號
-DocType: Journal Entry,Cash Entry,"現金分錄
-"
+DocType: Journal Entry,Cash Entry,現金分錄
 DocType: Sales Partner,Contact Desc,聯繫倒序
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
 DocType: Email Digest,Send regular summary reports via Email.,通過電子郵件發送定期匯總報告。
 DocType: Brand,Item Manager,項目經理
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,在帳戶的年度預算中加入新一列。
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Quarrying,採石
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +160,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +163,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,所有聯繫人。
 DocType: Newsletter,Test Email Id,測試電子郵件Id
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,公司縮寫
+apps/erpnext/erpnext/public/js/setup_wizard.js +142,Company Abbreviation,公司縮寫
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,如果你遵循質量檢驗。使產品的質量保證要求和質量保證在沒有採購入庫單
 DocType: GL Entry,Party Type,黨的類型
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,原料不能同主品相
 DocType: Item Attribute Value,Abbreviation,縮寫
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Rotational molding,滾塑成型
 apps/erpnext/erpnext/config/hr.py +115,Salary template master.,薪資套版主檔。
 DocType: Leave Type,Max Days Leave Allowed,允許的最長休假天
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,購物車設置稅收規則
@@ -3119,15 +2861,15 @@
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +474,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/controllers/accounts_controller.py +492,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是強制性的。也許外幣兌換記錄為{1}到{2}尚未建立。
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +37,Tax Template is mandatory.,稅務模板是強制性的。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
 DocType: Account,Temporary,臨時
 DocType: Address,Preferred Billing Address,偏好的帳單地址
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,秘書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,秘書
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Pricing Rule,Buying,採購
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
@@ -3140,24 +2882,21 @@
 ,Item-wise Price List Rate,全部項目的價格表
 DocType: Purchase Order Item,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Ironing,熨衣服
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is stopped,{0} {1}已停止
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +356,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,增加運輸成本的規則。
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
-DocType: Letter Head,Letter Head,信頭
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +27,Quick Entry,快速入門
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的回報
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0}是強制性的退回
 DocType: Purchase Order,To Receive,接受
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink fitting,冷縮配合
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +281,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,收入／支出
 DocType: Employee,Personal Email,個人電子郵件
-apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,總方差
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +62,Total Variance,總方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Brokerage,佣金
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
 DocType: Address,Postal Code,郵政編碼
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","在分
@@ -3165,18 +2904,16 @@
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,發布生產訂單。
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +442,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Planing,刨
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +182,Standard Selling,標準銷售
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +113,Standard Selling,標準銷售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: BOM Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +314,{0} against Sales Invoice {1},{0}對銷售發票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 apps/erpnext/erpnext/stock/doctype/item/item.py +49,Please enter default Unit of Measure,請輸入預設的計量單位
 DocType: Purchase Invoice Item,Project Name,專案名稱
 DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
-DocType: Workflow State,Edit,編輯
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Features Setup,Item Batch Nos,項目批NOS
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
@@ -3184,13 +2921,11 @@
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
-DocType: Contact Us Settings,Pincode,PIN代碼
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +128,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM Replace Tool,The BOM which will be replaced,這將被替換的物料清單
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +43,New Stock UOM must be different from current stock UOM,全新庫存計量單位必須不同於目前的計量單位
 DocType: Account,Debit,借方
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +34,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Production Order,Operation Cost,運營成本
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,從。csv文件上傳考勤
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
@@ -3206,10 +2941,7 @@
 DocType: Project,Default Cost Center,預設的成本中心
 DocType: Purchase Invoice,End Date,結束日期
 DocType: Employee,Internal Work History,內部工作經歷
-DocType: DocField,Column Break,分欄符
-DocType: Event,Thursday,星期四
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Private Equity,私募股權投資
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Turning,車削
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
 DocType: Sales Invoice,Exhibition,展覽
@@ -3222,31 +2954,30 @@
 DocType: Employee,Held On,舉行
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生產項目
 ,Employee Information,僱員資料
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +309,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,額外費用
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,財政年度年結日
+apps/erpnext/erpnext/public/js/setup_wizard.js +155,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +484,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +571,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),降低盈利停薪留職（LWP）
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
+apps/erpnext/erpnext/public/js/setup_wizard.js +271,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +97,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +336,Note: {0},注： {0}
 ,Delivery Note Trends,送貨單趨勢
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,This Week's Summary,本週的總結
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +74,{0} must be a Purchased or Sub-Contracted Item in row {1},{0}必須是購買或分包項目中列{1}
 apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
 DocType: GL Entry,Party,黨
 DocType: Sales Order,Delivery Date,交貨日期
-DocType: DocField,Currency,貨幣
 DocType: Opportunity,Opportunity Date,機會日期
 DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
 DocType: Purchase Order,To Bill,發票待輸入
 DocType: Material Request,% Ordered,％有序
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,計件工作
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,計件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
 DocType: Employee,History In Company,公司歷史
@@ -3263,77 +2994,68 @@
 DocType: Opportunity,To Discuss,為了討論
 DocType: SMS Settings,SMS Settings,短信設置
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,臨時帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,黑
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
 DocType: Purchase Order,End date of current order's period,當前訂單的週期的最後一天
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,使錄取通知書
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
-apps/erpnext/erpnext/stock/doctype/item/item.py +500,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
-DocType: DocField,Fold,折
+apps/erpnext/erpnext/stock/doctype/item/item.py +514,Default Unit of Measure for Variant must be same as Template,測度變異的默認單位必須與模板
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
 DocType: Project Task,Pending Review,待審核
-apps/frappe/frappe/integrations/doctype/dropbox_backup/dropbox_backup.js +12,Please specify,請註明
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,客戶ID
-DocType: Page,Page Name,網頁名稱
 apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +110,To Time must be greater than From Time,到時間必須大於從時間
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +465,Sales Order {0} is not submitted,銷售訂單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +467,Sales Order {0} is not submitted,銷售訂單{0}未提交
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Spindle finishing,主軸整理
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""",例如“MC”
+apps/erpnext/erpnext/public/js/setup_wizard.js +143,"e.g. ""MC""",例如“MC”
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
 ,Sales Person-wise Transaction Summary,銷售人員相關的交易匯總
-DocType: System Settings,Time Zone,時區
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,倉庫{0}不存在
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,立即註冊ERPNext中心
 DocType: Monthly Distribution,Monthly Distribution Percentages,每月分佈百分比
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,所選項目不能批
-DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單 ％ 的物料已交貨
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Stapling,裝訂
+DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
 DocType: Customer,Customer Details,客戶詳細資訊
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Shaping,成型
 DocType: Employee,Reports to,隸屬於
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Sales Invoice,Paid Amount,支付的金額
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type 'Liability',關閉帳戶{0}必須是類型'責任'
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +89,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶，不允許設為信用帳戶
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
+apps/erpnext/erpnext/accounts/doctype/account/account.py +96,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借記帳戶，不允許設為信用帳戶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,品質管理
 DocType: Production Planning Tool,Filter based on customer,過濾器可根據客戶
 DocType: Payment Tool Detail,Against Voucher No,針對券無
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 DocType: Tax Rule,Purchase,採購
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,餘額數量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,餘額數量
 DocType: Item Group,Parent Item Group,父項目群組
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +96,Cost Centers,成本中心
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,倉庫。
+apps/erpnext/erpnext/config/stock.py +110,Warehouses.,倉庫。
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,供應商貨幣被換算成公司基礎貨幣的匯率
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：與排時序衝突{1}
 DocType: Opportunity,Next Contact,下一頁聯繫
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
 DocType: Employee,Notice (days),通告（天）
-DocType: Page,Yes,是的
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
 DocType: Employee,Encashment Date,兌現日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Electroforming,電鑄
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +179,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry",對憑證類型必須是採購訂單，採購發票或日記帳分錄
 DocType: Account,Stock Adjustment,庫存調整
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},默認情況下存在作業成本的活動類型 -  {0}
 DocType: Production Order,Planned Operating Cost,計劃運營成本
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +121,New {0} Name,新{0}名稱
-apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},隨函附上{0}＃{1}
+apps/erpnext/erpnext/controllers/recurring_document.py +125,Please find attached {0} #{1},隨函附上{0}＃{1}
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3346,7 +3068,6 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
 DocType: Item Variant Attribute,Attribute,屬性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +21,Please specify from/to range,請從指定/至範圍
-apps/frappe/frappe/public/js/frappe/model/model.js +18,Created By,建立者
 DocType: Serial No,Under AMC,在AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
 apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,銷售交易的預設設定。
@@ -3358,17 +3079,16 @@
 DocType: Payment Reconciliation,Minimum Amount,最低金額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,Update Finished Goods,更新成品
 DocType: Workstation,per hour,每小時
-apps/frappe/frappe/core/doctype/doctype/doctype.py +106,Series {0} already used in {1},系列{0}已經被應用在{1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/public/js/pos/pos.html +36,Amount Paid,已支付的款項
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,調度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,專案經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
 DocType: Customer,Default Taxes and Charges,默認稅費
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +268,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +263,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允許提交超過設定信用額度交易的。
 DocType: Sales Invoice,Supplier Reference,供應商參考
 DocType: Production Planning Tool,"If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.",如果選中，則BOM的子裝配項目將被視為獲取原料。否則，所有的子組件件，將被視為一個原料。
@@ -3376,8 +3096,8 @@
 DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
 DocType: Item Price,Item Price,商品價格
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +36,Motion Picture & Video,電影和視頻
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,訂購
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
@@ -3386,7 +3106,6 @@
 DocType: BOM,Rate Of Materials Based On,材料成本基於
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
-DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,庫存計量單位更換工具
 DocType: POS Profile,Terms and Conditions,條款和條件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc",在這裡，你可以保持身高，體重，過敏，醫療問題等
@@ -3398,7 +3117,7 @@
 DocType: Sales Order Item,For Production,對於生產
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +103,Please enter sales order in the above table,請在上表輸入訂單
 DocType: Project Task,View Task,查看任務
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,您的會計年度自
+apps/erpnext/erpnext/public/js/setup_wizard.js +154,Your financial year begins on,您的會計年度自
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,請輸入採購入庫單
 DocType: Sales Invoice,Get Advances Received,取得進展收稿
 DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
@@ -3406,20 +3125,18 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),設置接收郵件服務器支持電子郵件ID 。 （例如support@example.com ）
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +525,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +539,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Burnishing,打磨
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +54,'To Date' is required,“至日期”是必需填寫的
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Features Setup,Item Advanced,項目高級
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Hot rolling,熱軋
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選中的交易都是“已提交”，郵件彈出窗口自動打開，在該事務發送電子郵件到相關的“聯繫”，與交易作為附件。用戶可能會或可能不會發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
 DocType: Employee Education,Employee Education,員工教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +742,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +751,It is needed to fetch Item Details.,這是需要獲取項目詳細信息。
 DocType: Salary Slip,Net Pay,淨收費
 DocType: Account,Account,帳戶
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,序列號{0}已收到
@@ -3428,35 +3145,28 @@
 DocType: Customer,Sales Team Details,銷售團隊詳細
 DocType: Expense Claim,Total Claimed Amount,總索賠額
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,潛在的銷售機會。
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +174,Invalid {0},無效的{0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,病假
 DocType: Email Digest,Email Digest,電子郵件摘要
 DocType: Delivery Note,Billing Address Name,帳單地址名稱
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +22,Department Stores,百貨
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +40,System Balance,系統平衡
-DocType: Workflow,Is Active,啟用
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百貨
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,System Balance,系統平衡
 apps/erpnext/erpnext/controllers/stock_controller.py +71,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,首先保存文檔。
 DocType: Account,Chargeable,收費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Linishing,Linishing
 DocType: Company,Change Abbreviation,更改縮寫
-DocType: Workflow State,Primary,主要的
 DocType: Expense Claim Detail,Expense Date,犧牲日期
 DocType: Item,Max Discount (%),最大折讓（％）
-DocType: Communication,More Information,更多信息
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,最後訂單金額
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Blasting,爆破
 DocType: Company,Warn,警告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +111,Item valuation updated,物品估價更新
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Order,Raw Materials Supplied,提供供應商
 DocType: Purchase Invoice,Recurring Print Format,經常打印格式
-DocType: Communication,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
 DocType: Appraisal,Appraisal Template,評估模板
-DocType: Communication,Email,電子郵件
 DocType: Item Group,Item Classification,項目分類
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,業務發展經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,業務發展經理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,期間
 ,General Ledger,總帳
@@ -3466,9 +3176,7 @@
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +264,Please select {0} first,請先選擇{0}
 DocType: Features Setup,To get Item Group in details table,取得詳細表格裡的項目群組
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Redrawing,重繪
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +112,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Etching,蝕刻
 DocType: Sales Invoice,Commission,佣金
 DocType: Address Template,"<h4>Default Template</h4>
 <p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
@@ -3494,7 +3202,7 @@
  {％，如果email_id％}電子郵件：{{email_id}}＆LT; BR＆GT {％ENDIF - ％} 
  </代碼> </ PRE>"
 DocType: Salary Slip Deduction,Default Amount,違約金額
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,倉庫系統中未找到
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,倉庫系統中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,This Month's Summary,本月摘要
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於％d天。
@@ -3513,13 +3221,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +340,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
 DocType: Supplier,Address and Contacts,地址和聯繫方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
+apps/erpnext/erpnext/public/js/setup_wizard.js +257,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Payment Tool,Get Outstanding Vouchers,獲得傑出禮券
 DocType: Warranty Claim,Resolved By,議決
 DocType: Appraisal,Start Date,開始日期
-apps/frappe/frappe/public/js/frappe/form/link_selector.js +21,Value,值
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +139,Click here to verify,點擊這裡核實
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
@@ -3529,55 +3236,43 @@
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
 DocType: Time Log,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Rolling,滾動
-DocType: ToDo,Priority,優先
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +41,Remove item if charges is not applicable to that item,刪除項目，如果收費並不適用於該項目
-DocType: Dropbox Backup,Dropbox Access Allowed,允許訪問Dropbox
-DocType: Dropbox Backup,Weekly,每週
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,例如：。 smsgateway.com / API / send_sms.cgi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Receive,接受
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +597,Receive,接受
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +166,{0} has been successfully added to our Newsletter list.,{0}已成功添加到我們的新聞列表。
-apps/erpnext/erpnext/stock/doctype/item/item.py +377,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +394,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +67,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electron beam machining,電子束加工
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +424,Production Order {0} must be submitted,生產訂單{0}必須提交
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,主報告
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +102,Stock Ledger entries balances updated,庫存總帳條目更新結餘
+apps/erpnext/erpnext/config/stock.py +136,Main Reports,主報告
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
 DocType: Purchase Receipt Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,新增/編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +178,Add / Edit Prices,新增/編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +53,Chart of Cost Centers,成本中心的圖
 ,Requested Items To Be Ordered,要訂購的需求項目
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +298,My Orders,我的訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +293,My Orders,我的訂單
 DocType: Price List,Price List Name,價格列表名稱
 DocType: Time Log,For Manufacturing,對於製造業
-apps/erpnext/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +70,Totals,總計
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +174,Totals,總計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,訂購項目交付
 DocType: Account,Income,收入
-,Setup Wizard,設置嚮導
 DocType: Industry Type,Industry Type,行業類型
 apps/erpnext/erpnext/templates/includes/cart.js +137,Something went wrong!,出事了！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +251,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +256,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,完成日期
 DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Die casting,壓鑄模具
-DocType: Email Alert,Reference Date,參考日期
 apps/erpnext/erpnext/config/hr.py +105,Organization unit (department) master.,組織單位（部門）的主人。
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,請輸入有效的手機號
 DocType: Budget Detail,Budget Detail,預算案詳情
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前，請填寫留言
-DocType: Async Task,Status,狀態
-apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +65,Stock UOM updated for Item {0},股票UOM更新的項目{0}
-DocType: Company History,Year,年
 apps/erpnext/erpnext/config/accounts.py +127,Point-of-Sale Profile,簡介銷售點的
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新短信設置
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +37,Time Log {0} already billed,時間日誌{0}已結算
@@ -3590,55 +3285,52 @@
 ,Serial No Service Contract Expiry,序號服務合同到期
 DocType: Item,Unit of Measure Conversion,轉換度量單位
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,僱員不能改變
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +259,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
 apps/erpnext/erpnext/controllers/status_updater.py +140,Allowance for over-{0} crossed for Item {1},備抵過{0}越過為項目{1}
 DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,您的供應商
+apps/erpnext/erpnext/public/js/setup_wizard.js +340,Your Suppliers,您的供應商
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +65,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,另外工資結構{0}激活員工{1}。請其狀態“無效”繼續。
 DocType: Purchase Invoice,Contact,聯繫
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +9,Received From,從......收到
 DocType: Features Setup,Exports,出口
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：從{0} {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +16,{0}: From {0} for {1},{0}：從{0}給 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
 DocType: Issue,Content Type,內容類型
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Computer,電腦
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,電腦
 DocType: Item,List this Item in multiple groups on the website.,列出這個項目在網站上多個組。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +283,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +62,Item: {0} does not exist in the system,項：{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +81,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Cost Center,Budgets,預算
-apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,已更新
 DocType: Employee,Emergency Contact Details,緊急聯繫方式
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,它有什麼作用？
+apps/erpnext/erpnext/public/js/setup_wizard.js +144,What does it do?,它有什麼作用？
 DocType: Delivery Note,To Warehouse,到倉庫
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},帳戶{0}已多次輸入會計年度{1}
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +307,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/stock/doctype/item/item.py +317,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,更新的額外成本來計算項目的到岸成本
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,電子的
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Electrical,電子的
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +302,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +304,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},用戶ID不為員工設置{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Peening,噴丸
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,從保修索賠
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +212,Birthday Reminder for {0},生日提醒{0}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +163,Lapping,精研
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,天自上次訂購
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +72,Days Since Last Order,天自上次訂購
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +299,Debit To account must be a Balance Sheet account,借記帳戶必須是資產負債表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
-DocType: User,Enabled,啟用
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,庫存資產
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +29,Do you really want to Submit all Salary Slip for month {0} and year {1},難道你真的想要提交的所有{1}年{0}月的工資單
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,進口認購
@@ -3646,19 +3338,18 @@
 DocType: Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
 DocType: Authorization Rule,Based On,基於
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +536,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +550,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
+apps/erpnext/erpnext/controllers/recurring_document.py +163,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,專案活動／任務。
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,生成工資條
-apps/frappe/frappe/utils/__init__.py +79,{0} is not a valid email id,{0}不是一個有效的電子郵件ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
-DocType: ToDo,Low,低
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Spinning,紡織
+apps/erpnext/erpnext/stock/doctype/item/item.py +385,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
@@ -3680,7 +3371,6 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,活動名稱是必需的
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Receipt Item,Rejected Serial No,拒絕序列號
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Deep drawing,深拉伸
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,新的通訊
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 apps/erpnext/erpnext/stock/doctype/item/item.js +17,Show Balance,顯示庫存餘額
@@ -3691,7 +3381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +119,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +450,Amount,量
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Riveting,鉚
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
 DocType: Manufacturing Settings,Manufacturing Settings,製造設定
@@ -3703,28 +3392,24 @@
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,New Account Name,新帳號名稱
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,顧客服務
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,顧客服務
 DocType: Item,Thumbnail,縮略圖
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +147,Confirm Your Email,確認您的電子郵件
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,報價候選作業。
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +81,Total allocated leaves are more than days in the period,分配的總葉多天的期限
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,預設在製品倉庫
 apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,會計交易的預設設定。
-apps/frappe/frappe/model/naming.py +40,{0} is required,{0}是必需的
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Vacuum molding,真空成型
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
-DocType: Contact Us Settings,City,城市
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Ultrasonic machining,超聲波加工
-apps/frappe/frappe/templates/base.html +137,Error: Not a valid id?,錯誤：沒有有效的身份證？
 apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,項{0}必須是一個銷售項目
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
 DocType: Sales Order,Printing Details,印刷詳情
 DocType: Task,Closing Date,截止日期
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,工程師
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,工程師
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +379,Item Code required at Row No {0},於列{0}需要產品編號
 DocType: Sales Partner,Partner Type,合作夥伴類型
@@ -3732,7 +3417,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise折扣
 DocType: Purchase Invoice,Against Expense Account,對費用帳戶
 DocType: Production Order,Production Order,生產訂單
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +258,Installation Note {0} has already been submitted,安裝注意{0}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Installation Note {0} has already been submitted,安裝注意{0}已提交
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
@@ -3740,26 +3425,24 @@
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
-apps/frappe/frappe/public/js/frappe/views/ganttview.js +45,Gantt Chart,甘特圖
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,兼任
 DocType: Employee,Applicable Holiday List,適用假期表
 DocType: Employee,Cheque,支票
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,系列更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Report Type is mandatory,報告類型是強制性的
 DocType: Item,Serial Number Series,序列號系列
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},倉庫是強制性的股票項目{0}行{1}
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +45,Retail & Wholesale,零售及批發
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批發
 DocType: Issue,First Responded On,首先作出回應
 DocType: Website Item Group,Cross Listing of Item in multiple groups,在多組項目的交叉上市
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,第一個用戶：您
+apps/erpnext/erpnext/public/js/setup_wizard.js +101,The First User: You,第一個用戶：您
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +48,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,Successfully Reconciled,不甘心成功
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +119,Successfully Reconciled,不甘心成功
 DocType: Production Order,Planned End Date,計劃的結束日期
 apps/erpnext/erpnext/config/stock.py +43,Where items are stored.,項目的存儲位置。
 DocType: Tax Rule,Validity,有效性
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,發票金額
 DocType: Attendance,Attendance,出勤
-DocType: Page,No,無
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選中，則列表將被添加到每個應被添加的部門。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +520,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
@@ -3767,55 +3450,46 @@
 ,Item Prices,產品價格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,採購訂單一被儲存，就會顯示出來。
 DocType: Period Closing Voucher,Period Closing Voucher,期末券
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,價格表師傅。
+apps/erpnext/erpnext/config/stock.py +120,Price List master.,價格表師傅。
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
-DocType: DocPerm,Level,級別
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +59,No permission to use Payment Tool,沒有權限使用支付工具
-apps/erpnext/erpnext/controllers/recurring_document.py +192,'Notification Email Addresses' not specified for recurring %s,為重複％不是指定的“通知電子郵件地址”
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +86,Milling,磨
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +97,No permission to use Payment Tool,沒有權限使用支付工具
+apps/erpnext/erpnext/controllers/recurring_document.py +189,'Notification Email Addresses' not specified for recurring %s,為重複％不是指定的“通知電子郵件地址”
+apps/erpnext/erpnext/accounts/doctype/account/account.py +106,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
 DocType: Company,Round Off Account,四捨五入賬戶
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Nibbling,嗑
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,行政開支
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consulting,諮詢
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
 apps/erpnext/erpnext/public/js/pos/pos.js +429,Change,更改
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 DocType: Appraisal Goal,Score Earned,獲得得分
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,通知期
+apps/erpnext/erpnext/public/js/setup_wizard.js +141,"e.g. ""My Company LLC""",例如“我的公司有限責任公司”
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Notice Period,通知期
 DocType: Bank Reconciliation Detail,Voucher ID,優惠券編號
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等帳戶
 DocType: Packing Slip,Gross Weight UOM,毛重計量單位
 DocType: Email Digest,Receivables / Payables,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Invoice,對銷售發票
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Stamping,沖壓
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +457,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +56,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +518,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +532,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
 DocType: Task,Actual End Date (via Time Logs),實際結束日期（通過時間日誌）
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,請輸入父成本中心
 DocType: Delivery Note,Print Without Amount,列印表單時不印金額
-apps/erpnext/erpnext/controllers/buying_controller.py +69,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
-DocType: User,Last Name,姓
-DocType: Web Page,Left,左
-DocType: Event,All Day,全日
+apps/erpnext/erpnext/controllers/buying_controller.py +60,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
 DocType: Issue,Support Team,支持團隊
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
-DocType: Contact Us Settings,State,狀態
 DocType: Batch,Batch,批量
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Balance,平衡
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +28,Balance,平衡
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
-DocType: User,Gender,性別
 DocType: Journal Entry,Debit Note,繳費單
 DocType: Stock Entry,As per Stock UOM,按庫存計量單位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
@@ -3829,45 +3503,41 @@
 apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
 DocType: Purchase Invoice,Total Advance,預付款總計
-DocType: Workflow State,User,使用者
 apps/erpnext/erpnext/config/hr.py +220,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,設為失落
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收貨注意事項
 DocType: Customer,Credit Days Based On,信貸天基於
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,規劃工作站工作時間以外的時間日誌。
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +95,{0} {1} has already been submitted,{0} {1}已提交
 ,Items To Be Requested,項目要請求
-DocType: Purchase Order,Get Last Purchase Rate,獲取最新預訂價
 DocType: Time Log,Billing Rate based on Activity Type (per hour),根據活動類型計費率（每小時）
 DocType: Company,Company Info,公司資訊
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Seaming,封罐
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +197,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到，因此郵件無法發送
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +211,"Company Email ID not found, hence mail not sent",公司電子郵件ID沒有找到，因此郵件無法發送
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
 DocType: Production Planning Tool,Filter based on item,根據項目篩選
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +451,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,今年開始日期
 DocType: Attendance,Employee Name,員工姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),整數總計（公司貨幣）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +115,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +122,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
 DocType: Purchase Common,Purchase Common,採購普通
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +95,{0} {1} has been modified. Please refresh.,{0} {1}已修改。請更新。
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,停止用戶在下面日期提出休假申請。
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +591,From Opportunity,從機會
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +46,Blanking,消隱
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Employee Benefits,員工福利
 DocType: Sales Invoice,Is POS,是POS機
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +240,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Packed quantity must equal quantity for Item {0} in row {1},盒裝數量必須等於{1}列品項{0}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,客戶提出的賬單。
-DocType: DocField,Default,預設
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +466,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}新增用戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +472,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +40,{0} subscribers added,{0}用戶已新增
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see ""Company List""",定義預算這個成本中心。要設置預算的行動，請參閱“企業名錄”
 DocType: Account,Parent Account,父帳戶
@@ -3877,70 +3547,63 @@
 apps/erpnext/erpnext/public/js/pos/pos.js +91,Price List not found or disabled,價格表未找到或禁用
 DocType: Expense Claim,Approved,批准
 DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",選擇“Yes”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
 DocType: Employee,Education,教育
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +217,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +220,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 DocType: Address,Office,辦公室
-apps/frappe/frappe/desk/moduleview.py +67,Standard Reports,標準報告
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Please select Employee Record first.,請選擇員工記錄第一。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,要創建一個納稅帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設置的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-apps/erpnext/erpnext/config/stock.py +288,Batch Inventory,批量庫存
+apps/erpnext/erpnext/config/stock.py +283,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單（待定提供）
-DocType: DocShare,Document Type,文件類型
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +565,From Supplier Quotation,從供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +676,From Supplier Quotation,從供應商報價
 DocType: Deduction Type,Deduction Type,扣類型
 DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
 DocType: Features Setup,"To track items in sales and purchase documents with batch nos. ""Preferred Industry: Chemicals""",要跟踪與批次號的銷售和採購文件的項目。 “首選行業：化工”
 DocType: GL Entry,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,計劃數量
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,總稅收
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +93,Total Tax,總稅收
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +178,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +95,Total allocated leaves are more than period,分配的總葉多期
 DocType: Production Order,Actual Start Date,實際開始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
 apps/erpnext/erpnext/config/stock.py +23,Record item movement.,記錄項目移動。
 DocType: Newsletter List Subscriber,Newsletter List Subscriber,通訊訂戶名單
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Morticing,Morticing
-DocType: Email Account,Service,服務
 DocType: Hub Settings,Hub Settings,中心設定
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,加入作業
 apps/erpnext/erpnext/accounts/party.py +232,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
 ,Monthly Salary Register,月薪註冊
-apps/frappe/frappe/website/template.py +140,Next,下一個
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Electropolishing,電解
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +24,Please enter Payment Amount in atleast one row,請輸入至少一行的付款金額
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +33,Please enter Payment Amount in atleast one row,請輸入至少一行的付款金額
 DocType: POS Profile,POS Profile,POS簡介
 apps/erpnext/erpnext/config/accounts.py +153,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +238,Row {0}: Payment Amount cannot be greater than Outstanding Amount,行{0}：付款金額不能大於傑出金額
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +45,Total Unpaid,總未付
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,總未付
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,時間日誌是不計費
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,購買者
+apps/erpnext/erpnext/public/js/setup_wizard.js +287,Purchaser,購買者
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,淨工資不能為負
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +71,Please enter the Against Vouchers manually,請手動輸入對優惠券
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +107,Please enter the Against Vouchers manually,請手動輸入對優惠券
 DocType: SMS Settings,Static Parameters,靜態參數
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
@@ -3949,15 +3612,13 @@
 apps/erpnext/erpnext/config/crm.py +48,Send mass SMS to your contacts,發送群發短信到您的聯繫人
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Cross-rolling,交叉軋製
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +132,Credit Card,信用卡
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,庫存交易的預設設定。
+apps/erpnext/erpnext/config/stock.py +90,Default settings for stock transactions.,庫存交易的預設設定。
 DocType: Purchase Invoice,Next Date,下一個日期
 DocType: Employee Education,Major/Optional Subjects,大/選修課
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,請輸入稅費
-apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Machining,加工
-DocType: Sales Invoice Item,Drop Ship,落船
+DocType: Sales Invoice Item,Drop Ship,直接發運給客戶
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
 DocType: Hub Settings,Seller Name,賣家名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
@@ -3966,47 +3627,44 @@
 DocType: Stock Entry,Repack,重新包裝
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在繼續之前，您必須儲存表單
 DocType: Item Attribute,Numeric Values,數字值
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,附加標誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +261,Attach Logo,附加標誌
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/stock/doctype/item/item.js +38,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,按部門封鎖請假申請。
 apps/erpnext/erpnext/templates/pages/cart.html +42,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +73,Root cannot be edited.,root不能被編輯。
-apps/erpnext/erpnext/accounts/utils.py +195,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
+apps/erpnext/erpnext/accounts/doctype/account/account.py +77,Root cannot be edited.,root不能被編輯。
+apps/erpnext/erpnext/accounts/utils.py +197,Allocated amount can not greater than unadusted amount,分配的金額不能超過未調整金額
 DocType: Manufacturing Settings,Allow Production on Holidays,允許生產的假日
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,股本
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,請選擇一個csv文件
-DocType: Dropbox Backup,Send Backups to Dropbox,發送到備份Dropbox的
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,設計師
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,設計師
 apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +383,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +386,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Item,Automatically create Material Request if quantity falls below this level,自動創建材料，如果申請數量低於這個水平
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
-apps/erpnext/erpnext/stock/doctype/item/item.py +369,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +379,"To set reorder level, item must be a Purchase Item or Manufacturing Item",要設置訂貨點水平，項目必須購買項目或生產項目
 ,Supplier Addresses and Contacts,供應商的地址和聯繫方式
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +268,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +18,Project master.,專案主持。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +330, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +374, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +478,Get Items from BOM,從物料清單獲取項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +565,Get Items from BOM,從物料清單獲取項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
 apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,材料清單
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +77,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
-DocType: Dropbox Backup,Send Notifications To,發送通知給
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,參考日期
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Debit entry can not be linked with a {1},行{0}：借記條目不能與連接的{1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +188,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/account/account.py +195,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +31,Please create Salary Structure for employee {0},請對{0}員工建立薪酬結構

diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index e18a694..0a1356e 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-map-marker", 
    "permlevel": 0, 
@@ -42,6 +43,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Title", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -62,7 +64,8 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Address Type",  
+   "label": "Address Type", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
    "permlevel": 0, 
@@ -85,6 +88,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 1", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -106,6 +110,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Address Line 2", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -127,6 +132,7 @@
    "in_filter": 1, 
    "in_list_view": 1, 
    "label": "City/Town", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -148,6 +154,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "State", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -169,6 +176,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Postal Code", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -190,6 +198,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -211,6 +220,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -233,6 +243,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Email Id", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -254,6 +265,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Phone", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -275,6 +287,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Fax", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -298,6 +311,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Preferred Billing Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -321,6 +335,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Preferred Shipping Address", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -342,6 +357,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Reference", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "icon-pushpin", 
    "permlevel": 0, 
@@ -364,6 +380,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Customer", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Customer", 
    "permlevel": 0, 
@@ -386,6 +403,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Customer Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -407,6 +425,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Supplier", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Supplier", 
    "permlevel": 0, 
@@ -429,6 +448,7 @@
    "in_filter": 1, 
    "in_list_view": 0, 
    "label": "Supplier Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -450,6 +470,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sales Partner", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Sales Partner", 
    "permlevel": 0, 
@@ -471,6 +492,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -493,6 +515,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Lead", 
    "permlevel": 0, 
@@ -516,6 +539,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Lead Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -536,7 +560,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:37.894887", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.719278", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address", 

diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index 8ae7c4d..da529fb 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py

@@ -10,6 +10,9 @@
 from frappe.model.document import Document
 
 class Address(Document):
+	def __setup__(self):
+		self.flags.linked = False
+
 	def autoname(self):
 		if not self.address_title:
 			self.address_title = self.customer \
@@ -35,20 +38,17 @@
 			for fieldname in self.link_fields:
 				if self.get(fieldname):
 					if not frappe.db.sql("""select name from `tabAddress` where is_primary_address=1
-						and `%s`=%s and name!=%s""" % (fieldname, "%s", "%s"),
+						and `%s`=%s and name!=%s""" % (frappe.db.escape(fieldname), "%s", "%s"),
 						(self.get(fieldname), self.name)):
 							self.is_primary_address = 1
 					break
 
 	def link_address(self):
 		"""Link address based on owner"""
-		linked = False
-		for fieldname in self.link_fields:
-			if self.get(fieldname):
-				linked = True
-				break
+		if not self.flags.linked:
+			self.check_if_linked()
 
-		if not linked:
+		if not self.flags.linked:
 			contact = frappe.db.get_value("Contact", {"email_id": self.owner},
 				("name", "customer", "supplier"), as_dict = True)
 			if contact:
@@ -57,6 +57,11 @@
 
 			self.lead = frappe.db.get_value("Lead", {"email_id": self.owner})
 
+	def check_if_linked(self):
+		for fieldname in self.link_fields:
+			if self.get(fieldname):
+				self.flags.linked = True
+				break
 
 	def validate_shipping_address(self):
 		"""Validate that there can only be one shipping address for particular customer, supplier"""

diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
index 9726e05..0d41753 100644
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ b/erpnext/utilities/doctype/address_template/address_template.json

@@ -20,6 +20,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Country", 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Country", 
    "permlevel": 0, 
@@ -43,6 +44,7 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Is Default", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -66,6 +68,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Template", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -85,7 +88,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:38:38.124736", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:41.812186", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "Address Template", 

diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 2bc9984..9fef425 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json

@@ -1,746 +1,768 @@
 {
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "creation": "2013-01-10 16:34:32",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "creation": "2013-01-10 16:34:32", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "contact_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "",
-   "no_copy": 0,
-   "options": "icon-user",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "icon-user", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "first_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "First Name",
-   "no_copy": 0,
-   "oldfieldname": "first_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "first_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "First Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "first_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "last_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Last Name",
-   "no_copy": 0,
-   "oldfieldname": "last_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "last_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Last Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "last_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "email_id",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Email Id",
-   "no_copy": 0,
-   "oldfieldname": "email_id",
-   "oldfieldtype": "Data",
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "email_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Email Id", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "email_id", 
+   "oldfieldtype": "Data", 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "cb00",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "cb00", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "Passive",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "label": "Status",
-   "no_copy": 0,
-   "options": "Passive\nOpen\nReplied",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "Passive", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Passive\nOpen\nReplied", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "phone",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Phone",
-   "no_copy": 0,
-   "oldfieldname": "contact_no",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "phone", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Phone", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "contact_no", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "contact_details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Reference",
-   "no_copy": 0,
-   "options": "icon-pushpin",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "contact_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Reference", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "icon-pushpin", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "User Id",
-   "no_copy": 0,
-   "options": "User",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "user", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "User Id", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "User", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Customer",
-   "no_copy": 0,
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "customer", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "customer", 
+   "oldfieldtype": "Link", 
+   "options": "Customer", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Customer Name",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "customer_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Customer Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "",
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier",
-   "no_copy": 0,
-   "options": "Supplier",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "",
-   "fieldname": "supplier_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Supplier Name",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 1,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "supplier_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Supplier Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "depends_on": "",
-   "fieldname": "sales_partner",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Sales Partner",
-   "no_copy": 0,
-   "options": "Sales Partner",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "depends_on": "", 
+   "fieldname": "sales_partner", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Sales Partner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Partner", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "default": "0",
-   "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)",
-   "fieldname": "is_primary_contact",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Is Primary Contact",
-   "no_copy": 0,
-   "oldfieldname": "is_primary_contact",
-   "oldfieldtype": "Select",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "default": "0", 
+   "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)", 
+   "fieldname": "is_primary_contact", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Is Primary Contact", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "is_primary_contact", 
+   "oldfieldtype": "Select", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "More Information",
-   "no_copy": 0,
-   "options": "icon-file-text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "More Information", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "icon-file-text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "mobile_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Mobile No",
-   "no_copy": 0,
-   "oldfieldname": "mobile_no",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "mobile_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Mobile No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "mobile_no", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "Enter department to which this Contact belongs",
-   "fieldname": "department",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Department",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Enter department to which this Contact belongs", 
+   "fieldname": "department", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "description": "Enter designation of this Contact",
-   "fieldname": "designation",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Designation",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "description": "Enter designation of this Contact", 
+   "fieldname": "designation", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Designation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "fieldname": "unsubscribed",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "label": "Unsubscribed",
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "unsubscribed", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Unsubscribed", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-user",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "modified": "2015-10-07 00:38:08.152183",
- "modified_by": "Administrator",
- "module": "Utilities",
- "name": "Contact",
- "owner": "Administrator",
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "icon-user", 
+ "idx": 1, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:43.760924", 
+ "modified_by": "Administrator", 
+ "module": "Utilities", 
+ "name": "Contact", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Master Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Master Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Master Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Master Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Maintenance Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Maintenance User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "match": "",
-   "permlevel": 1,
-   "print": 0,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "match": "", 
+   "permlevel": 1, 
+   "print": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "All", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "read_only": 0,
+ ], 
+ "read_only": 0, 
  "read_only_onload": 0
-}
+}
\ No newline at end of file

diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
index bfab79f..dff05bc 100644
--- a/erpnext/utilities/doctype/contact/contact.py
+++ b/erpnext/utilities/doctype/contact/contact.py

@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import cstr
+from frappe import _
 
 from erpnext.controllers.status_updater import StatusUpdater
 
@@ -61,6 +62,10 @@
 @frappe.whitelist()
 def invite_user(contact):
 	contact = frappe.get_doc("Contact", contact)
+
+	if not contact.email_id:
+		frappe.throw(_("Please set Email ID"))
+
 	if contact.has_permission("write"):
 		user = frappe.get_doc({
 			"doctype": "User",

diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.py b/erpnext/utilities/doctype/rename_tool/rename_tool.py
index 5e33f5f..0f8a7a3 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.py
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.py

@@ -15,7 +15,7 @@
 @frappe.whitelist()
 def get_doctypes():
 	return frappe.db.sql_list("""select name from tabDocType
-		where ifnull(allow_rename,0)=1 and module!='Core' order by name""")
+		where allow_rename=1 and module!='Core' order by name""")
 
 @frappe.whitelist()
 def upload(select_doctype=None, rows=None):

diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json
index 2be7fba..bf704cd 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.json
+++ b/erpnext/utilities/doctype/sms_log/sms_log.json

@@ -19,6 +19,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sender Name", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -40,6 +41,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sent On", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -60,6 +62,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -82,6 +85,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Message", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -102,6 +106,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "options": "Simple", 
    "permlevel": 0, 
@@ -125,6 +130,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "No of Requested SMS", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -146,6 +152,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Requested Numbers", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -166,6 +173,7 @@
    "ignore_user_permissions": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -188,6 +196,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "No of Sent SMS", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -209,6 +218,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "label": "Sent To", 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
@@ -230,7 +240,8 @@
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
- "modified": "2015-10-02 07:39:13.234503", 
+ "max_attachments": 0, 
+ "modified": "2015-11-16 06:29:57.793449", 
  "modified_by": "Administrator", 
  "module": "Utilities", 
  "name": "SMS Log", 

diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 278ec3b..d088f59 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py

@@ -89,6 +89,9 @@
 				prevdoc_values = frappe.db.get_value(reference_doctype, reference_name,
 					[d[0] for d in fields], as_dict=1)
 
+				if not prevdoc_values:
+					frappe.throw(_("Invalid reference {0} {1}").format(reference_doctype, reference_name))
+
 				for field, condition in fields:
 					if prevdoc_values[field] is not None:
 						self.validate_value(field, condition, prevdoc_values[field], doc)

diff --git a/setup.py b/setup.py
index c6f12a9..d81e7b7 100644
--- a/setup.py
+++ b/setup.py

@@ -1,18 +1,18 @@
 from setuptools import setup, find_packages
+from pip.req import parse_requirements
 
-version = "6.7.7"
-
-with open("requirements.txt", "r") as f:
-	install_requires = f.readlines()
+version = "6.12.6"
+requirements = parse_requirements("requirements.txt", session="")
 
 setup(
-    name='erpnext',
-    version=version,
-    description='Open Source ERP',
-    author='Frappe Technologies',
-    author_email='info@erpnext.com',
-    packages=find_packages(),
-    zip_safe=False,
-    include_package_data=True,
-    install_requires=install_requires
+	name='erpnext',
+	version=version,
+	description='Open Source ERP',
+	author='Frappe Technologies',
+	author_email='info@erpnext.com',
+	packages=find_packages(),
+	zip_safe=False,
+	include_package_data=True,
+	install_requires=[str(ir.req) for ir in requirements],
+	dependency_links=[str(ir._link) for ir in requirements if ir._link]
 )

diff --git a/sponsors.md b/sponsors.md
index bfa9e51..125b358 100644
--- a/sponsors.md
+++ b/sponsors.md

@@ -53,5 +53,13 @@
 				Leave Allocation based on Arbitrary Dates <a href="https://github.com/frappe/erpnext/issues/1938">#1938</a>
 			</td>
 		</tr>
+		<tr>
+			<td style="width: 30%">
+				<a href="http://agtech.com.sq">AG Technologies, Singapore</a>
+			</td>
+			<td>
+				Bulk edit via export-import in Bank Reconciliation <a href="https://github.com/frappe/erpnext/issues/1938">#4356</a>
+			</td>
+		</tr>
 	</tbody>
 </table>

diff --git a/test_sites/apps.txt b/test_sites/apps.txt
index 3796729..ee64549 100644
--- a/test_sites/apps.txt
+++ b/test_sites/apps.txt

@@ -1 +1 @@
-erpnext
+erpnext
\ No newline at end of file

diff --git a/test_sites/languages.txt b/test_sites/languages.txt
index 0163b22..cf2b150 100644
--- a/test_sites/languages.txt
+++ b/test_sites/languages.txt

@@ -1 +1 @@
-en english
+en english
\ No newline at end of file

diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
index 7d1194a..48b330b 100644
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json

@@ -9,4 +9,4 @@
  "run_selenium_tests": 1,
  "host_name": "http://localhost:8000",
  "install_apps": ["erpnext"]
-}
+}
\ No newline at end of file
commit	5ccaf6f9d7c0b4b551cd36be401f936ec4d943cf	[log] [tgz]
author	Giovanni Lion <giovanni.lion@gmail.com>	Wed Dec 09 15:25:47 2015 +0800
committer	Giovanni Lion <giovanni.lion@gmail.com>	Wed Dec 09 15:25:47 2015 +0800
tree	abf34f8631ffaada034bb065db31feafc74cfc67
parent	87b5fcb3b50cf2b372244f78ca8df4b8b4650031 [diff]
parent	29fe53f63c8fae263243abfd3c5138c6a943bd98 [diff]